$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at 833bb30 serial: fixup /proc/tty/driver/serial after proc_fops conversion Merging origin/master $ git merge origin/master Already up-to-date. Merging arm-current/master $ git merge arm-current/master Updating 833bb30..67a52bb Fast forward Documentation/kernel-parameters.txt | 4 +- arch/arm/configs/omap_ldp_defconfig | 24 +++++++++- arch/arm/configs/pcm037_defconfig | 23 +++++++++- arch/arm/configs/realview-smp_defconfig | 24 +++++++++- arch/arm/configs/realview_defconfig | 24 +++++++++- arch/arm/mach-at91/pm.c | 8 ++-- arch/arm/mach-gemini/include/mach/system.h | 2 +- arch/arm/mach-mmp/include/mach/system.h | 2 +- arch/arm/mach-mx3/pcm037.c | 23 ++++++---- arch/arm/mach-omap2/Makefile | 2 + arch/arm/mach-omap2/board-ldp.c | 47 ++++++++++++-------- arch/arm/mach-omap2/board-overo.c | 65 ++++++++++++++++++++++++++++ arch/arm/mach-realview/core.c | 17 ++++--- arch/arm/mach-realview/localtimer.c | 1 + arch/arm/mm/abort-ev6.S | 4 +- arch/arm/mm/cache-feroceon-l2.c | 9 +++- arch/arm/vfp/entry.S | 23 ++++++++-- arch/arm/vfp/vfphw.S | 12 +++++ arch/arm/vfp/vfpmodule.c | 6 ++- drivers/mtd/maps/pxa2xx-flash.c | 2 +- drivers/pcmcia/pxa2xx_cm_x255.c | 2 +- 21 files changed, 261 insertions(+), 63 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Auto-merging MAINTAINERS Auto-merging drivers/net/fec_mpc52xx.c Removing drivers/net/hamradio/yam1200.h Removing drivers/net/hamradio/yam9600.h Removing drivers/net/pcmcia/ositech.h Removing drivers/net/tokenring/3c359_microcode.h Merge made by recursive. Documentation/networking/vxge.txt | 100 + MAINTAINERS | 7 +- drivers/net/Kconfig | 19 +- drivers/net/Makefile | 1 + drivers/net/fec_mpc52xx.c | 77 +- drivers/net/fsl_pq_mdio.c | 2 +- drivers/net/gianfar.h | 1 - drivers/net/hamradio/yam.c | 64 +- drivers/net/hamradio/yam1200.h | 343 -- drivers/net/hamradio/yam9600.h | 343 -- drivers/net/igb/e1000_phy.c | 7 +- drivers/net/igb/igb_ethtool.c | 14 +- drivers/net/igb/igb_main.c | 54 +- drivers/net/ixgbe/ixgbe_82598.c | 3 +- drivers/net/ixgbe/ixgbe_common.c | 3 +- drivers/net/ixgbe/ixgbe_common.h | 9 +- drivers/net/ixgbe/ixgbe_dcb_nl.c | 6 +- drivers/net/ixgbe/ixgbe_ethtool.c | 129 +- drivers/net/ixgbe/ixgbe_main.c | 110 +- drivers/net/ixgbe/ixgbe_type.h | 1 + drivers/net/pcmcia/ositech.h | 358 --- drivers/net/pcmcia/smc91c92_cs.c | 44 +- drivers/net/r8169.c | 5 +- drivers/net/sfc/efx.c | 7 +- drivers/net/tc35815.c | 2 +- drivers/net/tokenring/3c359.c | 63 +- drivers/net/tokenring/3c359.h | 3 + drivers/net/tokenring/3c359_microcode.h | 1581 ---------- drivers/net/ucc_geth.c | 22 +- drivers/net/ucc_geth.h | 4 +- drivers/net/ucc_geth_ethtool.c | 1 - drivers/net/usb/hso.c | 11 +- drivers/net/usb/kaweth.c | 7 +- drivers/net/vxge/Makefile | 7 + drivers/net/vxge/vxge-config.c | 5264 +++++++++++++++++++++++++++++++ drivers/net/vxge/vxge-config.h | 2259 +++++++++++++ drivers/net/vxge/vxge-ethtool.c | 1148 +++++++ drivers/net/vxge/vxge-ethtool.h | 67 + drivers/net/vxge/vxge-main.c | 4502 ++++++++++++++++++++++++++ drivers/net/vxge/vxge-main.h | 557 ++++ drivers/net/vxge/vxge-reg.h | 4608 +++++++++++++++++++++++++++ drivers/net/vxge/vxge-traffic.c | 2528 +++++++++++++++ drivers/net/vxge/vxge-traffic.h | 2409 ++++++++++++++ drivers/net/vxge/vxge-version.h | 23 + firmware/3com/3C359.bin.ihex | 1573 +++++++++ firmware/Makefile | 3 + firmware/WHENCE | 50 + firmware/ositech/Xilinx7OD.bin.ihex | 177 ++ firmware/yam/1200.bin.ihex | 342 ++ firmware/yam/9600.bin.ihex | 342 ++ net/core/dev.c | 5 +- net/core/ethtool.c | 3 +- net/ipv4/netfilter/arp_tables.c | 4 +- net/ipv4/netfilter/ip_tables.c | 4 +- net/ipv4/tcp.c | 5 +- net/ipv6/netfilter/ip6_tables.c | 4 +- net/rds/ib.c | 5 +- net/rds/ib.h | 28 +- net/rds/ib_cm.c | 43 +- net/rds/ib_rdma.c | 43 +- net/rds/ib_recv.c | 37 +- net/rds/iw.c | 5 +- net/rds/iw.h | 28 +- net/rds/iw_cm.c | 44 +- net/rds/iw_rdma.c | 44 +- net/rds/iw_recv.c | 37 +- net/rds/rds.h | 4 + net/rds/send.c | 6 +- 68 files changed, 26631 insertions(+), 2978 deletions(-) create mode 100644 Documentation/networking/vxge.txt delete mode 100644 drivers/net/hamradio/yam1200.h delete mode 100644 drivers/net/hamradio/yam9600.h delete mode 100644 drivers/net/pcmcia/ositech.h delete mode 100644 drivers/net/tokenring/3c359_microcode.h create mode 100644 drivers/net/vxge/Makefile create mode 100644 drivers/net/vxge/vxge-config.c create mode 100644 drivers/net/vxge/vxge-config.h create mode 100644 drivers/net/vxge/vxge-ethtool.c create mode 100644 drivers/net/vxge/vxge-ethtool.h create mode 100644 drivers/net/vxge/vxge-main.c create mode 100644 drivers/net/vxge/vxge-main.h create mode 100644 drivers/net/vxge/vxge-reg.h create mode 100644 drivers/net/vxge/vxge-traffic.c create mode 100644 drivers/net/vxge/vxge-traffic.h create mode 100644 drivers/net/vxge/vxge-version.h create mode 100644 firmware/3com/3C359.bin.ihex create mode 100644 firmware/ositech/Xilinx7OD.bin.ihex create mode 100644 firmware/yam/1200.bin.ihex create mode 100644 firmware/yam/9600.bin.ihex Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. 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 Already up-to-date. Merging quilt/usb.current $ git merge quilt/usb.current Auto-merging drivers/usb/core/message.c Auto-merging drivers/usb/gadget/f_rndis.c Auto-merging drivers/usb/storage/scsiglue.c Merge made by recursive. Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Merge made by recursive. crypto/shash.c | 3 + drivers/char/hw_random/timeriomem-rng.c | 39 ++++++- drivers/crypto/ixp4xx_crypto.c | 182 +++++++++++-------------------- include/linux/timeriomem-rng.h | 2 +- 4 files changed, 102 insertions(+), 124 deletions(-) Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Auto-merging arch/avr32/Kconfig Merge made by recursive. arch/avr32/Kconfig | 14 + arch/avr32/Makefile | 1 + arch/avr32/boards/atngw100/evklcd10x.c | 50 +- arch/avr32/boards/atngw100/setup.c | 7 +- arch/avr32/boards/atstk1000/atstk1002.c | 6 +- arch/avr32/boards/atstk1000/atstk1003.c | 6 +- arch/avr32/boards/atstk1000/atstk1004.c | 6 +- arch/avr32/boards/favr-32/setup.c | 9 +- arch/avr32/boards/hammerhead/setup.c | 6 +- arch/avr32/boards/merisc/Kconfig | 5 + arch/avr32/boards/merisc/Makefile | 1 + arch/avr32/boards/merisc/display.c | 65 ++ arch/avr32/boards/merisc/flash.c | 139 +++ arch/avr32/boards/merisc/merisc.h | 18 + arch/avr32/boards/merisc/merisc_sysfs.c | 65 ++ arch/avr32/boards/merisc/setup.c | 297 ++++++ arch/avr32/boards/mimc200/setup.c | 8 +- arch/avr32/configs/merisc_defconfig | 1237 ++++++++++++++++++++++ arch/avr32/mach-at32ap/at32ap700x.c | 112 ++- arch/avr32/mach-at32ap/include/mach/at32ap700x.h | 52 +- arch/avr32/mach-at32ap/include/mach/board.h | 24 +- drivers/serial/atmel_serial.c | 9 +- drivers/usb/gadget/atmel_usba_udc.c | 14 +- 23 files changed, 2049 insertions(+), 102 deletions(-) create mode 100644 arch/avr32/boards/merisc/Kconfig create mode 100644 arch/avr32/boards/merisc/Makefile create mode 100644 arch/avr32/boards/merisc/display.c create mode 100644 arch/avr32/boards/merisc/flash.c create mode 100644 arch/avr32/boards/merisc/merisc.h create mode 100644 arch/avr32/boards/merisc/merisc_sysfs.c create mode 100644 arch/avr32/boards/merisc/setup.c create mode 100644 arch/avr32/configs/merisc_defconfig 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/arch-v10/kernel/irq.c | 2 +- arch/cris/arch-v32/boot/compressed/Makefile | 6 +++--- arch/cris/arch-v32/kernel/irq.c | 2 +- arch/cris/arch-v32/kernel/smp.c | 10 +++++----- arch/cris/arch-v32/mm/tlb.c | 2 +- arch/cris/kernel/setup.c | 2 +- arch/cris/mm/init.c | 3 +-- 7 files changed, 13 insertions(+), 14 deletions(-) Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/include/asm/bootinfo_mm.h Removing arch/m68k/include/asm/bootinfo_no.h Removing arch/m68k/include/asm/bug_mm.h Removing arch/m68k/include/asm/bug_no.h Removing arch/m68k/include/asm/bugs_mm.h Removing arch/m68k/include/asm/bugs_no.h Removing arch/m68k/include/asm/cache_mm.h Removing arch/m68k/include/asm/cache_no.h Removing arch/m68k/include/asm/current_mm.h Removing arch/m68k/include/asm/current_no.h Removing arch/m68k/include/asm/div64_mm.h Removing arch/m68k/include/asm/div64_no.h Removing arch/m68k/include/asm/dma-mapping_mm.h Removing arch/m68k/include/asm/dma-mapping_no.h Removing arch/m68k/include/asm/elf_mm.h Removing arch/m68k/include/asm/elf_no.h Removing arch/m68k/include/asm/fb_mm.h Removing arch/m68k/include/asm/fb_no.h Removing arch/m68k/include/asm/fpu_mm.h Removing arch/m68k/include/asm/fpu_no.h Removing arch/m68k/include/asm/hw_irq_mm.h Removing arch/m68k/include/asm/hw_irq_no.h Removing arch/m68k/include/asm/kmap_types_mm.h Removing arch/m68k/include/asm/kmap_types_no.h Removing arch/m68k/include/asm/mc146818rtc_mm.h Removing arch/m68k/include/asm/mc146818rtc_no.h Removing arch/m68k/include/asm/mcfpci.h Removing arch/m68k/include/asm/mmu_context_mm.h Removing arch/m68k/include/asm/mmu_context_no.h Removing arch/m68k/include/asm/mmu_mm.h Removing arch/m68k/include/asm/mmu_no.h Removing arch/m68k/include/asm/module_mm.h Removing arch/m68k/include/asm/module_no.h Removing arch/m68k/include/asm/page_offset_mm.h Removing arch/m68k/include/asm/page_offset_no.h Removing arch/m68k/include/asm/pci_mm.h Removing arch/m68k/include/asm/pci_no.h Removing arch/m68k/include/asm/pgalloc_mm.h Removing arch/m68k/include/asm/pgalloc_no.h Removing arch/m68k/include/asm/scatterlist_mm.h Removing arch/m68k/include/asm/scatterlist_no.h Removing arch/m68k/include/asm/segment_mm.h Removing arch/m68k/include/asm/segment_no.h Removing arch/m68k/include/asm/timex_mm.h Removing arch/m68k/include/asm/timex_no.h Removing arch/m68k/include/asm/tlbflush_mm.h Removing arch/m68k/include/asm/tlbflush_no.h Removing arch/m68k/include/asm/ucontext_mm.h Removing arch/m68k/include/asm/ucontext_no.h Removing arch/m68k/include/asm/unaligned_mm.h Removing arch/m68k/include/asm/unaligned_no.h Merge made by recursive. arch/m68k/include/asm/bootinfo.h | 381 ++++++++++++++++++++++++++++- arch/m68k/include/asm/bootinfo_mm.h | 378 ---------------------------- arch/m68k/include/asm/bootinfo_no.h | 2 - arch/m68k/include/asm/bug.h | 31 ++- arch/m68k/include/asm/bug_mm.h | 29 --- arch/m68k/include/asm/bug_no.h | 4 - arch/m68k/include/asm/bugs.h | 21 ++- arch/m68k/include/asm/bugs_mm.h | 14 - arch/m68k/include/asm/bugs_no.h | 16 -- arch/m68k/include/asm/cache.h | 14 +- arch/m68k/include/asm/cache_mm.h | 11 - arch/m68k/include/asm/cache_no.h | 12 - arch/m68k/include/asm/current.h | 31 ++- arch/m68k/include/asm/current_mm.h | 6 - arch/m68k/include/asm/current_no.h | 24 -- arch/m68k/include/asm/div64.h | 37 +++- arch/m68k/include/asm/div64_mm.h | 28 -- arch/m68k/include/asm/div64_no.h | 1 - arch/m68k/include/asm/dma-mapping.h | 113 +++++++++- arch/m68k/include/asm/dma-mapping_mm.h | 112 --------- arch/m68k/include/asm/dma-mapping_no.h | 6 - arch/m68k/include/asm/elf.h | 120 +++++++++- arch/m68k/include/asm/elf_mm.h | 119 --------- arch/m68k/include/asm/elf_no.h | 110 --------- arch/m68k/include/asm/fb.h | 41 +++- arch/m68k/include/asm/fb_mm.h | 34 --- arch/m68k/include/asm/fb_no.h | 12 - arch/m68k/include/asm/fpu.h | 22 ++- arch/m68k/include/asm/fpu_mm.h | 21 -- arch/m68k/include/asm/fpu_no.h | 21 -- arch/m68k/include/asm/hw_irq.h | 9 +- arch/m68k/include/asm/hw_irq_mm.h | 6 - arch/m68k/include/asm/hw_irq_no.h | 4 - arch/m68k/include/asm/kmap_types.h | 26 ++- arch/m68k/include/asm/kmap_types_mm.h | 21 -- arch/m68k/include/asm/kmap_types_no.h | 21 -- arch/m68k/include/asm/m532xsim.h | 1 + arch/m68k/include/asm/mc146818rtc.h | 31 ++- arch/m68k/include/asm/mc146818rtc_mm.h | 26 -- arch/m68k/include/asm/mc146818rtc_no.h | 9 - arch/m68k/include/asm/mcfpci.h | 119 --------- arch/m68k/include/asm/mmu.h | 14 +- arch/m68k/include/asm/mmu_context.h | 176 +++++++++++++- arch/m68k/include/asm/mmu_context_mm.h | 154 ------------ arch/m68k/include/asm/mmu_context_no.h | 33 --- arch/m68k/include/asm/mmu_mm.h | 7 - arch/m68k/include/asm/mmu_no.h | 10 - arch/m68k/include/asm/module.h | 51 ++++- arch/m68k/include/asm/module_mm.h | 39 --- arch/m68k/include/asm/module_no.h | 11 - arch/m68k/include/asm/page_offset.h | 12 +- arch/m68k/include/asm/page_offset_mm.h | 8 - arch/m68k/include/asm/page_offset_no.h | 5 - arch/m68k/include/asm/pci.h | 17 +- arch/m68k/include/asm/pci_mm.h | 12 - arch/m68k/include/asm/pci_no.h | 29 --- arch/m68k/include/asm/pgalloc.h | 20 ++- arch/m68k/include/asm/pgalloc_mm.h | 19 -- arch/m68k/include/asm/pgalloc_no.h | 8 - arch/m68k/include/asm/pgtable_no.h | 2 + arch/m68k/include/asm/scatterlist.h | 26 ++- arch/m68k/include/asm/scatterlist_mm.h | 23 -- arch/m68k/include/asm/scatterlist_no.h | 22 -- arch/m68k/include/asm/segment.h | 64 +++++- arch/m68k/include/asm/segment_mm.h | 57 ----- arch/m68k/include/asm/segment_no.h | 51 ---- arch/m68k/include/asm/timex.h | 21 ++- arch/m68k/include/asm/timex_mm.h | 18 -- arch/m68k/include/asm/timex_no.h | 23 -- arch/m68k/include/asm/tlbflush.h | 268 ++++++++++++++++++++- arch/m68k/include/asm/tlbflush_mm.h | 219 ----------------- arch/m68k/include/asm/tlbflush_no.h | 55 ---- arch/m68k/include/asm/ucontext.h | 33 +++- arch/m68k/include/asm/ucontext_mm.h | 30 --- arch/m68k/include/asm/ucontext_no.h | 32 --- arch/m68k/include/asm/unaligned.h | 26 ++- arch/m68k/include/asm/unaligned_mm.h | 13 - arch/m68k/include/asm/unaligned_no.h | 25 -- arch/m68knommu/kernel/dma.c | 8 +- arch/m68knommu/kernel/irq.c | 2 +- arch/m68knommu/mm/init.c | 6 +- arch/m68knommu/platform/5249/config.c | 11 +- arch/m68knommu/platform/5307/config.c | 8 +- arch/m68knommu/platform/5407/config.c | 8 +- arch/m68knommu/platform/coldfire/Makefile | 2 +- arch/m68knommu/platform/coldfire/clk.c | 40 +++ drivers/serial/mcf.c | 2 +- 87 files changed, 1582 insertions(+), 2182 deletions(-) delete mode 100644 arch/m68k/include/asm/bootinfo_mm.h delete mode 100644 arch/m68k/include/asm/bootinfo_no.h delete mode 100644 arch/m68k/include/asm/bug_mm.h delete mode 100644 arch/m68k/include/asm/bug_no.h delete mode 100644 arch/m68k/include/asm/bugs_mm.h delete mode 100644 arch/m68k/include/asm/bugs_no.h delete mode 100644 arch/m68k/include/asm/cache_mm.h delete mode 100644 arch/m68k/include/asm/cache_no.h delete mode 100644 arch/m68k/include/asm/current_mm.h delete mode 100644 arch/m68k/include/asm/current_no.h delete mode 100644 arch/m68k/include/asm/div64_mm.h delete mode 100644 arch/m68k/include/asm/div64_no.h delete mode 100644 arch/m68k/include/asm/dma-mapping_mm.h delete mode 100644 arch/m68k/include/asm/dma-mapping_no.h delete mode 100644 arch/m68k/include/asm/elf_mm.h delete mode 100644 arch/m68k/include/asm/elf_no.h delete mode 100644 arch/m68k/include/asm/fb_mm.h delete mode 100644 arch/m68k/include/asm/fb_no.h delete mode 100644 arch/m68k/include/asm/fpu_mm.h delete mode 100644 arch/m68k/include/asm/fpu_no.h delete mode 100644 arch/m68k/include/asm/hw_irq_mm.h delete mode 100644 arch/m68k/include/asm/hw_irq_no.h delete mode 100644 arch/m68k/include/asm/kmap_types_mm.h delete mode 100644 arch/m68k/include/asm/kmap_types_no.h delete mode 100644 arch/m68k/include/asm/mc146818rtc_mm.h delete mode 100644 arch/m68k/include/asm/mc146818rtc_no.h delete mode 100644 arch/m68k/include/asm/mcfpci.h delete mode 100644 arch/m68k/include/asm/mmu_context_mm.h delete mode 100644 arch/m68k/include/asm/mmu_context_no.h delete mode 100644 arch/m68k/include/asm/mmu_mm.h delete mode 100644 arch/m68k/include/asm/mmu_no.h delete mode 100644 arch/m68k/include/asm/module_mm.h delete mode 100644 arch/m68k/include/asm/module_no.h delete mode 100644 arch/m68k/include/asm/page_offset_mm.h delete mode 100644 arch/m68k/include/asm/page_offset_no.h delete mode 100644 arch/m68k/include/asm/pci_mm.h delete mode 100644 arch/m68k/include/asm/pci_no.h delete mode 100644 arch/m68k/include/asm/pgalloc_mm.h delete mode 100644 arch/m68k/include/asm/pgalloc_no.h delete mode 100644 arch/m68k/include/asm/scatterlist_mm.h delete mode 100644 arch/m68k/include/asm/scatterlist_no.h delete mode 100644 arch/m68k/include/asm/segment_mm.h delete mode 100644 arch/m68k/include/asm/segment_no.h delete mode 100644 arch/m68k/include/asm/timex_mm.h delete mode 100644 arch/m68k/include/asm/timex_no.h delete mode 100644 arch/m68k/include/asm/tlbflush_mm.h delete mode 100644 arch/m68k/include/asm/tlbflush_no.h delete mode 100644 arch/m68k/include/asm/ucontext_mm.h delete mode 100644 arch/m68k/include/asm/ucontext_no.h delete mode 100644 arch/m68k/include/asm/unaligned_mm.h delete mode 100644 arch/m68k/include/asm/unaligned_no.h create mode 100644 arch/m68knommu/platform/coldfire/clk.c Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Already up-to-date. Merging parisc/master $ git merge parisc/master Auto-merging arch/parisc/kernel/time.c Merge made by recursive. arch/parisc/Kconfig | 10 ++ arch/parisc/Makefile | 4 +- arch/parisc/include/asm/atomic.h | 18 ++-- arch/parisc/include/asm/cacheflush.h | 3 + arch/parisc/include/asm/elf.h | 10 ++ arch/parisc/include/asm/ftrace.h | 25 +++++ arch/parisc/include/asm/page.h | 13 +-- arch/parisc/include/asm/pdc.h | 4 + arch/parisc/include/asm/pgtable.h | 15 ++- arch/parisc/include/asm/smp.h | 3 +- arch/parisc/kernel/Makefile | 15 +++ arch/parisc/kernel/entry.S | 60 +++++++++-- arch/parisc/kernel/firmware.c | 6 +- arch/parisc/kernel/ftrace.c | 185 ++++++++++++++++++++++++++++++++++ arch/parisc/kernel/irq.c | 4 +- arch/parisc/kernel/module.c | 18 ---- arch/parisc/kernel/parisc_ksyms.c | 5 + arch/parisc/kernel/process.c | 29 +++--- arch/parisc/kernel/processor.c | 13 ++- arch/parisc/kernel/smp.c | 21 ++-- arch/parisc/kernel/stacktrace.c | 63 ++++++++++++ arch/parisc/kernel/syscall.S | 58 +++++++++-- arch/parisc/kernel/time.c | 3 +- arch/parisc/kernel/traps.c | 5 +- arch/parisc/kernel/vmlinux.lds.S | 2 + arch/parisc/mm/init.c | 7 ++ drivers/parisc/asp.c | 2 +- drivers/parisc/ccio-dma.c | 16 ++-- drivers/parisc/dino.c | 7 +- drivers/parisc/eisa.c | 2 +- drivers/parisc/eisa_enumerator.c | 4 +- drivers/parisc/iosapic.c | 2 +- drivers/parisc/led.c | 26 +++-- scripts/package/buildtar | 4 + 34 files changed, 540 insertions(+), 122 deletions(-) create mode 100644 arch/parisc/include/asm/ftrace.h create mode 100644 arch/parisc/kernel/ftrace.c create mode 100644 arch/parisc/kernel/stacktrace.c Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Merge made by recursive. arch/powerpc/configs/40x/acadia_defconfig | 2 +- arch/powerpc/configs/40x/ep405_defconfig | 2 +- arch/powerpc/configs/40x/kilauea_defconfig | 2 +- arch/powerpc/configs/40x/makalu_defconfig | 2 +- arch/powerpc/configs/40x/virtex_defconfig | 2 +- arch/powerpc/configs/44x/arches_defconfig | 2 +- arch/powerpc/configs/44x/bamboo_defconfig | 2 +- arch/powerpc/configs/44x/canyonlands_defconfig | 6 +++--- arch/powerpc/configs/44x/ebony_defconfig | 2 +- arch/powerpc/configs/44x/katmai_defconfig | 2 +- arch/powerpc/configs/44x/rainier_defconfig | 2 +- arch/powerpc/configs/44x/redwood_defconfig | 2 +- arch/powerpc/configs/44x/sam440ep_defconfig | 2 +- arch/powerpc/configs/44x/sequoia_defconfig | 2 +- arch/powerpc/configs/44x/taishan_defconfig | 2 +- arch/powerpc/configs/44x/virtex5_defconfig | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) Merging galak/next $ git merge galak/next Auto-merging arch/powerpc/Kconfig Auto-merging include/linux/fsl_devices.h Merge made by recursive. arch/powerpc/Kconfig | 1 + arch/powerpc/boot/dts/ksi8560.dts | 4 ++-- arch/powerpc/boot/dts/sbc8548.dts | 4 ++-- arch/powerpc/boot/dts/sbc8560.dts | 4 ++-- arch/powerpc/boot/dts/socrates.dts | 1 + arch/powerpc/boot/dts/stx_gp3_8560.dts | 4 ++-- arch/powerpc/boot/dts/tqm8540.dts | 4 ++-- arch/powerpc/boot/dts/tqm8541.dts | 4 ++-- arch/powerpc/boot/dts/tqm8555.dts | 4 ++-- arch/powerpc/boot/dts/tqm8560.dts | 4 ++-- arch/powerpc/include/asm/reg.h | 30 ++++++++++++++++++++++++++++++ arch/powerpc/include/asm/reg_booke.h | 30 ------------------------------ arch/powerpc/include/asm/sfp-machine.h | 6 +++--- include/linux/fsl_devices.h | 22 ---------------------- 14 files changed, 51 insertions(+), 71 deletions(-) Merging pxa/for-next $ git merge pxa/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 2 +- arch/arm/configs/magician_defconfig | 6 +- arch/arm/mach-pxa/Kconfig | 9 + arch/arm/mach-pxa/Makefile | 1 + arch/arm/mach-pxa/cm-x2xx.c | 2 +- arch/arm/mach-pxa/colibri-pxa300.c | 11 +- arch/arm/mach-pxa/colibri-pxa320.c | 10 +- arch/arm/mach-pxa/colibri-pxa3xx.c | 35 +++ arch/arm/mach-pxa/corgi.c | 55 +--- arch/arm/mach-pxa/csb701.c | 5 + arch/arm/mach-pxa/em-x270.c | 86 +++++- arch/arm/mach-pxa/include/mach/colibri.h | 7 + arch/arm/mach-pxa/include/mach/magician.h | 4 +- arch/arm/mach-pxa/include/mach/palmld.h | 1 + arch/arm/mach-pxa/include/mach/palmt5.h | 1 + arch/arm/mach-pxa/include/mach/palmte2.h | 68 +++++ arch/arm/mach-pxa/include/mach/palmtx.h | 2 + arch/arm/mach-pxa/magician.c | 84 +++--- arch/arm/mach-pxa/palmld.c | 36 ++- arch/arm/mach-pxa/palmt5.c | 35 ++- arch/arm/mach-pxa/palmte2.c | 466 +++++++++++++++++++++++++++++ arch/arm/mach-pxa/palmtx.c | 35 ++- arch/arm/mach-pxa/poodle.c | 18 +- arch/arm/mach-pxa/spitz.c | 63 +--- arch/arm/mm/mmu.c | 11 + 25 files changed, 869 insertions(+), 184 deletions(-) create mode 100644 arch/arm/mach-pxa/include/mach/palmte2.h create mode 100644 arch/arm/mach-pxa/palmte2.c Merging s390/features $ git merge s390/features Already up-to-date. Merging sh/master $ git merge sh/master Auto-merging Documentation/kernel-parameters.txt Merge made by recursive. Documentation/kernel-parameters.txt | 2 + arch/sh/Kconfig | 6 +- arch/sh/boards/board-ap325rxa.c | 57 ++++++- arch/sh/boards/board-urquell.c | 4 + arch/sh/boards/mach-migor/setup.c | 4 +- arch/sh/configs/ap325rxa_defconfig | 70 ++++++--- arch/sh/configs/cayman_defconfig | 235 ++++++++++++++--------------- arch/sh/configs/dreamcast_defconfig | 71 ++++++--- arch/sh/configs/edosk7705_defconfig | 29 +++-- arch/sh/configs/edosk7760_defconfig | 78 +++++++--- arch/sh/configs/espt_defconfig | 39 +++-- arch/sh/configs/hp6xx_defconfig | 54 +++++-- arch/sh/configs/landisk_defconfig | 97 ++++++++---- arch/sh/configs/lboxre2_defconfig | 69 ++++++--- arch/sh/configs/magicpanelr2_defconfig | 73 ++++++--- arch/sh/configs/microdev_defconfig | 74 +++++++--- arch/sh/configs/migor_defconfig | 82 +++++++---- arch/sh/configs/polaris_defconfig | 31 ++-- arch/sh/configs/r7780mp_defconfig | 91 +++++++++--- arch/sh/configs/r7785rp_defconfig | 96 +++++++++--- arch/sh/configs/rsk7201_defconfig | 57 +++++--- arch/sh/configs/rsk7203_defconfig | 94 ++++++++---- arch/sh/configs/rts7751r2d1_defconfig | 83 ++++++++--- arch/sh/configs/rts7751r2dplus_defconfig | 83 ++++++++--- arch/sh/configs/sdk7780_defconfig | 78 +++++++--- arch/sh/configs/se7206_defconfig | 82 +++++++--- arch/sh/configs/se7343_defconfig | 89 ++++++++---- arch/sh/configs/se7619_defconfig | 55 +++++--- arch/sh/configs/se7705_defconfig | 75 +++++++--- arch/sh/configs/se7712_defconfig | 79 +++++++--- arch/sh/configs/se7721_defconfig | 82 +++++++--- arch/sh/configs/se7722_defconfig | 76 +++++++--- arch/sh/configs/se7750_defconfig | 71 ++++++--- arch/sh/configs/se7751_defconfig | 74 +++++++--- arch/sh/configs/se7780_defconfig | 78 +++++++--- arch/sh/configs/sh03_defconfig | 79 +++++++--- arch/sh/configs/sh7710voipgw_defconfig | 69 ++++++--- arch/sh/configs/sh7763rdp_defconfig | 82 +++++++--- arch/sh/configs/sh7785lcr_32bit_defconfig | 42 +++-- arch/sh/configs/sh7785lcr_defconfig | 90 ++++++++---- arch/sh/configs/shmin_defconfig | 73 ++++++--- arch/sh/configs/shx3_defconfig | 99 ++++++++---- arch/sh/configs/snapgear_defconfig | 62 ++++++-- arch/sh/configs/systemh_defconfig | 54 +++++-- arch/sh/configs/titan_defconfig | 101 +++++++++--- arch/sh/configs/ul2_defconfig | 93 +++++++++--- arch/sh/configs/urquell_defconfig | 45 ++++--- arch/sh/include/asm/mmu.h | 35 +++-- arch/sh/include/asm/system.h | 1 + arch/sh/include/cpu-sh4/cpu/sh7786.h | 214 ++++++++++----------------- arch/sh/kernel/cpu/sh4/probe.c | 5 - arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 185 +++++------------------ arch/sh/kernel/idle.c | 2 +- arch/sh/kernel/io_trapped.c | 13 ++ arch/sh/kernel/setup.c | 5 +- arch/sh/mm/Kconfig | 12 -- drivers/clocksource/sh_cmt.c | 3 +- drivers/input/keyboard/sh_keysc.c | 17 ++- drivers/input/touchscreen/migor_ts.c | 23 +++ drivers/rtc/rtc-sh.c | 36 +++++ drivers/sh/intc.c | 68 +++++++++ 61 files changed, 2573 insertions(+), 1353 deletions(-) Merging sparc/master $ git merge sparc/master Already up-to-date. Merging x86/auto-x86-next $ git merge x86/auto-x86-next Merge made by recursive. arch/x86/include/asm/k8.h | 4 + arch/x86/kernel/cpu/intel_cacheinfo.c | 182 ++++++++++++++------------------ 2 files changed, 84 insertions(+), 102 deletions(-) Merging xtensa/master $ git merge xtensa/master Already up-to-date. Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Resolved 'include/linux/netfilter/xt_limit.h' using previous resolution. Resolved 'include/linux/netfilter/xt_statistic.h' using previous resolution. Resolved 'lib/Kconfig.debug' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/parisc/kernel/irq.c Auto-merging arch/s390/include/asm/smp.h Auto-merging include/drm/radeon_drm.h Auto-merging include/linux/interrupt.h Auto-merging include/linux/kernel.h Auto-merging include/linux/netfilter/nfnetlink.h Auto-merging include/linux/netfilter/x_tables.h Auto-merging include/linux/netfilter/xt_limit.h CONFLICT (content): Merge conflict in include/linux/netfilter/xt_limit.h Auto-merging include/linux/netfilter/xt_statistic.h CONFLICT (content): Merge conflict in include/linux/netfilter/xt_statistic.h Auto-merging include/linux/sched.h Auto-merging include/linux/string.h Auto-merging include/sound/asound.h Auto-merging kernel/fork.c Auto-merging kernel/lockdep.c Auto-merging kernel/sched.c Auto-merging kernel/sysctl.c Auto-merging lib/Kconfig Auto-merging lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merging mm/slob.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e769f4a] Merge commit 'tip-core/auto-core-next' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 3 + arch/s390/include/asm/smp.h | 6 - block/blk-softirq.c | 2 +- include/linux/hrtimer.h | 5 + include/linux/interrupt.h | 14 + include/linux/irqflags.h | 8 +- include/linux/kernel.h | 17 + include/linux/pkt_sched.h | 2 +- include/linux/sched.h | 18 +- include/linux/smp.h | 7 +- include/linux/string.h | 7 + kernel/Makefile | 1 + kernel/extable.c | 25 +- kernel/fork.c | 8 +- kernel/hrtimer.c | 55 ++- kernel/hung_task.c | 217 ++++++++ kernel/lockdep.c | 21 +- kernel/mutex.c | 4 +- kernel/panic.c | 115 ++-- kernel/printk.c | 7 +- kernel/ptrace.c | 2 - kernel/rcupdate.c | 44 ++ kernel/sched.c | 28 +- kernel/smp.c | 432 ++++++++------- kernel/softirq.c | 17 +- kernel/softlockup.c | 100 ---- kernel/sysctl.c | 19 +- lib/Kconfig | 3 + lib/Kconfig.debug | 40 ++- lib/debugobjects.c | 127 ++++- lib/locking-selftest.c | 4 +- lib/vsprintf.c | 1005 +++++++++++++++++++++++++++-------- 32 files changed, 1683 insertions(+), 680 deletions(-) create mode 100644 kernel/hung_task.c Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Resolved 'arch/x86/include/asm/topology.h' using previous resolution. Resolved 'arch/x86/kernel/cpu/common.c' using previous resolution. Resolved 'arch/x86/kernel/cpu/intel_cacheinfo.c' using previous resolution. Resolved 'drivers/oprofile/buffer_sync.c' using previous resolution. Auto-merging arch/parisc/kernel/irq.c Auto-merging arch/x86/include/asm/pci.h Auto-merging arch/x86/include/asm/processor.h Auto-merging arch/x86/include/asm/topology.h CONFLICT (content): Merge conflict in arch/x86/include/asm/topology.h Auto-merging arch/x86/kernel/apm_32.c Auto-merging arch/x86/kernel/cpu/common.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/common.c Auto-merging arch/x86/kernel/cpu/cpufreq/p4-clockmod.c Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c Auto-merging arch/x86/kernel/cpu/cpufreq/speedstep-ich.c Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/intel_cacheinfo.c Auto-merging arch/x86/kernel/cpu/mcheck/mce_amd_64.c Auto-merging arch/x86/kernel/cpu/mcheck/mce_intel_64.c Auto-merging arch/x86/kernel/process.c Auto-merging arch/x86/kernel/tlb_uv.c Auto-merging drivers/char/sysrq.c Auto-merging drivers/oprofile/buffer_sync.c CONFLICT (content): Merge conflict in drivers/oprofile/buffer_sync.c Auto-merging drivers/pci/pci-driver.c Auto-merging include/linux/mmzone.h Auto-merging kernel/sched.c Auto-merging mm/page_alloc.c Auto-merging mm/slab.c Auto-merging mm/vmscan.c Auto-merging net/sunrpc/svc.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master fd61ee0] Merge commit 'cpus4096/auto-cpus4096-next' $ git diff -M --stat --summary HEAD^.. arch/powerpc/include/asm/mmzone.h | 1 + arch/sparc/include/asm/mmzone.h | 2 + arch/x86/include/asm/cpumask.h | 18 -- arch/x86/include/asm/pci.h | 5 - arch/x86/include/asm/processor.h | 3 +- arch/x86/include/asm/smp.h | 13 +- arch/x86/include/asm/topology.h | 87 ++-------- arch/x86/kernel/apic/bigsmp_32.c | 16 +- arch/x86/kernel/apic/es7000_32.c | 17 +- arch/x86/kernel/apic/nmi.c | 11 +- arch/x86/kernel/apic/numaq_32.c | 11 +- arch/x86/kernel/apic/probe_32.c | 3 +- arch/x86/kernel/apic/summit_32.c | 21 +-- arch/x86/kernel/apm_32.c | 248 ++++++++++++++++----------- arch/x86/kernel/cpu/common.c | 13 +-- arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 2 +- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 +- arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 2 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 22 ++-- arch/x86/kernel/cpu/mcheck/mce_64.c | 10 +- arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 6 +- arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 2 +- arch/x86/kernel/cpu/proc.c | 6 +- arch/x86/kernel/microcode_amd.c | 43 +++--- arch/x86/kernel/microcode_core.c | 160 ++++++++++-------- arch/x86/kernel/microcode_intel.c | 83 +++++---- arch/x86/kernel/process.c | 20 ++- arch/x86/kernel/smpboot.c | 70 +++++--- arch/x86/kernel/tlb_uv.c | 9 +- arch/x86/mm/Makefile | 2 +- arch/x86/mm/mmio-mod.c | 19 ++- arch/x86/mm/numa.c | 67 +++++++ arch/x86/mm/numa_64.c | 111 +----------- arch/x86/oprofile/op_model_p4.c | 2 +- arch/x86/xen/smp.c | 6 +- block/blk.h | 2 +- drivers/base/node.c | 2 +- drivers/oprofile/buffer_sync.c | 20 +-- drivers/oprofile/buffer_sync.h | 4 - drivers/oprofile/oprof.c | 9 +- drivers/pci/pci-driver.c | 3 +- drivers/xen/cpu_hotplug.c | 4 +- include/linux/gfp.h | 1 + include/linux/mmzone.h | 6 - include/linux/topology.h | 11 +- kernel/sched.c | 43 +++--- mm/page_alloc.c | 6 +- mm/quicklist.c | 2 +- mm/slab.c | 2 +- mm/vmscan.c | 6 +- net/sunrpc/svc.c | 3 +- 51 files changed, 614 insertions(+), 634 deletions(-) create mode 100644 arch/x86/mm/numa.c Merging tracing/auto-tracing-next $ git merge tracing/auto-tracing-next Resolved 'arch/parisc/include/asm/ftrace.h' using previous resolution. Resolved 'include/linux/slub_def.h' using previous resolution. Resolved 'kernel/extable.c' using previous resolution. Resolved 'mm/slob.c' using previous resolution. Resolved 'mm/slub.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging Documentation/sysrq.txt Auto-merging MAINTAINERS Auto-merging arch/Kconfig Auto-merging arch/ia64/kernel/Makefile Auto-merging arch/ia64/kernel/entry.S Auto-merging arch/parisc/include/asm/ftrace.h CONFLICT (add/add): Merge conflict in arch/parisc/include/asm/ftrace.h Auto-merging arch/parisc/kernel/irq.c Auto-merging arch/x86/Kconfig Auto-merging arch/x86/include/asm/cacheflush.h Auto-merging arch/x86/kernel/Makefile Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Auto-merging arch/x86/kernel/kprobes.c Auto-merging arch/x86/kernel/process.c Auto-merging arch/x86/kernel/ptrace.c Auto-merging arch/x86/kvm/Kconfig Removing block/blktrace.c Auto-merging drivers/char/sysrq.c Auto-merging fs/libfs.c Auto-merging fs/partitions/check.c Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging include/linux/fs.h Auto-merging include/linux/interrupt.h Auto-merging include/linux/kernel.h Auto-merging include/linux/sched.h Auto-merging include/linux/security.h Auto-merging include/linux/slub_def.h CONFLICT (content): Merge conflict in include/linux/slub_def.h Auto-merging init/Kconfig Auto-merging init/main.c Auto-merging kernel/extable.c CONFLICT (content): Merge conflict in kernel/extable.c Auto-merging kernel/irq/handle.c Auto-merging kernel/lockdep.c Auto-merging kernel/module.c Auto-merging kernel/relay.c Auto-merging kernel/sched.c Auto-merging kernel/sched_clock.c Auto-merging kernel/softirq.c Auto-merging kernel/workqueue.c Auto-merging mm/memory.c Auto-merging mm/slab.c Auto-merging mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merging mm/slub.c CONFLICT (content): Merge conflict in mm/slub.c Auto-merging mm/util.c Automatic merge failed; fix conflicts and then commit the result. Applying: net: tracing interface fixup Applying: tracing: fixup for ftrace_push_return_trace API change $ git commit -v -a [master 0ce6db6] Merge commit 'tracing/auto-tracing-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/debugfs-kmemtrace | 71 + Documentation/ftrace.txt | 1134 +++++++---- Documentation/kernel-parameters.txt | 12 + Documentation/sysrq.txt | 2 + Documentation/tracepoints.txt | 21 +- Documentation/vm/kmemtrace.txt | 126 ++ MAINTAINERS | 6 + arch/Kconfig | 1 + arch/alpha/include/asm/ftrace.h | 1 + arch/alpha/include/asm/hardirq.h | 13 - arch/avr32/include/asm/ftrace.h | 1 + arch/avr32/include/asm/hardirq.h | 11 - arch/blackfin/include/asm/ftrace.h | 1 + arch/cris/include/asm/ftrace.h | 1 + arch/h8300/include/asm/ftrace.h | 1 + arch/ia64/Kconfig | 3 + arch/ia64/include/asm/ftrace.h | 28 + arch/ia64/include/asm/hardirq.h | 10 - arch/ia64/kernel/Makefile | 5 + arch/ia64/kernel/entry.S | 100 + arch/ia64/kernel/ftrace.c | 206 ++ arch/ia64/kernel/ia64_ksyms.c | 6 + arch/m68k/include/asm/ftrace.h | 1 + arch/mips/include/asm/ftrace.h | 1 + arch/powerpc/kernel/ftrace.c | 6 +- arch/um/include/asm/ftrace.h | 1 + arch/x86/Kconfig | 2 + arch/x86/include/asm/cacheflush.h | 5 + arch/x86/include/asm/fixmap.h | 2 + arch/x86/include/asm/ftrace.h | 7 + arch/x86/include/asm/ptrace-abi.h | 3 - arch/x86/include/asm/thread_info.h | 9 +- arch/x86/kernel/Makefile | 3 +- arch/x86/kernel/alternative.c | 29 +- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 4 +- arch/x86/kernel/dumpstack.c | 6 + arch/x86/kernel/ftrace.c | 192 ++- arch/x86/kernel/kprobes.c | 17 +- arch/x86/kernel/process.c | 5 +- arch/x86/kernel/ptrace.c | 7 + arch/x86/kvm/Kconfig | 3 +- arch/x86/mm/init_32.c | 35 +- arch/x86/mm/init_64.c | 37 +- arch/xtensa/include/asm/ftrace.h | 1 + block/Kconfig | 16 - block/Makefile | 1 - block/blktrace.c | 860 -------- drivers/char/sysrq.c | 2 +- drivers/oprofile/cpu_buffer.c | 5 +- fs/befs/debug.c | 1 + fs/debugfs/inode.c | 16 + fs/libfs.c | 16 + fs/partitions/check.c | 4 + fs/squashfs/export.c | 1 + include/asm-frv/ftrace.h | 1 + include/asm-generic/vmlinux.lds.h | 29 +- include/asm-m32r/ftrace.h | 1 + include/asm-mn10300/ftrace.h | 1 + include/linux/blktrace_api.h | 5 + include/linux/compiler.h | 6 +- include/linux/debugfs.h | 8 + include/linux/fdtable.h | 4 +- include/linux/fs.h | 35 +- include/linux/ftrace.h | 247 ++- include/linux/ftrace_irq.h | 2 +- include/linux/hardirq.h | 73 +- include/linux/interrupt.h | 5 + include/linux/kernel.h | 133 ++ include/linux/key.h | 1 + include/linux/memory.h | 6 + include/linux/module.h | 5 + include/linux/rcuclassic.h | 16 +- include/linux/rcupdate.h | 1 - include/linux/rcupreempt.h | 53 +- include/linux/rcutree.h | 27 +- include/linux/ring_buffer.h | 38 +- include/linux/sched.h | 4 + include/linux/security.h | 24 + include/linux/slab_def.h | 68 +- include/linux/slob_def.h | 9 +- include/linux/slub_def.h | 49 +- include/linux/syscalls.h | 60 +- include/linux/trace_clock.h | 19 + include/linux/tracepoint.h | 116 +- include/trace/block.h | 70 +- include/trace/irq.h | 9 + include/trace/irq_event_types.h | 55 + include/trace/kmemtrace.h | 63 + include/trace/lockdep.h | 9 + include/trace/lockdep_event_types.h | 44 + include/trace/power.h | 32 + include/trace/sched.h | 49 +- include/trace/sched_event_types.h | 337 +++ include/trace/skb.h | 4 +- include/trace/trace_event_types.h | 5 + include/trace/trace_events.h | 5 + include/trace/workqueue.h | 25 + init/Kconfig | 2 +- init/main.c | 5 +- kernel/extable.c | 19 +- kernel/irq/handle.c | 6 + kernel/kprobes.c | 19 +- kernel/lockdep.c | 17 + kernel/module.c | 2 +- kernel/rcuclassic.c | 23 +- kernel/rcupreempt.c | 48 +- kernel/rcutree.c | 20 + kernel/rcutree.h | 10 + kernel/rcutree_trace.c | 2 + kernel/relay.c | 4 +- kernel/sched.c | 8 +- kernel/sched_clock.c | 12 + kernel/softirq.c | 28 +- kernel/trace/Kconfig | 138 ++- kernel/trace/Makefile | 13 + kernel/trace/blktrace.c | 1515 +++++++++++++ kernel/trace/events.c | 14 + kernel/trace/ftrace.c | 1700 +++++++++++++--- kernel/trace/kmemtrace.c | 464 ++++ kernel/trace/ring_buffer.c | 692 +++++-- kernel/trace/trace.c | 3045 +++++++++++++++------------ kernel/trace/trace.h | 325 +++- kernel/trace/trace_boot.c | 36 +- kernel/trace/trace_branch.c | 278 ++-- kernel/trace/trace_clock.c | 109 + kernel/trace/trace_event_profile.c | 31 + kernel/trace/trace_event_types.h | 173 ++ kernel/trace/trace_events.c | 824 ++++++++ kernel/trace/trace_events_filter.c | 427 ++++ kernel/trace/trace_events_stage_1.h | 39 + kernel/trace/trace_events_stage_2.h | 176 ++ kernel/trace/trace_events_stage_3.h | 281 +++ kernel/trace/trace_export.c | 102 + kernel/trace/trace_functions.c | 369 ++++- kernel/trace/trace_functions_graph.c | 593 ++++-- kernel/trace/trace_hw_branches.c | 185 ++- kernel/trace/trace_irqsoff.c | 54 +- kernel/trace/trace_mmiotrace.c | 45 +- kernel/trace/trace_nop.c | 6 +- kernel/trace/trace_output.c | 1027 +++++++++ kernel/trace/trace_output.h | 72 + kernel/trace/trace_power.c | 194 +- kernel/trace/trace_printk.c | 270 +++ kernel/trace/trace_sched_switch.c | 24 +- kernel/trace/trace_sched_wakeup.c | 96 +- kernel/trace/trace_selftest.c | 169 ++- kernel/trace/trace_stack.c | 19 +- kernel/trace/trace_stat.c | 326 +++ kernel/trace/trace_stat.h | 31 + kernel/trace/trace_syscalls.c | 250 +++ kernel/trace/trace_sysprof.c | 23 +- kernel/trace/trace_workqueue.c | 288 +++ kernel/tracepoint.c | 7 +- kernel/workqueue.c | 16 +- lib/decompress_bunzip2.c | 1 + lib/decompress_inflate.c | 1 + lib/decompress_unlzma.c | 1 + mm/failslab.c | 1 + mm/memory.c | 2 + mm/slab.c | 69 +- mm/slob.c | 33 +- mm/slub.c | 77 +- mm/util.c | 16 + samples/tracepoints/tp-samples-trace.h | 8 +- samples/tracepoints/tracepoint-sample.c | 24 +- scripts/Makefile.build | 13 +- scripts/kallsyms.c | 57 + scripts/recordmcount.pl | 37 +- 168 files changed, 15451 insertions(+), 4371 deletions(-) create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace create mode 100644 Documentation/vm/kmemtrace.txt create mode 100644 arch/alpha/include/asm/ftrace.h create mode 100644 arch/avr32/include/asm/ftrace.h create mode 100644 arch/blackfin/include/asm/ftrace.h create mode 100644 arch/cris/include/asm/ftrace.h create mode 100644 arch/h8300/include/asm/ftrace.h create mode 100644 arch/ia64/include/asm/ftrace.h create mode 100644 arch/ia64/kernel/ftrace.c create mode 100644 arch/m68k/include/asm/ftrace.h create mode 100644 arch/mips/include/asm/ftrace.h create mode 100644 arch/um/include/asm/ftrace.h create mode 100644 arch/xtensa/include/asm/ftrace.h delete mode 100644 block/blktrace.c create mode 100644 include/asm-frv/ftrace.h create mode 100644 include/asm-m32r/ftrace.h create mode 100644 include/asm-mn10300/ftrace.h create mode 100644 include/linux/trace_clock.h create mode 100644 include/trace/irq.h create mode 100644 include/trace/irq_event_types.h create mode 100644 include/trace/kmemtrace.h create mode 100644 include/trace/lockdep.h create mode 100644 include/trace/lockdep_event_types.h create mode 100644 include/trace/power.h create mode 100644 include/trace/sched_event_types.h create mode 100644 include/trace/trace_event_types.h create mode 100644 include/trace/trace_events.h create mode 100644 include/trace/workqueue.h create mode 100644 kernel/rcutree.h create mode 100644 kernel/trace/blktrace.c create mode 100644 kernel/trace/events.c create mode 100644 kernel/trace/kmemtrace.c create mode 100644 kernel/trace/trace_clock.c create mode 100644 kernel/trace/trace_event_profile.c create mode 100644 kernel/trace/trace_event_types.h create mode 100644 kernel/trace/trace_events.c create mode 100644 kernel/trace/trace_events_filter.c create mode 100644 kernel/trace/trace_events_stage_1.h create mode 100644 kernel/trace/trace_events_stage_2.h create mode 100644 kernel/trace/trace_events_stage_3.h create mode 100644 kernel/trace/trace_export.c create mode 100644 kernel/trace/trace_output.c create mode 100644 kernel/trace/trace_output.h create mode 100644 kernel/trace/trace_printk.c create mode 100644 kernel/trace/trace_stat.c create mode 100644 kernel/trace/trace_stat.h create mode 100644 kernel/trace/trace_syscalls.c create mode 100644 kernel/trace/trace_workqueue.c Merging genirq/auto-genirq-next $ git merge genirq/auto-genirq-next Already uptodate! Merge made by recursive. Merging safe-poison-pointers/auto-safe-poison-pointers-next $ git merge safe-poison-pointers/auto-safe-poison-pointers-next Auto-merging arch/x86/Kconfig Auto-merging include/linux/poison.h 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 Already uptodate! Merge made by recursive. Merging stackprotector/auto-stackprotector-next $ git merge stackprotector/auto-stackprotector-next Already up-to-date. 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 Already up-to-date. Merging quilt/device-mapper $ git merge quilt/device-mapper Removing drivers/md/dm-snap.h Merge made by recursive. drivers/md/dm-bio-list.h | 10 + drivers/md/dm-bio-record.h | 26 +++ drivers/md/dm-crypt.c | 6 +- drivers/md/dm-exception-store.c | 252 +++++++++++++++++++++++++ drivers/md/dm-exception-store.h | 58 +++++- drivers/md/dm-io.c | 5 +- drivers/md/dm-log.c | 75 ++------ drivers/md/dm-path-selector.c | 21 +-- drivers/md/dm-raid1.c | 50 +++++- drivers/md/dm-snap-persistent.c | 153 +++++++++++----- drivers/md/dm-snap-transient.c | 86 +++++++-- drivers/md/dm-snap.c | 384 ++++++++++++++++++++------------------- drivers/md/dm-snap.h | 105 ----------- drivers/md/dm-table.c | 26 ++-- drivers/md/dm-target.c | 104 +++-------- drivers/md/dm.c | 134 +++++--------- drivers/md/dm.h | 2 +- include/linux/device-mapper.h | 3 + include/linux/dm-dirty-log.h | 13 ++ 19 files changed, 893 insertions(+), 620 deletions(-) delete mode 100644 drivers/md/dm-snap.h Merging hid/for-next $ git merge hid/for-next Already up-to-date. Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. Documentation/feature-removal-schedule.txt | 9 +++++++++ drivers/i2c/busses/Kconfig | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Already up-to-date. Merging quilt/kernel-doc $ git merge quilt/kernel-doc Resolved 'Documentation/kernel-parameters.txt' using previous resolution. Auto-merging Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3bb90ed] Merge branch 'quilt/kernel-doc' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 517 ++++++++++++++++++----------------- 1 files changed, 260 insertions(+), 257 deletions(-) Merging v4l-dvb/master $ git merge v4l-dvb/master Recorded preimage for 'arch/sh/boards/mach-migor/setup.c' Resolved 'arch/sh/boards/board-ap325rxa.c' using previous resolution. Resolved 'drivers/media/video/cx25840/cx25840-audio.c' using previous resolution. Resolved 'drivers/media/video/em28xx/em28xx-audio.c' using previous resolution. Resolved 'include/linux/i2c-id.h' using previous resolution. Renaming drivers/media/dvb/frontends/au8522.c->drivers/media/dvb/frontends/au8522_dig.c Auto-merging drivers/media/dvb/frontends/au8522_dig.c Renaming drivers/media/video/pvrusb2/pvrusb2-tuner.h->drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h Auto-merging drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h Auto-merging Documentation/feature-removal-schedule.txt Auto-merging MAINTAINERS Auto-merging arch/arm/mach-pxa/pcm990-baseboard.c Auto-merging arch/sh/boards/board-ap325rxa.c CONFLICT (content): Merge conflict in arch/sh/boards/board-ap325rxa.c Auto-merging arch/sh/boards/mach-migor/setup.c CONFLICT (content): Merge conflict in arch/sh/boards/mach-migor/setup.c Auto-merging drivers/media/dvb/firewire/firedtv-avc.c Auto-merging drivers/media/video/Kconfig Auto-merging drivers/media/video/Makefile Auto-merging drivers/media/video/cx25840/cx25840-audio.c CONFLICT (content): Merge conflict in drivers/media/video/cx25840/cx25840-audio.c Auto-merging drivers/media/video/cx25840/cx25840-core.c Auto-merging drivers/media/video/cx25840/cx25840-core.h Auto-merging drivers/media/video/em28xx/em28xx-audio.c CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-audio.c Auto-merging drivers/media/video/omap24xxcam.c Auto-merging drivers/media/video/pxa_camera.c Auto-merging include/linux/Kbuild Auto-merging include/linux/i2c-id.h CONFLICT (content): Merge conflict in include/linux/i2c-id.h Auto-merging sound/pci/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/sh/boards/mach-migor/setup.c'. [master 5c7437b] Merge commit 'v4l-dvb/master' $ git diff -M --stat --summary HEAD^.. drivers/media/dvb/siano/smssdio.c | 356 ++++ drivers/media/video/Kconfig | 2 + drivers/media/video/Makefile | 1 + drivers/media/video/cx231xx/Kconfig | 35 + drivers/media/video/cx231xx/Makefile | 14 + drivers/media/video/cx231xx/cx231xx-audio.c | 585 ++++++ drivers/media/video/cx231xx/cx231xx-avcore.c | 2581 ++++++++++++++++++++++++ drivers/media/video/cx231xx/cx231xx-cards.c | 919 +++++++++ drivers/media/video/cx231xx/cx231xx-conf-reg.h | 494 +++++ drivers/media/video/cx231xx/cx231xx-core.c | 1200 +++++++++++ drivers/media/video/cx231xx/cx231xx-dvb.c | 559 +++++ drivers/media/video/cx231xx/cx231xx-i2c.c | 555 +++++ drivers/media/video/cx231xx/cx231xx-input.c | 246 +++ drivers/media/video/cx231xx/cx231xx-pcb-cfg.c | 795 ++++++++ drivers/media/video/cx231xx/cx231xx-pcb-cfg.h | 231 +++ drivers/media/video/cx231xx/cx231xx-reg.h | 1564 ++++++++++++++ drivers/media/video/cx231xx/cx231xx-vbi.c | 701 +++++++ drivers/media/video/cx231xx/cx231xx-vbi.h | 65 + drivers/media/video/cx231xx/cx231xx-video.c | 2439 ++++++++++++++++++++++ drivers/media/video/cx231xx/cx231xx.h | 779 +++++++ drivers/media/video/cx25840/cx25840-audio.c | 66 +- drivers/media/video/cx25840/cx25840-core.c | 165 ++- drivers/media/video/cx25840/cx25840-core.h | 1 + drivers/media/video/cx25840/cx25840-firmware.c | 11 +- include/linux/i2c-id.h | 1 + include/linux/mmc/sdio_ids.h | 8 + linux/drivers/media/dvb/siano/smssdio.c | 354 ++++ 27 files changed, 14664 insertions(+), 63 deletions(-) create mode 100644 drivers/media/dvb/siano/smssdio.c create mode 100644 drivers/media/video/cx231xx/Kconfig create mode 100644 drivers/media/video/cx231xx/Makefile create mode 100644 drivers/media/video/cx231xx/cx231xx-audio.c create mode 100644 drivers/media/video/cx231xx/cx231xx-avcore.c create mode 100644 drivers/media/video/cx231xx/cx231xx-cards.c create mode 100644 drivers/media/video/cx231xx/cx231xx-conf-reg.h create mode 100644 drivers/media/video/cx231xx/cx231xx-core.c create mode 100644 drivers/media/video/cx231xx/cx231xx-dvb.c create mode 100644 drivers/media/video/cx231xx/cx231xx-i2c.c create mode 100644 drivers/media/video/cx231xx/cx231xx-input.c create mode 100644 drivers/media/video/cx231xx/cx231xx-pcb-cfg.c create mode 100644 drivers/media/video/cx231xx/cx231xx-pcb-cfg.h create mode 100644 drivers/media/video/cx231xx/cx231xx-reg.h create mode 100644 drivers/media/video/cx231xx/cx231xx-vbi.c create mode 100644 drivers/media/video/cx231xx/cx231xx-vbi.h create mode 100644 drivers/media/video/cx231xx/cx231xx-video.c create mode 100644 drivers/media/video/cx231xx/cx231xx.h create mode 100644 linux/drivers/media/dvb/siano/smssdio.c Merging quota/for_next $ git merge quota/for_next Resolved 'fs/Kconfig' using previous resolution. Resolved 'fs/ext4/ext4.h' using previous resolution. Resolved 'fs/ext4/inode.c' using previous resolution. Resolved 'fs/quota/dquot.c' using previous resolution. Resolved 'fs/reiserfs/namei.c' using previous resolution. Resolved 'fs/reiserfs/stree.c' using previous resolution. Renaming fs/dquot.c->fs/quota/dquot.c Auto-merging fs/quota/dquot.c CONFLICT (content): merge conflict in fs/quota/dquot.c Renaming fs/quota.c->fs/quota/quota.c Auto-merging fs/quota/quota.c Renaming fs/quota_tree.c->fs/quota/quota_tree.c Auto-merging fs/quota/quota_tree.c Renaming fs/quota_v1.c->fs/quota/quota_v1.c Auto-merging fs/quota/quota_v1.c Renaming fs/quota_v2.c->fs/quota/quota_v2.c Auto-merging fs/quota/quota_v2.c Auto-merging fs/Kconfig CONFLICT (content): Merge conflict in fs/Kconfig Auto-merging fs/Makefile Auto-merging fs/ext2/super.c Auto-merging fs/ext3/inode.c Auto-merging fs/ext3/namei.c Auto-merging fs/ext3/super.c Auto-merging fs/ext4/balloc.c Auto-merging fs/ext4/ext4.h CONFLICT (content): Merge conflict in fs/ext4/ext4.h Auto-merging fs/ext4/ialloc.c Auto-merging fs/ext4/inode.c CONFLICT (content): Merge conflict in fs/ext4/inode.c Auto-merging fs/ext4/mballoc.c Auto-merging fs/ext4/namei.c Auto-merging fs/ext4/super.c Auto-merging fs/inode.c Auto-merging fs/jfs/jfs_extent.c Auto-merging fs/jfs/jfs_xtree.c Auto-merging fs/jfs/namei.c Auto-merging fs/namei.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/ocfs2/quota_global.c Auto-merging fs/ramfs/file-nommu.c Auto-merging fs/reiserfs/bitmap.c Auto-merging fs/reiserfs/inode.c Auto-merging fs/reiserfs/namei.c CONFLICT (content): Merge conflict in fs/reiserfs/namei.c Auto-merging fs/reiserfs/stree.c CONFLICT (content): Merge conflict in fs/reiserfs/stree.c Auto-merging fs/reiserfs/super.c Auto-merging fs/super.c Auto-merging fs/sync.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 815a5a8] Merge commit 'quota/for_next' $ git diff -M --stat --summary HEAD^.. Merging jfs/next $ git merge jfs/next Already up-to-date. Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging quilt/ide $ git merge quilt/ide Auto-merging arch/um/drivers/ubd_kern.c Merge made by recursive. arch/um/drivers/ubd_kern.c | 12 +- drivers/block/aoe/aoecmd.c | 23 ++-- drivers/block/hd.c | 2 + drivers/block/xsysace.c | 30 +++--- drivers/usb/storage/isd200.c | 239 ++++++++++++++---------------------------- include/linux/hdreg.h | 66 +----------- 6 files changed, 117 insertions(+), 255 deletions(-) Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Resolved 'fs/nfs/file.c' using previous resolution. Auto-merging fs/nfs/client.c Auto-merging fs/nfs/file.c CONFLICT (content): Merge conflict in fs/nfs/file.c Auto-merging include/linux/fs.h Auto-merging include/linux/page-flags.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/sysctl.c Auto-merging mm/swap.c Auto-merging mm/vmscan.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5dd7882] Merge commit 'nfs/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/caching/backend-api.txt | 658 ++++++++++++++++ Documentation/filesystems/caching/cachefiles.txt | 501 ++++++++++++ Documentation/filesystems/caching/fscache.txt | 333 ++++++++ Documentation/filesystems/caching/netfs-api.txt | 800 +++++++++++++++++++ Documentation/filesystems/caching/object.txt | 313 ++++++++ Documentation/filesystems/caching/operations.txt | 213 +++++ Documentation/slow-work.txt | 174 +++++ fs/Kconfig | 7 + fs/Makefile | 2 + fs/afs/Kconfig | 8 + fs/afs/Makefile | 3 + fs/afs/cache.c | 503 ++++++++----- fs/afs/cache.h | 15 +- fs/afs/cell.c | 16 +- fs/afs/file.c | 220 ++++-- fs/afs/inode.c | 31 +- fs/afs/internal.h | 53 +- fs/afs/main.c | 27 +- fs/afs/mntpt.c | 4 +- fs/afs/vlocation.c | 25 +- fs/afs/volume.c | 14 +- fs/afs/write.c | 21 + fs/cachefiles/Kconfig | 39 + fs/cachefiles/Makefile | 18 + fs/cachefiles/cf-bind.c | 286 +++++++ fs/cachefiles/cf-daemon.c | 754 ++++++++++++++++++ fs/cachefiles/cf-interface.c | 449 +++++++++++ fs/cachefiles/cf-internal.h | 360 +++++++++ fs/cachefiles/cf-key.c | 159 ++++ fs/cachefiles/cf-main.c | 106 +++ fs/cachefiles/cf-namei.c | 772 +++++++++++++++++++ fs/cachefiles/cf-proc.c | 134 ++++ fs/cachefiles/cf-rdwr.c | 853 +++++++++++++++++++++ fs/cachefiles/cf-security.c | 116 +++ fs/cachefiles/cf-xattr.c | 291 +++++++ fs/ext2/inode.c | 2 + fs/ext3/inode.c | 9 +- fs/fscache/Kconfig | 56 ++ fs/fscache/Makefile | 19 + fs/fscache/fsc-cache.c | 415 ++++++++++ fs/fscache/fsc-cookie.c | 498 ++++++++++++ fs/fscache/fsc-fsdef.c | 144 ++++ fs/fscache/fsc-histogram.c | 109 +++ fs/fscache/fsc-internal.h | 380 +++++++++ fs/fscache/fsc-main.c | 124 +++ fs/fscache/fsc-netfs.c | 103 +++ fs/fscache/fsc-object.c | 810 +++++++++++++++++++ fs/fscache/fsc-operation.c | 459 +++++++++++ fs/fscache/fsc-page.c | 771 +++++++++++++++++++ fs/fscache/fsc-proc.c | 68 ++ fs/fscache/fsc-stats.c | 212 +++++ fs/namei.c | 75 ++- fs/namespace.c | 56 ++- fs/nfs/Kconfig | 8 + fs/nfs/Makefile | 1 + fs/nfs/client.c | 14 +- fs/nfs/file.c | 37 +- fs/nfs/fscache-index.c | 337 ++++++++ fs/nfs/fscache.c | 521 +++++++++++++ fs/nfs/fscache.h | 208 +++++ fs/nfs/inode.c | 14 + fs/nfs/internal.h | 4 + fs/nfs/iostat.h | 18 + fs/nfs/namespace.c | 5 + fs/nfs/read.c | 27 +- fs/nfs/super.c | 235 +++++- fs/splice.c | 3 +- fs/super.c | 1 + include/linux/fs.h | 7 + include/linux/fscache-cache.h | 504 ++++++++++++ include/linux/fscache.h | 592 ++++++++++++++ include/linux/mnt_namespace.h | 2 + include/linux/namei.h | 2 + include/linux/nfs_fs.h | 13 + include/linux/nfs_fs_sb.h | 11 + include/linux/nfs_iostat.h | 12 + include/linux/nsproxy.h | 1 + include/linux/page-flags.h | 43 +- include/linux/pagemap.h | 21 + include/linux/slow-work.h | 95 +++ init/Kconfig | 12 + kernel/Makefile | 1 + kernel/nsproxy.c | 11 + kernel/slow-work.c | 640 ++++++++++++++++ kernel/sysctl.c | 9 + mm/filemap.c | 99 +++ mm/migrate.c | 10 +- mm/readahead.c | 40 +- mm/swap.c | 4 +- mm/truncate.c | 10 +- mm/vmscan.c | 6 +- security/security.c | 2 + 92 files changed, 15746 insertions(+), 422 deletions(-) create mode 100644 Documentation/filesystems/caching/backend-api.txt create mode 100644 Documentation/filesystems/caching/cachefiles.txt create mode 100644 Documentation/filesystems/caching/fscache.txt create mode 100644 Documentation/filesystems/caching/netfs-api.txt create mode 100644 Documentation/filesystems/caching/object.txt create mode 100644 Documentation/filesystems/caching/operations.txt create mode 100644 Documentation/slow-work.txt create mode 100644 fs/cachefiles/Kconfig create mode 100644 fs/cachefiles/Makefile create mode 100644 fs/cachefiles/cf-bind.c create mode 100644 fs/cachefiles/cf-daemon.c create mode 100644 fs/cachefiles/cf-interface.c create mode 100644 fs/cachefiles/cf-internal.h create mode 100644 fs/cachefiles/cf-key.c create mode 100644 fs/cachefiles/cf-main.c create mode 100644 fs/cachefiles/cf-namei.c create mode 100644 fs/cachefiles/cf-proc.c create mode 100644 fs/cachefiles/cf-rdwr.c create mode 100644 fs/cachefiles/cf-security.c create mode 100644 fs/cachefiles/cf-xattr.c create mode 100644 fs/fscache/Kconfig create mode 100644 fs/fscache/Makefile create mode 100644 fs/fscache/fsc-cache.c create mode 100644 fs/fscache/fsc-cookie.c create mode 100644 fs/fscache/fsc-fsdef.c create mode 100644 fs/fscache/fsc-histogram.c create mode 100644 fs/fscache/fsc-internal.h create mode 100644 fs/fscache/fsc-main.c create mode 100644 fs/fscache/fsc-netfs.c create mode 100644 fs/fscache/fsc-object.c create mode 100644 fs/fscache/fsc-operation.c create mode 100644 fs/fscache/fsc-page.c create mode 100644 fs/fscache/fsc-proc.c create mode 100644 fs/fscache/fsc-stats.c create mode 100644 fs/nfs/fscache-index.c create mode 100644 fs/nfs/fscache.c create mode 100644 fs/nfs/fscache.h create mode 100644 include/linux/fscache-cache.h create mode 100644 include/linux/fscache.h create mode 100644 include/linux/slow-work.h create mode 100644 kernel/slow-work.c Merging xfs/master $ git merge xfs/master Auto-merging MAINTAINERS Removing fs/xfs/linux-2.6/mutex.h Merge made by recursive. MAINTAINERS | 3 +- fs/xfs/Makefile | 1 + fs/xfs/linux-2.6/mutex.h | 25 --- fs/xfs/linux-2.6/xfs_aops.c | 1 + fs/xfs/linux-2.6/xfs_ioctl.c | 117 +++++------- fs/xfs/linux-2.6/xfs_iops.c | 33 +--- fs/xfs/linux-2.6/xfs_linux.h | 13 +-- fs/xfs/linux-2.6/xfs_quotaops.c | 157 +++++++++++++++ fs/xfs/linux-2.6/xfs_super.c | 137 +++++--------- fs/xfs/linux-2.6/xfs_super.h | 1 + fs/xfs/linux-2.6/xfs_sync.h | 1 + fs/xfs/linux-2.6/xfs_vnode.h | 32 --- fs/xfs/quota/xfs_dquot.c | 28 ++-- fs/xfs/quota/xfs_dquot.h | 18 +-- fs/xfs/quota/xfs_qm.c | 212 ++++++--------------- fs/xfs/quota/xfs_qm.h | 26 ++-- fs/xfs/quota/xfs_qm_bhv.c | 1 - fs/xfs/quota/xfs_qm_syscalls.c | 190 +----------------- fs/xfs/quota/xfs_quota_priv.h | 38 ++--- fs/xfs/quota/xfs_trans_dquot.c | 16 +- fs/xfs/support/debug.c | 1 + fs/xfs/support/uuid.c | 71 ------- fs/xfs/support/uuid.h | 4 - fs/xfs/xfs_ag.h | 4 +- fs/xfs/xfs_alloc.c | 26 ++- fs/xfs/xfs_alloc.h | 6 + fs/xfs/xfs_attr_leaf.c | 58 +++--- fs/xfs/xfs_bmap.c | 76 +++++--- fs/xfs/xfs_bmap.h | 6 +- fs/xfs/xfs_btree.c | 4 +- fs/xfs/xfs_btree.h | 2 +- fs/xfs/xfs_da_btree.c | 2 +- fs/xfs/xfs_da_btree.h | 9 +- fs/xfs/xfs_dfrag.c | 68 +++---- fs/xfs/xfs_dinode.h | 4 +- fs/xfs/xfs_dir2.c | 2 - fs/xfs/xfs_dir2_block.c | 7 +- fs/xfs/xfs_dir2_data.h | 2 +- fs/xfs/xfs_dir2_leaf.c | 17 +-- fs/xfs/xfs_dir2_node.c | 2 +- fs/xfs/xfs_dir2_sf.c | 13 +-- fs/xfs/xfs_extfree_item.h | 6 - fs/xfs/xfs_filestream.c | 9 +- fs/xfs/xfs_fsops.c | 2 +- fs/xfs/xfs_ialloc.c | 12 +- fs/xfs/xfs_ialloc_btree.c | 2 +- fs/xfs/xfs_ialloc_btree.h | 22 +-- fs/xfs/xfs_inode.h | 2 +- fs/xfs/xfs_inode_item.h | 2 - fs/xfs/xfs_iomap.h | 2 +- fs/xfs/xfs_itable.c | 9 +- fs/xfs/xfs_log.c | 67 ++----- fs/xfs/xfs_log.h | 3 +- fs/xfs/xfs_log_priv.h | 3 +- fs/xfs/xfs_log_recover.c | 308 +++++++++++++++++------------- fs/xfs/xfs_mount.c | 253 ++++++++++++++----------- fs/xfs/xfs_mount.h | 19 +-- fs/xfs/xfs_qmops.c | 1 - fs/xfs/xfs_quota.h | 3 +- fs/xfs/xfs_rtalloc.c | 10 + fs/xfs/xfs_rtalloc.h | 8 +- fs/xfs/xfs_trans.h | 24 ++-- fs/xfs/xfs_trans_ail.c | 4 +- fs/xfs/xfs_trans_item.c | 2 +- fs/xfs/xfs_trans_space.h | 2 +- fs/xfs/xfs_types.h | 8 - fs/xfs/xfs_utils.c | 2 +- fs/xfs/xfs_vnodeops.c | 408 +++++++++------------------------------ fs/xfs/xfs_vnodeops.h | 3 - 69 files changed, 1031 insertions(+), 1599 deletions(-) delete mode 100644 fs/xfs/linux-2.6/mutex.h create mode 100644 fs/xfs/linux-2.6/xfs_quotaops.c Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. drivers/infiniband/core/cma.c | 4 + drivers/infiniband/hw/cxgb3/cxio_hal.c | 10 +- drivers/infiniband/hw/cxgb3/cxio_hal.h | 6 ++ drivers/infiniband/hw/cxgb3/iwch.c | 11 ++- drivers/infiniband/hw/cxgb3/iwch.h | 5 + drivers/infiniband/hw/cxgb3/iwch_cm.c | 116 ++++++++++++++++++++--------- drivers/infiniband/hw/cxgb3/iwch_cm.h | 3 +- drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +- drivers/infiniband/hw/mlx4/main.c | 3 +- drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 25 ++++--- drivers/net/mlx4/port.c | 5 +- 11 files changed, 132 insertions(+), 60 deletions(-) Merging acpi/test $ git merge acpi/test Resolved 'arch/x86/kernel/cpu/cpufreq/longhaul.c' using previous resolution. Auto-merging arch/x86/kernel/acpi/boot.c Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Auto-merging arch/x86/kernel/cpu/cpufreq/longhaul.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/longhaul.c Auto-merging arch/x86/kernel/reboot.c Auto-merging arch/x86/mm/srat_64.c Auto-merging drivers/acpi/acpica/tbxface.c Auto-merging drivers/acpi/battery.c Auto-merging drivers/acpi/fan.c Auto-merging drivers/acpi/osl.c Auto-merging drivers/acpi/processor_core.c Auto-merging drivers/acpi/processor_perflib.c Auto-merging drivers/acpi/sbs.c Auto-merging drivers/acpi/tables.c Auto-merging drivers/acpi/thermal.c Auto-merging drivers/acpi/video.c Auto-merging drivers/gpu/drm/i915/i915_dma.c Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/pci/pci-acpi.c Auto-merging drivers/platform/x86/sony-laptop.c Auto-merging include/acpi/acpiosxf.h Auto-merging include/acpi/acpixf.h Auto-merging include/linux/acpi.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e8dec97] Merge commit 'acpi/test' $ git diff -M --stat --summary HEAD^.. arch/x86/kernel/acpi/boot.c | 56 +++- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 12 + arch/x86/kernel/cpu/cpufreq/longhaul.c | 6 +- arch/x86/kernel/reboot.c | 2 +- arch/x86/mm/srat_64.c | 30 ++ drivers/acpi/Kconfig | 150 +++++---- drivers/acpi/Makefile | 8 +- drivers/acpi/acpica/Makefile | 4 +- drivers/acpi/acpica/acglobal.h | 11 +- drivers/acpi/acpica/achware.h | 12 +- drivers/acpi/acpica/aclocal.h | 60 +++- drivers/acpi/acpica/acmacros.h | 4 - drivers/acpi/acpica/acobject.h | 1 - drivers/acpi/acpica/acpredef.h | 41 ++- drivers/acpi/acpica/actables.h | 9 +- drivers/acpi/acpica/acutils.h | 15 + drivers/acpi/acpica/dsinit.c | 16 +- drivers/acpi/acpica/dsmthdat.c | 2 +- drivers/acpi/acpica/dsobject.c | 6 +- drivers/acpi/acpica/dsopcode.c | 32 +-- drivers/acpi/acpica/dsutils.c | 2 +- drivers/acpi/acpica/dswexec.c | 5 +- drivers/acpi/acpica/evevent.c | 18 +- drivers/acpi/acpica/evgpe.c | 7 +- drivers/acpi/acpica/evgpeblk.c | 70 ++-- drivers/acpi/acpica/evmisc.c | 16 +- drivers/acpi/acpica/evregion.c | 5 +- drivers/acpi/acpica/evrgnini.c | 22 +- drivers/acpi/acpica/evxface.c | 3 +- drivers/acpi/acpica/evxfevnt.c | 24 +- drivers/acpi/acpica/evxfregn.c | 3 +- drivers/acpi/acpica/exconfig.c | 17 +- drivers/acpi/acpica/exconvrt.c | 11 +- drivers/acpi/acpica/exdump.c | 59 +--- drivers/acpi/acpica/exfield.c | 29 +- drivers/acpi/acpica/exfldio.c | 14 +- drivers/acpi/acpica/exmisc.c | 14 +- drivers/acpi/acpica/exoparg1.c | 13 +- drivers/acpi/acpica/exoparg2.c | 2 +- drivers/acpi/acpica/exoparg3.c | 7 +- drivers/acpi/acpica/exprep.c | 2 +- drivers/acpi/acpica/exregion.c | 4 +- drivers/acpi/acpica/exresnte.c | 8 +- drivers/acpi/acpica/exresolv.c | 9 +- drivers/acpi/acpica/exresop.c | 23 +- drivers/acpi/acpica/exstore.c | 18 +- drivers/acpi/acpica/exstoren.c | 29 +- drivers/acpi/acpica/exutils.c | 2 +- drivers/acpi/acpica/hwacpi.c | 9 +- drivers/acpi/acpica/hwgpe.c | 21 +- drivers/acpi/acpica/hwregs.c | 322 ++++++++++++----- drivers/acpi/acpica/hwsleep.c | 130 ++++---- drivers/acpi/acpica/hwvalid.c | 258 +++++++++++++ drivers/acpi/acpica/hwxface.c | 279 ++++++--------- drivers/acpi/acpica/nsaccess.c | 54 ++-- drivers/acpi/acpica/nsalloc.c | 24 +- drivers/acpi/acpica/nsdump.c | 24 +- drivers/acpi/acpica/nseval.c | 2 +- drivers/acpi/acpica/nsinit.c | 19 +- drivers/acpi/acpica/nsload.c | 4 +- drivers/acpi/acpica/nsobject.c | 18 +- drivers/acpi/acpica/nsparse.c | 10 +- drivers/acpi/acpica/nspredef.c | 38 ++- drivers/acpi/acpica/nssearch.c | 14 +- drivers/acpi/acpica/nsutils.c | 27 +- drivers/acpi/acpica/nswalk.c | 12 +- drivers/acpi/acpica/nsxfeval.c | 36 ++- drivers/acpi/acpica/rscalc.c | 7 +- drivers/acpi/acpica/rscreate.c | 15 +- drivers/acpi/acpica/tbfadt.c | 363 +++++++++++-------- drivers/acpi/acpica/tbinstal.c | 82 ++++- drivers/acpi/acpica/tbutils.c | 106 ++++-- drivers/acpi/acpica/tbxface.c | 71 +--- drivers/acpi/acpica/tbxfroot.c | 4 +- drivers/acpi/acpica/utcopy.c | 30 +- drivers/acpi/acpica/utdelete.c | 6 +- drivers/acpi/acpica/uteval.c | 98 ++++-- drivers/acpi/acpica/utglobal.c | 17 +- drivers/acpi/acpica/utlock.c | 175 +++++++++ drivers/acpi/acpica/utmisc.c | 3 +- drivers/acpi/acpica/utmutex.c | 23 +- drivers/acpi/acpica/utobject.c | 11 +- drivers/acpi/battery.c | 12 +- drivers/acpi/bus.c | 15 + drivers/acpi/debug.c | 14 +- drivers/acpi/ec.c | 37 ++- drivers/acpi/fan.c | 20 +- drivers/acpi/glue.c | 6 +- drivers/acpi/internal.h | 43 +++ drivers/acpi/numa.c | 44 +++ drivers/acpi/osl.c | 92 ++++-- drivers/acpi/pci_irq.c | 2 +- drivers/acpi/pci_link.c | 147 +++----- drivers/acpi/power.c | 8 +- drivers/acpi/proc.c | 7 +- drivers/acpi/processor_core.c | 26 ++ drivers/acpi/processor_idle.c | 73 ++--- drivers/acpi/processor_perflib.c | 46 ++-- drivers/acpi/processor_thermal.c | 20 +- drivers/acpi/processor_throttling.c | 6 +- drivers/acpi/sbs.c | 27 +- drivers/acpi/scan.c | 23 +- drivers/acpi/sleep.c | 13 +- drivers/acpi/system.c | 60 +++- drivers/acpi/tables.c | 24 ++ drivers/acpi/thermal.c | 539 +++++----------------------- drivers/acpi/video.c | 301 ++++++++++++---- drivers/acpi/video_detect.c | 3 + drivers/acpi/wakeup.c | 9 +- drivers/gpu/drm/i915/i915_dma.c | 5 +- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_opregion.c | 65 ++++- drivers/pci/pci-acpi.c | 4 +- drivers/platform/x86/hp-wmi.c | 25 ++ drivers/platform/x86/intel_menlow.c | 29 +- drivers/platform/x86/sony-laptop.c | 514 ++++++++++++++++++++------- drivers/platform/x86/tc1100-wmi.c | 7 +- drivers/power/power_supply_sysfs.c | 2 + drivers/thermal/thermal_sys.c | 356 ++++++++++++++++++- include/acpi/acexcep.h | 6 +- include/acpi/acpi_bus.h | 16 - include/acpi/acpi_drivers.h | 23 -- include/acpi/acpiosxf.h | 4 - include/acpi/acpixf.h | 16 +- include/acpi/actbl.h | 74 ++-- include/acpi/actypes.h | 18 +- include/acpi/video.h | 11 + include/linux/acpi.h | 1 + include/linux/power_supply.h | 2 + include/linux/sonypi.h | 8 + include/linux/thermal.h | 48 ++- 132 files changed, 3758 insertions(+), 2324 deletions(-) create mode 100644 drivers/acpi/acpica/hwvalid.c create mode 100644 drivers/acpi/acpica/utlock.c create mode 100644 drivers/acpi/internal.h create mode 100644 include/acpi/video.h Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging fs/nfsd/nfsctl.c Auto-merging fs/nfsd/nfssvc.c Auto-merging fs/nfsd/vfs.c Auto-merging include/linux/sunrpc/svc.h Auto-merging include/linux/sunrpc/svc_xprt.h Auto-merging include/linux/sunrpc/xprt.h Auto-merging net/sunrpc/clnt.c Auto-merging net/sunrpc/svc.c Auto-merging net/sunrpc/svc_xprt.c Auto-merging net/sunrpc/svcsock.c Auto-merging net/sunrpc/xprt.c Auto-merging net/sunrpc/xprtsock.c Merge made by recursive. Documentation/filesystems/knfsd-stats.txt | 159 ++++ Documentation/filesystems/nfs41-server.txt | 148 ++++ fs/lockd/svclock.c | 13 +- fs/nfsd/Kconfig | 10 + fs/nfsd/nfs3proc.c | 10 +- fs/nfsd/nfs4callback.c | 314 +++++++- fs/nfsd/nfs4proc.c | 239 ++++-- fs/nfsd/nfs4recover.c | 74 +- fs/nfsd/nfs4state.c | 1229 ++++++++++++++++++++++++---- fs/nfsd/nfs4xdr.c | 653 ++++++++++++++- fs/nfsd/nfsctl.c | 12 + fs/nfsd/nfsproc.c | 3 +- fs/nfsd/nfssvc.c | 64 +- fs/nfsd/vfs.c | 37 +- include/linux/lockd/xdr.h | 12 +- include/linux/lockd/xdr4.h | 10 +- include/linux/nfs.h | 1 - include/linux/nfs4.h | 138 +++- include/linux/nfsd/cache.h | 5 + include/linux/nfsd/nfsd.h | 246 ++++-- include/linux/nfsd/nfsfh.h | 7 + include/linux/nfsd/state.h | 93 ++- include/linux/nfsd/stats.h | 9 +- include/linux/nfsd/xdr4.h | 133 +++- include/linux/sunrpc/clnt.h | 1 + include/linux/sunrpc/svc.h | 18 + include/linux/sunrpc/svcsock.h | 1 + include/linux/sunrpc/xdr.h | 42 +- include/linux/sunrpc/xprt.h | 4 + net/sunrpc/clnt.c | 1 + net/sunrpc/svc.c | 3 +- net/sunrpc/svc_xprt.c | 127 +++- net/sunrpc/svcsock.c | 116 ++- net/sunrpc/xprt.c | 41 +- net/sunrpc/xprtsock.c | 286 +++++++- 35 files changed, 3686 insertions(+), 573 deletions(-) create mode 100644 Documentation/filesystems/knfsd-stats.txt create mode 100644 Documentation/filesystems/nfs41-server.txt Merging ieee1394/for-next $ git merge ieee1394/for-next Already up-to-date. Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/cdev.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) Merging kvm/master $ git merge kvm/master Auto-merging arch/ia64/kvm/kvm-ia64.c Auto-merging arch/ia64/kvm/vcpu.c Auto-merging arch/ia64/kvm/vtlb.c Auto-merging arch/x86/kernel/kvm.c Merge made by recursive. arch/ia64/include/asm/kvm_host.h | 5 +- arch/ia64/include/asm/pgtable.h | 2 + arch/ia64/kvm/kvm-ia64.c | 159 +++++++--- arch/ia64/kvm/kvm_fw.c | 28 ++- arch/ia64/kvm/lapic.h | 6 +- arch/ia64/kvm/optvfault.S | 30 ++ arch/ia64/kvm/process.c | 5 + arch/ia64/kvm/vcpu.c | 20 +- arch/ia64/kvm/vmm.c | 12 +- arch/ia64/kvm/vmm_ivt.S | 18 +- arch/ia64/kvm/vtlb.c | 3 +- arch/powerpc/kvm/powerpc.c | 6 + arch/s390/kvm/interrupt.c | 6 + arch/x86/include/asm/kvm.h | 1 + arch/x86/include/asm/kvm_host.h | 7 +- arch/x86/kernel/kvm.c | 4 + arch/x86/kvm/Makefile | 2 +- arch/x86/kvm/i8254.c | 95 +++--- arch/x86/kvm/i8254.h | 12 +- arch/x86/kvm/kvm_timer.h | 18 + arch/x86/kvm/lapic.c | 251 +++++---------- arch/x86/kvm/lapic.h | 12 +- arch/x86/kvm/mmu.c | 77 ++++- arch/x86/kvm/paging_tmpl.h | 10 +- arch/x86/kvm/svm.c | 43 +-- arch/x86/kvm/timer.c | 46 +++ arch/x86/kvm/vmx.c | 205 +++++++------ arch/x86/kvm/x86.c | 88 ++++-- arch/x86/kvm/x86.h | 18 + include/linux/kvm.h | 40 +++- include/linux/kvm_host.h | 20 +- include/linux/kvm_types.h | 27 ++ virt/kvm/ioapic.c | 153 ++-------- virt/kvm/ioapic.h | 27 +-- virt/kvm/irq_comm.c | 109 ++++--- virt/kvm/kvm_main.c | 642 +++++++++++++++++++++++++++----------- 36 files changed, 1373 insertions(+), 834 deletions(-) create mode 100644 arch/x86/kvm/kvm_timer.h create mode 100644 arch/x86/kvm/timer.c Merging dlm/next $ git merge dlm/next Already up-to-date. Merging scsi/master $ git merge scsi/master Recorded preimage for 'firmware/Makefile' Removing drivers/scsi/fcoe/fc_transport_fcoe.c Removing drivers/scsi/fcoe/fcoe_sw.c Removing drivers/scsi/ql1040_fw.h Removing drivers/scsi/ql12160_fw.h Removing drivers/scsi/ql1280_fw.h Auto-merging firmware/Makefile CONFLICT (content): Merge conflict in firmware/Makefile Auto-merging firmware/WHENCE Removing include/scsi/fc_transport_fcoe.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'firmware/Makefile'. [master 6a2150e] Merge commit 'scsi/master' $ git diff -M --stat --summary HEAD^.. Documentation/scsi/aacraid.txt | 15 +- drivers/message/fusion/mptsas.c | 5 +- drivers/scsi/Kconfig | 17 +- drivers/scsi/Makefile | 1 + drivers/scsi/aacraid/aachba.c | 40 +- drivers/scsi/aacraid/aacraid.h | 9 +- drivers/scsi/aacraid/comminit.c | 14 +- drivers/scsi/aacraid/linit.c | 8 +- drivers/scsi/advansys.c | 1731 ++------------------------ drivers/scsi/aic7xxx/aic79xx_pci.c | 6 +- drivers/scsi/aic7xxx/aic7xxx_pci.c | 8 +- drivers/scsi/cxgb3i/Kbuild | 4 +- drivers/scsi/cxgb3i/cxgb3i.h | 10 +- drivers/scsi/cxgb3i/cxgb3i_ddp.c | 275 ++--- drivers/scsi/cxgb3i/cxgb3i_ddp.h | 6 +- drivers/scsi/cxgb3i/cxgb3i_init.c | 31 +- drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 129 ++- drivers/scsi/cxgb3i/cxgb3i_offload.c | 101 +- drivers/scsi/cxgb3i/cxgb3i_offload.h | 13 +- drivers/scsi/fcoe/Makefile | 8 +- drivers/scsi/fcoe/fc_transport_fcoe.c | 443 ------- drivers/scsi/fcoe/fcoe.c | 1878 ++++++++++++++++++++++++++++ drivers/scsi/fcoe/fcoe.h | 75 ++ drivers/scsi/fcoe/fcoe_sw.c | 561 --------- drivers/scsi/fcoe/libfcoe.c | 2216 ++++++++++++++++----------------- drivers/scsi/ibmvscsi/ibmvfc.c | 126 ++- drivers/scsi/ibmvscsi/ibmvfc.h | 16 +- drivers/scsi/libfc/fc_fcp.c | 10 +- drivers/scsi/libfc/fc_lport.c | 11 +- drivers/scsi/libiscsi.c | 4 +- drivers/scsi/osd/osd_initiator.c | 42 +- drivers/scsi/osd/osd_uld.c | 6 - 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/qla2xxx/qla_attr.c | 295 +++++- drivers/scsi/qla2xxx/qla_def.h | 136 +-- drivers/scsi/qla2xxx/qla_dfs.c | 4 +- drivers/scsi/qla2xxx/qla_fw.h | 42 +- drivers/scsi/qla2xxx/qla_gbl.h | 25 +- drivers/scsi/qla2xxx/qla_init.c | 136 +-- drivers/scsi/qla2xxx/qla_iocb.c | 37 +- drivers/scsi/qla2xxx/qla_isr.c | 32 +- drivers/scsi/qla2xxx/qla_mbx.c | 238 ++++- drivers/scsi/qla2xxx/qla_mid.c | 12 +- drivers/scsi/qla2xxx/qla_os.c | 258 ++--- drivers/scsi/qla2xxx/qla_sup.c | 103 ++- drivers/scsi/qla2xxx/qla_version.h | 4 +- drivers/scsi/scsi_lib.c | 17 +- drivers/scsi/sd.c | 6 - drivers/scsi/sr.c | 9 - drivers/scsi/stex.c | 742 +++++++++--- firmware/Makefile | 4 + firmware/WHENCE | 26 + 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/qlogic/1040.bin.ihex | 2111 +++++++++++++++++++++++++++++++ firmware/qlogic/12160.bin.ihex | 1771 ++++++++++++++++++++++++++ firmware/qlogic/1280.bin.ihex | 2008 +++++++++++++++++++++++++++++ include/scsi/fc/fc_fip.h | 237 ++++ include/scsi/fc_transport_fcoe.h | 54 - include/scsi/libfc.h | 45 +- include/scsi/libfcoe.h | 227 ++-- 67 files changed, 12691 insertions(+), 11014 deletions(-) delete mode 100644 drivers/scsi/fcoe/fc_transport_fcoe.c create mode 100644 drivers/scsi/fcoe/fcoe.c create mode 100644 drivers/scsi/fcoe/fcoe.h delete mode 100644 drivers/scsi/fcoe/fcoe_sw.c delete mode 100644 drivers/scsi/ql1040_fw.h delete mode 100644 drivers/scsi/ql12160_fw.h delete mode 100644 drivers/scsi/ql1280_fw.h 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/qlogic/1040.bin.ihex create mode 100644 firmware/qlogic/12160.bin.ihex create mode 100644 firmware/qlogic/1280.bin.ihex create mode 100644 include/scsi/fc/fc_fip.h delete mode 100644 include/scsi/fc_transport_fcoe.h Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/ocfs2/alloc.c | 57 + fs/ocfs2/alloc.h | 3 + fs/ocfs2/aops.c | 23 +- fs/ocfs2/cluster/heartbeat.c | 96 ++- fs/ocfs2/cluster/heartbeat.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 9 +- fs/ocfs2/dir.c | 2806 ++++++++++++++++++++++++++++++++++++++-- fs/ocfs2/dir.h | 57 +- fs/ocfs2/dlm/dlmcommon.h | 58 +- fs/ocfs2/dlm/dlmdebug.c | 87 +- fs/ocfs2/dlm/dlmdomain.c | 29 +- fs/ocfs2/dlm/dlmmaster.c | 387 +++--- fs/ocfs2/dlm/dlmthread.c | 20 +- fs/ocfs2/dlmglue.c | 46 + fs/ocfs2/dlmglue.h | 2 + fs/ocfs2/export.c | 84 ++- fs/ocfs2/inode.c | 48 +- fs/ocfs2/inode.h | 5 + fs/ocfs2/journal.c | 173 +++- fs/ocfs2/journal.h | 77 +- fs/ocfs2/localalloc.c | 86 -- fs/ocfs2/namei.c | 250 ++-- fs/ocfs2/ocfs2.h | 76 +- fs/ocfs2/ocfs2_fs.h | 136 ++- fs/ocfs2/ocfs2_lockid.h | 4 + fs/ocfs2/suballoc.c | 254 ++++- fs/ocfs2/suballoc.h | 4 + fs/ocfs2/super.c | 188 +++ fs/ocfs2/xattr.c | 8 +- fs/ocfs2/xattr.h | 2 +- 30 files changed, 4389 insertions(+), 689 deletions(-) Merging ext4/next $ git merge ext4/next Already up-to-date. Merging async_tx/next $ git merge async_tx/next Auto-merging drivers/dma/dw_dmac.c Auto-merging drivers/dma/ipu/ipu_idmac.c Merge made by recursive. crypto/async_tx/async_tx.c | 6 +- crypto/async_tx/async_xor.c | 7 +- drivers/dma/Kconfig | 11 ++ drivers/dma/dmaengine.c | 60 ++++++-- drivers/dma/dmatest.c | 307 +++++++++++++++++++++++++++------------ drivers/dma/dw_dmac.c | 333 ++++++++++++++++++++++++++++++++++++++++++- drivers/dma/dw_dmac_regs.h | 7 +- drivers/dma/fsldma.c | 1 - drivers/dma/ioat_dma.c | 1 - drivers/dma/iop-adma.c | 1 - drivers/dma/ipu/ipu_idmac.c | 308 ++++++++++++++++++++++++++-------------- drivers/dma/ipu/ipu_irq.c | 2 +- drivers/dma/mv_xor.c | 1 - include/linux/async_tx.h | 9 ++ include/linux/dmaengine.h | 30 ++++- include/linux/dw_dmac.h | 19 +++ 16 files changed, 870 insertions(+), 233 deletions(-) Merging udf/for_next $ git merge udf/for_next Merge made by recursive. Documentation/filesystems/udf.txt | 2 + fs/udf/balloc.c | 150 ++++----- fs/udf/dir.c | 14 +- fs/udf/directory.c | 38 ++-- fs/udf/ecma_167.h | 416 +++++++++++++------------- fs/udf/ialloc.c | 9 +- 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 | 605 +++++++++++++++++++------------------ fs/udf/truncate.c | 44 ++-- fs/udf/udf_i.h | 6 +- fs/udf/udf_sb.h | 9 +- fs/udf/udfdecl.h | 57 +++-- fs/udf/udfend.h | 28 +- fs/udf/udftime.c | 6 +- fs/udf/unicode.c | 62 +++-- 19 files changed, 930 insertions(+), 868 deletions(-) Merging net/master $ git merge net/master Already up-to-date. Merging wireless/master $ git merge wireless/master Already up-to-date. Merging mtd/master $ git merge mtd/master Resolved 'drivers/mtd/maps/Makefile' using previous resolution. Auto-merging drivers/mtd/maps/Kconfig Auto-merging drivers/mtd/maps/Makefile CONFLICT (content): Merge conflict in drivers/mtd/maps/Makefile Removing drivers/mtd/maps/sharpsl-flash.c Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/mtd/nand/pxa3xx_nand.c Removing fs/romfs/inode.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1ed851b] Merge commit 'mtd/master' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-davinci/include/mach/nand.h | 80 +++ arch/arm/mach-pxa/include/mach/pxa3xx_nand.h | 3 + arch/blackfin/kernel/process.c | 2 +- arch/mips/include/asm/txx9/ndfmc.h | 30 ++ arch/mips/include/asm/txx9/rbtx4939.h | 9 + arch/mips/include/asm/txx9/tx4938.h | 1 + arch/mips/include/asm/txx9/tx4939.h | 2 + arch/mips/txx9/generic/setup.c | 21 + arch/mips/txx9/generic/setup_tx4938.c | 21 + arch/mips/txx9/generic/setup_tx4939.c | 17 + arch/mips/txx9/rbtx4938/setup.c | 2 + arch/mips/txx9/rbtx4939/setup.c | 161 +++++++ drivers/mtd/Makefile | 2 +- drivers/mtd/ar7part.c | 6 +- drivers/mtd/chips/cfi_cmdset_0001.c | 8 +- drivers/mtd/chips/jedec_probe.c | 16 + drivers/mtd/chips/map_ram.c | 17 + drivers/mtd/chips/map_rom.c | 17 + drivers/mtd/cmdlinepart.c | 6 +- drivers/mtd/devices/doc2000.c | 1 - drivers/mtd/devices/doc2001.c | 1 - drivers/mtd/devices/doc2001plus.c | 1 - drivers/mtd/devices/docecc.c | 1 - drivers/mtd/devices/m25p80.c | 17 +- drivers/mtd/devices/mtd_dataflash.c | 16 +- drivers/mtd/devices/mtdram.c | 14 + drivers/mtd/inftlmount.c | 1 - drivers/mtd/internal.h | 17 + drivers/mtd/maps/Kconfig | 12 +- drivers/mtd/maps/Makefile | 2 +- drivers/mtd/maps/rbtx4939-flash.c | 208 ++++++++ drivers/mtd/maps/sharpsl-flash.c | 116 ----- drivers/mtd/mtdbdi.c | 43 ++ drivers/mtd/mtdchar.c | 64 +++- drivers/mtd/mtdconcat.c | 47 ++ drivers/mtd/mtdcore.c | 15 + drivers/mtd/mtdoops.c | 16 +- drivers/mtd/mtdpart.c | 15 + drivers/mtd/nand/Kconfig | 15 +- drivers/mtd/nand/Makefile | 2 + drivers/mtd/nand/bf5xx_nand.c | 18 +- drivers/mtd/nand/davinci_nand.c | 568 ++++++++++++++++++++++ drivers/mtd/nand/nand_base.c | 107 ++++- drivers/mtd/nand/pxa3xx_nand.c | 119 +++++- drivers/mtd/nand/sh_flctl.c | 18 +- drivers/mtd/nand/txx9ndfmc.c | 428 +++++++++++++++++ drivers/mtd/nftlcore.c | 3 +- drivers/mtd/ofpart.c | 7 + drivers/mtd/onenand/omap2.c | 4 + drivers/mtd/onenand/onenand_base.c | 145 ++++-- fs/jffs2/acl.c | 4 +- fs/jffs2/malloc.c | 6 +- fs/romfs/Kconfig | 48 ++- fs/romfs/Makefile | 9 +- fs/romfs/inode.c | 665 -------------------------- fs/romfs/internal.h | 47 ++ fs/romfs/mmap-nommu.c | 75 +++ fs/romfs/storage.c | 261 ++++++++++ fs/romfs/super.c | 648 +++++++++++++++++++++++++ include/linux/mtd/mtd.h | 14 + include/linux/mtd/partitions.h | 12 + 61 files changed, 3339 insertions(+), 912 deletions(-) create mode 100644 arch/arm/mach-davinci/include/mach/nand.h create mode 100644 arch/mips/include/asm/txx9/ndfmc.h create mode 100644 drivers/mtd/internal.h create mode 100644 drivers/mtd/maps/rbtx4939-flash.c delete mode 100644 drivers/mtd/maps/sharpsl-flash.c create mode 100644 drivers/mtd/mtdbdi.c create mode 100644 drivers/mtd/nand/davinci_nand.c create mode 100644 drivers/mtd/nand/txx9ndfmc.c delete mode 100644 fs/romfs/inode.c create mode 100644 fs/romfs/internal.h create mode 100644 fs/romfs/mmap-nommu.c create mode 100644 fs/romfs/storage.c create mode 100644 fs/romfs/super.c Merging crypto/master $ git merge crypto/master Auto-merging drivers/char/hw_random/omap-rng.c Merge made by recursive. arch/x86/crypto/Makefile | 2 + arch/x86/crypto/aesni-intel_glue.c | 267 ++++++++++++++- arch/x86/crypto/fpu.c | 166 +++++++++ crypto/Kconfig | 10 + crypto/api.c | 5 +- crypto/cryptd.c | 14 +- crypto/pcompress.c | 1 + crypto/tcrypt.c | 16 +- crypto/testmgr.c | 6 +- drivers/char/hw_random/omap-rng.c | 2 +- drivers/crypto/talitos.c | 713 ++++++++++++++++++++++++++---------- 11 files changed, 987 insertions(+), 215 deletions(-) create mode 100644 arch/x86/crypto/fpu.c Merging vfs/for-next $ git merge vfs/for-next Resolved 'include/linux/mnt_namespace.h' using previous resolution. Auto-merging fs/Makefile Auto-merging fs/buffer.c Auto-merging fs/jffs2/acl.c Auto-merging fs/namei.c Auto-merging fs/namespace.c Auto-merging fs/nfs/nfs3proc.c Auto-merging fs/nfs/nfs4proc.c Auto-merging fs/nfsd/nfssvc.c Auto-merging fs/xfs/linux-2.6/xfs_iops.c Auto-merging include/linux/buffer_head.h Auto-merging include/linux/fs.h Auto-merging include/linux/mnt_namespace.h CONFLICT (content): Merge conflict in include/linux/mnt_namespace.h Auto-merging include/linux/nsproxy.h Auto-merging include/linux/sched.h Auto-merging kernel/fork.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 17b4a25] Merge commit 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. arch/cris/kernel/process.c | 1 - arch/powerpc/platforms/cell/spufs/inode.c | 2 +- drivers/char/tty_audit.c | 2 - drivers/char/tty_ldisc.c | 1 - fs/Makefile | 2 +- fs/binfmt_elf.c | 22 +---- fs/binfmt_som.c | 7 - fs/block_dev.c | 1 + fs/btrfs/acl.c | 2 +- fs/btrfs/ioctl.c | 2 +- fs/buffer.c | 1 - fs/cifs/dir.c | 4 +- fs/cifs/inode.c | 4 +- fs/compat.c | 16 +++- fs/dcache.c | 2 +- fs/exec.c | 35 +++++-- fs/ext2/acl.c | 2 +- fs/ext3/acl.c | 2 +- fs/ext4/acl.c | 2 +- fs/fat/inode.c | 2 +- fs/fs_struct.c | 177 +++++++++++++++++++++++++++++ fs/generic_acl.c | 2 +- fs/gfs2/acl.c | 2 +- fs/hfsplus/options.c | 2 +- fs/hpfs/super.c | 2 +- fs/internal.h | 8 +- fs/jffs2/acl.c | 2 +- fs/jfs/acl.c | 2 +- fs/mpage.c | 13 ++- fs/namei.c | 14 +-- fs/namespace.c | 61 +---------- fs/nfs/nfs3proc.c | 6 +- fs/nfs/nfs4proc.c | 2 +- fs/nfsd/nfssvc.c | 7 +- fs/ocfs2/acl.c | 2 +- fs/omfs/inode.c | 2 +- fs/open.c | 1 + fs/proc/base.c | 1 + fs/proc/task_nommu.c | 3 +- fs/reiserfs/xattr_acl.c | 2 +- fs/xfs/linux-2.6/xfs_iops.c | 4 +- include/linux/buffer_head.h | 12 -- include/linux/fs.h | 14 +++ include/linux/fs_struct.h | 10 +- include/linux/mnt_namespace.h | 2 + include/linux/mpage.h | 10 -- include/linux/nsproxy.h | 1 + include/linux/sched.h | 3 +- init/do_mounts.c | 1 + ipc/mqueue.c | 2 +- kernel/auditsc.c | 1 + kernel/exec_domain.c | 23 +---- kernel/exit.c | 32 +----- kernel/fork.c | 63 +++++------ kernel/sys.c | 1 + net/unix/af_unix.c | 2 +- security/tomoyo/realpath.c | 1 + 57 files changed, 337 insertions(+), 268 deletions(-) create mode 100644 fs/fs_struct.c $ git am -3 ../patches/0001-vfs-merge-fix-for-put_fs_struct-free_fs_struct-chan.patch Applying: vfs: merge fix for put_fs_struct/free_fs_struct change $ git reset HEAD^ fs/namei.c: locally modified $ git add . $ git commit -v -a --amend [master c497dc0] Merge commit 'vfs/for-next' $ git am -3 ../patches/0001-nfs-fixup-for-fallout-from-cleaning-up-includes-of.patch Applying: nfs: fixup for fallout from cleaning up includes of fs_struct.h $ git reset HEAD^ fs/cachefiles/cf-daemon.c: locally modified $ git add . $ git commit -v -a --amend [master 33e6caf] Merge commit 'vfs/for-next' Merging sound/for-next $ git merge sound/for-next Already up-to-date. Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Resolved 'net/9p/protocol.c' using previous resolution. Auto-merging net/9p/protocol.c CONFLICT (content): Merge conflict in net/9p/protocol.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 78bc80c] Merge commit 'v9fs/for-next' $ git diff -M --stat --summary HEAD^.. Merging quilt/rr $ git merge quilt/rr Resolved 'kernel/extable.c' using previous resolution. Resolved 'kernel/module.c' using previous resolution. Auto-merging drivers/mtd/nand/nand_base.c Auto-merging drivers/video/uvesafb.c Auto-merging include/linux/compiler.h Auto-merging include/linux/module.h Auto-merging include/linux/string.h Auto-merging init/main.c Auto-merging kernel/extable.c CONFLICT (content): Merge conflict in kernel/extable.c Auto-merging kernel/module.c CONFLICT (content): Merge conflict in kernel/module.c Auto-merging kernel/workqueue.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 76f5825] Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. arch/arm/boot/compressed/misc.c | 5 +- drivers/mtd/nand/nand_base.c | 4 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/cyber2000fb.c | 9 +- drivers/video/uvesafb.c | 10 +- include/asm-frv/gdb-stub.h | 1 - include/asm-mn10300/gdb-stub.h | 1 - include/linux/compiler.h | 5 + include/linux/cpu.h | 5 - include/linux/kallsyms.h | 15 ++ include/linux/kmod.h | 11 +- include/linux/module.h | 63 ++++++++- include/linux/moduleparam.h | 50 ++++++-- include/linux/string.h | 9 ++ init/main.c | 1 - kernel/cpu.c | 11 +- kernel/extable.c | 6 +- kernel/kallsyms.c | 19 +++ kernel/kmod.c | 10 +- kernel/kthread.c | 26 ++-- kernel/module.c | 274 +++++++++++++++++++++++---------------- kernel/params.c | 60 +++++++-- kernel/workqueue.c | 36 +++--- scripts/mod/modpost.c | 4 +- 24 files changed, 421 insertions(+), 216 deletions(-) Merging cifs/master $ git merge cifs/master Auto-merging fs/cifs/dir.c Auto-merging fs/cifs/inode.c Merge made by recursive. fs/cifs/CHANGES | 3 +- fs/cifs/cifspdu.h | 8 +- fs/cifs/cifssmb.c | 2 +- fs/cifs/connect.c | 188 +++++++++++++++++++++++++++++++++++++---------------- fs/cifs/dir.c | 6 +- fs/cifs/inode.c | 66 ++++++++++--------- fs/cifs/readdir.c | 4 +- 7 files changed, 180 insertions(+), 97 deletions(-) $ git reset --hard HEAD^ HEAD is now at 76f5825 Merge branch 'quilt/rr' Merging refs/next/20090402/cifs $ git merge refs/next/20090402/cifs Auto-merging fs/cifs/dir.c Auto-merging fs/cifs/inode.c Merge made by recursive. fs/cifs/CHANGES | 3 +- fs/cifs/cifspdu.h | 8 +++--- fs/cifs/cifssmb.c | 2 +- fs/cifs/connect.c | 36 +++++++++------------------- fs/cifs/dir.c | 6 +++- fs/cifs/inode.c | 66 ++++++++++++++++++++++++++++------------------------- fs/cifs/readdir.c | 4 +- 7 files changed, 60 insertions(+), 65 deletions(-) Merging mmc/next $ git merge mmc/next Auto-merging MAINTAINERS Auto-merging drivers/mmc/host/atmel-mci.c Auto-merging drivers/mmc/host/omap_hsmmc.c Merge made by recursive. MAINTAINERS | 20 +- drivers/mmc/card/block.c | 2 + drivers/mmc/core/bus.c | 8 + drivers/mmc/core/core.c | 18 + drivers/mmc/core/debugfs.c | 67 +++ drivers/mmc/core/sdio_cis.c | 8 + drivers/mmc/core/sdio_ops.c | 8 + drivers/mmc/host/Kconfig | 29 ++ drivers/mmc/host/Makefile | 2 + drivers/mmc/host/atmel-mci.c | 2 +- drivers/mmc/host/mmc_spi.c | 40 ++- drivers/mmc/host/mvsdio.c | 885 +++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/mvsdio.h | 190 +++++++++ drivers/mmc/host/omap_hsmmc.c | 355 ++++++++++------- drivers/mmc/host/sdhci-of.c | 309 ++++++++++++++ drivers/mmc/host/sdhci.c | 317 ++++++++++----- drivers/mmc/host/sdhci.h | 112 ++++++ drivers/mmc/host/tmio_mmc.c | 6 +- drivers/mmc/host/tmio_mmc.h | 3 + 19 files changed, 2109 insertions(+), 272 deletions(-) create mode 100644 drivers/mmc/host/mvsdio.c create mode 100644 drivers/mmc/host/mvsdio.h create mode 100644 drivers/mmc/host/sdhci-of.c Merging gfs2/master $ git merge gfs2/master Already up-to-date. Merging input/next $ git merge input/next Auto-merging drivers/input/input.c Auto-merging drivers/input/mouse/Kconfig Merge made by recursive. Documentation/input/rotary-encoder.txt | 101 +++ arch/mips/include/asm/mach-rc32434/gpio.h | 3 + arch/mips/rb532/devices.c | 19 +- drivers/input/input.c | 13 +- drivers/input/keyboard/atkbd.c | 135 ++--- drivers/input/keyboard/bf54x-keys.c | 4 +- drivers/input/keyboard/hilkbd.c | 140 +++-- drivers/input/misc/Kconfig | 23 + drivers/input/misc/Makefile | 28 +- drivers/input/misc/ati_remote2.c | 277 ++++++++- drivers/input/misc/rb532_button.c | 120 ++++ drivers/input/misc/rotary_encoder.c | 221 +++++++ drivers/input/mouse/Kconfig | 11 + drivers/input/mouse/Makefile | 9 +- drivers/input/mouse/hgpk.c | 2 +- drivers/input/mouse/maplemouse.c | 147 +++++ drivers/input/mouse/pc110pad.c | 5 +- drivers/input/touchscreen/Kconfig | 58 ++ drivers/input/touchscreen/Makefile | 3 + drivers/input/touchscreen/ad7877.c | 844 ++++++++++++++++++++++++++ drivers/input/touchscreen/ad7879.c | 782 ++++++++++++++++++++++++ drivers/input/touchscreen/mainstone-wm97xx.c | 3 +- drivers/input/touchscreen/ucb1400_ts.c | 5 +- drivers/input/touchscreen/wm97xx-core.c | 13 +- drivers/input/touchscreen/zylonite-wm97xx.c | 240 ++++++++ include/linux/rotary_encoder.h | 13 + include/linux/spi/ad7879.h | 35 ++ 27 files changed, 3054 insertions(+), 200 deletions(-) create mode 100644 Documentation/input/rotary-encoder.txt create mode 100644 drivers/input/misc/rb532_button.c create mode 100644 drivers/input/misc/rotary_encoder.c create mode 100644 drivers/input/mouse/maplemouse.c create mode 100644 drivers/input/touchscreen/ad7877.c create mode 100644 drivers/input/touchscreen/ad7879.c create mode 100644 drivers/input/touchscreen/zylonite-wm97xx.c create mode 100644 include/linux/rotary_encoder.h create mode 100644 include/linux/spi/ad7879.h 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-merging fs/ubifs/file.c Auto-merging fs/ubifs/super.c Merge made by recursive. fs/ubifs/budget.c | 37 ++--- fs/ubifs/debug.c | 6 +- fs/ubifs/file.c | 16 ++- fs/ubifs/find.c | 12 +- fs/ubifs/gc.c | 428 +++++++++++++++++++++++++++++++++--------------- fs/ubifs/journal.c | 7 +- fs/ubifs/key.h | 6 +- fs/ubifs/log.c | 5 +- fs/ubifs/lpt_commit.c | 34 ++-- fs/ubifs/recovery.c | 70 +++------ fs/ubifs/replay.c | 2 +- fs/ubifs/sb.c | 36 ++++- fs/ubifs/shrinker.c | 6 +- fs/ubifs/super.c | 37 +++- fs/ubifs/tnc.c | 2 +- fs/ubifs/ubifs-media.h | 30 +++- fs/ubifs/ubifs.h | 13 +- 17 files changed, 482 insertions(+), 265 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Auto-merging block/blk.h Merge made by recursive. block/blk-core.c | 13 ++++--------- block/blk-merge.c | 29 +++++++++++++++++------------ block/blk-sysfs.c | 4 ++++ block/blk.h | 14 ++++++++++---- block/elevator.c | 42 ++++++++++++++++++++++++++++-------------- drivers/block/cciss.c | 10 +++++++++- include/linux/elevator.h | 1 + 7 files changed, 73 insertions(+), 40 deletions(-) Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Recorded preimage for 'firmware/Makefile' Recorded preimage for 'firmware/WHENCE' Resolved 'sound/isa/Kconfig' using previous resolution. Auto-merging drivers/media/dvb/ttpci/Kconfig Auto-merging drivers/media/dvb/ttpci/av7110.c Removing drivers/media/dvb/ttpci/fdump.c Removing drivers/scsi/qlogicpti_asm.c Auto-merging firmware/Makefile CONFLICT (content): Merge conflict in firmware/Makefile Auto-merging firmware/WHENCE CONFLICT (content): Merge conflict in firmware/WHENCE Auto-merging sound/isa/Kconfig CONFLICT (content): Merge conflict in sound/isa/Kconfig Removing sound/isa/wavefront/yss225.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'firmware/Makefile'. Recorded resolution for 'firmware/WHENCE'. [master aa9f5c5] 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/scsi/qlogicpti.c | 63 +- drivers/scsi/qlogicpti_asm.c | 1160 ------------ firmware/.gitignore | 1 + firmware/Makefile | 25 +- firmware/WHENCE | 59 + firmware/av7110/Boot.S | 109 ++ firmware/av7110/bootcode.bin.ihex | 15 + {scripts => firmware}/ihex2fw.c | 0 firmware/qlogic/isp1000.bin.ihex | 1158 ++++++++++++ firmware/yamaha/yss225_registers.bin.ihex | 998 +++++++++++ scripts/.gitignore | 1 - scripts/Makefile | 3 +- sound/isa/Kconfig | 10 - sound/isa/wavefront/wavefront_fx.c | 16 - sound/isa/wavefront/yss225.c | 2739 ----------------------------- 21 files changed, 2422 insertions(+), 4065 deletions(-) delete mode 100644 drivers/media/dvb/ttpci/fdump.c delete mode 100644 drivers/scsi/qlogicpti_asm.c create mode 100644 firmware/av7110/Boot.S create mode 100644 firmware/av7110/bootcode.bin.ihex rename {scripts => firmware}/ihex2fw.c (100%) create mode 100644 firmware/qlogic/isp1000.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 Merge made by recursive. drivers/power/pcf50633-charger.c | 88 +++++++++++++++++++++++++++++------- drivers/power/pda_power.c | 89 ++++++++++++++++++++++++++++++++----- include/linux/mfd/pcf50633/core.h | 2 + include/linux/mfd/pcf50633/mbc.h | 1 - include/linux/pda_power.h | 2 + 5 files changed, 152 insertions(+), 30 deletions(-) Merging leds/for-mm $ git merge leds/for-mm Auto-merging drivers/leds/Kconfig Merge made by recursive. Documentation/powerpc/dts-bindings/gpio/led.txt | 46 ++++- drivers/leds/Kconfig | 54 +++++- drivers/leds/Makefile | 6 + drivers/leds/led-class.c | 21 ++- drivers/leds/led-triggers.c | 10 +- drivers/leds/leds-dac124s085.c | 150 ++++++++++++++ drivers/leds/leds-gpio.c | 216 ++++++++++++++++---- drivers/leds/leds-pca9532.c | 2 +- drivers/leds/leds-pwm.c | 153 +++++++++++++++ drivers/leds/leds-rb532.c | 77 ++++++++ drivers/leds/leds.h | 4 +- drivers/leds/ledtrig-default-on.c | 2 +- drivers/leds/ledtrig-gpio.c | 239 +++++++++++++++++++++++ drivers/leds/ledtrig-heartbeat.c | 4 +- drivers/leds/ledtrig-ide-disk.c | 3 +- drivers/leds/ledtrig-timer.c | 2 +- include/linux/leds.h | 4 +- include/linux/leds_pwm.h | 21 ++ 18 files changed, 949 insertions(+), 65 deletions(-) create mode 100644 drivers/leds/leds-dac124s085.c create mode 100644 drivers/leds/leds-pwm.c create mode 100644 drivers/leds/leds-rb532.c create mode 100644 drivers/leds/ledtrig-gpio.c create mode 100644 include/linux/leds_pwm.h Merging backlight/for-mm $ git merge backlight/for-mm Merge made by recursive. drivers/video/backlight/Kconfig | 18 +++ drivers/video/backlight/Makefile | 2 + drivers/video/backlight/jornada720_bl.c | 161 +++++++++++++++++++++++++ drivers/video/backlight/jornada720_lcd.c | 153 ++++++++++++++++++++++++ drivers/video/backlight/mbp_nvidia_bl.c | 191 ++++++++++++++++++++++++------ drivers/video/backlight/pwm_bl.c | 4 +- 6 files changed, 491 insertions(+), 38 deletions(-) create mode 100644 drivers/video/backlight/jornada720_bl.c create mode 100644 drivers/video/backlight/jornada720_lcd.c Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging arch/x86/kernel/kgdb.c Merge made by recursive. Documentation/DocBook/kgdb.tmpl | 2 +- arch/x86/kernel/kgdb.c | 3 +- include/linux/kgdb.h | 50 +++++++++++++++++++++++++++++++++----- kernel/kgdb.c | 6 ++-- 4 files changed, 49 insertions(+), 12 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merging include/linux/rcupdate.h Auto-merging init/Kconfig Auto-merging lib/Kconfig.debug Auto-merging mm/Makefile Merge made by recursive. Documentation/vm/slqbinfo.c | 1054 +++++++++++++ include/linux/rcu_types.h | 18 + include/linux/rcupdate.h | 11 +- include/linux/slab.h | 10 +- include/linux/slqb_def.h | 296 ++++ init/Kconfig | 9 +- lib/Kconfig.debug | 20 + mm/Makefile | 1 + mm/slqb.c | 3622 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 5027 insertions(+), 14 deletions(-) create mode 100644 Documentation/vm/slqbinfo.c create mode 100644 include/linux/rcu_types.h create mode 100644 include/linux/slqb_def.h create mode 100644 mm/slqb.c Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Auto-merging drivers/md/md.c Auto-merging fs/compat_ioctl.c Removing include/linux/raid/md.h Merge made by recursive. Documentation/md.txt | 37 +- crypto/xor.c | 2 +- drivers/md/Kconfig | 31 +- drivers/md/Makefile | 16 +- drivers/md/bitmap.c | 49 +- {include/linux/raid => drivers/md}/bitmap.h | 0 drivers/md/faulty.c | 19 +- drivers/md/linear.c | 25 +- {include/linux/raid => drivers/md}/linear.h | 2 - drivers/md/md.c | 615 ++++++++--- include/linux/raid/md_k.h => drivers/md/md.h | 66 +- drivers/md/mktables.c | 14 +- drivers/md/multipath.c | 17 +- {include/linux/raid => drivers/md}/multipath.h | 2 - drivers/md/raid0.c | 66 +- {include/linux/raid => drivers/md}/raid0.h | 2 - drivers/md/raid1.c | 35 +- {include/linux/raid => drivers/md}/raid1.h | 2 - drivers/md/raid10.c | 42 +- {include/linux/raid => drivers/md}/raid10.h | 2 - drivers/md/raid5.c | 1494 +++++++++++++++++------- {include/linux/raid => drivers/md}/raid5.h | 110 ++- drivers/md/raid6algos.c | 21 +- drivers/md/raid6altivec.uc | 4 +- drivers/md/raid6int.uc | 4 +- drivers/md/raid6mmx.c | 4 +- drivers/md/raid6recov.c | 13 +- drivers/md/raid6sse1.c | 4 +- drivers/md/raid6sse2.c | 4 +- drivers/md/raid6test/Makefile | 2 +- drivers/md/raid6test/test.c | 2 +- drivers/md/raid6x86.h | 2 +- fs/compat_ioctl.c | 2 +- include/linux/raid/md.h | 81 -- include/linux/raid/md_u.h | 35 + drivers/md/raid6.h => include/linux/raid/pq.h | 28 +- include/linux/raid/xor.h | 2 - init/do_mounts.h | 1 + init/do_mounts_md.c | 5 +- 39 files changed, 2002 insertions(+), 860 deletions(-) rename {include/linux/raid => drivers/md}/bitmap.h (100%) rename {include/linux/raid => drivers/md}/linear.h (95%) rename include/linux/raid/md_k.h => drivers/md/md.h (83%) rename {include/linux/raid => drivers/md}/multipath.h (96%) rename {include/linux/raid => drivers/md}/raid0.h (96%) rename {include/linux/raid => drivers/md}/raid1.h (99%) rename {include/linux/raid => drivers/md}/raid10.h (99%) rename {include/linux/raid => drivers/md}/raid5.h (81%) delete mode 100644 include/linux/raid/md.h rename drivers/md/raid6.h => include/linux/raid/pq.h (86%) Merging mfd/for-next $ git merge mfd/for-next Auto-merging MAINTAINERS Auto-merging arch/arm/mach-pxa/magician.c Removing include/linux/ds1wm.h Merge made by recursive. MAINTAINERS | 3 +- arch/arm/mach-pxa/magician.c | 1 - drivers/mfd/Kconfig | 1 + drivers/mfd/da903x.c | 2 +- drivers/mfd/htc-pasic3.c | 169 ++++++++++++++++----------------------- drivers/mfd/pcf50633-core.c | 1 - drivers/mfd/t7l66xb.c | 4 +- drivers/mfd/tc6393xb.c | 2 +- drivers/mfd/twl4030-irq.c | 2 +- drivers/mfd/wm8350-core.c | 39 +++++++--- drivers/w1/masters/ds1wm.c | 58 ++++++------- include/linux/ds1wm.h | 12 --- include/linux/mfd/ds1wm.h | 6 ++ include/linux/mfd/htc-pasic3.h | 1 - include/linux/mfd/wm8350/core.h | 2 + 15 files changed, 139 insertions(+), 164 deletions(-) delete mode 100644 include/linux/ds1wm.h create mode 100644 include/linux/mfd/ds1wm.h 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 Auto-merging MAINTAINERS Auto-merging drivers/mmc/core/core.c Merge made by recursive. Documentation/ABI/testing/sysfs-class-regulator | 57 +++- MAINTAINERS | 2 +- drivers/mfd/twl4030-core.c | 2 - drivers/mmc/core/core.c | 100 +++++ drivers/regulator/Kconfig | 13 +- drivers/regulator/Makefile | 1 + drivers/regulator/bq24022.c | 3 +- drivers/regulator/core.c | 386 ++++++++++++++---- drivers/regulator/da903x.c | 3 +- drivers/regulator/fixed.c | 3 +- drivers/regulator/pcf50633-regulator.c | 3 +- drivers/regulator/twl4030-regulator.c | 500 +++++++++++++++++++++++ drivers/regulator/virtual.c | 14 +- drivers/regulator/wm8350-regulator.c | 57 +++- drivers/regulator/wm8400-regulator.c | 36 ++- include/linux/i2c/twl4030.h | 47 +++ include/linux/mmc/host.h | 5 + include/linux/regulator/bq24022.h | 3 + include/linux/regulator/consumer.h | 6 +- include/linux/regulator/driver.h | 81 ++++- include/linux/regulator/fixed.h | 3 + include/linux/regulator/machine.h | 12 +- 22 files changed, 1220 insertions(+), 117 deletions(-) create mode 100644 drivers/regulator/twl4030-regulator.c Merging security-testing/next $ git merge security-testing/next Merge made by recursive. security/selinux/avc.c | 2 +- security/selinux/include/security.h | 4 +++- security/selinux/selinuxfs.c | 4 ++-- security/selinux/ss/services.c | 30 +++++------------------------- 4 files changed, 11 insertions(+), 29 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Resolved 'fs/devpts/inode.c' using previous resolution. Auto-merging arch/x86/kernel/kprobes.c Auto-merging drivers/char/cyclades.c Auto-merging drivers/pci/quirks.c Auto-merging drivers/serial/Kconfig Auto-merging fs/devpts/inode.c CONFLICT (content): Merge conflict in fs/devpts/inode.c Auto-merging include/linux/pci_ids.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d9fc4fd] Merge branch 'quilt/ttydev' $ git diff -M --stat --summary HEAD^.. drivers/char/applicom.c | 1 + drivers/char/cyclades.c | 2 + drivers/char/isicom.c | 1 + drivers/char/moxa.c | 9 +- drivers/char/mxser.c | 1 - drivers/char/rio/rio_linux.c | 2 +- drivers/char/riscom8.c | 2 + drivers/char/specialix.c | 1 + drivers/serial/8250_pci.c | 411 +++++++++++++++++++++++++++++++++++++++ drivers/serial/8250_pnp.c | 7 +- drivers/serial/Kconfig | 4 +- drivers/serial/bfin_5xx.c | 22 ++- drivers/serial/icom.c | 14 +-- drivers/serial/jsm/jsm_driver.c | 9 +- drivers/serial/jsm/jsm_tty.c | 4 +- drivers/serial/ucc_uart.c | 1 + drivers/usb/class/cdc-acm.c | 2 +- include/linux/pci_ids.h | 26 +++ include/linux/serial_core.h | 2 +- 19 files changed, 484 insertions(+), 37 deletions(-) Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging generic-ipi/auto-generic-ipi-next $ git merge generic-ipi/auto-generic-ipi-next Already up-to-date. Merging oprofile/auto-oprofile-next $ git merge oprofile/auto-oprofile-next Already uptodate! Merge made by recursive. 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 Already uptodate! Merge made by recursive. Merging iommu/auto-iommu-next $ git merge iommu/auto-iommu-next Already up-to-date. Merging uwb/for-upstream $ git merge uwb/for-upstream Already up-to-date. Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/i6300esb.c | 155 ++++++++++++++++++++-------------------- drivers/watchdog/orion5x_wdt.c | 57 +++++++++++---- 2 files changed, 119 insertions(+), 93 deletions(-) Merging proc/proc $ git merge proc/proc Auto-merging fs/proc/base.c Auto-merging kernel/exit.c Merge made by recursive. fs/proc/Makefile | 1 + fs/proc/automount.c | 28 +++++ fs/proc/base.c | 26 +++--- fs/proc/generic.c | 47 +++++---- fs/proc/inode.c | 2 +- fs/proc/internal.h | 15 +++- fs/proc/proc_net.c | 236 ++++++++++++++++++++++++++++++++---------- include/linux/magic.h | 1 + include/linux/proc_fs.h | 10 +- include/net/net_namespace.h | 1 + kernel/exit.c | 2 +- security/selinux/hooks.c | 29 ++++- 12 files changed, 295 insertions(+), 103 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 Resolved 'arch/x86/Kconfig' using previous resolution. Resolved 'drivers/pci/intel-iommu.c' using previous resolution. Auto-merging arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/x86/Kconfig Auto-merging arch/x86/kernel/amd_iommu.c Auto-merging drivers/base/iommu.c Auto-merging drivers/pci/intel-iommu.c CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c Auto-merging include/linux/intel-iommu.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c6f0fb0] Merge commit 'dwmw2-iommu/master' $ git diff -M --stat --summary HEAD^.. arch/x86/Kconfig | 2 +- arch/x86/kernel/amd_iommu.c | 7 +++ drivers/base/iommu.c | 7 +++ drivers/pci/intel-iommu.c | 115 ++++++++++++++++++++++++++++++++++------- include/linux/dma_remapping.h | 1 + include/linux/intel-iommu.h | 2 +- include/linux/iommu.h | 13 +++++ 7 files changed, 126 insertions(+), 21 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Auto-merging fs/Kconfig Auto-merging fs/Makefile Merge made by recursive. Documentation/filesystems/exofs.txt | 176 +++++ fs/Kconfig | 2 + fs/Makefile | 1 + fs/exofs/BUGS | 3 + fs/exofs/Kbuild | 16 + fs/exofs/Kconfig | 13 + fs/exofs/common.h | 184 +++++ fs/exofs/dir.c | 672 ++++++++++++++++++ fs/exofs/exofs.h | 180 +++++ fs/exofs/file.c | 87 +++ fs/exofs/inode.c | 1303 +++++++++++++++++++++++++++++++++++ fs/exofs/namei.c | 342 +++++++++ fs/exofs/osd.c | 153 ++++ fs/exofs/super.c | 584 ++++++++++++++++ fs/exofs/symlink.c | 57 ++ 15 files changed, 3773 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/exofs.txt create mode 100644 fs/exofs/BUGS create mode 100644 fs/exofs/Kbuild create mode 100644 fs/exofs/Kconfig create mode 100644 fs/exofs/common.h create mode 100644 fs/exofs/dir.c create mode 100644 fs/exofs/exofs.h create mode 100644 fs/exofs/file.c create mode 100644 fs/exofs/inode.c create mode 100644 fs/exofs/namei.c create mode 100644 fs/exofs/osd.c create mode 100644 fs/exofs/super.c create mode 100644 fs/exofs/symlink.c Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Merge made by recursive. fs/fuse/dir.c | 1 + fs/fuse/file.c | 54 +++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 42 insertions(+), 13 deletions(-) Merging jc_docs/docs-next $ git merge jc_docs/docs-next Merge made by recursive. Documentation/SubmittingPatches | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging fs/compat.c Merge made by recursive. fs/compat.c | 2 +- fs/ext2/ext2.h | 2 +- fs/inode.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging omap/for-next $ git merge omap/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Already up-to-date. Merging kmemleak/kmemleak $ git merge kmemleak/kmemleak Resolved 'Documentation/kernel-parameters.txt' using previous resolution. Resolved 'MAINTAINERS' using previous resolution. Resolved 'init/main.c' using previous resolution. Resolved 'lib/Kconfig.debug' using previous resolution. Resolved 'mm/slob.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging fs/block_dev.c Auto-merging include/linux/slab.h Auto-merging init/main.c CONFLICT (content): Merge conflict in init/main.c Auto-merging kernel/module.c Auto-merging lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merging mm/Makefile Auto-merging mm/page_alloc.c Auto-merging mm/slab.c Auto-merging mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merging mm/slub.c Auto-merging mm/vmalloc.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2948538] Merge commit 'kmemleak/kmemleak' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 4 + Documentation/kmemleak.txt | 142 ++++ MAINTAINERS | 6 + arch/arm/kernel/vmlinux.lds.S | 2 + arch/x86/kernel/vmlinux_32.lds.S | 1 + arch/x86/kernel/vmlinux_64.lds.S | 1 + drivers/char/vt.c | 7 + fs/block_dev.c | 6 + include/linux/kmemleak.h | 96 +++ include/linux/percpu.h | 5 + include/linux/slab.h | 2 + init/main.c | 4 +- kernel/module.c | 56 ++ lib/Kconfig.debug | 33 + mm/Makefile | 2 + mm/kmemleak-test.c | 111 +++ mm/kmemleak.c | 1498 +++++++++++++++++++++++++++++++++++ mm/page_alloc.c | 11 + mm/slab.c | 32 +- mm/slob.c | 7 + mm/slub.c | 5 +- mm/vmalloc.c | 30 +- 22 files changed, 2054 insertions(+), 7 deletions(-) create mode 100644 Documentation/kmemleak.txt create mode 100644 include/linux/kmemleak.h create mode 100644 mm/kmemleak-test.c create mode 100644 mm/kmemleak.c Merging suspend/linux-next $ git merge suspend/linux-next Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Recorded preimage for 'drivers/mtd/maps/pxa2xx-flash.c' Resolved 'drivers/media/video/v4l2-device.c' using previous resolution. Resolved 'drivers/net/wimax/i2400m/usb-notif.c' using previous resolution. Resolved 'drivers/sh/maple/maple.c' using previous resolution. Resolved 'drivers/spi/spi_mpc83xx.c' using previous resolution. Resolved 'fs/sysfs/bin.c' using previous resolution. Resolved 'lib/Kconfig.debug' using previous resolution. Resolved 'lib/Makefile' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging drivers/base/power/main.c Auto-merging drivers/base/sys.c Auto-merging drivers/char/vt.c Auto-merging drivers/dma/dw_dmac.c Auto-merging drivers/gpu/drm/drm_sysfs.c Auto-merging drivers/i2c/i2c-core.c Auto-merging drivers/ide/au1xxx-ide.c Auto-merging drivers/media/video/v4l2-device.c CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c Auto-merging drivers/mmc/host/atmel-mci.c Auto-merging drivers/mtd/maps/pxa2xx-flash.c CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c Auto-merging drivers/net/au1000_eth.c Auto-merging drivers/net/bmac.c Auto-merging drivers/net/cpmac.c Auto-merging drivers/net/depca.c Auto-merging drivers/net/ehea/ehea_main.c Auto-merging drivers/net/macb.c Auto-merging drivers/net/mv643xx_eth.c Auto-merging drivers/net/sb1250-mac.c Auto-merging drivers/net/smc91x.c Auto-merging drivers/net/smsc911x.c Auto-merging drivers/net/smsc9420.c Auto-merging drivers/net/tc35815.c Auto-merging drivers/net/wimax/i2400m/driver.c Auto-merging drivers/net/wimax/i2400m/usb-notif.c CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c Auto-merging drivers/s390/cio/ccwgroup.c Auto-merging drivers/s390/cio/css.c Auto-merging drivers/s390/cio/device.c Auto-merging drivers/s390/net/qeth_l3_main.c Auto-merging drivers/sh/maple/maple.c CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c Auto-merging drivers/spi/omap2_mcspi.c Auto-merging drivers/spi/omap_uwire.c Auto-merging drivers/spi/pxa2xx_spi.c Auto-merging drivers/spi/spi_mpc83xx.c CONFLICT (content): Merge conflict in drivers/spi/spi_mpc83xx.c Auto-merging drivers/usb/gadget/ci13xxx_udc.c Auto-merging drivers/usb/gadget/imx_udc.c Auto-merging drivers/video/sh_mobile_lcdcfb.c Auto-merging fs/partitions/check.c Auto-merging fs/sysfs/bin.c CONFLICT (content): Merge conflict in fs/sysfs/bin.c Auto-merging fs/sysfs/dir.c Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging include/linux/kernel.h Auto-merging init/main.c Auto-merging kernel/module.c Auto-merging lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merging lib/Makefile CONFLICT (content): Merge conflict in lib/Makefile Auto-merging lib/kobject.c Auto-merging lib/kobject_uevent.c Auto-merging net/bluetooth/rfcomm/tty.c Auto-merging net/netfilter/nf_conntrack_pptp.c Auto-merging scripts/Makefile.lib Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/mtd/maps/pxa2xx-flash.c'. [master ef85bcf] Merge branch 'quilt/driver-core' $ git diff -M --stat --summary HEAD^.. include/linux/init.h | 1 + init/main.c | 9 +++++++++ lib/kobject.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 0 deletions(-) Merging quilt/usb $ git merge quilt/usb Renaming arch/arm/mach-s3c2410/include/mach/usb-control.h->arch/arm/plat-s3c/include/plat/usb-control.h Auto-merging arch/arm/plat-s3c/include/plat/usb-control.h CONFLICT (rename/delete): Rename drivers/usb/misc/phidget.h->arch/arm/mach-gemini/include/mach/vmalloc.h in HEAD and deleted in quilt/usb Renaming drivers/usb/serial/cp2101.c->drivers/usb/serial/cp210x.c Auto-merging drivers/usb/serial/cp210x.c Renaming drivers/usb/storage/cypress_atacb.h->drivers/usb/storage/unusual_freecom.h Auto-merging drivers/usb/storage/unusual_freecom.h Renaming drivers/usb/storage/freecom.h->drivers/usb/storage/unusual_alauda.h Auto-merging drivers/usb/storage/unusual_alauda.h Renaming drivers/usb/storage/isd200.h->drivers/usb/storage/unusual_karma.h Auto-merging drivers/usb/storage/unusual_karma.h Renaming drivers/usb/storage/sddr55.h->drivers/usb/storage/unusual_onetouch.h Auto-merging drivers/usb/storage/unusual_onetouch.h Auto-merging drivers/usb/gadget/atmel_usba_udc.c Auto-merging drivers/usb/gadget/file_storage.c Auto-merging drivers/usb/gadget/gmidi.c Auto-merging drivers/usb/host/ohci-hcd.c Auto-merging drivers/usb/serial/usb-serial.c Auto-merging drivers/usb/storage/isd200.c Auto-merging drivers/usb/storage/transport.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 0c121f0] Merge branch 'quilt/usb' $ git diff -M --stat --summary HEAD^.. Merging quilt/staging $ git merge quilt/staging Removing drivers/staging/epl/EdrvFec5282.h Removing drivers/staging/epl/EplObjDef.h Removing drivers/staging/epl/EplTimeruNull.c Removing drivers/staging/epl/EplTimeruWin32.c Removing drivers/staging/epl/ShbIpc-Win32.c Removing drivers/staging/epl/kernel/EplNmtkCal.h Removing drivers/staging/epl/kernel/EplObdkCal.h Removing drivers/staging/frontier/frontier_compat.h Removing drivers/staging/frontier/surface_sysfs.h Removing drivers/staging/slicoss/gbdownload.h Removing drivers/staging/slicoss/gbrcvucode.h Removing drivers/staging/slicoss/oasisdbgdownload.h Removing drivers/staging/slicoss/oasisdownload.h Removing drivers/staging/slicoss/oasisrcvucode.h Removing drivers/staging/slicoss/slic_os.h Removing drivers/staging/slicoss/slicbuild.h Removing drivers/staging/slicoss/slicdbg.h Removing drivers/staging/slicoss/slicdump.h Removing drivers/staging/slicoss/slicinc.h Removing drivers/staging/sxg/saharadbgdownload.h Removing drivers/staging/sxg/sxgphycode.h Removing drivers/staging/winbond/bss_f.h Removing drivers/staging/winbond/bssdscpt.h Removing drivers/staging/winbond/common.h Removing drivers/staging/winbond/ds_tkip.h Removing drivers/staging/winbond/gl_80211.h Removing drivers/staging/winbond/ioctls.h Removing drivers/staging/winbond/mlme_mib.h Removing drivers/staging/winbond/mto_f.h Removing drivers/staging/winbond/os_common.h Removing drivers/staging/winbond/sme_s.h Removing drivers/staging/winbond/wb35_ver.h Removing drivers/staging/wlan-ng/p80211metamib.h Removing drivers/staging/wlan-ng/p80211metamsg.h Removing drivers/staging/wlan-ng/wlan_compat.h Auto-merging firmware/Makefile Auto-merging firmware/WHENCE Auto-merging include/linux/connector.h Auto-merging mm/filemap.c Merge made by recursive. .../filesystems/pohmelfs/design_notes.txt | 70 + Documentation/filesystems/pohmelfs/info.txt | 86 + .../filesystems/pohmelfs/network_protocol.txt | 227 + drivers/staging/Kconfig | 22 + drivers/staging/Makefile | 11 + drivers/staging/agnx/agnx.h | 14 +- drivers/staging/agnx/debug.h | 21 +- drivers/staging/agnx/pci.c | 75 +- drivers/staging/agnx/phy.c | 32 +- drivers/staging/agnx/rf.c | 23 +- drivers/staging/agnx/sta.c | 21 +- drivers/staging/agnx/sta.h | 2 +- drivers/staging/agnx/table.c | 12 +- drivers/staging/agnx/xmit.c | 216 +- drivers/staging/altpciechdma/altpciechdma.c | 80 +- drivers/staging/android/binder.c | 18 +- drivers/staging/android/ram_console.c | 8 +- drivers/staging/asus_oled/asus_oled.c | 149 +- drivers/staging/at76_usb/TODO | 9 +- drivers/staging/at76_usb/at76_usb.c | 21 +- drivers/staging/at76_usb/at76_usb.h | 87 + drivers/staging/b3dfg/Kconfig | 9 + drivers/staging/b3dfg/Makefile | 1 + drivers/staging/b3dfg/TODO | 4 + drivers/staging/b3dfg/b3dfg.c | 1119 +++ drivers/staging/comedi/Kconfig | 14 + drivers/staging/comedi/comedi.h | 83 +- drivers/staging/comedi/comedi_compat32.c | 128 +- drivers/staging/comedi/comedi_fops.c | 293 +- drivers/staging/comedi/comedi_fops.h | 1 + drivers/staging/comedi/comedi_ksyms.c | 12 +- drivers/staging/comedi/comedi_rt.h | 9 +- drivers/staging/comedi/comedidev.h | 202 +- drivers/staging/comedi/comedilib.h | 114 +- drivers/staging/comedi/drivers.c | 187 +- drivers/staging/comedi/drivers/8253.h | 420 + drivers/staging/comedi/drivers/8255.c | 442 + drivers/staging/comedi/drivers/8255.h | 57 + drivers/staging/comedi/drivers/Makefile | 113 +- drivers/staging/comedi/drivers/acl7225b.c | 149 + .../comedi/drivers/addi-data/APCI1710_82x54.c | 1047 +++ .../comedi/drivers/addi-data/APCI1710_82x54.h | 73 + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2032 +++++ .../comedi/drivers/addi-data/APCI1710_Chrono.h | 74 + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 1020 +++ .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 46 + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 5363 ++++++++++++ .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 271 + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 861 ++ .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 47 + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 3588 ++++++++ .../comedi/drivers/addi-data/APCI1710_Pwm.h | 76 + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 848 ++ .../comedi/drivers/addi-data/APCI1710_Ssi.h | 43 + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2049 +++++ .../comedi/drivers/addi-data/APCI1710_Tor.h | 57 + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 1038 +++ .../comedi/drivers/addi-data/APCI1710_Ttl.h | 44 + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 203 + .../comedi/drivers/addi-data/addi_amcc_S5920.h | 27 + .../comedi/drivers/addi-data/addi_amcc_s5933.h | 476 + .../staging/comedi/drivers/addi-data/addi_common.c | 3062 +++++++ .../staging/comedi/drivers/addi-data/addi_common.h | 462 + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1158 +++ .../comedi/drivers/addi-data/amcc_s5933_58.h | 457 + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 1265 +++ .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 71 + .../comedi/drivers/addi-data/hwdrv_apci035.c | 600 ++ .../comedi/drivers/addi-data/hwdrv_apci035.h | 123 + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 285 + .../comedi/drivers/addi-data/hwdrv_apci1032.h | 63 + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 3045 +++++++ .../comedi/drivers/addi-data/hwdrv_apci1500.h | 165 + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 542 ++ .../comedi/drivers/addi-data/hwdrv_apci1516.h | 64 + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 1105 +++ .../comedi/drivers/addi-data/hwdrv_apci1564.h | 119 + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 780 ++ .../comedi/drivers/addi-data/hwdrv_apci16xx.h | 94 + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 460 + .../comedi/drivers/addi-data/hwdrv_apci2016.h | 70 + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 579 ++ .../comedi/drivers/addi-data/hwdrv_apci2032.h | 81 + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 549 ++ .../comedi/drivers/addi-data/hwdrv_apci2200.h | 61 + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 2697 ++++++ .../comedi/drivers/addi-data/hwdrv_apci3120.h | 241 + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 3642 ++++++++ .../comedi/drivers/addi-data/hwdrv_apci3200.h | 187 + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 742 ++ .../comedi/drivers/addi-data/hwdrv_apci3501.h | 94 + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 1691 ++++ .../comedi/drivers/addi-data/hwdrv_apci3xxx.h | 62 + drivers/staging/comedi/drivers/addi_apci_035.c | 5 + drivers/staging/comedi/drivers/addi_apci_1032.c | 3 + drivers/staging/comedi/drivers/addi_apci_1500.c | 3 + drivers/staging/comedi/drivers/addi_apci_1516.c | 3 + drivers/staging/comedi/drivers/addi_apci_1564.c | 3 + drivers/staging/comedi/drivers/addi_apci_16xx.c | 3 + drivers/staging/comedi/drivers/addi_apci_1710.c | 3 + drivers/staging/comedi/drivers/addi_apci_2016.c | 3 + drivers/staging/comedi/drivers/addi_apci_2032.c | 3 + drivers/staging/comedi/drivers/addi_apci_2200.c | 3 + drivers/staging/comedi/drivers/addi_apci_3001.c | 3 + drivers/staging/comedi/drivers/addi_apci_3120.c | 3 + drivers/staging/comedi/drivers/addi_apci_3200.c | 3 + drivers/staging/comedi/drivers/addi_apci_3300.c | 3 + drivers/staging/comedi/drivers/addi_apci_3501.c | 3 + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 3 + drivers/staging/comedi/drivers/addi_apci_all.c | 18 + drivers/staging/comedi/drivers/adl_pci6208.c | 391 + drivers/staging/comedi/drivers/adl_pci7296.c | 174 + drivers/staging/comedi/drivers/adl_pci7432.c | 202 + drivers/staging/comedi/drivers/adl_pci8164.c | 512 ++ drivers/staging/comedi/drivers/adl_pci9111.c | 1391 +++ drivers/staging/comedi/drivers/adl_pci9118.c | 2100 +++++ drivers/staging/comedi/drivers/adq12b.c | 394 + drivers/staging/comedi/drivers/adv_pci1710.c | 1568 ++++ drivers/staging/comedi/drivers/adv_pci1723.c | 465 + drivers/staging/comedi/drivers/adv_pci_dio.c | 1077 +++ drivers/staging/comedi/drivers/aio_aio12_8.c | 226 + drivers/staging/comedi/drivers/aio_iiro_16.c | 177 + drivers/staging/comedi/drivers/am9513.h | 79 + drivers/staging/comedi/drivers/amcc_s5933.h | 172 + drivers/staging/comedi/drivers/amplc_dio200.c | 1483 ++++ drivers/staging/comedi/drivers/amplc_pc236.c | 654 ++ drivers/staging/comedi/drivers/amplc_pc263.c | 431 + drivers/staging/comedi/drivers/amplc_pci224.c | 1545 ++++ drivers/staging/comedi/drivers/amplc_pci230.c | 2977 +++++++ drivers/staging/comedi/drivers/c6xdigio.c | 517 ++ drivers/staging/comedi/drivers/cb_das16_cs.c | 976 +++ drivers/staging/comedi/drivers/cb_pcidas.c | 1831 ++++ drivers/staging/comedi/drivers/cb_pcidas64.c | 4222 +++++++++ drivers/staging/comedi/drivers/cb_pcidda.c | 841 ++ drivers/staging/comedi/drivers/cb_pcidio.c | 294 + drivers/staging/comedi/drivers/cb_pcimdas.c | 484 ++ drivers/staging/comedi/drivers/cb_pcimdda.c | 474 + drivers/staging/comedi/drivers/comedi_bond.c | 56 +- drivers/staging/comedi/drivers/comedi_fc.c | 14 +- drivers/staging/comedi/drivers/comedi_fc.h | 18 +- drivers/staging/comedi/drivers/comedi_parport.c | 44 +- drivers/staging/comedi/drivers/comedi_rt_timer.c | 728 ++ drivers/staging/comedi/drivers/comedi_test.c | 80 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 230 + drivers/staging/comedi/drivers/daqboard2000.c | 877 ++ drivers/staging/comedi/drivers/das08.c | 1068 +++ drivers/staging/comedi/drivers/das08.h | 78 + drivers/staging/comedi/drivers/das08_cs.c | 488 ++ drivers/staging/comedi/drivers/das16.c | 1730 ++++ drivers/staging/comedi/drivers/das16m1.c | 765 ++ drivers/staging/comedi/drivers/das1800.c | 1758 ++++ drivers/staging/comedi/drivers/das6402.c | 354 + drivers/staging/comedi/drivers/das800.c | 894 ++ drivers/staging/comedi/drivers/dmm32at.c | 1081 +++ drivers/staging/comedi/drivers/dt2801.c | 697 ++ drivers/staging/comedi/drivers/dt2811.c | 604 ++ drivers/staging/comedi/drivers/dt2814.c | 383 + drivers/staging/comedi/drivers/dt2815.c | 264 + drivers/staging/comedi/drivers/dt2817.c | 178 + drivers/staging/comedi/drivers/dt282x.c | 1471 ++++ drivers/staging/comedi/drivers/dt3000.c | 983 +++ drivers/staging/comedi/drivers/dt9812.c | 40 +- drivers/staging/comedi/drivers/fl512.c | 186 + drivers/staging/comedi/drivers/gsc_hpdi.c | 1060 +++ drivers/staging/comedi/drivers/icp_multi.c | 392 +- drivers/staging/comedi/drivers/icp_multi.h | 19 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 612 ++ drivers/staging/comedi/drivers/jr3_pci.c | 976 +++ drivers/staging/comedi/drivers/jr3_pci.h | 681 ++ drivers/staging/comedi/drivers/ke_counter.c | 254 + drivers/staging/comedi/drivers/me4000.c | 296 +- drivers/staging/comedi/drivers/me4000.h | 268 +- drivers/staging/comedi/drivers/me_daq.c | 55 +- drivers/staging/comedi/drivers/mite.c | 63 +- drivers/staging/comedi/drivers/mite.h | 68 +- drivers/staging/comedi/drivers/mpc624.c | 386 + drivers/staging/comedi/drivers/mpc8260cpm.c | 169 + drivers/staging/comedi/drivers/multiq3.c | 333 + drivers/staging/comedi/drivers/ni_6527.c | 489 ++ drivers/staging/comedi/drivers/ni_65xx.c | 809 ++ drivers/staging/comedi/drivers/ni_660x.c | 1324 +++ drivers/staging/comedi/drivers/ni_670x.c | 337 + drivers/staging/comedi/drivers/ni_at_a2150.c | 909 ++ drivers/staging/comedi/drivers/ni_at_ao.c | 454 + drivers/staging/comedi/drivers/ni_atmio.c | 513 ++ drivers/staging/comedi/drivers/ni_atmio16d.c | 860 ++ drivers/staging/comedi/drivers/ni_daq_700.c | 841 ++ drivers/staging/comedi/drivers/ni_daq_dio24.c | 598 ++ drivers/staging/comedi/drivers/ni_labpc.c | 2005 +++++ drivers/staging/comedi/drivers/ni_labpc.h | 85 + drivers/staging/comedi/drivers/ni_labpc_cs.c | 573 ++ drivers/staging/comedi/drivers/ni_mio_common.c | 5862 +++++++++++++ drivers/staging/comedi/drivers/ni_mio_cs.c | 551 ++ drivers/staging/comedi/drivers/ni_pcidio.c | 1302 +++ drivers/staging/comedi/drivers/ni_pcimio.c | 1788 ++++ drivers/staging/comedi/drivers/ni_stc.h | 1498 ++++ drivers/staging/comedi/drivers/ni_tio.c | 1691 ++++ drivers/staging/comedi/drivers/ni_tio.h | 163 + drivers/staging/comedi/drivers/ni_tio_internal.h | 774 ++ drivers/staging/comedi/drivers/ni_tiocmd.c | 523 ++ drivers/staging/comedi/drivers/pcl711.c | 623 ++ drivers/staging/comedi/drivers/pcl724.c | 222 + drivers/staging/comedi/drivers/pcl725.c | 111 + drivers/staging/comedi/drivers/pcl726.c | 377 + drivers/staging/comedi/drivers/pcl730.c | 168 + drivers/staging/comedi/drivers/pcl812.c | 1605 ++++ drivers/staging/comedi/drivers/pcl816.c | 1251 +++ drivers/staging/comedi/drivers/pcl818.c | 1988 +++++ drivers/staging/comedi/drivers/pcm3724.c | 307 + drivers/staging/comedi/drivers/pcm3730.c | 152 + drivers/staging/comedi/drivers/pcmad.c | 173 + drivers/staging/comedi/drivers/pcmda12.c | 306 + drivers/staging/comedi/drivers/pcmmio.c | 1333 +++ drivers/staging/comedi/drivers/pcmuio.c | 1101 +++ drivers/staging/comedi/drivers/plx9052.h | 86 + drivers/staging/comedi/drivers/plx9080.h | 80 +- drivers/staging/comedi/drivers/poc.c | 247 + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1363 +++ drivers/staging/comedi/drivers/rtd520.c | 277 +- drivers/staging/comedi/drivers/rtd520.h | 676 +- drivers/staging/comedi/drivers/rti800.c | 458 + drivers/staging/comedi/drivers/rti802.c | 151 + drivers/staging/comedi/drivers/s526.c | 977 +++ drivers/staging/comedi/drivers/s626.c | 2538 +++--- drivers/staging/comedi/drivers/s626.h | 1226 ++-- drivers/staging/comedi/drivers/serial2002.c | 870 ++ drivers/staging/comedi/drivers/skel.c | 624 ++ drivers/staging/comedi/drivers/ssv_dnp.c | 311 + drivers/staging/comedi/drivers/unioxx5.c | 515 ++ drivers/staging/comedi/drivers/usbdux.c | 304 +- drivers/staging/comedi/drivers/usbduxfast.c | 2028 +++-- drivers/staging/comedi/interrupt.h | 9 - drivers/staging/comedi/kcomedilib/data.c | 22 +- drivers/staging/comedi/kcomedilib/dio.c | 18 +- drivers/staging/comedi/kcomedilib/get.c | 132 +- .../staging/comedi/kcomedilib/kcomedilib_main.c | 138 +- drivers/staging/comedi/kcomedilib/ksyms.c | 4 - drivers/staging/comedi/pci_ids.h | 2 +- drivers/staging/comedi/proc.c | 17 +- drivers/staging/comedi/range.c | 35 +- drivers/staging/comedi/rt.c | 29 +- drivers/staging/comedi/rt_pend_tq.c | 8 +- drivers/staging/dst/Kconfig | 67 + drivers/staging/dst/Makefile | 3 + drivers/staging/dst/crypto.c | 731 ++ drivers/staging/dst/dcore.c | 995 +++ drivers/staging/dst/export.c | 657 ++ drivers/staging/dst/state.c | 839 ++ drivers/staging/dst/thread_pool.c | 345 + drivers/staging/dst/trans.c | 335 + drivers/staging/echo/bit_operations.h | 30 +- drivers/staging/echo/echo.c | 42 +- drivers/staging/echo/echo.h | 2 - drivers/staging/echo/fir.h | 28 +- drivers/staging/echo/mmx.h | 408 +- drivers/staging/epl/Benchmark.h | 12 - drivers/staging/epl/Debug.h | 48 +- drivers/staging/epl/Edrv8139.c | 108 +- drivers/staging/epl/EdrvFec.h | 6 +- drivers/staging/epl/EdrvFec5282.h | 340 - drivers/staging/epl/EdrvSim.h | 4 +- drivers/staging/epl/Epl.h | 139 +- drivers/staging/epl/EplAmi.h | 121 +- drivers/staging/epl/EplApiGeneric.c | 188 +- drivers/staging/epl/EplApiLinuxKernel.c | 105 +- drivers/staging/epl/EplApiProcessImage.c | 31 +- drivers/staging/epl/EplDll.h | 50 +- drivers/staging/epl/EplDllCal.h | 2 +- drivers/staging/epl/EplDllk.c | 134 +- drivers/staging/epl/EplDllkCal.c | 14 +- drivers/staging/epl/EplDlluCal.c | 6 +- drivers/staging/epl/EplErrorHandlerk.c | 36 +- drivers/staging/epl/EplEvent.h | 8 +- drivers/staging/epl/EplEventk.c | 24 +- drivers/staging/epl/EplEventu.c | 25 +- drivers/staging/epl/EplFrame.h | 166 +- drivers/staging/epl/EplIdentu.c | 26 +- drivers/staging/epl/EplInc.h | 23 +- drivers/staging/epl/EplInstDef.h | 60 +- drivers/staging/epl/EplNmt.h | 2 +- drivers/staging/epl/EplNmtCnu.c | 39 +- drivers/staging/epl/EplNmtMnu.c | 121 +- drivers/staging/epl/EplNmtk.c | 30 +- drivers/staging/epl/EplNmtkCal.c | 2 - drivers/staging/epl/EplNmtu.c | 22 +- drivers/staging/epl/EplNmtuCal.c | 2 +- drivers/staging/epl/EplObd.c | 444 +- drivers/staging/epl/EplObd.h | 58 +- drivers/staging/epl/EplObdMacro.h | 40 +- drivers/staging/epl/EplObdkCal.c | 1 - drivers/staging/epl/EplObdu.c | 69 +- drivers/staging/epl/EplObduCal.c | 75 +- drivers/staging/epl/EplObjDef.h | 208 - drivers/staging/epl/EplPdo.h | 6 +- drivers/staging/epl/EplPdok.c | 73 +- drivers/staging/epl/EplPdou.c | 34 +- drivers/staging/epl/EplSdo.h | 24 +- drivers/staging/epl/EplSdoAsndu.c | 26 +- drivers/staging/epl/EplSdoAsySequ.c | 72 +- drivers/staging/epl/EplSdoComu.c | 153 +- drivers/staging/epl/EplSdoUdpu.c | 163 +- drivers/staging/epl/EplStatusu.c | 19 +- drivers/staging/epl/EplTarget.h | 109 +- drivers/staging/epl/EplTimer.h | 3 +- drivers/staging/epl/EplTimeruLinuxKernel.c | 26 +- drivers/staging/epl/EplTimeruNull.c | 312 - drivers/staging/epl/EplTimeruWin32.c | 513 -- drivers/staging/epl/SharedBuff.c | 111 +- drivers/staging/epl/SharedBuff.h | 17 - drivers/staging/epl/ShbIpc-LinuxKernel.c | 48 +- drivers/staging/epl/ShbIpc-Win32.c | 1202 --- drivers/staging/epl/ShbIpc.h | 26 - drivers/staging/epl/TimerHighReskX86.c | 34 +- drivers/staging/epl/VirtualEthernetLinux.c | 5 +- drivers/staging/epl/amix86.c | 316 +- drivers/staging/epl/demo_main.c | 84 +- drivers/staging/epl/edrv.h | 22 +- drivers/staging/epl/global.h | 1253 +--- drivers/staging/epl/kernel/EplDllk.h | 24 +- drivers/staging/epl/kernel/EplDllkCal.h | 14 +- drivers/staging/epl/kernel/EplErrorHandlerk.h | 20 +- drivers/staging/epl/kernel/EplEventk.h | 28 +- drivers/staging/epl/kernel/EplNmtk.h | 25 +- drivers/staging/epl/kernel/EplNmtkCal.h | 89 - drivers/staging/epl/kernel/EplObdk.h | 122 +- drivers/staging/epl/kernel/EplObdkCal.h | 89 - drivers/staging/epl/kernel/EplPdok.h | 12 - drivers/staging/epl/kernel/EplPdokCal.h | 13 - drivers/staging/epl/kernel/EplTimerHighResk.h | 43 +- drivers/staging/epl/kernel/EplTimerk.h | 36 +- drivers/staging/epl/kernel/VirtualEthernet.h | 16 +- drivers/staging/epl/proc_fs.c | 23 +- drivers/staging/epl/user/EplCfgMau.h | 80 +- drivers/staging/epl/user/EplDllu.h | 14 +- drivers/staging/epl/user/EplDlluCal.h | 15 +- drivers/staging/epl/user/EplEventu.h | 28 +- drivers/staging/epl/user/EplIdentu.h | 34 +- drivers/staging/epl/user/EplLedu.h | 32 +- drivers/staging/epl/user/EplNmtCnu.h | 32 +- drivers/staging/epl/user/EplNmtMnu.h | 42 +- drivers/staging/epl/user/EplNmtu.h | 38 +- drivers/staging/epl/user/EplNmtuCal.h | 17 +- drivers/staging/epl/user/EplObdu.h | 83 +- drivers/staging/epl/user/EplObduCal.h | 94 +- drivers/staging/epl/user/EplPdou.h | 22 +- drivers/staging/epl/user/EplSdoAsndu.h | 33 +- drivers/staging/epl/user/EplSdoAsySequ.h | 41 +- drivers/staging/epl/user/EplSdoComu.h | 48 +- drivers/staging/epl/user/EplSdoUdpu.h | 34 +- drivers/staging/epl/user/EplStatusu.h | 32 +- drivers/staging/epl/user/EplTimeru.h | 38 +- drivers/staging/et131x/et1310_rx.c | 3 +- drivers/staging/frontier/README | 53 +- drivers/staging/frontier/alphatrack.c | 383 +- drivers/staging/frontier/alphatrack.h | 80 +- drivers/staging/frontier/frontier_compat.h | 63 - drivers/staging/frontier/surface_sysfs.h | 100 - drivers/staging/frontier/tranzport.c | 685 +- drivers/staging/go7007/go7007-v4l2.c | 1 - drivers/staging/go7007/s2250-board.c | 7 +- drivers/staging/heci/Kconfig | 6 + drivers/staging/heci/Makefile | 9 + drivers/staging/heci/TODO | 6 + drivers/staging/heci/heci.h | 176 + drivers/staging/heci/heci_data_structures.h | 530 ++ drivers/staging/heci/heci_init.c | 1077 +++ drivers/staging/heci/heci_interface.c | 485 ++ drivers/staging/heci/heci_interface.h | 170 + drivers/staging/heci/heci_main.c | 1564 ++++ drivers/staging/heci/heci_version.h | 54 + drivers/staging/heci/interrupt.c | 1553 ++++ drivers/staging/heci/io_heci.c | 847 ++ drivers/staging/line6/Kconfig | 21 + drivers/staging/line6/Makefile | 15 + drivers/staging/line6/audio.c | 72 + drivers/staging/line6/audio.h | 24 + drivers/staging/line6/capture.c | 372 + drivers/staging/line6/capture.h | 32 + drivers/staging/line6/config.h | 48 + drivers/staging/line6/control.c | 840 ++ drivers/staging/line6/control.h | 187 + drivers/staging/line6/driver.c | 1102 +++ drivers/staging/line6/driver.h | 204 + drivers/staging/line6/dumprequest.c | 151 + drivers/staging/line6/dumprequest.h | 90 + drivers/staging/line6/midi.c | 422 + drivers/staging/line6/midi.h | 87 + drivers/staging/line6/midibuf.c | 262 + drivers/staging/line6/midibuf.h | 39 + drivers/staging/line6/pcm.c | 301 + drivers/staging/line6/pcm.h | 222 + drivers/staging/line6/playback.c | 427 + drivers/staging/line6/playback.h | 30 + drivers/staging/line6/pod.c | 1151 +++ drivers/staging/line6/pod.h | 204 + drivers/staging/line6/revision.h | 4 + drivers/staging/line6/toneport.c | 241 + drivers/staging/line6/toneport.h | 45 + drivers/staging/line6/usbdefs.h | 74 + drivers/staging/line6/variax.c | 546 ++ drivers/staging/line6/variax.h | 108 + drivers/staging/me4000/me4000.c | 193 +- drivers/staging/meilhaus/me0600_device.c | 4 +- drivers/staging/meilhaus/me0600_dio.c | 18 +- drivers/staging/meilhaus/me0600_ext_irq.c | 8 +- drivers/staging/meilhaus/me0600_optoi.c | 14 +- drivers/staging/meilhaus/me0600_relay.c | 14 +- drivers/staging/meilhaus/me0600_ttli.c | 12 +- drivers/staging/meilhaus/me0900_device.c | 4 +- drivers/staging/meilhaus/me0900_di.c | 12 +- drivers/staging/meilhaus/me0900_do.c | 14 +- drivers/staging/meilhaus/me1000_device.c | 8 +- drivers/staging/meilhaus/me1000_dio.c | 4 +- drivers/staging/meilhaus/me1400_device.c | 4 +- drivers/staging/meilhaus/me1400_ext_irq.c | 7 +- drivers/staging/meilhaus/me1600_ao.c | 70 +- drivers/staging/meilhaus/me1600_ao.h | 4 - drivers/staging/meilhaus/me1600_device.c | 8 +- drivers/staging/meilhaus/me4600_ai.c | 157 +- drivers/staging/meilhaus/me4600_ai.h | 4 - drivers/staging/meilhaus/me4600_ao.c | 191 +- drivers/staging/meilhaus/me4600_ao.h | 4 - drivers/staging/meilhaus/me4600_device.c | 4 +- drivers/staging/meilhaus/me4600_di.c | 14 +- drivers/staging/meilhaus/me4600_dio.c | 16 +- drivers/staging/meilhaus/me4600_do.c | 16 +- drivers/staging/meilhaus/me4600_ext_irq.c | 21 +- drivers/staging/meilhaus/me6000_ao.c | 146 +- drivers/staging/meilhaus/me6000_ao.h | 4 - drivers/staging/meilhaus/me6000_device.c | 4 +- drivers/staging/meilhaus/me6000_dio.c | 16 +- drivers/staging/meilhaus/me8100_device.c | 4 +- drivers/staging/meilhaus/me8100_di.c | 24 +- drivers/staging/meilhaus/me8100_do.c | 16 +- drivers/staging/meilhaus/me8200_device.c | 4 +- drivers/staging/meilhaus/me8200_di.c | 58 +- drivers/staging/meilhaus/me8200_dio.c | 16 +- drivers/staging/meilhaus/me8200_do.c | 26 +- drivers/staging/meilhaus/me8254.c | 14 +- drivers/staging/meilhaus/me8255.c | 4 +- drivers/staging/meilhaus/mecirc_buf.h | 16 +- drivers/staging/meilhaus/medevice.c | 14 +- drivers/staging/meilhaus/medlist.c | 6 +- drivers/staging/meilhaus/medlock.c | 4 +- drivers/staging/meilhaus/medummy.c | 84 +- drivers/staging/meilhaus/memain.c | 34 +- drivers/staging/meilhaus/meslist.c | 6 +- drivers/staging/meilhaus/meslock.c | 2 +- drivers/staging/meilhaus/mesubdevice.c | 12 +- drivers/staging/meilhaus/metempl_device.c | 4 +- drivers/staging/meilhaus/metempl_sub.c | 10 +- drivers/staging/mimio/Kconfig | 2 +- drivers/staging/otus/80211core/amsdu.c | 145 +- drivers/staging/otus/80211core/cmmsta.c | 5 +- drivers/staging/otus/80211core/coid.c | 8 +- drivers/staging/otus/80211core/cwm.c | 6 +- drivers/staging/otus/TODO | 9 +- drivers/staging/otus/hal/hpani.c | 46 +- drivers/staging/otus/hal/hpmain.c | 99 +- drivers/staging/otus/hal/hpreg.c | 9 +- drivers/staging/otus/hal/hprw.c | 30 +- drivers/staging/otus/hal/hpusb.c | 11 +- drivers/staging/otus/ioctl.c | 4789 +++++------ drivers/staging/otus/usbdrv.c | 12 +- drivers/staging/otus/wwrap.c | 6 +- drivers/staging/p9auth/Kconfig | 9 + drivers/staging/p9auth/Makefile | 1 + drivers/staging/p9auth/p9auth.c | 383 + drivers/staging/phison/Kconfig | 5 + drivers/staging/phison/Makefile | 1 + drivers/staging/phison/phison.c | 106 + drivers/staging/pohmelfs/Kconfig | 28 + drivers/staging/pohmelfs/Makefile | 3 + drivers/staging/pohmelfs/config.c | 478 + drivers/staging/pohmelfs/crypto.c | 880 ++ drivers/staging/pohmelfs/dir.c | 1093 +++ drivers/staging/pohmelfs/inode.c | 1976 +++++ drivers/staging/pohmelfs/lock.c | 182 + drivers/staging/pohmelfs/mcache.c | 171 + drivers/staging/pohmelfs/net.c | 1247 +++ drivers/staging/pohmelfs/netfs.h | 932 ++ drivers/staging/pohmelfs/path_entry.c | 114 + drivers/staging/pohmelfs/trans.c | 715 ++ drivers/staging/rspiusb/rspiusb.c | 5 +- drivers/staging/rt2860/2860_main_dev.c | 50 +- drivers/staging/rt2860/Makefile | 1 - drivers/staging/rt2860/TODO | 4 +- drivers/staging/rt2860/common/cmm_data.c | 27 +- drivers/staging/rt2860/common/cmm_data_2860.c | 144 +- drivers/staging/rt2860/common/cmm_info.c | 6 - drivers/staging/rt2860/common/cmm_sync.c | 2 +- drivers/staging/rt2860/common/cmm_wpa.c | 40 +- drivers/staging/rt2860/common/mlme.c | 289 +- drivers/staging/rt2860/common/rtmp_init.c | 157 +- drivers/staging/rt2860/common/spectrum.c | 2 +- drivers/staging/rt2860/config.mk | 4 - drivers/staging/rt2860/oid.h | 2 + drivers/staging/rt2860/rt2860.h | 22 +- drivers/staging/rt2860/rt28xx.h | 4 - drivers/staging/rt2860/rt_ate.c | 18 +- drivers/staging/rt2860/rt_ate.h | 6 - drivers/staging/rt2860/rt_config.h | 2 - drivers/staging/rt2860/rt_linux.c | 29 +- drivers/staging/rt2860/rt_linux.h | 49 +- drivers/staging/rt2860/rt_main_dev.c | 149 +- drivers/staging/rt2860/rt_profile.c | 2 +- drivers/staging/rt2860/rtmp.h | 61 +- drivers/staging/rt2860/rtmp_def.h | 29 +- drivers/staging/rt2860/sta/assoc.c | 23 +- drivers/staging/rt2860/sta/connect.c | 45 +- drivers/staging/rt2860/sta/dls.c | 4 - drivers/staging/rt2860/sta/rtmp_data.c | 29 +- drivers/staging/rt2860/sta/sync.c | 16 +- drivers/staging/rt2860/sta/wpa.c | 10 +- drivers/staging/rt2860/sta_ioctl.c | 96 +- drivers/staging/rt2860/wpa.h | 1 + drivers/staging/rt2870/2870_main_dev.c | 67 +- drivers/staging/rt2870/TODO | 9 +- drivers/staging/rt2870/common/2870_rtmp_init.c | 35 +- drivers/staging/rt2870/common/cmm_data.c | 3 - drivers/staging/rt2870/common/rtmp_init.c | 2 +- drivers/staging/rt2870/common/rtusb_io.c | 3 +- drivers/staging/rt2870/common/spectrum.c | 2 +- drivers/staging/rt2870/rt2870.h | 7 +- drivers/staging/rt2870/rt_linux.c | 2 +- drivers/staging/rt2870/rt_linux.h | 12 +- drivers/staging/rt2870/sta_ioctl.c | 2 +- drivers/staging/rt3070/2870_main_dev.c | 1627 ++++ drivers/staging/rt3070/Kconfig | 6 + drivers/staging/rt3070/Makefile | 47 + drivers/staging/rt3070/action.h | 68 + drivers/staging/rt3070/aironet.h | 210 + drivers/staging/rt3070/ap.h | 557 ++ drivers/staging/rt3070/chlist.h | 1253 +++ drivers/staging/rt3070/common/2870_rtmp_init.c | 1762 ++++ drivers/staging/rt3070/common/action.c | 1038 +++ drivers/staging/rt3070/common/ba_action.c | 1810 ++++ drivers/staging/rt3070/common/cmm_data.c | 2827 ++++++ drivers/staging/rt3070/common/cmm_data_2870.c | 980 +++ drivers/staging/rt3070/common/cmm_info.c | 3395 ++++++++ drivers/staging/rt3070/common/cmm_sanity.c | 1669 ++++ drivers/staging/rt3070/common/cmm_sync.c | 711 ++ drivers/staging/rt3070/common/cmm_wpa.c | 1606 ++++ drivers/staging/rt3070/common/dfs.c | 441 + drivers/staging/rt3070/common/eeprom.c | 1498 ++++ drivers/staging/rt3070/common/md5.c | 1427 +++ drivers/staging/rt3070/common/mlme.c | 9136 ++++++++++++++++++++ drivers/staging/rt3070/common/netif_block.c | 136 + drivers/staging/rt3070/common/rtmp_init.c | 4197 +++++++++ drivers/staging/rt3070/common/rtmp_tkip.c | 1613 ++++ drivers/staging/rt3070/common/rtmp_wep.c | 508 ++ drivers/staging/rt3070/common/rtusb_bulk.c | 1382 +++ drivers/staging/rt3070/common/rtusb_data.c | 218 + drivers/staging/rt3070/common/rtusb_io.c | 1908 ++++ drivers/staging/rt3070/common/spectrum.c | 1876 ++++ drivers/staging/rt3070/dfs.h | 100 + drivers/staging/rt3070/firmware.h | 558 ++ drivers/staging/rt3070/leap.h | 215 + drivers/staging/rt3070/link_list.h | 134 + drivers/staging/rt3070/md4.h | 42 + drivers/staging/rt3070/md5.h | 107 + drivers/staging/rt3070/mlme.h | 1468 ++++ drivers/staging/rt3070/netif_block.h | 58 + drivers/staging/rt3070/oid.h | 1142 +++ drivers/staging/rt3070/rt2870.h | 756 ++ drivers/staging/rt3070/rt28xx.h | 2725 ++++++ drivers/staging/rt3070/rt_ate.c | 6506 ++++++++++++++ drivers/staging/rt3070/rt_ate.h | 294 + drivers/staging/rt3070/rt_config.h | 121 + drivers/staging/rt3070/rt_linux.c | 1063 +++ drivers/staging/rt3070/rt_linux.h | 887 ++ drivers/staging/rt3070/rt_main_dev.c | 1800 ++++ drivers/staging/rt3070/rt_profile.c | 2041 +++++ drivers/staging/rt3070/rtmp.h | 7728 +++++++++++++++++ drivers/staging/rt3070/rtmp_ckipmic.h | 113 + drivers/staging/rt3070/rtmp_def.h | 1559 ++++ drivers/staging/rt3070/rtmp_type.h | 95 + drivers/staging/rt3070/spectrum.h | 322 + drivers/staging/rt3070/spectrum_def.h | 95 + drivers/staging/rt3070/sta/aironet.c | 1312 +++ drivers/staging/rt3070/sta/assoc.c | 2060 +++++ drivers/staging/rt3070/sta/auth.c | 475 + drivers/staging/rt3070/sta/auth_rsp.c | 167 + drivers/staging/rt3070/sta/connect.c | 2857 ++++++ drivers/staging/rt3070/sta/dls.c | 2170 +++++ drivers/staging/rt3070/sta/rtmp_data.c | 2637 ++++++ drivers/staging/rt3070/sta/sanity.c | 420 + drivers/staging/rt3070/sta/sync.c | 1755 ++++ drivers/staging/rt3070/sta/wpa.c | 2099 +++++ drivers/staging/rt3070/sta_ioctl.c | 7203 +++++++++++++++ drivers/staging/rt3070/wpa.h | 356 + drivers/staging/rtl8187se/dot11d.h | 202 +- drivers/staging/rtl8187se/ieee80211/dot11d.c | 492 +- drivers/staging/rtl8187se/ieee80211/dot11d.h | 204 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 4 +- drivers/staging/rtl8187se/r8180_core.c | 2 +- drivers/staging/rtl8187se/r8180_dm.c | 3450 ++++---- drivers/staging/rtl8187se/r8180_dm.h | 82 +- drivers/staging/rtl8187se/r8180_wx.c | 12 +- drivers/staging/serqt_usb/Kconfig | 9 + drivers/staging/serqt_usb/Makefile | 1 + drivers/staging/serqt_usb/TODO | 8 + drivers/staging/serqt_usb/serqt_usb.c | 2828 ++++++ drivers/staging/slicoss/gbdownload.h | 8215 ------------------ drivers/staging/slicoss/gbrcvucode.h | 238 - drivers/staging/slicoss/oasisdbgdownload.h | 6850 --------------- drivers/staging/slicoss/oasisdownload.h | 6848 --------------- drivers/staging/slicoss/oasisrcvucode.h | 205 - drivers/staging/slicoss/slic.h | 86 +- drivers/staging/slicoss/slic_os.h | 84 - drivers/staging/slicoss/slicbuild.h | 96 - drivers/staging/slicoss/slicdbg.h | 100 - drivers/staging/slicoss/slicdump.h | 278 - drivers/staging/slicoss/slichw.h | 1038 ++-- drivers/staging/slicoss/slicinc.h | 185 - drivers/staging/slicoss/slicoss.c | 2913 ++----- drivers/staging/stlc45xx/Kconfig | 8 + drivers/staging/stlc45xx/Makefile | 1 + drivers/staging/stlc45xx/stlc45xx.c | 2606 ++++++ drivers/staging/stlc45xx/stlc45xx.h | 283 + drivers/staging/stlc45xx/stlc45xx_lmac.h | 434 + drivers/staging/sxg/Kconfig | 2 +- drivers/staging/sxg/Makefile | 4 +- drivers/staging/sxg/saharadbgdownload.h | 4854 ----------- drivers/staging/sxg/sxg.c | 2885 ++++--- drivers/staging/sxg/sxg.h | 919 +- drivers/staging/sxg/sxg_ethtool.c | 328 + drivers/staging/sxg/sxg_os.h | 100 +- drivers/staging/sxg/sxgdbg.h | 129 +- drivers/staging/sxg/sxghif.h | 1110 ++- drivers/staging/sxg/sxghw.h | 1564 ++-- drivers/staging/sxg/sxgphycode-1.2.h | 130 + drivers/staging/sxg/sxgphycode.h | 349 - drivers/staging/uc2322/Kconfig | 10 + drivers/staging/uc2322/Makefile | 1 + drivers/staging/uc2322/TODO | 7 + drivers/staging/uc2322/aten2011.c | 2452 ++++++ drivers/staging/usbip/stub_rx.c | 4 +- drivers/staging/usbip/vhci_sysfs.c | 3 +- drivers/staging/winbond/bss_f.h | 63 - drivers/staging/winbond/bssdscpt.h | 164 - drivers/staging/winbond/common.h | 27 - drivers/staging/winbond/core.h | 7 +- drivers/staging/winbond/ds_tkip.h | 37 - drivers/staging/winbond/gl_80211.h | 126 - drivers/staging/winbond/ioctls.h | 678 -- drivers/staging/winbond/mds.c | 26 +- drivers/staging/winbond/mds_s.h | 24 +- drivers/staging/winbond/mlme_mib.h | 84 - drivers/staging/winbond/mlmetxrx.c | 2 +- drivers/staging/winbond/mto.c | 24 +- drivers/staging/winbond/mto.h | 12 +- drivers/staging/winbond/mto_f.h | 13 - drivers/staging/winbond/os_common.h | 2 - drivers/staging/winbond/phy_calibration.c | 28 +- drivers/staging/winbond/phy_calibration.h | 2 +- drivers/staging/winbond/reg.c | 81 +- drivers/staging/winbond/sme_api.h | 3 - drivers/staging/winbond/sme_s.h | 236 - drivers/staging/winbond/wb35_ver.h | 30 - drivers/staging/winbond/wb35reg.c | 41 +- drivers/staging/winbond/wb35reg_f.h | 70 +- drivers/staging/winbond/wb35rx.c | 43 +- drivers/staging/winbond/wb35rx_f.h | 6 +- drivers/staging/winbond/wb35rx_s.h | 8 +- drivers/staging/winbond/wb35tx.c | 54 +- drivers/staging/winbond/wb35tx_f.h | 8 +- drivers/staging/winbond/wb35tx_s.h | 6 +- drivers/staging/winbond/wbhal.c | 50 +- drivers/staging/winbond/wbhal_f.h | 94 +- drivers/staging/winbond/wbhal_s.h | 87 +- drivers/staging/winbond/wbusb.c | 20 +- drivers/staging/winbond/wbusb_s.h | 16 +- drivers/staging/wlan-ng/README | 4 +- drivers/staging/wlan-ng/hfa384x.h | 2638 ++----- drivers/staging/wlan-ng/hfa384x_usb.c | 2295 ++--- drivers/staging/wlan-ng/p80211conv.c | 377 +- drivers/staging/wlan-ng/p80211conv.h | 131 +- drivers/staging/wlan-ng/p80211hdr.h | 146 +- drivers/staging/wlan-ng/p80211ioctl.h | 46 +- drivers/staging/wlan-ng/p80211meta.h | 110 +- drivers/staging/wlan-ng/p80211metadef.h | 544 -- drivers/staging/wlan-ng/p80211metamib.h | 105 - drivers/staging/wlan-ng/p80211metamsg.h | 105 - drivers/staging/wlan-ng/p80211metastruct.h | 424 +- drivers/staging/wlan-ng/p80211mgmt.h | 441 +- drivers/staging/wlan-ng/p80211msg.h | 48 +- drivers/staging/wlan-ng/p80211netdev.c | 411 +- drivers/staging/wlan-ng/p80211netdev.h | 218 +- drivers/staging/wlan-ng/p80211req.c | 235 +- drivers/staging/wlan-ng/p80211req.h | 17 +- drivers/staging/wlan-ng/p80211types.h | 505 +- drivers/staging/wlan-ng/p80211wep.c | 24 +- drivers/staging/wlan-ng/p80211wext.c | 1214 ++-- drivers/staging/wlan-ng/prism2mgmt.c | 899 +- drivers/staging/wlan-ng/prism2mgmt.h | 69 +- drivers/staging/wlan-ng/prism2mib.c | 905 +-- drivers/staging/wlan-ng/prism2sta.c | 1561 ++-- drivers/staging/wlan-ng/prism2usb.c | 158 +- drivers/staging/wlan-ng/wlan_compat.h | 193 - firmware/Makefile | 6 + firmware/WHENCE | 26 + firmware/slicoss/gbdownload.sys.ihex | 6148 +++++++++++++ firmware/slicoss/gbrcvucode.sys.ihex | 162 + firmware/slicoss/oasisdbgdownload.sys.ihex | 5124 +++++++++++ firmware/slicoss/oasisdownload.sys.ihex | 5124 +++++++++++ firmware/slicoss/oasisrcvucode.sys.ihex | 162 + firmware/sxg/saharadbgdownloadB.sys.ihex | 3937 +++++++++ firmware/sxg/saharadownloadB.sys.ihex | 3385 ++++++++ include/linux/connector.h | 4 +- include/linux/dst.h | 587 ++ mm/filemap.c | 2 + 712 files changed, 312495 insertions(+), 64555 deletions(-) create mode 100644 Documentation/filesystems/pohmelfs/design_notes.txt create mode 100644 Documentation/filesystems/pohmelfs/info.txt create mode 100644 Documentation/filesystems/pohmelfs/network_protocol.txt create mode 100644 drivers/staging/b3dfg/Kconfig create mode 100644 drivers/staging/b3dfg/Makefile create mode 100644 drivers/staging/b3dfg/TODO create mode 100644 drivers/staging/b3dfg/b3dfg.c create mode 100644 drivers/staging/comedi/drivers/8253.h create mode 100644 drivers/staging/comedi/drivers/8255.c create mode 100644 drivers/staging/comedi/drivers/8255.h create mode 100644 drivers/staging/comedi/drivers/acl7225b.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.c create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_eeprom.c create mode 100644 drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h create mode 100644 drivers/staging/comedi/drivers/addi_apci_035.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1032.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1500.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1516.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1564.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_16xx.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1710.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_2016.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_2032.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_2200.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3001.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3120.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3200.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3300.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3501.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3xxx.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_all.c create mode 100644 drivers/staging/comedi/drivers/adl_pci6208.c create mode 100644 drivers/staging/comedi/drivers/adl_pci7296.c create mode 100644 drivers/staging/comedi/drivers/adl_pci7432.c create mode 100644 drivers/staging/comedi/drivers/adl_pci8164.c create mode 100644 drivers/staging/comedi/drivers/adl_pci9111.c create mode 100644 drivers/staging/comedi/drivers/adl_pci9118.c create mode 100644 drivers/staging/comedi/drivers/adq12b.c create mode 100644 drivers/staging/comedi/drivers/adv_pci1710.c create mode 100644 drivers/staging/comedi/drivers/adv_pci1723.c create mode 100644 drivers/staging/comedi/drivers/adv_pci_dio.c create mode 100644 drivers/staging/comedi/drivers/aio_aio12_8.c create mode 100644 drivers/staging/comedi/drivers/aio_iiro_16.c create mode 100644 drivers/staging/comedi/drivers/am9513.h create mode 100644 drivers/staging/comedi/drivers/amcc_s5933.h create mode 100644 drivers/staging/comedi/drivers/amplc_dio200.c create mode 100644 drivers/staging/comedi/drivers/amplc_pc236.c create mode 100644 drivers/staging/comedi/drivers/amplc_pc263.c create mode 100644 drivers/staging/comedi/drivers/amplc_pci224.c create mode 100644 drivers/staging/comedi/drivers/amplc_pci230.c create mode 100644 drivers/staging/comedi/drivers/c6xdigio.c create mode 100644 drivers/staging/comedi/drivers/cb_das16_cs.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidas.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidas64.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidda.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidio.c create mode 100644 drivers/staging/comedi/drivers/cb_pcimdas.c create mode 100644 drivers/staging/comedi/drivers/cb_pcimdda.c create mode 100644 drivers/staging/comedi/drivers/comedi_rt_timer.c create mode 100644 drivers/staging/comedi/drivers/contec_pci_dio.c create mode 100644 drivers/staging/comedi/drivers/daqboard2000.c create mode 100644 drivers/staging/comedi/drivers/das08.c create mode 100644 drivers/staging/comedi/drivers/das08.h create mode 100644 drivers/staging/comedi/drivers/das08_cs.c create mode 100644 drivers/staging/comedi/drivers/das16.c create mode 100644 drivers/staging/comedi/drivers/das16m1.c create mode 100644 drivers/staging/comedi/drivers/das1800.c create mode 100644 drivers/staging/comedi/drivers/das6402.c create mode 100644 drivers/staging/comedi/drivers/das800.c create mode 100644 drivers/staging/comedi/drivers/dmm32at.c create mode 100644 drivers/staging/comedi/drivers/dt2801.c create mode 100644 drivers/staging/comedi/drivers/dt2811.c create mode 100644 drivers/staging/comedi/drivers/dt2814.c create mode 100644 drivers/staging/comedi/drivers/dt2815.c create mode 100644 drivers/staging/comedi/drivers/dt2817.c create mode 100644 drivers/staging/comedi/drivers/dt282x.c create mode 100644 drivers/staging/comedi/drivers/dt3000.c create mode 100644 drivers/staging/comedi/drivers/fl512.c create mode 100644 drivers/staging/comedi/drivers/gsc_hpdi.c create mode 100644 drivers/staging/comedi/drivers/ii_pci20kc.c create mode 100644 drivers/staging/comedi/drivers/jr3_pci.c create mode 100644 drivers/staging/comedi/drivers/jr3_pci.h create mode 100644 drivers/staging/comedi/drivers/ke_counter.c create mode 100644 drivers/staging/comedi/drivers/mpc624.c create mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c create mode 100644 drivers/staging/comedi/drivers/multiq3.c create mode 100644 drivers/staging/comedi/drivers/ni_6527.c create mode 100644 drivers/staging/comedi/drivers/ni_65xx.c create mode 100644 drivers/staging/comedi/drivers/ni_660x.c create mode 100644 drivers/staging/comedi/drivers/ni_670x.c create mode 100644 drivers/staging/comedi/drivers/ni_at_a2150.c create mode 100644 drivers/staging/comedi/drivers/ni_at_ao.c create mode 100644 drivers/staging/comedi/drivers/ni_atmio.c create mode 100644 drivers/staging/comedi/drivers/ni_atmio16d.c create mode 100644 drivers/staging/comedi/drivers/ni_daq_700.c create mode 100644 drivers/staging/comedi/drivers/ni_daq_dio24.c create mode 100644 drivers/staging/comedi/drivers/ni_labpc.c create mode 100644 drivers/staging/comedi/drivers/ni_labpc.h create mode 100644 drivers/staging/comedi/drivers/ni_labpc_cs.c create mode 100644 drivers/staging/comedi/drivers/ni_mio_common.c create mode 100644 drivers/staging/comedi/drivers/ni_mio_cs.c create mode 100644 drivers/staging/comedi/drivers/ni_pcidio.c create mode 100644 drivers/staging/comedi/drivers/ni_pcimio.c create mode 100644 drivers/staging/comedi/drivers/ni_stc.h create mode 100644 drivers/staging/comedi/drivers/ni_tio.c create mode 100644 drivers/staging/comedi/drivers/ni_tio.h create mode 100644 drivers/staging/comedi/drivers/ni_tio_internal.h create mode 100644 drivers/staging/comedi/drivers/ni_tiocmd.c create mode 100644 drivers/staging/comedi/drivers/pcl711.c create mode 100644 drivers/staging/comedi/drivers/pcl724.c create mode 100644 drivers/staging/comedi/drivers/pcl725.c create mode 100644 drivers/staging/comedi/drivers/pcl726.c create mode 100644 drivers/staging/comedi/drivers/pcl730.c create mode 100644 drivers/staging/comedi/drivers/pcl812.c create mode 100644 drivers/staging/comedi/drivers/pcl816.c create mode 100644 drivers/staging/comedi/drivers/pcl818.c create mode 100644 drivers/staging/comedi/drivers/pcm3724.c create mode 100644 drivers/staging/comedi/drivers/pcm3730.c create mode 100644 drivers/staging/comedi/drivers/pcmad.c create mode 100644 drivers/staging/comedi/drivers/pcmda12.c create mode 100644 drivers/staging/comedi/drivers/pcmmio.c create mode 100644 drivers/staging/comedi/drivers/pcmuio.c create mode 100644 drivers/staging/comedi/drivers/plx9052.h create mode 100644 drivers/staging/comedi/drivers/poc.c create mode 100644 drivers/staging/comedi/drivers/quatech_daqp_cs.c create mode 100644 drivers/staging/comedi/drivers/rti800.c create mode 100644 drivers/staging/comedi/drivers/rti802.c create mode 100644 drivers/staging/comedi/drivers/s526.c create mode 100644 drivers/staging/comedi/drivers/serial2002.c create mode 100644 drivers/staging/comedi/drivers/skel.c create mode 100644 drivers/staging/comedi/drivers/ssv_dnp.c create mode 100644 drivers/staging/comedi/drivers/unioxx5.c create mode 100644 drivers/staging/dst/Kconfig create mode 100644 drivers/staging/dst/Makefile create mode 100644 drivers/staging/dst/crypto.c create mode 100644 drivers/staging/dst/dcore.c create mode 100644 drivers/staging/dst/export.c create mode 100644 drivers/staging/dst/state.c create mode 100644 drivers/staging/dst/thread_pool.c create mode 100644 drivers/staging/dst/trans.c delete mode 100644 drivers/staging/epl/EdrvFec5282.h delete mode 100644 drivers/staging/epl/EplObjDef.h delete mode 100644 drivers/staging/epl/EplTimeruNull.c delete mode 100644 drivers/staging/epl/EplTimeruWin32.c delete mode 100644 drivers/staging/epl/ShbIpc-Win32.c delete mode 100644 drivers/staging/epl/kernel/EplNmtkCal.h delete mode 100644 drivers/staging/epl/kernel/EplObdkCal.h delete mode 100644 drivers/staging/frontier/frontier_compat.h delete mode 100644 drivers/staging/frontier/surface_sysfs.h create mode 100644 drivers/staging/heci/Kconfig create mode 100644 drivers/staging/heci/Makefile create mode 100644 drivers/staging/heci/TODO create mode 100644 drivers/staging/heci/heci.h create mode 100644 drivers/staging/heci/heci_data_structures.h create mode 100644 drivers/staging/heci/heci_init.c create mode 100644 drivers/staging/heci/heci_interface.c create mode 100644 drivers/staging/heci/heci_interface.h create mode 100644 drivers/staging/heci/heci_main.c create mode 100644 drivers/staging/heci/heci_version.h create mode 100644 drivers/staging/heci/interrupt.c create mode 100644 drivers/staging/heci/io_heci.c create mode 100644 drivers/staging/line6/Kconfig create mode 100644 drivers/staging/line6/Makefile create mode 100644 drivers/staging/line6/audio.c create mode 100644 drivers/staging/line6/audio.h create mode 100644 drivers/staging/line6/capture.c create mode 100644 drivers/staging/line6/capture.h create mode 100644 drivers/staging/line6/config.h create mode 100644 drivers/staging/line6/control.c create mode 100644 drivers/staging/line6/control.h create mode 100644 drivers/staging/line6/driver.c create mode 100644 drivers/staging/line6/driver.h create mode 100644 drivers/staging/line6/dumprequest.c create mode 100644 drivers/staging/line6/dumprequest.h create mode 100644 drivers/staging/line6/midi.c create mode 100644 drivers/staging/line6/midi.h create mode 100644 drivers/staging/line6/midibuf.c create mode 100644 drivers/staging/line6/midibuf.h create mode 100644 drivers/staging/line6/pcm.c create mode 100644 drivers/staging/line6/pcm.h create mode 100644 drivers/staging/line6/playback.c create mode 100644 drivers/staging/line6/playback.h create mode 100644 drivers/staging/line6/pod.c create mode 100644 drivers/staging/line6/pod.h create mode 100644 drivers/staging/line6/revision.h create mode 100644 drivers/staging/line6/toneport.c create mode 100644 drivers/staging/line6/toneport.h create mode 100644 drivers/staging/line6/usbdefs.h create mode 100644 drivers/staging/line6/variax.c create mode 100644 drivers/staging/line6/variax.h create mode 100644 drivers/staging/p9auth/Kconfig create mode 100644 drivers/staging/p9auth/Makefile create mode 100644 drivers/staging/p9auth/p9auth.c create mode 100644 drivers/staging/phison/Kconfig create mode 100644 drivers/staging/phison/Makefile create mode 100644 drivers/staging/phison/phison.c create mode 100644 drivers/staging/pohmelfs/Kconfig create mode 100644 drivers/staging/pohmelfs/Makefile create mode 100644 drivers/staging/pohmelfs/config.c create mode 100644 drivers/staging/pohmelfs/crypto.c create mode 100644 drivers/staging/pohmelfs/dir.c create mode 100644 drivers/staging/pohmelfs/inode.c create mode 100644 drivers/staging/pohmelfs/lock.c create mode 100644 drivers/staging/pohmelfs/mcache.c create mode 100644 drivers/staging/pohmelfs/net.c create mode 100644 drivers/staging/pohmelfs/netfs.h create mode 100644 drivers/staging/pohmelfs/path_entry.c create mode 100644 drivers/staging/pohmelfs/trans.c create mode 100644 drivers/staging/rt3070/2870_main_dev.c create mode 100644 drivers/staging/rt3070/Kconfig create mode 100644 drivers/staging/rt3070/Makefile create mode 100644 drivers/staging/rt3070/action.h create mode 100644 drivers/staging/rt3070/aironet.h create mode 100644 drivers/staging/rt3070/ap.h create mode 100644 drivers/staging/rt3070/chlist.h create mode 100644 drivers/staging/rt3070/common/2870_rtmp_init.c create mode 100644 drivers/staging/rt3070/common/action.c create mode 100644 drivers/staging/rt3070/common/ba_action.c create mode 100644 drivers/staging/rt3070/common/cmm_data.c create mode 100644 drivers/staging/rt3070/common/cmm_data_2870.c create mode 100644 drivers/staging/rt3070/common/cmm_info.c create mode 100644 drivers/staging/rt3070/common/cmm_sanity.c create mode 100644 drivers/staging/rt3070/common/cmm_sync.c create mode 100644 drivers/staging/rt3070/common/cmm_wpa.c create mode 100644 drivers/staging/rt3070/common/dfs.c create mode 100644 drivers/staging/rt3070/common/eeprom.c create mode 100644 drivers/staging/rt3070/common/md5.c create mode 100644 drivers/staging/rt3070/common/mlme.c create mode 100644 drivers/staging/rt3070/common/netif_block.c create mode 100644 drivers/staging/rt3070/common/rtmp_init.c create mode 100644 drivers/staging/rt3070/common/rtmp_tkip.c create mode 100644 drivers/staging/rt3070/common/rtmp_wep.c create mode 100644 drivers/staging/rt3070/common/rtusb_bulk.c create mode 100644 drivers/staging/rt3070/common/rtusb_data.c create mode 100644 drivers/staging/rt3070/common/rtusb_io.c create mode 100644 drivers/staging/rt3070/common/spectrum.c create mode 100644 drivers/staging/rt3070/dfs.h create mode 100644 drivers/staging/rt3070/firmware.h create mode 100644 drivers/staging/rt3070/leap.h create mode 100644 drivers/staging/rt3070/link_list.h create mode 100644 drivers/staging/rt3070/md4.h create mode 100644 drivers/staging/rt3070/md5.h create mode 100644 drivers/staging/rt3070/mlme.h create mode 100644 drivers/staging/rt3070/netif_block.h create mode 100644 drivers/staging/rt3070/oid.h create mode 100644 drivers/staging/rt3070/rt2870.h create mode 100644 drivers/staging/rt3070/rt28xx.h create mode 100644 drivers/staging/rt3070/rt_ate.c create mode 100644 drivers/staging/rt3070/rt_ate.h create mode 100644 drivers/staging/rt3070/rt_config.h create mode 100644 drivers/staging/rt3070/rt_linux.c create mode 100644 drivers/staging/rt3070/rt_linux.h create mode 100644 drivers/staging/rt3070/rt_main_dev.c create mode 100644 drivers/staging/rt3070/rt_profile.c create mode 100644 drivers/staging/rt3070/rtmp.h create mode 100644 drivers/staging/rt3070/rtmp_ckipmic.h create mode 100644 drivers/staging/rt3070/rtmp_def.h create mode 100644 drivers/staging/rt3070/rtmp_type.h create mode 100644 drivers/staging/rt3070/spectrum.h create mode 100644 drivers/staging/rt3070/spectrum_def.h create mode 100644 drivers/staging/rt3070/sta/aironet.c create mode 100644 drivers/staging/rt3070/sta/assoc.c create mode 100644 drivers/staging/rt3070/sta/auth.c create mode 100644 drivers/staging/rt3070/sta/auth_rsp.c create mode 100644 drivers/staging/rt3070/sta/connect.c create mode 100644 drivers/staging/rt3070/sta/dls.c create mode 100644 drivers/staging/rt3070/sta/rtmp_data.c create mode 100644 drivers/staging/rt3070/sta/sanity.c create mode 100644 drivers/staging/rt3070/sta/sync.c create mode 100644 drivers/staging/rt3070/sta/wpa.c create mode 100644 drivers/staging/rt3070/sta_ioctl.c create mode 100644 drivers/staging/rt3070/wpa.h create mode 100644 drivers/staging/serqt_usb/Kconfig create mode 100644 drivers/staging/serqt_usb/Makefile create mode 100644 drivers/staging/serqt_usb/TODO create mode 100644 drivers/staging/serqt_usb/serqt_usb.c delete mode 100644 drivers/staging/slicoss/gbdownload.h delete mode 100644 drivers/staging/slicoss/gbrcvucode.h delete mode 100644 drivers/staging/slicoss/oasisdbgdownload.h delete mode 100644 drivers/staging/slicoss/oasisdownload.h delete mode 100644 drivers/staging/slicoss/oasisrcvucode.h delete mode 100644 drivers/staging/slicoss/slic_os.h delete mode 100644 drivers/staging/slicoss/slicbuild.h delete mode 100644 drivers/staging/slicoss/slicdbg.h delete mode 100644 drivers/staging/slicoss/slicdump.h delete mode 100644 drivers/staging/slicoss/slicinc.h create mode 100644 drivers/staging/stlc45xx/Kconfig create mode 100644 drivers/staging/stlc45xx/Makefile create mode 100644 drivers/staging/stlc45xx/stlc45xx.c create mode 100644 drivers/staging/stlc45xx/stlc45xx.h create mode 100644 drivers/staging/stlc45xx/stlc45xx_lmac.h delete mode 100644 drivers/staging/sxg/saharadbgdownload.h create mode 100644 drivers/staging/sxg/sxg_ethtool.c create mode 100644 drivers/staging/sxg/sxgphycode-1.2.h delete mode 100644 drivers/staging/sxg/sxgphycode.h create mode 100644 drivers/staging/uc2322/Kconfig create mode 100644 drivers/staging/uc2322/Makefile create mode 100644 drivers/staging/uc2322/TODO create mode 100644 drivers/staging/uc2322/aten2011.c delete mode 100644 drivers/staging/winbond/bss_f.h delete mode 100644 drivers/staging/winbond/bssdscpt.h delete mode 100644 drivers/staging/winbond/common.h delete mode 100644 drivers/staging/winbond/ds_tkip.h delete mode 100644 drivers/staging/winbond/gl_80211.h delete mode 100644 drivers/staging/winbond/ioctls.h delete mode 100644 drivers/staging/winbond/mlme_mib.h delete mode 100644 drivers/staging/winbond/mto_f.h delete mode 100644 drivers/staging/winbond/os_common.h delete mode 100644 drivers/staging/winbond/sme_s.h delete mode 100644 drivers/staging/winbond/wb35_ver.h delete mode 100644 drivers/staging/wlan-ng/p80211metamib.h delete mode 100644 drivers/staging/wlan-ng/p80211metamsg.h delete mode 100644 drivers/staging/wlan-ng/wlan_compat.h create mode 100644 firmware/slicoss/gbdownload.sys.ihex create mode 100644 firmware/slicoss/gbrcvucode.sys.ihex create mode 100644 firmware/slicoss/oasisdbgdownload.sys.ihex create mode 100644 firmware/slicoss/oasisdownload.sys.ihex create mode 100644 firmware/slicoss/oasisrcvucode.sys.ihex create mode 100644 firmware/sxg/saharadbgdownloadB.sys.ihex create mode 100644 firmware/sxg/saharadownloadB.sys.ihex create mode 100644 include/linux/dst.h Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.