diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 6737 |
1 files changed, 6737 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..4adb40fdc351 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6737 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at ed31348 Merge master.kernel.org:/home/rmk/linux-2.6-arm +Merging origin/master +$ git merge origin/master +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Updating ed31348..50ae815 +Fast forward + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/mioa701_bootresume.S | 1 + + drivers/usb/gadget/pxa25x_udc.c | 14 +- + drivers/video/omap/Makefile | 1 - + drivers/video/omap/lcd_sx1.c | 327 -------------------------------- + 5 files changed, 9 insertions(+), 336 deletions(-) + delete mode 100644 drivers/video/omap/lcd_sx1.c +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/configs/amiga_defconfig | 126 +++++++++++++++++++-------------- + arch/m68k/configs/apollo_defconfig | 115 +++++++++++++++++------------- + arch/m68k/configs/atari_defconfig | 130 +++++++++++++++++++--------------- + arch/m68k/configs/bvme6000_defconfig | 112 +++++++++++++++++------------- + arch/m68k/configs/hp300_defconfig | 115 +++++++++++++++++------------- + arch/m68k/configs/mac_defconfig | 125 ++++++++++++++++++-------------- + arch/m68k/configs/multi_defconfig | 129 +++++++++++++++++++--------------- + arch/m68k/configs/mvme147_defconfig | 112 +++++++++++++++++------------- + arch/m68k/configs/mvme16x_defconfig | 112 +++++++++++++++++------------- + arch/m68k/configs/q40_defconfig | 125 +++++++++++++++++++-------------- + arch/m68k/configs/sun3_defconfig | 124 +++++++++++++++++++------------- + arch/m68k/configs/sun3x_defconfig | 115 +++++++++++++++++------------- + drivers/video/macfb.c | 74 +++++++++---------- + 13 files changed, 863 insertions(+), 651 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Merge made by recursive. + arch/powerpc/boot/dts/mpc832x_rdb.dts | 4 +- + arch/powerpc/boot/dts/mpc8572ds.dts | 2 +- + arch/powerpc/configs/40x/virtex_defconfig | 1176 ++++++++++++++++++++++++ + arch/powerpc/configs/44x/virtex5_defconfig | 234 +++-- + arch/powerpc/configs/52xx/cm5200_defconfig | 169 +++- + arch/powerpc/configs/52xx/lite5200b_defconfig | 206 +++- + arch/powerpc/configs/52xx/motionpro_defconfig | 168 +++- + arch/powerpc/configs/52xx/pcm030_defconfig | 182 +++- + arch/powerpc/configs/52xx/tqm5200_defconfig | 180 +++- + arch/powerpc/configs/86xx/gef_sbc610_defconfig | 2 +- + arch/powerpc/configs/mpc5200_defconfig | 573 +++++++++--- + arch/powerpc/configs/ppc40x_defconfig | 92 ++- + arch/powerpc/configs/ppc44x_defconfig | 92 ++- + arch/powerpc/kernel/cpu_setup_44x.S | 7 +- + arch/powerpc/mm/40x_mmu.c | 16 +- + arch/powerpc/platforms/cell/spufs/file.c | 3 + + arch/powerpc/sysdev/bestcomm/Kconfig | 9 +- + arch/powerpc/sysdev/xilinx_intc.c | 4 +- + drivers/block/xsysace.c | 23 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 9 +- + drivers/net/Kconfig | 3 +- + drivers/serial/uartlite.c | 4 +- + drivers/video/xilinxfb.c | 5 +- + sound/soc/fsl/Kconfig | 3 +- + 24 files changed, 2644 insertions(+), 522 deletions(-) + create mode 100644 arch/powerpc/configs/40x/virtex_defconfig +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/scsi/scsi_lib.c | 23 +++++++++++------------ + include/scsi/scsi_transport_fc.h | 2 +- + 2 files changed, 12 insertions(+), 13 deletions(-) +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/Makefile | 2 +- + drivers/net/chelsio/sge.c | 4 -- + drivers/net/e1000e/netdev.c | 1 - + drivers/net/igb/igb_main.c | 4 -- + drivers/net/ixgbe/ixgbe_main.c | 1 - + drivers/net/pcmcia/axnet_cs.c | 2 +- + drivers/net/pcmcia/pcnet_cs.c | 1 - + drivers/net/phy/phy_device.c | 13 +++++- + drivers/net/phy/vitesse.c | 64 +++++++++++++++++++++++++++---- + drivers/net/sis900.c | 1 - + drivers/net/spider_net.c | 4 -- + drivers/net/wireless/ath5k/base.c | 35 +++++++++++++++++- + drivers/net/wireless/ath5k/base.h | 1 + + drivers/net/wireless/ath5k/debug.c | 10 ++-- + drivers/net/wireless/ath9k/beacon.c | 10 ++-- + drivers/net/wireless/ath9k/recv.c | 19 +++++++-- + drivers/net/wireless/iwlwifi/iwl-agn.c | 8 ++- + drivers/pci/quirks.c | 17 ++++++++ + include/linux/netfilter/x_tables.h | 2 +- + include/net/request_sock.h | 1 + + include/net/timewait_sock.h | 1 + + net/bridge/br_netfilter.c | 13 ++++++ + net/core/sock.c | 31 ++++++--------- + net/ipv4/tcp_output.c | 7 ++- + net/mac80211/wext.c | 8 ++++ + net/netfilter/nf_conntrack_core.c | 2 - + net/netfilter/nf_conntrack_netlink.c | 5 +- + net/rose/af_rose.c | 10 +++++ + net/wireless/reg.c | 4 +- + 29 files changed, 205 insertions(+), 76 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 5 +- + sound/pci/hda/hda_codec.c | 4 +- + sound/pci/hda/patch_sigmatel.c | 170 ++++++++++++++++------- + sound/sound_core.c | 6 +- + 4 files changed, 126 insertions(+), 59 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + lib/dynamic_printk.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/gadget/fsl_qe_udc.c | 3 +++ + drivers/usb/gadget/fsl_usb2_udc.c | 3 +++ + drivers/usb/host/ehci.h | 12 +++++------- + drivers/usb/storage/unusual_devs.h | 19 +++++++++++++++++++ + 4 files changed, 30 insertions(+), 7 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Merge made by recursive. + Documentation/cpu-freq/user-guide.txt | 12 ++++++++++++ + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 18 +++++++++++++++--- + arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 17 ++++++++++++++++- + 3 files changed, 43 insertions(+), 4 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + Documentation/input/input-programming.txt | 3 +- + drivers/input/ff-memless.c | 5 ++- + drivers/input/keyboard/atkbd.c | 27 ++++++++++++++++++++- + drivers/input/misc/cm109.c | 37 ++++++++++++++++++++++++++++- + drivers/input/mouse/hgpk.c | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 14 +++++++++++ + drivers/input/touchscreen/elo.c | 2 +- + 7 files changed, 83 insertions(+), 7 deletions(-) +Merging md-current/for-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Removed arch/arm/boot/compressed/head-clps7500.S +Removed arch/arm/mach-clps7500/Makefile +Removed arch/arm/mach-clps7500/Makefile.boot +Removed arch/arm/mach-clps7500/core.c +Removed arch/arm/mach-clps7500/include/mach/acornfb.h +Removed arch/arm/mach-clps7500/include/mach/debug-macro.S +Removed arch/arm/mach-clps7500/include/mach/dma.h +Removed arch/arm/mach-clps7500/include/mach/entry-macro.S +Removed arch/arm/mach-clps7500/include/mach/hardware.h +Removed arch/arm/mach-clps7500/include/mach/io.h +Removed arch/arm/mach-clps7500/include/mach/irq.h +Removed arch/arm/mach-clps7500/include/mach/irqs.h +Removed arch/arm/mach-clps7500/include/mach/memory.h +Removed arch/arm/mach-clps7500/include/mach/system.h +Removed arch/arm/mach-clps7500/include/mach/timex.h +Removed arch/arm/mach-clps7500/include/mach/uncompress.h +Removed arch/arm/mach-clps7500/include/mach/vmalloc.h +Removed arch/arm/mm/copypage-feroceon.S +Removed arch/arm/mm/copypage-v3.S +Removed arch/arm/mm/copypage-v4wb.S +Removed arch/arm/mm/copypage-v4wt.S +Removed arch/arm/mm/copypage-xsc3.S +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Auto-merged drivers/video/pxafb.c +Merge made by recursive. + arch/arm/Kconfig | 40 ++- + arch/arm/Makefile | 1 - + arch/arm/boot/compressed/Makefile | 4 - + arch/arm/boot/compressed/head-clps7500.S | 86 ----- + arch/arm/boot/compressed/misc.c | 2 + + arch/arm/common/Kconfig | 3 + + arch/arm/common/Makefile | 1 + + arch/arm/common/clkdev.c | 128 +++++++ + arch/arm/include/asm/clkdev.h | 30 ++ + arch/arm/include/asm/hardware/iomd.h | 41 --- + arch/arm/include/asm/memory.h | 7 +- + arch/arm/include/asm/page.h | 32 +- + arch/arm/include/asm/processor.h | 2 +- + arch/arm/include/asm/setup.h | 6 +- + arch/arm/include/asm/string.h | 9 - + arch/arm/include/asm/uaccess.h | 2 +- + arch/arm/kernel/setup.c | 37 ++- + arch/arm/lib/Makefile | 1 - + arch/arm/lib/memset.S | 2 +- + arch/arm/mach-aaec2000/include/mach/memory.h | 3 - + arch/arm/mach-at91/Kconfig | 7 + + arch/arm/mach-at91/include/mach/memory.h | 11 - + arch/arm/mach-clps711x/include/mach/memory.h | 20 +- + arch/arm/mach-clps7500/Makefile | 11 - + arch/arm/mach-clps7500/Makefile.boot | 2 - + arch/arm/mach-clps7500/core.c | 395 --------------------- + arch/arm/mach-clps7500/include/mach/acornfb.h | 33 -- + arch/arm/mach-clps7500/include/mach/debug-macro.S | 21 -- + arch/arm/mach-clps7500/include/mach/dma.h | 21 -- + arch/arm/mach-clps7500/include/mach/entry-macro.S | 16 - + arch/arm/mach-clps7500/include/mach/hardware.h | 67 ---- + arch/arm/mach-clps7500/include/mach/io.h | 255 ------------- + arch/arm/mach-clps7500/include/mach/irq.h | 32 -- + arch/arm/mach-clps7500/include/mach/irqs.h | 66 ---- + arch/arm/mach-clps7500/include/mach/memory.h | 43 --- + arch/arm/mach-clps7500/include/mach/system.h | 23 -- + arch/arm/mach-clps7500/include/mach/timex.h | 13 - + arch/arm/mach-clps7500/include/mach/uncompress.h | 35 -- + arch/arm/mach-clps7500/include/mach/vmalloc.h | 4 - + arch/arm/mach-davinci/include/mach/memory.h | 6 - + arch/arm/mach-ebsa110/include/mach/memory.h | 7 - + arch/arm/mach-ep93xx/include/mach/memory.h | 4 - + arch/arm/mach-footbridge/include/mach/memory.h | 9 + + arch/arm/mach-h720x/include/mach/memory.h | 17 - + arch/arm/mach-imx/include/mach/memory.h | 10 - + arch/arm/mach-integrator/clock.c | 80 +---- + arch/arm/mach-integrator/clock.h | 25 -- + arch/arm/mach-integrator/core.c | 35 ++ + arch/arm/mach-integrator/impd1.c | 26 +- + arch/arm/mach-integrator/include/mach/clkdev.h | 25 ++ + arch/arm/mach-integrator/include/mach/memory.h | 9 +- + arch/arm/mach-integrator/integrator_cp.c | 18 +- + arch/arm/mach-iop13xx/include/mach/memory.h | 16 +- + arch/arm/mach-iop32x/include/mach/memory.h | 11 - + arch/arm/mach-iop33x/include/mach/memory.h | 11 - + arch/arm/mach-ixp2000/include/mach/memory.h | 7 - + arch/arm/mach-ixp23xx/include/mach/memory.h | 13 - + arch/arm/mach-ixp4xx/include/mach/memory.h | 12 - + arch/arm/mach-kirkwood/include/mach/memory.h | 4 - + arch/arm/mach-ks8695/include/mach/memory.h | 5 - + arch/arm/mach-l7200/include/mach/memory.h | 3 - + arch/arm/mach-lh7a40x/include/mach/memory.h | 10 - + arch/arm/mach-loki/include/mach/memory.h | 4 - + arch/arm/mach-msm/include/mach/memory.h | 4 - + arch/arm/mach-mv78xx0/include/mach/memory.h | 4 - + arch/arm/mach-netx/include/mach/memory.h | 10 - + arch/arm/mach-ns9xxx/include/mach/memory.h | 3 - + arch/arm/mach-omap1/Kconfig | 3 + + arch/arm/mach-orion5x/include/mach/memory.h | 4 - + arch/arm/mach-pnx4008/include/mach/memory.h | 3 - + arch/arm/mach-pxa/Kconfig | 3 + + arch/arm/mach-pxa/clock.c | 66 +--- + arch/arm/mach-pxa/clock.h | 59 +-- + arch/arm/mach-pxa/include/mach/clkdev.h | 7 + + arch/arm/mach-pxa/include/mach/memory.h | 10 - + arch/arm/mach-pxa/pwm.c | 2 +- + arch/arm/mach-pxa/pxa25x.c | 71 +++-- + arch/arm/mach-pxa/pxa27x.c | 89 +++-- + arch/arm/mach-pxa/pxa300.c | 18 +- + arch/arm/mach-pxa/pxa320.c | 8 +- + arch/arm/mach-pxa/pxa3xx.c | 87 +++-- + arch/arm/mach-pxa/ssp.c | 2 +- + arch/arm/mach-realview/Kconfig | 2 + + arch/arm/mach-realview/clock.c | 80 +---- + arch/arm/mach-realview/clock.h | 6 - + arch/arm/mach-realview/core.c | 52 +++- + arch/arm/mach-realview/core.h | 1 - + arch/arm/mach-realview/include/mach/clkdev.h | 7 + + arch/arm/mach-realview/include/mach/memory.h | 10 - + arch/arm/mach-realview/realview_eb.c | 2 - + arch/arm/mach-realview/realview_pb1176.c | 2 - + arch/arm/mach-realview/realview_pb11mp.c | 2 - + arch/arm/mach-rpc/include/mach/memory.h | 7 - + arch/arm/mach-s3c2400/include/mach/memory.h | 3 - + arch/arm/mach-s3c2410/Kconfig | 1 + + arch/arm/mach-s3c2410/include/mach/memory.h | 3 - + arch/arm/mach-s3c2412/Kconfig | 1 + + arch/arm/mach-s3c2440/Kconfig | 1 + + arch/arm/mach-s3c2442/Kconfig | 1 + + arch/arm/mach-sa1100/clock.c | 100 ++---- + arch/arm/mach-sa1100/include/mach/memory.h | 12 - + arch/arm/mach-shark/include/mach/memory.h | 3 - + arch/arm/mach-versatile/Kconfig | 2 + + arch/arm/mach-versatile/clock.c | 80 +---- + arch/arm/mach-versatile/clock.h | 7 +- + arch/arm/mach-versatile/core.c | 56 +++- + arch/arm/mach-versatile/include/mach/clkdev.h | 7 + + arch/arm/mach-versatile/include/mach/memory.h | 10 - + arch/arm/mm/Kconfig | 65 +--- + arch/arm/mm/copypage-feroceon.S | 95 ----- + arch/arm/mm/copypage-feroceon.c | 111 ++++++ + arch/arm/mm/copypage-v3.S | 67 ---- + arch/arm/mm/copypage-v3.c | 81 +++++ + arch/arm/mm/copypage-v4mc.c | 53 ++-- + arch/arm/mm/copypage-v4wb.S | 79 ---- + arch/arm/mm/copypage-v4wb.c | 94 +++++ + arch/arm/mm/copypage-v4wt.S | 73 ---- + arch/arm/mm/copypage-v4wt.c | 88 +++++ + arch/arm/mm/copypage-v6.c | 84 +++-- + arch/arm/mm/copypage-xsc3.S | 97 ----- + arch/arm/mm/copypage-xsc3.c | 113 ++++++ + arch/arm/mm/copypage-xscale.c | 47 ++-- + arch/arm/mm/fault.c | 6 +- + arch/arm/mm/init.c | 57 ++-- + arch/arm/mm/mm.h | 2 +- + arch/arm/mm/mmu.c | 116 ++++--- + arch/arm/mm/nommu.c | 18 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm/mm/proc-syms.c | 4 +- + arch/arm/plat-mxc/Kconfig | 2 + + arch/arm/plat-mxc/include/mach/memory.h | 13 - + arch/arm/plat-omap/Kconfig | 2 + + arch/arm/plat-omap/include/mach/memory.h | 17 +- + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/ide/Kconfig | 2 +- + drivers/ide/ide_arm.c | 11 +- + drivers/input/keyboard/pxa27x_keypad.c | 2 +- + drivers/input/serio/Kconfig | 2 +- + drivers/media/video/pxa_camera.c | 2 +- + drivers/mfd/asic3.c | 6 +- + drivers/mmc/host/pxamci.c | 2 +- + drivers/mtd/maps/ixp2000.c | 2 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 2 +- + drivers/mtd/nand/s3c2410.c | 4 +- + drivers/net/cs89x0.c | 6 +- + drivers/serial/pxa.c | 2 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/host/ohci-pxa27x.c | 2 +- + drivers/video/Kconfig | 2 +- + drivers/video/pxafb.c | 2 +- + drivers/video/sa1100fb.c | 2 +- + include/linux/highmem.h | 2 + + 154 files changed, 1462 insertions(+), 2775 deletions(-) + delete mode 100644 arch/arm/boot/compressed/head-clps7500.S + create mode 100644 arch/arm/common/clkdev.c + create mode 100644 arch/arm/include/asm/clkdev.h + delete mode 100644 arch/arm/mach-clps7500/Makefile + delete mode 100644 arch/arm/mach-clps7500/Makefile.boot + delete mode 100644 arch/arm/mach-clps7500/core.c + delete mode 100644 arch/arm/mach-clps7500/include/mach/acornfb.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-clps7500/include/mach/dma.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-clps7500/include/mach/hardware.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/io.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/irq.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/irqs.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/memory.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/system.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/timex.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-integrator/include/mach/clkdev.h + create mode 100644 arch/arm/mach-pxa/include/mach/clkdev.h + create mode 100644 arch/arm/mach-realview/include/mach/clkdev.h + create mode 100644 arch/arm/mach-versatile/include/mach/clkdev.h + delete mode 100644 arch/arm/mm/copypage-feroceon.S + create mode 100644 arch/arm/mm/copypage-feroceon.c + delete mode 100644 arch/arm/mm/copypage-v3.S + create mode 100644 arch/arm/mm/copypage-v3.c + delete mode 100644 arch/arm/mm/copypage-v4wb.S + create mode 100644 arch/arm/mm/copypage-v4wb.c + delete mode 100644 arch/arm/mm/copypage-v4wt.S + create mode 100644 arch/arm/mm/copypage-v4wt.c + delete mode 100644 arch/arm/mm/copypage-xsc3.S + create mode 100644 arch/arm/mm/copypage-xsc3.c +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/mach-at32ap/at32ap700x.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v10/arch/byteorder.h | 10 ++++++---- + arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- + arch/cris/include/asm/byteorder.h | 20 ++++---------------- + 3 files changed, 14 insertions(+), 22 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. + arch/m68k/fpsp040/setox.S | 4 +- + arch/m68k/mac/baboon.c | 42 ++++++++++++---- + arch/m68k/mac/config.c | 3 - + arch/m68k/mac/debug.c | 1 - + arch/m68k/mac/macints.c | 9 ++-- + arch/m68k/mac/misc.c | 16 ++++-- + arch/m68k/mac/oss.c | 1 - + arch/m68k/mac/via.c | 80 ++++++++++++------------------- + drivers/ide/macide.c | 1 - + drivers/macintosh/via-cuda.c | 1 - + drivers/macintosh/via-macii.c | 1 - + drivers/macintosh/via-maciisi.c | 1 - + drivers/macintosh/via-pmu68k.c | 1 - + drivers/scsi/mac_esp.c | 100 ++++++++++++++++++++++++++------------ + drivers/scsi/mac_scsi.c | 1 - + drivers/video/console/fbcon.c | 78 ++---------------------------- + drivers/video/macfb.c | 33 ++++++------- + include/asm-m68k/byteorder.h | 16 ++---- + include/asm-m68k/machw.h | 22 --------- + 19 files changed, 173 insertions(+), 238 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +Merge made by recursive. + arch/parisc/include/asm/posix_types.h | 3 +- + arch/parisc/kernel/traps.c | 39 ++++++++++++++------------------ + 2 files changed, 18 insertions(+), 24 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Merge made by recursive. + arch/powerpc/boot/dts/kuroboxHD.dts | 1 - + arch/powerpc/boot/dts/kuroboxHG.dts | 1 - + arch/powerpc/boot/dts/lite5200.dts | 1 - + arch/powerpc/boot/dts/lite5200b.dts | 1 - + arch/powerpc/boot/dts/motionpro.dts | 1 - + arch/powerpc/boot/dts/mpc8315erdb.dts | 1 - + arch/powerpc/boot/dts/mpc8349emitx.dts | 1 - + arch/powerpc/boot/dts/mpc8349emitxgp.dts | 1 - + arch/powerpc/boot/dts/mpc8377_rdb.dts | 1 - + arch/powerpc/boot/dts/mpc8378_rdb.dts | 1 - + arch/powerpc/boot/dts/mpc8379_rdb.dts | 1 - + arch/powerpc/boot/dts/pcm030.dts | 2 - + arch/powerpc/boot/dts/tqm5200.dts | 1 - + arch/powerpc/boot/libfdt-wrapper.c | 2 +- + arch/powerpc/include/asm/atomic.h | 18 +- + arch/powerpc/include/asm/byteorder.h | 38 ++-- + arch/powerpc/include/asm/cputable.h | 6 +- + arch/powerpc/include/asm/dma-mapping.h | 36 +--- + arch/powerpc/include/asm/eeh.h | 8 +- + arch/powerpc/include/asm/local.h | 4 +- + arch/powerpc/include/asm/lppaca.h | 3 +- + arch/powerpc/include/asm/mutex.h | 135 +++++++++++++- + arch/powerpc/include/asm/pci-bridge.h | 4 +- + arch/powerpc/include/asm/pci.h | 11 +- + arch/powerpc/include/asm/ps3.h | 3 + + arch/powerpc/include/asm/ps3av.h | 4 - + arch/powerpc/include/asm/smp.h | 7 + + arch/powerpc/include/asm/spinlock.h | 2 +- + arch/powerpc/include/asm/synch.h | 4 + + arch/powerpc/include/asm/system.h | 24 ++- + arch/powerpc/include/asm/time.h | 20 -- + arch/powerpc/include/asm/vdso_datapage.h | 3 + + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/paca.c | 1 + + arch/powerpc/kernel/pci-common.c | 276 ++++++++++++++++++---------- + arch/powerpc/kernel/pci_32.c | 101 ++++------- + arch/powerpc/kernel/pci_64.c | 134 +++++++------- + arch/powerpc/kernel/prom_parse.c | 5 +- + arch/powerpc/kernel/rtas_pci.c | 48 ----- + arch/powerpc/kernel/smp-tbsync.c | 12 +- + arch/powerpc/kernel/smp.c | 59 ++++++ + arch/powerpc/kernel/time.c | 36 +---- + arch/powerpc/kernel/vdso32/gettimeofday.S | 208 +++++++++++++--------- + arch/powerpc/kernel/vdso64/gettimeofday.S | 141 ++++++++------- + arch/powerpc/lib/copyuser_64.S | 17 ++- + arch/powerpc/lib/dma-noncoherent.c | 1 - + arch/powerpc/lib/memcpy_64.S | 16 ++- + arch/powerpc/mm/fault.c | 12 +- + arch/powerpc/mm/hugetlbpage.c | 22 +- + arch/powerpc/platforms/cell/iommu.c | 5 +- + arch/powerpc/platforms/powermac/setup.c | 4 +- + arch/powerpc/platforms/ps3/device-init.c | 29 +++- + arch/powerpc/platforms/ps3/setup.c | 4 + + arch/powerpc/platforms/pseries/eeh.c | 44 +++-- + arch/powerpc/platforms/pseries/pci_dlpar.c | 163 ++++++++-------- + arch/powerpc/platforms/pseries/xics.c | 28 +++- + arch/powerpc/sysdev/mpic.c | 32 +--- + drivers/char/Kconfig | 6 + + drivers/char/Makefile | 1 + + drivers/char/hvc_udbg.c | 96 ++++++++++ + drivers/of/base.c | 35 ++++ + drivers/pci/hotplug/rpadlpar_core.c | 69 +++---- + drivers/ps3/ps3av.c | 20 -- + drivers/ps3/ps3av_cmd.c | 4 +- + drivers/serial/pmac_zilog.c | 27 +++ + drivers/video/ps3fb.c | 17 +-- + include/linux/of.h | 6 + + 67 files changed, 1189 insertions(+), 837 deletions(-) + create mode 100644 drivers/char/hvc_udbg.c +Merging 4xx/next +$ git merge 4xx/next +Auto-merged arch/powerpc/configs/ppc44x_defconfig +CONFLICT (content): Merge conflict in arch/powerpc/configs/ppc44x_defconfig +Resolved 'arch/powerpc/configs/ppc44x_defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit e4474f7: Merge commit '4xx/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/configs/ppc44x_defconfig | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) +Merging galak/next +$ git merge galak/next +Merge made by recursive. + arch/powerpc/Makefile | 1 - + arch/powerpc/include/asm/mmu-fsl-booke.h | 2 + + arch/powerpc/include/asm/processor.h | 6 + + arch/powerpc/include/asm/sfp-machine.h | 58 ++- + arch/powerpc/kernel/head_fsl_booke.S | 29 +- + arch/powerpc/kernel/traps.c | 62 +++- + arch/powerpc/math-emu/Makefile | 2 + + arch/powerpc/math-emu/fadd.c | 1 - + arch/powerpc/math-emu/fcmpo.c | 5 +- + arch/powerpc/math-emu/fdiv.c | 9 +- + arch/powerpc/math-emu/fdivs.c | 9 +- + arch/powerpc/math-emu/fmadd.c | 5 +- + arch/powerpc/math-emu/fmadds.c | 5 +- + arch/powerpc/math-emu/fmsub.c | 5 +- + arch/powerpc/math-emu/fmsubs.c | 5 +- + arch/powerpc/math-emu/fmul.c | 3 +- + arch/powerpc/math-emu/fmuls.c | 3 +- + arch/powerpc/math-emu/fnmadd.c | 5 +- + arch/powerpc/math-emu/fnmadds.c | 5 +- + arch/powerpc/math-emu/fnmsub.c | 5 +- + arch/powerpc/math-emu/fnmsubs.c | 5 +- + arch/powerpc/math-emu/fsqrt.c | 5 +- + arch/powerpc/math-emu/fsqrts.c | 5 +- + arch/powerpc/math-emu/fsub.c | 3 +- + arch/powerpc/math-emu/fsubs.c | 3 +- + arch/powerpc/math-emu/math_efp.c | 720 ++++++++++++++++++++++++++++++ + 26 files changed, 877 insertions(+), 89 deletions(-) + create mode 100644 arch/powerpc/math-emu/math_efp.c +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merged MAINTAINERS +Auto-merged arch/arm/mach-pxa/Kconfig +Auto-merged arch/arm/mach-pxa/mioa701.c +Auto-merged arch/arm/mach-pxa/pxa25x.c +Auto-merged arch/arm/mach-pxa/pxa27x.c +Auto-merged arch/arm/mach-pxa/pxa3xx.c +Auto-merged drivers/video/pxafb.c +Merge made by recursive. + MAINTAINERS | 2 +- + arch/arm/configs/h5000_defconfig | 996 +++++++++++++++++++++++++++ + arch/arm/mach-pxa/Kconfig | 14 + + arch/arm/mach-pxa/Makefile | 2 + + arch/arm/mach-pxa/cpufreq-pxa2xx.c | 32 +- + arch/arm/mach-pxa/devices.c | 27 +- + arch/arm/mach-pxa/devices.h | 1 + + arch/arm/mach-pxa/h5000.c | 200 ++++++ + arch/arm/mach-pxa/include/mach/h5000.h | 113 +++ + arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 6 + + arch/arm/mach-pxa/include/mach/mioa701.h | 9 +- + arch/arm/mach-pxa/include/mach/palmt5.h | 84 +++ + arch/arm/mach-pxa/mfp-pxa2xx.c | 31 +- + arch/arm/mach-pxa/mioa701.c | 199 +++---- + arch/arm/mach-pxa/palmt5.c | 497 +++++++++++++ + arch/arm/mach-pxa/pxa25x.c | 2 +- + arch/arm/mach-pxa/pxa27x.c | 1 + + arch/arm/mach-pxa/pxa3xx.c | 1 + + arch/arm/mach-pxa/tosa.c | 38 + + drivers/video/pxafb.c | 18 +- + drivers/video/pxafb.h | 3 + + 21 files changed, 2126 insertions(+), 150 deletions(-) + create mode 100644 arch/arm/configs/h5000_defconfig + create mode 100644 arch/arm/mach-pxa/h5000.c + create mode 100644 arch/arm/mach-pxa/include/mach/h5000.h + create mode 100644 arch/arm/mach-pxa/include/mach/palmt5.h + create mode 100644 arch/arm/mach-pxa/palmt5.c +Merging s390/features +$ git merge s390/features +Auto-merged drivers/char/Kconfig +Auto-merged drivers/char/Makefile +CONFLICT (content): Merge conflict in drivers/char/Makefile +Resolved 'drivers/char/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 1702ed2: Merge commit 's390/features' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 3 + + Documentation/kmsg/s390/hvc_iucv | 50 ++ + arch/powerpc/include/asm/elf.h | 2 +- + arch/powerpc/kernel/vdso.c | 3 +- + arch/s390/Kconfig | 23 +- + arch/s390/Makefile | 1 + + arch/s390/appldata/appldata.h | 4 - + arch/s390/appldata/appldata_base.c | 12 +- + arch/s390/appldata/appldata_os.c | 21 +- + arch/s390/crypto/aes_s390.c | 14 +- + arch/s390/hypfs/hypfs_diag.c | 10 +- + arch/s390/hypfs/inode.c | 14 +- + arch/s390/include/asm/auxvec.h | 2 + + arch/s390/include/asm/bug.h | 5 +- + arch/s390/include/asm/elf.h | 16 + + arch/s390/include/asm/fcx.h | 4 +- + arch/s390/include/asm/ftrace.h | 8 + + arch/s390/include/asm/isc.h | 1 + + arch/s390/include/asm/mmu.h | 1 + + arch/s390/include/asm/page.h | 2 + + arch/s390/include/asm/processor.h | 4 +- + arch/s390/include/asm/ptrace.h | 2 +- + arch/s390/include/asm/qdio.h | 16 +- + arch/s390/include/asm/sigp.h | 1 + + arch/s390/include/asm/smp.h | 5 +- + arch/s390/include/asm/syscall.h | 28 +- + arch/s390/include/asm/sysinfo.h | 11 + + arch/s390/include/asm/system.h | 20 +- + arch/s390/include/asm/vdso.h | 39 ++ + arch/s390/kernel/Makefile | 17 +- + arch/s390/kernel/asm-offsets.c | 17 +- + arch/s390/kernel/compat_signal.c | 2 +- + arch/s390/kernel/cpcmd.c | 7 +- + arch/s390/kernel/debug.c | 37 +- + arch/s390/kernel/entry.S | 21 +- + arch/s390/kernel/entry64.S | 23 +- + arch/s390/kernel/head.S | 49 ++ + arch/s390/kernel/head31.S | 27 +- + arch/s390/kernel/head64.S | 23 - + arch/s390/kernel/mcount.S | 48 ++ + arch/s390/kernel/processor.c | 98 ++++ + arch/s390/kernel/ptrace.c | 12 +- + arch/s390/kernel/s390_ksyms.c | 5 + + arch/s390/kernel/setup.c | 177 ++----- + arch/s390/kernel/signal.c | 6 +- + arch/s390/kernel/smp.c | 192 +------ + arch/s390/kernel/time.c | 270 ++++++---- + arch/s390/kernel/topology.c | 5 +- + arch/s390/kernel/vdso.c | 232 ++++++++ + arch/s390/kernel/vdso32/Makefile | 55 ++ + arch/s390/kernel/vdso32/clock_getres.S | 39 ++ + arch/s390/kernel/vdso32/clock_gettime.S | 128 +++++ + arch/s390/kernel/vdso32/gettimeofday.S | 82 +++ + arch/s390/kernel/vdso32/note.S | 12 + + arch/s390/kernel/vdso32/vdso32.lds.S | 138 +++++ + arch/s390/kernel/vdso32/vdso32_wrapper.S | 13 + + arch/s390/kernel/vdso64/Makefile | 55 ++ + arch/s390/kernel/vdso64/clock_getres.S | 39 ++ + arch/s390/kernel/vdso64/clock_gettime.S | 89 ++++ + arch/s390/kernel/vdso64/gettimeofday.S | 56 ++ + arch/s390/kernel/vdso64/note.S | 12 + + arch/s390/kernel/vdso64/vdso64.lds.S | 138 +++++ + arch/s390/kernel/vdso64/vdso64_wrapper.S | 13 + + arch/s390/mm/extmem.c | 106 ++--- + arch/sh/include/asm/elf.h | 2 +- + arch/sh/kernel/vsyscall/vsyscall.c | 3 +- + arch/x86/include/asm/elf.h | 2 +- + arch/x86/vdso/vdso32-setup.c | 2 +- + arch/x86/vdso/vma.c | 2 +- + drivers/char/Kconfig | 10 + + drivers/char/Makefile | 1 + + drivers/char/hvc_iucv.c | 850 ++++++++++++++++++++++++++++++ + drivers/s390/block/dasd_devmap.c | 19 +- + drivers/s390/block/dasd_proc.c | 28 +- + drivers/s390/block/dcssblk.c | 77 ++-- + drivers/s390/block/xpram.c | 41 +- + drivers/s390/char/monreader.c | 41 +- + drivers/s390/char/monwriter.c | 5 +- + drivers/s390/char/sclp_cmd.c | 29 +- + drivers/s390/char/sclp_config.c | 10 +- + drivers/s390/char/sclp_cpi_sys.c | 12 +- + drivers/s390/char/sclp_sdias.c | 18 +- + drivers/s390/char/sclp_vt220.c | 33 +- + drivers/s390/char/tape.h | 2 - + drivers/s390/char/tape_34xx.c | 155 +++---- + drivers/s390/char/tape_3590.c | 360 ++++++------- + drivers/s390/char/tape_block.c | 17 +- + drivers/s390/char/tape_char.c | 7 - + drivers/s390/char/tape_core.c | 60 +-- + drivers/s390/char/tape_proc.c | 3 - + drivers/s390/char/tape_std.c | 21 +- + drivers/s390/char/vmcp.c | 11 +- + drivers/s390/char/vmlogrdr.c | 26 +- + drivers/s390/char/vmur.c | 15 +- + drivers/s390/char/zcore.c | 14 +- + drivers/s390/cio/blacklist.c | 14 +- + drivers/s390/cio/ccwgroup.c | 8 +- + drivers/s390/cio/chsc.c | 8 +- + drivers/s390/cio/cio.c | 80 ++-- + drivers/s390/cio/cmf.c | 8 +- + drivers/s390/cio/css.c | 8 +- + drivers/s390/cio/device.c | 2 +- + drivers/s390/cio/qdio.h | 6 + + drivers/s390/cio/qdio_debug.c | 97 ++-- + drivers/s390/cio/qdio_debug.h | 112 ++--- + drivers/s390/cio/qdio_main.c | 355 ++++--------- + drivers/s390/cio/qdio_perf.c | 6 + + drivers/s390/cio/qdio_perf.h | 4 + + drivers/s390/cio/qdio_setup.c | 143 +++--- + drivers/s390/cio/qdio_thinint.c | 27 +- + drivers/s390/crypto/ap_bus.c | 212 +++++++- + drivers/s390/crypto/ap_bus.h | 6 +- + drivers/s390/net/ctcm_fsms.c | 46 +- + drivers/s390/net/ctcm_main.c | 72 ++- + drivers/s390/net/ctcm_main.h | 6 - + drivers/s390/net/ctcm_mpc.c | 15 +- + drivers/s390/net/ctcm_sysfs.c | 3 + + drivers/s390/net/lcs.c | 92 ++-- + drivers/s390/net/netiucv.c | 64 ++- + drivers/s390/net/qeth_core.h | 9 +- + drivers/s390/net/qeth_core_main.c | 175 ++++--- + drivers/s390/net/qeth_l2_main.c | 37 +- + drivers/s390/net/qeth_l3_main.c | 211 ++++---- + drivers/s390/scsi/zfcp_aux.c | 28 +- + drivers/s390/scsi/zfcp_ccw.c | 3 + + drivers/s390/scsi/zfcp_cfdc.c | 3 + + drivers/s390/scsi/zfcp_dbf.c | 3 + + drivers/s390/scsi/zfcp_def.h | 2 + + drivers/s390/scsi/zfcp_erp.c | 8 +- + drivers/s390/scsi/zfcp_fc.c | 3 + + drivers/s390/scsi/zfcp_fsf.c | 3 + + drivers/s390/scsi/zfcp_qdio.c | 3 + + drivers/s390/scsi/zfcp_scsi.c | 3 + + drivers/s390/scsi/zfcp_sysfs.c | 3 + + drivers/s390/sysinfo.c | 127 +++++- + fs/binfmt_elf.c | 2 +- + include/asm-generic/memory_model.h | 2 +- + include/net/iucv/iucv.h | 45 ++ + net/iucv/af_iucv.c | 19 +- + net/iucv/iucv.c | 161 +++++-- + 140 files changed, 4588 insertions(+), 2097 deletions(-) + create mode 100644 Documentation/kmsg/s390/hvc_iucv + create mode 100644 arch/s390/include/asm/ftrace.h + create mode 100644 arch/s390/include/asm/vdso.h + create mode 100644 arch/s390/kernel/mcount.S + create mode 100644 arch/s390/kernel/processor.c + create mode 100644 arch/s390/kernel/vdso.c + create mode 100644 arch/s390/kernel/vdso32/Makefile + create mode 100644 arch/s390/kernel/vdso32/clock_getres.S + create mode 100644 arch/s390/kernel/vdso32/clock_gettime.S + create mode 100644 arch/s390/kernel/vdso32/gettimeofday.S + create mode 100644 arch/s390/kernel/vdso32/note.S + create mode 100644 arch/s390/kernel/vdso32/vdso32.lds.S + create mode 100644 arch/s390/kernel/vdso32/vdso32_wrapper.S + create mode 100644 arch/s390/kernel/vdso64/Makefile + create mode 100644 arch/s390/kernel/vdso64/clock_getres.S + create mode 100644 arch/s390/kernel/vdso64/clock_gettime.S + create mode 100644 arch/s390/kernel/vdso64/gettimeofday.S + create mode 100644 arch/s390/kernel/vdso64/note.S + create mode 100644 arch/s390/kernel/vdso64/vdso64.lds.S + create mode 100644 arch/s390/kernel/vdso64/vdso64_wrapper.S + create mode 100644 drivers/char/hvc_iucv.c +Merging sh/master +$ git merge sh/master +Removed arch/sh/include/asm/bitops-irq.h +Auto-merged drivers/video/Kconfig +Merge made by recursive. + arch/sh/Kconfig | 4 +- + arch/sh/Makefile | 32 +- + arch/sh/boards/board-ap325rxa.c | 3 +- + arch/sh/boards/mach-migor/setup.c | 5 +- + arch/sh/boards/mach-se/7722/setup.c | 3 +- + arch/sh/drivers/dma/dma-sh.c | 3 +- + arch/sh/drivers/dma/dma-sh.h | 1 + + arch/sh/include/asm/addrspace.h | 11 + + arch/sh/include/asm/bitops-grb.h | 3 + + arch/sh/include/asm/bitops-irq.h | 91 ---- + arch/sh/include/asm/bitops-llsc.h | 2 + + arch/sh/include/asm/bitops-op32.h | 142 ++++++ + arch/sh/include/asm/bitops.h | 9 +- + arch/sh/include/asm/ftrace.h | 21 + + arch/sh/include/asm/io.h | 4 + + arch/sh/include/asm/mutex-llsc.h | 107 +++++ + arch/sh/include/asm/mutex.h | 5 +- + arch/sh/include/asm/unaligned-sh4a.h | 258 +++++++++++ + arch/sh/include/asm/unaligned.h | 7 +- + arch/sh/include/cpu-sh3/cpu/gpio.h | 14 + + arch/sh/include/mach-se/mach/se.h | 18 + + arch/sh/kernel/Makefile_32 | 6 + + arch/sh/kernel/cpu/clock.c | 10 + + arch/sh/kernel/cpu/init.c | 2 + + arch/sh/kernel/cpu/sh4/softfloat.c | 73 ++-- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 308 +++++++++---- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 18 +- + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 19 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 19 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 19 +- + arch/sh/kernel/entry-common.S | 44 -- + arch/sh/kernel/ftrace.c | 109 +++++ + arch/sh/kernel/sh_ksyms_32.c | 37 +-- + arch/sh/kernel/sys_sh.c | 92 ---- + arch/sh/lib/Makefile | 15 +- + arch/sh/lib/ashiftrt.S | 149 ++++++ + arch/sh/lib/ashldi3.c | 29 ++ + arch/sh/lib/ashlsi3.S | 193 ++++++++ + arch/sh/lib/ashrdi3.c | 31 ++ + arch/sh/lib/ashrsi3.S | 185 ++++++++ + arch/sh/lib/libgcc.h | 26 ++ + arch/sh/lib/lshrdi3.c | 29 ++ + arch/sh/lib/lshrsi3.S | 193 ++++++++ + arch/sh/lib/mcount.S | 90 ++++ + arch/sh/lib/movmem.S | 238 ++++++++++ + arch/sh/lib/udiv_qrnnd.S | 81 ++++ + arch/sh/lib/udivsi3-Os.S | 151 +++++++ + arch/sh/lib/udivsi3.S | 668 ++++++++++++++++++++++++++++ + arch/sh/mm/fault_32.c | 11 - + arch/sh/mm/ioremap_32.c | 3 +- + arch/sh/mm/mmap.c | 94 ++++ + drivers/i2c/busses/i2c-sh_mobile.c | 73 ++-- + drivers/input/keyboard/sh_keysc.c | 28 +- + drivers/media/video/Kconfig | 2 +- + drivers/media/video/sh_mobile_ceu_camera.c | 20 +- + drivers/serial/sh-sci.c | 130 +++--- + drivers/usb/gadget/m66592-udc.c | 34 +- + drivers/usb/gadget/m66592-udc.h | 27 +- + drivers/usb/host/r8a66597-hcd.c | 34 ++- + drivers/usb/host/r8a66597.h | 8 +- + drivers/video/Kconfig | 24 +- + drivers/video/sh7760fb.c | 94 +--- + drivers/video/sh_mobile_lcdcfb.c | 46 ++- + scripts/recordmcount.pl | 11 + + 64 files changed, 3511 insertions(+), 705 deletions(-) + delete mode 100644 arch/sh/include/asm/bitops-irq.h + create mode 100644 arch/sh/include/asm/bitops-op32.h + create mode 100644 arch/sh/include/asm/mutex-llsc.h + create mode 100644 arch/sh/include/asm/unaligned-sh4a.h + create mode 100644 arch/sh/kernel/ftrace.c + create mode 100644 arch/sh/lib/ashiftrt.S + create mode 100644 arch/sh/lib/ashldi3.c + create mode 100644 arch/sh/lib/ashlsi3.S + create mode 100644 arch/sh/lib/ashrdi3.c + create mode 100644 arch/sh/lib/ashrsi3.S + create mode 100644 arch/sh/lib/libgcc.h + create mode 100644 arch/sh/lib/lshrdi3.c + create mode 100644 arch/sh/lib/lshrsi3.S + create mode 100644 arch/sh/lib/mcount.S + create mode 100644 arch/sh/lib/movmem.S + create mode 100644 arch/sh/lib/udiv_qrnnd.S + create mode 100644 arch/sh/lib/udivsi3-Os.S + create mode 100644 arch/sh/lib/udivsi3.S +Merging sparc/master +$ git merge sparc/master +Removed arch/sparc/math-emu/ashldi3.S +Removed arch/sparc64/Kconfig.debug +Removed arch/sparc64/math-emu/Makefile +Removed arch/sparc64/mm/Makefile +Removed arch/sparc64/oprofile/Makefile +Removed arch/sparc64/oprofile/init.c +Merge made by recursive. + arch/sparc/Kconfig | 503 +++++++++++++++----- + arch/sparc/Kconfig.debug | 26 + + arch/sparc/Makefile | 7 +- + arch/sparc/include/asm/atomic_64.h | 7 - + arch/sparc/include/asm/bitops_64.h | 5 - + arch/sparc/include/asm/irq_64.h | 3 + + arch/sparc/include/asm/spinlock_64.h | 31 +- + arch/sparc/include/asm/system_64.h | 35 +- + arch/sparc/include/asm/tsb.h | 6 - + arch/sparc/math-emu/Makefile | 6 +- + arch/sparc/math-emu/ashldi3.S | 36 -- + arch/sparc/math-emu/{math.c => math_32.c} | 2 +- + .../math-emu/math.c => sparc/math-emu/math_64.c} | 2 +- + arch/sparc/math-emu/{sfp-util.h => sfp-util_32.h} | 0 + .../sfp-util.h => sparc/math-emu/sfp-util_64.h} | 0 + arch/sparc/mm/Makefile | 24 +- + arch/sparc/mm/{fault.c => fault_32.c} | 0 + arch/{sparc64/mm/fault.c => sparc/mm/fault_64.c} | 0 + arch/sparc/mm/{generic.c => generic_32.c} | 0 + .../mm/generic.c => sparc/mm/generic_64.c} | 0 + arch/{sparc64 => sparc}/mm/hugetlbpage.c | 0 + arch/sparc/mm/{init.c => init_32.c} | 0 + arch/{sparc64/mm/init.c => sparc/mm/init_64.c} | 4 +- + arch/{sparc64/mm/init.h => sparc/mm/init_64.h} | 0 + arch/{sparc64 => sparc}/mm/tlb.c | 0 + arch/{sparc64 => sparc}/mm/tsb.c | 25 +- + arch/{sparc64 => sparc}/mm/ultra.S | 2 - + arch/sparc64/Kconfig | 434 +----------------- + arch/sparc64/Kconfig.debug | 44 -- + arch/sparc64/Makefile | 10 +- + arch/sparc64/kernel/auxio.c | 70 +-- + arch/sparc64/kernel/etrap.S | 6 +- + arch/sparc64/kernel/irq.c | 63 +++ + arch/sparc64/kernel/rtrap.S | 6 +- + arch/sparc64/kernel/smp.c | 11 +- + arch/sparc64/kernel/trampoline.S | 4 - + arch/sparc64/kernel/traps.c | 1 - + arch/sparc64/kernel/tsb.S | 6 +- + arch/sparc64/kernel/ttable.S | 2 +- + arch/sparc64/lib/atomic.S | 26 - + arch/sparc64/lib/bitops.S | 24 - + arch/sparc64/lib/rwsem.S | 7 - + arch/sparc64/math-emu/Makefile | 7 - + arch/sparc64/mm/Makefile | 9 - + arch/sparc64/oprofile/Makefile | 9 - + arch/sparc64/oprofile/init.c | 23 - + include/linux/of_platform.h | 3 +- + kernel/sysctl.c | 14 + + 48 files changed, 582 insertions(+), 921 deletions(-) + delete mode 100644 arch/sparc/math-emu/ashldi3.S + rename arch/sparc/math-emu/{math.c => math_32.c} (99%) + rename arch/{sparc64/math-emu/math.c => sparc/math-emu/math_64.c} (99%) + rename arch/sparc/math-emu/{sfp-util.h => sfp-util_32.h} (100%) + rename arch/{sparc64/math-emu/sfp-util.h => sparc/math-emu/sfp-util_64.h} (100%) + rename arch/sparc/mm/{fault.c => fault_32.c} (100%) + rename arch/{sparc64/mm/fault.c => sparc/mm/fault_64.c} (100%) + rename arch/sparc/mm/{generic.c => generic_32.c} (100%) + rename arch/{sparc64/mm/generic.c => sparc/mm/generic_64.c} (100%) + rename arch/{sparc64 => sparc}/mm/hugetlbpage.c (100%) + rename arch/sparc/mm/{init.c => init_32.c} (100%) + rename arch/{sparc64/mm/init.c => sparc/mm/init_64.c} (99%) + rename arch/{sparc64/mm/init.h => sparc/mm/init_64.h} (100%) + rename arch/{sparc64 => sparc}/mm/tlb.c (100%) + rename arch/{sparc64 => sparc}/mm/tsb.c (97%) + rename arch/{sparc64 => sparc}/mm/ultra.S (99%) + delete mode 100644 arch/sparc64/Kconfig.debug + delete mode 100644 arch/sparc64/math-emu/Makefile + delete mode 100644 arch/sparc64/mm/Makefile + delete mode 100644 arch/sparc64/oprofile/Makefile + delete mode 100644 arch/sparc64/oprofile/init.c +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/pci/quirks.c +Merge made by recursive. + Documentation/filesystems/proc.txt | 9 +- + Documentation/kernel-parameters.txt | 33 +- + Documentation/nmi_watchdog.txt | 5 + + Documentation/x86/boot.txt | 2 +- + Documentation/x86/x86_64/boot-options.txt | 11 - + Documentation/x86/x86_64/mm.txt | 2 +- + arch/x86/Kconfig | 71 +- + arch/x86/Kconfig.debug | 20 +- + arch/x86/boot/tty.c | 2 +- + arch/x86/boot/video-vga.c | 4 +- + arch/x86/boot/video.c | 2 +- + arch/x86/ia32/ia32_signal.c | 68 +- + arch/x86/include/asm/apic.h | 1 + + arch/x86/include/asm/bigsmp/apic.h | 2 - + arch/x86/include/asm/bitops.h | 10 +- + arch/x86/include/asm/byteorder.h | 74 +- + arch/x86/include/asm/cpufeature.h | 4 +- + arch/x86/include/asm/dwarf2.h | 97 ++- + arch/x86/include/asm/emergency-restart.h | 4 +- + arch/x86/include/asm/es7000/apic.h | 79 +- + arch/x86/include/asm/es7000/wakecpu.h | 41 +- + arch/x86/include/asm/genapic_32.h | 19 +- + arch/x86/include/asm/genapic_64.h | 2 + + arch/x86/include/asm/hw_irq.h | 4 +- + arch/x86/include/asm/hypervisor.h | 26 + + arch/x86/include/asm/io_apic.h | 10 + + arch/x86/include/asm/irq.h | 4 - + arch/x86/include/asm/irq_regs_32.h | 2 + + arch/x86/include/asm/kexec.h | 31 +- + arch/x86/include/asm/linkage.h | 60 ++ + arch/x86/include/asm/mach-default/mach_apic.h | 2 + + arch/x86/include/asm/mach-default/mach_wakecpu.h | 24 +- + arch/x86/include/asm/mach-default/smpboot_hooks.h | 8 +- + arch/x86/include/asm/mach-generic/mach_apic.h | 1 + + arch/x86/include/asm/mach-generic/mach_wakecpu.h | 12 + + arch/x86/include/asm/msr.h | 8 +- + arch/x86/include/asm/numaq/wakecpu.h | 24 +- + arch/x86/include/asm/pci.h | 2 + + arch/x86/include/asm/pci_64.h | 14 - + arch/x86/include/asm/processor.h | 4 + + arch/x86/include/asm/reboot.h | 5 + + arch/x86/include/asm/setup.h | 7 + + arch/x86/include/asm/system.h | 2 + + arch/x86/include/asm/tsc.h | 8 +- + arch/x86/include/asm/uv/bios.h | 34 +- + arch/x86/include/asm/uv/uv_hub.h | 87 ++- + arch/x86/include/asm/vmware.h | 27 + + arch/x86/kernel/Makefile | 5 +- + arch/x86/kernel/apic.c | 121 +-- + arch/x86/kernel/bios_uv.c | 60 +- + arch/x86/kernel/check.c | 161 +++ + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/cpu/common.c | 2 + + arch/x86/kernel/cpu/hypervisor.c | 58 ++ + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/mtrr/main.c | 346 ++++---- + arch/x86/kernel/cpu/vmware.c | 112 ++ + arch/x86/kernel/crash.c | 70 +-- + arch/x86/kernel/ds.c | 9 +- + arch/x86/kernel/dumpstack.c | 319 ++++++ + arch/x86/kernel/dumpstack.h | 39 + + arch/x86/kernel/dumpstack_32.c | 302 +------ + arch/x86/kernel/dumpstack_64.c | 282 +----- + arch/x86/kernel/entry_32.S | 39 +- + arch/x86/kernel/entry_64.S | 1121 +++++++++++---------- + arch/x86/kernel/es7000_32.c | 62 +- + arch/x86/kernel/genapic_64.c | 4 + + arch/x86/kernel/genx2apic_uv_x.c | 108 ++- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/kernel/i387.c | 2 +- + arch/x86/kernel/io_apic.c | 22 +- + arch/x86/kernel/irq_64.c | 24 +- + arch/x86/kernel/irqinit_32.c | 2 +- + arch/x86/kernel/irqinit_64.c | 66 -- + arch/x86/kernel/machine_kexec_32.c | 104 ++- + arch/x86/kernel/nmi.c | 58 +- + arch/x86/kernel/numaq_32.c | 10 +- + arch/x86/kernel/process.c | 16 + + arch/x86/kernel/ptrace.c | 9 +- + arch/x86/kernel/reboot.c | 126 +++- + arch/x86/kernel/relocate_kernel_32.S | 115 --- + arch/x86/kernel/setup.c | 167 +--- + arch/x86/kernel/signal_32.c | 161 +++- + arch/x86/kernel/signal_64.c | 138 ++- + arch/x86/kernel/smp.c | 13 - + arch/x86/kernel/smpboot.c | 17 +- + arch/x86/kernel/time_64.c | 2 + + arch/x86/kernel/tlb_uv.c | 4 - + arch/x86/kernel/tsc.c | 42 +- + arch/x86/kernel/tsc_sync.c | 8 +- + arch/x86/kernel/vsyscall_64.c | 9 + + arch/x86/kernel/xsave.c | 2 +- + arch/x86/lguest/boot.c | 3 +- + arch/x86/mach-generic/bigsmp.c | 1 + + arch/x86/mach-generic/default.c | 1 + + arch/x86/mach-generic/es7000.c | 14 +- + arch/x86/mach-generic/probe.c | 16 +- + arch/x86/mach-generic/summit.c | 1 + + arch/x86/mm/fault.c | 11 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 2 - + arch/x86/oprofile/op_model_ppro.c | 2 +- + arch/x86/pci/common.c | 17 + + arch/x86/pci/direct.c | 4 +- + arch/x86/pci/pci.h | 1 + + arch/x86/xen/mmu.c | 21 +- + drivers/acpi/pci_irq.c | 56 + + drivers/firmware/dmi_scan.c | 11 + + drivers/misc/sgi-gru/gruprocfs.c | 1 - + drivers/misc/sgi-xp/xp.h | 7 +- + drivers/misc/sgi-xp/xp_main.c | 7 + + drivers/misc/sgi-xp/xp_sn2.c | 34 + + drivers/misc/sgi-xp/xp_uv.c | 70 ++- + drivers/misc/sgi-xp/xpc.h | 12 + + drivers/misc/sgi-xp/xpc_sn2.c | 15 +- + drivers/misc/sgi-xp/xpc_uv.c | 290 +++++- + drivers/pci/quirks.c | 170 +++- + include/linux/dmi.h | 2 + + include/linux/kexec.h | 4 + + include/linux/pci.h | 6 + + include/linux/pci_ids.h | 5 + + 121 files changed, 3701 insertions(+), 2398 deletions(-) + create mode 100644 arch/x86/include/asm/hypervisor.h + create mode 100644 arch/x86/include/asm/mach-generic/mach_wakecpu.h + create mode 100644 arch/x86/include/asm/vmware.h + create mode 100644 arch/x86/kernel/check.c + create mode 100644 arch/x86/kernel/cpu/hypervisor.c + create mode 100644 arch/x86/kernel/cpu/vmware.c + create mode 100644 arch/x86/kernel/dumpstack.c + create mode 100644 arch/x86/kernel/dumpstack.h +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. + arch/xtensa/Makefile | 28 +-- + arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- + arch/xtensa/boot/boot-redboot/bootstrap.S | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/Kbuild | 0 + .../xtensa/include/asm}/asmmacro.h | 2 +- + .../xtensa/include/asm}/atomic.h | 0 + .../xtensa/include/asm}/auxvec.h | 0 + .../xtensa/include/asm}/bitops.h | 0 + .../xtensa/include/asm}/bootparam.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bug.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bugs.h | 0 + .../xtensa/include/asm}/byteorder.h | 32 ++-- + .../asm-xtensa => arch/xtensa/include/asm}/cache.h | 2 +- + .../xtensa/include/asm}/cacheasm.h | 0 + .../xtensa/include/asm}/cacheflush.h | 0 + .../xtensa/include/asm}/checksum.h | 2 +- + .../xtensa/include/asm}/coprocessor.h | 4 +- + .../xtensa/include/asm}/cpumask.h | 0 + .../xtensa/include/asm}/cputime.h | 0 + .../xtensa/include/asm}/current.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/delay.h | 0 + .../xtensa/include/asm}/device.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/div64.h | 0 + .../xtensa/include/asm}/dma-mapping.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/dma.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/elf.h | 0 + .../xtensa/include/asm}/emergency-restart.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/errno.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fb.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fcntl.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/futex.h | 0 + .../xtensa/include/asm}/hardirq.h | 0 + .../xtensa/include/asm}/highmem.h | 0 + .../xtensa/include/asm}/hw_irq.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/io.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/ioctl.h | 0 + .../xtensa/include/asm}/ioctls.h | 0 + .../xtensa/include/asm}/ipcbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/irq.h | 4 +- + .../xtensa/include/asm}/irq_regs.h | 0 + .../xtensa/include/asm}/kdebug.h | 0 + .../xtensa/include/asm}/kmap_types.h | 0 + .../xtensa/include/asm}/linkage.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/local.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mman.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mmu.h | 0 + .../xtensa/include/asm}/mmu_context.h | 0 + .../xtensa/include/asm}/module.h | 0 + .../xtensa/include/asm}/msgbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mutex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/page.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/param.h | 0 + .../xtensa/include/asm}/pci-bridge.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/pci.h | 0 + .../xtensa/include/asm}/percpu.h | 0 + .../xtensa/include/asm}/pgalloc.h | 0 + .../xtensa/include/asm}/pgtable.h | 0 + .../xtensa/include/asm}/platform.h | 2 - + .../asm-xtensa => arch/xtensa/include/asm}/poll.h | 0 + .../xtensa/include/asm}/posix_types.h | 0 + .../xtensa/include/asm}/processor.h | 2 +- + .../xtensa/include/asm}/ptrace.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/regs.h | 0 + .../xtensa/include/asm}/resource.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rmap.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rwsem.h | 0 + .../xtensa/include/asm}/scatterlist.h | 0 + .../xtensa/include/asm}/sections.h | 0 + .../xtensa/include/asm}/segment.h | 0 + .../xtensa/include/asm}/sembuf.h | 0 + .../xtensa/include/asm}/serial.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/setup.h | 0 + .../xtensa/include/asm}/shmbuf.h | 0 + .../xtensa/include/asm}/shmparam.h | 0 + .../xtensa/include/asm}/sigcontext.h | 0 + .../xtensa/include/asm}/siginfo.h | 0 + .../xtensa/include/asm}/signal.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/smp.h | 0 + .../xtensa/include/asm}/socket.h | 0 + .../xtensa/include/asm}/sockios.h | 0 + .../xtensa/include/asm}/spinlock.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/stat.h | 0 + .../xtensa/include/asm}/statfs.h | 0 + .../xtensa/include/asm}/string.h | 0 + .../xtensa/include/asm}/syscall.h | 0 + .../xtensa/include/asm}/system.h | 0 + .../xtensa/include/asm}/termbits.h | 0 + .../xtensa/include/asm}/termios.h | 0 + .../xtensa/include/asm}/thread_info.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/timex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/tlb.h | 0 + .../xtensa/include/asm}/tlbflush.h | 0 + .../xtensa/include/asm}/topology.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/types.h | 0 + .../xtensa/include/asm}/uaccess.h | 0 + .../xtensa/include/asm}/ucontext.h | 0 + .../xtensa/include/asm}/unaligned.h | 12 +- + .../xtensa/include/asm}/unistd.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/user.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/vga.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/xor.h | 0 + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/lib/checksum.S | 2 +- + arch/xtensa/lib/memcopy.S | 2 +- + arch/xtensa/lib/memset.S | 2 +- + arch/xtensa/lib/strncpy_user.S | 2 +- + arch/xtensa/lib/strnlen_user.S | 2 +- + arch/xtensa/lib/usercopy.S | 2 +- + arch/xtensa/platforms/iss/console.c | 2 +- + .../platforms/iss/include/platform}/hardware.h | 0 + .../platforms/iss/include/platform}/simcall.h | 0 + arch/xtensa/platforms/iss/io.c | 2 +- + arch/xtensa/platforms/iss/network.c | 2 +- + arch/xtensa/platforms/xt2000/Makefile | 5 + + .../platforms/xt2000/include/platform/hardware.h | 55 ++++++ + .../platforms/xt2000/include/platform/serial.h | 28 +++ + arch/xtensa/platforms/xt2000/setup.c | 181 ++++++++++++++++++++ + .../xtensa/variants/dc232b/include/variant}/core.h | 0 + .../variants/dc232b/include/variant}/tie-asm.h | 0 + .../xtensa/variants/dc232b/include/variant}/tie.h | 0 + .../xtensa/variants/fsf/include/variant}/core.h | 0 + .../xtensa/variants/fsf/include/variant}/tie-asm.h | 0 + .../xtensa/variants/fsf/include/variant}/tie.h | 0 + 124 files changed, 322 insertions(+), 67 deletions(-) + rename {include/asm-xtensa => arch/xtensa/include/asm}/Kbuild (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/asmmacro.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/atomic.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/auxvec.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bitops.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bootparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bugs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/byteorder.h (82%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cache.h (96%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheasm.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/checksum.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/coprocessor.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cpumask.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cputime.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/current.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/delay.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/device.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/div64.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma-mapping.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/elf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/emergency-restart.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/errno.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fcntl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/futex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hardirq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/highmem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hw_irq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/io.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctls.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ipcbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq.h (89%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq_regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kdebug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kmap_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/linkage.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/local.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mman.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu_context.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/module.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/msgbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mutex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/page.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/param.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci-bridge.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/percpu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgalloc.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgtable.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/platform.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/poll.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/posix_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/processor.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ptrace.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/resource.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rmap.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rwsem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/scatterlist.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sections.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/segment.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sembuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/serial.h (92%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/setup.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sigcontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/siginfo.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/signal.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/smp.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/socket.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sockios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/spinlock.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/stat.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/statfs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/string.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/syscall.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/system.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termbits.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/thread_info.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/timex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlbflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/topology.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/uaccess.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ucontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unaligned.h (80%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unistd.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/user.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/vga.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/xor.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/hardware.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/simcall.h (100%) + create mode 100644 arch/xtensa/platforms/xt2000/Makefile + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xt2000/setup.c + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie.h (100%) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged arch/arm/mach-integrator/core.c +Auto-merged arch/arm/mach-integrator/integrator_cp.c +Auto-merged arch/arm/mach-realview/core.h +Auto-merged arch/arm/plat-omap/include/mach/memory.h +Auto-merged drivers/misc/sgi-xp/xp_main.c +Auto-merged drivers/mtd/maps/ixp2000.c +Auto-merged drivers/mtd/maps/ixp4xx.c +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Auto-merged drivers/usb/gadget/pxa27x_udc.c +Auto-merged include/linux/pci.h +Merge made by recursive. + arch/arm/kernel/ecard.c | 2 +- + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 6 +- + arch/arm/mach-integrator/core.c | 10 +- + arch/arm/mach-integrator/integrator_cp.c | 6 +- + arch/arm/mach-lh7a40x/clcd.c | 2 +- + arch/arm/mach-netx/fb.c | 2 +- + arch/arm/mach-realview/core.h | 2 +- + arch/arm/mach-versatile/core.h | 2 +- + arch/arm/plat-omap/include/mach/memory.h | 2 +- + arch/avr32/mach-at32ap/clock.c | 4 +- + arch/cris/arch-v32/drivers/iop_fw_load.c | 6 +- + arch/ia64/kernel/pci-dma.c | 2 +- + arch/ia64/sn/kernel/tiocx.c | 3 +- + arch/mips/kernel/vpe.c | 2 +- + arch/parisc/include/asm/parisc-device.h | 4 +- + arch/parisc/kernel/drivers.c | 6 +- + arch/powerpc/kernel/ibmebus.c | 2 +- + arch/powerpc/kernel/of_device.c | 18 ++--- + arch/powerpc/kernel/vio.c | 12 ++-- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 6 +- + arch/powerpc/platforms/ps3/system-bus.c | 28 +++---- + block/bsg.c | 6 +- + block/genhd.c | 2 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/base/attribute_container.c | 2 +- + drivers/base/bus.c | 12 ++-- + drivers/base/core.c | 36 ++++---- + drivers/base/dd.c | 12 ++-- + drivers/base/firmware_class.c | 8 +-- + drivers/base/isa.c | 7 +- + drivers/base/platform.c | 130 +++++++++++++++-------------- + drivers/base/power/main.c | 21 +++-- + drivers/base/power/trace.c | 4 +- + drivers/char/mwave/mwavedd.c | 2 +- + drivers/firmware/dmi-id.c | 2 +- + drivers/gpio/gpiolib.c | 2 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/lm75.c | 2 +- + drivers/idle/i7300_idle.c | 2 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/core/ucm.c | 3 +- + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + drivers/isdn/mISDN/dsp_pipeline.c | 2 +- + drivers/macintosh/macio_asic.c | 24 +++--- + drivers/memstick/core/memstick.c | 5 +- + drivers/memstick/core/mspro_block.c | 14 ++-- + drivers/memstick/host/tifm_ms.c | 4 +- + drivers/message/i2o/device.c | 8 +- + drivers/message/i2o/i2o_proc.c | 2 +- + drivers/message/i2o/iop.c | 2 +- + drivers/misc/enclosure.c | 8 +- + drivers/misc/sgi-gru/grumain.c | 2 +- + drivers/misc/sgi-xp/xp_main.c | 2 +- + drivers/misc/sgi-xp/xpc_main.c | 8 +- + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/misc/tifm_7xx1.c | 2 +- + drivers/misc/tifm_core.c | 7 +- + drivers/mtd/devices/m25p80.c | 16 ++-- + drivers/mtd/devices/mtd_dataflash.c | 30 ++++---- + drivers/mtd/maps/integrator-flash.c | 2 +- + drivers/mtd/maps/ixp2000.c | 4 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/maps/omap_nor.c | 2 +- + drivers/mtd/maps/physmap.c | 6 +- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/nand/fsl_upm.c | 2 +- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/mtd/onenand/generic.c | 2 +- + drivers/mtd/onenand/omap2.c | 2 +- + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/vmt.c | 4 +- + drivers/pci/pci-driver.c | 46 ++++------ + drivers/pnp/card.c | 7 +- + drivers/pnp/core.c | 5 +- + drivers/pnp/system.c | 2 +- + drivers/power/ds2760_battery.c | 4 +- + drivers/rapidio/rio-scan.c | 8 +- + drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/hosts.c | 6 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_dump.c | 2 +- + drivers/scsi/libsas/sas_port.c | 2 +- + drivers/scsi/raid_class.c | 3 +- + drivers/scsi/scsi_debug.c | 4 +- + drivers/scsi/scsi_ioctl.c | 3 +- + drivers/scsi/scsi_scan.c | 7 +- + drivers/scsi/scsi_sysfs.c | 12 +-- + drivers/scsi/scsi_transport_fc.c | 18 ++-- + drivers/scsi/scsi_transport_iscsi.c | 11 +-- + drivers/scsi/scsi_transport_sas.c | 42 +++++----- + drivers/scsi/scsi_transport_srp.c | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/ses.c | 2 +- + drivers/serial/serial_core.c | 4 +- + drivers/spi/spi.c | 20 ++--- + drivers/spi/spi_bitbang.c | 2 +- + drivers/spi/spi_butterfly.c | 2 +- + drivers/spi/spi_lm70llp.c | 2 +- + drivers/ssb/main.c | 11 +-- + drivers/ssb/pcihost_wrapper.c | 2 +- + drivers/thermal/thermal_sys.c | 6 +- + drivers/uio/uio_cif.c | 3 +- + drivers/uio/uio_pdrv_genirq.c | 5 +- + drivers/usb/core/usb.c | 4 +- + drivers/usb/gadget/at91_udc.c | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/lh7a40x_udc.c | 2 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/gadget/s3c2410_udc.c | 2 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/lcd.c | 2 +- + drivers/video/output.c | 2 +- + drivers/w1/w1.c | 19 ++-- + drivers/w1/w1_int.c | 3 +- + drivers/xen/xenbus/xenbus_probe.c | 27 ++++--- + drivers/xen/xenbus/xenbus_probe.h | 4 +- + fs/char_dev.c | 30 +++---- + fs/partitions/check.c | 11 +-- + include/linux/cdev.h | 1 + + include/linux/device.h | 13 ++-- + include/linux/init.h | 1 + + include/linux/klist.h | 2 - + include/linux/mtd/concat.h | 2 +- + include/linux/pci.h | 1 - + include/linux/platform_device.h | 1 - + include/linux/pm.h | 88 +++++++------------- + include/linux/rio_drv.h | 4 +- + init/Kconfig | 44 ++++++---- + init/main.c | 9 ++ + kernel/ksysfs.c | 4 +- + kernel/power/main.c | 6 +- + lib/klist.c | 43 +++++++++- + lib/kobject.c | 50 +++++++++++ + lib/kobject_uevent.c | 8 +- + lib/swiotlb.c | 2 +- + 143 files changed, 630 insertions(+), 589 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged drivers/usb/gadget/m66592-udc.c +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Auto-merged drivers/usb/gadget/pxa27x_udc.c +Auto-merged drivers/usb/host/r8a66597-hcd.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 29 + + Documentation/usb/power-management.txt | 22 +- + MAINTAINERS | 1 + + arch/arm/plat-mxc/include/mach/usb.h | 23 + + arch/arm/plat-omap/usb.c | 32 - + arch/powerpc/boot/dts/sequoia.dts | 2 +- + drivers/Makefile | 1 + + drivers/block/ub.c | 11 +- + drivers/hid/usbhid/hid-core.c | 9 +- + drivers/i2c/chips/Kconfig | 12 - + drivers/i2c/chips/Makefile | 1 - + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/net/usb/kaweth.c | 6 +- + drivers/net/usb/pegasus.c | 12 +- + drivers/usb/Kconfig | 2 + + drivers/usb/class/usbtmc.c | 9 +- + drivers/usb/core/devio.c | 5 - + drivers/usb/core/driver.c | 111 +- + drivers/usb/core/hcd.c | 4 +- + drivers/usb/core/hcd.h | 8 +- + drivers/usb/core/hub.c | 62 +- + drivers/usb/core/message.c | 47 +- + drivers/usb/core/sysfs.c | 35 +- + drivers/usb/core/usb.c | 32 +- + drivers/usb/core/usb.h | 1 + + drivers/usb/gadget/Kconfig | 39 + + drivers/usb/gadget/Makefile | 2 + + drivers/usb/gadget/ci13xxx_udc.c | 2830 ++++++++++++++++++ + drivers/usb/gadget/ci13xxx_udc.h | 195 ++ + drivers/usb/gadget/epautoconf.c | 2 +- + drivers/usb/gadget/file_storage.c | 176 +- + drivers/usb/gadget/fsl_qe_udc.c | 12 +- + drivers/usb/gadget/gadget_chips.h | 8 +- + drivers/usb/gadget/imx_udc.c | 1494 +++++++++ + drivers/usb/gadget/imx_udc.h | 327 ++ + drivers/usb/gadget/m66592-udc.c | 9 +- + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/gadget/omap_udc.c | 4 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 - + drivers/usb/gadget/s3c2410_udc.c | 34 +- + drivers/usb/host/Kconfig | 13 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-dbg.c | 8 +- + drivers/usb/host/ehci-hub.c | 27 +- + drivers/usb/host/ehci-ppc-of.c | 45 +- + drivers/usb/host/ehci.h | 34 + + drivers/usb/host/ohci-pnx4008.c | 85 +- + drivers/usb/host/ohci-ppc-of.c | 25 + + drivers/usb/host/ohci-tmio.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 3985 +++++++++++++++++++++++++ + drivers/usb/host/oxu210hp.h | 447 +++ + drivers/usb/host/pci-quirks.c | 14 +- + drivers/usb/host/r8a66597-hcd.c | 8 +- + drivers/usb/image/microtek.c | 11 +- + drivers/usb/misc/berry_charge.c | 5 + + drivers/usb/misc/usbtest.c | 2 - + drivers/usb/mon/Kconfig | 13 +- + drivers/usb/mon/Makefile | 3 +- + drivers/usb/musb/davinci.c | 18 +- + drivers/usb/musb/musb_core.c | 32 +- + drivers/usb/musb/musb_core.h | 3 +- + drivers/usb/musb/musb_gadget.c | 2 +- + drivers/usb/musb/musb_host.c | 23 +- + drivers/usb/musb/musbhsdma.c | 2 +- + drivers/usb/musb/omap2430.c | 15 +- + drivers/usb/musb/tusb6010.c | 7 +- + drivers/usb/otg/Kconfig | 44 + + drivers/usb/otg/Makefile | 17 + + drivers/usb/otg/gpio_vbus.c | 335 +++ + drivers/{i2c/chips => usb/otg}/isp1301_omap.c | 65 +- + drivers/usb/otg/otg.c | 59 + + drivers/usb/serial/Kconfig | 9 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/ipw.c | 4 +- + drivers/usb/serial/opticon.c | 363 +++ + drivers/usb/storage/protocol.c | 24 +- + drivers/usb/storage/protocol.h | 3 +- + drivers/usb/storage/scsiglue.c | 12 + + drivers/usb/storage/transport.c | 109 +- + drivers/usb/storage/transport.h | 2 - + drivers/usb/storage/unusual_devs.h | 137 +- + drivers/usb/storage/usb.c | 127 +- + drivers/usb/storage/usb.h | 1 - + drivers/usb/wusbcore/rh.c | 2 +- + include/linux/oxu210hp.h | 7 + + include/linux/usb.h | 19 +- + include/linux/usb/association.h | 22 +- + include/linux/usb/gpio_vbus.h | 30 + + include/linux/usb/otg.h | 1 + + include/linux/usb_usual.h | 5 +- + 91 files changed, 11333 insertions(+), 512 deletions(-) + create mode 100644 arch/arm/plat-mxc/include/mach/usb.h + create mode 100644 drivers/usb/gadget/ci13xxx_udc.c + create mode 100644 drivers/usb/gadget/ci13xxx_udc.h + create mode 100644 drivers/usb/gadget/imx_udc.c + create mode 100644 drivers/usb/gadget/imx_udc.h + create mode 100644 drivers/usb/host/oxu210hp-hcd.c + create mode 100644 drivers/usb/host/oxu210hp.h + create mode 100644 drivers/usb/otg/Kconfig + create mode 100644 drivers/usb/otg/Makefile + create mode 100644 drivers/usb/otg/gpio_vbus.c + rename drivers/{i2c/chips => usb/otg}/isp1301_omap.c (97%) + create mode 100644 drivers/usb/otg/otg.c + create mode 100644 drivers/usb/serial/opticon.c + create mode 100644 include/linux/oxu210hp.h + create mode 100644 include/linux/usb/gpio_vbus.h +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Merge made by recursive. + Documentation/lockstat.txt | 51 ++++--- + arch/um/include/asm/system.h | 14 +- + arch/x86/include/asm/percpu.h | 83 ++++++++++- + arch/x86/include/asm/uaccess.h | 2 + + arch/x86/include/asm/uaccess_32.h | 8 +- + arch/x86/include/asm/uaccess_64.h | 6 + + arch/x86/lib/usercopy_32.c | 8 +- + arch/x86/lib/usercopy_64.c | 4 +- + include/asm-generic/percpu.h | 11 ++- + include/asm-generic/sections.h | 10 ++ + include/asm-generic/vmlinux.lds.h | 16 ++ + include/linux/debug_locks.h | 2 +- + include/linux/futex.h | 2 + + include/linux/kernel.h | 11 ++ + include/linux/lockdep.h | 31 ++++- + include/linux/mutex.h | 2 + + include/linux/percpu.h | 17 ++- + include/linux/uaccess.h | 2 +- + kernel/exit.c | 2 +- + kernel/extable.c | 16 ++ + kernel/futex.c | 290 +++++++++++++------------------------ + kernel/lockdep.c | 41 +++-- + kernel/lockdep_proc.c | 28 +++- + kernel/module.c | 7 +- + kernel/mutex.c | 2 +- + kernel/notifier.c | 8 + + kernel/posix-cpu-timers.c | 10 +- + kernel/sched.c | 3 +- + kernel/softlockup.c | 2 +- + kernel/sys.c | 2 +- + lib/Kconfig.debug | 10 ++ + mm/memory.c | 15 ++ + 32 files changed, 444 insertions(+), 272 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Already up-to-date. +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/vsyscall_64.c +Auto-merged arch/x86/mm/fault.c +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/module.c +Auto-merged kernel/power/main.c +Auto-merged kernel/sched.c +Auto-merged kernel/sysctl.c +Auto-merged scripts/recordmcount.pl +CONFLICT (content): Merge conflict in scripts/recordmcount.pl +Resolved 'scripts/recordmcount.pl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit e3c04a0: Merge commit 'ftrace/auto-ftrace-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ftrace.txt | 62 +- + Documentation/kernel-parameters.txt | 8 + + Documentation/markers.txt | 14 + + Documentation/tracepoints.txt | 92 ++-- + Documentation/tracers/mmiotrace.txt | 6 +- + arch/powerpc/include/asm/ftrace.h | 14 +- + arch/powerpc/include/asm/module.h | 16 +- + arch/powerpc/kernel/ftrace.c | 473 +++++++++++++-- + arch/powerpc/kernel/idle.c | 5 + + arch/powerpc/kernel/module_32.c | 10 + + arch/powerpc/kernel/module_64.c | 13 + + arch/x86/Kconfig | 3 + + arch/x86/Kconfig.debug | 4 - + arch/x86/include/asm/ftrace.h | 34 +- + arch/x86/include/asm/thread_info.h | 2 + + arch/x86/kernel/Makefile | 6 + + arch/x86/kernel/entry_32.S | 42 ++- + arch/x86/kernel/entry_64.S | 5 + + arch/x86/kernel/ftrace.c | 312 +++++++++- + arch/x86/kernel/stacktrace.c | 64 ++ + arch/x86/kernel/vsyscall_64.c | 3 + + arch/x86/mm/Makefile | 3 +- + arch/x86/mm/fault.c | 2 +- + arch/x86/vdso/vclock_gettime.c | 3 + + drivers/char/sysrq.c | 18 +- + fs/seq_file.c | 14 +- + include/asm-generic/vmlinux.lds.h | 21 +- + include/linux/compiler.h | 84 +++- + include/linux/ftrace.h | 146 ++++- + include/linux/ftrace_irq.h | 13 + + include/linux/hardirq.h | 15 +- + include/linux/marker.h | 69 ++- + include/linux/rcupdate.h | 2 + + include/linux/ring_buffer.h | 1 + + include/linux/sched.h | 11 + + include/linux/seq_file.h | 1 + + include/linux/stacktrace.h | 8 + + include/linux/tracepoint.h | 57 ++- + include/linux/tty.h | 2 +- + include/trace/boot.h | 56 ++ + include/trace/sched.h | 24 +- + init/Kconfig | 1 + + init/main.c | 35 +- + kernel/Makefile | 4 + + kernel/exit.c | 5 +- + kernel/fork.c | 5 + + kernel/kthread.c | 3 + + kernel/marker.c | 192 ++++-- + kernel/module.c | 11 +- + kernel/power/disk.c | 13 +- + kernel/power/main.c | 5 +- + kernel/profile.c | 2 +- + kernel/sched.c | 7 + + kernel/signal.c | 2 + + kernel/sysctl.c | 10 + + kernel/trace/Kconfig | 76 +++ + kernel/trace/Makefile | 7 + + kernel/trace/ftrace.c | 359 ++++++++--- + kernel/trace/ring_buffer.c | 377 ++++++++---- + kernel/trace/trace.c | 793 ++++++++++++++++++++---- + kernel/trace/trace.h | 192 ++++++- + kernel/trace/trace_boot.c | 166 ++++-- + kernel/trace/trace_branch.c | 341 ++++++++++ + kernel/trace/trace_functions.c | 18 +- + kernel/trace/trace_functions_return.c | 98 +++ + kernel/trace/trace_irqsoff.c | 61 ++- + kernel/trace/trace_mmiotrace.c | 41 +- + kernel/trace/trace_nop.c | 65 ++- + kernel/trace/trace_sched_switch.c | 106 +++- + kernel/trace/trace_sched_wakeup.c | 70 ++- + kernel/trace/trace_selftest.c | 173 ++++-- + kernel/trace/trace_stack.c | 32 +- + kernel/trace/trace_sysprof.c | 19 +- + kernel/tracepoint.c | 295 ++++++--- + samples/tracepoints/tp-samples-trace.h | 4 +- + samples/tracepoints/tracepoint-probe-sample.c | 1 + + samples/tracepoints/tracepoint-probe-sample2.c | 1 + + samples/tracepoints/tracepoint-sample.c | 3 + + scripts/Makefile.build | 12 +- + scripts/bootgraph.pl | 16 +- + scripts/recordmcount.pl | 45 +- + scripts/tracing/draw_functrace.py | 130 ++++ + 82 files changed, 4484 insertions(+), 1050 deletions(-) + create mode 100644 include/linux/ftrace_irq.h + create mode 100644 include/trace/boot.h + create mode 100644 kernel/trace/trace_branch.c + create mode 100644 kernel/trace/trace_functions_return.c + create mode 100644 scripts/tracing/draw_functrace.py +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged arch/x86/kernel/io_apic.c +Merge made by recursive. + arch/x86/kernel/io_apic.c | 26 ++++++++++++++--- + include/linux/irq.h | 11 ++----- + kernel/irq/internals.h | 2 + + kernel/irq/manage.c | 68 +++++++++++++++++++++++++++++++++++---------- + kernel/irq/migration.c | 11 ------- + kernel/irq/proc.c | 2 +- + 6 files changed, 80 insertions(+), 40 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged arch/x86/Kconfig +Auto-merged include/linux/sched.h +Auto-merged kernel/Makefile +Auto-merged kernel/sched.c +Merge made by recursive. + Documentation/controllers/cpuacct.txt | 32 ++++++ + Documentation/scheduler/sched-arch.txt | 4 +- + arch/ia64/Kconfig | 2 +- + arch/m32r/Kconfig | 2 +- + arch/mips/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/x86/Kconfig | 4 +- + include/asm-m32r/system.h | 2 +- + include/linux/rcuclassic.h | 2 +- + include/linux/sched.h | 2 - + kernel/Makefile | 3 +- + kernel/rcuclassic.c | 4 +- + kernel/sched.c | 192 ++++++++++++-------------------- + kernel/sched_debug.c | 51 +++++++-- + kernel/sched_rt.c | 7 +- + 15 files changed, 160 insertions(+), 151 deletions(-) + create mode 100644 Documentation/controllers/cpuacct.txt +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/include/asm/system.h +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/include/asm/pda.h | 4 ++-- + arch/x86/include/asm/system.h | 6 +++++- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Already uptodate! +Merge made by recursive. +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged arch/x86/pci/common.c +Auto-merged drivers/acpi/pci_root.c +Auto-merged drivers/pci/pci-acpi.c +Auto-merged drivers/pci/pci.c +Auto-merged drivers/pci/quirks.c +Auto-merged include/linux/pci.h +Merge made by recursive. + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/pci/common.c | 8 +++ + drivers/acpi/pci_root.c | 20 ++++++ + drivers/pci/bus.c | 4 + + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/pciehp_ctrl.c | 26 ++++---- + drivers/pci/irq.c | 2 +- + drivers/pci/msi.c | 31 +++------ + drivers/pci/pci-acpi.c | 39 ++++------- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.c | 122 +++++++++++++++++++++++++++-------- + drivers/pci/pci.h | 6 +- + drivers/pci/pcie/aer/aerdrv_acpi.c | 1 - + drivers/pci/pcie/aspm.c | 27 +++----- + drivers/pci/pcie/portdrv_core.c | 2 +- + drivers/pci/probe.c | 6 +- + drivers/pci/proc.c | 11 +++- + drivers/pci/quirks.c | 5 +- + include/linux/pci-acpi.h | 14 +--- + include/linux/pci.h | 16 +++++ + include/linux/pci_regs.h | 12 ++++ + 21 files changed, 228 insertions(+), 130 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-crypt.c | 6 +--- + drivers/md/dm-delay.c | 6 +--- + drivers/md/dm-linear.c | 6 +--- + drivers/md/dm-mpath.c | 6 +--- + drivers/md/dm-raid1.c | 6 +--- + drivers/md/dm-snap.c | 18 ++++-------- + drivers/md/dm-stripe.c | 4 +-- + drivers/md/dm-table.c | 19 +++++++++++++ + drivers/md/dm-target.c | 15 +++++------ + drivers/md/dm-zero.c | 5 +--- + drivers/md/dm.c | 57 ++++++++++++++++++++++++++++++++-------- + drivers/md/dm.h | 1 + + include/linux/device-mapper.h | 27 ++++++++++++++++++- + 13 files changed, 112 insertions(+), 64 deletions(-) +Merging hid/mm +$ git merge hid/mm +Removed drivers/hid/hid-bright.c +Removed drivers/hid/hid-dell.c +Auto-merged drivers/hid/usbhid/hid-core.c +Merge made by recursive. + drivers/hid/Kconfig | 22 +++----- + drivers/hid/Makefile | 3 +- + drivers/hid/hid-bright.c | 71 ------------------------ + drivers/hid/hid-core.c | 119 ++++++++++++++++++++++++++++++++++++----- + drivers/hid/hid-dell.c | 76 -------------------------- + drivers/hid/hid-dummy.c | 3 + + drivers/hid/hid-ids.h | 15 ++---- + drivers/hid/hid-lg.c | 7 --- + drivers/hid/hid-ntrig.c | 82 ++++++++++++++++++++++++++++ + drivers/hid/hid-pl.c | 2 + + drivers/hid/hidraw.c | 28 ++++++++++ + drivers/hid/usbhid/hid-core.c | 52 ++++++++---------- + drivers/hid/usbhid/usbhid.h | 11 ++++- + include/linux/hid.h | 14 ++--- + include/linux/hidraw.h | 2 + + 15 files changed, 274 insertions(+), 233 deletions(-) + delete mode 100644 drivers/hid/hid-bright.c + delete mode 100644 drivers/hid/hid-dell.c + create mode 100644 drivers/hid/hid-ntrig.c +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged drivers/i2c/busses/i2c-pxa.c +Auto-merged drivers/i2c/busses/i2c-sh_mobile.c +Merge made by recursive. + drivers/i2c/busses/i2c-ali1563.c | 4 +- + drivers/i2c/busses/i2c-amd756-s4882.c | 4 +- + drivers/i2c/busses/i2c-amd756.c | 5 +- + drivers/i2c/busses/i2c-at91.c | 2 +- + drivers/i2c/busses/i2c-bfin-twi.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 50 ++++++++++++++- + drivers/i2c/busses/i2c-pxa.c | 4 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sh7760.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/busses/i2c-sis5595.c | 4 +- + drivers/i2c/busses/i2c-sis630.c | 4 +- + drivers/i2c/i2c-core.c | 10 ++-- + drivers/input/misc/apanel.c | 81 ++++++++---------------- + drivers/media/video/cafe_ccic.c | 1 - + drivers/media/video/ov7670.c | 1 - + drivers/media/video/ovcamchip/ovcamchip_core.c | 1 - + drivers/media/video/w9968cf.c | 1 - + include/linux/i2c.h | 4 - + 19 files changed, 99 insertions(+), 85 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merged drivers/spi/spi_lm70llp.c +Merge made by recursive. + Documentation/hwmon/it87 | 20 +- + Documentation/hwmon/lm70 | 12 +- + Documentation/hwmon/ltc4245 | 81 +++ + Documentation/spi/spi-lm70llp | 10 + + drivers/hwmon/Kconfig | 19 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asb100.c | 5 +- + drivers/hwmon/f71882fg.c | 1130 +++++++++++++++++++++++++++++++++++------ + drivers/hwmon/fschmd.c | 47 +- + drivers/hwmon/i5k_amb.c | 7 + + drivers/hwmon/it87.c | 30 +- + drivers/hwmon/k8temp.c | 15 + + drivers/hwmon/lm70.c | 91 +++- + drivers/hwmon/ltc4245.c | 567 +++++++++++++++++++++ + drivers/hwmon/w83781d.c | 5 +- + drivers/hwmon/w83791d.c | 5 +- + drivers/hwmon/w83792d.c | 5 +- + drivers/hwmon/w83793.c | 5 +- + drivers/spi/spi_lm70llp.c | 33 +- + 19 files changed, 1839 insertions(+), 249 deletions(-) + create mode 100644 Documentation/hwmon/ltc4245 + create mode 100644 drivers/hwmon/ltc4245.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merged drivers/media/video/Kconfig +Auto-merged drivers/media/video/pvrusb2/pvrusb2-hdw.c +Auto-merged drivers/media/video/sh_mobile_ceu_camera.c +Merge made by recursive. + Documentation/video4linux/CARDLIST.bttv | 7 +- + Documentation/video4linux/CARDLIST.cx88 | 5 +- + Documentation/video4linux/CARDLIST.em28xx | 1 + + Documentation/video4linux/README.cx88 | 8 +- + Documentation/video4linux/gspca.txt | 4 + + drivers/media/common/ir-keymaps.c | 32 + + drivers/media/common/saa7146_fops.c | 2 +- + drivers/media/common/saa7146_video.c | 10 +- + drivers/media/common/tuners/mxl5005s.c | 6 +- + drivers/media/common/tuners/tda9887.c | 5 +- + drivers/media/dvb/Kconfig | 13 + + drivers/media/dvb/dm1105/dm1105.c | 5 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 80 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 134 ++- + drivers/media/dvb/dvb-core/dvbdev.c | 71 +- + drivers/media/dvb/dvb-core/dvbdev.h | 1 + + drivers/media/dvb/dvb-usb/af9015.c | 41 +- + drivers/media/dvb/dvb-usb/af9015.h | 140 ++ + drivers/media/dvb/dvb-usb/cinergyT2-core.c | 3 +- + drivers/media/dvb/dvb-usb/cinergyT2.h | 10 +- + drivers/media/dvb/dvb-usb/dib0700.h | 5 +- + drivers/media/dvb/dvb-usb/dib0700_core.c | 16 + + drivers/media/dvb/dvb-usb/dib0700_devices.c | 139 ++- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/dvb/dvb-usb/dw2102.c | 13 +- + drivers/media/dvb/dvb-usb/usb-urb.c | 19 +- + drivers/media/dvb/frontends/Kconfig | 45 + + drivers/media/dvb/frontends/Makefile | 9 + + drivers/media/dvb/frontends/dvb-pll.c | 2 +- + drivers/media/dvb/frontends/lgdt3304.c | 378 ++++ + drivers/media/dvb/frontends/lgdt3304.h | 45 + + drivers/media/dvb/frontends/s5h1411.c | 3 + + drivers/media/dvb/frontends/s921_core.c | 216 +++ + drivers/media/dvb/frontends/s921_core.h | 114 ++ + drivers/media/dvb/frontends/s921_module.c | 190 ++ + drivers/media/dvb/frontends/s921_module.h | 49 + + drivers/media/dvb/frontends/si21xx.c | 1 - + drivers/media/dvb/frontends/stb0899_algo.c | 1519 +++++++++++++++ + drivers/media/dvb/frontends/stb0899_cfg.h | 287 +++ + drivers/media/dvb/frontends/stb0899_drv.c | 1684 ++++++++++++++++ + drivers/media/dvb/frontends/stb0899_drv.h | 162 ++ + drivers/media/dvb/frontends/stb0899_priv.h | 267 +++ + drivers/media/dvb/frontends/stb0899_reg.h | 2027 ++++++++++++++++++++ + drivers/media/dvb/frontends/stb6100.c | 545 ++++++ + drivers/media/dvb/frontends/stb6100.h | 115 ++ + drivers/media/dvb/frontends/stb6100_cfg.h | 108 ++ + drivers/media/dvb/frontends/tda8261.c | 230 +++ + drivers/media/dvb/frontends/tda8261.h | 55 + + drivers/media/dvb/frontends/tda8261_cfg.h | 84 + + drivers/media/dvb/frontends/zl10353.c | 3 + + drivers/media/dvb/siano/sms-cards.c | 94 +- + drivers/media/dvb/siano/sms-cards.h | 12 + + drivers/media/dvb/siano/smscoreapi.c | 78 + + drivers/media/dvb/siano/smscoreapi.h | 36 +- + drivers/media/dvb/siano/smsdvb.c | 56 +- + drivers/media/dvb/siano/smsusb.c | 45 + + drivers/media/dvb/ttpci/Kconfig | 4 + + drivers/media/dvb/ttpci/budget-av.c | 298 +++ + drivers/media/dvb/ttpci/budget-ci.c | 311 +++ + drivers/media/dvb/ttpci/budget.h | 1 + + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 15 +- + drivers/media/dvb/ttusb-dec/ttusb_dec.c | 7 + + drivers/media/radio/dsbr100.c | 71 +- + drivers/media/radio/radio-aimslab.c | 2 +- + drivers/media/radio/radio-cadet.c | 2 +- + drivers/media/radio/radio-gemtek.c | 2 +- + drivers/media/radio/radio-mr800.c | 43 +- + drivers/media/radio/radio-rtrack2.c | 2 +- + drivers/media/radio/radio-sf16fmi.c | 2 +- + drivers/media/video/Kconfig | 14 +- + drivers/media/video/Makefile | 4 +- + drivers/media/video/arv.c | 5 +- + drivers/media/video/bt8xx/bttv-cards.c | 60 +- + drivers/media/video/bt8xx/bttv-gpio.c | 7 +- + drivers/media/video/bt8xx/bttv.h | 10 +- + drivers/media/video/bt8xx/bttvp.h | 2 +- + drivers/media/video/bw-qcam.c | 5 +- + drivers/media/video/c-qcam.c | 7 +- + drivers/media/video/cpia.c | 9 +- + drivers/media/video/cpia2/cpia2_core.c | 2 +- + drivers/media/video/cpia2/cpia2_usb.c | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 15 +- + drivers/media/video/cx18/cx18-av-audio.c | 41 +- + drivers/media/video/cx18/cx18-av-core.c | 100 +- + drivers/media/video/cx18/cx18-av-core.h | 3 + + drivers/media/video/cx18/cx18-av-firmware.c | 18 +- + drivers/media/video/cx18/cx18-driver.c | 2 - + drivers/media/video/cx18/cx18-firmware.c | 60 +- + drivers/media/video/cx18/cx18-gpio.c | 22 +- + drivers/media/video/cx18/cx18-i2c.c | 24 +- + drivers/media/video/cx23885/cx23885-417.c | 2 +- + drivers/media/video/cx25840/Kconfig | 2 +- + drivers/media/video/cx88/cx88-blackbird.c | 4 +- + drivers/media/video/cx88/cx88-cards.c | 86 +- + drivers/media/video/cx88/cx88-core.c | 3 + + drivers/media/video/cx88/cx88-dvb.c | 182 +- + drivers/media/video/cx88/cx88-mpeg.c | 4 +- + drivers/media/video/cx88/cx88.h | 14 +- + drivers/media/video/em28xx/em28xx-audio.c | 58 +- + drivers/media/video/em28xx/em28xx-cards.c | 393 +++-- + drivers/media/video/em28xx/em28xx-core.c | 383 +++- + drivers/media/video/em28xx/em28xx-i2c.c | 21 +- + drivers/media/video/em28xx/em28xx-input.c | 311 +++- + drivers/media/video/em28xx/em28xx-reg.h | 121 ++- + drivers/media/video/em28xx/em28xx-video.c | 263 ++- + drivers/media/video/em28xx/em28xx.h | 79 +- + drivers/media/video/et61x251/et61x251_core.c | 2 +- + drivers/media/video/gspca/Kconfig | 22 +- + drivers/media/video/gspca/Makefile | 2 + + drivers/media/video/gspca/conex.c | 3 + + drivers/media/video/gspca/finepix.c | 11 +- + drivers/media/video/gspca/gspca.c | 121 +- + drivers/media/video/gspca/gspca.h | 22 +- + drivers/media/video/gspca/m5602/m5602_bridge.h | 112 +- + drivers/media/video/gspca/m5602/m5602_ov9650.c | 36 + + drivers/media/video/gspca/m5602/m5602_ov9650.h | 37 +- + drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 33 + + drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 28 - + drivers/media/video/gspca/mars.c | 2 +- + drivers/media/video/gspca/ov519.c | 155 +- + drivers/media/video/gspca/ov534.c | 505 +++++ + drivers/media/video/gspca/pac207.c | 1 + + drivers/media/video/gspca/pac7311.c | 3 + + drivers/media/video/gspca/sonixb.c | 21 +- + drivers/media/video/gspca/sonixj.c | 254 ++- + drivers/media/video/gspca/spca500.c | 4 +- + drivers/media/video/gspca/spca501.c | 149 +- + drivers/media/video/gspca/spca505.c | 4 + + drivers/media/video/gspca/spca561.c | 3 + + drivers/media/video/gspca/tv8532.c | 140 +- + drivers/media/video/gspca/vc032x.c | 3 + + drivers/media/video/gspca/zc3xx.c | 3 + + drivers/media/video/ir-kbd-i2c.c | 6 +- + drivers/media/video/ivtv/ivtv-cards.c | 16 +- + drivers/media/video/ov511.c | 5 +- + drivers/media/video/ov772x.c | 964 ++++++++++ + drivers/media/video/pms.c | 9 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 13 +- + drivers/media/video/pwc/pwc-if.c | 2 +- + drivers/media/video/pwc/pwc-v4l.c | 3 +- + drivers/media/video/pwc/pwc.h | 3 +- + drivers/media/video/s2255drv.c | 2 +- + drivers/media/video/saa5246a.c | 7 +- + drivers/media/video/saa5249.c | 7 +- + drivers/media/video/saa7134/saa7134-cards.c | 2 +- + drivers/media/video/saa7134/saa7134-dvb.c | 24 +- + drivers/media/video/saa7134/saa7134-tvaudio.c | 2 +- + drivers/media/video/saa7134/saa7134.h | 2 +- + drivers/media/video/se401.c | 5 +- + drivers/media/video/sh_mobile_ceu_camera.c | 6 +- + drivers/media/video/sn9c102/sn9c102_core.c | 2 +- + drivers/media/video/sn9c102/sn9c102_devtable.h | 8 + + drivers/media/video/soc_camera.c | 5 +- + drivers/media/video/stv680.c | 5 +- + drivers/media/video/tvp5150.c | 15 + + drivers/media/video/usbvideo/usbvideo.c | 5 +- + drivers/media/video/usbvision/usbvision-video.c | 6 +- + drivers/media/video/uvc/uvc_driver.c | 208 +-- + drivers/media/video/uvc/uvc_v4l2.c | 30 +- + drivers/media/video/uvc/uvc_video.c | 90 +- + drivers/media/video/uvc/uvcvideo.h | 14 +- + drivers/media/video/v4l2-common.c | 2 +- + .../{compat_ioctl32.c => v4l2-compat-ioctl32.c} | 92 +- + drivers/media/video/v4l2-dev.c | 4 +- + drivers/media/video/v4l2-ioctl.c | 96 +- + drivers/media/video/vino.c | 5 +- + drivers/media/video/w9966.c | 5 +- + drivers/media/video/zc0301/zc0301_core.c | 2 +- + drivers/media/video/zoran/zoran_driver.c | 8 +- + firmware/Makefile | 16 +- + include/linux/videodev2.h | 1 + + include/media/ir-common.h | 1 + + include/media/ov772x.h | 21 + + include/media/saa7146_vv.h | 3 +- + include/media/soc_camera.h | 4 +- + include/media/v4l2-chip-ident.h | 1 + + include/media/v4l2-ioctl.h | 12 +- + sound/i2c/other/tea575x-tuner.c | 22 +- + 180 files changed, 14146 insertions(+), 1625 deletions(-) + create mode 100644 drivers/media/dvb/frontends/lgdt3304.c + create mode 100644 drivers/media/dvb/frontends/lgdt3304.h + create mode 100644 drivers/media/dvb/frontends/s921_core.c + create mode 100644 drivers/media/dvb/frontends/s921_core.h + create mode 100644 drivers/media/dvb/frontends/s921_module.c + create mode 100644 drivers/media/dvb/frontends/s921_module.h + create mode 100644 drivers/media/dvb/frontends/stb0899_algo.c + create mode 100644 drivers/media/dvb/frontends/stb0899_cfg.h + create mode 100644 drivers/media/dvb/frontends/stb0899_drv.c + create mode 100644 drivers/media/dvb/frontends/stb0899_drv.h + create mode 100644 drivers/media/dvb/frontends/stb0899_priv.h + create mode 100644 drivers/media/dvb/frontends/stb0899_reg.h + create mode 100644 drivers/media/dvb/frontends/stb6100.c + create mode 100644 drivers/media/dvb/frontends/stb6100.h + create mode 100644 drivers/media/dvb/frontends/stb6100_cfg.h + create mode 100644 drivers/media/dvb/frontends/tda8261.c + create mode 100644 drivers/media/dvb/frontends/tda8261.h + create mode 100644 drivers/media/dvb/frontends/tda8261_cfg.h + create mode 100644 drivers/media/video/gspca/ov534.c + create mode 100644 drivers/media/video/ov772x.c + rename drivers/media/video/{compat_ioctl32.c => v4l2-compat-ioctl32.c} (92%) + create mode 100644 include/media/ov772x.h +$ git reset --hard HEAD^ +HEAD is now at f124547 Merge branch 'quilt/jdelvare-hwmon' +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Merge made by recursive. + Documentation/kbuild/makefiles.txt | 14 ++++++++++++++ + Makefile | 12 ++++++------ + arch/blackfin/boot/Makefile | 2 +- + scripts/Kbuild.include | 18 +++++++++--------- + scripts/Makefile.lib | 15 +++++++++------ + scripts/extract-ikconfig | 8 ++++---- + scripts/mkcompile_h | 6 ++++-- + scripts/mkmakefile | 4 +++- + usr/gen_init_cpio.c | 28 +++++++++++++++++++++++++++- + 9 files changed, 77 insertions(+), 30 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at f124547 Merge branch 'quilt/jdelvare-hwmon' +Merging quilt/ide +$ git merge quilt/ide +Auto-merged drivers/ide/Kconfig +Merge made by recursive. + drivers/ide/Kconfig | 8 + + drivers/ide/Makefile | 3 +- + drivers/ide/amd74xx.c | 11 +- + drivers/ide/cmd64x.c | 4 +- + drivers/ide/cy82c693.c | 1 - + drivers/ide/gayle.c | 6 +- + drivers/ide/hpt366.c | 8 +- + drivers/ide/ide-cd.c | 150 ++--------- + drivers/ide/ide-cd.h | 10 +- + drivers/ide/ide-dma-sff.c | 54 ++-- + drivers/ide/ide-floppy.c | 26 +- + drivers/ide/ide-floppy_ioctl.c | 58 ++-- + drivers/ide/ide-io.c | 572 ++++++++++------------------------------ + drivers/ide/ide-ioctls.c | 5 +- + drivers/ide/ide-iops.c | 57 ++--- + drivers/ide/ide-legacy.c | 58 ++++ + drivers/ide/ide-lib.c | 105 ++++---- + drivers/ide/ide-park.c | 27 +- + drivers/ide/ide-pm.c | 233 ++++++++++++++++ + drivers/ide/ide-probe.c | 386 ++++++++------------------- + drivers/ide/ide-proc.c | 29 +-- + drivers/ide/ide-sysfs.c | 125 +++++++++ + drivers/ide/ide.c | 161 +----------- + drivers/ide/pdc202xx_old.c | 9 +- + drivers/ide/rz1000.c | 36 ++- + drivers/ide/trm290.c | 4 +- + drivers/ide/tx4938ide.c | 11 +- + drivers/ide/tx4939ide.c | 43 ++-- + drivers/ide/umc8672.c | 11 +- + drivers/scsi/ide-scsi.c | 32 ++- + include/linux/ide.h | 128 ++++++---- + 31 files changed, 1075 insertions(+), 1296 deletions(-) + create mode 100644 drivers/ide/ide-legacy.c + create mode 100644 drivers/ide/ide-pm.c + create mode 100644 drivers/ide/ide-sysfs.c +Merging libata/NEXT +$ git merge libata/NEXT +Auto-merged drivers/ata/libata-scsi.c +Merge made by recursive. + drivers/ata/ahci.c | 8 +- + drivers/ata/ata_generic.c | 5 +- + drivers/ata/libata-acpi.c | 19 ++-- + drivers/ata/libata-core.c | 203 ++++++++++++++++++++++++---------------- + drivers/ata/libata-eh.c | 116 +++++++++++++---------- + drivers/ata/libata-pmp.c | 22 ++-- + drivers/ata/libata-scsi.c | 22 ++-- + drivers/ata/pata_bf54x.c | 1 - + drivers/ata/pata_it821x.c | 34 +++---- + drivers/ata/pata_ixp4xx_cf.c | 14 +-- + drivers/ata/pata_legacy.c | 18 ++-- + drivers/ata/pata_oldpiix.c | 1 - + drivers/ata/pata_pdc2027x.c | 29 +++---- + drivers/ata/pata_platform.c | 14 +-- + drivers/ata/pata_radisys.c | 1 - + drivers/ata/pata_rz1000.c | 16 ++-- + drivers/ata/pata_scc.c | 1 - + drivers/ata/pata_serverworks.c | 1 - + drivers/ata/pata_sis.c | 1 - + drivers/ata/sata_mv.c | 1 - + drivers/ata/sata_sil.c | 2 +- + include/linux/libata.h | 71 +++++++++++---- + 22 files changed, 336 insertions(+), 264 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Removed fs/xfs/xfs_clnt.h +Auto-merged fs/xfs/xfs_inode.c +Auto-merged fs/xfs/xfs_log.c +Auto-merged fs/xfs/xfs_log_recover.c +Auto-merged fs/xfs/xfs_mount.c +Merge made by recursive. + Documentation/filesystems/xfs.txt | 4 - + fs/inode.c | 209 ++- + fs/xfs/Makefile | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 2 +- + fs/xfs/linux-2.6/xfs_cred.h | 10 +- + fs/xfs/linux-2.6/xfs_globals.c | 8 - + fs/xfs/linux-2.6/xfs_globals.h | 1 - + fs/xfs/linux-2.6/xfs_ioctl.c | 9 +- + fs/xfs/linux-2.6/xfs_iops.c | 24 +- + fs/xfs/linux-2.6/xfs_linux.h | 2 +- + fs/xfs/linux-2.6/xfs_stats.c | 4 + + fs/xfs/linux-2.6/xfs_stats.h | 65 + + fs/xfs/linux-2.6/xfs_super.c | 840 +++------ + fs/xfs/linux-2.6/xfs_super.h | 3 - + fs/xfs/linux-2.6/xfs_sync.c | 764 ++++++++ + fs/xfs/linux-2.6/xfs_sync.h | 55 + + fs/xfs/linux-2.6/xfs_sysctl.c | 11 - + fs/xfs/linux-2.6/xfs_sysctl.h | 3 +- + fs/xfs/linux-2.6/xfs_vfs.h | 31 - + fs/xfs/linux-2.6/xfs_vnode.c | 15 +- + fs/xfs/linux-2.6/xfs_vnode.h | 5 - + fs/xfs/quota/xfs_dquot.c | 39 +- + fs/xfs/quota/xfs_dquot.h | 4 +- + fs/xfs/quota/xfs_dquot_item.c | 45 +- + fs/xfs/quota/xfs_qm.c | 13 +- + fs/xfs/quota/xfs_qm.h | 1 - + fs/xfs/quota/xfs_qm_bhv.c | 1 - + fs/xfs/quota/xfs_qm_syscalls.c | 151 +- + fs/xfs/support/debug.c | 2 +- + fs/xfs/xfs.h | 2 +- + fs/xfs/xfs_acl.c | 8 +- + fs/xfs/xfs_ag.h | 10 +- + fs/xfs/xfs_alloc.c | 195 ++- + fs/xfs/xfs_alloc.h | 27 +- + fs/xfs/xfs_alloc_btree.c | 2387 ++++--------------------- + fs/xfs/xfs_alloc_btree.h | 107 +- + fs/xfs/xfs_arch.h | 39 +- + fs/xfs/xfs_bit.h | 3 +- + fs/xfs/xfs_bmap.c | 306 ++-- + fs/xfs/xfs_bmap.h | 61 +- + fs/xfs/xfs_bmap_btree.c | 2614 +++++---------------------- + fs/xfs/xfs_bmap_btree.h | 171 +-- + fs/xfs/xfs_btree.c | 3596 ++++++++++++++++++++++++++++++++----- + fs/xfs/xfs_btree.h | 392 +++-- + fs/xfs/xfs_btree_trace.c | 249 +++ + fs/xfs/xfs_btree_trace.h | 116 ++ + fs/xfs/xfs_buf_item.c | 25 +- + fs/xfs/xfs_clnt.h | 105 -- + fs/xfs/xfs_da_btree.h | 24 +- + fs/xfs/xfs_dinode.h | 5 +- + fs/xfs/xfs_dmops.c | 5 +- + fs/xfs/xfs_extfree_item.c | 45 +- + fs/xfs/xfs_fsops.c | 24 +- + fs/xfs/xfs_ialloc.c | 132 ++- + fs/xfs/xfs_ialloc.h | 21 +- + fs/xfs/xfs_ialloc_btree.c | 2193 +++-------------------- + fs/xfs/xfs_ialloc_btree.h | 111 +- + fs/xfs/xfs_iget.c | 501 ++---- + fs/xfs/xfs_imap.h | 2 - + fs/xfs/xfs_inode.c | 300 ++-- + fs/xfs/xfs_inode.h | 288 ++-- + fs/xfs/xfs_inode_item.c | 30 +- + fs/xfs/xfs_inode_item.h | 41 +- + fs/xfs/xfs_itable.c | 33 +- + fs/xfs/xfs_log.c | 49 +- + fs/xfs/xfs_log.h | 4 + + fs/xfs/xfs_log_priv.h | 2 + + fs/xfs/xfs_log_recover.c | 97 +- + fs/xfs/xfs_mount.c | 42 +- + fs/xfs/xfs_mount.h | 54 +- + fs/xfs/xfs_qmops.c | 5 +- + fs/xfs/xfs_trans.c | 22 +- + fs/xfs/xfs_trans.h | 322 ++-- + fs/xfs/xfs_trans_ail.c | 362 +++-- + fs/xfs/xfs_trans_buf.c | 7 +- + fs/xfs/xfs_trans_item.c | 10 + + fs/xfs/xfs_trans_priv.h | 98 +- + fs/xfs/xfs_utils.c | 6 + + fs/xfs/xfs_vfsops.c | 617 +------- + fs/xfs/xfs_vfsops.h | 2 - + fs/xfs/xfs_vnodeops.c | 147 +-- + fs/xfs/xfs_vnodeops.h | 6 +- + include/linux/fs.h | 2 + + kernel/sysctl_check.c | 1 - + 84 files changed, 8154 insertions(+), 10194 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_sync.c + create mode 100644 fs/xfs/linux-2.6/xfs_sync.h + create mode 100644 fs/xfs/xfs_btree_trace.c + create mode 100644 fs/xfs/xfs_btree_trace.h + delete mode 100644 fs/xfs/xfs_clnt.h +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/reboot.c +Auto-merged kernel/power/disk.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 5 +- + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/kernel/e820.c | 21 ++ + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/dispatcher/dsmethod.c | 3 + + drivers/acpi/dispatcher/dsopcode.c | 53 +++++- + drivers/acpi/events/evevent.c | 14 +- + drivers/acpi/events/evgpe.c | 36 ++-- + drivers/acpi/events/evgpeblk.c | 38 ++-- + drivers/acpi/events/evmisc.c | 51 ++--- + drivers/acpi/events/evregion.c | 133 ++++++------- + drivers/acpi/events/evrgnini.c | 41 ++--- + drivers/acpi/events/evsci.c | 10 +- + drivers/acpi/events/evxface.c | 2 +- + drivers/acpi/events/evxfevnt.c | 12 +- + drivers/acpi/executer/exfldio.c | 11 +- + drivers/acpi/hardware/hwsleep.c | 73 +++---- + drivers/acpi/namespace/nsaccess.c | 11 +- + drivers/acpi/namespace/nsutils.c | 8 +- + drivers/acpi/osl.c | 44 ---- + drivers/acpi/parser/psparse.c | 12 ++ + drivers/acpi/parser/psxface.c | 17 ++ + drivers/acpi/sleep/main.c | 68 ++++++- + drivers/acpi/tables/tbfadt.c | 21 ++- + drivers/acpi/tables/tbutils.c | 24 +++ + drivers/acpi/toshiba_acpi.c | 19 +- + drivers/acpi/utilities/uteval.c | 6 +- + drivers/acpi/utilities/utglobal.c | 3 +- + drivers/acpi/utilities/utxface.c | 11 + + drivers/misc/sony-laptop.c | 4 +- + drivers/misc/thinkpad_acpi.c | 57 +++++-- + include/acpi/acconfig.h | 4 + + include/acpi/acexcep.h | 4 +- + include/acpi/acglobal.h | 1 + + include/acpi/aclocal.h | 1 + + include/acpi/acpixf.h | 6 +- + include/acpi/acpredef.h | 2 +- + include/acpi/actables.h | 2 + + include/acpi/actypes.h | 8 +- + include/linux/acpi.h | 1 + + include/linux/suspend.h | 13 ++ + kernel/power/disk.c | 6 +- + kernel/power/snapshot.c | 367 +++++++++++++++++++---------------- + kernel/power/swsusp.c | 122 ++++++++++++ + 44 files changed, 841 insertions(+), 508 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/lockd/host.c | 3 ++- + fs/lockd/svc.c | 9 +++++++++ + fs/nfsd/nfs4recover.c | 4 ++-- + fs/nfsd/nfs4state.c | 8 +++++--- + fs/nfsd/nfsfh.c | 30 ++++++++++++++++++++++++------ + include/linux/nfsd/nfsfh.h | 4 ++++ + include/linux/sunrpc/svc.h | 5 ++++- + net/sunrpc/svc_xprt.c | 22 ++++++++++++++++------ + net/sunrpc/svcsock.c | 9 +++++++-- + 9 files changed, 73 insertions(+), 21 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-cdev.c | 36 +- + drivers/firewire/fw-device.c | 3 + + drivers/firewire/fw-device.h | 4 + + drivers/firewire/fw-ohci.c | 73 +-- + drivers/firewire/fw-sbp2.c | 26 +- + drivers/ieee1394/dma.h | 1 + + drivers/ieee1394/ieee1394_core.c | 1 + + drivers/ieee1394/ieee1394_transactions.c | 29 + + drivers/ieee1394/ieee1394_transactions.h | 2 + + drivers/ieee1394/iso.h | 1 + + drivers/ieee1394/nodemgr.c | 10 +- + drivers/ieee1394/nodemgr.h | 18 + + drivers/ieee1394/sbp2.c | 5 + + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 + + drivers/media/dvb/firesat/Kconfig | 12 + + drivers/media/dvb/firesat/Makefile | 13 + + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ + drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ + drivers/media/dvb/firesat/cmp.c | 171 +++++ + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 255 ++++++++ + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ + drivers/media/dvb/firesat/firesat-rc.h | 11 + + drivers/media/dvb/firesat/firesat.h | 227 +++++++ + drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ + drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ + drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ + drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ + 30 files changed, 3440 insertions(+), 77 deletions(-) + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/dvb/firesat/firesat_iso.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/wl.c | 3 ++- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/powerpc/kernel/asm-offsets.c +Removed arch/powerpc/kvm/booke_host.c +Auto-merged arch/x86/kernel/cpu/mtrr/main.c +Auto-merged arch/x86/kernel/reboot.c +CONFLICT (content): Merge conflict in arch/x86/kernel/reboot.c +Resolved 'arch/x86/kernel/reboot.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 3afa074: Merge commit 'kvm/master' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/include/asm/kvm_host.h | 196 +++-- + arch/ia64/kvm/Makefile | 4 +- + arch/ia64/kvm/asm-offsets.c | 11 +- + arch/ia64/kvm/kvm-ia64.c | 70 +- + arch/ia64/kvm/kvm_lib.c | 15 + + arch/ia64/kvm/kvm_minstate.h | 4 +- + arch/ia64/kvm/misc.h | 3 +- + arch/ia64/kvm/mmio.c | 38 +- + arch/ia64/kvm/optvfault.S | 11 +- + arch/ia64/kvm/process.c | 29 +- + arch/ia64/kvm/vcpu.c | 76 ++- + arch/ia64/kvm/vcpu.h | 5 +- + arch/ia64/kvm/vmm.c | 29 + + arch/ia64/kvm/vmm_ivt.S | 1469 +++++++++++++-------------- + arch/ia64/kvm/vtlb.c | 4 +- + arch/powerpc/include/asm/disassemble.h | 80 ++ + arch/powerpc/include/asm/kvm_44x.h | 49 + + arch/powerpc/include/asm/kvm_host.h | 62 +- + arch/powerpc/include/asm/kvm_ppc.h | 79 +- + arch/powerpc/kernel/asm-offsets.c | 16 +- + arch/powerpc/kvm/44x.c | 234 +++++ + arch/powerpc/kvm/44x_emulate.c | 362 +++++++ + arch/powerpc/kvm/44x_tlb.c | 215 ++++- + arch/powerpc/kvm/44x_tlb.h | 29 +- + arch/powerpc/kvm/Kconfig | 21 +- + arch/powerpc/kvm/Makefile | 11 +- + arch/powerpc/kvm/{booke_guest.c => booke.c} | 358 +++---- + arch/powerpc/kvm/booke.h | 57 + + arch/powerpc/kvm/booke_host.c | 83 -- + arch/powerpc/kvm/booke_interrupts.S | 6 +- + arch/powerpc/kvm/emulate.c | 443 +-------- + arch/powerpc/kvm/powerpc.c | 130 +--- + arch/s390/kvm/sigp.c | 5 + + arch/x86/include/asm/kvm_host.h | 34 +- + arch/x86/include/asm/kvm_x86_emulate.h | 10 +- + arch/x86/include/asm/mtrr.h | 25 + + arch/x86/{kvm => include/asm}/svm.h | 0 + arch/x86/include/asm/virtext.h | 132 +++ + arch/x86/{kvm => include/asm}/vmx.h | 27 +- + arch/x86/kernel/cpu/mtrr/generic.c | 12 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 18 +- + arch/x86/kernel/crash.c | 18 + + arch/x86/kernel/reboot.c | 62 ++- + arch/x86/kvm/i8254.c | 19 + + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/kvm_svm.h | 2 +- + arch/x86/kvm/lapic.c | 58 +- + arch/x86/kvm/mmu.c | 139 +++- + arch/x86/kvm/svm.c | 48 +- + arch/x86/kvm/vmx.c | 364 +++++-- + arch/x86/kvm/x86.c | 138 +++- + arch/x86/kvm/x86_emulate.c | 12 +- + include/linux/kvm.h | 11 +- + include/linux/kvm_host.h | 3 +- + virt/kvm/ioapic.c | 1 + + virt/kvm/irq_comm.c | 8 +- + virt/kvm/kvm_main.c | 18 +- + 58 files changed, 3258 insertions(+), 2110 deletions(-) + create mode 100644 arch/ia64/kvm/kvm_lib.c + create mode 100644 arch/powerpc/include/asm/disassemble.h + create mode 100644 arch/powerpc/include/asm/kvm_44x.h + create mode 100644 arch/powerpc/kvm/44x.c + create mode 100644 arch/powerpc/kvm/44x_emulate.c + rename arch/powerpc/kvm/{booke_guest.c => booke.c} (61%) + create mode 100644 arch/powerpc/kvm/booke.h + delete mode 100644 arch/powerpc/kvm/booke_host.c + rename arch/x86/{kvm => include/asm}/svm.h (100%) + create mode 100644 arch/x86/include/asm/virtext.h + rename arch/x86/{kvm => include/asm}/vmx.h (93%) +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/dir.c | 18 +++++++++--------- + fs/dlm/lowcomms.c | 8 +------- + fs/dlm/memory.c | 6 +++--- + fs/dlm/midcomms.c | 2 +- + 4 files changed, 14 insertions(+), 20 deletions(-) +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/scsi/ipr.c +Auto-merged drivers/scsi/ipr.h +Auto-merged drivers/scsi/scsi_ioctl.c +Merge made by recursive. + drivers/message/fusion/mptbase.c | 15 +- + drivers/scsi/NCR5380.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/aacraid/aachba.c | 2 +- + drivers/scsi/aacraid/commctrl.c | 14 +- + drivers/scsi/aacraid/comminit.c | 2 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/aacraid/dpcsup.c | 2 +- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/aacraid/rkt.c | 2 +- + drivers/scsi/aacraid/rx.c | 2 +- + drivers/scsi/aacraid/sa.c | 2 +- + drivers/scsi/advansys.c | 3 +- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/atp870u.c | 4 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 18 +- + drivers/scsi/eata_pio.c | 4 +- + drivers/scsi/esp_scsi.c | 6 +- + drivers/scsi/fdomain.c | 2 +- + drivers/scsi/ibmmca.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 266 ++++-- + drivers/scsi/ibmvscsi/ibmvfc.h | 26 +- + drivers/scsi/in2000.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/initio.h | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/nsp32.c | 3 +- + drivers/scsi/qla1280.c | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 298 ++++--- + drivers/scsi/qla2xxx/qla_dbg.c | 61 +- + drivers/scsi/qla2xxx/qla_def.h | 525 ++++++------ + drivers/scsi/qla2xxx/qla_dfs.c | 21 +- + drivers/scsi/qla2xxx/qla_gbl.h | 13 +- + drivers/scsi/qla2xxx/qla_gs.c | 479 ++++++------ + drivers/scsi/qla2xxx/qla_init.c | 1113 +++++++++++++------------ + drivers/scsi/qla2xxx/qla_inline.h | 27 +- + drivers/scsi/qla2xxx/qla_iocb.c | 258 +++--- + drivers/scsi/qla2xxx/qla_isr.c | 633 ++++++++------- + drivers/scsi/qla2xxx/qla_mbx.c | 759 +++++++++-------- + drivers/scsi/qla2xxx/qla_mid.c | 173 ++--- + drivers/scsi/qla2xxx/qla_os.c | 1265 +++++++++++++++------------- + drivers/scsi/qla2xxx/qla_sup.c | 537 ++++++------ + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qlogicfas408.c | 2 +- + drivers/scsi/scsi_error.c | 6 +- + drivers/scsi/scsi_ioctl.c | 4 +- + drivers/scsi/stex.c | 3 +- + drivers/scsi/sym53c416.c | 2 +- + drivers/scsi/tmscsim.c | 3 +- + drivers/scsi/u14-34f.c | 3 +- + drivers/scsi/wd7000.c | 4 +- + 53 files changed, 3496 insertions(+), 3103 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merged fs/ext3/super.c +Removed fs/ocfs2/ocfs2_jbd_compat.h +Merge made by recursive. + Documentation/filesystems/ocfs2.txt | 6 +- + fs/Kconfig | 18 +- + fs/Makefile | 1 + + fs/dquot.c | 434 +++++-- + fs/ext3/super.c | 12 +- + fs/ext4/super.c | 11 +- + fs/ocfs2/Makefile | 6 + + fs/ocfs2/acl.c | 479 ++++++++ + fs/ocfs2/acl.h | 58 + + fs/ocfs2/alloc.c | 399 +++++-- + fs/ocfs2/alloc.h | 21 + + fs/ocfs2/aops.c | 51 +- + fs/ocfs2/buffer_head_io.c | 48 +- + fs/ocfs2/buffer_head_io.h | 27 +- + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/dir.c | 147 ++- + fs/ocfs2/dlm/dlmfs.c | 4 +- + fs/ocfs2/dlm/userdlm.h | 2 +- + fs/ocfs2/dlmglue.c | 161 +++- + fs/ocfs2/dlmglue.h | 19 + + fs/ocfs2/extent_map.c | 96 ++- + fs/ocfs2/extent_map.h | 24 + + fs/ocfs2/file.c | 193 ++-- + fs/ocfs2/file.h | 3 + + fs/ocfs2/inode.c | 144 ++- + fs/ocfs2/inode.h | 18 +- + fs/ocfs2/journal.c | 176 ++- + fs/ocfs2/journal.h | 96 ++- + fs/ocfs2/localalloc.c | 8 +- + fs/ocfs2/namei.c | 280 ++++-- + fs/ocfs2/ocfs2.h | 33 +- + fs/ocfs2/ocfs2_fs.h | 126 ++- + fs/ocfs2/ocfs2_jbd_compat.h | 82 -- + fs/ocfs2/ocfs2_lockid.h | 5 + + fs/ocfs2/quota.h | 117 ++ + fs/ocfs2/quota_global.c | 989 +++++++++++++++ + fs/ocfs2/quota_local.c | 1246 +++++++++++++++++++ + fs/ocfs2/resize.c | 60 +- + fs/ocfs2/slot_map.c | 4 +- + fs/ocfs2/stack_user.c | 3 + + fs/ocfs2/suballoc.c | 278 +++-- + fs/ocfs2/suballoc.h | 18 +- + fs/ocfs2/super.c | 310 +++++- + fs/ocfs2/symlink.c | 2 +- + fs/ocfs2/xattr.c | 2267 +++++++++++++++++++++-------------- + fs/ocfs2/xattr.h | 31 + + fs/quota.c | 11 +- + fs/quota_tree.c | 645 ++++++++++ + fs/quota_tree.h | 25 + + fs/quota_v1.c | 28 +- + fs/quota_v2.c | 631 ++--------- + {include/linux => fs}/quotaio_v1.h | 0 + {include/linux => fs}/quotaio_v2.h | 33 +- + fs/reiserfs/super.c | 8 +- + include/linux/Kbuild | 2 - + include/linux/dqblk_qtree.h | 56 + + include/linux/dqblk_v1.h | 4 - + include/linux/dqblk_v2.h | 21 +- + include/linux/quota.h | 104 ++- + include/linux/quotaops.h | 94 ++- + mm/pdflush.c | 1 + + 61 files changed, 7634 insertions(+), 2543 deletions(-) + create mode 100644 fs/ocfs2/acl.c + create mode 100644 fs/ocfs2/acl.h + delete mode 100644 fs/ocfs2/ocfs2_jbd_compat.h + create mode 100644 fs/ocfs2/quota.h + create mode 100644 fs/ocfs2/quota_global.c + create mode 100644 fs/ocfs2/quota_local.c + create mode 100644 fs/quota_tree.c + create mode 100644 fs/quota_tree.h + rename {include/linux => fs}/quotaio_v1.h (100%) + rename {include/linux => fs}/quotaio_v2.h (68%) + create mode 100644 include/linux/dqblk_qtree.h +$ git reset --hard HEAD^ +HEAD is now at fce27af Merge commit 'scsi/master' +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/ext3/super.c +Merge made by recursive. + fs/ext3/hash.c | 77 ++++++++++++++++++++++++++++++++++++++------ + fs/ext3/namei.c | 7 ++++ + fs/ext3/super.c | 12 +++++++ + fs/ext4/balloc.c | 4 +- + fs/ext4/ext4.h | 3 ++ + fs/ext4/ext4_sb.h | 1 + + fs/ext4/hash.c | 77 ++++++++++++++++++++++++++++++++++++++------ + fs/ext4/ialloc.c | 4 +- + fs/ext4/inode.c | 76 ++++++++++++++++++++++++++++++++----------- + fs/ext4/namei.c | 7 ++++ + fs/ext4/super.c | 12 +++++++ + include/linux/ext3_fs.h | 28 +++++++++++++++- + include/linux/ext3_fs_sb.h | 1 + + 13 files changed, 264 insertions(+), 45 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Merge made by recursive. + Documentation/crypto/async-tx-api.txt | 135 ++++---- + Documentation/dmaengine.txt | 1 + + arch/avr32/include/asm/atmel-mci.h | 6 +- + arch/avr32/mach-at32ap/at32ap700x.c | 15 +- + crypto/async_tx/async_tx.c | 350 +----------------- + drivers/dma/Kconfig | 2 - + drivers/dma/dmaengine.c | 659 +++++++++++++++++++++++---------- + drivers/dma/dmatest.c | 117 +++---- + drivers/dma/dw_dmac.c | 28 +- + drivers/dma/fsldma.c | 3 +- + drivers/dma/ioat.c | 92 ++--- + drivers/dma/ioat_dma.c | 10 +- + drivers/dma/iop-adma.c | 30 +-- + drivers/dma/mv_xor.c | 11 +- + drivers/mmc/host/atmel-mci.c | 103 ++---- + include/linux/async_tx.h | 17 +- + include/linux/dmaengine.h | 148 ++------ + include/linux/dw_dmac.h | 31 ++- + include/linux/netdevice.h | 3 - + include/net/netdma.h | 11 - + net/core/dev.c | 149 +-------- + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + 25 files changed, 747 insertions(+), 1185 deletions(-) + create mode 100644 Documentation/dmaengine.txt +Merging udf/for_next +$ git merge udf/for_next +Merge made by recursive. + Documentation/filesystems/udf.txt | 2 + + fs/udf/balloc.c | 91 ++++---- + fs/udf/dir.c | 14 +- + fs/udf/directory.c | 38 ++-- + fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 213 ++++++++++--------- + fs/udf/misc.c | 29 ++-- + fs/udf/namei.c | 86 ++++---- + fs/udf/osta_udf.h | 22 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 139 ++++++++----- + fs/udf/truncate.c | 44 ++-- + fs/udf/udf_i.h | 6 +- + fs/udf/udf_sb.h | 2 + + fs/udf/udfdecl.h | 46 +++-- + fs/udf/udfend.h | 28 ++-- + fs/udf/udftime.c | 6 +- + fs/udf/unicode.c | 41 +++-- + 19 files changed, 653 insertions(+), 576 deletions(-) +Merging net/master +$ git merge net/master +Removed Documentation/DocBook/wanbook.tmpl +Auto-merged MAINTAINERS +Auto-merged arch/xtensa/platforms/iss/network.c +Auto-merged drivers/infiniband/core/sysfs.c +Auto-merged drivers/infiniband/ulp/srp/ib_srp.c +Auto-merged drivers/net/Kconfig +Auto-merged drivers/net/Makefile +Auto-merged drivers/net/chelsio/sge.c +Auto-merged drivers/net/cs89x0.c +Auto-merged drivers/net/e1000e/netdev.c +Removed drivers/net/eepro100.c +Auto-merged drivers/net/igb/igb_main.c +Auto-merged drivers/net/ixgbe/ixgbe_main.c +Auto-merged drivers/net/pcmcia/axnet_cs.c +Auto-merged drivers/net/pcmcia/pcnet_cs.c +Removed drivers/net/phy/mdio-ofgpio.c +Auto-merged drivers/net/phy/phy_device.c +Auto-merged drivers/net/sis900.c +Auto-merged drivers/net/usb/pegasus.c +Removed drivers/net/wan/syncppp.c +Auto-merged drivers/net/wireless/ath5k/base.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ath5k/base.c +Auto-merged drivers/net/wireless/ath9k/beacon.c +Auto-merged drivers/net/wireless/ath9k/recv.c +Auto-merged drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merged drivers/s390/net/qeth_l2_main.c +Auto-merged fs/lockd/host.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged include/linux/kernel.h +Auto-merged include/linux/netdevice.h +Removed include/net/syncppp.h +Auto-merged net/bridge/br_netfilter.c +Auto-merged net/core/dev.c +Auto-merged net/core/sock.c +Removed net/ieee80211/Kconfig +Removed net/ieee80211/Makefile +Removed net/ieee80211/ieee80211_crypt.c +Auto-merged net/ipv4/tcp.c +Auto-merged net/ipv4/tcp_input.c +Auto-merged net/ipv4/tcp_ipv4.c +Auto-merged net/ipv4/tcp_output.c +Auto-merged net/ipv6/tcp_ipv6.c +Auto-merged net/mac80211/wext.c +Auto-merged net/sunrpc/svcsock.c +Auto-merged net/wireless/reg.c +CONFLICT (content): Merge conflict in net/wireless/reg.c +Recorded preimage for 'drivers/net/wireless/ath5k/base.c' +Recorded preimage for 'net/wireless/reg.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/wireless/ath5k/base.c'. +Recorded resolution for 'net/wireless/reg.c'. +Created commit 90648e3: Merge commit 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/networking.tmpl | 3 - + Documentation/DocBook/wanbook.tmpl | 99 - + Documentation/RCU/rculist_nulls.txt | 167 + + Documentation/feature-removal-schedule.txt | 7 - + Documentation/networking/README.ipw2200 | 2 +- + Documentation/networking/bonding.txt | 68 +- + Documentation/networking/dccp.txt | 21 +- + Documentation/networking/generic-hdlc.txt | 8 +- + Documentation/networking/ip-sysctl.txt | 6 + + Documentation/networking/mac80211_hwsim/README | 9 +- + Documentation/networking/regulatory.txt | 22 +- + Documentation/rfkill.txt | 20 +- + MAINTAINERS | 35 +- + arch/arm/mach-ixp4xx/fsg-setup.c | 9 +- + arch/arm/mach-ixp4xx/nas100d-setup.c | 5 +- + arch/arm/mach-ixp4xx/nslu2-setup.c | 5 +- + arch/s390/appldata/appldata_net_sum.c | 4 +- + arch/sparc64/kernel/idprom.c | 5 +- + arch/um/drivers/net_kern.c | 7 +- + arch/xtensa/platforms/iss/network.c | 5 +- + drivers/block/aoe/aoe.h | 1 - + drivers/block/aoe/aoeblk.c | 2 +- + drivers/block/aoe/aoecmd.c | 22 +- + drivers/block/aoe/aoenet.c | 11 - + drivers/firmware/iscsi_ibft.c | 7 +- + drivers/infiniband/core/sysfs.c | 10 +- + drivers/infiniband/hw/amso1100/c2_provider.c | 8 +- + drivers/infiniband/hw/mthca/mthca_mcg.c | 23 +- + drivers/infiniband/hw/nes/nes.c | 17 +- + drivers/infiniband/hw/nes/nes_cm.c | 31 +- + drivers/infiniband/hw/nes/nes_nic.c | 10 +- + drivers/infiniband/hw/nes/nes_utils.c | 5 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 23 - + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 25 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 70 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 8 +- + drivers/infiniband/ulp/srp/ib_srp.c | 31 +- + drivers/isdn/i4l/isdn_net.c | 141 +- + drivers/isdn/i4l/isdn_net.h | 43 - + drivers/isdn/i4l/isdn_ppp.c | 12 +- + drivers/media/dvb/b2c2/flexcop.c | 2 +- + drivers/media/dvb/bt8xx/dst.c | 4 +- + drivers/media/dvb/dm1105/dm1105.c | 3 +- + drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 5 +- + drivers/media/dvb/pluto2/pluto2.c | 3 +- + drivers/message/fusion/mptlan.c | 12 +- + drivers/net/3c501.c | 3 +- + drivers/net/3c503.c | 3 +- + drivers/net/3c505.c | 51 +- + drivers/net/3c507.c | 4 +- + drivers/net/3c509.c | 6 +- + drivers/net/3c515.c | 5 +- + drivers/net/3c523.c | 44 +- + drivers/net/3c527.c | 4 +- + drivers/net/3c59x.c | 13 +- + drivers/net/7990.c | 1 - + drivers/net/8139cp.c | 41 +- + drivers/net/8139too.c | 51 +- + drivers/net/82596.c | 42 +- + drivers/net/8390.h | 5 + + drivers/net/Kconfig | 42 +- + drivers/net/Makefile | 2 +- + drivers/net/a2065.c | 5 +- + drivers/net/ac3200.c | 5 +- + drivers/net/acenic.c | 30 +- + drivers/net/amd8111e.c | 6 +- + drivers/net/apne.c | 3 +- + drivers/net/appletalk/cops.c | 1 - + drivers/net/appletalk/ipddp.c | 6 +- + drivers/net/appletalk/ltpc.c | 13 +- + drivers/net/arcnet/arc-rawmode.c | 5 +- + drivers/net/arcnet/arc-rimi.c | 16 +- + drivers/net/arcnet/arcnet.c | 32 +- + drivers/net/arcnet/capmode.c | 7 +- + drivers/net/arcnet/com20020-isa.c | 4 +- + drivers/net/arcnet/com20020-pci.c | 2 +- + drivers/net/arcnet/com20020.c | 10 +- + drivers/net/arcnet/com90io.c | 4 +- + drivers/net/arcnet/com90xx.c | 10 +- + drivers/net/arcnet/rfc1051.c | 9 +- + drivers/net/arcnet/rfc1201.c | 14 +- + drivers/net/ariadne.c | 21 +- + drivers/net/arm/am79c961a.c | 7 +- + drivers/net/arm/at91_ether.c | 11 +- + drivers/net/arm/ep93xx_eth.c | 2 - + drivers/net/arm/ether1.c | 5 +- + drivers/net/arm/ether3.c | 5 +- + drivers/net/arm/etherh.c | 5 +- + drivers/net/arm/ixp4xx_eth.c | 1 - + drivers/net/at1700.c | 4 +- + drivers/net/atarilance.c | 52 +- + drivers/net/atl1e/atl1e_main.c | 40 +- + drivers/net/atlx/atl1.c | 98 +- + drivers/net/atlx/atl1.h | 4 +- + drivers/net/atlx/atl2.c | 101 +- + drivers/net/atlx/atl2.h | 1 - + drivers/net/atlx/atlx.c | 13 - + drivers/net/atp.c | 8 +- + drivers/net/au1000_eth.c | 49 +- + drivers/net/ax88796.c | 9 +- + drivers/net/b44.c | 6 +- + drivers/net/bfin_mac.c | 1 - + drivers/net/bmac.c | 7 +- + drivers/net/bnx2.c | 73 +- + drivers/net/bnx2.h | 35 +- + drivers/net/bnx2x_main.c | 50 +- + drivers/net/bonding/Makefile | 3 + + drivers/net/bonding/bond_3ad.c | 333 +- + drivers/net/bonding/bond_3ad.h | 10 +- + drivers/net/bonding/bond_alb.c | 25 +- + drivers/net/bonding/bond_ipv6.c | 218 + + drivers/net/bonding/bond_main.c | 315 +- + drivers/net/bonding/bond_sysfs.c | 150 +- + drivers/net/bonding/bonding.h | 39 +- + drivers/net/cassini.c | 8 +- + drivers/net/chelsio/cxgb2.c | 94 +- + drivers/net/chelsio/sge.c | 3 +- + drivers/net/cpmac.c | 5 +- + drivers/net/cris/eth_v10.c | 4 +- + drivers/net/cs89x0.c | 14 +- + drivers/net/cxgb3/cxgb3_main.c | 99 +- + drivers/net/cxgb3/sge.c | 1 - + drivers/net/de600.c | 4 +- + drivers/net/de620.c | 9 +- + drivers/net/declance.c | 7 +- + drivers/net/defxx.c | 20 +- + drivers/net/depca.c | 54 +- + drivers/net/dl2k.c | 28 +- + drivers/net/dm9000.c | 40 +- + drivers/net/dummy.c | 15 +- + drivers/net/e100.c | 51 +- + drivers/net/e1000/e1000_main.c | 58 +- + drivers/net/e1000e/82571.c | 19 +- + drivers/net/e1000e/defines.h | 8 + + drivers/net/e1000e/e1000.h | 2 + + drivers/net/e1000e/es2lan.c | 192 +- + drivers/net/e1000e/ethtool.c | 82 +- + drivers/net/e1000e/hw.h | 8 +- + drivers/net/e1000e/ich8lan.c | 151 +- + drivers/net/e1000e/lib.c | 80 +- + drivers/net/e1000e/netdev.c | 111 +- + drivers/net/e1000e/phy.c | 12 +- + drivers/net/eepro.c | 8 +- + drivers/net/eepro100.c | 2401 ------ + drivers/net/eexpress.c | 1 - + drivers/net/ehea/ehea.h | 2 +- + drivers/net/ehea/ehea_main.c | 1 - + drivers/net/ehea/ehea_qmr.c | 10 +- + drivers/net/enc28j60.c | 19 +- + drivers/net/enic/cq_desc.h | 5 +- + drivers/net/enic/enic.h | 2 +- + drivers/net/enic/enic_main.c | 74 +- + drivers/net/enic/enic_res.c | 7 +- + drivers/net/enic/enic_res.h | 4 - + drivers/net/enic/vnic_dev.c | 70 +- + drivers/net/enic/vnic_devcmd.h | 19 +- + drivers/net/enic/vnic_intr.h | 2 +- + drivers/net/enic/vnic_resource.h | 2 +- + drivers/net/enic/vnic_rq.h | 9 +- + drivers/net/enic/vnic_rss.h | 13 + + drivers/net/enic/vnic_wq.h | 9 +- + drivers/net/epic100.c | 50 +- + drivers/net/eql.c | 12 +- + drivers/net/es3210.c | 9 +- + drivers/net/eth16i.c | 3 +- + drivers/net/ewrk3.c | 8 +- + drivers/net/fealnx.c | 6 +- + drivers/net/fec.c | 6 +- + drivers/net/fec_mpc52xx.c | 3 +- + drivers/net/forcedeth.c | 62 +- + drivers/net/fs_enet/fs_enet-main.c | 5 +- + drivers/net/gianfar.c | 8 +- + drivers/net/hamachi.c | 27 +- + drivers/net/hamradio/6pack.c | 1 - + drivers/net/hamradio/baycom_epp.c | 1 - + drivers/net/hamradio/bpqether.c | 8 +- + drivers/net/hamradio/dmascc.c | 13 +- + drivers/net/hamradio/hdlcdrv.c | 1 - + drivers/net/hamradio/mkiss.c | 1 - + drivers/net/hamradio/scc.c | 13 +- + drivers/net/hamradio/yam.c | 1 - + drivers/net/hp-plus.c | 3 +- + drivers/net/hp.c | 3 +- + drivers/net/hp100.c | 7 +- + drivers/net/hydra.c | 5 +- + drivers/net/ibm_newemac/core.c | 11 +- + drivers/net/ibmlana.c | 6 +- + drivers/net/ibmveth.c | 40 +- + drivers/net/ifb.c | 13 +- + drivers/net/igb/e1000_defines.h | 6 - + drivers/net/igb/igb.h | 36 + + drivers/net/igb/igb_ethtool.c | 129 +- + drivers/net/igb/igb_main.c | 103 +- + drivers/net/ioc3-eth.c | 13 +- + drivers/net/ipg.c | 9 - + drivers/net/irda/ali-ircc.c | 17 +- + drivers/net/irda/au1k_ir.c | 1 - + drivers/net/irda/donauboe.c | 8 +- + drivers/net/irda/irda-usb.c | 15 +- + drivers/net/irda/kingsun-sir.c | 1 - + drivers/net/irda/ks959-sir.c | 1 - + drivers/net/irda/ksdazzle-sir.c | 1 - + drivers/net/irda/mcs7780.c | 1 - + drivers/net/irda/nsc-ircc.c | 17 +- + drivers/net/irda/pxaficp_ir.c | 4 - + drivers/net/irda/sa1100_ir.c | 28 +- + drivers/net/irda/sir_dev.c | 12 +- + drivers/net/irda/stir4200.c | 1 - + drivers/net/irda/via-ircc.c | 16 +- + drivers/net/irda/vlsi_ir.c | 37 +- + drivers/net/irda/w83977af_ir.c | 15 +- + drivers/net/isa-skeleton.c | 4 +- + drivers/net/iseries_veth.c | 14 +- + drivers/net/ixgb/ixgb_main.c | 37 +- + drivers/net/ixgbe/Makefile | 2 + + drivers/net/ixgbe/ixgbe.h | 31 +- + drivers/net/ixgbe/ixgbe_82598.c | 172 +- + drivers/net/ixgbe/ixgbe_dcb.c | 332 + + drivers/net/ixgbe/ixgbe_dcb.h | 184 + + drivers/net/ixgbe/ixgbe_dcb_82598.c | 398 + + drivers/net/ixgbe/ixgbe_dcb_82598.h | 94 + + drivers/net/ixgbe/ixgbe_dcb_nl.c | 615 ++ + drivers/net/ixgbe/ixgbe_ethtool.c | 63 +- + drivers/net/ixgbe/ixgbe_main.c | 386 +- + drivers/net/ixgbe/ixgbe_phy.c | 326 + + drivers/net/ixgbe/ixgbe_phy.h | 25 + + drivers/net/ixgbe/ixgbe_type.h | 28 +- + drivers/net/ixp2000/ixpdev.c | 2 - + drivers/net/jazzsonic.c | 4 +- + drivers/net/jme.c | 35 +- + drivers/net/korina.c | 1 - + drivers/net/lance.c | 30 +- + drivers/net/lib82596.c | 14 +- + drivers/net/lib8390.c | 27 +- + drivers/net/lne390.c | 5 +- + drivers/net/loopback.c | 29 +- + drivers/net/lp486e.c | 29 +- + drivers/net/mac89x0.c | 5 +- + drivers/net/macb.c | 8 +- + drivers/net/mace.c | 34 +- + drivers/net/macmace.c | 6 +- + drivers/net/macsonic.c | 9 +- + drivers/net/macvlan.c | 49 +- + drivers/net/meth.c | 4 +- + drivers/net/mlx4/en_netdev.c | 34 +- + drivers/net/mlx4/en_rx.c | 5 +- + drivers/net/mlx4/mcg.c | 25 +- + drivers/net/mlx4/mlx4_en.h | 8 +- + drivers/net/mv643xx_eth.c | 525 +- + drivers/net/mvme147.c | 9 +- + drivers/net/myri10ge/myri10ge.c | 60 +- + drivers/net/myri10ge/myri10ge_mcp_gen_header.h | 1 + + drivers/net/myri_sbus.c | 25 +- + drivers/net/natsemi.c | 6 +- + drivers/net/ne-h8300.c | 3 +- + drivers/net/ne.c | 3 +- + drivers/net/ne2.c | 6 +- + drivers/net/ne2k-pci.c | 28 +- + drivers/net/ne3210.c | 5 +- + drivers/net/netconsole.c | 9 +- + drivers/net/netx-eth.c | 1 - + drivers/net/netxen/netxen_nic_ethtool.c | 10 +- + drivers/net/netxen/netxen_nic_hw.c | 2 +- + drivers/net/netxen/netxen_nic_init.c | 2 - + drivers/net/netxen/netxen_nic_main.c | 55 +- + drivers/net/netxen/netxen_nic_niu.c | 7 +- + drivers/net/ni5010.c | 6 +- + drivers/net/ni52.c | 37 +- + drivers/net/ni65.c | 33 +- + drivers/net/niu.c | 62 +- + drivers/net/niu.h | 1 + + drivers/net/ns83820.c | 28 +- + drivers/net/pasemi_mac.c | 8 +- + drivers/net/pasemi_mac_ethtool.c | 4 +- + drivers/net/pci-skeleton.c | 6 +- + drivers/net/pcmcia/3c574_cs.c | 6 +- + drivers/net/pcmcia/3c589_cs.c | 6 +- + drivers/net/pcmcia/axnet_cs.c | 22 +- + drivers/net/pcmcia/com20020_cs.c | 6 +- + drivers/net/pcmcia/fmvj18x_cs.c | 79 +- + drivers/net/pcmcia/nmclan_cs.c | 6 +- + drivers/net/pcmcia/pcnet_cs.c | 3 +- + drivers/net/pcmcia/smc91c92_cs.c | 5 +- + drivers/net/pcmcia/xirc2ps_cs.c | 6 +- + drivers/net/pcnet32.c | 4 +- + drivers/net/phy/Kconfig | 7 +- + drivers/net/phy/Makefile | 2 +- + drivers/net/phy/broadcom.c | 216 +- + drivers/net/phy/mdio-gpio.c | 296 + + drivers/net/phy/mdio-ofgpio.c | 204 - + drivers/net/phy/mdio_bus.c | 4 +- + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/phy/smsc.c | 28 + + drivers/net/plip.c | 9 +- + drivers/net/ppp_generic.c | 25 +- + drivers/net/pppoe.c | 5 +- + drivers/net/ps3_gelic_net.c | 6 +- + drivers/net/ps3_gelic_wireless.c | 37 +- + drivers/net/ps3_gelic_wireless.h | 4 +- + drivers/net/qla3xxx.c | 35 +- + drivers/net/qlge/qlge_main.c | 69 +- + drivers/net/r6040.c | 30 +- + drivers/net/r8169.c | 51 +- + drivers/net/rionet.c | 31 +- + drivers/net/rrunner.c | 19 +- + drivers/net/s2io.c | 134 +- + drivers/net/sb1000.c | 1 - + drivers/net/sb1250-mac.c | 5 +- + drivers/net/sc92031.c | 30 +- + drivers/net/seeq8005.c | 4 +- + drivers/net/sfc/Kconfig | 8 + + drivers/net/sfc/Makefile | 1 + + drivers/net/sfc/boards.c | 136 + + drivers/net/sfc/efx.c | 78 +- + drivers/net/sfc/efx.h | 10 + + drivers/net/sfc/enum.h | 4 +- + drivers/net/sfc/ethtool.c | 17 +- + drivers/net/sfc/falcon.c | 23 +- + drivers/net/sfc/falcon_hwdefs.h | 1 - + drivers/net/sfc/mdio_10g.c | 35 + + drivers/net/sfc/mdio_10g.h | 7 + + drivers/net/sfc/mtd.c | 268 + + drivers/net/sfc/net_driver.h | 8 + + drivers/net/sfc/rx.c | 2 +- + drivers/net/sfc/sfe4001.c | 116 +- + drivers/net/sfc/spi.h | 34 +- + drivers/net/sfc/tenxpress.c | 18 +- + drivers/net/sfc/workarounds.h | 2 + + drivers/net/sfc/xfp_phy.c | 9 + + drivers/net/sgiseeq.c | 7 +- + drivers/net/sh_eth.c | 3 +- + drivers/net/sis190.c | 7 +- + drivers/net/sis900.c | 99 +- + drivers/net/skfp/skfddi.c | 21 +- + drivers/net/skge.c | 97 +- + drivers/net/sky2.c | 56 +- + drivers/net/slip.c | 1 - + drivers/net/smc-mca.c | 5 +- + drivers/net/smc-ultra.c | 5 +- + drivers/net/smc-ultra32.c | 5 +- + drivers/net/smc911x.c | 2 - + drivers/net/smc9194.c | 11 +- + drivers/net/smc91x.c | 8 +- + drivers/net/smc91x.h | 45 +- + drivers/net/smsc911x.c | 2091 +++++ + drivers/net/smsc911x.h | 394 + + drivers/net/sonic.c | 1 - + drivers/net/sonic.h | 20 +- + drivers/net/spider_net_ethtool.c | 8 +- + drivers/net/starfire.c | 14 +- + drivers/net/sun3_82586.c | 38 +- + drivers/net/sun3lance.c | 10 +- + drivers/net/sunbmac.c | 20 +- + drivers/net/sundance.c | 6 +- + drivers/net/sungem.c | 59 +- + drivers/net/sunhme.c | 31 +- + drivers/net/sunlance.c | 7 +- + drivers/net/sunqe.c | 15 +- + drivers/net/sunvnet.c | 5 +- + drivers/net/tc35815.c | 23 +- + drivers/net/tehuti.c | 66 +- + drivers/net/tg3.c | 907 ++- + drivers/net/tg3.h | 142 +- + drivers/net/tlan.c | 2 - + drivers/net/tokenring/3c359.c | 8 +- + drivers/net/tokenring/abyss.c | 4 +- + drivers/net/tokenring/ibmtr.c | 11 +- + drivers/net/tokenring/lanstreamer.c | 36 +- + drivers/net/tokenring/madgemc.c | 10 +- + drivers/net/tokenring/olympic.c | 52 +- + drivers/net/tokenring/proteon.c | 5 +- + drivers/net/tokenring/skisa.c | 5 +- + drivers/net/tokenring/smctr.c | 2 - + drivers/net/tokenring/tms380tr.c | 15 +- + drivers/net/tokenring/tmspci.c | 5 +- + drivers/net/tsi108_eth.c | 6 +- + drivers/net/tulip/de2104x.c | 50 +- + drivers/net/tulip/de4x5.c | 17 +- + drivers/net/tulip/dmfe.c | 7 +- + drivers/net/tulip/eeprom.c | 2 +- + drivers/net/tulip/interrupt.c | 2 - + drivers/net/tulip/tulip_core.c | 11 +- + drivers/net/tulip/uli526x.c | 8 +- + drivers/net/tulip/winbond-840.c | 16 +- + drivers/net/tulip/xircom_cb.c | 4 +- + drivers/net/tun.c | 33 +- + drivers/net/typhoon.c | 8 +- + drivers/net/ucc_geth.c | 6 +- + drivers/net/usb/catc.c | 2 - + drivers/net/usb/hso.c | 31 +- + drivers/net/usb/mcs7830.c | 4 +- + drivers/net/usb/pegasus.c | 41 +- + drivers/net/usb/smsc95xx.c | 79 +- + drivers/net/usb/usbnet.c | 5 +- + drivers/net/veth.c | 30 +- + drivers/net/via-rhine.c | 34 +- + drivers/net/via-velocity.c | 28 +- + drivers/net/virtio_net.c | 193 +- + drivers/net/wan/Kconfig | 2 + + drivers/net/wan/Makefile | 2 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/cosa.c | 1 - + drivers/net/wan/cycx_x25.c | 91 +- + drivers/net/wan/dlci.c | 37 +- + drivers/net/wan/dscc4.c | 4 +- + drivers/net/wan/farsync.c | 2 - + drivers/net/wan/{hd6457x.c => hd64570.c} | 255 +- + drivers/net/wan/hd64572.c | 640 ++ + drivers/net/wan/hdlc_fr.c | 10 +- + drivers/net/wan/hdlc_ppp.c | 648 ++- + drivers/net/wan/hostess_sv11.c | 1 - + drivers/net/wan/lapbether.c | 3 - + drivers/net/wan/lmc/lmc_main.c | 1 - + drivers/net/wan/lmc/lmc_proto.c | 1 - + drivers/net/wan/n2.c | 9 +- + drivers/net/wan/pc300_drv.c | 17 +- + drivers/net/wan/pc300too.c | 121 +- + drivers/net/wan/pci200syn.c | 79 +- + drivers/net/wan/sbni.c | 101 +- + drivers/net/wan/sdla.c | 48 +- + drivers/net/wan/sealevel.c | 1 - + drivers/net/wan/syncppp.c | 1480 ---- + drivers/net/wan/wanxl.c | 1 - + drivers/net/wan/x25_asy.c | 32 +- + drivers/net/wan/z85230.c | 2 +- + drivers/net/wd.c | 5 +- + drivers/net/wireless/Kconfig | 146 +- + drivers/net/wireless/Makefile | 22 +- + drivers/net/wireless/adm8211.c | 52 +- + drivers/net/wireless/adm8211.h | 2 - + drivers/net/wireless/airo.c | 241 +- + drivers/net/wireless/arlan-main.c | 27 +- + drivers/net/wireless/ath5k/ath5k.h | 89 +- + drivers/net/wireless/ath5k/base.c | 139 +- + drivers/net/wireless/ath5k/dma.c | 190 +- + drivers/net/wireless/ath5k/initvals.c | 8 +- + drivers/net/wireless/ath5k/pcu.c | 184 +- + drivers/net/wireless/ath5k/phy.c | 9 +- + drivers/net/wireless/ath5k/qcu.c | 37 +- + drivers/net/wireless/ath5k/reg.h | 15 +- + drivers/net/wireless/ath5k/reset.c | 7 +- + drivers/net/wireless/ath9k/Makefile | 4 + + drivers/net/wireless/ath9k/ani.c | 854 ++ + drivers/net/wireless/ath9k/ath9k.h | 389 +- + drivers/net/wireless/ath9k/beacon.c | 42 +- + drivers/net/wireless/ath9k/calib.c | 930 +++ + drivers/net/wireless/ath9k/core.c | 486 +- + drivers/net/wireless/ath9k/core.h | 165 +- + drivers/net/wireless/ath9k/eeprom.c | 1605 ++++ + drivers/net/wireless/ath9k/hw.c | 8497 +++++--------------- + drivers/net/wireless/ath9k/hw.h | 2 +- + drivers/net/wireless/ath9k/mac.c | 1031 +++ + drivers/net/wireless/ath9k/main.c | 623 +- + drivers/net/wireless/ath9k/phy.c | 10 +- + drivers/net/wireless/ath9k/rc.c | 151 +- + drivers/net/wireless/ath9k/rc.h | 1 - + drivers/net/wireless/ath9k/recv.c | 542 +-- + drivers/net/wireless/ath9k/xmit.c | 1037 +-- + drivers/net/wireless/atmel.c | 77 +- + drivers/net/wireless/b43/b43.h | 1 - + drivers/net/wireless/b43/dma.c | 4 +- + drivers/net/wireless/b43/main.c | 227 +- + drivers/net/wireless/b43/pio.c | 3 +- + drivers/net/wireless/b43/xmit.c | 64 +- + drivers/net/wireless/b43/xmit.h | 5 +- + drivers/net/wireless/b43legacy/b43legacy.h | 5 +- + drivers/net/wireless/b43legacy/dma.c | 48 +- + drivers/net/wireless/b43legacy/main.c | 211 +- + drivers/net/wireless/b43legacy/pio.c | 31 +- + drivers/net/wireless/b43legacy/xmit.c | 26 +- + drivers/net/wireless/b43legacy/xmit.h | 2 +- + drivers/net/wireless/hostap/Kconfig | 6 +- + drivers/net/wireless/hostap/hostap.h | 2 +- + drivers/net/wireless/hostap/hostap_80211.h | 2 +- + drivers/net/wireless/hostap/hostap_80211_rx.c | 72 +- + drivers/net/wireless/hostap/hostap_80211_tx.c | 23 +- + drivers/net/wireless/hostap/hostap_ap.c | 253 +- + drivers/net/wireless/hostap/hostap_ap.h | 8 +- + drivers/net/wireless/hostap/hostap_common.h | 13 - + drivers/net/wireless/hostap/hostap_hw.c | 71 +- + drivers/net/wireless/hostap/hostap_info.c | 16 +- + drivers/net/wireless/hostap/hostap_ioctl.c | 157 +- + drivers/net/wireless/hostap/hostap_main.c | 45 +- + drivers/net/wireless/hostap/hostap_pci.c | 2 +- + drivers/net/wireless/hostap/hostap_proc.c | 35 +- + drivers/net/wireless/hostap/hostap_wlan.h | 8 +- + drivers/net/wireless/ipw2x00/Kconfig | 191 + + drivers/net/wireless/ipw2x00/Makefile | 14 + + drivers/net/wireless/{ => ipw2x00}/ipw2100.c | 65 +- + drivers/net/wireless/{ => ipw2x00}/ipw2100.h | 0 + drivers/net/wireless/{ => ipw2x00}/ipw2200.c | 430 +- + drivers/net/wireless/{ => ipw2x00}/ipw2200.h | 1 + + .../net/wireless/ipw2x00/libipw_geo.c | 0 + .../net/wireless/ipw2x00/libipw_module.c | 51 +- + .../net/wireless/ipw2x00/libipw_rx.c | 124 +- + .../net/wireless/ipw2x00/libipw_tx.c | 7 +- + .../net/wireless/ipw2x00/libipw_wx.c | 98 +- + drivers/net/wireless/iwlwifi/Kconfig | 2 + + drivers/net/wireless/iwlwifi/Makefile | 1 + + drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-3945-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 76 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 74 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 195 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 176 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 62 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 320 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 104 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 845 +-- + drivers/net/wireless/iwlwifi/iwl-calib.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 209 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 235 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 31 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 19 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 109 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 5 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 143 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 107 - + drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 35 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 30 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 129 +- + drivers/net/wireless/iwlwifi/iwl-spectrum.c | 198 + + drivers/net/wireless/iwlwifi/iwl-spectrum.h | 1 + + drivers/net/wireless/iwlwifi/iwl-sta.c | 100 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 414 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 265 +- + drivers/net/wireless/libertas/assoc.c | 69 +- + drivers/net/wireless/libertas/cmd.c | 32 +- + drivers/net/wireless/libertas/cmd.h | 3 +- + drivers/net/wireless/libertas/debugfs.c | 11 +- + drivers/net/wireless/libertas/decl.h | 4 - + drivers/net/wireless/libertas/defs.h | 14 +- + drivers/net/wireless/libertas/dev.h | 7 +- + drivers/net/wireless/libertas/ethtool.c | 14 +- + drivers/net/wireless/libertas/host.h | 8 + + drivers/net/wireless/libertas/hostcmd.h | 26 +- + drivers/net/wireless/libertas/if_usb.c | 3 +- + drivers/net/wireless/libertas/main.c | 75 +- + drivers/net/wireless/libertas/persistcfg.c | 18 +- + drivers/net/wireless/libertas/scan.c | 105 +- + drivers/net/wireless/libertas/scan.h | 4 + + drivers/net/wireless/libertas/tx.c | 2 +- + drivers/net/wireless/libertas/types.h | 5 +- + drivers/net/wireless/libertas/wext.c | 80 +- + drivers/net/wireless/libertas_tf/cmd.c | 5 +- + drivers/net/wireless/libertas_tf/main.c | 8 +- + drivers/net/wireless/mac80211_hwsim.c | 294 +- + drivers/net/wireless/netwave_cs.c | 6 +- + drivers/net/wireless/orinoco/Makefile | 12 + + drivers/net/wireless/{ => orinoco}/airport.c | 0 + drivers/net/wireless/{ => orinoco}/hermes.c | 0 + drivers/net/wireless/{ => orinoco}/hermes.h | 0 + drivers/net/wireless/{ => orinoco}/hermes_dld.c | 0 + drivers/net/wireless/{ => orinoco}/hermes_dld.h | 0 + drivers/net/wireless/{ => orinoco}/hermes_rid.h | 0 + drivers/net/wireless/{ => orinoco}/orinoco.c | 87 +- + drivers/net/wireless/{ => orinoco}/orinoco.h | 5 + + drivers/net/wireless/{ => orinoco}/orinoco_cs.c | 2 +- + .../net/wireless/{ => orinoco}/orinoco_nortel.c | 0 + drivers/net/wireless/{ => orinoco}/orinoco_pci.c | 0 + drivers/net/wireless/{ => orinoco}/orinoco_pci.h | 0 + drivers/net/wireless/{ => orinoco}/orinoco_plx.c | 0 + drivers/net/wireless/{ => orinoco}/orinoco_tmd.c | 0 + drivers/net/wireless/{ => orinoco}/spectrum_cs.c | 2 +- + drivers/net/wireless/p54/p54.h | 52 +- + drivers/net/wireless/p54/p54common.c | 1160 ++- + drivers/net/wireless/p54/p54common.h | 316 +- + drivers/net/wireless/p54/p54pci.c | 33 +- + drivers/net/wireless/p54/p54usb.c | 98 +- + drivers/net/wireless/prism54/isl_ioctl.c | 24 +- + drivers/net/wireless/ray_cs.c | 10 +- + drivers/net/wireless/rndis_wlan.c | 95 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 302 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 2 + + drivers/net/wireless/rt2x00/rt2500pci.c | 336 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 2 + + drivers/net/wireless/rt2x00/rt2500usb.c | 164 +- + drivers/net/wireless/rt2x00/rt2500usb.h | 2 + + drivers/net/wireless/rt2x00/rt2x00.h | 100 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 201 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 47 +- + drivers/net/wireless/rt2x00/rt2x00debug.h | 13 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 83 +- + drivers/net/wireless/rt2x00/rt2x00leds.c | 94 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 18 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 37 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 16 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 19 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 56 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 9 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 42 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 5 +- + drivers/net/wireless/rt2x00/rt61pci.c | 373 +- + drivers/net/wireless/rt2x00/rt61pci.h | 2 + + drivers/net/wireless/rt2x00/rt73usb.c | 269 +- + drivers/net/wireless/rt2x00/rt73usb.h | 2 + + drivers/net/wireless/rtl818x/Makefile | 7 + + drivers/net/wireless/{ => rtl818x}/rtl8180.h | 0 + drivers/net/wireless/{ => rtl818x}/rtl8180_dev.c | 48 +- + .../net/wireless/{ => rtl818x}/rtl8180_grf5101.c | 0 + .../net/wireless/{ => rtl818x}/rtl8180_grf5101.h | 0 + .../net/wireless/{ => rtl818x}/rtl8180_max2820.c | 0 + .../net/wireless/{ => rtl818x}/rtl8180_max2820.h | 0 + .../net/wireless/{ => rtl818x}/rtl8180_rtl8225.c | 14 +- + .../net/wireless/{ => rtl818x}/rtl8180_rtl8225.h | 0 + .../net/wireless/{ => rtl818x}/rtl8180_sa2400.c | 0 + .../net/wireless/{ => rtl818x}/rtl8180_sa2400.h | 0 + drivers/net/wireless/{ => rtl818x}/rtl8187.h | 1 - + drivers/net/wireless/{ => rtl818x}/rtl8187_dev.c | 141 +- + .../net/wireless/{ => rtl818x}/rtl8187_rtl8225.c | 391 +- + .../net/wireless/{ => rtl818x}/rtl8187_rtl8225.h | 0 + drivers/net/wireless/{ => rtl818x}/rtl818x.h | 1 + + drivers/net/wireless/strip.c | 2 - + drivers/net/wireless/wavelan.c | 122 +- + drivers/net/wireless/wavelan_cs.c | 39 +- + drivers/net/wireless/wl3501.h | 4 +- + drivers/net/wireless/wl3501_cs.c | 11 +- + drivers/net/wireless/zd1201.c | 121 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 4 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 44 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- + drivers/net/xen-netfront.c | 1 - + drivers/net/xtsonic.c | 6 +- + drivers/net/yellowfin.c | 31 +- + drivers/net/znet.c | 28 +- + drivers/net/zorro8390.c | 7 +- + drivers/parisc/led.c | 4 +- + drivers/s390/net/qeth_core_offl.c | 8 +- + drivers/s390/net/qeth_l2_main.c | 18 +- + drivers/scsi/iscsi_tcp.c | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 3 +- + drivers/usb/atm/cxacru.c | 4 +- + drivers/usb/atm/usbatm.c | 5 +- + drivers/usb/gadget/u_ether.c | 10 +- + drivers/uwb/wlp/eda.c | 38 +- + fs/afs/proc.c | 4 +- + fs/afs/server.c | 9 +- + fs/cifs/cifs_spnego.c | 6 +- + fs/cifs/connect.c | 4 +- + fs/dlm/netlink.c | 2 +- + fs/lockd/host.c | 8 +- + fs/lockd/mon.c | 2 +- + fs/nfs/nfsroot.c | 6 +- + fs/nfs/super.c | 6 +- + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfsctl.c | 2 +- + fs/ocfs2/cluster/netdebug.c | 8 +- + fs/ocfs2/cluster/nodemanager.c | 2 +- + fs/ocfs2/cluster/tcp.c | 29 +- + include/linux/cgroup_subsys.h | 6 + + include/linux/dcbnl.h | 338 + + include/linux/dccp.h | 32 +- + include/linux/etherdevice.h | 46 + + include/linux/fddidevice.h | 1 + + include/linux/filter.h | 3 +- + include/linux/hdlc.h | 2 +- + include/linux/hippidevice.h | 4 +- + include/linux/ieee80211.h | 152 +- + include/linux/if.h | 1 + + include/linux/in.h | 4 + + include/linux/kernel.h | 12 - + include/linux/list_nulls.h | 94 + + include/linux/mdio-gpio.h | 25 + + include/linux/netdevice.h | 293 +- + include/linux/netlink.h | 3 +- + include/linux/nl80211.h | 147 +- + include/linux/pkt_cls.h | 14 + + include/linux/pkt_sched.h | 16 + + include/linux/rculist_nulls.h | 110 + + include/linux/rtnetlink.h | 5 + + include/linux/skbuff.h | 52 +- + include/linux/smsc911x.h | 42 + + include/linux/snmp.h | 3 + + include/linux/sunrpc/svc_xprt.h | 8 +- + include/linux/virtio_net.h | 9 + + include/linux/xfrm.h | 14 + + include/net/cfg80211.h | 82 +- + include/net/checksum.h | 2 +- + include/net/dcbnl.h | 53 + + include/net/dst.h | 39 +- + include/net/flow.h | 9 +- + include/net/ieee80211.h | 143 +- + include/net/inet_hashtables.h | 85 +- + include/net/inet_timewait_sock.h | 10 +- + include/net/ip.h | 3 +- + include/net/ip_vs.h | 17 +- + include/net/{ieee80211_crypt.h => lib80211.h} | 75 +- + include/net/mac80211.h | 416 +- + include/net/ndisc.h | 14 + + include/net/neighbour.h | 15 +- + include/net/net_namespace.h | 22 + + include/net/netfilter/nf_conntrack_tuple.h | 12 +- + include/net/netlink.h | 22 +- + include/net/netns/ipv4.h | 2 + + include/net/netns/mib.h | 3 + + include/net/netns/xfrm.h | 56 + + include/net/pkt_cls.h | 2 +- + include/net/sch_generic.h | 38 +- + include/net/sctp/sctp.h | 8 +- + include/net/sock.h | 82 +- + include/net/syncppp.h | 102 - + include/net/tcp.h | 10 +- + include/net/udp.h | 25 +- + include/net/udplite.h | 2 +- + include/net/wireless.h | 70 +- + include/net/xfrm.h | 110 +- + lib/vsprintf.c | 77 + + net/802/fddi.c | 8 +- + net/802/hippi.c | 14 +- + net/802/tr.c | 24 +- + net/8021q/vlan.c | 26 +- + net/8021q/vlan.h | 6 +- + net/8021q/vlan_core.c | 2 - + net/8021q/vlan_dev.c | 54 +- + net/9p/trans_rdma.c | 2 - + net/Kconfig | 7 +- + net/Makefile | 4 +- + net/appletalk/aarp.c | 3 +- + net/appletalk/ddp.c | 2 +- + net/appletalk/sysctl_net_atalk.c | 14 +- + net/atm/atm_sysfs.c | 2 +- + net/atm/br2684.c | 7 +- + net/atm/clip.c | 4 +- + net/atm/lec.c | 60 +- + net/atm/mpc.c | 36 +- + net/atm/mpoa_caches.c | 18 +- + net/ax25/sysctl_net_ax25.c | 58 +- + net/bluetooth/bnep/core.c | 3 +- + net/bluetooth/bnep/netdev.c | 6 +- + net/bluetooth/hci_sysfs.c | 7 +- + net/bluetooth/rfcomm/sock.c | 2 + + net/bridge/br_device.c | 20 +- + net/bridge/br_if.c | 4 +- + net/bridge/br_netfilter.c | 10 +- + net/bridge/br_sysfs_br.c | 2 +- + net/bridge/netfilter/ebt_log.c | 18 +- + net/core/datagram.c | 5 +- + net/core/dev.c | 242 +- + net/core/dst.c | 6 +- + net/core/fib_rules.c | 7 +- + net/core/filter.c | 19 + + net/core/flow.c | 6 +- + net/core/gen_estimator.c | 76 +- + net/core/neighbour.c | 73 +- + net/core/net-sysfs.c | 15 +- + net/core/net_namespace.c | 2 - + net/core/netpoll.c | 20 +- + net/core/pktgen.c | 42 +- + net/core/rtnetlink.c | 15 +- + net/core/skbuff.c | 145 +- + net/core/sock.c | 36 +- + net/core/sysctl_net_core.c | 68 +- + net/dcb/Kconfig | 22 + + net/dcb/Makefile | 1 + + net/dcb/dcbnl.c | 1121 +++ + net/dccp/ackvec.c | 9 +- + net/dccp/ackvec.h | 5 +- + net/dccp/ccid.c | 48 + + net/dccp/ccid.h | 23 + + net/dccp/ccids/ccid2.c | 6 +- + net/dccp/dccp.h | 8 +- + net/dccp/diag.c | 2 +- + net/dccp/feat.c | 626 ++- + net/dccp/feat.h | 112 +- + net/dccp/input.c | 2 - + net/dccp/ipv4.c | 13 +- + net/dccp/ipv6.c | 15 +- + net/dccp/minisocks.c | 8 +- + net/dccp/options.c | 148 +- + net/dccp/output.c | 17 +- + net/dccp/probe.c | 19 +- + net/dccp/proto.c | 161 +- + net/dccp/sysctl.c | 7 - + net/dccp/timer.c | 12 - + net/decnet/dn_nsp_out.c | 1 - + net/decnet/dn_route.c | 7 +- + net/decnet/sysctl_net_decnet.c | 44 +- + net/dsa/mv88e6060.c | 2 +- + net/dsa/mv88e6xxx.c | 2 +- + net/dsa/slave.c | 2 +- + net/dsa/tag_dsa.c | 1 - + net/dsa/tag_edsa.c | 1 - + net/dsa/tag_trailer.c | 1 - + net/ethernet/eth.c | 19 +- + net/ieee80211/Kconfig | 73 - + net/ieee80211/Makefile | 12 - + net/ieee80211/ieee80211_crypt.c | 206 - + net/ipv4/af_inet.c | 16 +- + net/ipv4/ah4.c | 10 +- + net/ipv4/arp.c | 36 +- + net/ipv4/cipso_ipv4.c | 1 - + net/ipv4/devinet.c | 19 +- + net/ipv4/esp4.c | 8 +- + net/ipv4/fib_frontend.c | 10 +- + net/ipv4/fib_hash.c | 12 +- + net/ipv4/fib_semantics.c | 8 +- + net/ipv4/fib_trie.c | 6 +- + net/ipv4/icmp.c | 39 +- + net/ipv4/igmp.c | 46 +- + net/ipv4/inet_connection_sock.c | 6 +- + net/ipv4/inet_diag.c | 31 +- + net/ipv4/inet_hashtables.c | 277 +- + net/ipv4/inet_lro.c | 4 +- + net/ipv4/inet_timewait_sock.c | 48 +- + net/ipv4/inetpeer.c | 2 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_fragment.c | 21 +- + net/ipv4/ip_gre.c | 58 +- + net/ipv4/ip_input.c | 10 +- + net/ipv4/ip_output.c | 24 +- + net/ipv4/ip_sockglue.c | 72 +- + net/ipv4/ipcomp.c | 10 +- + net/ipv4/ipconfig.c | 40 +- + net/ipv4/ipip.c | 37 +- + net/ipv4/ipmr.c | 161 +- + net/ipv4/netfilter.c | 4 +- + net/ipv4/netfilter/arp_tables.c | 16 +- + net/ipv4/netfilter/ip_tables.c | 12 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 9 +- + net/ipv4/netfilter/ipt_LOG.c | 7 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 27 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +- + net/ipv4/netfilter/nf_nat_h323.c | 58 +- + net/ipv4/netfilter/nf_nat_irc.c | 4 +- + net/ipv4/netfilter/nf_nat_rule.c | 6 +- + net/ipv4/netfilter/nf_nat_sip.c | 18 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 9 +- + net/ipv4/proc.c | 3 + + net/ipv4/raw.c | 10 +- + net/ipv4/route.c | 227 +- + net/ipv4/sysctl_net_ipv4.c | 188 +- + net/ipv4/tcp.c | 10 +- + net/ipv4/tcp_cubic.c | 120 +- + net/ipv4/tcp_diag.c | 2 +- + net/ipv4/tcp_input.c | 396 +- + net/ipv4/tcp_ipv4.c | 98 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/tcp_output.c | 130 +- + net/ipv4/tcp_probe.c | 7 +- + net/ipv4/tcp_timer.c | 12 +- + net/ipv4/tcp_yeah.c | 4 +- + net/ipv4/udp.c | 271 +- + net/ipv4/udp_impl.h | 4 +- + net/ipv4/udplite.c | 14 +- + net/ipv4/xfrm4_policy.c | 15 +- + net/ipv4/xfrm4_state.c | 2 - + net/ipv6/addrconf.c | 80 +- + net/ipv6/addrlabel.c | 34 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/ah6.c | 9 +- + net/ipv6/anycast.c | 6 +- + net/ipv6/datagram.c | 3 +- + net/ipv6/esp6.c | 7 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/icmp.c | 21 +- + net/ipv6/inet6_connection_sock.c | 2 +- + net/ipv6/inet6_hashtables.c | 182 +- + net/ipv6/ip6_flowlabel.c | 6 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6_tunnel.c | 37 +- + net/ipv6/ip6mr.c | 11 +- + net/ipv6/ipcomp6.c | 10 +- + net/ipv6/mcast.c | 16 +- + net/ipv6/mip6.c | 3 +- + net/ipv6/ndisc.c | 105 +- + net/ipv6/netfilter.c | 2 +- + net/ipv6/netfilter/ip6t_LOG.c | 7 +- + net/ipv6/netfilter/ip6t_REJECT.c | 2 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 5 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 6 +- + net/ipv6/raw.c | 3 +- + net/ipv6/reassembly.c | 12 +- + net/ipv6/route.c | 45 +- + net/ipv6/sit.c | 35 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/sysctl_net_ipv6.c | 4 +- + net/ipv6/tcp_ipv6.c | 26 +- + net/ipv6/udp.c | 148 +- + net/ipv6/udp_impl.h | 4 +- + net/ipv6/udplite.c | 9 +- + net/ipv6/xfrm6_input.c | 9 +- + net/ipv6/xfrm6_policy.c | 22 +- + net/ipv6/xfrm6_state.c | 2 - + net/ipx/sysctl_net_ipx.c | 2 +- + net/irda/irlan/irlan_client.c | 4 +- + net/irda/irlan/irlan_common.c | 2 +- + net/irda/irsysctl.c | 50 +- + net/key/af_key.c | 217 +- + net/llc/af_llc.c | 1 - + net/llc/llc_proc.c | 3 +- + net/llc/sysctl_net_llc.c | 20 +- + net/mac80211/cfg.c | 141 +- + net/mac80211/debugfs.c | 12 +- + net/mac80211/debugfs_key.c | 4 +- + net/mac80211/debugfs_netdev.c | 117 +- + net/mac80211/debugfs_sta.c | 84 +- + net/mac80211/event.c | 5 +- + net/mac80211/ht.c | 252 +- + net/mac80211/ieee80211_i.h | 62 +- + net/mac80211/iface.c | 44 +- + net/mac80211/key.c | 10 +- + net/mac80211/main.c | 224 +- + net/mac80211/mesh.c | 4 +- + net/mac80211/mesh.h | 5 +- + net/mac80211/mesh_hwmp.c | 7 +- + net/mac80211/mesh_plink.c | 49 +- + net/mac80211/mlme.c | 503 +- + net/mac80211/rate.c | 52 +- + net/mac80211/rate.h | 11 +- + net/mac80211/rc80211_minstrel.c | 109 +- + net/mac80211/rc80211_minstrel.h | 2 + + net/mac80211/rc80211_pid.h | 3 +- + net/mac80211/rc80211_pid_algo.c | 38 +- + net/mac80211/rc80211_pid_debugfs.c | 5 +- + net/mac80211/rx.c | 77 +- + net/mac80211/scan.c | 24 +- + net/mac80211/sta_info.c | 37 +- + net/mac80211/sta_info.h | 45 +- + net/mac80211/tkip.c | 10 +- + net/mac80211/tx.c | 437 +- + net/mac80211/util.c | 20 +- + net/mac80211/wep.c | 26 +- + net/mac80211/wep.h | 2 +- + net/mac80211/wext.c | 88 +- + net/mac80211/wme.c | 32 +- + net/mac80211/wpa.c | 32 +- + net/netfilter/ipvs/ip_vs_conn.c | 20 +- + net/netfilter/ipvs/ip_vs_core.c | 20 +- + net/netfilter/ipvs/ip_vs_ctl.c | 82 +- + net/netfilter/ipvs/ip_vs_dh.c | 34 +- + net/netfilter/ipvs/ip_vs_ftp.c | 13 +- + net/netfilter/ipvs/ip_vs_lblc.c | 69 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 96 +- + net/netfilter/ipvs/ip_vs_lc.c | 3 - + net/netfilter/ipvs/ip_vs_nq.c | 3 - + net/netfilter/ipvs/ip_vs_proto.c | 38 +- + net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 10 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 8 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 8 +- + net/netfilter/ipvs/ip_vs_rr.c | 3 - + net/netfilter/ipvs/ip_vs_sed.c | 3 - + net/netfilter/ipvs/ip_vs_sh.c | 34 +- + net/netfilter/ipvs/ip_vs_sync.c | 4 +- + net/netfilter/ipvs/ip_vs_wlc.c | 3 - + net/netfilter/ipvs/ip_vs_wrr.c | 3 - + net/netfilter/ipvs/ip_vs_xmit.c | 34 +- + net/netfilter/nf_conntrack_acct.c | 2 +- + net/netfilter/nf_conntrack_ftp.c | 15 +- + net/netfilter/nf_conntrack_h323_main.c | 12 +- + net/netfilter/nf_conntrack_irc.c | 13 +- + net/netfilter/nf_conntrack_proto_generic.c | 4 +- + net/netfilter/nf_conntrack_proto_sctp.c | 28 +- + net/netfilter/nf_conntrack_proto_tcp.c | 50 +- + net/netfilter/nf_conntrack_proto_udp.c | 8 +- + net/netfilter/nf_conntrack_proto_udplite.c | 4 +- + net/netfilter/nf_conntrack_standalone.c | 16 +- + net/netfilter/xt_hashlimit.c | 14 +- + net/netfilter/xt_iprange.c | 36 +- + net/netfilter/xt_recent.c | 10 +- + net/netlabel/netlabel_addrlist.c | 4 +- + net/netlabel/netlabel_mgmt.c | 1 - + net/netlink/af_netlink.c | 7 + + net/netlink/attr.c | 2 +- + net/netrom/sysctl_net_netrom.c | 48 +- + net/packet/af_packet.c | 2 + + net/phonet/pep-gprs.c | 41 +- + net/phonet/sysctl.c | 2 +- + net/rfkill/rfkill-input.c | 337 +- + net/rfkill/rfkill-input.h | 3 + + net/rfkill/rfkill.c | 85 +- + net/rose/sysctl_net_rose.c | 40 +- + net/rxrpc/af_rxrpc.c | 4 +- + net/rxrpc/ar-error.c | 3 +- + net/rxrpc/ar-local.c | 16 +- + net/rxrpc/ar-peer.c | 8 +- + net/rxrpc/ar-proc.c | 16 +- + net/rxrpc/ar-transport.c | 12 +- + net/rxrpc/rxkad.c | 2 +- + net/sched/Kconfig | 22 + + net/sched/Makefile | 2 + + net/sched/cls_api.c | 3 +- + net/sched/cls_basic.c | 2 +- + net/sched/cls_cgroup.c | 288 + + net/sched/cls_fw.c | 2 +- + net/sched/cls_route.c | 2 +- + net/sched/cls_tcindex.c | 6 - + net/sched/cls_u32.c | 11 +- + net/sched/ematch.c | 18 +- + net/sched/sch_api.c | 40 +- + net/sched/sch_atm.c | 36 +- + net/sched/sch_blackhole.c | 1 + + net/sched/sch_cbq.c | 43 +- + net/sched/sch_drr.c | 509 ++ + net/sched/sch_dsmark.c | 22 +- + net/sched/sch_fifo.c | 4 +- + net/sched/sch_generic.c | 40 +- + net/sched/sch_gred.c | 22 +- + net/sched/sch_hfsc.c | 39 +- + net/sched/sch_htb.c | 49 +- + net/sched/sch_multiq.c | 82 +- + net/sched/sch_netem.c | 159 +- + net/sched/sch_prio.c | 50 +- + net/sched/sch_red.c | 33 +- + net/sched/sch_sfq.c | 69 +- + net/sched/sch_tbf.c | 44 +- + net/sched/sch_teql.c | 19 +- + net/sctp/ipv6.c | 35 +- + net/sctp/protocol.c | 18 +- + net/sctp/sm_statefuns.c | 10 +- + net/sctp/socket.c | 8 + + net/sctp/sysctl.c | 82 +- + net/socket.c | 1 - + net/sunrpc/clnt.c | 8 +- + net/sunrpc/rpcb_clnt.c | 17 +- + net/sunrpc/svcauth_unix.c | 24 +- + net/sunrpc/svcsock.c | 6 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 14 +- + net/sunrpc/xprtrdma/transport.c | 14 +- + net/sunrpc/xprtrdma/verbs.c | 16 +- + net/sunrpc/xprtsock.c | 41 +- + net/tipc/eth_media.c | 3 +- + net/tipc/name_table.c | 2 +- + net/unix/af_unix.c | 201 +- + net/unix/garbage.c | 12 +- + net/unix/sysctl_net_unix.c | 3 +- + net/wanrouter/wanmain.c | 36 +- + net/wireless/Kconfig | 19 + + net/wireless/Makefile | 4 + + net/wireless/core.c | 9 +- + net/wireless/lib80211.c | 284 + + .../lib80211_crypt_ccmp.c} | 129 +- + .../lib80211_crypt_tkip.c} | 181 +- + .../lib80211_crypt_wep.c} | 79 +- + net/wireless/nl80211.c | 288 +- + net/wireless/reg.c | 462 +- + net/wireless/reg.h | 20 +- + net/wireless/sysfs.c | 25 +- + net/wireless/util.c | 19 + + net/x25/sysctl_net_x25.c | 22 +- + net/xfrm/Makefile | 4 +- + net/xfrm/xfrm_input.c | 25 +- + net/xfrm/xfrm_output.c | 18 +- + net/xfrm/xfrm_policy.c | 484 +- + net/xfrm/xfrm_proc.c | 26 +- + net/xfrm/xfrm_state.c | 381 +- + net/xfrm/xfrm_sysctl.c | 85 + + net/xfrm/xfrm_user.c | 227 +- + security/selinux/avc.c | 4 +- + security/selinux/hooks.c | 4 +- + 1062 files changed, 40823 insertions(+), 31607 deletions(-) + delete mode 100644 Documentation/DocBook/wanbook.tmpl + create mode 100644 Documentation/RCU/rculist_nulls.txt + create mode 100644 drivers/net/bonding/bond_ipv6.c + delete mode 100644 drivers/net/eepro100.c + create mode 100644 drivers/net/ixgbe/ixgbe_dcb.c + create mode 100644 drivers/net/ixgbe/ixgbe_dcb.h + create mode 100644 drivers/net/ixgbe/ixgbe_dcb_82598.c + create mode 100644 drivers/net/ixgbe/ixgbe_dcb_82598.h + create mode 100644 drivers/net/ixgbe/ixgbe_dcb_nl.c + create mode 100644 drivers/net/phy/mdio-gpio.c + delete mode 100644 drivers/net/phy/mdio-ofgpio.c + create mode 100644 drivers/net/sfc/mtd.c + create mode 100644 drivers/net/smsc911x.c + create mode 100644 drivers/net/smsc911x.h + rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) + create mode 100644 drivers/net/wan/hd64572.c + delete mode 100644 drivers/net/wan/syncppp.c + create mode 100644 drivers/net/wireless/ath9k/ani.c + create mode 100644 drivers/net/wireless/ath9k/calib.c + create mode 100644 drivers/net/wireless/ath9k/eeprom.c + create mode 100644 drivers/net/wireless/ath9k/mac.c + create mode 100644 drivers/net/wireless/ipw2x00/Kconfig + create mode 100644 drivers/net/wireless/ipw2x00/Makefile + rename drivers/net/wireless/{ => ipw2x00}/ipw2100.c (99%) + rename drivers/net/wireless/{ => ipw2x00}/ipw2100.h (100%) + rename drivers/net/wireless/{ => ipw2x00}/ipw2200.c (97%) + rename drivers/net/wireless/{ => ipw2x00}/ipw2200.h (99%) + rename net/ieee80211/ieee80211_geo.c => drivers/net/wireless/ipw2x00/libipw_geo.c (100%) + rename net/ieee80211/ieee80211_module.c => drivers/net/wireless/ipw2x00/libipw_module.c (88%) + rename net/ieee80211/ieee80211_rx.c => drivers/net/wireless/ipw2x00/libipw_rx.c (94%) + rename net/ieee80211/ieee80211_tx.c => drivers/net/wireless/ipw2x00/libipw_tx.c (98%) + rename net/ieee80211/ieee80211_wx.c => drivers/net/wireless/ipw2x00/libipw_wx.c (91%) + create mode 100644 drivers/net/wireless/iwlwifi/iwl-spectrum.c + create mode 100644 drivers/net/wireless/orinoco/Makefile + rename drivers/net/wireless/{ => orinoco}/airport.c (100%) + rename drivers/net/wireless/{ => orinoco}/hermes.c (100%) + rename drivers/net/wireless/{ => orinoco}/hermes.h (100%) + rename drivers/net/wireless/{ => orinoco}/hermes_dld.c (100%) + rename drivers/net/wireless/{ => orinoco}/hermes_dld.h (100%) + rename drivers/net/wireless/{ => orinoco}/hermes_rid.h (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco.c (98%) + rename drivers/net/wireless/{ => orinoco}/orinoco.h (98%) + rename drivers/net/wireless/{ => orinoco}/orinoco_cs.c (99%) + rename drivers/net/wireless/{ => orinoco}/orinoco_nortel.c (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_pci.c (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_pci.h (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_plx.c (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_tmd.c (100%) + rename drivers/net/wireless/{ => orinoco}/spectrum_cs.c (99%) + create mode 100644 drivers/net/wireless/rtl818x/Makefile + rename drivers/net/wireless/{ => rtl818x}/rtl8180.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_dev.c (96%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_grf5101.c (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_grf5101.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_max2820.c (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_max2820.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_rtl8225.c (98%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_rtl8225.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.c (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8187.h (99%) + rename drivers/net/wireless/{ => rtl818x}/rtl8187_dev.c (93%) + rename drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.c (70%) + rename drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl818x.h (98%) + create mode 100644 include/linux/dcbnl.h + create mode 100644 include/linux/list_nulls.h + create mode 100644 include/linux/mdio-gpio.h + create mode 100644 include/linux/rculist_nulls.h + create mode 100644 include/linux/smsc911x.h + create mode 100644 include/net/dcbnl.h + rename include/net/{ieee80211_crypt.h => lib80211.h} (58%) + create mode 100644 include/net/netns/xfrm.h + delete mode 100644 include/net/syncppp.h + create mode 100644 net/dcb/Kconfig + create mode 100644 net/dcb/Makefile + create mode 100644 net/dcb/dcbnl.c + delete mode 100644 net/ieee80211/Kconfig + delete mode 100644 net/ieee80211/Makefile + delete mode 100644 net/ieee80211/ieee80211_crypt.c + create mode 100644 net/sched/cls_cgroup.c + create mode 100644 net/sched/sch_drr.c + create mode 100644 net/wireless/lib80211.c + rename net/{ieee80211/ieee80211_crypt_ccmp.c => wireless/lib80211_crypt_ccmp.c} (74%) + rename net/{ieee80211/ieee80211_crypt_tkip.c => wireless/lib80211_crypt_tkip.c} (79%) + rename net/{ieee80211/ieee80211_crypt_wep.c => wireless/lib80211_crypt_wep.c} (74%) + create mode 100644 net/xfrm/xfrm_sysctl.c +$ git apply ../patches/0001-net-async_tx-merge-fix.patch +Applying net: async_tx merge fix +$ git add . +$ git commit -v -a --amend +Created commit 829deac: Merge commit 'net/master' +$ git am -3 ../patches/0001-net-br_netfilter-merge-fix.patch +Applying net: br_netfilter merge fix +$ git reset HEAD^ +net/bridge/br_netfilter.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit 3da1bb4: Merge commit 'net/master' +Merging mtd/master +$ git merge mtd/master +Auto-merged drivers/mtd/onenand/omap2.c +Merge made by recursive. + drivers/mtd/onenand/omap2.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) +Merging wireless/master +$ git merge wireless/master +Auto-merged drivers/net/wireless/ath5k/base.c +Auto-merged drivers/net/wireless/ath9k/beacon.c +Removed drivers/net/wireless/ath9k/core.c +Auto-merged drivers/net/wireless/ath9k/recv.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ath9k/recv.c +Auto-merged drivers/net/wireless/iwlwifi/iwl-agn.c +Recorded preimage for 'drivers/net/wireless/ath9k/recv.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/wireless/ath9k/recv.c'. +Created commit c972663: Merge commit 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/configs/eseries_pxa_defconfig | 7 +- + arch/arm/configs/ezx_defconfig | 16 +- + arch/arm/configs/overo_defconfig | 7 +- + arch/arm/configs/s3c2410_defconfig | 15 +- + arch/mips/configs/bcm47xx_defconfig | 18 +- + arch/mips/configs/sb1250-swarm_defconfig | 6 +- + arch/powerpc/configs/pmac32_defconfig | 10 +- + arch/powerpc/configs/ppc6xx_defconfig | 10 +- + arch/powerpc/configs/ps3_defconfig | 7 +- + arch/sh/configs/ul2_defconfig | 9 +- + arch/x86/configs/i386_defconfig | 7 +- + arch/x86/configs/x86_64_defconfig | 7 +- + drivers/net/wireless/Kconfig | 17 +- + drivers/net/wireless/ath5k/ath5k.h | 7 - + drivers/net/wireless/ath5k/attach.c | 12 +- + drivers/net/wireless/ath5k/base.c | 15 +- + drivers/net/wireless/ath5k/eeprom.c | 1194 +++++++++++++++-- + drivers/net/wireless/ath5k/eeprom.h | 253 +++- + drivers/net/wireless/ath5k/reset.c | 2 +- + drivers/net/wireless/ath9k/Makefile | 3 +- + drivers/net/wireless/ath9k/ath9k.h | 49 +- + drivers/net/wireless/ath9k/beacon.c | 88 +- + drivers/net/wireless/ath9k/calib.c | 4 +- + drivers/net/wireless/ath9k/core.c | 1652 ----------------------- + drivers/net/wireless/ath9k/core.h | 280 +---- + drivers/net/wireless/ath9k/eeprom.c | 11 +- + drivers/net/wireless/ath9k/hw.c | 276 ++--- + drivers/net/wireless/ath9k/hw.h | 23 +- + drivers/net/wireless/ath9k/initvals.h | 701 +++++++--- + drivers/net/wireless/ath9k/mac.c | 4 +- + drivers/net/wireless/ath9k/main.c | 1503 ++++++++++++++++++---- + drivers/net/wireless/ath9k/rc.c | 1696 +++++++++--------------- + drivers/net/wireless/ath9k/rc.h | 219 +--- + drivers/net/wireless/ath9k/recv.c | 598 ++++------ + drivers/net/wireless/ath9k/xmit.c | 465 +++----- + drivers/net/wireless/iwlwifi/iwl-3945-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 1 - + drivers/net/wireless/iwlwifi/iwl-4965.c | 27 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 27 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 50 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 121 +-- + drivers/net/wireless/iwlwifi/iwl-core.c | 26 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 3 - + drivers/net/wireless/iwlwifi/iwl-dev.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 55 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 75 -- + drivers/net/wireless/iwlwifi/iwl-sta.c | 157 +++- + drivers/net/wireless/iwlwifi/iwl-sta.h | 14 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 11 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 272 +++-- + drivers/net/wireless/mac80211_hwsim.c | 14 +- + drivers/net/wireless/orinoco/orinoco.c | 160 ++- + drivers/net/wireless/orinoco/orinoco.h | 6 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 21 +- + drivers/net/wireless/p54/p54.h | 3 + + drivers/net/wireless/p54/p54common.c | 69 +- + drivers/net/wireless/p54/p54common.h | 2 +- + drivers/net/wireless/p54/p54pci.c | 42 +- + drivers/net/wireless/p54/p54pci.h | 2 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 125 +-- + drivers/net/wireless/rt2x00/rt2500pci.c | 125 +-- + drivers/net/wireless/rt2x00/rt2500usb.c | 151 +-- + drivers/net/wireless/rt2x00/rt2x00.h | 8 +- + drivers/net/wireless/rt2x00/rt2x00leds.c | 6 - + drivers/net/wireless/rt2x00/rt2x00mac.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 25 + + drivers/net/wireless/rt2x00/rt2x00pci.h | 18 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 14 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 22 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 113 ++- + drivers/net/wireless/rt2x00/rt2x00usb.h | 136 ++ + drivers/net/wireless/rt2x00/rt61pci.c | 165 +-- + drivers/net/wireless/rt2x00/rt73usb.c | 433 +++---- + drivers/net/wireless/rtl818x/rtl8187.h | 7 + + drivers/net/wireless/rtl818x/rtl8187_dev.c | 214 +++- + drivers/net/wireless/rtl818x/rtl8187_rtl8225.c | 6 - + include/linux/ieee80211.h | 62 + + include/linux/nl80211.h | 5 + + include/linux/rfkill.h | 1 + + include/net/wireless.h | 22 + + net/mac80211/Kconfig | 8 +- + net/mac80211/ht.c | 2 +- + net/mac80211/main.c | 5 +- + net/mac80211/mlme.c | 15 +- + net/mac80211/rc80211_pid_algo.c | 2 +- + net/mac80211/wep.c | 7 +- + net/rfkill/rfkill.c | 17 +- + net/wireless/Kconfig | 11 + + net/wireless/core.c | 5 +- + net/wireless/core.h | 13 + + net/wireless/nl80211.c | 5 +- + net/wireless/reg.c | 586 +++++++- + net/wireless/reg.h | 21 +- + 95 files changed, 6658 insertions(+), 6062 deletions(-) + delete mode 100644 drivers/net/wireless/ath9k/core.c +Merging crypto/master +$ git merge crypto/master +Auto-merged lib/Kconfig +Merge made by recursive. + arch/x86/crypto/crc32c-intel.c | 121 +++++----- + crypto/Kconfig | 4 +- + crypto/Makefile | 1 + + crypto/ahash.c | 30 +++ + crypto/ansi_cprng.c | 35 ++- + crypto/api.c | 121 +++++++++- + crypto/authenc.c | 3 + + crypto/camellia.c | 84 +++---- + crypto/crc32c.c | 290 +++++++++++++---------- + crypto/hmac.c | 10 +- + crypto/internal.h | 2 + + crypto/md4.c | 4 +- + crypto/proc.c | 20 +- + crypto/shash.c | 505 ++++++++++++++++++++++++++++++++++++++++ + crypto/testmgr.c | 60 +++++- + drivers/crypto/hifn_795x.c | 494 ++++++++++++++++++--------------------- + drivers/crypto/padlock-aes.c | 52 ++++- + drivers/crypto/talitos.c | 171 +++++++++----- + drivers/crypto/talitos.h | 11 +- + include/crypto/algapi.h | 16 ++- + include/crypto/hash.h | 125 ++++++++++ + include/crypto/internal/hash.h | 16 +- + include/linux/crc32c.h | 6 +- + include/linux/crypto.h | 10 +- + lib/Kconfig | 2 + + lib/libcrc32c.c | 182 +++------------ + 26 files changed, 1607 insertions(+), 768 deletions(-) + create mode 100644 crypto/shash.c +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Auto-merged MAINTAINERS +Removed sound/soc/at32/Kconfig +Removed sound/soc/at32/Makefile +Removed sound/soc/at32/at32-pcm.h +Removed sound/soc/at32/at32-ssc.c +Removed sound/soc/at32/at32-ssc.h +Removed sound/soc/at91/Kconfig +Removed sound/soc/at91/Makefile +Removed sound/soc/at91/at91-pcm.c +Removed sound/soc/at91/at91-pcm.h +Removed sound/soc/at91/at91-ssc.c +Removed sound/soc/at91/at91-ssc.h +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 9 +- + Documentation/sound/alsa/Procfile.txt | 10 + + Documentation/sound/alsa/soc/machine.txt | 8 +- + MAINTAINERS | 2 +- + arch/arm/mach-pxa/include/mach/palmasoc.h | 13 + + include/linux/input.h | 1 + + include/sound/asound.h | 1 + + include/sound/core.h | 28 +- + include/sound/info.h | 106 +- + include/sound/jack.h | 1 + + include/sound/l3.h | 18 + + include/sound/s3c24xx_uda134x.h | 14 + + include/sound/soc-dai.h | 225 +++ + include/sound/soc-dapm.h | 2 - + include/sound/soc.h | 171 +-- + include/sound/uda134x.h | 26 + + include/sound/version.h | 2 +- + sound/aoa/codecs/Makefile | 4 + + sound/aoa/codecs/{snd-aoa-codec-onyx.c => onyx.c} | 12 +- + sound/aoa/codecs/{snd-aoa-codec-onyx.h => onyx.h} | 0 + ...aoa-codec-tas-basstreble.h => tas-basstreble.h} | 0 + ...aoa-codec-tas-gain-table.h => tas-gain-table.h} | 0 + sound/aoa/codecs/{snd-aoa-codec-tas.c => tas.c} | 8 +- + sound/aoa/codecs/{snd-aoa-codec-tas.h => tas.h} | 0 + .../codecs/{snd-aoa-codec-toonie.c => toonie.c} | 2 +- + sound/aoa/core/Makefile | 8 +- + sound/aoa/core/{snd-aoa-alsa.c => alsa.c} | 4 +- + sound/aoa/core/{snd-aoa-alsa.h => alsa.h} | 0 + sound/aoa/core/{snd-aoa-core.c => core.c} | 2 +- + .../{snd-aoa-gpio-feature.c => gpio-feature.c} | 2 +- + sound/aoa/core/{snd-aoa-gpio-pmf.c => gpio-pmf.c} | 0 + sound/aoa/fabrics/Makefile | 2 + + .../fabrics/{snd-aoa-fabric-layout.c => layout.c} | 2 +- + sound/aoa/soundbus/i2sbus/Makefile | 2 +- + .../i2sbus/{i2sbus-control.c => control.c} | 0 + .../aoa/soundbus/i2sbus/{i2sbus-core.c => core.c} | 4 +- + sound/aoa/soundbus/i2sbus/i2sbus.h | 2 +- + .../i2sbus/{i2sbus-interface.h => interface.h} | 0 + sound/aoa/soundbus/i2sbus/{i2sbus-pcm.c => pcm.c} | 0 + sound/core/Kconfig | 21 + + sound/core/Makefile | 2 + + sound/core/device.c | 4 +- + sound/core/hrtimer.c | 140 ++ + sound/core/info.c | 17 + + sound/core/init.c | 71 +- + sound/core/jack.c | 9 +- + sound/core/seq/seq.c | 4 +- + sound/drivers/pcsp/pcsp.c | 8 +- + sound/drivers/pcsp/pcsp.h | 1 + + sound/drivers/pcsp/pcsp_lib.c | 95 +- + sound/pci/Kconfig | 124 +-- + sound/pci/ac97/ac97_patch.c | 2 + + sound/pci/emu10k1/emu10k1_main.c | 494 ++++--- + sound/pci/hda/Kconfig | 139 ++ + sound/pci/hda/Makefile | 2 + + sound/pci/hda/hda_codec.c | 534 ++++++-- + sound/pci/hda/hda_codec.h | 65 +- + sound/pci/hda/hda_eld.c | 590 +++++++ + sound/pci/hda/hda_generic.c | 20 +- + sound/pci/hda/hda_hwdep.c | 232 +++ + sound/pci/hda/hda_intel.c | 311 ++-- + sound/pci/hda/hda_local.h | 100 ++- + sound/pci/hda/hda_patch.h | 2 + + sound/pci/hda/hda_proc.c | 73 +- + sound/pci/hda/patch_analog.c | 105 +- + sound/pci/hda/patch_atihdmi.c | 1 - + sound/pci/hda/patch_conexant.c | 11 - + sound/pci/hda/patch_intelhdmi.c | 685 +++++++++ + sound/pci/hda/patch_nvhdmi.c | 1 + + sound/pci/hda/patch_realtek.c | 1603 +++++++++++--------- + sound/pci/hda/patch_sigmatel.c | 581 +++++--- + sound/pci/hda/patch_via.c | 73 +- + sound/pci/ice1712/ice1724.c | 23 +- + sound/pci/pcxhr/Makefile | 2 +- + sound/pci/pcxhr/pcxhr.c | 552 +++++--- + sound/pci/pcxhr/pcxhr.h | 76 +- + sound/pci/pcxhr/pcxhr_core.c | 291 +++-- + sound/pci/pcxhr/pcxhr_core.h | 5 +- + sound/pci/pcxhr/pcxhr_hwdep.c | 148 ++- + sound/pci/pcxhr/pcxhr_mix22.c | 820 ++++++++++ + sound/pci/pcxhr/pcxhr_mix22.h | 56 + + sound/pci/pcxhr/pcxhr_mixer.c | 556 +++++--- + sound/pci/rme9652/hdsp.c | 2 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/ppc/pmac.c | 2 +- + sound/ppc/tumbler.c | 3 +- + sound/soc/Kconfig | 3 +- + sound/soc/Makefile | 2 +- + sound/soc/at32/Kconfig | 34 - + sound/soc/at32/Makefile | 11 - + sound/soc/at32/at32-pcm.h | 79 - + sound/soc/at32/at32-ssc.c | 849 ----------- + sound/soc/at32/at32-ssc.h | 59 - + sound/soc/at91/Kconfig | 10 - + sound/soc/at91/Makefile | 6 - + sound/soc/at91/at91-pcm.c | 434 ------ + sound/soc/at91/at91-pcm.h | 72 - + sound/soc/at91/at91-ssc.c | 791 ---------- + sound/soc/at91/at91-ssc.h | 27 - + sound/soc/atmel/Kconfig | 43 + + sound/soc/atmel/Makefile | 15 + + sound/soc/{at32/at32-pcm.c => atmel/atmel-pcm.c} | 376 +++--- + sound/soc/atmel/atmel-pcm.h | 86 ++ + sound/soc/atmel/atmel_ssc_dai.c | 780 ++++++++++ + sound/soc/atmel/atmel_ssc_dai.h | 121 ++ + sound/soc/{at32 => atmel}/playpaq_wm8510.c | 9 +- + sound/soc/atmel/sam9g20_wm8731.c | 328 ++++ + sound/soc/au1x/psc-ac97.c | 7 +- + sound/soc/au1x/psc-i2s.c | 9 +- + sound/soc/au1x/sample-ac97.c | 4 +- + sound/soc/blackfin/Kconfig | 18 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 101 +- + sound/soc/blackfin/bf5xx-ac97.c | 160 ++- + sound/soc/blackfin/bf5xx-ac97.h | 35 +- + sound/soc/blackfin/bf5xx-ad1980.c | 6 +- + sound/soc/blackfin/bf5xx-ad73311.c | 8 +- + sound/soc/blackfin/bf5xx-i2s.c | 13 +- + sound/soc/blackfin/bf5xx-sport.h | 2 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 12 +- + sound/soc/codecs/Kconfig | 65 +- + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/ac97.c | 5 +- + sound/soc/codecs/ad1980.c | 22 +- + sound/soc/codecs/ad73311.c | 1 - + sound/soc/codecs/ak4535.c | 5 +- + sound/soc/codecs/cs4270.c | 24 +- + sound/soc/codecs/l3.c | 91 ++ + sound/soc/codecs/pcm3008.c | 200 +++ + sound/soc/codecs/pcm3008.h | 25 + + sound/soc/codecs/ssm2602.c | 39 +- + sound/soc/codecs/tlv320aic23.c | 246 +++- + sound/soc/codecs/tlv320aic26.c | 5 +- + sound/soc/codecs/tlv320aic3x.c | 5 +- + sound/soc/codecs/twl4030.c | 826 ++++++++++ + sound/soc/codecs/twl4030.h | 197 +++ + sound/soc/codecs/uda134x.c | 656 ++++++++ + sound/soc/codecs/uda134x.h | 36 + + sound/soc/codecs/uda1380.c | 15 +- + sound/soc/codecs/wm8510.c | 5 +- + sound/soc/codecs/wm8580.c | 120 +- + sound/soc/codecs/wm8580.h | 1 + + sound/soc/codecs/wm8728.c | 573 +++++++ + sound/soc/codecs/wm8728.h | 30 + + sound/soc/codecs/wm8731.c | 11 +- + sound/soc/codecs/wm8750.c | 5 +- + sound/soc/codecs/wm8753.c | 25 +- + sound/soc/codecs/wm8900.c | 118 +- + sound/soc/codecs/wm8900.h | 1 + + sound/soc/codecs/wm8903.c | 11 +- + sound/soc/codecs/wm8971.c | 5 +- + sound/soc/codecs/wm8990.c | 29 +- + sound/soc/codecs/wm8990.h | 4 +- + sound/soc/codecs/wm9712.c | 10 +- + sound/soc/codecs/wm9713.c | 43 +- + sound/soc/davinci/Kconfig | 10 + + sound/soc/davinci/Makefile | 2 + + sound/soc/davinci/davinci-evm.c | 4 +- + sound/soc/davinci/davinci-i2s.c | 141 ++- + sound/soc/davinci/davinci-sffsdr.c | 157 ++ + sound/soc/fsl/fsl_dma.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 14 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 18 +- + sound/soc/fsl/mpc8610_hpcd.c | 6 +- + sound/soc/fsl/soc-of-simple.c | 10 +- + sound/soc/omap/Kconfig | 26 + + sound/soc/omap/Makefile | 6 + + sound/soc/omap/n810.c | 8 +- + sound/soc/omap/omap-mcbsp.c | 44 +- + sound/soc/omap/omap2evm.c | 151 ++ + sound/soc/omap/omap3beagle.c | 149 ++ + sound/soc/omap/osk5912.c | 4 +- + sound/soc/omap/overo.c | 148 ++ + sound/soc/omap/sdp3430.c | 152 ++ + sound/soc/pxa/Kconfig | 22 + + sound/soc/pxa/Makefile | 6 + + sound/soc/pxa/corgi.c | 4 +- + sound/soc/pxa/e800_wm9712.c | 6 +- + sound/soc/pxa/em-x270.c | 4 +- + sound/soc/pxa/palm27x.c | 269 ++++ + sound/soc/pxa/poodle.c | 4 +- + sound/soc/pxa/pxa-ssp.c | 921 +++++++++++ + sound/soc/pxa/pxa-ssp.h | 47 + + sound/soc/pxa/pxa2xx-ac97.c | 15 +- + sound/soc/pxa/pxa2xx-i2s.c | 16 +- + sound/soc/pxa/pxa2xx-pcm.c | 2 +- + sound/soc/pxa/spitz.c | 4 +- + sound/soc/pxa/tosa.c | 36 +- + sound/soc/pxa/zylonite.c | 219 +++ + sound/soc/s3c24xx/Kconfig | 5 + + sound/soc/s3c24xx/Makefile | 2 + + sound/soc/s3c24xx/ln2440sbc_alc650.c | 6 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 7 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 9 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 12 +- + sound/soc/s3c24xx/s3c24xx-i2s.c | 17 +- + sound/soc/s3c24xx/s3c24xx_uda134x.c | 373 +++++ + sound/soc/s3c24xx/smdk2443_wm9710.c | 6 +- + sound/soc/sh/hac.c | 7 +- + sound/soc/sh/sh7760-ac97.c | 4 +- + sound/soc/sh/ssi.c | 18 +- + sound/soc/soc-core.c | 409 +++-- + sound/soc/soc-dapm.c | 76 +- + 202 files changed, 14927 insertions(+), 5974 deletions(-) + create mode 100644 arch/arm/mach-pxa/include/mach/palmasoc.h + create mode 100644 include/sound/l3.h + create mode 100644 include/sound/s3c24xx_uda134x.h + create mode 100644 include/sound/soc-dai.h + create mode 100644 include/sound/uda134x.h + rename sound/aoa/codecs/{snd-aoa-codec-onyx.c => onyx.c} (99%) + rename sound/aoa/codecs/{snd-aoa-codec-onyx.h => onyx.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-tas-basstreble.h => tas-basstreble.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-tas-gain-table.h => tas-gain-table.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-tas.c => tas.c} (99%) + rename sound/aoa/codecs/{snd-aoa-codec-tas.h => tas.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-toonie.c => toonie.c} (98%) + rename sound/aoa/core/{snd-aoa-alsa.c => alsa.c} (98%) + rename sound/aoa/core/{snd-aoa-alsa.h => alsa.h} (100%) + rename sound/aoa/core/{snd-aoa-core.c => core.c} (99%) + rename sound/aoa/core/{snd-aoa-gpio-feature.c => gpio-feature.c} (99%) + rename sound/aoa/core/{snd-aoa-gpio-pmf.c => gpio-pmf.c} (100%) + rename sound/aoa/fabrics/{snd-aoa-fabric-layout.c => layout.c} (99%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-control.c => control.c} (100%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-core.c => core.c} (99%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-interface.h => interface.h} (100%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-pcm.c => pcm.c} (100%) + create mode 100644 sound/core/hrtimer.c + create mode 100644 sound/pci/hda/Kconfig + create mode 100644 sound/pci/hda/hda_eld.c + create mode 100644 sound/pci/hda/patch_intelhdmi.c + create mode 100644 sound/pci/pcxhr/pcxhr_mix22.c + create mode 100644 sound/pci/pcxhr/pcxhr_mix22.h + delete mode 100644 sound/soc/at32/Kconfig + delete mode 100644 sound/soc/at32/Makefile + delete mode 100644 sound/soc/at32/at32-pcm.h + delete mode 100644 sound/soc/at32/at32-ssc.c + delete mode 100644 sound/soc/at32/at32-ssc.h + delete mode 100644 sound/soc/at91/Kconfig + delete mode 100644 sound/soc/at91/Makefile + delete mode 100644 sound/soc/at91/at91-pcm.c + delete mode 100644 sound/soc/at91/at91-pcm.h + delete mode 100644 sound/soc/at91/at91-ssc.c + delete mode 100644 sound/soc/at91/at91-ssc.h + create mode 100644 sound/soc/atmel/Kconfig + create mode 100644 sound/soc/atmel/Makefile + rename sound/soc/{at32/at32-pcm.c => atmel/atmel-pcm.c} (50%) + create mode 100644 sound/soc/atmel/atmel-pcm.h + create mode 100644 sound/soc/atmel/atmel_ssc_dai.c + create mode 100644 sound/soc/atmel/atmel_ssc_dai.h + rename sound/soc/{at32 => atmel}/playpaq_wm8510.c (98%) + create mode 100644 sound/soc/atmel/sam9g20_wm8731.c + create mode 100644 sound/soc/codecs/l3.c + create mode 100644 sound/soc/codecs/pcm3008.c + create mode 100644 sound/soc/codecs/pcm3008.h + create mode 100644 sound/soc/codecs/twl4030.c + create mode 100644 sound/soc/codecs/twl4030.h + create mode 100644 sound/soc/codecs/uda134x.c + create mode 100644 sound/soc/codecs/uda134x.h + create mode 100644 sound/soc/codecs/wm8728.c + create mode 100644 sound/soc/codecs/wm8728.h + create mode 100644 sound/soc/davinci/davinci-sffsdr.c + create mode 100644 sound/soc/omap/omap2evm.c + create mode 100644 sound/soc/omap/omap3beagle.c + create mode 100644 sound/soc/omap/overo.c + create mode 100644 sound/soc/omap/sdp3430.c + create mode 100644 sound/soc/pxa/palm27x.c + create mode 100644 sound/soc/pxa/pxa-ssp.c + create mode 100644 sound/soc/pxa/pxa-ssp.h + create mode 100644 sound/soc/pxa/zylonite.c + create mode 100644 sound/soc/s3c24xx/s3c24xx_uda134x.c +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 ++- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 51 ++++++++++----------- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 9 ++++ + drivers/cpufreq/cpufreq.c | 51 ++++++++++++++-------- + include/linux/cpufreq.h | 1 + + 5 files changed, 72 insertions(+), 46 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged arch/arm/mach-realview/core.c +Auto-merged arch/arm/mach-versatile/core.c +Auto-merged arch/m32r/Kconfig +Auto-merged arch/powerpc/kernel/smp.c +Auto-merged arch/powerpc/kernel/time.c +Auto-merged arch/powerpc/platforms/pseries/xics.c +Auto-merged arch/powerpc/sysdev/mpic.c +Auto-merged arch/s390/Kconfig +Auto-merged arch/s390/kernel/smp.c +Auto-merged arch/s390/kernel/time.c +Auto-merged arch/sparc64/kernel/irq.c +Auto-merged arch/sparc64/kernel/smp.c +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/include/asm/pci.h +Auto-merged arch/x86/include/asm/setup.h +Auto-merged arch/x86/kernel/apic.c +Auto-merged arch/x86/kernel/hpet.c +Auto-merged arch/x86/kernel/io_apic.c +CONFLICT (content): Merge conflict in arch/x86/kernel/io_apic.c +Auto-merged arch/x86/kernel/irq_64.c +Auto-merged arch/x86/kernel/setup.c +CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged arch/x86/lguest/boot.c +Auto-merged arch/x86/mach-generic/probe.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/probe.c +Auto-merged drivers/usb/core/usb.c +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/irq.h +Auto-merged include/linux/seq_file.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Auto-merged kernel/irq/manage.c +CONFLICT (content): Merge conflict in kernel/irq/manage.c +Auto-merged kernel/irq/migration.c +Auto-merged kernel/irq/proc.c +CONFLICT (content): Merge conflict in kernel/irq/proc.c +Auto-merged kernel/module.c +Auto-merged kernel/profile.c +Auto-merged kernel/sched.c +Auto-merged kernel/trace/trace.c +Resolved 'arch/x86/kernel/io_apic.c' using previous resolution. +Resolved 'arch/x86/kernel/setup.c' using previous resolution. +Resolved 'kernel/irq/manage.c' using previous resolution. +Resolved 'kernel/irq/proc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 1749c98: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/lguest/lguest.c | 66 ++----------- + arch/alpha/include/asm/smp.h | 1 - + arch/alpha/include/asm/topology.h | 17 +++ + arch/alpha/kernel/irq.c | 2 +- + arch/alpha/kernel/process.c | 2 + + arch/alpha/kernel/setup.c | 5 + + arch/alpha/kernel/smp.c | 7 +- + arch/alpha/kernel/sys_dp264.c | 8 +- + arch/alpha/kernel/sys_titan.c | 4 +- + arch/arm/common/gic.c | 4 +- + arch/arm/kernel/irq.c | 2 +- + arch/arm/kernel/smp.c | 10 -- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-davinci/time.c | 2 +- + arch/arm/mach-imx/time.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-msm/timer.c | 2 +- + arch/arm/mach-ns9xxx/time-ns9360.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/timer-gp.c | 2 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-realview/core.c | 2 +- + arch/arm/mach-realview/localtimer.c | 4 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-versatile/core.c | 2 +- + arch/arm/oprofile/op_model_mpcore.c | 4 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-orion/time.c | 2 +- + arch/avr32/kernel/time.c | 2 +- + arch/cris/arch-v32/kernel/irq.c | 4 +- + arch/cris/arch-v32/kernel/smp.c | 4 - + arch/cris/include/asm/smp.h | 1 - + arch/ia64/hp/sim/hpsim_irq.c | 2 +- + arch/ia64/include/asm/smp.h | 1 - + arch/ia64/include/asm/topology.h | 7 +- + arch/ia64/kernel/acpi.c | 2 +- + arch/ia64/kernel/iosapic.c | 19 ++-- + arch/ia64/kernel/irq.c | 9 +- + arch/ia64/kernel/msi_ia64.c | 7 +- + arch/ia64/kernel/smpboot.c | 10 +-- + arch/ia64/kernel/topology.c | 2 +- + arch/ia64/sn/kernel/irq.c | 6 +- + arch/ia64/sn/kernel/msi_sn.c | 7 +- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 27 ++--- + arch/m32r/Kconfig | 1 + + arch/m32r/kernel/smpboot.c | 8 +-- + arch/m68knommu/platform/coldfire/pit.c | 2 +- + arch/mips/include/asm/irq.h | 3 +- + arch/mips/include/asm/mach-ip27/topology.h | 4 +- + arch/mips/include/asm/smp.h | 3 - + arch/mips/jazz/irq.c | 2 +- + arch/mips/kernel/cevt-bcm1480.c | 4 +- + arch/mips/kernel/cevt-ds1287.c | 2 +- + arch/mips/kernel/cevt-gt641xx.c | 2 +- + arch/mips/kernel/cevt-r4k.c | 2 +- + arch/mips/kernel/cevt-sb1250.c | 4 +- + arch/mips/kernel/cevt-smtc.c | 2 +- + arch/mips/kernel/cevt-txx9.c | 2 +- + arch/mips/kernel/i8253.c | 2 +- + arch/mips/kernel/irq-gic.c | 6 +- + arch/mips/kernel/smp-cmp.c | 6 +- + arch/mips/kernel/smp-mt.c | 2 +- + arch/mips/kernel/smp.c | 7 +- + arch/mips/kernel/smtc.c | 6 +- + arch/mips/mti-malta/malta-smtc.c | 6 +- + arch/mips/nxp/pnx8550/common/time.c | 1 + + arch/mips/pmc-sierra/yosemite/smp.c | 6 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/mips/sgi-ip27/ip27-timer.c | 2 +- + arch/mips/sibyte/bcm1480/irq.c | 8 +- + arch/mips/sibyte/bcm1480/smp.c | 8 +- + arch/mips/sibyte/sb1250/irq.c | 8 +- + arch/mips/sibyte/sb1250/smp.c | 8 +- + arch/mips/sni/time.c | 2 +- + arch/parisc/Kconfig | 1 + + arch/parisc/kernel/irq.c | 6 +- + arch/parisc/kernel/smp.c | 15 --- + arch/powerpc/include/asm/topology.h | 10 ++- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/smp.c | 4 - + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/platforms/cell/spu_priv1_mmio.c | 6 +- + arch/powerpc/platforms/cell/spufs/sched.c | 4 +- + arch/powerpc/platforms/pseries/xics.c | 4 +- + arch/powerpc/sysdev/mpic.c | 4 +- + arch/powerpc/sysdev/mpic.h | 2 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/kvm_virtio.h | 4 + + arch/s390/kernel/smp.c | 6 - + arch/s390/kernel/time.c | 2 +- + arch/sh/include/asm/smp.h | 2 +- + arch/sh/include/asm/topology.h | 1 + + arch/sh/kernel/smp.c | 10 +-- + arch/sh/kernel/timers/timer-broadcast.c | 2 +- + arch/sh/kernel/timers/timer-tmu.c | 2 +- + arch/sparc/include/asm/smp_32.h | 2 - + arch/sparc/include/asm/topology_64.h | 10 +- + arch/sparc/kernel/smp.c | 6 +- + arch/sparc/kernel/sparc_ksyms.c | 4 - + arch/sparc64/kernel/irq.c | 11 ++- + arch/sparc64/kernel/of_device.c | 4 +- + arch/sparc64/kernel/pci_msi.c | 4 +- + arch/sparc64/kernel/smp.c | 4 - + arch/sparc64/kernel/time.c | 2 +- + arch/um/kernel/smp.c | 7 -- + arch/um/kernel/time.c | 2 +- + arch/x86/include/asm/pci.h | 10 ++- + arch/x86/include/asm/topology.h | 35 ++++-- + arch/x86/kernel/apic.c | 8 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- + arch/x86/kernel/hpet.c | 8 +- + arch/x86/kernel/i8253.c | 2 +- + arch/x86/kernel/io_apic.c | 81 +++++++-------- + arch/x86/kernel/irq_32.c | 2 +- + arch/x86/kernel/irq_64.c | 2 +- + arch/x86/kernel/mfgpt_32.c | 2 +- + arch/x86/kernel/setup_percpu.c | 10 +- + arch/x86/kernel/smpboot.c | 6 - + arch/x86/kernel/vmiclock_32.c | 2 +- + arch/x86/lguest/boot.c | 2 +- + arch/x86/lguest/i386_head.S | 15 --- + arch/x86/mach-voyager/voyager_smp.c | 9 +-- + arch/x86/xen/time.c | 2 +- + drivers/base/cpu.c | 2 +- + drivers/base/node.c | 4 +- + drivers/base/topology.c | 4 +- + drivers/block/virtio_blk.c | 41 +++++--- + drivers/clocksource/tcb_clksrc.c | 2 +- + drivers/infiniband/hw/ehca/ehca_irq.c | 17 ++-- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 8 +- + drivers/lguest/lg.h | 2 +- + drivers/lguest/lguest_device.c | 6 +- + drivers/lguest/lguest_user.c | 13 +-- + drivers/lguest/page_tables.c | 72 +++++++++++++- + drivers/parisc/iosapic.c | 7 +- + drivers/pci/pci-sysfs.c | 4 +- + drivers/pci/probe.c | 4 +- + drivers/pnp/pnpbios/bioscalls.c | 2 +- + drivers/s390/kvm/kvm_virtio.c | 12 ++- + drivers/virtio/virtio.c | 2 +- + drivers/virtio/virtio_balloon.c | 13 ++- + drivers/virtio/virtio_pci.c | 15 ++-- + drivers/virtio/virtio_ring.c | 3 +- + drivers/xen/events.c | 6 +- + include/asm-generic/topology.h | 14 +++- + include/asm-generic/vmlinux.lds.h | 3 + + include/asm-m32r/smp.h | 2 - + include/linux/bitmap.h | 35 ++++--- + include/linux/clockchips.h | 4 +- + include/linux/cpumask.h | 87 +++++++++++------ + include/linux/interrupt.h | 4 +- + include/linux/irq.h | 3 +- + include/linux/lguest_launcher.h | 6 +- + include/linux/moduleparam.h | 26 +++-- + include/linux/seq_file.h | 2 +- + include/linux/smp.h | 15 ++-- + include/linux/virtio_balloon.h | 3 + + include/linux/virtio_pci.h | 8 ++ + include/linux/virtio_ring.h | 13 ++- + init/Kconfig | 15 ++- + init/main.c | 25 +++++- + kernel/cpu.c | 11 +- + kernel/cpuset.c | 4 +- + kernel/irq/chip.c | 2 +- + kernel/irq/manage.c | 22 ++-- + kernel/irq/migration.c | 14 ++-- + kernel/irq/proc.c | 31 ++++-- + kernel/module.c | 16 ++-- + kernel/params.c | 20 ++-- + kernel/profile.c | 4 +- + kernel/sched.c | 4 +- + kernel/sched_stats.h | 2 +- + kernel/smp.c | 139 +++++++++----------------- + kernel/taskstats.c | 2 +- + kernel/time/clockevents.c | 2 + + kernel/time/tick-broadcast.c | 2 +- + kernel/time/tick-common.c | 12 +- + kernel/trace/trace.c | 4 +- + kernel/workqueue.c | 8 +- + lib/is_single_threaded.c | 45 ++++++++ + mm/slub.c | 2 +- + 182 files changed, 844 insertions(+), 749 deletions(-) + create mode 100644 lib/is_single_threaded.c +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Merge made by recursive. + drivers/mmc/card/block.c | 6 ++---- + drivers/mmc/host/sdhci-pci.c | 2 +- + 2 files changed, 3 insertions(+), 5 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/daemon.c +Removed fs/gfs2/daemon.h +Removed fs/gfs2/ops_dentry.h +Removed fs/gfs2/ops_fstype.h +Removed fs/gfs2/ops_inode.h +Removed fs/gfs2/ops_super.h +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/gfs2/Makefile | 2 +- + fs/gfs2/acl.c | 2 +- + fs/gfs2/bmap.c | 30 +++--- + fs/gfs2/daemon.c | 136 ----------------------- + fs/gfs2/daemon.h | 17 --- + fs/gfs2/dir.c | 62 ++++++------ + fs/gfs2/eattr.c | 40 ++++---- + fs/gfs2/glock.c | 289 ++++++++++++++++++++++++------------------------- + fs/gfs2/glock.h | 2 +- + fs/gfs2/glops.c | 56 +++++++---- + fs/gfs2/incore.h | 55 +++------- + fs/gfs2/inode.c | 53 ++++----- + fs/gfs2/inode.h | 13 ++- + fs/gfs2/main.c | 15 +++- + fs/gfs2/mount.c | 21 +---- + fs/gfs2/ops_address.c | 26 ++--- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 --- + fs/gfs2/ops_export.c | 5 +- + fs/gfs2/ops_file.c | 20 ++-- + fs/gfs2/ops_fstype.c | 38 +------ + fs/gfs2/ops_fstype.h | 19 ---- + fs/gfs2/ops_inode.c | 75 ++++++++++--- + fs/gfs2/ops_inode.h | 25 ----- + fs/gfs2/ops_super.c | 17 +-- + fs/gfs2/ops_super.h | 17 --- + fs/gfs2/quota.c | 113 ++++++++++++++++++-- + fs/gfs2/quota.h | 24 ++-- + fs/gfs2/recovery.c | 26 +++++- + fs/gfs2/recovery.h | 14 ++-- + fs/gfs2/rgrp.c | 58 +++++------ + fs/gfs2/super.c | 12 +- + fs/gfs2/super.h | 8 ++ + fs/gfs2/sys.c | 44 +-------- + fs/gfs2/util.c | 1 + + fs/gfs2/util.h | 1 + + fs/ioctl.c | 44 ++++++-- + include/linux/fs.h | 3 + + 38 files changed, 638 insertions(+), 764 deletions(-) + delete mode 100644 fs/gfs2/daemon.c + delete mode 100644 fs/gfs2/daemon.h + delete mode 100644 fs/gfs2/ops_dentry.h + delete mode 100644 fs/gfs2/ops_fstype.h + delete mode 100644 fs/gfs2/ops_inode.h + delete mode 100644 fs/gfs2/ops_super.h +Merging input/next +$ git merge input/next +Auto-merged drivers/input/evdev.c +Auto-merged drivers/input/joydev.c +Auto-merged drivers/input/mousedev.c +Merge made by recursive. + Documentation/input/walkera0701.txt | 109 ++++++++++ + drivers/input/Makefile | 2 +- + drivers/input/evbug.c | 6 +- + drivers/input/evdev.c | 199 +---------------- + drivers/input/gameport/gameport.c | 3 +- + drivers/input/gameport/ns558.c | 2 +- + drivers/input/input-compat.c | 135 ++++++++++++ + drivers/input/input-compat.h | 94 ++++++++ + drivers/input/input.c | 4 +- + drivers/input/joydev.c | 2 +- + drivers/input/joystick/Kconfig | 12 + + drivers/input/joystick/Makefile | 1 + + drivers/input/joystick/walkera0701.c | 292 +++++++++++++++++++++++++ + drivers/input/keyboard/gpio_keys.c | 4 + + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/input/misc/pcspkr.c | 4 +- + drivers/input/misc/uinput.c | 172 +++++++++++++--- + drivers/input/mouse/appletouch.c | 274 ++++++++++++------------ + drivers/input/mouse/synaptics.c | 16 +- + drivers/input/mousedev.c | 3 +- + drivers/input/serio/libps2.c | 20 ++- + drivers/input/serio/pcips2.c | 2 +- + drivers/input/serio/serio.c | 4 +- + drivers/input/serio/xilinx_ps2.c | 220 ++++++++++--------- + drivers/input/touchscreen/Kconfig | 13 ++ + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/input/touchscreen/usbtouchscreen.c | 5 +- + drivers/input/touchscreen/wacom_w8001.c | 325 ++++++++++++++++++++++++++++ + include/linux/gpio_keys.h | 1 + + include/linux/libps2.h | 2 + + include/linux/serio.h | 1 + + 32 files changed, 1439 insertions(+), 499 deletions(-) + create mode 100644 Documentation/input/walkera0701.txt + create mode 100644 drivers/input/input-compat.c + create mode 100644 drivers/input/input-compat.h + create mode 100644 drivers/input/joystick/walkera0701.c + create mode 100644 drivers/input/touchscreen/wacom_w8001.c +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 4 +- + fs/ubifs/commit.c | 4 +- + fs/ubifs/debug.c | 66 +++++++++++++++++++++-------------- + fs/ubifs/dir.c | 5 ++- + fs/ubifs/file.c | 91 ++++++++++++++++++++++++++++++++++--------------- + fs/ubifs/journal.c | 8 +++-- + fs/ubifs/key.h | 4 +- + fs/ubifs/lpt_commit.c | 2 - + fs/ubifs/orphan.c | 28 +++++++++------ + fs/ubifs/recovery.c | 17 +++++---- + fs/ubifs/replay.c | 2 +- + fs/ubifs/sb.c | 9 +++-- + fs/ubifs/super.c | 70 +++++++++++++++++++++++++++++++------ + fs/ubifs/tnc.c | 12 +++++-- + fs/ubifs/ubifs.h | 12 +++++-- + 15 files changed, 223 insertions(+), 111 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merged block/genhd.c +Auto-merged drivers/block/virtio_blk.c +Auto-merged drivers/md/dm.c +Auto-merged kernel/exit.c +Merge made by recursive. + Documentation/block/biodoc.txt | 6 +- + block/Kconfig | 1 + + block/blk-core.c | 37 +-- + block/blk-map.c | 2 +- + block/blk-sysfs.c | 7 +- + block/blk-tag.c | 1 - + block/blk-timeout.c | 21 +- + block/blktrace.c | 332 +++++++++++++++++++- + block/compat_ioctl.c | 2 - + block/elevator.c | 7 +- + block/genhd.c | 2 +- + block/ioctl.c | 2 - + block/scsi_ioctl.c | 4 +- + drivers/block/cciss.c | 72 ++--- + drivers/block/cciss.h | 4 +- + drivers/block/cciss_cmd.h | 3 +- + drivers/block/virtio_blk.c | 2 + + drivers/block/xen-blkfront.c | 8 +- + drivers/cdrom/cdrom.c | 703 +++++++++++++++++++++++----------------- + drivers/md/dm.c | 6 +- + fs/bio.c | 3 +- + fs/buffer.c | 19 +- + include/linux/bio.h | 1 + + include/linux/blkdev.h | 1 + + include/linux/blktrace_api.h | 172 +---------- + include/linux/buffer_head.h | 1 + + include/trace/block.h | 60 ++++ + kernel/exit.c | 2 - + mm/bounce.c | 3 +- + 29 files changed, 897 insertions(+), 587 deletions(-) + create mode 100644 include/trace/block.h +$ git reset --hard HEAD^ +HEAD is now at 534ab9d Merge commit 'ubifs/linux-next' +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Auto-merged drivers/net/starfire.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +CONFLICT (content): Merge conflict in drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Auto-merged drivers/scsi/advansys.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Removed drivers/scsi/qlogicpti_asm.c +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/net/tg3.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit da851c0: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 787 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +----- + drivers/scsi/ql1040_fw.h | 2130 ------- + drivers/scsi/ql12160_fw.h | 1811 ------ + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 20 + + firmware/WHENCE | 121 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 + + firmware/advansys/38C0800.bin.ihex | 336 + + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 +++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 --------- + 49 files changed, 20559 insertions(+), 22497 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 6 ++ + drivers/leds/Makefile | 1 + + drivers/leds/leds-alix2.c | 209 +++++++++++++++++++++++++++++++++++++++++++ + drivers/leds/leds-pca9532.c | 4 +- + include/linux/leds.h | 2 +- + 5 files changed, 219 insertions(+), 3 deletions(-) + create mode 100644 drivers/leds/leds-alix2.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + drivers/video/backlight/cr_bllcd.c | 18 +++++++----------- + drivers/video/backlight/hp680_bl.c | 20 ++++++++------------ + drivers/video/backlight/progear_bl.c | 20 ++++++++------------ + 3 files changed, 23 insertions(+), 35 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- + kernel/kgdb.c | 6 +++--- + 2 files changed, 43 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/super.c +Auto-merged fs/inode.c +Auto-merged include/linux/fs.h +Auto-merged init/main.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/slub.c +Auto-merged mm/vmscan.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysctl/vm.txt | 12 + + Documentation/vm/kmemtrace.txt | 126 +++++++ + Documentation/vm/slabinfo.c | 95 ++++- + MAINTAINERS | 6 + + fs/buffer.c | 102 +++++ + fs/dcache.c | 148 ++++++-- + fs/drop_caches.c | 2 +- + fs/ext2/super.c | 9 + + fs/ext3/super.c | 8 + + fs/ext4/super.c | 8 + + fs/inode.c | 123 ++++++ + fs/proc/inode.c | 8 + + fs/reiserfs/super.c | 8 + + include/linux/fs.h | 6 + + include/linux/kmemtrace.h | 86 +++++ + include/linux/mm.h | 3 +- + include/linux/mmzone.h | 1 + + include/linux/page-flags.h | 2 + + include/linux/slab.h | 61 +++- + include/linux/slab_def.h | 68 +++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 69 ++++- + include/linux/swap.h | 3 + + init/main.c | 2 + + kernel/sysctl.c | 20 + + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/kmemtrace.c | 333 +++++++++++++++++ + mm/slab.c | 83 ++++- + mm/slob.c | 37 ++- + mm/slub.c | 536 ++++++++++++++++++++++----- + mm/vmscan.c | 64 +++- + mm/vmstat.c | 4 +- + 35 files changed, 1955 insertions(+), 189 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/linux/kmemtrace.h + create mode 100644 mm/kmemtrace.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Merge made by recursive. + drivers/md/bitmap.c | 3 +- + drivers/md/faulty.c | 3 +- + drivers/md/linear.c | 3 +- + drivers/md/md.c | 410 +++++++++++++++++++++++++++++++------------- + drivers/md/multipath.c | 3 +- + drivers/md/raid0.c | 178 ++++++++++---------- + drivers/md/raid1.c | 3 +- + drivers/md/raid10.c | 3 +- + drivers/md/raid5.c | 8 +- + fs/block_dev.c | 14 ++ + include/linux/raid/md_k.h | 17 +- + include/linux/raid/md_p.h | 2 + + include/linux/raid/raid0.h | 10 +- + 13 files changed, 415 insertions(+), 242 deletions(-) +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/kernel/process.c +Auto-merged arch/x86/kernel/stacktrace.c +Auto-merged arch/x86/mm/Makefile +CONFLICT (content): Merge conflict in arch/x86/mm/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/slab.h +Auto-merged include/linux/slab_def.h +Auto-merged include/linux/stacktrace.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +Auto-merged mm/slab.c +CONFLICT (content): Merge conflict in mm/slab.c +Auto-merged mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'arch/x86/mm/Makefile' using previous resolution. +Resolved 'mm/slab.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 1ff73e2: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 129 ++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 88 +++++ + arch/x86/Makefile | 5 + + arch/x86/include/asm/dma-mapping.h | 2 + + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_32.h | 6 + + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/string_32.h | 8 + + arch/x86/include/asm/string_64.h | 8 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 + + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/asm-x86/kmemcheck.h | 42 ++ + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 ++++ + include/linux/mm_types.h | 8 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 11 + + mm/Makefile | 1 + + mm/kmemcheck.c | 103 +++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 1982 insertions(+), 104 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. + drivers/mfd/twl4030-core.c | 4 +- + drivers/mfd/wm8350-core.c | 126 +++++++-- + drivers/mfd/wm8350-i2c.c | 2 - + drivers/mfd/wm8350-regmap.c | 2 +- + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/wm8350_power.c | 515 +++++++++++++++++++++++++++++++++ + include/linux/i2c/twl4030.h | 4 +- + include/linux/mfd/wm8350/comparator.h | 8 + + include/linux/mfd/wm8350/core.h | 37 +++- + include/linux/mfd/wm8350/supply.h | 25 ++- + 11 files changed, 702 insertions(+), 29 deletions(-) + create mode 100644 drivers/power/wm8350_power.c +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 136 ++++----- + drivers/regulator/core.c | 403 ++++++++++++++--------- + drivers/regulator/da903x.c | 12 +- + 3 files changed, 312 insertions(+), 239 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/powerpc/mm/fault.c +Auto-merged arch/s390/hypfs/inode.c +Auto-merged arch/x86/mm/fault.c +Auto-merged drivers/net/tun.c +Auto-merged drivers/usb/core/devio.c +Auto-merged fs/binfmt_elf.c +Auto-merged fs/cifs/connect.c +Auto-merged fs/cifs/misc.c +Auto-merged fs/ext4/balloc.c +Auto-merged fs/gfs2/inode.c +Auto-merged fs/namei.c +Auto-merged fs/nfsd/nfs4recover.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c +Auto-merged fs/nfsd/nfsfh.c +Auto-merged fs/ubifs/dir.c +Auto-merged fs/udf/ialloc.c +Auto-merged fs/udf/namei.c +Auto-merged fs/xfs/linux-2.6/xfs_cred.h +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h +Auto-merged fs/xfs/linux-2.6/xfs_globals.h +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/xfs_acl.c +Auto-merged fs/xfs/xfs_inode.h +Auto-merged fs/xfs/xfs_vnodeops.h +CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h +Auto-merged include/linux/fs.h +Removed include/linux/key-ui.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged ipc/util.c +Auto-merged kernel/Makefile +Auto-merged kernel/cgroup.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/futex.c +Auto-merged kernel/sched.c +Auto-merged kernel/signal.c +Auto-merged kernel/sys.c +Auto-merged kernel/sysctl.c +Auto-merged kernel/trace/trace.c +Auto-merged mm/migrate.c +Auto-merged net/core/dev.c +Auto-merged net/ipv4/netfilter/ipt_LOG.c +Auto-merged net/ipv6/ip6_flowlabel.c +Auto-merged net/ipv6/netfilter/ip6t_LOG.c +Auto-merged net/rose/af_rose.c +Auto-merged net/socket.c +Auto-merged net/unix/af_unix.c +Auto-merged security/selinux/hooks.c +Resolved 'fs/nfsd/nfs4recover.c' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_cred.h' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_globals.h' using previous resolution. +Resolved 'fs/xfs/xfs_vnodeops.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 0b20ff3: Merge commit 'security-testing/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/credentials.txt | 582 ++++++++++++ + Documentation/kernel-parameters.txt | 4 + + arch/alpha/kernel/asm-offsets.c | 11 +- + arch/alpha/kernel/entry.S | 10 +- + arch/ia64/ia32/sys_ia32.c | 7 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/perfmon.c | 43 +- + arch/ia64/kernel/signal.c | 4 +- + arch/mips/kernel/kspd.c | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 5 +- + arch/mips/kernel/vpe.c | 4 +- + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 8 +- + arch/s390/hypfs/inode.c | 4 +- + arch/s390/kernel/compat_linux.c | 28 +- + arch/um/drivers/mconsole_kern.c | 3 +- + arch/x86/ia32/ia32_aout.c | 2 +- + arch/x86/mm/fault.c | 2 +- + drivers/block/loop.c | 6 +- + drivers/char/tty_audit.c | 6 +- + drivers/connector/cn_proc.c | 16 +- + drivers/isdn/capi/capifs.c | 4 +- + drivers/isdn/hysdn/hysdn_procconf.c | 6 +- + drivers/net/tun.c | 8 +- + drivers/usb/core/devio.c | 10 +- + drivers/usb/core/inode.c | 4 +- + fs/9p/fid.c | 2 +- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_super.c | 4 +- + fs/affs/inode.c | 4 +- + fs/affs/super.c | 4 +- + fs/anon_inodes.c | 4 +- + fs/attr.c | 4 +- + fs/autofs/inode.c | 4 +- + fs/autofs4/dev-ioctl.c | 3 +- + fs/autofs4/inode.c | 4 +- + fs/autofs4/waitq.c | 4 +- + fs/bfs/dir.c | 4 +- + fs/binfmt_aout.c | 2 +- + fs/binfmt_elf.c | 20 +- + fs/binfmt_elf_fdpic.c | 19 +- + fs/binfmt_flat.c | 2 +- + fs/binfmt_som.c | 2 +- + fs/cifs/cifs_fs_sb.h | 2 +- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 4 +- + fs/cifs/dir.c | 12 +- + fs/cifs/inode.c | 8 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/misc.c | 4 +- + fs/coda/cache.c | 6 +- + fs/coda/file.c | 3 +- + fs/coda/upcall.c | 2 +- + fs/compat.c | 42 +- + fs/devpts/inode.c | 4 +- + fs/dquot.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 3 +- + fs/ecryptfs/kthread.c | 9 +- + fs/ecryptfs/main.c | 3 +- + fs/ecryptfs/messaging.c | 18 +- + fs/ecryptfs/miscdev.c | 20 +- + fs/exec.c | 183 +++-- + fs/exportfs/expfs.c | 4 +- + fs/ext2/balloc.c | 2 +- + fs/ext2/ialloc.c | 4 +- + fs/ext3/balloc.c | 2 +- + fs/ext3/ialloc.c | 4 +- + fs/fat/file.c | 2 +- + fs/fat/inode.c | 4 +- + fs/fcntl.c | 18 +- + fs/file_table.c | 10 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 25 +- + fs/gfs2/inode.c | 10 +- + fs/hfs/inode.c | 4 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/inode.c | 4 +- + fs/hfsplus/options.c | 4 +- + fs/hpfs/namei.c | 24 +- + fs/hpfs/super.c | 4 +- + fs/hppfs/hppfs.c | 6 +- + fs/hugetlbfs/inode.c | 21 +- + fs/inotify_user.c | 2 +- + fs/internal.h | 6 + + fs/ioprio.c | 18 +- + fs/jfs/jfs_inode.c | 4 +- + fs/locks.c | 2 +- + fs/minix/bitmap.c | 4 +- + fs/namei.c | 10 +- + fs/namespace.c | 2 +- + fs/ncpfs/ioctl.c | 91 +- + fs/nfsctl.c | 5 +- + fs/nfsd/auth.c | 95 ++- + fs/nfsd/nfs4recover.c | 71 +- + fs/nfsd/nfsfh.c | 11 +- + fs/nfsd/vfs.c | 9 +- + fs/ocfs2/dlm/dlmfs.c | 8 +- + fs/ocfs2/namei.c | 4 +- + fs/omfs/inode.c | 8 +- + fs/open.c | 59 +- + fs/pipe.c | 4 +- + fs/posix_acl.c | 4 +- + fs/proc/array.c | 32 +- + fs/proc/base.c | 32 +- + fs/quota.c | 4 +- + fs/ramfs/inode.c | 4 +- + fs/reiserfs/namei.c | 4 +- + fs/smbfs/dir.c | 3 +- + fs/smbfs/inode.c | 2 +- + fs/smbfs/proc.c | 2 +- + fs/sysv/ialloc.c | 4 +- + fs/ubifs/budget.c | 2 +- + fs/ubifs/dir.c | 4 +- + fs/udf/ialloc.c | 4 +- + fs/udf/namei.c | 2 +- + fs/ufs/ialloc.c | 4 +- + fs/xfs/linux-2.6/xfs_cred.h | 12 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 3 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_vnodeops.h | 6 +- + include/keys/keyring-type.h | 31 + + include/linux/audit.h | 26 + + include/linux/binfmts.h | 16 +- + include/linux/capability.h | 25 +- + include/linux/cred.h | 340 +++++++- + include/linux/fs.h | 8 +- + include/linux/init_task.h | 13 +- + include/linux/key-ui.h | 66 -- + include/linux/key.h | 32 +- + include/linux/keyctl.h | 4 +- + include/linux/sched.h | 64 +-- + include/linux/securebits.h | 2 +- + include/linux/security.h | 338 ++++---- + include/net/scm.h | 4 +- + init/main.c | 1 + + ipc/mqueue.c | 19 +- + ipc/shm.c | 9 +- + ipc/util.c | 18 +- + kernel/Makefile | 2 +- + kernel/acct.c | 7 +- + kernel/auditsc.c | 255 +++++- + kernel/capability.c | 288 +----- + kernel/cgroup.c | 17 +- + kernel/cred-internals.h | 21 + + kernel/cred.c | 577 ++++++++++++ + kernel/exit.c | 23 +- + kernel/fork.c | 44 +- + kernel/futex.c | 20 +- + kernel/futex_compat.c | 7 +- + kernel/kmod.c | 30 +- + kernel/ptrace.c | 29 +- + kernel/sched.c | 26 +- + kernel/signal.c | 60 +- + kernel/sys.c | 584 +++++++------ + kernel/sysctl.c | 2 +- + kernel/timer.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/tsacct.c | 6 +- + kernel/uid16.c | 31 +- + kernel/user.c | 37 +- + kernel/user_namespace.c | 14 +- + lib/Makefile | 2 +- + mm/mempolicy.c | 9 +- + mm/migrate.c | 9 +- + mm/oom_kill.c | 12 +- + mm/shmem.c | 8 +- + net/9p/client.c | 2 +- + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 2 +- + net/core/dev.c | 8 +- + net/core/scm.c | 10 +- + net/ipv4/netfilter/ipt_LOG.c | 4 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/netfilter/ip6t_LOG.c | 4 +- + net/netfilter/nfnetlink_log.c | 5 +- + net/netfilter/xt_owner.c | 16 +- + net/netrom/af_netrom.c | 4 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/ar-key.c | 6 +- + net/sched/cls_flow.c | 4 +- + net/socket.c | 4 +- + net/sunrpc/auth.c | 14 +- + net/unix/af_unix.c | 11 +- + security/capability.c | 56 +- + security/commoncap.c | 830 +++++++++++------ + security/keys/internal.h | 49 +- + security/keys/key.c | 25 +- + security/keys/keyctl.c | 210 +++-- + security/keys/keyring.c | 15 +- + security/keys/permission.c | 29 +- + security/keys/proc.c | 8 +- + security/keys/process_keys.c | 469 +++++------ + security/keys/request_key.c | 135 ++-- + security/keys/request_key_auth.c | 46 +- + security/root_plug.c | 13 +- + security/security.c | 99 +- + security/selinux/exports.c | 8 +- + security/selinux/hooks.c | 1246 ++++++++++++++------------ + security/selinux/include/av_perm_to_string.h | 2 + + security/selinux/include/av_permissions.h | 2 + + security/selinux/include/class_to_string.h | 5 + + security/selinux/include/flask.h | 1 + + security/selinux/include/objsec.h | 11 - + security/selinux/nlmsgtab.c | 3 + + security/selinux/selinuxfs.c | 13 +- + security/selinux/xfrm.c | 6 +- + security/smack/smack_access.c | 4 +- + security/smack/smack_lsm.c | 173 +++-- + security/smack/smackfs.c | 6 +- + 210 files changed, 5444 insertions(+), 3179 deletions(-) + create mode 100644 Documentation/credentials.txt + create mode 100644 include/keys/keyring-type.h + delete mode 100644 include/linux/key-ui.h + create mode 100644 kernel/cred-internals.h + create mode 100644 kernel/cred.c +Merging lblnet/master +$ git merge lblnet/master +Auto-merged net/ipv4/cipso_ipv4.c +Auto-merged security/smack/smackfs.c +Merge made by recursive. + include/net/cipso_ipv4.h | 6 +- + include/net/netlabel.h | 108 +++++++++++- + net/ipv4/cipso_ipv4.c | 88 +++++++--- + net/netlabel/netlabel_cipso_v4.c | 61 ++----- + net/netlabel/netlabel_kapi.c | 356 ++++++++++++++++++++++++++++++------- + net/netlabel/netlabel_unlabeled.c | 70 +++++--- + net/netlabel/netlabel_unlabeled.h | 19 ++- + security/smack/smackfs.c | 16 ++- + 8 files changed, 558 insertions(+), 166 deletions(-) +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged drivers/char/Kconfig +Auto-merged drivers/net/slip.c +Auto-merged drivers/net/usb/hso.c +Auto-merged drivers/net/wan/x25_asy.c +Auto-merged drivers/net/wireless/strip.c +Auto-merged fs/devpts/inode.c +CONFLICT (content): Merge conflict in fs/devpts/inode.c +Auto-merged include/linux/pci_ids.h +Auto-merged include/linux/tty.h +Resolved 'fs/devpts/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 959151d: Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/devpts.txt | 132 ++++++ + drivers/char/Kconfig | 13 +- + drivers/char/amiserial.c | 34 +- + drivers/char/epca.c | 265 ++++-------- + drivers/char/esp.c | 61 ++- + drivers/char/generic_serial.c | 76 ++-- + drivers/char/hvc_console.c | 2 +- + drivers/char/hvsi.c | 12 +- + drivers/char/isicom.c | 166 ++------ + drivers/char/istallion.c | 221 +++------- + drivers/char/moxa.c | 26 +- + drivers/char/mxser.c | 150 ++----- + drivers/char/n_r3964.c | 12 +- + drivers/char/n_tty.c | 786 ++++++++++++++++++++++++++-------- + drivers/char/nozomi.c | 85 ++-- + drivers/char/pty.c | 57 +++- + drivers/char/rio/rio_linux.c | 35 +- + drivers/char/riscom8.c | 194 ++------- + drivers/char/rocket.c | 320 +++++---------- + drivers/char/rocket.h | 2 +- + drivers/char/rocket_int.h | 5 - + drivers/char/selection.c | 2 +- + drivers/char/ser_a2232.c | 23 +- + drivers/char/serial167.c | 32 +- + drivers/char/specialix.c | 34 +- + drivers/char/stallion.c | 169 ++------ + drivers/char/sx.c | 31 +- + drivers/char/synclink.c | 177 ++++----- + drivers/char/synclink_gt.c | 120 ++--- + drivers/char/synclinkmp.c | 171 +++----- + drivers/char/tty_io.c | 54 +-- + drivers/char/tty_ldisc.c | 30 +- + drivers/char/tty_port.c | 225 ++++++++++ + drivers/char/vme_scc.c | 27 +- + drivers/char/vt.c | 16 +- + drivers/char/vt_ioctl.c | 2 +- + drivers/net/irda/irtty-sir.c | 7 +- + drivers/net/slip.c | 11 +- + drivers/net/usb/hso.c | 432 +++++++++++++++++-- + drivers/net/wan/x25_asy.c | 18 +- + drivers/net/wireless/strip.c | 18 +- + drivers/serial/8250_pci.c | 131 ++++--- + drivers/serial/bfin_5xx.c | 239 ++++++----- + drivers/usb/serial/console.c | 14 + + drivers/usb/serial/sierra.c | 2 +- + drivers/usb/serial/usb-serial.c | 19 +- + fs/devpts/inode.c | 472 ++++++++++++++++++-- + include/linux/8250_pci.h | 2 +- + include/linux/generic_serial.h | 1 - + include/linux/istallion.h | 2 - + include/linux/pci_ids.h | 1 + + include/linux/tty.h | 27 ++- + include/linux/tty_driver.h | 6 +- + 53 files changed, 3051 insertions(+), 2118 deletions(-) + create mode 100644 Documentation/filesystems/devpts.txt +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already up-to-date. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Auto-merged include/linux/irq.h +Merge made by recursive. + include/linux/irq.h | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Already uptodate! +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merged drivers/usb/wusbcore/rh.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-uwb_rc | 14 +- + Documentation/usb/wusb-cbaf | 9 - + drivers/usb/host/hwa-hc.c | 104 +++--- + drivers/usb/host/whci/hcd.c | 3 - + drivers/usb/host/whci/hw.c | 8 +- + drivers/usb/host/whci/int.c | 1 - + drivers/usb/host/whci/whcd.h | 2 +- + drivers/usb/host/whci/whci-hc.h | 2 + + drivers/usb/host/whci/wusb.c | 16 +- + drivers/usb/wusbcore/cbaf.c | 1 - + drivers/usb/wusbcore/crypto.c | 15 +- + drivers/usb/wusbcore/devconnect.c | 105 +------ + drivers/usb/wusbcore/mmc.c | 83 +---- + drivers/usb/wusbcore/pal.c | 16 +- + drivers/usb/wusbcore/reservation.c | 7 +- + drivers/usb/wusbcore/rh.c | 40 ++- + drivers/usb/wusbcore/security.c | 3 +- + drivers/usb/wusbcore/wusbhc.h | 36 +- + drivers/uwb/Makefile | 2 + + drivers/uwb/beacon.c | 122 +++---- + drivers/uwb/driver.c | 2 - + drivers/uwb/drp-ie.c | 1 - + drivers/uwb/drp.c | 24 +-- + drivers/uwb/hwa-rc.c | 23 ++- + drivers/uwb/i1480/dfu/usb.c | 1 - + drivers/uwb/i1480/i1480u-wlp/lc.c | 3 +- + drivers/uwb/i1480/i1480u-wlp/netdev.c | 51 +--- + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 1 - + drivers/uwb/ie-rcv.c | 55 +++ + drivers/uwb/ie.c | 463 +++++++++----------------- + drivers/uwb/lc-rc.c | 62 ++--- + drivers/uwb/neh.c | 46 ++- + drivers/uwb/pal.c | 20 +- + drivers/uwb/radio.c | 202 +++++++++++ + drivers/uwb/reset.c | 45 ++- + drivers/uwb/rsv.c | 88 ++++-- + drivers/uwb/umc-bus.c | 62 +++- + drivers/uwb/umc-dev.c | 3 +- + drivers/uwb/uwb-debug.c | 66 +++- + drivers/uwb/uwb-internal.h | 43 +-- + drivers/uwb/uwbd.c | 102 ++---- + drivers/uwb/whc-rc.c | 31 ++- + drivers/uwb/whci.c | 2 +- + drivers/uwb/wlp/wlp-internal.h | 4 - + drivers/uwb/wlp/wlp-lc.c | 19 +- + include/linux/usb/wusb-wa.h | 1 + + include/linux/uwb.h | 73 +++-- + include/linux/uwb/debug-cmd.h | 11 + + include/linux/uwb/debug.h | 2 +- + include/linux/uwb/spec.h | 28 ++ + include/linux/uwb/umc.h | 2 + + include/linux/wlp.h | 3 +- + 52 files changed, 1101 insertions(+), 1027 deletions(-) + create mode 100644 drivers/uwb/ie-rcv.c + create mode 100644 drivers/uwb/radio.c +Merging watchdog/master +$ git merge watchdog/master +Auto-merged drivers/watchdog/Kconfig +Auto-merged drivers/watchdog/ib700wdt.c +Merge made by recursive. + drivers/watchdog/Kconfig | 19 + + drivers/watchdog/Makefile | 2 + + drivers/watchdog/hpwdt.c | 7 +- + drivers/watchdog/iTCO_vendor_support.c | 31 +-- + drivers/watchdog/iTCO_wdt.c | 164 ++++++---- + drivers/watchdog/ib700wdt.c | 49 +-- + drivers/watchdog/mtx-1_wdt.c | 4 + + drivers/watchdog/sch311x_wdt.c | 578 ++++++++++++++++++++++++++++++++ + drivers/watchdog/wm8350_wdt.c | 329 ++++++++++++++++++ + 9 files changed, 1064 insertions(+), 119 deletions(-) + create mode 100644 drivers/watchdog/sch311x_wdt.c + create mode 100644 drivers/watchdog/wm8350_wdt.c +Merging proc/proc +$ git merge proc/proc +Auto-merged Documentation/filesystems/proc.txt +Auto-merged fs/proc/base.c +CONFLICT (content): Merge conflict in fs/proc/base.c +Auto-merged fs/proc/inode.c +Auto-merged include/linux/magic.h +Auto-merged include/net/net_namespace.h +Auto-merged kernel/exit.c +CONFLICT (content): Merge conflict in kernel/exit.c +Auto-merged security/selinux/hooks.c +Resolved 'fs/proc/base.c' using previous resolution. +Resolved 'kernel/exit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit bede8ef: Merge commit 'proc/proc' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/proc.txt | 1 + + arch/mips/kernel/stacktrace.c | 24 +++- + fs/proc/Makefile | 1 + + fs/proc/automount.c | 28 ++++ + fs/proc/base.c | 249 ++++++++++++++++++++---------------- + fs/proc/generic.c | 55 ++++---- + fs/proc/inode.c | 5 +- + fs/proc/internal.h | 15 ++- + fs/proc/proc_net.c | 235 ++++++++++++++++++++++++++-------- + fs/proc/root.c | 8 +- + include/linux/magic.h | 1 + + include/linux/proc_fs.h | 10 +- + include/net/net_namespace.h | 1 + + kernel/exit.c | 1 + + security/selinux/hooks.c | 29 ++++- + 15 files changed, 443 insertions(+), 220 deletions(-) + create mode 100644 fs/proc/automount.c +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merged drivers/pci/intel-iommu.c +Merge made by recursive. + drivers/pci/intel-iommu.c | 132 ++++++++++++++++++++++++++++++++++++++- + include/linux/dma_remapping.h | 137 +---------------------------------------- + include/linux/dmar.h | 1 - + include/linux/intel-iommu.h | 5 -- + 4 files changed, 132 insertions(+), 143 deletions(-) +Merging userns/next +$ git merge userns/next +Auto-merged include/linux/sched.h +Auto-merged kernel/fork.c +Auto-merged kernel/sys.c +Merge made by recursive. + fs/ecryptfs/messaging.c | 13 +++---- + fs/ecryptfs/miscdev.c | 19 ++++------ + include/linux/cred.h | 2 + + include/linux/init_task.h | 1 - + include/linux/nsproxy.h | 1 - + include/linux/sched.h | 1 + + include/linux/user_namespace.h | 13 ++----- + kernel/cred.c | 15 +++++++- + kernel/fork.c | 19 ++++++++-- + kernel/nsproxy.c | 15 +------- + kernel/sys.c | 4 +- + kernel/user.c | 47 +++++++------------------ + kernel/user_namespace.c | 75 ++++++++++++++++------------------------ + 13 files changed, 96 insertions(+), 129 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Auto-merged arch/powerpc/kernel/time.c +Auto-merged arch/s390/kernel/smp.c +Auto-merged arch/x86/xen/time.c +Auto-merged include/linux/sched.h +Auto-merged kernel/sched.c +CONFLICT (content): Merge conflict in kernel/sched.c +Auto-merged kernel/timer.c +Resolved 'kernel/sched.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 752b603: Merge commit 'cputime/cputime' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/kernel/time.c | 18 ++++--- + arch/powerpc/kernel/process.c | 1 + + arch/powerpc/kernel/time.c | 18 ++++--- + arch/s390/include/asm/cpu.h | 4 +- + arch/s390/kernel/process.c | 74 ++++++++++++++++++-------- + arch/s390/kernel/s390_ext.c | 2 +- + arch/s390/kernel/smp.c | 25 +++++---- + arch/s390/kernel/vtime.c | 16 +++--- + arch/x86/xen/time.c | 10 ++-- + drivers/s390/cio/cio.c | 2 +- + include/linux/kernel_stat.h | 13 +++-- + include/linux/sched.h | 1 - + kernel/sched.c | 115 +++++++++++++++++++++++++++-------------- + kernel/time/tick-sched.c | 12 ++-- + kernel/timer.c | 15 ----- + 15 files changed, 193 insertions(+), 133 deletions(-) +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merged MAINTAINERS +Auto-merged drivers/scsi/scsi_scan.c +Merge made by recursive. + Documentation/devices.txt | 6 + + Documentation/scsi/osd.txt | 198 ++++++ + MAINTAINERS | 10 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 2 + + drivers/scsi/osd/Kbuild | 33 + + drivers/scsi/osd/Kconfig | 41 ++ + drivers/scsi/osd/Makefile | 43 ++ + drivers/scsi/osd/osd_debug.h | 30 + + drivers/scsi/osd/osd_initiator.c | 1457 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/osd/osd_ktests.c | 441 ++++++++++++ + drivers/scsi/osd/osd_ktests.h | 31 + + drivers/scsi/osd/osd_test.c | 74 ++ + drivers/scsi/osd/osd_uld.c | 445 ++++++++++++ + drivers/scsi/scsi_scan.c | 1 + + include/linux/major.h | 1 + + include/scsi/osd_attributes.h | 327 +++++++++ + include/scsi/osd_initiator.h | 379 ++++++++++ + include/scsi/osd_protocol.h | 575 +++++++++++++++ + include/scsi/osd_sec.h | 45 ++ + include/scsi/osd_types.h | 40 + + include/scsi/scsi.h | 1 + + 22 files changed, 4182 insertions(+), 0 deletions(-) + create mode 100644 Documentation/scsi/osd.txt + create mode 100644 drivers/scsi/osd/Kbuild + create mode 100644 drivers/scsi/osd/Kconfig + create mode 100755 drivers/scsi/osd/Makefile + create mode 100644 drivers/scsi/osd/osd_debug.h + create mode 100644 drivers/scsi/osd/osd_initiator.c + create mode 100644 drivers/scsi/osd/osd_ktests.c + create mode 100644 drivers/scsi/osd/osd_ktests.h + create mode 100644 drivers/scsi/osd/osd_test.c + create mode 100644 drivers/scsi/osd/osd_uld.c + create mode 100644 include/scsi/osd_attributes.h + create mode 100644 include/scsi/osd_initiator.h + create mode 100644 include/scsi/osd_protocol.h + create mode 100644 include/scsi/osd_sec.h + create mode 100644 include/scsi/osd_types.h +Merging fatfs/master +$ git merge fatfs/master +Auto-merged fs/fat/inode.c +Merge made by recursive. + fs/fat/dir.c | 1 - + fs/fat/inode.c | 2 ++ + fs/fat/namei_vfat.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging quilt/staging +$ git merge quilt/staging +Auto-merged arch/arm/Kconfig +Removed drivers/staging/winbond/adapter.h +Removed drivers/staging/winbond/linux/common.h +Removed drivers/staging/winbond/linux/sysdef.h +Removed drivers/staging/winbond/linux/wb35rx_f.h +Removed drivers/staging/winbond/linux/wb35tx_f.h +Removed drivers/staging/winbond/linux/wbusb.c +Removed drivers/staging/winbond/linux/wbusb_f.h +Removed drivers/staging/winbond/rxisr.c +Removed drivers/staging/winbond/sme_api.c +Removed drivers/staging/winbond/wblinux.c +Removed drivers/staging/winbond/wblinux_s.h +Removed drivers/staging/wlan-ng/hfa384x.c +Removed drivers/staging/wlan-ng/p80211mod.c +Removed drivers/staging/wlan-ng/prism2_cs.c +Removed drivers/staging/wlan-ng/prism2_pci.c +Removed drivers/staging/wlan-ng/prism2_plx.c +Removed drivers/staging/wlan-ng/version.h +Merge made by recursive. + arch/arm/Kconfig | 2 + + arch/cris/Kconfig | 2 + + arch/h8300/Kconfig | 2 + + drivers/staging/Kconfig | 16 + + drivers/staging/Makefile | 8 + + drivers/staging/agnx/Kconfig | 5 + + drivers/staging/agnx/Makefile | 8 + + drivers/staging/agnx/TODO | 22 + + drivers/staging/agnx/agnx.h | 156 + + drivers/staging/agnx/debug.h | 418 + + drivers/staging/agnx/pci.c | 650 ++ + drivers/staging/agnx/phy.c | 960 +++ + drivers/staging/agnx/phy.h | 409 + + drivers/staging/agnx/rf.c | 894 ++ + drivers/staging/agnx/sta.c | 219 + + drivers/staging/agnx/sta.h | 222 + + drivers/staging/agnx/table.c | 168 + + drivers/staging/agnx/table.h | 10 + + drivers/staging/agnx/xmit.c | 819 ++ + drivers/staging/agnx/xmit.h | 250 + + drivers/staging/asus_oled/Kconfig | 6 + + drivers/staging/asus_oled/Makefile | 1 + + drivers/staging/asus_oled/README | 156 + + drivers/staging/asus_oled/TODO | 10 + + drivers/staging/asus_oled/asus_oled.c | 745 ++ + drivers/staging/asus_oled/linux.txt | 33 + + drivers/staging/asus_oled/linux_f.txt | 18 + + drivers/staging/asus_oled/linux_fr.txt | 33 + + drivers/staging/asus_oled/tux.txt | 33 + + drivers/staging/asus_oled/tux_r.txt | 33 + + drivers/staging/asus_oled/tux_r2.txt | 33 + + drivers/staging/asus_oled/zig.txt | 33 + + drivers/staging/at76_usb/Kconfig | 2 +- + drivers/staging/at76_usb/at76_usb.c | 4615 ++--------- + drivers/staging/at76_usb/at76_usb.h | 227 +- + drivers/staging/benet/Kconfig | 7 + + drivers/staging/benet/MAINTAINERS | 6 + + drivers/staging/benet/Makefile | 14 + + drivers/staging/benet/TODO | 7 + + drivers/staging/benet/asyncmesg.h | 98 + + drivers/staging/benet/be_cm.h | 134 + + drivers/staging/benet/be_common.h | 53 + + drivers/staging/benet/be_ethtool.c | 348 + + drivers/staging/benet/be_init.c | 1381 ++++ + drivers/staging/benet/be_int.c | 872 ++ + drivers/staging/benet/be_netif.c | 706 ++ + drivers/staging/benet/benet.h | 429 + + drivers/staging/benet/bestatus.h | 103 + + drivers/staging/benet/cev.h | 243 + + drivers/staging/benet/cq.c | 211 + + drivers/staging/benet/descriptors.h | 71 + + drivers/staging/benet/doorbells.h | 179 + + drivers/staging/benet/ep.h | 66 + + drivers/staging/benet/eq.c | 299 + + drivers/staging/benet/eth.c | 1273 +++ + drivers/staging/benet/etx_context.h | 55 + + drivers/staging/benet/funcobj.c | 565 ++ + drivers/staging/benet/fwcmd_common.h | 222 + + drivers/staging/benet/fwcmd_common_bmap.h | 717 ++ + drivers/staging/benet/fwcmd_eth_bmap.h | 280 + + drivers/staging/benet/fwcmd_hdr_bmap.h | 54 + + drivers/staging/benet/fwcmd_mcc.h | 94 + + drivers/staging/benet/fwcmd_opcodes.h | 244 + + drivers/staging/benet/fwcmd_types_bmap.h | 29 + + drivers/staging/benet/host_struct.h | 182 + + drivers/staging/benet/hwlib.h | 829 ++ + drivers/staging/benet/mpu.c | 1363 +++ + drivers/staging/benet/mpu.h | 74 + + drivers/staging/benet/mpu_context.h | 46 + + drivers/staging/benet/pcicfg.h | 825 ++ + drivers/staging/benet/post_codes.h | 111 + + drivers/staging/benet/regmap.h | 68 + + drivers/staging/comedi/Kconfig | 27 + + drivers/staging/comedi/Makefile | 17 + + drivers/staging/comedi/TODO | 14 + + drivers/staging/comedi/comedi.h | 916 +++ + drivers/staging/comedi/comedi_compat32.c | 597 ++ + drivers/staging/comedi/comedi_compat32.h | 58 + + drivers/staging/comedi/comedi_fops.c | 2244 +++++ + drivers/staging/comedi/comedi_fops.h | 8 + + drivers/staging/comedi/comedi_ksyms.c | 77 + + drivers/staging/comedi/comedi_rt.h | 150 + + drivers/staging/comedi/comedidev.h | 537 ++ + drivers/staging/comedi/comedilib.h | 192 + + drivers/staging/comedi/drivers.c | 846 ++ + drivers/staging/comedi/drivers/Makefile | 21 + + drivers/staging/comedi/drivers/comedi_bond.c | 535 ++ + drivers/staging/comedi/drivers/comedi_fc.c | 118 + + drivers/staging/comedi/drivers/comedi_fc.h | 76 + + drivers/staging/comedi/drivers/comedi_parport.c | 390 + + drivers/staging/comedi/drivers/comedi_pci.h | 60 + + drivers/staging/comedi/drivers/comedi_test.c | 527 ++ + drivers/staging/comedi/drivers/dt9812.c | 1162 +++ + drivers/staging/comedi/drivers/icp_multi.c | 1085 +++ + drivers/staging/comedi/drivers/icp_multi.h | 278 + + drivers/staging/comedi/drivers/me4000.c | 2362 ++++++ + drivers/staging/comedi/drivers/me4000.h | 446 + + drivers/staging/comedi/drivers/me_daq.c | 845 ++ + drivers/staging/comedi/drivers/mite.c | 809 ++ + drivers/staging/comedi/drivers/mite.h | 453 + + drivers/staging/comedi/drivers/plx9080.h | 429 + + drivers/staging/comedi/drivers/rtd520.c | 2283 ++++++ + drivers/staging/comedi/drivers/rtd520.h | 412 + + drivers/staging/comedi/drivers/s626.c | 3254 ++++++++ + drivers/staging/comedi/drivers/s626.h | 802 ++ + drivers/staging/comedi/drivers/usbdux.c | 2932 +++++++ + drivers/staging/comedi/drivers/usbduxfast.c | 1778 ++++ + drivers/staging/comedi/interrupt.h | 60 + + drivers/staging/comedi/kcomedilib/Makefile | 8 + + drivers/staging/comedi/kcomedilib/data.c | 89 + + drivers/staging/comedi/kcomedilib/dio.c | 95 + + drivers/staging/comedi/kcomedilib/get.c | 294 + + .../staging/comedi/kcomedilib/kcomedilib_main.c | 567 ++ + drivers/staging/comedi/kcomedilib/ksyms.c | 144 + + drivers/staging/comedi/pci_ids.h | 31 + + drivers/staging/comedi/proc.c | 100 + + drivers/staging/comedi/range.c | 161 + + drivers/staging/comedi/rt.c | 412 + + drivers/staging/comedi/rt_pend_tq.c | 113 + + drivers/staging/comedi/rt_pend_tq.h | 10 + + drivers/staging/comedi/wrapper.h | 25 + + drivers/staging/echo/TODO | 2 - + drivers/staging/echo/echo.h | 4 +- + drivers/staging/echo/fir.h | 44 +- + drivers/staging/echo/mmx.h | 8 +- + drivers/staging/et131x/et1310_tx.c | 3 - + drivers/staging/et131x/et131x_debug.h | 160 +- + drivers/staging/go7007/Kconfig | 10 + + drivers/staging/go7007/Makefile | 15 +- + drivers/staging/go7007/go7007-driver.c | 5 +- + drivers/staging/go7007/go7007-fw.c | 30 +- + drivers/staging/go7007/go7007-priv.h | 2 + + drivers/staging/go7007/go7007-usb.c | 50 +- + drivers/staging/go7007/go7007-v4l2.c | 1700 +++-- + drivers/staging/go7007/go7007.txt | 481 ++ + drivers/staging/go7007/s2250-board.c | 630 ++ + drivers/staging/go7007/s2250-loader.c | 188 + + drivers/staging/go7007/saa7134-go7007.c | 52 +- + drivers/staging/go7007/wis-i2c.h | 1 + + drivers/staging/go7007/wis-sony-tuner.c | 2 +- + drivers/staging/me4000/me4000.c | 2 +- + drivers/staging/meilhaus/Kconfig | 127 + + drivers/staging/meilhaus/Makefile | 43 + + drivers/staging/meilhaus/TODO | 10 + + drivers/staging/meilhaus/me0600_device.c | 215 + + drivers/staging/meilhaus/me0600_device.h | 97 + + drivers/staging/meilhaus/me0600_dio.c | 415 + + drivers/staging/meilhaus/me0600_dio.h | 68 + + drivers/staging/meilhaus/me0600_dio_reg.h | 41 + + drivers/staging/meilhaus/me0600_ext_irq.c | 478 ++ + drivers/staging/meilhaus/me0600_ext_irq.h | 58 + + drivers/staging/meilhaus/me0600_ext_irq_reg.h | 18 + + drivers/staging/meilhaus/me0600_optoi.c | 243 + + drivers/staging/meilhaus/me0600_optoi.h | 58 + + drivers/staging/meilhaus/me0600_optoi_reg.h | 35 + + drivers/staging/meilhaus/me0600_relay.c | 359 + + drivers/staging/meilhaus/me0600_relay.h | 63 + + drivers/staging/meilhaus/me0600_relay_reg.h | 36 + + drivers/staging/meilhaus/me0600_ttli.c | 238 + + drivers/staging/meilhaus/me0600_ttli.h | 58 + + drivers/staging/meilhaus/me0600_ttli_reg.h | 35 + + drivers/staging/meilhaus/me0900_device.c | 180 + + drivers/staging/meilhaus/me0900_device.h | 92 + + drivers/staging/meilhaus/me0900_di.c | 246 + + drivers/staging/meilhaus/me0900_di.h | 65 + + drivers/staging/meilhaus/me0900_do.c | 314 + + drivers/staging/meilhaus/me0900_do.h | 68 + + drivers/staging/meilhaus/me0900_reg.h | 40 + + drivers/staging/meilhaus/me1000_device.c | 208 + + drivers/staging/meilhaus/me1000_device.h | 59 + + drivers/staging/meilhaus/me1000_dio.c | 438 + + drivers/staging/meilhaus/me1000_dio.h | 71 + + drivers/staging/meilhaus/me1000_dio_reg.h | 50 + + drivers/staging/meilhaus/me1400_device.c | 256 + + drivers/staging/meilhaus/me1400_device.h | 108 + + drivers/staging/meilhaus/me1400_ext_irq.c | 517 ++ + drivers/staging/meilhaus/me1400_ext_irq.h | 62 + + drivers/staging/meilhaus/me1400_ext_irq_reg.h | 56 + + drivers/staging/meilhaus/me1600_ao.c | 1033 +++ + drivers/staging/meilhaus/me1600_ao.h | 132 + + drivers/staging/meilhaus/me1600_ao_reg.h | 66 + + drivers/staging/meilhaus/me1600_device.c | 261 + + drivers/staging/meilhaus/me1600_device.h | 101 + + drivers/staging/meilhaus/me4600_ai.c | 3434 ++++++++ + drivers/staging/meilhaus/me4600_ai.h | 180 + + drivers/staging/meilhaus/me4600_ai_reg.h | 107 + + drivers/staging/meilhaus/me4600_ao.c | 6011 ++++++++++++++ + drivers/staging/meilhaus/me4600_ao.h | 263 + + drivers/staging/meilhaus/me4600_ao_reg.h | 113 + + drivers/staging/meilhaus/me4600_device.c | 373 + + drivers/staging/meilhaus/me4600_device.h | 151 + + drivers/staging/meilhaus/me4600_di.c | 256 + + drivers/staging/meilhaus/me4600_di.h | 64 + + drivers/staging/meilhaus/me4600_dio.c | 510 ++ + drivers/staging/meilhaus/me4600_dio.h | 69 + + drivers/staging/meilhaus/me4600_dio_reg.h | 63 + + drivers/staging/meilhaus/me4600_do.c | 433 + + drivers/staging/meilhaus/me4600_do.h | 65 + + drivers/staging/meilhaus/me4600_ext_irq.c | 467 ++ + drivers/staging/meilhaus/me4600_ext_irq.h | 78 + + drivers/staging/meilhaus/me4600_ext_irq_reg.h | 41 + + drivers/staging/meilhaus/me4600_reg.h | 46 + + drivers/staging/meilhaus/me6000_ao.c | 3739 +++++++++ + drivers/staging/meilhaus/me6000_ao.h | 200 + + drivers/staging/meilhaus/me6000_ao_reg.h | 177 + + drivers/staging/meilhaus/me6000_device.c | 211 + + drivers/staging/meilhaus/me6000_device.h | 149 + + drivers/staging/meilhaus/me6000_dio.c | 415 + + drivers/staging/meilhaus/me6000_dio.h | 68 + + drivers/staging/meilhaus/me6000_dio_reg.h | 43 + + drivers/staging/meilhaus/me6000_reg.h | 35 + + drivers/staging/meilhaus/me8100_device.c | 187 + + drivers/staging/meilhaus/me8100_device.h | 97 + + drivers/staging/meilhaus/me8100_di.c | 693 ++ + drivers/staging/meilhaus/me8100_di.h | 89 + + drivers/staging/meilhaus/me8100_di_reg.h | 47 + + drivers/staging/meilhaus/me8100_do.c | 391 + + drivers/staging/meilhaus/me8100_do.h | 70 + + drivers/staging/meilhaus/me8100_do_reg.h | 36 + + drivers/staging/meilhaus/me8100_reg.h | 41 + + drivers/staging/meilhaus/me8200_device.c | 194 + + drivers/staging/meilhaus/me8200_device.h | 97 + + drivers/staging/meilhaus/me8200_di.c | 857 ++ + drivers/staging/meilhaus/me8200_di.h | 92 + + drivers/staging/meilhaus/me8200_di_reg.h | 75 + + drivers/staging/meilhaus/me8200_dio.c | 418 + + drivers/staging/meilhaus/me8200_dio.h | 68 + + drivers/staging/meilhaus/me8200_dio_reg.h | 43 + + drivers/staging/meilhaus/me8200_do.c | 600 ++ + drivers/staging/meilhaus/me8200_do.h | 75 + + drivers/staging/meilhaus/me8200_do_reg.h | 40 + + drivers/staging/meilhaus/me8200_reg.h | 46 + + drivers/staging/meilhaus/me8254.c | 1176 +++ + drivers/staging/meilhaus/me8254.h | 80 + + drivers/staging/meilhaus/me8254_reg.h | 172 + + drivers/staging/meilhaus/me8255.c | 462 ++ + drivers/staging/meilhaus/me8255.h | 59 + + drivers/staging/meilhaus/me8255_reg.h | 50 + + drivers/staging/meilhaus/mecirc_buf.h | 131 + + drivers/staging/meilhaus/mecommon.h | 26 + + drivers/staging/meilhaus/medebug.h | 125 + + drivers/staging/meilhaus/medefines.h | 449 + + drivers/staging/meilhaus/medevice.c | 1740 ++++ + drivers/staging/meilhaus/medevice.h | 304 + + drivers/staging/meilhaus/medlist.c | 127 + + drivers/staging/meilhaus/medlist.h | 91 + + drivers/staging/meilhaus/medlock.c | 195 + + drivers/staging/meilhaus/medlock.h | 76 + + drivers/staging/meilhaus/medriver.h | 350 + + drivers/staging/meilhaus/medummy.c | 1266 +++ + drivers/staging/meilhaus/medummy.h | 40 + + drivers/staging/meilhaus/meerror.h | 100 + + drivers/staging/meilhaus/mefirmware.c | 137 + + drivers/staging/meilhaus/mefirmware.h | 57 + + drivers/staging/meilhaus/meids.h | 31 + + drivers/staging/meilhaus/meinternal.h | 363 + + drivers/staging/meilhaus/meioctl.h | 515 ++ + drivers/staging/meilhaus/memain.c | 2022 +++++ + drivers/staging/meilhaus/memain.h | 460 ++ + drivers/staging/meilhaus/meplx_reg.h | 53 + + drivers/staging/meilhaus/meslist.c | 173 + + drivers/staging/meilhaus/meslist.h | 108 + + drivers/staging/meilhaus/meslock.c | 136 + + drivers/staging/meilhaus/meslock.h | 73 + + drivers/staging/meilhaus/mesubdevice.c | 317 + + drivers/staging/meilhaus/mesubdevice.h | 197 + + drivers/staging/meilhaus/metempl_device.c | 137 + + drivers/staging/meilhaus/metempl_device.h | 92 + + drivers/staging/meilhaus/metempl_sub.c | 149 + + drivers/staging/meilhaus/metempl_sub.h | 64 + + drivers/staging/meilhaus/metempl_sub_reg.h | 35 + + drivers/staging/meilhaus/metypes.h | 95 + + drivers/staging/otus/80211core/amsdu.c | 134 + + drivers/staging/otus/80211core/cagg.c | 3611 ++++++++ + drivers/staging/otus/80211core/cagg.h | 435 + + drivers/staging/otus/80211core/ccmd.c | 1861 +++++ + drivers/staging/otus/80211core/cfunc.c | 1227 +++ + drivers/staging/otus/80211core/cfunc.h | 449 + + drivers/staging/otus/80211core/chb.c | 200 + + drivers/staging/otus/80211core/cic.c | 496 ++ + drivers/staging/otus/80211core/cinit.c | 1911 +++++ + drivers/staging/otus/80211core/cmm.c | 2141 +++++ + drivers/staging/otus/80211core/cmmap.c | 2402 ++++++ + drivers/staging/otus/80211core/cmmsta.c | 5782 +++++++++++++ + drivers/staging/otus/80211core/coid.c | 2695 ++++++ + drivers/staging/otus/80211core/cprecomp.h | 32 + + drivers/staging/otus/80211core/cpsmgr.c | 731 ++ + drivers/staging/otus/80211core/cscanmgr.c | 535 ++ + drivers/staging/otus/80211core/ctkip.c | 598 ++ + drivers/staging/otus/80211core/ctxrx.c | 4096 +++++++++ + drivers/staging/otus/80211core/cwep.c | 299 + + drivers/staging/otus/80211core/cwm.c | 131 + + drivers/staging/otus/80211core/cwm.h | 45 + + drivers/staging/otus/80211core/freqctrl.c | 259 + + drivers/staging/otus/80211core/ledmgr.c | 557 ++ + drivers/staging/otus/80211core/performance.c | 431 + + drivers/staging/otus/80211core/performance.h | 97 + + drivers/staging/otus/80211core/pub_usb.h | 102 + + drivers/staging/otus/80211core/pub_zfi.h | 821 ++ + drivers/staging/otus/80211core/pub_zfw.h | 93 + + drivers/staging/otus/80211core/queue.c | 303 + + drivers/staging/otus/80211core/queue.h | 37 + + drivers/staging/otus/80211core/ratectrl.c | 874 ++ + drivers/staging/otus/80211core/ratectrl.h | 37 + + drivers/staging/otus/80211core/struct.h | 1315 +++ + drivers/staging/otus/80211core/wlan.h | 595 ++ + drivers/staging/otus/Kconfig | 32 + + drivers/staging/otus/Makefile | 67 + + drivers/staging/otus/TODO | 9 + + drivers/staging/otus/apdbg.c | 457 + + drivers/staging/otus/athr_common.h | 141 + + drivers/staging/otus/hal/hpDKfwu.c | 832 ++ + drivers/staging/otus/hal/hpani.c | 732 ++ + drivers/staging/otus/hal/hpani.h | 420 + + drivers/staging/otus/hal/hpfw2.c | 1018 +++ + drivers/staging/otus/hal/hpfwbu.c | 5269 ++++++++++++ + drivers/staging/otus/hal/hpfwspiu.c | 655 ++ + drivers/staging/otus/hal/hpfwu.c | 1017 +++ + drivers/staging/otus/hal/hpfwu.c.drv_ba_resend | 742 ++ + drivers/staging/otus/hal/hpfwu_2k.c | 1016 +++ + drivers/staging/otus/hal/hpfwu_BA.c | 874 ++ + drivers/staging/otus/hal/hpfwu_FB50_mdk.c | 721 ++ + drivers/staging/otus/hal/hpfwu_OTUS_RC.c | 715 ++ + drivers/staging/otus/hal/hpfwu_txstream.c | 1017 +++ + drivers/staging/otus/hal/hpfwuinit.c | 240 + + drivers/staging/otus/hal/hpmain.c | 4643 +++++++++++ + drivers/staging/otus/hal/hpreg.c | 2481 ++++++ + drivers/staging/otus/hal/hpreg.h | 524 ++ + drivers/staging/otus/hal/hprw.c | 1557 ++++ + drivers/staging/otus/hal/hpusb.c | 1584 ++++ + drivers/staging/otus/hal/hpusb.h | 437 + + drivers/staging/otus/hal/otus.ini | 414 + + drivers/staging/otus/ioctl.c | 2936 +++++++ + drivers/staging/otus/oal_dt.h | 60 + + drivers/staging/otus/oal_marc.h | 135 + + drivers/staging/otus/usbdrv.c | 1209 +++ + drivers/staging/otus/usbdrv.h | 257 + + drivers/staging/otus/wrap_buf.c | 114 + + drivers/staging/otus/wrap_dbg.c | 101 + + drivers/staging/otus/wrap_ev.c | 283 + + drivers/staging/otus/wrap_mem.c | 101 + + drivers/staging/otus/wrap_mis.c | 108 + + drivers/staging/otus/wrap_pkt.c | 178 + + drivers/staging/otus/wrap_sec.c | 127 + + drivers/staging/otus/wrap_usb.c | 195 + + drivers/staging/otus/wwrap.c | 1191 +++ + drivers/staging/otus/zdcompat.h | 116 + + drivers/staging/otus/zdusb.c | 295 + + drivers/staging/otus/zdusb.h | 43 + + drivers/staging/panel/Kconfig | 278 + + drivers/staging/panel/Makefile | 1 + + drivers/staging/panel/TODO | 9 + + drivers/staging/panel/lcd-panel-cgram.txt | 24 + + drivers/staging/panel/panel.c | 2193 +++++ + drivers/staging/poch/README | 9 +- + drivers/staging/poch/poch.c | 104 +- + drivers/staging/rt2860/2860_main_dev.c | 1377 ++++ + drivers/staging/rt2860/Kconfig | 5 + + drivers/staging/rt2860/Makefile | 43 + + drivers/staging/rt2860/TODO | 17 + + drivers/staging/rt2860/aironet.h | 210 + + drivers/staging/rt2860/ap.h | 557 ++ + drivers/staging/rt2860/chlist.h | 1296 +++ + drivers/staging/rt2860/common/2860_rtmp_init.c | 922 +++ + drivers/staging/rt2860/common/action.c | 1031 +++ + drivers/staging/rt2860/common/action.h | 68 + + drivers/staging/rt2860/common/ba_action.c | 1802 ++++ + drivers/staging/rt2860/common/cmm_data.c | 3466 ++++++++ + drivers/staging/rt2860/common/cmm_data_2860.c | 1240 +++ + drivers/staging/rt2860/common/cmm_info.c | 3417 ++++++++ + drivers/staging/rt2860/common/cmm_sanity.c | 1633 ++++ + drivers/staging/rt2860/common/cmm_sync.c | 702 ++ + drivers/staging/rt2860/common/cmm_wpa.c | 1606 ++++ + drivers/staging/rt2860/common/dfs.c | 453 + + drivers/staging/rt2860/common/eeprom.c | 244 + + drivers/staging/rt2860/common/firmware.h | 558 ++ + drivers/staging/rt2860/common/md5.c | 1427 ++++ + drivers/staging/rt2860/common/mlme.c | 8667 ++++++++++++++++++++ + drivers/staging/rt2860/common/netif_block.c | 144 + + drivers/staging/rt2860/common/netif_block.h | 58 + + drivers/staging/rt2860/common/rtmp_init.c | 3744 +++++++++ + drivers/staging/rt2860/common/rtmp_tkip.c | 1607 ++++ + drivers/staging/rt2860/common/rtmp_wep.c | 499 ++ + drivers/staging/rt2860/common/spectrum.c | 1877 +++++ + drivers/staging/rt2860/config.mk | 245 + + drivers/staging/rt2860/dfs.h | 100 + + drivers/staging/rt2860/leap.h | 215 + + drivers/staging/rt2860/link_list.h | 134 + + drivers/staging/rt2860/md4.h | 42 + + drivers/staging/rt2860/md5.h | 107 + + drivers/staging/rt2860/mlme.h | 1447 ++++ + drivers/staging/rt2860/oid.h | 995 +++ + drivers/staging/rt2860/rt2860.h | 349 + + drivers/staging/rt2860/rt28xx.h | 2714 ++++++ + drivers/staging/rt2860/rt_ate.c | 6025 ++++++++++++++ + drivers/staging/rt2860/rt_ate.h | 353 + + drivers/staging/rt2860/rt_config.h | 101 + + drivers/staging/rt2860/rt_linux.c | 1054 +++ + drivers/staging/rt2860/rt_linux.h | 926 +++ + drivers/staging/rt2860/rt_main_dev.c | 1686 ++++ + drivers/staging/rt2860/rt_profile.c | 1976 +++++ + drivers/staging/rt2860/rtmp.h | 7177 ++++++++++++++++ + drivers/staging/rt2860/rtmp_ckipmic.h | 113 + + drivers/staging/rt2860/rtmp_def.h | 1588 ++++ + drivers/staging/rt2860/rtmp_type.h | 94 + + drivers/staging/rt2860/spectrum.h | 322 + + drivers/staging/rt2860/spectrum_def.h | 95 + + drivers/staging/rt2860/sta/aironet.c | 1312 +++ + drivers/staging/rt2860/sta/assoc.c | 1826 +++++ + drivers/staging/rt2860/sta/auth.c | 474 ++ + drivers/staging/rt2860/sta/auth_rsp.c | 167 + + drivers/staging/rt2860/sta/connect.c | 2751 +++++++ + drivers/staging/rt2860/sta/dls.c | 2201 +++++ + drivers/staging/rt2860/sta/rtmp_data.c | 2614 ++++++ + drivers/staging/rt2860/sta/sanity.c | 420 + + drivers/staging/rt2860/sta/sync.c | 1959 +++++ + drivers/staging/rt2860/sta/wpa.c | 2086 +++++ + drivers/staging/rt2860/sta_ioctl.c | 6944 ++++++++++++++++ + drivers/staging/rt2860/wpa.h | 356 + + drivers/staging/slicoss/slic.h | 34 + + drivers/staging/slicoss/slicoss.c | 84 +- + drivers/staging/sxg/README | 2 - + drivers/staging/sxg/sxg.c | 316 +- + drivers/staging/sxg/sxg.h | 121 +- + drivers/staging/sxg/sxg_os.h | 24 +- + drivers/staging/sxg/sxgdbg.h | 15 +- + drivers/staging/sxg/sxghif.h | 139 +- + drivers/staging/sxg/sxghw.h | 40 +- + drivers/staging/sxg/sxgphycode.h | 2 +- + drivers/staging/usbip/stub.h | 2 +- + drivers/staging/usbip/stub_dev.c | 2 +- + drivers/staging/usbip/stub_main.c | 21 +- + drivers/staging/usbip/stub_rx.c | 4 +- + drivers/staging/usbip/stub_tx.c | 1 - + drivers/staging/usbip/vhci_hcd.c | 2 +- + drivers/staging/usbip/vhci_sysfs.c | 2 +- + drivers/staging/winbond/Kconfig | 12 +- + drivers/staging/winbond/Makefile | 17 +- + drivers/staging/winbond/adapter.h | 23 - + drivers/staging/winbond/bss_f.h | 80 +- + drivers/staging/winbond/bssdscpt.h | 20 +- + drivers/staging/winbond/common.h | 27 + + drivers/staging/winbond/core.h | 42 + + drivers/staging/winbond/ds_tkip.h | 12 +- + drivers/staging/winbond/gl_80211.h | 3 +- + drivers/staging/winbond/linux/common.h | 128 - + drivers/staging/winbond/linux/sysdef.h | 73 - + drivers/staging/winbond/linux/wb35rx_f.h | 17 - + drivers/staging/winbond/linux/wb35tx_f.h | 20 - + drivers/staging/winbond/linux/wbusb.c | 387 - + drivers/staging/winbond/linux/wbusb_f.h | 34 - + drivers/staging/winbond/localpara.h | 11 +- + drivers/staging/winbond/mac_structures.h | 7 +- + drivers/staging/winbond/mds.c | 831 +- + drivers/staging/winbond/mds_f.h | 42 +- + drivers/staging/winbond/mds_s.h | 42 +- + drivers/staging/winbond/mlme_mib.h | 20 +- + drivers/staging/winbond/mlme_s.h | 11 +- + drivers/staging/winbond/mlmetxrx.c | 113 +- + drivers/staging/winbond/mlmetxrx_f.h | 25 +- + drivers/staging/winbond/mto.c | 991 +--- + drivers/staging/winbond/mto.h | 27 +- + drivers/staging/winbond/mto_f.h | 12 +- + drivers/staging/winbond/os_common.h | 2 +- + drivers/staging/winbond/phy_calibration.c | 40 +- + drivers/staging/winbond/phy_calibration.h | 6 + + drivers/staging/winbond/reg.c | 349 +- + drivers/staging/winbond/rxisr.c | 30 - + drivers/staging/winbond/scan_s.h | 22 +- + drivers/staging/winbond/sme_api.c | 14 - + drivers/staging/winbond/sme_api.h | 7 +- + drivers/staging/winbond/sme_s.h | 16 +- + drivers/staging/winbond/sysdef.h | 40 + + drivers/staging/winbond/{linux => }/wb35reg.c | 531 +- + drivers/staging/winbond/{linux => }/wb35reg_f.h | 9 +- + drivers/staging/winbond/{linux => }/wb35reg_s.h | 46 +- + drivers/staging/winbond/{linux => }/wb35rx.c | 421 +- + drivers/staging/winbond/wb35rx_f.h | 15 + + drivers/staging/winbond/{linux => }/wb35rx_s.h | 2 +- + drivers/staging/winbond/{linux => }/wb35tx.c | 248 +- + drivers/staging/winbond/wb35tx_f.h | 21 + + drivers/staging/winbond/{linux => }/wb35tx_s.h | 14 +- + drivers/staging/winbond/wbhal.c | 830 +-- + drivers/staging/winbond/wbhal_f.h | 49 +- + drivers/staging/winbond/wbhal_s.h | 33 +- + drivers/staging/winbond/wblinux.c | 275 - + drivers/staging/winbond/wblinux_f.h | 21 +- + drivers/staging/winbond/wblinux_s.h | 45 - + drivers/staging/winbond/wbusb.c | 437 + + drivers/staging/winbond/{linux => }/wbusb_s.h | 17 +- + drivers/staging/wlan-ng/Kconfig | 6 +- + drivers/staging/wlan-ng/Makefile | 3 +- + drivers/staging/wlan-ng/README | 1 - + drivers/staging/wlan-ng/hfa384x.c | 4018 --------- + drivers/staging/wlan-ng/hfa384x.h | 2491 +++---- + drivers/staging/wlan-ng/hfa384x_usb.c | 655 +-- + drivers/staging/wlan-ng/p80211conv.c | 39 +- + drivers/staging/wlan-ng/p80211conv.h | 76 +- + drivers/staging/wlan-ng/p80211hdr.h | 90 +- + drivers/staging/wlan-ng/p80211ioctl.h | 6 +- + drivers/staging/wlan-ng/p80211meta.h | 46 +- + drivers/staging/wlan-ng/p80211metadef.h | 1785 +---- + drivers/staging/wlan-ng/p80211metamib.h | 2 +- + drivers/staging/wlan-ng/p80211metamsg.h | 2 +- + drivers/staging/wlan-ng/p80211metastruct.h | 463 +- + drivers/staging/wlan-ng/p80211mgmt.h | 194 +- + drivers/staging/wlan-ng/p80211mod.c | 216 - + drivers/staging/wlan-ng/p80211msg.h | 14 +- + drivers/staging/wlan-ng/p80211netdev.c | 357 +- + drivers/staging/wlan-ng/p80211netdev.h | 180 +- + drivers/staging/wlan-ng/p80211req.c | 39 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 208 +- + drivers/staging/wlan-ng/p80211wep.c | 21 +- + drivers/staging/wlan-ng/p80211wext.c | 354 +- + drivers/staging/wlan-ng/prism2_cs.c | 1487 ---- + drivers/staging/wlan-ng/prism2_pci.c | 332 - + drivers/staging/wlan-ng/prism2_plx.c | 472 -- + drivers/staging/wlan-ng/prism2mgmt.c | 1673 +---- + drivers/staging/wlan-ng/prism2mgmt.h | 59 +- + drivers/staging/wlan-ng/prism2mib.c | 2790 +------ + drivers/staging/wlan-ng/prism2sta.c | 338 +- + .../staging/wlan-ng/{prism2_usb.c => prism2usb.c} | 77 +- + drivers/staging/wlan-ng/version.h | 64 - + drivers/staging/wlan-ng/wlan_compat.h | 570 +-- + 525 files changed, 259861 insertions(+), 26380 deletions(-) + create mode 100644 drivers/staging/agnx/Kconfig + create mode 100644 drivers/staging/agnx/Makefile + create mode 100644 drivers/staging/agnx/TODO + create mode 100644 drivers/staging/agnx/agnx.h + create mode 100644 drivers/staging/agnx/debug.h + create mode 100644 drivers/staging/agnx/pci.c + create mode 100644 drivers/staging/agnx/phy.c + create mode 100644 drivers/staging/agnx/phy.h + create mode 100644 drivers/staging/agnx/rf.c + create mode 100644 drivers/staging/agnx/sta.c + create mode 100644 drivers/staging/agnx/sta.h + create mode 100644 drivers/staging/agnx/table.c + create mode 100644 drivers/staging/agnx/table.h + create mode 100644 drivers/staging/agnx/xmit.c + create mode 100644 drivers/staging/agnx/xmit.h + create mode 100644 drivers/staging/asus_oled/Kconfig + create mode 100644 drivers/staging/asus_oled/Makefile + create mode 100644 drivers/staging/asus_oled/README + create mode 100644 drivers/staging/asus_oled/TODO + create mode 100644 drivers/staging/asus_oled/asus_oled.c + create mode 100644 drivers/staging/asus_oled/linux.txt + create mode 100644 drivers/staging/asus_oled/linux_f.txt + create mode 100644 drivers/staging/asus_oled/linux_fr.txt + create mode 100644 drivers/staging/asus_oled/tux.txt + create mode 100644 drivers/staging/asus_oled/tux_r.txt + create mode 100644 drivers/staging/asus_oled/tux_r2.txt + create mode 100644 drivers/staging/asus_oled/zig.txt + create mode 100644 drivers/staging/benet/Kconfig + create mode 100644 drivers/staging/benet/MAINTAINERS + create mode 100644 drivers/staging/benet/Makefile + create mode 100644 drivers/staging/benet/TODO + create mode 100644 drivers/staging/benet/asyncmesg.h + create mode 100644 drivers/staging/benet/be_cm.h + create mode 100644 drivers/staging/benet/be_common.h + create mode 100644 drivers/staging/benet/be_ethtool.c + create mode 100644 drivers/staging/benet/be_init.c + create mode 100644 drivers/staging/benet/be_int.c + create mode 100644 drivers/staging/benet/be_netif.c + create mode 100644 drivers/staging/benet/benet.h + create mode 100644 drivers/staging/benet/bestatus.h + create mode 100644 drivers/staging/benet/cev.h + create mode 100644 drivers/staging/benet/cq.c + create mode 100644 drivers/staging/benet/descriptors.h + create mode 100644 drivers/staging/benet/doorbells.h + create mode 100644 drivers/staging/benet/ep.h + create mode 100644 drivers/staging/benet/eq.c + create mode 100644 drivers/staging/benet/eth.c + create mode 100644 drivers/staging/benet/etx_context.h + create mode 100644 drivers/staging/benet/funcobj.c + create mode 100644 drivers/staging/benet/fwcmd_common.h + create mode 100644 drivers/staging/benet/fwcmd_common_bmap.h + create mode 100644 drivers/staging/benet/fwcmd_eth_bmap.h + create mode 100644 drivers/staging/benet/fwcmd_hdr_bmap.h + create mode 100644 drivers/staging/benet/fwcmd_mcc.h + create mode 100644 drivers/staging/benet/fwcmd_opcodes.h + create mode 100644 drivers/staging/benet/fwcmd_types_bmap.h + create mode 100644 drivers/staging/benet/host_struct.h + create mode 100644 drivers/staging/benet/hwlib.h + create mode 100644 drivers/staging/benet/mpu.c + create mode 100644 drivers/staging/benet/mpu.h + create mode 100644 drivers/staging/benet/mpu_context.h + create mode 100644 drivers/staging/benet/pcicfg.h + create mode 100644 drivers/staging/benet/post_codes.h + create mode 100644 drivers/staging/benet/regmap.h + create mode 100644 drivers/staging/comedi/Kconfig + create mode 100644 drivers/staging/comedi/Makefile + create mode 100644 drivers/staging/comedi/TODO + create mode 100644 drivers/staging/comedi/comedi.h + create mode 100644 drivers/staging/comedi/comedi_compat32.c + create mode 100644 drivers/staging/comedi/comedi_compat32.h + create mode 100644 drivers/staging/comedi/comedi_fops.c + create mode 100644 drivers/staging/comedi/comedi_fops.h + create mode 100644 drivers/staging/comedi/comedi_ksyms.c + create mode 100644 drivers/staging/comedi/comedi_rt.h + create mode 100644 drivers/staging/comedi/comedidev.h + create mode 100644 drivers/staging/comedi/comedilib.h + create mode 100644 drivers/staging/comedi/drivers.c + create mode 100644 drivers/staging/comedi/drivers/Makefile + create mode 100644 drivers/staging/comedi/drivers/comedi_bond.c + create mode 100644 drivers/staging/comedi/drivers/comedi_fc.c + create mode 100644 drivers/staging/comedi/drivers/comedi_fc.h + create mode 100644 drivers/staging/comedi/drivers/comedi_parport.c + create mode 100644 drivers/staging/comedi/drivers/comedi_pci.h + create mode 100644 drivers/staging/comedi/drivers/comedi_test.c + create mode 100644 drivers/staging/comedi/drivers/dt9812.c + create mode 100644 drivers/staging/comedi/drivers/icp_multi.c + create mode 100644 drivers/staging/comedi/drivers/icp_multi.h + create mode 100644 drivers/staging/comedi/drivers/me4000.c + create mode 100644 drivers/staging/comedi/drivers/me4000.h + create mode 100644 drivers/staging/comedi/drivers/me_daq.c + create mode 100644 drivers/staging/comedi/drivers/mite.c + create mode 100644 drivers/staging/comedi/drivers/mite.h + create mode 100644 drivers/staging/comedi/drivers/plx9080.h + create mode 100644 drivers/staging/comedi/drivers/rtd520.c + create mode 100644 drivers/staging/comedi/drivers/rtd520.h + create mode 100644 drivers/staging/comedi/drivers/s626.c + create mode 100644 drivers/staging/comedi/drivers/s626.h + create mode 100644 drivers/staging/comedi/drivers/usbdux.c + create mode 100644 drivers/staging/comedi/drivers/usbduxfast.c + create mode 100644 drivers/staging/comedi/interrupt.h + create mode 100644 drivers/staging/comedi/kcomedilib/Makefile + create mode 100644 drivers/staging/comedi/kcomedilib/data.c + create mode 100644 drivers/staging/comedi/kcomedilib/dio.c + create mode 100644 drivers/staging/comedi/kcomedilib/get.c + create mode 100644 drivers/staging/comedi/kcomedilib/kcomedilib_main.c + create mode 100644 drivers/staging/comedi/kcomedilib/ksyms.c + create mode 100644 drivers/staging/comedi/pci_ids.h + create mode 100644 drivers/staging/comedi/proc.c + create mode 100644 drivers/staging/comedi/range.c + create mode 100644 drivers/staging/comedi/rt.c + create mode 100644 drivers/staging/comedi/rt_pend_tq.c + create mode 100644 drivers/staging/comedi/rt_pend_tq.h + create mode 100644 drivers/staging/comedi/wrapper.h + create mode 100644 drivers/staging/go7007/go7007.txt + create mode 100644 drivers/staging/go7007/s2250-board.c + create mode 100644 drivers/staging/go7007/s2250-loader.c + create mode 100644 drivers/staging/meilhaus/Kconfig + create mode 100644 drivers/staging/meilhaus/Makefile + create mode 100644 drivers/staging/meilhaus/TODO + create mode 100644 drivers/staging/meilhaus/me0600_device.c + create mode 100644 drivers/staging/meilhaus/me0600_device.h + create mode 100644 drivers/staging/meilhaus/me0600_dio.c + create mode 100644 drivers/staging/meilhaus/me0600_dio.h + create mode 100644 drivers/staging/meilhaus/me0600_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_ext_irq.c + create mode 100644 drivers/staging/meilhaus/me0600_ext_irq.h + create mode 100644 drivers/staging/meilhaus/me0600_ext_irq_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_optoi.c + create mode 100644 drivers/staging/meilhaus/me0600_optoi.h + create mode 100644 drivers/staging/meilhaus/me0600_optoi_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_relay.c + create mode 100644 drivers/staging/meilhaus/me0600_relay.h + create mode 100644 drivers/staging/meilhaus/me0600_relay_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_ttli.c + create mode 100644 drivers/staging/meilhaus/me0600_ttli.h + create mode 100644 drivers/staging/meilhaus/me0600_ttli_reg.h + create mode 100644 drivers/staging/meilhaus/me0900_device.c + create mode 100644 drivers/staging/meilhaus/me0900_device.h + create mode 100644 drivers/staging/meilhaus/me0900_di.c + create mode 100644 drivers/staging/meilhaus/me0900_di.h + create mode 100644 drivers/staging/meilhaus/me0900_do.c + create mode 100644 drivers/staging/meilhaus/me0900_do.h + create mode 100644 drivers/staging/meilhaus/me0900_reg.h + create mode 100644 drivers/staging/meilhaus/me1000_device.c + create mode 100644 drivers/staging/meilhaus/me1000_device.h + create mode 100644 drivers/staging/meilhaus/me1000_dio.c + create mode 100644 drivers/staging/meilhaus/me1000_dio.h + create mode 100644 drivers/staging/meilhaus/me1000_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me1400_device.c + create mode 100644 drivers/staging/meilhaus/me1400_device.h + create mode 100644 drivers/staging/meilhaus/me1400_ext_irq.c + create mode 100644 drivers/staging/meilhaus/me1400_ext_irq.h + create mode 100644 drivers/staging/meilhaus/me1400_ext_irq_reg.h + create mode 100644 drivers/staging/meilhaus/me1600_ao.c + create mode 100644 drivers/staging/meilhaus/me1600_ao.h + create mode 100644 drivers/staging/meilhaus/me1600_ao_reg.h + create mode 100644 drivers/staging/meilhaus/me1600_device.c + create mode 100644 drivers/staging/meilhaus/me1600_device.h + create mode 100644 drivers/staging/meilhaus/me4600_ai.c + create mode 100644 drivers/staging/meilhaus/me4600_ai.h + create mode 100644 drivers/staging/meilhaus/me4600_ai_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_ao.c + create mode 100644 drivers/staging/meilhaus/me4600_ao.h + create mode 100644 drivers/staging/meilhaus/me4600_ao_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_device.c + create mode 100644 drivers/staging/meilhaus/me4600_device.h + create mode 100644 drivers/staging/meilhaus/me4600_di.c + create mode 100644 drivers/staging/meilhaus/me4600_di.h + create mode 100644 drivers/staging/meilhaus/me4600_dio.c + create mode 100644 drivers/staging/meilhaus/me4600_dio.h + create mode 100644 drivers/staging/meilhaus/me4600_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_do.c + create mode 100644 drivers/staging/meilhaus/me4600_do.h + create mode 100644 drivers/staging/meilhaus/me4600_ext_irq.c + create mode 100644 drivers/staging/meilhaus/me4600_ext_irq.h + create mode 100644 drivers/staging/meilhaus/me4600_ext_irq_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_reg.h + create mode 100644 drivers/staging/meilhaus/me6000_ao.c + create mode 100644 drivers/staging/meilhaus/me6000_ao.h + create mode 100644 drivers/staging/meilhaus/me6000_ao_reg.h + create mode 100644 drivers/staging/meilhaus/me6000_device.c + create mode 100644 drivers/staging/meilhaus/me6000_device.h + create mode 100644 drivers/staging/meilhaus/me6000_dio.c + create mode 100644 drivers/staging/meilhaus/me6000_dio.h + create mode 100644 drivers/staging/meilhaus/me6000_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me6000_reg.h + create mode 100644 drivers/staging/meilhaus/me8100_device.c + create mode 100644 drivers/staging/meilhaus/me8100_device.h + create mode 100644 drivers/staging/meilhaus/me8100_di.c + create mode 100644 drivers/staging/meilhaus/me8100_di.h + create mode 100644 drivers/staging/meilhaus/me8100_di_reg.h + create mode 100644 drivers/staging/meilhaus/me8100_do.c + create mode 100644 drivers/staging/meilhaus/me8100_do.h + create mode 100644 drivers/staging/meilhaus/me8100_do_reg.h + create mode 100644 drivers/staging/meilhaus/me8100_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_device.c + create mode 100644 drivers/staging/meilhaus/me8200_device.h + create mode 100644 drivers/staging/meilhaus/me8200_di.c + create mode 100644 drivers/staging/meilhaus/me8200_di.h + create mode 100644 drivers/staging/meilhaus/me8200_di_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_dio.c + create mode 100644 drivers/staging/meilhaus/me8200_dio.h + create mode 100644 drivers/staging/meilhaus/me8200_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_do.c + create mode 100644 drivers/staging/meilhaus/me8200_do.h + create mode 100644 drivers/staging/meilhaus/me8200_do_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_reg.h + create mode 100644 drivers/staging/meilhaus/me8254.c + create mode 100644 drivers/staging/meilhaus/me8254.h + create mode 100644 drivers/staging/meilhaus/me8254_reg.h + create mode 100644 drivers/staging/meilhaus/me8255.c + create mode 100644 drivers/staging/meilhaus/me8255.h + create mode 100644 drivers/staging/meilhaus/me8255_reg.h + create mode 100644 drivers/staging/meilhaus/mecirc_buf.h + create mode 100644 drivers/staging/meilhaus/mecommon.h + create mode 100644 drivers/staging/meilhaus/medebug.h + create mode 100644 drivers/staging/meilhaus/medefines.h + create mode 100644 drivers/staging/meilhaus/medevice.c + create mode 100644 drivers/staging/meilhaus/medevice.h + create mode 100644 drivers/staging/meilhaus/medlist.c + create mode 100644 drivers/staging/meilhaus/medlist.h + create mode 100644 drivers/staging/meilhaus/medlock.c + create mode 100644 drivers/staging/meilhaus/medlock.h + create mode 100644 drivers/staging/meilhaus/medriver.h + create mode 100644 drivers/staging/meilhaus/medummy.c + create mode 100644 drivers/staging/meilhaus/medummy.h + create mode 100644 drivers/staging/meilhaus/meerror.h + create mode 100644 drivers/staging/meilhaus/mefirmware.c + create mode 100644 drivers/staging/meilhaus/mefirmware.h + create mode 100644 drivers/staging/meilhaus/meids.h + create mode 100644 drivers/staging/meilhaus/meinternal.h + create mode 100644 drivers/staging/meilhaus/meioctl.h + create mode 100644 drivers/staging/meilhaus/memain.c + create mode 100644 drivers/staging/meilhaus/memain.h + create mode 100644 drivers/staging/meilhaus/meplx_reg.h + create mode 100644 drivers/staging/meilhaus/meslist.c + create mode 100644 drivers/staging/meilhaus/meslist.h + create mode 100644 drivers/staging/meilhaus/meslock.c + create mode 100644 drivers/staging/meilhaus/meslock.h + create mode 100644 drivers/staging/meilhaus/mesubdevice.c + create mode 100644 drivers/staging/meilhaus/mesubdevice.h + create mode 100644 drivers/staging/meilhaus/metempl_device.c + create mode 100644 drivers/staging/meilhaus/metempl_device.h + create mode 100644 drivers/staging/meilhaus/metempl_sub.c + create mode 100644 drivers/staging/meilhaus/metempl_sub.h + create mode 100644 drivers/staging/meilhaus/metempl_sub_reg.h + create mode 100644 drivers/staging/meilhaus/metypes.h + create mode 100644 drivers/staging/otus/80211core/amsdu.c + create mode 100644 drivers/staging/otus/80211core/cagg.c + create mode 100644 drivers/staging/otus/80211core/cagg.h + create mode 100644 drivers/staging/otus/80211core/ccmd.c + create mode 100644 drivers/staging/otus/80211core/cfunc.c + create mode 100644 drivers/staging/otus/80211core/cfunc.h + create mode 100644 drivers/staging/otus/80211core/chb.c + create mode 100644 drivers/staging/otus/80211core/cic.c + create mode 100644 drivers/staging/otus/80211core/cinit.c + create mode 100644 drivers/staging/otus/80211core/cmm.c + create mode 100644 drivers/staging/otus/80211core/cmmap.c + create mode 100644 drivers/staging/otus/80211core/cmmsta.c + create mode 100644 drivers/staging/otus/80211core/coid.c + create mode 100644 drivers/staging/otus/80211core/cprecomp.h + create mode 100644 drivers/staging/otus/80211core/cpsmgr.c + create mode 100644 drivers/staging/otus/80211core/cscanmgr.c + create mode 100644 drivers/staging/otus/80211core/ctkip.c + create mode 100644 drivers/staging/otus/80211core/ctxrx.c + create mode 100644 drivers/staging/otus/80211core/cwep.c + create mode 100644 drivers/staging/otus/80211core/cwm.c + create mode 100644 drivers/staging/otus/80211core/cwm.h + create mode 100644 drivers/staging/otus/80211core/freqctrl.c + create mode 100644 drivers/staging/otus/80211core/ledmgr.c + create mode 100644 drivers/staging/otus/80211core/performance.c + create mode 100644 drivers/staging/otus/80211core/performance.h + create mode 100644 drivers/staging/otus/80211core/pub_usb.h + create mode 100644 drivers/staging/otus/80211core/pub_zfi.h + create mode 100644 drivers/staging/otus/80211core/pub_zfw.h + create mode 100644 drivers/staging/otus/80211core/queue.c + create mode 100644 drivers/staging/otus/80211core/queue.h + create mode 100644 drivers/staging/otus/80211core/ratectrl.c + create mode 100644 drivers/staging/otus/80211core/ratectrl.h + create mode 100644 drivers/staging/otus/80211core/struct.h + create mode 100644 drivers/staging/otus/80211core/wlan.h + create mode 100644 drivers/staging/otus/Kconfig + create mode 100644 drivers/staging/otus/Makefile + create mode 100644 drivers/staging/otus/TODO + create mode 100644 drivers/staging/otus/apdbg.c + create mode 100644 drivers/staging/otus/athr_common.h + create mode 100644 drivers/staging/otus/hal/hpDKfwu.c + create mode 100644 drivers/staging/otus/hal/hpani.c + create mode 100644 drivers/staging/otus/hal/hpani.h + create mode 100644 drivers/staging/otus/hal/hpfw2.c + create mode 100644 drivers/staging/otus/hal/hpfwbu.c + create mode 100644 drivers/staging/otus/hal/hpfwspiu.c + create mode 100644 drivers/staging/otus/hal/hpfwu.c + create mode 100644 drivers/staging/otus/hal/hpfwu.c.drv_ba_resend + create mode 100644 drivers/staging/otus/hal/hpfwu_2k.c + create mode 100644 drivers/staging/otus/hal/hpfwu_BA.c + create mode 100644 drivers/staging/otus/hal/hpfwu_FB50_mdk.c + create mode 100644 drivers/staging/otus/hal/hpfwu_OTUS_RC.c + create mode 100644 drivers/staging/otus/hal/hpfwu_txstream.c + create mode 100644 drivers/staging/otus/hal/hpfwuinit.c + create mode 100644 drivers/staging/otus/hal/hpmain.c + create mode 100644 drivers/staging/otus/hal/hpreg.c + create mode 100644 drivers/staging/otus/hal/hpreg.h + create mode 100644 drivers/staging/otus/hal/hprw.c + create mode 100644 drivers/staging/otus/hal/hpusb.c + create mode 100644 drivers/staging/otus/hal/hpusb.h + create mode 100644 drivers/staging/otus/hal/otus.ini + create mode 100644 drivers/staging/otus/ioctl.c + create mode 100644 drivers/staging/otus/oal_dt.h + create mode 100644 drivers/staging/otus/oal_marc.h + create mode 100644 drivers/staging/otus/usbdrv.c + create mode 100644 drivers/staging/otus/usbdrv.h + create mode 100644 drivers/staging/otus/wrap_buf.c + create mode 100644 drivers/staging/otus/wrap_dbg.c + create mode 100644 drivers/staging/otus/wrap_ev.c + create mode 100644 drivers/staging/otus/wrap_mem.c + create mode 100644 drivers/staging/otus/wrap_mis.c + create mode 100644 drivers/staging/otus/wrap_pkt.c + create mode 100644 drivers/staging/otus/wrap_sec.c + create mode 100644 drivers/staging/otus/wrap_usb.c + create mode 100644 drivers/staging/otus/wwrap.c + create mode 100644 drivers/staging/otus/zdcompat.h + create mode 100644 drivers/staging/otus/zdusb.c + create mode 100644 drivers/staging/otus/zdusb.h + create mode 100644 drivers/staging/panel/Kconfig + create mode 100644 drivers/staging/panel/Makefile + create mode 100644 drivers/staging/panel/TODO + create mode 100644 drivers/staging/panel/lcd-panel-cgram.txt + create mode 100644 drivers/staging/panel/panel.c + create mode 100644 drivers/staging/rt2860/2860_main_dev.c + create mode 100644 drivers/staging/rt2860/Kconfig + create mode 100644 drivers/staging/rt2860/Makefile + create mode 100644 drivers/staging/rt2860/TODO + create mode 100644 drivers/staging/rt2860/aironet.h + create mode 100644 drivers/staging/rt2860/ap.h + create mode 100644 drivers/staging/rt2860/chlist.h + create mode 100644 drivers/staging/rt2860/common/2860_rtmp_init.c + create mode 100644 drivers/staging/rt2860/common/action.c + create mode 100644 drivers/staging/rt2860/common/action.h + create mode 100644 drivers/staging/rt2860/common/ba_action.c + create mode 100644 drivers/staging/rt2860/common/cmm_data.c + create mode 100644 drivers/staging/rt2860/common/cmm_data_2860.c + create mode 100644 drivers/staging/rt2860/common/cmm_info.c + create mode 100644 drivers/staging/rt2860/common/cmm_sanity.c + create mode 100644 drivers/staging/rt2860/common/cmm_sync.c + create mode 100644 drivers/staging/rt2860/common/cmm_wpa.c + create mode 100644 drivers/staging/rt2860/common/dfs.c + create mode 100644 drivers/staging/rt2860/common/eeprom.c + create mode 100644 drivers/staging/rt2860/common/firmware.h + create mode 100644 drivers/staging/rt2860/common/md5.c + create mode 100644 drivers/staging/rt2860/common/mlme.c + create mode 100644 drivers/staging/rt2860/common/netif_block.c + create mode 100644 drivers/staging/rt2860/common/netif_block.h + create mode 100644 drivers/staging/rt2860/common/rtmp_init.c + create mode 100644 drivers/staging/rt2860/common/rtmp_tkip.c + create mode 100644 drivers/staging/rt2860/common/rtmp_wep.c + create mode 100644 drivers/staging/rt2860/common/spectrum.c + create mode 100644 drivers/staging/rt2860/config.mk + create mode 100644 drivers/staging/rt2860/dfs.h + create mode 100644 drivers/staging/rt2860/leap.h + create mode 100644 drivers/staging/rt2860/link_list.h + create mode 100644 drivers/staging/rt2860/md4.h + create mode 100644 drivers/staging/rt2860/md5.h + create mode 100644 drivers/staging/rt2860/mlme.h + create mode 100644 drivers/staging/rt2860/oid.h + create mode 100644 drivers/staging/rt2860/rt2860.h + create mode 100644 drivers/staging/rt2860/rt28xx.h + create mode 100644 drivers/staging/rt2860/rt_ate.c + create mode 100644 drivers/staging/rt2860/rt_ate.h + create mode 100644 drivers/staging/rt2860/rt_config.h + create mode 100644 drivers/staging/rt2860/rt_linux.c + create mode 100644 drivers/staging/rt2860/rt_linux.h + create mode 100644 drivers/staging/rt2860/rt_main_dev.c + create mode 100644 drivers/staging/rt2860/rt_profile.c + create mode 100644 drivers/staging/rt2860/rtmp.h + create mode 100644 drivers/staging/rt2860/rtmp_ckipmic.h + create mode 100644 drivers/staging/rt2860/rtmp_def.h + create mode 100644 drivers/staging/rt2860/rtmp_type.h + create mode 100644 drivers/staging/rt2860/spectrum.h + create mode 100644 drivers/staging/rt2860/spectrum_def.h + create mode 100644 drivers/staging/rt2860/sta/aironet.c + create mode 100644 drivers/staging/rt2860/sta/assoc.c + create mode 100644 drivers/staging/rt2860/sta/auth.c + create mode 100644 drivers/staging/rt2860/sta/auth_rsp.c + create mode 100644 drivers/staging/rt2860/sta/connect.c + create mode 100644 drivers/staging/rt2860/sta/dls.c + create mode 100644 drivers/staging/rt2860/sta/rtmp_data.c + create mode 100644 drivers/staging/rt2860/sta/sanity.c + create mode 100644 drivers/staging/rt2860/sta/sync.c + create mode 100644 drivers/staging/rt2860/sta/wpa.c + create mode 100644 drivers/staging/rt2860/sta_ioctl.c + create mode 100644 drivers/staging/rt2860/wpa.h + delete mode 100644 drivers/staging/winbond/adapter.h + create mode 100644 drivers/staging/winbond/common.h + create mode 100644 drivers/staging/winbond/core.h + delete mode 100644 drivers/staging/winbond/linux/common.h + delete mode 100644 drivers/staging/winbond/linux/sysdef.h + delete mode 100644 drivers/staging/winbond/linux/wb35rx_f.h + delete mode 100644 drivers/staging/winbond/linux/wb35tx_f.h + delete mode 100644 drivers/staging/winbond/linux/wbusb.c + delete mode 100644 drivers/staging/winbond/linux/wbusb_f.h + delete mode 100644 drivers/staging/winbond/rxisr.c + delete mode 100644 drivers/staging/winbond/sme_api.c + create mode 100644 drivers/staging/winbond/sysdef.h + rename drivers/staging/winbond/{linux => }/wb35reg.c (52%) + rename drivers/staging/winbond/{linux => }/wb35reg_f.h (95%) + rename drivers/staging/winbond/{linux => }/wb35reg_s.h (90%) + rename drivers/staging/winbond/{linux => }/wb35rx.c (77%) + create mode 100644 drivers/staging/winbond/wb35rx_f.h + rename drivers/staging/winbond/{linux => }/wb35rx_s.h (96%) + rename drivers/staging/winbond/{linux => }/wb35tx.c (73%) + create mode 100644 drivers/staging/winbond/wb35tx_f.h + rename drivers/staging/winbond/{linux => }/wb35tx_s.h (82%) + delete mode 100644 drivers/staging/winbond/wblinux.c + delete mode 100644 drivers/staging/winbond/wblinux_s.h + create mode 100644 drivers/staging/winbond/wbusb.c + rename drivers/staging/winbond/{linux => }/wbusb_s.h (68%) + delete mode 100644 drivers/staging/wlan-ng/hfa384x.c + delete mode 100644 drivers/staging/wlan-ng/p80211mod.c + delete mode 100644 drivers/staging/wlan-ng/prism2_cs.c + delete mode 100644 drivers/staging/wlan-ng/prism2_pci.c + delete mode 100644 drivers/staging/wlan-ng/prism2_plx.c + rename drivers/staging/wlan-ng/{prism2_usb.c => prism2usb.c} (84%) + delete mode 100644 drivers/staging/wlan-ng/version.h +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. |