$ date -R Tue, 23 May 2017 09:13:19 +1000 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at f3926e4c2a4b Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Merging origin/master (08332893e37a Linux 4.12-rc2) $ git merge origin/master Updating f3926e4c2a4b..08332893e37a Fast-forward Makefile | 2 +- arch/x86/include/asm/uaccess.h | 11 ++++++----- 2 files changed, 7 insertions(+), 6 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 Already up-to-date. 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 (e41e53cd4fe3 powerpc/mm: Fix virt_addr_valid() etc. on 64-bit hash) $ git merge powerpc-fixes/fixes Already up-to-date. Merging sparc/master (8b4822de59d5 Merge tag 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md) $ git merge sparc/master Already up-to-date. 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 (2d76b2f8b54a net: sched: cls_matchall: fix null pointer dereference) $ git merge net/master Merge made by the 'recursive' strategy. drivers/net/bonding/bond_3ad.c | 2 +- drivers/net/bonding/bond_main.c | 5 +- drivers/net/ethernet/atheros/atlx/atl2.c | 8 +- drivers/net/usb/smsc95xx.c | 13 ++- 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 +- kernel/bpf/verifier.c | 12 ++- net/bridge/br_stp_if.c | 1 + net/bridge/br_stp_timer.c | 2 +- net/bridge/netfilter/ebt_arpreply.c | 3 + net/bridge/netfilter/ebtables.c | 9 +- net/ipv4/arp.c | 56 +++++++--- net/ipv4/tcp.c | 4 + net/ipv6/ip6_output.c | 15 +-- 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 | 24 +++-- net/netfilter/xt_CT.c | 6 +- net/openvswitch/conntrack.c | 4 +- net/sched/cls_matchall.c | 1 - net/vmw_vsock/af_vsock.c | 21 ++-- 33 files changed, 335 insertions(+), 133 deletions(-) Merging ipsec/master (a486cd23661c xfrm: fix state migration copy replay sequence numbers) $ 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 ----------------------------------------------- net/xfrm/xfrm_state.c | 2 ++ 6 files changed, 8 insertions(+), 60 deletions(-) Merging netfilter/master (6d18c732b95c bridge: start hello_timer when enabling KERNEL_STP in br_stp_start) $ git merge netfilter/master Already up-to-date. Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections) $ git merge ipvs/master Already up-to-date. Merging wireless-drivers/master (6d18c732b95c bridge: start hello_timer when enabling KERNEL_STP in br_stp_start) $ 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 (a79e7df97592 ALSA: hda - Update the list of quirk models) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. Documentation/sound/hd-audio/models.rst | 114 ++++++++++++++++++-------------- sound/pci/hda/patch_realtek.c | 7 ++ sound/usb/quirks.c | 2 +- 3 files changed, 73 insertions(+), 50 deletions(-) Merging pci-current/for-linus (415b6185c541 PCI: imx6: Fix config read timeout handling) $ git merge pci-current/for-linus Merge made by the 'recursive' strategy. drivers/pci/dwc/pci-imx6.c | 33 ++++++++++++++++++++++++++++++--- drivers/pci/endpoint/Kconfig | 1 + drivers/pci/switch/switchtec.c | 16 ++++++---------- 3 files changed, 37 insertions(+), 13 deletions(-) Merging driver-core.current/driver-core-linus (08332893e37a Linux 4.12-rc2) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (da4c279942b0 serial: enable serdev support) $ git merge tty.current/tty-linus Merge made by the 'recursive' strategy. drivers/tty/ehv_bytechan.c | 17 ++++---- drivers/tty/serdev/core.c | 12 ++++++ drivers/tty/serdev/serdev-ttyport.c | 21 ++++++---- drivers/tty/serial/8250/8250_port.c | 21 +++++----- drivers/tty/serial/altera_jtaguart.c | 1 + drivers/tty/serial/efm32-uart.c | 11 ++++-- drivers/tty/serial/ifx6x60.c | 2 +- drivers/tty/serial/serial_core.c | 6 +-- drivers/tty/tty_port.c | 75 +++++++++++++++++++++++++++++++++--- include/linux/serdev.h | 19 +++++---- include/linux/tty.h | 9 +++++ 11 files changed, 148 insertions(+), 46 deletions(-) Merging usb.current/usb-linus (08332893e37a Linux 4.12-rc2) $ git merge usb.current/usb-linus Already up-to-date. 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 (08332893e37a Linux 4.12-rc2) $ git merge usb-serial-fixes/usb-linus Already up-to-date. Merging usb-chipidea-fixes/ci-for-usb-stable (aa1f058d7d92 usb: chipidea: udc: fix NULL pointer dereference if udc_start failed) $ git merge usb-chipidea-fixes/ci-for-usb-stable Merge made by the 'recursive' strategy. drivers/usb/chipidea/udc.c | 8 ++++++-- drivers/usb/chipidea/usbmisc_imx.c | 41 +++++++++++++++++++++++++++++--------- 2 files changed, 38 insertions(+), 11 deletions(-) Merging phy/fixes (a380b78b799b phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer) $ git merge phy/fixes Auto-merging drivers/phy/ti/phy-tusb1210.c Auto-merging drivers/phy/qualcomm/phy-qcom-usb-hsic.c Auto-merging drivers/phy/qualcomm/phy-qcom-usb-hs.c Auto-merging drivers/phy/qualcomm/phy-qcom-qmp.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 18 +- drivers/phy/Kconfig | 491 +-------------------- drivers/phy/Makefile | 70 +-- drivers/phy/allwinner/Kconfig | 31 ++ drivers/phy/allwinner/Makefile | 2 + drivers/phy/{ => allwinner}/phy-sun4i-usb.c | 0 drivers/phy/{ => allwinner}/phy-sun9i-usb.c | 0 drivers/phy/amlogic/Kconfig | 14 + drivers/phy/amlogic/Makefile | 1 + drivers/phy/{ => amlogic}/phy-meson8b-usb2.c | 0 drivers/phy/broadcom/Kconfig | 55 +++ drivers/phy/broadcom/Makefile | 6 + drivers/phy/{ => broadcom}/phy-bcm-cygnus-pcie.c | 0 drivers/phy/{ => broadcom}/phy-bcm-kona-usb2.c | 0 drivers/phy/{ => broadcom}/phy-bcm-ns-usb2.c | 0 drivers/phy/{ => broadcom}/phy-bcm-ns-usb3.c | 0 drivers/phy/{ => broadcom}/phy-bcm-ns2-pcie.c | 0 drivers/phy/{ => broadcom}/phy-brcm-sata.c | 0 drivers/phy/hisilicon/Kconfig | 20 + drivers/phy/hisilicon/Makefile | 2 + drivers/phy/{ => hisilicon}/phy-hi6220-usb.c | 0 drivers/phy/{ => hisilicon}/phy-hix5hd2-sata.c | 0 drivers/phy/marvell/Kconfig | 50 +++ drivers/phy/marvell/Makefile | 6 + drivers/phy/{ => marvell}/phy-armada375-usb2.c | 0 drivers/phy/{ => marvell}/phy-berlin-sata.c | 0 drivers/phy/{ => marvell}/phy-berlin-usb.c | 0 drivers/phy/{ => marvell}/phy-mvebu-sata.c | 0 drivers/phy/{ => marvell}/phy-pxa-28nm-hsic.c | 0 drivers/phy/{ => marvell}/phy-pxa-28nm-usb2.c | 0 drivers/phy/qualcomm/Kconfig | 58 +++ drivers/phy/qualcomm/Makefile | 9 + drivers/phy/{ => qualcomm}/phy-qcom-apq8064-sata.c | 0 drivers/phy/{ => qualcomm}/phy-qcom-ipq806x-sata.c | 0 drivers/phy/{ => qualcomm}/phy-qcom-qmp.c | 14 +- drivers/phy/{ => qualcomm}/phy-qcom-qusb2.c | 0 drivers/phy/{ => qualcomm}/phy-qcom-ufs-i.h | 0 drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-14nm.c | 0 drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-14nm.h | 0 drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-20nm.c | 0 drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-20nm.h | 0 drivers/phy/{ => qualcomm}/phy-qcom-ufs.c | 0 drivers/phy/{ => qualcomm}/phy-qcom-usb-hs.c | 3 +- drivers/phy/{ => qualcomm}/phy-qcom-usb-hsic.c | 3 +- drivers/phy/renesas/Kconfig | 17 + drivers/phy/renesas/Makefile | 2 + drivers/phy/{ => renesas}/phy-rcar-gen2.c | 0 drivers/phy/{ => renesas}/phy-rcar-gen3-usb2.c | 0 drivers/phy/rockchip/Kconfig | 51 +++ drivers/phy/rockchip/Makefile | 6 + drivers/phy/{ => rockchip}/phy-rockchip-dp.c | 0 drivers/phy/{ => rockchip}/phy-rockchip-emmc.c | 0 .../phy/{ => rockchip}/phy-rockchip-inno-usb2.c | 0 drivers/phy/{ => rockchip}/phy-rockchip-pcie.c | 0 drivers/phy/{ => rockchip}/phy-rockchip-typec.c | 0 drivers/phy/{ => rockchip}/phy-rockchip-usb.c | 0 drivers/phy/samsung/Kconfig | 95 ++++ drivers/phy/samsung/Makefile | 11 + drivers/phy/{ => samsung}/phy-exynos-dp-video.c | 0 drivers/phy/{ => samsung}/phy-exynos-mipi-video.c | 0 drivers/phy/{ => samsung}/phy-exynos-pcie.c | 0 drivers/phy/{ => samsung}/phy-exynos4210-usb2.c | 0 drivers/phy/{ => samsung}/phy-exynos4x12-usb2.c | 0 drivers/phy/{ => samsung}/phy-exynos5-usbdrd.c | 0 drivers/phy/{ => samsung}/phy-exynos5250-sata.c | 0 drivers/phy/{ => samsung}/phy-exynos5250-usb2.c | 0 drivers/phy/{ => samsung}/phy-s5pv210-usb2.c | 0 drivers/phy/{ => samsung}/phy-samsung-usb2.c | 0 drivers/phy/{ => samsung}/phy-samsung-usb2.h | 0 drivers/phy/st/Kconfig | 33 ++ drivers/phy/st/Makefile | 4 + drivers/phy/{ => st}/phy-miphy28lp.c | 0 drivers/phy/{ => st}/phy-spear1310-miphy.c | 0 drivers/phy/{ => st}/phy-spear1340-miphy.c | 0 drivers/phy/{ => st}/phy-stih407-usb.c | 0 drivers/phy/ti/Kconfig | 78 ++++ drivers/phy/ti/Makefile | 7 + drivers/phy/{ => ti}/phy-da8xx-usb.c | 0 drivers/phy/{ => ti}/phy-dm816x-usb.c | 0 drivers/phy/{ => ti}/phy-omap-control.c | 0 drivers/phy/{ => ti}/phy-omap-usb2.c | 0 drivers/phy/{ => ti}/phy-ti-pipe3.c | 0 drivers/phy/{ => ti}/phy-tusb1210.c | 3 +- drivers/phy/{ => ti}/phy-twl4030-usb.c | 0 {drivers => include/linux}/phy/ulpi_phy.h | 0 85 files changed, 601 insertions(+), 559 deletions(-) create mode 100644 drivers/phy/allwinner/Kconfig create mode 100644 drivers/phy/allwinner/Makefile rename drivers/phy/{ => allwinner}/phy-sun4i-usb.c (100%) rename drivers/phy/{ => allwinner}/phy-sun9i-usb.c (100%) create mode 100644 drivers/phy/amlogic/Kconfig create mode 100644 drivers/phy/amlogic/Makefile rename drivers/phy/{ => amlogic}/phy-meson8b-usb2.c (100%) create mode 100644 drivers/phy/broadcom/Kconfig create mode 100644 drivers/phy/broadcom/Makefile rename drivers/phy/{ => broadcom}/phy-bcm-cygnus-pcie.c (100%) rename drivers/phy/{ => broadcom}/phy-bcm-kona-usb2.c (100%) rename drivers/phy/{ => broadcom}/phy-bcm-ns-usb2.c (100%) rename drivers/phy/{ => broadcom}/phy-bcm-ns-usb3.c (100%) rename drivers/phy/{ => broadcom}/phy-bcm-ns2-pcie.c (100%) rename drivers/phy/{ => broadcom}/phy-brcm-sata.c (100%) create mode 100644 drivers/phy/hisilicon/Kconfig create mode 100644 drivers/phy/hisilicon/Makefile rename drivers/phy/{ => hisilicon}/phy-hi6220-usb.c (100%) rename drivers/phy/{ => hisilicon}/phy-hix5hd2-sata.c (100%) create mode 100644 drivers/phy/marvell/Kconfig create mode 100644 drivers/phy/marvell/Makefile rename drivers/phy/{ => marvell}/phy-armada375-usb2.c (100%) rename drivers/phy/{ => marvell}/phy-berlin-sata.c (100%) rename drivers/phy/{ => marvell}/phy-berlin-usb.c (100%) rename drivers/phy/{ => marvell}/phy-mvebu-sata.c (100%) rename drivers/phy/{ => marvell}/phy-pxa-28nm-hsic.c (100%) rename drivers/phy/{ => marvell}/phy-pxa-28nm-usb2.c (100%) create mode 100644 drivers/phy/qualcomm/Kconfig create mode 100644 drivers/phy/qualcomm/Makefile rename drivers/phy/{ => qualcomm}/phy-qcom-apq8064-sata.c (100%) rename drivers/phy/{ => qualcomm}/phy-qcom-ipq806x-sata.c (100%) rename drivers/phy/{ => qualcomm}/phy-qcom-qmp.c (99%) rename drivers/phy/{ => qualcomm}/phy-qcom-qusb2.c (100%) rename drivers/phy/{ => qualcomm}/phy-qcom-ufs-i.h (100%) rename drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-14nm.c (100%) rename drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-14nm.h (100%) rename drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-20nm.c (100%) rename drivers/phy/{ => qualcomm}/phy-qcom-ufs-qmp-20nm.h (100%) rename drivers/phy/{ => qualcomm}/phy-qcom-ufs.c (100%) rename drivers/phy/{ => qualcomm}/phy-qcom-usb-hs.c (99%) rename drivers/phy/{ => qualcomm}/phy-qcom-usb-hsic.c (99%) create mode 100644 drivers/phy/renesas/Kconfig create mode 100644 drivers/phy/renesas/Makefile rename drivers/phy/{ => renesas}/phy-rcar-gen2.c (100%) rename drivers/phy/{ => renesas}/phy-rcar-gen3-usb2.c (100%) create mode 100644 drivers/phy/rockchip/Kconfig create mode 100644 drivers/phy/rockchip/Makefile rename drivers/phy/{ => rockchip}/phy-rockchip-dp.c (100%) rename drivers/phy/{ => rockchip}/phy-rockchip-emmc.c (100%) rename drivers/phy/{ => rockchip}/phy-rockchip-inno-usb2.c (100%) rename drivers/phy/{ => rockchip}/phy-rockchip-pcie.c (100%) rename drivers/phy/{ => rockchip}/phy-rockchip-typec.c (100%) rename drivers/phy/{ => rockchip}/phy-rockchip-usb.c (100%) create mode 100644 drivers/phy/samsung/Kconfig create mode 100644 drivers/phy/samsung/Makefile rename drivers/phy/{ => samsung}/phy-exynos-dp-video.c (100%) rename drivers/phy/{ => samsung}/phy-exynos-mipi-video.c (100%) rename drivers/phy/{ => samsung}/phy-exynos-pcie.c (100%) rename drivers/phy/{ => samsung}/phy-exynos4210-usb2.c (100%) rename drivers/phy/{ => samsung}/phy-exynos4x12-usb2.c (100%) rename drivers/phy/{ => samsung}/phy-exynos5-usbdrd.c (100%) rename drivers/phy/{ => samsung}/phy-exynos5250-sata.c (100%) rename drivers/phy/{ => samsung}/phy-exynos5250-usb2.c (100%) rename drivers/phy/{ => samsung}/phy-s5pv210-usb2.c (100%) rename drivers/phy/{ => samsung}/phy-samsung-usb2.c (100%) rename drivers/phy/{ => samsung}/phy-samsung-usb2.h (100%) create mode 100644 drivers/phy/st/Kconfig create mode 100644 drivers/phy/st/Makefile rename drivers/phy/{ => st}/phy-miphy28lp.c (100%) rename drivers/phy/{ => st}/phy-spear1310-miphy.c (100%) rename drivers/phy/{ => st}/phy-spear1340-miphy.c (100%) rename drivers/phy/{ => st}/phy-stih407-usb.c (100%) create mode 100644 drivers/phy/ti/Kconfig create mode 100644 drivers/phy/ti/Makefile rename drivers/phy/{ => ti}/phy-da8xx-usb.c (100%) rename drivers/phy/{ => ti}/phy-dm816x-usb.c (100%) rename drivers/phy/{ => ti}/phy-omap-control.c (100%) rename drivers/phy/{ => ti}/phy-omap-usb2.c (100%) rename drivers/phy/{ => ti}/phy-ti-pipe3.c (100%) rename drivers/phy/{ => ti}/phy-tusb1210.c (99%) rename drivers/phy/{ => ti}/phy-twl4030-usb.c (100%) rename {drivers => include/linux}/phy/ulpi_phy.h (100%) Merging staging.current/staging-linus (5a4733df7ef2 Merge tag 'iio-fixes-for-4.12a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) $ git merge staging.current/staging-linus Merge made by the 'recursive' strategy. drivers/iio/adc/bcm_iproc_adc.c | 8 ++++---- drivers/iio/adc/max9611.c | 10 +++++----- drivers/iio/adc/sun4i-gpadc-iio.c | 38 ++++++++++++++++++++++++-------------- drivers/iio/adc/ti_am335x_adc.c | 2 +- drivers/iio/industrialio-trigger.c | 3 ++- drivers/iio/light/ltr501.c | 4 ++-- drivers/iio/proximity/as3935.c | 14 ++++++-------- 7 files changed, 44 insertions(+), 35 deletions(-) Merging char-misc.current/char-misc-linus (08332893e37a Linux 4.12-rc2) $ git merge char-misc.current/char-misc-linus Already up-to-date. 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 (9933e113c2e8 crypto: skcipher - Add missing API setkey checks) $ git merge crypto-current/master Merge made by the 'recursive' strategy. crypto/skcipher.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) 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 (d4ed3b9015b5 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 (dd8245f445f5 [media] atomisp: don't treat warnings as errors) $ git merge v4l-dvb-fixes/fixes Merge made by the 'recursive' strategy. drivers/staging/media/atomisp/i2c/Makefile | 2 -- drivers/staging/media/atomisp/i2c/imx/Makefile | 2 -- drivers/staging/media/atomisp/i2c/ov5693/Makefile | 2 -- drivers/staging/media/atomisp/pci/atomisp2/Makefile | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) Merging drm-intel-fixes/for-linux-next-fixes (46cd902f6d9a drm/i915: set initialised only when init_context callback is NULL) $ git merge drm-intel-fixes/for-linux-next-fixes Merge made by the 'recursive' strategy. drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_gem_shrinker.c | 5 ----- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) Merging drm-misc-fixes/for-linux-next-fixes (e480eabae232 drm/radeon: Fix oops upon driver load on PowerXpress laptops) $ git merge drm-misc-fixes/for-linux-next-fixes Merge made by the 'recursive' strategy. drivers/gpu/drm/radeon/radeon_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 000b406004b0] 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 (7e54f6b647c1 Merge branch 'fixes' into for-next) $ git merge arm-soc/for-next Merge made by the 'recursive' strategy. arch/arm/arm-soc-for-next-contents.txt | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) 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 (15e858ec0c62 Merge branch 'v4.13/defconfig' into tmp/aml-rebuild) $ git merge amlogic/for-next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/arm/amlogic.txt | 20 +- arch/arm/boot/dts/meson.dtsi | 178 ++++++++--------- arch/arm/boot/dts/meson6.dtsi | 2 - arch/arm/boot/dts/meson8.dtsi | 130 +++++++++---- arch/arm/boot/dts/meson8b.dtsi | 214 +++++++++------------ arch/arm64/boot/dts/amlogic/Makefile | 6 +- .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 60 +++--- .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 52 ++--- .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 108 +++++------ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 66 +++---- .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 56 +++--- .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 6 +- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 181 +++++++++-------- .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 +- .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 52 ++--- arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 72 +++---- .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 87 +++++---- arch/arm64/configs/defconfig | 5 + 19 files changed, 667 insertions(+), 632 deletions(-) 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 Auto-merging arch/arm/mach-at91/pm.c 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 (c156bb73ae01 Merge branch anholt/bcm2835-dt-next into for-next) $ git merge bcm2835/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 1 - arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +- arch/arm/boot/dts/bcm2835.dtsi | 4 ++++ arch/arm/boot/dts/bcm2836.dtsi | 4 ++++ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 + arch/arm/boot/dts/bcm283x.dtsi | 21 +++++++++++++++++++++ 7 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts 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 (428c917deaaf Merge branch 'imx/defconfig' into for-next) $ git merge imx-mxs/for-next Auto-merging arch/arm/boot/dts/Makefile Merge made by the 'recursive' strategy. .../devicetree/bindings/mmc/fsl-esdhc.txt | 14 + arch/arm/boot/dts/Makefile | 3 + 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 | 40 +- arch/arm/boot/dts/imx6qp.dtsi | 4 + arch/arm/boot/dts/imx6sl.dtsi | 3 + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +- arch/arm/boot/dts/imx6sx-sdb.dts | 8 + arch/arm/boot/dts/imx6sx.dtsi | 3 + arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 2 +- arch/arm/boot/dts/imx6ul.dtsi | 1 + arch/arm/boot/dts/imx7-colibri.dtsi | 2 +- arch/arm/boot/dts/imx7d-nitrogen7.dts | 4 +- arch/arm/boot/dts/imx7d-pico.dts | 387 +++++++++++ arch/arm/boot/dts/imx7d-sdb.dts | 34 + arch/arm/boot/dts/imx7d.dtsi | 37 + arch/arm/boot/dts/imx7s-warp.dts | 1 + arch/arm/boot/dts/imx7s.dtsi | 50 +- arch/arm/configs/imx_v6_v7_defconfig | 3 + arch/arm/configs/mxs_defconfig | 6 +- arch/arm/mach-imx/Kconfig | 1 + 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-ls1043-post.dtsi | 45 ++ arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 4 +- arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 75 ++- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 69 +- arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi | 48 ++ arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 4 +- arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 70 +- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 72 +- 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 +- .../boot/dts/freescale/qoriq-bman-portals.dtsi | 71 ++ .../boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi | 42 ++ .../boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi | 42 ++ .../boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi | 41 ++ .../boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi | 41 ++ .../boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi | 41 ++ .../boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi | 41 ++ .../boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi | 41 ++ .../boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi | 41 ++ arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 81 +++ .../boot/dts/freescale/qoriq-qman-portals.dtsi | 80 +++ drivers/soc/imx/Makefile | 2 +- 68 files changed, 2609 insertions(+), 79 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 create mode 100644 arch/arm/boot/dts/imx7d-pico.dts create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi create mode 100644 arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next) $ git merge keystone/next Auto-merging arch/arm/boot/dts/Makefile Merge made by the 'recursive' strategy. .../devicetree/bindings/arm/keystone/keystone.txt | 3 ++ arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/keystone-k2g-evm.dts | 2 +- arch/arm/boot/dts/keystone-k2g-ice.dts | 35 ++++++++++++++++++++++ arch/arm/boot/dts/keystone-k2g.dtsi | 3 +- 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 arch/arm/boot/dts/keystone-k2g-ice.dts 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 (d0ee30d59b38 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 | 3 +- arch/arm/boot/dts/dra7.dtsi | 4 +- arch/arm/boot/dts/dra72-evm-common.dtsi | 3 +- arch/arm/boot/dts/omap4-droid4-xt894.dts | 20 +++++++ 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/timer.c | 28 +++++++++ 13 files changed, 157 insertions(+), 38 deletions(-) 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 (d8eca86fc05f 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 (0b83ca4910ac Merge branch 'v4.13-armsoc/dts32' 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 +- .../devicetree/bindings/gpu/arm,mali-midgard.txt | 86 +++ arch/arm/Kconfig.debug | 30 + arch/arm/boot/dts/Makefile | 2 +- arch/arm/boot/dts/rk322x.dtsi | 73 ++- arch/arm/boot/dts/rk3288-firefly.dtsi | 5 + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 5 + arch/arm/boot/dts/rk3288-rock2-square.dts | 8 +- arch/arm/boot/dts/rk3288-veyron.dtsi | 5 + arch/arm/boot/dts/rk3288.dtsi | 43 ++ .../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 + 20 files changed, 1233 insertions(+), 95 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt 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 (2ea659a9ef48 Linux 4.12-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 (ce91c7087700 Merge branches 'sunxi/dt-for-4.13', 'sunxi/fixes-for-4.12' and 'sunxi/clk-for-4.13' into sunxi/for-next) $ git merge sunxi/sunxi/for-next Removing arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi Auto-merging arch/arm/boot/dts/Makefile Merge made by the 'recursive' strategy. .../devicetree/bindings/clock/sun8i-de2.txt | 31 + .../devicetree/bindings/clock/sunxi-ccu.txt | 2 + arch/arm/boot/dts/Makefile | 3 +- 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 | 33 +- arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 4 - arch/arm/boot/dts/sun5i-a10s.dtsi | 47 ++ .../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/sun5i.dtsi | 1 + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 6 - arch/arm/boot/dts/sun6i-a31.dtsi | 169 +++- arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 2 +- arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 2 +- arch/arm/boot/dts/sun7i-a20-bananapi.dts | 51 ++ arch/arm/boot/dts/sun7i-a20-bananapro.dts | 2 +- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 2 +- arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 4 +- arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 2 +- arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 4 +- 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 | 4 +- 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 | 50 +- arch/arm/boot/dts/sun8i-a83t.dtsi | 80 +- arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 24 +- 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 | 96 +++ 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 +++++ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi | 1 - drivers/clk/clk-divider.c | 19 +- drivers/clk/sunxi-ng/Kconfig | 17 + drivers/clk/sunxi-ng/Makefile | 2 + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 10 +- drivers/clk/sunxi-ng/ccu-sun5i.h | 6 +- drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 12 +- drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 10 +- drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 10 +- drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 922 +++++++++++++++++++++ drivers/clk/sunxi-ng/ccu-sun8i-a83t.h | 64 ++ drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 260 ++++++ drivers/clk/sunxi-ng/ccu-sun8i-de2.h | 28 + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 10 +- drivers/clk/sunxi-ng/ccu-sun8i-r.c | 10 +- drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 12 +- drivers/clk/sunxi-ng/ccu_div.c | 38 +- drivers/clk/sunxi-ng/ccu_mp.c | 15 +- drivers/clk/sunxi-ng/ccu_mult.c | 19 +- drivers/clk/sunxi-ng/ccu_mux.c | 108 ++- drivers/clk/sunxi-ng/ccu_mux.h | 24 +- drivers/clk/sunxi-ng/ccu_nkm.c | 7 +- drivers/clk/sunxi-ng/ccu_reset.h | 1 + include/dt-bindings/clock/sun5i-ccu.h | 3 + include/dt-bindings/clock/sun8i-a83t-ccu.h | 140 ++++ include/dt-bindings/clock/sun8i-de2.h | 18 + include/dt-bindings/reset/sun8i-a83t-ccu.h | 98 +++ include/dt-bindings/reset/sun8i-de2.h | 14 + include/linux/clk-provider.h | 16 +- 107 files changed, 2926 insertions(+), 368 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 delete mode 120000 arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a83t.c create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-a83t.h 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-a83t-ccu.h create mode 100644 include/dt-bindings/clock/sun8i-de2.h create mode 100644 include/dt-bindings/reset/sun8i-a83t-ccu.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 (08332893e37a Linux 4.12-rc2) $ 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 (8a2d2b096d53 libceph: fix error handling in process_one_ticket()) $ git merge ceph/master Merge made by the 'recursive' strategy. include/linux/ceph/ceph_debug.h | 6 +++--- net/ceph/auth_x.c | 13 ++++++++----- net/ceph/ceph_common.c | 13 ------------- net/ceph/messenger.c | 11 ++++------- net/ceph/mon_client.c | 4 +--- 5 files changed, 16 insertions(+), 31 deletions(-) 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 (ee1d6d37b6b8 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 | 19 ++++++----- fs/overlayfs/dir.c | 82 +++++++++++++++++++++++++++++++++++++++--------- fs/overlayfs/namei.c | 18 +++++++++-- fs/overlayfs/overlayfs.h | 9 ++++-- fs/overlayfs/ovl_entry.h | 2 ++ fs/overlayfs/super.c | 13 ++++++++ fs/overlayfs/util.c | 38 +++++++++++++++++++--- 8 files changed, 152 insertions(+), 30 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 (719f6a7040f1 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 (c10e8031d5b3 efi-pstore: Fix write/erase id tracking) $ git merge pstore/for-next/pstore Auto-merging drivers/firmware/efi/efi-pstore.c Merge made by the 'recursive' strategy. drivers/firmware/efi/efi-pstore.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) Merging hid/for-next (70d49ea6d2a0 Merge branch 'for-4.13/ite' into for-next) $ git merge hid/for-next Merge made by the 'recursive' strategy. drivers/hid/Kconfig | 13 +- drivers/hid/Makefile | 1 + drivers/hid/hid-asus.c | 10 ++ drivers/hid/hid-core.c | 4 + drivers/hid/hid-elecom.c | 62 ++++++- drivers/hid/hid-ids.h | 4 + drivers/hid/hid-input.c | 9 + drivers/hid/hid-ite.c | 56 ++++++ drivers/hid/hid-magicmouse.c | 15 +- drivers/hid/i2c-hid/i2c-hid.c | 2 +- drivers/hid/wacom.h | 1 + drivers/hid/wacom_sys.c | 4 +- drivers/hid/wacom_wac.c | 237 +++++++++++++++---------- drivers/hid/wacom_wac.h | 7 + include/linux/hid.h | 9 + include/linux/{i2c => platform_data}/i2c-hid.h | 0 16 files changed, 316 insertions(+), 118 deletions(-) create mode 100644 drivers/hid/hid-ite.c rename include/linux/{i2c => platform_data}/i2c-hid.h (100%) Merging i2c/i2c/for-next (e2c824924cdb i2c: designware: Fix bogus sda_hold_time due to uninitialized vars) $ git merge i2c/i2c/for-next Merge made by the 'recursive' strategy. drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- drivers/i2c/busses/i2c-tiny-usb.c | 25 +++++++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) 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 (e3ebfb6ddebb hwmon: (pmbus) move header file out of I2C realm) $ git merge hwmon-staging/hwmon-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/hwmon/ads1015 | 2 +- Documentation/hwmon/adt7475 | 9 + Documentation/hwmon/ir35221 | 87 +++++++ Documentation/hwmon/ltc4245 | 2 +- Documentation/hwmon/pmbus-core | 2 +- MAINTAINERS | 4 +- drivers/hwmon/ads1015.c | 2 +- drivers/hwmon/adt7475.c | 184 +++++++++++--- drivers/hwmon/ds620.c | 2 +- drivers/hwmon/ltc4245.c | 2 +- drivers/hwmon/max6639.c | 2 +- drivers/hwmon/nct6775.c | 325 ++++++++++++++++-------- drivers/hwmon/pmbus/Kconfig | 10 + drivers/hwmon/pmbus/Makefile | 1 + drivers/hwmon/pmbus/ir35221.c | 337 +++++++++++++++++++++++++ drivers/hwmon/pmbus/pmbus.c | 2 +- drivers/hwmon/pmbus/pmbus_core.c | 2 +- drivers/hwmon/pmbus/ucd9000.c | 2 +- drivers/hwmon/pmbus/ucd9200.c | 2 +- drivers/iio/adc/ti-ads1015.c | 2 +- include/linux/{i2c => platform_data}/ads1015.h | 0 include/linux/{i2c => platform_data}/ds620.h | 0 include/linux/{i2c => platform_data}/ltc4245.h | 0 include/linux/{i2c => platform_data}/max6639.h | 0 include/linux/{i2c => }/pmbus.h | 0 25 files changed, 830 insertions(+), 151 deletions(-) create mode 100644 Documentation/hwmon/ir35221 create mode 100644 drivers/hwmon/pmbus/ir35221.c rename include/linux/{i2c => platform_data}/ads1015.h (100%) rename include/linux/{i2c => platform_data}/ds620.h (100%) rename include/linux/{i2c => platform_data}/ltc4245.h (100%) rename include/linux/{i2c => platform_data}/max6639.h (100%) rename include/linux/{i2c => }/pmbus.h (100%) Merging jc_docs/docs-next (6312811be26f Merge remote-tracking branch 'mauro-exp/docbook3' into death-to-docbook) $ git merge jc_docs/docs-next Removing scripts/check-lc_ctype.c Auto-merging net/core/sock.c Auto-merging kernel/irq/chip.c Auto-merging include/linux/netdevice.h Auto-merging fs/namei.c Auto-merging drivers/mtd/nand/nand_base.c Auto-merging Makefile Auto-merging MAINTAINERS Auto-merging Documentation/userspace-api/seccomp_filter.rst Auto-merging Documentation/userspace-api/no_new_privs.rst Removing Documentation/sphinx/tmplcvt Auto-merging Documentation/security/self-protection.rst Auto-merging Documentation/security/keys/trusted-encrypted.rst Auto-merging Documentation/security/keys/request-key.rst Auto-merging Documentation/security/keys/ecryptfs.rst Auto-merging Documentation/security/keys/core.rst Auto-merging Documentation/security/credentials.rst Removing Documentation/security/conf.py Auto-merging Documentation/security/IMA-templates.rst Removing Documentation/security/00-INDEX Removing Documentation/doc-guide/docbook.rst Auto-merging Documentation/admin-guide/LSM/tomoyo.rst Auto-merging Documentation/admin-guide/LSM/index.rst Auto-merging Documentation/admin-guide/LSM/apparmor.rst Auto-merging Documentation/admin-guide/LSM/Yama.rst Auto-merging Documentation/admin-guide/LSM/Smack.rst Auto-merging Documentation/admin-guide/LSM/SELinux.rst Auto-merging Documentation/admin-guide/LSM/LoadPin.rst Removing Documentation/Makefile.sphinx Removing Documentation/DocBook/z8530book.tmpl Removing Documentation/DocBook/w1.tmpl Removing Documentation/DocBook/stylesheet.xsl Removing Documentation/DocBook/sh.tmpl Removing Documentation/DocBook/scsi.tmpl Removing Documentation/DocBook/s390-drivers.tmpl Removing Documentation/DocBook/rapidio.tmpl Removing Documentation/DocBook/networking.tmpl Removing Documentation/DocBook/mtdnand.tmpl Removing Documentation/DocBook/lsm.tmpl Removing Documentation/DocBook/librs.tmpl Removing Documentation/DocBook/libata.tmpl Removing Documentation/DocBook/kgdb.tmpl Removing Documentation/DocBook/kernel-locking.tmpl Removing Documentation/DocBook/kernel-hacking.tmpl Removing Documentation/DocBook/filesystems.tmpl Removing Documentation/DocBook/Makefile Removing Documentation/DocBook/.gitignore Merge made by the 'recursive' strategy. Documentation/00-INDEX | 6 +- Documentation/DocBook/.gitignore | 17 - Documentation/DocBook/Makefile | 282 --- Documentation/DocBook/filesystems.tmpl | 381 ---- Documentation/DocBook/kernel-hacking.tmpl | 1312 ------------ Documentation/DocBook/kernel-locking.tmpl | 2151 -------------------- Documentation/DocBook/kgdb.tmpl | 918 --------- Documentation/DocBook/libata.tmpl | 1625 --------------- Documentation/DocBook/librs.tmpl | 289 --- Documentation/DocBook/lsm.tmpl | 265 --- Documentation/DocBook/mtdnand.tmpl | 1291 ------------ Documentation/DocBook/networking.tmpl | 111 - Documentation/DocBook/rapidio.tmpl | 155 -- Documentation/DocBook/s390-drivers.tmpl | 161 -- Documentation/DocBook/scsi.tmpl | 409 ---- Documentation/DocBook/sh.tmpl | 105 - Documentation/DocBook/stylesheet.xsl | 11 - Documentation/DocBook/w1.tmpl | 101 - Documentation/DocBook/z8530book.tmpl | 371 ---- Documentation/Makefile | 125 ++ Documentation/Makefile.sphinx | 130 -- Documentation/PCI/MSI-HOWTO.txt | 2 +- .../LoadPin.txt => admin-guide/LSM/LoadPin.rst} | 12 +- .../SELinux.txt => admin-guide/LSM/SELinux.rst} | 18 +- .../Smack.txt => admin-guide/LSM/Smack.rst} | 273 ++- .../Yama.txt => admin-guide/LSM/Yama.rst} | 55 +- .../apparmor.txt => admin-guide/LSM/apparmor.rst} | 36 +- .../LSM.txt => admin-guide/LSM/index.rst} | 28 +- .../tomoyo.txt => admin-guide/LSM/tomoyo.rst} | 22 +- Documentation/admin-guide/README.rst | 6 - Documentation/admin-guide/index.rst | 1 + Documentation/conf.py | 35 +- Documentation/core-api/assoc_array.rst | 5 +- Documentation/core-api/index.rst | 1 + Documentation/core-api/librs.rst | 212 ++ Documentation/crypto/asymmetric-keys.txt | 2 +- Documentation/crypto/conf.py | 10 + Documentation/dev-tools/index.rst | 1 + Documentation/dev-tools/kgdb.rst | 907 +++++++++ Documentation/doc-guide/docbook.rst | 90 - Documentation/doc-guide/index.rst | 1 - Documentation/doc-guide/kernel-doc.rst | 10 + Documentation/doc-guide/sphinx.rst | 5 - Documentation/driver-api/index.rst | 6 + Documentation/driver-api/libata.rst | 1031 ++++++++++ Documentation/driver-api/mtdnand.rst | 1007 +++++++++ Documentation/driver-api/rapidio.rst | 107 + Documentation/driver-api/s390-drivers.rst | 111 + Documentation/driver-api/scsi.rst | 344 ++++ Documentation/driver-api/w1.rst | 70 + Documentation/fb/api.txt | 4 +- Documentation/filesystems/conf.py | 10 + Documentation/filesystems/index.rst | 317 +++ Documentation/filesystems/nfs/idmapper.txt | 2 +- Documentation/gpu/todo.rst | 2 +- Documentation/index.rst | 14 + Documentation/kbuild/makefiles.txt | 2 +- Documentation/kernel-doc-nano-HOWTO.txt | 65 +- Documentation/kernel-hacking/conf.py | 10 + Documentation/kernel-hacking/hacking.rst | 811 ++++++++ Documentation/kernel-hacking/index.rst | 9 + Documentation/kernel-hacking/locking.rst | 1446 +++++++++++++ Documentation/lsm.txt | 201 ++ Documentation/networking/conf.py | 10 + Documentation/networking/dns_resolver.txt | 2 +- Documentation/networking/index.rst | 18 + Documentation/networking/kapi.rst | 147 ++ Documentation/networking/z8530book.rst | 256 +++ Documentation/process/changes.rst | 26 +- Documentation/process/howto.rst | 8 - Documentation/process/kernel-docs.rst | 34 +- Documentation/security/00-INDEX | 26 - .../{IMA-templates.txt => IMA-templates.rst} | 46 +- Documentation/security/LSM.rst | 14 + Documentation/security/conf.py | 8 - .../security/{credentials.txt => credentials.rst} | 275 ++- Documentation/security/index.rst | 8 +- Documentation/security/{keys.txt => keys/core.rst} | 314 ++- .../{keys-ecryptfs.txt => keys/ecryptfs.rst} | 19 +- Documentation/security/keys/index.rst | 11 + .../{keys-request-key.txt => keys/request-key.rst} | 73 +- .../trusted-encrypted.rst} | 32 +- .../{self-protection.txt => self-protection.rst} | 99 +- Documentation/sh/conf.py | 10 + Documentation/sh/index.rst | 59 + Documentation/sound/conf.py | 10 + Documentation/sphinx/tmplcvt | 28 - Documentation/translations/ja_JP/howto.rst | 7 - Documentation/translations/ko_KR/howto.rst | 7 - Documentation/userspace-api/index.rst | 2 + .../no_new_privs.rst} | 44 +- .../seccomp_filter.rst} | 116 +- Documentation/userspace-api/unshare.rst | 2 +- MAINTAINERS | 18 +- Makefile | 11 +- arch/ia64/include/asm/io.h | 2 +- arch/ia64/sn/kernel/iomv.c | 2 +- drivers/ata/acard-ahci.c | 2 +- drivers/ata/ahci.c | 2 +- drivers/ata/ahci.h | 2 +- drivers/ata/ata_piix.c | 2 +- drivers/ata/libahci.c | 2 +- drivers/ata/libata-core.c | 2 +- drivers/ata/libata-eh.c | 2 +- drivers/ata/libata-scsi.c | 9 +- drivers/ata/libata-sff.c | 2 +- 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_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 +- drivers/mtd/nand/nand_base.c | 7 +- drivers/net/phy/phy.c | 1 + drivers/scsi/qla1280.c | 2 +- drivers/scsi/scsi_scan.c | 7 +- drivers/scsi/scsi_transport_fc.c | 18 +- drivers/scsi/scsicam.c | 4 +- drivers/usb/gadget/Kconfig | 2 +- fs/debugfs/file.c | 2 +- fs/debugfs/inode.c | 2 +- fs/eventfd.c | 4 +- fs/fs-writeback.c | 12 +- fs/jbd2/transaction.c | 42 +- fs/mpage.c | 1 + fs/namei.c | 1 + include/linux/ata.h | 2 +- include/linux/cred.h | 2 +- include/linux/debugfs.h | 2 +- include/linux/key.h | 2 +- include/linux/libata.h | 2 +- include/linux/lsm_hooks.h | 25 +- include/linux/mtd/nand.h | 2 +- include/linux/mutex.h | 6 +- include/linux/netdevice.h | 9 +- include/linux/skbuff.h | 2 +- include/net/sock.h | 9 +- kernel/cred.c | 2 +- kernel/futex.c | 40 +- kernel/irq/chip.c | 2 +- kernel/irq/handle.c | 2 +- kernel/irq/irqdesc.c | 2 +- kernel/locking/mutex.c | 6 +- lib/Kconfig.debug | 2 +- lib/Kconfig.kgdb | 2 +- net/core/datagram.c | 2 +- net/core/sock.c | 7 +- scripts/Makefile | 9 +- scripts/check-lc_ctype.c | 11 - scripts/selinux/README | 2 +- security/apparmor/match.c | 2 +- security/apparmor/policy_unpack.c | 2 +- security/keys/encrypted-keys/encrypted.c | 2 +- security/keys/encrypted-keys/masterkey_trusted.c | 2 +- security/keys/request_key.c | 2 +- security/keys/request_key_auth.c | 2 +- security/keys/trusted.c | 2 +- security/yama/Kconfig | 3 +- 166 files changed, 8354 insertions(+), 11234 deletions(-) delete mode 100644 Documentation/DocBook/.gitignore delete mode 100644 Documentation/DocBook/Makefile delete mode 100644 Documentation/DocBook/filesystems.tmpl delete mode 100644 Documentation/DocBook/kernel-hacking.tmpl delete mode 100644 Documentation/DocBook/kernel-locking.tmpl delete mode 100644 Documentation/DocBook/kgdb.tmpl delete mode 100644 Documentation/DocBook/libata.tmpl delete mode 100644 Documentation/DocBook/librs.tmpl delete mode 100644 Documentation/DocBook/lsm.tmpl delete mode 100644 Documentation/DocBook/mtdnand.tmpl delete mode 100644 Documentation/DocBook/networking.tmpl delete mode 100644 Documentation/DocBook/rapidio.tmpl delete mode 100644 Documentation/DocBook/s390-drivers.tmpl delete mode 100644 Documentation/DocBook/scsi.tmpl delete mode 100644 Documentation/DocBook/sh.tmpl delete mode 100644 Documentation/DocBook/stylesheet.xsl delete mode 100644 Documentation/DocBook/w1.tmpl delete mode 100644 Documentation/DocBook/z8530book.tmpl delete mode 100644 Documentation/Makefile.sphinx rename Documentation/{security/LoadPin.txt => admin-guide/LSM/LoadPin.rst} (73%) rename Documentation/{security/SELinux.txt => admin-guide/LSM/SELinux.rst} (71%) rename Documentation/{security/Smack.txt => admin-guide/LSM/Smack.rst} (85%) rename Documentation/{security/Yama.txt => admin-guide/LSM/Yama.rst} (60%) rename Documentation/{security/apparmor.txt => admin-guide/LSM/apparmor.rst} (65%) rename Documentation/{security/LSM.txt => admin-guide/LSM/index.rst} (62%) rename Documentation/{security/tomoyo.txt => admin-guide/LSM/tomoyo.rst} (85%) create mode 100644 Documentation/core-api/librs.rst create mode 100644 Documentation/crypto/conf.py create mode 100644 Documentation/dev-tools/kgdb.rst delete mode 100644 Documentation/doc-guide/docbook.rst create mode 100644 Documentation/driver-api/libata.rst create mode 100644 Documentation/driver-api/mtdnand.rst create mode 100644 Documentation/driver-api/rapidio.rst create mode 100644 Documentation/driver-api/s390-drivers.rst create mode 100644 Documentation/driver-api/scsi.rst create mode 100644 Documentation/driver-api/w1.rst create mode 100644 Documentation/filesystems/conf.py create mode 100644 Documentation/filesystems/index.rst create mode 100644 Documentation/kernel-hacking/conf.py create mode 100644 Documentation/kernel-hacking/hacking.rst create mode 100644 Documentation/kernel-hacking/index.rst create mode 100644 Documentation/kernel-hacking/locking.rst create mode 100644 Documentation/lsm.txt create mode 100644 Documentation/networking/conf.py create mode 100644 Documentation/networking/index.rst create mode 100644 Documentation/networking/kapi.rst create mode 100644 Documentation/networking/z8530book.rst delete mode 100644 Documentation/security/00-INDEX rename Documentation/security/{IMA-templates.txt => IMA-templates.rst} (72%) create mode 100644 Documentation/security/LSM.rst delete mode 100644 Documentation/security/conf.py rename Documentation/security/{credentials.txt => credentials.rst} (72%) rename Documentation/security/{keys.txt => keys/core.rst} (89%) rename Documentation/security/{keys-ecryptfs.txt => keys/ecryptfs.rst} (91%) create mode 100644 Documentation/security/keys/index.rst rename Documentation/security/{keys-request-key.txt => keys/request-key.rst} (77%) rename Documentation/security/{keys-trusted-encrypted.txt => keys/trusted-encrypted.rst} (93%) rename Documentation/security/{self-protection.txt => self-protection.rst} (83%) create mode 100644 Documentation/sh/conf.py create mode 100644 Documentation/sh/index.rst create mode 100644 Documentation/sound/conf.py delete mode 100755 Documentation/sphinx/tmplcvt rename Documentation/{prctl/no_new_privs.txt => userspace-api/no_new_privs.rst} (54%) rename Documentation/{prctl/seccomp_filter.txt => userspace-api/seccomp_filter.rst} (71%) delete mode 100644 scripts/check-lc_ctype.c Merging v4l-dvb/master (36bcba973ad4 [media] mtk_vcodec_dec: return error at mtk_vdec_pic_info_update()) $ git merge v4l-dvb/master Merge made by the 'recursive' strategy. drivers/media/cec/Kconfig | 1 + drivers/media/dvb-frontends/af9013.c | 1 + drivers/media/dvb-frontends/bcm3510.c | 4 +- drivers/media/dvb-frontends/dib7000p.c | 6 +- drivers/media/dvb-frontends/drx39xyj/drxj.c | 20 +- drivers/media/dvb-frontends/drxd_hard.c | 10 +- drivers/media/dvb-frontends/drxk_hard.c | 20 +- drivers/media/dvb-frontends/mt352.c | 1 + drivers/media/dvb-frontends/or51132.c | 4 +- drivers/media/dvb-frontends/s5h1411.c | 4 +- drivers/media/dvb-frontends/zl10353.c | 3 +- drivers/media/i2c/msp3400-kthreads.c | 1 + drivers/media/i2c/soc_camera/ov6650.c | 2 + drivers/media/i2c/tc358743.c | 2 +- drivers/media/pci/bt8xx/dst_ca.c | 1 + drivers/media/pci/cx23885/cx23885-cards.c | 3 +- drivers/media/pci/cx88/cx88-video.c | 2 +- drivers/media/pci/ddbridge/ddbridge-core.c | 7 +- drivers/media/pci/saa7134/saa7134-cards.c | 4 +- drivers/media/pci/saa7164/saa7164-cmd.c | 2 + drivers/media/pci/solo6x10/solo6x10-core.c | 1 + drivers/media/pci/solo6x10/solo6x10-i2c.c | 1 + drivers/media/platform/exynos4-is/fimc-capture.c | 3 + drivers/media/platform/marvell-ccic/mcam-core.c | 1 + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 10 +- drivers/media/platform/pxa_camera.c | 15 +- drivers/media/platform/s5p-cec/s5p_cec.h | 1 - drivers/media/platform/s5p-jpeg/jpeg-core.c | 8 +- drivers/media/platform/sh_vou.c | 2 + drivers/media/rc/iguanair.c | 1 + drivers/media/rc/imon.c | 2 +- drivers/media/rc/ir-lirc-codec.c | 25 +-- drivers/media/rc/lirc_dev.c | 13 +- drivers/media/rc/rc-main.c | 20 +- drivers/media/rc/sir_ir.c | 6 + drivers/media/tuners/tda18271-fe.c | 2 +- drivers/media/tuners/xc5000.c | 1 + drivers/media/usb/cpia2/cpia2_core.c | 51 +++-- drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- drivers/media/usb/dvb-usb-v2/af9015.c | 1 + drivers/media/usb/dvb-usb-v2/lmedm04.c | 1 + drivers/media/usb/dvb-usb/dib0700_devices.c | 1 + drivers/media/usb/dvb-usb/dvb-usb-remote.c | 5 + drivers/media/usb/dvb-usb/dw2102.c | 4 +- drivers/media/usb/gspca/ov519.c | 3 +- drivers/media/usb/pwc/pwc-v4l.c | 3 +- drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 6 +- drivers/media/usb/usbvision/usbvision-i2c.c | 3 + drivers/media/usb/uvc/uvc_video.c | 2 +- drivers/media/v4l2-core/videobuf2-core.c | 2 +- .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 1 - .../media/atomisp/pci/atomisp2/atomisp_fops.c | 14 +- .../media/atomisp/pci/atomisp2/atomisp_tpg.c | 1 + .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 2 +- .../css2400/hive_isp_css_include/math_support.h | 6 +- .../css2400/hive_isp_css_include/string_support.h | 9 +- .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 6 +- .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 2 +- .../isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 2 +- .../atomisp2/css2400/runtime/binary/src/binary.c | 2 +- .../css2400/runtime/debug/interface/ia_css_debug.h | 1 + .../css2400/runtime/debug/src/ia_css_debug.c | 6 +- .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 19 +- .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 2 +- .../atomisp/pci/atomisp2/css2400/sh_css_params.c | 10 +- .../platform/intel-mid/atomisp_gmin_platform.c | 210 +++++++++++---------- .../platform/intel-mid/intel_mid_pcihelpers.c | 12 +- include/media/cec-notifier.h | 12 +- 68 files changed, 364 insertions(+), 247 deletions(-) Merging v4l-dvb-next/master (791a9a666d1a Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) $ git merge v4l-dvb-next/master Already up-to-date. 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 (591c3beb86c4 dlm: Delete an unnecessary variable initialisation in dlm_ls_start()) $ git merge dlm/next Merge made by the 'recursive' strategy. fs/dlm/debug_fs.c | 25 ++++++++++++------------- fs/dlm/lock.c | 8 +++----- fs/dlm/lockspace.c | 3 ++- fs/dlm/member.c | 15 ++++++--------- fs/dlm/user.c | 2 ++ 5 files changed, 25 insertions(+), 28 deletions(-) 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 (1db3a61017c6 Merge branch 'dsa-distribute-switch-events') $ git merge net-next/master Auto-merging net/ipv4/tcp.c Auto-merging net/core/sock.c Auto-merging net/core/datagram.c Auto-merging net/bridge/br_stp_if.c Auto-merging include/net/sock.h Auto-merging include/linux/skbuff.h Auto-merging include/linux/netdevice.h Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/net/dsa/b53.txt | 3 + Documentation/networking/checksum-offloads.txt | 11 +- Documentation/networking/timestamping.txt | 26 +- arch/alpha/include/uapi/asm/socket.h | 2 + arch/frv/include/uapi/asm/socket.h | 2 + arch/ia64/include/uapi/asm/socket.h | 2 + arch/m32r/include/uapi/asm/socket.h | 2 + arch/mips/include/uapi/asm/socket.h | 2 + arch/mn10300/include/uapi/asm/socket.h | 2 + arch/parisc/include/uapi/asm/socket.h | 2 + arch/powerpc/boot/dts/fsl/kmcent2.dts | 4 +- arch/powerpc/include/uapi/asm/socket.h | 2 + arch/s390/include/uapi/asm/socket.h | 2 + arch/sparc/include/uapi/asm/socket.h | 2 + arch/xtensa/include/uapi/asm/socket.h | 2 + drivers/net/can/m_can/m_can.c | 87 +- drivers/net/dsa/Kconfig | 40 +- drivers/net/dsa/Makefile | 6 +- drivers/net/dsa/b53/b53_common.c | 11 +- drivers/net/dsa/b53/b53_priv.h | 4 +- drivers/net/dsa/b53/b53_srab.c | 2 + drivers/net/dsa/bcm_sf2.c | 5 +- drivers/net/dsa/dsa_loop.c | 3 +- drivers/net/dsa/mt7530.c | 3 +- drivers/net/dsa/mv88e6060.c | 2 +- drivers/net/dsa/mv88e6xxx/chip.c | 11 +- drivers/net/dsa/qca8k.c | 5 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +- .../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 138 +- 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 | 74 +- 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/aquantia/atlantic/aq_ring.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 56 +- drivers/net/ethernet/cavium/liquidio/lio_main.c | 25 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 18 +- .../net/ethernet/cavium/liquidio/octeon_device.c | 87 +- .../net/ethernet/cavium/liquidio/octeon_device.h | 25 + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 1 + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 34 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 19 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 30 + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 1 + drivers/net/ethernet/ibm/ibmveth.c | 107 +- drivers/net/ethernet/ibm/ibmveth.h | 1 + drivers/net/ethernet/ibm/ibmvnic.c | 1 + drivers/net/ethernet/intel/e1000e/netdev.c | 5 +- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 1 + drivers/net/ethernet/intel/igb/igb_ptp.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 1 + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 +- 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 | 22 +- .../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/neterion/vxge/vxge-main.c | 1 + drivers/net/ethernet/netronome/nfp/Makefile | 4 +- drivers/net/ethernet/netronome/nfp/nfp_app.c | 57 + drivers/net/ethernet/netronome/nfp/nfp_app.h | 56 + drivers/net/ethernet/netronome/nfp/nfp_main.c | 1 + drivers/net/ethernet/netronome/nfp/nfp_main.h | 25 +- drivers/net/ethernet/netronome/nfp/nfp_net.h | 63 +- .../net/ethernet/netronome/nfp/nfp_net_common.c | 255 +- drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 18 +- .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 4 +- .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 74 +- drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 346 +- .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 14 +- drivers/net/ethernet/netronome/nfp/nfp_port.c | 121 + drivers/net/ethernet/netronome/nfp/nfp_port.h | 102 + .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 11 + drivers/net/ethernet/qlogic/qed/qed.h | 4 +- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 12 +- drivers/net/ethernet/qlogic/qed/qed_debug.c | 3332 +++++++++-------- drivers/net/ethernet/qlogic/qed/qed_debug.h | 3 + drivers/net/ethernet/qlogic/qed/qed_dev.c | 79 +- drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 24 +- drivers/net/ethernet/qlogic/qed/qed_fcoe.h | 22 +- drivers/net/ethernet/qlogic/qed/qed_hsi.h | 3739 +++++++++++++------- .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 267 +- drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 4 + drivers/net/ethernet/qlogic/qed/qed_int.c | 3 + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 28 +- drivers/net/ethernet/qlogic/qed/qed_iscsi.h | 23 +- drivers/net/ethernet/qlogic/qed/qed_l2.c | 1 - drivers/net/ethernet/qlogic/qed/qed_ll2.c | 22 +- drivers/net/ethernet/qlogic/qed/qed_ll2.h | 13 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 1 - drivers/net/ethernet/qlogic/qed/qed_mcp.c | 1 + drivers/net/ethernet/qlogic/qed/qed_ooo.c | 30 +- drivers/net/ethernet/qlogic/qed/qed_ooo.h | 26 +- drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 186 +- drivers/net/ethernet/qlogic/qed/qed_roce.c | 4 - drivers/net/ethernet/qlogic/qed/qed_sp.h | 32 +- drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 23 +- drivers/net/ethernet/qlogic/qed/qed_spq.c | 54 +- drivers/net/ethernet/qlogic/qede/qede.h | 1 - drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 14 +- drivers/net/ethernet/qlogic/qede/qede_filter.c | 62 +- drivers/net/ethernet/qlogic/qede/qede_fp.c | 18 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 29 +- drivers/net/ethernet/qlogic/qede/qede_ptp.c | 1 + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 3 +- drivers/net/ethernet/sfc/ef10.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +- drivers/net/ethernet/ti/cpsw.c | 1 + drivers/net/ethernet/tile/tilegx.c | 1 + drivers/net/macsec.c | 15 +- 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 +- drivers/net/tap.c | 25 +- drivers/net/tun.c | 31 +- drivers/net/usb/net1080.c | 9 - drivers/net/usb/r8152.c | 6 - drivers/net/wan/fsl_ucc_hdlc.c | 92 +- drivers/net/wan/fsl_ucc_hdlc.h | 1 + drivers/net/wan/hdlc_raw_eth.c | 3 +- drivers/scsi/qedi/qedi_fw.c | 20 +- drivers/scsi/qedi/qedi_fw_api.c | 3 +- drivers/scsi/qedi/qedi_iscsi.c | 3 - drivers/vhost/net.c | 128 +- include/linux/if_tap.h | 5 + include/linux/if_tun.h | 5 + include/linux/netdevice.h | 11 +- include/linux/netlink.h | 5 + include/linux/phy.h | 17 +- include/linux/ptr_ring.h | 120 + include/linux/qed/common_hsi.h | 209 +- include/linux/qed/eth_common.h | 3 +- include/linux/qed/fcoe_common.h | 1 - include/linux/qed/iscsi_common.h | 91 +- include/linux/qed/rdma_common.h | 2 +- include/linux/qed/roce_common.h | 2 + include/linux/qed/tcp_common.h | 5 +- include/linux/skb_array.h | 31 + include/linux/skbuff.h | 146 +- include/linux/tcp.h | 24 +- include/linux/udp.h | 3 + include/net/act_api.h | 13 +- include/net/dsa.h | 44 +- include/net/dst.h | 2 +- include/net/ip6_fib.h | 3 +- include/net/ip6_route.h | 2 +- include/net/ip_fib.h | 3 +- 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/soc/fsl/qe/qe.h | 9 + include/uapi/asm-generic/socket.h | 2 + include/uapi/linux/net_tstamp.h | 15 +- include/uapi/linux/pkt_cls.h | 1 + include/uapi/linux/rtnetlink.h | 1 + net/bluetooth/af_bluetooth.c | 2 +- net/bridge/br_stp_if.c | 11 - net/bridge/netfilter/nft_reject_bridge.c | 5 +- net/caif/caif_socket.c | 2 +- net/core/datagram.c | 92 +- net/core/dev.c | 90 +- net/core/dev_ioctl.c | 1 + net/core/net-sysfs.c | 8 +- net/core/rtnetlink.c | 4 +- net/core/skbuff.c | 30 + net/core/sock.c | 4 + net/dcb/dcbnl.c | 11 +- net/dccp/ccids/ccid2.c | 8 +- net/dccp/ccids/ccid2.h | 2 +- net/dsa/Kconfig | 8 +- net/dsa/Makefile | 8 +- net/dsa/dsa.c | 20 +- net/dsa/dsa2.c | 16 +- net/dsa/dsa_priv.h | 102 +- net/dsa/legacy.c | 12 +- net/dsa/port.c | 260 ++ net/dsa/slave.c | 367 +- net/dsa/switch.c | 178 +- net/dsa/tag_brcm.c | 4 +- net/dsa/tag_dsa.c | 2 +- net/dsa/tag_edsa.c | 2 +- net/dsa/tag_lan9303.c | 2 +- net/dsa/tag_mtk.c | 2 +- net/dsa/tag_qca.c | 4 +- net/dsa/tag_trailer.c | 4 +- net/ipv4/fib_frontend.c | 18 +- net/ipv4/fib_lookup.h | 3 +- net/ipv4/fib_semantics.c | 133 +- net/ipv4/fib_trie.c | 4 +- net/ipv4/fou.c | 82 +- net/ipv4/inet_connection_sock.c | 1 + net/ipv4/netfilter/nf_reject_ipv4.c | 2 +- net/ipv4/syncookies.c | 8 +- net/ipv4/tcp.c | 15 +- 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 | 139 +- 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_nv.c | 5 +- net/ipv4/tcp_output.c | 131 +- net/ipv4/tcp_rate.c | 16 +- net/ipv4/tcp_recovery.c | 24 +- net/ipv4/tcp_timer.c | 21 +- net/ipv4/tcp_westwood.c | 6 +- net/ipv4/udp.c | 156 +- net/ipv6/addrconf.c | 4 +- net/ipv6/fou6.c | 14 +- net/ipv6/ila/ila_lwt.c | 2 +- net/ipv6/ip6_fib.c | 18 +- net/ipv6/netfilter/nf_reject_ipv6.c | 3 - net/ipv6/route.c | 97 +- net/ipv6/seg6.c | 4 - 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/openvswitch/datapath.c | 2 +- net/sched/act_api.c | 55 +- net/sched/act_csum.c | 1 + 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 +- net/sctp/offload.c | 7 + net/sctp/output.c | 1 + net/socket.c | 49 +- tools/hv/bondvf.sh | 21 +- 264 files changed, 10530 insertions(+), 6334 deletions(-) create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_app.c create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_app.h create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_port.c create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_port.h create mode 100644 net/dsa/port.c Merging ipsec-next/master (d49c9dc1c848 ipv6: remove unused variables in esp6) $ git merge ipsec-next/master Auto-merging net/xfrm/xfrm_state.c Auto-merging net/xfrm/xfrm_device.c Merge made by the 'recursive' strategy. net/ipv4/ah4.c | 5 +++-- net/ipv6/ah6.c | 5 +++-- net/ipv6/esp6.c | 5 ----- net/xfrm/xfrm_device.c | 2 +- net/xfrm/xfrm_state.c | 11 +++-------- 5 files changed, 10 insertions(+), 18 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 (c239838fbd6d p54: allocate enough space for ->used_rxkeys) $ git merge wireless-drivers-next/master Merge made by the 'recursive' strategy. drivers/net/wireless/ath/ath10k/Kconfig | 7 + drivers/net/wireless/ath/ath10k/Makefile | 3 + drivers/net/wireless/ath/ath10k/bmi.c | 71 + drivers/net/wireless/ath/ath10k/bmi.h | 2 + drivers/net/wireless/ath/ath10k/core.c | 36 +- drivers/net/wireless/ath/ath10k/core.h | 3 + drivers/net/wireless/ath/ath10k/debug.c | 16 +- drivers/net/wireless/ath/ath10k/debug.h | 2 + drivers/net/wireless/ath/ath10k/htc.c | 244 ++- drivers/net/wireless/ath/ath10k/htc.h | 39 +- drivers/net/wireless/ath/ath10k/hw.h | 53 + drivers/net/wireless/ath/ath10k/sdio.c | 2113 ++++++++++++++++++++ drivers/net/wireless/ath/ath10k/sdio.h | 229 +++ drivers/net/wireless/ath/ath10k/targaddrs.h | 24 + drivers/net/wireless/ath/ath10k/testmode.c | 7 + drivers/net/wireless/ath/ath10k/testmode_i.h | 1 + drivers/net/wireless/ath/ath5k/debug.c | 5 +- drivers/net/wireless/ath/ath6kl/txrx.c | 13 +- drivers/net/wireless/ath/ath9k/common.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom.c | 2 +- drivers/net/wireless/ath/ath9k/tx99.c | 2 +- drivers/net/wireless/ath/wil6210/debugfs.c | 12 +- drivers/net/wireless/broadcom/b43/main.c | 10 + .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c | 4 +- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 21 +- .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 22 +- .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- .../broadcom/brcm80211/brcmfmac/fwil_types.h | 59 + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 10 + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.h | 8 + drivers/net/wireless/intersil/hostap/hostap_hw.c | 12 +- drivers/net/wireless/intersil/hostap/hostap_wlan.h | 3 +- .../net/wireless/intersil/orinoco/orinoco_usb.c | 15 +- drivers/net/wireless/intersil/p54/fwio.c | 5 +- drivers/net/wireless/marvell/mwifiex/11h.c | 6 - drivers/net/wireless/marvell/mwifiex/11n.c | 17 +- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 71 +- drivers/net/wireless/marvell/mwifiex/cmdevt.c | 7 +- drivers/net/wireless/marvell/mwifiex/init.c | 12 +- drivers/net/wireless/marvell/mwifiex/main.h | 5 +- drivers/net/wireless/marvell/mwifiex/pcie.c | 188 +- drivers/net/wireless/marvell/mwifiex/sdio.c | 16 +- drivers/net/wireless/marvell/mwifiex/usb.c | 3 +- drivers/net/wireless/ray_cs.c | 7 +- .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 68 +- .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.h | 2 - .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 542 ++++- .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.h | 22 +- .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 80 +- .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.h | 2 - .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 275 ++- .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.h | 4 +- .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 515 +++-- .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.h | 10 +- .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 6 + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 2 +- .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 4 +- .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 2 +- drivers/net/wireless/ti/wlcore/debugfs.c | 13 +- 60 files changed, 4165 insertions(+), 775 deletions(-) create mode 100644 drivers/net/wireless/ath/ath10k/sdio.c create mode 100644 drivers/net/wireless/ath/ath10k/sdio.h Merging bluetooth/master (3a21bf586dd0 ieee802154: ca8210: Delete an error message for a failed memory allocation in ca8210_skb_rx()) $ git merge bluetooth/master Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 4 ++-- drivers/bluetooth/Kconfig | 3 ++- drivers/bluetooth/btusb.c | 4 ++++ drivers/bluetooth/hci_ldisc.c | 40 ++++++++++++++++++++++++++++++----- drivers/bluetooth/hci_uart.h | 1 + drivers/net/ieee802154/ca8210.c | 9 ++------ include/net/bluetooth/hci.h | 8 +++++++ net/bluetooth/ecdh_helper.c | 11 +++------- net/bluetooth/hci_core.c | 46 ++++++++++++++++++++++++++++++++++++----- 9 files changed, 98 insertions(+), 28 deletions(-) Merging mac80211-next/master (3b23782f7d00 mac80211: mark as action frame when parsing IEs of CSA action frames) $ git merge mac80211-next/master Auto-merging net/wireless/util.c Merge made by the 'recursive' strategy. include/net/cfg80211.h | 4 ++++ include/net/mac80211.h | 16 ++++++++++++++++ net/mac80211/cfg.c | 1 + net/mac80211/debugfs_sta.c | 6 ++++++ net/mac80211/ibss.c | 1 - net/mac80211/ieee80211_i.h | 3 +++ net/mac80211/mesh.c | 39 ++++++++++++++++++++++++++++++++++----- net/mac80211/mlme.c | 1 - net/mac80211/rate.c | 3 ++- net/mac80211/spectmgmt.c | 7 +++++++ net/mac80211/sta_info.c | 30 ++++++++++++++++++++++++++++++ net/mac80211/sta_info.h | 11 +++++++++++ net/mac80211/tx.c | 9 ++++++++- net/wireless/mesh.c | 8 ++++++++ net/wireless/nl80211.c | 17 ++++++++++++++++- net/wireless/util.c | 11 +++++++---- 16 files changed, 153 insertions(+), 14 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 include/linux/mtd/nand.h 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 (cce2ea8d90fe crypto: aesni - add generic gcm(aes)) $ git merge crypto/master Merge made by the 'recursive' strategy. arch/arm64/crypto/sha1-ce-core.S | 6 +- arch/arm64/crypto/sha1-ce-glue.c | 11 +- arch/arm64/crypto/sha2-ce-core.S | 6 +- arch/arm64/crypto/sha2-ce-glue.c | 13 +- arch/x86/crypto/aesni-intel_asm.S | 231 +++++++++++---- arch/x86/crypto/aesni-intel_avx-x86_64.S | 283 +++++++++++++------ arch/x86/crypto/aesni-intel_glue.c | 208 ++++++++++---- arch/x86/crypto/sha512-mb/sha512_mb.c | 7 +- crypto/tcrypt.c | 4 - drivers/crypto/caam/caampkc.c | 463 +++++++++++++++++++++++++++++-- drivers/crypto/caam/caampkc.h | 58 ++++ drivers/crypto/caam/pdb.h | 62 +++++ drivers/crypto/caam/pkc_desc.c | 36 +++ drivers/crypto/ccp/ccp-dev.c | 1 + 14 files changed, 1158 insertions(+), 231 deletions(-) Merging drm/drm-next (e98c58e55f68 Merge tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc into drm-next) $ git merge drm/drm-next Auto-merging drivers/gpu/drm/radeon/radeon_kms.c Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c Auto-merging drivers/gpu/drm/nouveau/nouveau_display.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/display/brcm,bcm-vc4.txt | 7 +- .../devicetree/bindings/display/st,stm32-ltdc.txt | 36 + .../devicetree/bindings/display/zte,vou.txt | 21 + Documentation/gpu/index.rst | 1 + Documentation/gpu/pl111.rst | 6 + MAINTAINERS | 17 + drivers/dma-buf/dma-buf.c | 8 +- drivers/dma-buf/dma-fence.c | 5 + drivers/dma-buf/sync_debug.c | 6 +- drivers/dma-buf/sync_file.c | 13 +- drivers/gpu/drm/Kconfig | 4 + drivers/gpu/drm/Makefile | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 41 - drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 + drivers/gpu/drm/bridge/sii902x.c | 6 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 46 +- drivers/gpu/drm/drm_atomic.c | 87 +- drivers/gpu/drm/drm_atomic_helper.c | 12 +- drivers/gpu/drm/drm_color_mgmt.c | 9 +- drivers/gpu/drm/drm_connector.c | 64 ++ drivers/gpu/drm/drm_dp_mst_topology.c | 164 ++- drivers/gpu/drm/drm_fb_cma_helper.c | 29 +- drivers/gpu/drm/drm_file.c | 8 +- drivers/gpu/drm/drm_irq.c | 129 ++- drivers/gpu/drm/drm_plane_helper.c | 11 +- drivers/gpu/drm/drm_prime.c | 30 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 +- drivers/gpu/drm/gma500/mdfld_tpo_vid.c | 51 +- drivers/gpu/drm/i915/i915_irq.c | 62 +- drivers/gpu/drm/i915/intel_display.c | 11 +- drivers/gpu/drm/i915/intel_dp_mst.c | 48 +- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_hdmi.c | 18 +- drivers/gpu/drm/i915/intel_sdvo.c | 23 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 45 +- drivers/gpu/drm/nouveau/nouveau_display.c | 39 +- drivers/gpu/drm/nouveau/nouveau_display.h | 8 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 11 +- drivers/gpu/drm/pl111/Kconfig | 12 + drivers/gpu/drm/pl111/Makefile | 5 + drivers/gpu/drm/pl111/pl111_connector.c | 127 +++ drivers/gpu/drm/pl111/pl111_display.c | 344 ++++++ drivers/gpu/drm/pl111/pl111_drm.h | 56 + drivers/gpu/drm/pl111/pl111_drv.c | 272 +++++ drivers/gpu/drm/radeon/radeon_drv.c | 18 +- drivers/gpu/drm/radeon/radeon_kms.c | 37 - drivers/gpu/drm/radeon/radeon_mode.h | 3 + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 14 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 20 +- drivers/gpu/drm/selftests/test-drm_mm.c | 28 + drivers/gpu/drm/sti/sti_cursor.c | 5 +- drivers/gpu/drm/sti/sti_dvo.c | 3 +- drivers/gpu/drm/sti/sti_gdp.c | 5 +- drivers/gpu/drm/sti/sti_hda.c | 9 +- drivers/gpu/drm/sti/sti_hdmi.c | 23 +- drivers/gpu/drm/sti/sti_hqvdp.c | 7 +- drivers/gpu/drm/sti/sti_mixer.c | 3 +- drivers/gpu/drm/sti/sti_tvout.c | 7 +- drivers/gpu/drm/sti/sti_vid.c | 5 +- drivers/gpu/drm/stm/Kconfig | 16 + drivers/gpu/drm/stm/Makefile | 7 + drivers/gpu/drm/stm/drv.c | 221 ++++ drivers/gpu/drm/stm/ltdc.c | 1160 ++++++++++++++++++++ drivers/gpu/drm/stm/ltdc.h | 40 + drivers/gpu/drm/tegra/drm.c | 4 +- drivers/gpu/drm/vc4/Makefile | 1 + drivers/gpu/drm/vc4/vc4_bo.c | 37 +- drivers/gpu/drm/vc4/vc4_crtc.c | 34 +- drivers/gpu/drm/vc4/vc4_drv.c | 6 +- drivers/gpu/drm/vc4/vc4_drv.h | 70 +- drivers/gpu/drm/vc4/vc4_fence.c | 56 + drivers/gpu/drm/vc4/vc4_gem.c | 161 ++- drivers/gpu/drm/vc4/vc4_hdmi.c | 174 +-- drivers/gpu/drm/vc4/vc4_irq.c | 65 +- drivers/gpu/drm/vc4/vc4_kms.c | 10 +- drivers/gpu/drm/vc4/vc4_render_cl.c | 3 +- drivers/gpu/drm/vc4/vc4_v3d.c | 180 +++ drivers/gpu/drm/vc4/vc4_validate.c | 54 +- drivers/gpu/drm/vgem/vgem_drv.c | 194 +++- drivers/gpu/drm/vgem/vgem_drv.h | 2 + drivers/gpu/drm/zte/Makefile | 1 + drivers/gpu/drm/zte/zx_common_regs.h | 31 + drivers/gpu/drm/zte/zx_drm_drv.c | 1 + drivers/gpu/drm/zte/zx_drm_drv.h | 1 + drivers/gpu/drm/zte/zx_plane.c | 1 + drivers/gpu/drm/zte/zx_plane_regs.h | 18 - drivers/gpu/drm/zte/zx_vga.c | 531 +++++++++ drivers/gpu/drm/zte/zx_vga_regs.h | 36 + drivers/gpu/drm/zte/zx_vou.c | 36 +- drivers/gpu/drm/zte/zx_vou_regs.h | 12 +- include/drm/drmP.h | 9 - include/drm/drm_atomic.h | 95 ++ include/drm/drm_blend.h | 1 + include/drm/drm_color_mgmt.h | 2 + include/drm/drm_connector.h | 21 + include/drm/drm_crtc.h | 34 +- include/drm/drm_dp_helper.h | 166 +++ include/drm/drm_dp_mst_helper.h | 26 + include/drm/drm_drv.h | 75 +- include/drm/drm_fb_cma_helper.h | 4 + include/drm/drm_gem_cma_helper.h | 17 +- include/drm/drm_irq.h | 21 +- include/drm/drm_prime.h | 7 + include/linux/amba/clcd-regs.h | 81 ++ include/linux/amba/clcd.h | 68 +- include/linux/sync_file.h | 3 - 109 files changed, 4980 insertions(+), 927 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/st,stm32-ltdc.txt create mode 100644 Documentation/gpu/pl111.rst create mode 100644 drivers/gpu/drm/pl111/Kconfig create mode 100644 drivers/gpu/drm/pl111/Makefile create mode 100644 drivers/gpu/drm/pl111/pl111_connector.c create mode 100644 drivers/gpu/drm/pl111/pl111_display.c create mode 100644 drivers/gpu/drm/pl111/pl111_drm.h create mode 100644 drivers/gpu/drm/pl111/pl111_drv.c create mode 100644 drivers/gpu/drm/stm/Kconfig create mode 100644 drivers/gpu/drm/stm/Makefile create mode 100644 drivers/gpu/drm/stm/drv.c create mode 100644 drivers/gpu/drm/stm/ltdc.c create mode 100644 drivers/gpu/drm/stm/ltdc.h create mode 100644 drivers/gpu/drm/vc4/vc4_fence.c create mode 100644 drivers/gpu/drm/zte/zx_common_regs.h create mode 100644 drivers/gpu/drm/zte/zx_vga.c create mode 100644 drivers/gpu/drm/zte/zx_vga_regs.h create mode 100644 include/linux/amba/clcd-regs.h 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 (48f1fc3a301d drm/i915/g33: Improve reset reliability) $ git merge drm-intel/for-linux-next Resolved 'drivers/gpu/drm/i915/i915_gem_shrinker.c' using previous resolution. Resolved 'drivers/gpu/drm/i915/intel_dp_mst.c' using previous resolution. 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_sdvo.c Auto-merging drivers/gpu/drm/i915/intel_lrc.c Auto-merging drivers/gpu/drm/i915/intel_lpe_audio.c Auto-merging drivers/gpu/drm/i915/intel_hdmi.c Auto-merging drivers/gpu/drm/i915/intel_drv.h Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp_mst.c Auto-merging drivers/gpu/drm/i915/intel_display.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_irq.c Auto-merging drivers/gpu/drm/i915/i915_gem_shrinker.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c 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 Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master da12b04746e2] Merge remote-tracking branch 'drm-intel/for-linux-next' $ git diff -M --stat --summary HEAD^.. 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 | 220 +-- drivers/gpu/drm/i915/i915_drv.c | 31 +- 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 | 30 +- 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 | 56 +- 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 | 95 +- 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 | 413 +++--- 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 | 108 +- drivers/gpu/drm/i915/intel_uc.h | 35 +- drivers/gpu/drm/i915/intel_uncore.c | 369 +++-- 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 | 582 ++++++++ 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 | 12 +- 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, 7078 insertions(+), 3018 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 (665f37e7eec3 drm/pl111: Fix return value check in pl111_amba_probe()) $ git merge drm-misc/for-linux-next Recorded preimage for 'drivers/gpu/drm/i915/intel_display.c' Removing include/drm/drm_mem_util.h Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c Auto-merging drivers/gpu/drm/i915/intel_sprite.c Auto-merging drivers/gpu/drm/i915/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/intel_atomic_plane.c Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_debugfs.c Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/gpu/drm/i915/intel_display.c'. [master 17fc29ecd0d3] Merge remote-tracking branch 'drm-misc/for-linux-next' $ git diff -M --stat --summary HEAD^.. drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 19 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 2 +- drivers/gpu/drm/amd/amdgpu/ci_smc.c | 2 +- drivers/gpu/drm/amd/amdgpu/cik.c | 2 +- drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/cz_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 +- drivers/gpu/drm/amd/amdgpu/kv_smc.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 2 +- drivers/gpu/drm/amd/amdgpu/si.c | 2 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 2 +- drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/si_smc.c | 2 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/vi.c | 2 +- drivers/gpu/drm/amd/amdkfd/Makefile | 2 +- drivers/gpu/drm/amd/powerplay/Makefile | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 +- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 +- drivers/gpu/drm/arm/malidp_drv.h | 2 +- drivers/gpu/drm/arm/malidp_planes.c | 18 +-- drivers/gpu/drm/armada/armada_overlay.c | 2 +- drivers/gpu/drm/ast/Makefile | 2 - drivers/gpu/drm/ast/ast_ttm.c | 3 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 20 +-- drivers/gpu/drm/bochs/Makefile | 1 - drivers/gpu/drm/bochs/bochs.h | 4 +- drivers/gpu/drm/bridge/Makefile | 2 - drivers/gpu/drm/bridge/nxp-ptn3460.c | 12 +- drivers/gpu/drm/bridge/parade-ps8622.c | 10 +- drivers/gpu/drm/cirrus/Makefile | 1 - drivers/gpu/drm/cirrus/cirrus_ttm.c | 3 +- drivers/gpu/drm/drm_atomic.c | 2 +- drivers/gpu/drm/drm_atomic_helper.c | 2 +- drivers/gpu/drm/drm_blend.c | 45 +++--- drivers/gpu/drm/drm_fb_helper.c | 4 +- drivers/gpu/drm/drm_gem.c | 6 +- drivers/gpu/drm/drm_plane_helper.c | 2 +- drivers/gpu/drm/drm_rect.c | 36 ++--- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 12 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 4 +- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 12 +- drivers/gpu/drm/exynos/exynos_drm_gem.c | 11 +- drivers/gpu/drm/gma500/Makefile | 1 - drivers/gpu/drm/hisilicon/hibmc/Makefile | 1 - drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +- drivers/gpu/drm/i2c/Makefile | 2 - drivers/gpu/drm/i810/Makefile | 1 - drivers/gpu/drm/i915/i915_debugfs.c | 18 +-- drivers/gpu/drm/i915/i915_gem.c | 4 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 34 ++--- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 8 +- drivers/gpu/drm/i915/intel_atomic_plane.c | 6 +- drivers/gpu/drm/i915/intel_display.c | 52 +++---- drivers/gpu/drm/i915/intel_fbc.c | 2 +- drivers/gpu/drm/i915/intel_fbdev.c | 2 +- drivers/gpu/drm/i915/intel_sprite.c | 20 +-- drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 12 +- drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- drivers/gpu/drm/mga/Makefile | 1 - drivers/gpu/drm/mgag200/Makefile | 1 - drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 +- drivers/gpu/drm/msm/Makefile | 2 +- drivers/gpu/drm/msm/dsi/dsi.h | 6 +- drivers/gpu/drm/msm/edp/edp.h | 4 +- drivers/gpu/drm/msm/edp/edp_ctrl.c | 6 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 10 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c | 6 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 7 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 4 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 6 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 6 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 10 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 6 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 30 ++-- drivers/gpu/drm/msm/msm_fb.c | 6 +- drivers/gpu/drm/msm/msm_fbdev.c | 6 +- drivers/gpu/drm/msm/msm_gem.c | 10 +- drivers/gpu/drm/nouveau/Kbuild | 1 - drivers/gpu/drm/nouveau/nouveau_drm.c | 4 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- drivers/gpu/drm/nouveau/nv50_display.c | 2 +- drivers/gpu/drm/omapdrm/Makefile | 1 - drivers/gpu/drm/omapdrm/omap_drv.c | 4 +- drivers/gpu/drm/omapdrm/omap_fb.c | 18 +-- drivers/gpu/drm/omapdrm/omap_plane.c | 16 +- drivers/gpu/drm/pl111/Kconfig | 1 + drivers/gpu/drm/pl111/Makefile | 2 + drivers/gpu/drm/pl111/pl111_debugfs.c | 55 +++++++ drivers/gpu/drm/pl111/pl111_display.c | 164 +++++++++++++++++++-- drivers/gpu/drm/pl111/pl111_drm.h | 11 ++ drivers/gpu/drm/pl111/pl111_drv.c | 21 ++- drivers/gpu/drm/qxl/Makefile | 2 - drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +- drivers/gpu/drm/qxl/qxl_display.c | 9 +- drivers/gpu/drm/qxl/qxl_drv.c | 6 +- drivers/gpu/drm/qxl/qxl_drv.h | 18 +-- drivers/gpu/drm/qxl/qxl_fb.c | 11 +- drivers/gpu/drm/qxl/qxl_gem.c | 5 +- drivers/gpu/drm/qxl/qxl_ttm.c | 10 +- drivers/gpu/drm/r128/Makefile | 1 - drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/btc_dpm.c | 2 +- drivers/gpu/drm/radeon/ci_dpm.c | 2 +- drivers/gpu/drm/radeon/ci_smc.c | 2 +- drivers/gpu/drm/radeon/cik.c | 2 +- drivers/gpu/drm/radeon/cypress_dpm.c | 2 +- drivers/gpu/drm/radeon/kv_dpm.c | 2 +- drivers/gpu/drm/radeon/kv_smc.c | 2 +- drivers/gpu/drm/radeon/ni_dpm.c | 2 +- drivers/gpu/drm/radeon/r600_dpm.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 10 +- drivers/gpu/drm/radeon/radeon_cs.c | 11 +- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_ring.c | 4 +- drivers/gpu/drm/radeon/radeon_ttm.c | 10 +- drivers/gpu/drm/radeon/radeon_vm.c | 4 +- drivers/gpu/drm/radeon/rs780_dpm.c | 2 +- drivers/gpu/drm/radeon/rv6xx_dpm.c | 2 +- drivers/gpu/drm/radeon/rv730_dpm.c | 2 +- drivers/gpu/drm/radeon/rv740_dpm.c | 2 +- drivers/gpu/drm/radeon/rv770_dpm.c | 2 +- drivers/gpu/drm/radeon/rv770_smc.c | 2 +- drivers/gpu/drm/radeon/si_dpm.c | 2 +- drivers/gpu/drm/radeon/si_smc.c | 2 +- drivers/gpu/drm/radeon/sumo_dpm.c | 2 +- drivers/gpu/drm/radeon/sumo_smc.c | 2 +- drivers/gpu/drm/radeon/trinity_dpm.c | 2 +- drivers/gpu/drm/radeon/trinity_smc.c | 2 +- drivers/gpu/drm/savage/Makefile | 1 - drivers/gpu/drm/sis/Makefile | 1 - drivers/gpu/drm/sti/sti_compositor.c | 2 +- drivers/gpu/drm/stm/Makefile | 2 - drivers/gpu/drm/tdfx/Makefile | 1 - drivers/gpu/drm/tilcdc/Makefile | 1 - drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +- drivers/gpu/drm/ttm/Makefile | 1 - drivers/gpu/drm/ttm/ttm_bo_vm.c | 6 +- drivers/gpu/drm/ttm/ttm_tt.c | 13 +- drivers/gpu/drm/udl/Makefile | 3 - drivers/gpu/drm/udl/udl_dmabuf.c | 2 +- drivers/gpu/drm/udl/udl_gem.c | 2 +- drivers/gpu/drm/vc4/Kconfig | 2 +- drivers/gpu/drm/vc4/Makefile | 2 - drivers/gpu/drm/vc4/vc4_crtc.c | 14 +- drivers/gpu/drm/vc4/vc4_dpi.c | 16 +- drivers/gpu/drm/vc4/vc4_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.h | 6 +- drivers/gpu/drm/vc4/vc4_dsi.c | 140 +++++++++++++----- drivers/gpu/drm/vc4/vc4_gem.c | 15 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 30 ++-- drivers/gpu/drm/vc4/vc4_hvs.c | 2 +- drivers/gpu/drm/vc4/vc4_kms.c | 12 +- drivers/gpu/drm/vc4/vc4_plane.c | 9 +- drivers/gpu/drm/vc4/vc4_v3d.c | 6 +- drivers/gpu/drm/vc4/vc4_validate.c | 3 +- drivers/gpu/drm/vgem/Makefile | 1 - drivers/gpu/drm/vgem/vgem_drv.c | 8 +- drivers/gpu/drm/via/Makefile | 1 - drivers/gpu/drm/virtio/Makefile | 2 - drivers/gpu/drm/virtio/virtgpu_debugfs.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 4 +- drivers/gpu/drm/virtio/virtgpu_drv.h | 8 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 32 ++-- drivers/gpu/drm/virtio/virtgpu_ttm.c | 10 +- drivers/gpu/drm/vmwgfx/Makefile | 3 - drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 3 +- include/drm/drmP.h | 1 - include/drm/drm_blend.h | 21 +-- include/drm/drm_connector.h | 2 +- include/drm/drm_mem_util.h | 78 ---------- include/drm/drm_panel.h | 2 + include/drm/ttm/ttm_bo_driver.h | 9 +- include/drm/ttm/ttm_execbuf_util.h | 3 +- include/drm/ttm/ttm_lock.h | 3 +- include/drm/ttm/ttm_object.h | 3 +- include/linux/amba/clcd-regs.h | 5 + include/uapi/drm/drm_mode.h | 49 +++++- 213 files changed, 948 insertions(+), 749 deletions(-) create mode 100644 drivers/gpu/drm/pl111/pl111_debugfs.c delete mode 100644 include/drm/drm_mem_util.h 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 Already up-to-date. 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 Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c 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_gpu.c | 30 ++++-- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 + 6 files changed, 122 insertions(+), 69 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 (a02cb8f8def6 ALSA: firewire: remove support for 16 bit PCM samples in playback substream) $ 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 | 4 +- sound/core/pcm.c | 33 +- sound/core/pcm_drm_eld.c | 8 +- sound/core/pcm_lib.c | 8 +- sound/core/pcm_native.c | 270 +++++--------- sound/drivers/opl3/opl3_oss.c | 14 - sound/drivers/opl4/opl4_lib.c | 4 +- sound/drivers/opl4/opl4_local.h | 2 +- sound/firewire/amdtp-am824.c | 71 +--- sound/firewire/amdtp-am824.h | 6 +- sound/firewire/bebob/bebob_pcm.c | 4 - sound/firewire/dice/dice-pcm.c | 6 - sound/firewire/digi00x/amdtp-dot.c | 63 +--- sound/firewire/digi00x/digi00x-pcm.c | 7 +- sound/firewire/digi00x/digi00x.h | 1 - sound/firewire/fireworks/fireworks_pcm.c | 4 - sound/firewire/oxfw/oxfw-pcm.c | 4 - sound/firewire/tascam/amdtp-tascam.c | 62 +--- sound/firewire/tascam/tascam-pcm.c | 7 +- sound/firewire/tascam/tascam.h | 1 - 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/gus/gus_main.c | 2 +- sound/isa/gus/gus_pcm.c | 4 +- sound/isa/sb/emu8000.c | 2 +- sound/isa/sb/sb16.c | 2 +- sound/isa/sb/sb16_csp.c | 4 +- sound/isa/sb/sb16_main.c | 2 +- sound/isa/sscape.c | 2 +- sound/pci/cs4281.c | 2 +- sound/pci/cs46xx/cs46xx_lib.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/ice1712/ice1712.c | 6 +- sound/pci/ice1712/ice1724.c | 2 +- sound/pci/mixart/mixart_mixer.c | 6 +- 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 + 70 files changed, 570 insertions(+), 2347 deletions(-) delete mode 100644 sound/atmel/abdac.c Merging sound-asoc/for-next (10f9d34d9501 Merge remote-tracking branches 'asoc/topic/sh', 'asoc/topic/stm32' 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/cs35l35.txt | 3 + .../devicetree/bindings/sound/renesas,rsnd.txt | 34 +- .../devicetree/bindings/sound/simple-scu-card.txt | 65 +- .../devicetree/bindings/sound/st,stm32-i2s.txt | 62 ++ drivers/of/base.c | 62 +- include/linux/of_graph.h | 21 + include/sound/cs35l35.h | 2 + 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/cs35l35.c | 84 +- sound/soc/codecs/cs35l35.h | 6 + sound/soc/codecs/da7213.c | 39 +- 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 | 310 +++++++ sound/soc/generic/simple-card-utils.c | 73 +- sound/soc/generic/simple-card.c | 8 +- sound/soc/generic/simple-scu-card.c | 6 +- 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/Kconfig | 2 +- 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 | 255 ++++-- sound/soc/sh/rcar/gen.c | 3 + sound/soc/sh/rcar/rsnd.h | 13 +- sound/soc/sh/rcar/src.c | 30 +- sound/soc/sh/rcar/ssi.c | 65 +- sound/soc/sh/rcar/ssiu.c | 40 +- sound/soc/soc-core.c | 10 +- sound/soc/stm/Kconfig | 2 +- sound/soc/stm/Makefile | 4 + sound/soc/stm/stm32_i2s.c | 946 +++++++++++++++++++++ 52 files changed, 2421 insertions(+), 401 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.txt create mode 100644 sound/soc/generic/audio-graph-card.c create mode 100644 sound/soc/stm/stm32_i2s.c Merging modules/modules-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge modules/modules-next Already up-to-date. Merging input/next (8fd708157a59 Input: tsc2007 - move header file out of I2C realm) $ git merge input/next Auto-merging include/linux/platform_data/tsc2007.h Auto-merging drivers/input/mouse/elantech.c Merge made by the 'recursive' strategy. arch/sh/boards/mach-ecovec24/setup.c | 2 +- drivers/input/input.c | 12 ++--- drivers/input/keyboard/lm8323.c | 2 +- drivers/input/keyboard/mcs_touchkey.c | 2 +- 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 ++++ drivers/input/touchscreen/mcs5000_ts.c | 2 +- drivers/input/touchscreen/mms114.c | 2 +- drivers/input/touchscreen/tsc2007_core.c | 2 +- drivers/mfd/timberdale.c | 2 +- include/linux/{i2c => platform_data}/lm8323.h | 0 include/linux/{i2c => platform_data}/mcs.h | 0 include/linux/{i2c => platform_data}/mms114.h | 0 include/linux/{i2c => platform_data}/tsc2007.h | 2 +- 17 files changed, 131 insertions(+), 31 deletions(-) rename include/linux/{i2c => platform_data}/lm8323.h (100%) rename include/linux/{i2c => platform_data}/mcs.h (100%) rename include/linux/{i2c => platform_data}/mms114.h (100%) rename include/linux/{i2c => platform_data}/tsc2007.h (94%) 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 (26d73cccecb8 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-integrity.c | 27 +++------- drivers/md/dm-ioctl.c | 114 +++++++++++++++++++++++++++++++++--------- drivers/md/dm-verity-target.c | 4 +- drivers/md/dm.c | 5 ++ include/uapi/linux/dm-ioctl.h | 6 ++- 8 files changed, 112 insertions(+), 51 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 (9d84fe2b43db Merge branch 'fixes' into next) $ git merge mmc/next Auto-merging drivers/mmc/host/tmio_mmc_core.c Auto-merging drivers/mmc/host/renesas_sdhi_sys_dmac.c Auto-merging drivers/mmc/host/renesas_sdhi_core.c Merge made by the 'recursive' strategy. drivers/mmc/core/Kconfig | 18 -- drivers/mmc/core/block.c | 253 +++++++++++++-------- drivers/mmc/core/core.c | 2 + drivers/mmc/core/host.c | 2 + drivers/mmc/core/mmc.c | 2 + drivers/mmc/core/mmc_ops.c | 10 +- drivers/mmc/core/mmc_ops.h | 1 + drivers/mmc/core/mmc_test.c | 2 - drivers/mmc/core/pwrseq.c | 8 + drivers/mmc/core/pwrseq.h | 3 + drivers/mmc/core/pwrseq_emmc.c | 2 +- drivers/mmc/core/queue.c | 243 +++++--------------- drivers/mmc/core/queue.h | 47 ++-- drivers/mmc/core/sd.c | 16 +- drivers/mmc/core/sdio_irq.c | 22 +- drivers/mmc/core/sdio_ops.h | 2 + drivers/mmc/host/Kconfig | 12 +- drivers/mmc/host/Makefile | 4 +- drivers/mmc/host/atmel-mci.c | 28 +-- drivers/mmc/host/cavium-octeon.c | 15 +- drivers/mmc/host/cavium-thunderx.c | 6 + drivers/mmc/host/cavium.c | 29 ++- drivers/mmc/host/dw_mmc.c | 42 +++- drivers/mmc/host/pxamci.c | 6 +- drivers/mmc/host/renesas_sdhi.h | 39 ++++ .../host/{sh_mobile_sdhi.c => renesas_sdhi_core.c} | 231 +++++-------------- .../{tmio_mmc_dma.c => renesas_sdhi_sys_dmac.c} | 166 ++++++++++++-- drivers/mmc/host/sdhci-iproc.c | 3 +- drivers/mmc/host/sdhci-of-arasan.c | 2 +- drivers/mmc/host/sdhci-xenon-phy.c | 14 +- drivers/mmc/host/sdhci-xenon.c | 6 +- drivers/mmc/host/sdhci-xenon.h | 1 - drivers/mmc/host/sdricoh_cs.c | 3 - drivers/mmc/host/tmio_mmc.c | 10 +- drivers/mmc/host/tmio_mmc.h | 53 ++--- .../mmc/host/{tmio_mmc_pio.c => tmio_mmc_core.c} | 186 ++++++++++----- drivers/mmc/host/vub300.c | 3 +- drivers/of/platform.c | 3 +- include/linux/mmc/card.h | 2 - include/linux/mmc/host.h | 4 + include/linux/of_platform.h | 1 + 41 files changed, 771 insertions(+), 731 deletions(-) create mode 100644 drivers/mmc/host/renesas_sdhi.h rename drivers/mmc/host/{sh_mobile_sdhi.c => renesas_sdhi_core.c} (68%) rename drivers/mmc/host/{tmio_mmc_dma.c => renesas_sdhi_sys_dmac.c} (58%) rename drivers/mmc/host/{tmio_mmc_pio.c => tmio_mmc_core.c} (94%) 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 (2dffdc072400 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 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 (6d92c391a0aa Merge remote-tracking branches 'regulator/topic/lp8755', '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/axp20x-regulator.c | 153 ++++++++++++++++++--- drivers/regulator/core.c | 6 + drivers/regulator/lp8755.c | 14 +- drivers/regulator/max8997-regulator.c | 9 +- drivers/regulator/of_regulator.c | 19 +++ include/linux/mfd/axp20x.h | 37 +++++ include/linux/regulator/machine.h | 6 + 9 files changed, 220 insertions(+), 38 deletions(-) Merging security/next (d68c51e0b377 Sync to mainline for security submaintainers to work against) $ git merge security/next 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/trusted.c Auto-merging security/keys/keyctl.c Auto-merging security/keys/gc.c Auto-merging security/keys/encrypted-keys/encrypted.c Auto-merging include/linux/key.h 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 (b76dd295790d selinux: Add a cache for quicker retreival of PKey SIDs) $ git merge selinux/next Resolved 'include/rdma/ib_verbs.h' using previous resolution. Auto-merging security/selinux/selinuxfs.c Auto-merging security/security.c Auto-merging security/Kconfig Auto-merging include/rdma/ib_verbs.h CONFLICT (content): Merge conflict in include/rdma/ib_verbs.h Auto-merging include/rdma/ib_mad.h Auto-merging include/linux/lsm_hooks.h Auto-merging drivers/infiniband/core/verbs.c Auto-merging drivers/infiniband/core/uverbs_cmd.c Auto-merging drivers/infiniband/core/mad.c Auto-merging drivers/infiniband/core/device.c Auto-merging drivers/infiniband/core/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7809b36a6568] Merge remote-tracking branch 'selinux/next' $ git diff -M --stat --summary HEAD^.. drivers/infiniband/core/Makefile | 3 +- drivers/infiniband/core/cache.c | 43 ++- drivers/infiniband/core/core_priv.h | 115 ++++++ drivers/infiniband/core/device.c | 86 +++++ drivers/infiniband/core/mad.c | 52 ++- drivers/infiniband/core/security.c | 710 +++++++++++++++++++++++++++++++++++ drivers/infiniband/core/uverbs_cmd.c | 15 +- drivers/infiniband/core/verbs.c | 27 +- include/linux/lsm_audit.h | 15 + include/linux/lsm_hooks.h | 35 ++ include/linux/security.h | 50 +++ include/rdma/ib_mad.h | 4 + include/rdma/ib_verbs.h | 49 +++ security/Kconfig | 9 + security/lsm_audit.c | 16 + security/security.c | 48 +++ security/selinux/Makefile | 2 +- security/selinux/hooks.c | 152 ++++++-- security/selinux/ibpkey.c | 245 ++++++++++++ security/selinux/include/classmap.h | 6 +- security/selinux/include/ibpkey.h | 31 ++ security/selinux/include/objsec.h | 11 + security/selinux/include/security.h | 9 +- security/selinux/selinuxfs.c | 15 +- security/selinux/ss/policydb.c | 127 +++++-- security/selinux/ss/policydb.h | 27 +- security/selinux/ss/services.c | 104 +++++ security/selinux/ss/sidtab.c | 27 +- 28 files changed, 1922 insertions(+), 111 deletions(-) create mode 100644 drivers/infiniband/core/security.c create mode 100644 security/selinux/ibpkey.c create mode 100644 security/selinux/include/ibpkey.h $ git am -3 ../patches/0001-IB-core-fix-up-for-create_qp-label-changes.patch Applying: IB/core: fix up for create_qp label changes $ git reset HEAD^ Unstaged changes after reset: M drivers/infiniband/core/uverbs_cmd.c $ git add -A . $ git commit -v -a --amend [master e1df7aae8c50] Merge remote-tracking branch 'selinux/next' Date: Tue May 23 12:34:24 2017 +1000 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 (08332893e37a Linux 4.12-rc2) $ git merge watchdog/master Already up-to-date. 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 | 2 +- drivers/iommu/intel-svm.c | 30 ++++ drivers/iommu/iova.c | 21 ++- drivers/iommu/ipmmu-vmsa.c | 353 +++++++++++++++++++++++++++++++++++++-------- include/linux/intel-svm.h | 20 +++ 6 files changed, 358 insertions(+), 72 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 Already up-to-date. 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 (9c2ff0b50363 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 | 163 ++++++++++++++++++++++++++++++++++++++-- drivers/spi/spi.c | 6 +- drivers/spi/spidev.c | 11 +-- 5 files changed, 161 insertions(+), 21 deletions(-) Merging tip/auto-latest (217dc52c43da Merge branch 'smp/hotplug') $ git merge tip/auto-latest Resolved 'arch/arm64/include/asm/cpufeature.h' using previous resolution. Auto-merging kernel/kprobes.c Auto-merging arch/arm64/kernel/cpufeature.c Auto-merging arch/arm64/include/asm/cpufeature.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4997bd7d969a] Merge remote-tracking branch 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. arch/arm/kernel/hw_breakpoint.c | 5 +- arch/arm64/include/asm/cpufeature.h | 1 + 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/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 | 6 +- kernel/sched/fair.c | 150 ++++----- kernel/sched/features.h | 1 - kernel/sched/sched.h | 19 +- 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 ++ 51 files changed, 1026 insertions(+), 629 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 (a33d7d94eed9 tracing: Make sure RCU is watching before calling a stack trace) $ git merge ftrace/for-next Already up-to-date. Merging rcu/rcu/next (d73ec7f9d137 rcu: Use timer as backstop for NOCB deferred wakeups) $ 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 lib/Kconfig.debug 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 Already up-to-date. Merging kvms390/next (a2bdbb2c7e70 KVM: s390: ioctls to get and set guest storage attributes) $ git merge kvms390/next Merge made by the 'recursive' strategy. Documentation/virtual/kvm/api.txt | 135 ++++++++++++ Documentation/virtual/kvm/devices/vm.txt | 33 +++ arch/s390/include/asm/kvm_host.h | 9 + arch/s390/include/uapi/asm/kvm.h | 6 + arch/s390/kvm/kvm-s390.c | 361 ++++++++++++++++++++++++++++++- arch/s390/kvm/priv.c | 103 ++++++++- include/uapi/linux/kvm.h | 33 +++ 7 files changed, 674 insertions(+), 6 deletions(-) Merging xen-tip/linux-next (c71e6d804c88 xen: make xen_flush_tlb_all() static) $ 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 (23ccd0363c9b platform/x86: topstar-laptop: Add new device id) $ git merge drivers-x86/for-next Merge made by the 'recursive' strategy. .../ABI/testing/sysfs-platform-ideapad-laptop | 8 + drivers/platform/x86/Kconfig | 7 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/ideapad-laptop.c | 34 ++++ drivers/platform/x86/peaq-wmi.c | 100 +++++++++++ drivers/platform/x86/silead_dmi.c | 22 +++ drivers/platform/x86/thinkpad_acpi.c | 183 ++++++++------------- drivers/platform/x86/topstar-laptop.c | 1 + drivers/platform/x86/toshiba_acpi.c | 11 +- 9 files changed, 242 insertions(+), 125 deletions(-) create mode 100644 drivers/platform/x86/peaq-wmi.c 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 (cfb1f1218b2d leds: pca955x: Correct I2C Functionality) $ 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-pca955x.c | 2 +- drivers/leds/leds-pca963x.c | 17 +++- drivers/leds/leds-versatile.c | 110 --------------------- include/linux/platform_data/leds-pca963x.h | 6 ++ 7 files changed, 23 insertions(+), 122 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 (08332893e37a Linux 4.12-rc2) $ git merge driver-core/driver-core-next Already up-to-date. Merging usb/usb-next (6acf116c9558 Merge 4.12-rc2 into usb-next) $ git merge usb/usb-next 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/storage/ene_ub6250.c | 87 +++++++++++++++++++++++----------------- drivers/usb/typec/typec.c | 11 ++--- include/linux/usb/typec.h | 6 +-- 8 files changed, 89 insertions(+), 66 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 (08332893e37a Linux 4.12-rc2) $ 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 (d653c43aefed serial: xilinx_uartps: Fix the error path) $ git merge tty/tty-next Auto-merging drivers/tty/serial/8250/8250_port.c Auto-merging drivers/tty/serdev/serdev-ttyport.c Merge made by the 'recursive' strategy. Documentation/ABI/stable/sysfs-driver-aspeed-vuart | 15 + Documentation/devicetree/bindings/serial/8250.txt | 2 + drivers/tty/hvc/hvcs.c | 3 +- drivers/tty/serdev/serdev-ttyport.c | 2 +- drivers/tty/serial/8250/8250_aspeed_vuart.c | 323 +++++++++++++++++++++ drivers/tty/serial/8250/8250_exar.c | 5 +- drivers/tty/serial/8250/8250_omap.c | 4 + drivers/tty/serial/8250/8250_port.c | 2 +- drivers/tty/serial/8250/Kconfig | 10 + drivers/tty/serial/8250/Makefile | 1 + drivers/tty/serial/amba-pl010.c | 31 +- drivers/tty/serial/atmel_serial.c | 5 +- drivers/tty/serial/imx.c | 26 +- drivers/tty/serial/meson_uart.c | 64 ++-- drivers/tty/serial/pch_uart.c | 3 +- drivers/tty/serial/sh-sci.c | 42 ++- drivers/tty/serial/xilinx_uartps.c | 9 +- drivers/tty/vt/keyboard.c | 3 +- include/linux/serial_core.h | 1 + include/uapi/linux/serial.h | 3 + 20 files changed, 453 insertions(+), 101 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-driver-aspeed-vuart create mode 100644 drivers/tty/serial/8250/8250_aspeed_vuart.c Merging char-misc/char-misc-next (b4a338d2b3ca Merge 4.12-rc2 into char-misc-next) $ git merge char-misc/char-misc-next Merge made by the 'recursive' strategy. Documentation/admin-guide/devices.txt | 4 +- drivers/firmware/google/memconsole-coreboot.c | 51 +++++++++++++++--- drivers/firmware/google/memconsole-x86-legacy.c | 18 +++++-- drivers/firmware/google/memconsole.c | 14 +++-- drivers/firmware/google/memconsole.h | 7 +-- drivers/hv/channel.c | 8 ++- drivers/hv/channel_mgmt.c | 69 +++++++++++++++++++------ drivers/hv/connection.c | 9 ++-- drivers/hv/hv_kvp.c | 14 ++--- drivers/hv/hyperv_vmbus.h | 11 ++++ drivers/hv/vmbus_drv.c | 29 ++++++++++- drivers/ipack/ipack.c | 3 +- drivers/misc/sram-exec.c | 27 +++++++--- drivers/pps/Kconfig | 12 ++--- drivers/pps/clients/Kconfig | 6 +-- drivers/pps/generators/Kconfig | 3 +- drivers/uio/uio_pci_generic.c | 20 ++++--- drivers/vhost/vsock.c | 4 +- include/linux/miscdevice.h | 1 + include/linux/sram.h | 8 +-- tools/hv/hv_kvp_daemon.c | 44 +++++++--------- tools/hv/hv_vss_daemon.c | 4 +- 22 files changed, 250 insertions(+), 116 deletions(-) Merging extcon/extcon-next (2ea659a9ef48 Linux 4.12-rc1) $ git merge extcon/extcon-next Already up-to-date. Merging staging/staging-next (639e1c739bf5 Merge 4.12-rc2 into staging-next) $ git merge staging/staging-next Auto-merging include/linux/tty.h Removing drivers/staging/most/aim-network/networking.h 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 | 22 +- drivers/staging/android/ion/ion.h | 14 - drivers/staging/android/ion/ion_carveout_heap.c | 2 +- drivers/staging/android/uapi/ion.h | 6 - 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 | 154 +------- 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 | 81 ++-- 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/sm750fb/ddk750_chip.c | 7 +- drivers/staging/sm750fb/ddk750_dvi.c | 35 +- drivers/staging/sm750fb/ddk750_dvi.h | 43 +-- drivers/staging/sm750fb/ddk750_hwi2c.c | 33 +- drivers/staging/sm750fb/ddk750_sii164.c | 49 +-- drivers/staging/sm750fb/ddk750_sii164.h | 22 +- drivers/staging/sm750fb/ddk750_swi2c.c | 21 +- drivers/staging/sm750fb/ddk750_swi2c.h | 18 +- drivers/staging/sm750fb/sm750.c | 26 +- drivers/staging/sm750fb/sm750_accel.c | 15 +- drivers/staging/sm750fb/sm750_cursor.c | 17 +- 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 | 90 +++-- 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 + 174 files changed, 3148 insertions(+), 4164 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 (1a35454b7589 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 | 15 + 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, 1945 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 (6d2a299d9f10 Merge branch 'misc' into for-next) $ git merge scsi/for-next Auto-merging drivers/scsi/lpfc/lpfc_nvmet.c Auto-merging drivers/hv/channel_mgmt.c Merge made by the 'recursive' strategy. drivers/hv/channel_mgmt.c | 1 - drivers/scsi/aacraid/aachba.c | 17 +- drivers/scsi/aacraid/aacraid.h | 22 +- drivers/scsi/aacraid/commctrl.c | 15 +- drivers/scsi/aacraid/comminit.c | 18 +- drivers/scsi/aacraid/commsup.c | 78 +- drivers/scsi/aacraid/linit.c | 232 ++- drivers/scsi/aacraid/src.c | 136 +- drivers/scsi/csiostor/csio_hw.c | 84 +- drivers/scsi/csiostor/csio_hw_chip.h | 14 + drivers/scsi/csiostor/csio_hw_t5.c | 29 +- drivers/scsi/csiostor/csio_init.c | 6 +- drivers/scsi/csiostor/csio_wr.c | 4 +- drivers/scsi/hpsa.c | 849 ++------- drivers/scsi/hpsa.h | 4 +- drivers/scsi/hpsa_cmd.h | 20 +- drivers/scsi/libfc/fc_rport.c | 2 +- drivers/scsi/libiscsi.c | 4 +- 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/scsi_lib.c | 2 +- drivers/scsi/sd.c | 63 +- drivers/scsi/sg.c | 5 +- drivers/scsi/smartpqi/smartpqi.h | 194 +- drivers/scsi/smartpqi/smartpqi_init.c | 2427 ++++++++++++++++++------ drivers/scsi/smartpqi/smartpqi_sas_transport.c | 2 +- drivers/scsi/smartpqi/smartpqi_sis.c | 100 +- drivers/scsi/smartpqi/smartpqi_sis.h | 7 +- drivers/scsi/storvsc_drv.c | 52 +- drivers/scsi/ufs/ufshcd.c | 7 + include/linux/hyperv.h | 1 - 46 files changed, 3555 insertions(+), 2092 deletions(-) Merging scsi-mkp/for-next (31b583e7cf4d scsi: storvsc: remove unnecessary channel inbound lock) $ git merge scsi-mkp/for-next Already up-to-date. 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 Auto-merging drivers/ata/libata-sff.c Auto-merging drivers/ata/ahci.c Merge made by the 'recursive' strategy. drivers/ata/ahci.c | 38 ++++++++++++++++++++++++++++++++++++ drivers/ata/libahci_platform.c | 5 +++-- drivers/ata/libata-sff.c | 44 ++++++++---------------------------------- drivers/ata/sata_rcar.c | 15 +++++++++++--- 4 files changed, 61 insertions(+), 41 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 (5be33fa99a95 Merge branch 'devel' into for-next) $ git merge gpio/for-next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/gpio/gpio.txt | 4 ++-- drivers/gpio/gpio-aspeed.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) Merging pinctrl/for-next (18e2177d2c59 Merge branch 'devel' into for-next) $ git merge pinctrl/for-next Removing drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h Removing drivers/pinctrl/mediatek/pinctrl-mt7623.c Merge made by the 'recursive' strategy. .../bindings/pinctrl/pinctrl-bindings.txt | 2 - .../devicetree/bindings/pinctrl/pinctrl-zx.txt | 85 + drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/core.c | 20 +- drivers/pinctrl/freescale/pinctrl-imx.c | 5 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 3 +- drivers/pinctrl/mediatek/Kconfig | 9 +- drivers/pinctrl/mediatek/Makefile | 1 - drivers/pinctrl/mediatek/pinctrl-mt2701.c | 1 + drivers/pinctrl/mediatek/pinctrl-mt7623.c | 379 ---- drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h | 1936 -------------------- drivers/pinctrl/meson/pinctrl-meson8.c | 127 +- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 229 +++ drivers/pinctrl/pinconf-generic.c | 3 - drivers/pinctrl/pinconf.c | 35 +- drivers/pinctrl/pinctrl-amd.c | 4 + drivers/pinctrl/pinctrl-rockchip.c | 22 +- drivers/pinctrl/zte/Kconfig | 13 + drivers/pinctrl/zte/Makefile | 2 + drivers/pinctrl/zte/pinctrl-zx.c | 445 +++++ drivers/pinctrl/zte/pinctrl-zx.h | 105 ++ drivers/pinctrl/zte/pinctrl-zx296718.c | 1027 +++++++++++ include/linux/gpio/machine.h | 7 + include/linux/pinctrl/pinconf-generic.h | 3 - 25 files changed, 2089 insertions(+), 2376 deletions(-) create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt delete mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7623.c delete mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h create mode 100644 drivers/pinctrl/zte/Kconfig create mode 100644 drivers/pinctrl/zte/Makefile create mode 100644 drivers/pinctrl/zte/pinctrl-zx.c create mode 100644 drivers/pinctrl/zte/pinctrl-zx.h create mode 100644 drivers/pinctrl/zte/pinctrl-zx296718.c 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 ba1bc511c31c] 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 (02ca8ae14673 mnt: Make propagate_umount less slow for overlapping mount propagation trees) $ git merge userns/for-next Merge made by the 'recursive' strategy. fs/mount.h | 1 + fs/namespace.c | 1 + fs/pnode.c | 212 ++++++++++++++++++++++++++++++++++++++++++++------------- 3 files changed, 165 insertions(+), 49 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 (ce90b525d901 coresight: tmc: Configure DMA mask appropriately) $ 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-tmc.c | 7 +++++ drivers/hwtracing/coresight/coresight.c | 34 ++++++++++++++++++------ drivers/hwtracing/coresight/of_coresight.c | 7 ++--- include/linux/coresight.h | 7 ++--- 7 files changed, 61 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 Already up-to-date. 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 (a9adb44baaaf include/linux/sem.h: correctly document sem_ctime) $ git merge --no-ff akpm-current/current Auto-merging lib/Kconfig.debug Auto-merging kernel/fork.c Auto-merging include/linux/sched.h Auto-merging fs/namespace.c Auto-merging arch/x86/xen/mmu_pv.c Auto-merging arch/s390/Kconfig Removing arch/mn10300/include/asm/device.h Removing arch/frv/include/asm/device.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/kdump/kdump.txt | 12 +- Documentation/vm/ksm.txt | 63 ++ arch/arm/include/asm/page.h | 2 + arch/arm64/Kconfig | 2 +- arch/arm64/include/asm/hugetlb.h | 4 + arch/frv/include/asm/Kbuild | 1 + arch/frv/include/asm/device.h | 7 - arch/frv/include/asm/timex.h | 6 + arch/ia64/kernel/machine_kexec.c | 5 - arch/ia64/mm/init.c | 11 +- arch/mn10300/include/asm/Kbuild | 1 + arch/mn10300/include/asm/device.h | 1 - arch/powerpc/include/asm/book3s/64/hugetlb.h | 10 + arch/powerpc/kernel/fadump.c | 3 +- arch/powerpc/mm/hugetlbpage.c | 88 +-- arch/powerpc/mm/mem.c | 12 +- arch/powerpc/platforms/Kconfig.cputype | 6 + arch/s390/Kconfig | 2 +- arch/s390/include/asm/hugetlb.h | 3 + arch/s390/kernel/machine_kexec.c | 1 + arch/s390/kernel/setup.c | 6 - arch/s390/mm/init.c | 32 +- arch/sh/mm/init.c | 10 +- arch/x86/Kconfig | 3 +- arch/x86/include/asm/hugetlb.h | 4 + arch/x86/kernel/crash.c | 2 +- arch/x86/kernel/machine_kexec_64.c | 1 + arch/x86/mm/init_32.c | 7 +- arch/x86/mm/init_64.c | 11 +- arch/x86/xen/mmu_pv.c | 4 +- block/genhd.c | 2 +- drivers/base/Kconfig | 14 +- drivers/base/memory.c | 83 ++- drivers/base/node.c | 58 +- drivers/block/zram/Kconfig | 14 + drivers/block/zram/Makefile | 3 +- drivers/block/zram/zram_dedup.c | 250 +++++++ drivers/block/zram/zram_dedup.h | 45 ++ drivers/block/zram/zram_drv.c | 208 +++++- drivers/block/zram/zram_drv.h | 33 +- drivers/sh/intc/virq.c | 4 +- fs/Kconfig | 1 - fs/bfs/inode.c | 2 +- fs/dcache.c | 18 +- fs/eventpoll.c | 62 +- fs/inode.c | 14 +- fs/namespace.c | 10 +- fs/ocfs2/dlm/dlmmaster.c | 66 +- fs/ocfs2/dlm/dlmrecovery.c | 40 +- fs/ocfs2/super.c | 8 +- fs/proc/base.c | 44 ++ fs/seq_file.c | 10 - fs/userfaultfd.c | 5 - include/linux/bootmem.h | 1 + include/linux/crash_core.h | 9 +- include/linux/eventpoll.h | 5 + include/linux/gfp.h | 2 +- include/linux/huge_mm.h | 7 + include/linux/hugetlb.h | 63 +- include/linux/jiffies.h | 6 +- include/linux/kexec.h | 2 + include/linux/memory_hotplug.h | 41 +- include/linux/mmzone.h | 59 +- include/linux/node.h | 35 +- include/linux/page-flags.h | 7 +- include/linux/reboot.h | 4 + include/linux/sched.h | 1 + include/linux/sem.h | 24 +- include/linux/slub_def.h | 34 +- include/linux/swap.h | 19 +- include/linux/swap_cgroup.h | 6 +- include/uapi/linux/kcmp.h | 10 + include/uapi/linux/sem.h | 2 +- include/uapi/linux/sysctl.h | 4 + init/main.c | 15 +- ipc/sem.c | 88 +-- kernel/crash_core.c | 44 +- kernel/exit.c | 1 - kernel/fork.c | 20 +- kernel/kcmp.c | 57 ++ kernel/kexec.c | 8 + kernel/kexec_core.c | 39 + kernel/kexec_file.c | 8 + kernel/ksysfs.c | 2 +- kernel/locking/qspinlock_paravirt.h | 3 +- kernel/memremap.c | 6 +- kernel/pid.c | 7 +- kernel/reboot.c | 27 + lib/Kconfig.debug | 2 +- lib/fault-inject.c | 7 + lib/interval_tree_test.c | 93 ++- lib/kstrtox.c | 12 +- mm/Kconfig | 12 + mm/compaction.c | 5 +- mm/gup.c | 186 +++-- mm/huge_memory.c | 29 +- mm/hugetlb.c | 50 +- mm/kasan/kasan.c | 14 +- mm/kasan/kasan_init.c | 12 + mm/ksm.c | 823 ++++++++++++++++++++-- mm/memcontrol.c | 50 +- mm/memory-failure.c | 13 +- mm/memory.c | 2 - mm/memory_hotplug.c | 460 +++++------- mm/migrate.c | 21 +- mm/mmap.c | 2 +- mm/mprotect.c | 2 - mm/nobootmem.c | 2 +- mm/page_alloc.c | 69 +- mm/page_isolation.c | 26 +- mm/page_owner.c | 4 +- mm/shmem.c | 4 +- mm/slub.c | 109 +-- mm/sparse.c | 104 ++- mm/swap_cgroup.c | 40 +- mm/swap_slots.c | 16 +- mm/swap_state.c | 98 +-- mm/swapfile.c | 273 +++++-- mm/util.c | 7 +- mm/vmscan.c | 62 +- mm/vmstat.c | 21 +- scripts/gdb/linux/constants.py.in | 7 + scripts/gdb/linux/proc.py | 73 ++ scripts/gen_initramfs_list.sh | 2 + usr/Kconfig | 24 +- 129 files changed, 3481 insertions(+), 1333 deletions(-) delete mode 100644 arch/frv/include/asm/device.h delete mode 100644 arch/mn10300/include/asm/device.h 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: powerpc/sequoia: fix NAND partitions not to overlap Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + d7f522135231...6746b98677b8 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (6746b98677b8 lib/crc-ccitt: add CCITT-FALSE CRC16 variant) $ git merge --no-ff akpm/master Merge made by the 'recursive' strategy. arch/powerpc/boot/dts/sequoia.dts | 2 +- arch/sparc/lib/NG4memset.S | 26 +++++++++--------- include/linux/crc-ccitt.h | 7 +++++ lib/crc-ccitt.c | 58 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 78 insertions(+), 15 deletions(-)