$ date -R Thu, 18 May 2017 08:41:38 +1000 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at b23afd384801 Merge tag 'pstore-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux Merging origin/master (dac94e29110c Merge tag 'for-4.12/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) $ git merge origin/master Updating b23afd384801..dac94e29110c Fast-forward drivers/i2c/busses/i2c-mv64xxx.c | 6 ++--- drivers/i2c/busses/i2c-xgene-slimpro.c | 1 + drivers/i2c/i2c-mux.c | 26 ++++++++++++--------- drivers/i2c/muxes/i2c-mux-reg.c | 21 +++++++++++------ drivers/md/dm-bufio.c | 16 ++++++------- drivers/md/dm-cache-background-tracker.c | 5 +++++ drivers/md/dm-cache-policy-smq.c | 31 ++++++++++---------------- drivers/md/dm-cache-target.c | 27 +++++++++++----------- drivers/md/dm-mpath.c | 19 +++++++++------- drivers/md/dm-rq.c | 1 + drivers/md/dm-thin-metadata.c | 4 ++-- drivers/md/persistent-data/dm-space-map-disk.c | 15 ++++++++++++- 12 files changed, 100 insertions(+), 72 deletions(-) Merging fixes/master (97da3854c526 Linux 4.11-rc3) $ git merge fixes/master Already up-to-date. Merging kbuild-current/fixes (05d8cba4a1e8 kbuild: skip install/check of headers right under uapi directories) $ git merge kbuild-current/fixes Merge made by the 'recursive' strategy. Makefile | 2 +- scripts/Makefile.headersinst | 43 +++++++++++++++++++++++++++---------------- 2 files changed, 28 insertions(+), 17 deletions(-) Merging arc-current/for-curr (2ea659a9ef48 Linux 4.12-rc1) $ git merge arc-current/for-curr Already up-to-date. Merging arm-current/fixes (2ea659a9ef48 Linux 4.12-rc1) $ git merge arm-current/fixes Already up-to-date. Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions) $ git merge m68k-current/for-linus Already up-to-date. Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) $ git merge metag-fixes/fixes Already up-to-date. Merging powerpc-fixes/fixes (bfb9956ab4d8 powerpc/mm: Fix crash in page table dump with huge pages) $ git merge powerpc-fixes/fixes Merge made by the 'recursive' strategy. arch/powerpc/include/asm/module.h | 4 + arch/powerpc/kernel/idle_book3s.S | 2 +- arch/powerpc/kernel/kprobes.c | 3 +- arch/powerpc/kernel/process.c | 19 ++++ arch/powerpc/mm/dump_linuxpagetables.c | 7 +- tools/testing/selftests/powerpc/tm/.gitignore | 1 + tools/testing/selftests/powerpc/tm/Makefile | 4 +- .../testing/selftests/powerpc/tm/tm-vmx-unavail.c | 118 +++++++++++++++++++++ 8 files changed, 152 insertions(+), 6 deletions(-) create mode 100644 tools/testing/selftests/powerpc/tm/tm-vmx-unavail.c Merging sparc/master (48078d2dac0a sparc/ftrace: Fix ftrace graph time measurement) $ git merge sparc/master Merge made by the 'recursive' strategy. arch/sparc/include/asm/hugetlb.h | 6 ++++-- arch/sparc/include/asm/pgtable_32.h | 4 ++-- arch/sparc/include/asm/setup.h | 2 +- arch/sparc/kernel/ftrace.c | 13 ++++++------- arch/sparc/mm/init_32.c | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) $ git merge fscrypt-current/for-stable Already up-to-date. Merging net/master (f917174caf71 Merge branch 'bnxt_en-DCBX-fixes') $ git merge net/master Merge made by the 'recursive' strategy. drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +-- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 6 +++-- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +- net/core/neighbour.c | 14 +++++++--- net/core/rtnetlink.c | 36 ++++++++++++++++--------- net/core/sock.c | 3 --- net/ipv4/arp.c | 16 +++++++++-- net/ipv4/fib_frontend.c | 15 ++++++++--- net/ipv4/fib_trie.c | 26 +++++++++--------- net/ipv4/ipmr.c | 18 +++++++++++-- net/ipv4/tcp_input.c | 2 +- net/ipv6/ip6_offload.c | 2 ++ net/ipv6/ip6_output.c | 4 +++ net/ipv6/output_core.c | 14 +++++----- net/ipv6/udp_offload.c | 2 ++ net/smc/Kconfig | 4 +++ net/smc/smc_clc.c | 4 +-- net/smc/smc_core.c | 16 +++-------- net/smc/smc_core.h | 2 +- net/smc/smc_ib.c | 21 ++------------- net/smc/smc_ib.h | 2 -- 21 files changed, 124 insertions(+), 88 deletions(-) Merging ipsec/master (2c1497bbc8fd xfrm: Fix NETDEV_DOWN with IPSec offload) $ git merge ipsec/master Merge made by the 'recursive' strategy. include/net/xfrm.h | 10 ---------- net/ipv4/esp4.c | 5 ++++- net/key/af_key.c | 2 +- net/xfrm/xfrm_device.c | 2 +- net/xfrm/xfrm_policy.c | 47 ----------------------------------------------- 5 files changed, 6 insertions(+), 60 deletions(-) Merging netfilter/master (c953d6354820 ebtables: arpreply: Add the standard target sanity check) $ git merge netfilter/master Merge made by the 'recursive' strategy. include/linux/netfilter/x_tables.h | 2 +- include/linux/netfilter_bridge/ebtables.h | 5 + include/net/netfilter/nf_conntrack_helper.h | 4 + include/net/netfilter/nf_tables.h | 2 +- net/bridge/netfilter/ebt_arpreply.c | 3 + net/bridge/netfilter/ebtables.c | 9 +- net/netfilter/ipvs/ip_vs_core.c | 19 +++- net/netfilter/nf_conntrack_helper.c | 12 +++ net/netfilter/nf_conntrack_netlink.c | 11 +- net/netfilter/nf_nat_core.c | 4 + net/netfilter/nf_tables_api.c | 160 ++++++++++++++++++++++------ net/netfilter/nfnetlink_cthelper.c | 17 +-- net/netfilter/nft_bitwise.c | 19 +++- net/netfilter/nft_cmp.c | 12 ++- net/netfilter/nft_ct.c | 4 +- net/netfilter/nft_immediate.c | 5 +- net/netfilter/nft_range.c | 4 +- net/netfilter/nft_set_hash.c | 2 +- net/netfilter/x_tables.c | 9 +- net/netfilter/xt_CT.c | 6 +- net/openvswitch/conntrack.c | 4 +- 21 files changed, 239 insertions(+), 74 deletions(-) $ git am -3 ../patches/nf-xtables-fix-build-failure-from-COMPAT_XT_ALIGN-outside-CONFIG_COMPAT.patch Applying: xtables: fix build failure from COMPAT_XT_ALIGN outside CONFIG_COMPAT $ git reset HEAD^ Unstaged changes after reset: M net/netfilter/x_tables.c $ git add -A . $ git commit -v -a --amend [master 48297afc8fe9] Merge remote-tracking branch 'netfilter/master' Date: Thu May 18 09:05:00 2017 +1000 Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections) $ git merge ipvs/master Already up-to-date. Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface) $ git merge wireless-drivers/master Already up-to-date. Merging mac80211/master (5667c86acf02 mac80211: strictly check mesh address extension mode) $ git merge mac80211/master Merge made by the 'recursive' strategy. net/mac80211/rx.c | 3 ++- net/wireless/util.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) Merging sound-current/for-linus (fa16b69f1299 ALSA: hda - No loopback on ALC299 codec) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. sound/pci/hda/patch_realtek.c | 3 +++ sound/usb/quirks.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) Merging pci-current/for-linus (2ea659a9ef48 Linux 4.12-rc1) $ git merge pci-current/for-linus Already up-to-date. Merging driver-core.current/driver-core-linus (2ea659a9ef48 Linux 4.12-rc1) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (2ea659a9ef48 Linux 4.12-rc1) $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus (5120a266928a USB: host: xhci: use max-port define) $ git merge usb.current/usb-linus Merge made by the 'recursive' strategy. Documentation/usb/typec.rst | 6 +-- drivers/usb/core/devio.c | 14 ++--- drivers/usb/core/hcd.c | 5 +- drivers/usb/core/hub.c | 27 +++++++--- drivers/usb/core/of.c | 3 ++ drivers/usb/core/urb.c | 2 +- drivers/usb/dwc3/dwc3-keystone.c | 4 ++ drivers/usb/dwc3/dwc3-pci.c | 4 ++ drivers/usb/dwc3/gadget.c | 21 +++++++- drivers/usb/gadget/function/f_fs.c | 10 ++-- drivers/usb/gadget/function/u_serial.c | 2 +- drivers/usb/gadget/udc/dummy_hcd.c | 6 +-- drivers/usb/host/ehci-platform.c | 4 +- drivers/usb/host/r8a66597-hcd.c | 6 ++- drivers/usb/host/xhci-mem.c | 7 +-- drivers/usb/misc/chaoskey.c | 2 +- drivers/usb/misc/iowarrior.c | 2 +- drivers/usb/misc/legousbtower.c | 1 + drivers/usb/misc/sisusbvga/sisusb_con.c | 2 +- drivers/usb/storage/ene_ub6250.c | 90 ++++++++++++++++++++------------- drivers/usb/usbip/vhci_hcd.c | 11 ++-- drivers/uwb/i1480/dfu/usb.c | 5 +- include/uapi/linux/usb/ch11.h | 3 ++ 23 files changed, 158 insertions(+), 79 deletions(-) Merging usb-gadget-fixes/fixes (a351e9b9fc24 Linux 4.11) $ git merge usb-gadget-fixes/fixes Already up-to-date. Merging usb-serial-fixes/usb-linus (8d7a10dd3239 USB: serial: qcserial: add more Lenovo EM74xx device IDs) $ git merge usb-serial-fixes/usb-linus Merge made by the 'recursive' strategy. drivers/usb/serial/ftdi_sio.c | 10 +++++----- drivers/usb/serial/ftdi_sio_ids.h | 2 ++ drivers/usb/serial/io_ti.c | 5 ++++- drivers/usb/serial/ir-usb.c | 21 ++++++++++++--------- drivers/usb/serial/mct_u232.c | 2 +- drivers/usb/serial/option.c | 8 ++++++++ drivers/usb/serial/qcserial.c | 2 ++ 7 files changed, 34 insertions(+), 16 deletions(-) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) $ git merge usb-chipidea-fixes/ci-for-usb-stable Merge made by the 'recursive' strategy. Merging phy/fixes (2ea659a9ef48 Linux 4.12-rc1) $ git merge phy/fixes Already up-to-date. Merging staging.current/staging-linus (b72d7451209a staging: fsl-dpaa2/eth: add ETHERNET dependency) $ git merge staging.current/staging-linus Removing drivers/staging/android/ion/devicetree.txt Removing Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt Merge made by the 'recursive' strategy. .../devicetree/bindings/staging/ion/hi6220-ion.txt | 31 -------- MAINTAINERS | 9 ++- drivers/staging/android/ion/devicetree.txt | 51 ------------- drivers/staging/ccree/ssi_request_mgr.c | 1 - drivers/staging/fsl-dpaa2/Kconfig | 1 + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 24 +++--- drivers/staging/rtl8192e/rtl819x_TSProc.c | 15 +--- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 1 - drivers/staging/typec/fusb302/fusb302.c | 86 +++++++++++----------- drivers/staging/typec/pd.h | 10 +++ drivers/staging/typec/pd_vdo.h | 4 +- drivers/staging/typec/tcpci.c | 2 +- drivers/staging/typec/tcpm.c | 77 ++++++++++++++++++- drivers/staging/typec/tcpm.h | 3 + .../interface/vchiq_arm/vchiq_2835_arm.c | 31 +++++--- 15 files changed, 182 insertions(+), 164 deletions(-) delete mode 100644 Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt delete mode 100644 drivers/staging/android/ion/devicetree.txt Merging char-misc.current/char-misc-linus (0d83539092dd uio: fix incorrect memory leak cleanup) $ git merge char-misc.current/char-misc-linus Merge made by the 'recursive' strategy. drivers/char/lp.c | 6 +++++- drivers/misc/Kconfig | 1 + drivers/uio/uio.c | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) Merging input-current/for-linus (3af9256150b3 Input: cros_ec_keyb - remove extraneous 'const') $ git merge input-current/for-linus Already up-to-date. Merging crypto-current/master (929562b14478 crypto: stm32 - Fix OF module alias information) $ git merge crypto-current/master Already up-to-date. Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination) $ git merge ide/master Already up-to-date. Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6) $ git merge vfio-fixes/for-linus Already up-to-date. Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-rc1) $ git merge kselftest-fixes/fixes Already up-to-date. Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) $ git merge backlight-fixes/for-backlight-fixes Already up-to-date. Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) $ git merge ftrace-fixes/for-next-urgent Already up-to-date. Merging nand-fixes/nand/fixes (f7b7ad45f59d mtd: nand: make nand_ooblayout_lp_hamming_ops static) $ git merge nand-fixes/nand/fixes Merge made by the 'recursive' strategy. drivers/mtd/nand/nand_base.c | 46 +++++++++++++++++++++++++++++++---------- drivers/mtd/nand/nand_ids.c | 1 - drivers/mtd/nand/nand_samsung.c | 3 +++ drivers/mtd/nand/tango_nand.c | 23 ++++++++++++++------- 4 files changed, 54 insertions(+), 19 deletions(-) Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1) $ git merge spi-nor-fixes/spi-nor/fixes Already up-to-date. Merging mfd-fixes/for-mfd-fixes (b2376407f989 mfd: cros-ec: Fix host command buffer size) $ git merge mfd-fixes/for-mfd-fixes Already up-to-date. Merging v4l-dvb-fixes/fixes (24a47426066c [media] exynos-gsc: Do not swap cb/cr for semi planar formats) $ git merge v4l-dvb-fixes/fixes Already up-to-date. Merging drm-intel-fixes/for-linux-next-fixes (2f720aac936d drm/i915: don't do allocate_va_range again on PIN_UPDATE) $ git merge drm-intel-fixes/for-linux-next-fixes Merge made by the 'recursive' strategy. drivers/gpu/drm/i915/gvt/handlers.c | 2 +- drivers/gpu/drm/i915/gvt/render.c | 3 +++ drivers/gpu/drm/i915/gvt/sched_policy.c | 8 ++++++-- drivers/gpu/drm/i915/i915_gem_gtt.c | 12 ++++++++---- drivers/gpu/drm/i915/i915_reg.h | 10 +++++++--- drivers/gpu/drm/i915/intel_cdclk.c | 6 ++---- drivers/gpu/drm/i915/intel_dsi.c | 7 +++---- drivers/gpu/drm/i915/intel_lpe_audio.c | 5 +++++ sound/x86/intel_hdmi_audio.c | 4 ---- 9 files changed, 35 insertions(+), 22 deletions(-) Merging drm-misc-fixes/for-linux-next-fixes (0c45b36f8acc drm/udl: Fix unaligned memory access in udl_render_hline) $ git merge drm-misc-fixes/for-linux-next-fixes Already up-to-date. Merging kbuild/for-next (547b9255cde5 Merge branch 'fixes' into for-next) $ git merge kbuild/for-next Merge made by the 'recursive' strategy. scripts/bootgraph.pl | 2 +- scripts/checkincludes.pl | 2 +- scripts/checkpatch.pl | 3 ++- scripts/checkstack.pl | 2 +- scripts/checkversion.pl | 2 +- scripts/cleanfile | 3 ++- scripts/cleanpatch | 3 ++- scripts/dtc/dt_to_config | 2 +- scripts/export_report.pl | 3 ++- scripts/extract-module-sig.pl | 3 ++- scripts/extract-sys-certs.pl | 3 ++- scripts/extract_xc3028.pl | 2 +- scripts/get_dvb_firmware | 2 +- scripts/get_maintainer.pl | 3 ++- scripts/headerdep.pl | 2 +- scripts/headers_check.pl | 3 ++- scripts/kconfig/streamline_config.pl | 3 ++- scripts/kernel-doc | 3 ++- scripts/kernel-doc-xml-ref | 3 ++- scripts/markup_oops.pl | 2 +- scripts/namespace.pl | 4 ++-- scripts/profile2linkerlist.pl | 2 +- scripts/recordmcount.pl | 3 ++- scripts/stackdelta | 2 +- 24 files changed, 37 insertions(+), 25 deletions(-) Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) $ git merge asm-generic/master Resolved 'include/asm-generic/percpu.h' using previous resolution. Auto-merging include/asm-generic/percpu.h CONFLICT (content): Merge conflict in include/asm-generic/percpu.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9e914a22266d] Merge remote-tracking branch 'asm-generic/master' $ git diff -M --stat --summary HEAD^.. include/asm-generic/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7) $ git merge arc/for-next Already up-to-date. Merging arm/for-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge arm/for-next Already up-to-date. Merging arm-perf/for-next/perf (2ea659a9ef48 Linux 4.12-rc1) $ git merge arm-perf/for-next/perf Already up-to-date. Merging arm-soc/for-next (e3ec06d4bc1e arm-soc: document merges) $ git merge arm-soc/for-next Resolved 'drivers/tee/tee_shm.c' using previous resolution. Auto-merging drivers/tee/tee_shm.c CONFLICT (content): Merge conflict in drivers/tee/tee_shm.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2cba109701cf] Merge remote-tracking branch 'arm-soc/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/arm-soc-for-next-contents.txt | 15 ++++++ arch/arm/boot/dts/mt7623.dtsi | 2 + arch/arm/mach-omap2/common.h | 3 +- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 10 ++-- arch/arm/mach-omap2/omap-smp.c | 11 ++-- arch/arm64/Kconfig.platforms | 5 ++ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 8 +++ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 73 ++++++++++++++++++++++++-- arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 3 ++ include/linux/soc/renesas/rcar-rst.h | 5 ++ 10 files changed, 122 insertions(+), 13 deletions(-) create mode 100644 arch/arm/arm-soc-for-next-contents.txt Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) $ git merge alpine/alpine/for-next Merge made by the 'recursive' strategy. Merging amlogic/for-next (715dcd206041 Merge branch 'v4.12/drivers' into tmp/aml-rebuild) $ git merge amlogic/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next) $ git merge aspeed/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging at91/at91-next (7d9fb74454a7 Merge branch 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) $ git merge at91/at91-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/at91-linea.dtsi | 2 +- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 24 ++++ arch/arm/boot/dts/at91-tse850-3.dts | 2 +- arch/arm/boot/dts/sama5d2.dtsi | 56 ++++++++ arch/arm/configs/sama5_defconfig | 3 + arch/arm/mach-at91/generic.h | 2 + arch/arm/mach-at91/pm.c | 206 ++++++++++++++++++++++++---- arch/arm/mach-at91/pm.h | 5 + arch/arm/mach-at91/pm_data-offsets.c | 3 + arch/arm/mach-at91/pm_suspend.S | 73 +++++++--- arch/arm/mach-at91/sama5.c | 19 ++- drivers/memory/atmel-ebi.c | 2 +- 12 files changed, 346 insertions(+), 51 deletions(-) Merging bcm2835/for-next (7ea6e490ba7f Merge branch anholt/bcm2835-defconfig-64-next into for-next) $ git merge bcm2835/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next) $ git merge berlin/berlin/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) $ git merge cortex-m/for-next Already up-to-date. Merging imx-mxs/for-next (e13cc349a3c7 Merge branch 'imx/defconfig' into for-next) $ git merge imx-mxs/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/mmc/fsl-esdhc.txt | 14 + arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/imx53-qsrb.dts | 2 +- arch/arm/boot/dts/imx6dl-gw560x.dts | 55 ++ arch/arm/boot/dts/imx6q-gw5400-a.dts | 5 - arch/arm/boot/dts/imx6q-gw560x.dts | 59 ++ arch/arm/boot/dts/imx6q.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-colibri.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 5 - arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 - arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 749 +++++++++++++++++++++ arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 1 + arch/arm/boot/dts/imx6qdl.dtsi | 37 +- arch/arm/boot/dts/imx6qp.dtsi | 4 + arch/arm/boot/dts/imx6sx-sdb.dts | 17 - arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- arch/arm/boot/dts/imx7s.dtsi | 12 +- arch/arm/configs/imx_v6_v7_defconfig | 3 + arch/arm/configs/mxs_defconfig | 6 +- arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 10 +- arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 15 +- arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 27 +- arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +- arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 10 +- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 7 +- arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 28 + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 20 + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 109 ++- arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 3 +- arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 3 +- arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts | 3 +- arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 3 +- arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 3 +- arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 4 +- arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 7 +- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 5 +- drivers/soc/imx/Kconfig | 3 +- drivers/soc/imx/Makefile | 2 +- 46 files changed, 1176 insertions(+), 86 deletions(-) create mode 100644 arch/arm/boot/dts/imx6dl-gw560x.dts create mode 100644 arch/arm/boot/dts/imx6q-gw560x.dts create mode 100644 arch/arm/boot/dts/imx6qdl-gw560x.dtsi Merging keystone/next (4495c08e8472 Linux 4.11-rc2) $ git merge keystone/next Already up-to-date. Merging mvebu/for-next (4cfb1f480e35 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 (12ab2264669c Merge branch 'omap-for-v4.13/dt' into for-next) $ git merge omap/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/cpufreq/ti-cpufreq.txt | 20 +- arch/arm/boot/dts/am335x-boneblack.dts | 2 +- arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +- arch/arm/boot/dts/am33xx.dtsi | 20 +- arch/arm/boot/dts/am4372.dtsi | 10 +- arch/arm/boot/dts/dra7-evm.dts | 5 +- arch/arm/boot/dts/dra7.dtsi | 8 +- arch/arm/boot/dts/dra72-evm-common.dtsi | 3 +- arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 6 +- arch/arm/boot/dts/omap3-gta04.dtsi | 3 +- arch/arm/boot/dts/omap4-droid4-xt894.dts | 20 + arch/arm/boot/dts/omap4-panda-a4.dts | 2 +- arch/arm/boot/dts/omap4-panda-es.dts | 2 +- arch/arm/boot/dts/omap5-uevm.dts | 13 + arch/arm/mach-omap2/omap-wakeupgen.c | 68 +++- arch/arm/mach-omap2/pm.c | 2 +- arch/arm/mach-omap2/sleep33xx.S | 219 +++++++++++ arch/arm/mach-omap2/sleep43xx.S | 403 +++++++++++++++++++++ arch/arm/mach-omap2/timer.c | 28 ++ drivers/memory/omap-gpmc.c | 2 +- 20 files changed, 793 insertions(+), 45 deletions(-) create mode 100644 arch/arm/mach-omap2/sleep33xx.S create mode 100644 arch/arm/mach-omap2/sleep43xx.S Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) $ git merge omap-pending/for-next Already up-to-date. Merging qcom/for-next (9f514b0f9cf3 Merge branch 'drivers-for-4.12' into all-for-4.12) $ git merge qcom/for-next Merge made by the 'recursive' strategy. Merging renesas/next (e7b4b5069b25 Merge branches 'arm64-dt-for-v4.13' and 'dt-for-v4.13' into next) $ git merge renesas/next Merge made by the 'recursive' strategy. arch/arm/boot/dts/emev2.dtsi | 2 +- arch/arm/boot/dts/r7s72100.dtsi | 6 +- arch/arm/boot/dts/r8a73a4.dtsi | 2 +- arch/arm/boot/dts/r8a7740.dtsi | 2 +- arch/arm/boot/dts/r8a7778.dtsi | 2 +- arch/arm/boot/dts/r8a7779.dtsi | 2 +- arch/arm/boot/dts/r8a7790.dtsi | 2 +- arch/arm/boot/dts/r8a7791.dtsi | 16 +- arch/arm/boot/dts/r8a7793-gose.dts | 34 +- arch/arm/boot/dts/r8a7793.dtsi | 5 +- arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi | 3 +- arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi | 3 +- arch/arm/boot/dts/sh73a0.dtsi | 2 +- arch/arm64/boot/dts/renesas/Makefile | 1 + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 115 ++++ arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 84 +++ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 344 +---------- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 565 ++---------------- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 121 ++-- arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 168 +----- arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 244 +------- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 409 +++++++++++++ arch/arm64/boot/dts/renesas/salvator-x.dtsi | 644 +++++++++++++++++++++ arch/arm64/boot/dts/renesas/ulcb.dtsi | 367 ++++++++++++ include/dt-bindings/clock/r7s72100-clock.h | 2 + include/dt-bindings/clock/r8a7791-clock.h | 1 + include/dt-bindings/pinctrl/r7s72100-pinctrl.h | 16 + 27 files changed, 1816 insertions(+), 1346 deletions(-) create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi create mode 100644 arch/arm64/boot/dts/renesas/salvator-x.dtsi create mode 100644 arch/arm64/boot/dts/renesas/ulcb.dtsi create mode 100644 include/dt-bindings/pinctrl/r7s72100-pinctrl.h Merging rockchip/for-next (fd285b686308 Merge branch 'v4.13-clk/next' into for-next) $ git merge rockchip/for-next Auto-merging arch/arm/boot/dts/rv1108.dtsi Auto-merging arch/arm/boot/dts/rv1108-evb.dts Auto-merging arch/arm/boot/dts/Makefile Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/arm/rockchip.txt | 8 +- arch/arm/Kconfig.debug | 30 + arch/arm/boot/dts/Makefile | 2 +- arch/arm/boot/dts/rk322x.dtsi | 21 +- arch/arm/boot/dts/rk3288-rock2-square.dts | 8 +- .../boot/dts/{rk1108-evb.dts => rv1108-evb.dts} | 6 +- arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi} | 20 +- arch/arm/mach-rockchip/rockchip.c | 1 + arch/arm64/boot/dts/rockchip/Makefile | 1 + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 690 +++++++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 158 ++++- drivers/clk/rockchip/clk-rk3228.c | 134 ++-- drivers/clk/rockchip/clk-rk3399.c | 4 +- include/dt-bindings/clock/rk3228-cru.h | 47 ++ include/dt-bindings/clock/rk3399-cru.h | 2 + 15 files changed, 1043 insertions(+), 89 deletions(-) rename arch/arm/boot/dts/{rk1108-evb.dts => rv1108-evb.dts} (94%) rename arch/arm/boot/dts/{rk1108.dtsi => rv1108.dtsi} (95%) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) $ git merge rpi/for-rpi-next Already up-to-date. Merging samsung/for-next (1001354ca341 Linux 4.9-rc1) $ git merge samsung/for-next Already up-to-date. Merging samsung-krzk/for-next (64eaeaf32bc5 Merge branch 'next/defconfig' into for-next) $ git merge samsung-krzk/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 1 - arch/arm/boot/dts/exynos5250-arndale.dts | 1 - arch/arm/boot/dts/exynos5250-smdk5250.dts | 1 - arch/arm/boot/dts/exynos5250-spring.dts | 1 - arch/arm/boot/dts/exynos5420-arndale-octa.dts | 1 - arch/arm/boot/dts/exynos5420-peach-pit.dts | 1 - arch/arm/boot/dts/exynos5420-smdk5420.dts | 1 - arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 - arch/arm/boot/dts/exynos5800-peach-pi.dts | 1 - arch/arm/configs/exynos_defconfig | 6 ++++++ arch/arm/configs/multi_v7_defconfig | 6 ++++++ arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 1 - 12 files changed, 12 insertions(+), 10 deletions(-) Merging sunxi/sunxi/for-next (b2f33feddc53 Merge branches 'sunxi/dt-for-4.13' and 'sunxi/clk-for-4.13' into sunxi/for-next) $ git merge sunxi/sunxi/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/clock/sun8i-de2.txt | 31 +++ arch/arm/boot/dts/axp209.dtsi | 5 + arch/arm/boot/dts/axp22x.dtsi | 5 + arch/arm/boot/dts/sun4i-a10-a1000.dts | 2 +- arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +- arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 2 +- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 2 +- arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 2 +- arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 2 +- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 +- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 6 +- arch/arm/boot/dts/sun4i-a10-inet1.dts | 2 +- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 2 +- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 2 +- .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 2 +- arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 2 +- arch/arm/boot/dts/sun4i-a10-marsboard.dts | 2 +- arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 2 +- arch/arm/boot/dts/sun4i-a10-mk802.dts | 2 +- arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 2 +- arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 +- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 2 +- arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 2 +- arch/arm/boot/dts/sun4i-a10.dtsi | 6 - arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 8 - arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 4 - arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 4 - arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 4 - .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 4 - arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 5 - arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 4 - arch/arm/boot/dts/sun5i-r8-chip.dts | 4 + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 6 - arch/arm/boot/dts/sun6i-a31.dtsi | 169 +++++++++++++- arch/arm/boot/dts/sun7i-a20-bananapi.dts | 51 ++++ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 2 +- arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 +- arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 2 +- arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 2 +- arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 2 +- arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 2 +- arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 8 - arch/arm/boot/dts/sun7i-a20-m3.dts | 2 +- arch/arm/boot/dts/sun7i-a20-mk808c.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 2 +- arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 2 +- arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 6 +- arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 2 +- arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 6 - arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 8 +- arch/arm/boot/dts/sun8i-a33.dtsi | 30 +-- .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 2 +- arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 2 +- arch/arm/boot/dts/sun8i-a83t.dtsi | 34 ++- arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 22 +- arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 13 +- arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 22 +- arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts | 94 ++++++++ arch/arm/boot/dts/sun8i-v3s.dtsi | 100 +++++--- arch/arm/boot/dts/sunxi-common-regulators.dtsi | 30 --- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 +- arch/arm64/boot/dts/allwinner/Makefile | 2 + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 41 ++++ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 61 +++++ .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 134 +++++++++++ .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 205 ++++++++++++++++ drivers/clk/sunxi-ng/Kconfig | 5 + drivers/clk/sunxi-ng/Makefile | 1 + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 2 +- drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 260 +++++++++++++++++++++ drivers/clk/sunxi-ng/ccu-sun8i-de2.h | 28 +++ drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 2 +- drivers/clk/sunxi-ng/ccu_reset.h | 1 + include/dt-bindings/clock/sun8i-de2.h | 18 ++ include/dt-bindings/reset/sun8i-de2.h | 14 ++ 79 files changed, 1331 insertions(+), 206 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/sun8i-de2.txt create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-de2.c create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-de2.h create mode 100644 include/dt-bindings/clock/sun8i-de2.h create mode 100644 include/dt-bindings/reset/sun8i-de2.h Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next) $ git merge tegra/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging arm64/for-next/core (0c2cf6d9487c arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y) $ git merge arm64/for-next/core Already up-to-date. Merging clk/clk-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge clk/clk-next Already up-to-date. Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) $ git merge c6x/for-linux-next Already up-to-date. Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) $ git merge cris/for-next Already up-to-date. Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) $ git merge h8300/h8300-next Merge made by the 'recursive' strategy. Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") $ git merge hexagon/linux-next Already up-to-date. Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) $ git merge ia64/next Already up-to-date. Merging m68k/for-next (1072734a2c63 m68k/defconfig: Update defconfigs for v4.12-rc1) $ git merge m68k/for-next Merge made by the 'recursive' strategy. arch/m68k/configs/amiga_defconfig | 8 ++- arch/m68k/configs/apollo_defconfig | 8 ++- arch/m68k/configs/atari_defconfig | 8 ++- arch/m68k/configs/bvme6000_defconfig | 8 ++- arch/m68k/configs/hp300_defconfig | 8 ++- arch/m68k/configs/mac_defconfig | 8 ++- arch/m68k/configs/multi_defconfig | 8 ++- arch/m68k/configs/mvme147_defconfig | 8 ++- arch/m68k/configs/mvme16x_defconfig | 8 ++- arch/m68k/configs/q40_defconfig | 8 ++- arch/m68k/configs/sun3_defconfig | 8 ++- arch/m68k/configs/sun3x_defconfig | 8 ++- drivers/nubus/nubus.c | 125 +++-------------------------------- 13 files changed, 95 insertions(+), 126 deletions(-) Merging m68knommu/for-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge m68knommu/for-next Already up-to-date. Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) $ git merge metag/for-next Already up-to-date. Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families) $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next (50540f5b5dcc Merge branch '4.12-fixes' into mips-for-linux-next) $ git merge mips/mips-for-linux-next Merge made by the 'recursive' strategy. arch/mips/include/asm/highmem.h | 5 +++++ arch/mips/include/asm/pgtable-32.h | 7 ++++++- arch/mips/kernel/perf_event_mipsxx.c | 6 +++++- arch/mips/mm/pgtable-32.c | 6 +++--- 4 files changed, 19 insertions(+), 5 deletions(-) Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation) $ git merge nios2/for-next Already up-to-date. Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start) $ git merge openrisc/for-next Already up-to-date. Merging parisc-hd/for-next (5aa2aabff1ce parisc: Stop CPUs via PAT firmware before system halt or reboot.) $ git merge parisc-hd/for-next Merge made by the 'recursive' strategy. arch/parisc/include/asm/pdc.h | 18 +++++ arch/parisc/include/asm/pdcpat.h | 36 ++++++--- arch/parisc/include/asm/pgtable.h | 3 + arch/parisc/include/asm/processor.h | 2 + arch/parisc/include/asm/uaccess.h | 11 --- arch/parisc/include/uapi/asm/pdc.h | 12 +-- arch/parisc/kernel/Makefile | 2 +- arch/parisc/kernel/asm-offsets.c | 5 -- arch/parisc/kernel/firmware.c | 130 ++++++++++++++++++++++++++++++++ arch/parisc/kernel/inventory.c | 9 +++ arch/parisc/kernel/pdt.c | 143 ++++++++++++++++++++++++++++++++++++ arch/parisc/kernel/process.c | 18 ++++- arch/parisc/kernel/processor.c | 5 +- arch/parisc/kernel/smp.c | 3 + arch/parisc/kernel/time.c | 24 +++++- arch/parisc/lib/lusercopy.S | 25 +++---- arch/parisc/mm/fault.c | 9 --- arch/parisc/mm/init.c | 3 + 18 files changed, 393 insertions(+), 65 deletions(-) create mode 100644 arch/parisc/kernel/pdt.c Merging powerpc/next (2ea659a9ef48 Linux 4.12-rc1) $ git merge powerpc/next Already up-to-date. Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE) $ git merge fsl/next Already up-to-date. Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) $ git merge mpc5xxx/next Already up-to-date. Merging s390/features (e9ae6b6e7a19 s390/hvc_iucv: fix broken Kconfig select statement) $ git merge s390/features Removing drivers/s390/block/scm_blk_cluster.c Removing arch/s390/include/asm/fb.h Removing arch/s390/include/asm/device.h Merge made by the 'recursive' strategy. arch/s390/Kconfig | 2 +- arch/s390/crypto/Makefile | 3 +- arch/s390/crypto/arch_random.c | 1 + arch/s390/include/asm/Kbuild | 2 + arch/s390/include/asm/device.h | 10 -- arch/s390/include/asm/fb.h | 12 -- arch/s390/include/asm/page.h | 3 + arch/s390/include/asm/pgalloc.h | 25 +++- arch/s390/include/asm/pgtable.h | 80 +++++++++-- arch/s390/include/asm/processor.h | 4 +- arch/s390/include/asm/tlb.h | 15 ++ arch/s390/kernel/entry.S | 19 ++- arch/s390/kernel/traps.c | 1 + arch/s390/kernel/vdso.c | 91 ++++++++---- arch/s390/kernel/vtime.c | 14 +- arch/s390/mm/dump_pagetables.c | 23 ++- arch/s390/mm/gmap.c | 11 +- arch/s390/mm/gup.c | 33 ++++- arch/s390/mm/hugetlbpage.c | 30 ++-- arch/s390/mm/mmap.c | 4 +- arch/s390/mm/pageattr.c | 30 +++- arch/s390/mm/pgalloc.c | 57 +++++--- arch/s390/mm/pgtable.c | 6 +- arch/s390/mm/vmem.c | 44 +++++- drivers/crypto/Kconfig | 15 +- drivers/s390/block/Kconfig | 7 - drivers/s390/block/Makefile | 3 - drivers/s390/block/dasd_devmap.c | 47 ++++--- drivers/s390/block/scm_blk.c | 252 +++++++++++++++------------------ drivers/s390/block/scm_blk.h | 60 +------- drivers/s390/block/scm_blk_cluster.c | 255 ---------------------------------- drivers/s390/crypto/pkey_api.c | 6 +- drivers/s390/crypto/zcrypt_cca_key.h | 115 +-------------- drivers/s390/crypto/zcrypt_msgtype6.c | 4 +- drivers/tty/hvc/Kconfig | 2 +- 35 files changed, 551 insertions(+), 735 deletions(-) delete mode 100644 arch/s390/include/asm/device.h delete mode 100644 arch/s390/include/asm/fb.h delete mode 100644 drivers/s390/block/scm_blk_cluster.c Merging sparc-next/master (94836ecf1e73 Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux) $ git merge sparc-next/master Already up-to-date. Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) $ git merge sh/for-next Already up-to-date. Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory) $ git merge tile/master Merge made by the 'recursive' strategy. arch/tile/include/uapi/arch/abi.h | 49 +++---------------------- arch/tile/include/uapi/arch/intreg.h | 70 ++++++++++++++++++++++++++++++++++++ arch/tile/mm/init.c | 30 ---------------- 3 files changed, 74 insertions(+), 75 deletions(-) create mode 100644 arch/tile/include/uapi/arch/intreg.h Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include) $ git merge uml/linux-next Already up-to-date. Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) $ git merge unicore32/unicore32 Auto-merging arch/unicore32/include/asm/Kbuild Merge made by the 'recursive' strategy. arch/unicore32/Kconfig | 14 + arch/unicore32/include/asm/Kbuild | 3 - arch/unicore32/include/asm/signal.h | 21 + arch/unicore32/include/asm/syscalls.h | 25 + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ arch/unicore32/include/uapi/asm/stat.h | 19 + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ arch/unicore32/include/uapi/asm/unistd.h | 8 + arch/unicore32/kernel/entry.S | 17 + arch/unicore32/kernel/signal.c | 41 ++ 11 files changed, 1000 insertions(+), 3 deletions(-) create mode 100644 arch/unicore32/include/asm/signal.h create mode 100644 arch/unicore32/include/asm/syscalls.h create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h create mode 100644 arch/unicore32/include/uapi/asm/stat.h create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h Merging xtensa/xtensa-for-next (6fad04b7585d Merge branch 'xtensa-fixes' into xtensa-for-next) $ git merge xtensa/xtensa-for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging fscrypt/master (6f9d696f016f fscrypt: correct collision claim for digested names) $ git merge fscrypt/master Already up-to-date. Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache) $ git merge befs/for-next Merge made by the 'recursive' strategy. Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) $ git merge btrfs/next Already up-to-date. Merging btrfs-kdave/for-next (4b1370b4e34a Merge branch 'for-next-next-v4.13-20170517' into for-next-20170517) $ git merge btrfs-kdave/for-next Merge made by the 'recursive' strategy. fs/btrfs/check-integrity.c | 35 +++-- fs/btrfs/ctree.h | 18 ++- fs/btrfs/disk-io.c | 77 ++++++++--- fs/btrfs/extent-tree.c | 41 +++--- fs/btrfs/extent_io.c | 146 ++++++++++++++++++++- fs/btrfs/extent_io.h | 37 +++++- fs/btrfs/file-item.c | 31 +++-- fs/btrfs/file.c | 41 +++--- fs/btrfs/inode-map.c | 4 +- fs/btrfs/inode.c | 296 +++++++++++++++++++++---------------------- fs/btrfs/ioctl.c | 12 +- fs/btrfs/qgroup.c | 220 +++++++++++++++++++++++--------- fs/btrfs/qgroup.h | 8 +- fs/btrfs/reada.c | 1 - fs/btrfs/relocation.c | 12 +- fs/btrfs/send.c | 8 -- fs/btrfs/sysfs.c | 41 ++++++ fs/btrfs/transaction.c | 18 +-- fs/btrfs/volumes.c | 26 +--- fs/btrfs/volumes.h | 2 + include/trace/events/btrfs.h | 36 ------ 21 files changed, 706 insertions(+), 404 deletions(-) Merging ceph/master (eeca958dce0a ceph: fix memory leak in __ceph_setxattr()) $ git merge ceph/master Already up-to-date. Merging cifs/for-next (a95cfad947d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge cifs/for-next Already up-to-date. Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link) $ git merge configfs/for-next Already up-to-date. Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) $ git merge ecryptfs/next Auto-merging fs/ecryptfs/main.c Auto-merging fs/ecryptfs/ecryptfs_kernel.h Merge made by the 'recursive' strategy. fs/ecryptfs/crypto.c | 15 --------------- fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- fs/ecryptfs/keystore.c | 2 +- fs/ecryptfs/main.c | 2 +- fs/ecryptfs/miscdev.c | 2 +- 5 files changed, 11 insertions(+), 19 deletions(-) Merging ext3/for_next (07f7e3135e58 Merge branch 'fsnotify' into for_next) $ git merge ext3/for_next Already up-to-date! Merge made by the 'recursive' strategy. Merging ext4/dev (17f423b51607 jbd2: cleanup write flags handling from jbd2_write_superblock()) $ git merge ext4/dev Already up-to-date. Merging f2fs/dev (2d3e4866dea9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) $ git merge f2fs/dev Already up-to-date. Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) $ git merge freevxfs/for-next Already up-to-date. Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) $ git merge fscache/fscache Already up-to-date. Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces) $ git merge fuse/for-next Already up-to-date. Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size) $ git merge jfs/jfs-next Auto-merging fs/jfs/super.c Merge made by the 'recursive' strategy. fs/jfs/resize.c | 4 ++-- fs/jfs/super.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Merging nfs/linux-next (76b2a303384e pNFS/flexfiles: Always attempt to call layoutstats when flexfiles is enabled) $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next (b26b78cb7260 nfsd: Fix up the "supattr_exclcreat" attributes) $ git merge nfsd/nfsd-next Already up-to-date. Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly) $ git merge orangefs/for-next Already up-to-date. Merging overlayfs/overlayfs-next (02cac3227a28 ovl: mark upper dir with type origin entries "impure") $ git merge overlayfs/overlayfs-next Merge made by the 'recursive' strategy. fs/overlayfs/Kconfig | 1 + fs/overlayfs/copy_up.c | 26 ++++++++++++++++++++------ fs/overlayfs/dir.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- fs/overlayfs/namei.c | 18 ++++++++++++++++-- fs/overlayfs/overlayfs.h | 5 ++++- fs/overlayfs/ovl_entry.h | 2 ++ fs/overlayfs/util.c | 16 +++++++++++++++- 7 files changed, 102 insertions(+), 14 deletions(-) Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state) $ git merge ubifs/linux-next Already up-to-date. Merging xfs/for-next (161f55efba5d xfs: fix use-after-free in xfs_finish_page_writeback) $ git merge xfs/for-next Already up-to-date. Merging file-locks/linux-next (b0756441db3a fs/locks: don't mess with the address limit in compat_fcntl64) $ git merge file-locks/linux-next Merge made by the 'recursive' strategy. fs/fcntl.c | 145 ++++++++++++++++++++++++++++++++--------------------- fs/locks.c | 97 +++++++++++------------------------ include/linux/fs.h | 8 +-- 3 files changed, 123 insertions(+), 127 deletions(-) Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next) $ git merge vfs/for-next Auto-merging fs/stat.c Auto-merging fs/namei.c Merge made by the 'recursive' strategy. fs/namei.c | 56 ++++++++++++++++++++++++++++++++++------------ fs/stat.c | 4 +++- include/linux/namei.h | 2 ++ include/uapi/linux/fcntl.h | 1 + 4 files changed, 48 insertions(+), 15 deletions(-) Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) $ git merge vfs-jk/vfs Already up-to-date. 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 (ad30113010b7 printk: Use the main logbuf in NMI when logbuf_lock is available) $ git merge printk/for-next Auto-merging kernel/printk/printk.c Merge made by the 'recursive' strategy. kernel/printk/internal.h | 6 ++++-- kernel/printk/printk.c | 19 ++++++++++++++----- kernel/printk/printk_safe.c | 26 ++++++++++++++++++++++++-- lib/nmi_backtrace.c | 3 +++ 4 files changed, 45 insertions(+), 9 deletions(-) Merging pci/next (2ea659a9ef48 Linux 4.12-rc1) $ git merge pci/next Already up-to-date. Merging pstore/for-next/pstore (6f61dd3aa351 efi-pstore: Fix read iter after pstore API refactor) $ git merge pstore/for-next/pstore Already up-to-date. Merging hid/for-next (edb2a51c6fbb Merge branch 'for-4.12/upstream-fixes' into for-next) $ git merge hid/for-next Merge made by the 'recursive' strategy. drivers/hid/hid-magicmouse.c | 15 ++++++++------- drivers/hid/wacom_wac.c | 45 ++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 29 deletions(-) Merging i2c/i2c/for-next (83345d51a49a i2c: xgene: Set ACPI_COMPANION_I2C) $ git merge i2c/i2c/for-next Already up-to-date. Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) $ git merge jdelvare-hwmon/master Already up-to-date. Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first) $ git merge dmi/master Merge made by the 'recursive' strategy. drivers/firmware/dmi_scan.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) Merging hwmon-staging/hwmon-next (08f2a3db3e50 hwmon: (adt7475) temperature smoothing) $ git merge hwmon-staging/hwmon-next Merge made by the 'recursive' strategy. Documentation/hwmon/adt7475 | 9 ++ Documentation/hwmon/ir35221 | 87 +++++++++++ drivers/hwmon/adt7475.c | 184 ++++++++++++++++++----- drivers/hwmon/coretemp.c | 14 ++ drivers/hwmon/pmbus/Kconfig | 10 ++ drivers/hwmon/pmbus/Makefile | 1 + drivers/hwmon/pmbus/ir35221.c | 337 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 607 insertions(+), 35 deletions(-) create mode 100644 Documentation/hwmon/ir35221 create mode 100644 drivers/hwmon/pmbus/ir35221.c Merging jc_docs/docs-next (25a0da73f24c doc: replace FTP URL to kernel.org with HTTPS one) $ git merge jc_docs/docs-next Already up-to-date. Merging v4l-dvb/master (3622d3e77ece [media] ov2640: print error if devm_*_optional*() fails) $ git merge v4l-dvb/master Already up-to-date. Merging v4l-dvb-next/master (6d95b3f24881 Merge branch 'TTT' into to_next) $ git merge v4l-dvb-next/master Already up-to-date! Merge made by the 'recursive' strategy. Merging fbdev/fbdev-for-next (34bf129a7f06 fbdev: sti: don't select CONFIG_VT) $ git merge fbdev/fbdev-for-next Already up-to-date. Merging pm/linux-next (c549d04f0535 Merge branch 'pm-tools' into linux-next) $ git merge pm/linux-next Removing Documentation/cpu-freq/intel-pstate.txt Merge made by the 'recursive' strategy. Documentation/acpi/acpi-lid.txt | 16 +- Documentation/admin-guide/pm/cpufreq.rst | 19 +- Documentation/admin-guide/pm/index.rst | 1 + Documentation/admin-guide/pm/intel_pstate.rst | 755 ++++++++++ Documentation/cpu-freq/intel-pstate.txt | 281 ---- arch/x86/include/asm/msr-index.h | 18 +- drivers/acpi/button.c | 9 + drivers/base/power/wakeup.c | 11 +- drivers/cpufreq/Kconfig.arm | 9 + drivers/cpufreq/Makefile | 2 +- drivers/cpufreq/intel_pstate.c | 34 +- drivers/powercap/powercap_sys.c | 1 + drivers/rtc/rtc-cmos.c | 2 +- kernel/power/snapshot.c | 2 +- kernel/sched/cpufreq_schedutil.c | 7 +- tools/power/acpi/.gitignore | 4 + tools/power/x86/x86_energy_perf_policy/Makefile | 27 +- .../x86_energy_perf_policy.8 | 241 +++- .../x86_energy_perf_policy.c | 1504 +++++++++++++++++--- 19 files changed, 2339 insertions(+), 604 deletions(-) create mode 100644 Documentation/admin-guide/pm/intel_pstate.rst delete mode 100644 Documentation/cpu-freq/intel-pstate.txt create mode 100644 tools/power/acpi/.gitignore Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) $ git merge idle/next Merge made by the 'recursive' strategy. Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next) $ git merge thermal/next Already up-to-date. Merging thermal-soc/next (19fd1783c24e Merge branch 'work-linus' into work-next) $ git merge thermal-soc/next Already up-to-date! Merge made by the 'recursive' strategy. Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) $ git merge ieee1394/for-next Merge made by the 'recursive' strategy. drivers/firewire/net.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure) $ git merge dlm/next Auto-merging fs/dlm/user.c Merge made by the 'recursive' strategy. fs/dlm/user.c | 2 ++ 1 file changed, 2 insertions(+) Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) $ git merge swiotlb/linux-next Already up-to-date. Merging net-next/master (1fc4d180b3c6 Merge branch 'phy-marvell-cleanups') $ git merge net-next/master Auto-merging net/ipv4/tcp_input.c Auto-merging net/core/sock.c Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c Merge made by the 'recursive' strategy. drivers/net/dsa/Kconfig | 40 +- drivers/net/dsa/Makefile | 6 +- drivers/net/dsa/b53/b53_common.c | 4 +- drivers/net/dsa/bcm_sf2.c | 4 +- drivers/net/dsa/mv88e6060.c | 2 +- drivers/net/dsa/qca8k.c | 2 +- .../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 132 ++++- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 188 +++--- drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 70 ++- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 59 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 12 +- drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 110 +--- drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 77 +-- drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 5 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 56 +- drivers/net/ethernet/cavium/liquidio/lio_main.c | 24 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 17 +- .../net/ethernet/cavium/liquidio/octeon_device.c | 87 ++- .../net/ethernet/cavium/liquidio/octeon_device.h | 25 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 12 +- drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 118 +++- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 131 +---- .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 73 ++- .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 17 +- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 289 ++++++---- .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 2 + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 415 +++++--------- drivers/net/ethernet/netronome/nfp/nfp_net.h | 19 +- .../net/ethernet/netronome/nfp/nfp_net_common.c | 179 +++--- drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 18 +- .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 12 +- drivers/net/phy/broadcom.c | 30 +- drivers/net/phy/marvell.c | 636 ++++++++++++--------- drivers/net/phy/mdio-xgene.c | 74 +-- drivers/net/phy/mdio-xgene.h | 3 + drivers/net/phy/micrel.c | 27 +- drivers/net/phy/microchip.c | 2 +- drivers/net/phy/smsc.c | 12 +- include/linux/phy.h | 3 +- include/linux/skbuff.h | 69 +-- include/linux/tcp.h | 24 +- include/linux/udp.h | 3 + include/net/act_api.h | 13 +- include/net/dsa.h | 21 +- include/net/pkt_cls.h | 24 +- include/net/pkt_sched.h | 3 - include/net/sch_generic.h | 26 +- include/net/sock.h | 13 +- include/net/tcp.h | 77 ++- include/net/udp.h | 9 +- include/net/udplite.h | 2 +- include/uapi/linux/pkt_cls.h | 1 + include/uapi/linux/rtnetlink.h | 1 + net/bluetooth/af_bluetooth.c | 2 +- net/caif/caif_socket.c | 2 +- net/core/datagram.c | 90 +-- net/core/dev.c | 5 +- net/core/sock.c | 4 + net/dccp/ccids/ccid2.c | 8 +- net/dccp/ccids/ccid2.h | 2 +- net/dsa/Kconfig | 8 +- net/dsa/Makefile | 6 +- net/dsa/dsa.c | 18 +- net/dsa/dsa2.c | 14 +- net/dsa/dsa_priv.h | 18 +- net/dsa/legacy.c | 10 +- net/dsa/slave.c | 10 +- net/dsa/tag_brcm.c | 2 +- net/dsa/tag_qca.c | 2 +- net/dsa/tag_trailer.c | 2 +- net/ipv4/syncookies.c | 8 +- net/ipv4/tcp.c | 10 +- net/ipv4/tcp_bbr.c | 43 +- net/ipv4/tcp_bic.c | 6 +- net/ipv4/tcp_cubic.c | 14 +- net/ipv4/tcp_htcp.c | 2 +- net/ipv4/tcp_input.c | 126 ++-- net/ipv4/tcp_ipv4.c | 16 +- net/ipv4/tcp_lp.c | 17 +- net/ipv4/tcp_metrics.c | 2 +- net/ipv4/tcp_minisocks.c | 8 +- net/ipv4/tcp_output.c | 131 ++++- net/ipv4/tcp_rate.c | 16 +- net/ipv4/tcp_recovery.c | 24 +- net/ipv4/tcp_timer.c | 20 +- net/ipv4/tcp_westwood.c | 6 +- net/ipv4/udp.c | 162 +++++- net/ipv6/syncookies.c | 2 +- net/ipv6/tcp_ipv6.c | 4 +- net/ipv6/udp.c | 3 +- net/kcm/kcmsock.c | 2 +- net/netfilter/nf_synproxy_core.c | 2 +- net/nfc/af_nfc.c | 2 +- net/sched/act_api.c | 55 +- net/sched/cls_api.c | 411 ++++++++++--- net/sched/sch_api.c | 50 +- net/sched/sch_atm.c | 29 +- net/sched/sch_cbq.c | 21 +- net/sched/sch_drr.c | 15 +- net/sched/sch_dsmark.c | 17 +- net/sched/sch_fq.c | 8 + net/sched/sch_fq_codel.c | 17 +- net/sched/sch_hfsc.c | 21 +- net/sched/sch_htb.c | 28 +- net/sched/sch_ingress.c | 61 +- net/sched/sch_multiq.c | 16 +- net/sched/sch_prio.c | 19 +- net/sched/sch_qfq.c | 16 +- net/sched/sch_sfb.c | 17 +- net/sched/sch_sfq.c | 17 +- tools/hv/bondvf.sh | 21 +- 113 files changed, 2974 insertions(+), 1975 deletions(-) Merging ipsec-next/master (a133d93054fa xfrm: use memdup_user) $ git merge ipsec-next/master Merge made by the 'recursive' strategy. net/xfrm/xfrm_state.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) Merging netfilter-next/master (9ad098037db5 liquidio: use pcie_flr instead of duplicating it) $ git merge netfilter-next/master Already up-to-date. Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period) $ git merge ipvs-next/master Already up-to-date. Merging wireless-drivers-next/master (a95cfad947d5 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 (2a25b3faef44 Bluetooth: hci_ldisc: Use rwlocking to avoid closing proto races) $ git merge bluetooth/master Merge made by the 'recursive' strategy. drivers/bluetooth/Kconfig | 2 +- drivers/bluetooth/btusb.c | 4 ++++ drivers/bluetooth/hci_ldisc.c | 40 ++++++++++++++++++++++++++++++++----- drivers/bluetooth/hci_uart.h | 1 + include/net/bluetooth/hci.h | 8 ++++++++ net/bluetooth/hci_core.c | 46 ++++++++++++++++++++++++++++++++++++++----- 6 files changed, 90 insertions(+), 11 deletions(-) Merging mac80211-next/master (484a54c2e597 mac80211: Dynamically set CoDel parameters per station) $ git merge mac80211-next/master Auto-merging net/wireless/util.c Merge made by the 'recursive' strategy. include/net/mac80211.h | 16 ++++++++++++++++ net/mac80211/debugfs_sta.c | 6 ++++++ net/mac80211/rate.c | 3 ++- net/mac80211/sta_info.c | 30 ++++++++++++++++++++++++++++++ net/mac80211/sta_info.h | 11 +++++++++++ net/mac80211/tx.c | 9 ++++++++- net/wireless/util.c | 11 +++++++---- 7 files changed, 80 insertions(+), 6 deletions(-) Merging rdma/for-next (67cf3623e097 rxe: expose num_possible_cpus() cnum_comp_vectors) $ git merge rdma/for-next Already up-to-date. Merging gfs2/for-next (3ef2bc099d1c Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux) $ git merge gfs2/for-next Already up-to-date. Merging mtd/master (2ea659a9ef48 Linux 4.12-rc1) $ git merge mtd/master Already up-to-date. Merging l2-mtd/master (c316cf670491 Merge 'v4.12-rc1' into MTD) $ git merge l2-mtd/master Merge made by the 'recursive' strategy. drivers/mtd/chips/cfi_cmdset_0020.c | 2 +- drivers/mtd/devices/Kconfig | 10 ++ drivers/mtd/devices/Makefile | 1 + drivers/mtd/devices/mchp23k256.c | 182 +++++++++++++++++++++++++++++++ drivers/mtd/devices/mtd_dataflash.c | 200 ++++++++++++++++++++--------------- drivers/mtd/maps/physmap_of_gemini.c | 2 +- 6 files changed, 307 insertions(+), 90 deletions(-) create mode 100644 drivers/mtd/devices/mchp23k256.c Merging nand/nand/next (6076fd1e9d87 mtd: nand: gpmi: Kill gpmi_nand_exit()) $ git merge nand/nand/next Auto-merging drivers/mtd/nand/nand_base.c Merge made by the 'recursive' strategy. .../devicetree/bindings/mtd/gpmi-nand.txt | 14 +- Documentation/devicetree/bindings/mtd/nand.txt | 2 +- drivers/mtd/nand/Kconfig | 2 + drivers/mtd/nand/davinci_nand.c | 3 + drivers/mtd/nand/fsmc_nand.c | 123 +++++++++--- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 75 +++---- drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 9 +- drivers/mtd/nand/jz4780_nand.c | 2 +- drivers/mtd/nand/nand_base.c | 28 ++- drivers/mtd/nand/nand_micron.c | 215 +++++++++++++++++++++ include/linux/mtd/nand.h | 11 ++ 11 files changed, 414 insertions(+), 70 deletions(-) Merging spi-nor/spi-nor/next (05d090f00203 mtd: spi-nor: Potential oops on error path in quad_enable()) $ git merge spi-nor/spi-nor/next Merge made by the 'recursive' strategy. drivers/mtd/devices/m25p80.c | 121 ++++++--- drivers/mtd/spi-nor/Kconfig | 2 +- drivers/mtd/spi-nor/aspeed-smc.c | 23 +- drivers/mtd/spi-nor/atmel-quadspi.c | 83 ++++-- drivers/mtd/spi-nor/cadence-quadspi.c | 18 +- drivers/mtd/spi-nor/fsl-quadspi.c | 6 +- drivers/mtd/spi-nor/hisi-sfc.c | 31 ++- drivers/mtd/spi-nor/intel-spi.c | 7 +- drivers/mtd/spi-nor/mtk-quadspi.c | 15 +- drivers/mtd/spi-nor/nxp-spifi.c | 22 +- drivers/mtd/spi-nor/spi-nor.c | 475 +++++++++++++++++++++++++++------- drivers/mtd/spi-nor/stm32-quadspi.c | 32 ++- include/linux/mtd/spi-nor.h | 161 +++++++++++- 13 files changed, 770 insertions(+), 226 deletions(-) Merging crypto/master (929562b14478 crypto: stm32 - Fix OF module alias information) $ git merge crypto/master Already up-to-date. Merging drm/drm-next (2ea659a9ef48 Linux 4.12-rc1) $ 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 (d555cb5827d6 drm/i915/skl+: use linetime latency if ddb size is not available) $ git merge drm-intel/for-linux-next Auto-merging sound/x86/intel_hdmi_audio.c Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c Auto-merging drivers/gpu/drm/i915/intel_sprite.c Auto-merging drivers/gpu/drm/i915/intel_lpe_audio.c Auto-merging drivers/gpu/drm/i915/intel_cdclk.c Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_gem_request.h Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/Kconfig.debug Merge made by the 'recursive' strategy. drivers/gpu/drm/i915/Kconfig.debug | 12 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/dvo_ch7017.c | 4 +- drivers/gpu/drm/i915/gvt/scheduler.c | 12 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 10 +- drivers/gpu/drm/i915/i915_debugfs.c | 205 +-- drivers/gpu/drm/i915/i915_drv.c | 27 +- drivers/gpu/drm/i915/i915_drv.h | 330 +++-- drivers/gpu/drm/i915/i915_gem.c | 260 ++-- drivers/gpu/drm/i915/i915_gem.h | 2 + drivers/gpu/drm/i915/i915_gem_clflush.c | 8 +- drivers/gpu/drm/i915/i915_gem_clflush.h | 1 - drivers/gpu/drm/i915/i915_gem_context.c | 116 +- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 24 + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 12 + drivers/gpu/drm/i915/i915_gem_gtt.c | 32 +- drivers/gpu/drm/i915/i915_gem_request.c | 182 ++- drivers/gpu/drm/i915/i915_gem_request.h | 14 +- drivers/gpu/drm/i915/i915_gem_shrinker.c | 61 +- drivers/gpu/drm/i915/i915_gem_timeline.c | 95 +- drivers/gpu/drm/i915/i915_gem_timeline.h | 47 +- drivers/gpu/drm/i915/i915_gpu_error.c | 59 +- drivers/gpu/drm/i915/i915_guc_submission.c | 89 +- drivers/gpu/drm/i915/i915_irq.c | 43 +- drivers/gpu/drm/i915/i915_pci.c | 5 - drivers/gpu/drm/i915/i915_perf.c | 395 ++++-- drivers/gpu/drm/i915/i915_reg.h | 30 +- drivers/gpu/drm/i915/i915_sw_fence.c | 62 +- drivers/gpu/drm/i915/i915_sw_fence.h | 1 - drivers/gpu/drm/i915/i915_syncmap.c | 412 ++++++ drivers/gpu/drm/i915/i915_syncmap.h | 38 + drivers/gpu/drm/i915/i915_sysfs.c | 26 +- drivers/gpu/drm/i915/i915_trace.h | 49 + drivers/gpu/drm/i915/i915_utils.h | 34 +- drivers/gpu/drm/i915/intel_atomic_plane.c | 24 +- drivers/gpu/drm/i915/intel_audio.c | 19 +- drivers/gpu/drm/i915/intel_breadcrumbs.c | 13 +- drivers/gpu/drm/i915/intel_cdclk.c | 16 +- drivers/gpu/drm/i915/intel_crt.c | 10 +- drivers/gpu/drm/i915/intel_device_info.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 745 +++++----- drivers/gpu/drm/i915/intel_dp.c | 360 +++-- drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 37 +- drivers/gpu/drm/i915/intel_dp_link_training.c | 25 +- drivers/gpu/drm/i915/intel_dp_mst.c | 16 +- drivers/gpu/drm/i915/intel_drv.h | 86 +- drivers/gpu/drm/i915/intel_dsi_vbt.c | 8 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 231 ++- drivers/gpu/drm/i915/intel_guc_fwif.h | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 19 +- drivers/gpu/drm/i915/intel_guc_log.c | 6 +- drivers/gpu/drm/i915/intel_hangcheck.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 7 +- drivers/gpu/drm/i915/intel_huc.c | 64 +- drivers/gpu/drm/i915/intel_lpe_audio.c | 94 +- drivers/gpu/drm/i915/intel_lrc.c | 415 +++--- drivers/gpu/drm/i915/intel_lrc.h | 2 - drivers/gpu/drm/i915/intel_panel.c | 17 +- drivers/gpu/drm/i915/intel_pipe_crc.c | 30 +- drivers/gpu/drm/i915/intel_pm.c | 1483 ++++++++++++++------ drivers/gpu/drm/i915/intel_ringbuffer.c | 329 +++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 105 +- drivers/gpu/drm/i915/intel_sdvo.c | 9 +- drivers/gpu/drm/i915/intel_sprite.c | 124 +- drivers/gpu/drm/i915/intel_tv.c | 208 +-- drivers/gpu/drm/i915/intel_uc.c | 101 +- drivers/gpu/drm/i915/intel_uc.h | 19 +- drivers/gpu/drm/i915/intel_uncore.c | 247 ++-- drivers/gpu/drm/i915/intel_uncore.h | 169 +++ .../gpu/drm/i915/selftests/i915_gem_coherency.c | 10 +- drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 100 ++ drivers/gpu/drm/i915/selftests/i915_gem_object.c | 4 +- drivers/gpu/drm/i915/selftests/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/selftests/i915_gem_timeline.c | 299 ++++ .../gpu/drm/i915/selftests/i915_mock_selftests.h | 3 + drivers/gpu/drm/i915/selftests/i915_random.c | 11 + drivers/gpu/drm/i915/selftests/i915_random.h | 2 + drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 577 ++++++++ drivers/gpu/drm/i915/selftests/i915_syncmap.c | 616 ++++++++ drivers/gpu/drm/i915/selftests/mock_engine.c | 11 +- drivers/gpu/drm/i915/selftests/mock_gem_device.c | 11 +- drivers/gpu/drm/i915/selftests/mock_timeline.c | 45 + drivers/gpu/drm/i915/selftests/mock_timeline.h | 33 + drivers/gpu/drm/i915/selftests/mock_uncore.c | 46 + drivers/gpu/drm/i915/selftests/mock_uncore.h | 30 + include/drm/intel_lpe_audio.h | 22 +- include/uapi/drm/i915_drm.h | 17 +- sound/x86/intel_hdmi_audio.c | 324 +++-- sound/x86/intel_hdmi_audio.h | 20 +- 90 files changed, 6984 insertions(+), 2945 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_syncmap.c create mode 100644 drivers/gpu/drm/i915/i915_syncmap.h create mode 100644 drivers/gpu/drm/i915/intel_uncore.h create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_timeline.c create mode 100644 drivers/gpu/drm/i915/selftests/i915_sw_fence.c create mode 100644 drivers/gpu/drm/i915/selftests/i915_syncmap.c create mode 100644 drivers/gpu/drm/i915/selftests/mock_timeline.c create mode 100644 drivers/gpu/drm/i915/selftests/mock_timeline.h create mode 100644 drivers/gpu/drm/i915/selftests/mock_uncore.c create mode 100644 drivers/gpu/drm/i915/selftests/mock_uncore.h Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown) $ git merge drm-tegra/drm/tegra/for-next Already up-to-date. Merging drm-misc/for-linux-next (e345da82bd6b drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2) $ git merge drm-misc/for-linux-next Already up-to-date. Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) $ git merge drm-exynos/exynos-drm/for-next Already up-to-date. Merging drm-msm/msm-next (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree) $ git merge drm-msm/msm-next Already up-to-date. Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address) $ git merge hdlcd/for-upstream/hdlcd Auto-merging drivers/gpu/drm/arm/hdlcd_crtc.c Merge made by the 'recursive' strategy. drivers/gpu/drm/arm/hdlcd_crtc.c | 47 ++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 16 deletions(-) Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions) $ git merge mali-dp/for-upstream/mali-dp Already up-to-date. Merging sunxi-drm/sunxi-drm/for-next (e6010f19497a drm/sun4i: tcon: add support for V3s TCON) $ git merge sunxi-drm/sunxi-drm/for-next Merge made by the 'recursive' strategy. .../bindings/display/sunxi/sun4i-drm.txt | 36 +- drivers/gpu/drm/sun4i/Kconfig | 20 + drivers/gpu/drm/sun4i/Makefile | 9 +- drivers/gpu/drm/sun4i/sun4i_backend.c | 122 ++++-- drivers/gpu/drm/sun4i/sun4i_backend.h | 15 +- drivers/gpu/drm/sun4i/sun4i_crtc.c | 32 +- drivers/gpu/drm/sun4i/sun4i_crtc.h | 5 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 6 +- drivers/gpu/drm/sun4i/sun4i_drv.h | 5 +- drivers/gpu/drm/sun4i/sun4i_layer.c | 21 +- drivers/gpu/drm/sun4i/sun4i_layer.h | 6 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 - drivers/gpu/drm/sun4i/sun4i_tcon.c | 77 +++- drivers/gpu/drm/sun4i/sun4i_tcon.h | 6 + drivers/gpu/drm/sun4i/sun4i_tv.c | 11 +- drivers/gpu/drm/sun4i/sun8i_layer.c | 134 +++++++ drivers/gpu/drm/sun4i/sun8i_layer.h | 36 ++ drivers/gpu/drm/sun4i/sun8i_mixer.c | 414 +++++++++++++++++++++ drivers/gpu/drm/sun4i/sun8i_mixer.h | 137 +++++++ drivers/gpu/drm/sun4i/sunxi_engine.h | 98 +++++ 20 files changed, 1105 insertions(+), 87 deletions(-) create mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.c create mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.h create mode 100644 drivers/gpu/drm/sun4i/sun8i_mixer.c create mode 100644 drivers/gpu/drm/sun4i/sun8i_mixer.h create mode 100644 drivers/gpu/drm/sun4i/sunxi_engine.h Merging imx-drm/imx-drm/next (b8f0951de854 gpu: ipu-v3: prg: remove counter load enable) $ git merge imx-drm/imx-drm/next Merge made by the 'recursive' strategy. drivers/gpu/ipu-v3/ipu-prg.c | 2 -- 1 file changed, 2 deletions(-) Merging etnaviv/etnaviv/next (d79fd1ccf2cd drm/etnaviv: implement cooling support for new GPU cores) $ git merge etnaviv/etnaviv/next Merge made by the 'recursive' strategy. drivers/gpu/drm/etnaviv/common.xml.h | 150 ++++++++++++++++----------- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 ++ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30 ++++-- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 + 7 files changed, 125 insertions(+), 70 deletions(-) Merging kspp/for-next/kspp (62111ab351b8 Merge branch 'for-next/gcc-plugin-infrastructure' into for-next/kspp) $ git merge kspp/for-next/kspp Auto-merging arch/Kconfig Merge made by the 'recursive' strategy. arch/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") $ git merge kconfig/for-next Already up-to-date. Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next) $ git merge regmap/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging sound/for-next (b46fe5d9607c ALSA: pcm: constify function local and read-only table) $ git merge sound/for-next Auto-merging sound/pci/hda/patch_realtek.c Removing sound/atmel/abdac.c Merge made by the 'recursive' strategy. drivers/dma/dw/Kconfig | 7 +- drivers/dma/dw/core.c | 332 +--------------------- drivers/dma/dw/regs.h | 50 +--- include/linux/dma/dw.h | 21 -- include/sound/ak4113.h | 13 +- include/sound/ak4114.h | 13 +- include/sound/ak4117.h | 13 +- include/sound/core.h | 6 +- include/sound/mixer_oss.h | 2 +- include/sound/opl3.h | 4 +- include/sound/pcm.h | 27 +- include/sound/rawmidi.h | 4 +- sound/Kconfig | 4 +- sound/atmel/Kconfig | 13 +- sound/atmel/Makefile | 2 - sound/atmel/abdac.c | 610 ---------------------------------------- sound/atmel/ac97c.c | 447 +++++------------------------ sound/core/oss/pcm_oss.c | 20 +- sound/core/oss/pcm_plugin.c | 5 +- sound/core/oss/pcm_plugin.h | 2 +- sound/core/pcm.c | 33 ++- sound/core/pcm_drm_eld.c | 8 +- sound/core/pcm_lib.c | 8 +- sound/core/pcm_native.c | 9 +- sound/drivers/opl3/opl3_oss.c | 14 - sound/drivers/opl4/opl4_lib.c | 4 +- sound/drivers/opl4/opl4_local.h | 2 +- sound/i2c/other/ak4113.c | 23 +- sound/i2c/other/ak4114.c | 23 +- sound/i2c/other/ak4117.c | 23 +- sound/isa/cmi8328.c | 2 +- sound/isa/sb/emu8000.c | 2 +- sound/isa/sb/sb16.c | 2 +- sound/pci/cs4281.c | 2 +- sound/pci/emu10k1/emufx.c | 127 +++++---- sound/pci/hda/hda_codec.c | 251 ++--------------- sound/pci/hda/hda_generic.c | 46 ++- sound/pci/hda/hda_local.h | 61 ---- sound/pci/hda/patch_realtek.c | 37 ++- sound/pci/vx222/vx222.c | 4 +- sound/pci/vx222/vx222.h | 2 + sound/pci/vx222/vx222_ops.c | 26 +- sound/pcmcia/vx/vxp_mixer.c | 10 +- sound/pcmcia/vx/vxp_ops.c | 28 +- sound/pcmcia/vx/vxpocket.c | 4 +- sound/pcmcia/vx/vxpocket.h | 2 + sound/usb/Kconfig | 2 +- sound/usb/usx2y/us122l.c | 36 +-- sound/usb/usx2y/us122l.h | 2 + 49 files changed, 465 insertions(+), 1923 deletions(-) delete mode 100644 sound/atmel/abdac.c Merging sound-asoc/for-next (f0dccc94df0e Merge remote-tracking branches 'asoc/topic/rt5514', 'asoc/topic/rt5614', 'asoc/topic/sh' and 'asoc/topic/tlv320dac31xx' into asoc-next) $ git merge sound-asoc/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/sound/audio-graph-card.txt | 124 +++++++++ .../devicetree/bindings/sound/renesas,rsnd.txt | 34 ++- drivers/of/base.c | 62 ++++- include/linux/of_graph.h | 21 ++ include/sound/simple_card_utils.h | 10 + include/uapi/sound/snd_sst_tokens.h | 5 +- sound/soc/atmel/atmel-classd.c | 9 + sound/soc/atmel/atmel-pcm.h | 6 +- sound/soc/codecs/ak4613.c | 18 +- sound/soc/codecs/da7213.c | 2 +- sound/soc/codecs/hdmi-codec.c | 2 +- sound/soc/codecs/msm8916-wcd-analog.c | 6 +- sound/soc/codecs/nau8824.c | 52 ++++ sound/soc/codecs/nau8824.h | 12 + sound/soc/codecs/rt286.c | 7 + sound/soc/codecs/rt5514.c | 37 ++- sound/soc/codecs/rt5514.h | 6 + sound/soc/codecs/rt5665.c | 151 +++++----- sound/soc/codecs/tlv320aic31xx.c | 2 +- sound/soc/davinci/davinci-mcasp.c | 12 +- sound/soc/generic/Kconfig | 8 + sound/soc/generic/Makefile | 2 + sound/soc/generic/audio-graph-card.c | 308 +++++++++++++++++++++ sound/soc/generic/simple-card-utils.c | 73 ++++- sound/soc/hisilicon/hi6210-i2s.c | 11 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- sound/soc/intel/atom/sst/sst.c | 2 +- sound/soc/intel/skylake/skl-topology.c | 2 +- sound/soc/intel/skylake/skl.c | 162 ++++++----- sound/soc/intel/skylake/skl.h | 4 +- sound/soc/sh/fsi.c | 13 +- sound/soc/sh/rcar/adg.c | 8 +- sound/soc/sh/rcar/cmd.c | 4 + sound/soc/sh/rcar/core.c | 58 +++- sound/soc/sh/rcar/gen.c | 1 + sound/soc/sh/rcar/rsnd.h | 2 + sound/soc/sh/rcar/src.c | 30 +- sound/soc/sh/rcar/ssi.c | 2 +- sound/soc/sh/rcar/ssiu.c | 3 +- sound/soc/soc-core.c | 10 +- 40 files changed, 1024 insertions(+), 259 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.txt create mode 100644 sound/soc/generic/audio-graph-card.c Merging modules/modules-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge modules/modules-next Already up-to-date. Merging input/next (d899520b0431 Input: elantech - force relative mode on a certain module) $ git merge input/next Auto-merging drivers/input/mouse/elantech.c Merge made by the 'recursive' strategy. drivers/input/input.c | 12 +++--- drivers/input/mouse/elan_i2c.h | 3 +- drivers/input/mouse/elan_i2c_core.c | 40 ++++++++++++++++---- drivers/input/mouse/elan_i2c_i2c.c | 71 ++++++++++++++++++++++++++++++++---- drivers/input/mouse/elan_i2c_smbus.c | 9 ++++- drivers/input/mouse/elantech.c | 11 ++++++ 6 files changed, 123 insertions(+), 23 deletions(-) Merging block/for-next (0789bd7bdb5b Merge branch 'for-linus' into for-next) $ git merge block/for-next Already up-to-date! 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 (41ff9f8cc74f dm bio prison: use rb_entry() rather than container_of()) $ git merge device-mapper/for-next Merge made by the 'recursive' strategy. drivers/md/dm-bio-prison-v1.c | 2 +- drivers/md/dm-bio-prison-v2.c | 2 +- drivers/md/dm-core.h | 3 ++ drivers/md/dm-ioctl.c | 109 +++++++++++++++++++++++++++++++++--------- drivers/md/dm.c | 5 ++ include/uapi/linux/dm-ioctl.h | 6 ++- 6 files changed, 101 insertions(+), 26 deletions(-) Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) $ git merge pcmcia/master Already up-to-date. Merging mmc/next (9a64c8d0bb76 Revert "mmc: dw_mmc: Don't allow Runtime PM for SDIO cards") $ git merge mmc/next Merge made by the 'recursive' strategy. drivers/mmc/core/core.c | 2 ++ drivers/mmc/core/host.c | 2 ++ drivers/mmc/core/mmc.c | 2 ++ drivers/mmc/core/pwrseq.c | 8 ++++++++ drivers/mmc/core/pwrseq.h | 3 +++ drivers/mmc/core/pwrseq_emmc.c | 2 +- drivers/mmc/core/sdio_irq.c | 22 ++++++++++++++++++-- drivers/mmc/core/sdio_ops.h | 2 ++ drivers/mmc/host/Kconfig | 8 ++++---- drivers/mmc/host/atmel-mci.c | 24 ++-------------------- drivers/mmc/host/dw_mmc.c | 42 ++++++++++++++++++++++++++++---------- drivers/mmc/host/sdhci-of-arasan.c | 2 +- drivers/mmc/host/sdricoh_cs.c | 3 --- drivers/mmc/host/vub300.c | 3 ++- include/linux/mmc/host.h | 3 +++ 15 files changed, 83 insertions(+), 45 deletions(-) Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) $ git merge kgdb/kgdb-next Auto-merging kernel/debug/kdb/kdb_io.c Merge made by the 'recursive' strategy. kernel/debug/kdb/kdb_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging md/for-next (582e67954ef1 md-cluster: fix potential lock issue in add_new_disk) $ git merge md/for-next Merge made by the 'recursive' strategy. drivers/md/md-cluster.c | 4 +- drivers/md/md.c | 20 ++++---- drivers/md/md.h | 2 +- drivers/md/raid0.c | 116 +++++++++++++++++++++++++++++++++++++++++------ drivers/md/raid1.c | 21 ++++----- drivers/md/raid10.c | 7 ++- drivers/md/raid5-cache.c | 47 ++++++++++++++----- drivers/md/raid5-log.h | 3 +- drivers/md/raid5.c | 79 +++++++++++++++++++------------- 9 files changed, 212 insertions(+), 87 deletions(-) Merging mfd/for-mfd-next (ab6241ae07c3 input: touchscreen: mxs-lradc: || vs && typos) $ git merge mfd/for-mfd-next Already up-to-date. Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips) $ git merge backlight/for-backlight-next Already up-to-date. Merging battery/for-next (b5910897b2ee power_supply: Add Apple Brick ID power supply type) $ git merge battery/for-next Merge made by the 'recursive' strategy. .../bindings/power/supply/ltc3651-charger.txt | 27 +++ drivers/power/supply/Kconfig | 7 + drivers/power/supply/Makefile | 1 + drivers/power/supply/axp20x_usb_power.c | 2 +- drivers/power/supply/cpcap-charger.c | 83 ++++---- drivers/power/supply/ltc3651-charger.c | 210 +++++++++++++++++++++ drivers/power/supply/power_supply_core.c | 24 ++- drivers/power/supply/power_supply_sysfs.c | 2 +- include/linux/power_supply.h | 15 +- 9 files changed, 327 insertions(+), 44 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt create mode 100644 drivers/power/supply/ltc3651-charger.c Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) $ git merge omap_dss2/for-next Already up-to-date. Merging regulator/for-next (cdf3514a6395 Merge remote-tracking branches 'regulator/topic/max8997' and 'regulator/topic/settle' into regulator-next) $ git merge regulator/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/regulator/regulator.txt | 8 ++++++++ MAINTAINERS | 6 +++--- drivers/regulator/core.c | 6 ++++++ drivers/regulator/max8997-regulator.c | 9 +++------ drivers/regulator/of_regulator.c | 19 +++++++++++++++++++ include/linux/regulator/machine.h | 6 ++++++ 6 files changed, 45 insertions(+), 9 deletions(-) Merging security/next (99c55fb18fc4 security: Grammar s/allocates/allocated/) $ git merge security/next Auto-merging security/security.c Auto-merging security/Kconfig Merge made by the 'recursive' strategy. security/Kconfig | 2 +- security/security.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.) $ git merge integrity/next Already up-to-date. Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing) $ git merge keys/keys-next Auto-merging security/keys/keyctl.c Auto-merging security/keys/gc.c Merge made by the 'recursive' strategy. crypto/asymmetric_keys/verify_pefile.c | 4 +-- include/linux/key.h | 1 - include/linux/mpi.h | 2 +- include/uapi/linux/keyctl.h | 4 +-- lib/mpi/mpicoder.c | 10 ++++--- security/keys/dh.c | 34 +++++++++++----------- security/keys/encrypted-keys/encrypted.c | 31 +++++++++----------- security/keys/gc.c | 4 +-- security/keys/keyctl.c | 4 ++- security/keys/trusted.c | 50 ++++++++++++++------------------ security/keys/user_defined.c | 16 +++++++--- 11 files changed, 79 insertions(+), 81 deletions(-) Merging selinux/next (e5df4f8bad72 selinux: only invoke capabilities and selinux for CAP_MAC_ADMIN checks) $ git merge selinux/next Merge made by the 'recursive' strategy. security/selinux/hooks.c | 28 ++++++++++++++++++---------- security/selinux/ss/policydb.c | 15 +++++---------- security/selinux/ss/sidtab.c | 27 ++++++++++----------------- 3 files changed, 33 insertions(+), 37 deletions(-) Merging tpmdd/next (da4cee99ca6d tpm_tis: Consolidate the platform and acpi probe flow) $ git merge tpmdd/next Merge made by the 'recursive' strategy. drivers/char/tpm/tpm-interface.c | 79 ++++++++++-------- drivers/char/tpm/tpm-sysfs.c | 6 +- drivers/char/tpm/tpm.h | 2 +- drivers/char/tpm/tpm_tis.c | 175 +++++++++++++-------------------------- 4 files changed, 104 insertions(+), 158 deletions(-) Merging watchdog/master (00078cff73db Merge branch 'watchdog-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging) $ git merge watchdog/master Resolved 'drivers/watchdog/iTCO_wdt.c' using previous resolution. Auto-merging drivers/watchdog/iTCO_wdt.c CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a85f4353522a] Merge remote-tracking branch 'watchdog/master' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/watchdog/da9062-wdt.txt | 23 ++ .../devicetree/bindings/watchdog/renesas-wdt.txt | 4 +- .../devicetree/bindings/watchdog/st,stm32-iwdg.txt | 19 ++ Documentation/watchdog/watchdog-parameters.txt | 2 +- drivers/watchdog/Kconfig | 29 ++- drivers/watchdog/Makefile | 2 + drivers/watchdog/bcm_kona_wdt.c | 3 +- drivers/watchdog/cadence_wdt.c | 2 +- drivers/watchdog/f71808e_wdt.c | 27 ++- drivers/watchdog/gpio_wdt.c | 73 ++---- drivers/watchdog/iTCO_wdt.c | 22 +- drivers/watchdog/intel-mid_wdt.c | 17 +- drivers/watchdog/orion_wdt.c | 2 +- drivers/watchdog/pcwd_usb.c | 3 + drivers/watchdog/rza_wdt.c | 199 ++++++++++++++++ drivers/watchdog/s3c2410_wdt.c | 58 +++-- drivers/watchdog/sama5d4_wdt.c | 96 +++++--- drivers/watchdog/stm32_iwdg.c | 253 +++++++++++++++++++++ drivers/watchdog/wdt_pci.c | 2 +- drivers/watchdog/zx2967_wdt.c | 4 +- 20 files changed, 686 insertions(+), 154 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/da9062-wdt.txt create mode 100644 Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.txt create mode 100644 drivers/watchdog/rza_wdt.c create mode 100644 drivers/watchdog/stm32_iwdg.c Merging iommu/next (63cbe752d43e Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/core' and 'x86/vt-d' into next) $ git merge iommu/next Merge made by the 'recursive' strategy. drivers/iommu/Kconfig | 4 +- drivers/iommu/dma-iommu.c | 15 +- drivers/iommu/intel-iommu.c | 5 +- drivers/iommu/intel-svm.c | 30 ++++ drivers/iommu/iova.c | 21 ++- drivers/iommu/ipmmu-vmsa.c | 353 ++++++++++++++++++++++++++++++++++++------- drivers/iommu/mtk_iommu_v1.c | 1 + include/linux/intel-svm.h | 20 +++ 8 files changed, 371 insertions(+), 78 deletions(-) Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) $ git merge dwmw2-iommu/master Already up-to-date. Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote()) $ git merge vfio/next Already up-to-date. Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver()) $ git merge trivial/for-next Already up-to-date. Merging audit/next (48d0e023af97 audit: fix the RCU locking for the auditd_connection structure) $ git merge audit/next Already up-to-date. Merging devicetree/for-next (49e67dd17649 of: fdt: add missing allocation-failure check) $ git merge devicetree/for-next Auto-merging drivers/of/fdt.c Merge made by the 'recursive' strategy. drivers/of/fdt.c | 3 +++ drivers/of/of_reserved_mem.c | 2 +- include/linux/of_irq.h | 2 +- scripts/dtc/checks.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick) $ git merge mailbox/mailbox-for-next Already up-to-date. Merging spi/for-next (a645312f10e8 Merge remote-tracking branches 'spi/topic/imx' and 'spi/topic/spidev' into spi-next) $ git merge spi/for-next Merge made by the 'recursive' strategy. drivers/spi/Kconfig | 1 + drivers/spi/spi-bcm63xx-hsspi.c | 1 + drivers/spi/spi-imx.c | 157 ++++++++++++++++++++++++++++++++++++++-- drivers/spi/spi.c | 6 +- drivers/spi/spidev.c | 11 +-- 5 files changed, 155 insertions(+), 21 deletions(-) Merging tip/auto-latest (217dc52c43da Merge branch 'smp/hotplug') $ git merge tip/auto-latest Merge made by the 'recursive' strategy. arch/arm/kernel/hw_breakpoint.c | 5 +- arch/arm64/include/asm/cpufeature.h | 3 +- arch/arm64/kernel/cpu_errata.c | 9 +- arch/arm64/kernel/cpufeature.c | 5 +- arch/mips/kernel/jump_label.c | 2 - arch/powerpc/kvm/book3s_hv.c | 8 +- arch/powerpc/platforms/powernv/subcore.c | 3 +- arch/s390/kernel/time.c | 2 +- arch/sparc/kernel/jump_label.c | 2 - arch/tile/kernel/jump_label.c | 2 - arch/x86/events/core.c | 13 +- arch/x86/events/intel/core.c | 4 +- arch/x86/events/intel/cqm.c | 12 +- arch/x86/events/intel/ds.c | 7 +- arch/x86/include/asm/timer.h | 8 +- arch/x86/kernel/cpu/mtrr/main.c | 2 - arch/x86/kernel/jump_label.c | 2 - arch/x86/kernel/tsc.c | 208 ++++--------- arch/x86/platform/uv/tlb_uv.c | 14 +- drivers/acpi/processor_driver.c | 4 +- drivers/cpufreq/cpufreq.c | 9 +- drivers/cpuidle/cpuidle.c | 1 + drivers/hwtracing/coresight/coresight-etm3x.c | 12 +- drivers/hwtracing/coresight/coresight-etm4x.c | 12 +- drivers/irqchip/irq-mbigen.c | 17 +- drivers/pci/pci-driver.c | 47 +-- include/linux/clocksource.h | 1 + include/linux/cpu.h | 2 + include/linux/cpuhotplug.h | 38 +++ include/linux/cpumask.h | 17 + include/linux/jump_label.h | 27 +- include/linux/padata.h | 3 - include/linux/pci.h | 1 + include/linux/sched/clock.h | 11 +- include/linux/stop_machine.h | 26 +- kernel/cpu.c | 173 ++++------- kernel/events/core.c | 56 ++-- kernel/jump_label.c | 57 +++- kernel/kprobes.c | 25 +- kernel/padata.c | 43 +-- kernel/sched/clock.c | 119 +++++-- kernel/sched/core.c | 31 +- kernel/sched/fair.c | 150 ++++----- kernel/sched/features.h | 1 - kernel/sched/idle.c | 2 +- kernel/sched/sched.h | 21 +- kernel/sched/topology.c | 430 ++++++++++++++++++++------ kernel/stop_machine.c | 7 +- kernel/time/clocksource.c | 3 + kernel/time/tick-sched.c | 2 +- kernel/trace/trace_events.c | 8 + kernel/tracepoint.c | 4 +- lib/cpumask.c | 32 ++ 53 files changed, 1065 insertions(+), 638 deletions(-) Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12) $ 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 (f8d5549df25e EDAC, ghes: Do not enable it by default) $ git merge edac-amd/for-next Already up-to-date. Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) $ git merge irqchip/irqchip/for-next Already up-to-date. Merging ftrace/for-next (4dbbe2d8e95c tracing: Use cpumask_available() to check if cpumask variable may be used) $ git merge ftrace/for-next Already up-to-date. Merging rcu/rcu/next (2d307e6015ad rcu: Remove RCU CPU stall warnings from Tiny RCU) $ git merge rcu/rcu/next Auto-merging tools/testing/selftests/rcutorture/configs/rcuperf/TINY Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T Auto-merging scripts/checkpatch.pl Auto-merging kernel/sched/core.c Removing kernel/rcu/tree_trace.c Removing kernel/rcu/srcu.c Removing include/linux/srcuclassic.h Removing Documentation/RCU/trace.txt Merge made by the 'recursive' strategy. Documentation/RCU/00-INDEX | 2 - .../RCU/Design/Requirements/Requirements.html | 34 +- Documentation/RCU/checklist.txt | 8 +- Documentation/RCU/trace.txt | 535 ----------------- Documentation/admin-guide/kernel-parameters.txt | 41 +- Documentation/core-api/atomic_ops.rst | 5 + Documentation/dev-tools/sparse.rst | 6 - Documentation/kernel-per-CPU-kthreads.txt | 31 +- Documentation/memory-barriers.txt | 2 +- Documentation/timers/NO_HZ.txt | 29 +- include/linux/compiler.h | 4 - include/linux/rcu_node_tree.h | 4 + include/linux/rcu_segcblist.h | 4 + include/linux/rcupdate.h | 318 +--------- include/linux/rcutiny.h | 167 +----- include/linux/rcutree.h | 21 +- include/linux/sched.h | 3 +- include/linux/spinlock.h | 20 + include/linux/srcu.h | 25 +- include/linux/srcuclassic.h | 115 ---- include/linux/srcutiny.h | 46 +- include/linux/srcutree.h | 13 +- include/trace/events/rcu.h | 1 + init/Kconfig | 349 +---------- kernel/locking/lockdep.c | 176 +++--- kernel/rcu/Kconfig | 242 ++++++++ kernel/rcu/Kconfig.debug | 82 +++ kernel/rcu/Makefile | 2 - kernel/rcu/rcu.h | 277 +++++++++ kernel/rcu/rcuperf.c | 129 +++- kernel/rcu/rcutorture.c | 21 +- kernel/rcu/srcu.c | 662 --------------------- kernel/rcu/srcutiny.c | 85 +-- kernel/rcu/srcutree.c | 187 ++++-- kernel/rcu/tiny.c | 54 +- kernel/rcu/tiny_plugin.h | 123 ---- kernel/rcu/tree.c | 216 ++++--- kernel/rcu/tree.h | 111 +--- kernel/rcu/tree_exp.h | 2 +- kernel/rcu/tree_plugin.h | 653 +++++--------------- kernel/rcu/tree_trace.c | 494 --------------- kernel/rcu/update.c | 77 ++- kernel/sched/core.c | 9 +- kernel/time/Kconfig | 50 -- lib/Kconfig.debug | 184 +----- lib/Makefile | 3 - scripts/checkpatch.pl | 17 - .../selftests/rcutorture/bin/config_override.sh | 61 ++ .../selftests/rcutorture/bin/configcheck.sh | 2 +- .../testing/selftests/rcutorture/bin/kvm-build.sh | 11 +- .../selftests/rcutorture/bin/kvm-test-1-run.sh | 60 +- tools/testing/selftests/rcutorture/bin/kvm.sh | 38 +- .../selftests/rcutorture/configs/rcu/CFLIST | 2 + .../selftests/rcutorture/configs/rcu/SRCU-C.boot | 1 + .../selftests/rcutorture/configs/rcu/SRCU-N | 2 +- .../selftests/rcutorture/configs/rcu/SRCU-P | 6 +- .../selftests/rcutorture/configs/rcu/SRCU-t | 10 + .../selftests/rcutorture/configs/rcu/SRCU-t.boot | 1 + .../selftests/rcutorture/configs/rcu/SRCU-u | 9 + .../selftests/rcutorture/configs/rcu/SRCU-u.boot | 1 + .../selftests/rcutorture/configs/rcu/TINY02 | 5 +- .../selftests/rcutorture/configs/rcu/TREE01 | 5 +- .../selftests/rcutorture/configs/rcu/TREE01.boot | 4 + .../selftests/rcutorture/configs/rcu/TREE02 | 5 +- .../selftests/rcutorture/configs/rcu/TREE03 | 4 - .../selftests/rcutorture/configs/rcu/TREE03.boot | 4 + .../selftests/rcutorture/configs/rcu/TREE04 | 4 - .../selftests/rcutorture/configs/rcu/TREE05 | 4 - .../selftests/rcutorture/configs/rcu/TREE05.boot | 3 + .../selftests/rcutorture/configs/rcu/TREE06 | 4 +- .../selftests/rcutorture/configs/rcu/TREE06.boot | 3 + .../selftests/rcutorture/configs/rcu/TREE07 | 6 - .../selftests/rcutorture/configs/rcu/TREE08 | 1 - .../selftests/rcutorture/configs/rcu/TREE08-T | 21 - .../selftests/rcutorture/configs/rcu/TREE08.boot | 1 + .../configs/{rcu/TREE02-T => rcuperf/TINY} | 19 +- .../selftests/rcutorture/configs/rcuperf/TREE | 1 - .../selftests/rcutorture/configs/rcuperf/TREE54 | 1 - .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 1 - .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 34 +- .../rcutorture/formal/srcu-cbmc/modify_srcu.awk | 2 +- 81 files changed, 1686 insertions(+), 4289 deletions(-) delete mode 100644 Documentation/RCU/trace.txt delete mode 100644 include/linux/srcuclassic.h create mode 100644 kernel/rcu/Kconfig create mode 100644 kernel/rcu/Kconfig.debug delete mode 100644 kernel/rcu/srcu.c delete mode 100644 kernel/rcu/tree_trace.c create mode 100755 tools/testing/selftests/rcutorture/bin/config_override.sh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-t create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-t.boot create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-u create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-u.boot delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T rename tools/testing/selftests/rcutorture/configs/{rcu/TREE02-T => rcuperf/TINY} (50%) Merging kvm/linux-next (36c344f3f1ff Merge tag 'kvm-arm-for-v4.12-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) $ git merge kvm/linux-next Already up-to-date. Merging kvm-arm/next (a2b19e6e2d4b KVM: arm/arm64: vgic-its: Cleanup after failed ITT restore) $ 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 (76d837a4c0f9 KVM: PPC: Book3S PR: Don't include SPAPR TCE code on non-pseries platforms) $ git merge kvm-ppc/kvm-ppc-next Merge made by the 'recursive' strategy. arch/powerpc/kvm/Kconfig | 2 +- arch/powerpc/kvm/Makefile | 4 +-- arch/powerpc/kvm/book3s_64_vio_hv.c | 13 +++++++ arch/powerpc/kvm/book3s_hv_builtin.c | 9 ++++- arch/powerpc/kvm/book3s_pr_papr.c | 70 +++++++++++++++++++++++++++--------- arch/powerpc/kvm/powerpc.c | 4 ++- 6 files changed, 80 insertions(+), 22 deletions(-) Merging kvms390/next (e000b8e0968d s390: kvm: Cpu model support for msa6, msa7 and msa8) $ git merge kvms390/next Already up-to-date. Merging xen-tip/linux-next (69861e0a52f8 xen: adjust early dom0 p2m handling to xen hypervisor behavior) $ git merge xen-tip/linux-next Already up-to-date. Merging percpu/for-next (1328710b8ec3 mark most percpu globals as __ro_after_init) $ git merge percpu/for-next Merge made by the 'recursive' strategy. mm/percpu.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next) $ git merge workqueues/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging drivers-x86/for-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge drivers-x86/for-next Already up-to-date. Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") $ git merge chrome-platform/for-next Merge made by the 'recursive' strategy. Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit()) $ git merge hsi/for-next Already up-to-date. Merging leds/for-next (7678da8ee6de leds: Delete obsolete Versatile driver) $ git merge leds/for-next Removing drivers/leds/leds-versatile.c Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/leds/pca963x.txt | 1 + drivers/leds/Kconfig | 8 -- drivers/leds/Makefile | 1 - drivers/leds/leds-pca963x.c | 17 +++- drivers/leds/leds-versatile.c | 110 --------------------- include/linux/platform_data/leds-pca963x.h | 6 ++ 6 files changed, 22 insertions(+), 121 deletions(-) delete mode 100644 drivers/leds/leds-versatile.c Merging ipmi/for-next (bf10ff69dd6e ipmi_ssif: remove redundant null check on array client->adapter->name) $ git merge ipmi/for-next Merge made by the 'recursive' strategy. drivers/char/ipmi/ipmi_ssif.c | 5 +++-- drivers/char/ipmi/ipmi_watchdog.c | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) Merging driver-core/driver-core-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge driver-core/driver-core-next Already up-to-date. Merging usb/usb-next (ca2ef0d5cd05 USB: iowarrior: use memdup_user) $ git merge usb/usb-next Auto-merging drivers/usb/misc/iowarrior.c Auto-merging drivers/usb/core/hcd.c Merge made by the 'recursive' strategy. drivers/usb/class/cdc-wdm.c | 17 ++++------------- drivers/usb/core/hcd.c | 12 ++++++++++++ drivers/usb/gadget/udc/core.c | 9 +++++++++ drivers/usb/host/ehci-sched.c | 2 +- drivers/usb/misc/iowarrior.c | 11 +++-------- drivers/usb/typec/typec.c | 11 ++++++----- include/linux/usb/typec.h | 6 +++--- 7 files changed, 38 insertions(+), 30 deletions(-) Merging usb-gadget/next (2868b2513aa7 Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) $ git merge usb-gadget/next Already up-to-date. Merging usb-serial/usb-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge usb-serial/usb-next Already up-to-date. Merging usb-chipidea-next/ci-for-usb-next (c4a0bbbdb7f6 usb: chipidea: properly handle host or gadget initialization failure) $ git merge usb-chipidea-next/ci-for-usb-next Merge made by the 'recursive' strategy. drivers/usb/chipidea/core.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) Merging phy-next/next (2ea659a9ef48 Linux 4.12-rc1) $ git merge phy-next/next Already up-to-date. Merging tty/tty-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge tty/tty-next Already up-to-date. Merging char-misc/char-misc-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge char-misc/char-misc-next Already up-to-date. Merging extcon/extcon-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge extcon/extcon-next Already up-to-date. Merging staging/staging-next (1c5973675cee staging: speakup: flush tty buffers and ensure hardware flow control) $ git merge staging/staging-next Removing drivers/staging/most/aim-network/networking.h Auto-merging drivers/staging/ccree/ssi_request_mgr.c Removing drivers/staging/ccree/hw_queue_defs_plat.h Removing drivers/staging/ccree/dx_env.h Removing drivers/staging/ccree/cc_pal_types_plat.h Removing drivers/staging/ccree/cc_pal_types.h Removing drivers/staging/ccree/cc_pal_log_plat.h Removing drivers/staging/ccree/cc_pal_log.h Merge made by the 'recursive' strategy. drivers/staging/android/ion/ion-ioctl.c | 4 +- drivers/staging/android/ion/ion.c | 8 +- drivers/staging/android/ion/ion_carveout_heap.c | 2 +- drivers/staging/ccree/cc_bitops.h | 33 +- drivers/staging/ccree/cc_crypto_ctx.h | 89 ++--- drivers/staging/ccree/cc_hal.h | 15 +- drivers/staging/ccree/cc_hw_queue_defs.h | 322 +++++++-------- drivers/staging/ccree/cc_lli_defs.h | 46 ++- drivers/staging/ccree/cc_pal_log.h | 188 --------- drivers/staging/ccree/cc_pal_log_plat.h | 33 -- drivers/staging/ccree/cc_pal_types.h | 97 ----- drivers/staging/ccree/cc_pal_types_plat.h | 29 -- drivers/staging/ccree/cc_regs.h | 25 +- drivers/staging/ccree/dx_crys_kernel.h | 46 +-- drivers/staging/ccree/dx_env.h | 224 ----------- drivers/staging/ccree/dx_host.h | 38 +- drivers/staging/ccree/dx_reg_base_host.h | 15 +- drivers/staging/ccree/dx_reg_common.h | 8 +- drivers/staging/ccree/hash_defs.h | 24 +- drivers/staging/ccree/hw_queue_defs_plat.h | 43 --- drivers/staging/ccree/ssi_aead.c | 363 +++++++++-------- drivers/staging/ccree/ssi_aead.h | 44 +-- drivers/staging/ccree/ssi_buffer_mgr.c | 336 ++++++++-------- drivers/staging/ccree/ssi_buffer_mgr.h | 18 +- drivers/staging/ccree/ssi_cipher.c | 141 +++---- drivers/staging/ccree/ssi_cipher.h | 18 +- drivers/staging/ccree/ssi_config.h | 8 +- drivers/staging/ccree/ssi_driver.c | 40 +- drivers/staging/ccree/ssi_driver.h | 27 +- drivers/staging/ccree/ssi_fips.c | 18 +- drivers/staging/ccree/ssi_fips.h | 18 +- drivers/staging/ccree/ssi_fips_data.h | 36 +- drivers/staging/ccree/ssi_fips_ext.c | 32 +- drivers/staging/ccree/ssi_fips_ll.c | 224 +++++------ drivers/staging/ccree/ssi_fips_local.c | 32 +- drivers/staging/ccree/ssi_fips_local.h | 8 +- drivers/staging/ccree/ssi_hash.c | 430 ++++++++++----------- drivers/staging/ccree/ssi_hash.h | 54 +-- drivers/staging/ccree/ssi_ivgen.c | 58 +-- drivers/staging/ccree/ssi_ivgen.h | 40 +- drivers/staging/ccree/ssi_pm.c | 8 +- drivers/staging/ccree/ssi_pm.h | 6 +- drivers/staging/ccree/ssi_pm_ext.c | 16 +- drivers/staging/ccree/ssi_pm_ext.h | 6 +- drivers/staging/ccree/ssi_request_mgr.c | 144 +++---- drivers/staging/ccree/ssi_request_mgr.h | 18 +- drivers/staging/ccree/ssi_sram_mgr.c | 42 +- drivers/staging/ccree/ssi_sram_mgr.h | 46 +-- drivers/staging/ccree/ssi_sysfs.c | 52 +-- drivers/staging/ccree/ssi_sysfs.h | 6 +- drivers/staging/dgnc/dgnc_driver.h | 13 - drivers/staging/dgnc/dgnc_tty.c | 150 +++---- drivers/staging/emxx_udc/emxx_udc.c | 398 +++++++++---------- drivers/staging/emxx_udc/emxx_udc.h | 226 +++++------ drivers/staging/fbtft/fb_agm1264k-fl.c | 4 +- drivers/staging/fbtft/fbtft-io.c | 2 +- drivers/staging/fsl-mc/bus/dprc-driver.c | 4 +- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 8 +- drivers/staging/greybus/Kconfig | 10 + drivers/staging/greybus/Makefile | 2 +- drivers/staging/greybus/arche-apb-ctrl.c | 11 +- drivers/staging/greybus/arche-platform.c | 150 +------ drivers/staging/greybus/arche_platform.h | 8 - drivers/staging/greybus/light.c | 4 +- drivers/staging/greybus/power_supply.c | 2 +- drivers/staging/ks7010/eap_packet.h | 4 +- drivers/staging/ks7010/ks7010_sdio.c | 10 +- drivers/staging/ks7010/ks_hostif.c | 55 ++- drivers/staging/ks7010/ks_hostif.h | 192 ++++----- drivers/staging/ks7010/ks_wlan.h | 8 +- drivers/staging/ks7010/ks_wlan_net.c | 20 +- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 11 +- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 6 +- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 8 +- drivers/staging/lustre/lustre/obdclass/lu_object.c | 3 +- .../staging/lustre/lustre/obdecho/echo_client.c | 3 +- drivers/staging/lustre/lustre/osc/osc_cache.c | 3 +- drivers/staging/lustre/lustre/ptlrpc/import.c | 15 +- drivers/staging/lustre/lustre/ptlrpc/layout.c | 2 +- drivers/staging/most/aim-network/networking.c | 172 +++------ drivers/staging/most/aim-network/networking.h | 21 - drivers/staging/most/hdm-dim2/Kconfig | 1 - drivers/staging/most/hdm-dim2/dim2_hal.c | 17 +- drivers/staging/most/hdm-dim2/dim2_hdm.c | 18 +- drivers/staging/most/hdm-dim2/dim2_reg.h | 1 + drivers/staging/most/hdm-i2c/hdm_i2c.c | 7 - drivers/staging/most/hdm-usb/Kconfig | 2 +- drivers/staging/most/hdm-usb/hdm_usb.c | 15 +- drivers/staging/most/mostcore/mostcore.h | 7 +- drivers/staging/octeon-usb/octeon-hcd.c | 6 +- drivers/staging/octeon/ethernet-util.h | 2 +- drivers/staging/rtl8188eu/core/rtw_ap.c | 10 +- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 44 --- drivers/staging/rtl8188eu/core/rtw_mlme.c | 4 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 83 ++-- drivers/staging/rtl8188eu/hal/phy.c | 4 +- drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +- drivers/staging/rtl8188eu/include/ieee80211.h | 107 ----- drivers/staging/rtl8188eu/os_dep/mon.c | 34 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 16 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 +- drivers/staging/rtl8192e/rtllib_rx.c | 3 - drivers/staging/rtl8192e/rtllib_softmac.c | 3 +- drivers/staging/rtl8192e/rtllib_wx.c | 2 +- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 27 +- .../staging/rtl8192u/ieee80211/ieee80211_module.c | 3 +- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 171 +++----- drivers/staging/rtl8192u/r8192U.h | 2 +- drivers/staging/rtl8192u/r8192U_dm.c | 77 ++-- drivers/staging/rtl8712/ieee80211.c | 13 +- drivers/staging/rtl8712/os_intfs.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 32 +- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 8 +- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 4 +- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 +- drivers/staging/rtl8723bs/hal/odm.h | 5 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 2 +- drivers/staging/rtl8723bs/hal/odm_debug.h | 81 ++-- drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 18 +- drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 12 +- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 20 +- drivers/staging/rtl8723bs/include/rtl8192c_rf.h | 23 +- drivers/staging/rtl8723bs/include/rtl8723b_spec.h | 49 ++- drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 24 +- drivers/staging/speakup/Makefile | 1 + drivers/staging/speakup/serialio.c | 17 +- drivers/staging/speakup/serialio.h | 4 +- drivers/staging/speakup/speakup_acntsa.c | 8 +- drivers/staging/speakup/speakup_apollo.c | 10 +- drivers/staging/speakup/speakup_audptr.c | 14 +- drivers/staging/speakup/speakup_decext.c | 25 +- drivers/staging/speakup/speakup_decpc.c | 2 +- drivers/staging/speakup/speakup_dectlk.c | 14 +- drivers/staging/speakup/speakup_dtlk.c | 2 +- drivers/staging/speakup/speakup_dtlk.h | 10 +- drivers/staging/speakup/speakup_dummy.c | 8 +- drivers/staging/speakup/speakup_ltlk.c | 13 +- drivers/staging/speakup/speakup_soft.c | 4 +- drivers/staging/speakup/speakup_spkout.c | 12 +- drivers/staging/speakup/speakup_txprt.c | 8 +- drivers/staging/speakup/spk_priv.h | 8 +- drivers/staging/speakup/spk_ttyio.c | 279 +++++++++++++ drivers/staging/speakup/spk_types.h | 5 +- drivers/staging/speakup/synth.c | 11 +- drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- drivers/staging/vme/devices/vme_pio2.h | 80 ++-- drivers/staging/vt6655/card.h | 2 +- drivers/staging/vt6656/card.c | 29 +- drivers/staging/vt6656/main_usb.c | 17 +- drivers/staging/vt6656/rxtx.c | 70 ++-- drivers/staging/wilc1000/host_interface.c | 20 +- drivers/staging/wilc1000/host_interface.h | 10 +- drivers/staging/wilc1000/wilc_debugfs.c | 28 +- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 18 +- drivers/staging/wlan-ng/prism2fw.c | 24 +- drivers/staging/wlan-ng/prism2mgmt.c | 2 +- drivers/staging/wlan-ng/prism2sta.c | 100 ++--- drivers/tty/tty_io.c | 10 +- drivers/tty/tty_ldisc.c | 2 + include/linux/tty.h | 2 + include/uapi/linux/tty.h | 1 + 161 files changed, 2993 insertions(+), 3949 deletions(-) delete mode 100644 drivers/staging/ccree/cc_pal_log.h delete mode 100644 drivers/staging/ccree/cc_pal_log_plat.h delete mode 100644 drivers/staging/ccree/cc_pal_types.h delete mode 100644 drivers/staging/ccree/cc_pal_types_plat.h delete mode 100644 drivers/staging/ccree/dx_env.h delete mode 100644 drivers/staging/ccree/hw_queue_defs_plat.h delete mode 100644 drivers/staging/most/aim-network/networking.h create mode 100644 drivers/staging/speakup/spk_ttyio.c Merging mux/for-next (a351e9b9fc24 Linux 4.11) $ git merge mux/for-next Already up-to-date. Merging slave-dma/next (ca5b1afa6846 Merge branch 'topic/bcm' into next) $ git merge slave-dma/next Merge made by the 'recursive' strategy. .../devicetree/bindings/dma/brcm,iproc-sba.txt | 29 + crypto/async_tx/async_pq.c | 5 +- drivers/dma/Kconfig | 14 + drivers/dma/Makefile | 1 + drivers/dma/bcm-sba-raid.c | 1785 ++++++++++++++++++++ drivers/dma/mv_xor_v2.c | 147 +- drivers/dma/sh/usb-dmac.c | 2 +- include/linux/raid/pq.h | 1 + lib/raid6/mktables.c | 20 + 9 files changed, 1944 insertions(+), 60 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/brcm,iproc-sba.txt create mode 100644 drivers/dma/bcm-sba-raid.c Merging cgroup/for-next (0948307b3a5d Merge branch 'for-4.12' into for-next) $ git merge cgroup/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging scsi/for-next (b77b36cb7272 scsi: pmcraid: remove redundant check to see if request_size is less than zero) $ git merge scsi/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 4 ---- drivers/scsi/cxlflash/Kconfig | 1 + drivers/scsi/libfc/fc_fcp.c | 15 +++++++++------ drivers/scsi/lpfc/lpfc_crtn.h | 1 + drivers/scsi/lpfc/lpfc_ct.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 9 ++++++++- drivers/scsi/lpfc/lpfc_sli.c | 19 ++++++++++++------- drivers/scsi/pmcraid.c | 3 --- drivers/scsi/qedf/qedf.h | 2 +- drivers/scsi/qedf/qedf_els.c | 2 +- drivers/scsi/qedf/qedf_main.c | 2 +- drivers/scsi/scsi.c | 2 ++ drivers/scsi/scsi_lib.c | 1 + 13 files changed, 38 insertions(+), 25 deletions(-) Merging scsi-mkp/for-next (eeeb51d834d7 scsi: lpfc: fix build issue if NVME_FC_TARGET is not defined) $ git merge scsi-mkp/for-next Merge made by the 'recursive' strategy. drivers/scsi/libfc/fc_rport.c | 2 +- drivers/scsi/lpfc/lpfc.h | 23 ++- drivers/scsi/lpfc/lpfc_attr.c | 47 +++-- drivers/scsi/lpfc/lpfc_crtn.h | 11 +- drivers/scsi/lpfc/lpfc_ct.c | 1 + drivers/scsi/lpfc/lpfc_debugfs.c | 69 ++++--- drivers/scsi/lpfc/lpfc_disc.h | 1 + drivers/scsi/lpfc/lpfc_els.c | 26 ++- drivers/scsi/lpfc/lpfc_hbadisc.c | 9 +- drivers/scsi/lpfc/lpfc_hw4.h | 16 +- drivers/scsi/lpfc/lpfc_init.c | 137 ++++-------- drivers/scsi/lpfc/lpfc_mem.c | 100 +++------ drivers/scsi/lpfc/lpfc_nportdisc.c | 6 + drivers/scsi/lpfc/lpfc_nvmet.c | 414 ++++++++++++++++++++++++++++++------- drivers/scsi/lpfc/lpfc_nvmet.h | 14 +- drivers/scsi/lpfc/lpfc_sli.c | 357 +++++++++++++++++++++++++------- drivers/scsi/lpfc/lpfc_sli4.h | 19 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/sd.c | 63 ++++-- drivers/scsi/sg.c | 5 +- 20 files changed, 890 insertions(+), 432 deletions(-) Merging target-updates/for-next (984a9d4c40be Revert "target: Fix VERIFY and WRITE VERIFY command parsing") $ git merge target-updates/for-next Already up-to-date. Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) $ git merge target-merge/for-next-merge Already up-to-date. Merging target-bva/for-next (a351e9b9fc24 Linux 4.11) $ git merge target-bva/for-next Already up-to-date. Merging libata/for-next (f79e7febd5cd Merge branch 'for-4.13' into for-next) $ git merge libata/for-next Merge made by the 'recursive' strategy. drivers/ata/acard-ahci.c | 2 +- drivers/ata/ahci.c | 40 +++++++++++++++++++++++++++++++++++- drivers/ata/ahci.h | 2 +- drivers/ata/ata_piix.c | 2 +- drivers/ata/libahci.c | 2 +- drivers/ata/libahci_platform.c | 5 +++-- drivers/ata/libata-core.c | 2 +- drivers/ata/libata-eh.c | 2 +- drivers/ata/libata-scsi.c | 9 +++++---- drivers/ata/libata-sff.c | 46 +++++++++--------------------------------- drivers/ata/libata.h | 2 +- drivers/ata/pata_pdc2027x.c | 2 +- drivers/ata/pdc_adma.c | 2 +- drivers/ata/sata_nv.c | 2 +- drivers/ata/sata_promise.c | 2 +- drivers/ata/sata_promise.h | 2 +- drivers/ata/sata_qstor.c | 2 +- drivers/ata/sata_rcar.c | 15 +++++++++++--- drivers/ata/sata_sil.c | 2 +- drivers/ata/sata_sis.c | 2 +- drivers/ata/sata_svw.c | 2 +- drivers/ata/sata_sx4.c | 2 +- drivers/ata/sata_uli.c | 2 +- drivers/ata/sata_via.c | 2 +- drivers/ata/sata_vsc.c | 2 +- include/linux/ata.h | 2 +- include/linux/libata.h | 2 +- 27 files changed, 90 insertions(+), 69 deletions(-) Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) $ git merge binfmt_misc/for-next Already up-to-date. Merging vhost/linux-next (c8b0d7290657 s390/virtio: change maintainership) $ git merge vhost/linux-next Already up-to-date. Merging rpmsg/for-next (1224d580d353 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) $ git merge rpmsg/for-next Merge made by the 'recursive' strategy. drivers/hwspinlock/Kconfig | 26 ++--- drivers/hwspinlock/Makefile | 1 + drivers/hwspinlock/sprd_hwspinlock.c | 183 +++++++++++++++++++++++++++++++++++ drivers/rpmsg/qcom_smd.c | 11 +++ drivers/rpmsg/virtio_rpmsg_bus.c | 9 ++ 5 files changed, 219 insertions(+), 11 deletions(-) create mode 100644 drivers/hwspinlock/sprd_hwspinlock.c Merging gpio/for-next (b86c86aa9805 gpio: f7188x: Add a missing break) $ git merge gpio/for-next Already up-to-date. Merging pinctrl/for-next (1aa2faf52f76 pinctrl: mediatek: Add missing pinctrl bindings for mt7623) $ git merge pinctrl/for-next Already up-to-date. Merging pinctrl-samsung/for-next (7ddaa43ee9fd pinctrl: samsung: Remove unneeded (void *) casts in of_match_table) $ git merge pinctrl-samsung/for-next Merge made by the 'recursive' strategy. drivers/pinctrl/samsung/pinctrl-samsung.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1) $ git merge dma-mapping/dma-mapping-next Already up-to-date. Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/drivers' into for-next) $ git merge pwm/for-next Already up-to-date. Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) $ git merge dma-buf/for-next Resolved 'drivers/dma-buf/Kconfig' using previous resolution. Auto-merging drivers/dma-buf/Kconfig CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7dece189c339] Merge remote-tracking branch 'dma-buf/for-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) Merging userns/for-next (3fd372262166 pid_ns: Fix race between setns'ed fork() and zap_pid_ns_processes()) $ git merge userns/for-next Merge made by the 'recursive' strategy. kernel/fork.c | 8 ++++++-- kernel/pid_namespace.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) $ git merge ktest/for-next Already up-to-date. Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block) $ git merge random/dev Already up-to-date. Merging aio/master (b562e44f507e Linux 4.5) $ git merge aio/master Already up-to-date. Merging kselftest/next (2ea659a9ef48 Linux 4.12-rc1) $ git merge kselftest/next Already up-to-date. Merging y2038/y2038 (69973b830859 Linux 4.9) $ git merge y2038/y2038 Already up-to-date. Merging luto-misc/next (2dcd0af568b0 Linux 4.6) $ git merge luto-misc/next Already up-to-date. Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge borntraeger/linux-next Already up-to-date. Merging livepatching/for-next (608822c0f7af Merge branch 'for-4.12/upstream' into for-next) $ git merge livepatching/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging coresight/next (196a00385bb8 coresight: etb10: Fix a typo in a comment line) $ git merge coresight/next Merge made by the 'recursive' strategy. drivers/hwtracing/coresight/coresight-etb10.c | 7 ++--- drivers/hwtracing/coresight/coresight-etm-perf.c | 3 +-- drivers/hwtracing/coresight/coresight-tmc-etf.c | 25 +++++++++++------ drivers/hwtracing/coresight/coresight.c | 34 ++++++++++++++++++------ drivers/hwtracing/coresight/of_coresight.c | 7 ++--- include/linux/coresight.h | 7 ++--- 6 files changed, 54 insertions(+), 29 deletions(-) Merging rtc/rtc-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge rtc/rtc-next Already up-to-date. Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) $ git merge hwspinlock/for-next Already up-to-date. Merging nvdimm/libnvdimm-for-next (f5705aa8cfed dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case) $ git merge nvdimm/libnvdimm-for-next Merge made by the 'recursive' strategy. drivers/dax/super.c | 2 ++ fs/ext2/inode.c | 4 ++-- fs/ext4/inode.c | 4 ++-- fs/xfs/xfs_iomap.c | 4 ++-- include/linux/dax.h | 34 +++++++++++++++++++++++++++------- 5 files changed, 35 insertions(+), 13 deletions(-) Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) $ git merge dax-misc/dax-misc 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 akpm-current/current (7428afcf3bab ipc/sem: avoid indexing past end of sem_array) $ git merge --no-ff akpm-current/current Auto-merging kernel/fork.c Auto-merging include/linux/sched.h Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-block-zram | 10 + Documentation/blockdev/zram.txt | 3 + Documentation/fault-injection/fault-injection.txt | 79 +++ Documentation/filesystems/proc.txt | 6 +- Documentation/vm/ksm.txt | 63 ++ arch/arm/include/asm/page.h | 2 + arch/ia64/kernel/machine_kexec.c | 5 - arch/powerpc/kernel/fadump.c | 3 +- arch/s390/kernel/machine_kexec.c | 1 + arch/s390/kernel/setup.c | 6 - arch/x86/kernel/crash.c | 2 +- arch/x86/kernel/machine_kexec_64.c | 1 + arch/x86/xen/mmu_pv.c | 4 +- block/genhd.c | 2 +- drivers/base/memory.c | 4 + drivers/block/zram/Kconfig | 14 + drivers/block/zram/Makefile | 3 +- drivers/block/zram/zram_dedup.c | 254 +++++++ drivers/block/zram/zram_dedup.h | 45 ++ drivers/block/zram/zram_drv.c | 184 ++++- drivers/block/zram/zram_drv.h | 32 +- fs/bfs/inode.c | 2 +- fs/eventpoll.c | 60 +- fs/ocfs2/dlm/dlmmaster.c | 66 +- fs/ocfs2/dlm/dlmrecovery.c | 40 +- fs/proc/base.c | 44 ++ include/linux/crash_core.h | 9 +- include/linux/eventpoll.h | 3 + include/linux/kexec.h | 2 + include/linux/mmzone.h | 2 + include/linux/reboot.h | 4 + include/linux/sched.h | 1 + include/linux/slub_def.h | 34 +- include/uapi/linux/kcmp.h | 10 + include/uapi/linux/sysctl.h | 4 + ipc/sem.c | 12 +- kernel/crash_core.c | 44 +- kernel/fork.c | 4 + kernel/kcmp.c | 57 ++ kernel/kexec.c | 8 + kernel/kexec_core.c | 39 ++ kernel/kexec_file.c | 8 + kernel/ksysfs.c | 2 +- kernel/reboot.c | 27 + lib/fault-inject.c | 7 + mm/ksm.c | 777 ++++++++++++++++++++-- mm/memory_hotplug.c | 4 + mm/mmap.c | 2 +- mm/nobootmem.c | 2 +- mm/page_alloc.c | 5 + mm/page_owner.c | 4 +- mm/slub.c | 109 +-- mm/sparse.c | 60 +- mm/vmscan.c | 30 +- mm/vmstat.c | 16 +- scripts/gdb/linux/constants.py.in | 7 + scripts/gdb/linux/proc.py | 73 ++ scripts/gen_initramfs_list.sh | 2 + usr/Kconfig | 24 +- 59 files changed, 2038 insertions(+), 289 deletions(-) create mode 100644 drivers/block/zram/zram_dedup.c create mode 100644 drivers/block/zram/zram_dedup.h $ 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: sparc64: NG4 memset 32 bits overflow Applying: mm: zero hash tables in allocator Applying: mm: update callers to use HASH_ZERO flag Applying: mm: adaptive hash table scaling Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + cd597f9d8c98...d53d56c0f83c akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (d53d56c0f83c lib/crc-ccitt: add CCITT-FALSE CRC16 variant) $ git merge --no-ff akpm/master Merge made by the 'recursive' strategy. arch/sparc/lib/NG4memset.S | 26 ++++++++--------- fs/dcache.c | 18 +++--------- fs/inode.c | 14 ++------- fs/namespace.c | 10 ++----- include/linux/bootmem.h | 2 ++ include/linux/crc-ccitt.h | 7 +++++ kernel/locking/qspinlock_paravirt.h | 3 +- kernel/pid.c | 7 ++--- lib/crc-ccitt.c | 58 ++++++++++++++++++++++++++++++++++++- mm/page_alloc.c | 31 ++++++++++++++++++-- 10 files changed, 119 insertions(+), 57 deletions(-)