Google Git
Sign in
kernel / pub / scm / linux / kernel / git / next / linux-next-history / 0e9ce823ad7bc6b85c279223ae6638d47089461e / . / Next / merge.log
blob: 66c12ccefcd3d5957557c1c6631989894d1af048 [file] [log] [blame]
$ date
Thursday 3 July 10:12:18 EST 2014
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at d92a333a65a1 Merge tag 'fbdev-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Merging origin/master (d92a333a65a1 Merge tag 'fbdev-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux)
$ git merge origin/master
Already up-to-date.
Merging fixes/master (b8accbbce667 powerpc: Disable RELOCATABLE for COMPILE_TEST with PPC64)
$ git merge fixes/master
Merge made by the 'recursive' strategy.
arch/powerpc/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Merging kbuild-current/rc-fixes (c14105628b2e kbuild: fix a typo in a kbuild document)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (42309ab450b6 ARM: 8087/1: ptrace: reload syscall number after secure_computing() check)
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo())
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging powerpc-merge/merge (6663a4fa6711 powerpc: Don't skip ePAPR spin-table CPUs)
$ git merge powerpc-merge/merge
Already up-to-date.
Merging sparc/master (894e552cfaa3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
$ git merge sparc/master
Already up-to-date.
Merging net/master (5925a0555bda net: fix sparse warning in sk_dst_set())
$ git merge net/master
Merge made by the 'recursive' strategy.
arch/powerpc/net/bpf_jit_comp.c | 10 ++--
drivers/bluetooth/ath3k.c | 2 -
drivers/bluetooth/btusb.c | 1 -
drivers/bluetooth/hci_h5.c | 1 +
drivers/net/ethernet/broadcom/bcmsysport.c | 43 ++++------------
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 +++---
drivers/net/phy/mdio_bus.c | 44 ++++++++++++++++
drivers/net/wireless/ath/ath10k/core.c | 6 ++-
drivers/net/wireless/ath/ath10k/htt_rx.c | 18 -------
drivers/net/wireless/brcm80211/brcmfmac/usb.c | 5 +-
drivers/net/wireless/iwlwifi/iwl-fw.h | 1 +
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 7 +++
drivers/net/wireless/iwlwifi/mvm/scan.c | 65 +++++++-----------------
drivers/net/wireless/iwlwifi/pcie/drv.c | 3 +-
drivers/net/wireless/mwifiex/main.c | 1 +
drivers/of/of_mdio.c | 34 -------------
include/linux/of_mdio.h | 8 ---
include/net/sock.h | 12 ++---
net/8021q/vlan_dev.c | 13 +++--
net/bluetooth/hci_conn.c | 12 ++++-
net/bluetooth/smp.c | 60 +++++++++++++++++-----
net/ipv4/route.c | 15 +++---
net/ipv4/udp.c | 5 +-
net/ipv6/mcast.c | 13 ++++-
net/ipv6/udp.c | 6 ++-
net/mac80211/util.c | 5 +-
net/wireless/core.h | 2 +-
net/wireless/nl80211.c | 11 ++--
net/wireless/reg.c | 22 +++-----
31 files changed, 227 insertions(+), 219 deletions(-)
Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
net/xfrm/xfrm_policy.c | 2 ++
net/xfrm/xfrm_user.c | 7 +++----
2 files changed, 5 insertions(+), 4 deletions(-)
Merging sound-current/for-linus (a12137e779e1 ALSA: hda - Add a fixup for Thinkpad T540p)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
sound/pci/hda/patch_realtek.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
Merging pci-current/for-linus (d066c946a866 PCI: Fix unaligned access in AF transaction pending test)
$ git merge pci-current/for-linus
Merge made by the 'recursive' strategy.
drivers/pci/pci.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
Merging wireless/master (e055a6e20a91 Merge branch 'ath-current' of git://github.com/kvalo/ath)
$ git merge wireless/master
Already up-to-date.
Merging driver-core.current/driver-core-linus (ecca47ce8294 kernfs: kernfs_notify() must be useable from non-sleepable contexts)
$ git merge driver-core.current/driver-core-linus
Merge made by the 'recursive' strategy.
fs/kernfs/file.c | 69 ++++++++++++++++++++++++++++++++++++++++----------
include/linux/kernfs.h | 1 +
2 files changed, 56 insertions(+), 14 deletions(-)
Merging tty.current/tty-linus (a497c3ba1d97 Linux 3.16-rc2)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (e4adcff09ca3 usb: chipidea: udc: delete td from req's td list at ep_dequeue)
$ git merge usb.current/usb-linus
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 14 +-------------
drivers/scsi/sd.c | 5 ++++-
drivers/usb/chipidea/udc.c | 7 +++++++
drivers/usb/dwc3/Kconfig | 1 +
drivers/usb/dwc3/dwc3-omap.c | 17 ++++++++++++++---
drivers/usb/dwc3/gadget.c | 8 ++++----
drivers/usb/gadget/configfs.c | 37 +++++++++++++++++++------------------
drivers/usb/gadget/configfs.h | 1 +
drivers/usb/gadget/f_fs.c | 12 +++++++-----
drivers/usb/gadget/f_rndis.c | 6 ++++--
drivers/usb/gadget/gr_udc.c | 5 +++--
drivers/usb/gadget/inode.c | 7 ++++++-
drivers/usb/gadget/u_ether.c | 3 +++
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/xhci-hub.c | 5 ++++-
drivers/usb/host/xhci-ring.c | 9 ++++++---
drivers/usb/host/xhci.c | 10 +++++++---
drivers/usb/musb/musb_am335x.c | 23 ++++++-----------------
drivers/usb/musb/musb_core.c | 2 +-
drivers/usb/musb/musb_cppi41.c | 2 +-
drivers/usb/musb/musb_dsps.c | 9 ++++-----
drivers/usb/musb/ux500.c | 1 -
drivers/usb/phy/phy-msm-usb.c | 4 +++-
drivers/usb/renesas_usbhs/fifo.c | 8 ++++++++
drivers/usb/serial/ftdi_sio.c | 7 +++++--
drivers/usb/serial/option.c | 26 ++++++++++++++++++++------
drivers/usb/storage/scsiglue.c | 4 ++++
drivers/usb/storage/unusual_devs.h | 7 +++++++
include/linux/usb_usual.h | 4 +++-
include/scsi/scsi_device.h | 1 +
include/uapi/linux/usb/functionfs.h | 7 +++++++
tools/usb/ffs-test.c | 4 ++--
32 files changed, 164 insertions(+), 94 deletions(-)
Merging usb-gadget-fixes/fixes (8035691365b8 usb: musb: dsps: fix the base address for accessing the mode register)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (660856948664 MAINTAINERS: update e-mail address)
$ git merge usb-serial-fixes/usb-linus
Already up-to-date.
Merging staging.current/staging-linus (6b64168de843 Merge tag 'iio-fixes-for-3.16b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
drivers/iio/adc/ad799x.c | 8 ++++++--
drivers/iio/inkern.c | 6 ++++--
drivers/staging/iio/adc/ad7291.c | 4 ++--
drivers/staging/tidspbridge/core/tiomap3430.c | 6 ++++--
4 files changed, 16 insertions(+), 8 deletions(-)
Merging char-misc.current/char-misc-linus (a497c3ba1d97 Linux 3.16-rc2)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (31972f6e517d Input: ti_am335x_tsc - warn about incorrect spelling)
$ git merge input-current/for-linus
Merge made by the 'recursive' strategy.
drivers/input/tablet/wacom_wac.c | 28 +++++++---------------------
drivers/input/touchscreen/ti_am335x_tsc.c | 5 ++++-
2 files changed, 11 insertions(+), 22 deletions(-)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
$ git merge md-current/for-linus
Already up-to-date.
Merging crypto-current/master (cfe82d4f45c7 crypto: sha512_ssse3 - fix byte count to bit count conversion)
$ git merge crypto-current/master
Merge made by the 'recursive' strategy.
arch/x86/crypto/sha512_ssse3_glue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies)
$ git merge ide/master
Merge made by the 'recursive' strategy.
drivers/ide/Kconfig | 5 ++++-
drivers/ide/ide-probe.c | 8 +++++---
2 files changed, 9 insertions(+), 4 deletions(-)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
$ git merge dwmw2/master
Already up-to-date.
Merging devicetree-current/devicetree/merge (4b660a7f5c80 Linux 3.15-rc6)
$ git merge devicetree-current/devicetree/merge
Already up-to-date.
Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.)
$ git merge rr-fixes/fixes
Already up-to-date.
Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works)
$ git merge mfd-fixes/master
Already up-to-date.
Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (5549d25f642a drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
drivers/gpu/drm/i915/intel_display.c | 27 ++++++++++++++++++++++++++-
drivers/gpu/drm/i915/intel_pm.c | 8 ++++++++
drivers/gpu/drm/i915/intel_sprite.c | 8 ++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (4c834452aad0 Linux 3.16-rc3)
$ git merge arc/for-next
Already up-to-date.
Merging arm/for-next (e8ba1384b32a ARM: make it easier to check the CPU part number correctly)
$ git merge arm/for-next
Auto-merging arch/arm/boot/compressed/vmlinux.lds.S
Merge made by the 'recursive' strategy.
arch/arm/boot/compressed/Makefile | 5 +-
arch/arm/boot/compressed/head.S | 7 +--
.../compressed/{vmlinux.lds.in => vmlinux.lds.S} | 17 +++++--
arch/arm/common/mcpm_entry.c | 52 ++++++++++++++++++++
arch/arm/include/asm/assembler.h | 8 ++--
arch/arm/include/asm/cputype.h | 37 ++++++++++-----
arch/arm/include/asm/mcpm.h | 16 +++++++
arch/arm/include/asm/smp_scu.h | 2 +-
arch/arm/include/asm/thread_info.h | 3 +-
arch/arm/kernel/perf_event_cpu.c | 55 +++++++++++-----------
arch/arm/kvm/guest.c | 8 +---
arch/arm/mach-exynos/mcpm-exynos.c | 17 ++++++-
arch/arm/mach-exynos/platsmp.c | 4 +-
arch/arm/mach-exynos/pm.c | 11 ++---
arch/arm/mach-vexpress/tc2_pm.c | 19 +++++++-
arch/arm/mm/cache-l2x0.c | 2 +-
arch/arm/plat-omap/dma.c | 2 +
drivers/clocksource/arm_global_timer.c | 2 +-
18 files changed, 192 insertions(+), 75 deletions(-)
rename arch/arm/boot/compressed/{vmlinux.lds.in => vmlinux.lds.S} (81%)
Merging arm-perf/for-next/perf (037e79aa958d arm: perf: krait: stop using singleton PMU)
$ git merge arm-perf/for-next/perf
Resolved 'arch/arm/kernel/perf_event_cpu.c' using previous resolution.
Auto-merging arch/arm/kernel/perf_event_cpu.c
CONFLICT (content): Merge conflict in arch/arm/kernel/perf_event_cpu.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 29f92273a2a3] Merge remote-tracking branch 'arm-perf/for-next/perf'
$ git diff -M --stat --summary HEAD^..
arch/arm/include/asm/perf_event.h | 9 -
arch/arm/include/asm/pmu.h | 19 +
arch/arm/kernel/perf_event_cpu.c | 13 +-
arch/arm/kernel/perf_event_v6.c | 307 +++---------
arch/arm/kernel/perf_event_v7.c | 967 ++++++++----------------------------
arch/arm/kernel/perf_event_xscale.c | 121 +----
arch/arm/oprofile/common.c | 14 +-
7 files changed, 349 insertions(+), 1101 deletions(-)
Merging arm-soc/for-next (3464a486dcc1 Merge branch 'fixes' into for-next)
$ git merge arm-soc/for-next
Merge made by the 'recursive' strategy.
arch/arm/configs/bcm_defconfig | 2 +-
arch/arm/configs/multi_v7_defconfig | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
$ git merge bcm2835/for-next
Already up-to-date.
Merging berlin/berlin/for-next (251f72d06c59 Merge branch 'berlin/soc' into berlin/for-next)
$ git merge berlin/berlin/for-next
Auto-merging arch/arm/mach-berlin/Kconfig
Merge made by the 'recursive' strategy.
.../arm/cpu-enable-method/marvell,berlin-smp | 41 +++++++++
.../devicetree/bindings/arm/marvell,berlin.txt | 16 ++++
arch/arm/boot/dts/berlin2.dtsi | 6 ++
arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 8 ++
arch/arm/boot/dts/berlin2q.dtsi | 80 +++++++++++++++++
arch/arm/mach-berlin/Kconfig | 3 +
arch/arm/mach-berlin/Makefile | 3 +-
arch/arm/mach-berlin/headsmp.S | 30 +++++++
arch/arm/mach-berlin/platsmp.c | 99 ++++++++++++++++++++++
9 files changed, 285 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/marvell,berlin-smp
create mode 100644 arch/arm/mach-berlin/headsmp.S
create mode 100644 arch/arm/mach-berlin/platsmp.c
Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
$ git merge cortex-m/for-next
Already up-to-date.
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
$ git merge ep93xx/ep93xx-for-next
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (9f8cc13fbcaa Merge branch 'imx/dt' into for-next)
$ git merge imx-mxs/for-next
Resolved 'arch/arm/mach-imx/Kconfig' using previous resolution.
Removing include/linux/platform_data/usb-imx_udc.h
Removing arch/arm/mach-imx/mx53.h
Removing arch/arm/mach-imx/mx51.h
Removing arch/arm/mach-imx/mm-imx5.c
Auto-merging arch/arm/mach-imx/mach-imx51.c
Removing arch/arm/mach-imx/mach-imx27ipcam.c
Removing arch/arm/mach-imx/iomux-mx51.h
Removing arch/arm/mach-imx/ehci-imx5.c
Removing arch/arm/mach-imx/devices/platform-imx_udc.c
Removing arch/arm/mach-imx/devices-imx51.h
Removing arch/arm/mach-imx/crm-regs-imx5.h
Auto-merging arch/arm/mach-imx/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Kconfig
Auto-merging arch/arm/configs/multi_v7_defconfig
Auto-merging arch/arm/boot/dts/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master fe99ed6a212e] Merge remote-tracking branch 'imx-mxs/for-next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/clock/imx1-clock.txt | 26 +
.../devicetree/bindings/clock/imx21-clock.txt | 28 +
.../devicetree/bindings/clock/imx6q-clock.txt | 220 +--
arch/arm/boot/dts/Makefile | 15 +
.../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 73 +
.../imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts | 45 +
.../imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts | 45 +
.../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 1 -
arch/arm/boot/dts/imx25-pdk.dts | 8 +-
arch/arm/boot/dts/imx25.dtsi | 8 +-
arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 296 ++++
.../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 273 ++++
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 -
arch/arm/boot/dts/imx28-cfa10036.dts | 22 +
arch/arm/boot/dts/imx28-m28.dtsi | 87 ++
arch/arm/boot/dts/imx28-m28evk.dts | 62 +-
.../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 1 -
arch/arm/boot/dts/imx35.dtsi | 8 +
arch/arm/boot/dts/imx50.dtsi | 8 +-
arch/arm/boot/dts/imx51-babbage.dts | 2 +-
.../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 -
arch/arm/boot/dts/imx51.dtsi | 3 -
arch/arm/boot/dts/imx53-m53evk.dts | 1 -
arch/arm/boot/dts/imx53-mba53.dts | 1 -
arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 -
arch/arm/boot/dts/imx53-tx53.dtsi | 1 -
arch/arm/boot/dts/imx53-voipac-bsb.dts | 1 -
arch/arm/boot/dts/imx53.dtsi | 13 +-
arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 85 ++
arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 74 +
arch/arm/boot/dts/imx6dl-gw51xx.dts | 2 +-
arch/arm/boot/dts/imx6dl-gw52xx.dts | 2 +-
arch/arm/boot/dts/imx6dl-gw53xx.dts | 2 +-
arch/arm/boot/dts/imx6dl-gw54xx.dts | 2 +-
arch/arm/boot/dts/imx6dl-riotboard.dts | 1 -
arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts | 103 ++
arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 177 +++
arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 150 ++
arch/arm/boot/dts/imx6dl.dtsi | 17 +-
arch/arm/boot/dts/imx6q-cubox-i.dts | 4 +
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 54 +
arch/arm/boot/dts/imx6q-gw51xx.dts | 2 +-
arch/arm/boot/dts/imx6q-gw52xx.dts | 2 +-
arch/arm/boot/dts/imx6q-gw53xx.dts | 2 +-
arch/arm/boot/dts/imx6q-gw5400-a.dts | 5 +-
arch/arm/boot/dts/imx6q-gw54xx.dts | 2 +-
arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 103 ++
arch/arm/boot/dts/imx6q-tx6q-1010.dts | 177 +++
arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts | 136 ++
arch/arm/boot/dts/imx6q-tx6q-1020.dts | 210 +++
arch/arm/boot/dts/imx6q-tx6q-1110.dts | 154 ++
arch/arm/boot/dts/imx6q-udoo.dts | 32 +
arch/arm/boot/dts/imx6q.dtsi | 35 +-
arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 418 ++++++
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 5 +-
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 5 +-
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 6 +-
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 +
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-tx6.dtsi | 696 +++++++++
arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 1 -
arch/arm/boot/dts/imx6qdl.dtsi | 152 +-
arch/arm/boot/dts/imx6sl-evk.dts | 17 +-
arch/arm/boot/dts/imx6sl.dtsi | 1 +
arch/arm/boot/dts/imx6sx-pinfunc.h | 1544 ++++++++++++++++++++
arch/arm/boot/dts/imx6sx-sdb.dts | 407 ++++++
arch/arm/boot/dts/imx6sx.dtsi | 1203 +++++++++++++++
arch/arm/configs/imx_v4_v5_defconfig | 4 +-
arch/arm/configs/imx_v6_v7_defconfig | 7 +-
arch/arm/configs/multi_v7_defconfig | 2 +-
arch/arm/configs/mxs_defconfig | 1 +
arch/arm/mach-imx/Kconfig | 34 +-
arch/arm/mach-imx/Makefile | 5 +-
arch/arm/mach-imx/clk-imx1.c | 157 +-
arch/arm/mach-imx/clk-imx21.c | 301 ++--
arch/arm/mach-imx/clk-imx25.c | 45 +-
arch/arm/mach-imx/clk-imx27.c | 89 +-
arch/arm/mach-imx/clk-imx31.c | 6 +-
arch/arm/mach-imx/clk-imx35.c | 6 +-
arch/arm/mach-imx/clk-imx51-imx53.c | 251 ++--
arch/arm/mach-imx/clk-imx6q.c | 538 ++++---
arch/arm/mach-imx/clk-imx6sl.c | 8 +-
arch/arm/mach-imx/clk-imx6sx.c | 7 +-
arch/arm/mach-imx/clk-vf610.c | 2 +
arch/arm/mach-imx/clk.c | 10 +
arch/arm/mach-imx/clk.h | 9 +
arch/arm/mach-imx/common.h | 29 +-
arch/arm/mach-imx/cpu-imx5.c | 25 +-
arch/arm/mach-imx/cpuidle-imx6q.c | 6 +-
arch/arm/mach-imx/crm-regs-imx5.h | 600 --------
arch/arm/mach-imx/devices-imx51.h | 66 -
arch/arm/mach-imx/devices/Kconfig | 6 +-
arch/arm/mach-imx/devices/Makefile | 1 -
arch/arm/mach-imx/devices/devices-common.h | 16 -
arch/arm/mach-imx/devices/platform-fec.c | 12 -
arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 5 -
arch/arm/mach-imx/devices/platform-imx-i2c.c | 26 -
arch/arm/mach-imx/devices/platform-imx-keypad.c | 10 -
arch/arm/mach-imx/devices/platform-imx-ssi.c | 20 -
arch/arm/mach-imx/devices/platform-imx-uart.c | 22 -
arch/arm/mach-imx/devices/platform-imx2-wdt.c | 18 -
arch/arm/mach-imx/devices/platform-imx_udc.c | 75 -
arch/arm/mach-imx/devices/platform-mxc-ehci.c | 9 -
arch/arm/mach-imx/devices/platform-mxc_nand.c | 5 -
arch/arm/mach-imx/devices/platform-pata_imx.c | 10 -
.../mach-imx/devices/platform-sdhci-esdhc-imx.c | 24 -
arch/arm/mach-imx/devices/platform-spi_imx.c | 27 -
arch/arm/mach-imx/ehci-imx25.c | 1 +
arch/arm/mach-imx/ehci-imx27.c | 1 +
arch/arm/mach-imx/ehci-imx31.c | 1 +
arch/arm/mach-imx/ehci-imx35.c | 1 +
arch/arm/mach-imx/ehci-imx5.c | 171 ---
arch/arm/mach-imx/ehci.h | 43 +
arch/arm/mach-imx/gpc.c | 5 +-
arch/arm/mach-imx/hardware.h | 2 -
arch/arm/mach-imx/imx25-dt.c | 6 -
arch/arm/mach-imx/imx27-dt.c | 6 -
arch/arm/mach-imx/imx31-dt.c | 2 +-
arch/arm/mach-imx/imx35-dt.c | 2 +-
arch/arm/mach-imx/iomux-mx51.h | 827 -----------
arch/arm/mach-imx/mach-armadillo5x0.c | 1 +
arch/arm/mach-imx/mach-cpuimx27.c | 1 +
arch/arm/mach-imx/mach-cpuimx35.c | 1 +
arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 +
arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 +
arch/arm/mach-imx/mach-imx27ipcam.c | 77 -
arch/arm/mach-imx/mach-imx50.c | 5 +-
arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} | 45 +-
arch/arm/mach-imx/mach-imx53.c | 17 +-
arch/arm/mach-imx/mach-imx6q.c | 4 +-
arch/arm/mach-imx/mach-imx6sl.c | 2 +-
arch/arm/mach-imx/mach-imx6sx.c | 10 +-
arch/arm/mach-imx/mach-mx25_3ds.c | 1 +
arch/arm/mach-imx/mach-mx27_3ds.c | 1 +
arch/arm/mach-imx/mach-mx31_3ds.c | 1 +
arch/arm/mach-imx/mach-mx31lilly.c | 1 +
arch/arm/mach-imx/mach-mx31lite.c | 1 +
arch/arm/mach-imx/mach-mx31moboard.c | 1 +
arch/arm/mach-imx/mach-mx35_3ds.c | 1 +
arch/arm/mach-imx/mach-pca100.c | 1 +
arch/arm/mach-imx/mach-pcm037.c | 1 +
arch/arm/mach-imx/mach-pcm038.c | 1 +
arch/arm/mach-imx/mach-pcm043.c | 1 +
arch/arm/mach-imx/mach-vf610.c | 2 +-
arch/arm/mach-imx/mach-vpr200.c | 1 +
arch/arm/mach-imx/mm-imx5.c | 155 --
arch/arm/mach-imx/mx31moboard-devboard.c | 1 +
arch/arm/mach-imx/mx31moboard-marxbot.c | 1 +
arch/arm/mach-imx/mx31moboard-smartbot.c | 1 +
arch/arm/mach-imx/mx51.h | 346 -----
arch/arm/mach-imx/mx53.h | 342 -----
arch/arm/mach-imx/pm-imx5.c | 98 +-
arch/arm/mach-imx/pm-imx6.c | 67 +-
arch/arm/mach-imx/system.c | 24 +-
arch/arm/mach-imx/time.c | 42 +-
arch/arm/mach-imx/tzic.c | 9 +-
include/dt-bindings/clock/imx1-clock.h | 40 +
include/dt-bindings/clock/imx21-clock.h | 80 +
include/dt-bindings/clock/imx6qdl-clock.h | 224 +++
include/linux/platform_data/usb-ehci-mxc.h | 46 -
include/linux/platform_data/usb-imx_udc.h | 23 -
163 files changed, 8255 insertions(+), 4229 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/imx1-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/imx21-clock.txt
create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts
create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts
create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts
create mode 100644 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
create mode 100644 arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts
create mode 100644 arch/arm/boot/dts/imx28-m28.dtsi
create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos_4.dts
create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos_7.dts
create mode 100644 arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-801x.dts
create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-811x.dts
create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010.dts
create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1020.dts
create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1110.dts
create mode 100644 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
create mode 100644 arch/arm/boot/dts/imx6qdl-tx6.dtsi
create mode 100755 arch/arm/boot/dts/imx6sx-pinfunc.h
create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dts
create mode 100644 arch/arm/boot/dts/imx6sx.dtsi
delete mode 100644 arch/arm/mach-imx/crm-regs-imx5.h
delete mode 100644 arch/arm/mach-imx/devices-imx51.h
delete mode 100644 arch/arm/mach-imx/devices/platform-imx_udc.c
delete mode 100644 arch/arm/mach-imx/ehci-imx5.c
create mode 100644 arch/arm/mach-imx/ehci.h
delete mode 100644 arch/arm/mach-imx/iomux-mx51.h
delete mode 100644 arch/arm/mach-imx/mach-imx27ipcam.c
rename arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} (51%)
delete mode 100644 arch/arm/mach-imx/mm-imx5.c
delete mode 100644 arch/arm/mach-imx/mx51.h
delete mode 100644 arch/arm/mach-imx/mx53.h
create mode 100644 include/dt-bindings/clock/imx1-clock.h
create mode 100644 include/dt-bindings/clock/imx21-clock.h
create mode 100644 include/dt-bindings/clock/imx6qdl-clock.h
delete mode 100644 include/linux/platform_data/usb-imx_udc.h
Merging ixp4xx/next (19f949f52599 Linux 3.8)
$ git merge ixp4xx/next
Already up-to-date.
Merging keystone/next (c9eaa447e77e Linux 3.15-rc1)
$ git merge keystone/next
Already up-to-date.
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
$ git merge msm/for-next
Already up-to-date.
Merging mvebu/for-next (121d24bab476 Merge branch 'mvebu/fixes' into mvebu/for-next)
$ git merge mvebu/for-next
Resolved 'arch/arm/mach-mvebu/Kconfig' using previous resolution.
Removing arch/arm/mach-mvebu/hotplug.c
Auto-merging arch/arm/mach-mvebu/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/Kconfig
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 867cac0e6f3e] Merge remote-tracking branch 'mvebu/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/arm/Marvell/README | 4 +-
.../devicetree/bindings/vendor-prefixes.txt | 1 +
arch/arm/boot/dts/Makefile | 3 +
arch/arm/boot/dts/dove-cubox-es.dts | 12 ++
arch/arm/boot/dts/dove-cubox.dts | 3 -
arch/arm/boot/dts/kirkwood-net2big.dts | 30 ++++
arch/arm/boot/dts/kirkwood-net5big.dts | 83 +++++++++
arch/arm/boot/dts/kirkwood-netxbig.dtsi | 180 +++++++++++++++++++
arch/arm/configs/multi_v5_defconfig | 2 +
arch/arm/configs/mvebu_v5_defconfig | 2 +
arch/arm/mach-mvebu/Kconfig | 7 +
arch/arm/mach-mvebu/Makefile | 4 +-
arch/arm/mach-mvebu/armada-370-xp.h | 3 +
arch/arm/mach-mvebu/board-v7.c | 42 +++--
arch/arm/mach-mvebu/board.h | 5 +
arch/arm/mach-mvebu/common.h | 3 +-
arch/arm/mach-mvebu/cpu-reset.c | 2 +-
arch/arm/mach-mvebu/headsmp-a9.S | 9 +-
arch/arm/mach-mvebu/hotplug.c | 31 ----
arch/arm/mach-mvebu/kirkwood.c | 3 +
arch/arm/mach-mvebu/mvebu-soc-id.c | 21 ++-
arch/arm/mach-mvebu/netxbig.c | 191 +++++++++++++++++++++
arch/arm/mach-mvebu/platsmp-a9.c | 5 +-
arch/arm/mach-mvebu/platsmp.c | 48 ++++++
arch/arm/mach-mvebu/pmsu.c | 26 +--
arch/arm/mach-mvebu/pmsu_ll.S | 25 +++
arch/arm/mach-mvebu/system-controller.c | 19 ++
27 files changed, 687 insertions(+), 77 deletions(-)
create mode 100644 arch/arm/boot/dts/dove-cubox-es.dts
create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi
delete mode 100644 arch/arm/mach-mvebu/hotplug.c
create mode 100644 arch/arm/mach-mvebu/netxbig.c
create mode 100644 arch/arm/mach-mvebu/pmsu_ll.S
Merging renesas/next (52e97c7257a8 Merge branch 'heads/dt-for-v3.17' into next)
$ git merge renesas/next
Auto-merging arch/arm/mach-shmobile/sh7372.h
Auto-merging arch/arm/mach-shmobile/rcar-gen2.h
Auto-merging arch/arm/mach-shmobile/r8a7791.h
Auto-merging arch/arm/mach-shmobile/r8a7790.h
Auto-merging arch/arm/mach-shmobile/r8a7779.h
Auto-merging arch/arm/mach-shmobile/r8a7740.h
Auto-merging arch/arm/mach-shmobile/r7s72100.h
Auto-merging arch/arm/mach-shmobile/common.h
Auto-merging arch/arm/mach-shmobile/Kconfig
Removing arch/arm/boot/dts/r8a7779-marzen-reference.dts
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 14 ++
arch/arm/boot/dts/Makefile | 4 +-
arch/arm/boot/dts/emev2.dtsi | 2 +
arch/arm/boot/dts/r7s72100.dtsi | 1 +
.../boot/dts/r8a7740-armadillo800eva-reference.dts | 12 +-
arch/arm/boot/dts/r8a7779-marzen-reference.dts | 121 ------------
arch/arm/boot/dts/r8a7779-marzen.dts | 116 ++++++++++-
arch/arm/boot/dts/r8a7779.dtsi | 220 +++++++++++++++++++++
arch/arm/boot/dts/r8a7790-lager.dts | 88 ++++++++-
arch/arm/boot/dts/r8a7790.dtsi | 207 ++++++++++++++++++-
arch/arm/boot/dts/r8a7791-henninger.dts | 21 ++
arch/arm/boot/dts/r8a7791-koelsch.dts | 67 +++++--
arch/arm/boot/dts/r8a7791.dtsi | 178 ++++++++++++++++-
arch/arm/configs/armadillo800eva_defconfig | 4 +
arch/arm/configs/shmobile_defconfig | 23 ++-
arch/arm/mach-shmobile/Kconfig | 24 ++-
arch/arm/mach-shmobile/Makefile | 23 ++-
arch/arm/mach-shmobile/Makefile.boot | 1 -
arch/arm/mach-shmobile/board-ape6evm-reference.c | 6 +-
arch/arm/mach-shmobile/board-ape6evm.c | 8 +-
.../board-armadillo800eva-reference.c | 14 +-
arch/arm/mach-shmobile/board-armadillo800eva.c | 43 +++-
arch/arm/mach-shmobile/board-bockw-reference.c | 6 +-
arch/arm/mach-shmobile/board-bockw.c | 8 +-
arch/arm/mach-shmobile/board-genmai-reference.c | 10 +-
arch/arm/mach-shmobile/board-genmai.c | 10 +-
arch/arm/mach-shmobile/board-koelsch-reference.c | 28 +--
arch/arm/mach-shmobile/board-koelsch.c | 11 +-
arch/arm/mach-shmobile/board-kzm9g-reference.c | 6 +-
arch/arm/mach-shmobile/board-kzm9g.c | 8 +-
arch/arm/mach-shmobile/board-lager-reference.c | 29 +--
arch/arm/mach-shmobile/board-lager.c | 22 ++-
arch/arm/mach-shmobile/board-mackerel.c | 12 +-
arch/arm/mach-shmobile/board-marzen-reference.c | 32 ++-
arch/arm/mach-shmobile/board-marzen.c | 8 +-
arch/arm/mach-shmobile/clock-r7s72100.c | 5 +-
arch/arm/mach-shmobile/clock-r8a73a4.c | 4 +-
arch/arm/mach-shmobile/clock-r8a7740.c | 7 +-
arch/arm/mach-shmobile/clock-r8a7778.c | 4 +-
arch/arm/mach-shmobile/clock-r8a7779.c | 27 +--
arch/arm/mach-shmobile/clock-r8a7790.c | 8 +-
arch/arm/mach-shmobile/clock-r8a7791.c | 6 +-
arch/arm/mach-shmobile/clock-sh7372.c | 4 +-
arch/arm/mach-shmobile/clock-sh73a0.c | 4 +-
arch/arm/mach-shmobile/clock.c | 6 +-
arch/arm/mach-shmobile/{include/mach => }/clock.h | 0
arch/arm/mach-shmobile/{include/mach => }/common.h | 9 +
arch/arm/mach-shmobile/console.c | 2 +-
arch/arm/mach-shmobile/cpufreq.c | 31 +++
.../{include/mach => }/dma-register.h | 0
arch/arm/mach-shmobile/headsmp.S | 13 +-
arch/arm/mach-shmobile/include/mach/irqs.h | 16 +-
arch/arm/mach-shmobile/intc-sh7372.c | 5 +-
arch/arm/mach-shmobile/intc-sh73a0.c | 9 +-
arch/arm/mach-shmobile/{include/mach => }/intc.h | 0
arch/arm/mach-shmobile/irqs.h | 21 ++
arch/arm/mach-shmobile/platsmp-apmu.c | 73 ++++++-
arch/arm/mach-shmobile/platsmp-scu.c | 2 +-
arch/arm/mach-shmobile/platsmp.c | 2 +-
arch/arm/mach-shmobile/pm-r8a7740.c | 4 +-
arch/arm/mach-shmobile/pm-r8a7779.c | 19 +-
arch/arm/mach-shmobile/pm-r8a7790.c | 45 ++++-
arch/arm/mach-shmobile/pm-r8a7791.c | 73 +++++++
arch/arm/mach-shmobile/pm-rcar.c | 2 +-
.../arm/mach-shmobile/{include/mach => }/pm-rcar.h | 0
arch/arm/mach-shmobile/pm-rmobile.c | 2 +-
.../mach-shmobile/{include/mach => }/pm-rmobile.h | 0
arch/arm/mach-shmobile/pm-sh7372.c | 8 +-
arch/arm/mach-shmobile/pm-sh73a0.c | 2 +-
.../mach-shmobile/{include/mach => }/r7s72100.h | 1 -
.../arm/mach-shmobile/{include/mach => }/r8a73a4.h | 0
.../arm/mach-shmobile/{include/mach => }/r8a7740.h | 2 -
.../arm/mach-shmobile/{include/mach => }/r8a7778.h | 0
.../arm/mach-shmobile/{include/mach => }/r8a7779.h | 14 +-
.../arm/mach-shmobile/{include/mach => }/r8a7790.h | 3 -
.../arm/mach-shmobile/{include/mach => }/r8a7791.h | 1 +
.../mach-shmobile/{include/mach => }/rcar-gen2.h | 1 +
arch/arm/mach-shmobile/setup-emev2.c | 19 +-
arch/arm/mach-shmobile/setup-r7s72100.c | 15 +-
arch/arm/mach-shmobile/setup-r8a73a4.c | 10 +-
arch/arm/mach-shmobile/setup-r8a7740.c | 12 +-
arch/arm/mach-shmobile/setup-r8a7778.c | 8 +-
arch/arm/mach-shmobile/setup-r8a7779.c | 53 ++---
arch/arm/mach-shmobile/setup-r8a7790.c | 22 +--
arch/arm/mach-shmobile/setup-r8a7791.c | 12 +-
arch/arm/mach-shmobile/setup-rcar-gen2.c | 76 ++++++-
arch/arm/mach-shmobile/setup-sh7372.c | 12 +-
arch/arm/mach-shmobile/setup-sh73a0.c | 11 +-
arch/arm/mach-shmobile/{include/mach => }/sh7372.h | 4 -
arch/arm/mach-shmobile/{include/mach => }/sh73a0.h | 0
arch/arm/mach-shmobile/smp-emev2.c | 2 +-
arch/arm/mach-shmobile/smp-r8a7779.c | 8 +-
arch/arm/mach-shmobile/smp-r8a7790.c | 36 +---
arch/arm/mach-shmobile/smp-r8a7791.c | 30 +--
arch/arm/mach-shmobile/smp-sh73a0.c | 6 +-
arch/arm/mach-shmobile/timer.c | 50 +++--
include/dt-bindings/clock/r8a7790-clock.h | 27 +++
include/dt-bindings/clock/r8a7791-clock.h | 27 +++
98 files changed, 1699 insertions(+), 563 deletions(-)
delete mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts
rename arch/arm/mach-shmobile/{include/mach => }/clock.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/common.h (88%)
create mode 100644 arch/arm/mach-shmobile/cpufreq.c
rename arch/arm/mach-shmobile/{include/mach => }/dma-register.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/intc.h (100%)
create mode 100644 arch/arm/mach-shmobile/irqs.h
create mode 100644 arch/arm/mach-shmobile/pm-r8a7791.c
rename arch/arm/mach-shmobile/{include/mach => }/pm-rcar.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/pm-rmobile.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r7s72100.h (82%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7740.h (98%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7778.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7779.h (74%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7790.h (93%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7791.h (90%)
rename arch/arm/mach-shmobile/{include/mach => }/rcar-gen2.h (85%)
rename arch/arm/mach-shmobile/{include/mach => }/sh7372.h (96%)
rename arch/arm/mach-shmobile/{include/mach => }/sh73a0.h (100%)
Merging samsung/for-next (4fb1a57b04e3 Merge branch 'v3.17-next/cleanup-s5p' into for-next)
$ git merge samsung/for-next
Removing arch/arm/mach-s5pc100/setup-spi.c
Removing arch/arm/mach-s5pc100/setup-sdhci-gpio.c
Removing arch/arm/mach-s5pc100/setup-keypad.c
Removing arch/arm/mach-s5pc100/setup-ide.c
Removing arch/arm/mach-s5pc100/setup-i2c1.c
Removing arch/arm/mach-s5pc100/setup-i2c0.c
Removing arch/arm/mach-s5pc100/setup-fb-24bpp.c
Removing arch/arm/mach-s5pc100/mach-smdkc100.c
Removing arch/arm/mach-s5pc100/include/mach/regs-irq.h
Removing arch/arm/mach-s5pc100/include/mach/regs-gpio.h
Removing arch/arm/mach-s5pc100/include/mach/regs-clock.h
Removing arch/arm/mach-s5pc100/include/mach/map.h
Removing arch/arm/mach-s5pc100/include/mach/irqs.h
Removing arch/arm/mach-s5pc100/include/mach/hardware.h
Removing arch/arm/mach-s5pc100/include/mach/gpio.h
Removing arch/arm/mach-s5pc100/include/mach/entry-macro.S
Removing arch/arm/mach-s5pc100/include/mach/dma.h
Removing arch/arm/mach-s5pc100/include/mach/debug-macro.S
Removing arch/arm/mach-s5pc100/dma.c
Removing arch/arm/mach-s5pc100/dev-audio.c
Removing arch/arm/mach-s5pc100/common.h
Removing arch/arm/mach-s5pc100/common.c
Removing arch/arm/mach-s5pc100/clock.c
Removing arch/arm/mach-s5pc100/Makefile.boot
Removing arch/arm/mach-s5pc100/Makefile
Removing arch/arm/mach-s5pc100/Kconfig
Removing arch/arm/mach-s5p64x0/setup-spi.c
Removing arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
Removing arch/arm/mach-s5p64x0/setup-i2c1.c
Removing arch/arm/mach-s5p64x0/setup-i2c0.c
Removing arch/arm/mach-s5p64x0/setup-fb-24bpp.c
Removing arch/arm/mach-s5p64x0/pm.c
Removing arch/arm/mach-s5p64x0/mach-smdk6450.c
Removing arch/arm/mach-s5p64x0/mach-smdk6440.c
Removing arch/arm/mach-s5p64x0/irq-pm.c
Removing arch/arm/mach-s5p64x0/include/mach/regs-irq.h
Removing arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
Removing arch/arm/mach-s5p64x0/include/mach/regs-clock.h
Removing arch/arm/mach-s5p64x0/include/mach/pm-core.h
Removing arch/arm/mach-s5p64x0/include/mach/map.h
Removing arch/arm/mach-s5p64x0/include/mach/irqs.h
Removing arch/arm/mach-s5p64x0/include/mach/hardware.h
Removing arch/arm/mach-s5p64x0/include/mach/gpio.h
Removing arch/arm/mach-s5p64x0/include/mach/dma.h
Removing arch/arm/mach-s5p64x0/include/mach/debug-macro.S
Removing arch/arm/mach-s5p64x0/i2c.h
Removing arch/arm/mach-s5p64x0/dma.c
Removing arch/arm/mach-s5p64x0/dev-audio.c
Removing arch/arm/mach-s5p64x0/common.h
Removing arch/arm/mach-s5p64x0/common.c
Removing arch/arm/mach-s5p64x0/clock.h
Removing arch/arm/mach-s5p64x0/clock.c
Removing arch/arm/mach-s5p64x0/clock-s5p6450.c
Removing arch/arm/mach-s5p64x0/clock-s5p6440.c
Removing arch/arm/mach-s5p64x0/Makefile.boot
Removing arch/arm/mach-s5p64x0/Makefile
Removing arch/arm/mach-s5p64x0/Kconfig
Removing arch/arm/configs/s5pc100_defconfig
Removing arch/arm/configs/s5p64x0_defconfig
Merge made by the 'recursive' strategy.
Documentation/arm/Samsung/Overview.txt | 11 -
.../arm/Samsung/clksrc-change-registers.awk | 1 -
.../devicetree/bindings/pwm/pwm-samsung.txt | 3 -
.../devicetree/bindings/spi/spi-samsung.txt | 1 -
.../devicetree/bindings/video/samsung-fimd.txt | 2 -
arch/arm/Kconfig | 43 +-
arch/arm/Makefile | 2 -
arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 236 ++--
arch/arm/boot/dts/exynos5800-peach-pi.dts | 218 ++--
arch/arm/configs/s5p64x0_defconfig | 68 -
arch/arm/configs/s5pc100_defconfig | 49 -
arch/arm/mach-s5p64x0/Kconfig | 102 --
arch/arm/mach-s5p64x0/Makefile | 36 -
arch/arm/mach-s5p64x0/Makefile.boot | 2 -
arch/arm/mach-s5p64x0/clock-s5p6440.c | 632 ---------
arch/arm/mach-s5p64x0/clock-s5p6450.c | 701 ----------
arch/arm/mach-s5p64x0/clock.c | 236 ----
arch/arm/mach-s5p64x0/clock.h | 38 -
arch/arm/mach-s5p64x0/common.c | 490 -------
arch/arm/mach-s5p64x0/common.h | 56 -
arch/arm/mach-s5p64x0/dev-audio.c | 176 ---
arch/arm/mach-s5p64x0/dma.c | 128 --
arch/arm/mach-s5p64x0/i2c.h | 16 -
arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 32 -
arch/arm/mach-s5p64x0/include/mach/dma.h | 26 -
arch/arm/mach-s5p64x0/include/mach/gpio.h | 132 --
arch/arm/mach-s5p64x0/include/mach/hardware.h | 18 -
arch/arm/mach-s5p64x0/include/mach/irqs.h | 148 ---
arch/arm/mach-s5p64x0/include/mach/map.h | 96 --
arch/arm/mach-s5p64x0/include/mach/pm-core.h | 119 --
arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 98 --
arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 68 -
arch/arm/mach-s5p64x0/include/mach/regs-irq.h | 18 -
arch/arm/mach-s5p64x0/irq-pm.c | 98 --
arch/arm/mach-s5p64x0/mach-smdk6440.c | 280 ----
arch/arm/mach-s5p64x0/mach-smdk6450.c | 299 -----
arch/arm/mach-s5p64x0/pm.c | 202 ---
arch/arm/mach-s5p64x0/setup-fb-24bpp.c | 29 -
arch/arm/mach-s5p64x0/setup-i2c0.c | 38 -
arch/arm/mach-s5p64x0/setup-i2c1.c | 38 -
arch/arm/mach-s5p64x0/setup-sdhci-gpio.c | 104 --
arch/arm/mach-s5p64x0/setup-spi.c | 38 -
arch/arm/mach-s5pc100/Kconfig | 81 --
arch/arm/mach-s5pc100/Makefile | 32 -
arch/arm/mach-s5pc100/Makefile.boot | 2 -
arch/arm/mach-s5pc100/clock.c | 1361 --------------------
arch/arm/mach-s5pc100/common.c | 255 ----
arch/arm/mach-s5pc100/common.h | 30 -
arch/arm/mach-s5pc100/dev-audio.c | 239 ----
arch/arm/mach-s5pc100/dma.c | 130 --
arch/arm/mach-s5pc100/include/mach/debug-macro.S | 39 -
arch/arm/mach-s5pc100/include/mach/dma.h | 26 -
arch/arm/mach-s5pc100/include/mach/entry-macro.S | 19 -
arch/arm/mach-s5pc100/include/mach/gpio.h | 144 ---
arch/arm/mach-s5pc100/include/mach/hardware.h | 14 -
arch/arm/mach-s5pc100/include/mach/irqs.h | 115 --
arch/arm/mach-s5pc100/include/mach/map.h | 137 --
arch/arm/mach-s5pc100/include/mach/regs-clock.h | 80 --
arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 38 -
arch/arm/mach-s5pc100/include/mach/regs-irq.h | 18 -
arch/arm/mach-s5pc100/mach-smdkc100.c | 264 ----
arch/arm/mach-s5pc100/setup-fb-24bpp.c | 35 -
arch/arm/mach-s5pc100/setup-i2c0.c | 28 -
arch/arm/mach-s5pc100/setup-i2c1.c | 28 -
arch/arm/mach-s5pc100/setup-ide.c | 57 -
arch/arm/mach-s5pc100/setup-keypad.c | 23 -
arch/arm/mach-s5pc100/setup-sdhci-gpio.c | 70 -
arch/arm/mach-s5pc100/setup-spi.c | 41 -
arch/arm/plat-samsung/Kconfig | 14 +-
arch/arm/plat-samsung/adc.c | 2 +-
arch/arm/plat-samsung/include/plat/cpu.h | 29 -
arch/arm/plat-samsung/include/plat/devs.h | 17 -
arch/arm/plat-samsung/include/plat/fb.h | 14 -
arch/arm/plat-samsung/include/plat/s5p-clock.h | 2 +-
arch/arm/plat-samsung/include/plat/sdhci.h | 77 --
drivers/clocksource/samsung_pwm_timer.c | 25 -
drivers/gpio/gpio-samsung.c | 722 -----------
drivers/irqchip/Kconfig | 1 -
drivers/mtd/onenand/Kconfig | 4 +-
drivers/mtd/onenand/samsung.c | 25 +-
drivers/pwm/pwm-samsung.c | 13 +-
drivers/spi/spi-s3c64xx.c | 22 -
drivers/tty/serial/Kconfig | 1 -
drivers/tty/serial/samsung.c | 4 +-
drivers/video/fbdev/Kconfig | 4 +-
drivers/video/fbdev/s3c-fb.c | 65 -
include/linux/platform_data/asoc-s3c.h | 9 -
include/video/samsung_fimd.h | 2 +-
sound/soc/samsung/Kconfig | 4 +-
sound/soc/samsung/smdk_wm8580pcm.c | 2 +-
91 files changed, 267 insertions(+), 9227 deletions(-)
delete mode 100644 arch/arm/configs/s5p64x0_defconfig
delete mode 100644 arch/arm/configs/s5pc100_defconfig
delete mode 100644 arch/arm/mach-s5p64x0/Kconfig
delete mode 100644 arch/arm/mach-s5p64x0/Makefile
delete mode 100644 arch/arm/mach-s5p64x0/Makefile.boot
delete mode 100644 arch/arm/mach-s5p64x0/clock-s5p6440.c
delete mode 100644 arch/arm/mach-s5p64x0/clock-s5p6450.c
delete mode 100644 arch/arm/mach-s5p64x0/clock.c
delete mode 100644 arch/arm/mach-s5p64x0/clock.h
delete mode 100644 arch/arm/mach-s5p64x0/common.c
delete mode 100644 arch/arm/mach-s5p64x0/common.h
delete mode 100644 arch/arm/mach-s5p64x0/dev-audio.c
delete mode 100644 arch/arm/mach-s5p64x0/dma.c
delete mode 100644 arch/arm/mach-s5p64x0/i2c.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/dma.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/gpio.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/hardware.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/irqs.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/map.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/pm-core.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-clock.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-irq.h
delete mode 100644 arch/arm/mach-s5p64x0/irq-pm.c
delete mode 100644 arch/arm/mach-s5p64x0/mach-smdk6440.c
delete mode 100644 arch/arm/mach-s5p64x0/mach-smdk6450.c
delete mode 100644 arch/arm/mach-s5p64x0/pm.c
delete mode 100644 arch/arm/mach-s5p64x0/setup-fb-24bpp.c
delete mode 100644 arch/arm/mach-s5p64x0/setup-i2c0.c
delete mode 100644 arch/arm/mach-s5p64x0/setup-i2c1.c
delete mode 100644 arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
delete mode 100644 arch/arm/mach-s5p64x0/setup-spi.c
delete mode 100644 arch/arm/mach-s5pc100/Kconfig
delete mode 100644 arch/arm/mach-s5pc100/Makefile
delete mode 100644 arch/arm/mach-s5pc100/Makefile.boot
delete mode 100644 arch/arm/mach-s5pc100/clock.c
delete mode 100644 arch/arm/mach-s5pc100/common.c
delete mode 100644 arch/arm/mach-s5pc100/common.h
delete mode 100644 arch/arm/mach-s5pc100/dev-audio.c
delete mode 100644 arch/arm/mach-s5pc100/dma.c
delete mode 100644 arch/arm/mach-s5pc100/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-s5pc100/include/mach/dma.h
delete mode 100644 arch/arm/mach-s5pc100/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-s5pc100/include/mach/gpio.h
delete mode 100644 arch/arm/mach-s5pc100/include/mach/hardware.h
delete mode 100644 arch/arm/mach-s5pc100/include/mach/irqs.h
delete mode 100644 arch/arm/mach-s5pc100/include/mach/map.h
delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-clock.h
delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-gpio.h
delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-irq.h
delete mode 100644 arch/arm/mach-s5pc100/mach-smdkc100.c
delete mode 100644 arch/arm/mach-s5pc100/setup-fb-24bpp.c
delete mode 100644 arch/arm/mach-s5pc100/setup-i2c0.c
delete mode 100644 arch/arm/mach-s5pc100/setup-i2c1.c
delete mode 100644 arch/arm/mach-s5pc100/setup-ide.c
delete mode 100644 arch/arm/mach-s5pc100/setup-keypad.c
delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci-gpio.c
delete mode 100644 arch/arm/mach-s5pc100/setup-spi.c
Merging sunxi/sunxi/for-next (6e30a67c513f Merge branch 'sunxi/dt-for-3.17' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
arch/arm/Kconfig.debug | 10 ++
arch/arm/boot/dts/Makefile | 6 +-
arch/arm/boot/dts/sun4i-a10-a1000.dts | 15 ++
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 110 +++++++++++++++
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 15 ++
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 21 +++
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 21 ++-
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 28 ++++
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 15 ++
arch/arm/boot/dts/sun4i-a10-pcduino.dts | 9 ++
arch/arm/boot/dts/sun4i-a10.dtsi | 34 ++++-
arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +-
arch/arm/boot/dts/sun5i-a13.dtsi | 2 +-
arch/arm/boot/dts/sun6i-a31.dtsi | 4 +-
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 16 +++
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 16 +++
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 22 +++
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 10 ++
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 173 ++++++++++++++++++++++++
arch/arm/boot/dts/sun7i-a20.dtsi | 34 ++++-
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 30 ++++
arch/arm/boot/dts/sun8i-a23.dtsi | 160 ++++++++++++++++++++++
arch/arm/mach-sunxi/Kconfig | 5 +
arch/arm/mach-sunxi/sunxi.c | 9 ++
24 files changed, 754 insertions(+), 13 deletions(-)
create mode 100644 arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3.dts
create mode 100644 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
create mode 100644 arch/arm/boot/dts/sun8i-a23.dtsi
Merging tegra/for-next (545617fb69e4 Merge branch for-3.17/defconfig into for-next)
$ git merge tegra/for-next
Auto-merging drivers/misc/fuse/tegra/speedo-tegra30.c
Auto-merging drivers/misc/fuse/tegra/speedo-tegra20.c
Auto-merging drivers/misc/fuse/tegra/speedo-tegra114.c
Removing arch/arm/mach-tegra/fuse.h
Removing arch/arm/mach-tegra/fuse.c
Removing arch/arm/mach-tegra/apbio.h
Removing arch/arm/mach-tegra/apbio.c
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-driver-tegra-fuse | 11 +
Documentation/devicetree/bindings/arm/tegra.txt | 2 +
.../bindings/fuse/nvidia,tegra20-fuse.txt | 40 ++
.../devicetree/bindings/gpu/nvidia,gk20a.txt | 43 ++
.../bindings/misc/nvidia,tegra20-apbmisc.txt | 13 +
.../bindings/pci/nvidia,tegra20-pcie.txt | 30 +-
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/cros-ec-keyboard.dtsi | 105 ++++
arch/arm/boot/dts/exynos5250-snow.dts | 93 +--
arch/arm/boot/dts/tegra114-roth.dts | 10 +-
arch/arm/boot/dts/tegra114.dtsi | 15 +
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 1 +
arch/arm/boot/dts/tegra124-venice2.dts | 122 +---
arch/arm/boot/dts/tegra124.dtsi | 45 ++
arch/arm/boot/dts/tegra20-harmony.dts | 8 +-
arch/arm/boot/dts/tegra20-medcom-wide.dts | 61 +-
arch/arm/boot/dts/tegra20-plutux.dts | 41 ++
arch/arm/boot/dts/tegra20-tamonten.dtsi | 17 +-
arch/arm/boot/dts/tegra20-tec.dts | 41 ++
arch/arm/boot/dts/tegra20-trimslice.dts | 8 +-
arch/arm/boot/dts/tegra20.dtsi | 15 +
arch/arm/boot/dts/tegra30-apalis-eval.dts | 260 ++++++++
arch/arm/boot/dts/tegra30-apalis.dtsi | 678 +++++++++++++++++++++
arch/arm/boot/dts/tegra30-beaver.dts | 12 +-
arch/arm/boot/dts/tegra30-cardhu.dtsi | 11 +-
arch/arm/boot/dts/tegra30.dtsi | 15 +
arch/arm/configs/tegra_defconfig | 16 +-
arch/arm/lib/delay.c | 26 +-
arch/arm/mach-tegra/Makefile | 5 -
arch/arm/mach-tegra/apbio.c | 206 -------
arch/arm/mach-tegra/apbio.h | 22 -
arch/arm/mach-tegra/cpuidle.c | 2 +-
arch/arm/mach-tegra/flowctrl.c | 2 +-
arch/arm/mach-tegra/fuse.c | 252 --------
arch/arm/mach-tegra/fuse.h | 79 ---
arch/arm/mach-tegra/hotplug.c | 2 +-
arch/arm/mach-tegra/platsmp.c | 2 +-
arch/arm/mach-tegra/pm.c | 2 +-
arch/arm/mach-tegra/pmc.c | 15 +-
arch/arm/mach-tegra/pmc.h | 13 +
arch/arm/mach-tegra/powergate.c | 42 +-
arch/arm/mach-tegra/reset-handler.S | 2 +-
arch/arm/mach-tegra/reset.c | 2 +-
arch/arm/mach-tegra/sleep-tegra30.S | 2 +-
arch/arm/mach-tegra/tegra.c | 7 +-
drivers/clocksource/tegra20_timer.c | 13 +
drivers/misc/Makefile | 1 +
drivers/misc/fuse/Makefile | 1 +
drivers/misc/fuse/tegra/Makefile | 8 +
drivers/misc/fuse/tegra/fuse-tegra.c | 154 +++++
drivers/misc/fuse/tegra/fuse-tegra20.c | 214 +++++++
drivers/misc/fuse/tegra/fuse-tegra30.c | 223 +++++++
drivers/misc/fuse/tegra/fuse.h | 71 +++
.../misc/fuse/tegra/speedo-tegra114.c | 53 +-
drivers/misc/fuse/tegra/speedo-tegra124.c | 167 +++++
.../misc/fuse/tegra/speedo-tegra20.c | 42 +-
.../misc/fuse/tegra/speedo-tegra30.c | 173 +++---
drivers/misc/fuse/tegra/tegra-apbmisc.c | 110 ++++
drivers/pci/host/pci-tegra.c | 148 +++--
include/linux/tegra-soc.h | 42 ++
init/calibrate.c | 11 +
61 files changed, 2792 insertions(+), 1036 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-driver-tegra-fuse
create mode 100644 Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt
create mode 100644 Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
create mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt
create mode 100644 arch/arm/boot/dts/cros-ec-keyboard.dtsi
create mode 100644 arch/arm/boot/dts/tegra30-apalis-eval.dts
create mode 100644 arch/arm/boot/dts/tegra30-apalis.dtsi
delete mode 100644 arch/arm/mach-tegra/apbio.c
delete mode 100644 arch/arm/mach-tegra/apbio.h
delete mode 100644 arch/arm/mach-tegra/fuse.c
delete mode 100644 arch/arm/mach-tegra/fuse.h
create mode 100644 drivers/misc/fuse/Makefile
create mode 100644 drivers/misc/fuse/tegra/Makefile
create mode 100644 drivers/misc/fuse/tegra/fuse-tegra.c
create mode 100644 drivers/misc/fuse/tegra/fuse-tegra20.c
create mode 100644 drivers/misc/fuse/tegra/fuse-tegra30.c
create mode 100644 drivers/misc/fuse/tegra/fuse.h
rename arch/arm/mach-tegra/tegra114_speedo.c => drivers/misc/fuse/tegra/speedo-tegra114.c (55%)
create mode 100644 drivers/misc/fuse/tegra/speedo-tegra124.c
rename arch/arm/mach-tegra/tegra20_speedo.c => drivers/misc/fuse/tegra/speedo-tegra20.c (67%)
rename arch/arm/mach-tegra/tegra30_speedo.c => drivers/misc/fuse/tegra/speedo-tegra30.c (52%)
create mode 100644 drivers/misc/fuse/tegra/tegra-apbmisc.c
Merging arm64/for-next/core (e3a920afc348 arm64: mm: remove broken &= operator from pmd_mknotpresent)
$ git merge arm64/for-next/core
Already up-to-date.
Merging blackfin/for-linus (51fdc6bf9880 blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80))
$ git merge blackfin/for-linus
Already up-to-date.
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
$ git merge c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
$ git merge cris/for-next
Already up-to-date.
Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo())
$ git merge m68k/for-next
Already up-to-date.
Merging m68knommu/for-next (9a1a1aea7572 m68knommu: Remove unnecessary prototype for kobjsize())
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
arch/m68k/include/asm/pgtable_no.h | 5 -----
arch/m68k/include/asm/virtconvert.h | 6 +-----
2 files changed, 1 insertion(+), 10 deletions(-)
Merging metag/for-next (8bc613befaec metag: hugetlbpage: Remove null pointer checks that could never happen)
$ git merge metag/for-next
Merge made by the 'recursive' strategy.
arch/metag/mm/hugetlbpage.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging microblaze/next (225fba216261 microblaze: Fix typo in head.S s/substract/subtract/)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (97a5c1896361 Merge branch '3.16-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Merge made by the 'recursive' strategy.
arch/mips/rb532/devices.c | 27 ++++-----------------------
arch/mips/sgi-ip22/ip22-gio.c | 10 +++++++++-
arch/mips/txx9/generic/7segled.c | 14 +++++++++++---
arch/mips/txx9/generic/setup.c | 29 +++++++++++++++++++----------
4 files changed, 43 insertions(+), 37 deletions(-)
Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
$ git merge openrisc/for-upstream
Already up-to-date.
Merging parisc/for-next (6c700d71f7fa [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 (455c6fdbd219 Linux 3.14)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (68986c9f0f45 Revert "offb: Add palette hack for little endian")
$ git merge powerpc/next
Already up-to-date.
Merging fsl/next (087dfae3fe3f powerpc/8xx: Remove empty asm/mpc8xx.h)
$ git merge fsl/next
Removing drivers/pcmcia/m8xx_pcmcia.c
Removing arch/powerpc/include/asm/mpc8xx.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 3 +-
arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 1 +
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 1 +
arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 1 +
arch/powerpc/boot/dts/t4240rdb.dts | 186 ++++
arch/powerpc/configs/corenet32_smp_defconfig | 3 +-
arch/powerpc/configs/corenet64_smp_defconfig | 4 +
arch/powerpc/configs/mpc85xx_defconfig | 3 +
arch/powerpc/configs/mpc85xx_smp_defconfig | 3 +
arch/powerpc/include/asm/fs_pd.h | 1 -
arch/powerpc/include/asm/mpc8xx.h | 12 -
arch/powerpc/include/asm/pte-fsl-booke.h | 2 +
arch/powerpc/include/asm/reg_booke.h | 2 +-
arch/powerpc/kernel/traps.c | 2 +-
arch/powerpc/mm/tlb_low_64e.S | 19 +-
arch/powerpc/platforms/85xx/Kconfig | 2 +-
arch/powerpc/platforms/85xx/corenet_generic.c | 2 +
arch/powerpc/platforms/8xx/m8xx_setup.c | 3 -
arch/powerpc/platforms/8xx/mpc885ads_setup.c | 62 --
arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 -
arch/powerpc/sysdev/micropatch.c | 1 -
drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 1 -
drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 1 -
drivers/pcmcia/Kconfig | 10 -
drivers/pcmcia/Makefile | 1 -
drivers/pcmcia/m8xx_pcmcia.c | 1168 ----------------------
26 files changed, 221 insertions(+), 1274 deletions(-)
create mode 100644 arch/powerpc/boot/dts/t4240rdb.dts
delete mode 100644 arch/powerpc/include/asm/mpc8xx.h
delete mode 100644 drivers/pcmcia/m8xx_pcmcia.c
Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (c60d0baa40f9 s390/3270: correct size detection with the read-partition command)
$ git merge s390/features
Merge made by the 'recursive' strategy.
arch/s390/kernel/head.S | 6 +++---
arch/s390/pci/pci.c | 2 +-
drivers/s390/char/raw3270.c | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
Merging sparc-next/master (894e552cfaa3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (8dfb6948f7d8 tile: use ARRAY_SIZE)
$ git merge tile/master
Merge made by the 'recursive' strategy.
arch/tile/kernel/traps.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
$ git merge uml/next
Resolved 'arch/um/include/asm/Kbuild' using previous resolution.
Removing arch/x86/um/shared/sysdep/skas_ptrace.h
Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
Removing arch/um/sys-ia64/sysdep/skas_ptrace.h
Removing arch/um/include/shared/skas_ptrace.h
Removing arch/um/include/shared/skas/proc_mm.h
Auto-merging arch/um/include/shared/os.h
Auto-merging arch/um/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 530aeeaf5a6b] Merge remote-tracking branch 'uml/next'
$ git diff -M --stat --summary HEAD^..
arch/um/include/shared/os.h | 2 -
arch/um/include/shared/skas/proc_mm.h | 44 ------
arch/um/include/shared/skas/skas.h | 3 -
arch/um/include/shared/skas_ptrace.h | 14 --
arch/um/kernel/ptrace.c | 32 ----
arch/um/kernel/reboot.c | 35 ++---
arch/um/kernel/skas/mmu.c | 68 +++------
arch/um/kernel/skas/process.c | 27 ----
arch/um/kernel/trap.c | 2 +-
arch/um/kernel/um_arch.c | 10 --
arch/um/os-Linux/process.c | 16 --
arch/um/os-Linux/skas/mem.c | 100 ++----------
arch/um/os-Linux/skas/process.c | 200 ++++++------------------
arch/um/os-Linux/start_up.c | 154 -------------------
arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 ---
arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 ---
arch/x86/um/ldt.c | 227 ++++++----------------------
arch/x86/um/shared/sysdep/faultinfo_32.h | 3 -
arch/x86/um/shared/sysdep/faultinfo_64.h | 3 -
arch/x86/um/shared/sysdep/skas_ptrace.h | 22 ---
20 files changed, 148 insertions(+), 858 deletions(-)
delete mode 100644 arch/um/include/shared/skas/proc_mm.h
delete mode 100644 arch/um/include/shared/skas_ptrace.h
delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h
delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (55b441be5cd6 xtensa: ISS: don't depend on CONFIG_TTY)
$ git merge xtensa/for_next
Already up-to-date.
Merging btrfs/next (c7548af69d9e Btrfs: convert smp_mb__{before,after}_clear_bit)
$ git merge btrfs/next
Already up-to-date.
Merging ceph/master (437f2c0d0c01 rbd: fix ida/idr memory leak)
$ git merge ceph/master
Auto-merging fs/dcache.c
Merge made by the 'recursive' strategy.
fs/dcache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging cifs/for-next (4b26c7b1fc36 cifs: Split lanman auth from CIFS_SessSetup())
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
fs/cifs/cifsproto.h | 1 +
fs/cifs/cifssmb.c | 20 +---
fs/cifs/misc.c | 9 ++
fs/cifs/sess.c | 303 ++++++++++++++++++++++++++++++++++++++++++++--------
fs/cifs/smb2pdu.c | 10 --
5 files changed, 272 insertions(+), 71 deletions(-)
Merging configfs/linux-next (b930c26416c4 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 (9e78d14a9f64 Use %pd in eCryptFS)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/inode.c
Auto-merging fs/ecryptfs/file.c
Merge made by the 'recursive' strategy.
fs/ecryptfs/file.c | 4 ++--
fs/ecryptfs/inode.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
Merging ext3/for_next (19ef1229bc2e reiserfs: Fix compilation breakage with CONFIG_REISERFS_CHECK)
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (14b02deff1ae [regression] fix 32-bit breakage in block device read(2))
$ git merge ext4/dev
Merge made by the 'recursive' strategy.
Merging f2fs/dev (a4e3519092d0 f2fs: check bdi->dirty_exceeded when trying to skip data writes)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
fs/f2fs/acl.c | 6 --
fs/f2fs/data.c | 24 +++--
fs/f2fs/dir.c | 82 +++++++++++------
fs/f2fs/f2fs.h | 13 +--
fs/f2fs/file.c | 22 +++--
fs/f2fs/hash.c | 4 +-
fs/f2fs/inode.c | 1 +
fs/f2fs/namei.c | 97 ++++++++++++++------
fs/f2fs/node.c | 267 +++++++++++++++++++++++++++++++++++++-----------------
fs/f2fs/node.h | 7 ++
fs/f2fs/segment.c | 4 +-
fs/f2fs/super.c | 4 +-
12 files changed, 358 insertions(+), 173 deletions(-)
Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
$ git merge fscache/fscache
Merge made by the 'recursive' strategy.
Merging fuse/for-next (1560c974dcd4 fuse: add renameat2 support)
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/master (7b596840397a GFS2: Allow caching of glocks for flock)
$ git merge gfs2/master
Merge made by the 'recursive' strategy.
fs/gfs2/file.c | 4 ++--
fs/gfs2/glock.c | 14 +++++++++-----
fs/gfs2/lock_dlm.c | 4 ++--
3 files changed, 13 insertions(+), 9 deletions(-)
Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr)
$ git merge jfs/jfs-next
Already up-to-date.
Merging logfs/master (339466142b3f 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 (f15b5041440c FS/NFS: replace count*size kzalloc by kcalloc)
$ git merge nfs/linux-next
Merge made by the 'recursive' strategy.
fs/nfs/blocklayout/blocklayout.c | 101 ++++++++--------
fs/nfs/direct.c | 33 ++---
fs/nfs/filelayout/filelayout.c | 180 +++++++++++++--------------
fs/nfs/filelayout/filelayoutdev.c | 2 +-
fs/nfs/internal.h | 11 +-
fs/nfs/nfs3proc.c | 21 ++--
fs/nfs/nfs4_fs.h | 6 +-
fs/nfs/nfs4proc.c | 105 ++++++++--------
fs/nfs/nfs4trace.h | 28 ++---
fs/nfs/objlayout/objio_osd.c | 24 ++--
fs/nfs/objlayout/objlayout.c | 81 ++++++-------
fs/nfs/objlayout/objlayout.h | 8 +-
fs/nfs/pagelist.c | 247 +++++++++++++++++---------------------
fs/nfs/pnfs.c | 161 +++++++------------------
fs/nfs/pnfs.h | 18 ++-
fs/nfs/proc.c | 27 +++--
fs/nfs/read.c | 54 ++++-----
fs/nfs/write.c | 80 +++++-------
include/linux/nfs_page.h | 15 ++-
include/linux/nfs_xdr.h | 33 ++---
20 files changed, 545 insertions(+), 690 deletions(-)
Merging nfsd/nfsd-next (784ffe5c1ecf nfsd: clean up nfsd4_close_open_stateid)
$ git merge nfsd/nfsd-next
Merge made by the 'recursive' strategy.
fs/nfsd/acl.h | 2 +-
fs/nfsd/export.c | 6 +-
fs/nfsd/export.h | 3 +-
fs/nfsd/fault_inject.c | 8 ++
fs/nfsd/netns.h | 6 ++
fs/nfsd/nfs3proc.c | 9 +-
fs/nfsd/nfs3xdr.c | 30 ++----
fs/nfsd/nfs4acl.c | 20 ++--
fs/nfsd/nfs4callback.c | 10 +-
fs/nfsd/nfs4proc.c | 42 +++-----
fs/nfsd/nfs4state.c | 220 ++++++++++++++++++++++----------------
fs/nfsd/nfs4xdr.c | 108 +++++++++----------
fs/nfsd/nfscache.c | 13 ++-
fs/nfsd/nfsctl.c | 51 +++++++--
fs/nfsd/nfsfh.c | 12 ++-
fs/nfsd/nfsfh.h | 15 ++-
fs/nfsd/nfsproc.c | 9 +-
fs/nfsd/nfssvc.c | 16 +--
fs/nfsd/nfsxdr.c | 14 ++-
fs/nfsd/state.h | 2 -
fs/nfsd/vfs.c | 48 ++++-----
fs/nfsd/vfs.h | 8 +-
fs/nfsd/xdr4.h | 24 +++--
include/linux/sunrpc/svc.h | 4 +-
net/sunrpc/auth_gss/svcauth_gss.c | 2 +-
net/sunrpc/svc.c | 4 +-
26 files changed, 377 insertions(+), 309 deletions(-)
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
$ git merge omfs/for-next
Already up-to-date.
Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
$ git merge squashfs/master
Already up-to-date.
Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (e9110361a9a4 UBI: fix the volumes tree sorting criteria)
$ git merge ubifs/linux-next
Merge made by the 'recursive' strategy.
drivers/mtd/ubi/fastmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging xfs/for-next (2451337dd043 xfs: global error sign conversion)
$ git merge xfs/for-next
Auto-merging fs/xfs/libxfs/xfs_symlink_remote.c
Auto-merging fs/xfs/libxfs/xfs_sb.c
Auto-merging fs/xfs/libxfs/xfs_inode_fork.c
Auto-merging fs/xfs/libxfs/xfs_inode_buf.c
Auto-merging fs/xfs/libxfs/xfs_ialloc_btree.c
Auto-merging fs/xfs/libxfs/xfs_ialloc.c
Auto-merging fs/xfs/libxfs/xfs_dquot_buf.c
Auto-merging fs/xfs/libxfs/xfs_dir2_sf.c
Auto-merging fs/xfs/libxfs/xfs_dir2_node.c
Auto-merging fs/xfs/libxfs/xfs_dir2_leaf.c
Auto-merging fs/xfs/libxfs/xfs_dir2_data.c
Auto-merging fs/xfs/libxfs/xfs_dir2_block.c
Auto-merging fs/xfs/libxfs/xfs_dir2.c
Auto-merging fs/xfs/libxfs/xfs_da_btree.c
Auto-merging fs/xfs/libxfs/xfs_btree.c
Auto-merging fs/xfs/libxfs/xfs_bmap_btree.c
Auto-merging fs/xfs/libxfs/xfs_bmap.c
Auto-merging fs/xfs/libxfs/xfs_attr_remote.c
Auto-merging fs/xfs/libxfs/xfs_attr_leaf.c
Auto-merging fs/xfs/libxfs/xfs_attr.c
Auto-merging fs/xfs/libxfs/xfs_alloc_btree.c
Auto-merging fs/xfs/libxfs/xfs_alloc.c
Merge made by the 'recursive' strategy.
fs/xfs/Makefile | 70 +++++----
fs/xfs/{ => libxfs}/xfs_ag.h | 0
fs/xfs/{ => libxfs}/xfs_alloc.c | 20 +--
fs/xfs/{ => libxfs}/xfs_alloc.h | 0
fs/xfs/{ => libxfs}/xfs_alloc_btree.c | 6 +-
fs/xfs/{ => libxfs}/xfs_alloc_btree.h | 0
fs/xfs/{ => libxfs}/xfs_attr.c | 92 +++++------
fs/xfs/{ => libxfs}/xfs_attr_leaf.c | 78 +++++-----
fs/xfs/{ => libxfs}/xfs_attr_leaf.h | 0
fs/xfs/{ => libxfs}/xfs_attr_remote.c | 22 +--
fs/xfs/{ => libxfs}/xfs_attr_remote.h | 0
fs/xfs/{ => libxfs}/xfs_attr_sf.h | 0
fs/xfs/{ => libxfs}/xfs_bit.h | 0
fs/xfs/{ => libxfs}/xfs_bmap.c | 52 +++----
fs/xfs/{ => libxfs}/xfs_bmap.h | 0
fs/xfs/{ => libxfs}/xfs_bmap_btree.c | 10 +-
fs/xfs/{ => libxfs}/xfs_bmap_btree.h | 0
fs/xfs/{ => libxfs}/xfs_btree.c | 14 +-
fs/xfs/{ => libxfs}/xfs_btree.h | 0
fs/xfs/{ => libxfs}/xfs_cksum.h | 0
fs/xfs/{ => libxfs}/xfs_da_btree.c | 110 ++++++-------
fs/xfs/{ => libxfs}/xfs_da_btree.h | 0
fs/xfs/{ => libxfs}/xfs_da_format.c | 0
fs/xfs/{ => libxfs}/xfs_da_format.h | 0
fs/xfs/{ => libxfs}/xfs_dinode.h | 0
fs/xfs/{ => libxfs}/xfs_dir2.c | 24 +--
fs/xfs/{ => libxfs}/xfs_dir2.h | 0
fs/xfs/{ => libxfs}/xfs_dir2_block.c | 18 +--
fs/xfs/{ => libxfs}/xfs_dir2_data.c | 10 +-
fs/xfs/{ => libxfs}/xfs_dir2_leaf.c | 24 +--
fs/xfs/{ => libxfs}/xfs_dir2_node.c | 40 ++---
fs/xfs/{ => libxfs}/xfs_dir2_priv.h | 0
fs/xfs/{ => libxfs}/xfs_dir2_sf.c | 30 ++--
fs/xfs/{ => libxfs}/xfs_dquot_buf.c | 6 +-
fs/xfs/{ => libxfs}/xfs_format.h | 0
fs/xfs/{ => libxfs}/xfs_ialloc.c | 34 ++--
fs/xfs/{ => libxfs}/xfs_ialloc.h | 0
fs/xfs/{ => libxfs}/xfs_ialloc_btree.c | 6 +-
fs/xfs/{ => libxfs}/xfs_ialloc_btree.h | 0
fs/xfs/{ => libxfs}/xfs_inode_buf.c | 10 +-
fs/xfs/{ => libxfs}/xfs_inode_buf.h | 0
fs/xfs/{ => libxfs}/xfs_inode_fork.c | 32 ++--
fs/xfs/{ => libxfs}/xfs_inode_fork.h | 0
fs/xfs/{ => libxfs}/xfs_inum.h | 0
fs/xfs/{ => libxfs}/xfs_log_format.h | 0
fs/xfs/{ => libxfs}/xfs_log_recover.h | 0
fs/xfs/{ => libxfs}/xfs_log_rlimit.c | 0
fs/xfs/{ => libxfs}/xfs_quota_defs.h | 0
fs/xfs/{ => libxfs}/xfs_rtbitmap.c | 0
fs/xfs/{ => libxfs}/xfs_sb.c | 32 ++--
fs/xfs/{ => libxfs}/xfs_sb.h | 0
fs/xfs/{ => libxfs}/xfs_shared.h | 0
fs/xfs/{ => libxfs}/xfs_symlink_remote.c | 6 +-
fs/xfs/{ => libxfs}/xfs_trans_resv.c | 0
fs/xfs/{ => libxfs}/xfs_trans_resv.h | 0
fs/xfs/{ => libxfs}/xfs_trans_space.h | 0
fs/xfs/xfs_acl.c | 8 +-
fs/xfs/xfs_aops.c | 18 +--
fs/xfs/xfs_attr_inactive.c | 22 +--
fs/xfs/xfs_attr_list.c | 38 ++---
fs/xfs/xfs_bmap_util.c | 78 +++++-----
fs/xfs/xfs_buf.c | 26 ++--
fs/xfs/xfs_buf.h | 2 +-
fs/xfs/xfs_buf_item.c | 4 +-
fs/xfs/xfs_dir2_readdir.c | 4 +-
fs/xfs/xfs_discard.c | 18 +--
fs/xfs/xfs_dquot.c | 38 ++---
fs/xfs/xfs_error.c | 25 +--
fs/xfs/xfs_error.h | 13 +-
fs/xfs/xfs_export.c | 10 +-
fs/xfs/xfs_extfree_item.c | 2 +-
fs/xfs/xfs_file.c | 42 ++---
fs/xfs/xfs_filestream.c | 4 +-
fs/xfs/xfs_fsops.c | 42 ++---
fs/xfs/xfs_icache.c | 52 +++----
fs/xfs/xfs_icache.h | 10 +-
fs/xfs/xfs_inode.c | 66 ++++----
fs/xfs/xfs_inode_item.c | 2 +-
fs/xfs/xfs_ioctl.c | 256 +++++++++++++++----------------
fs/xfs/xfs_ioctl32.c | 106 ++++++-------
fs/xfs/xfs_iomap.c | 34 ++--
fs/xfs/xfs_iops.c | 68 ++++----
fs/xfs/xfs_itable.c | 24 +--
fs/xfs/xfs_linux.h | 2 +-
fs/xfs/xfs_log.c | 52 +++----
fs/xfs/xfs_log_cil.c | 6 +-
fs/xfs/xfs_log_recover.c | 191 +++++++++++------------
fs/xfs/xfs_mount.c | 70 ++++-----
fs/xfs/xfs_mru_cache.c | 14 +-
fs/xfs/xfs_qm.c | 32 ++--
fs/xfs/xfs_qm_bhv.c | 2 +-
fs/xfs/xfs_qm_syscalls.c | 46 +++---
fs/xfs/xfs_quotaops.c | 18 +--
fs/xfs/xfs_rtalloc.c | 20 +--
fs/xfs/xfs_rtalloc.h | 2 +-
fs/xfs/xfs_super.c | 88 +++++------
fs/xfs/xfs_symlink.c | 30 ++--
fs/xfs/xfs_trans.c | 10 +-
fs/xfs/xfs_trans_ail.c | 4 +-
fs/xfs/xfs_trans_buf.c | 37 +++--
fs/xfs/xfs_trans_dquot.c | 4 +-
fs/xfs/xfs_xattr.c | 6 +-
102 files changed, 1180 insertions(+), 1212 deletions(-)
rename fs/xfs/{ => libxfs}/xfs_ag.h (100%)
rename fs/xfs/{ => libxfs}/xfs_alloc.c (99%)
rename fs/xfs/{ => libxfs}/xfs_alloc.h (100%)
rename fs/xfs/{ => libxfs}/xfs_alloc_btree.c (99%)
rename fs/xfs/{ => libxfs}/xfs_alloc_btree.h (100%)
rename fs/xfs/{ => libxfs}/xfs_attr.c (97%)
rename fs/xfs/{ => libxfs}/xfs_attr_leaf.c (98%)
rename fs/xfs/{ => libxfs}/xfs_attr_leaf.h (100%)
rename fs/xfs/{ => libxfs}/xfs_attr_remote.c (98%)
rename fs/xfs/{ => libxfs}/xfs_attr_remote.h (100%)
rename fs/xfs/{ => libxfs}/xfs_attr_sf.h (100%)
rename fs/xfs/{ => libxfs}/xfs_bit.h (100%)
rename fs/xfs/{ => libxfs}/xfs_bmap.c (99%)
rename fs/xfs/{ => libxfs}/xfs_bmap.h (100%)
rename fs/xfs/{ => libxfs}/xfs_bmap_btree.c (99%)
rename fs/xfs/{ => libxfs}/xfs_bmap_btree.h (100%)
rename fs/xfs/{ => libxfs}/xfs_btree.c (99%)
rename fs/xfs/{ => libxfs}/xfs_btree.h (100%)
rename fs/xfs/{ => libxfs}/xfs_cksum.h (100%)
rename fs/xfs/{ => libxfs}/xfs_da_btree.c (97%)
rename fs/xfs/{ => libxfs}/xfs_da_btree.h (100%)
rename fs/xfs/{ => libxfs}/xfs_da_format.c (100%)
rename fs/xfs/{ => libxfs}/xfs_da_format.h (100%)
rename fs/xfs/{ => libxfs}/xfs_dinode.h (100%)
rename fs/xfs/{ => libxfs}/xfs_dir2.c (98%)
rename fs/xfs/{ => libxfs}/xfs_dir2.h (100%)
rename fs/xfs/{ => libxfs}/xfs_dir2_block.c (99%)
rename fs/xfs/{ => libxfs}/xfs_dir2_data.c (99%)
rename fs/xfs/{ => libxfs}/xfs_dir2_leaf.c (99%)
rename fs/xfs/{ => libxfs}/xfs_dir2_node.c (98%)
rename fs/xfs/{ => libxfs}/xfs_dir2_priv.h (100%)
rename fs/xfs/{ => libxfs}/xfs_dir2_sf.c (98%)
rename fs/xfs/{ => libxfs}/xfs_dquot_buf.c (98%)
rename fs/xfs/{ => libxfs}/xfs_format.h (100%)
rename fs/xfs/{ => libxfs}/xfs_ialloc.c (99%)
rename fs/xfs/{ => libxfs}/xfs_ialloc.h (100%)
rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.c (98%)
rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.h (100%)
rename fs/xfs/{ => libxfs}/xfs_inode_buf.c (98%)
rename fs/xfs/{ => libxfs}/xfs_inode_buf.h (100%)
rename fs/xfs/{ => libxfs}/xfs_inode_fork.c (99%)
rename fs/xfs/{ => libxfs}/xfs_inode_fork.h (100%)
rename fs/xfs/{ => libxfs}/xfs_inum.h (100%)
rename fs/xfs/{ => libxfs}/xfs_log_format.h (100%)
rename fs/xfs/{ => libxfs}/xfs_log_recover.h (100%)
rename fs/xfs/{ => libxfs}/xfs_log_rlimit.c (100%)
rename fs/xfs/{ => libxfs}/xfs_quota_defs.h (100%)
rename fs/xfs/{ => libxfs}/xfs_rtbitmap.c (100%)
rename fs/xfs/{ => libxfs}/xfs_sb.c (97%)
rename fs/xfs/{ => libxfs}/xfs_sb.h (100%)
rename fs/xfs/{ => libxfs}/xfs_shared.h (100%)
rename fs/xfs/{ => libxfs}/xfs_symlink_remote.c (97%)
rename fs/xfs/{ => libxfs}/xfs_trans_resv.c (100%)
rename fs/xfs/{ => libxfs}/xfs_trans_resv.h (100%)
rename fs/xfs/{ => libxfs}/xfs_trans_space.h (100%)
Merging file-private-locks/linux-next (a497c3ba1d97 Linux 3.16-rc2)
$ git merge file-private-locks/linux-next
Already up-to-date.
Merging vfs/for-next (cd67b9ac44ea switch iov_iter_get_pages() to passing maximal number of pages)
$ git merge vfs/for-next
Auto-merging include/linux/uio.h
Merge made by the 'recursive' strategy.
fs/direct-io.c | 2 +-
fs/fuse/file.c | 4 ++--
include/linux/uio.h | 2 +-
mm/iov_iter.c | 17 ++++++++---------
4 files changed, 12 insertions(+), 13 deletions(-)
Merging pci/next (7171511eaec5 Linux 3.16-rc1)
$ git merge pci/next
Already up-to-date.
Merging hid/for-next (0ee3e1aef4f2 Merge branch 'for-3.17/upstream' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
.../ABI/testing/sysfs-class-hid-driver-gt683r | 14 +
drivers/hid/Kconfig | 16 +-
drivers/hid/Makefile | 1 +
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-gt683r.c | 309 +++++++++++++++++++++
drivers/hid/hid-ids.h | 2 +-
drivers/hid/hid-picolcd_debugfs.c | 9 +-
drivers/hid/hid-roccat-lua.c | 2 +-
drivers/hid/hid-sony.c | 130 ++++++---
drivers/hid/usbhid/hid-core.c | 2 +-
drivers/hid/usbhid/hid-quirks.c | 2 +-
11 files changed, 432 insertions(+), 56 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r
create mode 100644 drivers/hid/hid-gt683r.c
Merging i2c/i2c/for-next (2fd6cf0523fc i2c: taos-evm: Use module_serio_driver())
$ git merge i2c/i2c/for-next
Merge made by the 'recursive' strategy.
drivers/i2c/Kconfig | 18 +-
drivers/i2c/Makefile | 5 +-
drivers/i2c/busses/i2c-taos-evm.c | 13 +-
drivers/i2c/i2c-acpi.c | 362 ++++++++++++++++++++++++++++++++++++++
drivers/i2c/i2c-core.c | 97 +---------
include/linux/acpi.h | 11 ++
include/linux/i2c.h | 12 ++
7 files changed, 409 insertions(+), 109 deletions(-)
create mode 100644 drivers/i2c/i2c-acpi.c
Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (f719604dd06f hwmon: (lm63) Fix smatch warnings)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/i2c/trivial-devices.txt | 1 +
Documentation/hwmon/powr1220 | 45 +++
Documentation/hwmon/tmp103 | 28 ++
drivers/hwmon/Kconfig | 23 ++
drivers/hwmon/Makefile | 2 +
drivers/hwmon/ads7828.c | 52 +--
drivers/hwmon/atxp1.c | 76 ++--
drivers/hwmon/fam15h_power.c | 51 +--
drivers/hwmon/gpio-fan.c | 17 +-
drivers/hwmon/lm63.c | 4 +-
drivers/hwmon/powr1220.c | 391 +++++++++++++++++++++
drivers/hwmon/tmp103.c | 205 +++++++++++
drivers/hwmon/twl4030-madc-hwmon.c | 38 +-
drivers/hwmon/w83l786ng.c | 289 +++++++--------
drivers/hwmon/wm831x-hwmon.c | 72 +---
drivers/hwmon/wm8350-hwmon.c | 50 +--
16 files changed, 895 insertions(+), 449 deletions(-)
create mode 100644 Documentation/hwmon/powr1220
create mode 100644 Documentation/hwmon/tmp103
create mode 100644 drivers/hwmon/powr1220.c
create mode 100644 drivers/hwmon/tmp103.c
Merging v4l-dvb/master (ac35b35b30aa Merge branch 'patchwork' into to_next)
$ git merge v4l-dvb/master
Removing drivers/media/platform/soc_camera/mx1_camera.c
Merge made by the 'recursive' strategy.
drivers/media/dvb-core/dvb_frontend.c | 8 +-
drivers/media/dvb-core/dvbdev.h | 4 +
drivers/media/dvb-frontends/au8522_decoder.c | 180 +++--
drivers/media/dvb-frontends/au8522_priv.h | 2 +
drivers/media/dvb-frontends/dib7000p.c | 433 ++++++++++++-
drivers/media/dvb-frontends/dib7000p.h | 131 +---
drivers/media/dvb-frontends/dib8000.c | 88 +--
drivers/media/dvb-frontends/dib8000.h | 150 +----
drivers/media/dvb-frontends/drxd.h | 1 -
drivers/media/dvb-frontends/drxd_hard.c | 3 +-
drivers/media/dvb-frontends/si2168.c | 16 +-
drivers/media/dvb-frontends/si2168_priv.h | 2 +-
drivers/media/i2c/smiapp/smiapp-core.c | 6 +-
drivers/media/pci/cx23885/cx23885-dvb.c | 8 +-
drivers/media/pci/saa7134/saa7134-empress.c | 2 +-
drivers/media/platform/davinci/vpif_capture.c | 245 ++-----
drivers/media/platform/davinci/vpif_capture.h | 11 -
drivers/media/platform/m2m-deinterlace.c | 7 +-
drivers/media/platform/soc_camera/Kconfig | 18 +-
drivers/media/platform/soc_camera/Makefile | 1 -
drivers/media/platform/soc_camera/mx1_camera.c | 866 -------------------------
drivers/media/platform/soc_camera/rcar_vin.c | 12 +-
drivers/media/platform/soc_camera/soc_camera.c | 12 +-
drivers/media/platform/vsp1/vsp1_video.c | 2 -
drivers/media/platform/vsp1/vsp1_video.h | 1 -
drivers/media/rc/img-ir/img-ir-core.c | 5 +
drivers/media/rc/img-ir/img-ir-hw.c | 5 +
drivers/media/rc/img-ir/img-ir-hw.h | 5 +
drivers/media/rc/img-ir/img-ir-jvc.c | 5 +
drivers/media/rc/img-ir/img-ir-nec.c | 5 +
drivers/media/rc/img-ir/img-ir-raw.c | 5 +
drivers/media/rc/img-ir/img-ir-raw.h | 5 +
drivers/media/rc/img-ir/img-ir-sanyo.c | 5 +
drivers/media/rc/img-ir/img-ir-sharp.c | 5 +
drivers/media/rc/img-ir/img-ir-sony.c | 5 +
drivers/media/rc/img-ir/img-ir.h | 5 +
drivers/media/tuners/si2157.c | 2 +-
drivers/media/usb/au0828/Kconfig | 1 +
drivers/media/usb/au0828/au0828-video.c | 60 +-
drivers/media/usb/dvb-usb-v2/lmedm04.c | 25 +-
drivers/media/usb/dvb-usb/cxusb.c | 39 +-
drivers/media/usb/dvb-usb/dib0700_devices.c | 464 ++++++++-----
drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +-
drivers/media/usb/usbtv/usbtv-core.c | 2 +
drivers/media/v4l2-core/v4l2-dv-timings.c | 4 +-
drivers/staging/media/omap4iss/Kconfig | 2 +-
46 files changed, 1160 insertions(+), 1705 deletions(-)
delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c
Merging kbuild/for-next (bfbf2e950ac8 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
$ git merge kbuild/for-next
Auto-merging lib/Kconfig.debug
Auto-merging arch/x86/Kconfig
Auto-merging Makefile
Merge made by the 'recursive' strategy.
Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++
Makefile | 19 +++++-
arch/x86/Kconfig | 2 +-
init/Kconfig | 73 ++++++++++++++++++++
kernel/gcov/Kconfig | 2 +-
lib/Kconfig.debug | 2 +-
scripts/Makefile.lto | 84 +++++++++++++++++++++++
scripts/Makefile.modpost | 7 +-
scripts/link-vmlinux.sh | 2 +-
9 files changed, 356 insertions(+), 8 deletions(-)
create mode 100644 Documentation/lto-build
create mode 100644 scripts/Makefile.lto
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
$ git merge kconfig/for-next
Already up-to-date.
Merging libata/for-next (4e0449c81db9 Merge branch 'for-3.17' into for-next)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/ata/ahci-platform.txt | 6 -
Documentation/devicetree/bindings/ata/imx-sata.txt | 36 ++++
drivers/ata/ahci_imx.c | 218 +++++++++++++++++++--
drivers/ata/ahci_platform.c | 2 +-
drivers/ata/ahci_xgene.c | 10 -
drivers/ata/libahci_platform.c | 20 +-
drivers/ata/pata_samsung_cf.c | 13 --
drivers/ata/sata_fsl.c | 5 +-
include/linux/platform_data/ata-samsung_cf.h | 1 -
9 files changed, 264 insertions(+), 47 deletions(-)
create mode 100644 Documentation/devicetree/bindings/ata/imx-sata.txt
Merging pm/linux-next (8c8f4a5571e4 Merge branch 'acpica' into linux-next)
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
drivers/acpi/acpi_extlog.c | 14 +++++++-------
drivers/acpi/apei/apei-internal.h | 10 +++++-----
drivers/acpi/apei/ghes.c | 32 ++++++++++++++++----------------
drivers/firmware/efi/cper.c | 20 ++++++++++----------
include/acpi/actbl1.h | 14 +++++++-------
include/acpi/ghes.h | 2 +-
6 files changed, 46 insertions(+), 46 deletions(-)
Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release)
$ git merge idle/next
Already up-to-date.
Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk)
$ git merge apm/for-next
Already up-to-date.
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
$ git merge cpupowerutils/master
Already up-to-date.
Merging thermal/next (b6902baa1fab Merge branch 'for-rc' of .git into next)
$ git merge thermal/next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 4 +-
drivers/thermal/cpu_cooling.c | 2 +-
drivers/thermal/imx_thermal.c | 18 +++-----
drivers/thermal/int3403_thermal.c | 67 ++++++++++++++++++++++++++---
drivers/thermal/of-thermal.c | 7 +--
drivers/thermal/thermal_hwmon.c | 33 +++++++-------
drivers/thermal/ti-soc-thermal/ti-bandgap.c | 2 +-
include/linux/thermal.h | 46 +++++++++++++++++++-
tools/thermal/tmon/Makefile | 2 +-
tools/thermal/tmon/tmon.c | 26 ++++++++++-
10 files changed, 163 insertions(+), 44 deletions(-)
Merging ieee1394/for-next (165d560bb267 Merge branch 'master' into for-next)
$ git merge ieee1394/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (d1a792f3b407 Update imx-sdma cyclic handling to report residue)
$ git merge slave-dma/next
Merge made by the 'recursive' strategy.
drivers/dma/cppi41.c | 13 ++++++++++---
drivers/dma/imx-sdma.c | 22 ++++++++++++++++++----
sound/soc/fsl/imx-pcm-dma.c | 1 -
3 files changed, 28 insertions(+), 8 deletions(-)
Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup())
$ git merge dmaengine/next
Auto-merging drivers/dma/mv_xor.c
Merge made by the 'recursive' strategy.
drivers/dma/ioat/dca.c | 13 ++++----
drivers/dma/ioat/dma.c | 2 +-
drivers/dma/ioat/dma_v3.c | 6 ++--
drivers/dma/mv_xor.c | 80 +++++++++++++++++++++++++++++++++++++----------
4 files changed, 74 insertions(+), 27 deletions(-)
Merging net-next/master (fb0d164cc1e4 net/caif/caif_socket.c: remove unnecessary null test before debugfs_remove_recursive)
$ git merge net-next/master
Auto-merging net/ipv6/udp.c
Auto-merging include/net/sock.h
Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/net/ieee802154/cc2520.txt | 29 +
Documentation/networking/ip-sysctl.txt | 12 +
Documentation/networking/pktgen.txt | 28 +
MAINTAINERS | 3 +-
drivers/infiniband/hw/cxgb4/cm.c | 3 +-
drivers/net/bonding/bond_main.c | 13 -
drivers/net/ethernet/amd/Kconfig | 2 +
drivers/net/ethernet/amd/xgbe/xgbe-common.h | 26 +-
drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 9 +-
drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 23 +-
drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 344 +-
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 115 +-
drivers/net/ethernet/amd/xgbe/xgbe-main.c | 13 +-
drivers/net/ethernet/amd/xgbe/xgbe.h | 55 +-
drivers/net/ethernet/broadcom/Kconfig | 8 +-
drivers/net/ethernet/broadcom/bnx2.c | 9 +-
drivers/net/ethernet/broadcom/bnx2.h | 5 +-
drivers/net/ethernet/broadcom/bnx2_fw.h | 3 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 9 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 55 +-
.../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 44 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 264 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 35 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 78 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 23 +-
drivers/net/ethernet/broadcom/cnic.c | 10 +-
drivers/net/ethernet/broadcom/cnic.h | 3 +-
drivers/net/ethernet/broadcom/cnic_defs.h | 3 +-
drivers/net/ethernet/broadcom/cnic_if.h | 3 +-
drivers/net/ethernet/chelsio/Kconfig | 11 +
drivers/net/ethernet/chelsio/cxgb4/Makefile | 1 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 33 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 980 ++++
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 141 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 372 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 +-
drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/l2t.h | 2 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 348 +-
drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 2 +-
drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 2 +-
drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 8 +-
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 97 +-
.../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 9 +
drivers/net/ethernet/cisco/enic/Makefile | 2 +-
drivers/net/ethernet/cisco/enic/enic.h | 43 +-
drivers/net/ethernet/cisco/enic/enic_api.c | 4 +-
drivers/net/ethernet/cisco/enic/enic_clsf.c | 269 ++
drivers/net/ethernet/cisco/enic/enic_clsf.h | 22 +
drivers/net/ethernet/cisco/enic/enic_dev.c | 80 +-
drivers/net/ethernet/cisco/enic/enic_dev.h | 4 +-
drivers/net/ethernet/cisco/enic/enic_main.c | 245 +-
drivers/net/ethernet/cisco/enic/enic_res.c | 1 +
drivers/net/ethernet/cisco/enic/vnic_dev.c | 65 +-
drivers/net/ethernet/cisco/enic/vnic_dev.h | 2 +
drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 5 +
drivers/net/ethernet/cisco/enic/vnic_enet.h | 2 +
drivers/net/ethernet/cisco/enic/vnic_rq.h | 122 +
drivers/net/ethernet/intel/i40e/i40e.h | 8 +-
drivers/net/ethernet/intel/i40e/i40e_adminq.c | 103 +-
drivers/net/ethernet/intel/i40e/i40e_adminq.h | 3 +
drivers/net/ethernet/intel/i40e/i40e_common.c | 112 +-
drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 6 +-
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 31 +-
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 247 +-
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 28 +-
drivers/net/ethernet/intel/i40e/i40e_main.c | 353 +-
drivers/net/ethernet/intel/i40e/i40e_nvm.c | 9 +-
drivers/net/ethernet/intel/i40e/i40e_prototype.h | 4 +-
drivers/net/ethernet/intel/i40e/i40e_ptp.c | 125 +-
drivers/net/ethernet/intel/i40e/i40e_register.h | 5011 ++++++++------------
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 34 +-
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 -
drivers/net/ethernet/intel/i40e/i40e_type.h | 7 +-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +
drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 103 +-
drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 3 +
drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h | 28 +-
drivers/net/ethernet/intel/i40evf/i40e_register.h | 5011 ++++++++------------
drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 1 +
drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 -
drivers/net/ethernet/intel/i40evf/i40e_type.h | 7 +-
drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 4 +-
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 14 +-
.../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 44 +-
drivers/net/ethernet/intel/igb/igb_main.c | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 16 +-
drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 +-
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +-
drivers/net/hyperv/hyperv_net.h | 3 +-
drivers/net/hyperv/netvsc_drv.c | 30 +-
drivers/net/hyperv/rndis_filter.c | 21 +-
drivers/net/ieee802154/Kconfig | 11 +
drivers/net/ieee802154/Makefile | 1 +
drivers/net/ieee802154/cc2520.c | 1039 ++++
drivers/net/ieee802154/mrf24j40.c | 115 +-
drivers/net/irda/kingsun-sir.c | 4 +-
drivers/net/phy/dp83640.c | 39 +-
drivers/net/veth.c | 18 +
drivers/ptp/ptp_chardev.c | 9 +-
include/linux/crc32.h | 20 +-
include/linux/ipv6.h | 21 +-
include/linux/kernel.h | 2 +-
include/linux/rndis.h | 1 +
include/linux/spi/cc2520.h | 26 +
include/linux/tcp.h | 3 -
include/net/flow_keys.h | 14 +
include/net/inet_sock.h | 6 +-
include/net/inet_timewait_sock.h | 3 +-
include/net/sch_generic.h | 2 +-
include/net/sock.h | 4 +-
include/net/tcp.h | 57 +-
include/uapi/linux/ipv6.h | 1 +
include/uapi/linux/sysctl.h | 1 +
include/uapi/linux/tipc_config.h | 2 +-
kernel/sysctl_binary.c | 1 +
lib/crc32.c | 153 +-
lib/net_utils.c | 10 +-
net/bridge/br_fdb.c | 10 +-
net/caif/caif_socket.c | 3 +-
net/core/dev.c | 12 +-
net/core/flow_dissector.c | 1 +
net/core/pktgen.c | 110 +-
net/core/request_sock.c | 43 +-
net/core/rtnetlink.c | 12 +-
net/dccp/ipv6.c | 2 +-
net/dccp/minisocks.c | 4 +-
net/dsa/dsa.c | 3 +-
net/ipv4/syncookies.c | 3 +-
net/ipv4/tcp_input.c | 150 +
net/ipv4/tcp_ipv4.c | 189 +-
net/ipv4/tcp_minisocks.c | 2 +-
net/ipv4/tcp_output.c | 15 +
net/ipv6/addrconf.c | 10 +
net/ipv6/af_inet6.c | 6 +-
net/ipv6/ipv6_sockglue.c | 4 +-
net/ipv6/ndisc.c | 56 +-
net/ipv6/syncookies.c | 2 +-
net/ipv6/tcp_ipv6.c | 207 +-
net/ipv6/udp.c | 3 +-
net/irda/irlmp.c | 3 +-
net/openvswitch/datapath.c | 9 +-
net/openvswitch/vport-internal_dev.c | 16 +
net/openvswitch/vport-internal_dev.h | 2 +
net/sched/em_canid.c | 7 -
net/sched/sch_generic.c | 4 +-
net/tipc/link.c | 417 +-
net/tipc/link.h | 2 +
net/tipc/msg.c | 282 +-
net/tipc/msg.h | 32 +-
net/tipc/net.c | 63 +-
net/tipc/net.h | 2 -
net/tipc/node.c | 25 +-
net/tipc/node.h | 17 +
net/tipc/node_subscr.c | 6 +-
net/tipc/port.c | 328 +-
net/tipc/port.h | 40 -
net/tipc/socket.c | 487 +-
net/tipc/socket.h | 14 +
162 files changed, 10808 insertions(+), 8851 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c
create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h
create mode 100644 drivers/net/ethernet/cisco/enic/enic_clsf.c
create mode 100644 drivers/net/ethernet/cisco/enic/enic_clsf.h
create mode 100644 drivers/net/ieee802154/cc2520.c
create mode 100644 include/linux/spi/cc2520.h
Merging ipsec-next/master (1759389e8af4 xfrm4: Remove duplicate semicolon)
$ git merge ipsec-next/master
Merge made by the 'recursive' strategy.
net/ipv4/ip_vti.c | 54 ++++++++++++++++++-----------------------------
net/ipv4/xfrm4_protocol.c | 2 +-
net/ipv6/ip6_vti.c | 51 ++++++++++++++++++--------------------------
3 files changed, 42 insertions(+), 65 deletions(-)
Merging wireless-next/master (15be8e89cdd9 b43: add more bcma cores)
$ git merge wireless-next/master
Auto-merging net/wireless/nl80211.c
Removing net/wireless/ethtool.h
Auto-merging net/mac80211/util.c
Removing net/mac80211/rc80211_pid_debugfs.c
Removing net/mac80211/rc80211_pid_algo.c
Removing net/mac80211/rc80211_pid.h
Auto-merging drivers/net/wireless/rt2x00/rt2x00mac.c
Auto-merging drivers/net/wireless/rt2x00/rt2x00dev.c
Auto-merging drivers/net/wireless/mwifiex/util.h
Auto-merging drivers/net/wireless/mwifiex/pcie.c
Auto-merging drivers/net/wireless/mwifiex/main.c
Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c
Auto-merging drivers/net/wireless/iwlwifi/iwl-fw.h
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/usb.c
Auto-merging drivers/net/wireless/b43/main.c
Auto-merging drivers/net/wireless/b43/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 10 -
drivers/bcma/driver_gpio.c | 1 +
drivers/net/wireless/at76c50x-usb.c | 3 +-
drivers/net/wireless/ath/ath.h | 1 +
drivers/net/wireless/ath/ath10k/mac.c | 3 +-
drivers/net/wireless/ath/ath5k/ath5k.h | 1 +
drivers/net/wireless/ath/ath5k/base.c | 31 +-
drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +
drivers/net/wireless/ath/ath9k/Makefile | 3 +-
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 +-
drivers/net/wireless/ath/ath9k/ar9003_hw.c | 15 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 +-
drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 201 ++++-
drivers/net/wireless/ath/ath9k/ath9k.h | 159 +++-
drivers/net/wireless/ath/ath9k/beacon.c | 97 ++-
drivers/net/wireless/ath/ath9k/channel.c | 685 ++++++++++++++++
drivers/net/wireless/ath/ath9k/common-beacon.c | 5 +-
drivers/net/wireless/ath/ath9k/debug.c | 28 +-
drivers/net/wireless/ath/ath9k/hw.c | 26 +-
drivers/net/wireless/ath/ath9k/hw.h | 1 +
drivers/net/wireless/ath/ath9k/init.c | 57 +-
drivers/net/wireless/ath/ath9k/link.c | 6 +-
drivers/net/wireless/ath/ath9k/main.c | 892 +++++++++++++++------
drivers/net/wireless/ath/ath9k/mci.c | 4 +-
drivers/net/wireless/ath/ath9k/pci.c | 1 +
drivers/net/wireless/ath/ath9k/recv.c | 16 +-
drivers/net/wireless/ath/ath9k/reg.h | 4 +
drivers/net/wireless/ath/ath9k/tx99.c | 2 +-
drivers/net/wireless/ath/ath9k/wow.c | 1 +
drivers/net/wireless/ath/ath9k/xmit.c | 114 ++-
drivers/net/wireless/ath/wil6210/cfg80211.c | 68 +-
drivers/net/wireless/ath/wil6210/debugfs.c | 305 ++++++-
drivers/net/wireless/ath/wil6210/interrupt.c | 3 +
drivers/net/wireless/ath/wil6210/main.c | 22 +-
drivers/net/wireless/ath/wil6210/pcie_bus.c | 31 +-
drivers/net/wireless/ath/wil6210/rx_reorder.c | 1 +
drivers/net/wireless/ath/wil6210/txrx.c | 33 +-
drivers/net/wireless/ath/wil6210/wil6210.h | 10 +-
drivers/net/wireless/ath/wil6210/wmi.c | 40 +-
drivers/net/wireless/b43/Kconfig | 9 +
drivers/net/wireless/b43/Makefile | 6 +-
drivers/net/wireless/b43/main.c | 300 +++----
drivers/net/wireless/b43/phy_a.c | 2 +-
drivers/net/wireless/b43/phy_a.h | 4 -
drivers/net/wireless/b43/phy_common.c | 26 +-
drivers/net/wireless/b43/phy_common.h | 12 +-
drivers/net/wireless/b43/phy_ht.c | 2 +-
drivers/net/wireless/b43/phy_n.c | 348 +++++---
drivers/net/wireless/b43/radio_2057.c | 122 ++-
drivers/net/wireless/b43/radio_2057.h | 66 ++
drivers/net/wireless/b43/tables_nphy.c | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +-
drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | 38 +-
drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 10 -
.../net/wireless/brcm80211/brcmfmac/dhd_common.c | 7 +
drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/usb.c | 214 +++--
drivers/net/wireless/brcm80211/brcmfmac/vendor.c | 115 +++
drivers/net/wireless/brcm80211/brcmfmac/vendor.h | 64 ++
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 81 +-
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 2 +-
.../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 6 +-
drivers/net/wireless/cw1200/scan.c | 3 +-
drivers/net/wireless/cw1200/scan.h | 2 +-
drivers/net/wireless/cw1200/sta.c | 3 +-
drivers/net/wireless/ipw2x00/libipw_module.c | 3 +-
drivers/net/wireless/iwlegacy/common.c | 3 +-
drivers/net/wireless/iwlegacy/common.h | 2 +-
drivers/net/wireless/iwlwifi/dvm/mac80211.c | 3 +-
drivers/net/wireless/iwlwifi/dvm/power.c | 9 +
drivers/net/wireless/iwlwifi/iwl-8000.c | 5 +-
drivers/net/wireless/iwlwifi/iwl-config.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-drv.c | 15 +
drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 1 -
drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 46 +-
drivers/net/wireless/iwlwifi/iwl-fw-file.h | 6 +-
drivers/net/wireless/iwlwifi/iwl-fw.h | 8 +
drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 +
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 56 +-
drivers/net/wireless/iwlwifi/iwl-prph.h | 6 +
drivers/net/wireless/iwlwifi/mvm/coex.c | 77 +-
drivers/net/wireless/iwlwifi/mvm/constants.h | 2 +
drivers/net/wireless/iwlwifi/mvm/debugfs.c | 39 +
drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 10 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 2 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 47 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 7 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 14 +
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 45 +-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 20 +-
drivers/net/wireless/iwlwifi/mvm/mvm.h | 16 +-
drivers/net/wireless/iwlwifi/mvm/nvm.c | 29 +-
drivers/net/wireless/iwlwifi/mvm/ops.c | 31 +-
drivers/net/wireless/iwlwifi/mvm/scan.c | 83 +-
drivers/net/wireless/iwlwifi/mvm/sta.c | 20 +
drivers/net/wireless/iwlwifi/mvm/sta.h | 2 +
drivers/net/wireless/iwlwifi/mvm/tx.c | 8 +-
drivers/net/wireless/iwlwifi/pcie/internal.h | 7 +
drivers/net/wireless/iwlwifi/pcie/trans.c | 145 +++-
drivers/net/wireless/iwlwifi/pcie/tx.c | 1 +
drivers/net/wireless/libertas/Kconfig | 2 +-
drivers/net/wireless/libertas/cmd.c | 1 +
drivers/net/wireless/mac80211_hwsim.c | 69 +-
drivers/net/wireless/mwifiex/11ac.c | 2 +-
drivers/net/wireless/mwifiex/11ac.h | 2 +-
drivers/net/wireless/mwifiex/11h.c | 2 +-
drivers/net/wireless/mwifiex/11n.c | 2 +-
drivers/net/wireless/mwifiex/11n.h | 2 +-
drivers/net/wireless/mwifiex/11n_aggr.c | 2 +-
drivers/net/wireless/mwifiex/11n_aggr.h | 2 +-
drivers/net/wireless/mwifiex/11n_rxreorder.c | 2 +-
drivers/net/wireless/mwifiex/11n_rxreorder.h | 2 +-
drivers/net/wireless/mwifiex/Makefile | 2 +-
drivers/net/wireless/mwifiex/README | 32 +-
drivers/net/wireless/mwifiex/cfg80211.c | 55 +-
drivers/net/wireless/mwifiex/cfg80211.h | 2 +-
drivers/net/wireless/mwifiex/cfp.c | 2 +-
drivers/net/wireless/mwifiex/cmdevt.c | 30 +-
drivers/net/wireless/mwifiex/debugfs.c | 95 ++-
drivers/net/wireless/mwifiex/decl.h | 2 +-
drivers/net/wireless/mwifiex/ethtool.c | 85 +-
drivers/net/wireless/mwifiex/fw.h | 2 +-
drivers/net/wireless/mwifiex/ie.c | 2 +-
drivers/net/wireless/mwifiex/init.c | 15 +-
drivers/net/wireless/mwifiex/ioctl.h | 2 +-
drivers/net/wireless/mwifiex/join.c | 2 +-
drivers/net/wireless/mwifiex/main.c | 8 +-
drivers/net/wireless/mwifiex/main.h | 34 +-
drivers/net/wireless/mwifiex/pcie.c | 195 ++++-
drivers/net/wireless/mwifiex/pcie.h | 12 +-
drivers/net/wireless/mwifiex/scan.c | 2 +-
drivers/net/wireless/mwifiex/sdio.c | 240 +++++-
drivers/net/wireless/mwifiex/sdio.h | 14 +-
drivers/net/wireless/mwifiex/sta_cmd.c | 2 +-
drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +-
drivers/net/wireless/mwifiex/sta_event.c | 2 +-
drivers/net/wireless/mwifiex/sta_ioctl.c | 8 +-
drivers/net/wireless/mwifiex/sta_rx.c | 2 +-
drivers/net/wireless/mwifiex/sta_tx.c | 2 +-
drivers/net/wireless/mwifiex/tdls.c | 8 +-
drivers/net/wireless/mwifiex/txrx.c | 2 +-
drivers/net/wireless/mwifiex/uap_cmd.c | 2 +-
drivers/net/wireless/mwifiex/uap_event.c | 2 +-
drivers/net/wireless/mwifiex/uap_txrx.c | 6 +-
drivers/net/wireless/mwifiex/usb.c | 2 +-
drivers/net/wireless/mwifiex/usb.h | 2 +-
drivers/net/wireless/mwifiex/util.c | 2 +-
drivers/net/wireless/mwifiex/util.h | 2 +-
drivers/net/wireless/mwifiex/wmm.c | 11 +-
drivers/net/wireless/mwifiex/wmm.h | 2 +-
drivers/net/wireless/orinoco/Kconfig | 4 +-
drivers/net/wireless/p54/p54spi.c | 2 +-
drivers/net/wireless/rsi/rsi_91x_core.c | 85 +-
drivers/net/wireless/rsi/rsi_91x_debugfs.c | 10 +-
drivers/net/wireless/rsi/rsi_91x_mac80211.c | 143 +++-
drivers/net/wireless/rsi/rsi_91x_mgmt.c | 239 ++++--
drivers/net/wireless/rsi/rsi_91x_pkt.c | 17 +
drivers/net/wireless/rsi/rsi_91x_sdio.c | 6 +-
drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 8 +-
drivers/net/wireless/rsi/rsi_91x_usb.c | 88 +-
drivers/net/wireless/rsi/rsi_main.h | 12 +
drivers/net/wireless/rsi/rsi_mgmt.h | 25 +-
drivers/net/wireless/rsi/rsi_sdio.h | 8 +-
drivers/net/wireless/rt2x00/rt2800lib.c | 69 +-
drivers/net/wireless/rt2x00/rt2x00dev.c | 10 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 20 +-
drivers/net/wireless/rt2x00/rt2x00mmio.c | 8 +-
drivers/net/wireless/rt2x00/rt2x00queue.c | 21 +-
drivers/net/wireless/rt2x00/rt2x00queue.h | 1 +
drivers/net/wireless/rtl818x/rtl8180/dev.c | 78 +-
drivers/net/wireless/rtl818x/rtl8180/rtl8180.h | 1 +
.../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h | 2 +-
drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8188ee/reg.h | 1 +
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 1 +
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 3 +-
drivers/net/wireless/rtlwifi/rtl8192de/reg.h | 1 +
drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8723ae/reg.h | 1 +
drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8723be/reg.h | 1 +
drivers/net/wireless/ti/wl1251/main.c | 3 +-
drivers/net/wireless/ti/wl12xx/scan.c | 20 +-
drivers/net/wireless/ti/wl12xx/scan.h | 2 +-
drivers/net/wireless/ti/wl18xx/scan.c | 16 +-
drivers/net/wireless/ti/wl18xx/scan.h | 2 +-
drivers/net/wireless/ti/wlcore/cmd.c | 11 +-
drivers/net/wireless/ti/wlcore/cmd.h | 3 +-
drivers/net/wireless/ti/wlcore/main.c | 5 +-
drivers/net/wireless/ti/wlcore/scan.h | 2 +-
drivers/net/wireless/ti/wlcore/wlcore.h | 2 +-
include/linux/ieee80211.h | 3 +
include/net/cfg80211.h | 38 +-
include/net/mac80211.h | 71 +-
include/uapi/linux/nl80211.h | 5 +
net/mac80211/Kconfig | 17 -
net/mac80211/Makefile | 6 +-
net/mac80211/agg-tx.c | 8 +-
net/mac80211/cfg.c | 555 +++----------
net/mac80211/chan.c | 861 ++++++++++++++++----
net/mac80211/debugfs_sta.c | 3 +-
net/mac80211/driver-ops.h | 20 +-
net/mac80211/ethtool.c | 244 ++++++
net/mac80211/ibss.c | 2 +-
net/mac80211/ieee80211_i.h | 88 +-
net/mac80211/iface.c | 13 +-
net/mac80211/main.c | 10 +-
net/mac80211/mesh.c | 4 +-
net/mac80211/mesh_plink.c | 30 +-
net/mac80211/mlme.c | 134 ++--
net/mac80211/offchannel.c | 6 +-
net/mac80211/pm.c | 6 +-
net/mac80211/rate.h | 13 -
net/mac80211/rc80211_pid.h | 278 -------
net/mac80211/rc80211_pid_algo.c | 478 -----------
net/mac80211/rc80211_pid_debugfs.c | 228 ------
net/mac80211/rx.c | 2 +
net/mac80211/scan.c | 118 ++-
net/mac80211/sta_info.c | 201 ++++-
net/mac80211/sta_info.h | 13 +-
net/mac80211/status.c | 7 +-
net/mac80211/tdls.c | 293 ++++++-
net/mac80211/trace.h | 7 +
net/mac80211/tx.c | 170 ++--
net/mac80211/util.c | 270 +++++--
net/mac80211/wep.c | 20 -
net/wireless/core.c | 3 -
net/wireless/ethtool.c | 86 +-
net/wireless/ethtool.h | 6 -
net/wireless/nl80211.c | 15 +-
net/wireless/rdev-ops.h | 54 +-
net/wireless/trace.h | 59 +-
236 files changed, 7740 insertions(+), 3744 deletions(-)
create mode 100644 drivers/net/wireless/ath/ath9k/channel.c
create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/vendor.c
create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/vendor.h
create mode 100644 net/mac80211/ethtool.c
delete mode 100644 net/mac80211/rc80211_pid.h
delete mode 100644 net/mac80211/rc80211_pid_algo.c
delete mode 100644 net/mac80211/rc80211_pid_debugfs.c
delete mode 100644 net/wireless/ethtool.h
Merging bluetooth/master (92b68b698562 Bluetooth: Add support for Unconfigured Index Removed events)
$ git merge bluetooth/master
Resolved 'net/bluetooth/hci_conn.c' using previous resolution.
Resolved 'net/bluetooth/mgmt.c' using previous resolution.
Resolved 'net/bluetooth/smp.c' using previous resolution.
Auto-merging net/bluetooth/smp.c
CONFLICT (content): Merge conflict in net/bluetooth/smp.c
Auto-merging net/bluetooth/mgmt.c
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
Auto-merging net/bluetooth/l2cap_sock.c
Auto-merging net/bluetooth/l2cap_core.c
Auto-merging net/bluetooth/hci_event.c
Auto-merging net/bluetooth/hci_conn.c
CONFLICT (content): Merge conflict in net/bluetooth/hci_conn.c
Removing net/bluetooth/6lowpan.h
Auto-merging drivers/bluetooth/hci_h5.c
Auto-merging drivers/bluetooth/btusb.c
Auto-merging drivers/bluetooth/ath3k.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 9c66c0bbd799] Merge remote-tracking branch 'bluetooth/master'
$ git diff -M --stat --summary HEAD^..
drivers/bluetooth/Kconfig | 12 +-
drivers/bluetooth/ath3k.c | 4 +-
drivers/bluetooth/btmrvl_drv.h | 3 +
drivers/bluetooth/btmrvl_main.c | 44 +-
drivers/bluetooth/btmrvl_sdio.c | 5 +
drivers/bluetooth/btmrvl_sdio.h | 2 +
drivers/bluetooth/btusb.c | 133 +++++-
drivers/bluetooth/hci_h5.c | 4 -
include/net/bluetooth/bluetooth.h | 18 +-
include/net/bluetooth/hci.h | 83 +++-
include/net/bluetooth/hci_core.h | 102 ++++-
include/net/bluetooth/l2cap.h | 36 +-
include/net/bluetooth/mgmt.h | 66 +++
net/bluetooth/6lowpan.c | 857 +++++++++++++++++++++++++++++---------
net/bluetooth/6lowpan.h | 47 ---
net/bluetooth/Kconfig | 6 +-
net/bluetooth/Makefile | 4 +-
net/bluetooth/a2mp.c | 8 +-
net/bluetooth/af_bluetooth.c | 2 +-
net/bluetooth/hci_conn.c | 126 ++++--
net/bluetooth/hci_core.c | 671 ++++++++++++++---------------
net/bluetooth/hci_event.c | 324 +++++++++++---
net/bluetooth/hci_sock.c | 5 +-
net/bluetooth/l2cap_core.c | 124 +++---
net/bluetooth/l2cap_sock.c | 46 +-
net/bluetooth/mgmt.c | 589 ++++++++++++++++++++++----
net/bluetooth/smp.c | 177 ++++----
net/bluetooth/smp.h | 7 +
28 files changed, 2521 insertions(+), 984 deletions(-)
delete mode 100644 net/bluetooth/6lowpan.h
Merging infiniband/for-next (eeaddf3670d4 Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next)
$ git merge infiniband/for-next
Already up-to-date.
Merging mtd/master (7171511eaec5 Linux 3.16-rc1)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (7171511eaec5 Linux 3.16-rc1)
$ git merge l2-mtd/master
Already up-to-date.
Merging crypto/master (8f312d64b5ee crypto: qat - Fix error path crash when no firmware is present)
$ git merge crypto/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/crypto/amd-ccp.txt | 16 +
Documentation/ioctl/ioctl-number.txt | 1 +
MAINTAINERS | 6 +
arch/x86/crypto/Makefile | 4 +-
arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 546 ++++++
arch/x86/crypto/aesni-intel_glue.c | 40 +-
arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 281 ++-
arch/x86/crypto/des3_ede-asm_64.S | 805 ++++++++
arch/x86/crypto/des3_ede_glue.c | 509 +++++
crypto/Kconfig | 49 +-
crypto/Makefile | 1 +
crypto/des_generic.c | 22 +-
crypto/drbg.c | 2007 ++++++++++++++++++++
crypto/lzo.c | 8 +-
crypto/tcrypt.c | 6 +
crypto/testmgr.c | 247 +++
crypto/testmgr.h | 892 ++++++++-
drivers/crypto/Kconfig | 3 +-
drivers/crypto/Makefile | 1 +
drivers/crypto/amcc/crypto4xx_core.c | 2 +-
drivers/crypto/caam/caamalg.c | 8 +-
drivers/crypto/caam/caamhash.c | 40 +-
drivers/crypto/caam/ctrl.c | 65 +-
drivers/crypto/caam/desc.h | 1 -
drivers/crypto/caam/intern.h | 1 +
drivers/crypto/caam/regs.h | 105 +-
drivers/crypto/ccp/Makefile | 5 +
drivers/crypto/ccp/ccp-dev.c | 34 +
drivers/crypto/ccp/ccp-dev.h | 10 +-
drivers/crypto/ccp/ccp-pci.c | 39 +-
drivers/crypto/ccp/ccp-platform.c | 224 +++
drivers/crypto/nx/nx-842.c | 2 +-
drivers/crypto/qat/Kconfig | 23 +
drivers/crypto/qat/Makefile | 2 +
drivers/crypto/qat/qat_common/Makefile | 14 +
drivers/crypto/qat/qat_common/adf_accel_devices.h | 205 ++
drivers/crypto/qat/qat_common/adf_accel_engine.c | 168 ++
drivers/crypto/qat/qat_common/adf_aer.c | 259 +++
drivers/crypto/qat/qat_common/adf_cfg.c | 362 ++++
drivers/crypto/qat/qat_common/adf_cfg.h | 87 +
drivers/crypto/qat/qat_common/adf_cfg_common.h | 100 +
drivers/crypto/qat/qat_common/adf_cfg_strings.h | 83 +
drivers/crypto/qat/qat_common/adf_cfg_user.h | 94 +
drivers/crypto/qat/qat_common/adf_common_drv.h | 192 ++
drivers/crypto/qat/qat_common/adf_ctl_drv.c | 490 +++++
drivers/crypto/qat/qat_common/adf_dev_mgr.c | 215 +++
drivers/crypto/qat/qat_common/adf_init.c | 388 ++++
drivers/crypto/qat/qat_common/adf_transport.c | 567 ++++++
drivers/crypto/qat/qat_common/adf_transport.h | 63 +
.../qat/qat_common/adf_transport_access_macros.h | 160 ++
.../crypto/qat/qat_common/adf_transport_debug.c | 304 +++
.../crypto/qat/qat_common/adf_transport_internal.h | 115 ++
drivers/crypto/qat/qat_common/icp_qat_fw.h | 316 +++
.../crypto/qat/qat_common/icp_qat_fw_init_admin.h | 131 ++
drivers/crypto/qat/qat_common/icp_qat_fw_la.h | 403 ++++
.../qat/qat_common/icp_qat_fw_loader_handle.h | 78 +
drivers/crypto/qat/qat_common/icp_qat_hal.h | 125 ++
drivers/crypto/qat/qat_common/icp_qat_hw.h | 305 +++
drivers/crypto/qat/qat_common/icp_qat_uclo.h | 377 ++++
drivers/crypto/qat/qat_common/qat_algs.c | 1038 ++++++++++
drivers/crypto/qat/qat_common/qat_crypto.c | 284 +++
drivers/crypto/qat/qat_common/qat_crypto.h | 83 +
drivers/crypto/qat/qat_common/qat_hal.c | 1405 ++++++++++++++
drivers/crypto/qat/qat_common/qat_uclo.c | 1195 ++++++++++++
drivers/crypto/qat/qat_dh895xcc/Makefile | 8 +
drivers/crypto/qat/qat_dh895xcc/adf_admin.c | 144 ++
.../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 214 +++
.../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 86 +
drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 449 +++++
drivers/crypto/qat/qat_dh895xcc/adf_drv.h | 67 +
drivers/crypto/qat/qat_dh895xcc/adf_hw_arbiter.c | 159 ++
drivers/crypto/qat/qat_dh895xcc/adf_isr.c | 266 +++
drivers/crypto/qat/qat_dh895xcc/qat_admin.c | 107 ++
include/crypto/algapi.h | 6 +
include/crypto/des.h | 3 +
include/crypto/drbg.h | 289 +++
include/crypto/internal/skcipher.h | 3 +-
include/crypto/scatterwalk.h | 6 -
78 files changed, 17153 insertions(+), 265 deletions(-)
create mode 100644 Documentation/devicetree/bindings/crypto/amd-ccp.txt
create mode 100644 arch/x86/crypto/aes_ctrby8_avx-x86_64.S
create mode 100644 arch/x86/crypto/des3_ede-asm_64.S
create mode 100644 arch/x86/crypto/des3_ede_glue.c
create mode 100644 crypto/drbg.c
create mode 100644 drivers/crypto/ccp/ccp-platform.c
create mode 100644 drivers/crypto/qat/Kconfig
create mode 100644 drivers/crypto/qat/Makefile
create mode 100644 drivers/crypto/qat/qat_common/Makefile
create mode 100644 drivers/crypto/qat/qat_common/adf_accel_devices.h
create mode 100644 drivers/crypto/qat/qat_common/adf_accel_engine.c
create mode 100644 drivers/crypto/qat/qat_common/adf_aer.c
create mode 100644 drivers/crypto/qat/qat_common/adf_cfg.c
create mode 100644 drivers/crypto/qat/qat_common/adf_cfg.h
create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_common.h
create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_strings.h
create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_user.h
create mode 100644 drivers/crypto/qat/qat_common/adf_common_drv.h
create mode 100644 drivers/crypto/qat/qat_common/adf_ctl_drv.c
create mode 100644 drivers/crypto/qat/qat_common/adf_dev_mgr.c
create mode 100644 drivers/crypto/qat/qat_common/adf_init.c
create mode 100644 drivers/crypto/qat/qat_common/adf_transport.c
create mode 100644 drivers/crypto/qat/qat_common/adf_transport.h
create mode 100644 drivers/crypto/qat/qat_common/adf_transport_access_macros.h
create mode 100644 drivers/crypto/qat/qat_common/adf_transport_debug.c
create mode 100644 drivers/crypto/qat/qat_common/adf_transport_internal.h
create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw.h
create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_init_admin.h
create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_la.h
create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_loader_handle.h
create mode 100644 drivers/crypto/qat/qat_common/icp_qat_hal.h
create mode 100644 drivers/crypto/qat/qat_common/icp_qat_hw.h
create mode 100644 drivers/crypto/qat/qat_common/icp_qat_uclo.h
create mode 100644 drivers/crypto/qat/qat_common/qat_algs.c
create mode 100644 drivers/crypto/qat/qat_common/qat_crypto.c
create mode 100644 drivers/crypto/qat/qat_common/qat_crypto.h
create mode 100644 drivers/crypto/qat/qat_common/qat_hal.c
create mode 100644 drivers/crypto/qat/qat_common/qat_uclo.c
create mode 100644 drivers/crypto/qat/qat_dh895xcc/Makefile
create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_admin.c
create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_drv.c
create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_drv.h
create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_hw_arbiter.c
create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_isr.c
create mode 100644 drivers/crypto/qat/qat_dh895xcc/qat_admin.c
create mode 100644 include/crypto/drbg.h
Merging drm/drm-next (bc1dfff04a5d Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next)
$ git merge drm/drm-next
Already up-to-date.
Merging drm-panel/drm/panel/for-next (7e40b5162b3c drm/panel: make DRM_PANEL_LD9040 depend on SPI)
$ git merge drm-panel/drm/panel/for-next
Merge made by the 'recursive' strategy.
drivers/gpu/drm/panel/Kconfig | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
Merging drm-intel/for-linux-next (1267a26b22be drm/i915: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN)
$ git merge drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/intel_uncore.c
Auto-merging drivers/gpu/drm/i915/intel_sprite.c
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_irq.c
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_dma.c
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
Merge made by the 'recursive' strategy.
drivers/gpu/drm/drm_crtc.c | 357 +++++++---
drivers/gpu/drm/i915/i915_cmd_parser.c | 3 +
drivers/gpu/drm/i915/i915_debugfs.c | 52 +-
drivers/gpu/drm/i915/i915_dma.c | 34 +-
drivers/gpu/drm/i915/i915_drv.c | 41 +-
drivers/gpu/drm/i915/i915_drv.h | 76 ++-
drivers/gpu/drm/i915/i915_gem.c | 97 ++-
drivers/gpu/drm/i915/i915_gem_context.c | 3 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 8 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 54 +-
drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +-
drivers/gpu/drm/i915/i915_gem_render_state.c | 161 ++---
drivers/gpu/drm/i915/i915_gem_stolen.c | 21 +-
drivers/gpu/drm/i915/i915_irq.c | 213 +++---
drivers/gpu/drm/i915/i915_params.c | 5 +
drivers/gpu/drm/i915/i915_reg.h | 442 ++++++++-----
drivers/gpu/drm/i915/intel_ddi.c | 4 +-
drivers/gpu/drm/i915/intel_display.c | 915 +++++++++++++++++++++++---
drivers/gpu/drm/i915/intel_dp.c | 249 ++++---
drivers/gpu/drm/i915/intel_drv.h | 45 +-
drivers/gpu/drm/i915/intel_dsi.c | 26 +-
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 8 +-
drivers/gpu/drm/i915/intel_dvo.c | 8 +
drivers/gpu/drm/i915/intel_fbdev.c | 32 +-
drivers/gpu/drm/i915/intel_hdmi.c | 65 ++
drivers/gpu/drm/i915/intel_overlay.c | 13 +-
drivers/gpu/drm/i915/intel_pm.c | 386 ++++++++---
drivers/gpu/drm/i915/intel_renderstate.h | 2 -
drivers/gpu/drm/i915/intel_renderstate_gen6.c | 1 +
drivers/gpu/drm/i915/intel_renderstate_gen7.c | 1 +
drivers/gpu/drm/i915/intel_renderstate_gen8.c | 1 +
drivers/gpu/drm/i915/intel_ringbuffer.c | 12 +-
drivers/gpu/drm/i915/intel_sprite.c | 9 +
drivers/gpu/drm/i915/intel_uncore.c | 180 +++--
include/drm/drm_crtc.h | 6 +-
35 files changed, 2598 insertions(+), 937 deletions(-)
Merging drm-tegra/drm/tegra/for-next (1f64ae7c5af0 drm/tegra: sor - Remove obsolete comment)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging sound/for-next (d5471e67229a ALSA: hda: Remove unused variable)
$ git merge sound/for-next
Auto-merging sound/pci/hda/patch_realtek.c
Merge made by the 'recursive' strategy.
sound/aoa/soundbus/i2sbus/core.c | 12 +-
sound/core/seq/seq_memory.c | 4 +-
sound/oss/mpu401.c | 2 +-
sound/pci/echoaudio/echoaudio.c | 6 -
sound/pci/hda/hda_auto_parser.c | 2 -
sound/pci/hda/hda_codec.c | 44 +-
sound/pci/hda/hda_codec.h | 3 +-
sound/pci/hda/hda_controller.c | 203 +--
sound/pci/hda/hda_controller.h | 9 +-
sound/pci/hda/hda_eld.c | 46 +-
sound/pci/hda/hda_generic.c | 2 +-
sound/pci/hda/hda_intel.c | 321 ++++-
sound/pci/hda/hda_local.h | 7 +-
sound/pci/hda/hda_priv.h | 253 ++--
sound/pci/hda/hda_tegra.c | 36 +-
sound/pci/hda/patch_ca0132.c | 6 +-
sound/pci/hda/patch_cmedia.c | 624 +--------
sound/pci/hda/patch_conexant.c | 2715 +-----------------------------------
sound/pci/hda/patch_hdmi.c | 11 +-
sound/pci/hda/patch_realtek.c | 114 ++
sound/pci/hda/patch_sigmatel.c | 2 +-
sound/pci/mixart/mixart_core.c | 4 +-
sound/pci/trident/trident_main.c | 2 -
sound/pci/trident/trident_memory.c | 3 +-
sound/sparc/dbri.c | 6 +-
25 files changed, 676 insertions(+), 3761 deletions(-)
Merging sound-asoc/for-next (e5a278d60514 Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/wm0010', 'asoc/topic/wm8904' and 'asoc/topic/wm8985' into asoc-next)
$ git merge sound-asoc/for-next
Removing sound/soc/samsung/dma.c
Auto-merging sound/soc/samsung/Kconfig
Auto-merging arch/arm/mach-shmobile/board-mackerel.c
Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/sound/ak5386.txt | 4 +
Documentation/devicetree/bindings/sound/cs4265.txt | 29 +
.../devicetree/bindings/sound/max98090.txt | 2 +-
.../devicetree/bindings/sound/renesas,rsnd.txt | 9 +
Documentation/devicetree/bindings/sound/snow.txt | 1 +
Documentation/devicetree/bindings/sound/wm8904.txt | 33 +
arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +
arch/arm/mach-shmobile/board-kzm9g.c | 2 +
arch/arm/mach-shmobile/board-mackerel.c | 4 +
arch/sh/boards/mach-ecovec24/setup.c | 2 +
arch/x86/include/asm/platform_sst_audio.h | 78 +
drivers/misc/atmel-ssc.c | 13 +
include/linux/atmel-ssc.h | 13 +
include/linux/mfd/arizona/core.h | 6 +
include/sound/rcar_snd.h | 1 +
include/sound/rt5670.h | 27 +
include/sound/soc-dai.h | 1 -
include/sound/soc-dapm.h | 8 +-
include/sound/soc.h | 49 +-
include/trace/events/asoc.h | 6 +-
sound/arm/pxa2xx-ac97-lib.c | 12 +-
sound/soc/atmel/atmel_ssc_dai.c | 34 +-
sound/soc/atmel/atmel_wm8904.c | 50 -
sound/soc/codecs/Kconfig | 14 +
sound/soc/codecs/Makefile | 4 +
sound/soc/codecs/ak5386.c | 50 +
sound/soc/codecs/arizona.c | 137 +-
sound/soc/codecs/arizona.h | 1 +
sound/soc/codecs/cs4265.c | 682 +++++
sound/soc/codecs/cs4265.h | 64 +
sound/soc/codecs/cs4270.c | 4 +-
sound/soc/codecs/cs42l73.c | 4 +-
sound/soc/codecs/cs42xx8.c | 2 +-
sound/soc/codecs/max98090.c | 17 +-
sound/soc/codecs/mc13783.c | 6 +-
sound/soc/codecs/rl6231.c | 19 -
sound/soc/codecs/rt5640.c | 10 +-
sound/soc/codecs/rt5645.c | 10 +-
sound/soc/codecs/rt5670-dsp.h | 54 +
sound/soc/codecs/rt5670.c | 2692 ++++++++++++++++++++
sound/soc/codecs/rt5670.h | 2000 +++++++++++++++
sound/soc/codecs/rt5677.c | 270 +-
sound/soc/codecs/rt5677.h | 8 -
sound/soc/codecs/sgtl5000.c | 4 +-
sound/soc/codecs/spdif_transmitter.c | 2 +-
sound/soc/codecs/sta529.c | 4 +-
sound/soc/codecs/tlv320aic31xx.c | 23 +-
sound/soc/codecs/tlv320aic32x4.c | 21 +-
sound/soc/codecs/tlv320aic3x.c | 12 +-
sound/soc/codecs/tlv320dac33.c | 2 +-
sound/soc/codecs/tpa6130a2.c | 4 +-
sound/soc/codecs/twl4030.c | 4 +-
sound/soc/codecs/wl1273.c | 4 +-
sound/soc/codecs/wm0010.c | 14 +-
sound/soc/codecs/wm1250-ev1.c | 1 -
sound/soc/codecs/wm2000.c | 4 +-
sound/soc/codecs/wm5100.c | 3 +-
sound/soc/codecs/wm5102.c | 62 +
sound/soc/codecs/wm5110.c | 1 +
sound/soc/codecs/wm8903.c | 3 +-
sound/soc/codecs/wm8904.c | 17 +-
sound/soc/codecs/wm8958-dsp2.c | 24 +-
sound/soc/codecs/wm8985.c | 3 -
sound/soc/codecs/wm8994.c | 15 +-
sound/soc/codecs/wm8996.c | 3 +-
sound/soc/codecs/wm9090.c | 4 +-
sound/soc/codecs/wm_hubs.c | 4 +-
sound/soc/davinci/Kconfig | 1 +
sound/soc/davinci/davinci-mcasp.c | 75 +-
sound/soc/fsl/Kconfig | 6 +-
sound/soc/fsl/fsl_spdif.c | 86 +-
sound/soc/fsl/fsl_spdif.h | 10 +-
sound/soc/fsl/fsl_ssi.c | 4 +-
sound/soc/generic/simple-card.c | 13 +-
sound/soc/intel/byt-max98090.c | 27 +-
sound/soc/intel/byt-rt5640.c | 1 +
sound/soc/intel/sst-atom-controls.h | 30 +
sound/soc/intel/sst-baytrail-ipc.c | 30 +
sound/soc/intel/sst-mfld-dsp.h | 414 ++-
sound/soc/intel/sst-mfld-platform-compress.c | 11 +-
sound/soc/intel/sst-mfld-platform-pcm.c | 313 ++-
sound/soc/intel/sst-mfld-platform.h | 24 +-
sound/soc/kirkwood/kirkwood-dma.c | 11 +-
sound/soc/kirkwood/kirkwood-i2s.c | 33 +-
sound/soc/kirkwood/kirkwood.h | 7 +-
sound/soc/omap/omap-pcm.c | 1 +
sound/soc/samsung/Kconfig | 14 +-
sound/soc/samsung/Makefile | 2 -
sound/soc/samsung/dma.c | 454 ----
sound/soc/samsung/dmaengine.c | 3 +
sound/soc/samsung/idma.c | 3 +-
sound/soc/samsung/s3c-i2s-v2.c | 17 +-
sound/soc/samsung/s3c2412-i2s.c | 51 +-
sound/soc/samsung/s3c24xx-i2s.c | 62 +-
sound/soc/samsung/snow.c | 1 +
sound/soc/sh/fsi.c | 201 +-
sound/soc/sh/rcar/core.c | 160 +-
sound/soc/sh/rcar/dvc.c | 50 +-
sound/soc/sh/rcar/gen.c | 110 +-
sound/soc/sh/rcar/rsnd.h | 24 +-
sound/soc/sh/rcar/src.c | 37 +-
sound/soc/sh/rcar/ssi.c | 33 +-
sound/soc/soc-cache.c | 7 +-
sound/soc/soc-compress.c | 8 +-
sound/soc/soc-core.c | 531 ++--
sound/soc/soc-dapm.c | 183 +-
sound/soc/soc-pcm.c | 5 +-
107 files changed, 7854 insertions(+), 1873 deletions(-)
create mode 100644 Documentation/devicetree/bindings/sound/cs4265.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8904.txt
create mode 100644 arch/x86/include/asm/platform_sst_audio.h
create mode 100644 include/sound/rt5670.h
create mode 100644 sound/soc/codecs/cs4265.c
create mode 100644 sound/soc/codecs/cs4265.h
create mode 100644 sound/soc/codecs/rt5670-dsp.h
create mode 100644 sound/soc/codecs/rt5670.c
create mode 100644 sound/soc/codecs/rt5670.h
create mode 100644 sound/soc/intel/sst-atom-controls.h
delete mode 100644 sound/soc/samsung/dma.c
Merging modules/modules-next (4982223e51e8 module: set nx before marking module MODULE_STATE_COMING.)
$ git merge modules/modules-next
Already up-to-date.
Merging virtio/virtio-next (c77fba9ab058 virtio_scsi: don't call virtqueue_add_sgs(... GFP_NOIO) holding spinlock.)
$ git merge virtio/virtio-next
Already up-to-date.
Merging input/next (68807a0c2015 Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version)
$ git merge input/next
Already up-to-date.
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
$ git merge input-mt/for-next
Already up-to-date.
Merging block/for-next (49b3f10e2cf5 Merge branch 'for-3.17/core' into for-next)
$ git merge block/for-next
Merge made by the 'recursive' strategy.
arch/x86/include/asm/percpu.h | 3 +-
block/bio-integrity.c | 12 +-
block/bio.c | 52 +--
block/blk-core.c | 13 +-
block/blk-mq.c | 81 ++---
block/blk-mq.h | 2 +-
block/blk-sysfs.c | 2 +-
block/compat_ioctl.c | 6 +-
block/ioctl.c | 5 +-
block/partitions/aix.c | 2 +-
block/partitions/amiga.c | 12 +-
block/partitions/efi.c | 46 +--
block/partitions/msdos.c | 13 +-
block/scsi_ioctl.c | 20 +-
drivers/block/virtio_blk.c | 104 ++++--
drivers/target/target_core_tpg.c | 4 +-
fs/aio.c | 6 +-
include/asm-generic/percpu.h | 410 ++++++++++++++++++++----
include/linux/bio.h | 1 +
include/linux/blkdev.h | 4 +-
include/linux/percpu-defs.h | 380 +++++++++++++++++++++-
include/linux/percpu-refcount.h | 64 ++--
include/linux/percpu.h | 673 ---------------------------------------
include/scsi/sg.h | 3 +
include/uapi/linux/bsg.h | 11 +-
include/uapi/linux/virtio_blk.h | 5 +
kernel/cgroup.c | 8 +-
kernel/workqueue.c | 19 +-
lib/percpu-refcount.c | 86 +++--
mm/percpu.c | 3 +-
30 files changed, 1070 insertions(+), 980 deletions(-)
Merging device-mapper/for-next (cbc228137bbf dm crypt: sort writes)
$ git merge device-mapper/for-next
Auto-merging block/bio.c
Merge made by the 'recursive' strategy.
block/bio.c | 3 +-
drivers/md/dm-cache-target.c | 124 ++++++++-----
drivers/md/dm-crypt.c | 405 ++++++++++++++++++++++---------------------
drivers/md/dm-io.c | 85 ++++-----
drivers/md/dm-thin.c | 179 +++++++++++++------
drivers/md/dm-zero.c | 4 +-
drivers/md/dm.c | 13 +-
7 files changed, 474 insertions(+), 339 deletions(-)
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
$ git merge embedded/master
Already up-to-date.
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
$ git merge firmware/master
Already up-to-date.
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
$ git merge pcmcia/master
Already up-to-date.
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
$ git merge mmc/mmc-next
Already up-to-date.
Merging mmc-uh/next (9f98586a0b9d mmc: sdhci: avoid double-delay while transitioning to 1.8V)
$ git merge mmc-uh/next
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/mmc/mmc.txt | 4 +-
.../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 54 ++++
drivers/mmc/core/bus.c | 10 +-
drivers/mmc/core/quirks.c | 2 +-
drivers/mmc/core/sd_ops.c | 3 +
drivers/mmc/host/mmci.c | 127 ++++++++-
drivers/mmc/host/mmci.h | 20 ++
drivers/mmc/host/moxart-mmc.c | 1 -
drivers/mmc/host/omap_hsmmc.c | 283 +++++++++++++++++++--
drivers/mmc/host/sdhci-pci.c | 12 +
drivers/mmc/host/sdhci-pci.h | 1 +
drivers/mmc/host/sdhci.c | 118 ++++-----
drivers/mmc/host/sh_mmcif.c | 83 ++----
drivers/mmc/host/wmt-sdmmc.c | 33 ++-
include/linux/mmc/sdhci.h | 3 -
include/linux/platform_data/mmc-omap.h | 1 +
16 files changed, 561 insertions(+), 194 deletions(-)
Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
Merging slab/for-next (201ed0edb712 Merge branch 'slab/next' into for-next)
$ git merge slab/for-next
Auto-merging mm/slub.c
Auto-merging mm/slab_common.c
Merge made by the 'recursive' strategy.
mm/slab_common.c | 2 +-
mm/slub.c | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
$ git merge uclinux/for-next
Already up-to-date.
Merging md/for-next (053f5b6525ae raid5: speedup sync_request processing)
$ git merge md/for-next
Already up-to-date.
Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
$ git merge mfd/master
Already up-to-date.
Merging mfd-lj/for-mfd-next (9e1d700c407e mfd: ab8500-core: Resolve code style issues)
$ git merge mfd-lj/for-mfd-next
Auto-merging include/linux/mfd/arizona/core.h
Removing drivers/mfd/max77693-irq.c
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/mfd/s2mps11.txt | 11 +-
.../bindings/regulator/s5m8767-regulator.txt | 2 +-
drivers/extcon/extcon-max77693.c | 35 +-
drivers/gpio/Kconfig | 13 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-crystalcove.c | 380 +++++++++++++++++++++
drivers/i2c/busses/i2c-cros-ec-tunnel.c | 17 +-
drivers/input/keyboard/cros_ec_keyb.c | 70 ++--
drivers/mfd/88pm805.c | 2 +-
drivers/mfd/88pm860x-core.c | 37 +-
drivers/mfd/88pm860x-i2c.c | 3 +-
drivers/mfd/Kconfig | 19 +-
drivers/mfd/Makefile | 5 +-
drivers/mfd/aat2870-core.c | 5 +-
drivers/mfd/ab3100-core.c | 54 ++-
drivers/mfd/ab8500-core.c | 49 +--
drivers/mfd/ab8500-debugfs.c | 20 +-
drivers/mfd/arizona-core.c | 28 +-
drivers/mfd/arizona-i2c.c | 5 +-
drivers/mfd/arizona-spi.c | 3 +-
drivers/mfd/arizona.h | 4 +-
drivers/mfd/asic3.c | 12 +-
drivers/mfd/cros_ec.c | 97 ++----
drivers/mfd/cros_ec_i2c.c | 37 +-
drivers/mfd/cros_ec_spi.c | 56 ++-
drivers/mfd/intel_soc_pmic_core.c | 170 +++++++++
drivers/mfd/intel_soc_pmic_core.h | 32 ++
drivers/mfd/intel_soc_pmic_crc.c | 158 +++++++++
drivers/mfd/max77693-irq.c | 336 ------------------
drivers/mfd/max77693.c | 210 ++++++++----
drivers/mfd/mc13xxx-core.c | 310 +++--------------
drivers/mfd/mc13xxx.h | 11 +-
drivers/mfd/pcf50633-core.c | 18 +-
drivers/mfd/pm8921-core.c | 4 -
drivers/mfd/sec-core.c | 81 ++++-
drivers/mfd/sec-irq.c | 110 +++++-
drivers/mfd/stmpe-i2c.c | 4 +-
drivers/mfd/stmpe.c | 2 +-
drivers/mfd/stmpe.h | 2 +-
drivers/mfd/tc3589x.c | 2 +-
drivers/mfd/tps65910.c | 10 +-
drivers/mfd/wm8994-regmap.c | 64 ++++
drivers/regulator/max77693.c | 12 +-
drivers/regulator/s2mps11.c | 321 +++++++++++++++--
include/dt-bindings/mfd/as3722.h | 2 +-
include/linux/mfd/arizona/core.h | 2 +-
include/linux/mfd/cros_ec.h | 110 +++---
include/linux/mfd/intel_soc_pmic.h | 30 ++
include/linux/mfd/max77693-private.h | 54 ++-
include/linux/mfd/mc13783.h | 1 -
include/linux/mfd/mc13xxx.h | 23 +-
include/linux/mfd/samsung/core.h | 1 +
include/linux/mfd/samsung/irq.h | 24 ++
include/linux/mfd/samsung/s2mpu02.h | 201 +++++++++++
include/linux/mfd/tps65910.h | 2 +-
55 files changed, 2170 insertions(+), 1102 deletions(-)
create mode 100644 drivers/gpio/gpio-crystalcove.c
create mode 100644 drivers/mfd/intel_soc_pmic_core.c
create mode 100644 drivers/mfd/intel_soc_pmic_core.h
create mode 100644 drivers/mfd/intel_soc_pmic_crc.c
delete mode 100644 drivers/mfd/max77693-irq.c
create mode 100644 include/linux/mfd/intel_soc_pmic.h
create mode 100644 include/linux/mfd/samsung/s2mpu02.h
Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data)
$ git merge battery/master
Already up-to-date.
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
$ git merge fbdev/for-next
Already up-to-date.
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
$ git merge viafb/viafb-next
Already up-to-date.
Merging omap_dss2/for-next (8a61f0135c69 MAINTAINERS: Update Framebuffer file patterns)
$ git merge omap_dss2/for-next
Auto-merging drivers/video/fbdev/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../bindings/video/cirrus,clps711x-fb.txt | 47 +++
MAINTAINERS | 74 ++--
drivers/video/fbdev/68328fb.c | 8 +-
drivers/video/fbdev/Kconfig | 21 +-
drivers/video/fbdev/Makefile | 3 +-
drivers/video/fbdev/clps711x-fb.c | 397 +++++++++++++++++++++
drivers/video/fbdev/da8xx-fb.c | 9 +-
drivers/video/fbdev/mbx/mbxfb.c | 4 +-
drivers/video/fbdev/msm/mddi_client_dummy.c | 19 +-
drivers/video/fbdev/s3c2410fb.c | 10 +-
drivers/video/fbdev/sis/init.c | 2 +-
drivers/video/fbdev/sis/sis_main.c | 4 -
include/linux/fb.h | 2 +-
13 files changed, 515 insertions(+), 85 deletions(-)
create mode 100644 Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt
create mode 100644 drivers/video/fbdev/clps711x-fb.c
Merging regulator/for-next (a8fc1cdccbaa Merge remote-tracking branches 'regulator/topic/tps6586x' and 'regulator/topic/twl' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/mfd/palmas.txt | 2 +
.../devicetree/bindings/regulator/palmas-pmic.txt | 1 +
drivers/mfd/palmas.c | 233 +++--
drivers/regulator/88pm800.c | 1 -
drivers/regulator/ab8500.c | 38 +-
drivers/regulator/act8865-regulator.c | 38 +-
drivers/regulator/as3722-regulator.c | 4 +-
drivers/regulator/bcm590xx-regulator.c | 16 +-
drivers/regulator/core.c | 30 +-
drivers/regulator/ltc3589.c | 2 +-
drivers/regulator/max8952.c | 34 +-
drivers/regulator/mc13xxx-regulator-core.c | 37 +-
drivers/regulator/mc13xxx.h | 1 -
drivers/regulator/palmas-regulator.c | 1008 +++++++++++++++-----
drivers/regulator/s5m8767.c | 4 +-
drivers/regulator/tps65217-regulator.c | 4 +-
drivers/regulator/tps65218-regulator.c | 4 +-
drivers/regulator/tps6586x-regulator.c | 129 +--
drivers/regulator/twl-regulator.c | 13 +-
include/linux/mfd/palmas.h | 837 ++++++++++++++++
include/linux/regulator/ab8500.h | 14 -
21 files changed, 1923 insertions(+), 527 deletions(-)
Merging security/next (f01387d26938 Merge commit 'v3.15' into next)
$ git merge security/next
Merge made by the 'recursive' strategy.
Merging integrity/next (0430e49b6e7c ima: introduce ima_kernel_read())
$ git merge integrity/next
Already up-to-date.
Merging selinux/next (f31e79945965 selinux: no recursive read_lock of policy_rwlock in security_genfs_sid())
$ git merge selinux/next
Merge made by the 'recursive' strategy.
scripts/selinux/genheaders/Makefile | 1 -
scripts/selinux/mdp/Makefile | 2 +-
security/selinux/include/security.h | 3 +-
security/selinux/ss/conditional.c | 11 +--
security/selinux/ss/policydb.c | 141 +++++++++++-------------------------
security/selinux/ss/services.c | 41 ++++++++---
6 files changed, 79 insertions(+), 120 deletions(-)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
$ git merge lblnet/next
Already up-to-date.
Merging watchdog/master (7171511eaec5 Linux 3.16-rc1)
$ git merge watchdog/master
Already up-to-date.
Merging iommu/next (d73a6d722a67 iommu/amd: Fix small race between invalidate_range_end/start)
$ git merge iommu/next
Already up-to-date.
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging vfio/next (fd49c81f080a drivers/vfio/pci: Fix wrong MSI interrupt count)
$ git merge vfio/next
Already up-to-date.
Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6)
$ git merge osd/linux-next
Already up-to-date.
Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
$ git merge jc_docs/docs-next
Already up-to-date.
Merging trivial/for-next (d31e373d0778 irq-gic: remove file name from heading comment)
$ git merge trivial/for-next
Resolved 'arch/arm/mach-msm/Kconfig' using previous resolution.
Auto-merging fs/befs/linuxvfs.c
Auto-merging drivers/usb/phy/phy.c
Auto-merging drivers/irqchip/irq-gic.c
Auto-merging drivers/cpuidle/governors/menu.c
Auto-merging arch/sh/boards/Kconfig
Auto-merging arch/arm/mach-msm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-msm/Kconfig
Auto-merging Documentation/SubmittingPatches
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7aacc4f33322] Merge remote-tracking branch 'trivial/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/PCI/MSI-HOWTO.txt | 2 +-
Documentation/RCU/RTFP.txt | 4 ++--
Documentation/SubmittingDrivers | 4 ----
Documentation/SubmittingPatches | 4 ++--
Documentation/laptops/hpfall.c | 1 +
Documentation/scsi/ncr53c8xx.txt | 2 +-
Documentation/security/LSM.txt | 2 +-
Documentation/usb/hotplug.txt | 8 ++++----
Documentation/zh_CN/SubmittingDrivers | 4 ----
arch/arm/mach-msm/Kconfig | 3 ---
arch/hexagon/include/asm/cache.h | 2 +-
arch/sh/boards/Kconfig | 2 +-
crypto/asymmetric_keys/Kconfig | 1 -
drivers/cpuidle/governors/menu.c | 2 +-
drivers/gpu/drm/gma500/mid_bios.c | 1 -
drivers/irqchip/irq-gic.c | 2 --
drivers/media/radio/radio-mr800.c | 2 +-
drivers/mfd/intel_msic.c | 2 +-
drivers/scsi/mvsas/mv_sas.c | 24 ++++++++++++++----------
drivers/usb/phy/phy.c | 2 +-
fs/befs/linuxvfs.c | 2 --
scripts/Makefile.modinst | 2 +-
22 files changed, 33 insertions(+), 45 deletions(-)
Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface)
$ git merge audit/master
Resolved 'arch/mips/include/asm/syscall.h' using previous resolution.
Resolved 'arch/mips/kernel/ptrace.c' using previous resolution.
Resolved 'arch/x86/Kconfig' using previous resolution.
Resolved 'kernel/audit.c' using previous resolution.
Auto-merging kernel/auditsc.c
Auto-merging kernel/audit.c
CONFLICT (content): Merge conflict in kernel/audit.c
Auto-merging include/uapi/linux/audit.h
Auto-merging arch/x86/kernel/ptrace.c
Auto-merging arch/x86/kernel/entry_64.S
Auto-merging arch/x86/kernel/entry_32.S
Auto-merging arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Auto-merging arch/um/kernel/ptrace.c
Auto-merging arch/s390/kernel/ptrace.c
Auto-merging arch/mips/kernel/ptrace.c
CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
Auto-merging arch/mips/include/asm/syscall.h
CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h
Auto-merging arch/arm/kernel/ptrace.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master dc498fd43b5a] Merge remote-tracking branch 'audit/master'
$ git diff -M --stat --summary HEAD^..
arch/alpha/include/asm/syscall.h | 11 +++++++++++
arch/alpha/kernel/ptrace.c | 2 +-
arch/arm/kernel/ptrace.c | 4 ++--
arch/ia64/include/asm/syscall.h | 6 ++++++
arch/ia64/kernel/ptrace.c | 2 +-
arch/microblaze/include/asm/syscall.h | 5 +++++
arch/microblaze/kernel/ptrace.c | 3 +--
arch/mips/include/asm/syscall.h | 2 +-
arch/mips/kernel/ptrace.c | 4 +---
arch/openrisc/include/asm/syscall.h | 5 +++++
arch/openrisc/kernel/ptrace.c | 3 +--
arch/parisc/include/asm/syscall.h | 11 +++++++++++
arch/parisc/kernel/ptrace.c | 9 +++------
arch/powerpc/include/asm/syscall.h | 6 ++++++
arch/powerpc/kernel/ptrace.c | 7 ++-----
arch/s390/kernel/ptrace.c | 4 +---
arch/sh/include/asm/syscall_32.h | 10 ++++++++++
arch/sh/include/asm/syscall_64.h | 14 ++++++++++++++
arch/sh/kernel/ptrace_32.c | 14 +-------------
arch/sh/kernel/ptrace_64.c | 17 +----------------
arch/sparc/include/asm/syscall.h | 7 +++++++
arch/sparc/include/asm/thread_info_32.h | 2 ++
arch/sparc/include/asm/thread_info_64.h | 2 ++
arch/sparc/kernel/ptrace_64.c | 9 ++-------
arch/um/kernel/ptrace.c | 3 +--
arch/x86/ia32/ia32entry.S | 12 ++++++------
arch/x86/kernel/entry_32.S | 11 +++++------
arch/x86/kernel/entry_64.S | 11 +++++------
arch/x86/kernel/ptrace.c | 8 ++------
arch/x86/um/asm/ptrace.h | 4 ----
arch/x86/um/asm/syscall.h | 15 +++++++++++++++
arch/xtensa/kernel/ptrace.c | 2 +-
include/asm-generic/syscall.h | 2 +-
include/linux/audit.h | 11 ++++++-----
include/uapi/linux/audit.h | 14 +-------------
kernel/auditsc.c | 17 +++++++----------
36 files changed, 147 insertions(+), 122 deletions(-)
create mode 100644 arch/alpha/include/asm/syscall.h
create mode 100644 arch/x86/um/asm/syscall.h
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
$ git merge fsnotify/for-next
Already up-to-date.
Merging devicetree/devicetree/next (c9e0fb3bb3aa tty: Update hypervisor tty drivers to use core stdout parsing code.)
$ git merge devicetree/devicetree/next
Auto-merging drivers/of/base.c
Merge made by the 'recursive' strategy.
arch/arm/boot/dts/versatile-ab.dts | 4 ++++
drivers/of/base.c | 28 +++++++++++++++----------
drivers/tty/ehv_bytechan.c | 43 ++++----------------------------------
drivers/tty/hvc/hvc_opal.c | 15 +++----------
drivers/tty/hvc/hvc_vio.c | 29 +++++++++----------------
drivers/tty/serial/serial_core.c | 3 +++
include/linux/of.h | 7 ++++---
7 files changed, 45 insertions(+), 84 deletions(-)
Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root)
$ git merge dt-rh/for-next
Already up-to-date.
Merging spi/for-next (9739c0b06cd9 Merge remote-tracking branches 'spi/topic/omap-uwire', 'spi/topic/orion', 'spi/topic/qup' and 'spi/topic/rspi' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/spi/qcom,spi-qup.txt | 6 +-
drivers/spi/spi-adi-v3.c | 5 +-
drivers/spi/spi-cadence.c | 2 +-
drivers/spi/spi-clps711x.c | 2 -
drivers/spi/spi-falcon.c | 2 -
drivers/spi/spi-fsl-lib.c | 2 +-
drivers/spi/spi-fsl-spi.c | 2 +-
drivers/spi/spi-omap-100k.c | 2 -
drivers/spi/spi-omap-uwire.c | 11 +-
drivers/spi/spi-orion.c | 65 ++-
drivers/spi/spi-qup.c | 36 +-
drivers/spi/spi-rspi.c | 15 +-
drivers/spi/spi-sh-hspi.c | 2 +-
drivers/spi/spi-sh-msiof.c | 514 +++++++++++++++++++--
drivers/spi/spi.c | 2 -
include/linux/spi/sh_msiof.h | 2 +
16 files changed, 565 insertions(+), 105 deletions(-)
Merging tip/auto-latest (35299db412b6 Merge branch 'x86/xsave')
$ git merge tip/auto-latest
Auto-merging kernel/smp.c
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
Documentation/kernel-parameters.txt | 15 ++
arch/arc/kernel/perf_event.c | 7 +-
arch/blackfin/kernel/perf_event.c | 15 +-
arch/metag/kernel/perf/perf_event.c | 19 +-
arch/s390/kernel/perf_cpum_cf.c | 12 +-
arch/sh/kernel/perf_event.c | 15 +-
arch/x86/Makefile | 9 +-
arch/x86/boot/code16gcc.h | 24 +--
arch/x86/include/asm/alternative.h | 14 ++
arch/x86/include/asm/apic.h | 2 +-
arch/x86/include/asm/barrier.h | 2 +-
arch/x86/include/asm/cpufeature.h | 395 +++++++++++++++++-----------------
arch/x86/include/asm/fpu-internal.h | 11 +-
arch/x86/include/asm/mwait.h | 2 +-
arch/x86/include/asm/processor.h | 4 +-
arch/x86/include/asm/qrwlock.h | 2 +-
arch/x86/include/asm/uv/uv_bau.h | 19 +-
arch/x86/include/asm/xsave.h | 223 ++++++++++++++-----
arch/x86/include/uapi/asm/msr-index.h | 2 +
arch/x86/kernel/cpu/amd.c | 2 +-
arch/x86/kernel/cpu/common.c | 17 ++
arch/x86/kernel/cpu/intel.c | 4 +-
arch/x86/kernel/cpu/scattered.c | 1 -
arch/x86/kernel/i387.c | 2 +-
arch/x86/kernel/process.c | 1 +
arch/x86/kernel/xsave.c | 118 +++++++++-
arch/x86/mm/fault.c | 6 +
arch/x86/platform/uv/tlb_uv.c | 69 +++---
include/linux/irq_work.h | 5 +
include/linux/seqlock.h | 2 -
include/linux/tick.h | 9 +-
kernel/irq_work.c | 76 ++++---
kernel/sched/core.c | 22 +-
kernel/sched/fair.c | 26 +--
kernel/sched/sched.h | 12 +-
kernel/smp.c | 9 +
kernel/time/tick-sched.c | 10 +-
37 files changed, 755 insertions(+), 428 deletions(-)
Merging clockevents/clockevents/next (2529c3a33079 clocksource: Add Freescale FlexTimer Module (FTM) timer support)
$ git merge clockevents/clockevents/next
Already up-to-date.
Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems)
$ git merge edac/linux_next
Merge made by the 'recursive' strategy.
drivers/edac/Kconfig | 4 +-
drivers/edac/edac_mc_sysfs.c | 4 +-
drivers/edac/sb_edac.c | 810 +++++++++++++++++++++++++++++--------------
include/linux/edac.h | 5 +
4 files changed, 551 insertions(+), 272 deletions(-)
Merging edac-amd/for-next (6866b390562b EDAC, edac_module.c: Remove unnecessary test on unsigned value)
$ git merge edac-amd/for-next
Merge made by the 'recursive' strategy.
drivers/edac/edac_module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging irqchip/irqchip/for-next (885d078bfe92 Merge branch 'irqchip/crossbar' into irqchip/core)
$ git merge irqchip/irqchip/for-next
Removing include/linux/irqchip/spear-shirq.h
Auto-merging drivers/irqchip/Kconfig
Merge made by the 'recursive' strategy.
.../devicetree/bindings/arm/omap/crossbar.txt | 36 +++
.../interrupt-controller/opencores,or1k-pic.txt | 23 ++
arch/openrisc/Kconfig | 1 +
arch/openrisc/include/asm/irq.h | 3 +
arch/openrisc/kernel/irq.c | 146 +---------
drivers/irqchip/Kconfig | 4 +
drivers/irqchip/Makefile | 1 +
drivers/irqchip/irq-armada-370-xp.c | 17 +-
drivers/irqchip/irq-brcmstb-l2.c | 2 +-
drivers/irqchip/irq-crossbar.c | 168 ++++++++++--
drivers/irqchip/irq-nvic.c | 13 +-
drivers/irqchip/irq-or1k-pic.c | 182 ++++++++++++
drivers/irqchip/spear-shirq.c | 304 ++++++++++-----------
include/linux/irqchip/spear-shirq.h | 64 -----
14 files changed, 563 insertions(+), 401 deletions(-)
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/opencores,or1k-pic.txt
create mode 100644 drivers/irqchip/irq-or1k-pic.c
delete mode 100644 include/linux/irqchip/spear-shirq.h
Merging ftrace/for-next (fb6bab6a5ad4 tracing/uprobes: Fix the usage of uprobe_buffer_enable() in probe_event_enable())
$ git merge ftrace/for-next
Merge made by the 'recursive' strategy.
kernel/events/uprobes.c | 6 +++---
kernel/trace/trace_uprobe.c | 46 ++++++++++++++++++++++++++-------------------
2 files changed, 30 insertions(+), 22 deletions(-)
Merging rcu/rcu/next (cd4775e7e74c rcu: Change rcu_dereference_check(c) to check "c" first)
$ git merge rcu/rcu/next
Auto-merging kernel/time/tick-sched.c
Auto-merging kernel/sched/core.c
Auto-merging init/Kconfig
Auto-merging include/linux/tick.h
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
Documentation/RCU/rcuref.txt | 9 +
Documentation/kernel-parameters.txt | 6 +
Documentation/memory-barriers.txt | 25 ++-
MAINTAINERS | 14 +-
include/linux/init_task.h | 9 +-
include/linux/rcupdate.h | 157 ++++++++-------
include/linux/sched.h | 6 -
include/linux/srcu.h | 6 +-
include/linux/tick.h | 19 ++
init/Kconfig | 2 +-
kernel/rcu/rcu.h | 14 +-
kernel/rcu/srcu.c | 4 +-
kernel/rcu/tree.c | 224 +++++++++++++++------
kernel/rcu/tree.h | 14 +-
kernel/rcu/tree_plugin.h | 67 ++++--
kernel/rcu/update.c | 78 ++++---
kernel/sched/core.c | 7 +-
kernel/signal.c | 4 +
kernel/time/tick-sched.c | 10 +
kernel/torture.c | 2 +-
.../selftests/rcutorture/bin/kvm-recheck.sh | 8 +-
.../selftests/rcutorture/bin/kvm-test-1-run.sh | 9 +-
tools/testing/selftests/rcutorture/bin/kvm.sh | 21 +-
.../selftests/rcutorture/configs/rcu/TREE01 | 1 -
.../selftests/rcutorture/configs/rcu/TREE02 | 1 -
.../selftests/rcutorture/configs/rcu/TREE02-T | 1 -
.../selftests/rcutorture/configs/rcu/TREE03 | 1 -
.../selftests/rcutorture/configs/rcu/TREE04 | 1 -
.../selftests/rcutorture/configs/rcu/TREE05 | 1 -
.../selftests/rcutorture/configs/rcu/TREE06 | 1 -
.../selftests/rcutorture/configs/rcu/TREE07 | 1 -
.../selftests/rcutorture/configs/rcu/TREE08 | 1 -
.../selftests/rcutorture/configs/rcu/TREE08-T | 1 -
.../selftests/rcutorture/configs/rcu/TREE09 | 1 -
34 files changed, 478 insertions(+), 248 deletions(-)
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
$ git merge uprobes/for-next
Already up-to-date.
Merging kvm/linux-next (9f6226a762c7 arch: x86: kvm: x86.c: Cleaning up variable is set more than once)
$ git merge kvm/linux-next
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/include/uapi/asm/msr-index.h
Auto-merging arch/x86/include/asm/kvm_host.h
Auto-merging arch/mips/kvm/trap_emul.c
Auto-merging arch/mips/kvm/tlb.c
Auto-merging arch/mips/kvm/stats.c
Auto-merging arch/mips/kvm/mips.c
Auto-merging arch/mips/kvm/locore.S
Removing arch/mips/kvm/kvm_mips_opcode.h
Removing arch/mips/kvm/kvm_mips_commpage.c
Removing arch/mips/kvm/kvm_mips_comm.h
Auto-merging arch/mips/kvm/interrupt.h
Auto-merging arch/mips/kvm/interrupt.c
Auto-merging arch/mips/kvm/emulate.c
Auto-merging arch/mips/kvm/dyntrans.c
Merge made by the 'recursive' strategy.
arch/mips/include/asm/kvm_host.h | 12 +-
arch/mips/include/asm/r4kcache.h | 3 +
arch/mips/kvm/Makefile | 8 +-
arch/mips/kvm/{kvm_cb.c => callback.c} | 0
arch/mips/kvm/commpage.c | 33 ++
arch/mips/kvm/commpage.h | 24 +
arch/mips/kvm/{kvm_mips_dyntrans.c => dyntrans.c} | 40 +-
arch/mips/kvm/{kvm_mips_emul.c => emulate.c} | 539 +++++++++++-----------
arch/mips/kvm/{kvm_mips_int.c => interrupt.c} | 47 +-
arch/mips/kvm/{kvm_mips_int.h => interrupt.h} | 22 +-
arch/mips/kvm/kvm_mips_comm.h | 23 -
arch/mips/kvm/kvm_mips_commpage.c | 37 --
arch/mips/kvm/kvm_mips_opcode.h | 24 -
arch/mips/kvm/{kvm_locore.S => locore.S} | 55 ++-
arch/mips/kvm/{kvm_mips.c => mips.c} | 224 +++++----
arch/mips/kvm/opcode.h | 22 +
arch/mips/kvm/{kvm_mips_stats.c => stats.c} | 28 +-
arch/mips/kvm/{kvm_tlb.c => tlb.c} | 258 +++++------
arch/mips/kvm/trace.h | 18 +-
arch/mips/kvm/{kvm_trap_emul.c => trap_emul.c} | 112 +++--
arch/x86/include/asm/kvm_emulate.h | 1 +
arch/x86/include/asm/kvm_host.h | 1 +
arch/x86/include/asm/vmx.h | 7 +-
arch/x86/include/uapi/asm/msr-index.h | 1 +
arch/x86/kvm/emulate.c | 82 +++-
arch/x86/kvm/pmu.c | 9 +
arch/x86/kvm/vmx.c | 105 +++--
arch/x86/kvm/x86.c | 19 +-
arch/x86/kvm/x86.h | 27 ++
29 files changed, 934 insertions(+), 847 deletions(-)
rename arch/mips/kvm/{kvm_cb.c => callback.c} (100%)
create mode 100644 arch/mips/kvm/commpage.c
create mode 100644 arch/mips/kvm/commpage.h
rename arch/mips/kvm/{kvm_mips_dyntrans.c => dyntrans.c} (79%)
rename arch/mips/kvm/{kvm_mips_emul.c => emulate.c} (83%)
rename arch/mips/kvm/{kvm_mips_int.c => interrupt.c} (85%)
rename arch/mips/kvm/{kvm_mips_int.h => interrupt.h} (74%)
delete mode 100644 arch/mips/kvm/kvm_mips_comm.h
delete mode 100644 arch/mips/kvm/kvm_mips_commpage.c
delete mode 100644 arch/mips/kvm/kvm_mips_opcode.h
rename arch/mips/kvm/{kvm_locore.S => locore.S} (93%)
rename arch/mips/kvm/{kvm_mips.c => mips.c} (84%)
create mode 100644 arch/mips/kvm/opcode.h
rename arch/mips/kvm/{kvm_mips_stats.c => stats.c} (63%)
rename arch/mips/kvm/{kvm_tlb.c => tlb.c} (78%)
rename arch/mips/kvm/{kvm_trap_emul.c => trap_emul.c} (83%)
Merging kvm-arm/next (1252b3313642 arm64: KVM: Enable minimalistic support for Cortex-A53)
$ git merge kvm-arm/next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (5c02c392cd23 Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge oprofile/for-next
Already up-to-date.
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
$ git merge fw-nohz/nohz/next
Already up-to-date.
Merging xen-tip/linux-next (77945ca73e9a x86/xen: map foreign pfns for autotranslated guests)
$ git merge xen-tip/linux-next
Already up-to-date.
Merging percpu/for-next (a46e532a9145 Merge branch 'for-3.16-fixes' into for-next)
$ git merge percpu/for-next
Merge made by the 'recursive' strategy.
include/asm-generic/vmlinux.lds.h | 2 +-
include/linux/percpu-defs.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Merging workqueues/for-next (f66e1930724a Merge branch 'for-3.17' into for-next)
$ git merge workqueues/for-next
Resolved 'kernel/workqueue.c' using previous resolution.
Auto-merging kernel/workqueue.c
CONFLICT (content): Merge conflict in kernel/workqueue.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c25d0d9976e7] Merge remote-tracking branch 'workqueues/for-next'
$ git diff -M --stat --summary HEAD^..
kernel/workqueue.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
Merging drivers-x86/linux-next (f82bdd0d77b6 hp-wmi: Enable hotkeys on some systems)
$ git merge drivers-x86/linux-next
Already up-to-date.
Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
$ git merge chrome-platform/for-next
Already up-to-date.
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
$ git merge sysctl/master
Already up-to-date.
Merging regmap/for-next (4c834452aad0 Linux 3.16-rc3)
$ git merge regmap/for-next
Already up-to-date.
Merging hsi/for-next (b357d7b58f37 hsi: omap_ssi_port: use normal module refcounting)
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (f471d9480275 HID: add support for MSI GT683R led panels)
$ git merge leds/for-next
Merge made by the 'recursive' strategy.
drivers/input/keyboard/lm8323.c | 22 +++++++++-------------
drivers/leds/led-class.c | 5 +++--
drivers/leds/leds-lm3530.c | 20 +++++++-------------
drivers/leds/leds-lm3533.c | 20 ++++++++------------
drivers/leds/leds-lm355x.c | 21 +++++++++------------
drivers/leds/leds-lm3642.c | 30 ++++++++++++++----------------
drivers/leds/leds-lp55xx-common.c | 20 +++-----------------
drivers/leds/leds-max8997.c | 16 +++++++---------
drivers/leds/leds-netxbig.c | 31 +++++++++++++------------------
drivers/leds/leds-ns2.c | 16 +++++++---------
drivers/leds/leds-ss4200.c | 14 +++++++++-----
drivers/leds/leds-wm831x-status.c | 23 +++++++++--------------
include/linux/leds.h | 2 ++
13 files changed, 100 insertions(+), 140 deletions(-)
Merging driver-core/driver-core-next (c9d53c0f2d23 devres: remove devm_request_and_ioremap())
$ git merge driver-core/driver-core-next
Removing scripts/coccinelle/api/devm_ioremap_resource.cocci
Merge made by the 'recursive' strategy.
Documentation/driver-model/devres.txt | 1 -
drivers/bus/brcmstb_gisb.c | 6 +-
drivers/gpu/drm/armada/armada_crtc.c | 8 +-
include/linux/device.h | 2 -
lib/devres.c | 28 -------
scripts/coccinelle/api/devm_ioremap_resource.cocci | 90 ----------------------
6 files changed, 6 insertions(+), 129 deletions(-)
delete mode 100644 scripts/coccinelle/api/devm_ioremap_resource.cocci
Merging tty/tty-next (a497c3ba1d97 Linux 3.16-rc2)
$ git merge tty/tty-next
Already up-to-date.
Merging usb/usb-next (d6759133e981 usb: xhci: Correct last context entry calculation for Configure Endpoint)
$ git merge usb/usb-next
Auto-merging drivers/usb/host/xhci.c
Merge made by the 'recursive' strategy.
drivers/usb/host/xhci.c | 51 +++++++++++++++++--------------------------------
1 file changed, 18 insertions(+), 33 deletions(-)
Merging usb-gadget/next (7751b6fb0586 usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call.)
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (4c834452aad0 Linux 3.16-rc3)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging staging/staging-next (14b596c9d80b staging: cxt1e1: remove driver)
$ git merge staging/staging-next
Removing drivers/staging/wlags49_h25/wl_wext.h
Removing drivers/staging/wlags49_h25/wl_wext.c
Removing drivers/staging/wlags49_h25/wl_version.h
Removing drivers/staging/wlags49_h25/wl_util.h
Removing drivers/staging/wlags49_h25/wl_util.c
Removing drivers/staging/wlags49_h25/wl_profile.h
Removing drivers/staging/wlags49_h25/wl_profile.c
Removing drivers/staging/wlags49_h25/wl_priv.h
Removing drivers/staging/wlags49_h25/wl_priv.c
Removing drivers/staging/wlags49_h25/wl_netdev.h
Removing drivers/staging/wlags49_h25/wl_netdev.c
Removing drivers/staging/wlags49_h25/wl_main.h
Removing drivers/staging/wlags49_h25/wl_main.c
Removing drivers/staging/wlags49_h25/wl_internal.h
Removing drivers/staging/wlags49_h25/wl_if.h
Removing drivers/staging/wlags49_h25/wl_enc.h
Removing drivers/staging/wlags49_h25/wl_enc.c
Removing drivers/staging/wlags49_h25/wl_cs.h
Removing drivers/staging/wlags49_h25/wl_cs.c
Removing drivers/staging/wlags49_h25/sta_h25.c
Removing drivers/staging/wlags49_h25/mmd.h
Removing drivers/staging/wlags49_h25/mmd.c
Removing drivers/staging/wlags49_h25/mdd.h
Removing drivers/staging/wlags49_h25/hcfdef.h
Removing drivers/staging/wlags49_h25/hcfcfg.h
Removing drivers/staging/wlags49_h25/hcf.h
Removing drivers/staging/wlags49_h25/hcf.c
Removing drivers/staging/wlags49_h25/dhfcfg.h
Removing drivers/staging/wlags49_h25/dhf.h
Removing drivers/staging/wlags49_h25/dhf.c
Removing drivers/staging/wlags49_h25/debug.h
Removing drivers/staging/wlags49_h25/ap_h25.c
Removing drivers/staging/wlags49_h25/TODO
Removing drivers/staging/wlags49_h25/README.txt
Removing drivers/staging/wlags49_h25/Makefile
Removing drivers/staging/wlags49_h25/Kconfig
Removing drivers/staging/wlags49_h2/wl_wext.h
Removing drivers/staging/wlags49_h2/wl_wext.c
Removing drivers/staging/wlags49_h2/wl_version.h
Removing drivers/staging/wlags49_h2/wl_util.h
Removing drivers/staging/wlags49_h2/wl_util.c
Removing drivers/staging/wlags49_h2/wl_profile.h
Removing drivers/staging/wlags49_h2/wl_profile.c
Removing drivers/staging/wlags49_h2/wl_priv.h
Removing drivers/staging/wlags49_h2/wl_priv.c
Removing drivers/staging/wlags49_h2/wl_netdev.h
Removing drivers/staging/wlags49_h2/wl_netdev.c
Removing drivers/staging/wlags49_h2/wl_main.h
Removing drivers/staging/wlags49_h2/wl_main.c
Removing drivers/staging/wlags49_h2/wl_internal.h
Removing drivers/staging/wlags49_h2/wl_if.h
Removing drivers/staging/wlags49_h2/wl_enc.h
Removing drivers/staging/wlags49_h2/wl_enc.c
Removing drivers/staging/wlags49_h2/wl_cs.h
Removing drivers/staging/wlags49_h2/wl_cs.c
Removing drivers/staging/wlags49_h2/sta_h25.c
Removing drivers/staging/wlags49_h2/sta_h2.c
Removing drivers/staging/wlags49_h2/mmd.h
Removing drivers/staging/wlags49_h2/mmd.c
Removing drivers/staging/wlags49_h2/mdd.h
Removing drivers/staging/wlags49_h2/man/wlags49.4
Removing drivers/staging/wlags49_h2/hcfdef.h
Removing drivers/staging/wlags49_h2/hcfcfg.h
Removing drivers/staging/wlags49_h2/hcf.h
Removing drivers/staging/wlags49_h2/hcf.c
Removing drivers/staging/wlags49_h2/dhfcfg.h
Removing drivers/staging/wlags49_h2/dhf.h
Removing drivers/staging/wlags49_h2/dhf.c
Removing drivers/staging/wlags49_h2/debug.h
Removing drivers/staging/wlags49_h2/ap_h25.c
Removing drivers/staging/wlags49_h2/ap_h2.c
Removing drivers/staging/wlags49_h2/WARNING.txt
Removing drivers/staging/wlags49_h2/TODO
Removing drivers/staging/wlags49_h2/README.wlags49
Removing drivers/staging/wlags49_h2/README.ubuntu
Removing drivers/staging/wlags49_h2/Makefile
Removing drivers/staging/wlags49_h2/Kconfig
Removing drivers/staging/winbond/wbusb.c
Removing drivers/staging/winbond/wbhal.h
Removing drivers/staging/winbond/wb35tx_s.h
Removing drivers/staging/winbond/wb35tx_f.h
Removing drivers/staging/winbond/wb35tx.c
Removing drivers/staging/winbond/wb35rx_s.h
Removing drivers/staging/winbond/wb35rx_f.h
Removing drivers/staging/winbond/wb35rx.c
Removing drivers/staging/winbond/wb35reg_s.h
Removing drivers/staging/winbond/wb35reg_f.h
Removing drivers/staging/winbond/wb35reg.c
Removing drivers/staging/winbond/sme_api.h
Removing drivers/staging/winbond/reg.c
Removing drivers/staging/winbond/phy_calibration.h
Removing drivers/staging/winbond/phy_calibration.c
Removing drivers/staging/winbond/mto.h
Removing drivers/staging/winbond/mto.c
Removing drivers/staging/winbond/mds_s.h
Removing drivers/staging/winbond/mds_f.h
Removing drivers/staging/winbond/mds.c
Removing drivers/staging/winbond/mac_structures.h
Removing drivers/staging/winbond/localpara.h
Removing drivers/staging/winbond/core.h
Removing drivers/staging/winbond/TODO
Removing drivers/staging/winbond/Makefile
Removing drivers/staging/winbond/Kconfig
Removing drivers/staging/vt6656/wpactl.h
Removing drivers/staging/vt6656/wpactl.c
Removing drivers/staging/vt6656/wpa2.h
Removing drivers/staging/vt6656/wpa2.c
Removing drivers/staging/vt6656/wpa.h
Removing drivers/staging/vt6656/wpa.c
Removing drivers/staging/vt6656/wmgr.h
Removing drivers/staging/vt6656/wmgr.c
Removing drivers/staging/vt6656/wctl.h
Removing drivers/staging/vt6656/wctl.c
Removing drivers/staging/vt6656/vntconfiguration.dat
Removing drivers/staging/vt6656/tmacro.h
Removing drivers/staging/vt6656/tkip.h
Removing drivers/staging/vt6656/tkip.c
Removing drivers/staging/vt6656/tether.h
Removing drivers/staging/vt6656/tether.c
Removing drivers/staging/vt6656/rc4.h
Removing drivers/staging/vt6656/rc4.c
Removing drivers/staging/vt6656/michael.h
Removing drivers/staging/vt6656/michael.c
Removing drivers/staging/vt6656/iwctl.h
Removing drivers/staging/vt6656/iwctl.c
Removing drivers/staging/vt6656/iowpa.h
Removing drivers/staging/vt6656/iocmd.h
Removing drivers/staging/vt6656/datarate.h
Removing drivers/staging/vt6656/datarate.c
Removing drivers/staging/vt6656/country.h
Removing drivers/staging/vt6656/bssdb.h
Removing drivers/staging/vt6656/bssdb.c
Removing drivers/staging/vt6656/80211mgr.h
Removing drivers/staging/vt6656/80211mgr.c
Removing drivers/staging/vt6656/80211hdr.h
Auto-merging drivers/staging/tidspbridge/core/tiomap3430.c
Removing drivers/staging/serqt_usb2/serqt_usb2.c
Removing drivers/staging/serqt_usb2/Makefile
Removing drivers/staging/serqt_usb2/Kconfig
Removing drivers/staging/rtl8723au/include/rtw_ioctl_set.h
Removing drivers/staging/rtl8723au/core/rtw_ioctl_set.c
Removing drivers/staging/rtl8188eu/include/usb_vendor_req.h
Removing drivers/staging/rtl8188eu/include/usb_ops.h
Removing drivers/staging/rtl8188eu/include/rtw_version.h
Removing drivers/staging/rtl8188eu/include/rtw_io.h
Removing drivers/staging/rtl8188eu/include/rtw_br_ext.h
Removing drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
Removing drivers/staging/rtl8188eu/include/HalPhyRf.h
Removing drivers/staging/rtl8188eu/include/Hal8188EReg.h
Removing drivers/staging/rtl8188eu/hal/usb_ops_linux.c
Removing drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
Removing drivers/staging/rtl8188eu/hal/HalPhyRf.c
Removing drivers/staging/rtl8188eu/core/rtw_io.c
Removing drivers/staging/rtl8188eu/core/rtw_br_ext.c
Removing drivers/staging/dgrp/drp.h
Removing drivers/staging/dgrp/digirp.h
Removing drivers/staging/dgrp/dgrp_tty.c
Removing drivers/staging/dgrp/dgrp_sysfs.c
Removing drivers/staging/dgrp/dgrp_specproc.c
Removing drivers/staging/dgrp/dgrp_ports_ops.c
Removing drivers/staging/dgrp/dgrp_net_ops.c
Removing drivers/staging/dgrp/dgrp_mon_ops.c
Removing drivers/staging/dgrp/dgrp_driver.c
Removing drivers/staging/dgrp/dgrp_dpa_ops.c
Removing drivers/staging/dgrp/dgrp_common.h
Removing drivers/staging/dgrp/dgrp_common.c
Removing drivers/staging/dgrp/TODO
Removing drivers/staging/dgrp/README
Removing drivers/staging/dgrp/Makefile
Removing drivers/staging/dgrp/Kconfig
Removing drivers/staging/cxt1e1/sbew_ioc.h
Removing drivers/staging/cxt1e1/sbeproc.h
Removing drivers/staging/cxt1e1/sbeproc.c
Removing drivers/staging/cxt1e1/sbeid.c
Removing drivers/staging/cxt1e1/sbecrc.c
Removing drivers/staging/cxt1e1/sbecom_inline_linux.h
Removing drivers/staging/cxt1e1/sbe_promformat.h
Removing drivers/staging/cxt1e1/sbe_bid.h
Removing drivers/staging/cxt1e1/pmcc4_sysdep.h
Removing drivers/staging/cxt1e1/pmcc4_private.h
Removing drivers/staging/cxt1e1/pmcc4_ioctls.h
Removing drivers/staging/cxt1e1/pmcc4_drv.c
Removing drivers/staging/cxt1e1/pmcc4_defs.h
Removing drivers/staging/cxt1e1/pmcc4_cpld.h
Removing drivers/staging/cxt1e1/pmcc4.h
Removing drivers/staging/cxt1e1/pmc93x6_eeprom.h
Removing drivers/staging/cxt1e1/pmc93x6_eeprom.c
Removing drivers/staging/cxt1e1/musycc.h
Removing drivers/staging/cxt1e1/musycc.c
Removing drivers/staging/cxt1e1/linux.c
Removing drivers/staging/cxt1e1/libsbew.h
Removing drivers/staging/cxt1e1/hwprobe.c
Removing drivers/staging/cxt1e1/functions.c
Removing drivers/staging/cxt1e1/comet_tables.h
Removing drivers/staging/cxt1e1/comet_tables.c
Removing drivers/staging/cxt1e1/comet.h
Removing drivers/staging/cxt1e1/comet.c
Removing drivers/staging/cxt1e1/Makefile
Removing drivers/staging/cxt1e1/Kconfig
Removing drivers/staging/crystalhd/crystalhd_misc.h
Removing drivers/staging/crystalhd/crystalhd_misc.c
Removing drivers/staging/crystalhd/crystalhd_lnx.h
Removing drivers/staging/crystalhd/crystalhd_lnx.c
Removing drivers/staging/crystalhd/crystalhd_hw.h
Removing drivers/staging/crystalhd/crystalhd_hw.c
Removing drivers/staging/crystalhd/crystalhd_fw_if.h
Removing drivers/staging/crystalhd/crystalhd_cmds.h
Removing drivers/staging/crystalhd/crystalhd_cmds.c
Removing drivers/staging/crystalhd/crystalhd.h
Removing drivers/staging/crystalhd/bcm_70012_regs.h
Removing drivers/staging/crystalhd/bc_dts_glob_lnx.h
Removing drivers/staging/crystalhd/bc_dts_defs.h
Removing drivers/staging/crystalhd/TODO
Removing drivers/staging/crystalhd/Makefile
Removing drivers/staging/crystalhd/Kconfig
Auto-merging drivers/iio/adc/ad799x.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-bus-iio | 13 +
.../ABI/testing}/sysfs-bus-iio-trigger-sysfs | 0
.../devicetree/bindings/iio/adc/max1027-adc.txt | 22 +
.../bindings/iio/magnetometer/hmc5843.txt | 3 +
MAINTAINERS | 19 -
.../cavium-octeon/executive/cvmx-helper-sgmii.c | 12 +-
drivers/iio/accel/Kconfig | 12 +
drivers/iio/accel/Makefile | 1 +
drivers/iio/accel/kxcjk-1013.c | 764 +++
drivers/iio/adc/Kconfig | 9 +
drivers/iio/adc/Makefile | 1 +
drivers/iio/adc/ad7298.c | 21 +-
drivers/iio/adc/ad7476.c | 5 +-
drivers/iio/adc/ad7887.c | 21 +-
drivers/iio/adc/ad799x.c | 3 +-
drivers/iio/adc/ad_sigma_delta.c | 2 +-
drivers/iio/adc/at91_adc.c | 2 +-
drivers/iio/adc/max1027.c | 521 ++
drivers/iio/adc/xilinx-xadc-core.c | 2 +-
drivers/iio/dac/Kconfig | 10 +
drivers/iio/dac/Makefile | 1 +
drivers/iio/dac/ad5504.c | 11 +-
drivers/iio/dac/ad5791.c | 29 +-
drivers/iio/dac/mcp4922.c | 216 +
drivers/iio/industrialio-buffer.c | 5 +-
drivers/iio/industrialio-trigger.c | 8 +-
drivers/iio/light/cm32181.c | 11 +-
drivers/iio/light/gp2ap020a00f.c | 2 +-
drivers/iio/magnetometer/Kconfig | 10 +
drivers/iio/magnetometer/Makefile | 1 +
drivers/iio/magnetometer/ak09911.c | 326 ++
drivers/iio/magnetometer/ak8975.c | 58 +-
drivers/iio/pressure/Kconfig | 10 +
drivers/iio/pressure/Makefile | 1 +
drivers/iio/pressure/t5403.c | 275 +
drivers/iio/proximity/as3935.c | 2 +-
drivers/iio/trigger/iio-trig-interrupt.c | 3 +-
drivers/iio/trigger/iio-trig-sysfs.c | 2 +-
drivers/staging/Kconfig | 18 +-
drivers/staging/Makefile | 9 +-
drivers/staging/android/Kconfig | 2 +-
drivers/staging/android/alarm-dev.c | 2 +-
drivers/staging/android/binder.c | 5 +-
drivers/staging/android/ion/ion_chunk_heap.c | 2 +-
drivers/staging/android/ion/ion_system_heap.c | 71 +-
drivers/staging/bcm/Bcmchar.c | 2 +-
drivers/staging/bcm/CmHost.c | 2 +-
drivers/staging/bcm/DDRInit.c | 279 +-
drivers/staging/bcm/HandleControlPacket.c | 24 +-
drivers/staging/bcm/InterfaceInit.c | 303 +-
drivers/staging/bcm/Misc.c | 25 +-
drivers/staging/bcm/PHSModule.c | 2 +-
drivers/staging/bcm/Prototypes.h | 89 +-
drivers/staging/bcm/Qos.c | 126 +-
drivers/staging/bcm/Queue.h | 46 +-
drivers/staging/bcm/hostmibs.c | 62 +-
drivers/staging/bcm/led_control.c | 664 +--
drivers/staging/bcm/led_control.h | 16 +-
drivers/staging/bcm/nvm.c | 8 +-
drivers/staging/board/Kconfig | 8 +
drivers/staging/board/Makefile | 2 +
drivers/staging/board/TODO | 2 +
drivers/staging/board/board.c | 41 +
drivers/staging/board/board.h | 20 +
drivers/staging/board/kzm9d.c | 19 +
drivers/staging/ced1401/usb1401.h | 2 +-
drivers/staging/ced1401/userspace/use1401.c | 9 +-
drivers/staging/comedi/Kconfig | 16 +-
drivers/staging/comedi/comedi.h | 11 +
drivers/staging/comedi/comedi_fops.c | 9 +-
drivers/staging/comedi/comedidev.h | 122 +-
.../staging/comedi/drivers/addi-data/addi_common.c | 10 +-
.../staging/comedi/drivers/addi-data/addi_common.h | 20 -
.../comedi/drivers/addi-data/hwdrv_apci035.c | 9 +-
.../comedi/drivers/addi-data/hwdrv_apci1564.c | 308 +-
.../comedi/drivers/addi-data/hwdrv_apci3120.c | 16 +-
.../comedi/drivers/addi-data/hwdrv_apci3200.c | 109 +-
drivers/staging/comedi/drivers/addi_apci_035.c | 2 +-
drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +-
drivers/staging/comedi/drivers/addi_apci_1564.c | 433 +-
drivers/staging/comedi/drivers/addi_apci_3120.c | 11 +-
drivers/staging/comedi/drivers/addi_apci_3200.c | 8 +-
drivers/staging/comedi/drivers/adl_pci9111.c | 101 +-
drivers/staging/comedi/drivers/adq12b.c | 148 +-
drivers/staging/comedi/drivers/das16m1.c | 2 +-
drivers/staging/comedi/drivers/das1800.c | 2 +-
drivers/staging/comedi/drivers/dt282x.c | 1340 +++--
drivers/staging/comedi/drivers/ke_counter.c | 66 +-
drivers/staging/comedi/drivers/mite.c | 18 +-
drivers/staging/comedi/drivers/mite.h | 17 +-
drivers/staging/comedi/drivers/ni_65xx.c | 10 +-
drivers/staging/comedi/drivers/ni_660x.c | 11 +-
drivers/staging/comedi/drivers/ni_670x.c | 6 +-
drivers/staging/comedi/drivers/ni_atmio.c | 371 +-
drivers/staging/comedi/drivers/ni_daq_700.c | 96 +-
drivers/staging/comedi/drivers/ni_labpc_pci.c | 8 +-
drivers/staging/comedi/drivers/ni_mio_common.c | 5917 ++++++++++----------
drivers/staging/comedi/drivers/ni_mio_cs.c | 83 +-
drivers/staging/comedi/drivers/ni_pcidio.c | 9 +-
drivers/staging/comedi/drivers/ni_pcimio.c | 481 +-
drivers/staging/comedi/drivers/ni_stc.h | 165 +-
drivers/staging/comedi/drivers/pcl724.c | 5 +
drivers/staging/comedi/drivers/pcl730.c | 21 +-
drivers/staging/comedi/drivers/pcl812.c | 2 +-
drivers/staging/comedi/drivers/pcl816.c | 2 +-
drivers/staging/comedi/drivers/s626.c | 668 +--
drivers/staging/comedi/drivers/s626.h | 28 +-
drivers/staging/cptm1217/clearpad_tm1217.c | 15 +-
drivers/staging/crystalhd/Kconfig | 6 -
drivers/staging/crystalhd/Makefile | 6 -
drivers/staging/crystalhd/TODO | 15 -
drivers/staging/crystalhd/bc_dts_defs.h | 572 --
drivers/staging/crystalhd/bc_dts_glob_lnx.h | 300 -
drivers/staging/crystalhd/bcm_70012_regs.h | 758 ---
drivers/staging/crystalhd/crystalhd.h | 13 -
drivers/staging/crystalhd/crystalhd_cmds.c | 1066 ----
drivers/staging/crystalhd/crystalhd_cmds.h | 92 -
drivers/staging/crystalhd/crystalhd_fw_if.h | 370 --
drivers/staging/crystalhd/crystalhd_hw.c | 2458 --------
drivers/staging/crystalhd/crystalhd_hw.h | 407 --
drivers/staging/crystalhd/crystalhd_lnx.c | 782 ---
drivers/staging/crystalhd/crystalhd_lnx.h | 93 -
drivers/staging/crystalhd/crystalhd_misc.c | 1044 ----
drivers/staging/crystalhd/crystalhd_misc.h | 232 -
drivers/staging/cxt1e1/Kconfig | 21 -
drivers/staging/cxt1e1/Makefile | 18 -
drivers/staging/cxt1e1/comet.c | 596 --
drivers/staging/cxt1e1/comet.h | 353 --
drivers/staging/cxt1e1/comet_tables.c | 538 --
drivers/staging/cxt1e1/comet_tables.h | 61 -
drivers/staging/cxt1e1/functions.c | 318 --
drivers/staging/cxt1e1/hwprobe.c | 382 --
drivers/staging/cxt1e1/libsbew.h | 549 --
drivers/staging/cxt1e1/linux.c | 1142 ----
drivers/staging/cxt1e1/musycc.c | 1720 ------
drivers/staging/cxt1e1/musycc.h | 427 --
drivers/staging/cxt1e1/pmc93x6_eeprom.c | 532 --
drivers/staging/cxt1e1/pmc93x6_eeprom.h | 39 -
drivers/staging/cxt1e1/pmcc4.h | 108 -
drivers/staging/cxt1e1/pmcc4_cpld.h | 91 -
drivers/staging/cxt1e1/pmcc4_defs.h | 68 -
drivers/staging/cxt1e1/pmcc4_drv.c | 1613 ------
drivers/staging/cxt1e1/pmcc4_ioctls.h | 65 -
drivers/staging/cxt1e1/pmcc4_private.h | 295 -
drivers/staging/cxt1e1/pmcc4_sysdep.h | 63 -
drivers/staging/cxt1e1/sbe_bid.h | 47 -
drivers/staging/cxt1e1/sbe_promformat.h | 130 -
drivers/staging/cxt1e1/sbecom_inline_linux.h | 193 -
drivers/staging/cxt1e1/sbecrc.c | 133 -
drivers/staging/cxt1e1/sbeid.c | 205 -
drivers/staging/cxt1e1/sbeproc.c | 219 -
drivers/staging/cxt1e1/sbeproc.h | 42 -
drivers/staging/cxt1e1/sbew_ioc.h | 81 -
drivers/staging/dgap/dgap.c | 281 +-
drivers/staging/dgap/dgap.h | 1 -
drivers/staging/dgnc/dgnc_driver.c | 14 +-
drivers/staging/dgrp/Kconfig | 9 -
drivers/staging/dgrp/Makefile | 12 -
drivers/staging/dgrp/README | 2 -
drivers/staging/dgrp/TODO | 13 -
drivers/staging/dgrp/dgrp_common.c | 169 -
drivers/staging/dgrp/dgrp_common.h | 150 -
drivers/staging/dgrp/dgrp_dpa_ops.c | 534 --
drivers/staging/dgrp/dgrp_driver.c | 105 -
drivers/staging/dgrp/dgrp_mon_ops.c | 327 --
drivers/staging/dgrp/dgrp_net_ops.c | 3666 ------------
drivers/staging/dgrp/dgrp_ports_ops.c | 156 -
drivers/staging/dgrp/dgrp_specproc.c | 541 --
drivers/staging/dgrp/dgrp_sysfs.c | 558 --
drivers/staging/dgrp/dgrp_tty.c | 3337 -----------
drivers/staging/dgrp/digirp.h | 129 -
drivers/staging/dgrp/drp.h | 693 ---
drivers/staging/emxx_udc/Kconfig | 10 +
drivers/staging/emxx_udc/Makefile | 1 +
drivers/staging/emxx_udc/TODO | 4 +
drivers/staging/emxx_udc/emxx_udc.c | 3520 ++++++++++++
drivers/staging/emxx_udc/emxx_udc.h | 653 +++
drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 4 +-
drivers/staging/fwserial/fwserial.c | 6 +-
drivers/staging/gdm724x/gdm_lte.c | 2 +
drivers/staging/gdm72xx/gdm_qos.c | 57 +-
drivers/staging/gdm72xx/gdm_qos.h | 12 +-
drivers/staging/gdm72xx/gdm_sdio.c | 10 +-
drivers/staging/gdm72xx/gdm_usb.c | 12 +-
drivers/staging/gdm72xx/gdm_wimax.c | 10 +-
drivers/staging/gdm72xx/hci.h | 4 +-
drivers/staging/goldfish/goldfish_audio.c | 10 +-
drivers/staging/iio/Documentation/generic_buffer.c | 9 +-
.../staging/iio/Documentation/iio_event_monitor.c | 10 +
drivers/staging/iio/Documentation/iio_utils.h | 6 +-
drivers/staging/iio/Documentation/trigger.txt | 2 +-
drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +-
drivers/staging/iio/accel/sca3000_ring.c | 6 +
drivers/staging/iio/adc/mxs-lradc.c | 2 +-
drivers/staging/iio/frequency/ad9832.c | 14 +-
drivers/staging/iio/frequency/ad9850.c | 6 -
drivers/staging/iio/iio_simple_dummy.c | 2 +
drivers/staging/iio/magnetometer/hmc5843.c | 4 +-
drivers/staging/iio/meter/ade7758_trigger.c | 2 +-
drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 2 +-
.../staging/iio/trigger/iio-trig-periodic-rtc.c | 29 +-
drivers/staging/keucr/usb.c | 3 +-
drivers/staging/line6/driver.c | 2 +-
.../staging/lustre/include/linux/lnet/lib-types.h | 1 +
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 5 -
.../staging/lustre/lnet/klnds/socklnd/socklnd.c | 74 +-
drivers/staging/lustre/lnet/lnet/api-ni.c | 24 +-
drivers/staging/lustre/lnet/lnet/lib-md.c | 10 +-
drivers/staging/lustre/lnet/lnet/lib-me.c | 11 +-
drivers/staging/lustre/lnet/lnet/lib-move.c | 49 +-
drivers/staging/lustre/lnet/lnet/router.c | 5 +-
drivers/staging/lustre/lnet/selftest/console.c | 10 -
drivers/staging/lustre/lnet/selftest/framework.c | 2 -
drivers/staging/lustre/lustre/Kconfig | 1 +
drivers/staging/lustre/lustre/fid/lproc_fid.c | 6 +-
drivers/staging/lustre/lustre/fld/fld_request.c | 1 -
drivers/staging/lustre/lustre/fld/lproc_fld.c | 3 +-
drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_net.h | 6 +-
drivers/staging/lustre/lustre/include/obd_class.h | 2 +-
drivers/staging/lustre/lustre/include/obd_ost.h | 4 +
drivers/staging/lustre/lustre/lclient/glimpse.c | 4 +-
drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 15 +-
.../staging/lustre/lustre/lclient/lcommon_misc.c | 2 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 30 +-
drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2 +-
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 13 +-
drivers/staging/lustre/lustre/libcfs/fail.c | 10 +-
.../lustre/lustre/libcfs/linux/linux-tcpip.c | 23 +-
drivers/staging/lustre/lustre/llite/dir.c | 20 +-
drivers/staging/lustre/lustre/llite/file.c | 6 +-
drivers/staging/lustre/lustre/llite/llite_capa.c | 10 +-
drivers/staging/lustre/lustre/llite/llite_lib.c | 6 +-
drivers/staging/lustre/lustre/llite/lproc_llite.c | 59 +-
drivers/staging/lustre/lustre/llite/vvp_io.c | 6 +-
drivers/staging/lustre/lustre/llite/xattr.c | 1 +
drivers/staging/lustre/lustre/lmv/lmv_obd.c | 2 +-
drivers/staging/lustre/lustre/lov/lov_internal.h | 2 +-
drivers/staging/lustre/lustre/lov/lov_request.c | 10 +-
drivers/staging/lustre/lustre/mgc/mgc_request.c | 5 +-
drivers/staging/lustre/lustre/obdclass/capa.c | 5 +
.../lustre/lustre/obdclass/linux/linux-sysctl.c | 20 +-
drivers/staging/lustre/lustre/obdclass/obd_mount.c | 18 +-
drivers/staging/lustre/lustre/obdecho/lproc_echo.c | 4 +-
drivers/staging/lustre/lustre/osc/osc_cache.c | 7 +-
drivers/staging/lustre/lustre/osc/osc_dev.c | 14 +-
drivers/staging/lustre/lustre/osc/osc_internal.h | 2 +-
drivers/staging/lustre/lustre/osc/osc_page.c | 2 +-
drivers/staging/lustre/lustre/osc/osc_request.c | 17 +-
drivers/staging/lustre/lustre/ptlrpc/client.c | 32 +-
drivers/staging/lustre/lustre/ptlrpc/events.c | 11 +-
drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 29 +
drivers/staging/lustre/lustre/ptlrpc/import.c | 41 +-
drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 14 +-
drivers/staging/lustre/lustre/ptlrpc/pinger.c | 5 +
drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 2 +-
drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 11 +
drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 12 +
drivers/staging/lustre/lustre/ptlrpc/service.c | 10 +-
drivers/staging/media/lirc/lirc_sir.c | 301 +-
drivers/staging/media/sn9c102/Kconfig | 2 +-
drivers/staging/nokia_h4p/nokia_core.c | 1 +
drivers/staging/octeon/ethernet-mdio.c | 79 +-
drivers/staging/octeon/ethernet-mem.c | 11 +-
drivers/staging/octeon/ethernet-rgmii.c | 23 +-
drivers/staging/octeon/ethernet-sgmii.c | 87 +-
drivers/staging/octeon/ethernet-xaui.c | 83 +-
drivers/staging/octeon/ethernet.c | 2 +-
drivers/staging/octeon/octeon-ethernet.h | 4 +
drivers/staging/rtl8188eu/Makefile | 5 -
drivers/staging/rtl8188eu/core/rtw_ap.c | 52 +-
drivers/staging/rtl8188eu/core/rtw_br_ext.c | 1191 ----
drivers/staging/rtl8188eu/core/rtw_cmd.c | 165 +-
drivers/staging/rtl8188eu/core/rtw_debug.c | 28 +-
drivers/staging/rtl8188eu/core/rtw_efuse.c | 1425 +++--
drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 33 +-
drivers/staging/rtl8188eu/core/rtw_io.c | 301 -
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 19 +-
drivers/staging/rtl8188eu/core/rtw_led.c | 52 +-
drivers/staging/rtl8188eu/core/rtw_mlme.c | 105 +-
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 190 +-
drivers/staging/rtl8188eu/core/rtw_mp.c | 76 +-
drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 24 +-
drivers/staging/rtl8188eu/core/rtw_p2p.c | 142 +-
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 126 +-
drivers/staging/rtl8188eu/core/rtw_recv.c | 53 +-
drivers/staging/rtl8188eu/core/rtw_security.c | 34 +-
drivers/staging/rtl8188eu/core/rtw_sreset.c | 19 +-
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 54 +-
drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 8 +-
drivers/staging/rtl8188eu/core/rtw_xmit.c | 251 +-
.../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 10 +-
drivers/staging/rtl8188eu/hal/HalPhyRf.c | 49 -
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 88 +-
drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c | 7 +-
drivers/staging/rtl8188eu/hal/hal_com.c | 12 +-
drivers/staging/rtl8188eu/hal/hal_intf.c | 53 -
drivers/staging/rtl8188eu/hal/odm.c | 28 +-
drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 2 +-
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 50 +-
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 8 +-
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1375 +----
drivers/staging/rtl8188eu/hal/rtl8188e_mp.c | 32 +-
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 26 +-
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 2 +-
drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +-
drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c | 80 -
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 15 +-
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 6 +-
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 30 +-
drivers/staging/rtl8188eu/hal/usb_halinit.c | 508 +-
drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 684 ---
drivers/staging/rtl8188eu/include/Hal8188EReg.h | 46 -
drivers/staging/rtl8188eu/include/HalPhyRf.h | 30 -
drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h | 2 +-
drivers/staging/rtl8188eu/include/drv_types.h | 69 +-
drivers/staging/rtl8188eu/include/hal_intf.h | 38 -
drivers/staging/rtl8188eu/include/odm_precomp.h | 4 +-
drivers/staging/rtl8188eu/include/osdep_intf.h | 35 -
drivers/staging/rtl8188eu/include/osdep_service.h | 161 -
drivers/staging/rtl8188eu/include/recv_osdep.h | 1 -
drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 1 -
drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 7 +-
.../staging/rtl8188eu/include/rtl8188e_sreset.h | 31 -
drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 1 -
drivers/staging/rtl8188eu/include/rtw_br_ext.h | 66 -
drivers/staging/rtl8188eu/include/rtw_cmd.h | 2 +-
drivers/staging/rtl8188eu/include/rtw_debug.h | 2 +-
drivers/staging/rtl8188eu/include/rtw_efuse.h | 43 +-
drivers/staging/rtl8188eu/include/rtw_io.h | 343 --
drivers/staging/rtl8188eu/include/rtw_sreset.h | 5 -
drivers/staging/rtl8188eu/include/rtw_version.h | 1 -
drivers/staging/rtl8188eu/include/usb_ops.h | 114 -
drivers/staging/rtl8188eu/include/usb_ops_linux.h | 42 +-
drivers/staging/rtl8188eu/include/usb_osintf.h | 7 -
drivers/staging/rtl8188eu/include/usb_vendor_req.h | 52 -
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 449 +-
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 8 +-
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 66 +-
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 111 +-
drivers/staging/rtl8188eu/os_dep/recv_linux.c | 8 +-
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 234 +-
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 646 ++-
drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 4 +-
drivers/staging/rtl8192e/dot11d.c | 8 +-
drivers/staging/rtl8192e/rtllib_module.c | 5 +-
drivers/staging/rtl8192ee/Kconfig | 1 -
drivers/staging/rtl8192ee/base.c | 2 +-
drivers/staging/rtl8192ee/base.h | 4 +-
.../staging/rtl8192ee/btcoexist/halbtc8821a2ant.c | 2 +-
drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.h | 2 +-
drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 -
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 8 +-
drivers/staging/rtl8192u/r8192U_core.c | 548 +-
drivers/staging/rtl8192u/r8192U_wx.c | 159 +-
drivers/staging/rtl8712/drv_types.h | 1 -
drivers/staging/rtl8712/hal_init.c | 2 -
drivers/staging/rtl8712/ieee80211.h | 4 +-
drivers/staging/rtl8712/os_intfs.c | 3 +-
drivers/staging/rtl8712/osdep_service.h | 66 +-
drivers/staging/rtl8712/rtl8712_cmd.c | 4 +-
drivers/staging/rtl8712/rtl8712_recv.c | 57 +-
drivers/staging/rtl8712/rtl8712_xmit.c | 20 +-
drivers/staging/rtl8712/rtl871x_cmd.c | 114 +-
drivers/staging/rtl8712/rtl871x_cmd.h | 2 +-
drivers/staging/rtl8712/rtl871x_io.c | 12 +-
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 31 +-
drivers/staging/rtl8712/rtl871x_ioctl_set.c | 6 +-
drivers/staging/rtl8712/rtl871x_mlme.c | 64 +-
drivers/staging/rtl8712/rtl871x_mp.c | 8 +-
drivers/staging/rtl8712/rtl871x_recv.c | 18 +-
drivers/staging/rtl8712/rtl871x_sta_mgt.c | 51 +-
drivers/staging/rtl8712/rtl871x_xmit.c | 54 +-
drivers/staging/rtl8712/usb_intf.c | 40 +-
drivers/staging/rtl8723au/Makefile | 4 +-
drivers/staging/rtl8723au/core/rtw_ap.c | 179 +-
drivers/staging/rtl8723au/core/rtw_cmd.c | 13 -
drivers/staging/rtl8723au/core/rtw_ieee80211.c | 346 +-
drivers/staging/rtl8723au/core/rtw_ioctl_set.c | 425 --
drivers/staging/rtl8723au/core/rtw_mlme.c | 517 +-
drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 1607 +++---
drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 16 -
drivers/staging/rtl8723au/core/rtw_sreset.c | 47 -
drivers/staging/rtl8723au/core/rtw_sta_mgt.c | 21 +-
drivers/staging/rtl8723au/core/rtw_wlan_util.c | 397 +-
.../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 5 +-
drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 82 +-
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 2 -
drivers/staging/rtl8723au/hal/rtl8723a_sreset.c | 19 -
drivers/staging/rtl8723au/hal/rtl8723a_xmit.c | 21 -
drivers/staging/rtl8723au/hal/usb_halinit.c | 4 +-
drivers/staging/rtl8723au/hal/usb_ops_linux.c | 11 -
drivers/staging/rtl8723au/include/drv_types.h | 3 -
drivers/staging/rtl8723au/include/ieee80211.h | 109 +-
drivers/staging/rtl8723au/include/ioctl_cfg80211.h | 3 -
drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 2 +-
.../staging/rtl8723au/include/rtl8723a_sreset.h | 1 -
drivers/staging/rtl8723au/include/rtl8723a_xmit.h | 1 -
drivers/staging/rtl8723au/include/rtw_ap.h | 3 +-
drivers/staging/rtl8723au/include/rtw_debug.h | 2 +-
drivers/staging/rtl8723au/include/rtw_event.h | 2 +-
drivers/staging/rtl8723au/include/rtw_ht.h | 4 +-
drivers/staging/rtl8723au/include/rtw_ioctl_set.h | 32 -
drivers/staging/rtl8723au/include/rtw_mlme.h | 50 +-
drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 25 +-
drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 2 -
drivers/staging/rtl8723au/include/rtw_rf.h | 11 -
drivers/staging/rtl8723au/include/rtw_security.h | 3 -
drivers/staging/rtl8723au/include/rtw_sreset.h | 20 -
drivers/staging/rtl8723au/include/sta_info.h | 2 +-
drivers/staging/rtl8723au/include/wifi.h | 71 -
drivers/staging/rtl8723au/include/wlan_bssdef.h | 6 +-
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 1105 ++--
drivers/staging/rtl8723au/os_dep/mlme_linux.c | 1 -
drivers/staging/rtl8723au/os_dep/os_intfs.c | 5 -
drivers/staging/rtl8723au/os_dep/usb_intf.c | 12 +-
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 2 -
drivers/staging/rtl8821ae/Kconfig | 1 -
.../staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c | 14 +-
drivers/staging/rtl8821ae/ps.c | 6 +-
drivers/staging/rtl8821ae/rtl8821ae/hal_btc.c | 17 +-
drivers/staging/rtl8821ae/rtl8821ae/hw.c | 2 +-
drivers/staging/rtl8821ae/rtl8821ae/reg.h | 1 +
drivers/staging/sep/sep_crypto.c | 17 +
drivers/staging/serqt_usb2/Kconfig | 9 -
drivers/staging/serqt_usb2/Makefile | 1 -
drivers/staging/serqt_usb2/serqt_usb2.c | 1528 -----
drivers/staging/skein/skein_iv.h | 26 +-
drivers/staging/slicoss/slicoss.c | 22 +-
drivers/staging/speakup/main.c | 2 +-
drivers/staging/tidspbridge/core/chnl_sm.c | 1 +
drivers/staging/tidspbridge/core/io_sm.c | 1 +
drivers/staging/tidspbridge/core/tiomap3430.c | 2 +
drivers/staging/tidspbridge/core/tiomap_io.c | 2 +
drivers/staging/tidspbridge/core/wdt.c | 1 +
drivers/staging/tidspbridge/dynload/cload.c | 7 +
drivers/staging/tidspbridge/dynload/reloc.c | 2 +
.../tidspbridge/include/dspbridge/dblldefs.h | 14 +-
drivers/staging/tidspbridge/pmgr/chnl.c | 1 +
drivers/staging/tidspbridge/pmgr/dspapi.c | 64 +-
drivers/staging/tidspbridge/rmgr/dbdcd.c | 1 +
drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 +
drivers/staging/tidspbridge/rmgr/nldr.c | 1 +
drivers/staging/tidspbridge/rmgr/node.c | 2 +
drivers/staging/tidspbridge/rmgr/proc.c | 3 +
drivers/staging/unisys/Kconfig | 2 +-
drivers/staging/unisys/channels/Makefile | 2 -
drivers/staging/unisys/include/guestlinuxdebug.h | 6 +-
drivers/staging/unisys/include/vbushelper.h | 8 +-
drivers/staging/unisys/uislib/Makefile | 3 -
drivers/staging/unisys/uislib/uisutils.c | 11 +-
drivers/staging/unisys/virthba/Makefile | 3 -
drivers/staging/unisys/virthba/virthba.c | 5 -
drivers/staging/unisys/virtpci/Makefile | 3 -
drivers/staging/unisys/virtpci/virtpci.c | 14 +-
drivers/staging/unisys/virtpci/virtpci.h | 2 -
drivers/staging/unisys/visorchannel/Makefile | 2 -
drivers/staging/unisys/visorchipset/Makefile | 2 -
.../unisys/visorchipset/visorchipset_main.c | 4 +-
drivers/staging/unisys/visorutil/Makefile | 1 -
.../usbip/userspace/libsrc/usbip_host_driver.c | 7 +-
drivers/staging/usbip/vhci_hcd.c | 2 +-
drivers/staging/vt6655/baseband.c | 300 +-
drivers/staging/vt6655/card.c | 2 +-
drivers/staging/vt6655/device.h | 6 +-
drivers/staging/vt6655/device_main.c | 6 +-
drivers/staging/vt6655/dpc.c | 3 +-
drivers/staging/vt6655/iwctl.c | 5 +-
drivers/staging/vt6655/iwctl.h | 12 +-
drivers/staging/vt6655/vntwifi.c | 8 +-
drivers/staging/vt6655/wmgr.c | 2 +-
drivers/staging/vt6656/80211hdr.h | 324 --
drivers/staging/vt6656/80211mgr.c | 861 ---
drivers/staging/vt6656/80211mgr.h | 808 ---
drivers/staging/vt6656/Kconfig | 4 +-
drivers/staging/vt6656/Makefile | 13 -
drivers/staging/vt6656/baseband.c | 58 +-
drivers/staging/vt6656/baseband.h | 5 +-
drivers/staging/vt6656/bssdb.c | 1466 -----
drivers/staging/vt6656/bssdb.h | 276 -
drivers/staging/vt6656/card.c | 189 +-
drivers/staging/vt6656/card.h | 35 +-
drivers/staging/vt6656/channel.c | 543 +-
drivers/staging/vt6656/channel.h | 9 +-
drivers/staging/vt6656/country.h | 162 -
drivers/staging/vt6656/datarate.c | 364 --
drivers/staging/vt6656/datarate.h | 76 -
drivers/staging/vt6656/desc.h | 2 -
drivers/staging/vt6656/device.h | 333 +-
drivers/staging/vt6656/dpc.c | 982 +---
drivers/staging/vt6656/dpc.h | 6 +-
drivers/staging/vt6656/firmware.c | 78 +-
drivers/staging/vt6656/firmware.h | 6 +-
drivers/staging/vt6656/int.c | 51 +-
drivers/staging/vt6656/iocmd.h | 38 -
drivers/staging/vt6656/iowpa.h | 75 -
drivers/staging/vt6656/iwctl.c | 1802 ------
drivers/staging/vt6656/iwctl.h | 138 -
drivers/staging/vt6656/key.c | 786 +--
drivers/staging/vt6656/key.h | 79 +-
drivers/staging/vt6656/mac.c | 35 +-
drivers/staging/vt6656/mac.h | 29 +-
drivers/staging/vt6656/main_usb.c | 1098 ++--
drivers/staging/vt6656/michael.c | 167 -
drivers/staging/vt6656/michael.h | 52 -
drivers/staging/vt6656/power.c | 250 +-
drivers/staging/vt6656/power.h | 13 +-
drivers/staging/vt6656/rc4.c | 87 -
drivers/staging/vt6656/rc4.h | 46 -
drivers/staging/vt6656/rf.c | 24 +-
drivers/staging/vt6656/rxtx.c | 1734 ++----
drivers/staging/vt6656/rxtx.h | 24 +-
drivers/staging/vt6656/tether.c | 60 -
drivers/staging/vt6656/tether.h | 101 -
drivers/staging/vt6656/tkip.c | 246 -
drivers/staging/vt6656/tkip.h | 45 -
drivers/staging/vt6656/tmacro.h | 52 -
drivers/staging/vt6656/usbpipe.c | 59 +-
drivers/staging/vt6656/vntconfiguration.dat | 6 -
drivers/staging/vt6656/wcmd.c | 866 +--
drivers/staging/vt6656/wcmd.h | 6 +-
drivers/staging/vt6656/wctl.c | 244 -
drivers/staging/vt6656/wctl.h | 94 -
drivers/staging/vt6656/wmgr.c | 4362 ---------------
drivers/staging/vt6656/wmgr.h | 397 --
drivers/staging/vt6656/wpa.c | 314 --
drivers/staging/vt6656/wpa.h | 72 -
drivers/staging/vt6656/wpa2.c | 235 -
drivers/staging/vt6656/wpa2.h | 53 -
drivers/staging/vt6656/wpactl.c | 247 -
drivers/staging/vt6656/wpactl.h | 47 -
drivers/staging/winbond/Kconfig | 11 -
drivers/staging/winbond/Makefile | 15 -
drivers/staging/winbond/TODO | 12 -
drivers/staging/winbond/core.h | 61 -
drivers/staging/winbond/localpara.h | 311 -
drivers/staging/winbond/mac_structures.h | 71 -
drivers/staging/winbond/mds.c | 650 ---
drivers/staging/winbond/mds_f.h | 22 -
drivers/staging/winbond/mds_s.h | 130 -
drivers/staging/winbond/mto.c | 167 -
drivers/staging/winbond/mto.h | 134 -
drivers/staging/winbond/phy_calibration.c | 1317 -----
drivers/staging/winbond/phy_calibration.h | 85 -
drivers/staging/winbond/reg.c | 2328 --------
drivers/staging/winbond/sme_api.h | 191 -
drivers/staging/winbond/wb35reg.c | 806 ---
drivers/staging/winbond/wb35reg_f.h | 65 -
drivers/staging/winbond/wb35reg_s.h | 240 -
drivers/staging/winbond/wb35rx.c | 358 --
drivers/staging/winbond/wb35rx_f.h | 15 -
drivers/staging/winbond/wb35rx_s.h | 44 -
drivers/staging/winbond/wb35tx.c | 290 -
drivers/staging/winbond/wb35tx_f.h | 22 -
drivers/staging/winbond/wb35tx_s.h | 39 -
drivers/staging/winbond/wbhal.h | 513 --
drivers/staging/winbond/wbusb.c | 853 ---
drivers/staging/wlags49_h2/Kconfig | 11 -
drivers/staging/wlags49_h2/Makefile | 53 -
drivers/staging/wlags49_h2/README.ubuntu | 180 -
drivers/staging/wlags49_h2/README.wlags49 | 641 ---
drivers/staging/wlags49_h2/TODO | 33 -
drivers/staging/wlags49_h2/WARNING.txt | 3 -
drivers/staging/wlags49_h2/ap_h2.c | 3337 -----------
drivers/staging/wlags49_h2/ap_h25.c | 4094 --------------
drivers/staging/wlags49_h2/debug.h | 199 -
drivers/staging/wlags49_h2/dhf.c | 380 --
drivers/staging/wlags49_h2/dhf.h | 225 -
drivers/staging/wlags49_h2/dhfcfg.h | 158 -
drivers/staging/wlags49_h2/hcf.c | 4748 ----------------
drivers/staging/wlags49_h2/hcf.h | 394 --
drivers/staging/wlags49_h2/hcfcfg.h | 785 ---
drivers/staging/wlags49_h2/hcfdef.h | 752 ---
drivers/staging/wlags49_h2/man/wlags49.4 | 734 ---
drivers/staging/wlags49_h2/mdd.h | 1155 ----
drivers/staging/wlags49_h2/mmd.c | 250 -
drivers/staging/wlags49_h2/mmd.h | 77 -
drivers/staging/wlags49_h2/sta_h2.c | 4480 ---------------
drivers/staging/wlags49_h2/sta_h25.c | 5255 -----------------
drivers/staging/wlags49_h2/wl_cs.c | 440 --
drivers/staging/wlags49_h2/wl_cs.h | 89 -
drivers/staging/wlags49_h2/wl_enc.c | 217 -
drivers/staging/wlags49_h2/wl_enc.h | 118 -
drivers/staging/wlags49_h2/wl_if.h | 221 -
drivers/staging/wlags49_h2/wl_internal.h | 1040 ----
drivers/staging/wlags49_h2/wl_main.c | 3702 ------------
drivers/staging/wlags49_h2/wl_main.h | 138 -
drivers/staging/wlags49_h2/wl_netdev.c | 1951 -------
drivers/staging/wlags49_h2/wl_netdev.h | 154 -
drivers/staging/wlags49_h2/wl_priv.c | 1928 -------
drivers/staging/wlags49_h2/wl_priv.h | 127 -
drivers/staging/wlags49_h2/wl_profile.c | 995 ----
drivers/staging/wlags49_h2/wl_profile.h | 87 -
drivers/staging/wlags49_h2/wl_util.c | 1367 -----
drivers/staging/wlags49_h2/wl_util.h | 96 -
drivers/staging/wlags49_h2/wl_version.h | 146 -
drivers/staging/wlags49_h2/wl_wext.c | 3794 -------------
drivers/staging/wlags49_h2/wl_wext.h | 88 -
drivers/staging/wlags49_h25/Kconfig | 11 -
drivers/staging/wlags49_h25/Makefile | 52 -
drivers/staging/wlags49_h25/README.txt | 30 -
drivers/staging/wlags49_h25/TODO | 33 -
drivers/staging/wlags49_h25/ap_h25.c | 2 -
drivers/staging/wlags49_h25/debug.h | 2 -
drivers/staging/wlags49_h25/dhf.c | 2 -
drivers/staging/wlags49_h25/dhf.h | 2 -
drivers/staging/wlags49_h25/dhfcfg.h | 2 -
drivers/staging/wlags49_h25/hcf.c | 2 -
drivers/staging/wlags49_h25/hcf.h | 2 -
drivers/staging/wlags49_h25/hcfcfg.h | 2 -
drivers/staging/wlags49_h25/hcfdef.h | 2 -
drivers/staging/wlags49_h25/mdd.h | 2 -
drivers/staging/wlags49_h25/mmd.c | 2 -
drivers/staging/wlags49_h25/mmd.h | 2 -
drivers/staging/wlags49_h25/sta_h25.c | 2 -
drivers/staging/wlags49_h25/wl_cs.c | 2 -
drivers/staging/wlags49_h25/wl_cs.h | 2 -
drivers/staging/wlags49_h25/wl_enc.c | 2 -
drivers/staging/wlags49_h25/wl_enc.h | 2 -
drivers/staging/wlags49_h25/wl_if.h | 2 -
drivers/staging/wlags49_h25/wl_internal.h | 2 -
drivers/staging/wlags49_h25/wl_main.c | 2 -
drivers/staging/wlags49_h25/wl_main.h | 2 -
drivers/staging/wlags49_h25/wl_netdev.c | 2 -
drivers/staging/wlags49_h25/wl_netdev.h | 2 -
drivers/staging/wlags49_h25/wl_priv.c | 2 -
drivers/staging/wlags49_h25/wl_priv.h | 2 -
drivers/staging/wlags49_h25/wl_profile.c | 2 -
drivers/staging/wlags49_h25/wl_profile.h | 2 -
drivers/staging/wlags49_h25/wl_util.c | 2 -
drivers/staging/wlags49_h25/wl_util.h | 2 -
drivers/staging/wlags49_h25/wl_version.h | 2 -
drivers/staging/wlags49_h25/wl_wext.c | 2 -
drivers/staging/wlags49_h25/wl_wext.h | 2 -
drivers/staging/wlan-ng/cfg80211.c | 2 +
drivers/staging/wlan-ng/hfa384x_usb.c | 1 +
drivers/staging/wlan-ng/prism2mgmt.c | 42 +-
drivers/staging/wlan-ng/prism2mib.c | 4 +-
drivers/staging/wlan-ng/prism2sta.c | 5 +-
drivers/staging/xillybus/xillybus.h | 46 +-
drivers/staging/xillybus/xillybus_core.c | 186 +-
drivers/staging/xillybus/xillybus_of.c | 72 +-
drivers/staging/xillybus/xillybus_pcie.c | 66 +-
include/linux/iio/accel/kxcjk_1013.h | 22 +
include/linux/iio/trigger.h | 5 +-
kernel/time/alarmtimer.c | 2 +-
647 files changed, 20950 insertions(+), 122059 deletions(-)
rename {drivers/staging/iio/Documentation => Documentation/ABI/testing}/sysfs-bus-iio-trigger-sysfs (100%)
create mode 100644 Documentation/devicetree/bindings/iio/adc/max1027-adc.txt
create mode 100644 drivers/iio/accel/kxcjk-1013.c
create mode 100644 drivers/iio/adc/max1027.c
create mode 100644 drivers/iio/dac/mcp4922.c
create mode 100644 drivers/iio/magnetometer/ak09911.c
create mode 100644 drivers/iio/pressure/t5403.c
create mode 100644 drivers/staging/board/Kconfig
create mode 100644 drivers/staging/board/Makefile
create mode 100644 drivers/staging/board/TODO
create mode 100644 drivers/staging/board/board.c
create mode 100644 drivers/staging/board/board.h
create mode 100644 drivers/staging/board/kzm9d.c
delete mode 100644 drivers/staging/crystalhd/Kconfig
delete mode 100644 drivers/staging/crystalhd/Makefile
delete mode 100644 drivers/staging/crystalhd/TODO
delete mode 100644 drivers/staging/crystalhd/bc_dts_defs.h
delete mode 100644 drivers/staging/crystalhd/bc_dts_glob_lnx.h
delete mode 100644 drivers/staging/crystalhd/bcm_70012_regs.h
delete mode 100644 drivers/staging/crystalhd/crystalhd.h
delete mode 100644 drivers/staging/crystalhd/crystalhd_cmds.c
delete mode 100644 drivers/staging/crystalhd/crystalhd_cmds.h
delete mode 100644 drivers/staging/crystalhd/crystalhd_fw_if.h
delete mode 100644 drivers/staging/crystalhd/crystalhd_hw.c
delete mode 100644 drivers/staging/crystalhd/crystalhd_hw.h
delete mode 100644 drivers/staging/crystalhd/crystalhd_lnx.c
delete mode 100644 drivers/staging/crystalhd/crystalhd_lnx.h
delete mode 100644 drivers/staging/crystalhd/crystalhd_misc.c
delete mode 100644 drivers/staging/crystalhd/crystalhd_misc.h
delete mode 100644 drivers/staging/cxt1e1/Kconfig
delete mode 100644 drivers/staging/cxt1e1/Makefile
delete mode 100644 drivers/staging/cxt1e1/comet.c
delete mode 100644 drivers/staging/cxt1e1/comet.h
delete mode 100644 drivers/staging/cxt1e1/comet_tables.c
delete mode 100644 drivers/staging/cxt1e1/comet_tables.h
delete mode 100644 drivers/staging/cxt1e1/functions.c
delete mode 100644 drivers/staging/cxt1e1/hwprobe.c
delete mode 100644 drivers/staging/cxt1e1/libsbew.h
delete mode 100644 drivers/staging/cxt1e1/linux.c
delete mode 100644 drivers/staging/cxt1e1/musycc.c
delete mode 100644 drivers/staging/cxt1e1/musycc.h
delete mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.c
delete mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.h
delete mode 100644 drivers/staging/cxt1e1/pmcc4.h
delete mode 100644 drivers/staging/cxt1e1/pmcc4_cpld.h
delete mode 100644 drivers/staging/cxt1e1/pmcc4_defs.h
delete mode 100644 drivers/staging/cxt1e1/pmcc4_drv.c
delete mode 100644 drivers/staging/cxt1e1/pmcc4_ioctls.h
delete mode 100644 drivers/staging/cxt1e1/pmcc4_private.h
delete mode 100644 drivers/staging/cxt1e1/pmcc4_sysdep.h
delete mode 100644 drivers/staging/cxt1e1/sbe_bid.h
delete mode 100644 drivers/staging/cxt1e1/sbe_promformat.h
delete mode 100644 drivers/staging/cxt1e1/sbecom_inline_linux.h
delete mode 100644 drivers/staging/cxt1e1/sbecrc.c
delete mode 100644 drivers/staging/cxt1e1/sbeid.c
delete mode 100644 drivers/staging/cxt1e1/sbeproc.c
delete mode 100644 drivers/staging/cxt1e1/sbeproc.h
delete mode 100644 drivers/staging/cxt1e1/sbew_ioc.h
delete mode 100644 drivers/staging/dgrp/Kconfig
delete mode 100644 drivers/staging/dgrp/Makefile
delete mode 100644 drivers/staging/dgrp/README
delete mode 100644 drivers/staging/dgrp/TODO
delete mode 100644 drivers/staging/dgrp/dgrp_common.c
delete mode 100644 drivers/staging/dgrp/dgrp_common.h
delete mode 100644 drivers/staging/dgrp/dgrp_dpa_ops.c
delete mode 100644 drivers/staging/dgrp/dgrp_driver.c
delete mode 100644 drivers/staging/dgrp/dgrp_mon_ops.c
delete mode 100644 drivers/staging/dgrp/dgrp_net_ops.c
delete mode 100644 drivers/staging/dgrp/dgrp_ports_ops.c
delete mode 100644 drivers/staging/dgrp/dgrp_specproc.c
delete mode 100644 drivers/staging/dgrp/dgrp_sysfs.c
delete mode 100644 drivers/staging/dgrp/dgrp_tty.c
delete mode 100644 drivers/staging/dgrp/digirp.h
delete mode 100644 drivers/staging/dgrp/drp.h
create mode 100644 drivers/staging/emxx_udc/Kconfig
create mode 100644 drivers/staging/emxx_udc/Makefile
create mode 100644 drivers/staging/emxx_udc/TODO
create mode 100644 drivers/staging/emxx_udc/emxx_udc.c
create mode 100644 drivers/staging/emxx_udc/emxx_udc.h
delete mode 100644 drivers/staging/rtl8188eu/core/rtw_br_ext.c
delete mode 100644 drivers/staging/rtl8188eu/core/rtw_io.c
delete mode 100644 drivers/staging/rtl8188eu/hal/HalPhyRf.c
delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
delete mode 100644 drivers/staging/rtl8188eu/hal/usb_ops_linux.c
delete mode 100644 drivers/staging/rtl8188eu/include/Hal8188EReg.h
delete mode 100644 drivers/staging/rtl8188eu/include/HalPhyRf.h
delete mode 100644 drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
delete mode 100644 drivers/staging/rtl8188eu/include/rtw_br_ext.h
delete mode 100644 drivers/staging/rtl8188eu/include/rtw_io.h
delete mode 100644 drivers/staging/rtl8188eu/include/rtw_version.h
delete mode 100644 drivers/staging/rtl8188eu/include/usb_ops.h
delete mode 100644 drivers/staging/rtl8188eu/include/usb_vendor_req.h
delete mode 100644 drivers/staging/rtl8723au/core/rtw_ioctl_set.c
delete mode 100644 drivers/staging/rtl8723au/include/rtw_ioctl_set.h
delete mode 100644 drivers/staging/serqt_usb2/Kconfig
delete mode 100644 drivers/staging/serqt_usb2/Makefile
delete mode 100644 drivers/staging/serqt_usb2/serqt_usb2.c
delete mode 100644 drivers/staging/vt6656/80211hdr.h
delete mode 100644 drivers/staging/vt6656/80211mgr.c
delete mode 100644 drivers/staging/vt6656/80211mgr.h
delete mode 100644 drivers/staging/vt6656/bssdb.c
delete mode 100644 drivers/staging/vt6656/bssdb.h
delete mode 100644 drivers/staging/vt6656/country.h
delete mode 100644 drivers/staging/vt6656/datarate.c
delete mode 100644 drivers/staging/vt6656/datarate.h
delete mode 100644 drivers/staging/vt6656/iocmd.h
delete mode 100644 drivers/staging/vt6656/iowpa.h
delete mode 100644 drivers/staging/vt6656/iwctl.c
delete mode 100644 drivers/staging/vt6656/iwctl.h
delete mode 100644 drivers/staging/vt6656/michael.c
delete mode 100644 drivers/staging/vt6656/michael.h
delete mode 100644 drivers/staging/vt6656/rc4.c
delete mode 100644 drivers/staging/vt6656/rc4.h
delete mode 100644 drivers/staging/vt6656/tether.c
delete mode 100644 drivers/staging/vt6656/tether.h
delete mode 100644 drivers/staging/vt6656/tkip.c
delete mode 100644 drivers/staging/vt6656/tkip.h
delete mode 100644 drivers/staging/vt6656/tmacro.h
delete mode 100644 drivers/staging/vt6656/vntconfiguration.dat
delete mode 100644 drivers/staging/vt6656/wctl.c
delete mode 100644 drivers/staging/vt6656/wctl.h
delete mode 100644 drivers/staging/vt6656/wmgr.c
delete mode 100644 drivers/staging/vt6656/wmgr.h
delete mode 100644 drivers/staging/vt6656/wpa.c
delete mode 100644 drivers/staging/vt6656/wpa.h
delete mode 100644 drivers/staging/vt6656/wpa2.c
delete mode 100644 drivers/staging/vt6656/wpa2.h
delete mode 100644 drivers/staging/vt6656/wpactl.c
delete mode 100644 drivers/staging/vt6656/wpactl.h
delete mode 100644 drivers/staging/winbond/Kconfig
delete mode 100644 drivers/staging/winbond/Makefile
delete mode 100644 drivers/staging/winbond/TODO
delete mode 100644 drivers/staging/winbond/core.h
delete mode 100644 drivers/staging/winbond/localpara.h
delete mode 100644 drivers/staging/winbond/mac_structures.h
delete mode 100644 drivers/staging/winbond/mds.c
delete mode 100644 drivers/staging/winbond/mds_f.h
delete mode 100644 drivers/staging/winbond/mds_s.h
delete mode 100644 drivers/staging/winbond/mto.c
delete mode 100644 drivers/staging/winbond/mto.h
delete mode 100644 drivers/staging/winbond/phy_calibration.c
delete mode 100644 drivers/staging/winbond/phy_calibration.h
delete mode 100644 drivers/staging/winbond/reg.c
delete mode 100644 drivers/staging/winbond/sme_api.h
delete mode 100644 drivers/staging/winbond/wb35reg.c
delete mode 100644 drivers/staging/winbond/wb35reg_f.h
delete mode 100644 drivers/staging/winbond/wb35reg_s.h
delete mode 100644 drivers/staging/winbond/wb35rx.c
delete mode 100644 drivers/staging/winbond/wb35rx_f.h
delete mode 100644 drivers/staging/winbond/wb35rx_s.h
delete mode 100644 drivers/staging/winbond/wb35tx.c
delete mode 100644 drivers/staging/winbond/wb35tx_f.h
delete mode 100644 drivers/staging/winbond/wb35tx_s.h
delete mode 100644 drivers/staging/winbond/wbhal.h
delete mode 100644 drivers/staging/winbond/wbusb.c
delete mode 100644 drivers/staging/wlags49_h2/Kconfig
delete mode 100644 drivers/staging/wlags49_h2/Makefile
delete mode 100644 drivers/staging/wlags49_h2/README.ubuntu
delete mode 100644 drivers/staging/wlags49_h2/README.wlags49
delete mode 100644 drivers/staging/wlags49_h2/TODO
delete mode 100644 drivers/staging/wlags49_h2/WARNING.txt
delete mode 100644 drivers/staging/wlags49_h2/ap_h2.c
delete mode 100644 drivers/staging/wlags49_h2/ap_h25.c
delete mode 100644 drivers/staging/wlags49_h2/debug.h
delete mode 100644 drivers/staging/wlags49_h2/dhf.c
delete mode 100644 drivers/staging/wlags49_h2/dhf.h
delete mode 100644 drivers/staging/wlags49_h2/dhfcfg.h
delete mode 100644 drivers/staging/wlags49_h2/hcf.c
delete mode 100644 drivers/staging/wlags49_h2/hcf.h
delete mode 100644 drivers/staging/wlags49_h2/hcfcfg.h
delete mode 100644 drivers/staging/wlags49_h2/hcfdef.h
delete mode 100644 drivers/staging/wlags49_h2/man/wlags49.4
delete mode 100644 drivers/staging/wlags49_h2/mdd.h
delete mode 100644 drivers/staging/wlags49_h2/mmd.c
delete mode 100644 drivers/staging/wlags49_h2/mmd.h
delete mode 100644 drivers/staging/wlags49_h2/sta_h2.c
delete mode 100644 drivers/staging/wlags49_h2/sta_h25.c
delete mode 100644 drivers/staging/wlags49_h2/wl_cs.c
delete mode 100644 drivers/staging/wlags49_h2/wl_cs.h
delete mode 100644 drivers/staging/wlags49_h2/wl_enc.c
delete mode 100644 drivers/staging/wlags49_h2/wl_enc.h
delete mode 100644 drivers/staging/wlags49_h2/wl_if.h
delete mode 100644 drivers/staging/wlags49_h2/wl_internal.h
delete mode 100644 drivers/staging/wlags49_h2/wl_main.c
delete mode 100644 drivers/staging/wlags49_h2/wl_main.h
delete mode 100644 drivers/staging/wlags49_h2/wl_netdev.c
delete mode 100644 drivers/staging/wlags49_h2/wl_netdev.h
delete mode 100644 drivers/staging/wlags49_h2/wl_priv.c
delete mode 100644 drivers/staging/wlags49_h2/wl_priv.h
delete mode 100644 drivers/staging/wlags49_h2/wl_profile.c
delete mode 100644 drivers/staging/wlags49_h2/wl_profile.h
delete mode 100644 drivers/staging/wlags49_h2/wl_util.c
delete mode 100644 drivers/staging/wlags49_h2/wl_util.h
delete mode 100644 drivers/staging/wlags49_h2/wl_version.h
delete mode 100644 drivers/staging/wlags49_h2/wl_wext.c
delete mode 100644 drivers/staging/wlags49_h2/wl_wext.h
delete mode 100644 drivers/staging/wlags49_h25/Kconfig
delete mode 100644 drivers/staging/wlags49_h25/Makefile
delete mode 100644 drivers/staging/wlags49_h25/README.txt
delete mode 100644 drivers/staging/wlags49_h25/TODO
delete mode 100644 drivers/staging/wlags49_h25/ap_h25.c
delete mode 100644 drivers/staging/wlags49_h25/debug.h
delete mode 100644 drivers/staging/wlags49_h25/dhf.c
delete mode 100644 drivers/staging/wlags49_h25/dhf.h
delete mode 100644 drivers/staging/wlags49_h25/dhfcfg.h
delete mode 100644 drivers/staging/wlags49_h25/hcf.c
delete mode 100644 drivers/staging/wlags49_h25/hcf.h
delete mode 100644 drivers/staging/wlags49_h25/hcfcfg.h
delete mode 100644 drivers/staging/wlags49_h25/hcfdef.h
delete mode 100644 drivers/staging/wlags49_h25/mdd.h
delete mode 100644 drivers/staging/wlags49_h25/mmd.c
delete mode 100644 drivers/staging/wlags49_h25/mmd.h
delete mode 100644 drivers/staging/wlags49_h25/sta_h25.c
delete mode 100644 drivers/staging/wlags49_h25/wl_cs.c
delete mode 100644 drivers/staging/wlags49_h25/wl_cs.h
delete mode 100644 drivers/staging/wlags49_h25/wl_enc.c
delete mode 100644 drivers/staging/wlags49_h25/wl_enc.h
delete mode 100644 drivers/staging/wlags49_h25/wl_if.h
delete mode 100644 drivers/staging/wlags49_h25/wl_internal.h
delete mode 100644 drivers/staging/wlags49_h25/wl_main.c
delete mode 100644 drivers/staging/wlags49_h25/wl_main.h
delete mode 100644 drivers/staging/wlags49_h25/wl_netdev.c
delete mode 100644 drivers/staging/wlags49_h25/wl_netdev.h
delete mode 100644 drivers/staging/wlags49_h25/wl_priv.c
delete mode 100644 drivers/staging/wlags49_h25/wl_priv.h
delete mode 100644 drivers/staging/wlags49_h25/wl_profile.c
delete mode 100644 drivers/staging/wlags49_h25/wl_profile.h
delete mode 100644 drivers/staging/wlags49_h25/wl_util.c
delete mode 100644 drivers/staging/wlags49_h25/wl_util.h
delete mode 100644 drivers/staging/wlags49_h25/wl_version.h
delete mode 100644 drivers/staging/wlags49_h25/wl_wext.c
delete mode 100644 drivers/staging/wlags49_h25/wl_wext.h
create mode 100644 include/linux/iio/accel/kxcjk_1013.h
$ git am -3 ../patches/0001-staging-board-disable.patch
Applying: staging: board: disable
$ git reset HEAD^
Unstaged changes after reset:
M drivers/staging/board/Kconfig
$ git add -A .
$ git commit -v -a --amend
[master 4cf6271699b2] Merge remote-tracking branch 'staging/staging-next'
Merging char-misc/char-misc-next (6b5fa7760835 w1: select crc16 library for ds2406)
$ git merge char-misc/char-misc-next
Resolved 'drivers/w1/masters/mxc_w1.c' using previous resolution.
Auto-merging include/asm-generic/vmlinux.lds.h
Auto-merging drivers/w1/masters/mxc_w1.c
CONFLICT (content): Merge conflict in drivers/w1/masters/mxc_w1.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master fb1baf2b0224] Merge remote-tracking branch 'char-misc/char-misc-next'
$ git diff -M --stat --summary HEAD^..
Documentation/w1/slaves/w1_ds2406 | 25 ++
drivers/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/pci/pci-driver.c | 18 +-
drivers/pci/quirks.c | 104 ++++++
drivers/thunderbolt/Kconfig | 13 +
drivers/thunderbolt/Makefile | 3 +
drivers/thunderbolt/cap.c | 116 ++++++
drivers/thunderbolt/ctl.c | 731 ++++++++++++++++++++++++++++++++++++++
drivers/thunderbolt/ctl.h | 75 ++++
drivers/thunderbolt/eeprom.c | 449 +++++++++++++++++++++++
drivers/thunderbolt/nhi.c | 677 +++++++++++++++++++++++++++++++++++
drivers/thunderbolt/nhi.h | 114 ++++++
drivers/thunderbolt/nhi_regs.h | 101 ++++++
drivers/thunderbolt/path.c | 215 +++++++++++
drivers/thunderbolt/switch.c | 507 ++++++++++++++++++++++++++
drivers/thunderbolt/tb.c | 436 +++++++++++++++++++++++
drivers/thunderbolt/tb.h | 271 ++++++++++++++
drivers/thunderbolt/tb_regs.h | 213 +++++++++++
drivers/thunderbolt/tunnel_pci.c | 232 ++++++++++++
drivers/thunderbolt/tunnel_pci.h | 30 ++
drivers/w1/masters/ds1wm.c | 2 +-
drivers/w1/masters/ds2482.c | 2 +-
drivers/w1/masters/ds2490.c | 50 +--
drivers/w1/masters/mxc_w1.c | 64 ++--
drivers/w1/slaves/Kconfig | 8 +
drivers/w1/slaves/Makefile | 1 +
drivers/w1/slaves/w1_ds2406.c | 168 +++++++++
drivers/w1/slaves/w1_ds2760.c | 3 +-
drivers/w1/w1.c | 10 +-
drivers/w1/w1_family.c | 2 +-
drivers/w1/w1_family.h | 1 +
drivers/w1/w1_int.c | 19 +-
drivers/w1/w1_log.h | 4 +-
drivers/w1/w1_netlink.c | 3 +-
include/asm-generic/vmlinux.lds.h | 3 +
include/linux/pci.h | 12 +-
37 files changed, 4601 insertions(+), 84 deletions(-)
create mode 100644 Documentation/w1/slaves/w1_ds2406
create mode 100644 drivers/thunderbolt/Kconfig
create mode 100644 drivers/thunderbolt/Makefile
create mode 100644 drivers/thunderbolt/cap.c
create mode 100644 drivers/thunderbolt/ctl.c
create mode 100644 drivers/thunderbolt/ctl.h
create mode 100644 drivers/thunderbolt/eeprom.c
create mode 100644 drivers/thunderbolt/nhi.c
create mode 100644 drivers/thunderbolt/nhi.h
create mode 100644 drivers/thunderbolt/nhi_regs.h
create mode 100644 drivers/thunderbolt/path.c
create mode 100644 drivers/thunderbolt/switch.c
create mode 100644 drivers/thunderbolt/tb.c
create mode 100644 drivers/thunderbolt/tb.h
create mode 100644 drivers/thunderbolt/tb_regs.h
create mode 100644 drivers/thunderbolt/tunnel_pci.c
create mode 100644 drivers/thunderbolt/tunnel_pci.h
create mode 100644 drivers/w1/slaves/w1_ds2406.c
Merging cgroup/for-next (76bb5ab8f6e3 cpuset: break kernfs active protection in cpuset_write_resmask())
$ git merge cgroup/for-next
Auto-merging mm/mempolicy.c
Auto-merging kernel/cgroup.c
Auto-merging include/linux/kernfs.h
Merge made by the 'recursive' strategy.
fs/kernfs/mount.c | 30 ++++++++++++++++++++++++++
include/linux/kernfs.h | 1 +
kernel/cgroup.c | 58 +++++++++++++++++++++++++++++++++++++++++++-------
kernel/cpuset.c | 20 ++++++++++++++++-
mm/mempolicy.c | 2 --
5 files changed, 100 insertions(+), 11 deletions(-)
Merging scsi/for-next (eed78c36555c Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next)
$ git merge scsi/for-next
Resolved 'include/scsi/sg.h' using previous resolution.
Auto-merging include/scsi/sg.h
CONFLICT (content): Merge conflict in include/scsi/sg.h
Auto-merging include/scsi/scsi_device.h
Auto-merging drivers/target/loopback/tcm_loop.c
Auto-merging drivers/scsi/sd.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 876d905a2a9b] Merge remote-tracking branch 'scsi/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/scsi/tmscsim.txt | 2 -
MAINTAINERS | 9 +-
drivers/ata/libata-scsi.c | 2 +-
drivers/ata/libata.h | 2 +-
drivers/message/fusion/mptbase.h | 2 +-
drivers/message/fusion/mptfc.c | 6 +-
drivers/message/fusion/mptscsih.c | 14 +-
drivers/message/fusion/mptscsih.h | 4 +-
drivers/message/i2o/i2o_scsi.c | 11 +-
drivers/s390/scsi/zfcp_dbf.c | 3 +-
drivers/s390/scsi/zfcp_unit.c | 4 +-
drivers/scsi/Kconfig | 14 -
drivers/scsi/NCR5380.c | 28 +-
drivers/scsi/aacraid/linit.c | 2 +-
drivers/scsi/advansys.c | 2 +-
drivers/scsi/aha152x.c | 6 +-
drivers/scsi/aic7xxx/aic79xx.h | 2 +-
drivers/scsi/aic7xxx/aic79xx_osm.c | 6 +-
drivers/scsi/aic7xxx/aic79xx_proc.c | 2 +-
drivers/scsi/aic7xxx/aic7xxx_osm.c | 11 +-
drivers/scsi/aic7xxx/aic7xxx_proc.c | 2 +-
drivers/scsi/arcmsr/arcmsr_hba.c | 8 +-
drivers/scsi/be2iscsi/be_main.c | 2 +
drivers/scsi/be2iscsi/be_mgmt.c | 4 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 16 +-
drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +
drivers/scsi/ch.c | 14 +-
drivers/scsi/csiostor/csio_scsi.c | 24 +-
drivers/scsi/cxgbi/libcxgbi.c | 2 +-
drivers/scsi/cxgbi/libcxgbi.h | 2 +-
drivers/scsi/dc395x.c | 51 ++-
drivers/scsi/eata.c | 4 +-
drivers/scsi/fnic/fnic_scsi.c | 4 +-
drivers/scsi/hosts.c | 15 +-
drivers/scsi/hpsa.c | 2 +-
drivers/scsi/ibmvscsi/ibmvfc.c | 4 +-
drivers/scsi/ibmvscsi/ibmvscsi.c | 13 +-
drivers/scsi/libiscsi.c | 8 +-
drivers/scsi/libsas/sas_scsi_host.c | 11 +-
drivers/scsi/lpfc/lpfc_attr.c | 10 +-
drivers/scsi/lpfc/lpfc_scsi.c | 36 +-
drivers/scsi/megaraid.c | 6 +-
drivers/scsi/megaraid/mega_common.h | 2 +-
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +-
drivers/scsi/ncr53c8xx.h | 4 -
drivers/scsi/pm8001/pm8001_init.c | 13 +-
drivers/scsi/pmcraid.c | 2 +-
drivers/scsi/qla2xxx/qla_def.h | 6 +-
drivers/scsi/qla2xxx/qla_gbl.h | 18 +-
drivers/scsi/qla2xxx/qla_iocb.c | 11 +-
drivers/scsi/qla2xxx/qla_isr.c | 4 +-
drivers/scsi/qla2xxx/qla_mbx.c | 12 +-
drivers/scsi/qla2xxx/qla_mr.c | 8 +-
drivers/scsi/qla2xxx/qla_os.c | 48 +--
drivers/scsi/qla2xxx/qla_target.c | 17 +-
drivers/scsi/qla2xxx/qla_target.h | 4 +-
drivers/scsi/qla4xxx/ql4_glbl.h | 4 +-
drivers/scsi/qla4xxx/ql4_iocb.c | 2 +-
drivers/scsi/qla4xxx/ql4_isr.c | 22 +-
drivers/scsi/qla4xxx/ql4_mbx.c | 6 +-
drivers/scsi/qla4xxx/ql4_os.c | 20 +-
drivers/scsi/scsi.c | 28 +-
drivers/scsi/scsi_debug.c | 21 +-
drivers/scsi/scsi_error.c | 201 ++++++-----
drivers/scsi/scsi_ioctl.c | 17 +-
drivers/scsi/scsi_lib.c | 22 +-
drivers/scsi/scsi_priv.h | 2 +-
drivers/scsi/scsi_proc.c | 2 +-
drivers/scsi/scsi_scan.c | 152 ++++----
drivers/scsi/scsi_sysfs.c | 14 +-
drivers/scsi/scsi_transport_fc.c | 5 +-
drivers/scsi/scsi_transport_iscsi.c | 4 +-
drivers/scsi/scsi_transport_sas.c | 2 +-
drivers/scsi/sd.c | 46 ++-
drivers/scsi/sd.h | 3 +
drivers/scsi/sg.c | 654 ++++++++++++++++++++---------------
drivers/scsi/sr.c | 61 ++--
drivers/scsi/sr.h | 4 +
drivers/scsi/sr_ioctl.c | 26 +-
drivers/scsi/sr_vendor.c | 36 +-
drivers/scsi/st.c | 605 ++++++++++++++++----------------
drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 +-
drivers/scsi/virtio_scsi.c | 26 +-
drivers/target/loopback/tcm_loop.c | 2 +-
drivers/target/target_core_pscsi.c | 12 +-
drivers/usb/storage/Kconfig | 4 +-
drivers/usb/storage/sddr09.c | 4 +-
drivers/usb/storage/usb.c | 10 +-
include/linux/moduleparam.h | 5 +
include/scsi/scsi.h | 2 +-
include/scsi/scsi_cmnd.h | 2 +-
include/scsi/scsi_device.h | 22 +-
include/scsi/scsi_devinfo.h | 2 +
include/scsi/scsi_host.h | 10 +-
include/scsi/scsi_transport.h | 2 +-
include/scsi/sg.h | 91 ++---
kernel/params.c | 1 +
98 files changed, 1417 insertions(+), 1266 deletions(-)
Merging scsi-core/core-for-3.16 (7bafc240e126 scsi: use the scsi data buffer length to extract transfer size)
$ git merge scsi-core/core-for-3.16
Already up-to-date.
Merging scsi-drivers/drivers-for-3.16 (8faeb529b2da virtio-scsi: fix various bad behavior on aborted requests)
$ git merge scsi-drivers/drivers-for-3.16
Already up-to-date.
Merging target-updates/for-next (a497c3ba1d97 Linux 3.16-rc2)
$ git merge target-updates/for-next
Already up-to-date.
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
$ git merge writeback/writeback-for-next
Already up-to-date.
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
$ git merge hwspinlock/linux-next
Already up-to-date.
Merging pinctrl/for-next (4aba0a02ff80 Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
drivers/pinctrl/Kconfig | 4 +-
drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 250 ++++++++++++++++++++++++++++
drivers/pinctrl/spear/Kconfig | 1 +
drivers/pinctrl/spear/pinctrl-plgpio.c | 81 ++++-----
drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 217 ++++++++++++++++--------
drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 1 +
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 85 ++++++----
drivers/pinctrl/sunxi/pinctrl-sunxi.h | 44 ++++-
12 files changed, 525 insertions(+), 162 deletions(-)
Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
$ git merge vhost/linux-next
Resolved 'drivers/vhost/net.c' using previous resolution.
Auto-merging drivers/vhost/net.c
CONFLICT (content): Merge conflict in drivers/vhost/net.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ca41fb377205] Merge remote-tracking branch 'vhost/linux-next'
$ git diff -M --stat --summary HEAD^..
Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols)
$ git merge remoteproc/for-next
Already up-to-date.
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
$ git merge rpmsg/for-next
Already up-to-date.
Merging gpio/for-next (0fb394122af4 gpio: pxa: Make of_device_id array const)
$ git merge gpio/for-next
Auto-merging drivers/gpio/Kconfig
Merge made by the 'recursive' strategy.
drivers/gpio/Kconfig | 1 +
drivers/gpio/gpio-intel-mid.c | 86 ++++++++++----------------------
drivers/gpio/gpio-lpc32xx.c | 2 +-
drivers/gpio/gpio-pxa.c | 2 +-
drivers/gpio/gpio-stmpe.c | 111 ++++++++++--------------------------------
5 files changed, 55 insertions(+), 147 deletions(-)
Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (39fd3f99aba3 pwm: fsl-ftm: set pwm_chip can_sleep flag)
$ git merge pwm/for-next
Already up-to-date.
Merging dma-buf/for-next (dfb945473ae8 Merge git://www.linux-watchdog.org/linux-watchdog)
$ git merge dma-buf/for-next
Already up-to-date.
Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files)
$ git merge userns/for-next
Resolved 'fs/btrfs/ioctl.c' using previous resolution.
Resolved 'fs/dcache.c' using previous resolution.
Resolved 'fs/namei.c' using previous resolution.
Resolved 'fs/namespace.c' using previous resolution.
Auto-merging kernel/acct.c
Auto-merging include/linux/dcache.h
Auto-merging fs/proc/fd.c
Auto-merging fs/proc/base.c
Auto-merging fs/nfs/dir.c
Auto-merging fs/namespace.c
CONFLICT (content): Merge conflict in fs/namespace.c
Auto-merging fs/namei.c
CONFLICT (content): Merge conflict in fs/namei.c
Auto-merging fs/mount.h
Auto-merging fs/kernfs/dir.c
Auto-merging fs/fuse/dir.c
Auto-merging fs/dcache.c
CONFLICT (content): Merge conflict in fs/dcache.c
Auto-merging fs/ceph/dir.c
Auto-merging fs/btrfs/ioctl.c
CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 519bb1324f02] Merge remote-tracking branch 'userns/for-next'
$ git diff -M --stat --summary HEAD^..
fs/afs/dir.c | 5 --
fs/btrfs/ioctl.c | 6 +--
fs/ceph/dir.c | 1 -
fs/cifs/readdir.c | 6 +--
fs/dcache.c | 140 ++++++++++++++++++-------------------------------
fs/fuse/dir.c | 7 +--
fs/gfs2/dentry.c | 3 --
fs/kernfs/dir.c | 11 ----
fs/mount.h | 22 ++++++++
fs/namei.c | 22 ++++----
fs/namespace.c | 130 +++++++++++++++++++++++++++++++++++++++++----
fs/nfs/dir.c | 7 +--
fs/proc/base.c | 10 +---
fs/proc/fd.c | 2 -
include/linux/dcache.h | 3 +-
kernel/acct.c | 25 +++++++--
16 files changed, 232 insertions(+), 168 deletions(-)
Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect)
$ git merge ktest/for-next
Merge made by the 'recursive' strategy.
tools/testing/ktest/ktest.pl | 581 +++++++++++++++++++---------------------
tools/testing/ktest/sample.conf | 65 ++---
2 files changed, 297 insertions(+), 349 deletions(-)
Merging signal/for-next (20b4fb485227 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 (27b8d5f723e6 clk: flatten clk tree in debugfs)
$ git merge clk/clk-next
Merge made by the 'recursive' strategy.
drivers/clk/clk.c | 114 ++++++++++++++++-----------------------------------
drivers/clk/clkdev.c | 5 ++-
2 files changed, 38 insertions(+), 81 deletions(-)
Merging random/dev (5458c2fecbb8 hw_random: fix sparse warning (NULL vs 0 for pointer))
$ git merge random/dev
Auto-merging drivers/char/random.c
Merge made by the 'recursive' strategy.
drivers/char/hw_random/core.c | 78 +++++++++++++-
drivers/char/random.c | 234 ++++++++++++++++++++++++++----------------
include/linux/hw_random.h | 5 +
3 files changed, 225 insertions(+), 92 deletions(-)
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
$ git merge lzo-update/lzo-update
Auto-merging lib/lzo/lzo1x_decompress_safe.c
Merge made by the 'recursive' strategy.
lib/lzo/lzo1x_decompress_safe.c | 4 ++++
lib/lzo/lzodefs.h | 6 ++++++
2 files changed, 10 insertions(+)
Merging aio/master (855ef0dec727 aio: kill the misleading rcu read locks in ioctx_add_table() and kill_ioctx())
$ git merge aio/master
Auto-merging fs/aio.c
Merge made by the 'recursive' strategy.
fs/aio.c | 56 +++++++++++++++++++-------------------------------------
1 file changed, 19 insertions(+), 37 deletions(-)
Merging llvmlinux/for-next (f9da455b93f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
$ git merge llvmlinux/for-next
Already up-to-date.
Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
$ git merge powernv-cpuidle/powernv-cpuidle
Already up-to-date.
Merging rd-docs/master (d5be754bfca4 Object-like macros are different than function-like macros: https://gcc.gnu.org/onlinedocs/cpp/Object-like-Macros.html https://gcc.gnu.org/onlinedocs/cpp/Function-like-Macros.html)
$ git merge rd-docs/master
Merge made by the 'recursive' strategy.
Documentation/Changes | 9 +++------
scripts/kernel-doc | 15 ++++++++++++---
2 files changed, 15 insertions(+), 9 deletions(-)
Merging akpm-current/current (0ffdd21bf650 fs/dlm/debug_fs.c: remove unnecessary null test before debugfs_remove)
$ git merge --no-ff akpm-current/current
Auto-merging scripts/basic/bin2c.c
Auto-merging net/xfrm/xfrm_policy.c
Auto-merging mm/slub.c
Auto-merging kernel/events/uprobes.c
Auto-merging init/Kconfig
Auto-merging include/scsi/scsi.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/kernel.h
Auto-merging fs/proc/base.c
Auto-merging fs/namespace.c
Auto-merging fs/cifs/smb2pdu.c
Auto-merging fs/cifs/sess.c
Auto-merging fs/cifs/cifssmb.c
Auto-merging drivers/net/ethernet/intel/i40e/i40e_ethtool.c
Auto-merging arch/x86/mm/fault.c
Removing arch/x86/include/asm/scatterlist.h
Auto-merging arch/x86/Makefile
Auto-merging arch/x86/Kconfig
Removing arch/sparc/include/asm/scatterlist.h
Removing arch/score/include/asm/scatterlist.h
Removing arch/s390/include/asm/scatterlist.h
Removing arch/powerpc/kvm/book3s_hv_cma.h
Removing arch/powerpc/kvm/book3s_hv_cma.c
Removing arch/powerpc/include/asm/scatterlist.h
Auto-merging arch/powerpc/Kconfig
Removing arch/mn10300/include/asm/scatterlist.h
Removing arch/microblaze/include/asm/scatterlist.h
Removing arch/m32r/include/asm/scatterlist.h
Removing arch/ia64/include/asm/scatterlist.h
Removing arch/frv/include/asm/scatterlist.h
Removing arch/cris/include/asm/scatterlist.h
Removing arch/arm/include/asm/scatterlist.h
Auto-merging arch/arm/Kconfig
Removing arch/alpha/include/asm/scatterlist.h
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
CREDITS | 7 +
Documentation/ABI/testing/sysfs-fs-nilfs2 | 269 ++++
Documentation/RCU/whatisRCU.txt | 2 +-
Documentation/cgroups/memcg_test.txt | 160 +--
Documentation/kernel-parameters.txt | 8 +-
Documentation/leds/leds-class.txt | 3 -
Documentation/oops-tracing.txt | 2 +
Documentation/printk-formats.txt | 6 +
Documentation/sysctl/kernel.txt | 1 +
.../trace/postprocess/trace-vmscan-postprocess.pl | 14 +-
MAINTAINERS | 19 +-
Makefile | 3 +
arch/alpha/include/asm/Kbuild | 1 +
arch/alpha/include/asm/scatterlist.h | 6 -
arch/arm/Kconfig | 1 +
arch/arm/include/asm/Kbuild | 1 +
arch/arm/include/asm/scatterlist.h | 12 -
arch/arm/mm/dma-mapping.c | 1 +
arch/arm64/Kconfig | 1 +
arch/cris/include/asm/Kbuild | 1 +
arch/cris/include/asm/scatterlist.h | 6 -
arch/frv/include/asm/Kbuild | 1 +
arch/frv/include/asm/scatterlist.h | 6 -
arch/ia64/Kconfig | 1 +
arch/ia64/include/asm/Kbuild | 1 +
arch/ia64/include/asm/scatterlist.h | 7 -
arch/m32r/include/asm/Kbuild | 1 +
arch/m32r/include/asm/scatterlist.h | 6 -
arch/m68k/kernel/sys_m68k.c | 18 +-
arch/microblaze/include/asm/Kbuild | 1 +
arch/microblaze/include/asm/scatterlist.h | 1 -
arch/mn10300/include/asm/Kbuild | 1 +
arch/mn10300/include/asm/scatterlist.h | 16 -
arch/powerpc/Kconfig | 1 +
arch/powerpc/include/asm/Kbuild | 1 +
arch/powerpc/include/asm/scatterlist.h | 17 -
arch/powerpc/kvm/Makefile | 1 -
arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 +-
arch/powerpc/kvm/book3s_hv_builtin.c | 19 +-
arch/powerpc/kvm/book3s_hv_cma.c | 240 ----
arch/powerpc/kvm/book3s_hv_cma.h | 27 -
arch/powerpc/mm/dma-noncoherent.c | 1 +
arch/powerpc/platforms/44x/warp.c | 1 +
arch/powerpc/platforms/52xx/efika.c | 1 +
arch/powerpc/platforms/amigaone/setup.c | 1 +
arch/s390/Kconfig | 1 +
arch/s390/include/asm/Kbuild | 1 +
arch/s390/include/asm/scatterlist.h | 3 -
arch/score/include/asm/Kbuild | 1 +
arch/score/include/asm/scatterlist.h | 6 -
arch/sh/drivers/dma/Kconfig | 5 +-
arch/sh/include/cpu-sh4/cpu/dma-register.h | 1 -
arch/sh/include/cpu-sh4a/cpu/dma.h | 3 +-
arch/sparc/Kconfig | 1 +
arch/sparc/include/asm/Kbuild | 1 +
arch/sparc/include/asm/scatterlist.h | 8 -
arch/um/include/asm/Kbuild | 1 +
arch/x86/Kbuild | 4 +
arch/x86/Kconfig | 4 +
arch/x86/Makefile | 8 +
arch/x86/include/asm/Kbuild | 3 +-
arch/x86/include/asm/crash.h | 9 +
arch/x86/include/asm/kexec-bzimage64.h | 6 +
arch/x86/include/asm/kexec.h | 45 +
arch/x86/include/asm/numa.h | 1 -
arch/x86/include/asm/pgtable_64.h | 3 +-
arch/x86/include/asm/scatterlist.h | 8 -
arch/x86/kernel/Makefile | 1 +
arch/x86/kernel/crash.c | 563 ++++++++
arch/x86/kernel/kexec-bzimage64.c | 532 +++++++
arch/x86/kernel/machine_kexec_64.c | 228 +++
arch/x86/mm/fault.c | 2 +-
arch/x86/mm/init_64.c | 36 +-
arch/x86/mm/numa.c | 34 +-
arch/x86/purgatory/Makefile | 30 +
arch/x86/purgatory/entry64.S | 101 ++
arch/x86/purgatory/purgatory.c | 72 +
arch/x86/purgatory/setup-x86_64.S | 58 +
arch/x86/purgatory/sha256.c | 283 ++++
arch/x86/purgatory/sha256.h | 22 +
arch/x86/purgatory/stack.S | 19 +
arch/x86/purgatory/string.c | 13 +
arch/x86/syscalls/syscall_64.tbl | 1 +
block/genhd.c | 2 +-
crypto/zlib.c | 8 +-
drivers/ata/Kconfig | 1 +
drivers/ata/libata-core.c | 72 +-
drivers/base/Kconfig | 10 -
drivers/base/dma-contiguous.c | 220 +--
drivers/base/memory.c | 30 +-
drivers/base/node.c | 2 +-
drivers/block/zram/zram_drv.c | 76 +-
drivers/block/zram/zram_drv.h | 29 +-
drivers/firmware/efi/runtime-map.c | 21 +
drivers/gpu/drm/drm_hashtab.c | 2 +-
drivers/hwmon/asus_atk0110.c | 2 +-
drivers/input/Kconfig | 9 +
drivers/input/Makefile | 3 +
drivers/input/input.c | 6 +
drivers/input/leds.c | 249 ++++
drivers/leds/Kconfig | 3 -
drivers/misc/ti-st/st_core.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 +-
drivers/net/irda/donauboe.c | 15 +-
drivers/parport/parport_ip32.c | 2 +-
drivers/rtc/Kconfig | 19 +-
drivers/rtc/rtc-ds1343.c | 75 +-
drivers/rtc/rtc-ds1742.c | 2 +-
drivers/rtc/rtc-efi.c | 32 +-
drivers/staging/lustre/lustre/libcfs/hash.c | 4 +-
drivers/tty/Kconfig | 4 +
drivers/tty/vt/keyboard.c | 110 +-
drivers/video/backlight/backlight.c | 2 -
fs/adfs/adfs.h | 1 +
fs/adfs/dir.c | 2 +-
fs/adfs/dir_fplus.c | 9 +-
fs/autofs4/inode.c | 2 +-
fs/bfs/bfs.h | 1 +
fs/bfs/dir.c | 4 +-
fs/bfs/inode.c | 8 +-
fs/binfmt_elf.c | 21 +-
fs/cachefiles/bind.c | 6 +-
fs/cachefiles/daemon.c | 6 +-
fs/cifs/cifsacl.c | 2 +-
fs/cifs/cifssmb.c | 20 +-
fs/cifs/file.c | 4 +-
fs/cifs/sess.c | 2 +-
fs/cifs/smb2file.c | 4 +-
fs/cifs/smb2misc.c | 38 +-
fs/cifs/smb2ops.c | 2 +-
fs/cifs/smb2pdu.c | 2 +-
fs/cifs/smb2pdu.h | 28 +-
fs/coda/cache.c | 2 +-
fs/coda/coda_linux.c | 2 +-
fs/coda/dir.c | 3 +-
fs/coda/file.c | 2 +-
fs/coda/inode.c | 4 +-
fs/coda/pioctl.c | 2 +-
fs/coda/psdev.c | 2 +-
fs/coda/upcall.c | 2 +-
fs/compat.c | 2 +-
fs/dlm/debug_fs.c | 15 +-
fs/efs/namei.c | 11 +-
fs/exec.c | 4 -
fs/exofs/ore_raid.c | 2 +-
fs/ext4/fsync.c | 5 +-
fs/hfsplus/catalog.c | 89 +-
fs/hfsplus/dir.c | 11 +-
fs/hfsplus/hfsplus_fs.h | 4 +-
fs/hfsplus/super.c | 4 +-
fs/hpfs/dnode.c | 17 +-
fs/isofs/Makefile | 2 +
fs/isofs/compress.c | 10 +-
fs/isofs/export.c | 11 +-
fs/isofs/inode.c | 88 +-
fs/isofs/namei.c | 5 +-
fs/isofs/rock.c | 44 +-
fs/jffs2/compr_zlib.c | 7 +-
fs/mpage.c | 23 +-
fs/namespace.c | 2 +-
fs/nilfs2/Makefile | 2 +-
fs/nilfs2/nilfs.h | 8 +
fs/nilfs2/super.c | 11 +-
fs/nilfs2/sysfs.c | 1137 +++++++++++++++
fs/nilfs2/sysfs.h | 176 +++
fs/nilfs2/the_nilfs.c | 17 +-
fs/nilfs2/the_nilfs.h | 20 +-
fs/notify/inode_mark.c | 2 +-
fs/notify/vfsmount_mark.c | 2 +-
fs/ocfs2/alloc.c | 15 +-
fs/ocfs2/aops.c | 21 +-
fs/ocfs2/cluster/quorum.c | 13 +-
fs/ocfs2/cluster/tcp.c | 45 +-
fs/ocfs2/cluster/tcp.h | 1 +
fs/ocfs2/dlm/dlmdomain.c | 5 +-
fs/ocfs2/dlm/dlmmaster.c | 12 +-
fs/ocfs2/inode.c | 10 +-
fs/ocfs2/ioctl.c | 129 +-
fs/ocfs2/move_extents.c | 2 +-
fs/ocfs2/refcounttree.c | 2 +-
fs/ocfs2/slot_map.c | 2 +-
fs/omfs/inode.c | 2 +-
fs/proc/base.c | 2 +-
fs/proc/kcore.c | 2 +-
fs/proc/meminfo.c | 2 +-
fs/proc/proc_sysctl.c | 2 +-
fs/proc/stat.c | 22 +-
fs/pstore/ram_core.c | 2 +-
fs/qnx6/Makefile | 1 +
fs/qnx6/dir.c | 26 +-
fs/qnx6/inode.c | 99 +-
fs/qnx6/namei.c | 6 +-
fs/qnx6/qnx6.h | 12 +-
fs/qnx6/super_mmi.c | 22 +-
fs/ramfs/file-nommu.c | 2 +-
fs/reiserfs/dir.c | 2 +-
fs/reiserfs/do_balan.c | 2 +-
fs/reiserfs/file.c | 2 +-
fs/reiserfs/ibalance.c | 2 +-
fs/reiserfs/inode.c | 2 +-
fs/reiserfs/ioctl.c | 2 +-
fs/reiserfs/item_ops.c | 4 +-
fs/reiserfs/lbalance.c | 2 +-
fs/reiserfs/prints.c | 4 +-
fs/reiserfs/procfs.c | 2 +-
fs/reiserfs/stree.c | 2 +-
fs/reiserfs/super.c | 9 +-
fs/reiserfs/xattr.c | 22 +-
fs/reiserfs/xattr_acl.c | 2 +-
fs/reiserfs/xattr_security.c | 2 +-
fs/reiserfs/xattr_trusted.c | 2 +-
fs/reiserfs/xattr_user.c | 2 +-
fs/romfs/super.c | 23 +-
fs/seq_file.c | 30 +-
fs/squashfs/file_direct.c | 2 +-
fs/squashfs/super.c | 5 +-
fs/ufs/Makefile | 1 +
fs/ufs/super.c | 304 ++--
fs/ufs/ufs.h | 10 +-
include/linux/cma.h | 27 +
include/linux/crc64_ecma.h | 56 +
include/linux/decompress/bunzip2.h | 8 +-
include/linux/decompress/generic.h | 10 +-
include/linux/decompress/inflate.h | 8 +-
include/linux/decompress/unlz4.h | 8 +-
include/linux/decompress/unlzma.h | 8 +-
include/linux/decompress/unlzo.h | 8 +-
include/linux/decompress/unxz.h | 8 +-
include/linux/dma-contiguous.h | 11 +-
include/linux/efi.h | 19 +
include/linux/fs.h | 2 +-
include/linux/gfp.h | 2 +-
include/linux/glob.h | 10 +
include/linux/huge_mm.h | 4 -
include/linux/hugetlb.h | 8 -
include/linux/hugetlb_inline.h | 7 +
include/linux/input.h | 21 +
include/linux/ioport.h | 6 +
include/linux/kernel.h | 38 +-
include/linux/kexec.h | 101 +-
include/linux/klist.h | 2 +-
include/linux/list.h | 14 +-
include/linux/memblock.h | 4 +-
include/linux/memcontrol.h | 94 +-
include/linux/memory_hotplug.h | 9 +-
include/linux/mm_types.h | 1 +
include/linux/mmdebug.h | 2 +
include/linux/mmzone.h | 2 +
include/linux/page-flags.h | 21 +-
include/linux/page_cgroup.h | 70 +-
include/linux/pagemap.h | 28 +
include/linux/rculist.h | 8 +-
include/linux/scatterlist.h | 2 +-
include/linux/sched.h | 2 +
include/linux/shm.h | 18 +-
include/linux/slab.h | 14 +-
include/linux/string.h | 1 +
include/linux/swap.h | 16 +-
include/linux/syscalls.h | 4 +
include/linux/sysctl.h | 2 -
include/linux/user_namespace.h | 6 +-
include/linux/zbud.h | 2 +-
include/linux/zlib.h | 4 +-
include/linux/zpool.h | 224 +++
include/scsi/scsi.h | 2 +-
include/trace/events/migrate.h | 1 +
include/uapi/linux/kexec.h | 11 +
init/Kconfig | 51 +-
init/do_mounts.c | 12 +-
init/do_mounts_rd.c | 10 +-
init/initramfs.c | 58 +-
ipc/shm.c | 75 +-
kernel/Makefile | 2 +-
kernel/auditfilter.c | 4 +-
kernel/bounds.c | 2 -
kernel/events/uprobes.c | 15 +-
kernel/fork.c | 59 +-
kernel/gcov/fs.c | 3 +-
kernel/kexec.c | 1326 +++++++++++++++--
kernel/panic.c | 1 +
kernel/posix-timers.c | 57 +-
kernel/printk/printk.c | 101 +-
kernel/resource.c | 101 +-
kernel/sys_ni.c | 1 +
kernel/sysctl.c | 9 +-
kernel/test_kprobes.c | 87 +-
kernel/user_namespace.c | 6 +-
kernel/watchdog.c | 11 +-
lib/Kconfig | 47 +
lib/Makefile | 3 +
lib/cmdline.c | 15 +-
lib/crc64_ecma.c | 341 +++++
lib/decompress.c | 2 +-
lib/decompress_bunzip2.c | 26 +-
lib/decompress_inflate.c | 12 +-
lib/decompress_unlz4.c | 83 +-
lib/decompress_unlzma.c | 28 +-
lib/decompress_unlzo.c | 12 +-
lib/decompress_unxz.c | 10 +-
lib/glob.c | 287 ++++
lib/idr.c | 25 +-
lib/klist.c | 6 +-
lib/list_sort.c | 71 +-
lib/scatterlist.c | 4 +-
lib/string_helpers.c | 15 +-
lib/test-kstrtox.c | 2 +-
lib/vsprintf.c | 20 +-
mm/Kconfig | 54 +-
mm/Makefile | 2 +
mm/cma.c | 335 +++++
mm/compaction.c | 17 +-
mm/filemap.c | 17 +-
mm/huge_memory.c | 65 +-
mm/hugetlb.c | 130 +-
mm/hwpoison-inject.c | 3 +-
mm/internal.h | 2 +-
mm/madvise.c | 3 -
mm/memcontrol.c | 1517 ++++++++------------
mm/memory-failure.c | 25 +-
mm/memory.c | 55 +-
mm/memory_hotplug.c | 17 +-
mm/migrate.c | 44 +-
mm/mmap.c | 5 +
mm/msync.c | 3 +-
mm/page_alloc.c | 42 +-
mm/readahead.c | 3 +-
mm/rmap.c | 30 +-
mm/shmem.c | 164 +--
mm/slab.c | 553 +++----
mm/slab.h | 47 +-
mm/slub.c | 235 ++-
mm/swap.c | 54 +-
mm/swap_state.c | 8 +-
mm/swapfile.c | 21 +-
mm/truncate.c | 20 +-
mm/util.c | 30 +
mm/vmalloc.c | 16 +-
mm/vmscan.c | 154 +-
mm/zbud.c | 123 +-
mm/zpool.c | 207 +++
mm/zsmalloc.c | 83 ++
mm/zswap.c | 82 +-
net/batman-adv/fragmentation.c | 2 +-
net/bridge/br_multicast.c | 2 +-
net/ipv4/fib_trie.c | 2 +-
net/ipv6/addrlabel.c | 2 +-
net/xfrm/xfrm_policy.c | 4 +-
scripts/.gitignore | 1 -
scripts/Makefile | 1 -
scripts/basic/.gitignore | 1 +
scripts/basic/Makefile | 1 +
scripts/{ => basic}/bin2c.c | 7 +-
scripts/checkpatch.pl | 163 ++-
scripts/coccinelle/free/ifnullfree.cocci | 53 +
scripts/tags.sh | 2 +
tools/testing/selftests/cpu-hotplug/Makefile | 2 +-
tools/testing/selftests/ipc/msgque.c | 5 +
tools/testing/selftests/memory-hotplug/Makefile | 2 +-
359 files changed, 10717 insertions(+), 4476 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-fs-nilfs2
delete mode 100644 arch/alpha/include/asm/scatterlist.h
delete mode 100644 arch/arm/include/asm/scatterlist.h
delete mode 100644 arch/cris/include/asm/scatterlist.h
delete mode 100644 arch/frv/include/asm/scatterlist.h
delete mode 100644 arch/ia64/include/asm/scatterlist.h
delete mode 100644 arch/m32r/include/asm/scatterlist.h
delete mode 100644 arch/microblaze/include/asm/scatterlist.h
delete mode 100644 arch/mn10300/include/asm/scatterlist.h
delete mode 100644 arch/powerpc/include/asm/scatterlist.h
delete mode 100644 arch/powerpc/kvm/book3s_hv_cma.c
delete mode 100644 arch/powerpc/kvm/book3s_hv_cma.h
delete mode 100644 arch/s390/include/asm/scatterlist.h
delete mode 100644 arch/score/include/asm/scatterlist.h
delete mode 100644 arch/sparc/include/asm/scatterlist.h
create mode 100644 arch/x86/include/asm/crash.h
create mode 100644 arch/x86/include/asm/kexec-bzimage64.h
delete mode 100644 arch/x86/include/asm/scatterlist.h
create mode 100644 arch/x86/kernel/kexec-bzimage64.c
create mode 100644 arch/x86/purgatory/Makefile
create mode 100644 arch/x86/purgatory/entry64.S
create mode 100644 arch/x86/purgatory/purgatory.c
create mode 100644 arch/x86/purgatory/setup-x86_64.S
create mode 100644 arch/x86/purgatory/sha256.c
create mode 100644 arch/x86/purgatory/sha256.h
create mode 100644 arch/x86/purgatory/stack.S
create mode 100644 arch/x86/purgatory/string.c
create mode 100644 drivers/input/leds.c
create mode 100644 fs/nilfs2/sysfs.c
create mode 100644 fs/nilfs2/sysfs.h
create mode 100644 include/linux/cma.h
create mode 100644 include/linux/crc64_ecma.h
create mode 100644 include/linux/glob.h
create mode 100644 include/linux/zpool.h
create mode 100644 lib/crc64_ecma.c
create mode 100644 lib/glob.c
create mode 100644 mm/cma.c
create mode 100644 mm/zpool.c
rename scripts/{ => basic}/bin2c.c (88%)
create mode 100644 scripts/coccinelle/free/ifnullfree.cocci
$ git am -3 ../patches/0001-purgatory-run-host-built-programs-from-objtree.patch
Applying: purgatory: run host built programs from objtree
$ 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: drivers/gpio/gpio-zevio.c: fix build
Applying: init/main.c: code clean-up
Applying: arch/arm/mach-omap2: replace strict_strto* with kstrto*
Applying: arch/arm/mach-pxa: replace strict_strto call with kstrto
Applying: arch/arm/mach-s3c24xx/mach-jive.c: replace strict_strto* with kstrto*
Applying: arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto
Applying: arch/powerpc: replace obsolete strict_strto* calls
Applying: arch/x86: replace strict_strto calls
Applying: drivers/scsi: replace strict_strto calls
Applying: net/sunrpc: replace strict_strto calls
Applying: drivers/staging/emxx_udc/emxx_udc.c: replace strict_strto() with kstrto()
Applying: include/linux: remove strict_strto* definitions
Applying: pci-dma-compat: add pci_zalloc_consistent helper
Applying: atm: use pci_zalloc_consistent
Applying: block: use pci_zalloc_consistent
Applying: crypto: use pci_zalloc_consistent
Applying: infiniband: use pci_zalloc_consistent
Applying: i810: use pci_zalloc_consistent
Applying: media: use pci_zalloc_consistent
Applying: amd: use pci_zalloc_consistent
Applying: atl1e: use pci_zalloc_consistent
Applying: enic: use pci_zalloc_consistent
Applying: sky2: use pci_zalloc_consistent
Applying: micrel: use pci_zalloc_consistent
Applying: qlogic: use pci_zalloc_consistent
Applying: irda: use pci_zalloc_consistent
Applying: ipw2100: use pci_zalloc_consistent
Applying: mwl8k: use pci_zalloc_consistent
Applying: rtl818x: use pci_zalloc_consistent
Applying: rtlwifi: use pci_zalloc_consistent
Applying: scsi: use pci_zalloc_consistent
Applying: staging: use pci_zalloc_consistent
Applying: synclink_gt: use pci_zalloc_consistent
Applying: vme: bridges: use pci_zalloc_consistent
Applying: drivers/net/ethernet/amd/pcnet32.c: neaten and remove unnecessary OOM messages
Applying: kernel/kprobes.c: convert printk to pr_foo()
Applying: mm: replace remap_file_pages() syscall with emulation
Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix
Applying: mm: remap_file_pages: initialize populate before usage
Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping
Applying: memcg: deprecate memory.force_empty knob
Applying: memcg-deprecate-memoryforce_empty-knob-fix
Applying: fat: add i_disksize to represent uninitialized size
Applying: fat: add fat_fallocate operation
Applying: fat: zero out seek range on _fat_get_block
Applying: fat: fallback to buffered write in case of fallocated region on direct IO
Applying: fat: permit to return phy block number by fibmap in fallocated region
Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
+ d3b09b5fb435...0d6a92631f18 akpm -> akpm/master (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (0d6a92631f18 mm: add strictlimit knob)
$ git merge --no-ff akpm/master
Removing mm/fremap.c
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-class-bdi | 8 +
Documentation/cgroups/memory.txt | 3 +
Documentation/filesystems/vfat.txt | 10 +
Documentation/vm/remap_file_pages.txt | 7 +-
arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
arch/arm/mach-omap2/mux.c | 22 +-
arch/arm/mach-pxa/balloon3.c | 2 +-
arch/arm/mach-pxa/viper.c | 2 +-
arch/arm/mach-s3c24xx/mach-jive.c | 2 +-
arch/arm/mach-w90x900/cpu.c | 3 +-
arch/powerpc/kernel/setup_64.c | 6 +-
arch/powerpc/kernel/vio.c | 2 +-
arch/powerpc/platforms/pseries/dlpar.c | 4 +-
arch/powerpc/platforms/pseries/mobility.c | 2 +-
arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +-
arch/x86/kernel/cpu/mcheck/mce.c | 6 +-
arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +-
arch/x86/kvm/mmu_audit.c | 2 +-
arch/x86/platform/uv/tlb_uv.c | 2 +-
drivers/atm/he.c | 31 ++-
drivers/atm/idt77252.c | 15 +-
drivers/block/DAC960.c | 18 +-
drivers/block/cciss.c | 11 +-
drivers/block/skd_main.c | 25 +-
drivers/crypto/hifn_795x.c | 5 +-
drivers/gpio/gpio-zevio.c | 4 +
drivers/gpu/drm/i810/i810_dma.c | 5 +-
drivers/infiniband/hw/amso1100/c2.c | 6 +-
drivers/infiniband/hw/nes/nes_hw.c | 12 +-
drivers/infiniband/hw/nes/nes_verbs.c | 5 +-
drivers/media/common/saa7146/saa7146_core.c | 15 +-
drivers/media/common/saa7146/saa7146_fops.c | 5 +-
drivers/media/pci/bt8xx/bt878.c | 16 +-
drivers/media/pci/ngene/ngene-core.c | 7 +-
drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 11 +-
drivers/media/usb/ttusb-dec/ttusb_dec.c | 11 +-
drivers/net/ethernet/amd/pcnet32.c | 45 ++--
drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 7 +-
drivers/net/ethernet/cisco/enic/vnic_dev.c | 8 +-
drivers/net/ethernet/marvell/sky2.c | 5 +-
drivers/net/ethernet/micrel/ksz884x.c | 7 +-
.../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 4 +-
drivers/net/ethernet/qlogic/qlge/qlge_main.c | 11 +-
drivers/net/irda/vlsi_ir.c | 4 +-
drivers/net/wireless/ipw2x00/ipw2100.c | 16 +-
drivers/net/wireless/mwl8k.c | 6 +-
drivers/net/wireless/rtl818x/rtl8180/dev.c | 11 +-
drivers/net/wireless/rtlwifi/pci.c | 17 +-
drivers/scsi/3w-sas.c | 5 +-
drivers/scsi/a100u2w.c | 8 +-
drivers/scsi/be2iscsi/be_main.c | 10 +-
drivers/scsi/be2iscsi/be_mgmt.c | 3 +-
drivers/scsi/csiostor/csio_wr.c | 8 +-
drivers/scsi/eata.c | 5 +-
drivers/scsi/hpsa.c | 8 +-
drivers/scsi/megaraid/megaraid_mbox.c | 16 +-
drivers/scsi/megaraid/megaraid_sas_base.c | 8 +-
drivers/scsi/mesh.c | 6 +-
drivers/scsi/mvumi.c | 9 +-
drivers/scsi/pm8001/pm8001_sas.c | 5 +-
drivers/scsi/pmcraid.c | 4 +-
drivers/scsi/scsi_sysfs.c | 4 +-
drivers/staging/emxx_udc/emxx_udc.c | 5 +-
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 15 +-
drivers/staging/rtl8192ee/pci.c | 37 +--
drivers/staging/rtl8821ae/pci.c | 36 +--
drivers/staging/slicoss/slicoss.c | 9 +-
drivers/staging/vt6655/device_main.c | 40 +--
drivers/tty/synclink_gt.c | 5 +-
drivers/vme/bridges/vme_ca91cx42.c | 6 +-
drivers/vme/bridges/vme_tsi148.c | 6 +-
drivers/w1/w1_int.c | 3 +-
fs/fat/cache.c | 70 +++--
fs/fat/fat.h | 6 +-
fs/fat/file.c | 78 +++++-
fs/fat/inode.c | 87 ++++++-
include/asm-generic/pci-dma-compat.h | 8 +
include/linux/fs.h | 8 +-
include/linux/kernel.h | 4 -
init/main.c | 23 +-
kernel/kprobes.c | 36 +--
mm/Makefile | 2 +-
mm/backing-dev.c | 35 +++
mm/fremap.c | 283 ---------------------
mm/memcontrol.c | 5 +
mm/mmap.c | 69 +++++
mm/nommu.c | 8 -
net/sunrpc/addr.c | 16 +-
net/sunrpc/auth.c | 2 +-
net/sunrpc/xprtsock.c | 4 +-
90 files changed, 659 insertions(+), 782 deletions(-)
delete mode 100644 mm/fremap.c