path: root/Next/merge.log

$ date -R
Tue, 17 Apr 2018 09:06:31 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 60cc43fc8884 Linux 4.17-rc1
Merging origin/master (a27fc14219f2 Merge branch 'parisc-4.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
$ git merge origin/master
Updating 60cc43fc8884..a27fc14219f2
Fast-forward
 .../bindings/timer/nuvoton,npcm7xx-timer.txt       |  21 +
 .../devicetree/bindings/timer/nxp,tpm-timer.txt    |   2 +-
 arch/parisc/kernel/Makefile                        |   2 +-
 arch/x86/include/asm/kvm_host.h                    |   1 +
 arch/x86/kernel/ldt.c                              |   2 +-
 arch/x86/kvm/svm.c                                 |  31 +-
 arch/x86/kvm/vmx.c                                 |  95 ++--
 arch/x86/kvm/x86.c                                 |  15 +-
 drivers/clocksource/Kconfig                        |   8 +
 drivers/clocksource/Makefile                       |   1 +
 drivers/clocksource/timer-imx-tpm.c                |  43 +-
 drivers/clocksource/timer-npcm7xx.c                | 215 +++++++++
 tools/testing/selftests/kvm/Makefile               |   5 +-
 tools/testing/selftests/kvm/include/kvm_util.h     |  15 +-
 tools/testing/selftests/kvm/include/vmx.h          | 494 +++++++++++++++++++++
 tools/testing/selftests/kvm/lib/kvm_util.c         |  20 +-
 tools/testing/selftests/kvm/lib/sparsebit.c        |   4 +-
 tools/testing/selftests/kvm/lib/vmx.c              | 243 ++++++++++
 tools/testing/selftests/kvm/vmx_tsc_adjust_test.c  | 231 ++++++++++
 19 files changed, 1362 insertions(+), 86 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.txt
 create mode 100644 drivers/clocksource/timer-npcm7xx.c
 create mode 100644 tools/testing/selftests/kvm/include/vmx.h
 create mode 100644 tools/testing/selftests/kvm/lib/vmx.c
 create mode 100644 tools/testing/selftests/kvm/vmx_tsc_adjust_test.c
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge fixes/master
Already up to date.
Merging kbuild-current/fixes (28913ee8191a netfilter: nf_nat_snmp_basic: add correct dependency to Makefile)
$ git merge kbuild-current/fixes
Already up to date.
Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4)
$ git merge arc-current/for-curr
Already up to date.
Merging arm-current/fixes (fe680ca02c1e ARM: replace unnecessary perl with sed and the shell $(( )) operator)
$ git merge arm-current/fixes
Merge made by the 'recursive' strategy.
 arch/arm/boot/compressed/Makefile |  8 +++-----
 arch/arm/boot/compressed/head.S   | 20 ++++++++++----------
 arch/arm/kernel/machine_kexec.c   | 36 +++++++++++++++++++++++-------------
 3 files changed, 36 insertions(+), 28 deletions(-)
Merging arm64-fixes/for-next/fixes (e21da1c99200 arm64: Relax ARM_SMCCC_ARCH_WORKAROUND_1 discovery)
$ git merge arm64-fixes/for-next/fixes
Already up to date.
Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment)
$ git merge m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (81b654c27391 powerpc/64s: Fix CPU_FTRS_ALWAYS vs DT CPU features)
$ git merge powerpc-fixes/fixes
Already up to date.
Merging sparc/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
$ git merge sparc/master
Already up to date.
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
$ git merge fscrypt-current/for-stable
Already up to date.
Merging net/master (5968a70d7af5 textsearch: fix kernel-doc warnings and add kernel-api section)
$ git merge net/master
Merge made by the 'recursive' strategy.
 Documentation/core-api/kernel-api.rst              |  13 ++
 Documentation/networking/filter.txt                |   6 +-
 drivers/isdn/mISDN/dsp_hwec.c                      |   8 +-
 drivers/isdn/mISDN/l1oip_core.c                    |  14 +-
 drivers/net/dsa/mv88e6xxx/hwtstamp.c               |  12 +-
 drivers/net/ethernet/ibm/ibmvnic.c                 |  85 ++++++----
 drivers/net/ethernet/ibm/ibmvnic.h                 |   1 -
 drivers/net/ethernet/marvell/mvpp2.c               |   2 +-
 drivers/net/ethernet/netronome/nfp/flower/cmsg.c   |  44 ++++-
 drivers/net/ethernet/netronome/nfp/flower/cmsg.h   |   2 +
 drivers/net/ethernet/netronome/nfp/flower/main.c   |   6 +-
 drivers/net/ethernet/netronome/nfp/flower/main.h   |   8 +-
 .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c |   5 +-
 .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c   |   3 +-
 drivers/net/ethernet/sfc/ef10.c                    |   3 +-
 drivers/net/ethernet/sfc/farch.c                   |   2 +-
 drivers/net/ethernet/sfc/net_driver.h              |  25 +++
 drivers/net/ethernet/sfc/rx.c                      |  60 +++----
 drivers/net/macsec.c                               |   5 +-
 drivers/net/phy/microchip.c                        | 178 ++++++++++++++++++++-
 drivers/net/team/team.c                            |  19 +++
 drivers/net/virtio_net.c                           |  11 +-
 include/linux/microchipphy.h                       |   8 +
 include/linux/textsearch.h                         |   4 +-
 lib/textsearch.c                                   |  40 +++--
 net/core/neighbour.c                               |  40 +++--
 net/ipv4/ip_output.c                               |   8 +-
 net/ipv4/tcp.c                                     |   8 +-
 net/l2tp/l2tp_core.c                               |  40 ++---
 net/l2tp/l2tp_core.h                               |   3 +-
 net/l2tp/l2tp_debugfs.c                            |  15 +-
 net/l2tp/l2tp_netlink.c                            |  11 +-
 net/l2tp/l2tp_ppp.c                                |  24 ++-
 net/packet/af_packet.c                             |  23 +--
 net/sctp/ipv6.c                                    |  60 +++----
 net/strparser/strparser.c                          |   7 +-
 net/tipc/name_table.c                              |   5 +-
 net/tipc/name_table.h                              |   2 +-
 net/tipc/net.c                                     |   2 +
 net/tipc/netlink.c                                 |   5 +-
 net/tipc/socket.c                                  |   4 +-
 net/tipc/subscr.c                                  |   5 +-
 net/tls/tls_sw.c                                   |  10 +-
 tools/testing/selftests/net/Makefile               |   2 +-
 44 files changed, 620 insertions(+), 218 deletions(-)
Merging bpf/master (3a38bb98d9ab bpf/tracing: fix a deadlock in perf_event_detach_bpf_prog)
$ git merge bpf/master
Merge made by the 'recursive' strategy.
 include/linux/bpf.h                    |  4 +--
 kernel/bpf/core.c                      | 45 ++++++++++++++++++++++------------
 kernel/trace/bpf_trace.c               | 25 ++++++++++++++++---
 tools/testing/selftests/bpf/.gitignore |  3 +++
 4 files changed, 55 insertions(+), 22 deletions(-)
Merging ipsec/master (4b66af2d6356 af_key: Always verify length of provided sadb_key)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
 net/key/af_key.c | 45 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)
Merging netfilter/master (2f6adf481527 netfilter: nf_tables: free set name in error path)
$ git merge netfilter/master
Merge made by the 'recursive' strategy.
 net/bridge/netfilter/ebtables.c     |  11 +--
 net/netfilter/Kconfig               |   1 +
 net/netfilter/ipvs/ip_vs_ctl.c      |   8 --
 net/netfilter/ipvs/ip_vs_sync.c     | 155 +++++++++++++++++++-----------------
 net/netfilter/nf_conntrack_expect.c |   5 +-
 net/netfilter/nf_conntrack_extend.c |   1 +
 net/netfilter/nf_conntrack_sip.c    |  16 +++-
 net/netfilter/nf_tables_api.c       |  67 +++++++++-------
 net/netfilter/xt_connmark.c         |  19 +++--
 9 files changed, 152 insertions(+), 131 deletions(-)
Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set)
$ git merge ipvs/master
Already up to date.
Merging wireless-drivers/master (77e30e10ee28 iwlwifi: mvm: query regdb for wmm rule if needed)
$ git merge wireless-drivers/master
Merge made by the 'recursive' strategy.
 .../broadcom/brcm80211/brcmfmac/firmware.c         |  36 ++++---
 drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 111 ++++++++++++++++++---
 drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h |   6 +-
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |   3 +-
 4 files changed, 121 insertions(+), 35 deletions(-)
Merging mac80211/master (b5dbc28762fd Merge tag 'kbuild-fixes-v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge mac80211/master
Already up to date.
Merging rdma-fixes/for-rc (60cc43fc8884 Linux 4.17-rc1)
$ git merge rdma-fixes/for-rc
Already up to date.
Merging sound-current/for-linus (7ecb46e9ee9a ALSA: line6: Use correct endpoint type for midi output)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
 sound/usb/line6/midi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging pci-current/for-linus (60cc43fc8884 Linux 4.17-rc1)
$ git merge pci-current/for-linus
Already up to date.
Merging driver-core.current/driver-core-linus (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge driver-core.current/driver-core-linus
Already up to date.
Merging tty.current/tty-linus (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge usb.current/usb-linus
Already up to date.
Merging usb-gadget-fixes/fixes (c6ba5084ce0d usb: gadget: udc: renesas_usb3: add binging for r8a77965)
$ git merge usb-gadget-fixes/fixes
Already up to date.
Merging usb-serial-fixes/usb-linus (470b5d6f0cf4 USB: serial: ftdi_sio: use jtag quirk for Arrow USB Blaster)
$ git merge usb-serial-fixes/usb-linus
Merge made by the 'recursive' strategy.
 drivers/usb/serial/Kconfig             | 1 +
 drivers/usb/serial/cp210x.c            | 1 +
 drivers/usb/serial/ftdi_sio.c          | 3 ++-
 drivers/usb/serial/usb-serial-simple.c | 7 +++++++
 4 files changed, 11 insertions(+), 1 deletion(-)
Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Already up to date.
Merging phy/fixes (59fba0869aca phy: qcom-ufs: add MODULE_LICENSE tag)
$ git merge phy/fixes
Already up to date.
Merging staging.current/staging-linus (df34df483a97 Merge tag 'staging-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
$ git merge staging.current/staging-linus
Already up to date.
Merging char-misc.current/char-misc-linus (8837c70d531a Merge branch 'akpm' (patches from Andrew))
$ git merge char-misc.current/char-misc-linus
Already up to date.
Merging input-current/for-linus (664b0bae0b87 Merge branch 'next' into for-linus)
$ git merge input-current/for-linus
Already up to date.
Merging crypto-current/master (f444ec106407 crypto: ccree - remove unused enums)
$ git merge crypto-current/master
Already up to date.
Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time')
$ git merge ide/master
Already up to date.
Merging vfio-fixes/for-linus (834814e80268 Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it")
$ git merge vfio-fixes/for-linus
Already up to date.
Merging kselftest-fixes/fixes (60cc43fc8884 Linux 4.17-rc1)
$ git merge kselftest-fixes/fixes
Already up to date.
Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks)
$ git merge backlight-fixes/for-backlight-fixes
Merge made by the 'recursive' strategy.
 drivers/video/backlight/as3711_bl.c   | 45 ++++++++++++++++++++++-------------
 drivers/video/backlight/max8925_bl.c  |  4 +++-
 drivers/video/backlight/tps65217_bl.c |  4 ++--
 include/linux/mfd/as3711.h            |  4 ++--
 4 files changed, 36 insertions(+), 21 deletions(-)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
$ git merge nand-fixes/nand/fixes
Already up to date.
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
$ git merge spi-nor-fixes/spi-nor/fixes
Already up to date.
Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown)
$ git merge mfd-fixes/for-mfd-fixes
Already up to date.
Merging v4l-dvb-fixes/fixes (a95845ba184b media: v4l2-core: fix size of devnode_nums[] bitarray)
$ git merge v4l-dvb-fixes/fixes
Already up to date.
Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation)
$ git merge reset-fixes/reset/fixes
Already up to date.
Merging mips-fixes/mips-fixes (8a8158c85e1e MIPS: memset.S: EVA & fault support for small_memset)
$ git merge mips-fixes/mips-fixes
Merge made by the 'recursive' strategy.
 arch/mips/boot/dts/img/boston.dts | 6 ++++++
 arch/mips/include/asm/io.h        | 4 +++-
 arch/mips/lib/memset.S            | 7 ++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
Merging kvm-fixes/master (c18bb396d3d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge kvm-fixes/master
Already up to date.
Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries)
$ git merge kvms390-fixes/master
Already up to date.
Merging drm-intel-fixes/for-linux-next-fixes (60cc43fc8884 Linux 4.17-rc1)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up to date.
Merging drm-misc-fixes/for-linux-next-fixes (b8e47d87be65 drm: Fix HDCP downstream dev count read)
$ git merge drm-misc-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/vc4/vc4_bo.c               | 2 ++
 drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 +
 include/drm/drm_hdcp.h                     | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
$ git am -3 ../patches/0001-netfilter-conntrack-include-kmemleak.h-for-kmemleak_.patch
Applying: netfilter: conntrack: include kmemleak.h for kmemleak_not_leak()
$ git reset HEAD^
Unstaged changes after reset:
M	net/netfilter/nf_conntrack_extend.c
$ git add -A .
$ git commit -v -a --amend
[master 88c67dd75aa8] Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'
 Date: Tue Apr 17 09:17:57 2018 +1000
Merging syscalls/syscalls-next (c9a211951c7c bpf: whitelist all syscalls for error injection)
$ git merge syscalls/syscalls-next
Already up to date.
Merging kbuild/for-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge kbuild/for-next
Already up to date.
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
$ git merge leaks/leaks-next
Merge made by the 'recursive' strategy.
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
$ git merge uuid/for-next
Already up to date.
Merging dma-mapping/for-next (9e7f06c8beee swiotlb: fix unexpected swiotlb_alloc_coherent failures)
$ git merge dma-mapping/for-next
Already up to date.
Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers)
$ git merge asm-generic/master
Already up to date.
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
$ git merge arc/for-next
Already up to date.
Merging arm/for-next (f592819553ca Merge branches 'fixes' and 'sa1100-for-next' into for-next)
$ git merge arm/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap())
$ git merge arm-perf/for-next/perf
Merge made by the 'recursive' strategy.
Merging arm-soc/for-next (cb799267bb65 MAINTAINERS: Update ASPEED entry with details)
$ git merge arm-soc/for-next
Already up to date.
Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next)
$ git merge actions/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
$ git merge alpine/alpine/for-next
Already up to date.
Merging amlogic/for-next (059e40d90876 Merge branch 'v4.17/drivers' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next)
$ git merge aspeed/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next)
$ git merge at91/at91-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging bcm2835/for-next (cf172af3be59 Merge branch anholt/bcm2835-defconfig-next into for-next)
$ git merge bcm2835/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (9fa2e1a1fd60 Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   2 +
 arch/arm/boot/dts/imx25-pdk.dts                    |   1 -
 arch/arm/boot/dts/imx53-tx53.dtsi                  |   1 -
 arch/arm/boot/dts/imx6dl-mamoj.dts                 | 224 ++++++++++
 arch/arm/boot/dts/imx6q-dhcom-pdk2.dts             | 151 +++++++
 arch/arm/boot/dts/imx6q-dhcom-som.dtsi             | 476 +++++++++++++++++++++
 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi        |  52 ++-
 arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi       |  47 +-
 arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi     |   1 -
 arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi     |   1 -
 arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi     |   1 -
 arch/arm/boot/dts/imx6qdl-wandboard.dtsi           |   8 +
 arch/arm/boot/dts/imx7d-pinfunc.h                  |   6 +-
 arch/arm/boot/dts/imx7d-sdb.dts                    |  24 ++
 arch/arm/boot/dts/imx7s.dtsi                       |  36 +-
 arch/arm/configs/imx_v6_v7_defconfig               |   7 +
 17 files changed, 1003 insertions(+), 36 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6dl-mamoj.dts
 create mode 100644 arch/arm/boot/dts/imx6q-dhcom-pdk2.dts
 create mode 100644 arch/arm/boot/dts/imx6q-dhcom-som.dtsi
Merging keystone/next (dacf37850167 Merge branch 'for_4.17/soc-drivers' into next)
$ git merge keystone/next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (4c1b45a44e35 Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging omap/for-next (d1cc5c055f7a Merge branch 'omap-for-v4.17/defconfig' into for-next)
$ git merge omap/for-next
Auto-merging arch/arm/boot/dts/logicpd-torpedo-som.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi
Resolved 'arch/arm/boot/dts/logicpd-torpedo-som.dtsi' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 41461527d240] Merge remote-tracking branch 'omap/for-next'
$ git diff -M --stat --summary HEAD^..
 arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 1 +
 1 file changed, 1 insertion(+)
Merging reset/reset/next (0089313d8595 Merge branch 'reset/lookup' into reset/next)
$ git merge reset/reset/next
Already up to date.
Merging qcom/for-next (186d88395e05 Merge tag 'qcom-arm64-defconfig-for-4.17' into all-for-4.17-final)
$ git merge qcom/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
$ git merge realtek/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging renesas/next (6f989a10612a Merge branches 'arm64-dt-for-v4.18', 'defconfig-for-v4.18', 'dt-bindings-for-v4.18', 'dt-for-v4.18' and 'soc-for-v4.18' into next)
$ git merge renesas/next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/shmobile.txt |    8 +
 .../bindings/power/renesas,rcar-sysc.txt           |    1 +
 .../devicetree/bindings/reset/renesas,rst.txt      |    2 +
 arch/arm/Kconfig.debug                             |   13 +-
 arch/arm/boot/dts/Makefile                         |    1 +
 arch/arm/boot/dts/r7s72100.dtsi                    | 1018 +++++-----
 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts          |   35 +
 arch/arm/boot/dts/r8a77470.dtsi                    |  154 ++
 arch/arm/boot/dts/r8a7792-wheat.dts                |   11 +-
 arch/arm/configs/multi_v7_defconfig                |    1 +
 arch/arm/configs/shmobile_defconfig                |    1 +
 arch/arm/mach-shmobile/Kconfig                     |    9 +
 arch/arm/mach-shmobile/setup-rcar-gen2.c           |    2 +
 arch/arm64/Kconfig.platforms                       |    6 +
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 2022 ++++++++++---------
 arch/arm64/boot/dts/renesas/r8a7796.dtsi           | 2092 ++++++++++----------
 arch/arm64/boot/dts/renesas/r8a77965.dtsi          |  232 ++-
 arch/arm64/boot/dts/renesas/r8a77970.dtsi          |   10 +-
 drivers/soc/renesas/Kconfig                        |    8 +-
 drivers/soc/renesas/Makefile                       |    1 +
 drivers/soc/renesas/r8a77470-sysc.c                |   29 +
 drivers/soc/renesas/rcar-rst.c                     |    2 +
 drivers/soc/renesas/rcar-sysc.c                    |    3 +
 drivers/soc/renesas/rcar-sysc.h                    |    1 +
 drivers/soc/renesas/renesas-soc.c                  |   16 +
 include/dt-bindings/power/r8a77470-sysc.h          |   22 +
 include/dt-bindings/power/r8a77990-sysc.h          |   26 +
 27 files changed, 3145 insertions(+), 2581 deletions(-)
 create mode 100644 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts
 create mode 100644 arch/arm/boot/dts/r8a77470.dtsi
 create mode 100644 drivers/soc/renesas/r8a77470-sysc.c
 create mode 100644 include/dt-bindings/power/r8a77470-sysc.h
 create mode 100644 include/dt-bindings/power/r8a77990-sysc.h
Merging rockchip/for-next (aaa7709c6703 Merge branch 'v4.18-armsoc/dts64' into for-next)
$ git merge rockchip/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/rk3036.dtsi                      |  2 ++
 arch/arm/boot/dts/rk322x.dtsi                      |  8 +++++
 arch/arm/boot/dts/rk3288-phycore-som.dtsi          |  1 +
 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi    |  3 +-
 arch/arm/boot/dts/rk3288-veyron-minnie.dts         |  2 ++
 arch/arm/boot/dts/rk3288.dtsi                      | 20 +++++++++---
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           | 10 ++++++
 arch/arm64/boot/dts/rockchip/rk3368.dtsi           | 10 ++++++
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts    |  8 +++++
 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi       |  8 +++--
 .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts |  4 +++
 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi      |  4 +++
 .../dts/rockchip/rk3399-sapphire-excavator.dts     | 12 ++++++++
 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi  | 23 +++++---------
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           | 36 ++++++++++++++++------
 15 files changed, 119 insertions(+), 32 deletions(-)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
$ git merge samsung/for-next
Already up to date.
Merging samsung-krzk/for-next (5ee5f8b9b5ea Merge branch 'next/defconfig' into for-next)
$ git merge samsung-krzk/for-next
Auto-merging arch/arm/configs/multi_v7_defconfig
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/exynos3250-rinato.dts    |  4 ++++
 arch/arm/boot/dts/exynos4210-origen.dts    | 11 +++++++++++
 arch/arm/configs/exynos_defconfig          |  1 +
 arch/arm/configs/multi_v7_defconfig        |  1 +
 arch/arm/mach-s3c24xx/mach-mini2440.c      | 10 +++++-----
 arch/arm64/boot/dts/exynos/exynos5433.dtsi |  2 +-
 6 files changed, 23 insertions(+), 6 deletions(-)
Merging sunxi/sunxi/for-next (88fe315d2c0a ARM: dts: sun8i: a33: Add the DSI-related nodes)
$ git merge sunxi/sunxi/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts |  3 +-
 arch/arm/boot/dts/sun8i-a33.dtsi                  | 44 +++++++++++++++++++++++
 arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 10 ++++++
 3 files changed, 55 insertions(+), 2 deletions(-)
Merging tegra/for-next (6b9b5116227d Merge branch for-4.17/clk into for-next)
$ git merge tegra/for-next
Merge made by the 'recursive' strategy.
 drivers/soc/tegra/pmc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging arm64/for-next/core (24534b351182 arm64: assembler: add macros to conditionally yield the NEON under PREEMPT)
$ git merge arm64/for-next/core
Already up to date.
Merging clk/clk-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge clk/clk-next
Already up to date.
Merging clk-samsung/for-next (182c084da5d1 clk: samsung: Add fout=196608001 Hz EPLL rate entry for exynos4412)
$ git merge clk-samsung/for-next
Already up to date.
Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse)
$ git merge c6x/for-linux-next
Already up to date.
Merging m68k/for-next (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment)
$ git merge m68k/for-next
Already up to date.
Merging m68knommu/for-next (a9f947bb3dc7 m68k: fix ColdFire PCI config reads and write)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/Kconfig.bus               |   8 +-
 arch/m68k/coldfire/clk.c            |   8 +-
 arch/m68k/coldfire/dma_timer.c      |  20 +--
 arch/m68k/coldfire/intc-2.c         |  36 +++---
 arch/m68k/coldfire/intc-simr.c      |  38 +++---
 arch/m68k/coldfire/intc.c           |  28 ++--
 arch/m68k/coldfire/m520x.c          |  26 ++--
 arch/m68k/coldfire/m5272.c          |  16 +--
 arch/m68k/coldfire/m528x.c          |  29 +++--
 arch/m68k/coldfire/m5441x.c         |   8 +-
 arch/m68k/coldfire/m54xx.c          |  20 +--
 arch/m68k/coldfire/pci.c            | 169 +++++-------------------
 arch/m68k/coldfire/pit.c            |   2 +-
 arch/m68k/coldfire/reset.c          |   4 +-
 arch/m68k/coldfire/sltimers.c       |   4 +-
 arch/m68k/coldfire/stmark2.c        |  12 +-
 arch/m68k/coldfire/timers.c         |   6 +-
 arch/m68k/include/asm/atarihw.h     |   1 +
 arch/m68k/include/asm/io.h          |  10 +-
 arch/m68k/include/asm/io_mm.h       |  98 ++------------
 arch/m68k/include/asm/io_no.h       | 249 ++++++++++++++----------------------
 arch/m68k/include/asm/kmap.h        |  83 ++++++++++++
 arch/m68k/include/asm/mcfgpio.h     |  12 +-
 arch/m68k/include/asm/nubus.h       |   1 +
 arch/m68k/include/asm/q40_master.h  |   2 +-
 arch/m68k/include/asm/raw_io.h      |  14 --
 arch/m68k/include/asm/vga.h         |   9 ++
 arch/m68k/include/asm/virtconvert.h |   2 +
 arch/m68k/include/asm/zorro.h       |   1 +
 arch/m68k/mm/kmap.c                 |   8 ++
 30 files changed, 386 insertions(+), 538 deletions(-)
 create mode 100644 arch/m68k/include/asm/kmap.h
Merging microblaze/next (70f6283a372b microblaze: Use generic pci_mmap_resource_range())
$ git merge microblaze/next
Already up to date.
Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next)
$ git merge mips/mips-next
Auto-merging drivers/staging/octeon/ethernet-tx.c
Auto-merging drivers/staging/octeon/ethernet-rx.c
Auto-merging drivers/staging/octeon/ethernet-defines.h
Auto-merging arch/mips/include/asm/mipsregs.h
Auto-merging arch/mips/cavium-octeon/Kconfig
Merge made by the 'recursive' strategy.
 arch/mips/cavium-octeon/Kconfig                    |  27 +-
 arch/mips/cavium-octeon/Makefile                   |   1 +
 arch/mips/cavium-octeon/resource-mgr.c             | 351 +++++++++++++++++++++
 arch/mips/cavium-octeon/setup.c                    |  22 +-
 arch/mips/include/asm/barrier.h                    |   2 +-
 .../asm/mach-cavium-octeon/kernel-entry-init.h     |  20 +-
 arch/mips/include/asm/mipsregs.h                   |   2 +
 arch/mips/include/asm/octeon/octeon.h              |  32 +-
 arch/mips/include/asm/processor.h                  |   2 +-
 arch/mips/kernel/octeon_switch.S                   |   2 -
 arch/mips/mm/tlbex.c                               |  29 +-
 drivers/staging/octeon/ethernet-defines.h          |   6 -
 drivers/staging/octeon/ethernet-rx.c               |  25 +-
 drivers/staging/octeon/ethernet-tx.c               |  85 ++---
 14 files changed, 473 insertions(+), 133 deletions(-)
 create mode 100644 arch/mips/cavium-octeon/resource-mgr.c
Merging mips-james/mips-next (a5075e6226c4 MIPS: BCM47XX: Use standard reset button for Luxul XWR-1750)
$ git merge mips-james/mips-next
Already up to date.
Merging nds32/next (6fc61ee69433 nds32: To use the generic dump_stack())
$ git merge nds32/next
Already up to date.
Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock())
$ git merge nios2/for-next
Already up to date.
Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define)
$ git merge openrisc/for-next
Already up to date.
Merging parisc-hd/for-next (c7cd882469fc parisc: Fix missing binfmt_elf32.o build error)
$ git merge parisc-hd/for-next
Already up to date.
Merging powerpc/next (c1b25a17d249 powerpc/64s/idle: Fix restore of AMOR on POWER9 after deep sleep)
$ git merge powerpc/next
Already up to date.
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device)
$ git merge fsl/next
Already up to date.
Merging risc-v/for-next (0adb32858b0b Linux 4.16)
$ git merge risc-v/for-next
Already up to date.
Merging s390/features (49d23a851d62 s390: rename default_defconfig to debug_defconfig)
$ git merge s390/features
Removing arch/s390/configs/gcov_defconfig
Auto-merging arch/s390/configs/debug_defconfig
Merge made by the 'recursive' strategy.
 arch/s390/Kbuild                                   |   1 +
 arch/s390/Kconfig                                  |  32 +-
 arch/s390/boot/Makefile                            |   6 -
 arch/s390/boot/compressed/.gitignore               |   1 +
 .../configs/{default_defconfig => debug_defconfig} |  30 +-
 arch/s390/configs/gcov_defconfig                   | 661 ---------------------
 arch/s390/configs/performance_defconfig            |  20 +-
 arch/s390/defconfig                                |  13 +-
 arch/s390/include/asm/kexec.h                      |  23 +
 arch/s390/include/asm/purgatory.h                  |  17 +
 arch/s390/include/asm/setup.h                      |  40 +-
 arch/s390/kernel/Makefile                          |   3 +
 arch/s390/kernel/asm-offsets.c                     |   5 +
 arch/s390/kernel/compat_wrapper.c                  |   1 +
 arch/s390/kernel/kexec_elf.c                       | 147 +++++
 arch/s390/kernel/kexec_image.c                     |  76 +++
 arch/s390/kernel/machine_kexec_file.c              | 245 ++++++++
 arch/s390/kernel/nospec-branch.c                   |   1 +
 arch/s390/kernel/perf_cpum_cf_events.c             |   1 +
 arch/s390/kernel/setup.c                           |   1 +
 arch/s390/kernel/syscalls/syscall.tbl              |   1 +
 arch/s390/purgatory/.gitignore                     |   2 +
 arch/s390/purgatory/Makefile                       |  37 ++
 arch/s390/purgatory/head.S                         | 279 +++++++++
 arch/s390/purgatory/purgatory.c                    |  42 ++
 drivers/s390/block/dasd_diag.c                     |   1 -
 drivers/s390/char/sclp_early_core.c                |   2 +-
 drivers/s390/net/qeth_l2_main.c                    |   1 -
 drivers/s390/net/smsgiucv.c                        |   2 +-
 29 files changed, 982 insertions(+), 709 deletions(-)
 rename arch/s390/configs/{default_defconfig => debug_defconfig} (97%)
 delete mode 100644 arch/s390/configs/gcov_defconfig
 create mode 100644 arch/s390/include/asm/purgatory.h
 create mode 100644 arch/s390/kernel/kexec_elf.c
 create mode 100644 arch/s390/kernel/kexec_image.c
 create mode 100644 arch/s390/kernel/machine_kexec_file.c
 create mode 100644 arch/s390/purgatory/.gitignore
 create mode 100644 arch/s390/purgatory/Makefile
 create mode 100644 arch/s390/purgatory/head.S
 create mode 100644 arch/s390/purgatory/purgatory.c
Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
$ git merge sparc-next/master
Already up to date.
Merging sh/for-next (bf9c7e3d7924 arch/sh: pcie-sh7786: handle non-zero DMA offset)
$ git merge sh/for-next
Already up to date.
Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic)
$ git merge uml/linux-next
Already up to date.
Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next)
$ git merge xtensa/xtensa-for-next
Merge made by the 'recursive' strategy.
 arch/xtensa/kernel/pci-dma.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc versions)
$ git merge fscrypt/master
Already up to date.
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
$ git merge befs/for-next
Merge made by the 'recursive' strategy.
 fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 46 deletions(-)
Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits)
$ git merge btrfs/next
Auto-merging kernel/cgroup/cgroup.c
Auto-merging include/linux/fs.h
Auto-merging include/linux/buffer_head.h
Auto-merging include/linux/backing-dev.h
Auto-merging fs/ext4/super.c
Auto-merging fs/ext4/inode.c
Auto-merging fs/ext2/super.c
Auto-merging fs/ext2/inode.c
Auto-merging fs/buffer.c
Auto-merging fs/btrfs/super.c
Auto-merging fs/btrfs/ioctl.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/disk-io.c
Auto-merging fs/btrfs/check-integrity.c
Auto-merging fs/block_dev.c
Auto-merging block/blk-cgroup.c
Merge made by the 'recursive' strategy.
 block/blk-cgroup.c          |  1 +
 fs/block_dev.c              |  3 +--
 fs/btrfs/check-integrity.c  |  2 +-
 fs/btrfs/disk-io.c          |  4 ++++
 fs/btrfs/inode.c            | 15 ++++++++++++---
 fs/btrfs/ioctl.c            |  8 +++++++-
 fs/btrfs/super.c            |  1 -
 fs/buffer.c                 | 42 ++++++++++++++++++++++++++++++++++--------
 fs/ext2/inode.c             |  3 ++-
 fs/ext2/super.c             |  1 -
 fs/ext4/inode.c             |  4 +++-
 fs/ext4/super.c             |  2 --
 include/linux/backing-dev.h |  2 +-
 include/linux/buffer_head.h |  3 +++
 include/linux/fs.h          |  3 ++-
 kernel/cgroup/cgroup.c      |  1 +
 16 files changed, 72 insertions(+), 23 deletions(-)
$ git am -3 ../patches/0001-f2fs-fixup-for-cgroup-writeback-change.patch
Applying: f2fs: fixup for cgroup/writeback change
$ git reset HEAD^
Unstaged changes after reset:
M	fs/f2fs/inode.c
M	fs/f2fs/super.c
$ git add -A .
$ git commit -v -a --amend
[master 050061f7b697] Merge remote-tracking branch 'btrfs/next'
 Date: Tue Apr 17 09:53:36 2018 +1000
Merging btrfs-kdave/for-next (ed754f23c363 Merge branch 'for-next-next-v4.17-20180405' into for-next-20180405)
$ git merge btrfs-kdave/for-next
Auto-merging fs/btrfs/zstd.c
Auto-merging fs/btrfs/super.c
Auto-merging fs/btrfs/props.c
Auto-merging fs/btrfs/ioctl.c
Auto-merging fs/btrfs/extent-tree.c
Auto-merging fs/btrfs/delayed-ref.h
Auto-merging fs/btrfs/delayed-ref.c
Auto-merging fs/btrfs/ctree.h
Auto-merging fs/btrfs/compression.c
Merge made by the 'recursive' strategy.
 fs/btrfs/compression.c | 21 ++++++++++++++++-----
 fs/btrfs/ctree.h       |  2 --
 fs/btrfs/delayed-ref.c |  9 +++------
 fs/btrfs/delayed-ref.h |  4 +---
 fs/btrfs/extent-tree.c | 22 ++++++++++++++--------
 fs/btrfs/ioctl.c       | 35 +++++++++++++++++++++++++++++++----
 fs/btrfs/props.c       |  2 +-
 fs/btrfs/super.c       |  3 ++-
 fs/btrfs/zstd.c        | 19 ++++++++++++++-----
 9 files changed, 82 insertions(+), 35 deletions(-)
Merging ceph/master (e2311baa73a8 ceph: check if mds create snaprealm when setting quota)
$ git merge ceph/master
Merge made by the 'recursive' strategy.
 drivers/block/rbd.c | 101 +++++++++++++++++++++++++++++++++++-----------------
 fs/ceph/inode.c     |  10 ++++--
 fs/ceph/xattr.c     |  28 +++++++++++++--
 3 files changed, 101 insertions(+), 38 deletions(-)
Merging cifs/for-next (20144f1e0d11 fs: cifs: Adding new return type vm_fault_t)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 fs/cifs/file.c    | 2 +-
 fs/cifs/smb2ops.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
$ git merge configfs/for-next
Already up to date.
Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption)
$ git merge ecryptfs/next
Merge made by the 'recursive' strategy.
 fs/ecryptfs/crypto.c   | 41 ++++++++++++++++++++++++++++-------------
 fs/ecryptfs/file.c     | 21 ++++++++++++++++-----
 fs/ecryptfs/inode.c    |  3 +--
 fs/ecryptfs/keystore.c |  2 +-
 4 files changed, 46 insertions(+), 21 deletions(-)
Merging ext3/for_next (4f34a5130a47 isofs: fix potential memory leak in mount option parsing)
$ git merge ext3/for_next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                      |  8 ++++++++
 fs/isofs/compress.c              | 19 ++++++++++++++++---
 fs/isofs/inode.c                 |  3 +++
 fs/notify/fanotify/fanotify.c    | 34 +++++++++++++++-------------------
 fs/notify/fsnotify.c             | 25 +++++++++++--------------
 fs/quota/dquot.c                 |  2 +-
 include/linux/fsnotify_backend.h |  2 +-
 7 files changed, 55 insertions(+), 38 deletions(-)
Merging ext4/dev (b025a674fc5d ext4: force revalidation of directory pointer after seekdir(2))
$ git merge ext4/dev
Merge made by the 'recursive' strategy.
Merging f2fs/dev (214c2461a864 f2fs: remain written times to update inode during fsync)
$ git merge f2fs/dev
Already up to date.
Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation)
$ git merge fuse/for-next
Auto-merging fs/fuse/inode.c
Merge made by the 'recursive' strategy.
 Documentation/filesystems/fuse-io.txt | 38 +++++++++++++++++++++++++++++
 fs/fuse/acl.c                         |  4 ++--
 fs/fuse/control.c                     |  2 +-
 fs/fuse/cuse.c                        | 11 ++++++---
 fs/fuse/dev.c                         | 40 +++++++++++++++----------------
 fs/fuse/dir.c                         | 45 +++++++++++++++++++++++++----------
 fs/fuse/fuse_i.h                      | 14 +++++++++--
 fs/fuse/inode.c                       | 40 +++++++++++++++++++------------
 include/uapi/linux/fuse.h             |  7 +++++-
 kernel/user_namespace.c               |  1 +
 10 files changed, 145 insertions(+), 57 deletions(-)
 create mode 100644 Documentation/filesystems/fuse-io.txt
Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location)
$ git merge jfs/jfs-next
Already up to date.
Merging nfs/linux-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge nfs/linux-next
Already up to date.
Merging nfs-anna/linux-next (98de9ce6f666 NFS: advance nfs_entry cookie only after decoding completes successfully)
$ git merge nfs-anna/linux-next
Already up to date.
Merging nfsd/nfsd-next (e2f27527c903 nfsd: Do not refuse to serve out of cache)
$ git merge nfsd/nfsd-next
Merge made by the 'recursive' strategy.
 fs/nfsd/cache.h     |  5 -----
 fs/nfsd/nfs4state.c | 14 +++++++-------
 fs/nfsd/nfscache.c  |  6 ++----
 3 files changed, 9 insertions(+), 16 deletions(-)
Merging orangefs/for-next (8e9ba5c48ea6 Orangefs: documentation updates)
$ git merge orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (16149013f839 ovl: update documentation w.r.t "xino" feature)
$ git merge overlayfs/overlayfs-next
Already up to date.
Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND)
$ git merge ubifs/linux-next
Already up to date.
Merging xfs/for-next (8c81dd46ef3c Force log to disk before reading the AGF during a fstrim)
$ git merge xfs/for-next
Already up to date.
Merging file-locks/locks-next (86f84779d8e9 Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
$ git merge file-locks/locks-next
Already up to date.
Merging vfs/for-next (eb5e8befb894 Merge tag 'afs-next-20180409-c' into for-next)
$ git merge vfs/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
$ git merge vfs-miklos/next
Already up to date.
Merging printk/for-next (7e6bd6f3dcf9 lib/vsprintf: Mark expected switch fall-through)
$ git merge printk/for-next
Auto-merging lib/vsprintf.c
Merge made by the 'recursive' strategy.
 lib/test_printf.c |   2 +-
 lib/vsprintf.c    | 118 +++++++++++++++++++++++-------------------------------
 2 files changed, 50 insertions(+), 70 deletions(-)
Merging pci/next (60cc43fc8884 Linux 4.17-rc1)
$ git merge pci/next
Already up to date.
Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression)
$ git merge pstore/for-next/pstore
Already up to date.
Merging hid/for-next (d539f75b1f2f Merge branch 'for-4.18/i2c-hid' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
 drivers/hid/hid-ids.h         |  3 ++
 drivers/hid/hid-input.c       | 24 ++++++++++----
 drivers/hid/hidraw.c          |  5 +++
 drivers/hid/i2c-hid/i2c-hid.c | 36 ++++++++++++++++----
 drivers/hid/wacom_wac.c       | 76 ++++++++++++++++++++++++++-----------------
 include/linux/hid.h           |  9 ++++-
 6 files changed, 109 insertions(+), 44 deletions(-)
Merging i2c/i2c/for-next (1eace8344c02 i2c: add param sanity check to i2c_transfer())
$ git merge i2c/i2c/for-next
Already up to date.
Merging dmi/master (0a5f08c2f0c7 firmware: dmi_scan: Use lowercase letters for UUID)
$ git merge dmi/master
Merge made by the 'recursive' strategy.
Merging hwmon-staging/hwmon-next (3449f321d6ae Merge tag 'ib-mfd-hwmon-v4.18' into hwmon-next)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
 drivers/hwmon/mc13783-adc.c | 60 +++++++++++++++++++++++++++++++++++++++++++++
 drivers/hwmon/scmi-hwmon.c  |  5 +++-
 drivers/mfd/mc13xxx-core.c  | 15 +++++++++++-
 include/linux/mfd/mc13xxx.h |  2 ++
 4 files changed, 80 insertions(+), 2 deletions(-)
Merging jc_docs/docs-next (3b443955596e Docs: tell maintainers to put [GIT PULL] in their subject lines)
$ git merge jc_docs/docs-next
Auto-merging MAINTAINERS
Auto-merging Documentation/vm/zswap.rst
Auto-merging Documentation/vm/zsmalloc.rst
Auto-merging Documentation/vm/z3fold.rst
Auto-merging Documentation/vm/userfaultfd.rst
Auto-merging Documentation/vm/unevictable-lru.rst
Auto-merging Documentation/vm/transhuge.rst
Auto-merging Documentation/vm/swap_numa.rst
Auto-merging Documentation/vm/split_page_table_lock.rst
Auto-merging Documentation/vm/soft-dirty.rst
Removing Documentation/vm/slub.txt
Auto-merging Documentation/vm/remap_file_pages.rst
Auto-merging Documentation/vm/pagemap.rst
Auto-merging Documentation/vm/page_owner.rst
Auto-merging Documentation/vm/page_migration.rst
Auto-merging Documentation/vm/page_frags.rst
Removing Documentation/vm/overcommit-accounting
Removing Documentation/vm/numa_memory_policy.txt
Auto-merging Documentation/vm/numa.rst
Removing Documentation/vm/mmu_notifier.txt
Removing Documentation/vm/ksm.txt
Auto-merging Documentation/vm/idle_page_tracking.rst
Auto-merging Documentation/vm/hwpoison.rst
Auto-merging Documentation/vm/hugetlbpage.rst
Auto-merging Documentation/vm/hugetlbfs_reserv.rst
Auto-merging Documentation/vm/hmm.rst
Auto-merging Documentation/vm/highmem.rst
Auto-merging Documentation/vm/frontswap.rst
Auto-merging Documentation/vm/cleancache.rst
Auto-merging Documentation/vm/balance.rst
Removing Documentation/vm/active_mm.txt
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-devices-node        |   2 +-
 .../ABI/testing/sysfs-kernel-mm-hugepages          |   2 +-
 Documentation/ABI/testing/sysfs-kernel-mm-ksm      |   2 +-
 Documentation/ABI/testing/sysfs-kernel-slab        |   4 +-
 Documentation/admin-guide/kernel-parameters.txt    |  12 +-
 Documentation/dev-tools/kasan.rst                  |   2 +-
 Documentation/driver-api/usb/typec.rst             |   2 +-
 Documentation/filesystems/proc.txt                 |   4 +-
 Documentation/filesystems/tmpfs.txt                |   2 +-
 Documentation/index.rst                            |   3 +-
 Documentation/process/maintainer-pgp-guide.rst     |  39 +-
 Documentation/process/submitting-patches.rst       |   2 +-
 Documentation/sound/alsa-configuration.rst         |   4 +-
 Documentation/sound/soc/codec.rst                  |   2 +-
 Documentation/sound/soc/platform.rst               |   2 +-
 Documentation/sysctl/vm.txt                        |   6 +-
 Documentation/trace/ftrace.rst                     |   7 +-
 Documentation/vm/00-INDEX                          |  58 +--
 Documentation/vm/active_mm.rst                     |  91 ++++
 Documentation/vm/active_mm.txt                     |  83 ----
 Documentation/vm/{balance => balance.rst}          |  15 +-
 .../vm/{cleancache.txt => cleancache.rst}          | 105 +++--
 Documentation/vm/conf.py                           |  10 +
 Documentation/vm/{frontswap.txt => frontswap.rst}  |  59 ++-
 Documentation/vm/{highmem.txt => highmem.rst}      |  87 ++--
 Documentation/vm/{hmm.txt => hmm.rst}              |  78 ++--
 .../{hugetlbfs_reserv.txt => hugetlbfs_reserv.rst} | 212 +++++----
 .../vm/{hugetlbpage.txt => hugetlbpage.rst}        | 243 ++++++-----
 Documentation/vm/{hwpoison.txt => hwpoison.rst}    | 141 +++---
 ...le_page_tracking.txt => idle_page_tracking.rst} |  55 ++-
 Documentation/vm/index.rst                         |  56 +++
 Documentation/vm/ksm.rst                           | 183 ++++++++
 Documentation/vm/ksm.txt                           | 178 --------
 Documentation/vm/mmu_notifier.rst                  |  99 +++++
 Documentation/vm/mmu_notifier.txt                  |  93 ----
 Documentation/vm/{numa => numa.rst}                |   6 +-
 Documentation/vm/numa_memory_policy.rst            | 485 +++++++++++++++++++++
 Documentation/vm/numa_memory_policy.txt            | 452 -------------------
 Documentation/vm/overcommit-accounting             |  80 ----
 Documentation/vm/overcommit-accounting.rst         |  87 ++++
 Documentation/vm/{page_frags => page_frags.rst}    |   5 +-
 .../vm/{page_migration => page_migration.rst}      | 149 ++++---
 .../vm/{page_owner.txt => page_owner.rst}          |  34 +-
 Documentation/vm/{pagemap.txt => pagemap.rst}      | 170 ++++----
 .../{remap_file_pages.txt => remap_file_pages.rst} |   6 +
 Documentation/vm/slub.rst                          | 361 +++++++++++++++
 Documentation/vm/slub.txt                          | 342 ---------------
 .../vm/{soft-dirty.txt => soft-dirty.rst}          |  20 +-
 ...t_page_table_lock => split_page_table_lock.rst} |  12 +-
 Documentation/vm/{swap_numa.txt => swap_numa.rst}  |  55 ++-
 Documentation/vm/{transhuge.txt => transhuge.rst}  | 286 +++++++-----
 .../{unevictable-lru.txt => unevictable-lru.rst}   | 117 +++--
 .../vm/{userfaultfd.txt => userfaultfd.rst}        |  66 +--
 Documentation/vm/{z3fold.txt => z3fold.rst}        |   6 +-
 Documentation/vm/{zsmalloc.txt => zsmalloc.rst}    |  60 ++-
 Documentation/vm/{zswap.txt => zswap.rst}          |  71 +--
 MAINTAINERS                                        |   2 +-
 arch/alpha/Kconfig                                 |   2 +-
 arch/ia64/Kconfig                                  |   2 +-
 arch/mips/Kconfig                                  |   2 +-
 arch/powerpc/Kconfig                               |   2 +-
 fs/Kconfig                                         |   2 +-
 fs/dax.c                                           |   2 +-
 fs/proc/task_mmu.c                                 |   4 +-
 include/linux/hmm.h                                |   2 +-
 include/linux/memremap.h                           |   4 +-
 include/linux/mmu_notifier.h                       |   2 +-
 include/linux/sched/mm.h                           |   4 +-
 include/linux/swap.h                               |   2 +-
 mm/Kconfig                                         |   6 +-
 mm/cleancache.c                                    |   2 +-
 mm/frontswap.c                                     |   2 +-
 mm/hmm.c                                           |   2 +-
 mm/huge_memory.c                                   |   4 +-
 mm/hugetlb.c                                       |   4 +-
 mm/ksm.c                                           |   4 +-
 mm/mmap.c                                          |   2 +-
 mm/rmap.c                                          |   6 +-
 mm/util.c                                          |   2 +-
 79 files changed, 2659 insertions(+), 2220 deletions(-)
 create mode 100644 Documentation/vm/active_mm.rst
 delete mode 100644 Documentation/vm/active_mm.txt
 rename Documentation/vm/{balance => balance.rst} (96%)
 rename Documentation/vm/{cleancache.txt => cleancache.rst} (83%)
 create mode 100644 Documentation/vm/conf.py
 rename Documentation/vm/{frontswap.txt => frontswap.rst} (91%)
 rename Documentation/vm/{highmem.txt => highmem.rst} (64%)
 rename Documentation/vm/{hmm.txt => hmm.rst} (91%)
 rename Documentation/vm/{hugetlbfs_reserv.txt => hugetlbfs_reserv.rst} (87%)
 rename Documentation/vm/{hugetlbpage.txt => hugetlbpage.rst} (64%)
 rename Documentation/vm/{hwpoison.txt => hwpoison.rst} (60%)
 rename Documentation/vm/{idle_page_tracking.txt => idle_page_tracking.rst} (72%)
 create mode 100644 Documentation/vm/index.rst
 create mode 100644 Documentation/vm/ksm.rst
 delete mode 100644 Documentation/vm/ksm.txt
 create mode 100644 Documentation/vm/mmu_notifier.rst
 delete mode 100644 Documentation/vm/mmu_notifier.txt
 rename Documentation/vm/{numa => numa.rst} (99%)
 create mode 100644 Documentation/vm/numa_memory_policy.rst
 delete mode 100644 Documentation/vm/numa_memory_policy.txt
 delete mode 100644 Documentation/vm/overcommit-accounting
 create mode 100644 Documentation/vm/overcommit-accounting.rst
 rename Documentation/vm/{page_frags => page_frags.rst} (97%)
 rename Documentation/vm/{page_migration => page_migration.rst} (63%)
 rename Documentation/vm/{page_owner.txt => page_owner.rst} (86%)
 rename Documentation/vm/{pagemap.txt => pagemap.rst} (60%)
 rename Documentation/vm/{remap_file_pages.txt => remap_file_pages.rst} (92%)
 create mode 100644 Documentation/vm/slub.rst
 delete mode 100644 Documentation/vm/slub.txt
 rename Documentation/vm/{soft-dirty.txt => soft-dirty.rst} (67%)
 rename Documentation/vm/{split_page_table_lock => split_page_table_lock.rst} (95%)
 rename Documentation/vm/{swap_numa.txt => swap_numa.rst} (74%)
 rename Documentation/vm/{transhuge.txt => transhuge.rst} (74%)
 rename Documentation/vm/{unevictable-lru.txt => unevictable-lru.rst} (92%)
 rename Documentation/vm/{userfaultfd.txt => userfaultfd.rst} (89%)
 rename Documentation/vm/{z3fold.txt => z3fold.rst} (97%)
 rename Documentation/vm/{zsmalloc.txt => zsmalloc.rst} (71%)
 rename Documentation/vm/{zswap.txt => zswap.rst} (74%)
Merging v4l-dvb/master (60cc43fc8884 Linux 4.17-rc1)
$ git merge v4l-dvb/master
Already up to date.
Merging v4l-dvb-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
$ git merge v4l-dvb-next/master
Already up to date.
Merging fbdev/fbdev-for-next (7c9b845e79ea video: fbdev: s3c-fb: remove dead platform code for Exynos and S5PV210 platforms)
$ git merge fbdev/fbdev-for-next
Already up to date.
Merging pm/linux-next (1fe43114ea73 Merge tag 'pm-4.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
$ git merge pm/linux-next
Already up to date.
Merging cpupower/cpupower (7928b2cbe55b Linux 4.16-rc1)
$ git merge cpupower/cpupower
Already up to date.
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
$ git merge idle/next
Already up to date.
Merging opp/opp/linux-next (4a823c0be80f opp: cpu: Replace GFP_ATOMIC with GFP_KERNEL in dev_pm_opp_init_cpufreq_table)
$ git merge opp/opp/linux-next
Already up to date.
Merging thermal/next (b907b408ca64 Merge branches 'thermal-core' and 'thermal-soc' into next)
$ git merge thermal/next
Already up to date.
Merging thermal-soc/next (abdf02078bad dt-bindings: thermal: Remove "cooling-{min|max}-level" properties)
$ git merge thermal-soc/next
Auto-merging drivers/thermal/imx_thermal.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/thermal/exynos-thermal.txt |  23 +-
 .../devicetree/bindings/thermal/imx-thermal.txt    |   9 +-
 .../bindings/thermal/mediatek-thermal.txt          |   1 +
 .../devicetree/bindings/thermal/thermal.txt        |  16 +-
 drivers/thermal/imx_thermal.c                      | 295 ++++++++++++++++-----
 drivers/thermal/mtk_thermal.c                      |  35 +++
 6 files changed, 281 insertions(+), 98 deletions(-)
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers)
$ git merge ieee1394/for-next
Already up to date.
Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump)
$ git merge dlm/next
Already up to date.
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
$ git merge swiotlb/linux-next
Already up to date.
Merging rdma/for-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge rdma/for-next
Already up to date.
Merging net-next/master (ef53e9e14714 net: Remove unused tcp_set_state tracepoint)
$ git merge net-next/master
Auto-merging tools/testing/selftests/net/Makefile
Auto-merging net/ipv4/tcp.c
Merge made by the 'recursive' strategy.
 drivers/net/ethernet/mediatek/mtk_eth_soc.c        |   4 +-
 drivers/net/ethernet/realtek/r8169.c               |  39 +-
 drivers/net/ethernet/socionext/netsec.c            |  27 +-
 drivers/net/ethernet/stmicro/stmmac/chain_mode.c   |  34 +-
 drivers/net/ethernet/stmicro/stmmac/common.h       | 199 +------
 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c |   4 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac5.c       |  19 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac5.h       |   6 +-
 drivers/net/ethernet/stmicro/stmmac/enh_desc.c     |   4 +-
 drivers/net/ethernet/stmicro/stmmac/hwif.h         | 421 +++++++++++++++
 drivers/net/ethernet/stmicro/stmmac/norm_desc.c    |   4 +-
 drivers/net/ethernet/stmicro/stmmac/ring_mode.c    |  39 +-
 .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c   |  82 ++-
 .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c  |  34 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  | 439 +++++++--------
 drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c   |  18 +-
 include/linux/net.h                                |   1 +
 include/net/tcp.h                                  |   4 +
 include/trace/events/tcp.h                         |  47 --
 include/uapi/linux/pci_regs.h                      |   2 +
 net/core/sock.c                                    |   5 +-
 net/ipv4/af_inet.c                                 |   3 +-
 net/ipv4/tcp.c                                     | 138 +++++
 net/ipv4/tcp_input.c                               |  22 +-
 net/ipv6/addrconf.c                                |   3 +-
 net/ipv6/af_inet6.c                                |   3 +-
 tools/testing/selftests/net/Makefile               |   2 +
 tools/testing/selftests/net/tcp_mmap.c             | 437 +++++++++++++++
 .../tc-testing/tc-tests/actions/sample.json        | 588 +++++++++++++++++++++
 29 files changed, 1962 insertions(+), 666 deletions(-)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/hwif.h
 create mode 100644 tools/testing/selftests/net/tcp_mmap.c
 create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/sample.json
Merging bpf-next/master (5d1365940a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge bpf-next/master
Already up to date.
Merging ipsec-next/master (415a13296a1a xfrm_policy: use true and false for boolean values)
$ git merge ipsec-next/master
Already up to date.
Merging netfilter-next/master (159f02977b2f Merge branch 'net-mvneta-improve-suspend-resume')
$ git merge netfilter-next/master
Already up to date.
Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support)
$ git merge nfc-next/master
Already up to date.
Merging ipvs-next/master (30edf801d7ed netfilter: ipvs: Add configurations of Maglev hashing)
$ git merge ipvs-next/master
Auto-merging net/netfilter/ipvs/ip_vs_ctl.c
Merge made by the 'recursive' strategy.
 include/net/ip_vs.h                  |   1 +
 net/netfilter/ipvs/Kconfig           |  37 +++
 net/netfilter/ipvs/Makefile          |   1 +
 net/netfilter/ipvs/ip_vs_ctl.c       |   4 +
 net/netfilter/ipvs/ip_vs_mh.c        | 540 +++++++++++++++++++++++++++++++++++
 net/netfilter/ipvs/ip_vs_proto_tcp.c |   4 +-
 6 files changed, 585 insertions(+), 2 deletions(-)
 create mode 100644 net/netfilter/ipvs/ip_vs_mh.c
Merging wireless-drivers-next/master (5d1365940a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge wireless-drivers-next/master
Already up to date.
Merging bluetooth/master (24557b660705 Bluetooth: btqcomsmd: Fix rx/tx stats)
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
 drivers/bluetooth/btqcomsmd.c | 10 ++++++++++
 drivers/bluetooth/hci_bcm.c   | 33 ++++++++++++++++++---------------
 2 files changed, 28 insertions(+), 15 deletions(-)
Merging mac80211-next/master (159f02977b2f Merge branch 'net-mvneta-improve-suspend-resume')
$ git merge mac80211-next/master
Already up to date.
Merging gfs2/for-next (9a38662ba4e2 gfs2: Remove sdp->sd_jheightsize)
$ git merge gfs2/for-next
Merge made by the 'recursive' strategy.
 fs/gfs2/bmap.c       | 14 +-------------
 fs/gfs2/incore.h     |  2 --
 fs/gfs2/ops_fstype.c | 19 -------------------
 3 files changed, 1 insertion(+), 34 deletions(-)
Merging mtd/master (87a73eb5b56f mtd: jedec_probe: Fix crash in jedec_read_mfr())
$ git merge mtd/master
Already up to date.
Merging l2-mtd/mtd/next (fe5f31a8010a Merge tag 'v4.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mtd/next)
$ git merge l2-mtd/mtd/next
Already up to date.
Merging nand/nand/next (097ccca726ff mtd: nand: Fix some function description mismatches in core.c)
$ git merge nand/nand/next
Already up to date.
Merging spi-nor/spi-nor/next (e8de85d5a107 dt-bindings: fsl-quadspi: Add the example of two SPI NOR)
$ git merge spi-nor/spi-nor/next
Already up to date.
Merging crypto/master (f444ec106407 crypto: ccree - remove unused enums)
$ git merge crypto/master
Already up to date.
Merging drm/drm-next (a10beabba213 Merge branch 'drm-next-4.17' 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 (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
$ git merge drm-panel/drm/panel/for-next
Already up to date.
Merging drm-intel/for-linux-next (38057aa1639b drm/i915/execlists: Clear user-active flag on preemption completion)
$ git merge drm-intel/for-linux-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/gvt/cmd_parser.c |  1 +
 drivers/gpu/drm/i915/gvt/display.c    | 10 +++++++
 drivers/gpu/drm/i915/gvt/dmabuf.c     |  1 +
 drivers/gpu/drm/i915/gvt/fb_decoder.c | 27 ++++++------------
 drivers/gpu/drm/i915/gvt/gtt.c        | 52 ++++++++++++++++++++++++++++++-----
 drivers/gpu/drm/i915/gvt/gtt.h        |  2 +-
 drivers/gpu/drm/i915/gvt/handlers.c   |  1 +
 drivers/gpu/drm/i915/gvt/kvmgt.c      |  2 +-
 drivers/gpu/drm/i915/intel_lrc.c      |  9 ++++++
 9 files changed, 78 insertions(+), 27 deletions(-)
Merging drm-tegra/drm/tegra/for-next (27e92f1f1600 drm/tegra: prime: Implement ->{begin,end}_cpu_access())
$ git merge drm-tegra/drm/tegra/for-next
Already up to date.
Merging drm-misc/for-linux-next (3131f209468d drm/vc4: Fix leak of the file_priv that stored the perfmon.)
$ git merge drm-misc/for-linux-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/vc4/vc4_drv.c | 1 +
 1 file changed, 1 insertion(+)
Merging drm-msm/msm-next (288e5c8898c4 drm/msm: fix building without debugfs)
$ git merge drm-msm/msm-next
Already up to date.
Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.)
$ git merge hdlcd/for-upstream/hdlcd
Already up to date.
Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers)
$ git merge mali-dp/for-upstream/mali-dp
Already up to date.
Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
$ git merge sunxi-drm/sunxi-drm/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging imx-drm/imx-drm/next (22cd2b2b3151 drm/imx: Remove last traces of struct imx_drm_crtc)
$ git merge imx-drm/imx-drm/next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/imx/imx-drm.h    | 1 -
 drivers/gpu/drm/imx/ipuv3-crtc.c | 1 -
 2 files changed, 2 deletions(-)
Merging etnaviv/etnaviv/next (4ed75c3e5255 drm/etnaviv: bump HW job limit to 4)
$ git merge etnaviv/etnaviv/next
Already up to date.
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
$ git merge kconfig/for-next
Already up to date.
Merging regmap/for-next (e241e3f2bf97 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
$ git merge regmap/for-next
Already up to date.
Merging sound/for-next (7ecb46e9ee9a ALSA: line6: Use correct endpoint type for midi output)
$ git merge sound/for-next
Already up to date.
Merging sound-asoc/for-next (4eb8d3c2c436 Merge branch 'asoc-4.18' into asoc-next)
$ git merge sound-asoc/for-next
Auto-merging Documentation/sound/soc/codec.rst
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/sound/rt5668.txt |   50 +
 .../devicetree/bindings/sound/tscs42xx.txt         |    6 +
 Documentation/sound/soc/codec.rst                  |    8 +-
 include/linux/mfd/wm8350/audio.h                   |    3 -
 include/sound/rt5668.h                             |   40 +
 include/trace/events/asoc.h                        |    1 -
 include/uapi/sound/asoc.h                          |   29 +-
 sound/soc/amd/acp-da7219-max98357a.c               |    8 +-
 sound/soc/atmel/atmel_ssc_dai.c                    |    2 +-
 sound/soc/codecs/Kconfig                           |   12 +
 sound/soc/codecs/Makefile                          |    4 +
 sound/soc/codecs/adau17x1.c                        |   35 +-
 sound/soc/codecs/adau17x1.h                        |    3 +-
 sound/soc/codecs/max9860.c                         |   44 +-
 sound/soc/codecs/max9860.h                         |   10 +-
 sound/soc/codecs/rt1305.c                          | 1191 +++++++++
 sound/soc/codecs/rt1305.h                          |  276 ++
 sound/soc/codecs/rt5514.c                          |    3 +
 sound/soc/codecs/rt5668.c                          | 2639 ++++++++++++++++++++
 sound/soc/codecs/rt5668.h                          | 1318 ++++++++++
 sound/soc/codecs/tfa9879.c                         |   48 +-
 sound/soc/codecs/tfa9879.h                         |    7 +-
 sound/soc/codecs/tscs42xx.c                        |  203 +-
 sound/soc/codecs/tscs42xx.h                        |    2 +-
 sound/soc/fsl/fsl_esai.c                           |   13 +
 sound/soc/fsl/fsl_ssi.c                            |   14 +-
 sound/soc/intel/Kconfig                            |   22 +-
 sound/soc/intel/boards/bxt_da7219_max98357a.c      |    2 +-
 sound/soc/intel/boards/bxt_rt298.c                 |    2 +-
 sound/soc/intel/boards/bytcr_rt5640.c              |    2 +-
 sound/soc/intel/boards/cht_bsw_max98090_ti.c       |    2 +-
 sound/soc/intel/boards/cht_bsw_rt5645.c            |    2 +-
 sound/soc/intel/boards/skl_nau88l25_max98357a.c    |    2 +-
 sound/soc/intel/boards/skl_nau88l25_ssm4567.c      |    2 +-
 sound/soc/intel/boards/skl_rt286.c                 |    2 +-
 sound/soc/omap/omap-dmic.c                         |   14 +-
 sound/soc/sh/rcar/cmd.c                            |   15 +-
 sound/soc/sh/rcar/core.c                           |   53 +-
 sound/soc/sh/rcar/dma.c                            |   11 +-
 sound/soc/sh/rcar/gen.c                            |    3 +-
 sound/soc/sh/rcar/rsnd.h                           |    4 +-
 sound/soc/sh/rcar/ssi.c                            |   13 +-
 sound/soc/soc-topology.c                           |   35 +-
 43 files changed, 5936 insertions(+), 219 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/rt5668.txt
 create mode 100644 include/sound/rt5668.h
 create mode 100644 sound/soc/codecs/rt1305.c
 create mode 100644 sound/soc/codecs/rt1305.h
 create mode 100644 sound/soc/codecs/rt5668.c
 create mode 100644 sound/soc/codecs/rt5668.h
$ git reset --hard HEAD^
HEAD is now at 704b1983f106 Merge remote-tracking branch 'imx-drm/imx-drm/next'
Merging next-20180416 version of sound-asoc
$ git merge -m next-20180416/sound-asoc f7c7e552b1bd51a2470e656ce2313d02dd9dac17
Merge made by the 'recursive' strategy.
 sound/soc/codecs/adau17x1.c | 26 ++++++++++++++++++++------
 sound/soc/codecs/adau17x1.h |  3 ++-
 sound/soc/fsl/fsl_esai.c    |  7 +++++++
 sound/soc/fsl/fsl_ssi.c     | 14 +++++++++++---
 sound/soc/intel/Kconfig     | 22 +++++++++++++---------
 sound/soc/omap/omap-dmic.c  | 14 +++++++++++---
 sound/soc/sh/rcar/core.c    |  4 ++--
 sound/soc/soc-topology.c    |  8 ++++++--
 8 files changed, 72 insertions(+), 26 deletions(-)
Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign)
$ git merge modules/modules-next
Merge made by the 'recursive' strategy.
 kernel/module.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Merging input/next (04bb1719c4de Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad)
$ git merge input/next
Already up to date.
Merging block/for-next (667eea5d591b Merge branch 'for-4.17/block' into for-next)
$ git merge block/for-next
Merge made by the 'recursive' strategy.
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
$ git merge lightnvm/for-next
Already up to date.
Merging device-mapper/for-next (5bd5e8d891c1 dm: remove fmode_t argument from .prepare_ioctl hook)
$ git merge device-mapper/for-next
Already up to date.
Merging mmc/next (300ad8992913 mmc: sdhci-pci: Only do AMD tuning for HS200)
$ git merge mmc/next
Merge made by the 'recursive' strategy.
 drivers/mmc/host/sdhci-pci-core.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy)
$ git merge kgdb/kgdb-next
Already up to date.
Merging md/for-next (50c35295db95 MD: fix lock contention for flush bios)
$ git merge md/for-next
Merge made by the 'recursive' strategy.
 drivers/md/md.c    | 194 +++++++++++++++++++++++++++++++++++++----------------
 drivers/md/md.h    |  23 +++++--
 drivers/md/raid1.c |  25 +++++--
 3 files changed, 173 insertions(+), 69 deletions(-)
Merging mfd/for-mfd-next (b45bf45f1b82 mfd: arizona: Update reset pin to use GPIOD)
$ git merge mfd/for-mfd-next
Removing include/linux/mfd/syscon/exynos5-pmu.h
Removing include/linux/mfd/syscon/exynos4-pmu.h
Auto-merging include/linux/mfd/cros_ec.h
Removing drivers/mfd/cros_ec_acpi_gpe.c
Merge made by the 'recursive' strategy.
 drivers/mfd/Makefile                   |   1 -
 drivers/mfd/ab8500-debugfs.c           |   3 +-
 drivers/mfd/abx500-core.c              |  25 ++++----
 drivers/mfd/arizona-core.c             |  53 ++++++++++------
 drivers/mfd/axp20x.c                   |  13 +++-
 drivers/mfd/cros_ec.c                  |  15 +----
 drivers/mfd/cros_ec_acpi_gpe.c         | 103 -------------------------------
 drivers/mfd/htc-i2cpld.c               |   4 +-
 drivers/mfd/janz-cmodio.c              |   4 +-
 drivers/mfd/jz4740-adc.c               |   4 +-
 drivers/mfd/max8997.c                  |   4 +-
 drivers/mfd/omap-usb-tll.c             |  60 ++++++++----------
 drivers/mfd/pcf50633-core.c            |   7 ++-
 drivers/mfd/rave-sp.c                  | 107 +++++++++++++++++++++++++++++++--
 drivers/mfd/rc5t583.c                  |   6 +-
 drivers/mfd/si476x-i2c.c               |   6 +-
 drivers/mfd/sm501.c                    |  32 ++++------
 drivers/mfd/smsc-ece1099.c             |   7 +--
 drivers/mfd/sprd-sc27xx-spi.c          |   3 +
 drivers/mfd/syscon.c                   |   2 +
 drivers/mfd/ti_am335x_tscadc.c         |   5 +-
 drivers/mfd/tps65090.c                 |   4 +-
 drivers/mfd/tps6586x.c                 |   4 +-
 drivers/mfd/tps65910.c                 |  18 +++---
 drivers/mfd/tps68470.c                 |  10 +--
 drivers/mfd/tps80031.c                 |   4 +-
 drivers/mfd/twl6030-irq.c              |   4 +-
 drivers/mfd/viperboard.c               |   4 +-
 include/linux/mfd/arizona/pdata.h      |   3 +-
 include/linux/mfd/cros_ec.h            |  18 ------
 include/linux/mfd/syscon/exynos4-pmu.h |  21 -------
 include/linux/mfd/syscon/exynos5-pmu.h |  19 ------
 include/linux/mfd/tps65218.h           |   4 +-
 include/linux/mfd/tps68470.h           |  17 +-----
 34 files changed, 243 insertions(+), 351 deletions(-)
 delete mode 100644 drivers/mfd/cros_ec_acpi_gpe.c
 delete mode 100644 include/linux/mfd/syscon/exynos4-pmu.h
 delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h
Merging backlight/for-backlight-next (ea388d6cffd4 pwm-backlight: Add support for PWM delays proprieties.)
$ git merge backlight/for-backlight-next
Merge made by the 'recursive' strategy.
 .../bindings/leds/backlight/pwm-backlight.txt      |  6 ++
 .../leds/backlight/zii,rave-sp-backlight.txt       | 23 ++++++
 drivers/video/backlight/Kconfig                    |  6 ++
 drivers/video/backlight/Makefile                   |  1 +
 drivers/video/backlight/pwm_bl.c                   | 28 ++++++--
 drivers/video/backlight/rave-sp-backlight.c        | 82 ++++++++++++++++++++++
 include/linux/mfd/rave-sp.h                        |  1 +
 include/linux/pwm_backlight.h                      |  2 +
 8 files changed, 145 insertions(+), 4 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/leds/backlight/zii,rave-sp-backlight.txt
 create mode 100644 drivers/video/backlight/rave-sp-backlight.c
Merging battery/for-next (fd73a3e61888 power: reset: at91-reset: Switch from the pr_*() to the dev_*() logging functions)
$ git merge battery/for-next
Already up to date.
Merging regulator/for-next (ec1ba3e519c0 regulator: ab8500: Drop AB8540/9540 support)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 drivers/regulator/ab8500.c       | 1779 ++++----------------------------------
 include/linux/regulator/ab8500.h |  157 +---
 2 files changed, 188 insertions(+), 1748 deletions(-)
Merging security/next-testing (df0ce17331e2 security: convert security hooks to use hlist)
$ git merge security/next-testing
Already up to date.
Merging apparmor/apparmor-next (588558eb6d0e apparmor: fix memory leak on buffer on error exit path)
$ git merge apparmor/apparmor-next
Already up to date.
Merging efi-lock-down/efi-lock-down (89bcd5b02f12 lockdown: Print current->comm in restriction messages)
$ git merge efi-lock-down/efi-lock-down
Auto-merging security/integrity/ima/ima_policy.c
Auto-merging kernel/power/user.c
Auto-merging kernel/power/hibernate.c
Auto-merging kernel/params.c
Auto-merging kernel/module.c
CONFLICT (content): Merge conflict in kernel/module.c
Auto-merging kernel/kexec_file.c
CONFLICT (content): Merge conflict in kernel/kexec_file.c
Auto-merging kernel/kexec.c
Auto-merging kernel/events/core.c
Auto-merging kernel/debug/kdb/kdb_main.c
Auto-merging kernel/bpf/syscall.c
Auto-merging include/linux/security.h
Auto-merging include/linux/kexec.h
Auto-merging include/linux/kernel.h
Auto-merging include/linux/efi.h
Auto-merging fs/debugfs/inode.c
Auto-merging drivers/tty/sysrq.c
Auto-merging drivers/tty/serial/serial_core.c
CONFLICT (modify/delete): drivers/scsi/eata.c deleted in HEAD and modified in efi-lock-down/efi-lock-down. Version efi-lock-down/efi-lock-down of drivers/scsi/eata.c left in tree.
Auto-merging drivers/pci/syscall.c
Auto-merging drivers/pci/proc.c
Auto-merging drivers/pci/pci-sysfs.c
Auto-merging drivers/char/mem.c
Auto-merging drivers/acpi/tables.c
Auto-merging drivers/acpi/osl.c
Auto-merging drivers/acpi/custom_method.c
Auto-merging arch/x86/kernel/setup.c
Auto-merging arch/x86/kernel/machine_kexec_64.c
CONFLICT (content): Merge conflict in arch/x86/kernel/machine_kexec_64.c
Auto-merging arch/x86/kernel/kexec-bzimage64.c
Auto-merging arch/x86/kernel/ioport.c
Auto-merging arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Resolved 'arch/x86/Kconfig' using previous resolution.
Resolved 'arch/x86/kernel/machine_kexec_64.c' using previous resolution.
Resolved 'kernel/kexec_file.c' using previous resolution.
Recorded preimage for 'kernel/module.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/scsi/eata.c
drivers/scsi/eata.c: needs merge
rm 'drivers/scsi/eata.c'
$ git commit -v -a
Recorded resolution for 'kernel/module.c'.
[master 782b7d7b17d0] Merge remote-tracking branch 'efi-lock-down/efi-lock-down'
$ git diff -M --stat --summary HEAD^..
 arch/x86/Kconfig                       |  20 ++++--
 arch/x86/include/asm/setup.h           |   2 +
 arch/x86/kernel/ioport.c               |   6 +-
 arch/x86/kernel/kexec-bzimage64.c      |   1 +
 arch/x86/kernel/msr.c                  |  10 +++
 arch/x86/kernel/setup.c                |  18 ++----
 arch/x86/mm/testmmiotrace.c            |   3 +
 crypto/asymmetric_keys/verify_pefile.c |   4 +-
 drivers/acpi/apei/einj.c               |   3 +
 drivers/acpi/custom_method.c           |   3 +
 drivers/acpi/osl.c                     |   2 +-
 drivers/acpi/tables.c                  |   5 ++
 drivers/char/mem.c                     |   2 +
 drivers/firmware/efi/Makefile          |   1 +
 drivers/firmware/efi/secureboot.c      |  38 ++++++++++++
 drivers/input/misc/uinput.c            |   1 +
 drivers/pci/pci-sysfs.c                |   9 +++
 drivers/pci/proc.c                     |   9 ++-
 drivers/pci/syscall.c                  |   3 +-
 drivers/pcmcia/cistpl.c                |   3 +
 drivers/tty/serial/serial_core.c       |   6 ++
 drivers/tty/sysrq.c                    |  19 ++++--
 fs/debugfs/file.c                      |  28 +++++++++
 fs/debugfs/inode.c                     |  30 ++++++++-
 fs/proc/kcore.c                        |   2 +
 include/linux/efi.h                    |  16 +++--
 include/linux/input.h                  |   5 ++
 include/linux/kernel.h                 |  17 ++++++
 include/linux/kexec.h                  |   4 +-
 include/linux/security.h               |   8 +++
 include/linux/sysrq.h                  |   8 ++-
 kernel/bpf/syscall.c                   |   3 +
 kernel/debug/kdb/kdb_main.c            |   2 +-
 kernel/events/core.c                   |   5 ++
 kernel/kexec.c                         |   7 +++
 kernel/kexec_file.c                    |  56 ++++++++++++++---
 kernel/kprobes.c                       |   3 +
 kernel/module.c                        |  56 +++++++++++++----
 kernel/params.c                        |  26 ++++++--
 kernel/power/hibernate.c               |   2 +-
 kernel/power/user.c                    |   3 +
 security/Kconfig                       |  32 ++++++++++
 security/Makefile                      |   3 +
 security/integrity/ima/ima_policy.c    |  39 +++++++++---
 security/lock_down.c                   | 108 +++++++++++++++++++++++++++++++++
 45 files changed, 552 insertions(+), 79 deletions(-)
 create mode 100644 drivers/firmware/efi/secureboot.c
 create mode 100644 security/lock_down.c
Merging integrity/next-integrity (ab60368ab6a4 ima: Fallback to the builtin hash algorithm)
$ git merge integrity/next-integrity
Already up to date.
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
$ git merge keys/keys-next
Already up to date.
Merging selinux/next (ac9a1f6db355 security: selinux: Change return type to vm_fault_t)
$ git merge selinux/next
Merge made by the 'recursive' strategy.
 security/selinux/selinuxfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging tpmdd/next (6fd6db01dfaf tpm: fix intermittent failure with self tests)
$ git merge tpmdd/next
Merge made by the 'recursive' strategy.
Merging watchdog/master (49d4d277ca54 aspeed: watchdog: Set bootstatus during probe)
$ git merge watchdog/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                     | 2 +-
 drivers/watchdog/aspeed_wdt.c   | 7 +++++++
 drivers/watchdog/renesas_wdt.c  | 6 ++++--
 drivers/watchdog/sch311x_wdt.c  | 2 +-
 drivers/watchdog/w83977f_wdt.c  | 2 +-
 drivers/watchdog/wafer5823wdt.c | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)
Merging iommu/next (d4f96fd5c249 Merge branches 'x86/amd', 'x86/vt-d', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/exynos', 'arm/renesas', 'arm/smmu' and 'core' into next)
$ git merge iommu/next
Already up to date.
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
$ git merge dwmw2-iommu/master
Already up to date.
Merging vfio/next (da9147140fe3 MAINTAINERS: vfio/platform: Update sub-maintainer)
$ git merge vfio/next
Already up to date.
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
$ git merge trivial/for-next
Already up to date.
Merging audit/next (60cc43fc8884 Linux 4.17-rc1)
$ git merge audit/next
Already up to date.
Merging devicetree/for-next (827473268ee4 of: unittest: fix an error code in of_unittest_apply_overlay())
$ git merge devicetree/for-next
Already up to date.
Merging mailbox/mailbox-for-next (41c0e939d70d mailbox: Add support for Hi3660 mailbox)
$ git merge mailbox/mailbox-for-next
Already up to date.
Merging spi/for-next (219bb99b44c2 Merge branch 'spi-4.18' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 drivers/spi/spi-imx.c                  |  2 +-
 drivers/spi/spi-meson-spicc.c          | 11 +++--
 drivers/spi/spi-mt65xx.c               | 12 ++---
 drivers/spi/spi-sh-msiof.c             | 66 ++++++++++++++------------
 drivers/spi/spi-stm32.c                |  2 +-
 drivers/spi/spi-topcliff-pch.c         |  4 +-
 drivers/spi/spi-zynqmp-gqspi.c         | 86 +++++++++++++++++++++++++++-------
 drivers/spi/spi.c                      | 21 +++++++++
 sound/soc/intel/skylake/skl-messages.c |  2 +-
 sound/soc/intel/skylake/skl-pcm.c      | 36 ++++++++++++--
 sound/soc/intel/skylake/skl-sst-dsp.h  |  3 --
 sound/soc/intel/skylake/skl-sst.c      | 34 +-------------
 sound/soc/intel/skylake/skl.c          |  7 +++
 13 files changed, 183 insertions(+), 103 deletions(-)
Merging tip/auto-latest (41534889ad38 Merge branch 'timers/core')
$ git merge tip/auto-latest
Already up to date!
Merge made by the 'recursive' strategy.
Merging clockevents/clockevents/next (0136c741ff40 clocksource/drivers/imx-tpm: Add different counter width support)
$ git merge clockevents/clockevents/next
Already up to date.
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
$ git merge edac/linux_next
Already up to date.
Merging edac-amd/for-next (6fd052665274 EDAC, sb_edac: Remove variable length array usage)
$ git merge edac-amd/for-next
Already up to date.
Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when updating irq type)
$ git merge irqchip/irq/irqchip-next
Already up to date.
Merging ftrace/for-next (0b3dec05dbbc tracing: Enforce passing in filter=NULL to create_filter())
$ git merge ftrace/for-next
Already up to date.
Merging rcu/rcu/next (3b91e0ea77ce rcu: Exclude near-simultaneous RCU CPU stall warnings)
$ git merge rcu/rcu/next
Removing tools/testing/selftests/rcutorture/bin/parse-torture.sh
Merge made by the 'recursive' strategy.
 drivers/nvme/host/core.c                           |   2 +-
 include/linux/rcupdate.h                           |   4 +-
 include/linux/rcutree.h                            |   1 +
 include/linux/sched.h                              |  14 +-
 include/linux/srcu.h                               |  36 +++-
 kernel/rcu/rcu.h                                   |   1 +
 kernel/rcu/rcuperf.c                               |   2 +-
 kernel/rcu/rcutorture.c                            |   7 +-
 kernel/rcu/srcutiny.c                              |   9 +-
 kernel/rcu/srcutree.c                              |  30 +--
 kernel/rcu/tree.c                                  |  43 ++--
 kernel/rcu/tree.h                                  |  18 +-
 kernel/rcu/tree_exp.h                              | 235 ++++++++++++---------
 kernel/rcu/tree_plugin.h                           | 106 ++++++++--
 kernel/rcu/update.c                                |  50 +----
 kernel/sched/core.c                                |  14 --
 kernel/softirq.c                                   |   3 +-
 kernel/torture.c                                   |   2 +-
 kernel/trace/trace_benchmark.c                     |   4 +-
 .../selftests/rcutorture/bin/kvm-find-errors.sh    |  55 +++++
 .../selftests/rcutorture/bin/kvm-recheck.sh        |   4 -
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |   1 -
 .../selftests/rcutorture/bin/parse-console.sh      | 115 ++++++++--
 .../selftests/rcutorture/bin/parse-torture.sh      | 105 ---------
 24 files changed, 504 insertions(+), 357 deletions(-)
 create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh
 delete mode 100755 tools/testing/selftests/rcutorture/bin/parse-torture.sh
Merging kvm/linux-next (c18bb396d3d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge kvm/linux-next
Already up to date.
Merging kvm-arm/next (dc6ed61d2f82 arm64: Add temporary ERRATA_MIDR_ALL_VERSIONS compatibility macro)
$ git merge kvm-arm/next
Already up to date.
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
$ git merge kvm-mips/next
Already up to date.
Merging kvm-ppc/kvm-ppc-next (31c8b0d0694a KVM: PPC: Book3S HV: Use __gfn_to_pfn_memslot() in page fault handler)
$ git merge kvm-ppc/kvm-ppc-next
Already up to date.
Merging kvms390/next (ccc40c53c07b KVM: s390: provide counters for all interrupt injects/delivery)
$ git merge kvms390/next
Already up to date.
Merging xen-tip/linux-next (a5a18ae73bca xen/pvh: Indicate XENFEAT_linux_rsdp_unrestricted to Xen)
$ git merge xen-tip/linux-next
Already up to date.
Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods)
$ git merge percpu/for-next
Already up to date.
Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next)
$ git merge workqueues/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging drivers-x86/for-next (a986c75a7df0 platform/x86: thinkpad_acpi: Add 2nd Fan Support for Thinkpad P50)
$ git merge drivers-x86/for-next
Already up to date.
Merging chrome-platform/for-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge chrome-platform/for-next
Already up to date.
Merging hsi/for-next (e3d7fbab062b HSI: hsi_char: Delete an error message for a failed memory allocation in hsc_probe())
$ git merge hsi/for-next
Already up to date.
Merging leds/for-next (9e50d5fb0d18 leds: add LED driver for CR0014114 board)
$ git merge leds/for-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/leds/leds-cr0014114.txt    |  54 ++++
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 drivers/leds/Kconfig                               |  13 +
 drivers/leds/Makefile                              |   1 +
 drivers/leds/leds-cr0014114.c                      | 315 +++++++++++++++++++++
 5 files changed, 384 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/leds/leds-cr0014114.txt
 create mode 100644 drivers/leds/leds-cr0014114.c
Merging ipmi/for-next (c6185e285c5c ipmi/parisc: Add IPMI chassis poweroff for certain HP PA-RISC and IA-64 servers)
$ git merge ipmi/for-next
Already up to date.
Merging driver-core/driver-core-next (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge driver-core/driver-core-next
Already up to date.
Merging usb/usb-next (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge usb/usb-next
Already up to date.
Merging usb-gadget/next (60cc43fc8884 Linux 4.17-rc1)
$ git merge usb-gadget/next
Already up to date.
Merging usb-serial/usb-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge usb-serial/usb-next
Already up to date.
Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53)
$ git merge usb-chipidea-next/ci-for-usb-next
Merge made by the 'recursive' strategy.
Merging phy-next/next (e7f4da4c44fe phy: tegra: xusb: Uncomment register write)
$ git merge phy-next/next
Already up to date.
Merging tty/tty-next (38c23685b273 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge tty/tty-next
Already up to date.
Merging char-misc/char-misc-next (8837c70d531a Merge branch 'akpm' (patches from Andrew))
$ git merge char-misc/char-misc-next
Already up to date.
Merging extcon/extcon-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge extcon/extcon-next
Already up to date.
Merging staging/staging-next (df34df483a97 Merge tag 'staging-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
$ git merge staging/staging-next
Already up to date.
Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API)
$ git merge mux/for-next
Merge made by the 'recursive' strategy.
 Documentation/driver-model/devres.txt |   1 +
 drivers/mux/core.c                    | 104 +++++++++++++++++++++++++++-------
 include/linux/mux/consumer.h          |   4 ++
 3 files changed, 89 insertions(+), 20 deletions(-)
Merging slave-dma/next (72ef08bf651a dmaengine: dmatest: Remove use of VLAs)
$ git merge slave-dma/next
Merge made by the 'recursive' strategy.
 drivers/dma/dmatest.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded mode switching)
$ git merge cgroup/for-next
Already up to date.
Merging scsi/for-next (74bdda01e3b4 Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Auto-merging drivers/net/hyperv/netvsc.c
Merge made by the 'recursive' strategy.
 drivers/ata/libata-scsi.c                   |   12 +
 drivers/hv/ring_buffer.c                    |    2 +
 drivers/net/hyperv/hyperv_net.h             |    1 -
 drivers/net/hyperv/netvsc.c                 |   18 +-
 drivers/net/hyperv/netvsc_drv.c             |    3 -
 drivers/scsi/cxlflash/Kconfig               |    2 +-
 drivers/scsi/cxlflash/Makefile              |    2 +-
 drivers/scsi/cxlflash/backend.h             |   50 +-
 drivers/scsi/cxlflash/common.h              |   11 +-
 drivers/scsi/cxlflash/cxl_hw.c              |   13 +
 drivers/scsi/cxlflash/main.c                |   86 +-
 drivers/scsi/cxlflash/main.h                |    1 +
 drivers/scsi/cxlflash/ocxl_hw.c             | 1436 +++++++++++++++++++++++++++
 drivers/scsi/cxlflash/ocxl_hw.h             |   77 ++
 drivers/scsi/cxlflash/sislite.h             |   41 +-
 drivers/scsi/cxlflash/superpipe.c           |   14 +
 drivers/scsi/fnic/fnic_trace.c              |    2 +-
 drivers/scsi/hisi_sas/hisi_sas.h            |    3 -
 drivers/scsi/hisi_sas/hisi_sas_main.c       |   53 +-
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c      |    8 +-
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c      |   81 +-
 drivers/scsi/libsas/sas_ata.c               |    5 +
 drivers/scsi/libsas/sas_discover.c          |    1 +
 drivers/scsi/lpfc/lpfc.h                    |    9 +-
 drivers/scsi/lpfc/lpfc_attr.c               |  112 ++-
 drivers/scsi/lpfc/lpfc_ct.c                 |   10 +
 drivers/scsi/lpfc/lpfc_debugfs.c            |   93 +-
 drivers/scsi/lpfc/lpfc_els.c                |    1 -
 drivers/scsi/lpfc/lpfc_hbadisc.c            |    4 -
 drivers/scsi/lpfc/lpfc_hw4.h                |   12 +
 drivers/scsi/lpfc/lpfc_init.c               |   62 +-
 drivers/scsi/lpfc/lpfc_nportdisc.c          |   29 +-
 drivers/scsi/lpfc/lpfc_nvme.c               |  146 ++-
 drivers/scsi/lpfc/lpfc_nvme.h               |   14 +
 drivers/scsi/lpfc/lpfc_nvmet.h              |    6 +-
 drivers/scsi/lpfc/lpfc_scsi.c               |   31 +-
 drivers/scsi/lpfc/lpfc_sli.c                |   16 +-
 drivers/scsi/lpfc/lpfc_sli4.h               |    1 +
 drivers/scsi/lpfc/lpfc_version.h            |    2 +-
 drivers/scsi/megaraid/megaraid_sas.h        |    4 +-
 drivers/scsi/megaraid/megaraid_sas_base.c   |   25 +-
 drivers/scsi/megaraid/megaraid_sas_fusion.c |    8 +-
 drivers/scsi/scsi_debug.c                   |   33 +-
 drivers/scsi/scsi_devinfo.c                 |    3 +-
 drivers/scsi/scsi_dh.c                      |    5 +-
 drivers/scsi/scsi_transport_iscsi.c         |   29 +-
 drivers/scsi/storvsc_drv.c                  |   62 +-
 include/linux/hyperv.h                      |   12 +
 include/linux/libata.h                      |    2 +
 49 files changed, 2306 insertions(+), 347 deletions(-)
 create mode 100644 drivers/scsi/cxlflash/ocxl_hw.c
 create mode 100644 drivers/scsi/cxlflash/ocxl_hw.h
Merging scsi-mkp/for-next (94b8497d5d7d scsi: sr: get/drop reference to device in revalidate and check_events)
$ git merge scsi-mkp/for-next
Already up to date.
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
$ git merge target-updates/for-next
Already up to date.
Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1)
$ git merge target-bva/for-next
Already up to date.
Merging libata/for-next (fd17ed684b6e Revert "ata: ahci-platform: add reset control support")
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/ata/ahci-platform.txt      |  1 -
 drivers/ata/ahci.h                                 |  1 -
 drivers/ata/libahci_platform.c                     | 24 +++-------------------
 3 files changed, 3 insertions(+), 23 deletions(-)
Merging vhost/linux-next (3af494dbae48 ACPI: disable extra P_LVLx access on KVM)
$ git merge vhost/linux-next
Merge made by the 'recursive' strategy.
 drivers/acpi/processor_idle.c       |   7 +-
 drivers/virtio/virtio_balloon.c     | 298 +++++++++++++++++++++++++++++++-----
 include/linux/mm.h                  |   6 +
 include/linux/ptr_ring.h            |  79 +++++++++-
 include/uapi/linux/virtio_balloon.h |  22 +++
 mm/page_alloc.c                     |  97 ++++++++++++
 mm/page_poison.c                    |   6 +
 7 files changed, 473 insertions(+), 42 deletions(-)
Merging rpmsg/for-next (191d228609da Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge rpmsg/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging gpio/for-next (348f3cde84ab gpio: Add Spreadtrum PMIC EIC driver support)
$ git merge gpio/for-next
Already up to date.
Merging pinctrl/for-next (4fc97ef94bbf pinctrl: uniphier: add UART hardware flow control pin-mux settings)
$ git merge pinctrl/for-next
Already up to date.
Merging pinctrl-samsung/for-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge pinctrl-samsung/for-next
Already up to date.
Merging pwm/for-next (6873842235d6 pwm: rcar: Add suspend/resume support)
$ git merge pwm/for-next
Already up to date.
Merging userns/for-next (1f5781725dcb commoncap: Handle memory allocation failure.)
$ git merge userns/for-next
Merge made by the 'recursive' strategy.
 security/commoncap.c | 2 ++
 1 file changed, 2 insertions(+)
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
$ git merge ktest/for-next
Already up to date.
Merging random/dev (9e66317d3c92 Linux 4.14-rc3)
$ git merge random/dev
Already up to date.
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
$ git merge aio/master
Already up to date.
Merging kselftest/next (60cc43fc8884 Linux 4.17-rc1)
$ git merge kselftest/next
Already up to date.
Merging y2038/y2038 (ce380619fab9 Merge tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
$ git merge y2038/y2038
Already up to date.
Merging livepatching/for-next (d13f5d84ca27 Merge branch 'for-4.16/signal-sysfs-force-v2' into for-next)
$ git merge livepatching/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging coresight/next (6403587a930c coresight: use put_device() instead of kfree())
$ git merge coresight/next
Merge made by the 'recursive' strategy.
 drivers/hwtracing/coresight/coresight.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Merging rtc/rtc-next (1485991c0246 rtc: snvs: Fix usage of snvs_rtc_enable)
$ git merge rtc/rtc-next
Already up to date.
Merging nvdimm/libnvdimm-for-next (e13e75b86ef2 Merge branch 'for-4.17/dax' into libnvdimm-for-next)
$ git merge nvdimm/libnvdimm-for-next
Already up to date.
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
$ git merge idr/idr-4.11
Already up to date.
Merging at24/at24/for-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge at24/at24/for-next
Already up to date.
Merging ntb/ntb-next (53c3677c56c7 ntb: intel: change references of skx to gen3)
$ git merge ntb/ntb-next
Auto-merging drivers/ntb/hw/intel/ntb_hw_gen1.c
Merge made by the 'recursive' strategy.
 drivers/ntb/hw/intel/Makefile                      |   1 +
 .../ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} | 713 ++-------------------
 drivers/ntb/hw/intel/ntb_hw_gen1.h                 | 182 ++++++
 drivers/ntb/hw/intel/ntb_hw_gen3.c                 | 597 +++++++++++++++++
 drivers/ntb/hw/intel/ntb_hw_gen3.h                 | 110 ++++
 drivers/ntb/hw/intel/ntb_hw_intel.h                | 203 ++----
 6 files changed, 997 insertions(+), 809 deletions(-)
 rename drivers/ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} (74%)
 create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen1.h
 create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.c
 create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.h
Merging kspp/for-next/kspp (0adb32858b0b Linux 4.16)
$ git merge kspp/for-next/kspp
Already up to date.
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
$ git merge init_task/init_task
Already up to date.
Merging akpm-current/current (fdb1a3b69d1b exofs: avoid VLA in structures)
$ git merge --no-ff akpm-current/current
Auto-merging security/apparmor/lsm.c
Auto-merging mm/rmap.c
Auto-merging mm/huge_memory.c
Auto-merging kernel/cgroup/cgroup.c
Auto-merging include/linux/swap.h
Auto-merging include/linux/backing-dev.h
Auto-merging fs/proc/task_mmu.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-bdi |   8 +
 Documentation/cgroup-v2.txt               |  74 ++++++++
 MAINTAINERS                               |  15 +-
 arch/arm/include/asm/page.h               |   2 +
 arch/powerpc/platforms/cell/spufs/sched.c |   2 +-
 block/genhd.c                             |   2 +-
 drivers/rapidio/devices/rio_mport_cdev.c  |  19 +-
 fs/autofs4/root.c                         |   2 +-
 fs/binfmt_elf.c                           |  16 +-
 fs/dcache.c                               |   4 +-
 fs/exec.c                                 |   1 +
 fs/exofs/ore.c                            |  84 +++++----
 fs/exofs/ore_raid.c                       |  73 ++++++--
 fs/exofs/super.c                          |  23 ++-
 fs/fs-writeback.c                         |   7 +-
 fs/ocfs2/cluster/heartbeat.c              |   8 +-
 fs/ocfs2/dlmglue.c                        |   2 +-
 fs/ocfs2/journal.c                        |  51 ++++--
 fs/ocfs2/stackglue.c                      |   6 -
 fs/ocfs2/stackglue.h                      |   3 -
 fs/proc/base.c                            |   6 +
 fs/proc/loadavg.c                         |   2 +-
 fs/proc/task_mmu.c                        |   6 +-
 fs/seq_file.c                             |  10 --
 include/linux/backing-dev-defs.h          |   5 +
 include/linux/backing-dev.h               |  30 ++--
 include/linux/cgroup-defs.h               |   5 +
 include/linux/compiler-clang.h            |   5 +
 include/linux/memcontrol.h                |  34 ++++
 include/linux/oom.h                       |  12 +-
 include/linux/sched/signal.h              |   3 +
 include/linux/shrinker.h                  |   2 +-
 include/linux/swap.h                      |  13 +-
 include/linux/thread_info.h               |   6 +-
 include/uapi/linux/prctl.h                |   4 +
 kernel/cgroup/cgroup.c                    |  13 +-
 kernel/cred.c                             |   1 +
 kernel/exit.c                             |   4 +
 kernel/fork.c                             |   5 +-
 kernel/sys.c                              |  11 ++
 lib/reed_solomon/decode_rs.c              |   7 +-
 lib/reed_solomon/reed_solomon.c           |   5 +-
 mm/backing-dev.c                          |  35 ++++
 mm/huge_memory.c                          |   5 +-
 mm/kasan/kasan.c                          |  57 +++++-
 mm/list_lru.c                             |   7 +
 mm/memcontrol.c                           | 279 +++++++++++++++++++++++++++++-
 mm/memory.c                               |   4 +-
 mm/migrate.c                              |  19 +-
 mm/mincore.c                              |  12 +-
 mm/oom_kill.c                             | 210 ++++++++++++++--------
 mm/page-writeback.c                       |  18 +-
 mm/page_owner.c                           |   4 +-
 mm/rmap.c                                 |   3 -
 mm/sparse-vmemmap.c                       |   1 -
 mm/sparse.c                               |  29 +++-
 mm/swap_state.c                           |  16 +-
 mm/swapfile.c                             | 156 +++++++++++++----
 scripts/checkpatch.pl                     |   7 +
 security/apparmor/lsm.c                   |   1 +
 security/selinux/hooks.c                  |   1 +
 61 files changed, 1141 insertions(+), 314 deletions(-)
$ 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: kernel/kexec_file.c: add walk_system_ram_res_rev()
Applying: kernel/kexec_file.c: load kernel at top of system RAM if required
Applying: mm: memcg: remote memcg charging for kmem allocations
Applying: mm: memcg: remote memcg charging for kmem allocations fix
Applying: fs: fsnotify: account fsnotify metadata to kmemcg
Applying: fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Applying: sparc64: NG4 memset 32 bits overflow
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + fafdf7517129...2c9f408ab1e4 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (2c9f408ab1e4 sparc64: NG4 memset 32 bits overflow)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 arch/sparc/lib/NG4memset.S                   | 26 ++++++------
 drivers/media/platform/sti/delta/delta-ipc.c |  4 +-
 fs/notify/dnotify/dnotify.c                  |  5 ++-
 fs/notify/fanotify/fanotify.c                |  6 ++-
 fs/notify/fanotify/fanotify_user.c           |  5 ++-
 fs/notify/group.c                            |  4 ++
 fs/notify/inotify/inotify_fsnotify.c         |  2 +-
 fs/notify/inotify/inotify_user.c             |  5 ++-
 include/linux/fsnotify_backend.h             | 12 ++++--
 include/linux/ioport.h                       |  3 ++
 include/linux/memcontrol.h                   |  7 ++++
 include/linux/sched.h                        |  3 ++
 include/linux/sched/mm.h                     | 24 +++++++++++
 include/linux/slab.h                         | 59 ++++++++++++++++++++++++++
 kernel/fork.c                                |  3 ++
 kernel/kexec_file.c                          |  2 +
 kernel/resource.c                            | 63 ++++++++++++++++++++++++++++
 mm/memcontrol.c                              | 25 ++++++++---
 18 files changed, 227 insertions(+), 31 deletions(-)