path: root/Next/merge.log

$ date -R
Wed, 16 Sep 2015 08:49:59 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 9c488de24f72 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Merging origin/master (09a77a885233 modsign: Fix GPL/OpenSSL licence incompatibility)
$ git merge origin/master
Updating 9c488de24f72..09a77a885233
Fast-forward
 drivers/clk/h8300/clk-h8s2678.c   |  1 +
 drivers/clk/hisilicon/Kconfig     |  8 +++++++-
 drivers/clk/hisilicon/Makefile    |  3 ++-
 drivers/clk/rockchip/clk-rk3188.c |  9 +++++++--
 scripts/extract-cert.c            | 10 +++++-----
 scripts/sign-file.c               | 13 ++++++++-----
 6 files changed, 30 insertions(+), 14 deletions(-)
Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (c2172ce23030 Merge branch 'uaccess' into fixes)
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (1ecb40643a9a m68k/bootinfo: Use kmemdup rather than duplicating its implementation)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
$ git merge mips-fixes/mips-fixes
Already up-to-date.
Merging powerpc-fixes/fixes (e297c939b745 powerpc/MSI: Fix race condition in tearing down MSI interrupts)
$ git merge powerpc-fixes/fixes
Merge made by the 'recursive' strategy.
 arch/powerpc/include/asm/systbl.h         |  1 +
 arch/powerpc/include/asm/unistd.h         |  2 +-
 arch/powerpc/include/uapi/asm/unistd.h    |  1 +
 arch/powerpc/platforms/pasemi/msi.c       |  5 +++--
 arch/powerpc/platforms/powernv/pci-ioda.c | 16 +++++++++++++++-
 arch/powerpc/platforms/powernv/pci.c      |  5 +++--
 arch/powerpc/platforms/pseries/dlpar.c    |  4 +++-
 arch/powerpc/sysdev/fsl_msi.c             |  5 +++--
 arch/powerpc/sysdev/mpic_u3msi.c          |  5 +++--
 arch/powerpc/sysdev/ppc4xx_msi.c          |  5 +++--
 drivers/misc/cxl/vphb.c                   |  6 ++++++
 11 files changed, 42 insertions(+), 13 deletions(-)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
$ git merge powerpc-merge-mpe/fixes
Already up-to-date.
Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
$ git merge sparc/master
Merge made by the 'recursive' strategy.
 arch/sparc/include/uapi/asm/asi.h |  2 +-
 arch/sparc/lib/VISsave.S          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
Merging net/master (892aa01df2ad net: stmmac: Use msleep rather then udelay for reset delay)
$ git merge net/master
Merge made by the 'recursive' strategy.
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |   6 +-
 drivers/net/ethernet/marvell/mvneta.c             |   4 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c |  11 +-
 drivers/net/irda/ali-ircc.c                       |   6 -
 include/net/ip6_tunnel.h                          |  15 ++-
 net/bridge/br_multicast.c                         |   4 +-
 net/core/filter.c                                 |   2 +-
 net/core/rtnetlink.c                              |  26 +++--
 net/ipv6/addrconf.c                               |   7 +-
 net/ipv6/ip6_fib.c                                |  20 +++-
 net/ipv6/ip6_gre.c                                |  77 ++++++++-----
 net/ipv6/ip6_tunnel.c                             | 131 ++++++++++++++++------
 net/ipv6/route.c                                  |   7 +-
 net/netlink/af_netlink.c                          |  30 +++--
 net/netlink/af_netlink.h                          |   9 ++
 net/openvswitch/Kconfig                           |   3 +-
 net/sctp/protocol.c                               |  64 +++++++----
 17 files changed, 286 insertions(+), 136 deletions(-)
Merging ipsec/master (04a6b8bfee06 xfrm6: Fix ICMPv6 and MH header checks in _decode_session6)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
 net/ipv6/xfrm6_output.c | 17 +++++++++++------
 net/ipv6/xfrm6_policy.c |  6 ++++--
 2 files changed, 15 insertions(+), 8 deletions(-)
Merging sound-current/for-linus (5ee20bc79246 ALSA: usb-audio: Change internal PCM order)
$ git merge sound-current/for-linus
Already up-to-date.
Merging pci-current/for-linus (d5da9d99d4d7 PCI: Revert "PCI: Call pci_read_bridge_bases() from core instead of arch code")
$ git merge pci-current/for-linus
Merge made by the 'recursive' strategy.
 arch/alpha/kernel/pci.c          | 7 ++++++-
 arch/frv/mb93090-mb00/pci-vdk.c  | 2 ++
 arch/ia64/pci/pci.c              | 5 +++--
 arch/microblaze/pci/pci-common.c | 9 ++++++++-
 arch/mips/pci/pci.c              | 6 ++++++
 arch/mn10300/unit-asb2305/pci.c  | 1 +
 arch/powerpc/kernel/pci-common.c | 8 +++++++-
 arch/x86/pci/common.c            | 1 +
 arch/xtensa/kernel/pci.c         | 4 ++++
 drivers/parisc/dino.c            | 3 +++
 drivers/parisc/lba_pci.c         | 1 +
 drivers/pci/probe.c              | 6 ------
 12 files changed, 42 insertions(+), 11 deletions(-)
Merging wireless-drivers/master (741e3b9902d1 rtlwifi: rtl8723be: Add module parameter for MSI interrupts)
$ git merge wireless-drivers/master
Already up-to-date.
Merging driver-core.current/driver-core-linus (6ff33f3902c3 Linux 4.3-rc1)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (6ff33f3902c3 Linux 4.3-rc1)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (6ff33f3902c3 Linux 4.3-rc1)
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (762982db33b2 usb: phy: phy-generic: Fix reset behaviour on legacy boot)
$ git merge usb-gadget-fixes/fixes
Merge made by the 'recursive' strategy.
 drivers/usb/dwc3/dwc3-omap.c        |  4 ++--
 drivers/usb/gadget/epautoconf.c     |  1 +
 drivers/usb/gadget/udc/amd5536udc.c | 43 +++++++++++++++++--------------------
 drivers/usb/musb/musb_core.c        |  7 ++++++
 drivers/usb/musb/ux500.c            |  2 ++
 drivers/usb/phy/Kconfig             |  2 +-
 drivers/usb/phy/phy-generic.c       |  3 ++-
 7 files changed, 35 insertions(+), 27 deletions(-)
Merging usb-serial-fixes/usb-linus (19ab6bc5674a USB: option: add ZTE PIDs)
$ git merge usb-serial-fixes/usb-linus
Merge made by the 'recursive' strategy.
 drivers/usb/serial/option.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
Merging staging.current/staging-linus (8b5081c876bd staging: unisys: visornic: handle error return from device registration)
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
 MAINTAINERS                                     |  4 ++--
 drivers/staging/android/TODO                    | 20 ++++++++++++++++++++
 drivers/staging/fbtft/fb_uc1611.c               |  2 +-
 drivers/staging/fbtft/fb_watterott.c            |  4 ++--
 drivers/staging/fbtft/fbtft-core.c              | 10 +++-------
 drivers/staging/fbtft/flexfb.c                  | 11 ++++-------
 drivers/staging/lustre/README.txt               | 16 ++++++----------
 drivers/staging/most/Kconfig                    |  1 +
 drivers/staging/most/hdm-usb/Kconfig            |  2 +-
 drivers/staging/most/mostcore/Kconfig           |  1 +
 drivers/staging/unisys/visorbus/visorbus_main.c | 13 +++++++++----
 drivers/staging/unisys/visornic/visornic_main.c | 18 +++++++++++-------
 12 files changed, 61 insertions(+), 41 deletions(-)
Merging char-misc.current/char-misc-linus (6ff33f3902c3 Linux 4.3-rc1)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (53431d0a3534 Merge branch 'next' into for-linus)
$ git merge input-current/for-linus
Already up-to-date.
Merging crypto-current/master (84cba178a3b8 crypto: testmgr - don't copy from source IV too much)
$ git merge crypto-current/master
Merge made by the 'recursive' strategy.
 crypto/testmgr.c                          | 5 +++--
 drivers/crypto/Kconfig                    | 2 +-
 drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
$ git merge ide/master
Already up-to-date.
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
$ git merge devicetree-current/devicetree/merge
Already up-to-date.
Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
$ git merge rr-fixes/fixes
Merge made by the 'recursive' strategy.
 kernel/module.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (ae7858180510 selftests: exec: revert to default emit rule)
$ git merge kselftest-fixes/fixes
Merge made by the 'recursive' strategy.
 tools/testing/selftests/Makefile               |  2 +-
 tools/testing/selftests/exec/Makefile          |  4 +--
 tools/testing/selftests/ftrace/Makefile        |  2 +-
 tools/testing/selftests/lib.mk                 | 11 +++-----
 tools/testing/selftests/mqueue/Makefile        | 10 +++----
 tools/testing/selftests/seccomp/seccomp_bpf.c  | 37 +++++++++++++++++++++++++-
 tools/testing/selftests/seccomp/test_harness.h |  7 ++---
 tools/testing/selftests/zram/zram.sh           | 10 +------
 tools/testing/selftests/zram/zram_lib.sh       |  3 ++-
 9 files changed, 52 insertions(+), 34 deletions(-)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
$ git merge backlight-fixes/for-backlight-fixes
Already up-to-date.
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
$ git merge ftrace-fixes/for-next-urgent
Already up-to-date.
Merging mfd-fixes/for-mfd-fixes (fb9caeedafe6 mfd: Remove MFD_CROS_EC_SPI depends on OF)
$ git merge mfd-fixes/for-mfd-fixes
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (c13dcf9f2d6f Linux 4.2-rc8)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up-to-date.
Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge arc/for-next
Already up-to-date.
Merging arm/for-next (4cd545806d3c Merge branch 'drm-dwhdmi-devel' into for-next)
$ git merge arm/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm-perf/for-next/perf (6ff33f3902c3 Linux 4.3-rc1)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (f47c3594f854 Merge branch 'next/late' into for-next)
$ git merge arm-soc/for-next
Resolved 'Documentation/devicetree/bindings/serial/mtk-uart.txt' using previous resolution.
Auto-merging Documentation/devicetree/bindings/serial/mtk-uart.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/serial/mtk-uart.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7ad67eaecdf6] Merge remote-tracking branch 'arm-soc/for-next'
$ git diff -M --stat --summary HEAD^..
 arch/arm/arm-soc-for-next-contents.txt | 303 +++++++++++++++++++++++++++++++++
 1 file changed, 303 insertions(+)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging at91/at91-next (253ebd4df402 Merge branch 'at91-4.3-defconfig' into at91-next)
$ git merge at91/at91-next
Resolved 'arch/arm/configs/at91_dt_defconfig' using previous resolution.
Resolved 'arch/arm/mach-at91/sama5.c' using previous resolution.
Auto-merging arch/arm/mach-at91/sama5.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/sama5.c
Auto-merging arch/arm/configs/at91_dt_defconfig
CONFLICT (content): Merge conflict in arch/arm/configs/at91_dt_defconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 45905dea4e64] Merge remote-tracking branch 'at91/at91-next'
$ git diff -M --stat --summary HEAD^..
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
$ git merge bcm2835/for-next
Already up-to-date.
Merging berlin/berlin/for-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge berlin/berlin/for-next
Already up-to-date.
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
$ git merge cortex-m/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/efm32gg-dk3750.dts |  8 ++++----
 arch/arm/boot/dts/efm32gg.dtsi       | 32 ++++++++++++++++----------------
 2 files changed, 20 insertions(+), 20 deletions(-)
Merging imx-mxs/for-next (c746ef1b64e9 Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size)
$ git merge keystone/next
Resolved 'arch/arm/boot/dts/k2e.dtsi' using previous resolution.
Resolved 'arch/arm/boot/dts/k2hk.dtsi' using previous resolution.
Resolved 'arch/arm/boot/dts/k2l.dtsi' using previous resolution.
Auto-merging arch/arm/boot/dts/k2l.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2l.dtsi
Auto-merging arch/arm/boot/dts/k2hk.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2hk.dtsi
Auto-merging arch/arm/boot/dts/k2e.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2e.dtsi
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c47407d5702c] Merge remote-tracking branch 'keystone/next'
$ git diff -M --stat --summary HEAD^..
Merging mvebu/for-next (adfc8c76d84a Merge branch 'mvebu/config' into mvebu/for-next)
$ git merge mvebu/for-next
Merge made by the 'recursive' strategy.
Merging omap/for-next (7168e947291f Merge branch 'fixes-rc1' into omap-for-v4.3/fixes)
$ git merge omap/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/am335x-phycore-som.dtsi    | 4 ++--
 arch/arm/boot/dts/am57xx-beagle-x15.dts      | 4 ++--
 arch/arm/boot/dts/dm8148-evm.dts             | 4 ++--
 arch/arm/boot/dts/dm8148-t410.dts            | 6 +++---
 arch/arm/boot/dts/dm814x.dtsi                | 8 ++++----
 arch/arm/boot/dts/dra7.dtsi                  | 4 ++--
 arch/arm/boot/dts/omap2430.dtsi              | 2 +-
 arch/arm/boot/dts/omap3-beagle.dts           | 2 +-
 arch/arm/boot/dts/omap3-igep.dtsi            | 6 ------
 arch/arm/boot/dts/omap3-igep0020-common.dtsi | 6 ++++++
 arch/arm/boot/dts/omap3.dtsi                 | 2 +-
 arch/arm/boot/dts/omap4.dtsi                 | 2 +-
 arch/arm/boot/dts/omap5.dtsi                 | 2 +-
 arch/arm/configs/omap2plus_defconfig         | 4 +++-
 arch/arm/mach-omap2/Kconfig                  | 6 +++++-
 arch/arm/mach-omap2/board-generic.c          | 7 -------
 arch/arm/mach-omap2/id.c                     | 8 ++++++--
 arch/arm/mach-omap2/omap_device.c            | 3 ++-
 arch/arm/mach-omap2/pm.h                     | 3 ++-
 arch/arm/mach-omap2/soc.h                    | 2 ++
 arch/arm/mach-omap2/timer.c                  | 8 ++------
 arch/arm/mach-omap2/vc.c                     | 2 +-
 22 files changed, 49 insertions(+), 46 deletions(-)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
$ git merge omap-pending/for-next
Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution.
Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution.
Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 5f9930dae06f] Merge remote-tracking branch 'omap-pending/for-next'
$ git diff -M --stat --summary HEAD^..
Merging qcom/qcom/for-next (37a7a47c0031 Merge tag 'qcom-fixes-for-4.3-rc1' into next-base)
$ git merge qcom/qcom/for-next
Auto-merging drivers/firmware/Makefile
Auto-merging drivers/firmware/Kconfig
Merge made by the 'recursive' strategy.
 drivers/firmware/Kconfig       |  8 ++++++
 drivers/firmware/Makefile      |  3 +-
 drivers/firmware/qcom_scm-64.c | 63 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 drivers/firmware/qcom_scm-64.c
Merging renesas/next (f8aff9669745 Merge branches 'heads/sh-drivers-for-v4.3', 'heads/defconfig-for-v4.4', 'heads/dt-for-v4.4' and 'heads/soc-for-v4.4' into next)
$ git merge renesas/next
Removing arch/arm/mach-shmobile/sh-gpio.h
Removing arch/arm/mach-shmobile/r8a7778.h
Removing arch/arm/mach-shmobile/intc.h
Removing arch/arm/mach-shmobile/console.c
Removing arch/arm/mach-shmobile/clock.h
Removing arch/arm/mach-shmobile/clock.c
Removing arch/arm/mach-shmobile/clock-r8a7778.c
Removing arch/arm/mach-shmobile/board-bockw.c
Removing arch/arm/mach-shmobile/board-bockw-reference.c
Removing arch/arm/mach-shmobile/Makefile.boot
Removing arch/arm/configs/bockw_defconfig
Removing arch/arm/boot/dts/r8a7778-bockw-reference.dts
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/shmobile.txt |   8 +-
 MAINTAINERS                                        |   2 -
 arch/arm/Kconfig                                   |  26 +-
 arch/arm/Kconfig.debug                             |   3 +-
 arch/arm/boot/dts/Makefile                         |   3 -
 arch/arm/boot/dts/r8a7778-bockw-reference.dts      | 139 ----
 arch/arm/boot/dts/r8a7778.dtsi                     |   2 +-
 arch/arm/boot/dts/r8a7779-marzen.dts               |   6 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |  16 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |   3 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |   9 +-
 arch/arm/boot/dts/r8a7791.dtsi                     |   3 +-
 arch/arm/boot/dts/r8a7794-silk.dts                 |  88 +++
 arch/arm/boot/dts/r8a7794.dtsi                     | 224 ++++++-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |   2 +-
 arch/arm/configs/bockw_defconfig                   | 133 ----
 arch/arm/configs/multi_v7_defconfig                |   1 -
 arch/arm/configs/shmobile_defconfig                |   1 -
 arch/arm/mach-shmobile/Kconfig                     |  73 --
 arch/arm/mach-shmobile/Makefile                    |  14 +-
 arch/arm/mach-shmobile/Makefile.boot               |  12 -
 arch/arm/mach-shmobile/board-bockw-reference.c     |  86 ---
 arch/arm/mach-shmobile/board-bockw.c               | 737 ---------------------
 arch/arm/mach-shmobile/clock-r8a7778.c             | 342 ----------
 arch/arm/mach-shmobile/clock.c                     |  47 --
 arch/arm/mach-shmobile/clock.h                     |  42 --
 arch/arm/mach-shmobile/common.h                    |   5 -
 arch/arm/mach-shmobile/console.c                   |  27 -
 arch/arm/mach-shmobile/intc.h                      | 295 ---------
 arch/arm/mach-shmobile/pm-rmobile.c                |  35 +-
 arch/arm/mach-shmobile/pm-rmobile.h                |   9 -
 arch/arm/mach-shmobile/r8a7778.h                   |  78 ---
 arch/arm/mach-shmobile/r8a7779.h                   |   2 -
 arch/arm/mach-shmobile/setup-r8a7778.c             | 560 +---------------
 arch/arm/mach-shmobile/sh-gpio.h                   |  29 -
 arch/arm/mach-shmobile/timer.c                     |  21 -
 drivers/clk/shmobile/clk-mstp.c                    |   4 +
 drivers/sh/intc/internals.h                        |  10 +-
 drivers/sh/pm_runtime.c                            |  19 +-
 39 files changed, 355 insertions(+), 2761 deletions(-)
 delete mode 100644 arch/arm/boot/dts/r8a7778-bockw-reference.dts
 delete mode 100644 arch/arm/configs/bockw_defconfig
 delete mode 100644 arch/arm/mach-shmobile/Makefile.boot
 delete mode 100644 arch/arm/mach-shmobile/board-bockw-reference.c
 delete mode 100644 arch/arm/mach-shmobile/board-bockw.c
 delete mode 100644 arch/arm/mach-shmobile/clock-r8a7778.c
 delete mode 100644 arch/arm/mach-shmobile/clock.c
 delete mode 100644 arch/arm/mach-shmobile/clock.h
 delete mode 100644 arch/arm/mach-shmobile/console.c
 delete mode 100644 arch/arm/mach-shmobile/intc.h
 delete mode 100644 arch/arm/mach-shmobile/r8a7778.h
 delete mode 100644 arch/arm/mach-shmobile/sh-gpio.h
Merging rockchip/for-next (ed0450118b2f Merge branch 'v4.3-armsoc/soc' into for-next)
$ git merge rockchip/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
$ git merge rpi/for-rpi-next
Already up-to-date.
Merging samsung/for-next (112129267f1a Merge branch 'v4.3-next/dt64-samsung' into for-next)
$ git merge samsung/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/samsung/pmu.txt        |   1 +
 .../devicetree/bindings/hwmon/pwm-fan.txt          |  29 +-
 Documentation/devicetree/bindings/mfd/s2mps11.txt  |   4 +
 arch/arm/boot/dts/exynos4412-odroidu3.dts          |  43 +
 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |   1 +
 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 698 +++++++++++++++
 .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi     |  22 +
 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi     | 231 +++++
 arch/arm64/boot/dts/exynos/exynos5433.dtsi         | 931 +++++++++++++++++++++
 9 files changed, 1958 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
 create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi
 create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi
 create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi
Merging samsung-krzk/for-next (245b6177eeff Merge branch 'defconfig-for-next' into for-next)
$ git merge samsung-krzk/for-next
Auto-merging arch/arm/configs/multi_v7_defconfig
Auto-merging arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/exynos4.dtsi                     |   8 ++
 arch/arm/boot/dts/exynos4412.dtsi                  |   1 +
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |   1 +
 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi  |  61 ++++++++++++
 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |  98 +-------------------
 arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts    |  51 ++++++++++
 arch/arm/boot/dts/exynos5422-odroidxu3.dts         |  51 ++++++++++
 arch/arm/boot/dts/exynos5422-odroidxu4.dts         |  48 ++++++++++
 arch/arm/configs/exynos_defconfig                  |   9 +-
 arch/arm/configs/multi_v7_defconfig                |   2 +
 arch/arm/mach-exynos/mcpm-exynos.c                 |  27 +++++-
 arch/arm/mach-exynos/regs-pmu.h                    |   6 ++
 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi    | 103 +++++++++++++++++++++
 arch/arm64/boot/dts/exynos/exynos7.dtsi            |   7 ++
 15 files changed, 375 insertions(+), 99 deletions(-)
 create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
 create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu4.dts
Merging sunxi/sunxi/for-next (9d73c13a139c Merge branches 'sunxi/dt-for-4.3' and 'sunxi/defconfig-for-4.3' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging tegra/for-next (bea5a17a8beb Merge branch for-4.3/defconfig into for-next)
$ git merge tegra/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm64/for-next/core (6ff33f3902c3 Linux 4.3-rc1)
$ git merge arm64/for-next/core
Already up-to-date.
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
$ git merge blackfin/for-linus
Already up-to-date.
Merging c6x/for-linux-next (960a2741d5fd c67: irq: Use __handle_domain_irq())
$ git merge c6x/for-linux-next
Merge made by the 'recursive' strategy.
 arch/c6x/Kconfig      |  1 +
 arch/c6x/kernel/irq.c | 13 ++-----------
 2 files changed, 3 insertions(+), 11 deletions(-)
Merging cris/for-next (254a0f413548 CRISv10: delete unused lib/dmacopy.c)
$ git merge cris/for-next
Already up-to-date.
Merging h8300/h8300-next (99bcfda85f66 Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time")
$ git merge h8300/h8300-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next)
$ git merge ia64/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address)
$ git merge m68k/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/sun3/idprom.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Merging m68knommu/for-next (887ce682fb17 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
 fs/binfmt_elf_fdpic.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
Merging metag/for-next (3fe6942f0486 Documentation/features/vm: Meta2 is capable of THP)
$ git merge metag/for-next
Merge made by the 'recursive' strategy.
Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (807249d3ada1 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
$ git merge mips/mips-for-linux-next
Already up-to-date.
Merging nios2/for-next (08441d462ebd nios2: add Max10 defconfig)
$ git merge nios2/for-next
Already up-to-date.
Merging parisc-hd/for-next (64291f7db5bd Linux 4.2)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (ff474e8ca854 Merge tag 'powerpc-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
$ git merge powerpc/next
Already up-to-date.
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
$ git merge powerpc-mpe/next
Already up-to-date.
Merging fsl/next (4524cd093fa8 powerpc/t1023rdb/dts: set ifc nand chip select from 2 to 1)
$ git merge fsl/next
Already up-to-date.
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (0d764c637709 s390/dasd: mark DASD devices as non rotational)
$ git merge s390/features
Auto-merging drivers/s390/crypto/zcrypt_api.c
Merge made by the 'recursive' strategy.
 arch/s390/include/uapi/asm/unistd.h      |  3 ++-
 arch/s390/kernel/compat_signal.c         | 27 +++++++++++++++++++----
 arch/s390/kernel/entry.S                 |  2 ++
 arch/s390/kernel/perf_cpum_cf.c          | 12 ++++++----
 arch/s390/kernel/swsusp.S                | 38 +++-----------------------------
 arch/s390/kernel/syscalls.S              |  1 +
 arch/s390/kernel/vtime.c                 | 12 ++++++----
 arch/s390/numa/mode_emu.c                | 10 +++++++--
 drivers/s390/block/dasd.c                |  1 +
 drivers/s390/crypto/zcrypt_api.c         |  3 +--
 drivers/s390/crypto/zcrypt_cca_key.h     |  2 +-
 drivers/s390/crypto/zcrypt_msgtype50.c   |  2 +-
 drivers/s390/crypto/zcrypt_pcica.c       |  2 +-
 tools/testing/selftests/vm/userfaultfd.c |  2 ++
 14 files changed, 62 insertions(+), 55 deletions(-)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (fa5d8f13afb8 tile: fix build failure)
$ git merge tile/master
Merge made by the 'recursive' strategy.
 arch/tile/kernel/usb.c | 1 +
 1 file changed, 1 insertion(+)
Merging uml/linux-next (bdbac7d0e2b3 um: Fix kernel mode fault condition)
$ git merge uml/linux-next
Auto-merging arch/um/kernel/trap.c
Merge made by the 'recursive' strategy.
 arch/um/Makefile          | 4 ++--
 arch/um/kernel/trap.c     | 2 +-
 arch/um/os-Linux/helper.c | 6 +++---
 arch/x86/um/ldt.c         | 5 ++++-
 4 files changed, 10 insertions(+), 7 deletions(-)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing)
$ git merge xtensa/for_next
Already up-to-date.
Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled)
$ git merge btrfs/next
Already up-to-date.
Merging ceph/master (8dbd263de1cb ceph: improve readahead for file holes)
$ git merge ceph/master
Merge made by the 'recursive' strategy.
Merging cifs/for-next (eda2116f4ab6 [CIFS] mount option sec=none not displayed properly in /proc/mounts)
$ git merge cifs/for-next
Already up-to-date.
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
$ git merge ecryptfs/next
Merge made by the 'recursive' strategy.
 fs/ecryptfs/main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Merging ext3/for_next (9181f8bf5abf udf: Don't modify filesystem for read-only mounts)
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (bdfe0cbd746a Revert "ext4: remove block_device_ejected")
$ git merge ext4/dev
Already up-to-date.
Merging f2fs/dev (51e771c0d25b Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge f2fs/dev
Already up-to-date.
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
$ git merge fscache/fscache
Merge made by the 'recursive' strategy.
 fs/fscache/netfs.c | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)
Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry)
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/for-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge gfs2/for-next
Already up-to-date.
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
$ git merge jfs/jfs-next
Already up-to-date.
Merging nfs/linux-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge nfs/linux-next
Already up-to-date.
Merging nfsd/nfsd-next (a909e9f9d73a nfsd: don't hold i_mutex over userspace upcalls)
$ git merge nfsd/nfsd-next
Auto-merging fs/namei.c
Merge made by the 'recursive' strategy.
 fs/namei.c            | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++
 fs/nfsd/nfs3xdr.c     |  2 +-
 fs/nfsd/nfs4xdr.c     |  8 +++---
 fs/nfsd/vfs.c         | 23 +++++++---------
 include/linux/namei.h |  1 +
 5 files changed, 89 insertions(+), 19 deletions(-)
Merging orangefs/for-next (600896a3b8b0 Orangefs: Swap order of include files)
$ git merge orangefs/for-next
Auto-merging fs/Makefile
Auto-merging fs/Kconfig
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-fs-orangefs |   87 ++
 Documentation/filesystems/orangefs.txt     |  137 +++
 fs/Kconfig                                 |    1 +
 fs/Makefile                                |    1 +
 fs/orangefs/Kconfig                        |    6 +
 fs/orangefs/Makefile                       |   10 +
 fs/orangefs/acl.c                          |  175 +++
 fs/orangefs/dcache.c                       |  142 +++
 fs/orangefs/devpvfs2-req.c                 | 1004 ++++++++++++++++
 fs/orangefs/dir.c                          |  378 ++++++
 fs/orangefs/downcall.h                     |  138 +++
 fs/orangefs/file.c                         | 1016 ++++++++++++++++
 fs/orangefs/inode.c                        |  469 ++++++++
 fs/orangefs/namei.c                        |  473 ++++++++
 fs/orangefs/protocol.h                     |  672 +++++++++++
 fs/orangefs/pvfs2-bufmap.c                 |  974 +++++++++++++++
 fs/orangefs/pvfs2-bufmap.h                 |   76 ++
 fs/orangefs/pvfs2-cache.c                  |  260 ++++
 fs/orangefs/pvfs2-debug.h                  |  290 +++++
 fs/orangefs/pvfs2-debugfs.c                |  458 +++++++
 fs/orangefs/pvfs2-debugfs.h                |    3 +
 fs/orangefs/pvfs2-dev-proto.h              |  102 ++
 fs/orangefs/pvfs2-kernel.h                 |  864 ++++++++++++++
 fs/orangefs/pvfs2-mod.c                    |  315 +++++
 fs/orangefs/pvfs2-sysfs.c                  | 1787 ++++++++++++++++++++++++++++
 fs/orangefs/pvfs2-sysfs.h                  |    2 +
 fs/orangefs/pvfs2-utils.c                  | 1129 ++++++++++++++++++
 fs/orangefs/super.c                        |  558 +++++++++
 fs/orangefs/symlink.c                      |   31 +
 fs/orangefs/upcall.h                       |  255 ++++
 fs/orangefs/waitqueue.c                    |  529 ++++++++
 fs/orangefs/xattr.c                        |  530 +++++++++
 32 files changed, 12872 insertions(+)
 create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs
 create mode 100644 Documentation/filesystems/orangefs.txt
 create mode 100644 fs/orangefs/Kconfig
 create mode 100644 fs/orangefs/Makefile
 create mode 100644 fs/orangefs/acl.c
 create mode 100644 fs/orangefs/dcache.c
 create mode 100644 fs/orangefs/devpvfs2-req.c
 create mode 100644 fs/orangefs/dir.c
 create mode 100644 fs/orangefs/downcall.h
 create mode 100644 fs/orangefs/file.c
 create mode 100644 fs/orangefs/inode.c
 create mode 100644 fs/orangefs/namei.c
 create mode 100644 fs/orangefs/protocol.h
 create mode 100644 fs/orangefs/pvfs2-bufmap.c
 create mode 100644 fs/orangefs/pvfs2-bufmap.h
 create mode 100644 fs/orangefs/pvfs2-cache.c
 create mode 100644 fs/orangefs/pvfs2-debug.h
 create mode 100644 fs/orangefs/pvfs2-debugfs.c
 create mode 100644 fs/orangefs/pvfs2-debugfs.h
 create mode 100644 fs/orangefs/pvfs2-dev-proto.h
 create mode 100644 fs/orangefs/pvfs2-kernel.h
 create mode 100644 fs/orangefs/pvfs2-mod.c
 create mode 100644 fs/orangefs/pvfs2-sysfs.c
 create mode 100644 fs/orangefs/pvfs2-sysfs.h
 create mode 100644 fs/orangefs/pvfs2-utils.c
 create mode 100644 fs/orangefs/super.c
 create mode 100644 fs/orangefs/symlink.c
 create mode 100644 fs/orangefs/upcall.h
 create mode 100644 fs/orangefs/waitqueue.c
 create mode 100644 fs/orangefs/xattr.c
Merging overlayfs/overlayfs-next (cdb672795876 ovl: lookup whiteouts outside iterate_dir())
$ git merge overlayfs/overlayfs-next
Already up-to-date.
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
$ git merge squashfs/master
Already up-to-date.
Merging v9fs/for-next (46cfbe8e037a 9p: trans_fd, bail out if recv fcall if missing)
$ git merge v9fs/for-next
Merge made by the 'recursive' strategy.
 net/9p/trans_fd.c     | 88 +++++++++++++++++++++++++++------------------------
 net/9p/trans_virtio.c |  2 +-
 2 files changed, 47 insertions(+), 43 deletions(-)
Merging ubifs/linux-next (071a1f837f72 UGIFS: fix a typo in comment of ubifs_budget_req)
$ git merge ubifs/linux-next
Merge made by the 'recursive' strategy.
 fs/ubifs/lpt.c   | 6 ++----
 fs/ubifs/tnc.c   | 3 +--
 fs/ubifs/ubifs.h | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)
Merging xfs/for-next (5d54b8cdeaf4 Merge branch 'xfs-misc-fixes-for-4.3-4' into for-next)
$ git merge xfs/for-next
Already up-to-date.
Merging file-locks/linux-next (ee296d7c5709 locks: inline posix_lock_file_wait and flock_lock_file_wait)
$ git merge file-locks/linux-next
Already up-to-date.
Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root)
$ git merge vfs/for-next
Already up-to-date.
Merging pci/next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge pci/next
Already up-to-date.
Merging hid/for-next (c5a0db1eed32 Merge branch 'for-4.3/wacom' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
Merging i2c/i2c/for-next (f5956abbe430 Merge branch 'i2c/for-4.3' into i2c/for-next)
$ git merge i2c/i2c/for-next
Merge made by the 'recursive' strategy.
 drivers/i2c/busses/i2c-imx.c | 76 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 65 insertions(+), 11 deletions(-)
Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define)
$ git merge jdelvare-hwmon/master
Merge made by the 'recursive' strategy.
 drivers/hwmon/k10temp.c | 1 -
 1 file changed, 1 deletion(-)
Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge dmi/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (1b1165fa06db hwmon: Driver for Maxim MAX31790)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
 Documentation/hwmon/max31790 |  37 +++
 Documentation/hwmon/nct6775  |   4 +
 drivers/hwmon/Kconfig        |  14 +-
 drivers/hwmon/Makefile       |   1 +
 drivers/hwmon/max31790.c     | 603 +++++++++++++++++++++++++++++++++++++++++++
 drivers/hwmon/nct6775.c      |  64 +++--
 6 files changed, 699 insertions(+), 24 deletions(-)
 create mode 100644 Documentation/hwmon/max31790
 create mode 100644 drivers/hwmon/max31790.c
Merging v4l-dvb/master (41a8f406dacd Merge branch 'missed' into to_next)
$ git merge v4l-dvb/master
Resolved 'mm/Makefile' using previous resolution.
Auto-merging mm/Makefile
CONFLICT (content): Merge conflict in mm/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 931c53a43c1c] Merge remote-tracking branch 'v4l-dvb/master'
$ git diff -M --stat --summary HEAD^..
Merging kbuild/for-next (a8503631df45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
$ git merge kbuild/for-next
Auto-merging lib/Kconfig.debug
Auto-merging init/Kconfig
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 (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
$ git merge kconfig/for-next
Already up-to-date.
Merging libata/for-next (88622d80af82 ata: pata_pxa: dmaengine conversion)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/ata/ahci-fsl-qoriq.txt     |  21 ++
 .../devicetree/bindings/ata/ahci-platform.txt      |   2 -
 drivers/ata/Kconfig                                |   9 +
 drivers/ata/Makefile                               |   1 +
 drivers/ata/ahci_platform.c                        |   1 -
 drivers/ata/ahci_qoriq.c                           | 272 +++++++++++++++++++++
 drivers/ata/pata_pxa.c                             | 171 +++++--------
 7 files changed, 362 insertions(+), 115 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
 create mode 100644 drivers/ata/ahci_qoriq.c
Merging pm/linux-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge pm/linux-next
Already up-to-date.
Merging idle/next (aba5686671dc Merge branch 'cpuidle' into release)
$ git merge idle/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
$ git merge apm/for-next
Already up-to-date.
Merging thermal/next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge thermal/next
Already up-to-date.
Merging thermal-soc/next (a794b4f32921 Merge tag 'for-linus-4.3' of git://git.code.sf.net/p/openipmi/linux-ipmi)
$ git merge thermal-soc/next
Already up-to-date.
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
$ git merge ieee1394/for-next
Already up-to-date.
Merging dlm/next (b3a5bbfd780d dlm: print error from kernel_sendpage)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge slave-dma/next
Already up-to-date.
Merging net-next/master (ad1e7b97b3ad cdc: Fix build warning.)
$ git merge net-next/master
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/net/cpsw.txt   |   7 +
 arch/arm64/boot/dts/apm/apm-storm.dtsi           |  28 +++
 drivers/net/dsa/mv88e6xxx.c                      | 151 +++++++++++----
 drivers/net/dsa/mv88e6xxx.h                      |   8 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_hw.c   |   3 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c |  16 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_main.h |   5 +
 drivers/net/ethernet/marvell/mv643xx_eth.c       |  43 ++---
 drivers/net/ethernet/ti/cpsw.c                   |   9 +
 drivers/net/usb/cdc-phonet.c                     |  27 +--
 drivers/net/usb/cdc_ether.c                      | 230 ++++++++---------------
 drivers/net/usb/cdc_ncm.c                        |  69 +------
 drivers/net/usb/qmi_wwan.c                       |  66 +------
 drivers/net/usb/usbnet.c                         | 138 ++++++++++++++
 drivers/net/vrf.c                                |   2 +
 include/linux/usb/cdc.h                          |  47 +++++
 include/net/route.h                              |   2 +
 include/uapi/linux/rtnetlink.h                   |   1 +
 net/ipv4/route.c                                 | 105 +++++------
 net/ipv4/xfrm4_policy.c                          |   1 +
 20 files changed, 547 insertions(+), 411 deletions(-)
 create mode 100644 include/linux/usb/cdc.h
Merging ipsec-next/master (e69948a0a530 net: Document xfrm4_gc_thresh and xfrm6_gc_thresh)
$ git merge ipsec-next/master
Already up-to-date.
Merging wireless-drivers-next/master (0ba3ac03c1f3 Merge ath-next from ath.git)
$ git merge wireless-drivers-next/master
Already up-to-date.
Merging bluetooth/master (c258b966b5d6 Bluetooth: bt3c_cs: clean up obsolete functions)
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
 Documentation/networking/ieee802154.txt |   8 +-
 drivers/bluetooth/bt3c_cs.c             |  12 +-
 drivers/bluetooth/btintel.c             |  46 +++
 drivers/bluetooth/btintel.h             |  10 +-
 drivers/bluetooth/btmrvl_main.c         |  14 -
 drivers/bluetooth/btusb.c               |  51 +--
 drivers/bluetooth/hci_bcm.c             | 222 +++++++++---
 drivers/bluetooth/hci_intel.c           | 590 ++++++++++++++++++++++++++++----
 drivers/bluetooth/hci_qca.c             |   6 +-
 drivers/net/ieee802154/Kconfig          |   7 +
 drivers/net/ieee802154/at86rf230.c      | 195 ++++++++---
 drivers/net/ieee802154/at86rf230.h      |   8 +
 drivers/net/ieee802154/atusb.c          |  13 +-
 include/linux/ieee802154.h              |  25 ++
 include/net/6lowpan.h                   | 144 ++------
 include/net/af_ieee802154.h             |   2 +-
 include/net/bluetooth/bluetooth.h       |   7 +
 include/net/bluetooth/hci_core.h        |   1 +
 include/net/mac802154.h                 |  15 +
 net/6lowpan/iphc.c                      |  13 +-
 net/6lowpan/nhc_udp.c                   |  13 +-
 net/bluetooth/hci_core.c                |   5 +-
 net/bluetooth/hci_sock.c                |  11 +-
 net/bluetooth/smp.c                     |  14 +-
 net/ieee802154/6lowpan/6lowpan_i.h      |  14 +-
 net/ieee802154/6lowpan/core.c           | 116 ++++---
 net/ieee802154/6lowpan/reassembly.c     | 157 ++++++---
 net/ieee802154/6lowpan/rx.c             | 352 ++++++++++++++-----
 net/ieee802154/6lowpan/tx.c             |  51 +--
 29 files changed, 1567 insertions(+), 555 deletions(-)
$ git am -3 ../patches/drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null.patch
Applying: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/net/ieee802154/at86rf230.c
$ git add -A .
$ git commit -v -a --amend
[master dd305cb27a03] Merge remote-tracking branch 'bluetooth/master'
 Date: Wed Sep 16 09:33:30 2015 +1000
$ git am -3 ../patches/drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null-fix.patch
Applying: drivers-net-ieee802154-at86rf230c-seq_printf-now-returns-null-fix
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/net/ieee802154/at86rf230.c
$ git add -A .
$ git commit -v -a --amend
[master 8d62752d3baa] Merge remote-tracking branch 'bluetooth/master'
 Date: Wed Sep 16 09:33:30 2015 +1000
Merging rdma/for-next (64291f7db5bd Linux 4.2)
$ git merge rdma/for-next
Already up-to-date.
Merging mtd/master (6ff33f3902c3 Linux 4.3-rc1)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (db66e32e0d2a Merge tag 'v4.3-rc1' into MTD -next development)
$ git merge l2-mtd/master
Merge made by the 'recursive' strategy.
 drivers/mtd/devices/m25p80.c                  | 15 +++++------
 drivers/mtd/nand/brcmnand/brcmnand.c          |  5 ++--
 drivers/mtd/nand/nand_base.c                  |  4 +--
 drivers/mtd/nand/pxa3xx_nand.c                | 33 ++++++++++++++++++-----
 drivers/mtd/nand/sunxi_nand.c                 | 39 +++++++++++++--------------
 drivers/mtd/spi-nor/fsl-quadspi.c             | 23 +++++-----------
 drivers/mtd/spi-nor/nxp-spifi.c               | 11 +++-----
 drivers/mtd/spi-nor/spi-nor.c                 | 30 ++++++++++-----------
 include/linux/mtd/nand.h                      |  4 +--
 include/linux/mtd/spi-nor.h                   |  9 ++++---
 include/linux/platform_data/mtd-nand-pxa3xx.h | 27 -------------------
 11 files changed, 91 insertions(+), 109 deletions(-)
Merging crypto/master (bf433416e675 crypto: algif_aead - fix for multiple operations on AF_ALG sockets)
$ git merge crypto/master
Already up-to-date.
Merging drm/drm-next (73bf1b7be7aa Merge branch 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-next)
$ git merge drm/drm-next
Already up-to-date.
Merging drm-panel/drm/panel/for-next (a33ee95f8f45 drm/bridge: Put Kconfig entries in a separate menu)
$ git merge drm-panel/drm/panel/for-next
Already up-to-date.
Merging drm-intel/for-linux-next (824257857fd8 drm/i915: Allow DSI dual link to be configured on any pipe)
$ git merge drm-intel/for-linux-next
Already up-to-date.
Merging drm-tegra/drm/tegra/for-next (459cc2c6800b drm/tegra: sor: Add HDMI support)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging drm-misc/topic/drm-misc (216c59d65f99 drm/atomic-helper: Don't skip plane disabling on active CRTC)
$ git merge drm-misc/topic/drm-misc
Resolved 'drivers/gpu/drm/drm_dp_helper.c' using previous resolution.
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_audio.c
Auto-merging drivers/gpu/drm/drm_dp_helper.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_helper.c
Auto-merging drivers/gpu/drm/drm_atomic_helper.c
Auto-merging drivers/gpu/drm/drm_atomic.c
Auto-merging Documentation/kernel-parameters.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 920c96460b55] Merge remote-tracking branch 'drm-misc/topic/drm-misc'
$ git diff -M --stat --summary HEAD^..
 Documentation/kernel-parameters.txt             |  15 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c |   4 +-
 drivers/gpu/drm/drm_atomic.c                    |  25 ++++
 drivers/gpu/drm/drm_atomic_helper.c             | 185 ++++++++++++++++++++----
 drivers/gpu/drm/drm_crtc.c                      |  18 ++-
 drivers/gpu/drm/drm_dp_helper.c                 |  43 +++++-
 drivers/gpu/drm/drm_drv.c                       |   8 +-
 drivers/gpu/drm/drm_edid.c                      |   8 +-
 drivers/gpu/drm/drm_edid_load.c                 |  43 ++++--
 drivers/gpu/drm/drm_fb_helper.c                 |  48 +++++-
 drivers/gpu/drm/drm_internal.h                  |   2 +-
 drivers/gpu/drm/drm_mm.c                        |   6 +-
 drivers/gpu/drm/drm_modeset_lock.c              |   2 +
 drivers/gpu/drm/drm_plane_helper.c              |   6 +-
 drivers/gpu/drm/drm_sysfs.c                     |  49 +++----
 drivers/gpu/drm/exynos/exynos_drm_drv.c         |   2 +-
 drivers/gpu/drm/i2c/ch7006_drv.c                |   6 +-
 drivers/gpu/drm/i2c/ch7006_mode.c               |  26 ++--
 drivers/gpu/drm/i2c/ch7006_priv.h               |  12 +-
 drivers/gpu/drm/i915/intel_audio.c              |   2 +-
 drivers/gpu/drm/i915/intel_display.c            |   9 +-
 drivers/gpu/drm/i915/intel_dp.c                 |   1 +
 drivers/gpu/drm/i915/intel_drv.h                |   2 -
 drivers/gpu/drm/i915/intel_tv.c                 |   4 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c       |  10 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c       |  10 +-
 drivers/gpu/drm/msm/msm_atomic.c                |   2 +-
 drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c  |   2 +-
 drivers/gpu/drm/nouveau/dispnv04/tvnv17.h       |   2 +-
 drivers/gpu/drm/omapdrm/omap_drv.c              |   2 +-
 drivers/gpu/drm/omapdrm/omap_plane.c            |  10 +-
 drivers/gpu/drm/radeon/atombios_dp.c            |   1 +
 drivers/gpu/drm/rcar-du/rcar_du_kms.c           |   2 +-
 drivers/gpu/drm/sti/sti_drv.c                   |   2 +-
 drivers/gpu/drm/tegra/dc.c                      |   2 -
 drivers/gpu/drm/tegra/dpaux.c                   |   3 +-
 drivers/gpu/drm/tegra/drm.c                     |   2 +-
 include/drm/drm_atomic_helper.h                 |   6 +-
 include/drm/drm_crtc.h                          |   4 +-
 include/drm/drm_dp_helper.h                     |   2 +-
 include/drm/drm_edid.h                          |   5 +-
 include/drm/drm_fb_helper.h                     |   6 +-
 include/drm/drm_modeset_lock.h                  |  10 +-
 include/drm/drm_plane_helper.h                  |   2 -
 include/uapi/drm/drm_mode.h                     |  42 ++++--
 45 files changed, 469 insertions(+), 184 deletions(-)
Merging drm-exynos/exynos-drm/for-next (7d9071a09502 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge drm-exynos/exynos-drm/for-next
Already up-to-date.
Merging drm-msm/msm-next (d248b61f6114 drm/msm/dsi: Introduce DSI configuration module)
$ git merge drm-msm/msm-next
Already up-to-date.
Merging sound/for-next (0052b7dcf9d9 ALSA: pcm: remove structure member of 'struct snd_pcm_hwptr_log *' type because this structure had been removed)
$ git merge sound/for-next
Merge made by the 'recursive' strategy.
 include/sound/pcm.h      | 6 ------
 sound/core/pcm.c         | 3 ---
 sound/pci/rme9652/hdsp.c | 1 +
 3 files changed, 1 insertion(+), 9 deletions(-)
Merging sound-asoc/for-next (26f4093b46b9 Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/sh' and 'asoc/topic/ux500' into asoc-next)
$ git merge sound-asoc/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/sound/ak4642.txt |  22 +-
 .../devicetree/bindings/sound/renesas,rsnd.txt     |   7 +
 include/sound/rcar_snd.h                           |   1 -
 sound/soc/atmel/atmel_wm8904.c                     |   1 +
 sound/soc/au1x/db1000.c                            |  10 +-
 sound/soc/au1x/db1200.c                            |  10 +-
 sound/soc/au1x/psc-i2s.c                           |   1 -
 sound/soc/blackfin/bf5xx-ad1836.c                  |  11 +-
 sound/soc/blackfin/bfin-eval-adau1373.c            |  12 +-
 sound/soc/blackfin/bfin-eval-adau1701.c            |  12 +-
 sound/soc/blackfin/bfin-eval-adav80x.c             |  12 +-
 sound/soc/codecs/ak4642.c                          | 152 +++++++----
 sound/soc/codecs/rt5645.c                          |  13 +-
 sound/soc/codecs/wm0010.c                          |   8 +-
 sound/soc/codecs/wm8960.c                          |  26 +-
 sound/soc/davinci/davinci-mcasp.c                  |   8 +-
 sound/soc/fsl/fsl-asoc-card.c                      |   4 +-
 sound/soc/fsl/fsl_sai.c                            |   1 +
 sound/soc/intel/boards/broadwell.c                 |   9 +-
 sound/soc/intel/haswell/sst-haswell-ipc.c          |  20 +-
 sound/soc/jz4740/jz4740-i2s.c                      |   1 +
 sound/soc/kirkwood/armada-370-db.c                 |   1 +
 sound/soc/mediatek/mt8173-max98090.c               |  11 +-
 sound/soc/mediatek/mt8173-rt5650-rt5676.c          |  11 +-
 sound/soc/mediatek/mtk-afe-pcm.c                   |  17 ++
 sound/soc/mxs/mxs-sgtl5000.c                       |   6 +-
 sound/soc/pxa/brownstone.c                         |   9 +-
 sound/soc/pxa/corgi.c                              |  11 +-
 sound/soc/pxa/e740_wm9705.c                        |   5 +-
 sound/soc/pxa/e750_wm9705.c                        |   5 +-
 sound/soc/pxa/e800_wm9712.c                        |   5 +-
 sound/soc/pxa/hx4700.c                             |   4 +-
 sound/soc/pxa/imote2.c                             |  11 +-
 sound/soc/pxa/mioa701_wm9713.c                     |  11 +-
 sound/soc/pxa/palm27x.c                            |   9 +-
 sound/soc/pxa/poodle.c                             |  11 +-
 sound/soc/pxa/pxa-ssp.c                            |   1 +
 sound/soc/pxa/pxa2xx-pcm.c                         |   1 +
 sound/soc/pxa/spitz.c                              |   5 +-
 sound/soc/pxa/tosa.c                               |   5 +-
 sound/soc/pxa/ttc-dkb.c                            |  12 +-
 sound/soc/sh/rcar/adg.c                            | 303 ++++++++++++++++-----
 sound/soc/sh/rcar/core.c                           |  12 +
 sound/soc/sh/rcar/ctu.c                            |   6 +-
 sound/soc/sh/rcar/dvc.c                            |   6 +-
 sound/soc/sh/rcar/mix.c                            |   6 +-
 sound/soc/sh/rcar/rsnd.h                           |  15 +-
 sound/soc/sh/rcar/src.c                            |  17 +-
 sound/soc/sh/rcar/ssi.c                            |  98 +++----
 sound/soc/sh/siu_dai.c                             |  85 ++----
 sound/soc/soc-dapm.c                               |   2 +-
 sound/soc/soc-utils.c                              |   9 +
 sound/soc/spear/Kconfig                            |   2 +-
 sound/soc/sti/uniperif_player.c                    |  14 +-
 sound/soc/sti/uniperif_reader.c                    |   6 +-
 sound/soc/ux500/mop500.c                           |   1 +
 sound/soc/ux500/ux500_msp_dai.c                    |   1 +
 57 files changed, 600 insertions(+), 475 deletions(-)
Merging modules/modules-next (5cfb203a304d modpost: abort if a module symbol is too long)
$ git merge modules/modules-next
Merge made by the 'recursive' strategy.
 scripts/mod/modpost.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
Merging input/next (ade9c1a47c81 Input: imx_keypad - remove obsolete comment)
$ git merge input/next
Already up-to-date.
Merging block/for-next (3cb73014ad06 Merge branch 'for-4.3/core' into for-next)
$ git merge block/for-next
Merge made by the 'recursive' strategy.
Merging device-mapper/for-next (586b286b110e dm crypt: constrain crypt device's max_segment_size to PAGE_SIZE)
$ git merge device-mapper/for-next
Merge made by the 'recursive' strategy.
 drivers/md/dm-crypt.c | 17 +++++++++++++++--
 drivers/md/dm-thin.c  |  4 ++++
 2 files changed, 19 insertions(+), 2 deletions(-)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
$ 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 (552e7e6b679f mmc: sd: Remove superfluous error code assignment)
$ git merge mmc-uh/next
Merge made by the 'recursive' strategy.
 drivers/mmc/core/core.c       |  6 ++++++
 drivers/mmc/core/host.c       |  4 ++--
 drivers/mmc/core/sd.c         |  2 --
 drivers/mmc/core/sdio.c       | 20 +++++++++++++++-----
 drivers/mmc/host/sdhci-acpi.c |  1 +
 5 files changed, 24 insertions(+), 9 deletions(-)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
 kernel/debug/kdb/kdb_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (e89c6fdf9e0e Merge linux-block/for-4.3/core into md/for-linux)
$ git merge md/for-next
Already up-to-date.
Merging mfd/for-mfd-next (5a688c455066 mfd: jz4740-adc: Init mask cache in generic IRQ chip)
$ git merge mfd/for-mfd-next
Already up-to-date.
Merging backlight/for-backlight-next (13d20b3b618a backlight: tosa: Export I2C module alias information)
$ git merge backlight/for-backlight-next
Already up-to-date.
Merging battery/master (9bdc0e5eee20 twl4030_charger: fix another compile error)
$ git merge battery/master
Merge made by the 'recursive' strategy.
 drivers/power/twl4030_charger.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
Merging omap_dss2/for-next (7b554088d56e video: fbdev: pxa168fb: Use devm_clk_get)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (bcdfb18ae2ac Merge remote-tracking branches 'regulator/topic/bcm590xx', 'regulator/topic/da9063' and 'regulator/topic/qcom-smd' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 .../bindings/regulator/pbias-regulator.txt         |  7 ++-
 drivers/regulator/bcm590xx-regulator.c             |  2 +-
 drivers/regulator/core.c                           |  5 +-
 drivers/regulator/da9063-regulator.c               |  2 +-
 drivers/regulator/pbias-regulator.c                | 56 +++++++++++++++++++---
 drivers/regulator/qcom_smd-regulator.c             | 28 +++++------
 6 files changed, 74 insertions(+), 26 deletions(-)
Merging security/next (07f081fb5057 PKCS#7: Add OIDs for sha224, sha284 and sha512 hash algos and use them)
$ git merge security/next
Already up-to-date.
Merging integrity/next (24fd03c87695 ima: update builtin policies)
$ git merge integrity/next
Already up-to-date.
Merging selinux/next (fda4d578ed0a selinux: explicitly declare the role "base_r")
$ git merge selinux/next
Already up-to-date.
Merging lblnet/next (b2776bf7149b Linux 3.18)
$ git merge lblnet/next
Already up-to-date.
Merging watchdog/master (55f1dfb398d9 watchdog: iTCO: Fix dependencies on I2C)
$ git merge watchdog/master
Merge made by the 'recursive' strategy.
 drivers/watchdog/Kconfig       |  3 ++-
 drivers/watchdog/bcm2835_wdt.c | 10 ++++++++--
 drivers/watchdog/gef_wdt.c     |  1 +
 drivers/watchdog/mena21_wdt.c  |  1 +
 drivers/watchdog/moxart_wdt.c  |  1 +
 5 files changed, 13 insertions(+), 3 deletions(-)
Merging iommu/next (4ad79562577a Merge branches 'arm/omap', 'arm/msm', 'arm/smmu', 'arm/tegra', 'x86/vt-d', 'x86/amd', 'ppc/pamu' and 'core' into next)
$ git merge iommu/next
Already up-to-date.
Merging dwmw2-iommu/master (5dbaf90a6780 iommu/vt-d: Add initial shell of SVM support)
$ git merge dwmw2-iommu/master
Auto-merging include/linux/intel-iommu.h
Auto-merging drivers/iommu/intel-iommu.c
Auto-merging drivers/iommu/Kconfig
Merge made by the 'recursive' strategy.
 drivers/iommu/Kconfig       |  10 +++-
 drivers/iommu/Makefile      |   1 +
 drivers/iommu/intel-iommu.c |  19 +++++--
 drivers/iommu/intel-svm.c   |  71 ++++++++++++++++++++++++++
 drivers/iommu/iova.c        | 120 +++++++++++++++++++++++++-------------------
 include/linux/intel-iommu.h |  15 ++++++
 include/linux/iova.h        |   4 +-
 7 files changed, 183 insertions(+), 57 deletions(-)
 create mode 100644 drivers/iommu/intel-svm.c
Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer)
$ git merge vfio/next
Already up-to-date.
Merging jc_docs/docs-next (4d73270192ec scripts/kernel-doc: Replacing highlights hash by an array)
$ git merge jc_docs/docs-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/DocBook/.gitignore            |   2 +
 Documentation/filesystems/sysfs-tagging.txt |  14 ++--
 Documentation/filesystems/sysfs.txt         |   9 ++-
 Documentation/locking/lockstat.txt          |   2 +-
 Documentation/rbtree.txt                    |   2 +-
 Documentation/zh_CN/filesystems/sysfs.txt   |   2 +-
 MAINTAINERS                                 |   2 +
 scripts/kernel-doc                          | 115 ++++++++++++++++------------
 8 files changed, 85 insertions(+), 63 deletions(-)
Merging trivial/for-next (e5f6450c3f40 MAINTAINERS: update my e-mail address)
$ git merge trivial/for-next
Already up-to-date.
Merging audit/next (183434eefa74 audit: try harder to send to auditd upon netlink failure)
$ git merge audit/next
Auto-merging kernel/audit.c
Merge made by the 'recursive' strategy.
 kernel/audit.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
$ git merge devicetree/devicetree/next
Already up-to-date.
Merging dt-rh/for-next (c8fb70a3e8dd MAINTAINERS: Add Frank Rowand as DT maintainer)
$ git merge dt-rh/for-next
Already up-to-date.
Merging mailbox/mailbox-for-next (86e488adaab7 mailbox: arm_mhu: reduce txpoll_period from 10ms to 1 ms)
$ git merge mailbox/mailbox-for-next
Already up-to-date.
Merging spi/for-next (0c9c2fc26522 Merge remote-tracking branches 'spi/topic/bcm63xx' and 'spi/topic/s3c64xx' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/spi/spi-mt65xx.txt         | 16 ++++---
 drivers/spi/spi-atmel.c                            |  2 +
 drivers/spi/spi-bcm2835.c                          |  6 +--
 drivers/spi/spi-bcm63xx.c                          | 24 +++++++---
 drivers/spi/spi-mt65xx.c                           | 51 ++++++++++------------
 drivers/spi/spi-pxa2xx.c                           |  4 ++
 drivers/spi/spi-s3c64xx.c                          | 44 +++++++++++++------
 drivers/spi/spi.c                                  |  3 +-
 drivers/spi/spidev.c                               |  3 +-
 9 files changed, 91 insertions(+), 62 deletions(-)
Merging tip/auto-latest (0b2dd639ecdd Merge branch 'x86/urgent')
$ git merge tip/auto-latest
Removing tools/lib/api/fs/tracefs.h
Removing tools/lib/api/fs/tracefs.c
Removing tools/lib/api/fs/findfs.h
Removing tools/lib/api/fs/findfs.c
Removing tools/lib/api/fs/debugfs.h
Removing tools/lib/api/fs/debugfs.c
Auto-merging init/Kconfig
Auto-merging arch/x86/Kconfig
Auto-merging arch/s390/kernel/perf_cpum_cf.c
Merge made by the 'recursive' strategy.
 Documentation/atomic_ops.txt                       |   4 +
 Documentation/static-keys.txt                      |   4 +-
 arch/arm64/include/asm/acpi.h                      |   5 +
 arch/arm64/include/asm/memory.h                    |   1 +
 arch/arm64/include/asm/pgtable.h                   |   2 +
 arch/arm64/kernel/acpi.c                           |  29 +
 arch/arm64/mm/proc.S                               |   4 +-
 arch/powerpc/perf/core-book3s.c                    |  36 +-
 arch/powerpc/perf/hv-24x7.c                        | 166 +++-
 arch/s390/kernel/perf_cpum_cf.c                    |  35 +-
 arch/sparc/kernel/perf_event.c                     |  32 +-
 arch/x86/Kconfig                                   |  23 +-
 arch/x86/boot/header.S                             |   2 +-
 arch/x86/crypto/camellia_aesni_avx2_glue.c         |   3 +-
 arch/x86/crypto/camellia_aesni_avx_glue.c          |   3 +-
 arch/x86/crypto/cast5_avx_glue.c                   |   3 +-
 arch/x86/crypto/cast6_avx_glue.c                   |   3 +-
 arch/x86/crypto/chacha20_glue.c                    |   2 +-
 arch/x86/crypto/poly1305_glue.c                    |   2 +-
 arch/x86/crypto/serpent_avx2_glue.c                |   3 +-
 arch/x86/crypto/serpent_avx_glue.c                 |   3 +-
 arch/x86/crypto/sha1_ssse3_glue.c                  |   2 +-
 arch/x86/crypto/sha256_ssse3_glue.c                |   2 +-
 arch/x86/crypto/sha512_ssse3_glue.c                |   2 +-
 arch/x86/crypto/twofish_avx_glue.c                 |   2 +-
 arch/x86/ia32/ia32_signal.c                        |   8 +-
 arch/x86/include/asm/acpi.h                        |  23 +
 arch/x86/include/asm/cpufeature.h                  |   1 +
 arch/x86/include/asm/fpu/signal.h                  |   2 +-
 arch/x86/include/asm/fpu/types.h                   | 148 ++--
 arch/x86/include/asm/fpu/xstate.h                  |  15 +-
 arch/x86/include/asm/ia32.h                        |   4 +-
 arch/x86/include/asm/paravirt_types.h              |   1 -
 arch/x86/include/asm/processor.h                   |   2 +-
 arch/x86/include/asm/qspinlock.h                   |  19 +-
 arch/x86/include/asm/sigcontext.h                  |  75 +-
 arch/x86/include/asm/sigframe.h                    |   8 +-
 arch/x86/include/asm/signal.h                      |   2 +-
 arch/x86/include/asm/trace/mpx.h                   |   7 +-
 arch/x86/include/asm/uv/uv_hub.h                   |   2 +-
 arch/x86/include/uapi/asm/sigcontext.h             | 475 +++++++----
 arch/x86/include/uapi/asm/sigcontext32.h           |  73 +-
 arch/x86/kernel/alternative.c                      |   5 +
 arch/x86/kernel/apic/apic.c                        |   7 +
 arch/x86/kernel/apic/io_apic.c                     |   5 +-
 arch/x86/kernel/asm-offsets.c                      |  18 +-
 arch/x86/kernel/cpu/common.c                       |   4 +-
 arch/x86/kernel/cpu/perf_event.c                   |  39 +-
 arch/x86/kernel/cpu/perf_event.h                   |   2 +-
 arch/x86/kernel/cpu/perf_event_intel.c             |   5 +-
 arch/x86/kernel/cpu/perf_event_intel_bts.c         |  14 +
 arch/x86/kernel/cpu/perf_event_intel_ds.c          |  40 +-
 arch/x86/kernel/cpu/perf_event_intel_lbr.c         |   5 +-
 arch/x86/kernel/cpu/perf_event_intel_pt.c          |   7 +-
 arch/x86/kernel/fpu/init.c                         |  18 +-
 arch/x86/kernel/fpu/regset.c                       |   4 +-
 arch/x86/kernel/fpu/signal.c                       |  10 +-
 arch/x86/kernel/fpu/xstate.c                       | 398 ++++++++--
 arch/x86/kernel/ldt.c                              |   4 +-
 arch/x86/kernel/signal.c                           |   4 +-
 arch/x86/kernel/traps.c                            |   4 +-
 arch/x86/kernel/tsc.c                              |  24 +-
 arch/x86/kernel/vm86_32.c                          |  27 +
 arch/x86/kvm/cpuid.c                               |   4 +-
 arch/x86/kvm/x86.c                                 |  27 +-
 arch/x86/kvm/x86.h                                 |   6 +-
 arch/x86/lib/x86-opcode-map.txt                    |  24 +-
 arch/x86/math-emu/fpu_emu.h                        |   2 +-
 arch/x86/math-emu/fpu_entry.c                      |  36 -
 arch/x86/mm/mpx.c                                  |  15 +-
 arch/x86/mm/srat.c                                 |   5 +-
 arch/x86/platform/efi/efi-bgrt.c                   |   9 +-
 arch/x86/platform/efi/efi.c                        |  18 -
 arch/x86/platform/uv/uv_nmi.c                      |  53 +-
 drivers/acpi/apei/ghes.c                           |  10 +-
 drivers/firmware/efi/efi.c                         |  39 +-
 drivers/net/ethernet/sfc/mcdi.c                    |   2 +-
 drivers/phy/phy-rcar-gen2.c                        |   3 +-
 drivers/staging/speakup/selection.c                |   2 +-
 include/asm-generic/qspinlock.h                    |   4 +-
 include/linux/clockchips.h                         |  29 +-
 include/linux/efi.h                                |   1 +
 include/linux/jump_label.h                         |  10 +-
 include/linux/perf_event.h                         | 120 ++-
 include/linux/sched.h                              |   8 +-
 include/linux/tick.h                               |   9 +
 init/Kconfig                                       |   3 +
 kernel/cpu.c                                       |   8 +-
 kernel/events/core.c                               | 218 +++--
 kernel/locking/qspinlock.c                         |   2 +-
 kernel/sched/core.c                                |  68 +-
 kernel/sched/fair.c                                | 386 ++++-----
 kernel/sched/features.h                            |  21 +-
 kernel/sched/sched.h                               |  25 +-
 kernel/time/clockevents.c                          |  42 +-
 kernel/time/clocksource.c                          |   2 +-
 kernel/time/hrtimer.c                              |   2 +-
 kernel/time/tick-common.c                          |   1 -
 kernel/time/tick-sched.c                           |  15 +-
 kernel/time/timekeeping.c                          |   6 +-
 kernel/time/timer_list.c                           |  54 +-
 security/device_cgroup.c                           |   2 +-
 tools/include/linux/filter.h                       | 231 ++++++
 tools/lib/api/Build                                |   1 +
 tools/lib/api/cpu.c                                |  18 +
 tools/lib/api/cpu.h                                |   6 +
 tools/lib/api/fs/Build                             |   4 +-
 tools/lib/api/fs/debugfs.c                         | 129 ---
 tools/lib/api/fs/debugfs.h                         |  23 -
 tools/lib/api/fs/findfs.c                          |  63 --
 tools/lib/api/fs/findfs.h                          |  23 -
 tools/lib/api/fs/fs.c                              | 163 +++-
 tools/lib/api/fs/fs.h                              |  30 +-
 tools/lib/api/fs/tracefs.c                         |  78 --
 tools/lib/api/fs/tracefs.h                         |  21 -
 tools/lib/api/fs/tracing_path.c                    | 142 ++++
 tools/lib/api/fs/tracing_path.h                    |  16 +
 tools/lib/traceevent/event-parse.c                 |  56 +-
 tools/lib/traceevent/event-parse.h                 |   1 +
 tools/perf/Documentation/perf-report.txt           |   6 +-
 tools/perf/MANIFEST                                |   1 +
 tools/perf/Makefile.perf                           |   2 +-
 tools/perf/arch/common.c                           |  10 +-
 tools/perf/arch/common.h                           |   4 +-
 tools/perf/arch/x86/util/intel-pt.c                |  55 +-
 tools/perf/builtin-annotate.c                      |   2 +-
 tools/perf/builtin-kvm.c                           |   1 -
 tools/perf/builtin-probe.c                         | 111 ++-
 tools/perf/builtin-report.c                        |  11 +
 tools/perf/builtin-script.c                        |   4 +-
 tools/perf/builtin-stat.c                          |   2 +-
 tools/perf/builtin-top.c                           |  17 +-
 tools/perf/builtin-trace.c                         |   5 +-
 tools/perf/perf.c                                  |  14 +-
 tools/perf/tests/Build                             |   4 +
 tools/perf/tests/builtin-test.c                    |  44 +-
 tools/perf/tests/code-reading.c                    |  74 +-
 tools/perf/tests/gen-insn-x86-dat.awk              |  75 ++
 tools/perf/tests/gen-insn-x86-dat.sh               |  43 +
 tools/perf/tests/hists_filter.c                    |  55 +-
 tools/perf/tests/insn-x86-dat-32.c                 | 658 ++++++++++++++++
 tools/perf/tests/insn-x86-dat-64.c                 | 768 ++++++++++++++++++
 tools/perf/tests/insn-x86-dat-src.c                | 877 +++++++++++++++++++++
 tools/perf/tests/insn-x86.c                        | 184 +++++
 tools/perf/tests/openat-syscall-all-cpus.c         |  10 +-
 tools/perf/tests/openat-syscall.c                  |  10 +-
 tools/perf/tests/parse-events.c                    |  19 +-
 tools/perf/tests/tests.h                           |   2 +
 tools/perf/tests/topology.c                        | 115 +++
 tools/perf/trace/strace/groups/file                |   2 +
 tools/perf/ui/browsers/hists.c                     |  61 +-
 tools/perf/util/Build                              |   1 +
 tools/perf/util/cpumap.c                           |  63 +-
 tools/perf/util/cpumap.h                           |   2 +
 tools/perf/util/env.c                              |  86 ++
 tools/perf/util/env.h                              |  44 ++
 tools/perf/util/event.c                            |   8 +
 tools/perf/util/evsel.c                            |   2 +-
 tools/perf/util/evsel.h                            |   1 -
 tools/perf/util/header.c                           | 140 ++--
 tools/perf/util/header.h                           |  27 +-
 tools/perf/util/hist.c                             |  38 +
 tools/perf/util/hist.h                             |   6 +-
 tools/perf/util/intel-bts.c                        |   2 +-
 tools/perf/util/intel-pt-decoder/Build             |  13 +-
 .../perf/util/intel-pt-decoder/x86-opcode-map.txt  |  24 +-
 tools/perf/util/intel-pt.c                         | 131 ++-
 tools/perf/util/machine.c                          |   1 +
 tools/perf/util/machine.h                          |   1 +
 tools/perf/util/parse-events.c                     |   2 +-
 tools/perf/util/parse-events.y                     |   2 +-
 tools/perf/util/parse-options.c                    |   2 +-
 tools/perf/util/probe-event.c                      | 102 ++-
 tools/perf/util/probe-event.h                      |   9 +
 tools/perf/util/probe-file.c                       |  56 +-
 tools/perf/util/probe-file.h                       |   4 +
 .../perf/util/scripting-engines/trace-event-perl.c |   1 +
 .../util/scripting-engines/trace-event-python.c    |   1 +
 tools/perf/util/session.c                          |  23 +-
 tools/perf/util/sort.c                             |  29 +-
 tools/perf/util/sort.h                             |   3 +
 tools/perf/util/srcline.c                          |  29 +-
 tools/perf/util/symbol.h                           |   1 +
 tools/perf/util/trace-event-info.c                 |   2 +-
 tools/perf/util/trace-event.c                      |   1 +
 tools/perf/util/util.c                             |  70 --
 tools/perf/util/util.h                             |  11 +-
 tools/testing/selftests/x86/entry_from_vm86.c      |   5 +-
 188 files changed, 6456 insertions(+), 1911 deletions(-)
 create mode 100644 tools/include/linux/filter.h
 create mode 100644 tools/lib/api/cpu.c
 create mode 100644 tools/lib/api/cpu.h
 delete mode 100644 tools/lib/api/fs/debugfs.c
 delete mode 100644 tools/lib/api/fs/debugfs.h
 delete mode 100644 tools/lib/api/fs/findfs.c
 delete mode 100644 tools/lib/api/fs/findfs.h
 delete mode 100644 tools/lib/api/fs/tracefs.c
 delete mode 100644 tools/lib/api/fs/tracefs.h
 create mode 100644 tools/lib/api/fs/tracing_path.c
 create mode 100644 tools/lib/api/fs/tracing_path.h
 create mode 100644 tools/perf/tests/gen-insn-x86-dat.awk
 create mode 100755 tools/perf/tests/gen-insn-x86-dat.sh
 create mode 100644 tools/perf/tests/insn-x86-dat-32.c
 create mode 100644 tools/perf/tests/insn-x86-dat-64.c
 create mode 100644 tools/perf/tests/insn-x86-dat-src.c
 create mode 100644 tools/perf/tests/insn-x86.c
 create mode 100644 tools/perf/tests/topology.c
 create mode 100644 tools/perf/util/env.c
 create mode 100644 tools/perf/util/env.h
$ git reset --hard HEAD^
HEAD is now at 680c529cb2c5 Merge remote-tracking branch 'spi/for-next'
Merging next-20150915 version of tip
$ git merge -m next-20150915/tip b84834af3560740a7ce643a94c95a444710c1372
Auto-merging init/Kconfig
Auto-merging arch/s390/kernel/perf_cpum_cf.c
Merge made by the 'recursive' strategy.
 Documentation/atomic_ops.txt                       |   4 +
 Documentation/static-keys.txt                      |   2 +-
 arch/powerpc/perf/core-book3s.c                    |  36 +-
 arch/powerpc/perf/hv-24x7.c                        | 166 +++-
 arch/s390/kernel/perf_cpum_cf.c                    |  35 +-
 arch/sparc/kernel/perf_event.c                     |  32 +-
 arch/x86/ia32/ia32_signal.c                        |   8 +-
 arch/x86/include/asm/cpufeature.h                  |   1 +
 arch/x86/include/asm/fpu/signal.h                  |   2 +-
 arch/x86/include/asm/ia32.h                        |   4 +-
 arch/x86/include/asm/processor.h                   |   2 +-
 arch/x86/include/asm/qspinlock.h                   |  19 +-
 arch/x86/include/asm/sigcontext.h                  |  75 +-
 arch/x86/include/asm/sigframe.h                    |   8 +-
 arch/x86/include/asm/signal.h                      |   2 +-
 arch/x86/include/asm/uv/uv_hub.h                   |   2 +-
 arch/x86/include/uapi/asm/sigcontext.h             | 456 +++++++----
 arch/x86/include/uapi/asm/sigcontext32.h           |  73 +-
 arch/x86/kernel/alternative.c                      |   5 +
 arch/x86/kernel/asm-offsets.c                      |  18 +-
 arch/x86/kernel/cpu/common.c                       |   4 +-
 arch/x86/kernel/cpu/perf_event.c                   |  39 +-
 arch/x86/kernel/cpu/perf_event.h                   |   2 +-
 arch/x86/kernel/cpu/perf_event_intel.c             |   5 +-
 arch/x86/kernel/cpu/perf_event_intel_bts.c         |  14 +
 arch/x86/kernel/cpu/perf_event_intel_ds.c          |  40 +-
 arch/x86/kernel/cpu/perf_event_intel_lbr.c         |   5 +-
 arch/x86/kernel/cpu/perf_event_intel_pt.c          |   7 +-
 arch/x86/kernel/fpu/signal.c                       |   4 +-
 arch/x86/kernel/signal.c                           |   4 +-
 arch/x86/kernel/tsc.c                              |  24 +-
 arch/x86/kernel/vm86_32.c                          |  27 +
 arch/x86/lib/x86-opcode-map.txt                    |  24 +-
 arch/x86/math-emu/fpu_emu.h                        |   2 +-
 arch/x86/mm/srat.c                                 |   5 +-
 arch/x86/platform/uv/uv_nmi.c                      |  53 +-
 drivers/net/ethernet/sfc/mcdi.c                    |   2 +-
 drivers/phy/phy-rcar-gen2.c                        |   3 +-
 drivers/staging/speakup/selection.c                |   2 +-
 include/asm-generic/qspinlock.h                    |   4 +-
 include/linux/jump_label.h                         |   2 +-
 include/linux/perf_event.h                         | 120 ++-
 include/linux/sched.h                              |   8 +-
 include/linux/tick.h                               |   9 +
 init/Kconfig                                       |   3 +
 kernel/cpu.c                                       |   8 +-
 kernel/events/core.c                               | 218 +++--
 kernel/locking/qspinlock.c                         |   2 +-
 kernel/sched/core.c                                |  68 +-
 kernel/sched/fair.c                                | 386 ++++-----
 kernel/sched/features.h                            |  21 +-
 kernel/sched/sched.h                               |  25 +-
 kernel/time/clocksource.c                          |   2 +-
 kernel/time/hrtimer.c                              |   2 +-
 kernel/time/tick-sched.c                           |  15 +-
 kernel/time/timekeeping.c                          |   6 +-
 security/device_cgroup.c                           |   2 +-
 tools/include/linux/filter.h                       | 231 ++++++
 tools/lib/api/fs/Build                             |   1 +
 tools/lib/api/fs/debugfs.c                         |  52 --
 tools/lib/api/fs/fs.c                              | 117 ++-
 tools/lib/api/fs/fs.h                              |  26 +-
 tools/lib/api/fs/tracing_path.c                    | 137 ++++
 tools/lib/api/fs/tracing_path.h                    |  16 +
 tools/lib/traceevent/event-parse.c                 |  56 +-
 tools/lib/traceevent/event-parse.h                 |   1 +
 tools/perf/MANIFEST                                |   1 +
 tools/perf/arch/x86/util/intel-pt.c                |  55 +-
 tools/perf/builtin-probe.c                         | 110 ++-
 tools/perf/builtin-script.c                        |   4 +-
 tools/perf/builtin-stat.c                          |   2 +-
 tools/perf/builtin-trace.c                         |   5 +-
 tools/perf/perf.c                                  |  12 +-
 tools/perf/tests/Build                             |   3 +
 tools/perf/tests/builtin-test.c                    |   8 +
 tools/perf/tests/gen-insn-x86-dat.awk              |  75 ++
 tools/perf/tests/gen-insn-x86-dat.sh               |  43 +
 tools/perf/tests/insn-x86-dat-32.c                 | 658 ++++++++++++++++
 tools/perf/tests/insn-x86-dat-64.c                 | 768 ++++++++++++++++++
 tools/perf/tests/insn-x86-dat-src.c                | 877 +++++++++++++++++++++
 tools/perf/tests/insn-x86.c                        | 184 +++++
 tools/perf/tests/tests.h                           |   1 +
 tools/perf/trace/strace/groups/file                |   2 +
 tools/perf/util/cpumap.c                           |  51 +-
 tools/perf/util/cpumap.h                           |   2 +
 tools/perf/util/header.c                           |  94 ++-
 tools/perf/util/header.h                           |   6 +
 tools/perf/util/intel-bts.c                        |   2 +-
 tools/perf/util/intel-pt-decoder/Build             |  13 +-
 .../perf/util/intel-pt-decoder/x86-opcode-map.txt  |  24 +-
 tools/perf/util/intel-pt.c                         | 131 ++-
 tools/perf/util/parse-events.c                     |   2 +-
 tools/perf/util/parse-events.y                     |   2 +-
 tools/perf/util/probe-event.c                      |  97 +--
 tools/perf/util/probe-event.h                      |   9 +
 tools/perf/util/probe-file.c                       |  41 +-
 tools/perf/util/probe-file.h                       |   4 +
 .../perf/util/scripting-engines/trace-event-perl.c |   1 +
 .../util/scripting-engines/trace-event-python.c    |   1 +
 tools/perf/util/session.c                          |   3 +-
 tools/perf/util/sort.c                             |   4 +-
 tools/perf/util/srcline.c                          |  29 +-
 tools/perf/util/trace-event-info.c                 |   2 +-
 tools/perf/util/trace-event.c                      |   1 +
 tools/perf/util/util.c                             |  70 --
 tools/perf/util/util.h                             |   8 +-
 tools/testing/selftests/x86/entry_from_vm86.c      |   5 +-
 107 files changed, 5107 insertions(+), 1057 deletions(-)
 create mode 100644 tools/include/linux/filter.h
 create mode 100644 tools/lib/api/fs/tracing_path.c
 create mode 100644 tools/lib/api/fs/tracing_path.h
 create mode 100644 tools/perf/tests/gen-insn-x86-dat.awk
 create mode 100755 tools/perf/tests/gen-insn-x86-dat.sh
 create mode 100644 tools/perf/tests/insn-x86-dat-32.c
 create mode 100644 tools/perf/tests/insn-x86-dat-64.c
 create mode 100644 tools/perf/tests/insn-x86-dat-src.c
 create mode 100644 tools/perf/tests/insn-x86.c
$ git am -3 ../patches/0001-cdc-add-header-guards.patch
Applying: cdc: add header guards
$ git reset HEAD^
Unstaged changes after reset:
M	include/linux/usb/cdc.h
M	include/uapi/linux/usb/cdc.h
$ git add -A .
$ git commit -v -a --amend
[master e7d3b37fed11] next-20150915/tip
 Date: Wed Sep 16 10:07:00 2015 +1000
Merging clockevents/clockevents/next (0e4baaa9a11b clocksource/drivers/exynos_mct: Use container_of() instead of this_cpu_ptr())
$ git merge clockevents/clockevents/next
Auto-merging drivers/clocksource/sh_cmt.c
Merge made by the 'recursive' strategy.
 drivers/clocksource/em_sti.c        |  2 --
 drivers/clocksource/exynos_mct.c    | 12 ++++++++----
 drivers/clocksource/h8300_timer16.c |  1 -
 drivers/clocksource/h8300_timer8.c  |  1 -
 drivers/clocksource/h8300_tpu.c     |  1 -
 drivers/clocksource/mtk_timer.c     | 26 ++++++++++++++++----------
 drivers/clocksource/sh_cmt.c        |  1 -
 7 files changed, 24 insertions(+), 20 deletions(-)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (d5c268153978 x86/mce: Don't clear shared banks on Intel when offlining CPUs)
$ git merge edac-amd/for-next
Merge made by the 'recursive' strategy.
 arch/x86/kernel/cpu/mcheck/mce.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)
Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next)
$ git merge irqchip/irqchip/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
$ git merge tiny/tiny/next
Already up-to-date.
Merging ftrace/for-next (b7dc42fd7939 ring-buffer: Revert "ring-buffer: Get timestamp after event is allocated")
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (dc3a04d551b5 security/device_cgroup: Fix RCU_LOCKDEP_WARN() condition)
$ git merge rcu/rcu/next
Already up-to-date.
Merging kvm/linux-next (81523aac01a7 KVM: make the declaration of functions within 80 characters)
$ git merge kvm/linux-next
Merge made by the 'recursive' strategy.
 arch/arm/kvm/psci.c              | 12 ++++++++----
 arch/arm64/include/asm/kvm_arm.h | 10 +++++++---
 virt/kvm/arm/arch_timer.c        |  8 ++++++++
 virt/kvm/arm/vgic.c              | 42 +++++++++++++++++++++++++---------------
 virt/kvm/coalesced_mmio.h        |  4 ++--
 virt/kvm/kvm_main.c              |  3 ++-
 6 files changed, 53 insertions(+), 26 deletions(-)
Merging kvm-arm/next (43297dda0a51 KVM: arm64: add workaround for Cortex-A57 erratum #852523)
$ git merge kvm-arm/next
Auto-merging arch/arm64/kvm/hyp.S
Merge made by the 'recursive' strategy.
 arch/arm64/kvm/hyp.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvm-ppc-paulus/kvm-ppc-next (4e33d1f0a145 KVM: PPC: Book3S: Fix typo in top comment about locking)
$ git merge kvm-ppc-paulus/kvm-ppc-next
Already up-to-date.
Merging kvms390/next (152b28392a8d KVM: s390: Fix assumption that kvm_set_irq_routing is always run successfully)
$ git merge kvms390/next
Already up-to-date.
Merging xen-tip/linux-next (3e64472c1c74 xen: switch extra memory accounting to use pfns)
$ git merge xen-tip/linux-next
Resolved 'arch/x86/include/asm/xen/page.h' using previous resolution.
Auto-merging arch/x86/include/asm/xen/page.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/xen/page.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 66f3659e6732] Merge remote-tracking branch 'xen-tip/linux-next'
$ git diff -M --stat --summary HEAD^..
Merging percpu/for-next (292c24a073ee percpu: clean up of schunk->map[] assignment in pcpu_setup_first_chunk)
$ git merge percpu/for-next
Already up-to-date.
Merging workqueues/for-next (355c06633e23 workqueue: fix some docbook warnings)
$ git merge workqueues/for-next
Already up-to-date.
Merging drivers-x86/for-next (85b4e4eb2f9a wmi: Remove private %pUL implementation)
$ git merge drivers-x86/for-next
Merge made by the 'recursive' strategy.
 drivers/platform/x86/asus-nb-wmi.c | 18 ++++++++++++++
 drivers/platform/x86/wmi.c         | 51 +++++---------------------------------
 2 files changed, 24 insertions(+), 45 deletions(-)
Merging chrome-platform/for-next (1d95e6f10fd8 platform/chrome: cros_ec: Fix possible leak in led_rgb_store())
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
 drivers/platform/chrome/Kconfig            |  5 +++--
 drivers/platform/chrome/cros_ec_dev.c      |  6 ++++++
 drivers/platform/chrome/cros_ec_lightbar.c | 31 ++++++++++++++++--------------
 drivers/platform/chrome/cros_ec_lpc.c      | 21 +++++++++-----------
 4 files changed, 35 insertions(+), 28 deletions(-)
Merging regmap/for-next (b4a21fc275e9 regmap: Allocate buffers with GFP_ATOMIC when fast_io == true)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
 drivers/base/regmap/internal.h |  1 +
 drivers/base/regmap/regmap.c   | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
$ git am -3 ../patches/mfd__Fixup_clients_of_multi_reg_write_register_patch.patch
Applying: mfd: Fixup clients of multi_reg_write/register_patch
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/mfd/wm5110-tables.c
M	drivers/mfd/wm8998-tables.c
$ git add -A .
$ git commit -v -a --amend
[master a8c6ab76b62d] Merge remote-tracking branch 'regmap/for-next'
 Date: Wed Sep 16 11:38:12 2015 +1000
Merging hsi/for-next (d770e558e219 Linux 4.2-rc1)
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (b0ba362c611f leds:lp55xx: Correct Kconfig dependency for f/w user helper)
$ git merge leds/for-next
Auto-merging drivers/leds/leds-max77693.c
Auto-merging drivers/leds/Kconfig
Merge made by the 'recursive' strategy.
 drivers/leds/Kconfig            |  3 ++-
 drivers/leds/leds-aat1290.c     |  3 ++-
 drivers/leds/leds-bcm6328.c     |  1 +
 drivers/leds/leds-bcm6358.c     |  1 +
 drivers/leds/leds-cobalt-qube.c | 23 +----------------------
 drivers/leds/leds-hp6xx.c       | 17 ++---------------
 drivers/leds/leds-ipaq-micro.c  | 27 ++++++++++-----------------
 drivers/leds/leds-ktd2692.c     |  1 +
 drivers/leds/leds-max77693.c    |  1 +
 drivers/leds/leds-ns2.c         |  1 +
 drivers/leds/leds-ot200.c       | 21 ++-------------------
 11 files changed, 24 insertions(+), 75 deletions(-)
Merging ipmi/for-next (bf2d087749d9 ipmi:ssif: Add a module parm to specify that SMBus alerts don't work)
$ git merge ipmi/for-next
Already up-to-date.
Merging driver-core/driver-core-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge driver-core/driver-core-next
Already up-to-date.
Merging tty/tty-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge tty/tty-next
Already up-to-date.
Merging usb/usb-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge usb/usb-next
Already up-to-date.
Merging usb-gadget/next (2f3cc24f07b8 usb: musb: gadget: fix build break by adding missing 'break')
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging staging/staging-next (6dd19f19a5e2 staging/rtl8188eu : Remove duplicated BIT() definitions)
$ git merge staging/staging-next
Removing drivers/staging/wilc1000/wilc_memory.h
Removing drivers/staging/wilc1000/wilc_memory.c
Removing drivers/staging/wilc1000/wilc_exported_buf.c
Auto-merging drivers/staging/fbtft/flexfb.c
Auto-merging drivers/staging/fbtft/fbtft-core.c
Auto-merging drivers/staging/fbtft/fb_watterott.c
Auto-merging drivers/staging/fbtft/fb_uc1611.c
Removing drivers/staging/comedi/drivers/unioxx5.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |    4 +-
 drivers/staging/android/Kconfig                    |    2 +-
 drivers/staging/android/ashmem.c                   |   18 +-
 drivers/staging/android/sw_sync.c                  |    6 +-
 drivers/staging/comedi/Kconfig                     |    8 -
 drivers/staging/comedi/drivers/Makefile            |    1 -
 drivers/staging/comedi/drivers/addi_apci_3120.c    |    5 -
 drivers/staging/comedi/drivers/mpc624.c            |   30 +-
 drivers/staging/comedi/drivers/s526.c              |  560 +++++----
 drivers/staging/comedi/drivers/serial2002.c        |   51 +-
 drivers/staging/comedi/drivers/ssv_dnp.c           |   57 +-
 drivers/staging/comedi/drivers/unioxx5.c           |  506 --------
 drivers/staging/comedi/drivers/usbdux.c            |  100 +-
 drivers/staging/comedi/drivers/usbduxfast.c        |  274 ++---
 drivers/staging/comedi/drivers/usbduxsigma.c       |   72 +-
 drivers/staging/comedi/drivers/vmk80xx.c           |  127 +-
 .../staging/comedi/kcomedilib/kcomedilib_main.c    |   32 +-
 drivers/staging/dgap/dgap.c                        |   32 +-
 drivers/staging/dgnc/dgnc_mgmt.c                   |    3 +-
 drivers/staging/emxx_udc/emxx_udc.c                |   96 +-
 drivers/staging/emxx_udc/emxx_udc.h                |   30 -
 drivers/staging/fbtft/fb_agm1264k-fl.c             |    9 +-
 drivers/staging/fbtft/fb_bd663474.c                |    7 +-
 drivers/staging/fbtft/fb_hx8340bn.c                |   16 +-
 drivers/staging/fbtft/fb_hx8347d.c                 |   12 +-
 drivers/staging/fbtft/fb_hx8353d.c                 |   15 +-
 drivers/staging/fbtft/fb_hx8357d.c                 |    8 +-
 drivers/staging/fbtft/fb_ili9163.c                 |    7 +-
 drivers/staging/fbtft/fb_ili9320.c                 |   15 +-
 drivers/staging/fbtft/fb_ili9325.c                 |   14 +-
 drivers/staging/fbtft/fb_ili9340.c                 |   10 +-
 drivers/staging/fbtft/fb_ili9341.c                 |   14 +-
 drivers/staging/fbtft/fb_ili9481.c                 |    8 +-
 drivers/staging/fbtft/fb_ili9486.c                 |   10 +-
 drivers/staging/fbtft/fb_pcd8544.c                 |   17 +-
 drivers/staging/fbtft/fb_ra8875.c                  |   36 +-
 drivers/staging/fbtft/fb_s6d02a1.c                 |   14 +-
 drivers/staging/fbtft/fb_s6d1121.c                 |   12 +-
 drivers/staging/fbtft/fb_ssd1289.c                 |   14 +-
 drivers/staging/fbtft/fb_ssd1306.c                 |   17 +-
 drivers/staging/fbtft/fb_ssd1331.c                 |    5 -
 drivers/staging/fbtft/fb_ssd1351.c                 |   19 +-
 drivers/staging/fbtft/fb_st7735r.c                 |   18 +-
 drivers/staging/fbtft/fb_tinylcd.c                 |   10 +-
 drivers/staging/fbtft/fb_tls8204.c                 |   16 +-
 drivers/staging/fbtft/fb_uc1611.c                  |    4 -
 drivers/staging/fbtft/fb_uc1701.c                  |   19 +-
 drivers/staging/fbtft/fb_upd161704.c               |    7 +-
 drivers/staging/fbtft/fb_watterott.c               |   24 +-
 drivers/staging/fbtft/fbtft-bus.c                  |   13 +-
 drivers/staging/fbtft/fbtft-core.c                 |   91 +-
 drivers/staging/fbtft/fbtft-sysfs.c                |    6 +-
 drivers/staging/fbtft/fbtft.h                      |    9 -
 drivers/staging/fbtft/fbtft_device.c               |   96 +-
 drivers/staging/fbtft/flexfb.c                     |   10 -
 drivers/staging/fsl-mc/bus/mc-bus.c                |    6 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |   19 +-
 .../staging/ft1000/ft1000-usb/ft1000_download.c    |    8 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |    8 +-
 drivers/staging/gdm72xx/gdm_qos.c                  |    2 +-
 drivers/staging/gdm72xx/gdm_sdio.c                 |   20 +-
 drivers/staging/gdm72xx/gdm_usb.c                  |   16 +-
 drivers/staging/gdm72xx/gdm_wimax.c                |    4 +-
 drivers/staging/gdm72xx/sdio_boot.c                |    4 +-
 drivers/staging/gdm72xx/usb_boot.c                 |    8 +-
 drivers/staging/goldfish/goldfish_nand.c           |    4 +-
 drivers/staging/goldfish/goldfish_nand_reg.h       |   10 +-
 drivers/staging/iio/addac/adt7316.c                |   14 +-
 drivers/staging/iio/cdc/ad7746.c                   |    8 +-
 drivers/staging/iio/meter/ade7753.c                |    8 +-
 drivers/staging/iio/meter/ade7754.c                |    6 +-
 drivers/staging/iio/meter/ade7758_core.c           |    6 +-
 drivers/staging/iio/meter/ade7759.c                |    8 +-
 drivers/staging/iio/meter/ade7854.c                |    6 +-
 drivers/staging/lustre/include/linux/lnet/types.h  |    2 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |  284 ++---
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |    5 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |    8 +-
 .../lustre/lnet/klnds/socklnd/socklnd_lib.c        |    6 +-
 drivers/staging/lustre/lnet/lnet/lib-ptl.c         |    4 +-
 drivers/staging/lustre/lnet/selftest/conrpc.h      |    4 +-
 drivers/staging/lustre/lnet/selftest/console.c     |   16 +-
 drivers/staging/lustre/lnet/selftest/selftest.h    |   22 +-
 drivers/staging/lustre/lustre/include/cl_object.h  |   14 +-
 .../lustre/lustre/include/linux/lustre_lite.h      |    2 +-
 .../staging/lustre/lustre/include/lprocfs_status.h |    3 +-
 drivers/staging/lustre/lustre/include/lu_object.h  |   16 +-
 .../lustre/lustre/include/lustre/lustre_idl.h      |   12 +-
 .../lustre/lustre/include/lustre/lustre_user.h     |    7 +-
 .../staging/lustre/lustre/include/lustre_capa.h    |    2 +-
 .../staging/lustre/lustre/include/lustre_disk.h    |    2 +-
 drivers/staging/lustre/lustre/include/lustre_dlm.h |    6 +-
 .../lustre/lustre/include/lustre_dlm_flags.h       |  152 +--
 drivers/staging/lustre/lustre/include/lustre_lib.h |    6 +-
 drivers/staging/lustre/lustre/include/lustre_net.h |    2 +-
 drivers/staging/lustre/lustre/include/obd.h        |    2 +-
 .../staging/lustre/lustre/include/obd_support.h    |    8 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c    |    8 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c |    4 +-
 drivers/staging/lustre/lustre/libcfs/fail.c        |    4 +-
 drivers/staging/lustre/lustre/libcfs/hash.c        |   14 +-
 drivers/staging/lustre/lustre/libcfs/libcfs_lock.c |    6 +-
 drivers/staging/lustre/lustre/libcfs/libcfs_mem.c  |   10 +-
 .../staging/lustre/lustre/libcfs/linux/linux-cpu.c |    3 +-
 .../lustre/lustre/libcfs/linux/linux-crypto.c      |    5 +-
 .../lustre/lustre/libcfs/linux/linux-tracefile.c   |   22 +-
 drivers/staging/lustre/lustre/libcfs/tracefile.c   |    4 +-
 drivers/staging/lustre/lustre/libcfs/workitem.c    |   12 +-
 drivers/staging/lustre/lustre/llite/dir.c          |   10 +-
 drivers/staging/lustre/lustre/llite/file.c         |   14 +-
 drivers/staging/lustre/lustre/llite/llite_close.c  |    5 +-
 .../staging/lustre/lustre/llite/llite_internal.h   |    2 +-
 drivers/staging/lustre/lustre/llite/llite_lib.c    |    7 +-
 drivers/staging/lustre/lustre/llite/lproc_llite.c  |    5 +-
 drivers/staging/lustre/lustre/llite/rw.c           |    6 +-
 drivers/staging/lustre/lustre/llite/statahead.c    |    4 +-
 drivers/staging/lustre/lustre/llite/super25.c      |   16 +-
 drivers/staging/lustre/lustre/llite/vvp_io.c       |    2 +-
 drivers/staging/lustre/lustre/lmv/lmv_obd.c        |    5 +-
 drivers/staging/lustre/lustre/lov/lov_io.c         |    2 +
 drivers/staging/lustre/lustre/lov/lov_obd.c        |    6 +-
 drivers/staging/lustre/lustre/mdc/mdc_locks.c      |    2 +-
 drivers/staging/lustre/lustre/obdclass/capa.c      |    2 +-
 drivers/staging/lustre/lustre/obdclass/cl_io.c     |   10 +-
 drivers/staging/lustre/lustre/obdclass/cl_lock.c   |    6 +-
 drivers/staging/lustre/lustre/obdclass/cl_object.c |   11 +-
 drivers/staging/lustre/lustre/obdclass/class_obd.c |   12 +-
 drivers/staging/lustre/lustre/obdclass/dt_object.c |    5 +-
 drivers/staging/lustre/lustre/obdclass/genops.c    |   97 +-
 .../lustre/lustre/obdclass/linux/linux-module.c    |    2 -
 drivers/staging/lustre/lustre/obdclass/llog.c      |    4 +-
 .../lustre/lustre/obdclass/lprocfs_counters.c      |    2 +-
 drivers/staging/lustre/lustre/obdclass/lu_object.c |   20 +-
 .../staging/lustre/lustre/obdclass/obd_config.c    |   43 +-
 drivers/staging/lustre/lustre/obdclass/obd_mount.c |    6 +-
 drivers/staging/lustre/lustre/osc/osc_page.c       |    2 +-
 drivers/staging/lustre/lustre/osc/osc_request.c    |   16 +-
 drivers/staging/lustre/lustre/ptlrpc/client.c      |    7 +-
 drivers/staging/lustre/lustre/ptlrpc/import.c      |   31 +-
 drivers/staging/lustre/lustre/ptlrpc/layout.c      |    6 +-
 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |    2 +-
 .../staging/lustre/lustre/ptlrpc/pack_generic.c    |    2 +-
 .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c   |    3 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_plain.c   |    1 +
 drivers/staging/most/aim-cdev/cdev.c               |   22 +-
 drivers/staging/most/aim-network/networking.c      |    2 +-
 drivers/staging/most/aim-sound/sound.c             |    5 +-
 drivers/staging/most/aim-v4l2/Makefile             |    1 -
 drivers/staging/most/aim-v4l2/video.c              |    2 +-
 drivers/staging/most/hdm-dim2/dim2_hal.c           |    5 -
 drivers/staging/most/hdm-dim2/dim2_hal.h           |    5 -
 drivers/staging/most/hdm-dim2/dim2_hdm.c           |   19 +-
 drivers/staging/most/hdm-usb/hdm_usb.c             |   13 +-
 drivers/staging/most/mostcore/core.c               |   10 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c      |    1 +
 drivers/staging/octeon-usb/octeon-hcd.c            |    1 +
 drivers/staging/panel/panel.c                      |   63 +-
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |   12 +-
 drivers/staging/rtl8188eu/core/rtw_sta_mgt.c       |    6 +-
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c     |    6 +-
 .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c   |   14 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c       |    4 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c     |    2 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |    2 +-
 drivers/staging/rtl8188eu/include/rtl8188e_spec.h  |    4 -
 drivers/staging/rtl8188eu/include/wifi.h           |   12 -
 drivers/staging/rtl8188eu/os_dep/mlme_linux.c      |    4 +-
 drivers/staging/rtl8188eu/os_dep/osdep_service.c   |    2 +-
 drivers/staging/rtl8188eu/os_dep/recv_linux.c      |    2 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c     |    3 -
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c         |    3 +-
 .../staging/rtl8192u/ieee80211/ieee80211_module.c  |    2 +-
 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |    3 +-
 .../rtl8192u/ieee80211/ieee80211_softmac_wx.c      |   28 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |    2 +-
 drivers/staging/rtl8192u/r8192U.h                  |    4 +-
 drivers/staging/rtl8192u/r8192U_core.c             | 1230 ++++++++++----------
 drivers/staging/rtl8712/osdep_service.h            |    4 -
 drivers/staging/rtl8712/usb_ops_linux.c            |    2 +-
 drivers/staging/rtl8712/wifi.h                     |    9 -
 drivers/staging/rtl8723au/core/rtw_mlme_ext.c      |    7 +-
 drivers/staging/rtl8723au/core/rtw_security.c      |   17 +-
 drivers/staging/rtl8723au/hal/usb_halinit.c        |    5 +-
 drivers/staging/rtl8723au/include/rtw_cmd.h        |    2 -
 drivers/staging/sm750fb/ddk750_hwi2c.c             |  109 +-
 drivers/staging/sm750fb/ddk750_hwi2c.h             |    9 +-
 drivers/staging/sm750fb/ddk750_sii164.c            |    8 +-
 drivers/staging/sm750fb/ddk750_swi2c.c             |  291 ++---
 drivers/staging/sm750fb/ddk750_swi2c.h             |   47 +-
 drivers/staging/sm750fb/sm750_hw.c                 |   10 +-
 drivers/staging/speakup/devsynth.c                 |    4 +-
 drivers/staging/speakup/kobjects.c                 |   16 +-
 drivers/staging/speakup/serialio.c                 |    4 +-
 drivers/staging/speakup/speakup_dectlk.c           |    3 +-
 drivers/staging/speakup/varhandlers.c              |   18 +-
 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 -
 .../Documentation/ABI/sysfs-platform-visorchipset  |    2 +
 drivers/staging/unisys/Documentation/overview.txt  |  458 +++++---
 drivers/staging/unisys/TODO                        |   25 +-
 drivers/staging/vt6655/card.c                      |   14 +-
 drivers/staging/vt6655/desc.h                      |   58 +-
 drivers/staging/vt6655/device.h                    |   26 +-
 drivers/staging/vt6655/device_main.c               |  236 +---
 drivers/staging/vt6655/dpc.c                       |    8 +-
 drivers/staging/vt6655/dpc.h                       |    2 +-
 drivers/staging/wilc1000/Kconfig                   |    1 -
 drivers/staging/wilc1000/Makefile                  |    9 +-
 drivers/staging/wilc1000/coreconfigurator.c        | 1055 +----------------
 drivers/staging/wilc1000/host_interface.c          |  496 +++++---
 drivers/staging/wilc1000/host_interface.h          |    2 +
 drivers/staging/wilc1000/linux_mon.c               |  106 +-
 drivers/staging/wilc1000/linux_wlan.c              |  517 +-------
 drivers/staging/wilc1000/linux_wlan_common.h       |    7 +-
 drivers/staging/wilc1000/linux_wlan_sdio.c         |   10 +-
 drivers/staging/wilc1000/linux_wlan_spi.c          |   79 +-
 drivers/staging/wilc1000/wilc_errorsupport.h       |    2 -
 drivers/staging/wilc1000/wilc_exported_buf.c       |   71 --
 drivers/staging/wilc1000/wilc_memory.c             |   16 -
 drivers/staging/wilc1000/wilc_memory.h             |   66 --
 drivers/staging/wilc1000/wilc_msgqueue.c           |   53 +-
 drivers/staging/wilc1000/wilc_msgqueue.h           |    9 +-
 drivers/staging/wilc1000/wilc_oswrapper.h          |    4 -
 drivers/staging/wilc1000/wilc_sdio.c               |    3 -
 drivers/staging/wilc1000/wilc_spi.c                |    7 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  |  426 ++++---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.h  |    5 -
 drivers/staging/wilc1000/wilc_wfi_netdevice.h      |   10 +-
 drivers/staging/wilc1000/wilc_wlan.c               |  267 ++---
 drivers/staging/wilc1000/wilc_wlan.h               |    7 -
 drivers/staging/wilc1000/wilc_wlan_cfg.c           |   39 +-
 drivers/staging/wilc1000/wilc_wlan_if.h            |   28 +-
 drivers/staging/wlan-ng/p80211conv.c               |   50 +-
 drivers/staging/wlan-ng/p80211conv.h               |    7 +-
 234 files changed, 3562 insertions(+), 6517 deletions(-)
 delete mode 100644 drivers/staging/comedi/drivers/unioxx5.c
 delete mode 100644 drivers/staging/wilc1000/wilc_exported_buf.c
 delete mode 100644 drivers/staging/wilc1000/wilc_memory.c
 delete mode 100644 drivers/staging/wilc1000/wilc_memory.h
Merging char-misc/char-misc-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge char-misc/char-misc-next
Already up-to-date.
Merging extcon/extcon-next (b3792ea45887 extcon: axp288: Convert to using managed resources)
$ git merge extcon/extcon-next
Merge made by the 'recursive' strategy.
 drivers/extcon/extcon-axp288.c  | 23 +++++------------------
 drivers/extcon/extcon-rt8973a.c |  1 +
 drivers/extcon/extcon-sm5502.c  |  1 +
 drivers/extcon/extcon.c         |  2 +-
 4 files changed, 8 insertions(+), 19 deletions(-)
Merging kdbus/kdbus (a36324913ff2 kdbus: selftests: add more name registry tests)
$ git merge kdbus/kdbus
Resolved 'tools/testing/selftests/Makefile' using previous resolution.
Auto-merging tools/testing/selftests/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile
Auto-merging init/Kconfig
Auto-merging include/uapi/linux/Kbuild
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/ioctl/ioctl-number.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 9655f2222270] Merge remote-tracking branch 'kdbus/kdbus'
$ git diff -M --stat --summary HEAD^..
 Documentation/Makefile                           |    2 +-
 Documentation/ioctl/ioctl-number.txt             |    1 +
 Documentation/kdbus/.gitignore                   |    2 +
 Documentation/kdbus/Makefile                     |   44 +
 Documentation/kdbus/kdbus.bus.xml                |  344 ++++
 Documentation/kdbus/kdbus.connection.xml         | 1244 ++++++++++++
 Documentation/kdbus/kdbus.endpoint.xml           |  429 +++++
 Documentation/kdbus/kdbus.fs.xml                 |  124 ++
 Documentation/kdbus/kdbus.item.xml               |  839 ++++++++
 Documentation/kdbus/kdbus.match.xml              |  555 ++++++
 Documentation/kdbus/kdbus.message.xml            | 1276 +++++++++++++
 Documentation/kdbus/kdbus.name.xml               |  711 +++++++
 Documentation/kdbus/kdbus.policy.xml             |  406 ++++
 Documentation/kdbus/kdbus.pool.xml               |  326 ++++
 Documentation/kdbus/kdbus.xml                    | 1012 ++++++++++
 Documentation/kdbus/stylesheet.xsl               |   16 +
 MAINTAINERS                                      |   13 +
 Makefile                                         |    1 +
 include/uapi/linux/Kbuild                        |    1 +
 include/uapi/linux/kdbus.h                       |  984 ++++++++++
 include/uapi/linux/magic.h                       |    2 +
 init/Kconfig                                     |   13 +
 ipc/Makefile                                     |    2 +-
 ipc/kdbus/Makefile                               |   33 +
 ipc/kdbus/bus.c                                  |  514 +++++
 ipc/kdbus/bus.h                                  |  101 +
 ipc/kdbus/connection.c                           | 2227 ++++++++++++++++++++++
 ipc/kdbus/connection.h                           |  260 +++
 ipc/kdbus/domain.c                               |  296 +++
 ipc/kdbus/domain.h                               |   77 +
 ipc/kdbus/endpoint.c                             |  303 +++
 ipc/kdbus/endpoint.h                             |   70 +
 ipc/kdbus/fs.c                                   |  508 +++++
 ipc/kdbus/fs.h                                   |   28 +
 ipc/kdbus/handle.c                               |  691 +++++++
 ipc/kdbus/handle.h                               |  103 +
 ipc/kdbus/item.c                                 |  293 +++
 ipc/kdbus/item.h                                 |   61 +
 ipc/kdbus/limits.h                               |   61 +
 ipc/kdbus/main.c                                 |  114 ++
 ipc/kdbus/match.c                                |  546 ++++++
 ipc/kdbus/match.h                                |   35 +
 ipc/kdbus/message.c                              | 1040 ++++++++++
 ipc/kdbus/message.h                              |  120 ++
 ipc/kdbus/metadata.c                             | 1347 +++++++++++++
 ipc/kdbus/metadata.h                             |   86 +
 ipc/kdbus/names.c                                |  854 +++++++++
 ipc/kdbus/names.h                                |  105 +
 ipc/kdbus/node.c                                 |  897 +++++++++
 ipc/kdbus/node.h                                 |   86 +
 ipc/kdbus/notify.c                               |  204 ++
 ipc/kdbus/notify.h                               |   30 +
 ipc/kdbus/policy.c                               |  489 +++++
 ipc/kdbus/policy.h                               |   51 +
 ipc/kdbus/pool.c                                 |  728 +++++++
 ipc/kdbus/pool.h                                 |   46 +
 ipc/kdbus/queue.c                                |  363 ++++
 ipc/kdbus/queue.h                                |   84 +
 ipc/kdbus/reply.c                                |  252 +++
 ipc/kdbus/reply.h                                |   68 +
 ipc/kdbus/util.c                                 |  156 ++
 ipc/kdbus/util.h                                 |   73 +
 samples/Kconfig                                  |    7 +
 samples/Makefile                                 |    3 +-
 samples/kdbus/.gitignore                         |    1 +
 samples/kdbus/Makefile                           |    9 +
 samples/kdbus/kdbus-api.h                        |  114 ++
 samples/kdbus/kdbus-workers.c                    | 1346 +++++++++++++
 tools/testing/selftests/Makefile                 |    1 +
 tools/testing/selftests/kdbus/.gitignore         |    1 +
 tools/testing/selftests/kdbus/Makefile           |   49 +
 tools/testing/selftests/kdbus/kdbus-enum.c       |   94 +
 tools/testing/selftests/kdbus/kdbus-enum.h       |   15 +
 tools/testing/selftests/kdbus/kdbus-test.c       |  905 +++++++++
 tools/testing/selftests/kdbus/kdbus-test.h       |   84 +
 tools/testing/selftests/kdbus/kdbus-util.c       | 1612 ++++++++++++++++
 tools/testing/selftests/kdbus/kdbus-util.h       |  218 +++
 tools/testing/selftests/kdbus/test-activator.c   |  318 +++
 tools/testing/selftests/kdbus/test-benchmark.c   |  451 +++++
 tools/testing/selftests/kdbus/test-bus.c         |  175 ++
 tools/testing/selftests/kdbus/test-chat.c        |  124 ++
 tools/testing/selftests/kdbus/test-connection.c  |  597 ++++++
 tools/testing/selftests/kdbus/test-daemon.c      |   65 +
 tools/testing/selftests/kdbus/test-endpoint.c    |  352 ++++
 tools/testing/selftests/kdbus/test-fd.c          |  789 ++++++++
 tools/testing/selftests/kdbus/test-free.c        |   64 +
 tools/testing/selftests/kdbus/test-match.c       |  441 +++++
 tools/testing/selftests/kdbus/test-message.c     |  734 +++++++
 tools/testing/selftests/kdbus/test-metadata-ns.c |  500 +++++
 tools/testing/selftests/kdbus/test-monitor.c     |  176 ++
 tools/testing/selftests/kdbus/test-names.c       |  272 +++
 tools/testing/selftests/kdbus/test-policy-ns.c   |  632 ++++++
 tools/testing/selftests/kdbus/test-policy-priv.c | 1285 +++++++++++++
 tools/testing/selftests/kdbus/test-policy.c      |   80 +
 tools/testing/selftests/kdbus/test-sync.c        |  369 ++++
 tools/testing/selftests/kdbus/test-timeout.c     |   99 +
 96 files changed, 33726 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/kdbus/.gitignore
 create mode 100644 Documentation/kdbus/Makefile
 create mode 100644 Documentation/kdbus/kdbus.bus.xml
 create mode 100644 Documentation/kdbus/kdbus.connection.xml
 create mode 100644 Documentation/kdbus/kdbus.endpoint.xml
 create mode 100644 Documentation/kdbus/kdbus.fs.xml
 create mode 100644 Documentation/kdbus/kdbus.item.xml
 create mode 100644 Documentation/kdbus/kdbus.match.xml
 create mode 100644 Documentation/kdbus/kdbus.message.xml
 create mode 100644 Documentation/kdbus/kdbus.name.xml
 create mode 100644 Documentation/kdbus/kdbus.policy.xml
 create mode 100644 Documentation/kdbus/kdbus.pool.xml
 create mode 100644 Documentation/kdbus/kdbus.xml
 create mode 100644 Documentation/kdbus/stylesheet.xsl
 create mode 100644 include/uapi/linux/kdbus.h
 create mode 100644 ipc/kdbus/Makefile
 create mode 100644 ipc/kdbus/bus.c
 create mode 100644 ipc/kdbus/bus.h
 create mode 100644 ipc/kdbus/connection.c
 create mode 100644 ipc/kdbus/connection.h
 create mode 100644 ipc/kdbus/domain.c
 create mode 100644 ipc/kdbus/domain.h
 create mode 100644 ipc/kdbus/endpoint.c
 create mode 100644 ipc/kdbus/endpoint.h
 create mode 100644 ipc/kdbus/fs.c
 create mode 100644 ipc/kdbus/fs.h
 create mode 100644 ipc/kdbus/handle.c
 create mode 100644 ipc/kdbus/handle.h
 create mode 100644 ipc/kdbus/item.c
 create mode 100644 ipc/kdbus/item.h
 create mode 100644 ipc/kdbus/limits.h
 create mode 100644 ipc/kdbus/main.c
 create mode 100644 ipc/kdbus/match.c
 create mode 100644 ipc/kdbus/match.h
 create mode 100644 ipc/kdbus/message.c
 create mode 100644 ipc/kdbus/message.h
 create mode 100644 ipc/kdbus/metadata.c
 create mode 100644 ipc/kdbus/metadata.h
 create mode 100644 ipc/kdbus/names.c
 create mode 100644 ipc/kdbus/names.h
 create mode 100644 ipc/kdbus/node.c
 create mode 100644 ipc/kdbus/node.h
 create mode 100644 ipc/kdbus/notify.c
 create mode 100644 ipc/kdbus/notify.h
 create mode 100644 ipc/kdbus/policy.c
 create mode 100644 ipc/kdbus/policy.h
 create mode 100644 ipc/kdbus/pool.c
 create mode 100644 ipc/kdbus/pool.h
 create mode 100644 ipc/kdbus/queue.c
 create mode 100644 ipc/kdbus/queue.h
 create mode 100644 ipc/kdbus/reply.c
 create mode 100644 ipc/kdbus/reply.h
 create mode 100644 ipc/kdbus/util.c
 create mode 100644 ipc/kdbus/util.h
 create mode 100644 samples/kdbus/.gitignore
 create mode 100644 samples/kdbus/Makefile
 create mode 100644 samples/kdbus/kdbus-api.h
 create mode 100644 samples/kdbus/kdbus-workers.c
 create mode 100644 tools/testing/selftests/kdbus/.gitignore
 create mode 100644 tools/testing/selftests/kdbus/Makefile
 create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c
 create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h
 create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c
 create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h
 create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c
 create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h
 create mode 100644 tools/testing/selftests/kdbus/test-activator.c
 create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c
 create mode 100644 tools/testing/selftests/kdbus/test-bus.c
 create mode 100644 tools/testing/selftests/kdbus/test-chat.c
 create mode 100644 tools/testing/selftests/kdbus/test-connection.c
 create mode 100644 tools/testing/selftests/kdbus/test-daemon.c
 create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c
 create mode 100644 tools/testing/selftests/kdbus/test-fd.c
 create mode 100644 tools/testing/selftests/kdbus/test-free.c
 create mode 100644 tools/testing/selftests/kdbus/test-match.c
 create mode 100644 tools/testing/selftests/kdbus/test-message.c
 create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c
 create mode 100644 tools/testing/selftests/kdbus/test-monitor.c
 create mode 100644 tools/testing/selftests/kdbus/test-names.c
 create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c
 create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c
 create mode 100644 tools/testing/selftests/kdbus/test-policy.c
 create mode 100644 tools/testing/selftests/kdbus/test-sync.c
 create mode 100644 tools/testing/selftests/kdbus/test-timeout.c
Merging cgroup/for-next (eacb1e7d4bfa Merge branch 'for-4.3' into for-next)
$ git merge cgroup/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging scsi/for-next (294ab783ad98 scsi_dh: fix randconfig build error)
$ git merge scsi/for-next
Already up-to-date.
Merging target-updates/for-next (ac64a2ce5091 target: use stringify.h instead of own definition)
$ git merge target-updates/for-next
Already up-to-date.
Merging target-merge/for-next-merge (8edb1554f7c2 mpt3sas: Fix unprotected list lookup in v4.3-rc0 changes)
$ git merge target-merge/for-next-merge
Merge made by the 'recursive' strategy.
 drivers/scsi/mpt3sas/mpt3sas_base.h      |  25 +-
 drivers/scsi/mpt3sas/mpt3sas_scsih.c     | 595 ++++++++++++++++++++++---------
 drivers/scsi/mpt3sas/mpt3sas_transport.c |  18 +-
 3 files changed, 458 insertions(+), 180 deletions(-)
Merging pinctrl/for-next (fa84b52cb681 pinctrl: samsung: s3c24xx: fix syntax error)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
 drivers/pinctrl/core.c                    | 3 +++
 drivers/pinctrl/pinctrl-digicolor.c       | 4 ++--
 drivers/pinctrl/pinmux.c                  | 3 +--
 drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c  | 4 ++--
 drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c   | 4 ++--
 drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)
Merging vhost/linux-next (997e120843e8 virtio_balloon: do not change memory amount visible via /proc/meminfo)
$ git merge vhost/linux-next
Already up-to-date.
Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage)
$ git merge remoteproc/for-next
Already up-to-date.
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
$ git merge rpmsg/for-next
Already up-to-date.
Merging gpio/for-next (46d4f7c25e1b gpio: omap: Fix GPIO numbering for deferred probe)
$ git merge gpio/for-next
Merge made by the 'recursive' strategy.
 Documentation/gpio/board.txt    | 40 +++++++++++++++++++++++++---------------
 Documentation/gpio/consumer.txt |  3 +++
 drivers/gpio/Kconfig            |  2 +-
 drivers/gpio/gpio-mxc.c         | 12 ++++++++++--
 drivers/gpio/gpio-mxs.c         | 13 +++++++++++--
 drivers/gpio/gpio-omap.c        |  9 +++++++--
 drivers/gpio/gpio-sx150x.c      |  1 -
 drivers/gpio/gpiolib.c          | 21 ++++++++++++++-------
 8 files changed, 71 insertions(+), 30 deletions(-)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (7a5938201834 ARM: at91: pwm: atmel-hlcdc: Add at91sam9n12 errata)
$ git merge pwm/for-next
Already up-to-date.
Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
$ git merge dma-buf/for-next
Already up-to-date.
Merging userns/for-next (4b75de861505 fs: Set the size of empty dirs to 0.)
$ git merge userns/for-next
Already up-to-date.
Merging ktest/for-next (b953c0d234bc Linux 4.1)
$ git merge ktest/for-next
Already up-to-date.
Merging clk/clk-next (6336dc3e33cd clk: divider: handle integer overflow when dividing large clock rates)
$ git merge clk/clk-next
Merge made by the 'recursive' strategy.
 drivers/clk/at91/clk-system.c            |  3 +-
 drivers/clk/at91/clk-utmi.c              |  4 +-
 drivers/clk/clk-divider.c                | 20 +++----
 drivers/clk/qcom/clk-rcg.h               |  1 +
 drivers/clk/qcom/clk-rcg2.c              | 91 +++++++++++++++++++++++++++++---
 drivers/clk/qcom/gcc-msm8916.c           | 14 +----
 drivers/clk/qcom/mmcc-apq8084.c          | 18 +------
 drivers/clk/qcom/mmcc-msm8974.c          | 11 +---
 drivers/clk/rockchip/clk-rk3368.c        |  6 +++
 drivers/clk/sunxi/clk-sun6i-apb0-gates.c |  1 +
 drivers/clk/sunxi/clk-sun6i-apb0.c       |  1 +
 drivers/clk/sunxi/clk-sun6i-ar100.c      |  1 +
 drivers/clk/sunxi/clk-sun8i-apb0.c       |  1 +
 drivers/clk/sunxi/clk-sun9i-mmc.c        |  1 +
 drivers/clk/tegra/clk-dfll.c             |  4 ++
 15 files changed, 118 insertions(+), 59 deletions(-)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
$ git merge random/dev
Already up-to-date.
Merging aio/master (6ff33f3902c3 Linux 4.3-rc1)
$ git merge aio/master
Already up-to-date.
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
$ git merge llvmlinux/for-next
Merge made by the 'recursive' strategy.
Merging kselftest/next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge kselftest/next
Already up-to-date.
Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
$ git merge y2038/y2038
Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution.
Auto-merging kernel/cpuset.c
Auto-merging fs/coredump.c
Auto-merging drivers/staging/media/lirc/lirc_serial.c
Auto-merging drivers/staging/media/lirc/lirc_sasem.c
Auto-merging drivers/staging/media/lirc/lirc_parallel.c
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
Auto-merging drivers/staging/gdm72xx/gdm_sdio.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3f008e7f0f6e] Merge remote-tracking branch 'y2038/y2038'
$ git diff -M --stat --summary HEAD^..
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c |  4 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c |  4 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c    |  4 +-
 drivers/staging/ft1000/ft1000.h                  |  4 +-
 drivers/staging/gdm72xx/gdm_sdio.c               | 13 +++---
 drivers/staging/gdm72xx/gdm_sdio.h               |  4 +-
 drivers/staging/media/lirc/lirc_parallel.c       | 35 +++++++----------
 drivers/staging/media/lirc/lirc_sasem.c          | 20 +++++-----
 drivers/staging/media/lirc/lirc_serial.c         | 50 ++++++++----------------
 fs/coredump.c                                    |  8 ++--
 kernel/cpuset.c                                  | 12 ++++--
 11 files changed, 68 insertions(+), 90 deletions(-)
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
$ git merge luto-misc/next
Already up-to-date.
Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic)
$ git merge access_once/linux-next
Merge made by the 'recursive' strategy.
Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next)
$ git merge livepatching/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging coresight/next (8503d45d4f27 Coresight: ETMv4: Prevent TRCRSCTLR0&1 from being accessed)
$ git merge coresight/next
Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c
Merge made by the 'recursive' strategy.
 drivers/hwtracing/coresight/coresight-etm4x.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)
Merging rtc/rtc-next (ec7fe80d5f9e rtc: pcf2127: make module license match the file header)
$ git merge rtc/rtc-next
Merge made by the 'recursive' strategy.
 drivers/rtc/rtc-pcf2127.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
$ git merge hwspinlock/for-next
Already up-to-date.
Merging nvdimm/libnvdimm-for-next (004f1afbe199 libnvdimm, pmem: direct map legacy pmem by default)
$ git merge nvdimm/libnvdimm-for-next
Already up-to-date.
Merging akpm-current/current (fadfe9f50067 ipc/msg.c: use freezable blocking call)
$ git merge --no-ff akpm-current/current
Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution.
Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution.
Resolved 'include/linux/syscalls.h' using previous resolution.
Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution.
Auto-merging tools/testing/selftests/vm/userfaultfd.c
Auto-merging mm/swap.c
Auto-merging mm/rmap.c
Auto-merging mm/mmap.c
Auto-merging mm/migrate.c
Auto-merging mm/memory.c
Auto-merging mm/memory-failure.c
Auto-merging mm/huge_memory.c
Auto-merging mm/debug.c
Auto-merging lib/string_helpers.c
Auto-merging kernel/sys_ni.c
Auto-merging init/Kconfig
Auto-merging include/uapi/asm-generic/unistd.h
CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h
Auto-merging include/linux/syscalls.h
CONFLICT (content): Merge conflict in include/linux/syscalls.h
Auto-merging include/linux/poison.h
Auto-merging include/linux/page-flags.h
Auto-merging include/linux/mm.h
Auto-merging include/linux/kexec.h
Auto-merging fs/proc/task_mmu.c
Auto-merging fs/cifs/file.c
Auto-merging arch/x86/entry/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 34668c9b477b] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
 Documentation/devicetree/bindings/w1/omap-hdq.txt |   7 +-
 Documentation/filesystems/proc.txt                |  37 +-
 Documentation/filesystems/vfat.txt                |  10 +
 Documentation/printk-formats.txt                  |   8 +
 Documentation/w1/masters/omap-hdq                 |   6 +
 arch/alpha/include/uapi/asm/mman.h                |   4 +
 arch/arm/include/asm/pgtable-3level.h             |   1 +
 arch/arm64/include/asm/pgtable.h                  |   2 +
 arch/mips/include/uapi/asm/mman.h                 |   7 +
 arch/mips/include/uapi/asm/unistd.h               |  15 +-
 arch/mips/kernel/scall32-o32.S                    |   1 +
 arch/mips/kernel/scall64-64.S                     |   1 +
 arch/mips/kernel/scall64-n32.S                    |   1 +
 arch/mips/kernel/scall64-o32.S                    |   1 +
 arch/parisc/include/uapi/asm/mman.h               |   4 +
 arch/powerpc/include/asm/pgtable-ppc64.h          |   2 +
 arch/powerpc/include/uapi/asm/mman.h              |   1 +
 arch/sparc/include/asm/pgtable_64.h               |   9 +
 arch/sparc/include/uapi/asm/mman.h                |   1 +
 arch/tile/include/uapi/asm/mman.h                 |   1 +
 arch/x86/entry/syscalls/syscall_32.tbl            |   1 +
 arch/x86/entry/syscalls/syscall_64.tbl            |   1 +
 arch/x86/include/asm/pgtable.h                    |   5 +
 arch/x86/kernel/machine_kexec_64.c                |   1 +
 arch/xtensa/include/uapi/asm/mman.h               |   7 +
 block/genhd.c                                     |   2 +-
 drivers/gpu/drm/drm_vm.c                          |   8 +-
 drivers/w1/masters/omap_hdq.c                     | 224 ++++++--
 fs/9p/vfs_file.c                                  |   3 +-
 fs/cifs/file.c                                    |   8 +-
 fs/ext4/fsync.c                                   |   5 +-
 fs/fat/cache.c                                    |  79 ++-
 fs/fat/dir.c                                      |   2 +-
 fs/fat/fat.h                                      |   6 +-
 fs/fat/file.c                                     |  61 ++
 fs/fat/inode.c                                    |  75 ++-
 fs/hugetlbfs/inode.c                              |  12 +
 fs/mpage.c                                        |  23 +-
 fs/ocfs2/alloc.c                                  | 101 ++--
 fs/proc/task_mmu.c                                |  31 +
 fs/super.c                                        |   8 +-
 include/linux/crc64_ecma.h                        |  56 ++
 include/linux/huge_mm.h                           |   4 +
 include/linux/hugetlb.h                           |  36 ++
 include/linux/kexec.h                             |   2 +
 include/linux/mm.h                                |  42 +-
 include/linux/mm_types.h                          |   7 +
 include/linux/page-flags.h                        | 237 +++++---
 include/linux/pagemap.h                           |  25 +-
 include/linux/poison.h                            |   6 +-
 include/linux/rmap.h                              |   9 +-
 include/linux/string.h                            |   1 +
 include/linux/swap.h                              |   3 +-
 include/linux/syscalls.h                          |   2 +
 include/linux/vm_event_item.h                     |   1 +
 include/uapi/asm-generic/mman-common.h            |   6 +
 include/uapi/asm-generic/mman.h                   |   1 +
 include/uapi/asm-generic/unistd.h                 |   4 +-
 init/Kconfig                                      |   1 +
 ipc/msg.c                                         |   5 +-
 kernel/fork.c                                     |   6 +-
 kernel/sys_ni.c                                   |   1 +
 lib/Kconfig                                       |   7 +
 lib/Makefile                                      |   1 +
 lib/crc64_ecma.c                                  | 341 +++++++++++
 lib/string_helpers.c                              |   2 +-
 lib/vsprintf.c                                    |  20 +-
 mm/debug.c                                        |   1 +
 mm/filemap.c                                      |  15 +-
 mm/gup.c                                          |  10 +-
 mm/huge_memory.c                                  |  39 +-
 mm/hugetlb.c                                      |  50 +-
 mm/ksm.c                                          |   2 +-
 mm/madvise.c                                      | 176 ++++++
 mm/memory-failure.c                               |   2 +-
 mm/memory.c                                       |   2 +-
 mm/memory_hotplug.c                               |  11 +-
 mm/migrate.c                                      |   2 +-
 mm/mlock.c                                        |  87 ++-
 mm/mmap.c                                         |   3 +-
 mm/page_alloc.c                                   |   7 +
 mm/page_isolation.c                               |   7 +-
 mm/rmap.c                                         |  56 +-
 mm/shmem.c                                        |   4 +-
 mm/slab.c                                         |   2 +-
 mm/slub.c                                         |   2 +
 mm/swap.c                                         |  44 ++
 mm/swap_state.c                                   |   4 +-
 mm/util.c                                         |  40 +-
 mm/vmscan.c                                       | 157 ++++--
 mm/vmstat.c                                       |   1 +
 tools/testing/selftests/vm/Makefile               |   4 +-
 tools/testing/selftests/vm/mlock2-tests.c         | 657 ++++++++++++++++++++++
 tools/testing/selftests/vm/on-fault-limit.c       |  47 ++
 tools/testing/selftests/vm/run_vmtests            |  22 +
 tools/testing/selftests/vm/userfaultfd.c          |   4 +-
 96 files changed, 2653 insertions(+), 413 deletions(-)
 create mode 100644 include/linux/crc64_ecma.h
 create mode 100644 lib/crc64_ecma.c
 create mode 100644 tools/testing/selftests/vm/mlock2-tests.c
 create mode 100644 tools/testing/selftests/vm/on-fault-limit.c
$ git reset --hard HEAD^
HEAD is now at 5542214099bd Merge remote-tracking branch 'rtc/rtc-next'
$ 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/w1/w1_int.c: call put_device if device_register fails
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + f9267303cfdf...a1cdeb45ec62 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (a1cdeb45ec62 drivers/w1/w1_int.c: call put_device if device_register fails)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 drivers/w1/w1_int.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)