$ date Tuesday 28 May 10:18:08 EST 2013 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at e4aa937 Linux 3.10-rc3 Merging origin/master (e4aa937 Linux 3.10-rc3) $ git merge origin/master Already up-to-date. Merging fixes/master (0279b3c Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) $ git merge fixes/master Already up-to-date. Merging kbuild-current/rc-fixes (ad06156 kbuild: Don't assume dts files live in arch/*/boot/dts) $ git merge kbuild-current/rc-fixes Merge made by the 'recursive' strategy. scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging arc-current/for-curr (e4aa937 Linux 3.10-rc3) $ git merge arc-current/for-curr Already up-to-date. Merging arm-current/fixes (f27d6e1 ARM: 7729/1: vfp: ensure VFP_arch is non-zero when VFP is not supported) $ git merge arm-current/fixes Already up-to-date. Merging m68k-current/for-linus (e4f2dfb m68k: implement futex.h to support userspace robust futexes and PI mutexes) $ git merge m68k-current/for-linus Merge made by the 'recursive' strategy. arch/m68k/include/asm/Kbuild | 1 - arch/m68k/include/asm/futex.h | 94 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 arch/m68k/include/asm/futex.h Merging powerpc-merge/merge (f1dd153 powerpc/pseries: Make 32-bit MSI quirk work on systems lacking firmware support) $ git merge powerpc-merge/merge Already up-to-date. Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) $ git merge sparc/master Already up-to-date. Merging net/master (a622260 ip_tunnel: fix kernel panic with icmp_dest_unreach) $ git merge net/master Merge made by the 'recursive' strategy. drivers/net/ethernet/qlogic/qlge/qlge_main.c | 1 + drivers/ptp/ptp_pch.c | 8 +++++--- net/ipv4/ip_tunnel.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) Merging ipsec/master (da241ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge ipsec/master Already up-to-date. Merging sound-current/for-linus (d47333d ALSA: usb-6fire: Modify firmware version check) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. sound/usb/6fire/firmware.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Merging pci-current/for-linus (f3f0117 Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0") $ git merge pci-current/for-linus Already up-to-date. Merging wireless/master (86c157b ath9k_hw: improve performance for AR934x v1.3+) $ git merge wireless/master Merge made by the 'recursive' strategy. drivers/net/wireless/ath/ath9k/ar9003_phy.c | 3 +- drivers/net/wireless/ath/ath9k/ath9k.h | 14 +-- drivers/net/wireless/ath/ath9k/hw.c | 25 +++-- drivers/net/wireless/ath/ath9k/mac.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 3 +- drivers/net/wireless/ath/ath9k/rc.c | 5 +- drivers/net/wireless/ath/ath9k/reg.h | 11 +++ drivers/net/wireless/ath/ath9k/xmit.c | 138 ++++++++-------------------- drivers/net/wireless/atmel.c | 2 +- drivers/nfc/Kconfig | 2 +- drivers/nfc/mei_phy.c | 9 ++ drivers/nfc/microread/mei.c | 20 +--- drivers/nfc/pn544/mei.c | 20 +--- net/nfc/Makefile | 1 - 14 files changed, 98 insertions(+), 157 deletions(-) Merging driver-core.current/driver-core-linus (e4aa937 Linux 3.10-rc3) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (e4aa937 Linux 3.10-rc3) $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus (e4aa937 Linux 3.10-rc3) $ git merge usb.current/usb-linus Already up-to-date. Merging staging.current/staging-linus (e4aa937 Linux 3.10-rc3) $ git merge staging.current/staging-linus Already up-to-date. Merging char-misc.current/char-misc-linus (e4aa937 Linux 3.10-rc3) $ git merge char-misc.current/char-misc-linus Already up-to-date. Merging input-current/for-linus (c73a1af Input: wacom - add an eraser to DTH2242/DTK2241) $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array) $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master (286233e crypto: caam - fix inconsistent assoc dma mapping direction) $ git merge crypto-current/master Merge made by the 'recursive' strategy. drivers/crypto/caam/caamalg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) $ git merge ide/master Merge made by the 'recursive' strategy. drivers/ide/gayle.c | 15 +-------------- drivers/ide/tx4938ide.c | 13 +------------ drivers/ide/tx4939ide.c | 13 +------------ 3 files changed, 3 insertions(+), 38 deletions(-) Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) $ git merge dwmw2/master Already up-to-date. Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) $ git merge sh-current/sh-fixes-for-linus Already up-to-date. Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) $ git merge irqdomain-current/irqdomain/merge Already up-to-date. Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS) $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) $ git merge spi-current/spi/merge Already up-to-date. Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect) $ git merge gpio-current/gpio/merge Already up-to-date. Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header) $ git merge rr-fixes/fixes Already up-to-date. Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) $ git merge mfd-fixes/master Already up-to-date. Merging vfio-fixes/for-linus (904c680 vfio-pci: Fix possible integer overflow) $ git merge vfio-fixes/for-linus Already up-to-date. Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) $ git merge asm-generic/master Already up-to-date. Merging arc/for-next (41dbd63 ARC: Trim arcregs.h) $ git merge arc/for-next Merge made by the 'recursive' strategy. arch/arc/include/asm/arcregs.h | 100 +---------------------------------------- arch/arc/include/asm/cache.h | 35 +++++++++++++++ arch/arc/include/asm/mmu.h | 46 +++++++++++++++++++ arch/arc/kernel/entry.S | 8 +--- arch/arc/kernel/time.c | 11 +++++ arch/arc/mm/fault.c | 1 + arch/arc/mm/tlb.c | 6 ++- 7 files changed, 102 insertions(+), 105 deletions(-) Merging arm/for-next (b59c112 Merge branches 'devel-stable', 'fixes', 'misc' and 'mmci' into for-next) $ git merge arm/for-next Removing arch/arm/mach-virt/platsmp.c Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/arm/l2cc.txt | 3 + arch/arm/Kconfig | 4 +- arch/arm/Kconfig-nommu | 2 +- arch/arm/Makefile | 1 + arch/arm/boot/compressed/atags_to_fdt.c | 44 ++++++- arch/arm/boot/dts/bcm11351.dtsi | 8 +- arch/arm/include/asm/assembler.h | 17 ++- arch/arm/include/asm/cputype.h | 44 ++++++- arch/arm/include/asm/div64.h | 2 +- arch/arm/include/asm/glue-cache.h | 27 ++++ arch/arm/include/asm/glue-df.h | 8 ++ arch/arm/include/asm/glue-proc.h | 9 ++ arch/arm/include/asm/io.h | 8 +- arch/arm/include/asm/irqflags.h | 22 +++- arch/arm/include/asm/mach/arch.h | 5 + arch/arm/include/asm/psci.h | 9 ++ arch/arm/include/asm/ptrace.h | 4 + arch/arm/include/asm/system_info.h | 1 + arch/arm/include/asm/v7m.h | 44 +++++++ arch/arm/include/uapi/asm/ptrace.h | 35 ++++-- arch/arm/kernel/Makefile | 13 +- arch/arm/kernel/entry-common.S | 4 + arch/arm/kernel/entry-header.S | 124 +++++++++++++++++++ arch/arm/kernel/entry-v7m.S | 143 +++++++++++++++++++++ arch/arm/kernel/head-nommu.S | 10 +- arch/arm/kernel/psci.c | 7 +- arch/arm/kernel/psci_smp.c | 84 +++++++++++++ arch/arm/kernel/setup.c | 33 ++++- arch/arm/kernel/traps.c | 8 ++ arch/arm/mach-ebsa110/core.c | 2 +- arch/arm/mach-imx/mm-imx3.c | 2 +- arch/arm/mach-iop13xx/io.c | 2 +- arch/arm/mach-ixp4xx/common.c | 2 +- arch/arm/mach-msm/common.h | 2 +- arch/arm/mach-msm/io.c | 2 +- arch/arm/mach-virt/Makefile | 1 - arch/arm/mach-virt/platsmp.c | 50 -------- arch/arm/mach-virt/virt.c | 3 - arch/arm/mm/Kconfig | 21 +++- arch/arm/mm/Makefile | 2 + arch/arm/mm/cache-l2x0.c | 158 +++++++++++++++++++++++ arch/arm/mm/cache-nop.S | 50 ++++++++ arch/arm/mm/dma-mapping.c | 20 ++- arch/arm/mm/ioremap.c | 10 +- arch/arm/mm/nommu.c | 13 +- arch/arm/mm/proc-v7m.S | 157 +++++++++++++++++++++++ drivers/mmc/host/mmci.c | 165 +++++++++++++++++++------ drivers/mmc/host/mmci.h | 4 + 48 files changed, 1231 insertions(+), 158 deletions(-) create mode 100644 arch/arm/include/asm/v7m.h create mode 100644 arch/arm/kernel/entry-v7m.S create mode 100644 arch/arm/kernel/psci_smp.c delete mode 100644 arch/arm/mach-virt/platsmp.c create mode 100644 arch/arm/mm/cache-nop.S create mode 100644 arch/arm/mm/proc-v7m.S Merging arm-perf/for-next/perf (c778879 Linux 3.10-rc2) $ git merge arm-perf/for-next/perf Already up-to-date. Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) $ git merge davinci/davinci-next Already up-to-date. Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu) $ git merge xilinx/arm-next Resolved 'arch/arm/mach-highbank/highbank.c' using previous resolution. Resolved 'arch/arm/mach-imx/mach-imx6q.c' using previous resolution. Resolved 'arch/arm/mach-spear/spear13xx.c' using previous resolution. Resolved 'arch/arm/mach-vexpress/v2m.c' using previous resolution. Resolved 'arch/arm/mach-zynq/platsmp.c' using previous resolution. Resolved 'drivers/clocksource/Makefile' using previous resolution. Resolved 'drivers/clocksource/tegra20_timer.c' using previous resolution. Auto-merging drivers/clocksource/tegra20_timer.c CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c Auto-merging drivers/clocksource/Makefile CONFLICT (content): Merge conflict in drivers/clocksource/Makefile Auto-merging arch/arm/mach-zynq/platsmp.c CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c Auto-merging arch/arm/mach-vexpress/v2m.c CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c Auto-merging arch/arm/mach-spear/spear13xx.c CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c Auto-merging arch/arm/mach-imx/mach-imx6q.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c Auto-merging arch/arm/mach-highbank/highbank.c CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4e0c2b8] Merge remote-tracking branch 'xilinx/arm-next' $ git diff -M --stat --summary HEAD^.. Merging arm64/upstream (6427ae7 arm64: Provide default implementation for dma_{alloc,free}_attrs) $ git merge arm64/upstream Merge made by the 'recursive' strategy. arch/arm64/include/asm/dma-mapping.h | 17 +++++++++++------ arch/arm64/kernel/arm64ksyms.c | 1 + arch/arm64/kernel/traps.c | 5 +++-- arch/arm64/mm/fault.c | 3 ++- 4 files changed, 17 insertions(+), 9 deletions(-) Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcplb map for BF60x) $ git merge blackfin/blackfin-linus Already up-to-date. Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore) $ git merge c6x/for-linux-next Already up-to-date. Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file) $ git merge cris/for-next Auto-merging arch/cris/include/asm/processor.h Auto-merging arch/cris/arch-v32/drivers/Kconfig Auto-merging arch/cris/Kconfig Merge made by the 'recursive' strategy. arch/cris/Kconfig | 81 ------- arch/cris/arch-v10/drivers/Kconfig | 70 ------ arch/cris/arch-v10/drivers/Makefile | 2 - arch/cris/arch-v32/drivers/Kconfig | 394 ---------------------------------- arch/cris/arch-v32/mach-a3/Kconfig | 4 - arch/cris/include/asm/processor.h | 1 - arch/cris/include/uapi/asm/kvm_para.h | 1 + 7 files changed, 1 insertion(+), 552 deletions(-) create mode 100644 arch/cris/include/uapi/asm/kvm_para.h Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) $ git merge hexagon/linux-next Already up-to-date. Merging ia64/next (797f6a6 Add size restriction to the kdump documentation) $ git merge ia64/next Already up-to-date. Merging m68k/for-next (f2c23a7 m68k/sun3: remove inline marking of EXPORT_SYMBOL functions) $ git merge m68k/for-next Removing arch/m68k/lib/string.c Merge made by the 'recursive' strategy. arch/m68k/include/asm/string.h | 32 -------------------------------- arch/m68k/lib/Makefile | 2 +- arch/m68k/lib/string.c | 22 ---------------------- arch/m68k/sun3/sun3dvma.c | 2 +- drivers/scsi/a3000.c | 13 +------------ drivers/scsi/a4000t.c | 15 +-------------- 6 files changed, 4 insertions(+), 82 deletions(-) delete mode 100644 arch/m68k/lib/string.c Merging m68knommu/for-next (2842e5b0 m68knommu: enable Timer on coldfire 532x) $ git merge m68knommu/for-next Already up-to-date. Merging metag/for-next (164c013 metag: defconfigs: increase log buffer 8KiB => 128KiB) $ git merge metag/for-next Already up-to-date. Merging microblaze/next (b5dd0bb microblaze: Use proper casting for inb/inw/inl in io.h) $ git merge microblaze/next Merge made by the 'recursive' strategy. arch/microblaze/include/asm/io.h | 6 +++--- arch/microblaze/kernel/cpu/cache.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) Merging mips/mips-for-linux-next (324fe08f Merge branch '3.10-fixes' into mips-for-linux-next) $ git merge mips/mips-for-linux-next Auto-merging drivers/usb/host/Kconfig Merge made by the 'recursive' strategy. arch/mips/Kconfig | 19 ++----------- arch/mips/cavium-octeon/Kconfig | 17 ++++-------- arch/mips/cavium-octeon/Platform | 8 +++--- arch/mips/cavium-octeon/setup.c | 29 ++------------------ arch/mips/configs/cavium_octeon_defconfig | 2 +- .../asm/mach-cavium-octeon/kernel-entry-init.h | 7 +---- arch/mips/include/asm/ptrace.h | 32 ++++++++++++++++++++++ arch/mips/include/uapi/asm/ptrace.h | 17 ++---------- arch/mips/kernel/traps.c | 28 ++++++++++--------- arch/mips/mm/tlbex.c | 4 --- arch/mips/pci/Makefile | 4 +-- arch/mips/powertv/asic/asic_devices.c | 13 ++------- drivers/ata/Kconfig | 2 +- drivers/char/hw_random/Kconfig | 2 +- drivers/edac/Kconfig | 6 ++-- drivers/i2c/busses/Kconfig | 2 +- drivers/net/ethernet/octeon/Kconfig | 2 +- drivers/net/phy/Kconfig | 2 +- drivers/spi/Kconfig | 2 +- drivers/staging/octeon/Kconfig | 2 +- drivers/usb/host/Kconfig | 4 +-- drivers/watchdog/Kconfig | 2 +- 22 files changed, 82 insertions(+), 124 deletions(-) Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) $ git merge openrisc/for-upstream Already up-to-date. Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) $ git merge parisc/for-next Already up-to-date. Merging parisc-hd/for-next (1c92ce8 parisc: use arch_spinlock_t instead of raw_spinlock_t in irqstacks) $ git merge parisc-hd/for-next Resolved 'arch/parisc/include/asm/processor.h' using previous resolution. Resolved 'arch/parisc/kernel/irq.c' using previous resolution. Auto-merging arch/parisc/kernel/irq.c CONFLICT (content): Merge conflict in arch/parisc/kernel/irq.c Auto-merging arch/parisc/include/asm/processor.h CONFLICT (content): Merge conflict in arch/parisc/include/asm/processor.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 8e3d7ce] Merge remote-tracking branch 'parisc-hd/for-next' $ git diff -M --stat --summary HEAD^.. kernel/cpu/idle.c | 1 + 1 file changed, 1 insertion(+) Merging powerpc/next (519fe2e Merge branch 'leds-fixes-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) $ git merge powerpc/next Already up-to-date. Merging 4xx/next (2074b1d powerpc: Fix irq distribution) $ git merge 4xx/next Already up-to-date. Merging mpc5xxx/next (a4f4124 powerpc/mpc512x: initialize board restart earlier) $ git merge mpc5xxx/next Merge made by the 'recursive' strategy. arch/powerpc/include/asm/mpc5121.h | 1 - arch/powerpc/platforms/512x/mpc5121_ads.c | 6 ++---- arch/powerpc/platforms/512x/mpc512x.h | 11 ++--------- arch/powerpc/platforms/512x/mpc512x_generic.c | 4 ++-- arch/powerpc/platforms/512x/mpc512x_shared.c | 16 ++++++++++++++-- arch/powerpc/platforms/512x/pdm360ng.c | 4 ++-- 6 files changed, 22 insertions(+), 20 deletions(-) Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) $ git merge galak/next Already up-to-date. Merging s390/features (a78eac0 s390,sclp: add parameter to specify number of buffer pages) $ git merge s390/features Merge made by the 'recursive' strategy. arch/s390/include/asm/dma-mapping.h | 2 +- arch/s390/include/asm/io.h | 23 +------------------ arch/s390/kernel/smp.c | 32 ++++++++++----------------- arch/s390/pci/pci_dma.c | 6 ++--- arch/s390/pci/pci_sysfs.c | 8 +++---- drivers/s390/char/sclp.c | 15 +++++++++++++ drivers/s390/char/sclp.h | 4 +++- drivers/s390/char/sclp_con.c | 2 +- drivers/s390/char/sclp_vt220.c | 2 +- drivers/s390/cio/qdio_main.c | 44 ------------------------------------- include/asm-generic/io.h | 4 ++++ 11 files changed, 45 insertions(+), 97 deletions(-) Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) $ git merge sh/sh-latest Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution. Auto-merging arch/sh/kernel/cpu/sh2a/Makefile CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 559157f] Merge remote-tracking branch 'sh/sh-latest' $ git diff -M --stat --summary HEAD^.. .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++ arch/sh/include/asm/hw_breakpoint.h | 12 +- arch/sh/include/cpu-common/cpu/ubc.h | 17 +++ arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++ arch/sh/kernel/cpu/sh2a/Makefile | 1 + arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++ arch/sh/kernel/hw_breakpoint.c | 8 ++ drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++- include/linux/serial_sci.h | 4 + 9 files changed, 375 insertions(+), 15 deletions(-) create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) $ git merge sparc-next/master Already up-to-date. Merging tile/master (9fc1894 arch/tile: Fix syscall return value passed to tracepoint) $ git merge tile/master Already up-to-date. Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/for_next (51fc41a xtensa: fix fast_store_prohibited _PAGE_WRITABLE_BIT test) $ git merge xtensa/for_next Merge made by the 'recursive' strategy. arch/xtensa/include/asm/pgtable.h | 140 ++++++++++++++++++++++---------------- arch/xtensa/kernel/entry.S | 7 +- 2 files changed, 89 insertions(+), 58 deletions(-) Merging btrfs/next (667e7d9 Btrfs: allow superblock mismatch from older mkfs) $ git merge btrfs/next Already up-to-date. Merging ceph/testing (cb53a7e rbd: drop original request earlier for existence check) $ git merge ceph/testing Auto-merging drivers/block/rbd.c Merge made by the 'recursive' strategy. drivers/block/rbd.c | 40 ++++++++++++++------------- fs/ceph/locks.c | 75 ++++++++++++++++++++++++++++++++------------------- fs/ceph/mds_client.c | 65 +++++++++++++++++++++++--------------------- fs/ceph/super.h | 9 +++++-- net/ceph/osd_client.c | 2 +- 5 files changed, 112 insertions(+), 79 deletions(-) Merging cifs/for-next (e078371 cifs: throw a warning if negotiate or sess_setup ops are passed NULL server or session pointers) $ git merge cifs/for-next Merge made by the 'recursive' strategy. fs/cifs/cifs_dfs_ref.c | 141 +++++++++++++++++++++++++------------------------ fs/cifs/cifsencrypt.c | 1 - fs/cifs/cifsfs.c | 3 -- fs/cifs/cifsglob.h | 7 +-- fs/cifs/cifssmb.c | 11 ++-- fs/cifs/connect.c | 32 +++++++---- fs/cifs/dns_resolve.c | 4 +- fs/cifs/sess.c | 22 ++++---- fs/cifs/smb2pdu.c | 20 +++---- 9 files changed, 120 insertions(+), 121 deletions(-) Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next (c15cddd ecryptfs: fixed msync to flush data) $ git merge ecryptfs/next Merge made by the 'recursive' strategy. fs/ecryptfs/file.c | 1 + 1 file changed, 1 insertion(+) Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset) $ git merge ext3/for_next Already up-to-date. Merging ext4/dev (e2555fd jbd,jbd2: fix oops in jbd2_journal_put_journal_head()) $ git merge ext4/dev Already up-to-date. Merging f2fs/dev (e8c6ab0 f2fs: use ihold) $ git merge f2fs/dev Merge made by the 'recursive' strategy. fs/f2fs/checkpoint.c | 23 ++++++++++ fs/f2fs/data.c | 32 +++++++++----- fs/f2fs/debug.c | 4 +- fs/f2fs/dir.c | 87 +++++++++++++++++++----------------- fs/f2fs/f2fs.h | 27 ++++++++--- fs/f2fs/file.c | 18 ++++---- fs/f2fs/inode.c | 9 +--- fs/f2fs/namei.c | 6 +-- fs/f2fs/node.c | 24 +++++----- fs/f2fs/recovery.c | 123 +++++++++++++++++++++++++++++++-------------------- fs/f2fs/segment.c | 18 ++++---- fs/f2fs/super.c | 2 +- 12 files changed, 221 insertions(+), 152 deletions(-) Merging fscache/fscache (ccce57f FS-Cache: Don't use spin_is_locked() in assertions) $ git merge fscache/fscache Auto-merging include/linux/wait.h Merge made by the 'recursive' strategy. fs/cachefiles/interface.c | 13 +- fs/cachefiles/namei.c | 10 +- fs/cachefiles/xattr.c | 6 +- fs/fscache/cache.c | 34 +- fs/fscache/cookie.c | 93 ++-- fs/fscache/fsdef.c | 1 + fs/fscache/internal.h | 11 +- fs/fscache/main.c | 11 +- fs/fscache/netfs.c | 1 + fs/fscache/object-list.c | 103 ++-- fs/fscache/object.c | 1106 +++++++++++++++++++++-------------------- fs/fscache/operation.c | 37 +- fs/fscache/page.c | 65 ++- include/linux/fscache-cache.h | 175 +++---- include/linux/wait.h | 24 + kernel/wait.c | 88 ++++ 16 files changed, 956 insertions(+), 822 deletions(-) Merging fuse/for-next (bee6c30 fuse: update inode size and invalidate attributes on fallocate) $ git merge fuse/for-next Merge made by the 'recursive' strategy. fs/fuse/file.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) Merging gfs2/master (6509813 GFS2: Set log descriptor type for jdata blocks) $ git merge gfs2/master Merge made by the 'recursive' strategy. fs/gfs2/lops.c | 25 +++++++++++++++++++------ fs/gfs2/lops.h | 1 - 2 files changed, 19 insertions(+), 7 deletions(-) Merging jfs/jfs-next (95bbb82 fs/jfs: Add check if journaling to disk has been disabled in lbmRead()) $ git merge jfs/jfs-next Merge made by the 'recursive' strategy. fs/jfs/jfs_logmgr.c | 8 +++++++- fs/jfs/super.c | 38 ++++++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 9 deletions(-) Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) $ git merge logfs/master Auto-merging fs/logfs/super.c Merge made by the 'recursive' strategy. fs/logfs/dev_mtd.c | 2 +- fs/logfs/super.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Merging nfs/linux-next (088499a SUNRPC: Remove redundant call to rpc_set_running() in __rpc_execute()) $ git merge nfs/linux-next Merge made by the 'recursive' strategy. fs/nfs/blocklayout/blocklayout.c | 2 +- fs/nfs/nfs4_fs.h | 2 +- fs/nfs/nfs4filelayout.c | 3 +- fs/nfs/nfs4filelayout.h | 3 +- fs/nfs/nfs4filelayoutdev.c | 7 +++- fs/nfs/nfs4proc.c | 85 ++++++++++++++++++++++++++++++---------- fs/nfs/nfs4state.c | 13 ++++-- fs/nfs/objlayout/objlayout.c | 3 +- fs/nfs/pnfs.c | 4 +- fs/nfs/pnfs.h | 3 +- include/linux/nfs_xdr.h | 1 + include/linux/sunrpc/sched.h | 20 ---------- net/sunrpc/sched.c | 19 ++------- 13 files changed, 97 insertions(+), 68 deletions(-) Merging nfsd/nfsd-next (ba4e55b nfsd4: fix compile in !CONFIG_NFSD_V4_SECURITY_LABEL case) $ git merge nfsd/nfsd-next Merge made by the 'recursive' strategy. fs/nfsd/Kconfig | 16 ++++++++ fs/nfsd/nfs4proc.c | 41 +++++++++++++++++++ fs/nfsd/nfs4state.c | 2 +- fs/nfsd/nfs4xdr.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++---- fs/nfsd/nfsd.h | 26 ++++++++++-- fs/nfsd/vfs.c | 28 +++++++++++++ fs/nfsd/vfs.h | 7 +--- fs/nfsd/xdr4.h | 4 ++ include/linux/nfs4.h | 9 ++++ net/sunrpc/xprtsock.c | 1 - security/capability.c | 2 +- 11 files changed, 228 insertions(+), 19 deletions(-) Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) $ git merge ocfs2/linux-next Auto-merging fs/ocfs2/dlm/dlmrecovery.c Auto-merging fs/ocfs2/dlm/dlmmaster.c Auto-merging fs/ocfs2/cluster/heartbeat.c Merge made by the 'recursive' strategy. fs/ocfs2/cluster/heartbeat.c | 40 +++++++++------------------------------- fs/ocfs2/cluster/masklog.h | 3 ++- fs/ocfs2/dlm/dlmmaster.c | 8 +++++++- fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ 4 files changed, 25 insertions(+), 33 deletions(-) Merging omfs/for-next (976d167 Linux 3.1-rc9) $ git merge omfs/for-next Already up-to-date. Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next (c1be5a5 Linux 3.9) $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next (c1be5a5 Linux 3.9) $ git merge ubifs/linux-next Already up-to-date. Merging xfs/for-next (ad1858d xfs: rework remote attr CRCs) $ git merge xfs/for-next Resolved 'fs/xfs/xfs_attr_leaf.c' using previous resolution. Auto-merging fs/xfs/xfs_buf.c Auto-merging fs/xfs/xfs_attr_leaf.c CONFLICT (content): Merge conflict in fs/xfs/xfs_attr_leaf.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ee3dce9] Merge remote-tracking branch 'xfs/for-next' $ git diff -M --stat --summary HEAD^.. fs/xfs/xfs_alloc.c | 24 ++- fs/xfs/xfs_attr_leaf.c | 71 ++++++--- fs/xfs/xfs_attr_remote.c | 408 +++++++++++++++++++++++++++++------------------ fs/xfs/xfs_attr_remote.h | 10 ++ fs/xfs/xfs_buf.c | 1 + fs/xfs/xfs_qm_syscalls.c | 40 +++-- 6 files changed, 348 insertions(+), 206 deletions(-) Merging vfs/for-next (ac3e3c5 don't bother with deferred freeing of fdtables) $ git merge vfs/for-next Already up-to-date. Merging pci/next (b194dbf Merge branch 'pci/kevin-bus-to-resource' into next) $ git merge pci/next Auto-merging drivers/acpi/pci_root.c Merge made by the 'recursive' strategy. arch/powerpc/kernel/pci_of_scan.c | 2 +- arch/sparc/kernel/pci.c | 2 +- drivers/acpi/pci_root.c | 7 +++---- drivers/pci/pcie/aspm.c | 16 +++++++++++++--- drivers/pci/probe.c | 31 +++++++++++++++++++++++++------ drivers/pci/quirks.c | 25 +++++++++++++++++++++++++ 6 files changed, 68 insertions(+), 15 deletions(-) Merging hid/for-next (0f533d8 Merge branch 'for-3.11/upstream' into for-next) $ git merge hid/for-next Merge made by the 'recursive' strategy. drivers/hid/hid-core.c | 2 ++ drivers/hid/hid-ids.h | 14 ++++++++++---- drivers/hid/hid-multitouch.c | 34 ++++++++++++++++++---------------- 3 files changed, 30 insertions(+), 20 deletions(-) Merging i2c/i2c/for-next (e9b526f i2c: suppress lockdep warning on delete_device) $ git merge i2c/i2c/for-next Already up-to-date. Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge jdelvare-hwmon/master Already up-to-date. Merging hwmon-staging/hwmon-next (a63243b hwmon: (ds1621) Add ds1631 chip support to ds1621 driver and documentation) $ git merge hwmon-staging/hwmon-next Merge made by the 'recursive' strategy. Documentation/hwmon/ds1621 | 112 ++++++++++++++++++++++-- drivers/hwmon/Kconfig | 10 ++- drivers/hwmon/abituguru3.c | 1 - drivers/hwmon/coretemp.c | 2 - drivers/hwmon/ds1621.c | 193 +++++++++++++++++++++++++++++++++++++---- drivers/hwmon/i5k_amb.c | 2 - drivers/hwmon/ntc_thermistor.c | 1 - drivers/hwmon/w83627ehf.c | 2 - 8 files changed, 291 insertions(+), 32 deletions(-) Merging v4l-dvb/master (f6b831f Merge /home/v4l/v4l/patchwork) $ git merge v4l-dvb/master Merge made by the 'recursive' strategy. Documentation/DocBook/media/v4l/dev-codec.xml | 35 ++-- .../devicetree/bindings/media/exynos-fimc-lite.txt | 2 +- Documentation/video4linux/CARDLIST.bttv | 3 + Documentation/video4linux/CARDLIST.saa7134 | 1 + Documentation/video4linux/CARDLIST.tuner | 6 +- drivers/media/common/siano/smscoreapi.c | 6 +- drivers/media/common/siano/smsdvb-main.c | 1 + drivers/media/i2c/ad9389b.c | 8 +- drivers/media/i2c/adp1653.c | 5 +- drivers/media/i2c/adv7170.c | 3 +- drivers/media/i2c/adv7175.c | 3 +- drivers/media/i2c/adv7180.c | 23 ++- drivers/media/i2c/adv7183.c | 38 ++-- drivers/media/i2c/adv7393.c | 8 +- drivers/media/i2c/adv7604.c | 11 +- drivers/media/i2c/ak881x.c | 4 +- drivers/media/i2c/as3645a.c | 7 +- drivers/media/i2c/bt819.c | 4 +- drivers/media/i2c/bt856.c | 3 +- drivers/media/i2c/bt866.c | 3 +- drivers/media/i2c/cs5345.c | 4 +- drivers/media/i2c/cs53l32a.c | 4 +- drivers/media/i2c/cx25840/cx25840-core.c | 4 +- drivers/media/i2c/cx25840/cx25840-ir.c | 7 +- drivers/media/i2c/ir-kbd-i2c.c | 10 +- drivers/media/i2c/ks0127.c | 3 +- drivers/media/i2c/m52790.c | 3 +- drivers/media/i2c/m5mols/m5mols_core.c | 43 ++--- drivers/media/i2c/msp3400-driver.c | 5 +- drivers/media/i2c/mt9m032.c | 4 +- drivers/media/i2c/mt9p031.c | 14 +- drivers/media/i2c/mt9t001.c | 4 +- drivers/media/i2c/mt9v011.c | 6 +- drivers/media/i2c/mt9v032.c | 8 +- drivers/media/i2c/noon010pc30.c | 40 ++-- drivers/media/i2c/ov7640.c | 5 +- drivers/media/i2c/ov7670.c | 5 +- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 81 +++----- drivers/media/i2c/s5k6aa.c | 73 +++---- drivers/media/i2c/saa6588.c | 10 +- drivers/media/i2c/saa7110.c | 4 +- drivers/media/i2c/saa7115.c | 213 +++++++++++++++------ drivers/media/i2c/saa7127.c | 4 +- drivers/media/i2c/saa717x.c | 5 +- drivers/media/i2c/saa7185.c | 3 +- drivers/media/i2c/saa7191.c | 4 +- drivers/media/i2c/smiapp/smiapp-core.c | 18 +- drivers/media/i2c/sony-btf-mpx.c | 3 +- drivers/media/i2c/sr030pc30.c | 4 +- drivers/media/i2c/tda7432.c | 4 +- drivers/media/i2c/tda9840.c | 3 +- drivers/media/i2c/tea6415c.c | 3 +- drivers/media/i2c/tea6420.c | 3 +- drivers/media/i2c/tlv320aic23b.c | 4 +- drivers/media/i2c/tvaudio.c | 5 +- drivers/media/i2c/tvp514x.c | 1 - drivers/media/i2c/tvp5150.c | 14 +- drivers/media/i2c/tvp7002.c | 96 +++++++++- drivers/media/i2c/tw2804.c | 5 +- drivers/media/i2c/tw9903.c | 5 +- drivers/media/i2c/tw9906.c | 5 +- drivers/media/i2c/uda1342.c | 3 +- drivers/media/i2c/upd64031a.c | 3 +- drivers/media/i2c/upd64083.c | 3 +- drivers/media/i2c/vp27smpx.c | 3 +- drivers/media/i2c/vpx3220.c | 5 +- drivers/media/i2c/vs6624.c | 20 +- drivers/media/i2c/wm8739.c | 4 +- drivers/media/i2c/wm8775.c | 4 +- drivers/media/pci/bt8xx/bttv-cards.c | 52 ++++- drivers/media/pci/bt8xx/bttv.h | 4 + drivers/media/pci/mantis/mantis_vp1041.c | 2 +- drivers/media/pci/ttpci/budget-av.c | 2 +- drivers/media/pci/ttpci/budget-ci.c | 2 +- drivers/media/platform/blackfin/bfin_capture.c | 28 ++- drivers/media/platform/blackfin/ppi.c | 12 ++ drivers/media/platform/davinci/vpbe_display.c | 17 +- drivers/media/platform/davinci/vpbe_osd.c | 24 +-- drivers/media/platform/davinci/vpfe_capture.c | 3 +- drivers/media/platform/davinci/vpif_capture.c | 19 +- drivers/media/platform/davinci/vpif_capture.h | 5 +- drivers/media/platform/davinci/vpif_display.c | 25 +-- drivers/media/platform/davinci/vpif_display.h | 5 +- drivers/media/platform/exynos4-is/fimc-is-regs.c | 2 +- drivers/media/platform/exynos4-is/mipi-csis.c | 2 +- drivers/media/platform/s3c-camif/camif-core.h | 2 +- drivers/media/radio/Kconfig | 1 + drivers/media/radio/radio-si476x.c | 2 +- drivers/media/radio/wl128x/fmdrv_common.c | 24 ++- drivers/media/rc/keymaps/Makefile | 1 + drivers/media/rc/keymaps/rc-delock-61959.c | 83 ++++++++ drivers/media/usb/Kconfig | 5 +- drivers/media/usb/dvb-usb/az6027.c | 2 +- drivers/media/usb/dvb-usb/pctv452e.c | 2 +- drivers/media/usb/em28xx/em28xx-cards.c | 16 ++ drivers/media/usb/em28xx/em28xx-dvb.c | 5 +- drivers/media/usb/em28xx/em28xx.h | 1 + drivers/media/usb/gspca/sonixb.c | 7 + drivers/media/usb/hdpvr/Kconfig | 2 +- drivers/media/usb/hdpvr/hdpvr-core.c | 8 - drivers/media/usb/hdpvr/hdpvr-video.c | 6 +- drivers/media/usb/pwc/pwc.h | 2 +- drivers/media/v4l2-core/videobuf-dma-contig.c | 19 +- drivers/media/v4l2-core/videobuf-dma-sg.c | 10 +- drivers/media/v4l2-core/videobuf-vmalloc.c | 10 +- .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 6 +- drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 38 ++-- include/media/davinci/vpbe_osd.h | 4 +- include/media/rc-map.h | 1 + include/media/tvp7002.h | 2 + include/media/v4l2-chip-ident.h | 2 + include/uapi/linux/videodev2.h | 2 +- 112 files changed, 792 insertions(+), 633 deletions(-) create mode 100644 drivers/media/rc/keymaps/rc-delock-61959.c Merging kbuild/for-next (cdb5ffd Merge branch 'kbuild/rc-fixes' into kbuild/for-next) $ git merge kbuild/for-next Merge made by the 'recursive' strategy. scripts/Makefile.headersinst | 20 ++++++++++++++------ scripts/headers_install.sh | 7 +++++-- 2 files changed, 19 insertions(+), 8 deletions(-) Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') $ git merge kconfig/for-next Already up-to-date. Merging libata/for-next (9d84c18 Merge branch 'for-3.11' into for-next) $ git merge libata/for-next Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/kernel-parameters.txt | 2 ++ drivers/ata/acard-ahci.c | 2 +- drivers/ata/ahci.c | 6 ++++-- drivers/ata/ahci.h | 3 ++- drivers/ata/ata_piix.c | 17 ++++++++++++++++- drivers/ata/libahci.c | 12 +++++++++++- drivers/ata/libata-core.c | 17 +++++++++++++---- drivers/ata/libata-eh.c | 2 +- drivers/ata/libata-scsi.c | 2 +- drivers/ata/libata-sff.c | 2 +- drivers/ata/libata-transport.c | 4 +++- drivers/ata/pata_arasan_cf.c | 2 +- drivers/ata/pata_at91.c | 2 +- drivers/ata/pata_bf54x.c | 10 ++++------ drivers/ata/pata_imx.c | 2 +- drivers/ata/pata_mpc52xx.c | 4 ++-- drivers/ata/pata_pxa.c | 2 +- drivers/ata/pdc_adma.c | 2 +- drivers/ata/sata_fsl.c | 14 +++++--------- drivers/ata/sata_promise.c | 2 +- drivers/ata/sata_rcar.c | 3 ++- drivers/ata/sata_sil.c | 2 +- drivers/ata/sata_sx4.c | 2 +- drivers/ata/sata_via.c | 2 +- include/linux/libata.h | 2 ++ 25 files changed, 79 insertions(+), 41 deletions(-) Merging infiniband/for-next (f1258ea Merge branches 'misc' and 'mlx4' into for-next) $ git merge infiniband/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) $ git merge pstore/master Already up-to-date. Merging pm/linux-next (2eb1255 Merge branch 'acpi-assorted-next' into linux-next) $ git merge pm/linux-next Auto-merging net/sunrpc/sched.c Auto-merging fs/nfs/nfs4proc.c Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-devices-online | 20 + Documentation/ABI/testing/sysfs-firmware-acpi | 10 + Documentation/acpi/apei/einj.txt | 8 +- arch/x86/include/asm/acpi.h | 2 +- arch/x86/kernel/acpi/boot.c | 7 + arch/x86/kernel/acpi/sleep.c | 4 +- arch/x86/kernel/acpi/sleep.h | 2 + drivers/acpi/Makefile | 1 + drivers/acpi/acpi_memhotplug.c | 53 +- drivers/acpi/acpi_processor.c | 483 +++++++++++++++ drivers/acpi/ec_sys.c | 18 +- drivers/acpi/glue.c | 6 +- drivers/acpi/internal.h | 5 + drivers/acpi/processor_driver.c | 807 +++---------------------- drivers/acpi/resource.c | 16 +- drivers/acpi/scan.c | 120 +++- drivers/acpi/sleep.c | 2 + drivers/acpi/sysfs.c | 31 + drivers/base/core.c | 130 ++++ drivers/base/cpu.c | 100 ++- drivers/base/memory.c | 114 ++-- drivers/i2c/busses/i2c-s3c2410.c | 8 +- drivers/pnp/manager.c | 14 +- drivers/staging/android/binder.c | 5 +- fs/cifs/transport.c | 2 +- fs/eventpoll.c | 4 +- fs/nfs/inode.c | 2 +- fs/nfs/nfs3proc.c | 2 +- fs/nfs/nfs4proc.c | 4 +- fs/select.c | 4 +- include/acpi/acpi_bus.h | 9 +- include/acpi/processor.h | 5 + include/linux/debug_locks.h | 4 +- include/linux/device.h | 21 + include/linux/freezer.h | 171 +++++- include/linux/memory_hotplug.h | 3 +- include/linux/pm.h | 2 + include/xen/acpi.h | 16 +- kernel/exit.c | 2 +- kernel/freezer.c | 12 + kernel/futex.c | 3 +- kernel/hrtimer.c | 3 +- kernel/lockdep.c | 17 +- kernel/power/process.c | 26 +- kernel/signal.c | 2 +- mm/memory_hotplug.c | 6 +- net/sunrpc/sched.c | 2 +- net/unix/af_unix.c | 3 +- 48 files changed, 1352 insertions(+), 939 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-devices-online create mode 100644 drivers/acpi/acpi_processor.c Merging idle/next (5c99726b Merge branch 'fspin' into next) $ git merge idle/next Merge made by the 'recursive' strategy. tools/power/fspin/Makefile | 21 +++ tools/power/fspin/fspin.1 | 68 +++++++ tools/power/fspin/fspin.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 532 insertions(+) create mode 100644 tools/power/fspin/Makefile create mode 100644 tools/power/fspin/fspin.1 create mode 100644 tools/power/fspin/fspin.c Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) $ git merge apm/for-next Already up-to-date. Merging cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next) $ git merge cpuidle/cpuidle-next Resolved 'drivers/acpi/processor_driver.c' using previous resolution. Resolved 'drivers/base/power/qos.c' using previous resolution. Auto-merging drivers/base/power/qos.c CONFLICT (content): Merge conflict in drivers/base/power/qos.c Auto-merging drivers/acpi/processor_driver.c CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ad01d76] Merge remote-tracking branch 'cpuidle/cpuidle-next' $ git diff -M --stat --summary HEAD^.. Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) $ git merge cpupowerutils/master Already up-to-date. Merging thermal/next (3a9d1f1 Thermal: core: Ask .get_trip_temp() to register thermal zone device.) $ git merge thermal/next Auto-merging drivers/thermal/exynos_thermal.c Auto-merging drivers/thermal/dove_thermal.c Auto-merging drivers/thermal/armada_thermal.c Merge made by the 'recursive' strategy. drivers/thermal/armada_thermal.c | 1 - drivers/thermal/dove_thermal.c | 8 +------- drivers/thermal/exynos_thermal.c | 3 --- drivers/thermal/kirkwood_thermal.c | 8 +------- drivers/thermal/rcar_thermal.c | 10 ++-------- drivers/thermal/spear_thermal.c | 16 +++++----------- drivers/thermal/thermal_core.c | 8 ++++++-- 7 files changed, 15 insertions(+), 39 deletions(-) Merging ieee1394/for-next (6fe9efb firewire: ohci: dump_stack() for PHY regs read/write failures) $ git merge ieee1394/for-next Already up-to-date. Merging ubi/linux-next (1557b9e UBI: do not abort init when ubi.mtd devices cannot be found) $ git merge ubi/linux-next Merge made by the 'recursive' strategy. drivers/mtd/ubi/build.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) Merging dlm/next (9000831 dlm: avoid unnecessary posix unlock) $ git merge dlm/next Already up-to-date. Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) $ git merge swiotlb/linux-next Already up-to-date. Merging scsi/for-next (222ab59 [SCSI] ipr: Avoid target_destroy accessing memory after it was freed) $ git merge scsi/for-next Merge made by the 'recursive' strategy. drivers/scsi/ipr.c | 16 ---------------- drivers/scsi/ipr.h | 6 +++--- drivers/scsi/qla2xxx/qla_inline.h | 11 +++++++++++ drivers/scsi/qla2xxx/qla_isr.c | 27 ++++----------------------- drivers/scsi/qla2xxx/qla_mbx.c | 2 -- drivers/scsi/qla2xxx/qla_mr.c | 10 ++-------- drivers/scsi/qla2xxx/qla_nx.c | 26 ++++++++++---------------- 7 files changed, 30 insertions(+), 68 deletions(-) Merging target-updates/for-next (c778879 Linux 3.10-rc2) $ git merge target-updates/for-next Already up-to-date. Merging target-merge/for-next-merge (c778879 Linux 3.10-rc2) $ git merge target-merge/for-next-merge Already up-to-date. Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) $ git merge ibft/linux-next Already up-to-date. Merging isci/all (6734092 isci: add a couple __iomem annotations) $ git merge isci/all Already up-to-date. Merging slave-dma/next (77eb140 Merge branch 'topic/of-imx' into next) $ git merge slave-dma/next Merge made by the 'recursive' strategy. .../devicetree/bindings/dma/fsl-imx-dma.txt | 48 +++++++ drivers/dma/at_hdmac.c | 142 +++++++++++++++++---- drivers/dma/at_hdmac_regs.h | 5 + drivers/dma/fsldma.c | 5 +- drivers/dma/imx-dma.c | 77 ++++++++++- drivers/dma/mxs-dma.c | 2 +- drivers/dma/of-dma.c | 17 +-- drivers/dma/ppc4xx/adma.c | 5 +- drivers/dma/ste_dma40.c | 8 +- include/linux/of_dma.h | 1 - include/linux/platform_data/dma-atmel.h | 4 + include/linux/platform_data/dma-imx.h | 6 +- 12 files changed, 266 insertions(+), 54 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-dma.txt Merging dmaengine/next (41ef2d5 Linux 3.9-rc7) $ git merge dmaengine/next Already up-to-date. Merging net-next/master (c48b22d tcp: Remove 2 indentation levels in tcp_rcv_state_process) $ git merge net-next/master Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c Merge made by the 'recursive' strategy. .../devicetree/bindings/net/davicom-dm9000.txt | 26 + .../devicetree/bindings/net/via-velocity.txt | 20 + .../devicetree/bindings/vendor-prefixes.txt | 1 + Documentation/networking/scaling.txt | 58 +++ Documentation/sysctl/net.txt | 3 +- arch/arm/net/bpf_jit_32.c | 18 +- arch/powerpc/net/bpf_jit_comp.c | 19 +- arch/sparc/net/bpf_jit_comp.c | 20 +- arch/x86/net/bpf_jit_comp.c | 61 ++- drivers/net/can/at91_can.c | 2 - drivers/net/can/c_can/c_can_platform.c | 2 - drivers/net/can/flexcan.c | 1 - drivers/net/can/grcan.c | 7 +- drivers/net/can/ti_hecc.c | 1 - drivers/net/ethernet/3com/3c509.c | 19 - drivers/net/ethernet/3com/3c59x.c | 17 +- drivers/net/ethernet/aeroflex/greth.c | 4 +- drivers/net/ethernet/alteon/acenic.c | 15 +- drivers/net/ethernet/amd/amd8111e.c | 13 +- drivers/net/ethernet/amd/sunlance.c | 6 +- drivers/net/ethernet/apple/bmac.c | 4 +- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 25 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 25 +- drivers/net/ethernet/atheros/atlx/atl1.c | 27 +- drivers/net/ethernet/broadcom/bnx2.c | 16 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 4 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 23 +- .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 54 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 2 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 38 +- drivers/net/ethernet/broadcom/sb1250-mac.c | 9 +- drivers/net/ethernet/broadcom/tg3.c | 390 ++++++++++----- drivers/net/ethernet/broadcom/tg3.h | 2 + drivers/net/ethernet/brocade/bna/bfa_defs.h | 3 +- drivers/net/ethernet/brocade/bna/bfa_ioc.c | 7 +- drivers/net/ethernet/brocade/bna/bfa_ioc.h | 2 + drivers/net/ethernet/brocade/bna/bna.h | 2 + drivers/net/ethernet/brocade/bna/bna_enet.c | 7 +- drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 15 + drivers/net/ethernet/brocade/bna/bnad.c | 3 + drivers/net/ethernet/brocade/bna/bnad.h | 2 +- drivers/net/ethernet/brocade/bna/cna.h | 4 +- drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 15 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 9 +- drivers/net/ethernet/chelsio/cxgb3/sge.c | 105 +++- drivers/net/ethernet/davicom/dm9000.c | 51 +- drivers/net/ethernet/dec/tulip/xircom_cb.c | 14 +- drivers/net/ethernet/emulex/benet/be_main.c | 62 ++- drivers/net/ethernet/freescale/fec_main.c | 11 +- drivers/net/ethernet/freescale/fec_mpc52xx.c | 9 +- .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 5 +- .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 6 +- drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 6 +- drivers/net/ethernet/freescale/gianfar.c | 6 +- drivers/net/ethernet/freescale/gianfar_ptp.c | 4 +- drivers/net/ethernet/freescale/ucc_geth.c | 4 +- drivers/net/ethernet/freescale/xgmac_mdio.c | 4 +- drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +- drivers/net/ethernet/ibm/emac/mal.c | 6 +- drivers/net/ethernet/ibm/emac/rgmii.c | 18 +- drivers/net/ethernet/ibm/emac/tah.c | 14 +- drivers/net/ethernet/ibm/emac/zmii.c | 18 +- drivers/net/ethernet/icplus/ipg.c | 13 +- drivers/net/ethernet/intel/e1000e/80003es2lan.c | 24 +- drivers/net/ethernet/intel/e1000e/82571.c | 30 +- drivers/net/ethernet/intel/e1000e/ethtool.c | 34 +- drivers/net/ethernet/intel/e1000e/hw.h | 34 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 62 +-- drivers/net/ethernet/intel/e1000e/netdev.c | 55 +- drivers/net/ethernet/intel/e1000e/nvm.c | 1 - drivers/net/ethernet/intel/e1000e/phy.c | 22 +- drivers/net/ethernet/intel/igb/e1000_82575.c | 120 ++++- drivers/net/ethernet/intel/igb/e1000_defines.h | 36 +- drivers/net/ethernet/intel/igb/e1000_hw.h | 2 + drivers/net/ethernet/intel/igb/e1000_i210.h | 6 +- drivers/net/ethernet/intel/igb/e1000_mac.c | 45 +- drivers/net/ethernet/intel/igb/e1000_phy.c | 124 +++++ drivers/net/ethernet/intel/igb/e1000_phy.h | 20 + drivers/net/ethernet/intel/igb/igb.h | 14 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 74 ++- drivers/net/ethernet/intel/igb/igb_main.c | 9 +- drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 23 + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h | 2 + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 3 + drivers/net/ethernet/korina.c | 5 +- drivers/net/ethernet/netx-eth.c | 4 +- drivers/net/ethernet/nvidia/forcedeth.c | 17 +- drivers/net/ethernet/octeon/octeon_mgmt.c | 4 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 27 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 77 +-- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 1 + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 35 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 39 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 45 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 15 + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 1 + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 85 ++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 2 + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 7 +- .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 36 ++ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 122 +++-- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 13 +- drivers/net/ethernet/sgi/ioc3-eth.c | 14 +- drivers/net/ethernet/silan/sc92031.c | 14 +- drivers/net/ethernet/sis/sis190.c | 13 +- drivers/net/ethernet/smsc/Kconfig | 2 +- drivers/net/ethernet/sun/niu.c | 5 +- drivers/net/ethernet/sun/sunbmac.c | 5 +- drivers/net/ethernet/sun/sungem.c | 13 +- drivers/net/ethernet/sun/sunhme.c | 4 +- drivers/net/ethernet/sun/sunqe.c | 10 +- drivers/net/ethernet/ti/tlan.c | 1 - drivers/net/ethernet/ti/tlan.h | 1 - drivers/net/ethernet/toshiba/tc35815.c | 14 +- drivers/net/ethernet/via/Kconfig | 3 +- drivers/net/ethernet/via/via-velocity.c | 507 ++++++++++++------- drivers/net/ethernet/via/via-velocity.h | 8 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 5 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +- drivers/net/fddi/skfp/skfddi.c | 13 +- drivers/net/hippi/rrunner.c | 13 +- drivers/net/phy/phy.c | 23 +- drivers/net/phy/phy_device.c | 8 +- drivers/net/usb/r8152.c | 14 +- drivers/net/vxlan.c | 263 +++++++--- drivers/net/xen-netback/common.h | 14 +- drivers/net/xen-netback/interface.c | 102 +++- drivers/net/xen-netback/netback.c | 38 +- drivers/net/xen-netback/xenbus.c | 46 +- drivers/net/xen-netfront.c | 205 ++++++-- include/linux/filter.h | 4 +- include/linux/netdevice.h | 18 + include/linux/phy.h | 14 + include/linux/tcp.h | 1 - include/net/if_inet6.h | 2 +- include/net/ipv6.h | 6 + include/net/ping.h | 49 +- include/net/tcp.h | 9 +- include/net/transp_v6.h | 3 + include/xen/interface/io/netif.h | 12 + net/Kconfig | 12 + net/bridge/br_device.c | 13 +- net/bridge/br_multicast.c | 70 +-- net/bridge/br_private.h | 2 + net/bridge/br_sysfs_br.c | 26 + net/core/dev.c | 52 +- net/core/net-procfs.c | 16 +- net/core/skbuff.c | 3 +- net/core/sysctl_net_core.c | 104 ++++ net/ipv4/icmp.c | 5 +- net/ipv4/ping.c | 557 +++++++++++++++------ net/ipv4/tcp.c | 98 +--- net/ipv4/tcp_input.c | 340 +++++-------- net/ipv4/tcp_ipv4.c | 10 +- net/ipv4/tcp_minisocks.c | 6 +- net/ipv6/Makefile | 2 +- net/ipv6/addrconf.c | 67 ++- net/ipv6/af_inet6.c | 12 + net/ipv6/icmp.c | 19 +- net/ipv6/ping.c | 216 ++++++++ net/sched/sch_tbf.c | 47 +- 162 files changed, 3797 insertions(+), 1999 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/davicom-dm9000.txt create mode 100644 Documentation/devicetree/bindings/net/via-velocity.txt create mode 100644 net/ipv6/ping.c Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table) $ git merge ipsec-next/master Already up-to-date. Merging wireless-next/master (bbf71a8 mwl8k: Fix the firmware hang issue for 8764) $ git merge wireless-next/master Auto-merging drivers/net/wireless/mwifiex/main.c Auto-merging drivers/net/wireless/mwifiex/cmdevt.c Auto-merging drivers/net/wireless/mwifiex/cfg80211.c Auto-merging drivers/net/wireless/ath/ath9k/main.c Auto-merging drivers/net/wireless/ath/ath9k/init.c Auto-merging drivers/net/wireless/ath/ath9k/hw.c Auto-merging drivers/net/wireless/ath/ath9k/debug.h Auto-merging drivers/net/wireless/ath/ath9k/debug.c Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h Auto-merging drivers/net/wireless/ath/ath9k/Kconfig Merge made by the 'recursive' strategy. drivers/bcma/sprom.c | 71 +- drivers/net/wireless/ath/ath9k/Kconfig | 8 - drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- drivers/net/wireless/ath/ath9k/beacon.c | 8 +- drivers/net/wireless/ath/ath9k/debug.c | 337 --------- drivers/net/wireless/ath/ath9k/debug.h | 20 - drivers/net/wireless/ath/ath9k/htc.h | 7 + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 5 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 7 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 29 +- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +- drivers/net/wireless/ath/ath9k/hw.c | 4 +- drivers/net/wireless/ath/ath9k/init.c | 3 - drivers/net/wireless/ath/ath9k/link.c | 1 - drivers/net/wireless/ath/ath9k/main.c | 13 +- drivers/net/wireless/ath/wil6210/Kconfig | 12 + drivers/net/wireless/ath/wil6210/Makefile | 21 +- drivers/net/wireless/ath/wil6210/debug.c | 69 ++ drivers/net/wireless/ath/wil6210/debugfs.c | 8 +- drivers/net/wireless/ath/wil6210/interrupt.c | 29 +- drivers/net/wireless/ath/wil6210/main.c | 6 + drivers/net/wireless/ath/wil6210/netdev.c | 54 ++ drivers/net/wireless/ath/wil6210/trace.c | 20 + drivers/net/wireless/ath/wil6210/trace.h | 235 +++++++ drivers/net/wireless/ath/wil6210/txrx.c | 175 +++-- drivers/net/wireless/ath/wil6210/txrx.h | 32 +- drivers/net/wireless/ath/wil6210/wil6210.h | 26 +- drivers/net/wireless/ath/wil6210/wmi.c | 8 +- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 3 +- drivers/net/wireless/mwifiex/Kconfig | 4 +- drivers/net/wireless/mwifiex/cfg80211.c | 77 +- drivers/net/wireless/mwifiex/cmdevt.c | 1 + drivers/net/wireless/mwifiex/fw.h | 17 + drivers/net/wireless/mwifiex/init.c | 53 +- drivers/net/wireless/mwifiex/main.c | 14 + drivers/net/wireless/mwifiex/main.h | 5 +- drivers/net/wireless/mwifiex/scan.c | 23 +- drivers/net/wireless/mwifiex/sdio.c | 463 ++++++++---- drivers/net/wireless/mwifiex/sdio.h | 340 ++++++--- drivers/net/wireless/mwifiex/sta_cmd.c | 62 ++ drivers/net/wireless/mwifiex/sta_cmdresp.c | 17 + drivers/net/wireless/mwifiex/uap_cmd.c | 21 + drivers/net/wireless/mwifiex/uap_event.c | 25 +- drivers/net/wireless/mwl8k.c | 11 +- drivers/net/wireless/rt2x00/rt2800lib.c | 782 +++++++++++++-------- drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 36 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 9 +- drivers/net/wireless/rt2x00/rt61pci.c | 2 +- include/linux/ssb/ssb_regs.h | 1 + 51 files changed, 2017 insertions(+), 1165 deletions(-) create mode 100644 drivers/net/wireless/ath/wil6210/debug.c create mode 100644 drivers/net/wireless/ath/wil6210/trace.c create mode 100644 drivers/net/wireless/ath/wil6210/trace.h Merging bluetooth/master (f639dcd Bluetooth: Add missing reset_resume dev_pm_ops) $ git merge bluetooth/master Auto-merging net/bluetooth/l2cap_sock.c Merge made by the 'recursive' strategy. drivers/bluetooth/btusb.c | 1 + include/net/bluetooth/hci.h | 1 - include/net/bluetooth/hci_core.h | 29 ++--- include/net/bluetooth/l2cap.h | 2 +- net/bluetooth/hci_core.c | 182 +++++++++--------------------- net/bluetooth/hci_event.c | 71 +----------- net/bluetooth/hidp/core.c | 14 +-- net/bluetooth/l2cap_core.c | 121 +++++++++++++------- net/bluetooth/l2cap_sock.c | 4 +- net/bluetooth/mgmt.c | 231 ++++++++++++++++++++++++++------------- net/bluetooth/smp.c | 4 +- 11 files changed, 315 insertions(+), 345 deletions(-) Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd) $ git merge mtd/master Already up-to-date. Merging l2-mtd/master (fc228fa mtd: increase max OOB size to 744) $ git merge l2-mtd/master Merge made by the 'recursive' strategy. arch/mips/bcm63xx/nvram.c | 11 + arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 + drivers/mtd/bcm63xxpart.c | 9 +- drivers/mtd/chips/cfi_cmdset_0002.c | 4 +- drivers/mtd/devices/bcm47xxsflash.c | 68 ++++++ drivers/mtd/devices/bcm47xxsflash.h | 2 + drivers/mtd/devices/block2mtd.c | 58 +++--- drivers/mtd/devices/elm.c | 6 +- drivers/mtd/devices/m25p80.c | 44 +++- drivers/mtd/devices/mtd_dataflash.c | 8 +- drivers/mtd/devices/spear_smi.c | 6 +- drivers/mtd/devices/sst25l.c | 6 +- drivers/mtd/nand/Kconfig | 2 +- drivers/mtd/nand/fsl_ifc_nand.c | 3 +- drivers/mtd/nand/fsmc_nand.c | 6 +- drivers/mtd/nand/gpio.c | 227 ++++++--------------- drivers/mtd/nand/nand_base.c | 19 +- drivers/mtd/nand/pxa3xx_nand.c | 93 +++------ drivers/mtd/nand/r852.c | 5 +- include/linux/mtd/nand.h | 6 +- 20 files changed, 272 insertions(+), 313 deletions(-) Merging crypto/master (74d24d8 crypto: sahara - remove dependency on EXPERIMENTAL) $ git merge crypto/master Merge made by the 'recursive' strategy. arch/x86/crypto/Makefile | 2 + arch/x86/crypto/crct10dif-pcl-asm_64.S | 643 ++++++++++++++++++++++++++++++++ arch/x86/crypto/crct10dif-pclmul_glue.c | 151 ++++++++ crypto/Kconfig | 19 + crypto/Makefile | 1 + crypto/crct10dif.c | 178 +++++++++ crypto/tcrypt.c | 8 + crypto/testmgr.c | 10 + crypto/testmgr.h | 33 ++ drivers/char/hw_random/atmel-rng.c | 2 - drivers/char/hw_random/bcm63xx-rng.c | 2 - drivers/char/hw_random/timeriomem-rng.c | 2 - drivers/char/hw_random/tx4939-rng.c | 1 - drivers/crypto/Kconfig | 2 +- drivers/crypto/caam/ctrl.c | 10 +- drivers/crypto/caam/regs.h | 42 ++- drivers/crypto/mv_cesa.c | 1 - drivers/crypto/omap-aes.c | 7 +- drivers/crypto/omap-sham.c | 7 +- drivers/crypto/s5p-sss.c | 2 - include/linux/crc-t10dif.h | 4 + lib/Kconfig | 2 + lib/crc-t10dif.c | 75 ++-- 23 files changed, 1138 insertions(+), 66 deletions(-) create mode 100644 arch/x86/crypto/crct10dif-pcl-asm_64.S create mode 100644 arch/x86/crypto/crct10dif-pclmul_glue.c create mode 100644 crypto/crct10dif.c Merging drm/drm-next (e9ced8e drm/radeon: restore nomodeset operation (v2)) $ git merge drm/drm-next Already up-to-date. Merging drm-intel/for-linux-next (f3b7114 drm/i915: release scratch page at module unload) $ git merge drm-intel/for-linux-next Merge made by the 'recursive' strategy. Documentation/DocBook/drm.tmpl | 6 + drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/drm_rect.c | 295 ++++++ drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/dvo_ch7xxx.c | 28 +- drivers/gpu/drm/i915/i915_debugfs.c | 329 ++++-- drivers/gpu/drm/i915/i915_dma.c | 34 +- drivers/gpu/drm/i915/i915_drv.c | 24 +- drivers/gpu/drm/i915/i915_drv.h | 249 +++-- drivers/gpu/drm/i915/i915_gem.c | 81 +- drivers/gpu/drm/i915/i915_gem_context.c | 88 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 110 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 18 +- drivers/gpu/drm/i915/i915_irq.c | 505 +++++++-- drivers/gpu/drm/i915/i915_reg.h | 422 +++++--- drivers/gpu/drm/i915/i915_suspend.c | 10 + drivers/gpu/drm/i915/i915_sysfs.c | 74 +- drivers/gpu/drm/i915/i915_ums.c | 88 +- drivers/gpu/drm/i915/intel_bios.c | 100 +- drivers/gpu/drm/i915/intel_crt.c | 31 +- drivers/gpu/drm/i915/intel_ddi.c | 743 +++++-------- drivers/gpu/drm/i915/intel_display.c | 1757 +++++++++++++++++-------------- drivers/gpu/drm/i915/intel_dp.c | 375 +++++-- drivers/gpu/drm/i915/intel_drv.h | 137 ++- drivers/gpu/drm/i915/intel_dvo.c | 28 + drivers/gpu/drm/i915/intel_hdmi.c | 158 ++- drivers/gpu/drm/i915/intel_lvds.c | 274 +---- drivers/gpu/drm/i915/intel_opregion.c | 102 +- drivers/gpu/drm/i915/intel_overlay.c | 13 +- drivers/gpu/drm/i915/intel_panel.c | 296 +++++- drivers/gpu/drm/i915/intel_pm.c | 705 ++++++++++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 3 + drivers/gpu/drm/i915/intel_ringbuffer.h | 8 +- drivers/gpu/drm/i915/intel_sdvo.c | 86 +- drivers/gpu/drm/i915/intel_sideband.c | 177 ++++ drivers/gpu/drm/i915/intel_sprite.c | 221 +++- drivers/gpu/drm/i915/intel_tv.c | 8 +- include/drm/drm_rect.h | 167 +++ 38 files changed, 5217 insertions(+), 2537 deletions(-) create mode 100644 drivers/gpu/drm/drm_rect.c create mode 100644 drivers/gpu/drm/i915/intel_sideband.c create mode 100644 include/drm/drm_rect.h Merging drm-tegra/drm/for-next (d81692b drm/tegra: Fix return value) $ git merge drm-tegra/drm/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 6 +++--- drivers/gpu/host1x/drm/dc.c | 5 +++++ drivers/gpu/host1x/drm/drm.c | 9 +++++++++ drivers/gpu/host1x/drm/gr2d.c | 10 +++++++--- include/uapi/drm/tegra_drm.h | 2 ++ 5 files changed, 26 insertions(+), 6 deletions(-) Merging sound/for-next (7bb2491 ALSA: Add kconfig to specify the max card numbers) $ git merge sound/for-next Merge made by the 'recursive' strategy. include/sound/core.h | 2 +- include/sound/pcm.h | 5 ++-- sound/arm/pxa2xx-ac97.c | 1 - sound/core/Kconfig | 9 +++++++ sound/core/init.c | 55 +++++++++++++++++++++++-------------------- sound/core/pcm_lib.c | 3 ++- sound/drivers/aloop.c | 1 - sound/drivers/ml403-ac97cr.c | 1 - sound/drivers/mpu401/mpu401.c | 1 - sound/drivers/mtpav.c | 1 - sound/drivers/pcsp/pcsp.c | 1 - sound/drivers/serial-u16550.c | 1 - sound/drivers/virmidi.c | 1 - sound/pci/hda/hda_intel.c | 3 +++ sound/ppc/powermac.c | 1 - sound/sh/aica.c | 1 - sound/sh/sh_dac_audio.c | 2 -- 17 files changed, 47 insertions(+), 42 deletions(-) Merging sound-asoc/for-next (9621e6b Merge remote-tracking branch 'asoc/topic/x86' into asoc-next) $ git merge sound-asoc/for-next Removing sound/soc/pxa/tavorevb3.c Removing sound/soc/pxa/saarb.c Removing sound/soc/fsl/imx-pcm.c Auto-merging sound/soc/codecs/spdif_transmitter.c Auto-merging sound/soc/codecs/bt-sco.c Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mfd/arizona.txt | 62 ++ .../devicetree/bindings/sound/adi,adau1701.txt | 23 + .../devicetree/bindings/sound/mxs-saif.txt | 17 +- .../devicetree/bindings/sound/spdif-receiver.txt | 10 + .../bindings/sound/spdif-transmitter.txt | 10 + .../devicetree/bindings/sound/ssm2518.txt | 20 + drivers/mfd/arizona-core.c | 234 +++++- drivers/mfd/arizona-i2c.c | 10 +- drivers/mfd/arizona-spi.c | 10 +- drivers/mfd/arizona.h | 12 + drivers/mfd/wm5110-tables.c | 8 + include/linux/mfd/arizona/core.h | 2 + include/linux/mfd/arizona/pdata.h | 2 +- include/linux/mfd/arizona/registers.h | 3 + include/linux/mfd/wm8994/registers.h | 8 + include/linux/platform_data/ssm2518.h | 22 + include/sound/soc-dapm.h | 2 + sound/soc/atmel/sam9g20_wm8731.c | 9 - sound/soc/blackfin/bf5xx-tdm-pcm.c | 3 +- sound/soc/cirrus/Kconfig | 2 +- sound/soc/cirrus/ep93xx-ac97.c | 16 +- sound/soc/cirrus/ep93xx-i2s.c | 16 +- sound/soc/cirrus/ep93xx-pcm.c | 138 +--- sound/soc/codecs/88pm860x-codec.c | 9 +- sound/soc/codecs/Kconfig | 8 +- sound/soc/codecs/Makefile | 8 +- sound/soc/codecs/ab8500-codec.c | 66 +- sound/soc/codecs/ab8500-codec.h | 42 +- sound/soc/codecs/adau1701.c | 44 +- sound/soc/codecs/arizona.c | 7 + sound/soc/codecs/arizona.h | 3 +- sound/soc/codecs/{dfbmcs320.c => bt-sco.c} | 37 +- sound/soc/codecs/cs42l52.c | 6 +- sound/soc/codecs/cs42l52.h | 2 +- sound/soc/codecs/jz4740.c | 2 - sound/soc/codecs/max98090.c | 24 +- sound/soc/codecs/sgtl5000.c | 214 ++++-- sound/soc/codecs/sgtl5000.h | 2 +- sound/soc/codecs/sn95031.c | 2 +- sound/soc/codecs/spdif_receiver.c | 10 + .../{spdif_transciever.c => spdif_transmitter.c} | 10 + sound/soc/codecs/ssm2518.c | 856 +++++++++++++++++++++ sound/soc/codecs/ssm2518.h | 20 + sound/soc/codecs/wm5102.c | 181 ++++- sound/soc/codecs/wm5110.c | 183 ++++- sound/soc/codecs/wm8994.c | 64 +- sound/soc/codecs/wm_adsp.c | 460 ++++++++++- sound/soc/codecs/wm_adsp.h | 3 + sound/soc/davinci/davinci-mcasp.c | 7 +- sound/soc/davinci/davinci-sffsdr.c | 2 +- sound/soc/fsl/Kconfig | 5 - sound/soc/fsl/Makefile | 11 +- sound/soc/fsl/eukrea-tlv320.c | 2 +- sound/soc/fsl/fsl_ssi.c | 13 +- sound/soc/fsl/imx-audmux.c | 8 - sound/soc/fsl/imx-mc13783.c | 2 +- sound/soc/fsl/imx-pcm-dma.c | 2 + sound/soc/fsl/imx-pcm-fiq.c | 92 +++ sound/soc/fsl/imx-pcm.c | 145 ---- sound/soc/fsl/imx-pcm.h | 10 +- sound/soc/fsl/imx-sgtl5000.c | 7 +- sound/soc/fsl/imx-ssi.c | 44 +- sound/soc/fsl/imx-ssi.h | 3 - sound/soc/fsl/mx27vis-aic32x4.c | 2 +- sound/soc/fsl/phycore-ac97.c | 2 +- sound/soc/fsl/wm1133-ev1.c | 2 +- sound/soc/jz4740/jz4740-i2s.c | 17 +- sound/soc/kirkwood/kirkwood-dma.c | 2 +- sound/soc/mid-x86/mfld_machine.c | 1 - sound/soc/mxs/mxs-pcm.c | 18 - sound/soc/mxs/mxs-pcm.h | 7 - sound/soc/mxs/mxs-saif.c | 37 +- sound/soc/mxs/mxs-saif.h | 1 - sound/soc/mxs/mxs-sgtl5000.c | 10 +- sound/soc/omap/omap-mcbsp.c | 2 - sound/soc/pxa/Kconfig | 20 - sound/soc/pxa/Makefile | 4 - sound/soc/pxa/mmp-pcm.c | 6 +- sound/soc/pxa/mmp-sspa.c | 2 +- sound/soc/pxa/saarb.c | 190 ----- sound/soc/pxa/tavorevb3.c | 189 ----- sound/soc/samsung/Kconfig | 2 +- sound/soc/samsung/bells.c | 14 + sound/soc/samsung/neo1973_wm8753.c | 2 +- sound/soc/samsung/smdk_wm8580pcm.c | 1 - sound/soc/samsung/smdk_wm8994pcm.c | 1 - sound/soc/soc-compress.c | 8 +- sound/soc/soc-core.c | 106 ++- sound/soc/soc-dapm.c | 47 +- sound/soc/soc-pcm.c | 91 +-- sound/soc/soc-utils.c | 13 +- sound/soc/spear/spdif_in.c | 21 +- sound/soc/spear/spdif_out.c | 16 +- sound/soc/spear/spear_pcm.c | 152 +--- sound/soc/tegra/tegra_asoc_utils.c | 23 +- sound/soc/ux500/mop500.c | 2 +- sound/soc/ux500/mop500_ab8500.c | 26 +- 97 files changed, 2872 insertions(+), 1420 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/arizona.txt create mode 100644 Documentation/devicetree/bindings/sound/adi,adau1701.txt create mode 100644 Documentation/devicetree/bindings/sound/spdif-receiver.txt create mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt create mode 100644 Documentation/devicetree/bindings/sound/ssm2518.txt create mode 100644 include/linux/platform_data/ssm2518.h rename sound/soc/codecs/{dfbmcs320.c => bt-sco.c} (53%) rename sound/soc/codecs/{spdif_transciever.c => spdif_transmitter.c} (88%) create mode 100644 sound/soc/codecs/ssm2518.c create mode 100644 sound/soc/codecs/ssm2518.h delete mode 100644 sound/soc/fsl/imx-pcm.c delete mode 100644 sound/soc/pxa/saarb.c delete mode 100644 sound/soc/pxa/tavorevb3.c Merging modules/modules-next (06df44e modpost.c: Add .text.unlikely to TEXT_SECTIONS) $ git merge modules/modules-next Merge made by the 'recursive' strategy. scripts/mod/modpost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging virtio/virtio-next (b3087e4 virtio: remove virtqueue_add_buf().) $ git merge virtio/virtio-next Auto-merging include/uapi/linux/virtio_console.h Merge made by the 'recursive' strategy. arch/x86/lguest/Makefile | 2 +- arch/x86/lguest/{i386_head.S => head_32.S} | 0 drivers/block/virtio_blk.c | 2 +- drivers/virtio/virtio_ring.c | 37 +++--------------------------- include/linux/virtio.h | 7 ------ include/uapi/linux/virtio_console.h | 3 +++ include/uapi/linux/virtio_pci.h | 4 +++- 7 files changed, 11 insertions(+), 44 deletions(-) rename arch/x86/lguest/{i386_head.S => head_32.S} (100%) Merging input/next (737f644 Input: navpoint - pass correct pointer to free_irq()) $ git merge input/next Auto-merging drivers/input/touchscreen/egalax_ts.c Auto-merging drivers/input/keyboard/omap4-keypad.c Merge made by the 'recursive' strategy. drivers/input/keyboard/amikbd.c | 1 - drivers/input/keyboard/bf54x-keys.c | 2 -- drivers/input/keyboard/davinci_keyscan.c | 2 -- drivers/input/keyboard/ep93xx_keypad.c | 7 ++-- drivers/input/keyboard/gpio_keys.c | 1 - drivers/input/keyboard/gpio_keys_polled.c | 2 -- drivers/input/keyboard/jornada680_kbd.c | 2 -- drivers/input/keyboard/jornada720_kbd.c | 2 -- drivers/input/keyboard/matrix_keypad.c | 2 -- drivers/input/keyboard/omap4-keypad.c | 2 -- drivers/input/keyboard/opencores-kbd.c | 2 -- drivers/input/keyboard/pmic8xxx-keypad.c | 2 -- drivers/input/keyboard/pxa27x_keypad.c | 5 ++- drivers/input/keyboard/pxa930_rotary.c | 1 - drivers/input/keyboard/samsung-keypad.c | 2 -- drivers/input/keyboard/sh_keysc.c | 2 -- drivers/input/keyboard/spear-keyboard.c | 1 - drivers/input/keyboard/tnetv107x-keypad.c | 2 -- drivers/input/keyboard/twl4030_keypad.c | 3 +- drivers/input/keyboard/w90p910_keypad.c | 5 ++- drivers/input/misc/ab8500-ponkey.c | 2 -- drivers/input/misc/bfin_rotary.c | 1 - drivers/input/misc/gpio_tilt_polled.c | 2 -- drivers/input/misc/ixp4xx-beeper.c | 4 +-- drivers/input/misc/max8925_onkey.c | 2 -- drivers/input/misc/mc13783-pwrbutton.c | 1 - drivers/input/misc/pm8xxx-vibrator.c | 2 -- drivers/input/misc/pmic8xxx-pwrkey.c | 4 +-- drivers/input/misc/pwm-beeper.c | 1 - drivers/input/misc/rotary_encoder.c | 2 -- drivers/input/misc/sgi_btns.c | 7 ++-- drivers/input/misc/sparcspkr.c | 14 +++----- drivers/input/mouse/amimouse.c | 1 - drivers/input/mouse/gpio_mouse.c | 3 -- drivers/input/mouse/navpoint.c | 2 +- drivers/input/serio/altera_ps2.c | 1 - drivers/input/serio/at32psif.c | 2 -- drivers/input/serio/q40kbd.c | 1 - drivers/input/touchscreen/88pm860x-ts.c | 3 +- drivers/input/touchscreen/atmel-wm97xx.c | 2 -- drivers/input/touchscreen/atmel_tsadcc.c | 2 +- drivers/input/touchscreen/da9052_tsi.c | 2 -- drivers/input/touchscreen/egalax_ts.c | 53 ++++++++--------------------- drivers/input/touchscreen/intel-mid-touch.c | 2 -- drivers/input/touchscreen/jornada720_ts.c | 2 -- drivers/input/touchscreen/mc13783_ts.c | 2 -- drivers/input/touchscreen/ti_am335x_tsc.c | 1 - drivers/input/touchscreen/tnetv107x-ts.c | 2 -- drivers/input/touchscreen/w90p910_ts.c | 2 -- 49 files changed, 34 insertions(+), 139 deletions(-) Merging input-mt/for-next (194664e Input: MT - handle semi-mt devices in core) $ git merge input-mt/for-next Merge made by the 'recursive' strategy. Merging cgroup/for-next (248f1c6 Merge branch 'for-3.11' into for-next) $ git merge cgroup/for-next Merge made by the 'recursive' strategy. include/linux/cgroup.h | 35 +++++-- kernel/cgroup.c | 234 +++++++++++++++++++++++++++++++++++------------ security/device_cgroup.c | 56 ++++-------- 3 files changed, 221 insertions(+), 104 deletions(-) Merging block/for-next (48668c2 Merge branch 'for-linus' into for-next) $ git merge block/for-next Auto-merging include/linux/cgroup.h Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/bcache.txt | 12 +- Documentation/cgroups/blkio-controller.txt | 29 +- Documentation/devices.txt | 8 +- Documentation/kernel-parameters.txt | 3 - Documentation/m68k/kernel-options.txt | 2 - block/blk-cgroup.c | 105 ++- block/blk-cgroup.h | 38 +- block/blk-core.c | 2 +- block/blk-throttle.c | 1064 +++++++++++++++++++--------- drivers/block/mtip32xx/mtip32xx.c | 8 +- drivers/md/bcache/Kconfig | 1 - drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/stats.c | 34 +- drivers/md/bcache/super.c | 185 +++-- drivers/md/bcache/writeback.c | 2 +- include/linux/cgroup.h | 2 + 16 files changed, 954 insertions(+), 543 deletions(-) Merging device-mapper/master (11531a4 Fix detection of the need to resize the dm thin metadata device.) $ git merge device-mapper/master Merge made by the 'recursive' strategy. Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) $ git merge embedded/master Already up-to-date. Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) $ git merge firmware/master Already up-to-date. Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) $ git merge pcmcia/master Already up-to-date. Merging mmc/mmc-next (7396e31 mmc: sdhci-pci: support runtime PM for BYT SD cards) $ git merge mmc/mmc-next Merge made by the 'recursive' strategy. drivers/mmc/card/block.c | 100 +++++++++++++----- drivers/mmc/card/queue.c | 2 +- drivers/mmc/core/bus.c | 14 ++- drivers/mmc/core/core.c | 117 ++++++++------------- drivers/mmc/core/core.h | 5 +- drivers/mmc/core/debugfs.c | 8 +- drivers/mmc/core/mmc.c | 203 +++++++++++++++++++++++++----------- drivers/mmc/core/mmc_ops.c | 36 +------ drivers/mmc/core/mmc_ops.h | 1 - drivers/mmc/core/sd.c | 62 ++++++++++- drivers/mmc/core/sdio.c | 28 ++++- drivers/mmc/host/android-goldfish.c | 2 - drivers/mmc/host/atmel-mci.c | 37 +++---- drivers/mmc/host/au1xmmc.c | 1 - drivers/mmc/host/bfin_sdh.c | 2 - drivers/mmc/host/davinci_mmc.c | 1 - drivers/mmc/host/dw_mmc-pltfm.c | 1 - drivers/mmc/host/dw_mmc.c | 10 +- drivers/mmc/host/jz4740_mmc.c | 2 - drivers/mmc/host/mvsdio.c | 1 - drivers/mmc/host/mxcmmc.c | 2 - drivers/mmc/host/mxs-mmc.c | 3 +- drivers/mmc/host/omap.c | 2 - drivers/mmc/host/omap_hsmmc.c | 53 ++++++---- drivers/mmc/host/pxamci.c | 2 - drivers/mmc/host/rtsx_pci_sdmmc.c | 2 - drivers/mmc/host/sdhci-acpi.c | 135 +++++++++++++++++++++--- drivers/mmc/host/sdhci-esdhc-imx.c | 41 +++++++- drivers/mmc/host/sdhci-pci.c | 56 ++++++++++ drivers/mmc/host/sdhci-pltfm.c | 6 +- drivers/mmc/host/sdhci-pltfm.h | 1 + drivers/mmc/host/sdhci-pxav2.c | 2 - drivers/mmc/host/sdhci-pxav3.c | 2 - drivers/mmc/host/sdhci-s3c.c | 1 - drivers/mmc/host/sdhci-spear.c | 2 - drivers/mmc/host/sdhci.c | 35 ++++++- drivers/mmc/host/sh_mmcif.c | 2 - drivers/mmc/host/sh_mobile_sdhi.c | 24 +++-- drivers/mmc/host/tmio_mmc.c | 2 - drivers/mmc/host/tmio_mmc_dma.c | 48 ++++++--- drivers/mmc/host/wmt-sdmmc.c | 2 - include/linux/mfd/tmio.h | 5 + include/linux/mmc/card.h | 10 +- include/linux/mmc/core.h | 5 + include/linux/mmc/host.h | 8 +- include/linux/mmc/sdhci.h | 2 + 46 files changed, 757 insertions(+), 329 deletions(-) Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) $ git merge kgdb/kgdb-next Merge made by the 'recursive' strategy. Merging slab/for-next (8a965b3 mm, slab_common: Fix bootstrap creation of kmalloc caches) $ git merge slab/for-next Already up-to-date. Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) $ git merge uclinux/for-next Already up-to-date. Merging md/for-next (ae59b84 dm-raid: silence compiler warning on rebuilds_per_group.) $ git merge md/for-next Auto-merging drivers/md/raid10.c Auto-merging drivers/md/raid1.c Auto-merging drivers/md/md.c Merge made by the 'recursive' strategy. Documentation/device-mapper/dm-raid.txt | 1 + drivers/md/dm-raid.c | 67 ++++++++++++++++++++++++++++++++- drivers/md/md.c | 2 +- drivers/md/raid1.c | 7 ++-- drivers/md/raid10.c | 10 +++-- 5 files changed, 77 insertions(+), 10 deletions(-) Merging mfd/master (57d5b9c Merge tag 'mfd-arizona-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc) $ git merge mfd/master Removing drivers/ssbi/Makefile Removing drivers/ssbi/Kconfig Auto-merging drivers/mfd/intel_msic.c CONFLICT (content): Merge conflict in drivers/mfd/intel_msic.c Auto-merging drivers/mfd/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/mfd/intel_msic.c'. [master 188e0fa] Merge remote-tracking branch 'mfd/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 4 +- drivers/Kconfig | 2 - drivers/Makefile | 1 - drivers/mfd/Kconfig | 5 +- drivers/mfd/Makefile | 2 +- drivers/mfd/intel_msic.c | 1 - drivers/mfd/jz4740-adc.c | 7 +-- drivers/mfd/lpc_ich.c | 10 +++ drivers/mfd/max77686.c | 1 + drivers/mfd/mcp-sa11x0.c | 3 - drivers/mfd/rtl8411.c | 132 +++++++++++++++++++++++++++++++++++++++ drivers/mfd/rtsx_pcr.c | 5 ++ drivers/mfd/rtsx_pcr.h | 1 + drivers/mfd/sec-core.c | 3 +- drivers/{ssbi => mfd}/ssbi.c | 0 drivers/mfd/t7l66xb.c | 1 - drivers/mfd/tc6387xb.c | 1 - drivers/mfd/tc6393xb.c | 1 - drivers/mfd/twl-core.c | 12 +--- drivers/mfd/twl4030-audio.c | 5 +- drivers/mfd/twl4030-madc.c | 5 +- drivers/mfd/wm8994-irq.c | 100 +++++++++++++++++++++++++++-- drivers/ssbi/Kconfig | 16 ----- drivers/ssbi/Makefile | 1 - include/linux/mfd/rtsx_pci.h | 1 + include/linux/mfd/wm8994/core.h | 2 + include/linux/mfd/wm8994/pdata.h | 5 ++ 27 files changed, 266 insertions(+), 61 deletions(-) rename drivers/{ssbi => mfd}/ssbi.c (100%) delete mode 100644 drivers/ssbi/Kconfig delete mode 100644 drivers/ssbi/Makefile Merging battery/master (dccab60 pm2301_charger: Fix module alias prefix) $ git merge battery/master Already up-to-date. Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1) $ git merge fbdev/fbdev-next Already up-to-date. Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) $ git merge viafb/viafb-next Already up-to-date. Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning) $ git merge omap_dss2/for-next Merge made by the 'recursive' strategy. drivers/video/ps3fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging regulator/for-next (8b98eb9 Merge remote-tracking branch 'regulator/topic/lp872x' into regulator-next) $ git merge regulator/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/regulator/lp872x.txt | 160 ++++ .../bindings/regulator/ti-abb-regulator.txt | 128 +++ drivers/regulator/88pm8607.c | 1 - drivers/regulator/Kconfig | 10 + drivers/regulator/Makefile | 1 + drivers/regulator/core.c | 7 +- drivers/regulator/dbx500-prcmu.c | 24 +- drivers/regulator/isl6271a-regulator.c | 2 +- drivers/regulator/lp3971.c | 11 +- drivers/regulator/lp3972.c | 11 +- drivers/regulator/lp872x.c | 116 ++- drivers/regulator/lp8755.c | 1 - drivers/regulator/lp8788-buck.c | 1 - drivers/regulator/lp8788-ldo.c | 2 - drivers/regulator/max77686.c | 1 - drivers/regulator/max8925-regulator.c | 1 - drivers/regulator/mc13783-regulator.c | 2 - drivers/regulator/mc13892-regulator.c | 2 - drivers/regulator/palmas-regulator.c | 2 +- drivers/regulator/pcap-regulator.c | 1 - drivers/regulator/pcf50633-regulator.c | 1 - drivers/regulator/s2mps11.c | 1 - drivers/regulator/ti-abb-regulator.c | 912 +++++++++++++++++++++ drivers/regulator/tps65217-regulator.c | 2 - drivers/regulator/virtual.c | 2 - drivers/regulator/wm831x-dcdc.c | 7 - drivers/regulator/wm831x-isink.c | 2 - drivers/regulator/wm831x-ldo.c | 2 - drivers/regulator/wm8400-regulator.c | 1 - drivers/regulator/wm8994-regulator.c | 2 - 30 files changed, 1350 insertions(+), 66 deletions(-) create mode 100644 Documentation/devicetree/bindings/regulator/lp872x.txt create mode 100644 Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt create mode 100644 drivers/regulator/ti-abb-regulator.c Merging security/next (5b88e27 maintainers: Remove Kent from maintainers) $ git merge security/next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 6 +- drivers/char/tpm/tpm.h | 1 - drivers/char/tpm/tpm_tis.c | 17 +++- include/linux/security.h | 3 +- include/linux/tpm.h | 2 + security/apparmor/audit.c | 2 +- security/apparmor/context.c | 44 +++++---- security/apparmor/domain.c | 26 ++--- security/apparmor/include/apparmor.h | 12 ++- security/apparmor/include/context.h | 61 ++++++++---- security/apparmor/include/file.h | 14 +-- security/apparmor/include/match.h | 21 ++-- security/apparmor/include/policy.h | 16 ++-- security/apparmor/include/procattr.h | 1 - security/apparmor/include/sid.h | 4 +- security/apparmor/ipc.c | 13 +-- security/apparmor/lib.c | 44 ++++----- security/apparmor/lsm.c | 69 +++++++------ security/apparmor/match.c | 23 ++--- security/apparmor/path.c | 2 +- security/apparmor/policy.c | 181 ++++++++++++++++------------------- security/apparmor/policy_unpack.c | 4 +- security/apparmor/procattr.c | 6 -- security/apparmor/resource.c | 15 ++- 24 files changed, 309 insertions(+), 278 deletions(-) Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) $ git merge selinux/master Already up-to-date! Merge made by the 'recursive' strategy. Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) $ git merge lblnet/master Already up-to-date. Merging watchdog/master (64da82b watchdog: core: don't try to stop device if not running) $ git merge watchdog/master Merge made by the 'recursive' strategy. drivers/watchdog/at32ap700x_wdt.c | 17 +++------- drivers/watchdog/bcm63xx_wdt.c | 9 +++--- drivers/watchdog/cpwd.c | 4 +-- drivers/watchdog/da9052_wdt.c | 4 +-- drivers/watchdog/da9055_wdt.c | 4 +-- drivers/watchdog/dw_wdt.c | 11 +++---- drivers/watchdog/imx2_wdt.c | 6 ++-- drivers/watchdog/jz4740_wdt.c | 2 +- drivers/watchdog/mpcore_wdt.c | 2 -- drivers/watchdog/mtx-1_wdt.c | 3 +- drivers/watchdog/mv64x60_wdt.c | 4 +-- drivers/watchdog/nuc900_wdt.c | 50 +++++++---------------------- drivers/watchdog/pnx4008_wdt.c | 7 ++-- drivers/watchdog/rc32434_wdt.c | 10 ++---- drivers/watchdog/riowd.c | 12 +++---- drivers/watchdog/s3c2410_wdt.c | 20 ++++++------ drivers/watchdog/shwdt.c | 18 +++-------- drivers/watchdog/sp805_wdt.c | 7 ++-- drivers/watchdog/ts72xx_wdt.c | 67 ++++++--------------------------------- drivers/watchdog/twl4030_wdt.c | 5 +-- drivers/watchdog/watchdog_dev.c | 6 ++-- drivers/watchdog/wm831x_wdt.c | 21 +++++------- 22 files changed, 82 insertions(+), 207 deletions(-) Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) $ git merge dwmw2-iommu/master Already up-to-date. Merging iommu/next (0c4513b Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next) $ git merge iommu/next Already up-to-date. Merging vfio/next (664e938 vfio: Set container device mode) $ git merge vfio/next Already up-to-date. Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next (5c050fb docs: update the development process document) $ git merge jc_docs/docs-next Already up-to-date. Merging trivial/for-next (071361d mm: Convert print_symbol to %pSR) $ git merge trivial/for-next Already up-to-date. Merging audit/for-next (dcd6c92 Linux 3.3-rc1) $ git merge audit/for-next Already up-to-date. Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) $ git merge fsnotify/for-next Already up-to-date. Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device) $ git merge edac/linux_next Already up-to-date. Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased) $ git merge edac-amd/for-next Already up-to-date. Merging devicetree/devicetree/next (3132f62 Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD) $ git merge devicetree/devicetree/next Already up-to-date. Merging dt-rh/for-next (a2b9ea7 Documentation/devicetree: make semantic of initrd-end more explicit) $ git merge dt-rh/for-next Already up-to-date. Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration) $ git merge spi/spi/next Already up-to-date. Merging spi-mb/for-next (3e452a0 Merge remote-tracking branch 'spi/topic/sirf' into spi-next) $ git merge spi-mb/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 2 +- drivers/spi/spi-altera.c | 2 -- drivers/spi/spi-ath79.c | 2 -- drivers/spi/spi-au1550.c | 2 -- drivers/spi/spi-bcm2835.c | 7 +++-- drivers/spi/spi-bcm63xx.c | 3 --- drivers/spi/spi-bfin-sport.c | 3 --- drivers/spi/spi-bfin5xx.c | 3 --- drivers/spi/spi-clps711x.c | 2 -- drivers/spi/spi-coldfire-qspi.c | 12 ++++----- drivers/spi/spi-davinci.c | 4 +-- drivers/spi/spi-dw-mmio.c | 2 -- drivers/spi/spi-ep93xx.c | 3 +-- drivers/spi/spi-fsl-spi.c | 2 +- drivers/spi/spi-gpio.c | 2 -- drivers/spi/spi-imx.c | 11 -------- drivers/spi/spi-mpc52xx-psc.c | 2 +- drivers/spi/spi-mpc52xx.c | 4 +-- drivers/spi/spi-mxs.c | 6 ----- drivers/spi/spi-oc-tiny.c | 2 -- drivers/spi/spi-omap-100k.c | 4 +-- drivers/spi/spi-omap-uwire.c | 4 +-- drivers/spi/spi-omap2-mcspi.c | 11 ++------ drivers/spi/spi-orion.c | 4 +-- drivers/spi/spi-ppc4xx.c | 6 ++--- drivers/spi/spi-pxa2xx-dma.c | 11 ++++---- drivers/spi/spi-pxa2xx.c | 40 +++-------------------------- drivers/spi/spi-rspi.c | 4 +-- drivers/spi/spi-s3c64xx.c | 2 -- drivers/spi/spi-sh-hspi.c | 4 +-- drivers/spi/spi-sh.c | 4 +-- drivers/spi/spi-sirf.c | 55 ++++++++++------------------------------ drivers/spi/spi-tegra114.c | 4 +-- drivers/spi/spi-tegra20-sflash.c | 4 +-- drivers/spi/spi-tegra20-slink.c | 4 +-- drivers/spi/spi-topcliff-pch.c | 3 ++- include/linux/spi/spi.h | 2 ++ 37 files changed, 67 insertions(+), 175 deletions(-) Merging tip/auto-latest (57e87c1 Merge branch 'timers/urgent') $ git merge tip/auto-latest Auto-merging kernel/printk.c Merge made by the 'recursive' strategy. kernel/printk.c | 2 +- kernel/sched/Makefile | 2 +- kernel/sched/core.c | 569 ------------------------------------------------- kernel/sched/fair.c | 18 ++ kernel/sched/proc.c | 578 ++++++++++++++++++++++++++++++++++++++++++++++++++ kernel/sched/sched.h | 26 +-- 6 files changed, 606 insertions(+), 589 deletions(-) create mode 100644 kernel/sched/proc.c Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being added) $ git merge ftrace/for-next Already up-to-date. Merging rcu/rcu/next (fb28198 trace: Allow idle-safe tracepoints to be called from irq) $ git merge rcu/rcu/next Merge made by the 'recursive' strategy. Documentation/RCU/RTFP.txt | 855 +++++++++++++++--------- Documentation/RCU/checklist.txt | 6 - Documentation/RCU/rcubarrier.txt | 12 +- Documentation/RCU/torture.txt | 6 - Documentation/RCU/trace.txt | 100 +-- Documentation/RCU/whatisRCU.txt | 22 +- Documentation/kernel-per-CPU-kthreads.txt | 47 ++ Documentation/timers/NO_HZ.txt | 79 ++- arch/powerpc/kvm/book3s_hv.c | 2 +- include/linux/debugobjects.h | 6 +- include/linux/hardirq.h | 2 +- include/linux/rcupdate.h | 9 +- include/linux/rcutiny.h | 41 +- include/linux/rcutree.h | 3 +- include/linux/srcu.h | 43 -- include/linux/tracepoint.h | 4 +- init/Kconfig | 46 +- kernel/rcu.h | 10 +- kernel/rcupdate.c | 129 +--- kernel/rcutiny.c | 21 +- kernel/rcutiny_plugin.h | 1009 +---------------------------- kernel/rcutorture.c | 76 ++- kernel/rcutree.c | 246 +++---- kernel/rcutree.h | 15 +- kernel/rcutree_plugin.h | 81 ++- lib/debugobjects.c | 20 +- 26 files changed, 971 insertions(+), 1919 deletions(-) Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) $ git merge cputime/cputime Already up-to-date. Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) $ git merge uprobes/for-next Already up-to-date. Merging kvm/linux-next (e47a5f5 KVM: x86 emulator: convert XADD to fastop) $ git merge kvm/linux-next Resolved 'arch/s390/include/asm/pgtable.h' using previous resolution. Auto-merging virt/kvm/arm/arch_timer.c Auto-merging arch/s390/mm/pgtable.c Auto-merging arch/s390/include/asm/pgtable.h CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e098921] Merge remote-tracking branch 'kvm/linux-next' $ git diff -M --stat --summary HEAD^.. arch/arm/include/asm/kvm_host.h | 4 +- arch/arm/kvm/Makefile | 7 +- arch/ia64/kvm/Makefile | 7 +- arch/powerpc/kvm/Makefile | 13 +- arch/s390/include/asm/kvm_host.h | 8 +- arch/s390/include/asm/pgtable.h | 83 +++-- arch/s390/kernel/asm-offsets.c | 3 + arch/s390/kernel/entry64.S | 80 ++--- arch/s390/kvm/Makefile | 3 +- arch/s390/kvm/intercept.c | 39 +- arch/s390/kvm/kvm-s390.c | 81 ++++- arch/s390/kvm/kvm-s390.h | 5 + arch/s390/kvm/priv.c | 3 +- arch/s390/mm/pgtable.c | 2 +- arch/x86/kvm/Makefile | 13 +- arch/x86/kvm/emulate.c | 391 ++++++--------------- arch/x86/kvm/lapic.c | 57 ++- arch/x86/kvm/lapic.h | 6 +- arch/x86/kvm/mmu.c | 11 +- arch/x86/kvm/x86.c | 30 +- .../kvm/arm_arch_timer.h | 0 .../asm/kvm_vgic.h => include/kvm/arm_vgic.h | 0 include/linux/kvm_host.h | 1 + {arch/arm/kvm => virt/kvm/arm}/arch_timer.c | 4 +- {arch/arm/kvm => virt/kvm/arm}/vgic.c | 0 virt/kvm/irq_comm.c | 9 +- virt/kvm/kvm_main.c | 1 + 27 files changed, 383 insertions(+), 478 deletions(-) rename arch/arm/include/asm/kvm_arch_timer.h => include/kvm/arm_arch_timer.h (100%) rename arch/arm/include/asm/kvm_vgic.h => include/kvm/arm_vgic.h (100%) rename {arch/arm/kvm => virt/kvm/arm}/arch_timer.c (99%) rename {arch/arm/kvm => virt/kvm/arm}/vgic.c (100%) Merging kvm-arm/kvm-arm-next (24fd0fd Merge remote-tracking branch 'kvm/next' into kvm-arm-next) $ git merge kvm-arm/kvm-arm-next Already up-to-date! Merge made by the 'recursive' strategy. Merging kvm-ppc/kvm-ppc-next (5975a2e KVM: PPC: Book3S: Add API for in-kernel XICS emulation) $ git merge kvm-ppc/kvm-ppc-next Already up-to-date. Merging oprofile/for-next (f722406 Linux 3.10-rc1) $ git merge oprofile/for-next Already up-to-date. Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) $ git merge fw-nohz/nohz/next Already up-to-date. Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes) $ git merge xen/upstream/xen Already up-to-date. Merging xen-two/linux-next (f722406 Linux 3.10-rc1) $ git merge xen-two/linux-next Already up-to-date. Merging xen-arm/linux-next (3cc8e40 xen/arm: rename xen_secondary_init and run it on every online cpu) $ git merge xen-arm/linux-next Already up-to-date. Merging percpu/for-next (a1b2a55 percpu: add documentation on this_cpu operations) $ git merge percpu/for-next Already up-to-date. Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for-next) $ git merge workqueues/for-next Auto-merging drivers/net/phy/phy.c Auto-merging block/blk-core.c Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/kernel-parameters.txt | 15 +++++++++++++++ block/blk-core.c | 3 ++- block/blk-ioc.c | 3 ++- block/genhd.c | 12 ++++++++---- drivers/net/phy/phy.c | 9 +++++---- drivers/video/console/fbcon.c | 2 +- include/linux/workqueue.h | 35 +++++++++++++++++++++++++++++++++++ kernel/power/Kconfig | 20 ++++++++++++++++++++ kernel/workqueue.c | 26 +++++++++++++++++++++++++- 9 files changed, 113 insertions(+), 12 deletions(-) Merging drivers-x86/linux-next (a1ec56e Add support for fan button on Ideapad Z580) $ git merge drivers-x86/linux-next Already up-to-date. Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) $ git merge sysctl/master Already up-to-date. Merging regmap/for-next (d52bd3b Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next) $ git merge regmap/for-next Merge made by the 'recursive' strategy. drivers/base/regmap/internal.h | 2 ++ drivers/base/regmap/regcache-rbtree.c | 66 ++++++++++++++++++++++++++--------- drivers/base/regmap/regcache.c | 57 ++++++++++++++++++++++++------ drivers/base/regmap/regmap-debugfs.c | 9 +++-- drivers/base/regmap/regmap.c | 21 ++++++----- include/linux/regmap.h | 12 +++++++ include/trace/events/regmap.h | 23 ++++++++++++ 7 files changed, 152 insertions(+), 38 deletions(-) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) $ git merge hsi/for-next Already up-to-date. Merging leds/for-next (3234e11 leds: use platform_{get,set}_drvdata()) $ git merge leds/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/leds/leds-lp55xx.txt | 147 +++++++++++++++++++++ drivers/leds/leds-88pm860x.c | 2 +- drivers/leds/leds-atmel-pwm.c | 1 - drivers/leds/leds-gpio.c | 8 -- drivers/leds/leds-lp5521.c | 28 +++- drivers/leds/leds-lp5523.c | 28 +++- drivers/leds/leds-lp5562.c | 28 +++- drivers/leds/leds-lp55xx-common.c | 45 +++++++ drivers/leds/leds-lp55xx-common.h | 4 + drivers/leds/leds-mc13783.c | 1 - drivers/leds/leds-ns2.c | 2 - drivers/leds/leds-sunfire.c | 4 +- drivers/leds/leds-wm831x-status.c | 2 +- 13 files changed, 269 insertions(+), 31 deletions(-) create mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.txt Merging driver-core/driver-core-next (4993632 Merge 3.10-rc3 into driver-core-next) $ git merge driver-core/driver-core-next Resolved 'drivers/base/cpu.c' using previous resolution. Auto-merging drivers/base/cpu.c CONFLICT (content): Merge conflict in drivers/base/cpu.c Auto-merging drivers/base/core.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3fa6149] Merge remote-tracking branch 'driver-core/driver-core-next' $ git diff -M --stat --summary HEAD^.. drivers/base/core.c | 2 ++ drivers/base/cpu.c | 26 ++++++++++++++++++-------- fs/sysfs/dir.c | 2 +- fs/sysfs/inode.c | 2 -- 4 files changed, 21 insertions(+), 11 deletions(-) Merging tty/tty-next (8095e4e Merge 3.10-rc3 into tty-next) $ git merge tty/tty-next Auto-merging drivers/video/console/fbcon.c Merge made by the 'recursive' strategy. Documentation/console/console.txt | 28 +- arch/alpha/kernel/console.c | 4 +- arch/alpha/kernel/process.c | 4 +- arch/mips/pci/pci-bcm1480.c | 4 +- arch/mips/pci/pci-sb1250.c | 4 +- arch/parisc/kernel/setup.c | 2 +- drivers/tty/Makefile | 2 +- drivers/tty/n_tty.c | 12 +- drivers/tty/serial/altera_uart.c | 1 - drivers/tty/serial/amba-pl011.c | 11 +- drivers/tty/serial/imx.c | 15 ++ drivers/tty/serial/mpc52xx_uart.c | 10 - drivers/tty/serial/omap-serial.c | 34 ++- drivers/tty/serial/serial_core.c | 6 - drivers/tty/serial/xilinx_uartps.c | 30 --- drivers/tty/tty_ldsem.c | 453 ++++++++++++++++++++++++++++++++ drivers/tty/vt/vt.c | 117 ++------- drivers/usb/misc/sisusbvga/sisusb_con.c | 18 +- drivers/video/console/fbcon.c | 35 +-- drivers/video/console/mdacon.c | 8 +- drivers/video/console/newport_con.c | 9 +- drivers/video/console/sticon.c | 6 +- include/linux/console.h | 3 - include/linux/serial_core.h | 7 + include/linux/tty.h | 2 - include/linux/tty_ldisc.h | 46 ++++ include/linux/vt_kern.h | 2 - 27 files changed, 637 insertions(+), 236 deletions(-) create mode 100644 drivers/tty/tty_ldsem.c Merging usb/usb-next (45f6bc5 Merge 3.10-rc3 into usb-next) $ git merge usb/usb-next Auto-merging drivers/usb/host/Kconfig Merge made by the 'recursive' strategy. drivers/usb/Makefile | 1 + drivers/usb/chipidea/ci13xxx_imx.c | 2 - drivers/usb/class/usbtmc.c | 273 +- drivers/usb/core/devio.c | 7 +- drivers/usb/core/message.c | 16 +- drivers/usb/core/usb.c | 33 + drivers/usb/gadget/mv_u3d_core.c | 3 - drivers/usb/gadget/pxa27x_udc.c | 1 - drivers/usb/host/Kconfig | 11 + drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-fsl.c | 1 + drivers/usb/host/ehci-hub.c | 16 + drivers/usb/host/ehci-mv.c | 16 +- drivers/usb/host/ehci-mxc.c | 1 - drivers/usb/host/ehci-octeon.c | 2 - drivers/usb/host/ehci-omap.c | 2 +- drivers/usb/host/ehci-orion.c | 2 +- drivers/usb/host/ehci-platform.c | 3 +- drivers/usb/host/ehci-sead3.c | 1 - drivers/usb/host/ehci-sh.c | 1 - drivers/usb/host/ehci-spear.c | 2 +- drivers/usb/host/ehci-tilegx.c | 1 - drivers/usb/host/fusbh200-hcd.c | 5972 ++++++++++++++++++++++++++++++++++++ drivers/usb/host/fusbh200.h | 743 +++++ drivers/usb/host/ohci-da8xx.c | 1 - drivers/usb/host/ohci-jz4740.c | 3 - drivers/usb/host/ohci-nxp.c | 2 - drivers/usb/host/ohci-octeon.c | 2 - drivers/usb/host/ohci-omap.c | 1 - drivers/usb/host/ohci-omap3.c | 2 +- drivers/usb/host/ohci-platform.c | 1 - drivers/usb/host/ohci-pxa27x.c | 1 - drivers/usb/host/ohci-sm501.c | 1 - drivers/usb/host/ohci-spear.c | 4 +- drivers/usb/host/ohci-tilegx.c | 1 - drivers/usb/host/ohci-tmio.c | 2 - drivers/usb/host/oxu210hp-hcd.c | 2 - drivers/usb/host/uhci-platform.c | 3 +- drivers/usb/misc/adutux.c | 141 +- drivers/usb/phy/phy-nop.c | 2 +- drivers/usb/serial/quatech2.c | 2 +- drivers/usb/storage/alauda.c | 6 +- drivers/usb/storage/sddr09.c | 6 +- drivers/uwb/drp.c | 4 +- drivers/uwb/rsv.c | 4 +- drivers/uwb/whci.c | 14 +- include/linux/usb.h | 1 + 47 files changed, 7084 insertions(+), 233 deletions(-) create mode 100644 drivers/usb/host/fusbh200-hcd.c create mode 100644 drivers/usb/host/fusbh200.h Merging usb-gadget/next (added5f ARM: mxs_defconfig: add CONFIG_USB_PHY) $ git merge usb-gadget/next Already up-to-date. Merging staging/staging-next (829455b Merge 3.10-rc3 into staging-next) $ git merge staging/staging-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../bindings/iio/magnetometer/ak8975.txt | 18 + MAINTAINERS | 2 +- drivers/iio/Kconfig | 3 + drivers/iio/Makefile | 1 + drivers/iio/accel/Kconfig | 1 - drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/exynos_adc.c | 12 +- drivers/iio/adc/mcp320x.c | 257 ++ drivers/iio/gyro/Kconfig | 1 - drivers/iio/industrialio-buffer.c | 10 +- drivers/iio/light/hid-sensor-als.c | 2 +- drivers/iio/magnetometer/Kconfig | 1 - drivers/iio/magnetometer/ak8975.c | 103 +- drivers/iio/trigger/Kconfig | 17 + drivers/iio/trigger/Makefile | 5 + drivers/{staging => }/iio/trigger/iio-trig-sysfs.c | 0 drivers/staging/Kconfig | 4 + drivers/staging/Makefile | 2 + drivers/staging/android/ashmem.c | 3 +- drivers/staging/android/sw_sync.c | 6 +- drivers/staging/android/sync.c | 20 +- drivers/staging/asus_oled/asus_oled.c | 26 +- drivers/staging/bcm/Bcmchar.c | 2 +- drivers/staging/bcm/InterfaceIdleMode.c | 199 +- drivers/staging/bcm/Version.h | 8 +- drivers/staging/bcm/vendorspecificextn.c | 198 +- drivers/staging/btmtk_usb/Kconfig | 11 + drivers/staging/btmtk_usb/Makefile | 1 + drivers/staging/btmtk_usb/README | 14 + drivers/staging/btmtk_usb/TODO | 10 + drivers/staging/btmtk_usb/btmtk_usb.c | 1779 ++++++++ drivers/staging/btmtk_usb/btmtk_usb.h | 138 + drivers/staging/ced1401/ced_ioc.c | 665 ++- drivers/staging/ced1401/ced_ioctl.h | 2 +- drivers/staging/ced1401/machine.h | 32 +- drivers/staging/ced1401/usb1401.c | 613 ++- drivers/staging/ced1401/usb1401.h | 285 +- drivers/staging/ced1401/use1401.h | 201 +- drivers/staging/ced1401/use14_ioc.h | 503 ++- drivers/staging/ced1401/userspace/use1401.c | 152 +- drivers/staging/comedi/comedi.h | 5 - drivers/staging/comedi/comedi_buf.c | 4 - drivers/staging/comedi/comedi_compat32.c | 5 - drivers/staging/comedi/comedi_compat32.h | 5 - drivers/staging/comedi/comedi_fops.c | 5 - drivers/staging/comedi/comedi_pci.c | 4 - drivers/staging/comedi/comedi_pcmcia.c | 4 - drivers/staging/comedi/comedi_usb.c | 16 +- drivers/staging/comedi/comedidev.h | 13 +- drivers/staging/comedi/comedilib.h | 5 - drivers/staging/comedi/drivers.c | 38 +- drivers/staging/comedi/drivers/8253.h | 5 - drivers/staging/comedi/drivers/8255.c | 5 - drivers/staging/comedi/drivers/8255.h | 5 - drivers/staging/comedi/drivers/8255_pci.c | 4 - .../comedi/drivers/addi-data/APCI1710_Chrono.c | 4 - .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 4 - .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 4 - .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 4 - .../comedi/drivers/addi-data/APCI1710_Pwm.c | 4 - .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 - .../comedi/drivers/addi-data/APCI1710_Tor.c | 4 - .../comedi/drivers/addi-data/APCI1710_Ttl.c | 4 - .../staging/comedi/drivers/addi-data/addi_common.c | 7 - .../staging/comedi/drivers/addi-data/addi_eeprom.c | 7 - .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci035.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci1500.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci1564.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci3120.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci3200.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 4 - drivers/staging/comedi/drivers/addi_apci_1032.c | 7 - drivers/staging/comedi/drivers/addi_apci_1516.c | 7 - drivers/staging/comedi/drivers/addi_apci_16xx.c | 7 - drivers/staging/comedi/drivers/addi_apci_2032.c | 7 - drivers/staging/comedi/drivers/addi_apci_2200.c | 7 - drivers/staging/comedi/drivers/addi_apci_3501.c | 7 - drivers/staging/comedi/drivers/addi_watchdog.c | 4 - drivers/staging/comedi/drivers/adl_pci6208.c | 4 - drivers/staging/comedi/drivers/adl_pci7x3x.c | 4 - drivers/staging/comedi/drivers/adl_pci8164.c | 4 - drivers/staging/comedi/drivers/adl_pci9111.c | 4 - drivers/staging/comedi/drivers/adq12b.c | 5 - drivers/staging/comedi/drivers/adv_pci1723.c | 9 +- drivers/staging/comedi/drivers/adv_pci1724.c | 7 +- drivers/staging/comedi/drivers/aio_aio12_8.c | 4 - drivers/staging/comedi/drivers/aio_iiro_16.c | 4 - drivers/staging/comedi/drivers/amplc_dio200.c | 5 - drivers/staging/comedi/drivers/amplc_dio200.h | 5 - .../staging/comedi/drivers/amplc_dio200_common.c | 5 - drivers/staging/comedi/drivers/amplc_dio200_pci.c | 5 - drivers/staging/comedi/drivers/amplc_pc236.c | 5 - drivers/staging/comedi/drivers/amplc_pc263.c | 5 - drivers/staging/comedi/drivers/amplc_pci224.c | 5 - drivers/staging/comedi/drivers/amplc_pci230.c | 4 - drivers/staging/comedi/drivers/amplc_pci263.c | 5 - drivers/staging/comedi/drivers/c6xdigio.c | 5 - drivers/staging/comedi/drivers/cb_das16_cs.c | 4 - drivers/staging/comedi/drivers/cb_pcidas.c | 6 - drivers/staging/comedi/drivers/cb_pcidas64.c | 7 +- drivers/staging/comedi/drivers/cb_pcidda.c | 4 - drivers/staging/comedi/drivers/cb_pcimdas.c | 5 - drivers/staging/comedi/drivers/cb_pcimdda.c | 5 - drivers/staging/comedi/drivers/comedi_bond.c | 5 - drivers/staging/comedi/drivers/comedi_fc.c | 7 +- drivers/staging/comedi/drivers/comedi_fc.h | 7 +- drivers/staging/comedi/drivers/comedi_parport.c | 5 - drivers/staging/comedi/drivers/comedi_test.c | 7 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 5 - drivers/staging/comedi/drivers/daqboard2000.c | 29 +- drivers/staging/comedi/drivers/das08.c | 6 - drivers/staging/comedi/drivers/das08.h | 5 - drivers/staging/comedi/drivers/das08_cs.c | 7 - drivers/staging/comedi/drivers/das08_isa.c | 4 - drivers/staging/comedi/drivers/das08_pci.c | 4 - drivers/staging/comedi/drivers/das16.c | 6 - drivers/staging/comedi/drivers/das16m1.c | 6 - drivers/staging/comedi/drivers/das1800.c | 6 - drivers/staging/comedi/drivers/das6402.c | 5 - drivers/staging/comedi/drivers/das800.c | 6 - drivers/staging/comedi/drivers/dmm32at.c | 5 - drivers/staging/comedi/drivers/dt2811.c | 4 - drivers/staging/comedi/drivers/dt2814.c | 5 - drivers/staging/comedi/drivers/dt2815.c | 5 - drivers/staging/comedi/drivers/dt2817.c | 5 - drivers/staging/comedi/drivers/dt282x.c | 5 - drivers/staging/comedi/drivers/dt3000.c | 5 - drivers/staging/comedi/drivers/dt9812.c | 1031 ++--- drivers/staging/comedi/drivers/dyna_pci10xx.c | 4 - drivers/staging/comedi/drivers/gsc_hpdi.c | 7 +- drivers/staging/comedi/drivers/icp_multi.c | 5 - drivers/staging/comedi/drivers/jr3_pci.c | 51 +- drivers/staging/comedi/drivers/ke_counter.c | 5 - drivers/staging/comedi/drivers/me4000.c | 5 - drivers/staging/comedi/drivers/me_daq.c | 28 +- drivers/staging/comedi/drivers/mite.c | 5 - drivers/staging/comedi/drivers/mite.h | 5 - drivers/staging/comedi/drivers/mpc624.c | 5 - drivers/staging/comedi/drivers/multiq3.c | 5 - drivers/staging/comedi/drivers/ni_6527.c | 5 - drivers/staging/comedi/drivers/ni_65xx.c | 5 - drivers/staging/comedi/drivers/ni_660x.c | 4 - drivers/staging/comedi/drivers/ni_670x.c | 5 - drivers/staging/comedi/drivers/ni_at_a2150.c | 6 - drivers/staging/comedi/drivers/ni_at_ao.c | 5 - drivers/staging/comedi/drivers/ni_atmio.c | 4 - drivers/staging/comedi/drivers/ni_atmio16d.c | 5 - drivers/staging/comedi/drivers/ni_daq_700.c | 5 - drivers/staging/comedi/drivers/ni_daq_dio24.c | 6 - drivers/staging/comedi/drivers/ni_labpc.c | 66 +- drivers/staging/comedi/drivers/ni_labpc.h | 28 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 11 +- drivers/staging/comedi/drivers/ni_labpc_pci.c | 10 +- drivers/staging/comedi/drivers/ni_mio_common.c | 5 - drivers/staging/comedi/drivers/ni_mio_cs.c | 5 - drivers/staging/comedi/drivers/ni_pcidio.c | 30 +- drivers/staging/comedi/drivers/ni_pcimio.c | 4 - drivers/staging/comedi/drivers/ni_stc.h | 5 - drivers/staging/comedi/drivers/ni_tio.c | 4 - drivers/staging/comedi/drivers/ni_tio.h | 5 - drivers/staging/comedi/drivers/ni_tio_internal.h | 5 - drivers/staging/comedi/drivers/ni_tiocmd.c | 4 - drivers/staging/comedi/drivers/pcl711.c | 5 - drivers/staging/comedi/drivers/pcl726.c | 5 - drivers/staging/comedi/drivers/pcmad.c | 5 - drivers/staging/comedi/drivers/pcmda12.c | 4 - drivers/staging/comedi/drivers/pcmmio.c | 4 - drivers/staging/comedi/drivers/pcmuio.c | 4 - drivers/staging/comedi/drivers/plx9052.h | 5 - drivers/staging/comedi/drivers/poc.c | 4 - drivers/staging/comedi/drivers/rtd520.c | 4 - drivers/staging/comedi/drivers/rti800.c | 4 - drivers/staging/comedi/drivers/rti802.c | 5 - drivers/staging/comedi/drivers/s526.c | 5 - drivers/staging/comedi/drivers/s626.c | 5 - drivers/staging/comedi/drivers/s626.h | 5 - drivers/staging/comedi/drivers/serial2002.c | 5 - drivers/staging/comedi/drivers/skel.c | 5 - drivers/staging/comedi/drivers/ssv_dnp.c | 5 - drivers/staging/comedi/drivers/unioxx5.c | 4 - drivers/staging/comedi/drivers/usbdux.c | 236 +- drivers/staging/comedi/drivers/usbduxfast.c | 1282 ++---- drivers/staging/comedi/drivers/usbduxsigma.c | 238 +- drivers/staging/comedi/drivers/vmk80xx.c | 88 +- .../staging/comedi/kcomedilib/kcomedilib_main.c | 5 - drivers/staging/comedi/proc.c | 5 - drivers/staging/comedi/range.c | 5 - drivers/staging/cptm1217/clearpad_tm1217.c | 4 +- drivers/staging/crystalhd/bc_dts_glob_lnx.h | 19 +- drivers/staging/crystalhd/crystalhd_cmds.c | 28 +- drivers/staging/crystalhd/crystalhd_cmds.h | 19 +- drivers/staging/crystalhd/crystalhd_fw_if.h | 81 +- drivers/staging/crystalhd/crystalhd_hw.c | 231 +- drivers/staging/crystalhd/crystalhd_hw.h | 121 +- drivers/staging/crystalhd/crystalhd_lnx.c | 28 +- drivers/staging/crystalhd/crystalhd_lnx.h | 4 +- drivers/staging/crystalhd/crystalhd_misc.c | 39 +- drivers/staging/crystalhd/crystalhd_misc.h | 37 +- drivers/staging/csr/csr_wifi_nme_ap_sef.c | 4 +- drivers/staging/csr/drv.c | 6 +- drivers/staging/csr/io.c | 18 +- drivers/staging/csr/netdev.c | 100 +- drivers/staging/csr/sdio_mmc.c | 4 +- drivers/staging/csr/sme_blocking.c | 24 +- drivers/staging/csr/sme_native.c | 2 +- drivers/staging/csr/sme_sys.c | 148 +- drivers/staging/csr/sme_userspace.c | 4 +- drivers/staging/csr/sme_wext.c | 116 +- drivers/staging/csr/ul_int.c | 2 +- drivers/staging/csr/unifi_event.c | 20 +- drivers/staging/csr/unifi_pdu_processing.c | 490 +-- drivers/staging/csr/unifi_priv.h | 30 +- drivers/staging/csr/unifi_sme.c | 24 +- drivers/staging/csr/unifi_sme.h | 8 +- drivers/staging/cxt1e1/comet.c | 819 ++-- drivers/staging/cxt1e1/functions.c | 10 +- drivers/staging/cxt1e1/hwprobe.c | 6 +- drivers/staging/cxt1e1/linux.c | 64 +- drivers/staging/cxt1e1/musycc.c | 42 +- drivers/staging/cxt1e1/pmcc4.h | 10 +- drivers/staging/cxt1e1/pmcc4_drv.c | 52 +- drivers/staging/cxt1e1/sbecom_inline_linux.h | 6 +- drivers/staging/cxt1e1/sbeid.c | 6 +- drivers/staging/cxt1e1/sbeproc.h | 4 +- drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +- drivers/staging/dgrp/dgrp_net_ops.c | 4 +- drivers/staging/dgrp/drp.h | 2 +- drivers/staging/dwc2/core.c | 44 +- drivers/staging/dwc2/core_intr.c | 15 +- drivers/staging/dwc2/hcd.c | 7 +- drivers/staging/dwc2/hcd.h | 12 +- drivers/staging/dwc2/hcd_intr.c | 26 +- drivers/staging/dwc2/pci.c | 17 +- drivers/staging/echo/echo.c | 78 +- drivers/staging/echo/echo.h | 26 +- drivers/staging/frontier/alphatrack.c | 49 +- drivers/staging/frontier/alphatrack.h | 6 +- drivers/staging/frontier/tranzport.c | 18 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 35 +- drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 439 +- drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 156 +- drivers/staging/gdm72xx/gdm_wimax.c | 3 +- drivers/staging/goldfish/goldfish_audio.c | 30 +- drivers/staging/goldfish/goldfish_nand.c | 11 +- drivers/staging/goldfish/goldfish_nand_reg.h | 35 +- drivers/staging/iio/adc/ad7192.c | 2 +- drivers/staging/iio/adc/ad7280a.c | 2 +- drivers/staging/iio/adc/ad7606_core.c | 12 +- drivers/staging/iio/adc/ad7816.c | 8 +- drivers/staging/iio/adc/ad799x_core.c | 4 +- drivers/staging/iio/adc/mxs-lradc.c | 8 +- drivers/staging/iio/trigger/Kconfig | 11 - drivers/staging/iio/trigger/Makefile | 1 - drivers/staging/imx-drm/imx-tve.c | 18 +- drivers/staging/imx-drm/parallel-display.c | 10 - drivers/staging/keucr/init.c | 6 +- drivers/staging/keucr/scsiglue.c | 16 +- drivers/staging/keucr/smilmain.c | 1895 ++------- drivers/staging/keucr/smilsub.c | 25 +- drivers/staging/keucr/smscsi.c | 32 +- drivers/staging/keucr/transport.h | 2 +- drivers/staging/keucr/usb.c | 52 +- drivers/staging/keucr/usb.h | 83 +- drivers/staging/lustre/Kconfig | 3 + drivers/staging/lustre/Makefile | 4 + drivers/staging/lustre/TODO | 13 + .../staging/lustre/include/linux/libcfs/bitmap.h | 111 + .../staging/lustre/include/linux/libcfs/curproc.h | 110 + .../staging/lustre/include/linux/libcfs/libcfs.h | 286 ++ .../lustre/include/linux/libcfs/libcfs_cpu.h | 214 + .../lustre/include/linux/libcfs/libcfs_crypto.h | 201 + .../lustre/include/linux/libcfs/libcfs_debug.h | 350 ++ .../lustre/include/linux/libcfs/libcfs_fail.h | 170 + .../lustre/include/linux/libcfs/libcfs_hash.h | 850 ++++ .../lustre/include/linux/libcfs/libcfs_heap.h | 200 + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 222 + .../include/linux/libcfs/libcfs_kernelcomm.h | 117 + .../lustre/include/linux/libcfs/libcfs_prim.h | 101 + .../lustre/include/linux/libcfs/libcfs_private.h | 568 +++ .../lustre/include/linux/libcfs/libcfs_string.h | 137 + .../lustre/include/linux/libcfs/libcfs_time.h | 132 + .../lustre/include/linux/libcfs/libcfs_workitem.h | 110 + .../lustre/include/linux/libcfs/linux/kp30.h | 286 ++ .../lustre/include/linux/libcfs/linux/libcfs.h | 131 + .../include/linux/libcfs/linux/linux-bitops.h | 38 + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 175 + .../include/linux/libcfs/linux/linux-crypto.h | 49 + .../lustre/include/linux/libcfs/linux/linux-fs.h | 95 + .../lustre/include/linux/libcfs/linux/linux-lock.h | 204 + .../lustre/include/linux/libcfs/linux/linux-mem.h | 139 + .../lustre/include/linux/libcfs/linux/linux-prim.h | 243 ++ .../include/linux/libcfs/linux/linux-tcpip.h | 87 + .../lustre/include/linux/libcfs/linux/linux-time.h | 275 ++ .../include/linux/libcfs/linux/linux-types.h | 36 + .../include/linux/libcfs/linux/portals_compat25.h | 116 + .../staging/lustre/include/linux/libcfs/lucache.h | 162 + .../lustre/include/linux/libcfs/params_tree.h | 230 + .../lustre/include/linux/lnet/api-support.h | 44 + drivers/staging/lustre/include/linux/lnet/api.h | 220 + .../staging/lustre/include/linux/lnet/lib-lnet.h | 874 ++++ .../staging/lustre/include/linux/lnet/lib-types.h | 765 ++++ .../lustre/include/linux/lnet/linux/api-support.h | 43 + .../lustre/include/linux/lnet/linux/lib-lnet.h | 72 + .../lustre/include/linux/lnet/linux/lib-types.h | 45 + .../staging/lustre/include/linux/lnet/linux/lnet.h | 56 + .../lustre/include/linux/lnet/lnet-sysctl.h | 51 + drivers/staging/lustre/include/linux/lnet/lnet.h | 51 + .../staging/lustre/include/linux/lnet/lnetctl.h | 80 + drivers/staging/lustre/include/linux/lnet/lnetst.h | 491 +++ drivers/staging/lustre/include/linux/lnet/ptllnd.h | 94 + .../lustre/include/linux/lnet/ptllnd_wire.h | 124 + .../staging/lustre/include/linux/lnet/socklnd.h | 103 + drivers/staging/lustre/include/linux/lnet/types.h | 503 +++ drivers/staging/lustre/lnet/Kconfig | 40 + drivers/staging/lustre/lnet/Makefile | 1 + drivers/staging/lustre/lnet/klnds/Makefile | 1 + drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile | 5 + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 3256 ++++++++++++++ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 1057 +++++ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 3529 +++++++++++++++ .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 493 +++ drivers/staging/lustre/lnet/klnds/socklnd/Makefile | 7 + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 2902 +++++++++++++ .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 602 +++ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 2664 ++++++++++++ .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 1088 +++++ .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h | 91 + .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 198 + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 797 ++++ drivers/staging/lustre/lnet/lnet/Makefile | 8 + drivers/staging/lustre/lnet/lnet/acceptor.c | 527 +++ drivers/staging/lustre/lnet/lnet/api-errno.c | 39 + drivers/staging/lustre/lnet/lnet/api-ni.c | 1941 +++++++++ drivers/staging/lustre/lnet/lnet/config.c | 1264 ++++++ drivers/staging/lustre/lnet/lnet/lib-eq.c | 447 ++ drivers/staging/lustre/lnet/lnet/lib-md.c | 451 ++ drivers/staging/lustre/lnet/lnet/lib-me.c | 297 ++ drivers/staging/lustre/lnet/lnet/lib-move.c | 2441 +++++++++++ drivers/staging/lustre/lnet/lnet/lib-msg.c | 650 +++ drivers/staging/lustre/lnet/lnet/lib-ptl.c | 938 ++++ drivers/staging/lustre/lnet/lnet/lo.c | 120 + drivers/staging/lustre/lnet/lnet/module.c | 154 + drivers/staging/lustre/lnet/lnet/peer.c | 337 ++ drivers/staging/lustre/lnet/lnet/router.c | 1693 ++++++++ drivers/staging/lustre/lnet/lnet/router_proc.c | 950 +++++ drivers/staging/lustre/lnet/selftest/Makefile | 6 + drivers/staging/lustre/lnet/selftest/brw_test.c | 499 +++ drivers/staging/lustre/lnet/selftest/conctl.c | 931 ++++ drivers/staging/lustre/lnet/selftest/conrpc.c | 1397 ++++++ drivers/staging/lustre/lnet/selftest/conrpc.h | 146 + drivers/staging/lustre/lnet/selftest/console.c | 2071 +++++++++ drivers/staging/lustre/lnet/selftest/console.h | 232 + drivers/staging/lustre/lnet/selftest/framework.c | 1814 ++++++++ drivers/staging/lustre/lnet/selftest/module.c | 169 + drivers/staging/lustre/lnet/selftest/ping_test.c | 229 + drivers/staging/lustre/lnet/selftest/rpc.c | 1665 ++++++++ drivers/staging/lustre/lnet/selftest/rpc.h | 302 ++ drivers/staging/lustre/lnet/selftest/selftest.h | 611 +++ drivers/staging/lustre/lnet/selftest/timer.c | 253 ++ drivers/staging/lustre/lnet/selftest/timer.h | 53 + drivers/staging/lustre/lustre/Kconfig | 33 + drivers/staging/lustre/lustre/Makefile | 2 + drivers/staging/lustre/lustre/fid/Makefile | 5 + drivers/staging/lustre/lustre/fid/fid_handler.c | 661 +++ drivers/staging/lustre/lustre/fid/fid_internal.h | 86 + drivers/staging/lustre/lustre/fid/fid_lib.c | 97 + drivers/staging/lustre/lustre/fid/fid_request.c | 522 +++ drivers/staging/lustre/lustre/fid/fid_store.c | 259 ++ drivers/staging/lustre/lustre/fid/lproc_fid.c | 360 ++ drivers/staging/lustre/lustre/fld/Makefile | 5 + drivers/staging/lustre/lustre/fld/fld_cache.c | 566 +++ drivers/staging/lustre/lustre/fld/fld_handler.c | 447 ++ drivers/staging/lustre/lustre/fld/fld_index.c | 426 ++ drivers/staging/lustre/lustre/fld/fld_internal.h | 223 + drivers/staging/lustre/lustre/fld/fld_request.c | 519 +++ drivers/staging/lustre/lustre/fld/lproc_fld.c | 365 ++ drivers/staging/lustre/lustre/include/cl_object.h | 3281 ++++++++++++++ drivers/staging/lustre/lustre/include/dt_object.h | 1498 +++++++ .../staging/lustre/lustre/include/interval_tree.h | 124 + drivers/staging/lustre/lustre/include/ioctl.h | 106 + drivers/staging/lustre/lustre/include/lclient.h | 441 ++ .../lustre/lustre/include/linux/lprocfs_status.h | 58 + .../lustre/lustre/include/linux/lustre_acl.h | 66 + .../lustre/lustre/include/linux/lustre_common.h | 22 + .../lustre/lustre/include/linux/lustre_compat25.h | 349 ++ .../lustre/lustre/include/linux/lustre_debug.h | 47 + .../lustre/lustre/include/linux/lustre_dlm.h | 46 + .../lustre/lustre/include/linux/lustre_fsfilt.h | 181 + .../lustre/lustre/include/linux/lustre_handles.h | 53 + .../lustre/lustre/include/linux/lustre_intent.h | 62 + .../lustre/lustre/include/linux/lustre_lib.h | 87 + .../lustre/lustre/include/linux/lustre_lite.h | 100 + .../lustre/lustre/include/linux/lustre_log.h | 57 + .../lustre/lustre/include/linux/lustre_net.h | 50 + .../lustre/include/linux/lustre_patchless_compat.h | 85 + .../lustre/lustre/include/linux/lustre_quota.h | 47 + .../lustre/lustre/include/linux/lustre_user.h | 67 + drivers/staging/lustre/lustre/include/linux/lvfs.h | 134 + .../lustre/lustre/include/linux/lvfs_linux.h | 66 + drivers/staging/lustre/lustre/include/linux/obd.h | 128 + .../lustre/lustre/include/linux/obd_class.h | 58 + .../lustre/lustre/include/linux/obd_support.h | 63 + .../staging/lustre/lustre/include/lprocfs_status.h | 1100 +++++ drivers/staging/lustre/lustre/include/lu_object.h | 1346 ++++++ drivers/staging/lustre/lustre/include/lu_ref.h | 170 + drivers/staging/lustre/lustre/include/lu_target.h | 91 + .../staging/lustre/lustre/include/lustre/libiam.h | 145 + .../lustre/lustre/include/lustre/liblustreapi.h | 43 + .../lustre/lustre/include/lustre/ll_fiemap.h | 121 + .../lustre/include/lustre/lustre_build_version.h | 2 + .../lustre/lustre/include/lustre/lustre_idl.h | 3629 ++++++++++++++++ .../lustre/include/lustre/lustre_lfsck_user.h | 95 + .../lustre/lustre/include/lustre/lustre_user.h | 1146 +++++ .../lustre/lustre/include/lustre/lustreapi.h | 310 ++ drivers/staging/lustre/lustre/include/lustre_acl.h | 42 + .../staging/lustre/lustre/include/lustre_capa.h | 305 ++ drivers/staging/lustre/lustre/include/lustre_cfg.h | 299 ++ .../staging/lustre/lustre/include/lustre_debug.h | 76 + .../staging/lustre/lustre/include/lustre_disk.h | 553 +++ drivers/staging/lustre/lustre/include/lustre_dlm.h | 1668 ++++++++ .../staging/lustre/lustre/include/lustre_eacl.h | 95 + .../staging/lustre/lustre/include/lustre_export.h | 389 ++ drivers/staging/lustre/lustre/include/lustre_fid.h | 761 ++++ drivers/staging/lustre/lustre/include/lustre_fld.h | 202 + .../staging/lustre/lustre/include/lustre_fsfilt.h | 48 + drivers/staging/lustre/lustre/include/lustre_ha.h | 67 + .../staging/lustre/lustre/include/lustre_handles.h | 93 + .../staging/lustre/lustre/include/lustre_idmap.h | 104 + .../staging/lustre/lustre/include/lustre_import.h | 367 ++ drivers/staging/lustre/lustre/include/lustre_lib.h | 667 +++ .../staging/lustre/lustre/include/lustre_linkea.h | 57 + .../staging/lustre/lustre/include/lustre_lite.h | 147 + drivers/staging/lustre/lustre/include/lustre_log.h | 576 +++ drivers/staging/lustre/lustre/include/lustre_mdc.h | 176 + drivers/staging/lustre/lustre/include/lustre_mds.h | 81 + drivers/staging/lustre/lustre/include/lustre_mdt.h | 84 + drivers/staging/lustre/lustre/include/lustre_net.h | 3453 +++++++++++++++ .../staging/lustre/lustre/include/lustre_param.h | 121 + .../staging/lustre/lustre/include/lustre_quota.h | 239 ++ .../lustre/lustre/include/lustre_req_layout.h | 334 ++ drivers/staging/lustre/lustre/include/lustre_sec.h | 1145 +++++ .../staging/lustre/lustre/include/lustre_update.h | 189 + drivers/staging/lustre/lustre/include/lustre_ver.h | 24 + drivers/staging/lustre/lustre/include/lvfs.h | 57 + drivers/staging/lustre/lustre/include/md_object.h | 946 +++++ drivers/staging/lustre/lustre/include/obd.h | 1683 ++++++++ drivers/staging/lustre/lustre/include/obd_cache.h | 39 + drivers/staging/lustre/lustre/include/obd_cksum.h | 176 + drivers/staging/lustre/lustre/include/obd_class.h | 2281 ++++++++++ drivers/staging/lustre/lustre/include/obd_lov.h | 126 + drivers/staging/lustre/lustre/include/obd_ost.h | 96 + .../staging/lustre/lustre/include/obd_support.h | 853 ++++ drivers/staging/lustre/lustre/lclient/glimpse.c | 274 ++ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 1325 ++++++ .../staging/lustre/lustre/lclient/lcommon_misc.c | 194 + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 764 ++++ drivers/staging/lustre/lustre/ldlm/l_lock.c | 76 + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 242 ++ drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 849 ++++ .../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 75 + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 277 ++ drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 868 ++++ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 2443 +++++++++++ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 1238 ++++++ drivers/staging/lustre/lustre/ldlm/ldlm_plain.c | 72 + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 1406 ++++++ drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2333 ++++++++++ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1444 +++++++ drivers/staging/lustre/lustre/libcfs/Makefile | 22 + .../lustre/lustre/libcfs/crc32-pclmul_asm.S | 360 ++ drivers/staging/lustre/lustre/libcfs/debug.c | 476 +++ drivers/staging/lustre/lustre/libcfs/fail.c | 137 + drivers/staging/lustre/lustre/libcfs/hash.c | 2135 ++++++++++ drivers/staging/lustre/lustre/libcfs/heap.c | 475 +++ .../lustre/lustre/libcfs/kernel_user_comm.c | 336 ++ drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 204 + drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 192 + drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 205 + .../staging/lustre/lustre/libcfs/libcfs_string.c | 647 +++ .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 1085 +++++ .../lustre/libcfs/linux/linux-crypto-adler.c | 144 + .../lustre/libcfs/linux/linux-crypto-crc32.c | 149 + .../lustre/libcfs/linux/linux-crypto-crc32pclmul.c | 193 + .../lustre/lustre/libcfs/linux/linux-crypto.c | 305 ++ .../lustre/lustre/libcfs/linux/linux-curproc.c | 339 ++ .../lustre/lustre/libcfs/linux/linux-debug.c | 264 ++ .../staging/lustre/lustre/libcfs/linux/linux-fs.c | 113 + .../lustre/lustre/libcfs/linux/linux-lock.c | 38 + .../staging/lustre/lustre/libcfs/linux/linux-mem.c | 87 + .../lustre/lustre/libcfs/linux/linux-module.c | 183 + .../lustre/lustre/libcfs/linux/linux-prim.c | 259 ++ .../lustre/lustre/libcfs/linux/linux-proc.c | 580 +++ .../lustre/lustre/libcfs/linux/linux-sync.c | 35 + .../lustre/lustre/libcfs/linux/linux-tcpip.c | 664 +++ .../lustre/lustre/libcfs/linux/linux-tracefile.c | 275 ++ .../lustre/lustre/libcfs/linux/linux-tracefile.h | 48 + .../lustre/lustre/libcfs/linux/linux-utils.c | 75 + drivers/staging/lustre/lustre/libcfs/lwt.c | 266 ++ drivers/staging/lustre/lustre/libcfs/module.c | 498 +++ drivers/staging/lustre/lustre/libcfs/nidstrings.c | 867 ++++ drivers/staging/lustre/lustre/libcfs/prng.c | 139 + drivers/staging/lustre/lustre/libcfs/tracefile.c | 1195 ++++++ drivers/staging/lustre/lustre/libcfs/tracefile.h | 340 ++ .../staging/lustre/lustre/libcfs/upcall_cache.c | 462 ++ drivers/staging/lustre/lustre/libcfs/watchdog.c | 516 +++ drivers/staging/lustre/lustre/libcfs/workitem.c | 475 +++ drivers/staging/lustre/lustre/llite/Makefile | 13 + drivers/staging/lustre/lustre/llite/dcache.c | 675 +++ drivers/staging/lustre/lustre/llite/dir.c | 1978 +++++++++ drivers/staging/lustre/lustre/llite/file.c | 3196 ++++++++++++++ drivers/staging/lustre/lustre/llite/llite_capa.c | 661 +++ drivers/staging/lustre/lustre/llite/llite_close.c | 412 ++ .../staging/lustre/lustre/llite/llite_internal.h | 1578 +++++++ drivers/staging/lustre/lustre/llite/llite_lib.c | 2424 +++++++++++ drivers/staging/lustre/lustre/llite/llite_mmap.c | 507 +++ drivers/staging/lustre/lustre/llite/llite_nfs.c | 319 ++ drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 301 ++ drivers/staging/lustre/lustre/llite/lloop.c | 867 ++++ drivers/staging/lustre/lustre/llite/lproc_llite.c | 1397 ++++++ drivers/staging/lustre/lustre/llite/namei.c | 1279 ++++++ drivers/staging/lustre/lustre/llite/remote_perm.c | 333 ++ drivers/staging/lustre/lustre/llite/rw.c | 1307 ++++++ drivers/staging/lustre/lustre/llite/rw26.c | 586 +++ drivers/staging/lustre/lustre/llite/statahead.c | 1722 ++++++++ drivers/staging/lustre/lustre/llite/super25.c | 226 + drivers/staging/lustre/lustre/llite/symlink.c | 192 + drivers/staging/lustre/lustre/llite/vvp_dev.c | 547 +++ drivers/staging/lustre/lustre/llite/vvp_internal.h | 62 + drivers/staging/lustre/lustre/llite/vvp_io.c | 1175 +++++ drivers/staging/lustre/lustre/llite/vvp_lock.c | 85 + drivers/staging/lustre/lustre/llite/vvp_object.c | 186 + drivers/staging/lustre/lustre/llite/vvp_page.c | 558 +++ drivers/staging/lustre/lustre/llite/xattr.c | 578 +++ drivers/staging/lustre/lustre/lmv/Makefile | 5 + drivers/staging/lustre/lustre/lmv/lmv_fld.c | 88 + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 328 ++ drivers/staging/lustre/lustre/lmv/lmv_internal.h | 159 + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 2734 ++++++++++++ drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 239 ++ drivers/staging/lustre/lustre/lov/Makefile | 9 + .../staging/lustre/lustre/lov/lov_cl_internal.h | 820 ++++ drivers/staging/lustre/lustre/lov/lov_dev.c | 533 +++ drivers/staging/lustre/lustre/lov/lov_ea.c | 334 ++ drivers/staging/lustre/lustre/lov/lov_internal.h | 322 ++ drivers/staging/lustre/lustre/lov/lov_io.c | 967 +++++ drivers/staging/lustre/lustre/lov/lov_lock.c | 1253 ++++++ drivers/staging/lustre/lustre/lov/lov_log.c | 278 ++ drivers/staging/lustre/lustre/lov/lov_merge.c | 218 + drivers/staging/lustre/lustre/lov/lov_obd.c | 2923 +++++++++++++ drivers/staging/lustre/lustre/lov/lov_object.c | 942 +++++ drivers/staging/lustre/lustre/lov/lov_offset.c | 267 ++ drivers/staging/lustre/lustre/lov/lov_pack.c | 677 +++ drivers/staging/lustre/lustre/lov/lov_page.c | 235 + drivers/staging/lustre/lustre/lov/lov_pool.c | 682 +++ drivers/staging/lustre/lustre/lov/lov_request.c | 1551 +++++++ drivers/staging/lustre/lustre/lov/lovsub_dev.c | 211 + drivers/staging/lustre/lustre/lov/lovsub_io.c | 55 + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 485 +++ drivers/staging/lustre/lustre/lov/lovsub_object.c | 170 + drivers/staging/lustre/lustre/lov/lovsub_page.c | 72 + drivers/staging/lustre/lustre/lov/lproc_lov.c | 304 ++ drivers/staging/lustre/lustre/lvfs/Makefile | 6 + drivers/staging/lustre/lustre/lvfs/fsfilt.c | 138 + drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c | 761 ++++ drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 173 + drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 295 ++ drivers/staging/lustre/lustre/mdc/Makefile | 5 + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 183 + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 180 + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 564 +++ drivers/staging/lustre/lustre/mdc/mdc_locks.c | 1229 ++++++ drivers/staging/lustre/lustre/mdc/mdc_reint.c | 489 +++ drivers/staging/lustre/lustre/mdc/mdc_request.c | 2752 ++++++++++++ drivers/staging/lustre/lustre/mgc/Makefile | 5 + drivers/staging/lustre/lustre/mgc/libmgc.c | 166 + drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 68 + drivers/staging/lustre/lustre/mgc/mgc_internal.h | 75 + drivers/staging/lustre/lustre/mgc/mgc_request.c | 1863 ++++++++ drivers/staging/lustre/lustre/obdclass/Makefile | 13 + drivers/staging/lustre/lustre/obdclass/acl.c | 546 +++ drivers/staging/lustre/lustre/obdclass/capa.c | 401 ++ .../staging/lustre/lustre/obdclass/cl_internal.h | 121 + drivers/staging/lustre/lustre/obdclass/cl_io.c | 1753 ++++++++ drivers/staging/lustre/lustre/obdclass/cl_lock.c | 2304 ++++++++++ drivers/staging/lustre/lustre/obdclass/cl_object.c | 1155 +++++ drivers/staging/lustre/lustre/obdclass/cl_page.c | 1605 +++++++ drivers/staging/lustre/lustre/obdclass/class_obd.c | 691 +++ drivers/staging/lustre/lustre/obdclass/debug.c | 124 + drivers/staging/lustre/lustre/obdclass/dt_object.c | 1055 +++++ drivers/staging/lustre/lustre/obdclass/genops.c | 1855 ++++++++ drivers/staging/lustre/lustre/obdclass/idmap.c | 474 +++ drivers/staging/lustre/lustre/obdclass/linkea.c | 194 + .../lustre/lustre/obdclass/linux/linux-module.c | 430 ++ .../lustre/lustre/obdclass/linux/linux-obdo.c | 222 + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 445 ++ drivers/staging/lustre/lustre/obdclass/llog.c | 966 +++++ drivers/staging/lustre/lustre/obdclass/llog_cat.c | 833 ++++ .../staging/lustre/lustre/obdclass/llog_internal.h | 98 + .../staging/lustre/lustre/obdclass/llog_ioctl.c | 427 ++ drivers/staging/lustre/lustre/obdclass/llog_lvfs.c | 862 ++++ drivers/staging/lustre/lustre/obdclass/llog_obd.c | 319 ++ drivers/staging/lustre/lustre/obdclass/llog_osd.c | 1323 ++++++ drivers/staging/lustre/lustre/obdclass/llog_swab.c | 402 ++ drivers/staging/lustre/lustre/obdclass/llog_test.c | 1087 +++++ .../staging/lustre/lustre/obdclass/local_storage.c | 855 ++++ .../staging/lustre/lustre/obdclass/local_storage.h | 76 + .../lustre/lustre/obdclass/lprocfs_jobstats.c | 575 +++ .../lustre/lustre/obdclass/lprocfs_status.c | 2599 ++++++++++++ drivers/staging/lustre/lustre/obdclass/lu_object.c | 2209 ++++++++++ drivers/staging/lustre/lustre/obdclass/lu_ref.c | 50 + drivers/staging/lustre/lustre/obdclass/lu_ucred.c | 107 + .../lustre/lustre/obdclass/lustre_handles.c | 263 ++ .../staging/lustre/lustre/obdclass/lustre_peer.c | 218 + drivers/staging/lustre/lustre/obdclass/md_attrs.c | 202 + .../lustre/lustre/obdclass/md_local_object.c | 459 ++ drivers/staging/lustre/lustre/obdclass/mea.c | 112 + .../staging/lustre/lustre/obdclass/obd_config.c | 1899 +++++++++ drivers/staging/lustre/lustre/obdclass/obd_mount.c | 1321 ++++++ .../lustre/lustre/obdclass/obd_mount_server.c | 1783 ++++++++ drivers/staging/lustre/lustre/obdclass/obdo.c | 362 ++ .../staging/lustre/lustre/obdclass/statfs_pack.c | 75 + drivers/staging/lustre/lustre/obdclass/uuid.c | 82 + drivers/staging/lustre/lustre/obdecho/Makefile | 5 + drivers/staging/lustre/lustre/obdecho/echo.c | 679 +++ .../staging/lustre/lustre/obdecho/echo_client.c | 3217 ++++++++++++++ .../staging/lustre/lustre/obdecho/echo_internal.h | 47 + drivers/staging/lustre/lustre/obdecho/lproc_echo.c | 55 + drivers/staging/lustre/lustre/osc/Makefile | 7 + drivers/staging/lustre/lustre/osc/lproc_osc.c | 715 ++++ drivers/staging/lustre/lustre/osc/osc_cache.c | 3002 +++++++++++++ .../staging/lustre/lustre/osc/osc_cl_internal.h | 679 +++ drivers/staging/lustre/lustre/osc/osc_dev.c | 261 ++ drivers/staging/lustre/lustre/osc/osc_internal.h | 210 + drivers/staging/lustre/lustre/osc/osc_io.c | 836 ++++ drivers/staging/lustre/lustre/osc/osc_lock.c | 1663 ++++++++ drivers/staging/lustre/lustre/osc/osc_object.c | 275 ++ drivers/staging/lustre/lustre/osc/osc_page.c | 926 ++++ drivers/staging/lustre/lustre/osc/osc_quota.c | 332 ++ drivers/staging/lustre/lustre/osc/osc_request.c | 3668 ++++++++++++++++ drivers/staging/lustre/lustre/ptlrpc/Makefile | 23 + drivers/staging/lustre/lustre/ptlrpc/client.c | 3059 +++++++++++++ drivers/staging/lustre/lustre/ptlrpc/connection.c | 248 ++ drivers/staging/lustre/lustre/ptlrpc/events.c | 595 +++ drivers/staging/lustre/lustre/ptlrpc/gss/Makefile | 8 + drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h | 179 + .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h | 84 + .../staging/lustre/lustre/ptlrpc/gss/gss_bulk.c | 512 +++ .../lustre/lustre/ptlrpc/gss/gss_cli_upcall.c | 447 ++ drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h | 193 + .../lustre/lustre/ptlrpc/gss/gss_generic_token.c | 285 ++ .../lustre/lustre/ptlrpc/gss/gss_internal.h | 526 +++ .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 1424 +++++++ .../staging/lustre/lustre/ptlrpc/gss/gss_krb5.h | 163 + .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 1786 ++++++++ .../lustre/lustre/ptlrpc/gss/gss_mech_switch.c | 359 ++ .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c | 1252 ++++++ .../staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c | 242 ++ .../lustre/lustre/ptlrpc/gss/gss_svc_upcall.c | 1099 +++++ .../staging/lustre/lustre/ptlrpc/gss/lproc_gss.c | 219 + drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 2916 +++++++++++++ drivers/staging/lustre/lustre/ptlrpc/import.c | 1613 +++++++ drivers/staging/lustre/lustre/ptlrpc/layout.c | 2396 +++++++++++ drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 354 ++ drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 75 + drivers/staging/lustre/lustre/ptlrpc/llog_server.c | 466 ++ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 1401 ++++++ drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 728 ++++ drivers/staging/lustre/lustre/ptlrpc/nrs.c | 1790 ++++++++ drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c | 40 + drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 270 ++ drivers/staging/lustre/lustre/ptlrpc/nrs_orr.c | 37 + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 2575 +++++++++++ drivers/staging/lustre/lustre/ptlrpc/pers.c | 75 + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 763 ++++ .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 303 ++ .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 154 + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 827 ++++ drivers/staging/lustre/lustre/ptlrpc/recover.c | 357 ++ drivers/staging/lustre/lustre/ptlrpc/sec.c | 2465 +++++++++++ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 881 ++++ drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 1233 ++++++ drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 250 ++ drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 198 + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 464 ++ drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 1021 +++++ drivers/staging/lustre/lustre/ptlrpc/service.c | 3128 ++++++++++++++ drivers/staging/lustre/lustre/ptlrpc/wirehdr.c | 47 + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 4474 ++++++++++++++++++++ drivers/staging/nvec/nvec_kbd.c | 10 +- drivers/staging/ozwpan/ozcdev.c | 2 + drivers/staging/ozwpan/ozhcd.c | 2 +- drivers/staging/panel/panel.c | 25 +- drivers/staging/rtl8192e/rtllib_softmac.c | 5 +- drivers/staging/rtl8192u/ieee80211/dot11d.c | 14 +- drivers/staging/rtl8192u/ieee80211/dot11d.h | 10 +- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 94 +- .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 4 +- .../staging/rtl8192u/ieee80211/ieee80211_crypt.h | 2 +- .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 14 +- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 8 +- .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 4 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 34 +- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 78 +- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 26 +- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 106 +- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 82 +- drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 10 +- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 30 +- drivers/staging/rtl8192u/r8180_93cx6.c | 12 +- drivers/staging/rtl8192u/r8190_rtl8256.c | 22 +- drivers/staging/rtl8192u/r8190_rtl8256.h | 10 +- drivers/staging/rtl8192u/r8192U.h | 10 +- drivers/staging/rtl8192u/r8192U_core.c | 1232 +++--- drivers/staging/rtl8192u/r8192U_dm.c | 102 +- drivers/staging/rtl8192u/r8192U_wx.c | 34 +- drivers/staging/rtl8192u/r819xU_cmdpkt.c | 36 +- drivers/staging/rtl8192u/r819xU_cmdpkt.h | 6 +- drivers/staging/rtl8192u/r819xU_firmware.c | 46 +- drivers/staging/rtl8192u/r819xU_phy.c | 90 +- drivers/staging/rtl8192u/r819xU_phy.h | 30 +- drivers/staging/sb105x/sb_pci_mp.c | 34 +- drivers/staging/sb105x/sb_pci_mp.h | 1 - drivers/staging/silicom/bpctl_mod.c | 164 +- drivers/staging/slicoss/slicoss.c | 18 +- drivers/staging/speakup/Kconfig | 32 +- drivers/staging/speakup/devsynth.c | 14 +- drivers/staging/speakup/i18n.c | 12 +- drivers/staging/speakup/kobjects.c | 48 +- drivers/staging/speakup/main.c | 79 +- drivers/staging/speakup/serialio.c | 4 +- drivers/staging/speakup/speakup_acntpc.c | 22 +- drivers/staging/speakup/speakup_apollo.c | 20 +- drivers/staging/speakup/speakup_decext.c | 20 +- drivers/staging/speakup/speakup_decpc.c | 22 +- drivers/staging/speakup/speakup_dectlk.c | 20 +- drivers/staging/speakup/speakup_dtlk.c | 22 +- drivers/staging/speakup/speakup_keypc.c | 22 +- drivers/staging/speakup/speakup_soft.c | 34 +- drivers/staging/speakup/spk_priv.h | 13 - drivers/staging/speakup/synth.c | 38 +- drivers/staging/speakup/thread.c | 4 +- drivers/staging/speakup/varhandlers.c | 19 +- drivers/staging/ti-soc-thermal/ti-thermal-common.c | 30 +- drivers/staging/ti-soc-thermal/ti_soc_thermal.txt | 1 + drivers/staging/tidspbridge/core/_tiomap.h | 6 +- drivers/staging/tidspbridge/core/_tiomap_pwr.h | 10 +- drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 10 +- drivers/staging/tidspbridge/core/ue_deh.c | 2 +- drivers/staging/tidspbridge/core/wdt.c | 4 +- drivers/staging/usbip/usbip_event.c | 2 +- drivers/staging/vme/devices/vme_user.c | 6 +- drivers/staging/vme/devices/vme_user.h | 12 +- drivers/staging/vt6655/80211hdr.h | 2 +- drivers/staging/vt6655/80211mgr.c | 72 +- drivers/staging/vt6655/80211mgr.h | 107 +- drivers/staging/vt6655/aes_ccmp.c | 32 +- drivers/staging/vt6655/aes_ccmp.h | 2 +- drivers/staging/vt6655/hostap.c | 4 +- drivers/staging/vt6656/tether.h | 10 - drivers/staging/vt6656/tmacro.h | 6 - drivers/staging/wlags49_h2/wl_cs.c | 16 +- drivers/staging/wlags49_h2/wl_cs.h | 4 +- drivers/staging/wlags49_h2/wl_main.c | 4 +- drivers/staging/wlan-ng/prism2sta.c | 3 +- drivers/staging/xgifb/vb_init.c | 78 +- drivers/staging/xgifb/vb_setmode.c | 22 +- drivers/staging/zram/zram_drv.c | 4 +- drivers/staging/zsmalloc/zsmalloc-main.c | 7 +- drivers/staging/zsmalloc/zsmalloc.h | 2 +- 771 files changed, 267921 insertions(+), 9380 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ak8975.txt create mode 100644 drivers/iio/adc/mcp320x.c create mode 100644 drivers/iio/trigger/Kconfig create mode 100644 drivers/iio/trigger/Makefile rename drivers/{staging => }/iio/trigger/iio-trig-sysfs.c (100%) create mode 100644 drivers/staging/btmtk_usb/Kconfig create mode 100644 drivers/staging/btmtk_usb/Makefile create mode 100644 drivers/staging/btmtk_usb/README create mode 100644 drivers/staging/btmtk_usb/TODO create mode 100644 drivers/staging/btmtk_usb/btmtk_usb.c create mode 100644 drivers/staging/btmtk_usb/btmtk_usb.h create mode 100644 drivers/staging/lustre/Kconfig create mode 100644 drivers/staging/lustre/Makefile create mode 100644 drivers/staging/lustre/TODO create mode 100644 drivers/staging/lustre/include/linux/libcfs/bitmap.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/curproc.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_heap.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_private.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_string.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/kp30.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-crypto.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-lock.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-types.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/lucache.h create mode 100644 drivers/staging/lustre/include/linux/libcfs/params_tree.h create mode 100644 drivers/staging/lustre/include/linux/lnet/api-support.h create mode 100644 drivers/staging/lustre/include/linux/lnet/api.h create mode 100644 drivers/staging/lustre/include/linux/lnet/lib-lnet.h create mode 100644 drivers/staging/lustre/include/linux/lnet/lib-types.h create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/api-support.h create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/lib-types.h create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/lnet.h create mode 100644 drivers/staging/lustre/include/linux/lnet/lnet-sysctl.h create mode 100644 drivers/staging/lustre/include/linux/lnet/lnet.h create mode 100644 drivers/staging/lustre/include/linux/lnet/lnetctl.h create mode 100644 drivers/staging/lustre/include/linux/lnet/lnetst.h create mode 100644 drivers/staging/lustre/include/linux/lnet/ptllnd.h create mode 100644 drivers/staging/lustre/include/linux/lnet/ptllnd_wire.h create mode 100644 drivers/staging/lustre/include/linux/lnet/socklnd.h create mode 100644 drivers/staging/lustre/include/linux/lnet/types.h create mode 100644 drivers/staging/lustre/lnet/Kconfig create mode 100644 drivers/staging/lustre/lnet/Makefile create mode 100644 drivers/staging/lustre/lnet/klnds/Makefile create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/Makefile create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c create mode 100644 drivers/staging/lustre/lnet/lnet/Makefile create mode 100644 drivers/staging/lustre/lnet/lnet/acceptor.c create mode 100644 drivers/staging/lustre/lnet/lnet/api-errno.c create mode 100644 drivers/staging/lustre/lnet/lnet/api-ni.c create mode 100644 drivers/staging/lustre/lnet/lnet/config.c create mode 100644 drivers/staging/lustre/lnet/lnet/lib-eq.c create mode 100644 drivers/staging/lustre/lnet/lnet/lib-md.c create mode 100644 drivers/staging/lustre/lnet/lnet/lib-me.c create mode 100644 drivers/staging/lustre/lnet/lnet/lib-move.c create mode 100644 drivers/staging/lustre/lnet/lnet/lib-msg.c create mode 100644 drivers/staging/lustre/lnet/lnet/lib-ptl.c create mode 100644 drivers/staging/lustre/lnet/lnet/lo.c create mode 100644 drivers/staging/lustre/lnet/lnet/module.c create mode 100644 drivers/staging/lustre/lnet/lnet/peer.c create mode 100644 drivers/staging/lustre/lnet/lnet/router.c create mode 100644 drivers/staging/lustre/lnet/lnet/router_proc.c create mode 100644 drivers/staging/lustre/lnet/selftest/Makefile create mode 100644 drivers/staging/lustre/lnet/selftest/brw_test.c create mode 100644 drivers/staging/lustre/lnet/selftest/conctl.c create mode 100644 drivers/staging/lustre/lnet/selftest/conrpc.c create mode 100644 drivers/staging/lustre/lnet/selftest/conrpc.h create mode 100644 drivers/staging/lustre/lnet/selftest/console.c create mode 100644 drivers/staging/lustre/lnet/selftest/console.h create mode 100644 drivers/staging/lustre/lnet/selftest/framework.c create mode 100644 drivers/staging/lustre/lnet/selftest/module.c create mode 100644 drivers/staging/lustre/lnet/selftest/ping_test.c create mode 100644 drivers/staging/lustre/lnet/selftest/rpc.c create mode 100644 drivers/staging/lustre/lnet/selftest/rpc.h create mode 100644 drivers/staging/lustre/lnet/selftest/selftest.h create mode 100644 drivers/staging/lustre/lnet/selftest/timer.c create mode 100644 drivers/staging/lustre/lnet/selftest/timer.h create mode 100644 drivers/staging/lustre/lustre/Kconfig create mode 100644 drivers/staging/lustre/lustre/Makefile create mode 100644 drivers/staging/lustre/lustre/fid/Makefile create mode 100644 drivers/staging/lustre/lustre/fid/fid_handler.c create mode 100644 drivers/staging/lustre/lustre/fid/fid_internal.h create mode 100644 drivers/staging/lustre/lustre/fid/fid_lib.c create mode 100644 drivers/staging/lustre/lustre/fid/fid_request.c create mode 100644 drivers/staging/lustre/lustre/fid/fid_store.c create mode 100644 drivers/staging/lustre/lustre/fid/lproc_fid.c create mode 100644 drivers/staging/lustre/lustre/fld/Makefile create mode 100644 drivers/staging/lustre/lustre/fld/fld_cache.c create mode 100644 drivers/staging/lustre/lustre/fld/fld_handler.c create mode 100644 drivers/staging/lustre/lustre/fld/fld_index.c create mode 100644 drivers/staging/lustre/lustre/fld/fld_internal.h create mode 100644 drivers/staging/lustre/lustre/fld/fld_request.c create mode 100644 drivers/staging/lustre/lustre/fld/lproc_fld.c create mode 100644 drivers/staging/lustre/lustre/include/cl_object.h create mode 100644 drivers/staging/lustre/lustre/include/dt_object.h create mode 100644 drivers/staging/lustre/lustre/include/interval_tree.h create mode 100644 drivers/staging/lustre/lustre/include/ioctl.h create mode 100644 drivers/staging/lustre/lustre/include/lclient.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lprocfs_status.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_acl.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_common.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_compat25.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_debug.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_dlm.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_handles.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_intent.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_lib.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_lite.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_log.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_net.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_quota.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_user.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lvfs.h create mode 100644 drivers/staging/lustre/lustre/include/linux/lvfs_linux.h create mode 100644 drivers/staging/lustre/lustre/include/linux/obd.h create mode 100644 drivers/staging/lustre/lustre/include/linux/obd_class.h create mode 100644 drivers/staging/lustre/lustre/include/linux/obd_support.h create mode 100644 drivers/staging/lustre/lustre/include/lprocfs_status.h create mode 100644 drivers/staging/lustre/lustre/include/lu_object.h create mode 100644 drivers/staging/lustre/lustre/include/lu_ref.h create mode 100644 drivers/staging/lustre/lustre/include/lu_target.h create mode 100644 drivers/staging/lustre/lustre/include/lustre/libiam.h create mode 100644 drivers/staging/lustre/lustre/include/lustre/liblustreapi.h create mode 100644 drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_build_version.h create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_idl.h create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_lfsck_user.h create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_user.h create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustreapi.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_acl.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_capa.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_cfg.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_debug.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_disk.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_dlm.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_eacl.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_export.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_fid.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_fld.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_fsfilt.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_ha.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_handles.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_idmap.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_import.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_lib.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_linkea.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_lite.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_log.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_mdc.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_mds.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_mdt.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_net.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_param.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_quota.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_req_layout.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_sec.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_update.h create mode 100644 drivers/staging/lustre/lustre/include/lustre_ver.h create mode 100644 drivers/staging/lustre/lustre/include/lvfs.h create mode 100644 drivers/staging/lustre/lustre/include/md_object.h create mode 100644 drivers/staging/lustre/lustre/include/obd.h create mode 100644 drivers/staging/lustre/lustre/include/obd_cache.h create mode 100644 drivers/staging/lustre/lustre/include/obd_cksum.h create mode 100644 drivers/staging/lustre/lustre/include/obd_class.h create mode 100644 drivers/staging/lustre/lustre/include/obd_lov.h create mode 100644 drivers/staging/lustre/lustre/include/obd_ost.h create mode 100644 drivers/staging/lustre/lustre/include/obd_support.h create mode 100644 drivers/staging/lustre/lustre/lclient/glimpse.c create mode 100644 drivers/staging/lustre/lustre/lclient/lcommon_cl.c create mode 100644 drivers/staging/lustre/lustre/lclient/lcommon_misc.c create mode 100644 drivers/staging/lustre/lustre/ldlm/interval_tree.c create mode 100644 drivers/staging/lustre/lustre/ldlm/l_lock.c create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_internal.h create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_plain.c create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_request.c create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c create mode 100644 drivers/staging/lustre/lustre/libcfs/Makefile create mode 100644 drivers/staging/lustre/lustre/libcfs/crc32-pclmul_asm.S create mode 100644 drivers/staging/lustre/lustre/libcfs/debug.c create mode 100644 drivers/staging/lustre/lustre/libcfs/fail.c create mode 100644 drivers/staging/lustre/lustre/libcfs/hash.c create mode 100644 drivers/staging/lustre/lustre/libcfs/heap.c create mode 100644 drivers/staging/lustre/lustre/libcfs/kernel_user_comm.c create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_lock.c create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_mem.c create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_string.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-crc32.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-crc32pclmul.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-fs.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-lock.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-mem.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-module.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-sync.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.h create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-utils.c create mode 100644 drivers/staging/lustre/lustre/libcfs/lwt.c create mode 100644 drivers/staging/lustre/lustre/libcfs/module.c create mode 100644 drivers/staging/lustre/lustre/libcfs/nidstrings.c create mode 100644 drivers/staging/lustre/lustre/libcfs/prng.c create mode 100644 drivers/staging/lustre/lustre/libcfs/tracefile.c create mode 100644 drivers/staging/lustre/lustre/libcfs/tracefile.h create mode 100644 drivers/staging/lustre/lustre/libcfs/upcall_cache.c create mode 100644 drivers/staging/lustre/lustre/libcfs/watchdog.c create mode 100644 drivers/staging/lustre/lustre/libcfs/workitem.c create mode 100644 drivers/staging/lustre/lustre/llite/Makefile create mode 100644 drivers/staging/lustre/lustre/llite/dcache.c create mode 100644 drivers/staging/lustre/lustre/llite/dir.c create mode 100644 drivers/staging/lustre/lustre/llite/file.c create mode 100644 drivers/staging/lustre/lustre/llite/llite_capa.c create mode 100644 drivers/staging/lustre/lustre/llite/llite_close.c create mode 100644 drivers/staging/lustre/lustre/llite/llite_internal.h create mode 100644 drivers/staging/lustre/lustre/llite/llite_lib.c create mode 100644 drivers/staging/lustre/lustre/llite/llite_mmap.c create mode 100644 drivers/staging/lustre/lustre/llite/llite_nfs.c create mode 100644 drivers/staging/lustre/lustre/llite/llite_rmtacl.c create mode 100644 drivers/staging/lustre/lustre/llite/lloop.c create mode 100644 drivers/staging/lustre/lustre/llite/lproc_llite.c create mode 100644 drivers/staging/lustre/lustre/llite/namei.c create mode 100644 drivers/staging/lustre/lustre/llite/remote_perm.c create mode 100644 drivers/staging/lustre/lustre/llite/rw.c create mode 100644 drivers/staging/lustre/lustre/llite/rw26.c create mode 100644 drivers/staging/lustre/lustre/llite/statahead.c create mode 100644 drivers/staging/lustre/lustre/llite/super25.c create mode 100644 drivers/staging/lustre/lustre/llite/symlink.c create mode 100644 drivers/staging/lustre/lustre/llite/vvp_dev.c create mode 100644 drivers/staging/lustre/lustre/llite/vvp_internal.h create mode 100644 drivers/staging/lustre/lustre/llite/vvp_io.c create mode 100644 drivers/staging/lustre/lustre/llite/vvp_lock.c create mode 100644 drivers/staging/lustre/lustre/llite/vvp_object.c create mode 100644 drivers/staging/lustre/lustre/llite/vvp_page.c create mode 100644 drivers/staging/lustre/lustre/llite/xattr.c create mode 100644 drivers/staging/lustre/lustre/lmv/Makefile create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_fld.c create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_intent.c create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_internal.h create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_obd.c create mode 100644 drivers/staging/lustre/lustre/lmv/lproc_lmv.c create mode 100644 drivers/staging/lustre/lustre/lov/Makefile create mode 100644 drivers/staging/lustre/lustre/lov/lov_cl_internal.h create mode 100644 drivers/staging/lustre/lustre/lov/lov_dev.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_ea.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_internal.h create mode 100644 drivers/staging/lustre/lustre/lov/lov_io.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_lock.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_log.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_merge.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_obd.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_object.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_offset.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_pack.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_page.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_pool.c create mode 100644 drivers/staging/lustre/lustre/lov/lov_request.c create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_dev.c create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_io.c create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_lock.c create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_object.c create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_page.c create mode 100644 drivers/staging/lustre/lustre/lov/lproc_lov.c create mode 100644 drivers/staging/lustre/lustre/lvfs/Makefile create mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt.c create mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c create mode 100644 drivers/staging/lustre/lustre/lvfs/lvfs_lib.c create mode 100644 drivers/staging/lustre/lustre/lvfs/lvfs_linux.c create mode 100644 drivers/staging/lustre/lustre/mdc/Makefile create mode 100644 drivers/staging/lustre/lustre/mdc/lproc_mdc.c create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_internal.h create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_lib.c create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_locks.c create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_reint.c create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_request.c create mode 100644 drivers/staging/lustre/lustre/mgc/Makefile create mode 100644 drivers/staging/lustre/lustre/mgc/libmgc.c create mode 100644 drivers/staging/lustre/lustre/mgc/lproc_mgc.c create mode 100644 drivers/staging/lustre/lustre/mgc/mgc_internal.h create mode 100644 drivers/staging/lustre/lustre/mgc/mgc_request.c create mode 100644 drivers/staging/lustre/lustre/obdclass/Makefile create mode 100644 drivers/staging/lustre/lustre/obdclass/acl.c create mode 100644 drivers/staging/lustre/lustre/obdclass/capa.c create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_internal.h create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_io.c create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_lock.c create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_object.c create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_page.c create mode 100644 drivers/staging/lustre/lustre/obdclass/class_obd.c create mode 100644 drivers/staging/lustre/lustre/obdclass/debug.c create mode 100644 drivers/staging/lustre/lustre/obdclass/dt_object.c create mode 100644 drivers/staging/lustre/lustre/obdclass/genops.c create mode 100644 drivers/staging/lustre/lustre/obdclass/idmap.c create mode 100644 drivers/staging/lustre/lustre/obdclass/linkea.c create mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-module.c create mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c create mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c create mode 100644 drivers/staging/lustre/lustre/obdclass/llog.c create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_cat.c create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_internal.h create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_ioctl.c create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_lvfs.c create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_obd.c create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_osd.c create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_swab.c create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_test.c create mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.c create mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.h create mode 100644 drivers/staging/lustre/lustre/obdclass/lprocfs_jobstats.c create mode 100644 drivers/staging/lustre/lustre/obdclass/lprocfs_status.c create mode 100644 drivers/staging/lustre/lustre/obdclass/lu_object.c create mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ref.c create mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ucred.c create mode 100644 drivers/staging/lustre/lustre/obdclass/lustre_handles.c create mode 100644 drivers/staging/lustre/lustre/obdclass/lustre_peer.c create mode 100644 drivers/staging/lustre/lustre/obdclass/md_attrs.c create mode 100644 drivers/staging/lustre/lustre/obdclass/md_local_object.c create mode 100644 drivers/staging/lustre/lustre/obdclass/mea.c create mode 100644 drivers/staging/lustre/lustre/obdclass/obd_config.c create mode 100644 drivers/staging/lustre/lustre/obdclass/obd_mount.c create mode 100644 drivers/staging/lustre/lustre/obdclass/obd_mount_server.c create mode 100644 drivers/staging/lustre/lustre/obdclass/obdo.c create mode 100644 drivers/staging/lustre/lustre/obdclass/statfs_pack.c create mode 100644 drivers/staging/lustre/lustre/obdclass/uuid.c create mode 100644 drivers/staging/lustre/lustre/obdecho/Makefile create mode 100644 drivers/staging/lustre/lustre/obdecho/echo.c create mode 100644 drivers/staging/lustre/lustre/obdecho/echo_client.c create mode 100644 drivers/staging/lustre/lustre/obdecho/echo_internal.h create mode 100644 drivers/staging/lustre/lustre/obdecho/lproc_echo.c create mode 100644 drivers/staging/lustre/lustre/osc/Makefile create mode 100644 drivers/staging/lustre/lustre/osc/lproc_osc.c create mode 100644 drivers/staging/lustre/lustre/osc/osc_cache.c create mode 100644 drivers/staging/lustre/lustre/osc/osc_cl_internal.h create mode 100644 drivers/staging/lustre/lustre/osc/osc_dev.c create mode 100644 drivers/staging/lustre/lustre/osc/osc_internal.h create mode 100644 drivers/staging/lustre/lustre/osc/osc_io.c create mode 100644 drivers/staging/lustre/lustre/osc/osc_lock.c create mode 100644 drivers/staging/lustre/lustre/osc/osc_object.c create mode 100644 drivers/staging/lustre/lustre/osc/osc_page.c create mode 100644 drivers/staging/lustre/lustre/osc/osc_quota.c create mode 100644 drivers/staging/lustre/lustre/osc/osc_request.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/Makefile create mode 100644 drivers/staging/lustre/lustre/ptlrpc/client.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/connection.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/events.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/Makefile create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_asn1.h create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_bulk.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_generic_token.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_internal.h create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5.h create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5_mech.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_mech_switch.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/lproc_gss.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/import.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/layout.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_client.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_net.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_server.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/niobuf.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs_orr.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/pack_generic.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/pers.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/pinger.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/recover.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_config.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_gc.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_null.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_plain.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/service.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c create mode 100644 drivers/staging/lustre/lustre/ptlrpc/wiretest.c Merging char-misc/char-misc-next (f35c69b Merge 3.10-rc3 into char-misc-next) $ git merge char-misc/char-misc-next Merge made by the 'recursive' strategy. .../bindings/memory-controllers/mvebu-devbus.txt | 156 ++++++++++ drivers/char/mspec.c | 2 +- drivers/memory/Kconfig | 10 + drivers/memory/Makefile | 1 + drivers/memory/mvebu-devbus.c | 340 +++++++++++++++++++++ drivers/misc/arm-charlcd.c | 5 +- drivers/misc/ep93xx_pwm.c | 1 - drivers/misc/mei/amthif.c | 6 +- drivers/misc/mei/client.c | 26 ++ drivers/misc/mei/client.h | 1 + drivers/misc/mei/interrupt.c | 158 ++++------ drivers/misc/mei/mei_dev.h | 13 +- drivers/misc/sram.c | 7 +- drivers/misc/tsl2550.c | 4 +- drivers/uio/uio_aec.c | 14 +- drivers/uio/uio_cif.c | 14 +- drivers/uio/uio_netx.c | 14 +- drivers/uio/uio_pci_generic.c | 17 +- drivers/uio/uio_sercos3.c | 14 +- drivers/w1/masters/w1-gpio.c | 6 - 20 files changed, 617 insertions(+), 192 deletions(-) create mode 100644 Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt create mode 100644 drivers/memory/mvebu-devbus.c Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation) $ git merge bcon/master Resolved 'drivers/block/Kconfig' using previous resolution. Auto-merging kernel/printk.c Auto-merging init/do_mounts.c Auto-merging include/linux/mount.h Auto-merging include/linux/console.h Auto-merging drivers/net/netconsole.c Auto-merging drivers/block/Makefile Auto-merging drivers/block/Kconfig CONFLICT (content): Merge conflict in drivers/block/Kconfig Auto-merging block/partitions/check.h Auto-merging block/partitions/check.c Auto-merging Documentation/networking/netconsole.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2f1e119] Merge remote-tracking branch 'bcon/master' $ git diff -M --stat --summary HEAD^.. Documentation/block/blockconsole.txt | 94 ++++ Documentation/block/blockconsole/bcon_tail | 82 ++++ Documentation/block/blockconsole/mkblockconsole | 29 ++ Documentation/networking/netconsole.txt | 16 +- block/partitions/Makefile | 1 + block/partitions/blockconsole.c | 22 + block/partitions/check.c | 3 + block/partitions/check.h | 3 + drivers/block/Kconfig | 6 + drivers/block/Makefile | 1 + drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++ drivers/net/netconsole.c | 2 +- include/linux/blockconsole.h | 7 + include/linux/console.h | 1 + include/linux/mount.h | 2 +- init/do_mounts.c | 2 +- kernel/printk.c | 5 +- 17 files changed, 885 insertions(+), 9 deletions(-) create mode 100644 Documentation/block/blockconsole.txt create mode 100755 Documentation/block/blockconsole/bcon_tail create mode 100755 Documentation/block/blockconsole/mkblockconsole create mode 100644 block/partitions/blockconsole.c create mode 100644 drivers/block/blockconsole.c create mode 100644 include/linux/blockconsole.h Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) $ git merge tmem/linux-next Already up-to-date. Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio()) $ git merge writeback/writeback-for-next Already up-to-date. Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) $ git merge arm-dt/devicetree/arm-next Already up-to-date. Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) $ git merge hwspinlock/linux-next Already up-to-date. Merging pinctrl/for-next (8f6b018 Merge branch 'devel' into for-next) $ git merge pinctrl/for-next Auto-merging drivers/pinctrl/sirf/pinctrl-prima2.c Merge made by the 'recursive' strategy. .../bindings/pinctrl/marvell,dove-pinctrl.txt | 49 +- arch/arm/mach-exynos/include/mach/pm-core.h | 14 +- drivers/pinctrl/Makefile | 3 +- drivers/pinctrl/core.c | 34 +- drivers/pinctrl/mvebu/pinctrl-dove.c | 244 +++++- drivers/pinctrl/pinconf.c | 4 +- drivers/pinctrl/pinctrl-abx500.c | 10 - drivers/pinctrl/pinctrl-at91.c | 7 +- drivers/pinctrl/pinctrl-coh901.c | 4 +- drivers/pinctrl/pinctrl-exynos.c | 139 ++- drivers/pinctrl/pinctrl-exynos.h | 1 + drivers/pinctrl/pinctrl-mxs.c | 2 - drivers/pinctrl/pinctrl-samsung.c | 154 ++++ drivers/pinctrl/pinctrl-samsung.h | 9 + drivers/pinctrl/pinctrl-sunxi.c | 7 +- drivers/pinctrl/pinctrl-u300.c | 1 - drivers/pinctrl/sirf/Makefile | 5 + drivers/pinctrl/sirf/pinctrl-atlas6.c | 947 ++++++++++++++++++++ .../{pinctrl-sirf.c => sirf/pinctrl-prima2.c} | 949 +-------------------- drivers/pinctrl/sirf/pinctrl-sirf.c | 929 ++++++++++++++++++++ drivers/pinctrl/sirf/pinctrl-sirf.h | 116 +++ drivers/pinctrl/spear/pinctrl-plgpio.c | 7 +- drivers/pinctrl/vt8500/pinctrl-wmt.c | 9 +- 23 files changed, 2602 insertions(+), 1042 deletions(-) create mode 100644 drivers/pinctrl/sirf/Makefile create mode 100644 drivers/pinctrl/sirf/pinctrl-atlas6.c rename drivers/pinctrl/{pinctrl-sirf.c => sirf/pinctrl-prima2.c} (50%) create mode 100644 drivers/pinctrl/sirf/pinctrl-sirf.c create mode 100644 drivers/pinctrl/sirf/pinctrl-sirf.h Merging vhost/linux-next (f722406 Linux 3.10-rc1) $ git merge vhost/linux-next Already up-to-date. Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) $ git merge memblock/memblock-kill-early_node_map Already up-to-date. Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO) $ git merge remoteproc/for-next Already up-to-date. Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) $ git merge rpmsg/for-next Already up-to-date. Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq) $ git merge irqdomain/irqdomain/next Auto-merging kernel/irq/irqdomain.c Merge made by the 'recursive' strategy. kernel/irq/irqdomain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Merging gpio/gpio/next (08ffb22 gpio: grgpio: Add irq support) $ git merge gpio/gpio/next Already up-to-date. Merging gpio-lw/for-next (cfb1089 gpio: Don't override the error code in probe error handling) $ git merge gpio-lw/for-next Already up-to-date. Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of sizeof in mailbox_msg_send()) $ git merge mailbox/dbx500-prcmu-mailbox Auto-merging drivers/staging/tidspbridge/core/tiomap3430_pwr.c Auto-merging drivers/staging/tidspbridge/core/_tiomap.h Auto-merging drivers/remoteproc/Kconfig Auto-merging drivers/mailbox/mailbox-omap2.c Auto-merging drivers/mailbox/mailbox-omap1.c Removing arch/arm/plat-omap/mailbox.c Removing arch/arm/plat-omap/include/plat/mailbox.h Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c Auto-merging arch/arm/mach-omap2/omap_hwmod_2430_data.c Auto-merging arch/arm/mach-omap2/omap_hwmod_2420_data.c Auto-merging arch/arm/mach-omap2/devices.c Auto-merging arch/arm/mach-omap2/Makefile Auto-merging arch/arm/configs/omap1_defconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/mailbox/dbx500-mailbox.txt | 27 + arch/arm/configs/omap1_defconfig | 3 +- arch/arm/mach-omap1/Makefile | 4 - arch/arm/mach-omap2/Makefile | 3 - arch/arm/mach-omap2/devices.c | 13 +- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 12 + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 11 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 11 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 + arch/arm/plat-omap/Kconfig | 16 - arch/arm/plat-omap/Makefile | 3 - arch/arm/plat-omap/include/plat/mailbox.h | 105 ---- arch/arm/plat-omap/mailbox.c | 435 -------------- drivers/cpufreq/highbank-cpufreq.c | 2 +- drivers/mailbox/Kconfig | 41 ++ drivers/mailbox/Makefile | 5 + drivers/mailbox/mailbox-dbx500.c | 648 +++++++++++++++++++++ .../mailbox.c => drivers/mailbox/mailbox-omap1.c | 90 ++- .../mailbox.c => drivers/mailbox/mailbox-omap2.c | 330 +++++------ drivers/mailbox/mailbox.c | 552 ++++++++++++++++++ drivers/mailbox/mailbox_internal.h | 70 +++ drivers/mailbox/pl320-ipc.c | 2 +- drivers/remoteproc/Kconfig | 3 +- drivers/remoteproc/omap_remoteproc.c | 36 +- drivers/staging/tidspbridge/Kconfig | 3 +- drivers/staging/tidspbridge/core/_tiomap.h | 2 +- drivers/staging/tidspbridge/core/chnl_sm.c | 8 +- drivers/staging/tidspbridge/core/io_sm.c | 5 +- drivers/staging/tidspbridge/core/tiomap3430.c | 6 +- drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 6 +- drivers/staging/tidspbridge/core/tiomap_io.c | 9 +- .../tidspbridge/include/dspbridge/host_os.h | 2 +- include/linux/mailbox.h | 52 +- include/linux/pl320-ipc.h | 17 + include/linux/platform_data/mailbox-dbx500.h | 12 + include/linux/platform_data/mailbox-omap.h | 53 ++ 36 files changed, 1766 insertions(+), 844 deletions(-) create mode 100644 Documentation/devicetree/bindings/mailbox/dbx500-mailbox.txt delete mode 100644 arch/arm/plat-omap/include/plat/mailbox.h delete mode 100644 arch/arm/plat-omap/mailbox.c create mode 100644 drivers/mailbox/mailbox-dbx500.c rename arch/arm/mach-omap1/mailbox.c => drivers/mailbox/mailbox-omap1.c (64%) rename arch/arm/mach-omap2/mailbox.c => drivers/mailbox/mailbox-omap2.c (50%) create mode 100644 drivers/mailbox/mailbox.c create mode 100644 drivers/mailbox/mailbox_internal.h create mode 100644 include/linux/pl320-ipc.h create mode 100644 include/linux/platform_data/mailbox-dbx500.h create mode 100644 include/linux/platform_data/mailbox-omap.h Merging arm-soc/for-next (379057f Merge branch 'fixes' into for-next) $ git merge arm-soc/for-next Merge made by the 'recursive' strategy. arch/arm/arm-soc-for-next-contents.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 arch/arm/arm-soc-for-next-contents.txt Merging bcm2835/for-next (ee8056f Merge branch 'for-3.11/defconfig' into for-next) $ git merge bcm2835/for-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/bcm2835-rpi-b.dts | 11 +++++++++++ arch/arm/configs/bcm2835_defconfig | 14 ++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) Merging cortex/for-next (6fae9cd ARM: ARMv7-M: implement read_cpuid_ext) $ git merge cortex/for-next Already up-to-date. Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next) $ git merge ep93xx/ep93xx-for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging imx-mxs/for-next (77f1590 Merge branches 'imx/soc' and 'imx/dt' into for-next) $ git merge imx-mxs/for-next Auto-merging arch/arm/mach-imx/mm-imx3.c Auto-merging arch/arm/boot/dts/Makefile Merge made by the 'recursive' strategy. .../devicetree/bindings/clock/imx5-clock.txt | 13 + .../devicetree/bindings/clock/imx6q-clock.txt | 1 + .../devicetree/bindings/clock/imx6sl-clock.txt | 10 + .../bindings/pinctrl/fsl,imx-pinctrl.txt | 2 +- arch/arm/Kconfig.debug | 13 +- arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/imx27-phytec-phycore.dts | 109 +++ arch/arm/boot/dts/imx27.dtsi | 11 + arch/arm/boot/dts/imx28-apf28dev.dts | 1 + arch/arm/boot/dts/imx28-cfa10036.dts | 15 +- arch/arm/boot/dts/imx28-cfa10049.dts | 4 +- arch/arm/boot/dts/imx28-m28evk.dts | 14 +- arch/arm/boot/dts/imx28.dtsi | 33 + arch/arm/boot/dts/imx51-apf51.dts | 7 + arch/arm/boot/dts/imx51.dtsi | 23 + arch/arm/boot/dts/imx53-m53evk.dts | 259 +++++++ arch/arm/boot/dts/imx53-qsb.dts | 36 + arch/arm/boot/dts/imx53-tx53.dtsi | 122 ++++ arch/arm/boot/dts/imx53.dtsi | 246 ++++++- arch/arm/boot/dts/imx6dl-sabreauto.dts | 1 + arch/arm/boot/dts/imx6dl.dtsi | 34 + arch/arm/boot/dts/imx6q-sabreauto.dts | 1 + arch/arm/boot/dts/imx6q.dtsi | 2 - arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 22 + arch/arm/boot/dts/imx6qdl.dtsi | 9 +- arch/arm/boot/dts/imx6sl-evk.dts | 74 ++ arch/arm/boot/dts/imx6sl.dtsi | 779 +++++++++++++++++++++ arch/arm/configs/imx_v6_v7_defconfig | 4 + arch/arm/include/debug/imx-uart.h | 10 + arch/arm/mach-imx/Kconfig | 19 + arch/arm/mach-imx/Makefile | 1 + arch/arm/mach-imx/clk-imx51-imx53.c | 75 +- arch/arm/mach-imx/clk-imx6q.c | 46 +- arch/arm/mach-imx/clk-imx6sl.c | 267 +++++++ arch/arm/mach-imx/clk-pllv3.c | 10 - arch/arm/mach-imx/clk.c | 35 + arch/arm/mach-imx/clk.h | 4 +- arch/arm/mach-imx/common.h | 2 +- arch/arm/mach-imx/hardware.h | 1 + arch/arm/mach-imx/imx25-dt.c | 2 + arch/arm/mach-imx/imx27-dt.c | 2 + arch/arm/mach-imx/imx31-dt.c | 2 + arch/arm/mach-imx/imx51-dt.c | 2 + arch/arm/mach-imx/irq-common.c | 1 + arch/arm/mach-imx/mach-imx53.c | 17 +- arch/arm/mach-imx/mach-imx6q.c | 39 +- arch/arm/mach-imx/mach-imx6sl.c | 52 ++ arch/arm/mach-imx/mm-imx1.c | 2 +- arch/arm/mach-imx/mm-imx21.c | 2 +- arch/arm/mach-imx/mm-imx25.c | 2 +- arch/arm/mach-imx/mm-imx27.c | 2 +- arch/arm/mach-imx/mm-imx3.c | 4 +- arch/arm/mach-imx/mm-imx5.c | 3 +- arch/arm/mach-imx/system.c | 47 +- arch/arm/mach-mxs/mach-mxs.c | 2 - include/dt-bindings/clock/imx6sl-clock.h | 148 ++++ 56 files changed, 2513 insertions(+), 135 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/imx6sl-clock.txt create mode 100644 arch/arm/boot/dts/imx53-m53evk.dts create mode 100644 arch/arm/boot/dts/imx53-tx53.dtsi create mode 100644 arch/arm/boot/dts/imx6sl-evk.dts create mode 100644 arch/arm/boot/dts/imx6sl.dtsi create mode 100644 arch/arm/mach-imx/clk-imx6sl.c create mode 100644 arch/arm/mach-imx/mach-imx6sl.c create mode 100644 include/dt-bindings/clock/imx6sl-clock.h Merging ixp4xx/next (19f949f Linux 3.8) $ git merge ixp4xx/next Already up-to-date. Merging msm/for-next (1df357a Merge branch 'msm-defconfig' into for-next) $ git merge msm/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging mvebu/for-next (1e2448e Merge branch 'mvebu/seb_clk' into for-next) $ git merge mvebu/for-next Removing include/linux/clk/mvebu.h Removing drivers/clk/mvebu/clk.c Removing drivers/clk/mvebu/clk-gating-ctrl.h Removing drivers/clk/mvebu/clk-gating-ctrl.c Removing drivers/clk/mvebu/clk-core.h Removing drivers/clk/mvebu/clk-core.c Removing arch/arm/mach-kirkwood/db88f6281-bp-setup.c Removing arch/arm/mach-kirkwood/board-nsa310.c Auto-merging arch/arm/boot/dts/Makefile Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/pci/mvebu-pci.txt | 221 +++++ arch/arm/Kconfig | 1 + arch/arm/boot/dts/Makefile | 4 + arch/arm/boot/dts/armada-370-db.dts | 1 + arch/arm/boot/dts/armada-370-mirabox.dts | 1 + arch/arm/boot/dts/armada-370-rd.dts | 1 + arch/arm/boot/dts/armada-370-xp.dtsi | 10 +- arch/arm/boot/dts/armada-xp-db.dts | 33 + arch/arm/boot/dts/armada-xp-gp.dts | 10 + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 2 +- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 9 + arch/arm/boot/dts/armada-xp.dtsi | 2 +- arch/arm/boot/dts/dove-cubox.dts | 51 +- arch/arm/boot/dts/kirkwood-6281.dtsi | 59 ++ arch/arm/boot/dts/kirkwood-6282.dtsi | 76 ++ arch/arm/boot/dts/kirkwood-cloudbox.dts | 10 +- arch/arm/boot/dts/kirkwood-db-88f6281.dts | 30 + arch/arm/boot/dts/kirkwood-db-88f6282.dts | 34 + arch/arm/boot/dts/kirkwood-db.dtsi | 89 ++ arch/arm/boot/dts/kirkwood-dns320.dts | 7 + arch/arm/boot/dts/kirkwood-dns325.dts | 5 + arch/arm/boot/dts/kirkwood-dnskw.dtsi | 32 +- arch/arm/boot/dts/kirkwood-dockstar.dts | 9 +- arch/arm/boot/dts/kirkwood-dreamplug.dts | 12 +- arch/arm/boot/dts/kirkwood-goflexnet.dts | 18 +- .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 10 +- arch/arm/boot/dts/kirkwood-ib62x0.dts | 17 +- arch/arm/boot/dts/kirkwood-iconnect.dts | 44 +- arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 15 +- arch/arm/boot/dts/kirkwood-is2.dts | 2 + arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 13 +- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 26 +- arch/arm/boot/dts/kirkwood-mplcec4.dts | 33 +- .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 22 +- arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 10 +- arch/arm/boot/dts/kirkwood-ns2.dts | 2 + arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 + arch/arm/boot/dts/kirkwood-ns2max.dts | 2 + arch/arm/boot/dts/kirkwood-ns2mini.dts | 2 + arch/arm/boot/dts/kirkwood-nsa310.dts | 38 +- arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 108 +-- arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 97 +++ arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 40 + arch/arm/boot/dts/kirkwood-sheevaplug.dts | 45 + arch/arm/boot/dts/kirkwood-topkick.dts | 52 +- arch/arm/boot/dts/kirkwood-ts219-6281.dts | 11 +- arch/arm/boot/dts/kirkwood-ts219-6282.dts | 11 +- arch/arm/boot/dts/kirkwood-ts219.dtsi | 24 +- arch/arm/boot/dts/kirkwood.dtsi | 25 +- arch/arm/configs/kirkwood_defconfig | 10 +- arch/arm/configs/mvebu_defconfig | 4 + arch/arm/mach-dove/Kconfig | 3 +- arch/arm/mach-dove/board-dt.c | 3 +- arch/arm/mach-dove/common.c | 1 - arch/arm/mach-kirkwood/Kconfig | 33 +- arch/arm/mach-kirkwood/Makefile | 4 +- arch/arm/mach-kirkwood/board-db88f628x-bp.c | 24 + arch/arm/mach-kirkwood/board-dt.c | 22 +- arch/arm/mach-kirkwood/board-iconnect.c | 8 - arch/arm/mach-kirkwood/board-lsxl.c | 16 - arch/arm/mach-kirkwood/board-mplcec4.c | 1 - arch/arm/mach-kirkwood/board-nsa310.c | 25 - arch/arm/mach-kirkwood/board-sheevaplug.c | 27 + arch/arm/mach-kirkwood/board-ts219.c | 13 - arch/arm/mach-kirkwood/common.c | 47 +- arch/arm/mach-kirkwood/common.h | 13 + arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 108 --- arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 2 + arch/arm/mach-kirkwood/pcie.c | 22 + arch/arm/mach-mvebu/Kconfig | 7 +- arch/arm/mach-mvebu/armada-370-xp.c | 12 +- arch/arm/mach-mvebu/coherency_ll.S | 16 +- drivers/clk/mvebu/Kconfig | 25 +- drivers/clk/mvebu/Makefile | 8 +- drivers/clk/mvebu/armada-370.c | 176 ++++ drivers/clk/mvebu/armada-xp.c | 210 +++++ drivers/clk/mvebu/clk-core.c | 675 --------------- drivers/clk/mvebu/clk-core.h | 18 - drivers/clk/mvebu/clk-gating-ctrl.c | 250 ------ drivers/clk/mvebu/clk-gating-ctrl.h | 22 - drivers/clk/mvebu/clk.c | 23 - drivers/clk/mvebu/common.c | 163 ++++ drivers/clk/mvebu/common.h | 48 ++ drivers/clk/mvebu/dove.c | 194 +++++ drivers/clk/mvebu/kirkwood.c | 247 ++++++ drivers/of/address.c | 67 ++ drivers/of/of_pci.c | 59 +- drivers/pci/Kconfig | 2 + drivers/pci/Makefile | 3 + drivers/pci/host/Kconfig | 8 + drivers/pci/host/Makefile | 1 + drivers/pci/host/pci-mvebu.c | 914 +++++++++++++++++++++ include/linux/clk/mvebu.h | 22 - include/linux/of_address.h | 48 ++ include/linux/of_pci.h | 2 + 95 files changed, 3443 insertions(+), 1541 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/mvebu-pci.txt create mode 100644 arch/arm/boot/dts/kirkwood-db-88f6281.dts create mode 100644 arch/arm/boot/dts/kirkwood-db-88f6282.dts create mode 100644 arch/arm/boot/dts/kirkwood-db.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug.dts create mode 100644 arch/arm/mach-kirkwood/board-db88f628x-bp.c delete mode 100644 arch/arm/mach-kirkwood/board-nsa310.c create mode 100644 arch/arm/mach-kirkwood/board-sheevaplug.c delete mode 100644 arch/arm/mach-kirkwood/db88f6281-bp-setup.c create mode 100644 drivers/clk/mvebu/armada-370.c create mode 100644 drivers/clk/mvebu/armada-xp.c delete mode 100644 drivers/clk/mvebu/clk-core.c delete mode 100644 drivers/clk/mvebu/clk-core.h delete mode 100644 drivers/clk/mvebu/clk-gating-ctrl.c delete mode 100644 drivers/clk/mvebu/clk-gating-ctrl.h delete mode 100644 drivers/clk/mvebu/clk.c create mode 100644 drivers/clk/mvebu/common.c create mode 100644 drivers/clk/mvebu/common.h create mode 100644 drivers/clk/mvebu/dove.c create mode 100644 drivers/clk/mvebu/kirkwood.c create mode 100644 drivers/pci/host/Kconfig create mode 100644 drivers/pci/host/Makefile create mode 100644 drivers/pci/host/pci-mvebu.c delete mode 100644 include/linux/clk/mvebu.h Merging renesas/next (3db8078 Merge branches 'heads/soc-common', 'heads/soc-emev2', 'heads/soc-r8a73a4', 'heads/soc-r8a7779', 'heads/soc-sh7372', 'heads/soc-sh73a0', 'heads/soc-sh73a0-fixes', 'heads/defconfig-armadillo800eva', 'heads/defconfig-bockw', 'heads/defconfig-kzm9g', 'heads/boards-kzm9d', 'heads/boards-kzm9g', 'heads/boards-marzen-fixes', 'heads/boards-ape6evm', 'heads/boards-bockw', 'heads/boards-lager', 'heads/boards-marzen', 'heads/boards-armadillo800eva', 'heads/intc-external-irq' and 'heads/gpio-rcar' into next) $ git merge renesas/next Auto-merging arch/arm/boot/dts/Makefile Merge made by the 'recursive' strategy. .../interrupt-controller/renesas,intc-irqpin.txt | 13 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/r8a73a4.dtsi | 6 - .../boot/dts/r8a7740-armadillo800eva-reference.dts | 45 + arch/arm/boot/dts/r8a7740.dtsi | 117 + arch/arm/boot/dts/r8a7779.dtsi | 17 + arch/arm/boot/dts/r8a7790.dtsi | 6 - arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 86 + arch/arm/configs/armadillo800eva_defconfig | 2 +- arch/arm/configs/bockw_defconfig | 16 +- arch/arm/configs/kzm9g_defconfig | 3 + arch/arm/mach-shmobile/Kconfig | 19 +- arch/arm/mach-shmobile/Makefile | 3 +- arch/arm/mach-shmobile/board-ap4evb.c | 132 +- arch/arm/mach-shmobile/board-ape6evm.c | 17 +- .../board-armadillo800eva-reference.c | 213 ++ arch/arm/mach-shmobile/board-armadillo800eva.c | 116 +- arch/arm/mach-shmobile/board-bockw.c | 80 +- arch/arm/mach-shmobile/board-bonito.c | 47 +- arch/arm/mach-shmobile/board-kzm9d.c | 2 +- arch/arm/mach-shmobile/board-kzm9g-reference.c | 3 - arch/arm/mach-shmobile/board-kzm9g.c | 204 +- arch/arm/mach-shmobile/board-lager.c | 66 +- arch/arm/mach-shmobile/board-mackerel.c | 171 +- arch/arm/mach-shmobile/board-marzen.c | 12 +- arch/arm/mach-shmobile/clock-r8a73a4.c | 375 +- arch/arm/mach-shmobile/clock-r8a7740.c | 12 +- arch/arm/mach-shmobile/clock-r8a7778.c | 156 +- arch/arm/mach-shmobile/clock-r8a7779.c | 4 +- arch/arm/mach-shmobile/clock-r8a7790.c | 238 +- arch/arm/mach-shmobile/clock-sh73a0.c | 111 +- arch/arm/mach-shmobile/cpuidle-r8a7740.c | 62 + arch/arm/mach-shmobile/include/mach/clock.h | 8 +- arch/arm/mach-shmobile/include/mach/irqs.h | 5 + arch/arm/mach-shmobile/include/mach/r8a7740.h | 495 +-- arch/arm/mach-shmobile/include/mach/r8a7778.h | 3 + arch/arm/mach-shmobile/include/mach/sh7372.h | 391 -- arch/arm/mach-shmobile/intc-r8a7740.c | 24 +- arch/arm/mach-shmobile/pm-r8a7740.c | 165 +- arch/arm/mach-shmobile/setup-emev2.c | 2 - arch/arm/mach-shmobile/setup-r8a73a4.c | 2 - arch/arm/mach-shmobile/setup-r8a7740.c | 78 +- arch/arm/mach-shmobile/setup-r8a7778.c | 113 +- arch/arm/mach-shmobile/setup-r8a7779.c | 19 +- arch/arm/mach-shmobile/setup-r8a7790.c | 37 +- arch/arm/mach-shmobile/setup-sh7372.c | 24 +- arch/arm/mach-shmobile/setup-sh73a0.c | 124 +- arch/arm/mach-shmobile/sleep-r8a7740.S | 57 + drivers/gpio/gpio-rcar.c | 28 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 4 + drivers/irqchip/irq-renesas-irqc.c | 12 +- drivers/pinctrl/sh-pfc/Kconfig | 13 +- drivers/pinctrl/sh-pfc/Makefile | 2 + drivers/pinctrl/sh-pfc/core.c | 22 +- drivers/pinctrl/sh-pfc/core.h | 4 + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 1923 +++++++--- drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 2783 ++++++++++++++ drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 526 ++- drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 3835 ++++++++++++++++++++ drivers/pinctrl/sh-pfc/pfc-sh7372.c | 1652 ++++++--- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 742 ++-- drivers/pinctrl/sh-pfc/sh_pfc.h | 4 +- include/linux/irqchip.h | 4 + include/linux/platform_data/gpio-rcar.h | 5 +- 64 files changed, 12427 insertions(+), 3034 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt create mode 100644 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts create mode 100644 arch/arm/mach-shmobile/board-armadillo800eva-reference.c create mode 100644 arch/arm/mach-shmobile/cpuidle-r8a7740.c create mode 100644 arch/arm/mach-shmobile/sleep-r8a7740.S create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7778.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7790.c Merging samsung/for-next (924fd92 Revert "ARM: SAMSUNG: don't check resource with devm_ioremap_resource") $ git merge samsung/for-next Auto-merging drivers/pinctrl/pinctrl-samsung.h Auto-merging drivers/pinctrl/pinctrl-samsung.c Auto-merging drivers/pinctrl/Makefile Auto-merging drivers/cpufreq/s3c2412-cpufreq.c Auto-merging drivers/cpufreq/Kconfig.arm Auto-merging arch/arm/boot/dts/Makefile Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/media/s5p-mfc.txt | 5 + .../bindings/pinctrl/samsung-pinctrl.txt | 8 + .../devicetree/bindings/usb/exynos-usb.txt | 34 ++ arch/arm/Kconfig | 47 -- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/exynos4.dtsi | 2 + arch/arm/boot/dts/exynos4210-origen.dts | 147 +++++ arch/arm/boot/dts/exynos4210.dtsi | 3 + arch/arm/boot/dts/exynos4412-origen.dts | 62 ++ arch/arm/boot/dts/exynos4412-smdk4412.dts | 87 +++ arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 56 -- arch/arm/boot/dts/exynos5250.dtsi | 45 ++ arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 173 ++++++ arch/arm/boot/dts/s3c2416-smdk2416.dts | 72 +++ arch/arm/boot/dts/s3c2416.dtsi | 79 +++ arch/arm/boot/dts/s3c24xx.dtsi | 92 +++ arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/mach-exynos5-dt.c | 28 + arch/arm/mach-s3c24xx/Kconfig | 78 +-- arch/arm/mach-s3c24xx/Makefile | 7 +- arch/arm/mach-s3c24xx/dma-s3c2412.c | 56 +- arch/arm/mach-s3c24xx/dma-s3c2443.c | 3 +- arch/arm/mach-s3c24xx/dma.c | 3 - arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0 arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +- arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 91 +++ arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 +- arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +- arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 5 - drivers/cpufreq/Kconfig.arm | 58 ++ drivers/cpufreq/Makefile | 5 + .../cpufreq/s3c2410-cpufreq.c | 0 .../cpufreq/s3c2412-cpufreq.c | 3 +- .../cpufreq/s3c2440-cpufreq.c | 0 .../cpufreq/s3c24xx-cpufreq-debugfs.c | 0 .../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0 drivers/gpio/gpio-samsung.c | 4 + drivers/pinctrl/Kconfig | 5 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-s3c24xx.c | 652 +++++++++++++++++++++ drivers/pinctrl/pinctrl-samsung.c | 10 + drivers/pinctrl/pinctrl-samsung.h | 4 + 42 files changed, 1736 insertions(+), 209 deletions(-) create mode 100644 arch/arm/boot/dts/s3c2416-pinctrl.dtsi create mode 100644 arch/arm/boot/dts/s3c2416-smdk2416.dts create mode 100644 arch/arm/boot/dts/s3c2416.dtsi create mode 100644 arch/arm/boot/dts/s3c24xx.dtsi rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%) create mode 100644 arch/arm/mach-s3c24xx/mach-s3c2416-dt.c rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => drivers/cpufreq/s3c2410-cpufreq.c (100%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => drivers/cpufreq/s3c2412-cpufreq.c (99%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => drivers/cpufreq/s3c2440-cpufreq.c (100%) rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%) rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c (100%) create mode 100644 drivers/pinctrl/pinctrl-s3c24xx.c Merging tegra/for-next (3f23f9c Merge branch 'for-3.11/defconfig' into for-next) $ git merge tegra/for-next Auto-merging arch/arm/mach-tegra/tegra2_emc.c Auto-merging arch/arm/configs/tegra_defconfig Merge made by the 'recursive' strategy. .../bindings/clock/nvidia,tegra114-car.txt | 252 +-------------- .../bindings/clock/nvidia,tegra20-car.txt | 154 +--------- .../bindings/clock/nvidia,tegra30-car.txt | 211 +------------ .../bindings/usb/nvidia,tegra20-ehci.txt | 27 +- .../bindings/usb/nvidia,tegra20-usb-phy.txt | 41 ++- arch/arm/boot/dts/tegra114-dalmore.dts | 31 +- arch/arm/boot/dts/tegra114-pluto.dts | 2 +- arch/arm/boot/dts/tegra114.dtsi | 155 +++++----- arch/arm/boot/dts/tegra20-colibri-512.dtsi | 25 +- arch/arm/boot/dts/tegra20-harmony.dts | 61 ++-- arch/arm/boot/dts/tegra20-iris-512.dts | 13 +- arch/arm/boot/dts/tegra20-medcom-wide.dts | 8 +- arch/arm/boot/dts/tegra20-paz00.dts | 41 ++- arch/arm/boot/dts/tegra20-plutux.dts | 8 +- arch/arm/boot/dts/tegra20-seaboard.dts | 65 ++-- arch/arm/boot/dts/tegra20-tamonten.dtsi | 15 +- arch/arm/boot/dts/tegra20-tec.dts | 9 +- arch/arm/boot/dts/tegra20-trimslice.dts | 42 ++- arch/arm/boot/dts/tegra20-ventana.dts | 56 ++-- arch/arm/boot/dts/tegra20-whistler.dts | 43 ++- arch/arm/boot/dts/tegra20.dtsi | 191 +++++++----- arch/arm/boot/dts/tegra30-beaver.dts | 39 ++- arch/arm/boot/dts/tegra30-cardhu-a02.dts | 16 +- arch/arm/boot/dts/tegra30-cardhu-a04.dts | 18 +- arch/arm/boot/dts/tegra30-cardhu.dtsi | 43 +-- arch/arm/boot/dts/tegra30.dtsi | 178 +++++------ arch/arm/configs/tegra_defconfig | 8 + arch/arm/mach-tegra/Makefile | 1 + arch/arm/mach-tegra/flowctrl.h | 1 + arch/arm/mach-tegra/fuse.h | 22 +- arch/arm/mach-tegra/hotplug.c | 2 + arch/arm/mach-tegra/platsmp.c | 25 +- arch/arm/mach-tegra/reset-handler.S | 51 +-- arch/arm/mach-tegra/sleep-tegra30.S | 30 +- arch/arm/mach-tegra/sleep.S | 8 +- arch/arm/mach-tegra/sleep.h | 35 ++- arch/arm/mach-tegra/tegra2_emc.c | 2 +- drivers/clk/tegra/clk-tegra114.c | 23 +- include/dt-bindings/clk/tegra114-car.h | 342 +++++++++++++++++++++ include/dt-bindings/clk/tegra20-car.h | 158 ++++++++++ include/dt-bindings/clk/tegra30-car.h | 265 ++++++++++++++++ include/dt-bindings/gpio/tegra-gpio.h | 50 +++ 42 files changed, 1663 insertions(+), 1104 deletions(-) create mode 100644 include/dt-bindings/clk/tegra114-car.h create mode 100644 include/dt-bindings/clk/tegra20-car.h create mode 100644 include/dt-bindings/clk/tegra30-car.h create mode 100644 include/dt-bindings/gpio/tegra-gpio.h Merging dma-mapping/dma-mapping-next (c1be5a5 Linux 3.9) $ git merge dma-mapping/dma-mapping-next Already up-to-date. Merging pwm/for-next (e792714 pwm: mxs: Let device core handle pinctrl) $ git merge pwm/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 4 ++-- drivers/pwm/pwm-mxs.c | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) Merging dma-buf/for-next (b89e356 dma-buf: Add debugfs support) $ git merge dma-buf/for-next Already up-to-date. Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem) $ git merge userns/for-next Auto-merging fs/proc/root.c Merge made by the 'recursive' strategy. fs/proc/root.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines) $ git merge ktest/for-next Already up-to-date. Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) $ git merge signal/for-next Already up-to-date. Merging clk/clk-next (fa079b9 clk: sun5i: Add compatibles for Allwinner A13) $ git merge clk/clk-next Merge made by the 'recursive' strategy. .../devicetree/bindings/clock/silabs,si5351.txt | 5 + Documentation/devicetree/bindings/clock/sunxi.txt | 117 +-------- .../bindings/clock/sunxi/sun4i-a10-gates.txt | 93 +++++++ .../bindings/clock/sunxi/sun5i-a13-gates.txt | 58 +++++ arch/powerpc/platforms/Kconfig.cputype | 1 + drivers/clk/Kconfig | 7 + drivers/clk/Makefile | 1 + drivers/clk/clk-ppc-corenet.c | 280 +++++++++++++++++++++ drivers/clk/clk-si5351.c | 74 +++++- drivers/clk/clk-si5351.h | 1 + drivers/clk/clk.c | 70 +++--- drivers/clk/sunxi/clk-sunxi.c | 31 ++- drivers/clk/ux500/abx500-clk.c | 8 +- include/linux/platform_data/si5351.h | 18 ++ 14 files changed, 606 insertions(+), 158 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun4i-a10-gates.txt create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun5i-a13-gates.txt create mode 100644 drivers/clk/clk-ppc-corenet.c Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) $ git merge random/dev Already up-to-date. Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) $ git merge lzo-update/lzo-update Merge made by the 'recursive' strategy. lib/lzo/lzo1x_decompress_safe.c | 4 ++++ lib/lzo/lzodefs.h | 6 ++++++ 2 files changed, 10 insertions(+) Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) Merging akpm-current/current (bb3ec6b mm: Fix virt_to_page() warning) $ git merge akpm-current/current Already up-to-date. $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git checkout -b akpm remotes/origin/akpm/master Switched to a new branch 'akpm' $ git rebase --onto master remotes/origin/akpm/master-base First, rewinding head to replay your work on top of it... Applying: shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix Applying: CPU hotplug: provide a generic helper to disable/enable CPU hotplug Applying: cpu-hotplug-provide-a-generic-helper-to-disable-enable-cpu-hotplug-v11 Applying: reboot: rigrate shutdown/reboot to boot cpu Applying: migrate-shutdown-reboot-to-boot-cpu-v11 Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg Applying: kmsg-honor-dmesg_restrict-sysctl-on-dev-kmsg-fix Applying: kernel/audit_tree.c:audit_add_tree_rule(): protect `rule' from kill_rules() Applying: sound/soc/codecs/si476x.c: don't use 0bNNN Applying: x86: make 'mem=' option to work for efi platform Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record Applying: kernel/auditfilter.c: fix leak in audit_add_rule() error path Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress Applying: drivers/video/smscufx.c: use NULL instead of 0 Applying: drivers/video/udlfb.c: use NULL instead of 0 Applying: drivers/video/udlfb.c: make local symbol static Applying: drivers/video/imxfb.c: make local symbols static Applying: cyber2000fb: avoid palette corruption at higher clocks Applying: posix_cpu_timer: consolidate expiry time type Applying: posix_cpu_timers: consolidate timer list cleanups Applying: posix_cpu_timers: consolidate expired timers check Applying: selftests: add basic posix timers selftests Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule() Applying: posix_timers: fix racy timer delta caching on task exit Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic() Applying: configfs: use capped length for ->store_attribute() Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max Applying: fs/ocfs2/namei.c: remove unecessary ERROR when removing non-empty directory Applying: softirq: use _RET_IP_ Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros Applying: lglock: update lockdep annotations to report recursive local locks Applying: drivers/cdrom/gdrom.c: fix device number leak Applying: block/compat_ioctl.c: do not leak info to user-space Applying: block: restore /proc/partitions to not display non-partitionable removable devices Applying: vfs: fix invalid ida_remove() call Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic Applying: clear_refs: sanitize accepted commands declaration Applying: clear_refs: introduce private struct for mm_walk Applying: pagemap: introduce pagemap_entry_t without pmshift bits Applying: pagemap-introduce-pagemap_entry_t-without-pmshift-bits-v4 Applying: mm: soft-dirty bits for user memory changes tracking Applying: soft-dirty: call mmu notifiers when write-protecting ptes Applying: pagemap: prepare to reuse constant bits with page-shift Applying: mm/thp: use the correct function when updating access flags Applying: mm, memcg: don't take task_lock in task_in_mem_cgroup Applying: mm: remove free_area_cache Applying: mm: remove compressed copy from zram in-memory Applying: mm-remove-compressed-copy-from-zram-in-memory-fix Applying: mm/page_alloc.c: fix watermark check in __zone_watermark_ok() Applying: swap: add a simple detector for inappropriate swapin readahead Applying: mm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT Applying: ncpfs: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT Applying: uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT Applying: mm/page_alloc: factor out setting of pcp->high and pcp->batch Applying: mm/page_alloc: prevent concurrent updaters of pcp ->batch and ->high Applying: mm/page_alloc: insert memory barriers to allow async update of pcp batch and high Applying: mm/page_alloc: protect pcp->batch accesses with ACCESS_ONCE Applying: mm/page_alloc: convert zone_pcp_update() to rely on memory barriers instead of stop_machine() Applying: mm/page_alloc: when handling percpu_pagelist_fraction, don't unneedly recalulate high Applying: mm/page_alloc: factor setup_pageset() into pageset_init() and pageset_set_batch() Applying: mm/page_alloc: relocate comment to be directly above code it refers to. Applying: mm/page_alloc: factor zone_pageset_init() out of setup_zone_pageset() Applying: mm/page_alloc: in zone_pcp_update(), uze zone_pageset_init() Applying: mm/page_alloc: rename setup_pagelist_highmark() to match naming of pageset_set_batch() Applying: mm/THP: add pmd args to pgtable deposit and withdraw APIs Applying: mm/THP: withdraw the pgtable after pmdp related operations Applying: mm/THP: don't use HPAGE_SHIFT in transparent hugepage code Applying: mm/THP: deposit the transpare huge pgtable before set_pmd Applying: mm: vmscan: limit the number of pages kswapd reclaims at each priority Applying: mm: vmscan: obey proportional scanning requirements for kswapd Applying: mm: vmscan: flatten kswapd priority loop Applying: mm: vmscan: decide whether to compact the pgdat based on reclaim progress Applying: mm: vmscan: do not allow kswapd to scan at maximum priority Applying: mm: vmscan: have kswapd writeback pages based on dirty pages encountered, not priority Applying: mm: vmscan: block kswapd if it is encountering pages under writeback Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback-fix Applying: mm: vmscan: check if kswapd should writepage once per pgdat scan Applying: mm: vmscan: move logic from balance_pgdat() to kswapd_shrink_zone() Applying: mm: fix comment referring to non-existent size_seqlock, change to span_seqlock Applying: mmzone: note that node_size_lock should be manipulated via pgdat_resize_lock() Applying: memory_hotplug: use pgdat_resize_lock() in online_pages() Applying: memory_hotplug: use pgdat_resize_lock() in __offline_pages() Applying: memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix Applying: include/linux/mmzone.h: cleanups Applying: include-linux-mmzoneh-cleanups-fix Applying: mm: memmap_init_zone() performance improvement Applying: drop_caches: add some documentation and info message Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev Applying: mm/dmapool.c: fix null dev in dma_pool_create() Applying: memcg: debugging facility to access dangling memcgs Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix Applying: mm: add vm event counters for balloon pages compaction Applying: err.h: IS_ERR() can accept __user pointers Applying: dump_stack: serialize the output from dump_stack() Applying: dump_stack-serialize-the-output-from-dump_stack-fix Applying: panic: add cpu/pid to warn_slowpath_common in WARNING printk()s Applying: panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq Applying: backlight: atmel-pwm-bl: remove unnecessary platform_set_drvdata() Applying: backlight: ep93xx: remove unnecessary platform_set_drvdata() Applying: backlight: lp8788: remove unnecessary platform_set_drvdata() Applying: backlight: pcf50633: remove unnecessary platform_set_drvdata() Applying: lib/bitmap.c: speed up bitmap_find_free_region Applying: lib-bitmapc-speed-up-bitmap_find_free_region-fix Applying: rbtree: remove unneeded include Applying: rbtree-remove-unneeded-include-fix Applying: checkpatch: change CamelCase test and make it --strict Applying: checkpatch: warn when using gcc's binary constant ("0b") extension Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting Applying: init: remove permanent string buffer from do_one_initcall() Applying: insert missing space in printk line of root_delay Applying: autofs4: allow autofs to work outside the initial PID namespace Applying: autofs4: translate pids to the right namespace for the daemon Applying: rtc: rtc-88pm80x: remove unnecessary platform_set_drvdata() Applying: drivers/rtc/rtc-v3020.c: remove redundant goto Applying: drivers/rtc/interface.c: fix checkpatch errors Applying: drivers/rtc/rtc-at32ap700x.c: fix checkpatch error Applying: drivers/rtc/rtc-at91rm9200.c: include Applying: drivers/rtc/rtc-cmos.c: fix whitespace related errors Applying: drivers/rtc/rtc-davinci.c: fix whitespace warning Applying: drivers/rtc/rtc-ds1305.c: add missing braces around sizeof Applying: drivers/rtc/rtc-ds1374.c: fix spacing related issues Applying: drivers/rtc/rtc-ds1511.c: fix issues related to spaces and braces Applying: drivers/rtc/rtc-ds3234.c: fix whitespace issue Applying: drivers/rtc/rtc-fm3130.c: fix whitespace related issue Applying: drivers/rtc/rtc-m41t80.c: fix spacing related issue Applying: drivers/rtc/rtc-max6902.c: remove unwanted spaces Applying: drivers/rtc/rtc-max77686.c: remove space before semicolon Applying: drivers/rtc/rtc-max8997.c: remove space before semicolon Applying: drivers/rtc/rtc-mpc5121.c: remove space before tab Applying: drivers/rtc/rtc-msm6242.c: use pr_warn Applying: drivers/rtc/rtc-mxc.c: fix checkpatch error Applying: drivers/rtc/rtc-omap.c: include instead of Applying: drivers/rtc/rtc-pcf2123.c: remove space before tabs Applying: drivers/rtc/rtc-pcf8583.c: move assignment outside if condition Applying: drivers/rtc/rtc-rs5c313.c: include instead of Applying: drivers/rtc/rtc-rs5c313.c: fix spacing related issues Applying: drivers/rtc/rtc-v3020.c: fix spacing issues Applying: drivers/rtc/rtc-vr41xx.c: fix spacing issues Applying: drivers/rtc/rtc-x1205.c: fix checkpatch issues Applying: rtc: rtc-88pm860x: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ab3100: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ab8500: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-at32ap700x: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-at91rm9200: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-at91sam9: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-au1xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-bfin: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-bq4802: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-coh901331: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-da9052: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-da9055: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-davinci: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-dm355evm: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ds1302: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ep93xx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-jz4740: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-lp8788: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-lpc32xx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ls1x: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-m48t59: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-max8925: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-max8998: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-mc13xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-msm6242: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-mxc: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-nuc900: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-pcap: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-pm8xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-s3c: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-sa1100: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-sh: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-spear: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-stmp3xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-twl: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-vr41xx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-vt8500: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-m48t86: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-puv3: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-tile: remove unnecessary platform_set_drvdata() Applying: drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq Applying: drivers/rtc/rtc-m48t86.c: remove empty function Applying: drivers/rtc/rtc-tile.c: remove empty function Applying: drivers/rtc/rtc-nuc900.c: remove empty function Applying: drivers/rtc/rtc-msm6242.c: remove empty function Applying: drivers/rtc/rtc-max8998.c: remove empty function Applying: drivers/rtc/rtc-max8925.c: remove empty function Applying: drivers/rtc/rtc-ls1x.c: remove empty function Applying: drivers/rtc/rtc-lp8788.c: remove empty function Applying: drivers/rtc/rtc-ds1302.c: remove empty function Applying: drivers/rtc/rtc-dm355evm.c: remove empty function Applying: drivers/rtc/rtc-da9055.c: remove empty function Applying: drivers/rtc/rtc-da9052.c: remove empty function Applying: drivers/rtc/rtc-bq4802.c: remove empty function Applying: drivers/rtc/rtc-au1xxx.c: remove empty function Applying: drivers/rtc/rtc-ab3100.c: remove empty function Applying: rtc: rtc-hid-sensor-time: allow full years (16bit) in HID reports Applying: rtc: rtc-hid-sensor-time: allow 16 and 32 bit values for all attributes. Applying: rtc: rtc-hid-sensor-time: add option hctosys to set time at boot Applying: rtc: rtc-hid-sensor-time: add support for milliseconds Applying: rtc: add ability to push out an existing wakealarm using sysfs Applying: drivers/rtc/rtc-tps6586x.c: device wakeup flags correction Applying: reiserfs: fix deadlock with nfs racing on create/lookup Applying: fs/fat: use fat_msg() to replace printk() in __fat_fs_error() Applying: fat: additions to support fat_fallocate Applying: fat-additions-to-support-fat_fallocate-fix Applying: Documentation/CodingStyle: allow multiple return statements per function Applying: ptrace/x86: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" Applying: ptrace/powerpc: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" Applying: ptrace/arm: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" Applying: ptrace/sh: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" Applying: ptrace: revert "Prepare to fix racy accesses on task breakpoints" Applying: ptrace/x86: simplify the "disable" logic in ptrace_write_dr7() Applying: ptrace/x86: dont delay "disable" till second pass in ptrace_write_dr7() Applying: ptrace/x86: introduce ptrace_register_breakpoint() Applying: ptrace/x86: ptrace_write_dr7() should create bp if !disabled Applying: ptrace/x86: cleanup ptrace_set_debugreg() Applying: ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child) Applying: ptrace/x86: flush_ptrace_hw_breakpoint() shoule clear the virtual debug registers Applying: x86: kill TIF_DEBUG Applying: fork: reorder permissions when violating number of processes limits Applying: idr: print a stack dump after ida_remove warning Applying: idr-print-a-stack-dump-after-ida_remove-warning-fix Applying: mwave: fix info leak in mwave_ioctl() Applying: partitions/msdos.c: end-of-line whitespace and semicolon cleanup Applying: partitions: add aix lvm partition support files Applying: partitions-add-aix-lvm-partition-support-files-v2 Applying: partitions-add-aix-lvm-partition-support-files-checkpatch-fixes Applying: partitions-add-aix-lvm-partition-support-files: compile aix.c if configured Applying: partitions-add-aix-lvm-partition-support-files: add the AIX_PARTITION entry Applying: partitions/msdos: enumerate also AIX LVM partitions Applying: rapidio/switches: remove tsi500 driver Applying: drivers/parport/share.c: use kzalloc Applying: drivers/pps/clients/pps-gpio.c: convert to devm_* helpers Applying: drivers/pps/clients/pps-gpio.c: convert to module_platform_driver Applying: drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode Applying: drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix Applying: relay: fix timer madness Applying: aio: reqs_active -> reqs_available Applying: aio: percpu reqs_available Applying: generic dynamic per cpu refcounting Applying: aio: percpu ioctx refcount Applying: aio: use xchg() instead of completion_lock Applying: block: prep work for batch completion Applying: block-prep-work-for-batch-completion-fix-2 Applying: block-prep-work-for-batch-completion-fix-3 Applying: block-prep-work-for-batch-completion-fix-3-fix Applying: block-prep-work-for-batch-completion-fix-99 Applying: block-prep-work-for-batch-completion-fix-4 Applying: block-prep-work-for-batch-completion-fix-101 Applying: block, aio: batch completion for bios/kiocbs Applying: aio: fix kioctx not being freed after cancellation at exit time Applying: block-aio-batch-completion-for-bios-kiocbs-fix Applying: virtio-blk: convert to batch completion Applying: mtip32xx: convert to batch completion Applying: aio: convert the ioctx list to radix tree Applying: lib: add weak clz/ctz functions Applying: decompressor: add LZ4 decompressor module Applying: lib: add support for LZ4-compressed kernel Applying: kbuild: fix for updated LZ4 tool with the new streaming format Applying: arm: add support for LZ4-compressed kernel Applying: arm: Remove enforced Os flag for LZ4 decompressor Applying: x86: add support for LZ4-compressed kernel Applying: x86, doc: Add LZ4 magic number for the new compression Applying: lib: add lz4 compressor module Applying: lib-add-lz4-compressor-module-fix Applying: crypto: add lz4 Cryptographic API Applying: crypto-add-lz4-cryptographic-api-fix Applying: scripts/sortextable.c: fix building on non-Linux systems $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + 0d2456a...354a6e6 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (354a6e6 scripts/sortextable.c: fix building on non-Linux systems) $ git merge --no-ff akpm/master Removing drivers/rapidio/switches/tsi500.c Merge made by the 'recursive' strategy. Documentation/CodingStyle | 3 +- Documentation/cgroups/memory.txt | 16 + Documentation/filesystems/proc.txt | 7 +- Documentation/rtc.txt | 7 +- Documentation/sysctl/vm.txt | 33 +- Documentation/vm/pagemap.txt | 3 +- Documentation/vm/soft-dirty.txt | 36 ++ Documentation/x86/boot.txt | 7 +- arch/Kconfig | 3 + arch/arm/Kconfig | 1 + arch/arm/boot/compressed/.gitignore | 1 + arch/arm/boot/compressed/Makefile | 3 +- arch/arm/boot/compressed/decompress.c | 4 + arch/arm/boot/compressed/piggy.lz4.S | 6 + arch/arm/kernel/ptrace.c | 8 - arch/arm/mm/mmap.c | 2 - arch/arm64/mm/mmap.c | 2 - arch/mips/mm/mmap.c | 2 - arch/powerpc/kernel/ptrace.c | 20 - arch/powerpc/mm/mmap_64.c | 2 - arch/s390/include/asm/pgtable.h | 5 +- arch/s390/mm/mmap.c | 4 - arch/s390/mm/pgtable.c | 9 +- arch/sh/kernel/ptrace_32.c | 4 - arch/sparc/include/asm/pgtable_64.h | 5 +- arch/sparc/kernel/sys_sparc_64.c | 2 - arch/sparc/mm/tlb.c | 5 +- arch/tile/mm/mmap.c | 2 - arch/x86/Kconfig | 2 + arch/x86/boot/compressed/Makefile | 6 +- arch/x86/boot/compressed/misc.c | 4 + arch/x86/ia32/ia32_aout.c | 2 - arch/x86/include/asm/e820.h | 2 + arch/x86/include/asm/pgtable.h | 24 +- arch/x86/include/asm/pgtable_types.h | 12 + arch/x86/include/asm/thread_info.h | 4 +- arch/x86/kernel/e820.c | 72 +++- arch/x86/kernel/hw_breakpoint.c | 3 + arch/x86/kernel/ptrace.c | 204 ++++------ arch/x86/mm/mmap.c | 2 - arch/x86/platform/efi/efi.c | 15 +- block/blk-core.c | 32 +- block/blk-flush.c | 5 +- block/blk-lib.c | 3 +- block/blk.h | 3 +- block/compat_ioctl.c | 1 + block/genhd.c | 2 +- block/partitions/Kconfig | 11 + block/partitions/Makefile | 1 + block/partitions/aix.c | 293 ++++++++++++++ block/partitions/aix.h | 1 + block/partitions/msdos.c | 17 +- crypto/Kconfig | 16 + crypto/Makefile | 2 + crypto/lz4.c | 106 +++++ crypto/lz4hc.c | 106 +++++ drivers/block/blockconsole.c | 5 +- drivers/block/drbd/drbd_bitmap.c | 3 +- drivers/block/drbd/drbd_worker.c | 9 +- drivers/block/drbd/drbd_wrappers.h | 9 +- drivers/block/floppy.c | 3 +- drivers/block/mtip32xx/mtip32xx.c | 86 ++-- drivers/block/mtip32xx/mtip32xx.h | 8 +- drivers/block/nvme-core.c | 3 +- drivers/block/pktcdvd.c | 9 +- drivers/block/swim3.c | 2 +- drivers/block/virtio_blk.c | 31 +- drivers/block/xen-blkback/blkback.c | 3 +- drivers/cdrom/gdrom.c | 2 +- drivers/char/mwave/tp3780i.c | 1 + drivers/gpu/drm/drm_fb_helper.c | 8 + drivers/infiniband/core/cm.c | 5 +- drivers/md/bcache/alloc.c | 3 +- drivers/md/bcache/btree.c | 3 +- drivers/md/bcache/debug.c | 3 +- drivers/md/bcache/io.c | 6 +- drivers/md/bcache/journal.c | 9 +- drivers/md/bcache/movinggc.c | 3 +- drivers/md/bcache/request.c | 9 +- drivers/md/bcache/request.h | 3 +- drivers/md/bcache/super.c | 11 +- drivers/md/bcache/writeback.c | 8 +- drivers/md/dm-bufio.c | 9 +- drivers/md/dm-cache-target.c | 3 +- drivers/md/dm-crypt.c | 3 +- drivers/md/dm-io.c | 2 +- drivers/md/dm-snap.c | 3 +- drivers/md/dm-thin.c | 3 +- drivers/md/dm-verity.c | 3 +- drivers/md/dm.c | 8 +- drivers/md/faulty.c | 3 +- drivers/md/md.c | 9 +- drivers/md/multipath.c | 3 +- drivers/md/raid1.c | 12 +- drivers/md/raid10.c | 18 +- drivers/md/raid5.c | 15 +- drivers/parport/share.c | 3 +- drivers/pps/clients/pps-gpio.c | 46 +-- drivers/rapidio/switches/Kconfig | 7 - drivers/rapidio/switches/Makefile | 1 - drivers/rapidio/switches/tsi500.c | 78 ---- drivers/rtc/interface.c | 18 +- drivers/rtc/rtc-88pm80x.c | 1 - drivers/rtc/rtc-88pm860x.c | 1 - drivers/rtc/rtc-ab3100.c | 7 - drivers/rtc/rtc-ab8500.c | 2 - drivers/rtc/rtc-at32ap700x.c | 22 +- drivers/rtc/rtc-at91rm9200.c | 4 +- drivers/rtc/rtc-at91sam9.c | 19 +- drivers/rtc/rtc-au1xxx.c | 8 - drivers/rtc/rtc-bfin.c | 1 - drivers/rtc/rtc-bq4802.c | 8 - drivers/rtc/rtc-cmos.c | 6 +- drivers/rtc/rtc-coh901331.c | 5 +- drivers/rtc/rtc-da9052.c | 8 - drivers/rtc/rtc-da9055.c | 8 - drivers/rtc/rtc-davinci.c | 13 +- drivers/rtc/rtc-dm355evm.c | 7 - drivers/rtc/rtc-ds1302.c | 8 - drivers/rtc/rtc-ds1305.c | 32 +- drivers/rtc/rtc-ds1374.c | 11 +- drivers/rtc/rtc-ds1511.c | 93 +++-- drivers/rtc/rtc-ds3234.c | 2 +- drivers/rtc/rtc-ep93xx.c | 2 - drivers/rtc/rtc-fm3130.c | 2 +- drivers/rtc/rtc-hid-sensor-time.c | 175 ++++++++- drivers/rtc/rtc-jz4740.c | 3 - drivers/rtc/rtc-lp8788.c | 8 - drivers/rtc/rtc-lpc32xx.c | 3 - drivers/rtc/rtc-ls1x.c | 8 - drivers/rtc/rtc-m41t80.c | 2 +- drivers/rtc/rtc-m48t59.c | 1 - drivers/rtc/rtc-m48t86.c | 8 - drivers/rtc/rtc-max6902.c | 6 +- drivers/rtc/rtc-max77686.c | 2 +- drivers/rtc/rtc-max8925.c | 13 +- drivers/rtc/rtc-max8997.c | 2 +- drivers/rtc/rtc-max8998.c | 12 +- drivers/rtc/rtc-mc13xxx.c | 4 - drivers/rtc/rtc-mpc5121.c | 2 +- drivers/rtc/rtc-msm6242.c | 21 +- drivers/rtc/rtc-mxc.c | 7 +- drivers/rtc/rtc-nuc900.c | 8 - drivers/rtc/rtc-omap.c | 4 +- drivers/rtc/rtc-pcap.c | 13 +- drivers/rtc/rtc-pcf2123.c | 10 +- drivers/rtc/rtc-pcf8583.c | 3 +- drivers/rtc/rtc-pm8xxx.c | 2 - drivers/rtc/rtc-puv3.c | 1 - drivers/rtc/rtc-rp5c01.c | 12 +- drivers/rtc/rtc-rs5c313.c | 18 +- drivers/rtc/rtc-rv3029c2.c | 2 +- drivers/rtc/rtc-s3c.c | 9 +- drivers/rtc/rtc-sa1100.c | 8 +- drivers/rtc/rtc-sh.c | 2 - drivers/rtc/rtc-spear.c | 1 - drivers/rtc/rtc-stmp3xxx.c | 13 +- drivers/rtc/rtc-sysfs.c | 20 +- drivers/rtc/rtc-tile.c | 11 - drivers/rtc/rtc-tps6586x.c | 3 +- drivers/rtc/rtc-twl.c | 1 - drivers/rtc/rtc-v3020.c | 18 +- drivers/rtc/rtc-vr41xx.c | 12 +- drivers/rtc/rtc-vt8500.c | 2 - drivers/rtc/rtc-x1205.c | 33 +- drivers/target/target_core_iblock.c | 6 +- drivers/target/target_core_pscsi.c | 3 +- drivers/uio/uio.c | 2 +- drivers/usb/gadget/amd5536udc.c | 4 +- drivers/video/backlight/atmel-pwm-bl.c | 2 - drivers/video/backlight/ep93xx_bl.c | 1 - drivers/video/backlight/lp8788_bl.c | 1 - drivers/video/backlight/pcf50633-backlight.c | 2 - drivers/video/cyber2000fb.c | 3 + drivers/video/imxfb.c | 4 +- drivers/video/smscufx.c | 2 +- drivers/video/udlfb.c | 12 +- drivers/w1/slaves/w1_ds2408.c | 30 ++ fs/aio.c | 500 +++++++++++++++++------- fs/autofs4/autofs_i.h | 4 +- fs/autofs4/dev-ioctl.c | 16 +- fs/autofs4/inode.c | 33 +- fs/autofs4/waitq.c | 16 +- fs/binfmt_aout.c | 2 - fs/binfmt_elf.c | 23 +- fs/bio-integrity.c | 3 +- fs/bio.c | 63 +-- fs/btrfs/check-integrity.c | 14 +- fs/btrfs/compression.c | 6 +- fs/btrfs/disk-io.c | 6 +- fs/btrfs/extent_io.c | 12 +- fs/btrfs/inode.c | 15 +- fs/btrfs/raid56.c | 9 +- fs/btrfs/scrub.c | 18 +- fs/btrfs/volumes.c | 5 +- fs/buffer.c | 3 +- fs/configfs/file.c | 2 +- fs/direct-io.c | 20 +- fs/drop_caches.c | 2 + fs/ext4/page-io.c | 3 +- fs/f2fs/data.c | 2 +- fs/f2fs/segment.c | 3 +- fs/fat/file.c | 108 +++++- fs/fat/inode.c | 54 +++ fs/fat/misc.c | 5 +- fs/gfs2/lops.c | 3 +- fs/gfs2/ops_fstype.c | 3 +- fs/hfsplus/wrapper.c | 3 +- fs/jfs/jfs_logmgr.c | 4 +- fs/jfs/jfs_metapage.c | 6 +- fs/logfs/dev_bdev.c | 8 +- fs/mpage.c | 2 +- fs/ncpfs/mmap.c | 2 +- fs/nfs/blocklayout/blocklayout.c | 17 +- fs/nilfs2/segbuf.c | 3 +- fs/ocfs2/cluster/heartbeat.c | 4 +- fs/ocfs2/namei.c | 2 +- fs/pnode.c | 3 +- fs/proc/kmsg.c | 10 +- fs/proc/task_mmu.c | 145 +++++-- fs/reiserfs/inode.c | 9 +- fs/xfs/xfs_aops.c | 3 +- fs/xfs/xfs_buf.c | 3 +- include/asm-generic/pgtable.h | 27 +- include/linux/aio.h | 25 +- include/linux/audit.h | 26 +- include/linux/balloon_compaction.h | 7 + include/linux/batch_complete.h | 23 ++ include/linux/bio.h | 38 +- include/linux/blk_types.h | 4 +- include/linux/blkdev.h | 12 +- include/linux/cpu.h | 4 + include/linux/decompress/unlz4.h | 10 + include/linux/err.h | 10 +- include/linux/fs.h | 2 +- include/linux/hardirq.h | 5 + include/linux/hid-sensor-ids.h | 1 + include/linux/huge_mm.h | 10 +- include/linux/lockdep.h | 92 ++--- include/linux/lz4.h | 87 +++++ include/linux/memcontrol.h | 9 +- include/linux/mm_types.h | 6 +- include/linux/mmzone.h | 42 +- include/linux/page-flags.h | 4 +- include/linux/percpu-refcount.h | 114 ++++++ include/linux/posix-timers.h | 16 +- include/linux/ptrace.h | 10 - include/linux/rbtree.h | 1 - include/linux/sched.h | 5 - include/linux/swap.h | 9 +- include/linux/syslog.h | 4 +- include/linux/vm_event_item.h | 7 +- include/net/ip_vs.h | 8 +- init/Kconfig | 34 +- init/do_mounts.c | 2 +- init/main.c | 3 +- ipc/mqueue.c | 2 + ipc/shm.c | 4 +- kernel/audit.h | 1 + kernel/audit_tree.c | 1 + kernel/auditfilter.c | 6 + kernel/auditsc.c | 12 +- kernel/cpu.c | 55 ++- kernel/exit.c | 2 +- kernel/fork.c | 10 +- kernel/lglock.c | 12 +- kernel/panic.c | 5 +- kernel/posix-cpu-timers.c | 395 +++++++------------ kernel/printk.c | 91 +++-- kernel/ptrace.c | 17 +- kernel/relay.c | 14 +- kernel/smp.c | 11 +- kernel/softirq.c | 10 +- kernel/sys.c | 29 +- kernel/watchdog.c | 10 +- lib/Kconfig | 13 + lib/Makefile | 8 +- lib/bitmap.c | 23 +- lib/clz_ctz.c | 58 +++ lib/decompress.c | 5 + lib/decompress_unlz4.c | 187 +++++++++ lib/dump_stack.c | 47 ++- lib/idr.c | 7 +- lib/interval_tree.c | 1 + lib/lz4/Makefile | 3 + lib/lz4/lz4_compress.c | 443 +++++++++++++++++++++ lib/lz4/lz4_decompress.c | 326 ++++++++++++++++ lib/lz4/lz4defs.h | 156 ++++++++ lib/lz4/lz4hc_compress.c | 539 ++++++++++++++++++++++++++ lib/percpu-refcount.c | 251 ++++++++++++ mm/Kconfig | 12 + mm/balloon_compaction.c | 2 + mm/bounce.c | 12 +- mm/dmapool.c | 5 +- mm/huge_memory.c | 30 +- mm/memcontrol.c | 203 +++++++++- mm/memory.c | 2 +- mm/memory_hotplug.c | 10 + mm/migrate.c | 1 + mm/mmap.c | 34 +- mm/mremap.c | 2 +- mm/nommu.c | 4 - mm/page_alloc.c | 162 +++++--- mm/page_io.c | 43 +- mm/pgtable-generic.c | 5 +- mm/swap_state.c | 63 ++- mm/util.c | 1 - mm/vmscan.c | 452 +++++++++++++-------- mm/vmstat.c | 9 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 +- scripts/Makefile.lib | 5 + scripts/checkpatch.pl | 22 +- sound/soc/codecs/si476x.c | 6 +- tools/include/tools/be_byteshift.h | 34 +- tools/include/tools/le_byteshift.h | 34 +- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/timers/Makefile | 8 + tools/testing/selftests/timers/posix_timers.c | 221 +++++++++++ usr/Kconfig | 9 + 319 files changed, 6299 insertions(+), 2155 deletions(-) create mode 100644 Documentation/vm/soft-dirty.txt create mode 100644 arch/arm/boot/compressed/piggy.lz4.S create mode 100644 block/partitions/aix.c create mode 100644 block/partitions/aix.h create mode 100644 crypto/lz4.c create mode 100644 crypto/lz4hc.c delete mode 100644 drivers/rapidio/switches/tsi500.c create mode 100644 include/linux/batch_complete.h create mode 100644 include/linux/decompress/unlz4.h create mode 100644 include/linux/lz4.h create mode 100644 include/linux/percpu-refcount.h create mode 100644 lib/clz_ctz.c create mode 100644 lib/decompress_unlz4.c create mode 100644 lib/lz4/Makefile create mode 100644 lib/lz4/lz4_compress.c create mode 100644 lib/lz4/lz4_decompress.c create mode 100644 lib/lz4/lz4defs.h create mode 100644 lib/lz4/lz4hc_compress.c create mode 100644 lib/percpu-refcount.c create mode 100644 tools/testing/selftests/timers/Makefile create mode 100644 tools/testing/selftests/timers/posix_timers.c $ git am -3 ../patches/0001-jfs-fix-up-for-batch-completion-API-change.patch Applying: jfs: fix up for batch completion API change $ git reset HEAD^ Unstaged changes after reset: M fs/jfs/jfs_logmgr.c $ git add -A . $ git commit -v -a --amend [master c00f074] Merge branch 'akpm/master'