diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 9995 |
1 files changed, 9995 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..c554ce3d4ed9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9995 @@ +$ date -R +Fri, 16 Jun 2017 07:44:27 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 63f700aab4c1 Merge tag 'xtensa-20170612' of git://github.com/jcmvbkbc/linux-xtensa +Merging origin/master (a090bd4ff838 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge origin/master +Updating 63f700aab4c1..a090bd4ff838 +Fast-forward + Documentation/networking/scaling.txt | 2 +- + arch/arm64/net/bpf_jit_comp.c | 7 +- + drivers/acpi/acpica/tbutils.c | 34 ++- + drivers/acpi/acpica/utresrc.c | 9 - + drivers/cpufreq/cpufreq_conservative.c | 4 +- + drivers/cpuidle/dt_idle_states.c | 4 +- + drivers/devfreq/event/exynos-nocp.c | 6 +- + drivers/devfreq/event/exynos-ppmu.c | 8 +- + drivers/hid/hid-core.c | 282 ++++++++++++++++----- + drivers/hsi/clients/ssi_protocol.c | 2 +- + drivers/infiniband/sw/rxe/rxe.h | 5 +- + drivers/media/cec/Kconfig | 1 + + drivers/media/cec/cec-api.c | 8 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/rc/sir_ir.c | 6 + + drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 1 + + drivers/media/v4l2-core/videobuf2-core.c | 2 +- + drivers/net/bonding/bond_3ad.c | 27 ++ + drivers/net/bonding/bond_main.c | 6 +- + drivers/net/caif/caif_hsi.c | 2 +- + drivers/net/caif/caif_serial.c | 2 +- + drivers/net/caif/caif_spi.c | 2 +- + drivers/net/caif/caif_virtio.c | 2 +- + drivers/net/can/dev.c | 3 + + drivers/net/can/peak_canfd/peak_canfd.c | 2 +- + drivers/net/can/slcan.c | 7 +- + drivers/net/can/usb/gs_usb.c | 2 + + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 4 +- + drivers/net/can/vcan.c | 4 +- + drivers/net/can/vxcan.c | 4 +- + drivers/net/dummy.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_com.c | 35 ++- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 179 +++++++++---- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 18 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 3 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 19 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 15 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 67 +++-- + drivers/net/ethernet/ibm/ibmvnic.c | 6 + + drivers/net/ethernet/intel/i40e/i40e.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 7 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 + + drivers/net/ethernet/marvell/mvpp2.c | 76 +++--- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 45 ++-- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 25 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 3 +- + drivers/net/geneve.c | 2 +- + drivers/net/gtp.c | 2 +- + drivers/net/hamradio/6pack.c | 2 +- + drivers/net/hamradio/bpqether.c | 2 +- + drivers/net/hyperv/hyperv_net.h | 5 +- + drivers/net/hyperv/netvsc_drv.c | 54 ++-- + drivers/net/hyperv/rndis_filter.c | 30 ++- + drivers/net/ifb.c | 4 +- + drivers/net/ipvlan/ipvlan_main.c | 2 +- + drivers/net/loopback.c | 4 +- + drivers/net/macsec.c | 4 +- + drivers/net/macvlan.c | 2 +- + drivers/net/netconsole.c | 2 +- + drivers/net/nlmon.c | 2 +- + drivers/net/phy/Kconfig | 1 + + drivers/net/phy/phy.c | 2 + + drivers/net/slip/slip.c | 7 +- + drivers/net/team/team.c | 4 +- + drivers/net/tun.c | 4 +- + drivers/net/usb/cdc-phonet.c | 2 +- + drivers/net/usb/qmi_wwan.c | 6 +- + drivers/net/usb/r8152.c | 2 + + drivers/net/veth.c | 4 +- + drivers/net/vrf.c | 38 ++- + drivers/net/vsockmon.c | 2 +- + drivers/net/vxlan.c | 2 +- + drivers/net/wan/dlci.c | 2 +- + drivers/net/wan/hdlc_fr.c | 2 +- + drivers/net/wan/lapbether.c | 2 +- + drivers/net/wireless/ath/ath6kl/main.c | 2 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 1 - + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 3 +- + drivers/net/wireless/intersil/hostap/hostap_main.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 2 +- + drivers/s390/net/netiucv.c | 4 +- + drivers/staging/rtl8188eu/os_dep/mon.c | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 - + drivers/usb/gadget/function/f_phonet.c | 2 +- + fs/btrfs/hash.c | 5 +- + fs/f2fs/f2fs.h | 5 +- + include/acpi/actbl.h | 14 + + include/linux/netdevice.h | 15 +- + include/media/cec-notifier.h | 10 + + include/media/cec.h | 2 +- + include/uapi/linux/ethtool.h | 6 +- + include/uapi/linux/openvswitch.h | 1 + + kernel/sched/cpufreq_schedutil.c | 3 - + lib/libcrc32c.c | 6 +- + net/8021q/vlan_dev.c | 4 +- + net/batman-adv/distributed-arp-table.c | 5 +- + net/batman-adv/routing.c | 2 +- + net/batman-adv/soft-interface.c | 5 +- + net/bluetooth/6lowpan.c | 2 +- + net/bridge/br_device.c | 2 +- + net/caif/caif_socket.c | 4 + + net/caif/cfpkt_skbuff.c | 6 +- + net/caif/chnl_net.c | 4 +- + net/can/af_can.c | 3 +- + net/core/dev.c | 42 ++- + net/core/dst.c | 14 + + net/core/rtnetlink.c | 3 +- + net/decnet/netfilter/dn_rtmsg.c | 4 +- + net/hsr/hsr_device.c | 4 +- + net/hsr/hsr_forward.c | 3 +- + net/hsr/hsr_framereg.c | 9 +- + net/hsr/hsr_framereg.h | 2 +- + net/ieee802154/6lowpan/core.c | 2 +- + net/ipv4/icmp.c | 8 +- + net/ipv4/igmp.c | 21 +- + net/ipv4/ip_tunnel.c | 4 +- + net/ipv4/ipmr.c | 34 ++- + net/ipv6/icmp.c | 2 +- + net/ipv6/ila/ila_xlat.c | 1 + + net/ipv6/ip6_gre.c | 9 +- + net/ipv6/ip6_tunnel.c | 8 +- + net/ipv6/ip6_vti.c | 8 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/proc.c | 2 +- + net/ipv6/route.c | 1 + + net/ipv6/sit.c | 6 +- + net/irda/irlan/irlan_eth.c | 2 +- + net/l2tp/l2tp_eth.c | 15 +- + net/mac80211/cfg.c | 2 + + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/iface.c | 7 +- + net/mac80211/mlme.c | 62 ++--- + net/mac80211/rx.c | 6 +- + net/mac80211/wpa.c | 9 +- + net/mac802154/iface.c | 7 +- + net/openvswitch/vport-internal_dev.c | 4 +- + net/phonet/pep-gprs.c | 2 +- + net/sched/act_pedit.c | 4 +- + net/sched/act_police.c | 8 +- + net/sctp/socket.c | 4 +- + net/tipc/msg.c | 2 +- + net/unix/af_unix.c | 7 +- + tools/testing/selftests/bpf/bpf_endian.h | 41 ++- + 157 files changed, 1124 insertions(+), 594 deletions(-) +Merging fixes/master (97da3854c526 Linux 4.11-rc3) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/fixes (ff85a1a80e00 kconfig: Check for libncurses before menuconfig) +$ git merge kbuild-current/fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 +- + scripts/genksyms/genksyms.h | 2 +- + scripts/kconfig/Makefile | 2 +- + scripts/tags.sh | 1 + + 4 files changed, 4 insertions(+), 3 deletions(-) +Merging arc-current/for-curr (45c7d002f207 ARC: defconfig: Cleanup from old Kconfig options) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/configs/nps_defconfig | 1 - + arch/arc/configs/tb10x_defconfig | 1 - + 2 files changed, 2 deletions(-) +Merging arm-current/fixes (d360a687d995 ARM: 8682/1: V7M: Set cacheid iff DminLine or IminLine is nonzero) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 + + arch/arm/boot/compressed/efi-header.S | 3 ++- + arch/arm/kernel/setup.c | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) +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 (c6ee9619e2ed powerpc/book3s64: Move PPC_DT_CPU_FTRs and enable it by default) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging sparc/master (5faab9e0f03c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ 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 (3b1bbafbfd14 Doc: net: dsa: b53: update location of referenced dsa.txt) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/dsa/b53.txt | 2 +- + net/ipv6/addrconf.c | 6 +-- + net/rxrpc/key.c | 64 ++++++++++++----------- + net/sctp/socket.c | 5 +- + 4 files changed, 40 insertions(+), 37 deletions(-) +Merging ipsec/master (e747f64336fc xfrm: NULL dereference on allocation failure) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 7 ++----- + net/key/af_key.c | 19 +++++++++++++++---- + net/xfrm/Makefile | 3 +-- + net/xfrm/xfrm_device.c | 2 ++ + net/xfrm/xfrm_policy.c | 4 ---- + net/xfrm/xfrm_user.c | 1 + + 6 files changed, 21 insertions(+), 15 deletions(-) +Merging netfilter/master (4b1f0d33db7d net: ipmr: Fix some mroute forwarding issues in vrf's) +$ 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 (a2b7a622d629 brcmfmac: fix brcmf_fws_add_interface() for USB devices) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + .../broadcom/brcm80211/brcmfmac/firmware.c | 35 +++++++++++----------- + .../broadcom/brcm80211/brcmfmac/firmware.h | 4 +-- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 17 +++++++---- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 18 +++++++---- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 6 ++-- + 6 files changed, 48 insertions(+), 34 deletions(-) +Merging mac80211/master (68dd02d19c81 dev_ioctl: copy only the smaller struct iwreq for wext) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + include/net/wext.h | 4 ++-- + net/core/dev_ioctl.c | 19 ++++++++++++++++--- + net/wireless/wext-core.c | 22 +++++++++------------- + 3 files changed, 27 insertions(+), 18 deletions(-) +Merging sound-current/for-linus (2deaeaf102d6 ALSA: pcm: Don't treat NULL chmap as a fatal error) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/pcm_lib.c | 4 ++-- + sound/pci/hda/hda_intel.c | 6 +++++- + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging pci-current/for-linus (98dbf5af4fdd PCI: endpoint: Select CRC32 to fix test build error) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/access.c | 12 ++++++------ + drivers/pci/endpoint/functions/Kconfig | 1 + + 2 files changed, 7 insertions(+), 6 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 (3c2993b8c614 Linux 4.12-rc4) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (f16443a034c7 USB: gadgetfs, dummy-hcd, net2280: fix locking for callbacks) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/gadget/composite.c | 11 +++++------ + drivers/usb/gadget/legacy/inode.c | 9 ++++++--- + drivers/usb/gadget/udc/dummy_hcd.c | 13 ++++--------- + drivers/usb/gadget/udc/net2280.c | 9 +-------- + drivers/usb/host/xhci-mem.c | 7 +++++-- + drivers/usb/host/xhci-pci.c | 3 +++ + 6 files changed, 24 insertions(+), 28 deletions(-) +Merging usb-gadget-fixes/fixes (f50b878fed33 USB: gadget: fix GPF in gadgetfs) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (996fab55d864 USB: serial: qcserial: new Sierra Wireless EM7305 device ID) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 4 ++++ + drivers/usb/serial/qcserial.c | 1 + + 2 files changed, 5 insertions(+) +Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging phy/fixes (9605bc46433d phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (ed6456afef0d Staging: rtl8723bs: fix an error code in isFileReadable()) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/adc/meson_saradc.c | 4 +-- + drivers/iio/adc/mxs-lradc-adc.c | 7 ++-- + drivers/iio/buffer/industrialio-buffer-dma.c | 1 + + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 1 + + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 39 ++++++++++++++++++++-- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 3 ++ + drivers/staging/iio/cdc/ad7152.c | 6 +--- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 2 +- + 8 files changed, 50 insertions(+), 13 deletions(-) +Merging char-misc.current/char-misc-linus (32c1431eea48 Linux 4.12-rc5) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (a0897d5f2c2d Input: synaptics-rmi4 - register F03 port as pass-through serio) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (d41519a69b35 crypto: Work around deallocated stack frame reference gcc bug on sparc.) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination) +$ git merge ide/master +Already up-to-date. +Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static) +$ git merge nand-fixes/nand/fixes +Already up-to-date. +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 (27fef9f8ecb0 mfd: arizona: Fix typo using hard-coded register) +$ git merge mfd-fixes/for-mfd-fixes +Merge made by the 'recursive' strategy. + drivers/mfd/arizona-core.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging v4l-dvb-fixes/fixes (f9f314f32395 [media] media/cec.h: use IS_REACHABLE instead of IS_ENABLED) +$ git merge v4l-dvb-fixes/fixes +Already up-to-date. +Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded) +$ git merge reset-fixes/reset/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (c380f681245d drm/i915: Fix GVT-g PVINFO version compatibility check) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_pvinfo.h | 8 ++------ + drivers/gpu/drm/i915/i915_vgpu.c | 10 ++++------ + drivers/gpu/drm/i915/intel_display.c | 14 ++++++++------ + drivers/gpu/drm/i915/intel_pm.c | 36 ++++++++++++++++++++++++------------ + 4 files changed, 38 insertions(+), 30 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (0f933328f018 drm: mxsfb_crtc: Reset the eLCDIF controller) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/synopsys/Kconfig | 1 + + drivers/gpu/drm/mgag200/mgag200_mode.c | 9 ++++++- + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 42 +++++++++++++++++++++++++++++++++ + drivers/gpu/drm/tegra/drm.c | 22 ++++------------- + drivers/gpu/host1x/dev.c | 2 +- + 5 files changed, 57 insertions(+), 19 deletions(-) +Merging kbuild/for-next (e814942193b7 Merge branches 'kbuild' and 'fixes' into for-next) +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 15 +++------------ + scripts/bootgraph.pl | 2 +- + scripts/checkincludes.pl | 2 +- + scripts/checkpatch.pl | 3 ++- + scripts/checkstack.pl | 2 +- + scripts/checksyscalls.sh | 11 ++++------- + 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 +- + tools/build/Makefile.build | 8 +------- + tools/scripts/Makefile.include | 8 +------- + 28 files changed, 46 insertions(+), 58 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 2f91a0401c6a] 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 (ccfe0e09f0fa ARC: [plat-eznps] Handle user memory error same in simulation and silicon) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/include/asm/irqflags-arcv2.h | 3 --- + arch/arc/include/asm/irqflags-compact.h | 2 -- + arch/arc/include/asm/spinlock.h | 12 ++++++++++++ + arch/arc/kernel/entry-compact.S | 22 +++++++++++----------- + arch/arc/kernel/process.c | 29 +++++++++++++++++++++++++++-- + arch/arc/kernel/traps.c | 2 +- + arch/arc/mm/fault.c | 2 +- + arch/arc/mm/tlbex.S | 9 +++++++++ + arch/arc/plat-eznps/Kconfig | 15 +++++++++++++-- + arch/arc/plat-eznps/include/plat/ctop.h | 1 + + arch/arc/plat-eznps/mtm.c | 11 +++++++++-- + 11 files changed, 84 insertions(+), 24 deletions(-) +Merging arm/for-next (9d7fb07136c9 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/kernel/process.c | 8 ++++---- + arch/arm/mm/Kconfig | 6 +++++- + 2 files changed, 9 insertions(+), 5 deletions(-) +Merging arm-perf/for-next/perf (bddb9b68d3fb drivers/perf: commonise PERF_EVENTS dependency) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + arch/arm/kernel/perf_event_v6.c | 2 +- + arch/arm64/kernel/perf_event.c | 2 +- + drivers/perf/Kconfig | 9 +++++---- + 3 files changed, 7 insertions(+), 6 deletions(-) +Merging arm-soc/for-next (b0cd8f449f09 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/gemini.txt | 24 +- + Documentation/devicetree/bindings/arm/realtek.txt | 20 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 7 + + arch/arm/arm-soc-for-next-contents.txt | 59 ++ + arch/arm/boot/dts/aspeed-g4.dtsi | 7 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 7 +- + arch/arm/boot/dts/emev2.dtsi | 2 +- + arch/arm/boot/dts/gemini.dtsi | 29 +- + arch/arm/boot/dts/moxart.dtsi | 3 +- + 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/Kconfig.platforms | 11 +- + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/realtek/Makefile | 5 + + arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 42 ++ + arch/arm64/boot/dts/realtek/rtd1295.dtsi | 131 +++++ + 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 ++++++++++++ + arch/arm64/configs/defconfig | 1 - + include/dt-bindings/clock/r7s72100-clock.h | 2 + + include/dt-bindings/clock/r8a7791-clock.h | 1 + + include/dt-bindings/pinctrl/r7s72100-pinctrl.h | 16 + + 42 files changed, 2146 insertions(+), 1364 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/realtek.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm64/boot/dts/realtek/Makefile + create mode 100644 arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1295.dtsi + 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 actions/for-next (cae7fc484f46 Merge branch 'v4.13/arm64' into next) +$ git merge actions/for-next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig.platforms | 6 ++++++ + 1 file changed, 6 insertions(+) +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 (c93b658c3750 Merge branch 'v4.13/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 22 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/meson.dtsi | 178 +++++++------ + arch/arm/boot/dts/meson6.dtsi | 2 - + arch/arm/boot/dts/meson8.dtsi | 138 ++++++---- + arch/arm/boot/dts/meson8b.dtsi | 214 +++++++-------- + arch/arm/mach-meson/Kconfig | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 8 +- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 60 ++--- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 291 +++++++++++++++++++++ + .../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 +- + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 40 +++ + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 213 +++++++++------ + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 24 ++ + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 25 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 52 ++-- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 23 ++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 120 ++++++--- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 87 +++--- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 240 +++++++++++++++++ + arch/arm64/configs/defconfig | 7 + + 27 files changed, 1398 insertions(+), 640 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts +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 (630efea351f0 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Resolved 'arch/arm/mach-at91/Kconfig' using previous resolution. +Auto-merging arch/arm/mach-at91/pm.c +Auto-merging arch/arm/mach-at91/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-at91/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 081df9e0e1d0] Merge remote-tracking branch 'at91/at91-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/Atmel/README | 38 +++- + .../devicetree/bindings/arm/atmel-at91.txt | 30 +++ + .../devicetree/bindings/gpio/gpio_atmel.txt | 10 +- + .../devicetree/bindings/mtd/atmel-nand.txt | 14 ++ + arch/arm/Kconfig.debug | 10 + + arch/arm/boot/dts/aks-cdu.dts | 56 +++--- + arch/arm/boot/dts/animeo_ip.dts | 53 ++++-- + arch/arm/boot/dts/at91-cosino.dtsi | 83 ++++++--- + arch/arm/boot/dts/at91-kizbox.dts | 42 +++-- + arch/arm/boot/dts/at91-kizbox2.dts | 45 +++-- + arch/arm/boot/dts/at91-kizboxmini.dts | 52 +++++- + arch/arm/boot/dts/at91-linea.dtsi | 27 ++- + arch/arm/boot/dts/at91-qil_a9260.dts | 103 ++++++----- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 28 +++ + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 97 ++++++---- + arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 4 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 83 +++++---- + arch/arm/boot/dts/at91-sama5d4ek.dts | 83 +++++---- + arch/arm/boot/dts/at91-tse850-3.dts | 72 +++---- + arch/arm/boot/dts/at91sam9260.dtsi | 65 ++++--- + arch/arm/boot/dts/at91sam9261.dtsi | 48 +++-- + arch/arm/boot/dts/at91sam9261ek.dts | 83 +++++---- + arch/arm/boot/dts/at91sam9263.dtsi | 89 ++++++--- + arch/arm/boot/dts/at91sam9263ek.dts | 103 ++++++----- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 103 ++++++----- + arch/arm/boot/dts/at91sam9g45.dtsi | 64 ++++--- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 49 +++-- + arch/arm/boot/dts/at91sam9n12.dtsi | 74 +++++--- + arch/arm/boot/dts/at91sam9n12ek.dts | 26 ++- + arch/arm/boot/dts/at91sam9rl.dtsi | 69 ++++--- + arch/arm/boot/dts/at91sam9rlek.dts | 85 +++++---- + arch/arm/boot/dts/at91sam9x5.dtsi | 134 +++++++++----- + arch/arm/boot/dts/at91sam9x5cm.dtsi | 83 ++++++--- + arch/arm/boot/dts/ethernut5.dts | 47 +++-- + arch/arm/boot/dts/ge863-pro3.dtsi | 41 ++-- + arch/arm/boot/dts/pm9g45.dts | 99 +++++----- + arch/arm/boot/dts/sama5d2.dtsi | 117 ++++++++++++ + arch/arm/boot/dts/sama5d3.dtsi | 131 ++++++++++--- + arch/arm/boot/dts/sama5d3xcm.dtsi | 97 +++++++--- + arch/arm/boot/dts/sama5d3xcm_cmp.dtsi | 77 +++++--- + arch/arm/boot/dts/sama5d4.dtsi | 177 +++++++++++++++--- + arch/arm/boot/dts/tny_a9260_common.dtsi | 89 +++++---- + arch/arm/boot/dts/tny_a9263.dts | 103 ++++++----- + arch/arm/boot/dts/usb_a9260_common.dtsi | 103 ++++++----- + arch/arm/boot/dts/usb_a9263.dts | 103 ++++++----- + arch/arm/configs/sama5_defconfig | 3 + + arch/arm/mach-at91/Kconfig | 16 +- + arch/arm/mach-at91/Makefile | 4 +- + arch/arm/mach-at91/Makefile.boot | 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 +- + arch/arm/mach-at91/samv7.c | 34 ++++ + drivers/soc/atmel/soc.c | 24 +++ + drivers/soc/atmel/soc.h | 26 +++ + 58 files changed, 2540 insertions(+), 1067 deletions(-) + create mode 100644 arch/arm/mach-at91/Makefile.boot + create mode 100644 arch/arm/mach-at91/samv7.c +Merging bcm2835/for-next (652fb0c6435c Merge branch anholt/bcm2835-defconfig-next into for-next) +$ git merge bcm2835/for-next +Auto-merging arch/arm/boot/dts/bcm283x.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 +- + 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-rpi-usb-otg.dtsi | 10 +++++++++ + arch/arm/boot/dts/bcm283x.dtsi | 27 ++++++++++++++++++++++++ + arch/arm/configs/bcm2835_defconfig | 8 +++++++ + arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 17 +++++++++++++++ + arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 4 ++++ + 12 files changed, 78 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi +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 (e48b76aae6d8 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/ata/ahci-fsl-qoriq.txt | 2 +- + .../devicetree/bindings/mmc/fsl-esdhc.txt | 14 + + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/imx23-sansa.dts | 7 +- + arch/arm/boot/dts/imx25-karo-tx25.dts | 2 +- + arch/arm/boot/dts/imx25-pdk.dts | 2 +- + arch/arm/boot/dts/imx25.dtsi | 1 + + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 2 +- + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/imx28-cfa10037.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10057.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10058.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 2 +- + arch/arm/boot/dts/imx28-evk.dts | 4 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 2 +- + arch/arm/boot/dts/imx50-evk.dts | 2 +- + arch/arm/boot/dts/imx50.dtsi | 1 + + arch/arm/boot/dts/imx51-apf51.dts | 2 +- + arch/arm/boot/dts/imx53-mba53.dts | 2 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 +- + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 2 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 2 +- + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-gw560x.dts | 55 ++ + arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +- + arch/arm/boot/dts/imx6dl-sabrelite.dts | 5 + + arch/arm/boot/dts/imx6dl-sabresd.dts | 5 + + arch/arm/boot/dts/imx6dl.dtsi | 189 ++++++ + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 4 +- + arch/arm/boot/dts/imx6q-evi.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 7 +- + arch/arm/boot/dts/imx6q-gw560x.dts | 59 ++ + arch/arm/boot/dts/imx6q-novena.dts | 4 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 5 + + arch/arm/boot/dts/imx6q-sabresd.dts | 5 + + arch/arm/boot/dts/imx6q-utilite-pro.dts | 2 +- + arch/arm/boot/dts/imx6q-zii-rdu2.dts | 4 +- + arch/arm/boot/dts/imx6q.dtsi | 127 +++- + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 4 +- + 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-microsom-ar8035.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 131 +++- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 152 ++++- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 116 +++- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl.dtsi | 60 +- + arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 +- + arch/arm/boot/dts/imx6qp.dtsi | 4 + + arch/arm/boot/dts/imx6sl.dtsi | 3 + + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 4 +- + 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-tx6ul-mainboard.dts | 2 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 7 +- + arch/arm/boot/dts/imx6ul.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx7d-nitrogen7.dts | 6 +- + arch/arm/boot/dts/imx7d-pico.dts | 403 +++++++++++ + arch/arm/boot/dts/imx7d-pinfunc.h | 6 +- + arch/arm/boot/dts/imx7d-sdb.dts | 133 +++- + arch/arm/boot/dts/imx7d.dtsi | 37 + + arch/arm/boot/dts/imx7s-warp.dts | 3 +- + arch/arm/boot/dts/imx7s.dtsi | 50 +- + arch/arm/boot/dts/ls1021a.dtsi | 90 +-- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 + + arch/arm/configs/imx_v6_v7_defconfig | 5 + + arch/arm/configs/mxs_defconfig | 6 +- + arch/arm/mach-imx/Kconfig | 1 + + arch/arm/mach-imx/cpu.c | 3 + + arch/arm/mach-imx/mxc.h | 6 + + arch/arm/mach-imx/pm-imx6.c | 6 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 15 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 39 +- + 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 | 79 ++- + 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 | 75 ++- + 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 | 111 ++- + 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 | 3 +- + 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 +- + 123 files changed, 3536 insertions(+), 267 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 (3d789076c8d7 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-370.dtsi | 19 +- + arch/arm/boot/dts/armada-385-linksys-caiman.dts | 187 +++++++---- + arch/arm/boot/dts/armada-385-linksys-cobra.dts | 187 +++++++---- + arch/arm/boot/dts/armada-385-linksys-rango.dts | 203 ++++++++++++ + arch/arm/boot/dts/armada-385-linksys-shelby.dts | 187 +++++++---- + arch/arm/boot/dts/armada-385-linksys.dtsi | 362 +++++++-------------- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 2 +- + arch/arm/boot/dts/armada-38x.dtsi | 16 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 4 + + arch/arm/boot/dts/armada-xp-98dx4251.dtsi | 1 + + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 8 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 16 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 19 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 19 +- + arch/arm/configs/mvebu_v7_defconfig | 2 + + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 120 ++++--- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 25 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 6 +- + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 24 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 40 +++ + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 27 +- + .../boot/dts/marvell/armada-cp110-master.dtsi | 12 +- + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 18 + + 24 files changed, 970 insertions(+), 535 deletions(-) + create mode 100644 arch/arm/boot/dts/armada-385-linksys-rango.dts +Merging omap/for-next (33bb085d65d5 Merge branch 'omap-for-v4.13/soc-v4' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/prm_common.c +Removing arch/arm/mach-omap2/pmu.c +Removing arch/arm/mach-omap2/opp.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/cpufreq/ti-cpufreq.txt | 20 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- + arch/arm/boot/dts/am335x-base0033.dts | 2 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 10 +- + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 5 + + arch/arm/boot/dts/am335x-boneblack.dts | 2 +- + arch/arm/boot/dts/am335x-boneblue.dts | 460 +++++++++++++++++++++ + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 5 + + arch/arm/boot/dts/am335x-nano.dts | 2 +- + arch/arm/boot/dts/am335x-pepper.dts | 2 +- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/am335x-shc.dts | 2 +- + arch/arm/boot/dts/am335x-sl50.dts | 10 +- + arch/arm/boot/dts/am33xx.dtsi | 26 +- + arch/arm/boot/dts/am4372.dtsi | 10 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 2 - + arch/arm/boot/dts/am437x-idk-evm.dts | 2 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 4 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 4 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 36 ++ + arch/arm/boot/dts/am571x-idk.dts | 17 + + arch/arm/boot/dts/am572x-idk.dts | 20 + + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +- + 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/dra7xx-clocks.dtsi | 20 + + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 4 + + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 16 + + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 9 +- + arch/arm/boot/dts/omap3-evm-37xx.dts | 102 +++++ + arch/arm/boot/dts/omap3-evm-common.dtsi | 34 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- + arch/arm/boot/dts/omap3-sb-t35.dtsi | 3 +- + arch/arm/boot/dts/omap3-tao3530.dtsi | 1 - + arch/arm/boot/dts/omap4-droid4-xt894.dts | 39 +- + arch/arm/boot/dts/omap4-duovero.dtsi | 4 + + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 +- + arch/arm/boot/dts/omap4.dtsi | 22 +- + arch/arm/boot/dts/omap44xx-clocks.dtsi | 22 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 2 +- + arch/arm/boot/dts/omap5-sbc-t54.dts | 2 +- + arch/arm/boot/dts/omap5-uevm.dts | 13 + + arch/arm/boot/dts/omap54xx-clocks.dtsi | 6 + + arch/arm/boot/dts/twl4030.dtsi | 2 + + arch/arm/mach-omap1/dma.c | 5 +- + arch/arm/mach-omap1/timer.c | 4 +- + arch/arm/mach-omap2/Makefile | 4 - + arch/arm/mach-omap2/board-n8x0.c | 14 +- + arch/arm/mach-omap2/clockdomain.c | 8 + + arch/arm/mach-omap2/clockdomain.h | 2 + + arch/arm/mach-omap2/cm.h | 7 +- + arch/arm/mach-omap2/cm2xxx_3xxx.h | 4 +- + arch/arm/mach-omap2/cm33xx.c | 4 +- + arch/arm/mach-omap2/cm3xxx.c | 3 +- + arch/arm/mach-omap2/cm_common.c | 31 +- + arch/arm/mach-omap2/cminst44xx.c | 29 +- + arch/arm/mach-omap2/devices.c | 175 -------- + arch/arm/mach-omap2/hsmmc.c | 5 +- + arch/arm/mach-omap2/io.c | 59 +-- + arch/arm/mach-omap2/mcbsp.c | 70 ---- + arch/arm/mach-omap2/omap-wakeupgen.c | 68 ++- + arch/arm/mach-omap2/omap_device.c | 5 +- + arch/arm/mach-omap2/omap_hwmod.c | 168 ++++++-- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 3 +- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 146 ++++++- + arch/arm/mach-omap2/opp.c | 104 ----- + arch/arm/mach-omap2/opp3xxx_data.c | 86 ---- + arch/arm/mach-omap2/opp4xxx_data.c | 79 ---- + arch/arm/mach-omap2/pm.c | 2 +- + arch/arm/mach-omap2/pmu.c | 97 ----- + arch/arm/mach-omap2/prcm-common.h | 7 + + arch/arm/mach-omap2/prcm_mpu44xx.c | 4 +- + arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h | 4 +- + arch/arm/mach-omap2/prm.h | 2 +- + arch/arm/mach-omap2/prm2xxx_3xxx.h | 4 +- + arch/arm/mach-omap2/prm33xx.c | 4 +- + arch/arm/mach-omap2/prm3xxx.c | 19 +- + arch/arm/mach-omap2/prm44xx.c | 63 +-- + arch/arm/mach-omap2/prm_common.c | 32 +- + arch/arm/mach-omap2/prminst44xx.c | 16 +- + arch/arm/mach-omap2/sr_device.c | 15 +- + arch/arm/mach-omap2/timer.c | 200 +++------ + arch/arm/mach-omap2/wd_timer.c | 28 -- + drivers/memory/omap-gpmc.c | 9 +- + 87 files changed, 1412 insertions(+), 1142 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-boneblue.dts + delete mode 100644 arch/arm/mach-omap2/opp.c + delete mode 100644 arch/arm/mach-omap2/pmu.c +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 reset/reset/next (28df169b9afa reset: Add the TI SCI reset driver) +$ git merge reset/reset/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/ti,sci-reset.txt | 62 +++++ + MAINTAINERS | 2 + + drivers/reset/Kconfig | 17 +- + drivers/reset/Makefile | 4 +- + drivers/reset/core.c | 23 +- + drivers/reset/reset-gemini.c | 110 +++++++++ + drivers/reset/reset-ti-sci.c | 269 +++++++++++++++++++++ + drivers/reset/sti/reset-syscfg.c | 6 +- + include/dt-bindings/reset/altr,rst-mgr-s10.h | 108 +++++++++ + include/dt-bindings/reset/cortina,gemini-reset.h | 36 +++ + 10 files changed, 623 insertions(+), 14 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/ti,sci-reset.txt + create mode 100644 drivers/reset/reset-gemini.c + create mode 100644 drivers/reset/reset-ti-sci.c + create mode 100644 include/dt-bindings/reset/altr,rst-mgr-s10.h + create mode 100644 include/dt-bindings/reset/cortina,gemini-reset.h +Merging qcom/for-next (05ebfa8ae478 Merge tag 'qcom-arm64-for-4.13' into all-for-4.13) +$ git merge qcom/for-next +Auto-merging arch/arm/Kconfig.debug +Merge made by the 'recursive' strategy. + arch/arm/Kconfig.debug | 1 + + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 129 +++++++++++++++++ + .../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts | 48 +++---- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 20 +-- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 53 ++++--- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 53 ++++--- + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 16 +-- + arch/arm/boot/dts/qcom-apq8064.dtsi | 154 ++++++++++++--------- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 20 +++ + arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 23 +++ + arch/arm/boot/dts/qcom-msm8660.dtsi | 84 +++++++++++ + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 1 - + arch/arm/boot/dts/qcom-msm8974.dtsi | 54 +++++++- + arch/arm/boot/dts/qcom-pm8941.dtsi | 36 ++++- + arch/arm/configs/qcom_defconfig | 2 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 36 ++--- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 62 ++++----- + arch/arm64/boot/dts/qcom/msm8992.dtsi | 53 +++++++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 + + drivers/firmware/Kconfig | 2 +- + drivers/firmware/qcom_scm.h | 122 +++++++++++++--- + drivers/soc/qcom/smsm.c | 9 +- + include/linux/qcom_scm.h | 32 ----- + 24 files changed, 728 insertions(+), 292 deletions(-) +Merging realtek/for-next (007e6304223c Merge branch 'v4.13/dt64' into next) +$ git merge realtek/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging renesas/next (57e4f5c382df Merge branches 'arm64-dt-for-v4.13', 'rcar-sysc-for-v4.13' and 'soc-for-v4.13' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 13 +- + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/r7s72100-gr-peach.dts | 66 +++ + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 + + arch/arm/boot/dts/r8a7743-iwg20d-q7.dts | 25 + + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 29 + + arch/arm/boot/dts/r8a7790.dtsi | 16 +- + arch/arm/boot/dts/r8a7791.dtsi | 16 +- + arch/arm/boot/dts/r8a7793-gose.dts | 127 ++++- + arch/arm/boot/dts/r8a7794.dtsi | 16 +- + arch/arm/mach-shmobile/pm-rmobile.c | 19 +- + arch/arm64/boot/dts/renesas/Makefile | 3 +- + arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts | 42 ++ + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 4 +- + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 109 ++++ + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 12 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 12 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 629 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/salvator-x.dtsi | 616 +------------------- + arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 20 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + arch/arm64/configs/defconfig | 1 + + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 2 +- + drivers/soc/renesas/Kconfig | 63 +++ + drivers/soc/renesas/Makefile | 31 +- + drivers/soc/renesas/rcar-sysc.c | 52 +- + drivers/soc/renesas/rcar-sysc.h | 2 - + include/dt-bindings/clock/r7s72100-clock.h | 51 ++ + include/linux/soc/renesas/rcar-rst.h | 3 +- + 30 files changed, 1260 insertions(+), 726 deletions(-) + create mode 100644 arch/arm/boot/dts/r7s72100-gr-peach.dts + create mode 100644 arch/arm/boot/dts/r8a7743-iwg20d-q7.dts + create mode 100644 arch/arm/boot/dts/r8a7743-iwg20m.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/salvator-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/salvator-xs.dtsi + create mode 100644 drivers/soc/renesas/Kconfig +Merging rockchip/for-next (dd3f24b9ff88 Merge branch 'v4.13-clk/next' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm/boot/dts/rv1108.dtsi +Auto-merging arch/arm/boot/dts/rv1108-evb.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig.debug +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 8 +- + .../bindings/clock/rockchip,rk3128-cru.txt | 56 ++ + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 86 +++ + arch/arm/Kconfig.debug | 30 + + arch/arm/boot/dts/Makefile | 2 +- + arch/arm/boot/dts/rk3229-evb.dts | 74 +++ + arch/arm/boot/dts/rk322x.dtsi | 211 +++++- + arch/arm/boot/dts/rk3288-firefly-reload.dts | 17 + + arch/arm/boot/dts/rk3288-firefly.dtsi | 18 + + 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/rk3328.dtsi | 33 + + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 718 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 145 +++++ + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 18 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 165 ++++- + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-rk3036.c | 1 + + drivers/clk/rockchip/clk-rk3128.c | 612 ++++++++++++++++++ + drivers/clk/rockchip/clk-rk3228.c | 164 +++-- + drivers/clk/rockchip/clk-rk3288.c | 14 +- + drivers/clk/rockchip/clk-rk3368.c | 5 +- + drivers/clk/rockchip/clk-rk3399.c | 4 +- + include/dt-bindings/clock/rk3128-cru.h | 282 ++++++++ + include/dt-bindings/clock/rk3228-cru.h | 47 ++ + include/dt-bindings/clock/rk3399-cru.h | 2 + + 33 files changed, 2685 insertions(+), 119 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3128-cru.txt + 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 + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi + create mode 100644 drivers/clk/rockchip/clk-rk3128.c + create mode 100644 include/dt-bindings/clock/rk3128-cru.h +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 (e34443289db4 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/sama5_defconfig +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm/configs/mxs_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-monk.dts | 6 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 6 +- + arch/arm/boot/dts/exynos4210-origen.dts | 2 +- + arch/arm/boot/dts/exynos4210-trats.dts | 4 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 6 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 4 + + arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 8 +- + arch/arm/boot/dts/exynos5.dtsi | 84 ++++++++++---------- + arch/arm/boot/dts/exynos5250-arndale.dts | 1 - + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 7 ++ + arch/arm/boot/dts/exynos5250-smdk5250.dts | 1 - + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 + + arch/arm/boot/dts/exynos5250-spring.dts | 1 - + arch/arm/boot/dts/exynos5250.dtsi | 21 ++++- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 1 - + arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 7 ++ + arch/arm/boot/dts/exynos5420-smdk5420.dts | 1 - + arch/arm/boot/dts/exynos5420.dtsi | 89 ++++++++++++--------- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 5 +- + arch/arm/boot/dts/exynos5440.dtsi | 2 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +- + arch/arm/configs/acs5k_defconfig | 8 -- + arch/arm/configs/acs5k_tiny_defconfig | 10 --- + arch/arm/configs/am200epdkit_defconfig | 7 -- + arch/arm/configs/assabet_defconfig | 3 - + arch/arm/configs/axm55xx_defconfig | 1 - + arch/arm/configs/badge4_defconfig | 5 -- + arch/arm/configs/cerfcube_defconfig | 4 - + arch/arm/configs/cm_x2xx_defconfig | 13 ---- + arch/arm/configs/cm_x300_defconfig | 10 --- + arch/arm/configs/cns3420vb_defconfig | 7 -- + arch/arm/configs/colibri_pxa270_defconfig | 13 ---- + arch/arm/configs/colibri_pxa300_defconfig | 9 --- + arch/arm/configs/collie_defconfig | 4 - + arch/arm/configs/corgi_defconfig | 13 ---- + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/ebsa110_defconfig | 1 - + arch/arm/configs/efm32_defconfig | 1 - + arch/arm/configs/em_x270_defconfig | 13 ---- + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/eseries_pxa_defconfig | 8 -- + arch/arm/configs/exynos_defconfig | 12 ++- + arch/arm/configs/ezx_defconfig | 18 ----- + arch/arm/configs/footbridge_defconfig | 1 - + arch/arm/configs/h5000_defconfig | 6 -- + arch/arm/configs/hackkit_defconfig | 3 - + arch/arm/configs/imote2_defconfig | 16 ---- + arch/arm/configs/imx_v4_v5_defconfig | 1 - + arch/arm/configs/iop13xx_defconfig | 4 - + arch/arm/configs/iop32x_defconfig | 5 -- + arch/arm/configs/iop33x_defconfig | 6 -- + arch/arm/configs/ixp4xx_defconfig | 9 --- + arch/arm/configs/jornada720_defconfig | 8 -- + arch/arm/configs/ks8695_defconfig | 7 -- + arch/arm/configs/lart_defconfig | 3 - + arch/arm/configs/lpc18xx_defconfig | 1 - + arch/arm/configs/lpd270_defconfig | 5 -- + arch/arm/configs/lubbock_defconfig | 4 - + arch/arm/configs/magician_defconfig | 15 ---- + arch/arm/configs/mainstone_defconfig | 4 - + arch/arm/configs/mini2440_defconfig | 91 +++++++--------------- + arch/arm/configs/mmp2_defconfig | 9 --- + arch/arm/configs/moxart_defconfig | 1 - + arch/arm/configs/mps2_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 6 ++ + arch/arm/configs/mv78xx0_defconfig | 8 -- + arch/arm/configs/mxs_defconfig | 1 - + arch/arm/configs/neponset_defconfig | 4 - + arch/arm/configs/netwinder_defconfig | 3 - + arch/arm/configs/netx_defconfig | 6 -- + arch/arm/configs/nhk8815_defconfig | 1 - + arch/arm/configs/nuc910_defconfig | 7 -- + arch/arm/configs/nuc950_defconfig | 7 -- + arch/arm/configs/nuc960_defconfig | 7 -- + arch/arm/configs/omap1_defconfig | 2 - + arch/arm/configs/orion5x_defconfig | 2 - + arch/arm/configs/palmz72_defconfig | 6 -- + arch/arm/configs/pcm027_defconfig | 8 -- + arch/arm/configs/pleb_defconfig | 3 - + arch/arm/configs/pxa168_defconfig | 9 --- + arch/arm/configs/pxa255-idp_defconfig | 4 - + arch/arm/configs/pxa3xx_defconfig | 9 --- + arch/arm/configs/pxa910_defconfig | 9 --- + arch/arm/configs/pxa_defconfig | 2 - + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/raumfeld_defconfig | 11 --- + arch/arm/configs/realview_defconfig | 1 - + arch/arm/configs/rpc_defconfig | 6 -- + arch/arm/configs/s3c2410_defconfig | 38 +++------ + arch/arm/configs/s3c6400_defconfig | 18 +---- + arch/arm/configs/s5pv210_defconfig | 28 +++---- + arch/arm/configs/sama5_defconfig | 1 - + arch/arm/configs/shannon_defconfig | 3 - + arch/arm/configs/simpad_defconfig | 7 -- + arch/arm/configs/spear13xx_defconfig | 4 - + arch/arm/configs/spear3xx_defconfig | 4 - + arch/arm/configs/spear6xx_defconfig | 3 - + arch/arm/configs/spitz_defconfig | 13 ---- + arch/arm/configs/sunxi_defconfig | 1 - + arch/arm/configs/tct_hammer_defconfig | 15 +--- + arch/arm/configs/trizeps4_defconfig | 8 -- + arch/arm/configs/u300_defconfig | 1 - + arch/arm/configs/vexpress_defconfig | 1 - + arch/arm/configs/viper_defconfig | 9 --- + arch/arm/configs/xcep_defconfig | 8 -- + arch/arm/configs/zeus_defconfig | 10 --- + arch/arm/configs/zx_defconfig | 2 - + arch/arm/mach-s3c64xx/Kconfig | 1 - + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 1 - + 112 files changed, 223 insertions(+), 712 deletions(-) +Merging sunxi/sunxi/for-next (efb85d294c2a Merge branches 'sunxi/h3-for-4.13', 'sunxi/dt-for-4.13' and 'sunxi/dt64-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 | 10 +- + arch/arm/boot/dts/Makefile | 4 +- + 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 | 6 +- + 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 | 10 + + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 10 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 172 +++- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 20 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 6 +- + 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 | 14 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 5 +- + 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 | 9 +- + 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 | 111 ++- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 21 + + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 53 +- + arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 64 ++ + arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 + + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 21 +- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 + + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 + + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 30 +- + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 32 + + arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 26 + + arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts | 96 +++ + arch/arm/boot/dts/sun8i-v3s.dtsi | 183 +++- + arch/arm/boot/dts/sunxi-common-regulators.dtsi | 30 - + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 55 +- + arch/arm64/boot/dts/allwinner/Makefile | 4 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 15 + + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 95 +++ + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 17 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 57 ++ + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 126 +++ + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 65 ++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 142 +++- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 161 ++++ + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 27 + + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 232 ++++++ + 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 | 115 +-- + drivers/clk/sunxi-ng/Makefile | 37 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 10 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 4 +- + 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-h3.h | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 117 ++- + 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/sun50i-a64-ccu.h | 2 + + 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/clock/sun8i-h3-ccu.h | 2 + + include/dt-bindings/reset/sun8i-a83t-ccu.h | 98 +++ + include/dt-bindings/reset/sun8i-de2.h | 14 + + include/linux/clk-provider.h | 16 +- + 125 files changed, 3961 insertions(+), 527 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/sun8i-de2.txt + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts + create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi + 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 (07bb9460b188 Merge branch for-4.13/arm64/dt into for-next) +$ git merge tegra/for-next +Removing arch/arm/boot/dts/tegra20-whistler.dts +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/tegra.txt | 1 - + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/tegra124-apalis-eval.dts | 2 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 2 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +- + arch/arm/boot/dts/tegra124.dtsi | 4 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 2 +- + arch/arm/boot/dts/tegra20-tec.dts | 2 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- + arch/arm/boot/dts/tegra20-whistler.dts | 636 --------------------- + arch/arm/boot/dts/tegra20.dtsi | 4 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 2 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 2 +- + arch/arm/boot/dts/tegra30-beaver.dts | 2 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30.dtsi | 5 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 7 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 4 +- + drivers/base/power/domain.c | 8 +- + drivers/firmware/tegra/bpmp.c | 32 +- + drivers/soc/tegra/Kconfig | 5 + + drivers/soc/tegra/Makefile | 1 + + drivers/soc/tegra/flowctrl.c | 2 +- + drivers/soc/tegra/powergate-bpmp.c | 359 ++++++++++++ + include/linux/pm_domain.h | 4 + + include/soc/tegra/bpmp-abi.h | 418 +++++++++++++- + include/soc/tegra/bpmp.h | 12 + + 30 files changed, 852 insertions(+), 681 deletions(-) + delete mode 100644 arch/arm/boot/dts/tegra20-whistler.dts + create mode 100644 drivers/soc/tegra/powergate-bpmp.c +Merging arm64/for-next/core (0870f692c2ed Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core) +$ git merge arm64/for-next/core +Auto-merging virt/kvm/arm/mmu.c +Auto-merging drivers/acpi/arm64/iort.c +Auto-merging arch/arm64/kernel/pci.c +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_arm.h | 10 ++ + arch/arm/include/asm/system_misc.h | 5 + + arch/arm64/Kconfig | 6 +- + arch/arm64/Makefile | 3 + + arch/arm64/include/asm/dma-mapping.h | 2 - + arch/arm64/include/asm/elf.h | 6 + + arch/arm64/include/asm/esr.h | 1 + + arch/arm64/include/asm/futex.h | 8 +- + arch/arm64/include/asm/kvm_arm.h | 10 ++ + arch/arm64/include/asm/module.h | 3 + + arch/arm64/include/asm/pgtable.h | 2 +- + arch/arm64/include/asm/stacktrace.h | 1 + + arch/arm64/include/asm/system_misc.h | 4 +- + arch/arm64/kernel/Makefile | 3 + + arch/arm64/kernel/cpufeature.c | 6 +- + arch/arm64/kernel/ftrace-mod.S | 18 +++ + arch/arm64/kernel/ftrace.c | 101 +++++++++++++++- + arch/arm64/kernel/module.c | 6 +- + arch/arm64/kernel/pci.c | 3 + + arch/arm64/kernel/probes/kprobes.c | 4 +- + arch/arm64/kernel/process.c | 1 + + arch/arm64/kernel/setup.c | 3 + + arch/arm64/kernel/stacktrace.c | 1 + + arch/arm64/kernel/traps.c | 4 +- + arch/arm64/kernel/vdso.c | 10 +- + arch/arm64/mm/dma-mapping.c | 9 -- + arch/arm64/mm/fault.c | 215 +++++++++++++++++++++++++---------- + arch/arm64/mm/hugetlbpage.c | 29 ++--- + arch/arm64/mm/mmap.c | 19 +++- + arch/arm64/mm/mmu.c | 1 + + drivers/acpi/apei/Kconfig | 15 +++ + drivers/acpi/apei/ghes.c | 215 +++++++++++++++++++++++++++++------ + drivers/acpi/apei/hest.c | 7 +- + drivers/acpi/arm64/iort.c | 15 --- + drivers/firmware/efi/cper.c | 204 ++++++++++++++++++++++++++++++--- + drivers/irqchip/Kconfig | 1 - + drivers/ras/ras.c | 16 ++- + include/acpi/ghes.h | 48 +++++++- + include/linux/acpi_iort.h | 2 - + include/linux/cper.h | 54 +++++++++ + include/linux/ras.h | 15 +++ + include/ras/ras_event.h | 90 +++++++++++++++ + include/uapi/linux/uuid.h | 6 +- + virt/kvm/arm/mmu.c | 36 +++++- + 44 files changed, 1022 insertions(+), 196 deletions(-) + create mode 100644 arch/arm64/kernel/ftrace-mod.S +Merging clk/clk-next (9c861f33284c Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Recorded preimage for 'MAINTAINERS' +Removing include/linux/platform_data/clk-realview.h +Removing drivers/clk/versatile/clk-realview.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'MAINTAINERS'. +[master 2a298590a156] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../arm/marvell/ap806-system-controller.txt | 24 +- + .../devicetree/bindings/clock/qoriq-clock.txt | 6 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 10 +- + .../devicetree/bindings/clock/ti,sci-clk.txt | 37 ++ + MAINTAINERS | 2 + + arch/mips/lantiq/clk.c | 5 - + drivers/clk/Kconfig | 8 +- + drivers/clk/Makefile | 6 +- + drivers/clk/at91/clk-generated.c | 4 +- + drivers/clk/bcm/clk-bcm2835.c | 65 +- + drivers/clk/clk-bulk.c | 157 +++++ + drivers/clk/clk-conf.c | 2 +- + drivers/clk/clk-devres.c | 36 + + drivers/clk/clk-palmas.c | 1 + + drivers/clk/clk-qoriq.c | 91 ++- + drivers/clk/clk-scpi.c | 6 +- + drivers/clk/imx/clk-imx7d.c | 2 +- + drivers/clk/imx/clk-pllv3.c | 5 + + drivers/clk/imx/clk.h | 1 + + drivers/clk/keystone/Kconfig | 15 + + drivers/clk/keystone/Makefile | 3 +- + drivers/clk/keystone/sci-clk.c | 724 +++++++++++++++++++++ + drivers/clk/meson/Kconfig | 1 + + drivers/clk/meson/gxbb.c | 124 ++-- + drivers/clk/meson/gxbb.h | 25 +- + drivers/clk/meson/meson8b.c | 2 +- + drivers/clk/mvebu/ap806-system-controller.c | 107 ++- + drivers/clk/mvebu/armada-38x.c | 7 +- + drivers/clk/renesas/Kconfig | 139 +++- + drivers/clk/renesas/Makefile | 41 +- + drivers/clk/renesas/clk-mstp.c | 2 +- + drivers/clk/renesas/clk-rcar-gen2.c | 23 +- + drivers/clk/renesas/r8a7745-cpg-mssr.c | 17 +- + drivers/clk/renesas/r8a7790-cpg-mssr.c | 278 ++++++++ + drivers/clk/renesas/r8a7791-cpg-mssr.c | 286 ++++++++ + drivers/clk/renesas/r8a7792-cpg-mssr.c | 221 +++++++ + drivers/clk/renesas/r8a7794-cpg-mssr.c | 255 ++++++++ + drivers/clk/renesas/r8a7795-cpg-mssr.c | 43 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 39 ++ + drivers/clk/renesas/renesas-cpg-mssr.c | 41 +- + drivers/clk/renesas/renesas-cpg-mssr.h | 4 + + drivers/clk/samsung/clk-cpu.c | 17 +- + drivers/clk/samsung/clk-exynos-audss.c | 57 +- + drivers/clk/samsung/clk-exynos-clkout.c | 18 +- + drivers/clk/samsung/clk-exynos5420.c | 27 +- + drivers/clk/samsung/clk-pll.c | 101 +-- + drivers/clk/samsung/clk-pll.h | 4 - + drivers/clk/samsung/clk-s3c2410-dclk.c | 75 ++- + drivers/clk/samsung/clk-s5pv210-audss.c | 52 +- + drivers/clk/samsung/clk.c | 91 ++- + drivers/clk/samsung/clk.h | 9 +- + drivers/clk/sunxi-ng/ccu-sun5i.c | 2 +- + drivers/clk/versatile/Makefile | 1 - + drivers/clk/versatile/clk-realview.c | 97 --- + include/dt-bindings/clock/exynos5420.h | 3 + + include/dt-bindings/clock/gxbb-clkc.h | 10 +- + include/dt-bindings/clock/r8a7790-cpg-mssr.h | 52 ++ + include/dt-bindings/clock/r8a7791-cpg-mssr.h | 48 ++ + include/dt-bindings/clock/r8a7792-cpg-mssr.h | 43 ++ + include/dt-bindings/clock/r8a7793-cpg-mssr.h | 48 ++ + include/dt-bindings/clock/r8a7794-cpg-mssr.h | 47 ++ + include/linux/clk.h | 136 ++++ + include/linux/platform_data/clk-realview.h | 1 - + 63 files changed, 3246 insertions(+), 558 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/ti,sci-clk.txt + create mode 100644 drivers/clk/clk-bulk.c + create mode 100644 drivers/clk/keystone/Kconfig + create mode 100644 drivers/clk/keystone/sci-clk.c + create mode 100644 drivers/clk/renesas/r8a7790-cpg-mssr.c + create mode 100644 drivers/clk/renesas/r8a7791-cpg-mssr.c + create mode 100644 drivers/clk/renesas/r8a7792-cpg-mssr.c + create mode 100644 drivers/clk/renesas/r8a7794-cpg-mssr.c + delete mode 100644 drivers/clk/versatile/clk-realview.c + create mode 100644 include/dt-bindings/clock/r8a7790-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a7791-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a7792-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a7793-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a7794-cpg-mssr.h + delete mode 100644 include/linux/platform_data/clk-realview.h +Merging c6x/for-linux-next (91ebcd1b97ae MAINTAINERS: update email address for C6x maintainer) +$ git merge c6x/for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (f4d8f47e52ec m68k: defconfig: Cleanup from old Kconfig options) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/m5208evb_defconfig | 1 - + arch/m68k/configs/m5249evb_defconfig | 1 - + arch/m68k/configs/m5272c3_defconfig | 1 - + arch/m68k/configs/m5275evb_defconfig | 1 - + arch/m68k/configs/m5307c3_defconfig | 1 - + arch/m68k/configs/m5407c3_defconfig | 1 - + 6 files changed, 6 deletions(-) +Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (83f0124ad81e microblaze: remove asm-generic wrapper headers) +$ git merge microblaze/next +Removing arch/microblaze/include/uapi/asm/termios.h +Removing arch/microblaze/include/uapi/asm/termbits.h +Removing arch/microblaze/include/uapi/asm/swab.h +Removing arch/microblaze/include/uapi/asm/statfs.h +Removing arch/microblaze/include/uapi/asm/stat.h +Removing arch/microblaze/include/uapi/asm/sockios.h +Removing arch/microblaze/include/uapi/asm/socket.h +Removing arch/microblaze/include/uapi/asm/signal.h +Removing arch/microblaze/include/uapi/asm/siginfo.h +Removing arch/microblaze/include/uapi/asm/shmbuf.h +Removing arch/microblaze/include/uapi/asm/sembuf.h +Removing arch/microblaze/include/uapi/asm/resource.h +Removing arch/microblaze/include/uapi/asm/poll.h +Removing arch/microblaze/include/uapi/asm/param.h +Removing arch/microblaze/include/uapi/asm/msgbuf.h +Removing arch/microblaze/include/uapi/asm/mman.h +Removing arch/microblaze/include/uapi/asm/kvm_para.h +Removing arch/microblaze/include/uapi/asm/ipcbuf.h +Removing arch/microblaze/include/uapi/asm/ioctls.h +Removing arch/microblaze/include/uapi/asm/ioctl.h +Removing arch/microblaze/include/uapi/asm/fcntl.h +Removing arch/microblaze/include/uapi/asm/errno.h +Removing arch/microblaze/include/uapi/asm/bitsperlong.h +Removing arch/microblaze/include/asm/xor.h +Removing arch/microblaze/include/asm/vga.h +Removing arch/microblaze/include/asm/ucontext.h +Removing arch/microblaze/include/asm/topology.h +Removing arch/microblaze/include/asm/shmparam.h +Removing arch/microblaze/include/asm/serial.h +Removing arch/microblaze/include/asm/percpu.h +Removing arch/microblaze/include/asm/parport.h +Removing arch/microblaze/include/asm/local64.h +Removing arch/microblaze/include/asm/local.h +Removing arch/microblaze/include/asm/linkage.h +Removing arch/microblaze/include/asm/kmap_types.h +Removing arch/microblaze/include/asm/kdebug.h +Removing arch/microblaze/include/asm/irq_regs.h +Removing arch/microblaze/include/asm/hardirq.h +Removing arch/microblaze/include/asm/fb.h +Removing arch/microblaze/include/asm/emergency-restart.h +Removing arch/microblaze/include/asm/div64.h +Removing arch/microblaze/include/asm/bugs.h +Removing arch/microblaze/include/asm/bug.h +Removing arch/microblaze/include/asm/bitops.h +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/Kbuild | 45 ++++++++++++++++++++++++- + arch/microblaze/include/asm/bitops.h | 1 - + arch/microblaze/include/asm/bug.h | 1 - + arch/microblaze/include/asm/bugs.h | 1 - + arch/microblaze/include/asm/div64.h | 1 - + arch/microblaze/include/asm/emergency-restart.h | 1 - + arch/microblaze/include/asm/fb.h | 1 - + arch/microblaze/include/asm/hardirq.h | 1 - + arch/microblaze/include/asm/irq_regs.h | 1 - + arch/microblaze/include/asm/kdebug.h | 1 - + arch/microblaze/include/asm/kmap_types.h | 6 ---- + arch/microblaze/include/asm/linkage.h | 1 - + arch/microblaze/include/asm/local.h | 1 - + arch/microblaze/include/asm/local64.h | 1 - + arch/microblaze/include/asm/parport.h | 1 - + arch/microblaze/include/asm/percpu.h | 1 - + arch/microblaze/include/asm/serial.h | 1 - + arch/microblaze/include/asm/shmparam.h | 1 - + arch/microblaze/include/asm/topology.h | 1 - + arch/microblaze/include/asm/ucontext.h | 1 - + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/include/asm/vga.h | 1 - + arch/microblaze/include/asm/xor.h | 1 - + arch/microblaze/include/uapi/asm/bitsperlong.h | 1 - + arch/microblaze/include/uapi/asm/errno.h | 1 - + arch/microblaze/include/uapi/asm/fcntl.h | 1 - + arch/microblaze/include/uapi/asm/ioctl.h | 1 - + arch/microblaze/include/uapi/asm/ioctls.h | 1 - + arch/microblaze/include/uapi/asm/ipcbuf.h | 1 - + arch/microblaze/include/uapi/asm/kvm_para.h | 1 - + arch/microblaze/include/uapi/asm/mman.h | 1 - + arch/microblaze/include/uapi/asm/msgbuf.h | 1 - + arch/microblaze/include/uapi/asm/param.h | 1 - + arch/microblaze/include/uapi/asm/poll.h | 1 - + arch/microblaze/include/uapi/asm/resource.h | 1 - + arch/microblaze/include/uapi/asm/sembuf.h | 1 - + arch/microblaze/include/uapi/asm/shmbuf.h | 1 - + arch/microblaze/include/uapi/asm/siginfo.h | 1 - + arch/microblaze/include/uapi/asm/signal.h | 1 - + arch/microblaze/include/uapi/asm/socket.h | 1 - + arch/microblaze/include/uapi/asm/sockios.h | 1 - + arch/microblaze/include/uapi/asm/stat.h | 1 - + arch/microblaze/include/uapi/asm/statfs.h | 1 - + arch/microblaze/include/uapi/asm/swab.h | 1 - + arch/microblaze/include/uapi/asm/termbits.h | 1 - + arch/microblaze/include/uapi/asm/termios.h | 1 - + arch/microblaze/include/uapi/asm/unistd.h | 1 + + arch/microblaze/kernel/dma.c | 3 +- + arch/microblaze/kernel/syscall_table.S | 1 + + arch/microblaze/kernel/timer.c | 2 ++ + 50 files changed, 50 insertions(+), 53 deletions(-) + delete mode 100644 arch/microblaze/include/asm/bitops.h + delete mode 100644 arch/microblaze/include/asm/bug.h + delete mode 100644 arch/microblaze/include/asm/bugs.h + delete mode 100644 arch/microblaze/include/asm/div64.h + delete mode 100644 arch/microblaze/include/asm/emergency-restart.h + delete mode 100644 arch/microblaze/include/asm/fb.h + delete mode 100644 arch/microblaze/include/asm/hardirq.h + delete mode 100644 arch/microblaze/include/asm/irq_regs.h + delete mode 100644 arch/microblaze/include/asm/kdebug.h + delete mode 100644 arch/microblaze/include/asm/kmap_types.h + delete mode 100644 arch/microblaze/include/asm/linkage.h + delete mode 100644 arch/microblaze/include/asm/local.h + delete mode 100644 arch/microblaze/include/asm/local64.h + delete mode 100644 arch/microblaze/include/asm/parport.h + delete mode 100644 arch/microblaze/include/asm/percpu.h + delete mode 100644 arch/microblaze/include/asm/serial.h + delete mode 100644 arch/microblaze/include/asm/shmparam.h + delete mode 100644 arch/microblaze/include/asm/topology.h + delete mode 100644 arch/microblaze/include/asm/ucontext.h + delete mode 100644 arch/microblaze/include/asm/vga.h + delete mode 100644 arch/microblaze/include/asm/xor.h + delete mode 100644 arch/microblaze/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/microblaze/include/uapi/asm/errno.h + delete mode 100644 arch/microblaze/include/uapi/asm/fcntl.h + delete mode 100644 arch/microblaze/include/uapi/asm/ioctl.h + delete mode 100644 arch/microblaze/include/uapi/asm/ioctls.h + delete mode 100644 arch/microblaze/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/microblaze/include/uapi/asm/kvm_para.h + delete mode 100644 arch/microblaze/include/uapi/asm/mman.h + delete mode 100644 arch/microblaze/include/uapi/asm/msgbuf.h + delete mode 100644 arch/microblaze/include/uapi/asm/param.h + delete mode 100644 arch/microblaze/include/uapi/asm/poll.h + delete mode 100644 arch/microblaze/include/uapi/asm/resource.h + delete mode 100644 arch/microblaze/include/uapi/asm/sembuf.h + delete mode 100644 arch/microblaze/include/uapi/asm/shmbuf.h + delete mode 100644 arch/microblaze/include/uapi/asm/siginfo.h + delete mode 100644 arch/microblaze/include/uapi/asm/signal.h + delete mode 100644 arch/microblaze/include/uapi/asm/socket.h + delete mode 100644 arch/microblaze/include/uapi/asm/sockios.h + delete mode 100644 arch/microblaze/include/uapi/asm/stat.h + delete mode 100644 arch/microblaze/include/uapi/asm/statfs.h + delete mode 100644 arch/microblaze/include/uapi/asm/swab.h + delete mode 100644 arch/microblaze/include/uapi/asm/termbits.h + delete mode 100644 arch/microblaze/include/uapi/asm/termios.h +Merging mips/mips-for-linux-next (156b0ddcf50b Merge branch '4.12-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/kernel/module-rela.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + arch/mips/Kconfig | 110 ++++++----- + arch/mips/boot/Makefile | 10 +- + arch/mips/boot/dts/mti/sead3.dts | 24 ++- + arch/mips/configs/ar7_defconfig | 6 - + arch/mips/configs/ath79_defconfig | 2 - + arch/mips/configs/bcm63xx_defconfig | 7 - + arch/mips/configs/bigsur_defconfig | 4 - + arch/mips/configs/bmips_be_defconfig | 1 - + arch/mips/configs/capcella_defconfig | 4 - + arch/mips/configs/cavium_octeon_defconfig | 1 - + arch/mips/configs/ci20_defconfig | 1 - + arch/mips/configs/cobalt_defconfig | 8 - + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/e55_defconfig | 2 - + arch/mips/configs/fuloong2e_defconfig | 11 -- + arch/mips/configs/gpr_defconfig | 8 - + arch/mips/configs/ip22_defconfig | 11 -- + arch/mips/configs/ip27_defconfig | 5 - + arch/mips/configs/ip28_defconfig | 5 - + arch/mips/configs/ip32_defconfig | 8 - + arch/mips/configs/jazz_defconfig | 6 - + arch/mips/configs/jmr3927_defconfig | 7 - + arch/mips/configs/lasat_defconfig | 5 - + arch/mips/configs/lemote2f_defconfig | 12 -- + arch/mips/configs/loongson3_defconfig | 3 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_kvm_guest_defconfig | 1 - + arch/mips/configs/malta_qemu_32r6_defconfig | 1 - + arch/mips/configs/maltaaprp_defconfig | 2 - + arch/mips/configs/maltasmvp_defconfig | 1 - + arch/mips/configs/maltasmvp_eva_defconfig | 2 - + arch/mips/configs/maltaup_defconfig | 2 - + arch/mips/configs/markeins_defconfig | 4 - + arch/mips/configs/mips_paravirt_defconfig | 1 - + arch/mips/configs/mpc30x_defconfig | 5 - + arch/mips/configs/msp71xx_defconfig | 2 - + arch/mips/configs/mtx1_defconfig | 11 -- + arch/mips/configs/nlm_xlp_defconfig | 5 - + arch/mips/configs/nlm_xlr_defconfig | 9 - + arch/mips/configs/pnx8335_stb225_defconfig | 7 - + arch/mips/configs/qi_lb60_defconfig | 3 - + arch/mips/configs/rb532_defconfig | 6 - + arch/mips/configs/rbtx49xx_defconfig | 7 - + arch/mips/configs/rm200_defconfig | 8 - + arch/mips/configs/rt305x_defconfig | 2 - + arch/mips/configs/sb1250_swarm_defconfig | 1 - + arch/mips/configs/tb0219_defconfig | 6 - + arch/mips/configs/tb0226_defconfig | 7 - + arch/mips/configs/tb0287_defconfig | 5 - + arch/mips/configs/workpad_defconfig | 4 - + arch/mips/generic/Kconfig | 8 + + arch/mips/generic/Makefile | 1 + + arch/mips/generic/board-sead3.c | 234 ++++------------------ + arch/mips/generic/init.c | 27 +++ + arch/mips/generic/yamon-dt.c | 240 +++++++++++++++++++++++ + arch/mips/include/asm/branch.h | 5 +- + arch/mips/include/asm/cpu-type.h | 1 + + arch/mips/include/asm/cpu.h | 3 +- + arch/mips/include/asm/highmem.h | 5 + + arch/mips/include/asm/kprobes.h | 3 +- + arch/mips/include/asm/mach-generic/mc146818rtc.h | 2 +- + arch/mips/include/asm/machine.h | 31 +++ + arch/mips/include/asm/module.h | 8 +- + arch/mips/include/asm/pgtable-32.h | 7 +- + arch/mips/include/asm/uasm.h | 30 +++ + arch/mips/include/asm/yamon-dt.h | 64 ++++++ + arch/mips/include/uapi/asm/inst.h | 9 +- + arch/mips/kernel/Makefile | 1 - + arch/mips/kernel/branch.c | 75 ++++--- + arch/mips/kernel/cpu-probe.c | 5 + + arch/mips/kernel/ftrace.c | 24 +-- + arch/mips/kernel/module-rela.c | 202 ------------------- + arch/mips/kernel/module.c | 221 +++++++++++++++------ + arch/mips/kernel/perf_event_mipsxx.c | 19 +- + arch/mips/kernel/ptrace.c | 22 ++- + arch/mips/kernel/scall32-o32.S | 2 +- + arch/mips/kernel/scall64-64.S | 2 +- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/syscall.c | 19 +- + arch/mips/math-emu/cp1emu.c | 43 +++- + arch/mips/mm/c-r4k.c | 2 + + arch/mips/mm/dma-default.c | 23 ++- + arch/mips/mm/pgtable-32.c | 6 +- + arch/mips/mm/uasm-micromips.c | 188 +++++++++--------- + arch/mips/mm/uasm-mips.c | 238 +++++++++++----------- + arch/mips/mm/uasm.c | 61 ++++-- + arch/mips/net/Makefile | 3 +- + 89 files changed, 1145 insertions(+), 1064 deletions(-) + create mode 100644 arch/mips/generic/yamon-dt.c + create mode 100644 arch/mips/include/asm/yamon-dt.h + delete mode 100644 arch/mips/kernel/module-rela.c +Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation) +$ git merge nios2/for-next +Already up-to-date. +Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options) +$ git merge openrisc/for-next +Auto-merging arch/openrisc/kernel/process.c +Merge made by the 'recursive' strategy. + arch/openrisc/configs/or1ksim_defconfig | 3 +-- + arch/openrisc/include/asm/fixmap.h | 1 + + arch/openrisc/kernel/or32_ksyms.c | 2 +- + arch/openrisc/kernel/process.c | 2 +- + arch/openrisc/lib/delay.c | 3 ++- + 5 files changed, 6 insertions(+), 5 deletions(-) +Merging parisc-hd/for-next (f02e6c61bc1f parisc: Don't hardcode PSW values in hpmc code) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/io.h | 16 ++-- + arch/parisc/include/asm/mmu_context.h | 15 +++- + arch/parisc/include/asm/pdc.h | 18 +++++ + arch/parisc/include/asm/pdcpat.h | 35 ++++++--- + 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 | 108 +++++++++++++++++++++++++ + arch/parisc/kernel/hpmc.S | 5 +- + arch/parisc/kernel/inventory.c | 9 +++ + arch/parisc/kernel/pdt.c | 143 ++++++++++++++++++++++++++++++++++ + arch/parisc/kernel/processor.c | 5 +- + arch/parisc/kernel/time.c | 24 +++++- + arch/parisc/lib/lusercopy.S | 25 +++--- + arch/parisc/mm/fault.c | 10 +-- + arch/parisc/mm/init.c | 3 + + 19 files changed, 377 insertions(+), 74 deletions(-) + create mode 100644 arch/parisc/kernel/pdt.c +Merging powerpc/next (0edc2ca9ccc9 Revert "powerpc: Handle simultaneous interrupts at once") +$ git merge powerpc/next +Removing arch/powerpc/include/uapi/asm/statfs.h +Removing arch/powerpc/include/uapi/asm/sockios.h +Removing arch/powerpc/include/uapi/asm/resource.h +Removing arch/powerpc/include/uapi/asm/poll.h +Removing arch/powerpc/include/uapi/asm/param.h +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/powerpc/firmware-assisted-dump.txt | 4 +- + MAINTAINERS | 11 +- + arch/powerpc/Kconfig | 20 +- + arch/powerpc/Makefile | 11 + + arch/powerpc/Makefile.postlink | 17 +- + arch/powerpc/boot/Makefile | 5 +- + arch/powerpc/boot/crtsavres.S | 8 +- + arch/powerpc/boot/dts/fsp2.dts | 608 +++++++++++++++++++++ + arch/powerpc/boot/dts/sequoia.dts | 2 +- + arch/powerpc/boot/ppc_asm.h | 12 +- + arch/powerpc/configs/44x/fsp2_defconfig | 126 +++++ + arch/powerpc/include/asm/bitops.h | 87 +-- + arch/powerpc/include/asm/book3s/32/pgalloc.h | 3 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 2 + + arch/powerpc/include/asm/book3s/64/pgalloc.h | 16 +- + arch/powerpc/include/asm/fadump.h | 3 + + arch/powerpc/include/asm/head-64.h | 22 +- + arch/powerpc/include/asm/mce.h | 15 +- + arch/powerpc/include/asm/nohash/32/pgalloc.h | 3 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 2 + + arch/powerpc/include/asm/nohash/64/pgalloc.h | 11 +- + arch/powerpc/include/asm/paca.h | 2 + + arch/powerpc/include/asm/pgalloc.h | 14 + + arch/powerpc/include/asm/ppc_asm.h | 11 +- + arch/powerpc/include/uapi/asm/Kbuild | 6 + + arch/powerpc/include/uapi/asm/param.h | 1 - + arch/powerpc/include/uapi/asm/poll.h | 1 - + arch/powerpc/include/uapi/asm/resource.h | 1 - + arch/powerpc/include/uapi/asm/sockios.h | 20 - + arch/powerpc/include/uapi/asm/statfs.h | 6 - + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/fadump.c | 68 ++- + arch/powerpc/kernel/idle_book3s.S | 33 +- + arch/powerpc/kernel/mce.c | 1 + + arch/powerpc/kernel/mce_power.c | 3 + + arch/powerpc/kernel/misc_32.S | 6 +- + arch/powerpc/kernel/time.c | 14 +- + arch/powerpc/kernel/vmlinux.lds.S | 51 +- + arch/powerpc/lib/Makefile | 15 +- + arch/powerpc/lib/copyuser_power7.S | 4 +- + arch/powerpc/lib/crtsavres.S | 6 +- + arch/powerpc/lib/xor_vmx.c | 53 +- + arch/powerpc/lib/xor_vmx.h | 20 + + arch/powerpc/lib/xor_vmx_glue.c | 62 +++ + arch/powerpc/mm/8xx_mmu.c | 2 +- + arch/powerpc/mm/dma-noncoherent.c | 2 +- + arch/powerpc/mm/dump_hashpagetable.c | 2 +- + arch/powerpc/mm/fault.c | 17 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/mm/mem.c | 4 +- + arch/powerpc/mm/mmu_decl.h | 1 - + arch/powerpc/mm/pgtable_32.c | 15 +- + arch/powerpc/mm/pgtable_64.c | 20 +- + arch/powerpc/mm/tlb_hash64.c | 6 +- + arch/powerpc/platforms/44x/Kconfig | 12 + + arch/powerpc/platforms/44x/Makefile | 1 + + arch/powerpc/platforms/44x/fsp2.c | 62 +++ + arch/powerpc/platforms/powernv/idle.c | 114 ++-- + arch/powerpc/platforms/powernv/opal-wrappers.S | 6 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- + arch/powerpc/sysdev/mpc8xx_pic.c | 2 +- + arch/powerpc/sysdev/xive/common.c | 2 +- + arch/powerpc/tools/head_check.sh | 78 +++ + arch/powerpc/tools/unrel_branch_check.sh | 57 ++ + arch/powerpc/xmon/xmon.c | 8 +- + drivers/cpuidle/cpuidle-powernv.c | 16 +- + drivers/misc/cxl/flash.c | 8 +- + drivers/tty/hvc/hvcs.c | 3 +- + include/asm-generic/vmlinux.lds.h | 12 + + .../selftests/powerpc/benchmarks/context_switch.c | 53 +- + 70 files changed, 1515 insertions(+), 379 deletions(-) + create mode 100644 arch/powerpc/boot/dts/fsp2.dts + create mode 100644 arch/powerpc/configs/44x/fsp2_defconfig + delete mode 100644 arch/powerpc/include/uapi/asm/param.h + delete mode 100644 arch/powerpc/include/uapi/asm/poll.h + delete mode 100644 arch/powerpc/include/uapi/asm/resource.h + delete mode 100644 arch/powerpc/include/uapi/asm/sockios.h + delete mode 100644 arch/powerpc/include/uapi/asm/statfs.h + create mode 100644 arch/powerpc/lib/xor_vmx.h + create mode 100644 arch/powerpc/lib/xor_vmx_glue.c + create mode 100644 arch/powerpc/platforms/44x/fsp2.c + create mode 100644 arch/powerpc/tools/head_check.sh + create mode 100755 arch/powerpc/tools/unrel_branch_check.sh +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 (f044f4c58898 s390/fpu: export save_fpu_regs for all configs) +$ 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 +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 3 +- + 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/elf.h | 32 +++++ + arch/s390/include/asm/fb.h | 12 -- + arch/s390/include/asm/io.h | 4 +- + arch/s390/include/asm/mmu_context.h | 4 +- + arch/s390/include/asm/page.h | 3 + + arch/s390/include/asm/pgalloc.h | 25 +++- + arch/s390/include/asm/pgtable.h | 105 +++++++++++--- + arch/s390/include/asm/processor.h | 4 +- + arch/s390/include/asm/ptrace.h | 54 +++---- + arch/s390/include/asm/sigp.h | 2 +- + arch/s390/include/asm/thread_info.h | 1 + + arch/s390/include/asm/tlb.h | 15 ++ + arch/s390/kernel/dumpstack.c | 33 +---- + arch/s390/kernel/entry.S | 17 ++- + arch/s390/kernel/ipl.c | 7 +- + arch/s390/kernel/perf_cpum_sf.c | 10 +- + arch/s390/kernel/perf_event.c | 3 +- + arch/s390/kernel/ptrace.c | 15 +- + arch/s390/kernel/smp.c | 3 + + arch/s390/kernel/traps.c | 1 + + arch/s390/kernel/uprobes.c | 12 +- + arch/s390/kernel/vdso.c | 91 ++++++++---- + arch/s390/kernel/vtime.c | 14 +- + arch/s390/kvm/gaccess.c | 22 +-- + arch/s390/kvm/gaccess.h | 4 +- + arch/s390/kvm/guestdbg.c | 6 +- + arch/s390/kvm/priv.c | 8 +- + arch/s390/mm/dump_pagetables.c | 23 ++- + arch/s390/mm/fault.c | 2 +- + arch/s390/mm/gmap.c | 11 +- + arch/s390/mm/gup.c | 33 ++++- + arch/s390/mm/hugetlbpage.c | 30 ++-- + arch/s390/mm/init.c | 6 +- + 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 +++++- + arch/s390/tools/gen_facilities.c | 2 - + drivers/crypto/Kconfig | 15 +- + drivers/s390/block/Kconfig | 7 - + drivers/s390/block/Makefile | 3 - + drivers/s390/block/dasd.c | 76 +++++----- + drivers/s390/block/dasd_devmap.c | 73 +++++++--- + drivers/s390/block/scm_blk.c | 262 +++++++++++++++------------------- + drivers/s390/block/scm_blk.h | 60 +------- + drivers/s390/block/scm_blk_cluster.c | 255 --------------------------------- + drivers/s390/cio/css.c | 49 +++++++ + drivers/s390/cio/device.c | 42 ------ + drivers/s390/cio/vfio_ccw_drv.c | 58 +------- + drivers/s390/crypto/ap_bus.c | 21 ++- + drivers/s390/crypto/pkey_api.c | 6 +- + drivers/s390/crypto/zcrypt_api.c | 12 +- + drivers/s390/crypto/zcrypt_cca_key.h | 115 +-------------- + drivers/s390/crypto/zcrypt_msgtype6.c | 4 +- + drivers/tty/hvc/Kconfig | 2 +- + 61 files changed, 845 insertions(+), 989 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 (c55c5ddedba0 sparc/time: make of_device_ids const) +$ git merge sparc-next/master +Auto-merging arch/sparc/Kconfig +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 5 + + arch/sparc/include/asm/cmpxchg_64.h | 76 ++++++++++-- + arch/sparc/include/asm/ldc.h | 8 ++ + arch/sparc/include/asm/qrwlock.h | 7 ++ + arch/sparc/include/asm/qspinlock.h | 7 ++ + arch/sparc/include/asm/setup.h | 2 +- + arch/sparc/include/asm/spinlock_64.h | 208 +------------------------------- + arch/sparc/include/asm/spinlock_types.h | 12 +- + arch/sparc/include/asm/timer_64.h | 67 ++++++++++ + arch/sparc/kernel/kernel.h | 3 + + arch/sparc/kernel/ldc.c | 141 +++++++++++++++------- + arch/sparc/kernel/setup_64.c | 7 +- + arch/sparc/kernel/time_32.c | 2 +- + arch/sparc/kernel/time_64.c | 179 ++++++++++++++++++--------- + arch/sparc/kernel/vmlinux.lds.S | 5 + + kernel/locking/qrwlock.c | 1 + + 16 files changed, 408 insertions(+), 322 deletions(-) + create mode 100644 arch/sparc/include/asm/qrwlock.h + create mode 100644 arch/sparc/include/asm/qspinlock.h +Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) +$ git merge sh/for-next +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +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 (bdf3b55fde37 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 (736202ae51c5 Merge branch 'for-next-next-v4.13-20170605' into for-next-20170605) +$ git merge btrfs-kdave/for-next +Resolved 'fs/btrfs/extent-tree.c' using previous resolution. +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/dir-item.c +Auto-merging fs/btrfs/ctree.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1f99acc236d9] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/backref.c | 10 +- + fs/btrfs/check-integrity.c | 51 ++--- + fs/btrfs/compression.c | 94 ++------- + fs/btrfs/compression.h | 44 +++- + fs/btrfs/ctree.c | 42 ++-- + fs/btrfs/ctree.h | 46 +++-- + fs/btrfs/dir-item.c | 86 +++++++- + fs/btrfs/disk-io.c | 126 +++++++---- + fs/btrfs/disk-io.h | 8 +- + fs/btrfs/export.c | 5 + + fs/btrfs/extent-tree.c | 331 ++++++++++++++--------------- + fs/btrfs/extent_io.c | 206 ++++++++---------- + fs/btrfs/extent_io.h | 80 +++++-- + fs/btrfs/file-item.c | 31 ++- + fs/btrfs/file.c | 46 +++-- + fs/btrfs/free-space-tree.c | 12 +- + fs/btrfs/inode-map.c | 4 +- + fs/btrfs/inode.c | 436 ++++++++++++++++++++++----------------- + fs/btrfs/ioctl.c | 16 +- + fs/btrfs/lzo.c | 29 +-- + fs/btrfs/print-tree.c | 7 +- + fs/btrfs/props.c | 7 + + fs/btrfs/qgroup.c | 220 ++++++++++++++------ + fs/btrfs/qgroup.h | 8 +- + fs/btrfs/raid56.c | 14 +- + fs/btrfs/reada.c | 1 - + fs/btrfs/relocation.c | 15 +- + fs/btrfs/root-tree.c | 7 + + fs/btrfs/scrub.c | 195 +++++++---------- + fs/btrfs/send.c | 25 +-- + fs/btrfs/super.c | 3 +- + fs/btrfs/sysfs.c | 41 ++++ + fs/btrfs/tests/extent-io-tests.c | 2 +- + fs/btrfs/transaction.c | 20 +- + fs/btrfs/tree-log.c | 43 +++- + fs/btrfs/volumes.c | 34 +-- + fs/btrfs/volumes.h | 2 + + fs/btrfs/xattr.c | 2 +- + fs/btrfs/zlib.c | 20 +- + include/trace/events/btrfs.h | 36 ---- + 40 files changed, 1335 insertions(+), 1070 deletions(-) +Merging ceph/master (4ca2fea6f827 ceph: unify inode i_ctime update) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/acl.c | 1 + + fs/ceph/export.c | 4 ++++ + fs/ceph/inode.c | 5 ++--- + fs/ceph/mds_client.c | 4 +--- + 4 files changed, 8 insertions(+), 6 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 (19e72d3abb63 configfs: Introduce config_item_get_unless_zero()) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + fs/configfs/item.c | 8 ++++++++ + fs/configfs/symlink.c | 3 +-- + include/linux/configfs.h | 3 ++- + 3 files changed, 11 insertions(+), 3 deletions(-) +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 (fd3cfad374d4 udf: Convert udf_disk_stamp_to_time() to use mktime64()) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/udf/file.c | 12 +++++-- + fs/udf/inode.c | 4 +-- + fs/udf/super.c | 2 -- + fs/udf/udftime.c | 98 ++++++++------------------------------------------------ + 4 files changed, 24 insertions(+), 92 deletions(-) +Merging ext4/dev (67a7d5f561f4 ext4: fix fdatasync(2) after extent manipulation operations) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (1b7d8dd63b27 f2fs: fix a panic caused by NULL flush_cmd_control) +$ git merge f2fs/dev +Auto-merging fs/f2fs/segment.h +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Merge made by the 'recursive' strategy. + fs/f2fs/acl.c | 2 +- + fs/f2fs/checkpoint.c | 19 +++-- + fs/f2fs/data.c | 168 ++++++++++++++++++++++++++++---------------- + fs/f2fs/extent_cache.c | 12 +++- + fs/f2fs/f2fs.h | 45 +++++++++--- + fs/f2fs/file.c | 37 ++++++---- + fs/f2fs/gc.c | 40 +++++++---- + fs/f2fs/inode.c | 7 +- + fs/f2fs/node.c | 13 ++-- + fs/f2fs/segment.c | 164 ++++++++++++++++++++++++++---------------- + fs/f2fs/segment.h | 4 ++ + fs/f2fs/super.c | 51 +++++++++++--- + include/trace/events/f2fs.h | 16 ++++- + 13 files changed, 385 insertions(+), 193 deletions(-) +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 (68227c03cba8 fuse: initialize the flock flag in fuse_file on allocation) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (501e7a468937 NFSv4.2: Don't send mode again in post-EXCLUSIVE4_1 SETATTR with umask) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4proc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging nfsd/nfsd-next (bb2a8b0cd116 nfsd4: const-ify nfsd4_ops) +$ git merge nfsd/nfsd-next +Auto-merging include/linux/sunrpc/svc.h +Auto-merging fs/nfsd/nfsxdr.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging fs/nfsd/nfs3xdr.c +Auto-merging fs/nfs/internal.h +Merge made by the 'recursive' strategy. + fs/lockd/clnt4xdr.c | 34 ++- + fs/lockd/clntxdr.c | 58 +++-- + fs/lockd/mon.c | 38 ++-- + fs/lockd/svc.c | 38 ++-- + fs/lockd/svc4proc.c | 124 +++++++---- + fs/lockd/svcproc.c | 124 +++++++---- + fs/lockd/xdr.c | 43 ++-- + fs/lockd/xdr4.c | 43 ++-- + fs/nfs/callback.c | 2 +- + fs/nfs/callback.h | 27 +-- + fs/nfs/callback_proc.c | 33 ++- + fs/nfs/callback_xdr.c | 113 +++++----- + fs/nfs/internal.h | 10 +- + fs/nfs/mount_clnt.c | 29 ++- + fs/nfs/nfs2xdr.c | 70 ++++-- + fs/nfs/nfs3xdr.c | 151 ++++++++----- + fs/nfs/nfs42xdr.c | 52 +++-- + fs/nfs/nfs4_fs.h | 6 +- + fs/nfs/nfs4xdr.c | 331 ++++++++++++++++++---------- + fs/nfsd/current_stateid.h | 36 ++- + fs/nfsd/nfs2acl.c | 116 +++++----- + fs/nfsd/nfs3acl.c | 75 ++++--- + fs/nfsd/nfs3proc.c | 301 +++++++++++++------------ + fs/nfsd/nfs3xdr.c | 164 ++++++++------ + fs/nfsd/nfs4callback.c | 32 ++- + fs/nfsd/nfs4proc.c | 412 ++++++++++++++++++----------------- + fs/nfsd/nfs4state.c | 142 +++++++----- + fs/nfsd/nfs4xdr.c | 13 +- + fs/nfsd/nfsd.h | 6 +- + fs/nfsd/nfsproc.c | 206 +++++++++--------- + fs/nfsd/nfssvc.c | 24 +- + fs/nfsd/nfsxdr.c | 92 ++++---- + fs/nfsd/xdr.h | 50 ++--- + fs/nfsd/xdr3.h | 100 +++------ + fs/nfsd/xdr4.h | 78 +++---- + include/linux/lockd/lockd.h | 4 +- + include/linux/lockd/xdr.h | 26 +-- + include/linux/lockd/xdr4.h | 26 +-- + include/linux/sunrpc/clnt.h | 6 +- + include/linux/sunrpc/sched.h | 2 +- + include/linux/sunrpc/svc.h | 21 +- + include/linux/sunrpc/xdr.h | 15 +- + net/sunrpc/auth_gss/gss_rpc_upcall.c | 9 +- + net/sunrpc/auth_gss/gss_rpc_xdr.c | 14 +- + net/sunrpc/auth_gss/gss_rpc_xdr.h | 4 +- + net/sunrpc/clnt.c | 16 +- + net/sunrpc/rpcb_clnt.c | 82 ++++--- + net/sunrpc/stats.c | 16 +- + net/sunrpc/svc.c | 33 +-- + 49 files changed, 1956 insertions(+), 1491 deletions(-) +Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (a082c6f680da ovl: filter trusted xattr for non-admin) +$ git merge overlayfs/overlayfs-next +Already up-to-date. +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 (f73127356f34 fs/fcntl: return -ESRCH in f_setown when pid/pgid can't be found) +$ git merge file-locks/linux-next +Merge made by the 'recursive' strategy. + fs/fcntl.c | 172 +++++++++++++++++++++++++++++++++-------------------- + fs/locks.c | 97 ++++++++++-------------------- + include/linux/fs.h | 10 ++-- + net/socket.c | 3 +- + 4 files changed, 145 insertions(+), 137 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 (f4e981cba2de printk: add __printf attributes to internal functions) +$ 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 | 36 +++++++++++++++++++++++++++++------- + lib/nmi_backtrace.c | 3 +++ + 4 files changed, 50 insertions(+), 14 deletions(-) +Merging pci/next (c823e5b95885 Merge branch 'pci/host-xilinx' into next) +$ git merge pci/next +Auto-merging drivers/pci/pci.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/faraday,ftpci100.txt | 7 + + .../bindings/pci/mediatek,mt7623-pcie.txt | 130 +++++ + .../devicetree/bindings/pci/qcom,pcie.txt | 20 +- + .../asm/mach-loongson64/cs5536/cs5536_pci.h | 1 - + arch/mips/include/asm/pci.h | 1 - + arch/mips/pci/pci-legacy.c | 3 +- + arch/x86/pci/pcbios.c | 2 +- + drivers/pci/dwc/Kconfig | 1 + + drivers/pci/dwc/pcie-qcom.c | 422 +++++++++++++--- + drivers/pci/host/Kconfig | 11 + + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-ftpci100.c | 56 +++ + drivers/pci/host/pci-tegra.c | 33 +- + drivers/pci/host/pcie-mediatek.c | 552 +++++++++++++++++++++ + drivers/pci/host/pcie-xilinx-nwl.c | 45 +- + drivers/pci/pci-label.c | 7 +- + drivers/pci/pci.c | 2 +- + drivers/pci/pcie/pcie-dpc.c | 4 +- + drivers/pci/quirks.c | 2 +- + drivers/video/fbdev/efifb.c | 2 +- + 20 files changed, 1218 insertions(+), 84 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/mediatek,mt7623-pcie.txt + create mode 100644 drivers/pci/host/pcie-mediatek.c +Merging pstore/for-next/pstore (d3762358a739 pstore: Fix format string to use %u for record id) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + drivers/firmware/efi/efi-pstore.c | 87 +++++++++++++++++---------------------- + fs/pstore/inode.c | 22 +++++----- + fs/pstore/internal.h | 2 + + fs/pstore/platform.c | 58 ++++++++++++++++++-------- + fs/pstore/pmsg.c | 10 ++--- + fs/pstore/ram.c | 16 +++---- + include/linux/pstore.h | 5 ++- + 7 files changed, 105 insertions(+), 95 deletions(-) +Merging hid/for-next (4bf938cb7b1c Merge branch 'for-4.12/driver-matching-fix' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 7 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-apple.c | 59 ++++---- + drivers/hid/hid-asus.c | 30 ++++ + drivers/hid/hid-chicony.c | 2 - + drivers/hid/hid-core.c | 99 ++++++++++++- + drivers/hid/hid-ids.h | 9 +- + drivers/hid/hid-input.c | 9 ++ + drivers/hid/hid-ite.c | 56 ++++++++ + drivers/hid/i2c-hid/i2c-hid.c | 34 ++--- + drivers/hid/intel-ish-hid/Kconfig | 2 +- + drivers/hid/intel-ish-hid/ipc/ipc.c | 15 +- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 5 +- + drivers/hid/intel-ish-hid/ishtp/client.c | 49 +++---- + drivers/hid/intel-ish-hid/ishtp/client.h | 6 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 11 +- + drivers/hid/usbhid/hid-core.c | 150 +++++++++---------- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/usbhid/hiddev.c | 24 ++-- + drivers/hid/usbhid/usbhid.h | 15 +- + drivers/hid/wacom.h | 1 + + drivers/hid/wacom_sys.c | 4 +- + drivers/hid/wacom_wac.c | 192 +++++++++++++++---------- + drivers/hid/wacom_wac.h | 7 + + drivers/staging/greybus/hid.c | 43 ++---- + include/linux/hid.h | 82 +++-------- + include/linux/{i2c => platform_data}/i2c-hid.h | 0 + 27 files changed, 531 insertions(+), 382 deletions(-) + create mode 100644 drivers/hid/hid-ite.c + rename include/linux/{i2c => platform_data}/i2c-hid.h (100%) +Merging i2c/i2c/for-next (950497ff64f5 Merge branch 'i2c/for-4.13' into i2c/for-next) +$ git merge i2c/i2c/for-next +Removing include/linux/i2c/i2c-sh_mobile.h +Auto-merging drivers/i2c/i2c-core-base.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/driver-api/i2c.rst | 5 +- + Documentation/i2c/dev-interface | 14 +- + MAINTAINERS | 1 + + drivers/i2c/Makefile | 7 +- + drivers/i2c/busses/i2c-designware-core.c | 2 +- + drivers/i2c/busses/i2c-ismt.c | 2 +- + drivers/i2c/busses/i2c-mxs.c | 6 +- + drivers/i2c/busses/i2c-rcar.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 27 +- + drivers/i2c/busses/i2c-xgene-slimpro.c | 242 +++- + drivers/i2c/i2c-core-acpi.c | 653 +++++++++++ + drivers/i2c/{i2c-core.c => i2c-core-base.c} | 1684 +-------------------------- + drivers/i2c/i2c-core-of.c | 276 +++++ + drivers/i2c/i2c-core-slave.c | 115 ++ + drivers/i2c/i2c-core-smbus.c | 594 ++++++++++ + drivers/i2c/i2c-core.h | 24 + + drivers/i2c/i2c-stub.c | 14 +- + include/linux/i2c/i2c-sh_mobile.h | 11 - + include/trace/events/i2c.h | 226 +--- + include/trace/events/smbus.h | 249 ++++ + 20 files changed, 2188 insertions(+), 1966 deletions(-) + create mode 100644 drivers/i2c/i2c-core-acpi.c + rename drivers/i2c/{i2c-core.c => i2c-core-base.c} (58%) + create mode 100644 drivers/i2c/i2c-core-of.c + create mode 100644 drivers/i2c/i2c-core-slave.c + create mode 100644 drivers/i2c/i2c-core-smbus.c + delete mode 100644 include/linux/i2c/i2c-sh_mobile.h + create mode 100644 include/trace/events/smbus.h +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 (8efa050f19fe firmware: dmi_scan: Check DMI structure length) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 4 ++-- + drivers/firmware/dmi_scan.c | 49 ++++++++++++++++++++++++++++++++++----------- + include/linux/dmi.h | 2 +- + 3 files changed, 40 insertions(+), 15 deletions(-) +Merging hwmon-staging/hwmon-next (677252a185a9 hwmon: (pwm-fan) Switch to new atomic PWM API) +$ 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/aspeed-pwm-tacho.c | 24 +- + drivers/hwmon/ds620.c | 2 +- + drivers/hwmon/ibmpowernv.c | 68 ++++- + 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/hwmon/pwm-fan.c | 68 ++--- + drivers/hwmon/scpi-hwmon.c | 54 +++- + 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 + 29 files changed, 986 insertions(+), 209 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 (68f04b571da4 Doc: fix a markup error in coding-style.rst) +$ git merge jc_docs/docs-next +Auto-merging security/keys/trusted.c +Auto-merging security/keys/encrypted-keys/encrypted.c +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 include/linux/key.h +Auto-merging fs/namei.c +Auto-merging fs/jbd2/transaction.c +Auto-merging drivers/net/phy/phy.c +Auto-merging drivers/mtd/nand/nand_base.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/ahci.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 +Auto-merging Documentation/driver-api/i2c.rst +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/DMA-API.txt | 2 +- + 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/i2c.rst | 9 +- + 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/coding-style.rst | 4 +- + 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 | 9 +- + .../translations/ko_KR/memory-barriers.txt | 2 +- + 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 +- + 170 files changed, 8363 insertions(+), 11244 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 (acec36301557 [media] s3c-camif: fix arguments position in a function call) +$ git merge v4l-dvb/master +Auto-merging include/media/v4l2-fwnode.h +Removing drivers/staging/media/lirc/TODO.lirc_zilog +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_irq.c +Auto-merging drivers/media/v4l2-core/videobuf2-core.c +Removing drivers/media/v4l2-core/v4l2-of.c +Auto-merging drivers/media/usb/rainshadow-cec/rainshadow-cec.c +Auto-merging drivers/media/rc/sir_ir.c +Auto-merging drivers/media/i2c/tc358743.c +Removing Documentation/media/kapi/v4l2-of.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/i2c/adv7180.txt | 15 + + .../devicetree/bindings/media/mediatek-mdp.txt | 12 +- + .../devicetree/bindings/media/rcar_vin.txt | 4 +- + .../devicetree/bindings/media/st,stm32-cec.txt | 19 + + .../devicetree/bindings/media/st,stm32-dcmi.txt | 45 + + Documentation/media/kapi/v4l2-core.rst | 2 +- + Documentation/media/kapi/v4l2-fwnode.rst | 3 + + Documentation/media/kapi/v4l2-of.rst | 3 - + .../media/uapi/mediactl/media-ioc-g-topology.rst | 8 +- + Documentation/media/uapi/v4l/extended-controls.rst | 2 +- + drivers/leds/leds-aat1290.c | 5 +- + drivers/leds/leds-max77693.c | 5 +- + drivers/media/cec/cec-adap.c | 28 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 39 +- + drivers/media/dvb-frontends/af9013.c | 1 + + drivers/media/dvb-frontends/au8522_common.c | 1 + + drivers/media/dvb-frontends/au8522_decoder.c | 74 +- + drivers/media/dvb-frontends/au8522_dig.c | 215 ++- + 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/Kconfig | 11 + + drivers/media/i2c/ad5820.c | 2 +- + drivers/media/i2c/adv7180.c | 2 + + drivers/media/i2c/adv7604.c | 7 +- + drivers/media/i2c/cx25840/cx25840-core.c | 36 +- + drivers/media/i2c/msp3400-kthreads.c | 1 + + drivers/media/i2c/mt9v032.c | 7 +- + drivers/media/i2c/ov2659.c | 11 +- + drivers/media/i2c/ov5645.c | 7 +- + drivers/media/i2c/ov5647.c | 7 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 7 +- + drivers/media/i2c/s5k5baf.c | 6 +- + drivers/media/i2c/s5k6aa.c | 2 +- + drivers/media/i2c/smiapp/Kconfig | 1 + + drivers/media/i2c/smiapp/smiapp-core.c | 29 +- + drivers/media/i2c/soc_camera/ov6650.c | 2 + + drivers/media/i2c/tc358743.c | 76 +- + drivers/media/i2c/tvp514x.c | 6 +- + drivers/media/i2c/tvp5150.c | 7 +- + drivers/media/i2c/tvp7002.c | 6 +- + drivers/media/pci/bt8xx/dst_ca.c | 1 + + drivers/media/pci/cobalt/cobalt-driver.c | 2 + + drivers/media/pci/cx18/cx18-alsa-pcm.c | 4 +- + drivers/media/pci/cx18/cx18-dvb.c | 2 +- + drivers/media/pci/cx23885/cx23885-cards.c | 3 +- + drivers/media/pci/cx88/cx88-cards.c | 9 +- + drivers/media/pci/cx88/cx88-video.c | 4 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 7 +- + drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 4 +- + drivers/media/pci/saa7134/saa7134-cards.c | 4 +- + drivers/media/pci/saa7164/saa7164-bus.c | 13 +- + 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/pci/ttpci/av7110.c | 5 + + drivers/media/pci/zoran/zoran_driver.c | 2 + + drivers/media/platform/Kconfig | 28 + + drivers/media/platform/Makefile | 8 +- + drivers/media/platform/am437x/Kconfig | 1 + + drivers/media/platform/am437x/am437x-vpfe.c | 15 +- + drivers/media/platform/atmel/Kconfig | 2 + + drivers/media/platform/atmel/atmel-isc.c | 36 +- + drivers/media/platform/atmel/atmel-isi.c | 35 +- + drivers/media/platform/coda/coda-bit.c | 21 +- + drivers/media/platform/coda/coda-common.c | 67 +- + drivers/media/platform/coda/coda.h | 4 + + drivers/media/platform/davinci/Kconfig | 1 + + drivers/media/platform/davinci/vpif_capture.c | 232 +++- + drivers/media/platform/davinci/vpif_display.c | 5 + + drivers/media/platform/exynos-gsc/gsc-core.c | 9 +- + drivers/media/platform/exynos-gsc/gsc-core.h | 1 + + drivers/media/platform/exynos4-is/Kconfig | 2 + + drivers/media/platform/exynos4-is/fimc-capture.c | 3 + + drivers/media/platform/exynos4-is/fimc-is.c | 7 +- + drivers/media/platform/exynos4-is/media-dev.c | 13 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 6 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 1 + + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 12 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 10 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 20 +- + drivers/media/platform/omap3isp/isp.c | 49 +- + drivers/media/platform/pxa_camera.c | 77 +- + drivers/media/platform/rcar-vin/Kconfig | 1 + + drivers/media/platform/rcar-vin/rcar-core.c | 66 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 230 ++-- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 97 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 9 +- + drivers/media/platform/rcar_fdp1.c | 2 +- + drivers/media/platform/s3c-camif/camif-capture.c | 4 +- + drivers/media/platform/s5p-cec/s5p_cec.c | 2 +- + drivers/media/platform/s5p-cec/s5p_cec.h | 1 - + drivers/media/platform/s5p-jpeg/jpeg-core.c | 20 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 2 +- + drivers/media/platform/sh_vou.c | 2 + + drivers/media/platform/soc_camera/soc_camera.c | 7 +- + drivers/media/platform/soc_camera/soc_mediabus.c | 1 + + drivers/media/platform/sti/cec/stih-cec.c | 7 +- + drivers/media/platform/stm32/Makefile | 2 + + drivers/media/platform/stm32/stm32-cec.c | 362 +++++ + drivers/media/platform/stm32/stm32-dcmi.c | 1404 ++++++++++++++++++++ + drivers/media/platform/ti-vpe/cal.c | 15 +- + drivers/media/platform/xilinx/Kconfig | 1 + + drivers/media/platform/xilinx/xilinx-vipp.c | 63 +- + drivers/media/rc/Kconfig | 8 +- + drivers/media/rc/ati_remote.c | 3 - + drivers/media/rc/iguanair.c | 1 + + drivers/media/rc/img-ir/img-ir-hw.c | 4 - + drivers/media/rc/imon.c | 2 +- + drivers/media/rc/ir-lirc-codec.c | 37 +- + drivers/media/rc/ir-spi.c | 11 +- + drivers/media/rc/lirc_dev.c | 254 +--- + drivers/media/rc/mceusb.c | 158 ++- + drivers/media/rc/meson-ir.c | 89 +- + drivers/media/rc/rc-core-priv.h | 2 + + drivers/media/rc/rc-ir-raw.c | 36 +- + drivers/media/rc/rc-main.c | 160 +-- + drivers/media/rc/sir_ir.c | 94 +- + drivers/media/tuners/tda18271-fe.c | 2 +- + drivers/media/tuners/xc5000.c | 27 +- + drivers/media/usb/au0828/au0828-dvb.c | 30 + + drivers/media/usb/au0828/au0828.h | 2 + + drivers/media/usb/cpia2/cpia2_core.c | 51 +- + drivers/media/usb/cx231xx/Kconfig | 2 + + drivers/media/usb/cx231xx/cx231xx-cards.c | 34 + + drivers/media/usb/cx231xx/cx231xx-dvb.c | 49 + + drivers/media/usb/cx231xx/cx231xx-input.c | 5 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/cx231xx/cx231xx.h | 1 + + drivers/media/usb/dvb-usb-v2/af9015.c | 1 + + drivers/media/usb/dvb-usb-v2/lmedm04.c | 1 + + drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 4 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 32 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.h | 8 +- + 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/em28xx/em28xx-cards.c | 4 +- + drivers/media/usb/em28xx/em28xx-core.c | 35 +- + drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 5 + + drivers/media/usb/gspca/ov519.c | 3 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 2 +- + drivers/media/usb/pwc/pwc-v4l.c | 3 +- + drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 5 +- + drivers/media/usb/s2255/s2255drv.c | 2 + + drivers/media/usb/tm6000/tm6000-input.c | 4 - + drivers/media/usb/usbvision/usbvision-i2c.c | 3 + + drivers/media/usb/usbvision/usbvision-video.c | 4 +- + drivers/media/usb/uvc/uvc_driver.c | 34 +- + drivers/media/usb/uvc/uvc_video.c | 4 +- + drivers/media/v4l2-core/Kconfig | 3 + + drivers/media/v4l2-core/Makefile | 4 +- + drivers/media/v4l2-core/v4l2-async.c | 21 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 24 +- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 12 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 345 +++++ + drivers/media/v4l2-core/v4l2-ioctl.c | 31 +- + drivers/media/v4l2-core/v4l2-of.c | 327 ----- + drivers/media/v4l2-core/videobuf2-core.c | 38 +- + drivers/staging/media/atomisp/i2c/Makefile | 6 + + drivers/staging/media/atomisp/i2c/gc0310.c | 1 + + drivers/staging/media/atomisp/i2c/imx/Makefile | 7 + + drivers/staging/media/atomisp/i2c/lm3554.c | 4 +- + drivers/staging/media/atomisp/i2c/mt9m114.c | 2 +- + drivers/staging/media/atomisp/i2c/ov2680.c | 15 +- + drivers/staging/media/atomisp/i2c/ov5693/Makefile | 7 + + drivers/staging/media/atomisp/i2c/ov5693/ov5693.c | 2 +- + .../staging/media/atomisp/pci/atomisp2/Makefile | 7 +- + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 1 - + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 14 +- + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 2 +- + .../media/atomisp/pci/atomisp2/atomisp_tpg.c | 1 + + .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 6 +- + .../media/atomisp/pci/atomisp2/css2400/Makefile | 2 - + .../css2400/hive_isp_css_include/math_support.h | 6 +- + .../css2400/hive_isp_css_include/string_support.h | 9 +- + .../pci/atomisp2/css2400/ia_css_mmu_private.h | 2 - + .../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 +- + .../css2400/isp/modes/interface/isp_const.h | 16 - + .../css2400/isp/modes/interface/isp_exprs.h | 23 - + .../atomisp2/css2400/runtime/binary/src/binary.c | 36 +- + .../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 2 +- + .../css2400/runtime/debug/interface/ia_css_debug.h | 1 + + .../css2400/runtime/debug/src/ia_css_debug.c | 13 +- + .../atomisp2/css2400/runtime/spctrl/src/spctrl.c | 10 +- + .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 297 +---- + .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 34 +- + .../atomisp/pci/atomisp2/css2400/sh_css_internal.h | 7 - + .../atomisp/pci/atomisp2/css2400/sh_css_irq.c | 16 - + .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 2 +- + .../atomisp/pci/atomisp2/css2400/sh_css_mmu.c | 6 - + .../atomisp/pci/atomisp2/css2400/sh_css_params.c | 24 +- + .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 8 +- + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c | 4 +- + .../platform/intel-mid/atomisp_gmin_platform.c | 227 ++-- + .../platform/intel-mid/intel_mid_pcihelpers.c | 12 +- + drivers/staging/media/cxd2099/cxd2099.c | 6 +- + drivers/staging/media/lirc/TODO | 47 +- + drivers/staging/media/lirc/TODO.lirc_zilog | 36 - + drivers/staging/media/lirc/lirc_zilog.c | 136 +- + include/media/davinci/vpif_types.h | 9 +- + include/media/lirc_dev.h | 32 - + include/media/rc-core.h | 2 - + include/media/v4l2-async.h | 8 +- + include/media/v4l2-ctrls.h | 13 + + include/media/v4l2-flash-led-class.h | 6 +- + include/media/{v4l2-of.h => v4l2-fwnode.h} | 96 +- + include/media/v4l2-subdev.h | 16 +- + 217 files changed, 4524 insertions(+), 2573 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/st,stm32-cec.txt + create mode 100644 Documentation/devicetree/bindings/media/st,stm32-dcmi.txt + create mode 100644 Documentation/media/kapi/v4l2-fwnode.rst + delete mode 100644 Documentation/media/kapi/v4l2-of.rst + create mode 100644 drivers/media/platform/stm32/Makefile + create mode 100644 drivers/media/platform/stm32/stm32-cec.c + create mode 100644 drivers/media/platform/stm32/stm32-dcmi.c + create mode 100644 drivers/media/v4l2-core/v4l2-fwnode.c + delete mode 100644 drivers/media/v4l2-core/v4l2-of.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_irq.c + delete mode 100644 drivers/staging/media/lirc/TODO.lirc_zilog + rename include/media/{v4l2-of.h => v4l2-fwnode.h} (50%) +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 (a8feae091106 uvesafb: Fix continuation printks without KERN_LEVEL to pr_cont, neatening) +$ git merge fbdev/fbdev-for-next +Merge made by the 'recursive' strategy. + drivers/video/console/mdacon.c | 89 +++++++------ + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 2 +- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 14 +- + drivers/video/fbdev/pxafb.c | 5 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 +- + drivers/video/fbdev/uvesafb.c | 148 +++++++++------------ + 6 files changed, 123 insertions(+), 137 deletions(-) +Merging pm/linux-next (1e0afde20ced Merge branch 'acpi-pm' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/pci/pci.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/msr-index.h | 18 +- + drivers/acpi/acpica/Makefile | 1 + + drivers/acpi/acpica/acapps.h | 4 +- + drivers/acpi/acpica/acglobal.h | 3 + + drivers/acpi/acpica/aclocal.h | 15 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acpredef.h | 16 + + drivers/acpi/acpica/acresrc.h | 15 +- + drivers/acpi/acpica/acutils.h | 1 + + drivers/acpi/acpica/amlcode.h | 61 +- + drivers/acpi/acpica/amlresrc.h | 104 ++ + drivers/acpi/acpica/dbexec.c | 12 + + drivers/acpi/acpica/dbobject.c | 6 +- + drivers/acpi/acpica/dbxface.c | 2 +- + drivers/acpi/acpica/dsargs.c | 5 +- + drivers/acpi/acpica/dsdebug.c | 1 + + drivers/acpi/acpica/dsmethod.c | 12 +- + drivers/acpi/acpica/dsopcode.c | 11 +- + drivers/acpi/acpica/dsutils.c | 9 - + drivers/acpi/acpica/dswexec.c | 4 +- + drivers/acpi/acpica/dswload.c | 42 +- + drivers/acpi/acpica/dswload2.c | 16 + + drivers/acpi/acpica/evxfevnt.c | 18 + + drivers/acpi/acpica/exdebug.c | 4 +- + drivers/acpi/acpica/exdump.c | 30 +- + drivers/acpi/acpica/exoparg1.c | 25 +- + drivers/acpi/acpica/exresolv.c | 23 +- + drivers/acpi/acpica/nsaccess.c | 27 + + drivers/acpi/acpica/nsnames.c | 3 - + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nsxfeval.c | 39 +- + drivers/acpi/acpica/psobject.c | 14 + + drivers/acpi/acpica/psopcode.c | 8 +- + drivers/acpi/acpica/psparse.c | 14 +- + drivers/acpi/acpica/rscalc.c | 139 ++ + drivers/acpi/acpica/rsdump.c | 48 + + drivers/acpi/acpica/rsdumpinfo.c | 114 ++ + drivers/acpi/acpica/rsinfo.c | 28 +- + drivers/acpi/acpica/rsmisc.c | 4 +- + drivers/acpi/acpica/rsserial.c | 373 +++++ + drivers/acpi/acpica/tbfadt.c | 4 +- + drivers/acpi/acpica/tbutils.c | 6 +- + drivers/acpi/acpica/utdecode.c | 8 +- + drivers/acpi/acpica/utownerid.c | 12 +- + drivers/acpi/acpica/utresdecode.c | 315 ++++ + drivers/acpi/acpica/utresrc.c | 273 +--- + drivers/acpi/acpica/utxfmutex.c | 5 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/button.c | 5 +- + drivers/acpi/device_pm.c | 59 +- + drivers/acpi/internal.h | 2 + + drivers/acpi/sleep.c | 41 +- + drivers/base/power/main.c | 9 +- + drivers/base/power/wakeup.c | 18 +- + drivers/char/tpm/tpm_crb.c | 4 +- + drivers/cpufreq/intel_pstate.c | 34 +- + drivers/mailbox/pcc.c | 10 +- + drivers/pci/pci-acpi.c | 17 +- + drivers/pci/pci.c | 26 +- + drivers/platform/x86/Kconfig | 19 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/intel_int0002_vgpio.c | 219 +++ + drivers/usb/core/hcd-pci.c | 7 +- + include/acpi/acpi_bus.h | 10 +- + include/acpi/acpixf.h | 2 +- + include/acpi/acrestyp.h | 92 +- + include/acpi/actbl1.h | 238 +++- + include/acpi/actbl2.h | 59 +- + include/acpi/actbl3.h | 82 +- + include/acpi/actypes.h | 67 +- + include/acpi/acuuid.h | 5 + + include/acpi/platform/acgcc.h | 10 + + include/acpi/platform/acintel.h | 2 + + include/linux/suspend.h | 7 +- + kernel/power/process.c | 2 +- + kernel/power/suspend.c | 35 +- + .../acpi/os_specific/service_layers/osunixxf.c | 10 +- + tools/power/x86/x86_energy_perf_policy/Makefile | 27 +- + .../x86_energy_perf_policy.8 | 241 +++- + .../x86_energy_perf_policy.c | 1504 +++++++++++++++++--- + 80 files changed, 3955 insertions(+), 807 deletions(-) + create mode 100644 drivers/acpi/acpica/utresdecode.c + create mode 100644 drivers/platform/x86/intel_int0002_vgpio.c +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 (33011c583fcc Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + drivers/cpufreq/arm_big_little.c | 2 +- + drivers/cpufreq/cpufreq-dt.c | 2 +- + drivers/cpufreq/cpufreq_stats.c | 13 +- + drivers/cpufreq/dbx500-cpufreq.c | 2 +- + drivers/cpufreq/mt8173-cpufreq.c | 4 +- + drivers/cpufreq/qoriq-cpufreq.c | 3 +- + drivers/thermal/cpu_cooling.c | 609 +++++++++------------ + drivers/thermal/imx_thermal.c | 22 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 22 +- + include/linux/cpu_cooling.h | 32 +- + include/linux/cpufreq.h | 14 + + 11 files changed, 317 insertions(+), 408 deletions(-) +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 (3715c47bcda8 Merge branch 'r8152-support-new-chips') +$ git merge net-next/master +Auto-merging net/socket.c +Auto-merging net/sctp/socket.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/core/sock.c +Auto-merging net/core/dev_ioctl.c +Auto-merging net/core/datagram.c +Auto-merging include/net/sock.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/netdevice.h +Removing drivers/net/wireless/rsi/rsi_91x_pkt.c +Auto-merging drivers/net/phy/phy.c +Auto-merging drivers/net/ethernet/qualcomm/qca_7k_common.h +Auto-merging drivers/net/ethernet/qualcomm/qca_7k_common.c +Auto-merging drivers/net/ethernet/netronome/nfp/bpf/verifier.c +Auto-merging drivers/net/ethernet/netronome/nfp/bpf/offload.c +Auto-merging drivers/net/ethernet/netronome/nfp/bpf/main.h +Auto-merging drivers/net/ethernet/netronome/nfp/bpf/jit.c +Removing drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h +Removing drivers/net/ethernet/intel/i40e/i40e_virtchnl.h +Removing drivers/net/dsa/mv88e6xxx/mv88e6xxx.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +Auto-merging arch/arm/configs/sunxi_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/qca-qca7000-spi.txt +Auto-merging Documentation/devicetree/bindings/net/dsa/b53.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-net | 8 + + Documentation/ABI/testing/sysfs-class-net-phydev | 36 + + .../devicetree/bindings/misc/allwinner,syscon.txt | 19 + + Documentation/devicetree/bindings/net/cortina.txt | 21 + + Documentation/devicetree/bindings/net/dsa/b53.txt | 3 + + Documentation/devicetree/bindings/net/dsa/ksz.txt | 72 + + .../devicetree/bindings/net/dwmac-sun8i.txt | 78 + + Documentation/devicetree/bindings/net/ethernet.txt | 2 + + .../devicetree/bindings/net/qca,qca7000.txt | 88 + + .../devicetree/bindings/net/qca-qca7000-spi.txt | 47 - + .../devicetree/bindings/net/ti,wilink-st.txt | 12 + + .../devicetree/bindings/ptp/brcm,ptp-dte.txt | 13 + + .../devicetree/bindings/serial/slave-device.txt | 9 + + Documentation/networking/checksum-offloads.txt | 11 +- + Documentation/networking/i40evf.txt | 23 +- + Documentation/networking/phy.txt | 1 - + Documentation/networking/rxrpc.txt | 111 +- + Documentation/networking/timestamping.txt | 26 +- + Documentation/networking/tls.txt | 135 + + MAINTAINERS | 57 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 + + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 + + arch/arm64/configs/defconfig | 1 + + arch/arm64/net/bpf_jit_comp.c | 25 +- + 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/asm/hvcall.h | 2 + + arch/powerpc/include/uapi/asm/socket.h | 90 +- + arch/powerpc/net/bpf_jit_comp64.c | 3 +- + arch/s390/include/uapi/asm/socket.h | 2 + + arch/s390/net/bpf_jit_comp.c | 3 +- + arch/sparc/include/uapi/asm/socket.h | 2 + + arch/sparc/net/bpf_jit_comp_64.c | 12 +- + arch/x86/net/bpf_jit.S | 20 +- + arch/x86/net/bpf_jit_comp.c | 66 +- + arch/xtensa/include/uapi/asm/socket.h | 2 + + drivers/bluetooth/Kconfig | 3 +- + drivers/bluetooth/btbcm.c | 36 + + drivers/bluetooth/btintel.c | 2 + + drivers/bluetooth/btusb.c | 5 + + drivers/bluetooth/btwilink.c | 1 - + drivers/bluetooth/hci_bcm.c | 5 +- + drivers/bluetooth/hci_intel.c | 14 + + drivers/bluetooth/hci_ldisc.c | 40 +- + drivers/bluetooth/hci_ll.c | 23 +- + drivers/bluetooth/hci_uart.h | 1 + + drivers/infiniband/hw/cxgb4/cm.c | 16 +- + drivers/infiniband/hw/mlx4/main.c | 5 +- + drivers/infiniband/hw/mlx5/cq.c | 6 +- + drivers/infiniband/hw/mlx5/mad.c | 4 +- + drivers/infiniband/hw/mlx5/main.c | 11 +- + drivers/infiniband/hw/mlx5/mr.c | 2 +- + drivers/infiniband/hw/mlx5/qp.c | 32 +- + drivers/infiniband/hw/mlx5/srq.c | 4 +- + drivers/infiniband/hw/qedr/main.c | 6 +- + drivers/infiniband/hw/qedr/qedr.h | 2 + + drivers/infiniband/hw/qedr/qedr_cm.c | 238 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 16 +- + drivers/net/bonding/bond_3ad.c | 5 + + drivers/net/bonding/bond_main.c | 9 +- + drivers/net/bonding/bond_options.c | 27 +- + drivers/net/can/m_can/m_can.c | 87 +- + drivers/net/cris/eth_v10.c | 5 +- + drivers/net/dsa/Kconfig | 42 +- + drivers/net/dsa/Makefile | 7 +- + drivers/net/dsa/b53/b53_common.c | 21 +- + drivers/net/dsa/b53/b53_priv.h | 4 +- + drivers/net/dsa/b53/b53_srab.c | 2 + + drivers/net/dsa/bcm_sf2.c | 9 +- + drivers/net/dsa/dsa_loop.c | 5 +- + drivers/net/dsa/lan9303-core.c | 2 +- + drivers/net/dsa/microchip/Kconfig | 12 + + drivers/net/dsa/microchip/Makefile | 2 + + drivers/net/dsa/microchip/ksz_9477_reg.h | 1676 +++++++++ + drivers/net/dsa/microchip/ksz_common.c | 1279 +++++++ + drivers/net/dsa/microchip/ksz_priv.h | 210 ++ + drivers/net/dsa/microchip/ksz_spi.c | 216 ++ + drivers/net/dsa/mt7530.c | 9 +- + drivers/net/dsa/mv88e6060.c | 2 +- + drivers/net/dsa/mv88e6xxx/Makefile | 2 + + drivers/net/dsa/mv88e6xxx/chip.c | 854 ++--- + drivers/net/dsa/mv88e6xxx/chip.h | 531 +++ + drivers/net/dsa/mv88e6xxx/global1.c | 170 +- + drivers/net/dsa/mv88e6xxx/global1.h | 206 +- + drivers/net/dsa/mv88e6xxx/global1_atu.c | 58 +- + drivers/net/dsa/mv88e6xxx/global1_vtu.c | 64 +- + drivers/net/dsa/mv88e6xxx/global2.c | 8 +- + drivers/net/dsa/mv88e6xxx/global2.h | 105 +- + drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 946 ----- + drivers/net/dsa/mv88e6xxx/phy.c | 249 ++ + drivers/net/dsa/mv88e6xxx/phy.h | 43 + + drivers/net/dsa/mv88e6xxx/port.c | 402 ++- + drivers/net/dsa/mv88e6xxx/port.h | 233 +- + drivers/net/dsa/mv88e6xxx/serdes.c | 229 ++ + drivers/net/dsa/mv88e6xxx/serdes.h | 48 + + drivers/net/dsa/qca8k.c | 7 +- + drivers/net/ethernet/3com/3c509.c | 8 +- + drivers/net/ethernet/3com/3c59x.c | 4 +- + drivers/net/ethernet/8390/ax88796.c | 6 + + drivers/net/ethernet/amd/pcnet32.c | 5 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 7 +- + drivers/net/ethernet/apm/xgene-v2/ethtool.c | 4 +- + .../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 146 +- + 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/apple/bmac.c | 3 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 4 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 174 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 42 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 19 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 2 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/broadcom/tg3.c | 4 +- + .../ethernet/cavium/liquidio/cn23xx_vf_device.c | 10 - + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 19 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 25 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 41 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 93 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 25 + + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 11 +- + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.c | 5 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.h | 12 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 3 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 12 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 34 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 189 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 24 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 90 +- + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 4 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 5 + + drivers/net/ethernet/cirrus/ep93xx_eth.c | 5 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 6 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 11 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 5 +- + drivers/net/ethernet/emulex/benet/be.h | 2 +- + drivers/net/ethernet/emulex/benet/be_hw.h | 3 + + drivers/net/ethernet/emulex/benet/be_main.c | 27 +- + drivers/net/ethernet/faraday/ftmac100.c | 5 +- + drivers/net/ethernet/fealnx.c | 5 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 6 +- + drivers/net/ethernet/freescale/fec.h | 4 + + drivers/net/ethernet/freescale/fec_main.c | 31 +- + drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 2 +- + drivers/net/ethernet/ibm/emac/phy.c | 12 +- + drivers/net/ethernet/ibm/ibmveth.c | 107 +- + drivers/net/ethernet/ibm/ibmveth.h | 1 + + drivers/net/ethernet/ibm/ibmvnic.c | 319 +- + drivers/net/ethernet/ibm/ibmvnic.h | 2 + + drivers/net/ethernet/intel/Kconfig | 10 +- + drivers/net/ethernet/intel/e100.c | 5 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 1 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 3 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 51 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e.h | 7 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 6 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 49 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 28 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 449 --- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 474 +-- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 9 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 18 +- + drivers/net/ethernet/intel/i40evf/i40e_devids.h | 1 + + drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 6 +- + drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 449 --- + drivers/net/ethernet/intel/i40evf/i40evf.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40evf_client.c | 18 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 66 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 286 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 1 + + drivers/net/ethernet/intel/igb/igb.h | 4 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 3 +- + drivers/net/ethernet/intel/igb/igb_main.c | 66 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 42 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 44 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 103 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 5 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 43 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 63 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 61 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 28 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 2 + + drivers/net/ethernet/jme.c | 47 +- + drivers/net/ethernet/korina.c | 5 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 5 +- + drivers/net/ethernet/marvell/mvpp2.c | 49 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- + drivers/net/ethernet/mellanox/Kconfig | 1 + + drivers/net/ethernet/mellanox/Makefile | 1 + + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_main.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 3 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 10 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 3 + + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en_common.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 116 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 24 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 39 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 269 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 25 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 1 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c | 64 + + drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h | 59 + + .../net/ethernet/mellanox/mlx5/core/fpga/core.c | 202 ++ + .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 99 + + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 38 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/ipoib.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 21 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 34 +- + drivers/net/ethernet/mellanox/mlxfw/Kconfig | 7 + + drivers/net/ethernet/mellanox/mlxfw/Makefile | 2 + + drivers/net/ethernet/mellanox/mlxfw/mlxfw.h | 102 + + drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 273 ++ + drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c | 619 ++++ + drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.h | 66 + + .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_file.h | 60 + + .../ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h | 103 + + .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h | 98 + + .../ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c | 126 + + .../ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.h | 71 + + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 2 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 12 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 40 +- + .../mellanox/mlxsw/core_acl_flex_actions.h | 1 + + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 2 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 297 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 1689 ++++----- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 416 +-- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 22 + + .../mellanox/mlxsw/spectrum_acl_flex_keys.h | 6 + + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 73 +- + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 22 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 992 ++++++ + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 50 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 1027 +++--- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 2 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2009 ++++++----- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 1 + + drivers/net/ethernet/micrel/ks8851.c | 5 +- + drivers/net/ethernet/micrel/ks8851_mll.c | 5 +- + drivers/net/ethernet/neterion/s2io.c | 5 - + drivers/net/ethernet/neterion/vxge/vxge-main.c | 1 + + drivers/net/ethernet/netronome/Kconfig | 1 + + drivers/net/ethernet/netronome/nfp/Makefile | 15 +- + .../netronome/nfp/{nfp_bpf_jit.c => bpf/jit.c} | 4 +- + drivers/net/ethernet/netronome/nfp/bpf/main.c | 160 + + .../netronome/nfp/{nfp_bpf.h => bpf/main.h} | 23 + + .../nfp/{nfp_net_offload.c => bpf/offload.c} | 61 +- + .../nfp/{nfp_bpf_verifier.c => bpf/verifier.c} | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_app.c | 102 + + drivers/net/ethernet/netronome/nfp/nfp_app.h | 230 ++ + drivers/net/ethernet/netronome/nfp/nfp_app_nic.c | 86 + + drivers/net/ethernet/netronome/nfp/nfp_asm.h | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 181 + + drivers/net/ethernet/netronome/nfp/nfp_hwmon.c | 192 + + drivers/net/ethernet/netronome/nfp/nfp_main.c | 101 +- + drivers/net/ethernet/netronome/nfp/nfp_main.h | 66 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 144 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 1057 ++++-- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 23 +- + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 15 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 79 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 701 ++-- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 16 +- + drivers/net/ethernet/netronome/nfp/nfp_port.c | 140 + + drivers/net/ethernet/netronome/nfp/nfp_port.h | 114 + + drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h | 6 +- + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 49 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 26 +- + .../ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 130 +- + .../ethernet/netronome/nfp/nfpcore/nfp_hwinfo.c | 70 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_mip.c | 7 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c | 9 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.h | 16 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 24 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 15 + + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_cmds.c | 47 +- + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 11 +- + .../ethernet/netronome/nfp/nfpcore/nfp_resource.c | 10 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_rtsym.c | 127 +- + drivers/net/ethernet/netronome/nfp/nic/main.c | 58 + + drivers/net/ethernet/nuvoton/w90p910_ether.c | 5 +- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 6 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 15 +- + drivers/net/ethernet/qlogic/qed/qed.h | 26 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 230 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 54 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 42 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 2 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 3582 +++++++++++-------- + drivers/net/ethernet/qlogic/qed/qed_debug.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_dev.c | 240 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 43 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.h | 22 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 3717 +++++++++++++------- + .../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 | 2090 +++-------- + drivers/net/ethernet/qlogic/qed/qed_int.h | 93 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 96 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.h | 23 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 316 +- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 79 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 904 ++--- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 126 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 71 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 189 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 35 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.c | 30 +- + drivers/net/ethernet/qlogic/qed/qed_ooo.h | 26 +- + drivers/net/ethernet/qlogic/qed/qed_ptp.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 190 +- + drivers/net/ethernet/qlogic/qed/qed_roce.c | 304 +- + drivers/net/ethernet/qlogic/qed/qed_roce.h | 43 - + drivers/net/ethernet/qlogic/qed/qed_sp.h | 45 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 61 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 54 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 543 ++- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 25 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 271 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 102 +- + drivers/net/ethernet/qlogic/qede/qede.h | 1 - + drivers/net/ethernet/qlogic/qede/qede_dcbnl.c | 1 - + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 24 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 62 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 43 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 111 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 1 + + drivers/net/ethernet/qlogic/qede/qede_roce.c | 4 +- + drivers/net/ethernet/qualcomm/Kconfig | 24 +- + drivers/net/ethernet/qualcomm/Makefile | 7 +- + drivers/net/ethernet/qualcomm/qca_7k.c | 30 +- + drivers/net/ethernet/qualcomm/qca_7k.h | 15 +- + .../qualcomm/{qca_framing.c => qca_7k_common.c} | 26 +- + .../qualcomm/{qca_framing.h => qca_7k_common.h} | 24 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 5 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 51 +- + drivers/net/ethernet/qualcomm/qca_spi.h | 5 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 423 +++ + drivers/net/ethernet/realtek/8139cp.c | 5 +- + drivers/net/ethernet/realtek/r8169.c | 4 +- + drivers/net/ethernet/renesas/ravb_main.c | 14 +- + drivers/net/ethernet/renesas/sh_eth.c | 25 +- + drivers/net/ethernet/rocker/rocker.h | 21 +- + drivers/net/ethernet/rocker/rocker_main.c | 235 +- + drivers/net/ethernet/rocker/rocker_ofdpa.c | 610 ++-- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 3 +- + drivers/net/ethernet/sfc/ef10.c | 1 + + drivers/net/ethernet/sfc/efx.h | 4 +- + drivers/net/ethernet/sfc/falcon/efx.h | 4 +- + drivers/net/ethernet/sfc/falcon/tx.c | 4 +- + drivers/net/ethernet/sfc/tx.c | 4 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 5 +- + drivers/net/ethernet/sis/sis190.c | 4 +- + drivers/net/ethernet/smsc/epic100.c | 5 +- + drivers/net/ethernet/smsc/smc911x.c | 7 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 13 +- + drivers/net/ethernet/smsc/smc91x.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/common.h | 8 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 995 ++++++ + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 26 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 26 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 73 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 9 +- + drivers/net/ethernet/sun/ldmvsw.c | 2 +- + drivers/net/ethernet/sun/sunvnet.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 19 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 5 +- + drivers/net/ethernet/ti/netcp_core.c | 4 +- + drivers/net/ethernet/ti/netcp_ethss.c | 8 +- + drivers/net/ethernet/tile/tilegx.c | 1 + + drivers/net/ethernet/tundra/tsi108_eth.c | 5 +- + drivers/net/ethernet/via/via-rhine.c | 5 +- + drivers/net/fjes/fjes_main.c | 1 - + drivers/net/geneve.c | 36 +- + drivers/net/hyperv/hyperv_net.h | 3 +- + drivers/net/hyperv/netvsc.c | 49 +- + drivers/net/hyperv/netvsc_drv.c | 55 +- + drivers/net/ieee802154/ca8210.c | 12 +- + drivers/net/ipvlan/ipvlan_main.c | 69 + + drivers/net/macsec.c | 28 +- + drivers/net/macvlan.c | 6 +- + drivers/net/mii.c | 8 +- + drivers/net/phy/Kconfig | 10 + + drivers/net/phy/Makefile | 4 +- + drivers/net/phy/broadcom.c | 30 +- + drivers/net/phy/cortina.c | 118 + + drivers/net/phy/marvell.c | 731 ++-- + drivers/net/phy/marvell10g.c | 368 ++ + drivers/net/phy/mdio-mux.c | 26 +- + drivers/net/phy/mdio-xgene.c | 74 +- + drivers/net/phy/mdio-xgene.h | 3 + + drivers/net/phy/mdio_bus.c | 66 +- + drivers/net/phy/micrel.c | 38 +- + drivers/net/phy/microchip.c | 2 +- + drivers/net/phy/phy-c45.c | 298 ++ + drivers/net/phy/phy.c | 63 +- + drivers/net/phy/phy_device.c | 138 +- + drivers/net/phy/smsc.c | 84 +- + drivers/net/ppp/ppp_generic.c | 22 +- + drivers/net/ppp/ppp_mppe.c | 15 +- + drivers/net/sungem_phy.c | 26 +- + drivers/net/tap.c | 25 +- + drivers/net/team/team.c | 6 - + drivers/net/team/team_mode_activebackup.c | 2 +- + drivers/net/team/team_mode_broadcast.c | 2 +- + drivers/net/team/team_mode_loadbalance.c | 2 +- + drivers/net/team/team_mode_random.c | 2 +- + drivers/net/team/team_mode_roundrobin.c | 2 +- + drivers/net/tun.c | 37 +- + drivers/net/usb/ax88179_178a.c | 5 +- + drivers/net/usb/lan78xx.c | 2 +- + drivers/net/usb/net1080.c | 9 - + drivers/net/usb/r8152.c | 874 ++++- + drivers/net/usb/usbnet.c | 4 +- + drivers/net/virtio_net.c | 9 +- + drivers/net/vxlan.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/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 1 + + 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/intel/iwlegacy/common.c | 2 + + drivers/net/wireless/intel/iwlegacy/common.h | 1 + + 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/libertas/cfg.c | 104 +- + drivers/net/wireless/marvell/libertas/cmd.c | 116 +- + drivers/net/wireless/marvell/libertas/cmdresp.c | 9 - + drivers/net/wireless/marvell/libertas/defs.h | 9 - + drivers/net/wireless/marvell/libertas/ethtool.c | 3 - + drivers/net/wireless/marvell/libertas/if_cs.c | 36 - + drivers/net/wireless/marvell/libertas/if_sdio.c | 66 +- + drivers/net/wireless/marvell/libertas/if_spi.c | 38 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 27 +- + drivers/net/wireless/marvell/libertas/main.c | 81 +- + drivers/net/wireless/marvell/libertas/mesh.c | 54 +- + drivers/net/wireless/marvell/libertas/rx.c | 6 - + drivers/net/wireless/marvell/libertas/tx.c | 3 - + drivers/net/wireless/marvell/mwifiex/11h.c | 6 - + drivers/net/wireless/marvell/mwifiex/11n.c | 17 +- + drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 14 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 71 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 15 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 10 + + drivers/net/wireless/marvell/mwifiex/init.c | 17 +- + drivers/net/wireless/marvell/mwifiex/main.c | 4 + + drivers/net/wireless/marvell/mwifiex/main.h | 21 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 207 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 28 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 18 + + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 24 + + drivers/net/wireless/marvell/mwifiex/sta_tx.c | 12 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 11 +- + drivers/net/wireless/marvell/mwifiex/txrx.c | 15 +- + drivers/net/wireless/marvell/mwifiex/uap_event.c | 11 + + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 5 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 585 ++- + drivers/net/wireless/marvell/mwifiex/usb.h | 23 + + drivers/net/wireless/marvell/mwifiex/wmm.c | 16 +- + drivers/net/wireless/quantenna/Kconfig | 16 + + drivers/net/wireless/quantenna/Makefile | 6 + + drivers/net/wireless/quantenna/qtnfmac/Kconfig | 19 + + drivers/net/wireless/quantenna/qtnfmac/Makefile | 31 + + drivers/net/wireless/quantenna/qtnfmac/bus.h | 139 + + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 995 ++++++ + drivers/net/wireless/quantenna/qtnfmac/cfg80211.h | 43 + + drivers/net/wireless/quantenna/qtnfmac/commands.c | 1982 +++++++++++ + drivers/net/wireless/quantenna/qtnfmac/commands.h | 74 + + drivers/net/wireless/quantenna/qtnfmac/core.c | 618 ++++ + drivers/net/wireless/quantenna/qtnfmac/core.h | 173 + + drivers/net/wireless/quantenna/qtnfmac/debug.c | 46 + + drivers/net/wireless/quantenna/qtnfmac/debug.h | 50 + + drivers/net/wireless/quantenna/qtnfmac/event.c | 452 +++ + drivers/net/wireless/quantenna/qtnfmac/event.h | 27 + + .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 1378 ++++++++ + .../quantenna/qtnfmac/pearl/pcie_bus_priv.h | 89 + + .../wireless/quantenna/qtnfmac/pearl/pcie_ipc.h | 158 + + .../quantenna/qtnfmac/pearl/pcie_regs_pearl.h | 353 ++ + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 901 +++++ + .../net/wireless/quantenna/qtnfmac/qlink_util.c | 71 + + .../net/wireless/quantenna/qtnfmac/qlink_util.h | 80 + + .../net/wireless/quantenna/qtnfmac/qtn_hw_ids.h | 32 + + drivers/net/wireless/quantenna/qtnfmac/shm_ipc.c | 176 + + drivers/net/wireless/quantenna/qtnfmac/shm_ipc.h | 80 + + .../net/wireless/quantenna/qtnfmac/shm_ipc_defs.h | 46 + + drivers/net/wireless/quantenna/qtnfmac/trans.c | 224 ++ + drivers/net/wireless/quantenna/qtnfmac/trans.h | 57 + + drivers/net/wireless/quantenna/qtnfmac/util.c | 114 + + drivers/net/wireless/quantenna/qtnfmac/util.h | 45 + + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 181 +- + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 195 +- + drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 173 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 911 ++--- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 22 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 44 +- + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 20 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 12 +- + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00debug.h | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 12 +- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.h | 16 +- + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 285 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 189 +- + drivers/net/wireless/ray_cs.c | 7 +- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 68 +- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.h | 2 - + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 2043 ++++++++--- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.h | 47 +- + .../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 | 28 + + .../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/rsi/Makefile | 2 +- + drivers/net/wireless/rsi/rsi_91x_core.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 740 ++++ + drivers/net/wireless/rsi/rsi_91x_pkt.c | 215 -- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 211 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 190 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 166 +- + drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 125 - + drivers/net/wireless/rsi/rsi_common.h | 3 +- + drivers/net/wireless/rsi/rsi_hal.h | 81 + + drivers/net/wireless/rsi/rsi_main.h | 36 +- + drivers/net/wireless/rsi/rsi_sdio.h | 6 +- + drivers/net/wireless/rsi/rsi_usb.h | 5 +- + drivers/net/wireless/ti/wlcore/debugfs.c | 13 +- + drivers/net/wireless/ti/wlcore/spi.c | 6 +- + drivers/nfc/pn533/pn533.c | 3 +- + drivers/of/of_mdio.c | 23 - + drivers/ptp/Kconfig | 16 + + drivers/ptp/Makefile | 1 + + drivers/ptp/ptp_dte.c | 353 ++ + drivers/s390/net/qeth_core.h | 2 + + drivers/s390/net/qeth_core_main.c | 117 +- + drivers/s390/net/qeth_core_mpc.c | 2 + + drivers/s390/net/qeth_core_mpc.h | 2 +- + drivers/s390/net/qeth_core_sys.c | 2 +- + drivers/s390/net/qeth_l2_main.c | 8 + + drivers/s390/net/qeth_l3.h | 1 + + drivers/s390/net/qeth_l3_main.c | 59 +- + drivers/s390/net/qeth_l3_sys.c | 11 + + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 8 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qedi/qedi_fw.c | 20 +- + drivers/scsi/qedi/qedi_fw_api.c | 3 +- + drivers/scsi/qedi/qedi_iscsi.c | 3 - + drivers/scsi/qedi/qedi_main.c | 2 +- + drivers/ssb/main.c | 1 - + drivers/staging/netlogic/xlr_net.c | 5 +- + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 6 +- + drivers/vhost/net.c | 128 +- + fs/afs/rxrpc.c | 18 +- + include/linux/avf/virtchnl.h | 701 ++++ + include/linux/bpf.h | 5 +- + include/linux/bpf_verifier.h | 1 + + include/linux/filter.h | 6 +- + include/linux/ieee80211.h | 4 + + include/linux/if_bridge.h | 14 + + include/linux/if_tap.h | 5 + + include/linux/if_team.h | 2 + + include/linux/if_tun.h | 5 + + include/linux/inetdevice.h | 7 + + include/linux/micrel_phy.h | 2 + + include/linux/mii.h | 2 +- + include/linux/mlx5/device.h | 6 + + include/linux/mlx5/driver.h | 11 +- + include/linux/mlx5/mlx5_ifc.h | 64 +- + include/linux/mlx5/mlx5_ifc_fpga.h | 144 + + include/linux/mlx5/port.h | 13 + + include/linux/netdevice.h | 15 +- + include/linux/netlink.h | 15 + + include/linux/of_mdio.h | 24 +- + include/linux/perf_event.h | 7 +- + include/linux/phy.h | 50 +- + include/linux/platform_data/microchip-ksz.h | 29 + + 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/qed_eth_if.h | 6 +- + include/linux/qed/qed_fcoe_if.h | 5 + + include/linux/qed/qed_if.h | 69 +- + include/linux/qed/qed_iscsi_if.h | 7 + + include/linux/qed/qed_ll2_if.h | 128 + + include/linux/qed/qed_roce_if.h | 80 +- + include/linux/qed/rdma_common.h | 2 +- + include/linux/qed/roce_common.h | 2 + + include/linux/qed/tcp_common.h | 5 +- + include/linux/rtnetlink.h | 3 +- + include/linux/rxrpc.h | 25 +- + include/linux/skb_array.h | 31 + + include/linux/skbuff.h | 178 +- + include/linux/socket.h | 1 + + include/linux/stmmac.h | 2 + + include/linux/tcp.h | 24 +- + include/linux/udp.h | 3 + + include/net/act_api.h | 13 +- + include/net/addrconf.h | 10 +- + include/net/af_rxrpc.h | 2 + + include/net/bluetooth/hci.h | 8 + + include/net/bond_options.h | 2 + + include/net/cfg80211.h | 42 + + include/net/dsa.h | 79 +- + include/net/dst.h | 2 +- + include/net/flow_dissector.h | 20 + + include/net/genetlink.h | 1 - + include/net/inet_connection_sock.h | 4 + + include/net/inet_frag.h | 2 +- + include/net/ip6_fib.h | 3 +- + include/net/ip6_route.h | 2 +- + include/net/ip_fib.h | 7 +- + include/net/lwtunnel.h | 22 +- + include/net/mac80211.h | 37 +- + include/net/neighbour.h | 1 + + include/net/netns/ipv4.h | 3 + + include/net/pkt_cls.h | 44 +- + include/net/pkt_sched.h | 3 - + include/net/request_sock.h | 2 +- + include/net/route.h | 12 +- + include/net/sch_generic.h | 26 +- + include/net/sctp/structs.h | 7 +- + include/net/secure_seq.h | 5 +- + include/net/sock.h | 35 +- + include/net/switchdev.h | 9 +- + include/net/tc_act/tc_gact.h | 15 +- + include/net/tcp.h | 117 +- + include/net/tls.h | 237 ++ + include/net/udp.h | 9 +- + include/net/udplite.h | 2 +- + include/rxrpc/packet.h | 2 + + include/soc/fsl/qe/qe.h | 9 + + include/trace/events/rxrpc.h | 1 + + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 60 +- + include/uapi/linux/if_link.h | 11 + + include/uapi/linux/mroute.h | 42 + + include/uapi/linux/neighbour.h | 1 + + include/uapi/linux/net_tstamp.h | 15 +- + include/uapi/linux/nl80211.h | 73 +- + include/uapi/linux/pkt_cls.h | 16 + + include/uapi/linux/rtnetlink.h | 2 + + include/uapi/linux/snmp.h | 1 + + include/uapi/linux/tc_act/tc_tunnel_key.h | 1 + + include/uapi/linux/tcp.h | 1 + + include/uapi/linux/tls.h | 79 + + kernel/bpf/arraymap.c | 28 +- + kernel/bpf/core.c | 47 +- + kernel/bpf/syscall.c | 437 ++- + kernel/bpf/verifier.c | 92 +- + kernel/events/core.c | 47 +- + kernel/trace/bpf_trace.c | 53 +- + lib/nlattr.c | 3 +- + lib/test_bpf.c | 57 +- + net/8021q/vlan_dev.c | 6 - + net/Kconfig | 1 + + net/Makefile | 1 + + net/batman-adv/bat_iv_ogm.c | 5 +- + net/batman-adv/bat_v.c | 2 +- + net/batman-adv/bat_v_elp.c | 10 +- + net/batman-adv/bridge_loop_avoidance.c | 73 +- + net/batman-adv/distributed-arp-table.c | 2 +- + net/batman-adv/main.h | 4 +- + net/batman-adv/network-coding.c | 4 +- + net/batman-adv/routing.c | 4 +- + net/batman-adv/send.c | 6 +- + net/batman-adv/tp_meter.c | 3 +- + net/batman-adv/translation-table.c | 21 +- + net/bluetooth/af_bluetooth.c | 2 +- + net/bluetooth/ecdh_helper.c | 11 +- + net/bluetooth/hci_core.c | 63 +- + net/bluetooth/smp.c | 39 +- + net/bridge/br.c | 19 +- + net/bridge/br_fdb.c | 26 +- + net/bridge/br_if.c | 2 +- + net/bridge/br_mdb.c | 4 +- + net/bridge/br_multicast.c | 8 + + net/bridge/br_netlink.c | 89 +- + net/bridge/br_private.h | 37 +- + net/bridge/br_stp_if.c | 11 - + net/bridge/br_switchdev.c | 76 + + net/bridge/br_vlan.c | 8 + + net/bridge/netfilter/nft_reject_bridge.c | 5 +- + net/caif/caif_socket.c | 2 +- + net/core/datagram.c | 96 +- + net/core/dev.c | 94 +- + net/core/dev_ioctl.c | 1 + + net/core/filter.c | 120 +- + net/core/flow_dissector.c | 69 + + net/core/lwt_bpf.c | 5 +- + net/core/lwtunnel.c | 38 +- + net/core/neighbour.c | 60 +- + net/core/net-procfs.c | 13 +- + net/core/net-sysfs.c | 8 +- + net/core/net_namespace.c | 43 +- + net/core/rtnetlink.c | 69 +- + net/core/secure_seq.c | 9 +- + net/core/skbuff.c | 148 +- + net/core/sock.c | 24 + + net/dcb/dcbnl.c | 11 +- + net/dccp/ccids/ccid2.c | 8 +- + net/dccp/ccids/ccid2.h | 2 +- + net/decnet/af_decnet.c | 2 +- + net/dsa/Kconfig | 9 +- + net/dsa/Makefile | 9 +- + net/dsa/dsa.c | 46 +- + net/dsa/dsa2.c | 170 +- + net/dsa/dsa_priv.h | 117 +- + net/dsa/legacy.c | 39 +- + net/dsa/port.c | 259 ++ + net/dsa/slave.c | 448 +-- + net/dsa/switch.c | 184 +- + net/dsa/tag_brcm.c | 24 +- + net/dsa/tag_dsa.c | 23 +- + net/dsa/tag_edsa.c | 23 +- + net/dsa/tag_ksz.c | 99 + + net/dsa/tag_lan9303.c | 7 +- + net/dsa/tag_mtk.c | 17 +- + net/dsa/tag_qca.c | 22 +- + net/dsa/tag_trailer.c | 20 +- + net/ieee802154/socket.c | 10 +- + net/ipv4/Makefile | 2 +- + net/ipv4/ah4.c | 8 +- + net/ipv4/arp.c | 4 + + net/ipv4/devinet.c | 33 + + net/ipv4/esp4.c | 20 +- + net/ipv4/fib_frontend.c | 31 +- + net/ipv4/fib_lookup.h | 6 +- + net/ipv4/fib_semantics.c | 153 +- + net/ipv4/fib_trie.c | 39 +- + net/ipv4/fou.c | 82 +- + net/ipv4/icmp.c | 2 +- + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/ip_tunnel_core.c | 11 +- + net/ipv4/ipmr.c | 126 + + net/ipv4/netfilter/nf_reject_ipv4.c | 2 +- + net/ipv4/proc.c | 1 + + net/ipv4/route.c | 151 +- + net/ipv4/syncookies.c | 25 +- + net/ipv4/sysctl_net_ipv4.c | 67 +- + net/ipv4/tcp.c | 79 +- + 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 | 207 +- + net/ipv4/tcp_ipv4.c | 30 +- + net/ipv4/tcp_lp.c | 17 +- + net/ipv4/tcp_metrics.c | 2 +- + net/ipv4/tcp_minisocks.c | 12 +- + net/ipv4/tcp_nv.c | 5 +- + net/ipv4/tcp_output.c | 150 +- + net/ipv4/tcp_rate.c | 17 +- + net/ipv4/tcp_recovery.c | 24 +- + net/ipv4/tcp_timer.c | 45 +- + net/ipv4/tcp_ulp.c | 134 + + net/ipv4/tcp_westwood.c | 6 +- + net/ipv4/udp.c | 272 +- + net/ipv6/addrconf.c | 21 +- + net/ipv6/addrconf_core.c | 19 + + net/ipv6/ah6.c | 8 +- + net/ipv6/esp6.c | 20 +- + net/ipv6/fou6.c | 14 +- + net/ipv6/ila/ila_lwt.c | 7 +- + net/ipv6/ip6_fib.c | 18 +- + net/ipv6/ip6_output.c | 7 +- + net/ipv6/netfilter/nf_reject_ipv6.c | 3 - + net/ipv6/route.c | 137 +- + net/ipv6/seg6.c | 4 - + net/ipv6/seg6_iptunnel.c | 5 +- + net/ipv6/syncookies.c | 9 +- + net/ipv6/tcp_ipv6.c | 15 +- + net/ipv6/udp.c | 3 +- + net/kcm/kcmsock.c | 2 +- + net/mac80211/agg-rx.c | 47 +- + net/mac80211/cfg.c | 1 + + net/mac80211/debugfs_sta.c | 6 + + net/mac80211/ht.c | 12 + + net/mac80211/ibss.c | 1 - + net/mac80211/ieee80211_i.h | 16 +- + net/mac80211/iface.c | 25 +- + net/mac80211/mesh.c | 85 +- + net/mac80211/mesh_plink.c | 3 +- + net/mac80211/mlme.c | 1 - + net/mac80211/rate.c | 3 +- + net/mac80211/rx.c | 4 - + net/mac80211/spectmgmt.c | 7 + + net/mac80211/sta_info.c | 30 + + net/mac80211/sta_info.h | 14 + + net/mac80211/status.c | 4 +- + net/mac80211/trace.h | 11 +- + net/mac80211/tx.c | 9 +- + net/mac80211/util.c | 37 + + net/mpls/af_mpls.c | 266 +- + net/mpls/internal.h | 4 +- + net/mpls/mpls_iptunnel.c | 17 +- + net/netfilter/nf_synproxy_core.c | 2 +- + net/nfc/af_nfc.c | 2 +- + net/openvswitch/datapath.c | 2 +- + net/packet/af_packet.c | 11 +- + net/qrtr/qrtr.c | 104 +- + net/rfkill/rfkill-gpio.c | 5 +- + net/rxrpc/Makefile | 1 + + net/rxrpc/af_rxrpc.c | 156 +- + net/rxrpc/ar-internal.h | 87 +- + net/rxrpc/call_accept.c | 20 +- + net/rxrpc/call_object.c | 49 +- + net/rxrpc/conn_client.c | 206 +- + net/rxrpc/conn_event.c | 4 +- + net/rxrpc/conn_object.c | 58 +- + net/rxrpc/conn_service.c | 23 +- + net/rxrpc/input.c | 17 + + net/rxrpc/local_object.c | 49 +- + net/rxrpc/net_ns.c | 84 + + net/rxrpc/output.c | 4 + + net/rxrpc/peer_object.c | 33 +- + net/rxrpc/proc.c | 42 +- + net/rxrpc/recvmsg.c | 7 +- + net/rxrpc/rxkad.c | 21 +- + net/rxrpc/security.c | 5 +- + net/rxrpc/sendmsg.c | 136 +- + net/sched/Kconfig | 1 + + net/sched/act_api.c | 55 +- + net/sched/act_csum.c | 1 + + net/sched/act_tunnel_key.c | 15 +- + net/sched/cls_api.c | 425 ++- + net/sched/cls_bpf.c | 2 + + net/sched/cls_flower.c | 62 +- + net/sched/cls_matchall.c | 9 +- + net/sched/cls_u32.c | 12 +- + net/sched/sch_api.c | 50 +- + net/sched/sch_atm.c | 30 +- + net/sched/sch_cbq.c | 22 +- + net/sched/sch_drr.c | 16 +- + net/sched/sch_dsmark.c | 18 +- + net/sched/sch_fq.c | 8 + + net/sched/sch_fq_codel.c | 18 +- + net/sched/sch_hfsc.c | 22 +- + net/sched/sch_htb.c | 29 +- + net/sched/sch_ingress.c | 61 +- + net/sched/sch_mqprio.c | 5 +- + net/sched/sch_multiq.c | 17 +- + net/sched/sch_prio.c | 20 +- + net/sched/sch_qfq.c | 17 +- + net/sched/sch_sfb.c | 18 +- + net/sched/sch_sfq.c | 18 +- + net/sctp/associola.c | 24 +- + net/sctp/chunk.c | 4 +- + net/sctp/offload.c | 7 + + net/sctp/output.c | 1 + + net/sctp/outqueue.c | 10 +- + net/sctp/proc.c | 10 +- + net/sctp/sm_make_chunk.c | 8 +- + net/sctp/sm_statefuns.c | 8 +- + net/sctp/socket.c | 20 +- + net/sctp/stream.c | 93 +- + net/sctp/ulpqueue.c | 8 +- + net/socket.c | 49 +- + net/switchdev/switchdev.c | 30 +- + net/tls/Kconfig | 12 + + net/tls/Makefile | 7 + + net/tls/tls_main.c | 487 +++ + net/tls/tls_sw.c | 772 ++++ + net/wireless/core.c | 5 + + net/wireless/mesh.c | 8 + + net/wireless/nl80211.c | 135 +- + net/wireless/rdev-ops.h | 25 + + net/wireless/sme.c | 1 + + net/wireless/trace.h | 60 + + net/wireless/util.c | 11 +- + samples/bpf/Makefile | 13 + + samples/bpf/bpf_helpers.h | 16 +- + samples/bpf/bpf_load.c | 19 +- + samples/bpf/syscall_nrs.c | 12 + + samples/bpf/trace_event_user.c | 73 +- + samples/bpf/tracex5_kern.c | 11 +- + samples/bpf/tracex6_kern.c | 28 +- + samples/bpf/tracex6_user.c | 180 +- + tools/hv/bondvf.sh | 33 +- + tools/include/uapi/linux/bpf.h | 60 +- + tools/lib/bpf/bpf.c | 68 + + tools/lib/bpf/bpf.h | 5 + + tools/net/bpf_jit_disasm.c | 37 +- + tools/testing/selftests/bpf/Makefile | 3 +- + tools/testing/selftests/bpf/test_align.c | 7 +- + tools/testing/selftests/bpf/test_maps.c | 50 + + tools/testing/selftests/bpf/test_obj_id.c | 35 + + tools/testing/selftests/bpf/test_pkt_md_access.c | 35 + + tools/testing/selftests/bpf/test_progs.c | 225 +- + tools/testing/selftests/bpf/test_verifier.c | 202 +- + 995 files changed, 60564 insertions(+), 23032 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-net-phydev + create mode 100644 Documentation/devicetree/bindings/misc/allwinner,syscon.txt + create mode 100644 Documentation/devicetree/bindings/net/cortina.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/ksz.txt + create mode 100644 Documentation/devicetree/bindings/net/dwmac-sun8i.txt + create mode 100644 Documentation/devicetree/bindings/net/qca,qca7000.txt + delete mode 100644 Documentation/devicetree/bindings/net/qca-qca7000-spi.txt + create mode 100644 Documentation/devicetree/bindings/ptp/brcm,ptp-dte.txt + create mode 100644 Documentation/networking/tls.txt + create mode 100644 drivers/net/dsa/microchip/Kconfig + create mode 100644 drivers/net/dsa/microchip/Makefile + create mode 100644 drivers/net/dsa/microchip/ksz_9477_reg.h + create mode 100644 drivers/net/dsa/microchip/ksz_common.c + create mode 100644 drivers/net/dsa/microchip/ksz_priv.h + create mode 100644 drivers/net/dsa/microchip/ksz_spi.c + create mode 100644 drivers/net/dsa/mv88e6xxx/chip.h + delete mode 100644 drivers/net/dsa/mv88e6xxx/mv88e6xxx.h + create mode 100644 drivers/net/dsa/mv88e6xxx/phy.c + create mode 100644 drivers/net/dsa/mv88e6xxx/phy.h + create mode 100644 drivers/net/dsa/mv88e6xxx/serdes.c + create mode 100644 drivers/net/dsa/mv88e6xxx/serdes.h + delete mode 100644 drivers/net/ethernet/intel/i40e/i40e_virtchnl.h + delete mode 100644 drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/Kconfig + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/Makefile + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw.h + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.h + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_file.h + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c + create mode 100644 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c + rename drivers/net/ethernet/netronome/nfp/{nfp_bpf_jit.c => bpf/jit.c} (99%) + create mode 100644 drivers/net/ethernet/netronome/nfp/bpf/main.c + rename drivers/net/ethernet/netronome/nfp/{nfp_bpf.h => bpf/main.h} (88%) + rename drivers/net/ethernet/netronome/nfp/{nfp_net_offload.c => bpf/offload.c} (85%) + rename drivers/net/ethernet/netronome/nfp/{nfp_bpf_verifier.c => bpf/verifier.c} (99%) + 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_app_nic.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_devlink.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_hwmon.c + 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 drivers/net/ethernet/netronome/nfp/nic/main.c + rename drivers/net/ethernet/qualcomm/{qca_framing.c => qca_7k_common.c} (85%) + rename drivers/net/ethernet/qualcomm/{qca_framing.h => qca_7k_common.h} (86%) + create mode 100644 drivers/net/ethernet/qualcomm/qca_uart.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c + create mode 100644 drivers/net/phy/cortina.c + create mode 100644 drivers/net/phy/marvell10g.c + create mode 100644 drivers/net/phy/phy-c45.c + create mode 100644 drivers/net/wireless/ath/ath10k/sdio.c + create mode 100644 drivers/net/wireless/ath/ath10k/sdio.h + create mode 100644 drivers/net/wireless/quantenna/Kconfig + create mode 100644 drivers/net/wireless/quantenna/Makefile + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/Kconfig + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/Makefile + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/bus.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/cfg80211.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/cfg80211.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/commands.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/commands.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/core.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/core.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/debug.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/debug.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/event.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/event.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_bus_priv.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_ipc.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie_regs_pearl.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qlink.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qlink_util.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qlink_util.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/qtn_hw_ids.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/shm_ipc.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/shm_ipc.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/shm_ipc_defs.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/trans.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/trans.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/util.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/util.h + create mode 100644 drivers/net/wireless/rsi/rsi_91x_hal.c + delete mode 100644 drivers/net/wireless/rsi/rsi_91x_pkt.c + create mode 100644 drivers/net/wireless/rsi/rsi_hal.h + create mode 100644 drivers/ptp/ptp_dte.c + create mode 100644 include/linux/avf/virtchnl.h + create mode 100644 include/linux/mlx5/mlx5_ifc_fpga.h + create mode 100644 include/linux/platform_data/microchip-ksz.h + create mode 100644 include/net/tls.h + create mode 100644 include/uapi/linux/tls.h + create mode 100644 net/dsa/port.c + create mode 100644 net/dsa/tag_ksz.c + create mode 100644 net/ipv4/tcp_ulp.c + create mode 100644 net/rxrpc/net_ns.c + create mode 100644 net/tls/Kconfig + create mode 100644 net/tls/Makefile + create mode 100644 net/tls/tls_main.c + create mode 100644 net/tls/tls_sw.c + create mode 100644 samples/bpf/syscall_nrs.c + create mode 100644 tools/testing/selftests/bpf/test_obj_id.c + create mode 100644 tools/testing/selftests/bpf/test_pkt_md_access.c +$ git am -3 ../patches/0001-remove-duplicate-ethernet-noce-intruduced-by-merge.patch +Applying: remove duplicate ethernet node intruduced by merge +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +$ git add -A . +$ git commit -v -a --amend +[master 9d9f56144ee9] Merge remote-tracking branch 'net-next/master' + Date: Fri Jun 16 10:44:05 2017 +1000 +Merging ipsec-next/master (8bafd73093f2 xfrm: add UDP encapsulation port in migrate message) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/xfrm/xfrm_device.c +Auto-merging net/key/af_key.c +Auto-merging net/ipv6/esp6.c +Auto-merging net/ipv6/ah6.c +Auto-merging net/ipv4/ah4.c +Auto-merging include/net/xfrm.h +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 12 ++++++++---- + net/ipv4/ah4.c | 5 +++-- + net/ipv6/ah6.c | 5 +++-- + net/ipv6/esp6.c | 5 ----- + net/key/af_key.c | 8 +++++--- + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_policy.c | 13 +++++-------- + net/xfrm/xfrm_state.c | 35 ++++++++++++++++++++--------------- + net/xfrm/xfrm_user.c | 37 +++++++++++++++++++++++++++++-------- + 9 files changed, 74 insertions(+), 48 deletions(-) +Merging netfilter-next/master (34158151d2aa netfilter: cttimeout: use nf_ct_iterate_cleanup_net to unlink timeout objs) +$ git merge netfilter-next/master +Auto-merging net/netfilter/nft_set_rbtree.c +Auto-merging net/netfilter/nf_nat_core.c +Auto-merging net/netfilter/nf_conntrack_netlink.c +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_conntrack.h | 10 +- + include/net/netfilter/nf_tables.h | 29 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 14 +- + net/ipv4/netfilter/nf_nat_masquerade_ipv4.c | 4 +- + net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 10 +- + net/netfilter/nf_conntrack_core.c | 140 +++++++-- + net/netfilter/nf_conntrack_helper.c | 50 +-- + net/netfilter/nf_conntrack_netlink.c | 8 +- + net/netfilter/nf_conntrack_proto.c | 4 +- + net/netfilter/nf_dup_netdev.c | 1 + + net/netfilter/nf_nat_core.c | 37 +-- + net/netfilter/nf_tables_api.c | 73 +++-- + net/netfilter/nfnetlink_cttimeout.c | 39 +-- + net/netfilter/nft_rt.c | 16 +- + net/netfilter/nft_set_bitmap.c | 13 +- + net/netfilter/nft_set_hash.c | 471 +++++++++++++++++++++------- + net/netfilter/nft_set_rbtree.c | 21 +- + 17 files changed, 614 insertions(+), 326 deletions(-) +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 (c48c281e7236 wlcore: spi: remove unnecessary variable) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/wireless/ti,wlcore.txt | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 7 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 69 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 2 + + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 43 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 444 +++++++++-- + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.h | 47 +- + drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 10 +- + drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 14 +- + drivers/net/wireless/intel/iwlwifi/iwl-a000.c | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 11 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 6 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-fw-api.h | 205 +++++ + .../net/wireless/intel/iwlwifi/iwl-fw-error-dump.h | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 16 +- + drivers/net/wireless/intel/iwlwifi/iwl-io.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 95 ++- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 167 +--- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 82 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-coex.h | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h | 29 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-mac.h | 10 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-power.h | 45 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rs.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 88 ++- + .../net/wireless/intel/iwlwifi/mvm/fw-api-scan.h | 34 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 46 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-stats.h | 29 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-tof.h | 18 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h | 67 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 555 +++++++++++--- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 52 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 65 +- + drivers/net/wireless/intel/iwlwifi/mvm/led.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 42 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 25 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 133 +++- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 32 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 48 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 3 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/tof.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 14 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 27 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 12 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 3 + + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 135 +++- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 172 ++++- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 5 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.h | 2 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 4 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 4 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 12 +- + .../realtek/rtlwifi/btcoexist/halbt_precomp.h | 22 + + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.h | 32 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 52 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.h | 41 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.h | 3 + + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.h | 38 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.h | 26 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 838 ++++++++++++++++----- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 42 +- + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 35 +- + drivers/net/wireless/ti/wlcore/sdio.c | 1 + + drivers/net/wireless/ti/wlcore/spi.c | 8 +- + 79 files changed, 3098 insertions(+), 1071 deletions(-) + create mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-fw-api.h +Merging bluetooth/master (3715c47bcda8 Merge branch 'r8152-support-new-chips') +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (0e74008b668f Merge tag 'mac80211-next-for-davem-2017-06-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next) +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (5ed02dbb4974 Linux 4.12-rc3) +$ git merge rdma/for-next +Already up-to-date. +Merging gfs2/for-next (df68f20f5608 GFS2: Remove gl_list from glock structure) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/dir.c | 3 ++- + fs/gfs2/incore.h | 1 - + fs/gfs2/main.c | 1 - + 3 files changed, 2 insertions(+), 3 deletions(-) +Merging mtd/master (05e97a9eda72 Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (1eeef2d7483a mtd: handle partitioning on devices with 0 erasesize) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + .../bindings/mtd/microchip,mchp23k256.txt | 18 ++ + drivers/mtd/chips/cfi_cmdset_0020.c | 2 +- + drivers/mtd/devices/Kconfig | 10 + + drivers/mtd/devices/Makefile | 1 + + drivers/mtd/devices/mchp23k256.c | 236 +++++++++++++++++++++ + drivers/mtd/devices/mtd_dataflash.c | 200 +++++++++-------- + drivers/mtd/maps/physmap_of_gemini.c | 2 +- + drivers/mtd/mtdpart.c | 26 ++- + drivers/mtd/tests/subpagetest.c | 2 +- + 9 files changed, 397 insertions(+), 100 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/microchip,mchp23k256.txt + create mode 100644 drivers/mtd/devices/mchp23k256.c +Merging nand/nand/next (d690694be933 mtd: nand: atmel: drop unused include) +$ git merge nand/nand/next +Auto-merging include/linux/mtd/nand.h +Auto-merging drivers/mtd/nand/tango_nand.c +Auto-merging drivers/mtd/nand/nand_base.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/denali-nand.txt | 13 + + .../devicetree/bindings/mtd/gpmi-nand.txt | 14 +- + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 5 +- + Documentation/devicetree/bindings/mtd/nand.txt | 2 +- + drivers/mtd/nand/Kconfig | 3 + + drivers/mtd/nand/atmel/nand-controller.c | 354 ++++++++++++++++++++- + drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c | 2 + + drivers/mtd/nand/cafe_nand.c | 2 + + drivers/mtd/nand/davinci_nand.c | 3 + + drivers/mtd/nand/denali.c | 129 ++++---- + drivers/mtd/nand/denali.h | 256 +++++++-------- + drivers/mtd/nand/denali_dt.c | 42 ++- + drivers/mtd/nand/denali_pci.c | 4 + + drivers/mtd/nand/docg4.c | 2 + + drivers/mtd/nand/fsl_elbc_nand.c | 2 + + drivers/mtd/nand/fsl_ifc_nand.c | 79 +++-- + drivers/mtd/nand/fsmc_nand.c | 122 +++++-- + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 6 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 75 +++-- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 13 +- + drivers/mtd/nand/hisi504_nand.c | 2 + + drivers/mtd/nand/jz4780_nand.c | 2 +- + drivers/mtd/nand/mpc5121_nfc.c | 2 + + drivers/mtd/nand/mtk_ecc.c | 218 ++++++------- + drivers/mtd/nand/mtk_ecc.h | 2 +- + drivers/mtd/nand/mtk_nand.c | 187 ++++++----- + drivers/mtd/nand/mxc_nand.c | 12 +- + drivers/mtd/nand/nand_base.c | 349 +++++++++++++++++--- + drivers/mtd/nand/nand_micron.c | 222 +++++++++++++ + drivers/mtd/nand/orion_nand.c | 6 +- + drivers/mtd/nand/pxa3xx_nand.c | 2 + + drivers/mtd/nand/qcom_nandc.c | 2 + + drivers/mtd/nand/s3c2410.c | 5 +- + drivers/mtd/nand/sh_flctl.c | 2 + + drivers/mtd/nand/sunxi_nand.c | 9 +- + drivers/mtd/nand/tango_nand.c | 22 +- + drivers/mtd/nand/vf610_nfc.c | 2 + + drivers/staging/mt29f_spinand/mt29f_spinand.c | 2 + + include/linux/mtd/nand.h | 80 ++++- + 39 files changed, 1660 insertions(+), 596 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 (48df28b85991 dt-bindings: crypto: remove mediatek ethif clock) +$ git merge crypto/master +Auto-merging drivers/crypto/Kconfig +Auto-merging crypto/drbg.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/mediatek-crypto.txt | 8 +- + .../devicetree/bindings/rng/timeriomem_rng.txt | 7 + + MAINTAINERS | 6 + + arch/arm/crypto/aes-ce-glue.c | 6 +- + arch/arm/crypto/crc32-ce-glue.c | 6 + + arch/arm/crypto/ghash-ce-glue.c | 6 +- + arch/arm/crypto/sha1-ce-glue.c | 5 +- + arch/arm/crypto/sha2-ce-glue.c | 5 +- + 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/aes-x86_64-asm_64.S | 47 +- + 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/Kconfig | 1 + + crypto/Makefile | 9 +- + crypto/dh.c | 9 +- + crypto/dh_helper.c | 4 +- + crypto/drbg.c | 1 + + crypto/ecc.c | 88 +- + crypto/ecc.h | 41 +- + crypto/ecdh.c | 29 +- + crypto/ecdh_helper.c | 4 +- + crypto/hmac.c | 5 +- + crypto/rng.c | 5 - + crypto/rsa-pkcs1pad.c | 10 +- + crypto/rsa.c | 4 +- + crypto/tcrypt.c | 4 - + crypto/testmgr.c | 76 +- + crypto/testmgr.h | 47 + + drivers/char/hw_random/omap3-rom-rng.c | 11 +- + drivers/char/hw_random/timeriomem-rng.c | 7 + + drivers/crypto/Kconfig | 30 + + drivers/crypto/Makefile | 6 +- + drivers/crypto/bcm/cipher.c | 5 +- + drivers/crypto/caam/caampkc.c | 468 ++++++++- + drivers/crypto/caam/caampkc.h | 58 ++ + drivers/crypto/caam/pdb.h | 62 ++ + drivers/crypto/caam/pkc_desc.c | 36 + + drivers/crypto/cavium/nitrox/Kconfig | 21 + + drivers/crypto/cavium/nitrox/Makefile | 8 + + drivers/crypto/cavium/nitrox/nitrox_algs.c | 457 +++++++++ + drivers/crypto/cavium/nitrox/nitrox_common.h | 42 + + drivers/crypto/cavium/nitrox/nitrox_csr.h | 1084 ++++++++++++++++++++ + drivers/crypto/cavium/nitrox/nitrox_dev.h | 179 ++++ + drivers/crypto/cavium/nitrox/nitrox_hal.c | 401 ++++++++ + drivers/crypto/cavium/nitrox/nitrox_isr.c | 467 +++++++++ + drivers/crypto/cavium/nitrox/nitrox_lib.c | 210 ++++ + drivers/crypto/cavium/nitrox/nitrox_main.c | 640 ++++++++++++ + drivers/crypto/cavium/nitrox/nitrox_req.h | 445 ++++++++ + drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 732 +++++++++++++ + drivers/crypto/ccp/ccp-crypto-sha.c | 5 +- + drivers/crypto/ccp/ccp-dev.c | 1 + + drivers/crypto/img-hash.c | 12 +- + drivers/crypto/inside-secure/Makefile | 2 + + drivers/crypto/inside-secure/safexcel.c | 930 +++++++++++++++++ + drivers/crypto/inside-secure/safexcel.h | 572 +++++++++++ + drivers/crypto/inside-secure/safexcel_cipher.c | 556 ++++++++++ + drivers/crypto/inside-secure/safexcel_hash.c | 1045 +++++++++++++++++++ + drivers/crypto/inside-secure/safexcel_ring.c | 157 +++ + drivers/crypto/ixp4xx_crypto.c | 3 +- + drivers/crypto/marvell/hash.c | 5 +- + drivers/crypto/mediatek/mtk-platform.c | 10 +- + drivers/crypto/mediatek/mtk-platform.h | 2 - + drivers/crypto/mediatek/mtk-sha.c | 5 +- + drivers/crypto/mv_cesa.c | 5 +- + drivers/crypto/omap-aes-gcm.c | 408 ++++++++ + drivers/crypto/omap-aes.c | 461 ++++----- + drivers/crypto/omap-aes.h | 214 ++++ + drivers/crypto/omap-crypto.c | 184 ++++ + drivers/crypto/omap-crypto.h | 37 + + drivers/crypto/omap-des.c | 138 +-- + drivers/crypto/omap-sham.c | 38 +- + drivers/crypto/qat/qat_common/adf_aer.c | 15 +- + drivers/crypto/qat/qat_common/qat_algs.c | 5 +- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 8 +- + include/crypto/akcipher.h | 11 +- + include/crypto/dh.h | 4 +- + include/crypto/ecdh.h | 4 +- + include/crypto/hmac.h | 7 + + include/crypto/kpp.h | 15 +- + include/linux/timeriomem-rng.h | 3 + + 85 files changed, 10633 insertions(+), 796 deletions(-) + create mode 100644 drivers/crypto/cavium/nitrox/Kconfig + create mode 100644 drivers/crypto/cavium/nitrox/Makefile + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_algs.c + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_common.h + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_csr.h + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_dev.h + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_hal.c + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_isr.c + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_lib.c + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_main.c + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_req.h + create mode 100644 drivers/crypto/cavium/nitrox/nitrox_reqmgr.c + create mode 100644 drivers/crypto/inside-secure/Makefile + create mode 100644 drivers/crypto/inside-secure/safexcel.c + create mode 100644 drivers/crypto/inside-secure/safexcel.h + create mode 100644 drivers/crypto/inside-secure/safexcel_cipher.c + create mode 100644 drivers/crypto/inside-secure/safexcel_hash.c + create mode 100644 drivers/crypto/inside-secure/safexcel_ring.c + create mode 100644 drivers/crypto/omap-aes-gcm.c + create mode 100644 drivers/crypto/omap-aes.h + create mode 100644 drivers/crypto/omap-crypto.c + create mode 100644 drivers/crypto/omap-crypto.h + create mode 100644 include/crypto/hmac.h +Merging drm/drm-next (a6821698918a Merge tag 'imx-drm-next-2017-06-08' of git://git.pengutronix.de/git/pza/linux into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_gem_shrinker.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_dp.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_engine_cs.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_uc.h' using previous resolution. +Removing include/drm/drm_mem_util.h +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/ipu-v3/ipu-common.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +Auto-merging drivers/gpu/drm/tegra/drm.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.c +Auto-merging drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +Removing drivers/gpu/drm/omapdrm/dss/rfbi.c +Auto-merging drivers/gpu/drm/nouveau/nv50_display.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_drv.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +Auto-merging drivers/gpu/drm/meson/meson_drv.c +Auto-merging drivers/gpu/drm/i915/intel_uc.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_uc.h +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.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_fbc.c +Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.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/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_pci.c +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_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/todo.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ed4c4421cfa0] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 7 +- + .../bindings/display/exynos/exynos5433-decon.txt | 13 +- + .../bindings/display/panel/auo,p320hvn03.txt | 8 + + .../bindings/display/panel/innolux,p079zca.txt | 23 + + .../bindings/display/panel/nec,nl12880b20-05.txt | 8 + + .../display/panel/nlt,nl192108ac18-02d.txt | 8 + + .../bindings/display/panel/samsung,s6e3ha2.txt | 5 +- + .../devicetree/bindings/display/st,stm32-ltdc.txt | 36 + + .../bindings/display/sunxi/sun4i-drm.txt | 127 +- + .../devicetree/bindings/display/zte,vou.txt | 21 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpu/drm-internals.rst | 66 +- + Documentation/gpu/drm-kms-helpers.rst | 6 + + Documentation/gpu/drm-kms.rst | 4 +- + Documentation/gpu/drm-mm.rst | 12 + + Documentation/gpu/index.rst | 1 + + Documentation/gpu/pl111.rst | 6 + + Documentation/gpu/todo.rst | 13 - + Documentation/sync_file.txt | 23 +- + MAINTAINERS | 19 + + drivers/dma-buf/dma-buf.c | 8 +- + drivers/dma-buf/dma-fence.c | 5 + + drivers/dma-buf/sync_debug.c | 10 +- + drivers/dma-buf/sync_file.c | 52 +- + drivers/gpu/drm/Kconfig | 4 + + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 16 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 160 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 101 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 76 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 64 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 146 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 434 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 206 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 60 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 116 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 299 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 83 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 19 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 28 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 654 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 77 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 633 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 31 +- + 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 | 123 +- + 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 | 600 +- + 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_v6_0.c | 1615 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 652 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h | 5 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1291 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 5 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1782 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 435 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 78 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 95 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 95 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 152 +- + 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/mmhub_v1_0.c | 522 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 4 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 35 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 25 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 54 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 212 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h | 49 + + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 308 + + drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 41 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 34 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 152 +- + drivers/gpu/drm/amd/amdgpu/si.c | 86 +- + 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 | 184 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 14 + + drivers/gpu/drm/amd/amdgpu/soc15d.h | 90 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 193 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 61 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1189 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 12 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 216 +- + drivers/gpu/drm/amd/amdgpu/vid.h | 6 + + drivers/gpu/drm/amd/amdkfd/Makefile | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 149 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 10 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 3 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- + drivers/gpu/drm/amd/include/amd_shared.h | 4 +- + .../drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h | 2 + + .../include/asic_reg/raven1/DCN/dcn_1_0_default.h | 7988 ++ + .../include/asic_reg/raven1/DCN/dcn_1_0_offset.h | 14087 +++ + .../include/asic_reg/raven1/DCN/dcn_1_0_sh_mask.h | 54316 ++++++++ + .../include/asic_reg/raven1/GC/gc_9_1_default.h | 4005 + + .../amd/include/asic_reg/raven1/GC/gc_9_1_offset.h | 7491 ++ + .../include/asic_reg/raven1/GC/gc_9_1_sh_mask.h | 31191 +++++ + .../asic_reg/raven1/MMHUB/mmhub_9_1_default.h | 1028 + + .../asic_reg/raven1/MMHUB/mmhub_9_1_offset.h | 1999 + + .../asic_reg/raven1/MMHUB/mmhub_9_1_sh_mask.h | 9790 ++ + .../include/asic_reg/raven1/MP/mp_10_0_default.h | 182 + + .../include/asic_reg/raven1/MP/mp_10_0_offset.h | 336 + + .../include/asic_reg/raven1/MP/mp_10_0_sh_mask.h | 886 + + .../asic_reg/raven1/NBIO/nbio_7_0_default.h | 14865 +++ + .../include/asic_reg/raven1/NBIO/nbio_7_0_offset.h | 4640 + + .../asic_reg/raven1/NBIO/nbio_7_0_sh_mask.h | 118945 ++++++++++++++++++ + .../asic_reg/raven1/SDMA0/sdma0_4_1_default.h | 242 + + .../asic_reg/raven1/SDMA0/sdma0_4_1_offset.h | 459 + + .../asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h | 1658 + + .../include/asic_reg/raven1/THM/thm_10_0_default.h | 141 + + .../include/asic_reg/raven1/THM/thm_10_0_offset.h | 257 + + .../include/asic_reg/raven1/THM/thm_10_0_sh_mask.h | 885 + + .../include/asic_reg/raven1/VCN/vcn_1_0_default.h | 202 + + .../include/asic_reg/raven1/VCN/vcn_1_0_offset.h | 376 + + .../include/asic_reg/raven1/VCN/vcn_1_0_sh_mask.h | 1308 + + drivers/gpu/drm/amd/include/atomfirmware.h | 12 +- + .../gpu/drm/amd/include/ivsrcid/irqsrcs_dcn_1_0.h | 1134 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 18 +- + drivers/gpu/drm/amd/include/pptable.h | 57 +- + drivers/gpu/drm/amd/powerplay/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 6 + + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 13 +- + drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 2 +- + .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | 1276 + + .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h | 48 + + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 43 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 3 + + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 10 + + drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 1059 + + drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h | 301 + + drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h | 43 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 502 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 2 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_pptable.h | 31 + + .../amd/powerplay/hwmgr/vega10_processpptables.c | 49 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 3 - + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 5 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 16 +- + drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 77 + + drivers/gpu/drm/amd/powerplay/inc/smu10.h | 188 + + .../gpu/drm/amd/powerplay/inc/smu10_driver_if.h | 116 + + drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h | 38 +- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 3 +- + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 +- + drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 398 + + drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h | 62 + + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 14 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 4 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 11 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 7 + + drivers/gpu/drm/arc/arcpgu_drv.c | 1 - + drivers/gpu/drm/arm/hdlcd_drv.c | 2 - + drivers/gpu/drm/arm/malidp_drv.c | 2 - + 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_crtc.c | 10 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 5 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 173 +- + 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/Kconfig | 11 +- + drivers/gpu/drm/bridge/Makefile | 2 - + drivers/gpu/drm/bridge/analogix-anx78xx.c | 14 +- + drivers/gpu/drm/bridge/lvds-encoder.c | 157 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 12 +- + drivers/gpu/drm/bridge/panel.c | 200 + + drivers/gpu/drm/bridge/parade-ps8622.c | 10 +- + drivers/gpu/drm/bridge/sii902x.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 87 +- + drivers/gpu/drm/cirrus/Makefile | 1 - + drivers/gpu/drm/cirrus/cirrus_ttm.c | 3 +- + drivers/gpu/drm/drm_atomic.c | 94 +- + drivers/gpu/drm/drm_atomic_helper.c | 90 +- + drivers/gpu/drm/drm_blend.c | 45 +- + drivers/gpu/drm/drm_bridge.c | 33 + + drivers/gpu/drm/drm_color_mgmt.c | 9 +- + drivers/gpu/drm/drm_connector.c | 64 + + drivers/gpu/drm/drm_crtc_helper_internal.h | 12 + + drivers/gpu/drm/drm_dp_mst_topology.c | 215 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 29 +- + drivers/gpu/drm/drm_fb_helper.c | 4 +- + drivers/gpu/drm/drm_file.c | 16 +- + drivers/gpu/drm/drm_gem.c | 6 +- + drivers/gpu/drm/drm_internal.h | 16 +- + drivers/gpu/drm/drm_ioctl.c | 12 + + drivers/gpu/drm/drm_irq.c | 1628 +- + drivers/gpu/drm/drm_plane_helper.c | 13 +- + drivers/gpu/drm/drm_prime.c | 30 +- + drivers/gpu/drm/drm_probe_helper.c | 105 +- + drivers/gpu/drm/drm_rect.c | 36 +- + drivers/gpu/drm/drm_syncobj.c | 453 + + drivers/gpu/drm/drm_vblank.c | 1648 + + 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/exynos5433_drm_decon.c | 218 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 19 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 50 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.h | 1 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 18 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 14 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 24 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_plane.h | 1 - + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 22 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 13 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 76 +- + drivers/gpu/drm/exynos/regs-mixer.h | 7 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 24 +- + drivers/gpu/drm/gma500/Makefile | 1 - + drivers/gpu/drm/gma500/mdfld_tpo_vid.c | 53 +- + 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/Kconfig.debug | 12 + + drivers/gpu/drm/i915/Makefile | 2 + + 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 | 273 +- + drivers/gpu/drm/i915/i915_drv.c | 27 +- + drivers/gpu/drm/i915/i915_drv.h | 347 +- + drivers/gpu/drm/i915/i915_gem.c | 268 +- + 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 | 46 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 50 +- + drivers/gpu/drm/i915/i915_gem_object.h | 4 +- + drivers/gpu/drm/i915/i915_gem_request.c | 185 +- + drivers/gpu/drm/i915/i915_gem_request.h | 14 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 66 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 4 +- + drivers/gpu/drm/i915/i915_gem_timeline.c | 95 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 47 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 8 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 59 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 96 +- + drivers/gpu/drm/i915/i915_irq.c | 90 +- + 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 | 30 +- + 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 | 807 +- + drivers/gpu/drm/i915/intel_dp.c | 360 +- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 45 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 25 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 63 +- + drivers/gpu/drm/i915/intel_drv.h | 87 +- + 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 | 233 +- + drivers/gpu/drm/i915/intel_fbc.c | 6 +- + drivers/gpu/drm/i915/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/intel_guc_ct.c | 461 + + drivers/gpu/drm/i915/intel_guc_ct.h | 86 + + drivers/gpu/drm/i915/intel_guc_fwif.h | 47 +- + 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 | 25 +- + drivers/gpu/drm/i915/intel_huc.c | 64 +- + drivers/gpu/drm/i915/intel_lpe_audio.c | 58 +- + 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 | 32 +- + drivers/gpu/drm/i915/intel_sprite.c | 144 +- + drivers/gpu/drm/i915/intel_tv.c | 208 +- + drivers/gpu/drm/i915/intel_uc.c | 155 +- + drivers/gpu/drm/i915/intel_uc.h | 39 +- + drivers/gpu/drm/i915/intel_uncore.c | 384 +- + drivers/gpu/drm/i915/intel_uncore.h | 170 + + .../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/intel_breadcrumbs.c | 12 +- + 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 + + drivers/gpu/drm/imx/dw_hdmi-imx.c | 10 +- + drivers/gpu/drm/imx/imx-drm-core.c | 4 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 5 +- + drivers/gpu/drm/meson/meson_drv.c | 1 - + drivers/gpu/drm/meson/meson_dw_hdmi.c | 5 +- + 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_kms.c | 45 +- + 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_display.c | 39 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 8 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 15 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- + drivers/gpu/drm/nouveau/nv50_display.c | 7 +- + drivers/gpu/drm/omapdrm/Makefile | 1 - + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 51 +- + drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 3 - + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 3 - + drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 10 - + drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 4 - + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 83 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 10 - + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 7 - + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 6 - + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 7 - + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 49 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 5 - + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 6 - + drivers/gpu/drm/omapdrm/dss/Kconfig | 13 - + drivers/gpu/drm/omapdrm/dss/Makefile | 1 - + drivers/gpu/drm/omapdrm/dss/core.c | 41 - + drivers/gpu/drm/omapdrm/dss/dispc.c | 707 +- + drivers/gpu/drm/omapdrm/dss/display.c | 62 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 106 - + drivers/gpu/drm/omapdrm/dss/dsi.c | 118 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 14 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 11 - + drivers/gpu/drm/omapdrm/dss/dss_features.c | 179 +- + drivers/gpu/drm/omapdrm/dss/dss_features.h | 6 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 8 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 9 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 8 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 9 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 9 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 9 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 12 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 226 +- + drivers/gpu/drm/omapdrm/dss/output.c | 13 - + drivers/gpu/drm/omapdrm/dss/rfbi.c | 1083 - + drivers/gpu/drm/omapdrm/dss/sdi.c | 61 - + drivers/gpu/drm/omapdrm/dss/venc.c | 53 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 20 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 30 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 195 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 41 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 203 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 15 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 429 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 36 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 8 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 140 +- + drivers/gpu/drm/panel/Kconfig | 13 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 340 + + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 64 +- + drivers/gpu/drm/panel/panel-simple.c | 90 + + drivers/gpu/drm/pl111/Kconfig | 14 + + drivers/gpu/drm/pl111/Makefile | 7 + + drivers/gpu/drm/pl111/pl111_connector.c | 127 + + drivers/gpu/drm/pl111/pl111_debugfs.c | 55 + + drivers/gpu/drm/pl111/pl111_display.c | 465 + + drivers/gpu/drm/pl111/pl111_drm.h | 67 + + drivers/gpu/drm/pl111/pl111_drv.c | 269 + + 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 | 29 +- + drivers/gpu/drm/radeon/cypress_dpm.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 943 +- + 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 | 39 +- + drivers/gpu/drm/radeon/radeon_cs.c | 11 +- + drivers/gpu/drm/radeon/radeon_drv.c | 28 +- + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 35 + + drivers/gpu/drm/radeon/radeon_kfd.c | 34 +- + drivers/gpu/drm/radeon/radeon_kms.c | 62 +- + drivers/gpu/drm/radeon/radeon_mode.h | 3 + + 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.c | 655 +- + 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/rcar-du/rcar_du_crtc.c | 30 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 1 + + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 83 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 2 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 14 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 31 +- + drivers/gpu/drm/savage/Makefile | 1 - + drivers/gpu/drm/selftests/test-drm_mm.c | 28 + + drivers/gpu/drm/sis/Makefile | 1 - + drivers/gpu/drm/sti/sti_compositor.c | 2 +- + 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 | 5 + + drivers/gpu/drm/stm/drv.c | 221 + + drivers/gpu/drm/stm/ltdc.c | 1158 + + drivers/gpu/drm/stm/ltdc.h | 40 + + drivers/gpu/drm/sun4i/Kconfig | 28 + + drivers/gpu/drm/sun4i/Makefile | 14 +- + 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 | 21 +- + drivers/gpu/drm/sun4i/sun4i_drv.h | 5 +- + drivers/gpu/drm/sun4i/sun4i_hdmi.h | 157 + + drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c | 127 + + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 501 + + drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 225 + + drivers/gpu/drm/sun4i/sun4i_layer.c | 21 +- + drivers/gpu/drm/sun4i/sun4i_layer.h | 6 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 142 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 10 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 12 +- + 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 + + drivers/gpu/drm/tdfx/Makefile | 1 - + drivers/gpu/drm/tegra/drm.c | 4 +- + drivers/gpu/drm/tilcdc/Makefile | 1 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 7 +- + 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 | 4 +- + drivers/gpu/drm/vc4/Makefile | 3 +- + drivers/gpu/drm/vc4/vc4_bo.c | 33 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 54 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 180 +- + drivers/gpu/drm/vc4/vc4_drv.c | 8 +- + drivers/gpu/drm/vc4/vc4_drv.h | 76 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 294 +- + drivers/gpu/drm/vc4/vc4_fence.c | 56 + + drivers/gpu/drm/vc4/vc4_gem.c | 189 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 202 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 2 +- + drivers/gpu/drm/vc4/vc4_irq.c | 65 +- + drivers/gpu/drm/vc4/vc4_kms.c | 22 +- + drivers/gpu/drm/vc4/vc4_plane.c | 9 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 3 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 185 +- + drivers/gpu/drm/vc4/vc4_validate.c | 57 +- + drivers/gpu/drm/vgem/Makefile | 1 - + drivers/gpu/drm/vgem/vgem_drv.c | 194 +- + drivers/gpu/drm/vgem/vgem_drv.h | 2 + + 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_drm_bus.c | 1 - + 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_kms.c | 4 +- + 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 +- + drivers/gpu/drm/zte/Makefile | 1 + + drivers/gpu/drm/zte/zx_common_regs.h | 31 + + drivers/gpu/drm/zte/zx_drm_drv.c | 3 +- + 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 +- + drivers/gpu/ipu-v3/ipu-common.c | 39 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 6 + + drivers/gpu/ipu-v3/ipu-prg.c | 2 - + drivers/gpu/ipu-v3/ipu-prv.h | 9 +- + drivers/gpu/ipu-v3/ipu-vdi.c | 4 +- + drivers/media/platform/rcar-fcp.c | 17 +- + drivers/media/platform/vsp1/vsp1.h | 1 + + drivers/media/platform/vsp1/vsp1_dl.c | 23 +- + drivers/media/platform/vsp1/vsp1_dl.h | 2 +- + drivers/media/platform/vsp1/vsp1_drm.c | 41 + + drivers/media/platform/vsp1/vsp1_drm.h | 11 + + drivers/media/platform/vsp1/vsp1_drv.c | 9 + + drivers/media/platform/vsp1/vsp1_pipe.c | 13 +- + drivers/media/platform/vsp1/vsp1_video.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/core.c | 2 - + include/drm/bridge/dw_hdmi.h | 2 +- + include/drm/drmP.h | 43 +- + include/drm/drm_atomic.h | 97 +- + include/drm/drm_blend.h | 22 +- + include/drm/drm_bridge.h | 51 +- + include/drm/drm_color_mgmt.h | 2 + + include/drm/drm_connector.h | 40 +- + include/drm/drm_crtc.h | 66 +- + include/drm/drm_dp_helper.h | 168 + + include/drm/drm_dp_mst_helper.h | 26 + + include/drm/drm_drv.h | 109 +- + include/drm/drm_fb_cma_helper.h | 4 + + include/drm/drm_file.h | 6 + + include/drm/drm_gem_cma_helper.h | 17 +- + include/drm/drm_irq.h | 147 +- + include/drm/drm_mem_util.h | 78 - + include/drm/drm_modes.h | 17 + + include/drm/drm_modeset_helper_vtables.h | 159 +- + include/drm/drm_os_linux.h | 14 +- + include/drm/drm_panel.h | 2 + + include/drm/drm_prime.h | 9 + + include/drm/drm_property.h | 2 +- + include/drm/drm_rect.h | 27 + + include/drm/drm_syncobj.h | 90 + + include/drm/drm_vblank.h | 181 + + include/drm/intel_lpe_audio.h | 22 +- + 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 | 86 + + include/linux/amba/clcd.h | 68 +- + include/linux/platform_data/omapdss.h | 1 - + include/linux/sync_file.h | 14 +- + include/media/rcar-fcp.h | 5 + + include/media/vsp1.h | 10 + + include/uapi/drm/amdgpu_drm.h | 29 +- + include/uapi/drm/drm.h | 26 + + include/uapi/drm/drm_mode.h | 49 +- + include/uapi/drm/i915_drm.h | 17 +- + include/uapi/drm/omap_drm.h | 4 +- + include/video/exynos5433_decon.h | 1 + + include/video/imx-ipu-v3.h | 1 + + sound/x86/intel_hdmi_audio.c | 324 +- + sound/x86/intel_hdmi_audio.h | 20 +- + 667 files changed, 313597 insertions(+), 17252 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/auo,p320hvn03.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,p079zca.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/nec,nl12880b20-05.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/nlt,nl192108ac18-02d.txt + create mode 100644 Documentation/devicetree/bindings/display/st,stm32-ltdc.txt + create mode 100644 Documentation/gpu/pl111.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v10_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v10_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MP/mp_10_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/NBIO/nbio_7_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/THM/thm_10_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/irqsrcs_dcn_1_0.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu10.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu10_driver_if.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h + create mode 100644 drivers/gpu/drm/bridge/panel.c + create mode 100644 drivers/gpu/drm/drm_syncobj.c + create mode 100644 drivers/gpu/drm/drm_vblank.c + 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_guc_ct.c + create mode 100644 drivers/gpu/drm/i915/intel_guc_ct.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 + delete mode 100644 drivers/gpu/drm/omapdrm/dss/rfbi.c + create mode 100644 drivers/gpu/drm/panel/panel-innolux-p079zca.c + 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_debugfs.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/sun4i/sun4i_hdmi.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c + 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 + 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 + delete mode 100644 include/drm/drm_mem_util.h + create mode 100644 include/drm/drm_syncobj.h + create mode 100644 include/drm/drm_vblank.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 (9a30a26122c3 Revert "drm/i915/skl: New ddb allocation algorithm") +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/i915_gem_gtt.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_engine_cs.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_vgpu.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9683a6db78a7] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Makefile | 11 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 10 +- + drivers/gpu/drm/i915/i915_debugfs.c | 62 +- + drivers/gpu/drm/i915/i915_drv.c | 33 +- + drivers/gpu/drm/i915/i915_drv.h | 88 +- + drivers/gpu/drm/i915/i915_gem.c | 66 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 19 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 27 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 632 ++- + drivers/gpu/drm/i915/i915_gem_gtt.c | 8 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + + drivers/gpu/drm/i915/i915_gem_object.h | 17 +- + drivers/gpu/drm/i915/i915_gem_request.c | 20 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 28 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 6 +- + drivers/gpu/drm/i915/i915_oa_bdw.c | 5376 ++++++++++++++++++++++++ + drivers/gpu/drm/i915/i915_oa_bdw.h | 40 + + drivers/gpu/drm/i915/i915_oa_bxt.c | 2690 ++++++++++++ + drivers/gpu/drm/i915/i915_oa_bxt.h | 40 + + drivers/gpu/drm/i915/i915_oa_chv.c | 2873 +++++++++++++ + drivers/gpu/drm/i915/i915_oa_chv.h | 40 + + drivers/gpu/drm/i915/i915_oa_glk.c | 2602 ++++++++++++ + drivers/gpu/drm/i915/i915_oa_glk.h | 40 + + drivers/gpu/drm/i915/i915_oa_hsw.c | 263 +- + drivers/gpu/drm/i915/i915_oa_hsw.h | 4 +- + drivers/gpu/drm/i915/i915_oa_kblgt2.c | 2991 +++++++++++++ + drivers/gpu/drm/i915/i915_oa_kblgt2.h | 40 + + drivers/gpu/drm/i915/i915_oa_kblgt3.c | 3040 ++++++++++++++ + drivers/gpu/drm/i915/i915_oa_kblgt3.h | 40 + + drivers/gpu/drm/i915/i915_oa_sklgt2.c | 3479 +++++++++++++++ + drivers/gpu/drm/i915/i915_oa_sklgt2.h | 40 + + drivers/gpu/drm/i915/i915_oa_sklgt3.c | 3039 ++++++++++++++ + drivers/gpu/drm/i915/i915_oa_sklgt3.h | 40 + + drivers/gpu/drm/i915/i915_oa_sklgt4.c | 3093 ++++++++++++++ + drivers/gpu/drm/i915/i915_oa_sklgt4.h | 40 + + drivers/gpu/drm/i915/i915_pci.c | 87 +- + drivers/gpu/drm/i915/i915_perf.c | 1126 ++++- + drivers/gpu/drm/i915/i915_reg.h | 287 +- + drivers/gpu/drm/i915/i915_vgpu.c | 44 +- + drivers/gpu/drm/i915/i915_vma.c | 1 - + drivers/gpu/drm/i915/i915_vma.h | 7 +- + drivers/gpu/drm/i915/intel_atomic.c | 137 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 73 +- + drivers/gpu/drm/i915/intel_cdclk.c | 355 +- + drivers/gpu/drm/i915/intel_csr.c | 17 +- + drivers/gpu/drm/i915/intel_ddi.c | 392 +- + drivers/gpu/drm/i915/intel_device_info.c | 11 +- + drivers/gpu/drm/i915/intel_display.c | 306 +- + drivers/gpu/drm/i915/intel_dp.c | 190 +- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 17 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 437 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 4 + + drivers/gpu/drm/i915/intel_drv.h | 59 +- + drivers/gpu/drm/i915/intel_dsi.c | 167 +- + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 22 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 5 + + drivers/gpu/drm/i915/intel_fifo_underrun.c | 2 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 2 +- + drivers/gpu/drm/i915/intel_gvt.c | 43 +- + drivers/gpu/drm/i915/intel_gvt.h | 5 + + drivers/gpu/drm/i915/intel_hdmi.c | 157 +- + drivers/gpu/drm/i915/intel_huc.c | 2 +- + drivers/gpu/drm/i915/intel_i2c.c | 15 +- + drivers/gpu/drm/i915/intel_lrc.c | 7 + + drivers/gpu/drm/i915/intel_lvds.c | 73 +- + drivers/gpu/drm/i915/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/intel_overlay.c | 1 - + drivers/gpu/drm/i915/intel_panel.c | 265 +- + drivers/gpu/drm/i915/intel_pm.c | 112 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 316 +- + drivers/gpu/drm/i915/intel_sdvo.c | 541 +-- + drivers/gpu/drm/i915/intel_uc.c | 7 +- + drivers/gpu/drm/i915/intel_uncore.c | 126 - + include/drm/i915_pciids.h | 40 + + include/uapi/drm/i915_drm.h | 27 +- + 77 files changed, 34412 insertions(+), 1917 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_oa_bdw.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_bdw.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_bxt.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_bxt.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_chv.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_chv.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_glk.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_glk.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt2.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt2.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt3.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt3.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt2.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt2.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt3.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt3.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt4.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt4.h +Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy) +$ git merge drm-tegra/drm/tegra/for-next +Recorded preimage for 'Documentation/gpu/index.rst' +Auto-merging drivers/gpu/host1x/dev.c +Auto-merging drivers/gpu/drm/tegra/drm.c +Auto-merging Documentation/gpu/index.rst +CONFLICT (content): Merge conflict in Documentation/gpu/index.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/gpu/index.rst'. +[master 6e03e69c2597] Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/index.rst | 1 + + Documentation/gpu/tegra.rst | 178 +++++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/tegra/dc.c | 92 +++++++++++++------ + drivers/gpu/drm/tegra/drm.c | 119 ++++++++++++++++++++++++- + drivers/gpu/drm/tegra/drm.h | 1 + + drivers/gpu/drm/tegra/gem.c | 5 -- + drivers/gpu/drm/tegra/gem.h | 5 ++ + drivers/gpu/drm/tegra/gr2d.c | 11 ++- + drivers/gpu/drm/tegra/gr3d.c | 4 +- + drivers/gpu/drm/tegra/vic.c | 4 +- + drivers/gpu/host1x/bus.c | 75 ++++++++++++++++ + drivers/gpu/host1x/cdma.h | 1 - + drivers/gpu/host1x/channel.c | 147 ++++++++++++++++++------------ + drivers/gpu/host1x/channel.h | 21 +++-- + drivers/gpu/host1x/debug.c | 47 ++++------ + drivers/gpu/host1x/dev.c | 7 +- + drivers/gpu/host1x/dev.h | 6 +- + drivers/gpu/host1x/hw/channel_hw.c | 4 - + drivers/gpu/host1x/job.c | 124 ++++++++++++++++++++------ + drivers/gpu/host1x/job.h | 14 --- + drivers/gpu/host1x/syncpt.c | 81 ++++++++++++++--- + include/linux/host1x.h | 38 +++++++- + 22 files changed, 784 insertions(+), 201 deletions(-) + create mode 100644 Documentation/gpu/tegra.rst +Merging drm-misc/for-linux-next (2d7b56378d32 drm/rockchip: gem: add the lacks lock and trivial changes) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) +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 (d417f0815ce7 drm/arm: malidp: Use crtc->mode_valid() callback) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/malidp_crtc.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) +Merging sunxi-drm/sunxi-drm/for-next (110d33dd428e drm/sun4i: Add compatible for the A10s pipeline) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up-to-date. +Merging imx-drm/imx-drm/next (add1318723a0 gpu: ipu-v3: vdic: include AUTO field order bit in ipu_vdi_set_field_order) +$ git merge imx-drm/imx-drm/next +Already up-to-date. +Merging etnaviv/etnaviv/next (46a269da7e8a drm/etnaviv: restore ETNA_PREP_NOSYNC behaviour) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.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.c | 24 +++-- + 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 + + 7 files changed, 136 insertions(+), 79 deletions(-) +Merging kspp/for-next/kspp (94e4eaaabea7 Merge branch 'kspp/fortify/latest' into for-next/kspp) +$ git merge kspp/for-next/kspp +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + Documentation/dontdiff | 2 + + arch/Kconfig | 47 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/string.h | 5 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/prom_init.c | 3 + + arch/powerpc/lib/feature-fixups.c | 180 ++--- + arch/x86/Kconfig | 1 + + arch/x86/boot/compressed/misc.c | 5 + + arch/x86/include/asm/string_32.h | 9 + + arch/x86/include/asm/string_64.h | 7 + + arch/x86/include/asm/suspend_64.h | 5 +- + arch/x86/power/hibernate_64.c | 6 +- + drivers/firmware/efi/libstub/Makefile | 1 + + drivers/infiniband/sw/rxe/rxe_resp.c | 4 +- + include/linux/compiler-gcc.h | 13 + + include/linux/compiler.h | 12 + + include/linux/string.h | 200 +++++ + include/linux/vermagic.h | 9 +- + kernel/kexec_file.c | 7 - + kernel/kexec_internal.h | 2 + + lib/string.c | 6 + + scripts/Makefile.gcc-plugins | 4 + + scripts/gcc-plugins/.gitignore | 1 + + scripts/gcc-plugins/Makefile | 8 + + scripts/gcc-plugins/gcc-common.h | 12 + + scripts/gcc-plugins/gen-random-seed.sh | 8 + + scripts/gcc-plugins/randomize_layout_plugin.c | 1017 +++++++++++++++++++++++++ + security/Kconfig | 7 + + tools/objtool/builtin-check.c | 3 +- + 30 files changed, 1479 insertions(+), 107 deletions(-) + create mode 100644 scripts/gcc-plugins/.gitignore + create mode 100644 scripts/gcc-plugins/gen-random-seed.sh + create mode 100644 scripts/gcc-plugins/randomize_layout_plugin.c +$ git am -3 ../patches/0001-Revert-include-linux-string.h-add-the-option-of-fort.patch +Applying: Revert "include/linux/string.h: add the option of fortified string.h functions" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/Kconfig +M arch/arm64/Kconfig +M arch/arm64/include/asm/string.h +M arch/powerpc/Kconfig +M arch/x86/Kconfig +M arch/x86/boot/compressed/misc.c +M arch/x86/include/asm/string_32.h +M arch/x86/include/asm/string_64.h +M include/linux/string.h +M lib/string.c +M security/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 12f0a75c039c] Merge remote-tracking branch 'kspp/for-next/kspp' + Date: Fri Jun 16 11:16:33 2017 +1000 +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 (5ea32fb24a83 Merge remote-tracking branches 'regmap/topic/1wire', 'regmap/topic/irq' and 'regmap/topic/lzo' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 11 +- + drivers/base/regmap/Makefile | 4 +- + drivers/base/regmap/regcache.c | 2 + + drivers/base/regmap/regmap-irq.c | 2 +- + drivers/base/regmap/regmap-w1.c | 245 +++++++++++++++++++++++++++++++++++++++ + include/linux/regmap.h | 34 ++++++ + 6 files changed, 294 insertions(+), 4 deletions(-) + create mode 100644 drivers/base/regmap/regmap-w1.c +Merging sound/for-next (ba61faf0d75d ALSA: pcm: remove SNDRV_PCM_IOCTL1_GSTATE internal command) +$ git merge sound/for-next +Auto-merging sound/core/pcm_lib.c +Removing sound/atmel/abdac.c +Merge made by the 'recursive' strategy. + .../sound/kernel-api/writing-an-alsa-driver.rst | 111 ++- + drivers/dma/dw/Kconfig | 7 +- + drivers/dma/dw/core.c | 332 +------ + drivers/dma/dw/regs.h | 50 +- + drivers/media/pci/solo6x10/solo6x10-g723.c | 32 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 5 +- + drivers/usb/gadget/function/u_uac1.c | 7 +- + 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/emux_synth.h | 8 +- + include/sound/mixer_oss.h | 2 +- + include/sound/opl3.h | 8 +- + include/sound/pcm-indirect.h | 10 +- + include/sound/pcm.h | 143 +-- + include/sound/rawmidi.h | 4 +- + sound/Kconfig | 6 +- + sound/aoa/codecs/tas.c | 14 +- + sound/aoa/fabrics/layout.c | 8 +- + sound/atmel/Kconfig | 13 +- + sound/atmel/Makefile | 2 - + sound/atmel/abdac.c | 610 ------------- + sound/atmel/ac97c.c | 447 ++-------- + sound/core/Kconfig | 59 +- + sound/core/Makefile | 3 + + sound/core/control.c | 70 +- + sound/core/ctljack.c | 2 +- + sound/core/info.c | 6 +- + sound/core/oss/io.c | 4 +- + sound/core/oss/pcm_oss.c | 101 +-- + sound/core/oss/pcm_plugin.c | 5 +- + sound/core/oss/pcm_plugin.h | 10 +- + sound/core/pcm.c | 35 +- + sound/core/pcm_compat.c | 12 +- + sound/core/pcm_drm_eld.c | 8 +- + sound/core/pcm_lib.c | 634 ++++++-------- + sound/core/pcm_local.h | 50 ++ + sound/core/pcm_misc.c | 3 + + sound/core/pcm_native.c | 964 +++++++++++---------- + sound/core/pcm_param_trace.h | 142 +++ + sound/core/pcm_timer.c | 14 +- + sound/core/pcm_trace.h | 50 +- + sound/core/rawmidi.c | 4 +- + sound/core/seq/Kconfig | 68 +- + sound/core/seq/Makefile | 21 +- + sound/core/seq/oss/Makefile | 2 +- + sound/core/{seq => }/seq_device.c | 0 + sound/core/timer.c | 98 +-- + sound/drivers/Kconfig | 15 + + sound/drivers/dummy.c | 20 +- + sound/drivers/opl3/opl3_lib.c | 2 +- + sound/drivers/opl3/opl3_oss.c | 14 - + sound/drivers/opl3/opl3_seq.c | 4 +- + sound/drivers/opl3/opl3_voice.h | 5 +- + sound/drivers/opl4/opl4_lib.c | 4 +- + sound/drivers/opl4/opl4_local.h | 2 +- + sound/drivers/pcsp/pcsp_lib.c | 2 +- + sound/drivers/vx/vx_mixer.c | 24 +- + sound/drivers/vx/vx_pcm.c | 4 +- + sound/firewire/amdtp-am824.c | 71 +- + sound/firewire/amdtp-am824.h | 6 +- + sound/firewire/amdtp-stream.c | 38 + + sound/firewire/amdtp-stream.h | 1 + + sound/firewire/bebob/bebob_maudio.c | 8 +- + sound/firewire/bebob/bebob_pcm.c | 41 +- + sound/firewire/dice/dice-pcm.c | 44 +- + sound/firewire/digi00x/amdtp-dot.c | 63 +- + sound/firewire/digi00x/digi00x-pcm.c | 56 +- + sound/firewire/digi00x/digi00x.h | 1 - + sound/firewire/fireface/ff-midi.c | 22 +- + sound/firewire/fireface/ff-pcm.c | 83 +- + sound/firewire/fireworks/fireworks_pcm.c | 41 +- + sound/firewire/motu/motu-pcm.c | 36 +- + sound/firewire/oxfw/oxfw-pcm.c | 40 +- + sound/firewire/tascam/amdtp-tascam.c | 62 +- + sound/firewire/tascam/tascam-pcm.c | 58 +- + 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/Kconfig | 8 + + sound/isa/cmi8328.c | 2 +- + sound/isa/cs423x/cs4236_lib.c | 4 +- + sound/isa/es1688/es1688_lib.c | 4 +- + sound/isa/es18xx.c | 8 +- + sound/isa/gus/gus_main.c | 2 +- + sound/isa/gus/gus_pcm.c | 122 +-- + sound/isa/sb/emu8000.c | 2 +- + sound/isa/sb/emu8000_callback.c | 6 +- + sound/isa/sb/emu8000_pcm.c | 214 ++--- + sound/isa/sb/sb16.c | 2 +- + sound/isa/sb/sb16_csp.c | 4 +- + sound/isa/sb/sb16_main.c | 2 +- + sound/isa/sb/sb8_main.c | 6 +- + sound/isa/sscape.c | 2 +- + sound/isa/wss/wss_lib.c | 4 +- + sound/mips/hal2.c | 18 +- + sound/mips/sgio2audio.c | 14 +- + sound/parisc/harmony.c | 6 +- + sound/pci/Kconfig | 8 + + sound/pci/ali5451/ali5451.c | 4 +- + sound/pci/atiixp_modem.c | 4 +- + sound/pci/au88x0/au88x0_pcm.c | 4 +- + sound/pci/azt3328.c | 4 +- + sound/pci/bt87x.c | 4 +- + sound/pci/cmipci.c | 12 +- + sound/pci/cs4281.c | 2 +- + sound/pci/cs46xx/cs46xx_lib.c | 14 +- + sound/pci/emu10k1/emu10k1.c | 2 +- + sound/pci/emu10k1/emufx.c | 127 +-- + sound/pci/emu10k1/emupcm.c | 12 +- + sound/pci/ens1370.c | 16 +- + sound/pci/es1938.c | 37 +- + sound/pci/fm801.c | 8 +- + 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_hdmi.c | 10 +- + sound/pci/hda/patch_realtek.c | 37 +- + sound/pci/hda/patch_si3054.c | 4 +- + sound/pci/ice1712/ice1712.c | 10 +- + sound/pci/ice1712/ice1712.h | 2 +- + sound/pci/ice1712/ice1724.c | 10 +- + sound/pci/ice1712/juli.c | 6 +- + sound/pci/ice1712/maya44.c | 4 +- + sound/pci/ice1712/quartet.c | 6 +- + sound/pci/intel8x0.c | 12 +- + sound/pci/intel8x0m.c | 4 +- + sound/pci/korg1212/korg1212.c | 112 ++- + sound/pci/mixart/mixart_mixer.c | 6 +- + sound/pci/nm256/nm256.c | 61 +- + sound/pci/rme32.c | 80 +- + sound/pci/rme96.c | 74 +- + sound/pci/rme9652/hdsp.c | 75 +- + sound/pci/rme9652/hdspm.c | 4 +- + sound/pci/rme9652/rme9652.c | 75 +- + sound/pci/sonicvibes.c | 4 +- + sound/pci/via82xx.c | 4 +- + sound/pci/via82xx_modem.c | 4 +- + 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 | 14 +- + sound/pcmcia/vx/vxp_ops.c | 28 +- + sound/pcmcia/vx/vxpocket.c | 4 +- + sound/pcmcia/vx/vxpocket.h | 2 + + sound/ppc/awacs.c | 4 +- + sound/ppc/beep.c | 2 +- + sound/ppc/tumbler.c | 8 +- + sound/sh/aica.c | 4 +- + sound/sh/sh_dac_audio.c | 54 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 27 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 36 +- + sound/soc/sh/siu_dai.c | 4 +- + sound/soc/soc-pcm.c | 5 +- + sound/sparc/cs4231.c | 4 +- + sound/synth/Kconfig | 2 + + sound/synth/emux/Makefile | 4 +- + sound/synth/emux/emux.c | 6 +- + sound/synth/emux/emux_effect.c | 2 +- + sound/synth/emux/emux_oss.c | 4 - + sound/usb/Kconfig | 2 +- + sound/usb/mixer_quirks.c | 2 +- + sound/usb/usx2y/us122l.c | 36 +- + sound/usb/usx2y/us122l.h | 2 + + 167 files changed, 2880 insertions(+), 4145 deletions(-) + delete mode 100644 sound/atmel/abdac.c + create mode 100644 sound/core/pcm_local.h + create mode 100644 sound/core/pcm_param_trace.h + rename sound/core/{seq => }/seq_device.c (100%) + create mode 100644 sound/synth/Kconfig +Merging sound-asoc/for-next (b1f6b175adf2 Merge remote-tracking branches 'asoc/topic/tlv320dac31xx', 'asoc/topic/topology' and 'asoc/topic/wm-adsp' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/audio-graph-card.txt | 124 +++ + .../bindings/sound/audio-graph-scu-card.txt | 117 +++ + .../devicetree/bindings/sound/cs35l35.txt | 3 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 37 +- + .../devicetree/bindings/sound/rockchip,pdm.txt | 39 + + .../devicetree/bindings/sound/rockchip-spdif.txt | 2 + + .../devicetree/bindings/sound/samsung,odroid.txt | 15 +- + .../devicetree/bindings/sound/simple-scu-card.txt | 67 +- + .../devicetree/bindings/sound/st,stm32-i2s.txt | 62 ++ + .../devicetree/bindings/sound/sun4i-codec.txt | 11 +- + .../bindings/sound/sun8i-codec-analog.txt | 1 + + drivers/of/base.c | 62 +- + include/linux/of_graph.h | 21 + + include/sound/cs35l35.h | 2 + + include/sound/hdmi-codec.h | 9 + + include/sound/simple_card_utils.h | 41 +- + include/sound/soc-topology.h | 5 + + include/sound/soc.h | 3 + + include/uapi/sound/snd_sst_tokens.h | 5 +- + sound/soc/atmel/atmel-pcm.h | 6 +- + sound/soc/atmel/tse850-pcm5142.c | 4 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4613.c | 34 +- + sound/soc/codecs/cs35l34.c | 4 +- + sound/soc/codecs/cs35l35.c | 94 +- + sound/soc/codecs/cs35l35.h | 6 + + sound/soc/codecs/cs4271.c | 2 - + sound/soc/codecs/cs53l30.c | 2 +- + sound/soc/codecs/da7213.c | 37 +- + sound/soc/codecs/da7218.c | 2 +- + sound/soc/codecs/es8316.c | 637 ++++++++++++++ + sound/soc/codecs/es8316.h | 129 +++ + sound/soc/codecs/hdmi-codec.c | 92 +- + sound/soc/codecs/msm8916-wcd-analog.c | 6 +- + sound/soc/codecs/nau8824.c | 52 ++ + sound/soc/codecs/nau8824.h | 12 + + sound/soc/codecs/rt5514.c | 37 +- + sound/soc/codecs/rt5514.h | 6 + + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/rt5663.h | 4 + + sound/soc/codecs/rt5665.c | 151 ++-- + sound/soc/codecs/sgtl5000.c | 89 ++ + sound/soc/codecs/tlv320aic31xx.c | 2 +- + sound/soc/codecs/wm_adsp.c | 6 +- + sound/soc/davinci/davinci-mcasp.c | 12 +- + sound/soc/generic/Kconfig | 17 + + sound/soc/generic/Makefile | 4 + + sound/soc/generic/audio-graph-card.c | 293 +++++++ + sound/soc/generic/audio-graph-scu-card.c | 389 +++++++++ + sound/soc/generic/simple-card-utils.c | 179 +++- + sound/soc/generic/simple-card.c | 59 +- + sound/soc/generic/simple-scu-card.c | 55 +- + sound/soc/hisilicon/hi6210-i2s.c | 11 +- + sound/soc/intel/Kconfig | 42 + + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- + sound/soc/intel/atom/sst/sst.c | 37 +- + sound/soc/intel/atom/sst/sst.h | 22 - + sound/soc/intel/atom/sst/sst_acpi.c | 232 +++-- + sound/soc/intel/boards/Makefile | 6 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 12 +- + sound/soc/intel/boards/bxt_rt298.c | 19 +- + sound/soc/intel/boards/byt-max98090.c | 24 +- + sound/soc/intel/boards/bytcht_es8316.c | 300 +++++++ + sound/soc/intel/boards/bytcht_nocodec.c | 4 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 12 - + sound/soc/intel/boards/kbl_rt5663_max98927.c | 687 +++++++++++++++ + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 640 ++++++++++++++ + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 16 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 16 +- + sound/soc/intel/boards/skl_rt286.c | 12 +- + sound/soc/intel/common/sst-acpi.h | 23 + + sound/soc/intel/common/sst-match-acpi.c | 47 +- + sound/soc/intel/skylake/skl-messages.c | 2 + + sound/soc/intel/skylake/skl-topology.c | 180 +++- + sound/soc/intel/skylake/skl-topology.h | 20 + + sound/soc/intel/skylake/skl-tplg-interface.h | 2 + + sound/soc/intel/skylake/skl.c | 113 ++- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 2 +- + sound/soc/omap/mcbsp.c | 12 +- + sound/soc/rockchip/Kconfig | 9 + + sound/soc/rockchip/Makefile | 2 + + sound/soc/rockchip/rockchip_i2s.c | 41 +- + sound/soc/rockchip/rockchip_i2s.h | 3 + + sound/soc/rockchip/rockchip_pdm.c | 516 +++++++++++ + sound/soc/rockchip/rockchip_pdm.h | 83 ++ + sound/soc/rockchip/rockchip_spdif.c | 4 + + sound/soc/samsung/s3c24xx_uda134x.c | 2 +- + sound/soc/sh/Kconfig | 2 +- + sound/soc/sh/fsi.c | 13 +- + sound/soc/sh/rcar/adg.c | 61 +- + sound/soc/sh/rcar/cmd.c | 3 + + sound/soc/sh/rcar/core.c | 492 +++++++---- + sound/soc/sh/rcar/ctu.c | 6 + + sound/soc/sh/rcar/dma.c | 32 +- + sound/soc/sh/rcar/dvc.c | 12 +- + sound/soc/sh/rcar/gen.c | 2 + + sound/soc/sh/rcar/rsnd.h | 68 +- + sound/soc/sh/rcar/src.c | 20 +- + sound/soc/sh/rcar/ssi.c | 241 ++++-- + sound/soc/sh/rcar/ssiu.c | 37 + + sound/soc/soc-core.c | 47 +- + sound/soc/soc-topology.c | 24 +- + sound/soc/stm/Kconfig | 2 +- + sound/soc/stm/Makefile | 4 + + sound/soc/stm/stm32_i2s.c | 946 +++++++++++++++++++++ + sound/soc/sunxi/sun4i-codec.c | 63 ++ + sound/soc/sunxi/sun8i-codec-analog.c | 145 +++- + sound/soc/zte/zx-i2s.c | 5 +- + 110 files changed, 7532 insertions(+), 910 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.txt + create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.txt + create mode 100644 sound/soc/codecs/es8316.c + create mode 100644 sound/soc/codecs/es8316.h + create mode 100644 sound/soc/generic/audio-graph-card.c + create mode 100644 sound/soc/generic/audio-graph-scu-card.c + create mode 100644 sound/soc/intel/boards/bytcht_es8316.c + create mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c + create mode 100644 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c + create mode 100644 sound/soc/rockchip/rockchip_pdm.c + create mode 100644 sound/soc/rockchip/rockchip_pdm.h + create mode 100644 sound/soc/stm/stm32_i2s.c +$ git reset --hard HEAD^ +HEAD is now at a682a38d73ea Merge remote-tracking branch 'sound/for-next' +Merging next-20170615 version of sound-asoc +$ git merge -m next-20170615/sound-asoc 4206624587983b1987da44b5321e0611de117bbb +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/audio-graph-card.txt | 124 +++ + .../bindings/sound/audio-graph-scu-card.txt | 117 +++ + .../devicetree/bindings/sound/cs35l35.txt | 3 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 37 +- + .../devicetree/bindings/sound/rockchip,pdm.txt | 39 + + .../devicetree/bindings/sound/rockchip-spdif.txt | 2 + + .../devicetree/bindings/sound/samsung,odroid.txt | 15 +- + .../devicetree/bindings/sound/simple-scu-card.txt | 67 +- + .../devicetree/bindings/sound/st,stm32-i2s.txt | 62 ++ + .../devicetree/bindings/sound/sun4i-codec.txt | 11 +- + .../bindings/sound/sun8i-codec-analog.txt | 1 + + drivers/of/base.c | 62 +- + include/linux/of_graph.h | 21 + + include/sound/cs35l35.h | 2 + + include/sound/hdmi-codec.h | 9 + + include/sound/simple_card_utils.h | 27 +- + include/sound/soc-topology.h | 5 + + include/sound/soc.h | 3 + + include/uapi/sound/snd_sst_tokens.h | 5 +- + sound/soc/atmel/atmel-pcm.h | 6 +- + sound/soc/atmel/tse850-pcm5142.c | 4 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4613.c | 34 +- + sound/soc/codecs/cs35l34.c | 4 +- + sound/soc/codecs/cs35l35.c | 94 +- + sound/soc/codecs/cs35l35.h | 6 + + sound/soc/codecs/cs4271.c | 2 - + sound/soc/codecs/cs53l30.c | 2 +- + sound/soc/codecs/da7213.c | 37 +- + sound/soc/codecs/da7218.c | 2 +- + sound/soc/codecs/es8316.c | 637 ++++++++++++++ + sound/soc/codecs/es8316.h | 129 +++ + sound/soc/codecs/hdmi-codec.c | 92 +- + sound/soc/codecs/msm8916-wcd-analog.c | 6 +- + sound/soc/codecs/nau8824.c | 52 ++ + sound/soc/codecs/nau8824.h | 12 + + sound/soc/codecs/rt5514.c | 37 +- + sound/soc/codecs/rt5514.h | 6 + + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/rt5663.h | 4 + + sound/soc/codecs/rt5665.c | 151 ++-- + sound/soc/codecs/sgtl5000.c | 89 ++ + sound/soc/codecs/tlv320aic31xx.c | 2 +- + sound/soc/codecs/wm_adsp.c | 6 +- + sound/soc/davinci/davinci-mcasp.c | 12 +- + sound/soc/generic/Kconfig | 17 + + sound/soc/generic/Makefile | 4 + + sound/soc/generic/audio-graph-card.c | 293 +++++++ + sound/soc/generic/audio-graph-scu-card.c | 407 +++++++++ + sound/soc/generic/simple-card-utils.c | 117 ++- + sound/soc/generic/simple-card.c | 49 +- + sound/soc/generic/simple-scu-card.c | 29 +- + sound/soc/hisilicon/hi6210-i2s.c | 11 +- + sound/soc/intel/Kconfig | 42 + + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- + sound/soc/intel/atom/sst/sst.c | 37 +- + sound/soc/intel/atom/sst/sst.h | 22 - + sound/soc/intel/atom/sst/sst_acpi.c | 232 +++-- + sound/soc/intel/boards/Makefile | 6 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 12 +- + sound/soc/intel/boards/bxt_rt298.c | 19 +- + sound/soc/intel/boards/byt-max98090.c | 24 +- + sound/soc/intel/boards/bytcht_es8316.c | 300 +++++++ + sound/soc/intel/boards/bytcht_nocodec.c | 4 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 12 - + sound/soc/intel/boards/kbl_rt5663_max98927.c | 687 +++++++++++++++ + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 640 ++++++++++++++ + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 16 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 16 +- + sound/soc/intel/boards/skl_rt286.c | 12 +- + sound/soc/intel/common/sst-acpi.h | 23 + + sound/soc/intel/common/sst-match-acpi.c | 47 +- + sound/soc/intel/skylake/skl-messages.c | 2 + + sound/soc/intel/skylake/skl-topology.c | 180 +++- + sound/soc/intel/skylake/skl-topology.h | 20 + + sound/soc/intel/skylake/skl-tplg-interface.h | 2 + + sound/soc/intel/skylake/skl.c | 113 ++- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 2 +- + sound/soc/omap/mcbsp.c | 12 +- + sound/soc/rockchip/Kconfig | 9 + + sound/soc/rockchip/Makefile | 2 + + sound/soc/rockchip/rockchip_i2s.c | 32 +- + sound/soc/rockchip/rockchip_i2s.h | 3 + + sound/soc/rockchip/rockchip_pdm.c | 516 +++++++++++ + sound/soc/rockchip/rockchip_pdm.h | 83 ++ + sound/soc/rockchip/rockchip_spdif.c | 4 + + sound/soc/samsung/s3c24xx_uda134x.c | 2 +- + sound/soc/sh/Kconfig | 2 +- + sound/soc/sh/fsi.c | 13 +- + sound/soc/sh/rcar/adg.c | 8 +- + sound/soc/sh/rcar/cmd.c | 3 + + sound/soc/sh/rcar/core.c | 290 ++++--- + sound/soc/sh/rcar/ctu.c | 6 + + sound/soc/sh/rcar/dma.c | 32 +- + sound/soc/sh/rcar/dvc.c | 5 + + sound/soc/sh/rcar/gen.c | 2 + + sound/soc/sh/rcar/rsnd.h | 41 +- + sound/soc/sh/rcar/src.c | 20 +- + sound/soc/sh/rcar/ssi.c | 143 +++- + sound/soc/sh/rcar/ssiu.c | 37 + + sound/soc/soc-core.c | 47 +- + sound/soc/soc-topology.c | 24 +- + sound/soc/stm/Kconfig | 2 +- + sound/soc/stm/Makefile | 4 + + sound/soc/stm/stm32_i2s.c | 946 +++++++++++++++++++++ + sound/soc/sunxi/sun4i-codec.c | 63 ++ + sound/soc/sunxi/sun8i-codec-analog.c | 145 +++- + sound/soc/zte/zx-i2s.c | 5 +- + 110 files changed, 7176 insertions(+), 776 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.txt + create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.txt + create mode 100644 sound/soc/codecs/es8316.c + create mode 100644 sound/soc/codecs/es8316.h + create mode 100644 sound/soc/generic/audio-graph-card.c + create mode 100644 sound/soc/generic/audio-graph-scu-card.c + create mode 100644 sound/soc/intel/boards/bytcht_es8316.c + create mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c + create mode 100644 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c + create mode 100644 sound/soc/rockchip/rockchip_pdm.c + create mode 100644 sound/soc/rockchip/rockchip_pdm.h + create mode 100644 sound/soc/stm/stm32_i2s.c +Merging modules/modules-next (3e2e857f9c3a module: Add module name to modinfo) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 51 ++++++++++++++++++++++++++++++++------------------- + scripts/mod/modpost.c | 1 + + 2 files changed, 33 insertions(+), 19 deletions(-) +Merging input/next (ad2ee015245d Input: xen-kbdfront - use string constants from PV protocol) +$ git merge input/next +Auto-merging include/linux/platform_data/tsc2007.h +Auto-merging drivers/input/mouse/elantech.c +Auto-merging drivers/input/misc/axp20x-pek.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/input/dlink,dir685-touchkeys.txt | 21 + + .../bindings/input/touchscreen/st,stmfts.txt | 43 ++ + MAINTAINERS | 6 + + arch/sh/boards/mach-ecovec24/setup.c | 2 +- + drivers/input/input.c | 12 +- + drivers/input/keyboard/Kconfig | 11 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/dlink-dir685-touchkeys.c | 155 ++++ + drivers/input/keyboard/lm8323.c | 2 +- + drivers/input/keyboard/mcs_touchkey.c | 2 +- + drivers/input/misc/axp20x-pek.c | 28 + + drivers/input/misc/xen-kbdfront.c | 22 +- + 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/rmi4/rmi_f34v7.c | 24 +- + drivers/input/sparse-keymap.c | 14 - + drivers/input/touchscreen/Kconfig | 11 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/mcs5000_ts.c | 2 +- + drivers/input/touchscreen/mms114.c | 2 +- + drivers/input/touchscreen/s3c2410_ts.c | 8 +- + drivers/input/touchscreen/stmfts.c | 822 +++++++++++++++++++++ + drivers/input/touchscreen/tsc2007_core.c | 2 +- + drivers/mfd/timberdale.c | 2 +- + include/linux/input/sparse-keymap.h | 1 - + 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 +- + 32 files changed, 1259 insertions(+), 71 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/dlink,dir685-touchkeys.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/st,stmfts.txt + create mode 100644 drivers/input/keyboard/dlink-dir685-touchkeys.c + create mode 100644 drivers/input/touchscreen/stmfts.c + 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 (6931eb3ce135 Merge branch 'for-4.13/block' into for-next) +$ git merge block/for-next +Resolved 'drivers/s390/block/scm_blk.c' using previous resolution. +Resolved 'drivers/s390/block/scm_blk.h' using previous resolution. +Resolved 'fs/btrfs/compression.c' using previous resolution. +Resolved 'fs/btrfs/disk-io.c' using previous resolution. +Resolved 'fs/btrfs/disk-io.h' using previous resolution. +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Resolved 'fs/btrfs/extent_io.h' using previous resolution. +Resolved 'fs/btrfs/inode.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging fs/mpage.c +Auto-merging fs/gfs2/incore.h +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/raid56.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/btrfs/file-item.c +Auto-merging fs/btrfs/extent_io.h +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.h +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.h +CONFLICT (content): Merge conflict in fs/btrfs/disk-io.h +Auto-merging fs/btrfs/disk-io.c +CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/compression.h +Auto-merging fs/btrfs/compression.c +CONFLICT (content): Merge conflict in fs/btrfs/compression.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging drivers/s390/block/scm_blk.h +CONFLICT (content): Merge conflict in drivers/s390/block/scm_blk.h +Auto-merging drivers/s390/block/scm_blk.c +CONFLICT (content): Merge conflict in drivers/s390/block/scm_blk.c +Auto-merging drivers/s390/block/dasd.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 27712d05229a] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/s390/include/asm/eadm.h | 6 +- + arch/um/drivers/ubd_kern.c | 2 +- + block/bio-integrity.c | 8 +- + block/bio.c | 8 +- + block/blk-core.c | 174 +++++++++++++++++++++--------------- + block/blk-exec.c | 4 +- + block/blk-flush.c | 8 +- + block/blk-integrity.c | 4 +- + block/blk-mq-debugfs.c | 77 +++++++++++++++- + block/blk-mq-sched.c | 62 +++++++++++-- + block/blk-mq-sched.h | 4 +- + block/blk-mq.c | 123 +++++++------------------ + block/bounce.c | 4 +- + block/bsg-lib.c | 5 +- + block/bsg.c | 12 ++- + block/cfq-iosched.c | 9 -- + block/t10-pi.c | 30 +++---- + drivers/block/DAC960.c | 2 +- + drivers/block/amiflop.c | 10 +-- + drivers/block/aoe/aoecmd.c | 12 +-- + drivers/block/aoe/aoedev.c | 2 +- + drivers/block/ataflop.c | 16 ++-- + drivers/block/cciss.c | 4 +- + drivers/block/drbd/drbd_actlog.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 6 +- + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_receiver.c | 6 +- + drivers/block/drbd/drbd_req.c | 6 +- + drivers/block/drbd/drbd_worker.c | 16 ++-- + drivers/block/floppy.c | 8 +- + drivers/block/loop.c | 56 +++++++++--- + drivers/block/loop.h | 1 + + drivers/block/mtip32xx/mtip32xx.c | 33 ++++--- + drivers/block/mtip32xx/mtip32xx.h | 2 +- + drivers/block/nbd.c | 44 +++++---- + drivers/block/null_blk.c | 13 +-- + drivers/block/paride/pcd.c | 8 +- + drivers/block/paride/pd.c | 2 +- + drivers/block/paride/pf.c | 18 ++-- + drivers/block/pktcdvd.c | 23 +++-- + drivers/block/ps3disk.c | 11 +-- + drivers/block/ps3vram.c | 14 +-- + drivers/block/rbd.c | 12 +-- + drivers/block/rsxx/dev.c | 14 ++- + drivers/block/rsxx/dma.c | 13 ++- + drivers/block/rsxx/rsxx_priv.h | 2 +- + drivers/block/skd_main.c | 31 +++---- + drivers/block/sunvdc.c | 4 +- + drivers/block/swim.c | 6 +- + drivers/block/swim3.c | 26 +++--- + drivers/block/sx8.c | 20 ++--- + drivers/block/umem.c | 2 +- + drivers/block/virtio_blk.c | 20 ++--- + drivers/block/xen-blkback/blkback.c | 19 ++-- + drivers/block/xen-blkfront.c | 26 +++--- + drivers/block/xsysace.c | 8 +- + drivers/block/z2ram.c | 4 +- + drivers/cdrom/cdrom.c | 6 ++ + drivers/cdrom/gdrom.c | 9 +- + drivers/ide/ide-atapi.c | 9 +- + drivers/ide/ide-cd.c | 10 +-- + drivers/ide/ide-dma.c | 2 +- + drivers/ide/ide-eh.c | 16 ++-- + drivers/ide/ide-floppy.c | 6 +- + drivers/ide/ide-io.c | 10 +-- + drivers/ide/ide-pm.c | 6 +- + drivers/ide/ide-probe.c | 1 + + drivers/ide/ide-tape.c | 2 +- + drivers/ide/ide-taskfile.c | 6 +- + drivers/ide/siimage.c | 6 +- + drivers/lightnvm/pblk-core.c | 4 +- + drivers/lightnvm/pblk-read.c | 4 +- + drivers/lightnvm/pblk-write.c | 2 +- + drivers/lightnvm/rrpc.c | 8 +- + drivers/md/bcache/bcache.h | 7 +- + drivers/md/bcache/btree.c | 6 +- + drivers/md/bcache/io.c | 6 +- + drivers/md/bcache/journal.c | 2 +- + drivers/md/bcache/movinggc.c | 10 +-- + drivers/md/bcache/request.c | 28 +++--- + drivers/md/bcache/request.h | 2 +- + drivers/md/bcache/super.c | 6 +- + drivers/md/bcache/writeback.c | 4 +- + drivers/md/dm-bio-prison-v1.c | 4 +- + drivers/md/dm-bio-prison-v1.h | 2 +- + drivers/md/dm-bufio.c | 28 +++--- + drivers/md/dm-cache-target.c | 36 ++++---- + drivers/md/dm-crypt.c | 38 ++++---- + drivers/md/dm-flakey.c | 13 +-- + drivers/md/dm-integrity.c | 30 +++---- + drivers/md/dm-io.c | 10 +-- + drivers/md/dm-log-writes.c | 13 +-- + drivers/md/dm-mpath.c | 85 ++++++++---------- + drivers/md/dm-raid1.c | 31 +++---- + drivers/md/dm-rq.c | 28 +++--- + drivers/md/dm-rq.h | 2 +- + drivers/md/dm-snap.c | 15 ++-- + drivers/md/dm-stripe.c | 17 ++-- + drivers/md/dm-target.c | 2 +- + drivers/md/dm-thin.c | 67 +++++++------- + drivers/md/dm-verity-target.c | 16 ++-- + drivers/md/dm-zero.c | 4 +- + drivers/md/dm.c | 82 +++++++++-------- + drivers/md/md.c | 8 +- + drivers/md/multipath.c | 10 +-- + drivers/md/raid1.c | 36 ++++---- + drivers/md/raid10.c | 36 ++++---- + drivers/md/raid5-cache.c | 4 +- + drivers/md/raid5-ppl.c | 2 +- + drivers/md/raid5.c | 22 ++--- + drivers/memstick/core/ms_block.c | 7 +- + drivers/memstick/core/mspro_block.c | 8 +- + drivers/mmc/core/block.c | 37 ++++---- + drivers/mmc/core/queue.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 30 ++++--- + drivers/mtd/ubi/block.c | 8 +- + drivers/nvdimm/blk.c | 4 +- + drivers/nvdimm/btt.c | 4 +- + drivers/nvdimm/pmem.c | 28 +++--- + drivers/nvme/host/core.c | 43 ++++----- + drivers/nvme/host/fc.c | 23 ++--- + drivers/nvme/host/lightnvm.c | 14 +-- + drivers/nvme/host/nvme.h | 2 +- + drivers/nvme/host/pci.c | 48 +++++----- + drivers/nvme/host/rdma.c | 35 ++++---- + drivers/nvme/target/io-cmd.c | 4 +- + drivers/nvme/target/loop.c | 17 ++-- + drivers/s390/block/dasd.c | 36 +++++--- + drivers/s390/block/scm_blk.c | 8 +- + drivers/s390/block/scm_blk.h | 4 +- + drivers/s390/cio/eadm_sch.c | 6 +- + drivers/s390/cio/scm.c | 2 +- + drivers/sbus/char/jsflash.c | 4 +- + drivers/scsi/osd/osd_initiator.c | 22 ++--- + drivers/scsi/osst.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_lib.c | 83 +++++++---------- + drivers/scsi/scsi_transport_sas.c | 3 +- + drivers/scsi/sg.c | 6 +- + drivers/scsi/st.c | 2 +- + drivers/target/target_core_iblock.c | 10 +-- + drivers/target/target_core_pscsi.c | 4 +- + fs/block_dev.c | 21 +++-- + fs/btrfs/btrfs_inode.h | 3 +- + fs/btrfs/check-integrity.c | 4 +- + fs/btrfs/compression.c | 42 ++++----- + fs/btrfs/compression.h | 4 +- + fs/btrfs/ctree.h | 6 +- + fs/btrfs/disk-io.c | 74 +++++++-------- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent_io.c | 23 ++--- + fs/btrfs/extent_io.h | 6 +- + fs/btrfs/file-item.c | 14 +-- + fs/btrfs/inode.c | 83 +++++++++-------- + fs/btrfs/raid56.c | 16 ++-- + fs/btrfs/scrub.c | 26 +++--- + fs/btrfs/volumes.c | 11 +-- + fs/buffer.c | 2 +- + fs/crypto/bio.c | 2 +- + fs/direct-io.c | 15 ++-- + fs/ext4/page-io.c | 13 +-- + fs/ext4/readpage.c | 4 +- + fs/f2fs/data.c | 10 +-- + fs/f2fs/segment.c | 2 +- + fs/gfs2/incore.h | 1 - + fs/gfs2/lops.c | 10 +-- + fs/gfs2/meta_io.c | 2 +- + fs/gfs2/ops_fstype.c | 4 +- + fs/iomap.c | 4 +- + fs/jfs/jfs_logmgr.c | 2 +- + fs/jfs/jfs_metapage.c | 4 +- + fs/mpage.c | 3 +- + fs/nfs/blocklayout/blocklayout.c | 4 +- + fs/nfsd/blocklayout.c | 3 + + fs/nilfs2/segbuf.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 6 +- + fs/xfs/xfs_aops.c | 7 +- + fs/xfs/xfs_buf.c | 7 +- + include/linux/bio.h | 2 +- + include/linux/blk-mq.h | 11 +-- + include/linux/blk_types.h | 21 ++++- + include/linux/blkdev.h | 26 +++--- + include/linux/device-mapper.h | 4 +- + include/linux/fs.h | 2 +- + include/linux/ide.h | 6 +- + include/scsi/osd_initiator.h | 2 +- + include/uapi/linux/dm-ioctl.h | 4 +- + include/uapi/linux/loop.h | 3 + + include/uapi/linux/nbd.h | 4 + + kernel/power/swap.c | 14 +-- + kernel/trace/blktrace.c | 4 +- + mm/page_io.c | 4 +- + 192 files changed, 1563 insertions(+), 1379 deletions(-) +$ git am -3 ../patches/0001-btrfs-merge-fix-for-block-switch-bios-to-blk_status_.patch +Applying: btrfs: merge fix for "block: switch bios to blk_status_t" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/btrfs/inode.c +$ git add -A . +$ git commit -v -a --amend +[master ab7bbaffed4a] Merge remote-tracking branch 'block/for-next' + Date: Fri Jun 16 12:09:03 2017 +1000 +$ git am -3 ../patches/0001-s390-fix-up-for-blk-mq-switch-queue_rq-return-value-.patch +Applying: s390: fix up for "blk-mq: switch ->queue_rq return value to blk_status_t" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/s390/block/scm_blk.c +$ git add -A . +$ git commit -v -a --amend +[master 62a14083aec9] Merge remote-tracking branch 'block/for-next' + Date: Fri Jun 16 12:09:03 2017 +1000 +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 (1e6562930ed7 dm zoned: drive-managed zoned block device target) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-zoned.txt | 144 ++ + drivers/md/Kconfig | 17 + + drivers/md/Makefile | 2 + + 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-crypt.c | 21 +- + drivers/md/dm-flakey.c | 23 +- + drivers/md/dm-ioctl.c | 109 +- + drivers/md/dm-kcopyd.c | 65 +- + drivers/md/dm-linear.c | 18 +- + drivers/md/dm-table.c | 162 ++ + drivers/md/dm-zoned-metadata.c | 2509 ++++++++++++++++++++++++++++++ + drivers/md/dm-zoned-reclaim.c | 570 +++++++ + drivers/md/dm-zoned-target.c | 967 ++++++++++++ + drivers/md/dm-zoned.h | 228 +++ + drivers/md/dm.c | 97 +- + include/linux/device-mapper.h | 79 +- + include/linux/dm-kcopyd.h | 1 + + include/uapi/linux/dm-ioctl.h | 4 +- + 20 files changed, 4948 insertions(+), 75 deletions(-) + create mode 100644 Documentation/device-mapper/dm-zoned.txt + create mode 100644 drivers/md/dm-zoned-metadata.c + create mode 100644 drivers/md/dm-zoned-reclaim.c + create mode 100644 drivers/md/dm-zoned-target.c + create mode 100644 drivers/md/dm-zoned.h +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 (f2cd281b9f7d mmc: sdhci-pci: Enable card detect wake for Intel BYT-related SD controllers) +$ git merge mmc/next +Resolved 'drivers/mmc/core/block.c' using previous resolution. +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 +Auto-merging drivers/mmc/core/queue.c +Auto-merging drivers/mmc/core/block.c +CONFLICT (content): Merge conflict in drivers/mmc/core/block.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3f7be5e6e2bc] Merge remote-tracking branch 'mmc/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 1 + + .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 +- + MAINTAINERS | 2 +- + arch/arm/boot/dts/omap3-overo-base.dtsi | 11 - + drivers/mmc/core/Kconfig | 18 - + drivers/mmc/core/block.c | 269 +++++---- + drivers/mmc/core/core.c | 214 +------ + drivers/mmc/core/host.c | 74 +-- + drivers/mmc/core/mmc.c | 18 +- + drivers/mmc/core/mmc_ops.c | 260 ++++++-- + drivers/mmc/core/mmc_ops.h | 5 +- + 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 | 242 ++------ + drivers/mmc/core/queue.h | 47 +- + drivers/mmc/core/sd.c | 22 +- + drivers/mmc/core/sdio.c | 24 +- + drivers/mmc/core/sdio_irq.c | 22 +- + drivers/mmc/core/sdio_ops.h | 2 + + drivers/mmc/core/slot-gpio.c | 2 + + drivers/mmc/host/Kconfig | 12 +- + drivers/mmc/host/Makefile | 4 +- + drivers/mmc/host/atmel-mci.c | 28 +- + drivers/mmc/host/bcm2835.c | 12 +- + drivers/mmc/host/cavium.c | 4 +- + drivers/mmc/host/dw_mmc.c | 66 +- + drivers/mmc/host/meson-gx-mmc.c | 9 + + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/omap_hsmmc.c | 55 +- + drivers/mmc/host/pxamci.c | 6 +- + drivers/mmc/host/renesas_sdhi.h | 39 ++ + .../host/{sh_mobile_sdhi.c => renesas_sdhi_core.c} | 238 ++------ + .../{tmio_mmc_dma.c => renesas_sdhi_sys_dmac.c} | 169 +++++- + drivers/mmc/host/sdhci-acpi.c | 4 - + drivers/mmc/host/sdhci-brcmstb.c | 3 - + drivers/mmc/host/sdhci-esdhc-imx.c | 192 +++--- + drivers/mmc/host/sdhci-esdhc.h | 1 + + drivers/mmc/host/sdhci-of-arasan.c | 2 +- + drivers/mmc/host/sdhci-pci-core.c | 668 ++++----------------- + drivers/mmc/host/sdhci-pci.h | 46 +- + drivers/mmc/host/sdricoh_cs.c | 3 - + drivers/mmc/host/tmio_mmc.c | 12 +- + drivers/mmc/host/tmio_mmc.h | 58 +- + .../mmc/host/{tmio_mmc_pio.c => tmio_mmc_core.c} | 222 ++++--- + drivers/mmc/host/vub300.c | 3 +- + include/linux/mfd/tmio.h | 2 +- + include/linux/mmc/card.h | 2 - + include/linux/mmc/host.h | 7 +- + 50 files changed, 1396 insertions(+), 1723 deletions(-) + create mode 100644 drivers/mmc/host/renesas_sdhi.h + rename drivers/mmc/host/{sh_mobile_sdhi.c => renesas_sdhi_core.c} (67%) + rename drivers/mmc/host/{tmio_mmc_dma.c => renesas_sdhi_sys_dmac.c} (57%) + rename drivers/mmc/host/{tmio_mmc_pio.c => tmio_mmc_core.c} (92%) +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 (fe100f1eb9e1 md: change the initialization value for a spare device spot to MD_DISK_ROLE_SPARE) +$ git merge md/for-next +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/multipath.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/faulty.c | 5 +++-- + drivers/md/linear.c | 7 ++++--- + drivers/md/md.c | 24 ++++++++++++++++++------ + drivers/md/md.h | 5 +++-- + drivers/md/multipath.c | 8 ++++---- + drivers/md/raid0.c | 7 ++++--- + drivers/md/raid1.c | 32 +++++++++++++++++++++++--------- + drivers/md/raid10.c | 16 +++++++++------- + drivers/md/raid5.c | 32 ++++++++++++++++++++++---------- + 9 files changed, 90 insertions(+), 46 deletions(-) +$ git am -3 ../patches/0001-md-fixup-for-block-switch-bios-to-blk_status_t.patch +Applying: md: fixup for "block: switch bios to blk_status_t" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/raid1.c +M drivers/md/raid5.c +$ git add -A . +$ git commit -v -a --amend +[master 63117ff02de2] Merge remote-tracking branch 'md/for-next' + Date: Fri Jun 16 12:23:59 2017 +1000 +Merging mfd/for-mfd-next (d905cd268c76 dt-bindings: vendor-prefixes: Add arctic to vendor prefix) +$ git merge mfd/for-mfd-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/arizona.txt | 3 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 4 + + drivers/mfd/Kconfig | 30 ++- + drivers/mfd/Makefile | 1 + + drivers/mfd/atmel-flexcom.c | 2 +- + drivers/mfd/axp20x.c | 3 +- + drivers/mfd/cros_ec.c | 2 +- + drivers/mfd/da9062-core.c | 12 -- + drivers/mfd/exynos-lpass.c | 2 +- + drivers/mfd/fsl-imx25-tsadc.c | 7 +- + drivers/mfd/intel-lpss-pci.c | 24 +++ + drivers/mfd/intel_quark_i2c_gpio.c | 49 +++-- + drivers/mfd/intel_soc_pmic_chtwc.c | 230 +++++++++++++++++++++ + drivers/mfd/ipaq-micro.c | 5 - + drivers/mfd/motorola-cpcap.c | 13 +- + drivers/mfd/palmas.c | 2 +- + drivers/mfd/qcom-spmi-pmic.c | 9 +- + drivers/mfd/rn5t618.c | 2 + + drivers/mfd/rtsx_pcr.c | 17 +- + drivers/mfd/smsc-ece1099.c | 3 +- + drivers/mfd/stm32-timers.c | 10 +- + drivers/mfd/tc6393xb.c | 4 +- + drivers/mfd/twl4030-irq.c | 4 +- + drivers/mfd/wm831x-core.c | 26 ++- + drivers/mfd/wm831x-i2c.c | 4 + + drivers/mfd/wm831x-spi.c | 4 + + include/linux/mfd/rtsx_pci.h | 5 + + 28 files changed, 379 insertions(+), 99 deletions(-) + create mode 100644 drivers/mfd/intel_soc_pmic_chtwc.c +Merging backlight/for-backlight-next (7e715c2d9c27 backlight: Report error on failure) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/backlight.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) +Merging battery/for-next (bfa953d336cd power: supply: sbs-battery: Don't needlessly set CAPACITY_MODE) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-power-twl4030 | 17 - + .../devicetree/bindings/power/supply/battery.txt | 57 ++ + .../devicetree/bindings/power/supply/bq27xxx.txt | 31 +- + .../bindings/power/supply/cpcap-battery.txt | 31 + + .../bindings/power/supply/ltc3651-charger.txt | 27 + + .../power/{ => supply}/max8903-charger.txt | 0 + .../supply}/maxim,max14656.txt | 0 + .../devicetree/bindings/property-units.txt | 2 + + Documentation/power/power_supply_class.txt | 31 +- + drivers/power/reset/Kconfig | 4 +- + drivers/power/reset/at91-poweroff.c | 2 +- + drivers/power/reset/at91-sama5d2_shdwc.c | 2 +- + drivers/power/reset/reboot-mode.c | 2 +- + drivers/power/reset/syscon-reboot-mode.c | 2 +- + drivers/power/supply/Kconfig | 26 + + drivers/power/supply/Makefile | 2 + + drivers/power/supply/axp20x_battery.c | 88 ++- + drivers/power/supply/axp20x_usb_power.c | 2 +- + drivers/power/supply/bq24735-charger.c | 6 +- + drivers/power/supply/bq27xxx_battery.c | 536 +++++++++++++- + drivers/power/supply/bq27xxx_battery_i2c.c | 82 ++- + drivers/power/supply/cpcap-battery.c | 808 +++++++++++++++++++++ + drivers/power/supply/cpcap-charger.c | 89 ++- + drivers/power/supply/ltc3651-charger.c | 210 ++++++ + drivers/power/supply/power_supply_core.c | 83 ++- + drivers/power/supply/power_supply_sysfs.c | 125 +++- + drivers/power/supply/sbs-battery.c | 29 +- + drivers/power/supply/twl4030_charger.c | 97 +-- + include/linux/power/bq27xxx_battery.h | 6 + + include/linux/power_supply.h | 40 +- + .../power/reset => include/linux}/reboot-mode.h | 0 + 31 files changed, 2204 insertions(+), 233 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/battery.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/cpcap-battery.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt + rename Documentation/devicetree/bindings/power/{ => supply}/max8903-charger.txt (100%) + rename Documentation/devicetree/bindings/{power_supply => power/supply}/maxim,max14656.txt (100%) + create mode 100644 drivers/power/supply/cpcap-battery.c + create mode 100644 drivers/power/supply/ltc3651-charger.c + rename {drivers/power/reset => include/linux}/reboot-mode.h (100%) +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 (142bd4193b98 Merge remote-tracking branches 'regulator/topic/settle', 'regulator/topic/tps65910' and 'regulator/topic/tps65917' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/tps65910.txt | 4 + + .../devicetree/bindings/regulator/regulator.txt | 8 + + MAINTAINERS | 6 +- + drivers/mfd/tps65910.c | 22 +- + drivers/regulator/Kconfig | 22 +- + drivers/regulator/Makefile | 2 + + drivers/regulator/axp20x-regulator.c | 153 +++++++++-- + drivers/regulator/bd9571mwv-regulator.c | 12 +- + drivers/regulator/core.c | 16 +- + drivers/regulator/da9062-regulator.c | 303 ++++++++++++++++++++- + drivers/regulator/hi6421-regulator.c | 7 + + drivers/regulator/hi6421v530-regulator.c | 214 +++++++++++++++ + drivers/regulator/lp8755.c | 14 +- + drivers/regulator/lp87565-regulator.c | 236 ++++++++++++++++ + drivers/regulator/max8997-regulator.c | 9 +- + drivers/regulator/of_regulator.c | 19 ++ + drivers/regulator/palmas-regulator.c | 20 +- + drivers/regulator/tps65910-regulator.c | 5 +- + include/linux/mfd/axp20x.h | 37 +++ + include/linux/mfd/palmas.h | 2 + + include/linux/mfd/tps65910.h | 2 +- + include/linux/regulator/machine.h | 6 + + 22 files changed, 1042 insertions(+), 77 deletions(-) + create mode 100644 drivers/regulator/hi6421v530-regulator.c + create mode 100644 drivers/regulator/lp87565-regulator.c +Merging security/next (33f2eadabba5 apparmor: export that basic profile namespaces are supported) +$ git merge security/next +Auto-merging security/apparmor/policy_unpack.c +Merge made by the 'recursive' strategy. + include/linux/security.h | 12 + + include/uapi/linux/magic.h | 2 + + security/Kconfig | 2 +- + security/apparmor/Makefile | 8 +- + security/apparmor/apparmorfs.c | 1676 ++++++++++++++++++----- + security/apparmor/audit.c | 27 +- + security/apparmor/capability.c | 61 +- + security/apparmor/context.c | 87 +- + security/apparmor/domain.c | 1393 ++++++++++++------- + security/apparmor/file.c | 517 +++++-- + security/apparmor/include/apparmor.h | 6 +- + security/apparmor/include/apparmorfs.h | 67 +- + security/apparmor/include/audit.h | 17 +- + security/apparmor/include/capability.h | 8 +- + security/apparmor/include/context.h | 201 +-- + security/apparmor/include/domain.h | 13 +- + security/apparmor/include/file.h | 114 +- + security/apparmor/include/ipc.h | 16 +- + security/apparmor/include/label.h | 441 ++++++ + security/apparmor/include/lib.h | 120 +- + security/apparmor/include/path.h | 7 +- + security/apparmor/include/perms.h | 155 +++ + security/apparmor/include/policy.h | 131 +- + security/apparmor/include/policy_ns.h | 21 + + security/apparmor/include/policy_unpack.h | 68 +- + security/apparmor/include/procattr.h | 8 +- + security/apparmor/include/resource.h | 6 +- + security/apparmor/ipc.c | 140 +- + security/apparmor/label.c | 2120 +++++++++++++++++++++++++++++ + security/apparmor/lib.c | 368 ++++- + security/apparmor/lsm.c | 245 ++-- + security/apparmor/path.c | 130 +- + security/apparmor/policy.c | 392 +++--- + security/apparmor/policy_ns.c | 80 +- + security/apparmor/policy_unpack.c | 96 +- + security/apparmor/procattr.c | 71 +- + security/apparmor/resource.c | 116 +- + security/inode.c | 144 +- + security/security.c | 19 + + 39 files changed, 7295 insertions(+), 1810 deletions(-) + create mode 100644 security/apparmor/include/label.h + create mode 100644 security/apparmor/include/perms.h + create mode 100644 security/apparmor/label.c +Merging integrity/next (a2d9fa811f05 IMA: update IMA policy documentation to include pcr= option) +$ git merge integrity/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 8 +- + Documentation/admin-guide/kernel-parameters.txt | 21 ++-- + include/linux/ima.h | 6 ++ + security/integrity/digsig_asymmetric.c | 4 +- + security/integrity/iint.c | 2 +- + security/integrity/ima/Kconfig | 16 ++- + security/integrity/ima/ima.h | 31 +++--- + security/integrity/ima/ima_appraise.c | 16 ++- + security/integrity/ima/ima_fs.c | 13 +-- + security/integrity/ima/ima_policy.c | 106 +++++++++----------- + security/integrity/ima/ima_queue.c | 2 +- + security/integrity/ima/ima_template.c | 124 ++++++++---------------- + security/integrity/ima/ima_template_lib.c | 61 ++++++++++++ + security/integrity/ima/ima_template_lib.h | 6 ++ + security/integrity/integrity.h | 7 +- + 15 files changed, 239 insertions(+), 184 deletions(-) +Merging keys/keys-next (3088c2ad40cf Merge remote-tracking branch 'origin/keys-fixes' into keys-next) +$ git merge keys/keys-next +Resolved 'security/keys/dh.c' using previous resolution. +Auto-merging security/keys/dh.c +CONFLICT (content): Merge conflict in security/keys/dh.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b7c688d6bd9f] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. +Merging selinux/next (0b4d3452b8b4 security/selinux: allow security_sb_clone_mnt_opts to enable/disable native labeling behavior) +$ git merge selinux/next +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging fs/nfs/super.c +Auto-merging drivers/infiniband/core/core_priv.h +Merge made by the 'recursive' strategy. + 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 | 705 +++++++++++++++++++++++++++++++++++ + drivers/infiniband/core/uverbs_cmd.c | 15 +- + drivers/infiniband/core/verbs.c | 27 +- + fs/nfs/super.c | 17 +- + include/linux/lsm_audit.h | 15 + + include/linux/lsm_hooks.h | 39 +- + include/linux/security.h | 58 ++- + include/rdma/ib_mad.h | 4 + + include/rdma/ib_verbs.h | 49 +++ + security/Kconfig | 9 + + security/lsm_audit.c | 16 + + security/security.c | 55 ++- + security/selinux/Makefile | 2 +- + security/selinux/hooks.c | 211 +++++++++-- + 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/ebitmap.c | 26 +- + security/selinux/ss/ebitmap.h | 3 + + security/selinux/ss/policydb.c | 127 +++++-- + security/selinux/ss/policydb.h | 27 +- + security/selinux/ss/services.c | 108 ++++++ + security/selinux/ss/sidtab.c | 27 +- + 31 files changed, 2027 insertions(+), 129 deletions(-) + create mode 100644 drivers/infiniband/core/security.c + create mode 100644 security/selinux/ibpkey.c + create mode 100644 security/selinux/include/ibpkey.h +Merging tpmdd/next (d8b5d94538eb tpm: vtpm_proxy: Prevent userspace from sending driver command) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-interface.c | 118 +++++++++++++----------- + drivers/char/tpm/tpm-sysfs.c | 6 +- + drivers/char/tpm/tpm.h | 22 +---- + drivers/char/tpm/tpm2-cmd.c | 2 +- + drivers/char/tpm/tpm_i2c_infineon.c | 76 +++++++++++----- + drivers/char/tpm/tpm_infineon.c | 8 +- + drivers/char/tpm/tpm_tis.c | 175 ++++++++++++------------------------ + drivers/char/tpm/tpm_vtpm_proxy.c | 69 ++++++++++++++ + drivers/char/tpm/tpmrm-dev.c | 2 +- + include/uapi/linux/vtpm_proxy.h | 4 + + 10 files changed, 262 insertions(+), 220 deletions(-) +Merging watchdog/master (3a9aedb282ac watchdog: w83627hf: Add support for NCT6793D and NCT6795D) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/da9062-wdt.txt | 23 ++ + .../devicetree/bindings/watchdog/renesas-wdt.txt | 4 +- + .../devicetree/bindings/watchdog/st,stm32-iwdg.txt | 19 ++ + drivers/watchdog/Kconfig | 38 +++- + drivers/watchdog/Makefile | 2 + + drivers/watchdog/f71808e_wdt.c | 27 ++- + drivers/watchdog/gpio_wdt.c | 73 ++---- + drivers/watchdog/intel-mid_wdt.c | 17 +- + drivers/watchdog/orion_wdt.c | 2 +- + drivers/watchdog/rza_wdt.c | 199 ++++++++++++++++ + drivers/watchdog/s3c2410_wdt.c | 58 +++-- + drivers/watchdog/sama5d4_wdt.c | 19 +- + drivers/watchdog/stm32_iwdg.c | 253 +++++++++++++++++++++ + drivers/watchdog/w83627hf_wdt.c | 15 +- + drivers/watchdog/watchdog_dev.c | 19 +- + 15 files changed, 650 insertions(+), 118 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/da9062-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.txt + create mode 100644 drivers/watchdog/rza_wdt.c + create mode 100644 drivers/watchdog/stm32_iwdg.c +Merging iommu/next (56d95945c7e8 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/core', 'x86/vt-d' and 'x86/amd' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/Kconfig | 4 +- + drivers/iommu/amd_iommu.c | 449 +++++++++++++++++++++++------------- + drivers/iommu/amd_iommu_init.c | 2 + + drivers/iommu/amd_iommu_types.h | 2 + + drivers/iommu/dma-iommu.c | 2 +- + drivers/iommu/intel-iommu.c | 16 +- + drivers/iommu/intel-svm.c | 30 +++ + drivers/iommu/intel_irq_remapping.c | 4 +- + drivers/iommu/iova.c | 21 +- + drivers/iommu/ipmmu-vmsa.c | 353 +++++++++++++++++++++++----- + include/linux/intel-svm.h | 20 ++ + 11 files changed, 650 insertions(+), 253 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 (7b3a10df1d4b vfio: Use ERR_CAST() instead of open coding it) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 4 ++-- + drivers/vfio/vfio.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver()) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (e4c1a0d15b62 audit: style fix) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + kernel/audit.c | 20 ++++---------------- + kernel/audit.h | 29 +++++++++++++++-------------- + kernel/auditsc.c | 12 +++++++++--- + 3 files changed, 28 insertions(+), 33 deletions(-) +Merging devicetree/for-next (acedeb509830 MAINTAINERS: add device tree ABI documentation file) +$ git merge devicetree/for-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/graph.txt | 13 ++++++------- + Documentation/devicetree/bindings/iio/proximity/as3935.txt | 2 ++ + .../bindings/{powerpc/fsl/fman.txt => net/fsl-fman.txt} | 0 + .../devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt | 2 +- + Documentation/devicetree/bindings/vendor-prefixes.txt | 4 ++++ + MAINTAINERS | 1 + + drivers/of/irq.c | 5 ++++- + include/linux/of.h | 6 ++++++ + 8 files changed, 24 insertions(+), 9 deletions(-) + rename Documentation/devicetree/bindings/{powerpc/fsl/fman.txt => net/fsl-fman.txt} (100%) +Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../bindings/mailbox/qcom,apcs-kpss-global.txt | 46 ++++++++ + drivers/mailbox/Kconfig | 8 ++ + drivers/mailbox/Makefile | 2 + + drivers/mailbox/mailbox.c | 16 ++- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 129 +++++++++++++++++++++ + 5 files changed, 195 insertions(+), 6 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt + create mode 100644 drivers/mailbox/qcom-apcs-ipc-mailbox.c +Merging spi/for-next (2b37bbbc6291 Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/sh-msiof', 'spi/topic/spidev' and 'spi/topic/st-ssc4' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 + + Documentation/devicetree/bindings/spi/spi-bus.txt | 76 +- + .../devicetree/bindings/spi/spi-meson.txt | 31 + + .../devicetree/bindings/spi/spi-mt65xx.txt | 1 + + Documentation/spi/spi-summary | 27 +- + drivers/spi/Kconfig | 34 +- + drivers/spi/Makefile | 5 + + drivers/spi/spi-atmel.c | 6 +- + drivers/spi/spi-bcm63xx-hsspi.c | 1 + + drivers/spi/spi-davinci.c | 9 +- + drivers/spi/spi-fsl-dspi.c | 3 +- + drivers/spi/spi-imx.c | 86 +- + drivers/spi/spi-meson-spicc.c | 619 ++++++++++ + drivers/spi/spi-mt65xx.c | 54 +- + drivers/spi/spi-omap2-mcspi.c | 3 - + drivers/spi/spi-orion.c | 10 +- + drivers/spi/spi-pxa2xx.c | 22 + + drivers/spi/spi-rockchip.c | 27 +- + drivers/spi/spi-sh-msiof.c | 111 +- + drivers/spi/spi-slave-system-control.c | 154 +++ + drivers/spi/spi-slave-time.c | 129 +++ + drivers/spi/spi-st-ssc4.c | 38 +- + drivers/spi/spi.c | 1220 +++++++++++--------- + drivers/spi/spidev.c | 11 +- + include/linux/platform_data/spi-mt65xx.h | 2 + + include/linux/pxa2xx_ssp.h | 1 + + include/linux/spi/sh_msiof.h | 6 + + include/linux/spi/spi.h | 217 ++-- + include/trace/events/spi.h | 26 +- + 29 files changed, 2110 insertions(+), 821 deletions(-) + create mode 100644 drivers/spi/spi-meson-spicc.c + create mode 100644 drivers/spi/spi-slave-system-control.c + create mode 100644 drivers/spi/spi-slave-time.c +Merging tip/auto-latest (8b613ccb9d93 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Resolved 'arch/unicore32/include/asm/Kbuild' using previous resolution. +Recorded preimage for 'drivers/acpi/apei/ghes.c' +Auto-merging tools/testing/selftests/rcutorture/configs/rcuperf/TINY +Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T +Removing tools/lib/lockdep/uinclude/trace/events/lock.h +Removing tools/lib/lockdep/uinclude/linux/stringify.h +Removing tools/lib/lockdep/uinclude/linux/spinlock.h +Removing tools/lib/lockdep/uinclude/linux/seq_file.h +Removing tools/lib/lockdep/uinclude/linux/rbtree_augmented.h +Removing tools/lib/lockdep/uinclude/linux/proc_fs.h +Removing tools/lib/lockdep/uinclude/linux/prefetch.h +Removing tools/lib/lockdep/uinclude/linux/poison.h +Removing tools/lib/lockdep/uinclude/linux/mutex.h +Removing tools/lib/lockdep/uinclude/linux/list.h +Removing tools/lib/lockdep/uinclude/linux/linkage.h +Removing tools/lib/lockdep/uinclude/linux/kernel.h +Removing tools/lib/lockdep/uinclude/linux/interrupt.h +Removing tools/lib/lockdep/uinclude/linux/hash.h +Removing tools/lib/lockdep/uinclude/linux/gfp.h +Removing tools/lib/lockdep/uinclude/linux/ftrace.h +Removing tools/lib/lockdep/uinclude/linux/delay.h +Removing tools/lib/lockdep/uinclude/linux/compiler.h +Removing tools/lib/lockdep/uinclude/linux/bitops.h +Removing tools/lib/lockdep/uinclude/asm/sections.h +Removing tools/lib/lockdep/uinclude/asm/hweight.h +Removing tools/lib/lockdep/uinclude/asm/hash.h +Auto-merging tools/include/linux/rcu.h +Auto-merging tools/include/linux/module.h +Auto-merging tools/include/linux/lockdep.h +Auto-merging tools/include/linux/kallsyms.h +Auto-merging tools/include/linux/irqflags.h +Auto-merging tools/include/linux/debug_locks.h +Auto-merging scripts/checkpatch.pl +Auto-merging lib/Kconfig.debug +Removing kernel/rcu/tree_trace.c +Removing kernel/rcu/srcu.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/irq/irqdesc.c +Auto-merging kernel/irq/chip.c +Auto-merging kernel/events/core.c +Removing include/linux/srcuclassic.h +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/compiler.h +Removing include/asm-generic/siginfo.h +Auto-merging drivers/ras/ras.c +Auto-merging drivers/iommu/intel-iommu.c +Removing drivers/char/mmtimer.c +Auto-merging drivers/acpi/apei/ghes.c +CONFLICT (content): Merge conflict in drivers/acpi/apei/ghes.c +Removing arch/x86/ras/mce_amd_inj.c +Removing arch/x86/ras/Makefile +Auto-merging arch/x86/power/hibernate_64.c +Removing arch/x86/mm/gup.c +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging arch/unicore32/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild +Removing arch/sparc/include/asm/siginfo.h +Removing arch/score/include/uapi/asm/siginfo.h +Auto-merging arch/powerpc/Kconfig +Removing arch/mn10300/include/uapi/asm/siginfo.h +Removing arch/m32r/include/uapi/asm/siginfo.h +Removing arch/ia64/include/asm/siginfo.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Removing Documentation/RCU/trace.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/acpi/apei/ghes.c'. +[master fb72076417dc] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/IRQ-domain.txt | 41 +- + 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 | 50 +- + 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/scheduler/sched-deadline.txt | 168 ++++ + Documentation/timers/NO_HZ.txt | 29 +- + Documentation/x86/x86_64/boot-options.txt | 3 +- + MAINTAINERS | 11 +- + arch/arc/include/asm/Kbuild | 1 - + arch/arc/include/uapi/asm/Kbuild | 2 + + arch/arm/Kconfig | 19 +- + arch/arm/include/asm/Kbuild | 1 - + arch/arm/include/asm/dmi.h | 19 + + arch/arm/include/uapi/asm/Kbuild | 2 + + arch/arm/kernel/hw_breakpoint.c | 11 +- + arch/arm/kernel/patch.c | 2 +- + arch/arm/kernel/smp.c | 3 +- + arch/arm/probes/kprobes/core.c | 3 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/insn.h | 1 - + arch/arm64/kernel/efi.c | 15 - + arch/arm64/kernel/insn.c | 5 +- + arch/arm64/kernel/smp.c | 3 +- + arch/c6x/include/asm/Kbuild | 1 - + arch/c6x/include/uapi/asm/Kbuild | 1 + + arch/cris/include/asm/Kbuild | 1 - + arch/cris/include/uapi/asm/Kbuild | 2 + + arch/h8300/include/asm/Kbuild | 1 - + arch/h8300/include/uapi/asm/Kbuild | 2 + + arch/hexagon/include/asm/Kbuild | 1 - + arch/hexagon/include/uapi/asm/Kbuild | 2 + + arch/ia64/include/asm/siginfo.h | 23 - + arch/ia64/include/uapi/asm/siginfo.h | 1 - + arch/m32r/include/uapi/asm/Kbuild | 2 + + arch/m32r/include/uapi/asm/siginfo.h | 6 - + arch/m68k/include/asm/Kbuild | 1 - + arch/m68k/include/uapi/asm/Kbuild | 1 + + arch/metag/kernel/smp.c | 3 +- + arch/microblaze/include/uapi/asm/Kbuild | 1 + + arch/mips/kernel/jump_label.c | 2 - + arch/mn10300/include/uapi/asm/Kbuild | 2 + + arch/mn10300/include/uapi/asm/siginfo.h | 1 - + arch/nios2/include/asm/Kbuild | 1 - + arch/nios2/include/uapi/asm/Kbuild | 1 + + arch/openrisc/include/asm/Kbuild | 1 - + arch/openrisc/include/uapi/asm/Kbuild | 2 + + arch/powerpc/Kconfig | 2 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 14 +- + arch/powerpc/platforms/powernv/subcore.c | 7 +- + arch/s390/kernel/jump_label.c | 2 +- + arch/s390/kernel/kprobes.c | 4 +- + arch/s390/kernel/time.c | 6 +- + arch/score/include/uapi/asm/Kbuild | 2 + + arch/score/include/uapi/asm/siginfo.h | 6 - + arch/sh/include/asm/Kbuild | 1 - + arch/sh/include/uapi/asm/Kbuild | 2 + + arch/sparc/include/asm/siginfo.h | 13 - + arch/sparc/kernel/jump_label.c | 2 - + arch/tile/kernel/jump_label.c | 2 - + arch/tile/lib/atomic_asm_32.S | 3 +- + arch/unicore32/include/asm/Kbuild | 1 - + arch/unicore32/include/uapi/asm/Kbuild | 1 + + arch/x86/Kconfig | 7 +- + arch/x86/Makefile | 2 - + arch/x86/boot/compressed/cmdline.c | 2 +- + arch/x86/boot/compressed/eboot.c | 73 +- + arch/x86/boot/compressed/head_64.S | 86 ++- + arch/x86/boot/compressed/kaslr.c | 191 +++-- + arch/x86/boot/compressed/pagetable.c | 2 +- + arch/x86/boot/copy.S | 20 - + arch/x86/boot/string.c | 8 + + arch/x86/entry/entry_64.S | 3 +- + arch/x86/events/core.c | 28 +- + arch/x86/events/intel/core.c | 74 +- + arch/x86/events/intel/cqm.c | 16 +- + arch/x86/events/perf_event.h | 3 + + arch/x86/include/asm/amd_nb.h | 3 +- + arch/x86/include/asm/atomic.h | 13 - + arch/x86/include/asm/efi.h | 2 +- + arch/x86/include/asm/extable.h | 1 + + arch/x86/include/asm/hardirq.h | 2 +- + arch/x86/include/asm/mce.h | 4 - + arch/x86/include/asm/mmu.h | 6 - + arch/x86/include/asm/mmu_context.h | 37 +- + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/include/asm/paravirt.h | 8 +- + arch/x86/include/asm/paravirt_types.h | 5 +- + arch/x86/include/asm/pgtable-3level.h | 47 ++ + arch/x86/include/asm/pgtable.h | 55 +- + arch/x86/include/asm/pgtable_64.h | 22 +- + arch/x86/include/asm/processor-flags.h | 36 + + arch/x86/include/asm/processor.h | 13 + + arch/x86/include/asm/setup.h | 1 - + arch/x86/include/asm/special_insns.h | 10 +- + arch/x86/include/asm/timer.h | 8 +- + arch/x86/include/asm/tlbbatch.h | 14 + + arch/x86/include/asm/tlbflush.h | 118 +-- + arch/x86/include/asm/uv/uv.h | 11 +- + arch/x86/include/uapi/asm/processor-flags.h | 2 + + arch/x86/kernel/apic/apic.c | 80 ++ + arch/x86/kernel/apic/io_apic.c | 22 - + arch/x86/kernel/cpu/mcheck/dev-mcelog.c | 47 +- + arch/x86/kernel/cpu/mcheck/mce-inject.c | 569 ++++++++++++-- + arch/x86/kernel/cpu/mcheck/mce-internal.h | 6 +- + arch/x86/kernel/cpu/mcheck/mce.c | 10 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 273 +++---- + arch/x86/kernel/cpu/mtrr/main.c | 2 - + arch/x86/kernel/espfix_64.c | 2 +- + arch/x86/kernel/head64.c | 143 +++- + arch/x86/kernel/head_64.S | 131 +--- + arch/x86/kernel/jump_label.c | 2 - + arch/x86/kernel/ldt.c | 56 +- + arch/x86/kernel/machine_kexec_64.c | 2 +- + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 4 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/step.c | 2 +- + arch/x86/kernel/time.c | 2 +- + arch/x86/kernel/traps.c | 2 +- + arch/x86/kernel/tsc.c | 206 ++--- + arch/x86/kernel/tsc_sync.c | 21 +- + arch/x86/kvm/vmx.c | 21 +- + arch/x86/math-emu/fpu_system.h | 2 +- + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/dump_pagetables.c | 2 +- + arch/x86/mm/extable.c | 3 + + arch/x86/mm/fault.c | 10 +- + arch/x86/mm/gup.c | 496 ------------ + arch/x86/mm/init.c | 10 +- + arch/x86/mm/init_64.c | 108 ++- + arch/x86/mm/ioremap.c | 2 +- + arch/x86/mm/kasan_init_64.c | 12 +- + arch/x86/mm/kaslr.c | 81 +- + arch/x86/mm/tlb.c | 437 +++++------ + arch/x86/platform/efi/efi.c | 3 +- + arch/x86/platform/efi/efi_32.c | 9 +- + arch/x86/platform/efi/efi_64.c | 9 +- + arch/x86/platform/efi/quirks.c | 137 ++++ + arch/x86/platform/olpc/olpc-xo1-pm.c | 2 +- + arch/x86/platform/uv/tlb_uv.c | 24 +- + arch/x86/power/cpu.c | 2 +- + arch/x86/power/hibernate_64.c | 3 +- + arch/x86/ras/Kconfig | 11 - + arch/x86/ras/Makefile | 2 - + arch/x86/ras/mce_amd_inj.c | 492 ------------ + arch/x86/realmode/init.c | 2 +- + arch/x86/xen/mmu_pv.c | 83 +- + arch/x86/xen/xen-pvh.S | 2 +- + arch/xtensa/include/asm/Kbuild | 1 - + arch/xtensa/include/uapi/asm/Kbuild | 1 + + drivers/acpi/apei/ghes.c | 39 +- + drivers/acpi/pci_root.c | 2 +- + drivers/acpi/processor_driver.c | 4 +- + drivers/acpi/processor_throttling.c | 16 +- + drivers/base/node.c | 2 +- + drivers/char/Kconfig | 9 - + drivers/char/Makefile | 1 - + drivers/char/mmtimer.c | 858 --------------------- + drivers/cpufreq/cpufreq.c | 21 +- + drivers/cpufreq/pasemi-cpufreq.c | 2 +- + drivers/cpuidle/cpuidle.c | 1 + + drivers/firmware/efi/Kconfig | 9 + + drivers/firmware/efi/arm-runtime.c | 16 + + drivers/firmware/efi/capsule-loader.c | 117 ++- + drivers/firmware/efi/capsule.c | 11 +- + drivers/firmware/efi/test/efi_test.c | 11 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 20 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 20 +- + drivers/iommu/intel-iommu.c | 4 +- + drivers/iommu/of_iommu.c | 2 +- + drivers/pci/pci-driver.c | 47 +- + drivers/ras/ras.c | 2 +- + drivers/xen/manage.c | 1 + + include/asm-generic/siginfo.h | 22 - + include/linux/bcm47xx_nvram.h | 1 + + include/linux/clocksource.h | 1 + + include/linux/compat.h | 8 + + include/linux/compiler.h | 4 - + include/linux/cpu.h | 36 +- + include/linux/cpuhotplug.h | 38 + + include/linux/cpumask.h | 28 + + include/linux/efi.h | 14 +- + include/linux/hrtimer.h | 6 +- + include/linux/irq.h | 6 + + include/linux/kernel.h | 6 +- + include/linux/llist.h | 19 + + include/linux/mm_types_task.h | 15 +- + include/linux/padata.h | 3 - + include/linux/pci.h | 1 + + include/linux/perf_event.h | 2 + + include/linux/posix-clock.h | 22 - + include/linux/posix-timers.h | 105 ++- + 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/restart_block.h | 15 +- + include/linux/rtmutex.h | 25 +- + include/linux/sched.h | 32 +- + include/linux/sched/clock.h | 11 +- + include/linux/signal.h | 7 +- + include/linux/spinlock.h | 20 + + include/linux/srcu.h | 25 +- + include/linux/srcuclassic.h | 115 --- + include/linux/srcutiny.h | 47 +- + include/linux/srcutree.h | 13 +- + include/linux/stop_machine.h | 26 +- + include/linux/vm_event_item.h | 2 - + include/trace/events/rcu.h | 1 + + include/uapi/asm-generic/siginfo.h | 15 +- + include/uapi/linux/sched.h | 1 + + include/uapi/linux/time.h | 6 +- + init/Kconfig | 349 +-------- + init/main.c | 27 +- + kernel/async.c | 8 +- + kernel/compat.c | 526 ++----------- + kernel/cpu.c | 237 +++--- + kernel/events/core.c | 136 ++-- + kernel/extable.c | 2 +- + kernel/irq/chip.c | 83 +- + kernel/irq/irqdesc.c | 5 +- + kernel/irq/irqdomain.c | 81 +- + kernel/irq/manage.c | 28 +- + kernel/irq/msi.c | 10 +- + kernel/jump_label.c | 20 +- + kernel/kprobes.c | 59 +- + kernel/locking/lockdep.c | 176 +++-- + kernel/locking/rtmutex-debug.c | 6 +- + kernel/locking/rtmutex-debug.h | 2 +- + kernel/locking/rtmutex.c | 36 +- + kernel/locking/rtmutex.h | 2 +- + kernel/padata.c | 43 +- + kernel/printk/printk.c | 2 +- + 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 | 661 ---------------- + kernel/rcu/srcutiny.c | 86 +-- + kernel/rcu/srcutree.c | 187 +++-- + kernel/rcu/tiny.c | 54 +- + kernel/rcu/tiny_plugin.h | 123 --- + kernel/rcu/tree.c | 195 ++--- + kernel/rcu/tree.h | 109 +-- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 573 +++----------- + kernel/rcu/tree_trace.c | 494 ------------ + kernel/rcu/update.c | 77 +- + kernel/sched/Makefile | 4 +- + kernel/sched/clock.c | 128 ++- + kernel/sched/core.c | 175 ++--- + kernel/sched/deadline.c | 550 +++++++++++-- + kernel/sched/fair.c | 174 +++-- + kernel/sched/features.h | 2 +- + kernel/sched/idle.c | 1 + + kernel/sched/rt.c | 13 +- + kernel/sched/sched.h | 89 ++- + kernel/sched/topology.c | 430 ++++++++--- + kernel/signal.c | 3 +- + kernel/smp.c | 16 +- + kernel/stop_machine.c | 11 +- + kernel/time/Kconfig | 50 -- + kernel/time/alarmtimer.c | 377 ++++----- + kernel/time/clocksource.c | 3 + + kernel/time/hrtimer.c | 106 ++- + kernel/time/itimer.c | 38 + + kernel/time/posix-clock.c | 117 +-- + kernel/time/posix-cpu-timers.c | 141 ++-- + kernel/time/posix-stubs.c | 112 ++- + kernel/time/posix-timers.c | 759 +++++++++++------- + kernel/time/posix-timers.h | 40 + + kernel/time/tick-broadcast.c | 4 +- + kernel/time/tick-internal.h | 2 - + kernel/time/tick-sched.c | 65 +- + kernel/time/tick-sched.h | 2 + + kernel/time/time.c | 106 ++- + lib/Kconfig.debug | 187 +---- + lib/Makefile | 3 - + lib/cpumask.c | 32 + + lib/locking-selftest-rtmutex.h | 11 + + lib/locking-selftest.c | 133 +++- + lib/smp_processor_id.c | 2 +- + mm/Kconfig | 2 +- + mm/gup.c | 10 +- + mm/rmap.c | 16 +- + mm/vmscan.c | 2 +- + scripts/checkpatch.pl | 17 - + tools/Makefile | 8 +- + tools/include/asm/sections.h | 4 + + tools/include/linux/bitops.h | 10 + + tools/include/linux/compiler.h | 12 + + .../uinclude => include}/linux/debug_locks.h | 3 +- + tools/include/linux/delay.h | 4 + + tools/include/linux/err.h | 5 + + tools/include/linux/ftrace.h | 4 + + tools/include/linux/gfp.h | 4 + + .../lockdep/uinclude => include}/linux/hardirq.h | 0 + tools/include/linux/interrupt.h | 4 + + .../lockdep/uinclude => include}/linux/irqflags.h | 8 +- + tools/include/linux/jhash.h | 175 +++++ + .../lockdep/uinclude => include}/linux/kallsyms.h | 3 +- + .../uinclude => include}/linux/kern_levels.h | 0 + tools/include/linux/kernel.h | 4 + + .../lockdep/uinclude => include}/linux/kmemcheck.h | 0 + tools/include/linux/linkage.h | 4 + + .../lockdep/uinclude => include}/linux/lockdep.h | 34 +- + .../lockdep/uinclude => include}/linux/module.h | 5 + + tools/include/linux/mutex.h | 4 + + tools/include/linux/proc_fs.h | 4 + + .../{lib/lockdep/uinclude => include}/linux/rcu.h | 3 + + tools/include/linux/sched/clock.h | 4 + + tools/include/linux/sched/mm.h | 4 + + tools/include/linux/sched/task.h | 4 + + tools/include/linux/seq_file.h | 4 + + tools/include/linux/spinlock.h | 26 + + .../uinclude => include}/linux/stacktrace.h | 0 + tools/include/linux/unaligned/packed_struct.h | 46 ++ + tools/include/trace/events/lock.h | 4 + + tools/lib/lockdep/Makefile | 9 +- + tools/lib/lockdep/lockdep.c | 19 + + tools/lib/lockdep/preload.c | 5 +- + tools/lib/lockdep/rbtree.c | 2 +- + tools/lib/lockdep/run_tests.sh | 8 +- + tools/lib/lockdep/uinclude/asm/hash.h | 6 - + tools/lib/lockdep/uinclude/asm/hweight.h | 3 - + tools/lib/lockdep/uinclude/asm/sections.h | 3 - + tools/lib/lockdep/uinclude/linux/bitops.h | 3 - + tools/lib/lockdep/uinclude/linux/compiler.h | 10 - + tools/lib/lockdep/uinclude/linux/delay.h | 3 - + tools/lib/lockdep/uinclude/linux/ftrace.h | 3 - + tools/lib/lockdep/uinclude/linux/gfp.h | 3 - + tools/lib/lockdep/uinclude/linux/hash.h | 1 - + tools/lib/lockdep/uinclude/linux/interrupt.h | 3 - + tools/lib/lockdep/uinclude/linux/kernel.h | 47 -- + tools/lib/lockdep/uinclude/linux/linkage.h | 3 - + tools/lib/lockdep/uinclude/linux/list.h | 1 - + tools/lib/lockdep/uinclude/linux/mutex.h | 3 - + tools/lib/lockdep/uinclude/linux/poison.h | 1 - + tools/lib/lockdep/uinclude/linux/prefetch.h | 6 - + tools/lib/lockdep/uinclude/linux/proc_fs.h | 3 - + .../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 - + tools/lib/lockdep/uinclude/linux/seq_file.h | 3 - + tools/lib/lockdep/uinclude/linux/spinlock.h | 25 - + tools/lib/lockdep/uinclude/linux/stringify.h | 7 - + tools/lib/lockdep/uinclude/trace/events/lock.h | 3 - + .../selftests/rcutorture/bin/configcheck.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 2 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 5 +- + .../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 +- + 388 files changed, 8066 insertions(+), 9833 deletions(-) + delete mode 100644 Documentation/RCU/trace.txt + create mode 100644 arch/arm/include/asm/dmi.h + delete mode 100644 arch/ia64/include/asm/siginfo.h + delete mode 100644 arch/m32r/include/uapi/asm/siginfo.h + delete mode 100644 arch/mn10300/include/uapi/asm/siginfo.h + delete mode 100644 arch/score/include/uapi/asm/siginfo.h + delete mode 100644 arch/sparc/include/asm/siginfo.h + create mode 100644 arch/x86/include/asm/tlbbatch.h + delete mode 100644 arch/x86/mm/gup.c + delete mode 100644 arch/x86/ras/Makefile + delete mode 100644 arch/x86/ras/mce_amd_inj.c + delete mode 100644 drivers/char/mmtimer.c + delete mode 100644 include/asm-generic/siginfo.h + 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 100644 kernel/time/posix-timers.h + create mode 100644 lib/locking-selftest-rtmutex.h + create mode 100644 tools/include/asm/sections.h + rename tools/{lib/lockdep/uinclude => include}/linux/debug_locks.h (74%) + create mode 100644 tools/include/linux/delay.h + create mode 100644 tools/include/linux/ftrace.h + create mode 100644 tools/include/linux/gfp.h + rename tools/{lib/lockdep/uinclude => include}/linux/hardirq.h (100%) + create mode 100644 tools/include/linux/interrupt.h + rename tools/{lib/lockdep/uinclude => include}/linux/irqflags.h (84%) + create mode 100644 tools/include/linux/jhash.h + rename tools/{lib/lockdep/uinclude => include}/linux/kallsyms.h (89%) + rename tools/{lib/lockdep/uinclude => include}/linux/kern_levels.h (100%) + rename tools/{lib/lockdep/uinclude => include}/linux/kmemcheck.h (100%) + create mode 100644 tools/include/linux/linkage.h + rename tools/{lib/lockdep/uinclude => include}/linux/lockdep.h (63%) + rename tools/{lib/lockdep/uinclude => include}/linux/module.h (51%) + create mode 100644 tools/include/linux/mutex.h + create mode 100644 tools/include/linux/proc_fs.h + rename tools/{lib/lockdep/uinclude => include}/linux/rcu.h (76%) + create mode 100644 tools/include/linux/sched/clock.h + create mode 100644 tools/include/linux/sched/mm.h + create mode 100644 tools/include/linux/sched/task.h + create mode 100644 tools/include/linux/seq_file.h + rename tools/{lib/lockdep/uinclude => include}/linux/stacktrace.h (100%) + create mode 100644 tools/include/linux/unaligned/packed_struct.h + create mode 100644 tools/include/trace/events/lock.h + delete mode 100644 tools/lib/lockdep/uinclude/asm/hash.h + delete mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h + delete mode 100644 tools/lib/lockdep/uinclude/asm/sections.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/delay.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/hash.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/list.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/poison.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h + delete mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h + delete mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h + 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 clockevents/clockevents/next (d9569035d594 clocksource: Add an alias macro CLOCKSOURCE_OF_DECLARE) +$ git merge clockevents/clockevents/next +Auto-merging include/linux/clocksource.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/clocksource/timer-probe.c +Removing drivers/clocksource/moxart_timer.c +Removing drivers/clocksource/clkevt-probe.c +Auto-merging arch/mips/generic/init.c +Auto-merging arch/microblaze/kernel/timer.c +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/mach-s3c64xx/Kconfig +Auto-merging arch/arm/mach-rockchip/rockchip.c +Auto-merging arch/arm/mach-omap2/timer.c +Auto-merging arch/arm/Kconfig +Removing Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/faraday,fttmr010.txt | 6 +- + .../bindings/timer/moxa,moxart-timer.txt | 19 - + arch/arc/kernel/setup.c | 2 +- + arch/arm/Kconfig | 10 +- + arch/arm/kernel/smp_twd.c | 6 +- + arch/arm/kernel/time.c | 2 +- + arch/arm/mach-aspeed/Kconfig | 2 +- + arch/arm/mach-bcm/Kconfig | 2 +- + arch/arm/mach-clps711x/Kconfig | 2 +- + arch/arm/mach-mediatek/mediatek.c | 2 +- + arch/arm/mach-moxart/Kconfig | 3 +- + arch/arm/mach-omap2/timer.c | 10 +- + arch/arm/mach-rockchip/rockchip.c | 2 +- + arch/arm/mach-s3c24xx/Kconfig | 2 +- + arch/arm/mach-s3c64xx/Kconfig | 2 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- + arch/arm/mach-spear/spear13xx.c | 2 +- + arch/arm/mach-sunxi/sunxi.c | 2 +- + arch/arm/mach-u300/core.c | 2 +- + arch/arm/mach-zynq/common.c | 2 +- + arch/arm64/Kconfig.platforms | 4 +- + arch/arm64/kernel/time.c | 2 +- + arch/h8300/Kconfig | 2 +- + arch/h8300/kernel/setup.c | 2 +- + arch/microblaze/Kconfig | 2 +- + arch/microblaze/kernel/setup.c | 2 +- + arch/microblaze/kernel/timer.c | 2 +- + arch/mips/generic/init.c | 2 +- + arch/mips/mti-malta/malta-time.c | 2 +- + arch/mips/pic32/pic32mzda/time.c | 2 +- + arch/mips/pistachio/time.c | 2 +- + arch/mips/ralink/Kconfig | 2 +- + arch/mips/ralink/cevt-rt3352.c | 2 +- + arch/mips/ralink/clk.c | 2 +- + arch/mips/ralink/timer-gic.c | 2 +- + arch/mips/xilfpga/time.c | 2 +- + arch/nios2/Kconfig | 2 +- + arch/nios2/kernel/time.c | 4 +- + arch/sh/boards/Kconfig | 2 +- + arch/sh/boards/of-generic.c | 2 +- + arch/xtensa/kernel/time.c | 2 +- + drivers/clocksource/Kconfig | 78 ++-- + drivers/clocksource/Makefile | 4 +- + drivers/clocksource/arc_timer.c | 6 +- + drivers/clocksource/arm_arch_timer.c | 8 +- + drivers/clocksource/arm_global_timer.c | 2 +- + drivers/clocksource/armv7m_systick.c | 2 +- + drivers/clocksource/asm9260_timer.c | 2 +- + drivers/clocksource/bcm2835_timer.c | 2 +- + drivers/clocksource/bcm_kona_timer.c | 4 +- + drivers/clocksource/cadence_ttc_timer.c | 2 +- + drivers/clocksource/clkevt-probe.c | 56 --- + drivers/clocksource/clksrc-dbx500-prcmu.c | 2 +- + drivers/clocksource/clksrc_st_lpc.c | 2 +- + drivers/clocksource/clps711x-timer.c | 4 +- + drivers/clocksource/dw_apb_timer_of.c | 8 +- + drivers/clocksource/exynos_mct.c | 4 +- + drivers/clocksource/fsl_ftm_timer.c | 2 +- + drivers/clocksource/h8300_timer16.c | 2 +- + drivers/clocksource/h8300_timer8.c | 2 +- + drivers/clocksource/h8300_tpu.c | 2 +- + drivers/clocksource/jcore-pit.c | 2 +- + drivers/clocksource/meson6_timer.c | 2 +- + drivers/clocksource/mips-gic-timer.c | 2 +- + drivers/clocksource/moxart_timer.c | 256 ------------ + drivers/clocksource/mps2-timer.c | 2 +- + drivers/clocksource/mtk_timer.c | 2 +- + drivers/clocksource/mxs_timer.c | 2 +- + drivers/clocksource/nomadik-mtu.c | 2 +- + drivers/clocksource/pxa_timer.c | 2 +- + drivers/clocksource/qcom-timer.c | 4 +- + drivers/clocksource/renesas-ostm.c | 2 +- + drivers/clocksource/rockchip_timer.c | 4 +- + drivers/clocksource/samsung_pwm_timer.c | 10 +- + drivers/clocksource/sun4i_timer.c | 2 +- + drivers/clocksource/tango_xtal.c | 2 +- + drivers/clocksource/tegra20_timer.c | 4 +- + drivers/clocksource/time-armada-370-xp.c | 6 +- + drivers/clocksource/time-efm32.c | 4 +- + drivers/clocksource/time-lpc32xx.c | 2 +- + drivers/clocksource/time-orion.c | 2 +- + drivers/clocksource/time-pistachio.c | 2 +- + drivers/clocksource/timer-atlas7.c | 2 +- + drivers/clocksource/timer-atmel-pit.c | 2 +- + drivers/clocksource/timer-atmel-st.c | 2 +- + drivers/clocksource/timer-digicolor.c | 2 +- + drivers/clocksource/timer-fttmr010.c | 440 ++++++++++++--------- + drivers/clocksource/timer-imx-gpt.c | 24 +- + drivers/clocksource/timer-integrator-ap.c | 2 +- + drivers/clocksource/timer-keystone.c | 2 +- + drivers/clocksource/timer-nps.c | 6 +- + drivers/clocksource/timer-oxnas-rps.c | 4 +- + drivers/clocksource/timer-prima2.c | 2 +- + .../clocksource/{clksrc-probe.c => timer-probe.c} | 20 +- + drivers/clocksource/timer-sp804.c | 4 +- + drivers/clocksource/timer-stm32.c | 2 +- + drivers/clocksource/timer-sun5i.c | 4 +- + drivers/clocksource/timer-ti-32k.c | 2 +- + drivers/clocksource/timer-u300.c | 2 +- + drivers/clocksource/versatile.c | 4 +- + drivers/clocksource/vf_pit_timer.c | 2 +- + drivers/clocksource/vt8500_timer.c | 2 +- + drivers/clocksource/zevio-timer.c | 2 +- + include/asm-generic/vmlinux.lds.h | 8 +- + include/linux/clockchips.h | 9 - + include/linux/clocksource.h | 15 +- + 106 files changed, 460 insertions(+), 742 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt + delete mode 100644 drivers/clocksource/clkevt-probe.c + delete mode 100644 drivers/clocksource/moxart_timer.c + rename drivers/clocksource/{clksrc-probe.c => timer-probe.c} (72%) +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 (ff0abed4922f EDAC, altera: Simplify calculation of total memory) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/altera_edac.c | 26 +- + drivers/edac/ie31200_edac.c | 13 +- + drivers/edac/mce_amd.c | 2 +- + drivers/edac/mv64x60_edac.c | 88 +++--- + drivers/edac/sb_edac.c | 682 ++++++++++++++++++++----------------------- + drivers/edac/thunderx_edac.c | 2 +- + 6 files changed, 381 insertions(+), 432 deletions(-) +Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging ftrace/for-next (6ee98ffeea0b x86/ftrace: Make sure that ftrace trampolines are not RWX) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (e5013f33f44d rcu: Move rcu.h to new trivial-function style) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot +Auto-merging kernel/sched/core.c +Removing kernel/rcu/tiny_plugin.h +Auto-merging include/linux/sched.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/RCU/checklist.txt | 121 +++++++++---- + Documentation/RCU/rcu.txt | 9 +- + Documentation/RCU/rcubarrier.txt | 5 + + Documentation/RCU/torture.txt | 20 ++- + Documentation/RCU/whatisRCU.txt | 5 +- + Documentation/admin-guide/kernel-parameters.txt | 7 +- + arch/blackfin/kernel/module.c | 39 +++-- + include/linux/init_task.h | 8 +- + include/linux/rcupdate.h | 14 +- + include/linux/rcutiny.h | 8 +- + include/linux/sched.h | 8 +- + include/linux/srcutiny.h | 13 ++ + include/linux/srcutree.h | 1 + + include/trace/events/rcu.h | 7 +- + kernel/exit.c | 7 +- + kernel/rcu/Kconfig | 3 +- + kernel/rcu/rcu.h | 128 +++----------- + kernel/rcu/rcuperf.c | 17 +- + kernel/rcu/rcutorture.c | 62 +------ + kernel/rcu/srcutiny.c | 8 + + kernel/rcu/srcutree.c | 37 ++++ + kernel/rcu/tiny.c | 2 - + kernel/rcu/tiny_plugin.h | 47 ------ + kernel/rcu/tree.c | 33 ++-- + kernel/rcu/tree.h | 2 + + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 187 +++++++++++++-------- + kernel/rcu/update.c | 18 +- + kernel/sched/core.c | 1 + + .../selftests/rcutorture/bin/config_override.sh | 61 +++++++ + .../testing/selftests/rcutorture/bin/functions.sh | 27 ++- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 11 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 58 +++---- + tools/testing/selftests/rcutorture/bin/kvm.sh | 34 +++- + .../selftests/rcutorture/configs/rcu/BUSTED.boot | 2 +- + .../selftests/rcutorture/configs/rcu/SRCU-C.boot | 1 - + .../selftests/rcutorture/configs/rcu/SRCU-u | 3 +- + .../selftests/rcutorture/configs/rcu/TREE01.boot | 2 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 2 +- + 39 files changed, 544 insertions(+), 476 deletions(-) + delete mode 100644 kernel/rcu/tiny_plugin.h + create mode 100755 tools/testing/selftests/rcutorture/bin/config_override.sh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot +Merging kvm/linux-next (9d643f63128b KVM: x86: avoid large stack allocations in em_fxrstor) +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/vmx.c +Merge made by the 'recursive' strategy. + arch/x86/kvm/emulate.c | 82 +++++++++++++++++++++++--------------------------- + arch/x86/kvm/svm.c | 6 ++-- + arch/x86/kvm/vmx.c | 2 +- + 3 files changed, 41 insertions(+), 49 deletions(-) +Merging kvm-arm/next (02d50cdaff36 KVM: ARM64: fix phy counter access failure in guest.) +$ git merge kvm-arm/next +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/kvm_host.h +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/esr.h +Auto-merging arch/arm64/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 12 + + Documentation/arm64/silicon-errata.txt | 1 + + Documentation/virtual/kvm/devices/vcpu.txt | 41 +- + Documentation/virtual/kvm/vcpu-requests.rst | 307 +++++++++ + arch/arm/include/asm/kvm_host.h | 28 +- + arch/arm/include/uapi/asm/kvm.h | 8 + + arch/arm/kvm/guest.c | 51 ++ + arch/arm/kvm/handle_exit.c | 1 + + arch/arm/kvm/hyp/switch.c | 2 + + arch/arm/kvm/reset.c | 16 +- + arch/arm64/Kconfig | 11 + + arch/arm64/include/asm/arch_gicv3.h | 2 +- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/cputype.h | 2 + + arch/arm64/include/asm/esr.h | 24 + + arch/arm64/include/asm/kvm_host.h | 6 +- + arch/arm64/include/asm/kvm_hyp.h | 1 + + arch/arm64/include/asm/sysreg.h | 19 +- + arch/arm64/include/uapi/asm/kvm.h | 3 + + arch/arm64/kernel/cpu_errata.c | 21 + + arch/arm64/kvm/guest.c | 9 + + arch/arm64/kvm/handle_exit.c | 1 + + arch/arm64/kvm/hyp/switch.c | 15 + + arch/arm64/kvm/reset.c | 16 +- + arch/arm64/kvm/sys_regs.c | 27 +- + arch/arm64/kvm/vgic-sys-reg-v3.c | 45 +- + arch/mips/kvm/trap_emul.c | 2 +- + arch/mips/kvm/vz.c | 2 +- + arch/powerpc/include/asm/kvm_host.h | 4 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/powerpc.c | 5 +- + arch/s390/include/asm/kvm_host.h | 6 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/x86/include/asm/kvm_host.h | 47 +- + arch/x86/kvm/x86.c | 4 +- + include/kvm/arm_arch_timer.h | 8 +- + include/kvm/arm_pmu.h | 6 + + include/kvm/arm_vgic.h | 14 +- + include/linux/irqchip/arm-gic-v3.h | 6 + + include/linux/kvm_host.h | 12 + + virt/kvm/arm/aarch32.c | 2 +- + virt/kvm/arm/arch_timer.c | 139 +++- + virt/kvm/arm/arm.c | 82 ++- + virt/kvm/arm/hyp/vgic-v3-sr.c | 823 +++++++++++++++++++++++- + virt/kvm/arm/pmu.c | 117 ++-- + virt/kvm/arm/psci.c | 8 +- + virt/kvm/arm/vgic/vgic-irqfd.c | 2 +- + virt/kvm/arm/vgic/vgic-mmio-v2.c | 24 +- + virt/kvm/arm/vgic/vgic-mmio-v3.c | 22 +- + virt/kvm/arm/vgic/vgic-mmio.c | 68 +- + virt/kvm/arm/vgic/vgic-mmio.h | 12 +- + virt/kvm/arm/vgic/vgic-v3.c | 45 ++ + virt/kvm/arm/vgic/vgic.c | 68 +- + 53 files changed, 1920 insertions(+), 284 deletions(-) + create mode 100644 Documentation/virtual/kvm/vcpu-requests.rst +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 +Resolved 'arch/s390/include/asm/kvm_host.h' using previous resolution. +Auto-merging arch/s390/kvm/priv.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/kvm_host.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/kvm_host.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master de0052328c83] Merge remote-tracking branch 'kvms390/next' +$ git diff -M --stat --summary HEAD^.. + 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 (84b7625728ea xen: add sysfs node for hypervisor build id) +$ git merge xen-tip/linux-next +Auto-merging drivers/xen/manage.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/testing/sysfs-hypervisor-xen +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-hypervisor-xen | 119 ++++++++++++++++ + .../{sysfs-hypervisor-pmu => sysfs-hypervisor-xen} | 24 +++- + MAINTAINERS | 2 + + arch/arm/include/asm/xen/events.h | 2 +- + arch/arm/xen/p2m.c | 10 +- + arch/x86/include/asm/xen/hypercall.h | 4 +- + arch/x86/xen/enlighten.c | 154 +++++++++++++++------ + arch/x86/xen/enlighten_hvm.c | 33 ++--- + arch/x86/xen/enlighten_pv.c | 87 ++++++------ + arch/x86/xen/smp.c | 31 +++++ + arch/x86/xen/smp.h | 2 + + arch/x86/xen/smp_hvm.c | 14 +- + arch/x86/xen/smp_pv.c | 6 +- + arch/x86/xen/suspend_hvm.c | 11 +- + arch/x86/xen/xen-ops.h | 3 +- + drivers/xen/events/events_base.c | 6 +- + drivers/xen/evtchn.c | 34 ++++- + drivers/xen/manage.c | 12 +- + drivers/xen/sys-hypervisor.c | 62 +++++++++ + include/xen/arm/hypercall.h | 5 +- + include/xen/events.h | 1 + + include/xen/interface/version.h | 15 ++ + include/xen/xen-ops.h | 2 + + 23 files changed, 498 insertions(+), 141 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-hypervisor-xen + rename Documentation/ABI/testing/{sysfs-hypervisor-pmu => sysfs-hypervisor-xen} (54%) +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 (5d4be5f2b1f1 platform/x86: dell-rbtn: Improve explanation about DELLABC6) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/Makefile +Auto-merging drivers/platform/x86/Kconfig +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/dell-rbtn.c | 29 +- + drivers/platform/x86/dell-wmi.c | 8 +- + drivers/platform/x86/fujitsu-laptop.c | 417 +++++++++++---------- + drivers/platform/x86/ideapad-laptop.c | 42 ++- + drivers/platform/x86/intel_cht_int33fe.c | 8 + + drivers/platform/x86/intel_pmc_ipc.c | 2 +- + 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 +- + 14 files changed, 498 insertions(+), 341 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 (67ddd75771b6 HSI: core: Use kcalloc() in two functions) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/nokia-modem.c | 15 ++++++--------- + drivers/hsi/controllers/omap_ssi_core.c | 10 ++++------ + drivers/hsi/hsi_boardinfo.c | 2 +- + drivers/hsi/hsi_core.c | 7 +++---- + 4 files changed, 14 insertions(+), 20 deletions(-) +Merging leds/for-next (a5a82ff65611 Revert "leds: handle suspend/resume in heartbeat trigger") +$ git merge leds/for-next +Removing drivers/leds/leds-versatile.c +Removing drivers/leds/leds-sead3.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/pca963x.txt | 1 + + drivers/leds/Kconfig | 18 ---- + drivers/leds/Makefile | 2 - + drivers/leds/leds-bcm6328.c | 4 +- + drivers/leds/leds-pca963x.c | 17 +++- + drivers/leds/leds-sead3.c | 78 --------------- + drivers/leds/leds-versatile.c | 110 --------------------- + drivers/leds/trigger/ledtrig-gpio.c | 29 ++---- + drivers/leds/trigger/ledtrig-heartbeat.c | 31 ------ + include/linux/platform_data/leds-pca963x.h | 6 ++ + 10 files changed, 31 insertions(+), 265 deletions(-) + delete mode 100644 drivers/leds/leds-sead3.c + 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 (d565ed38d045 arm: mach-rpc: ecard: fix build error) +$ git merge driver-core/driver-core-next +Auto-merging kernel/module.c +Auto-merging drivers/tty/serdev/core.c +Auto-merging drivers/tty/hvc/hvcs.c +Auto-merging drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/s390/net/netiucv.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/net/caif/caif_spi.c +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging arch/sparc/kernel/vio.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-uevent | 47 ++++ + Documentation/devicetree/bindings/arm/cpus.txt | 4 +- + .../driver-api/firmware/request_firmware.rst | 11 + + arch/arm/Kconfig | 1 + + arch/arm/kernel/topology.c | 221 +-------------- + arch/arm/mach-rpc/ecard.c | 40 +-- + arch/arm64/Kconfig | 1 + + arch/arm64/kernel/topology.c | 226 +-------------- + arch/mips/sgi-ip22/ip22-gio.c | 16 +- + arch/parisc/kernel/drivers.c | 23 +- + arch/powerpc/platforms/ps3/system-bus.c | 10 +- + arch/powerpc/platforms/pseries/dlpar.c | 2 +- + arch/powerpc/platforms/pseries/ibmebus.c | 16 +- + arch/powerpc/platforms/pseries/mobility.c | 7 +- + arch/powerpc/platforms/pseries/vio.c | 72 +++-- + arch/sparc/kernel/vio.c | 18 +- + drivers/amba/bus.c | 25 +- + drivers/base/Kconfig | 8 + + drivers/base/Makefile | 1 + + drivers/base/arch_topology.c | 243 +++++++++++++++++ + drivers/base/bus.c | 47 +--- + drivers/base/class.c | 33 --- + drivers/base/core.c | 7 +- + drivers/base/dma-mapping.c | 33 ++- + drivers/base/firmware_class.c | 302 ++++++++++++++------- + drivers/base/platform.c | 11 +- + drivers/block/pktcdvd.c | 35 ++- + drivers/block/zram/zram_drv.c | 26 +- + drivers/gpio/gpiolib-sysfs.c | 13 +- + drivers/hid/hid-core.c | 24 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 10 +- + drivers/hwtracing/intel_th/core.c | 1 - + drivers/infiniband/hw/nes/nes.c | 80 +++--- + drivers/macintosh/macio_asic.c | 4 +- + drivers/macintosh/macio_sysfs.c | 29 +- + drivers/mtd/ubi/build.c | 16 +- + drivers/net/caif/caif_spi.c | 20 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 6 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 8 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 8 +- + drivers/pci/pci-driver.c | 8 +- + drivers/pcmcia/ds.c | 4 +- + drivers/platform/x86/thinkpad_acpi.c | 91 ++----- + drivers/rpmsg/rpmsg_core.c | 23 +- + drivers/s390/char/sclp.c | 12 +- + drivers/s390/char/vmlogrdr.c | 7 +- + drivers/s390/net/ctcm_main.c | 6 +- + drivers/s390/net/lcs.c | 6 +- + drivers/s390/net/netiucv.c | 14 +- + drivers/s390/net/qeth_core_main.c | 6 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 5 - + drivers/sh/superhyway/superhyway-sysfs.c | 29 +- + drivers/sh/superhyway/superhyway.c | 2 +- + drivers/tty/hvc/hvcs.c | 7 +- + drivers/tty/serdev/core.c | 10 +- + drivers/usb/usbip/stub_main.c | 7 +- + drivers/uwb/driver.c | 11 +- + include/linux/arch_topology.h | 17 ++ + include/linux/device.h | 6 - + include/linux/kobject.h | 4 +- + include/linux/superhyway.h | 2 +- + include/linux/sysfs.h | 2 +- + kernel/module.c | 5 +- + lib/kobject_uevent.c | 167 +++++++++++- + 64 files changed, 1116 insertions(+), 1040 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-uevent + create mode 100644 drivers/base/arch_topology.c + create mode 100644 include/linux/arch_topology.h +Merging usb/usb-next (ce046e5d9b48 thermal: max77620: fix pinmux conflict on reprobe) +$ git merge usb/usb-next +Auto-merging include/linux/device.h +Auto-merging drivers/usb/usbip/stub_main.c +Removing drivers/usb/host/ohci-omap3.c +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-typec | 15 + + Documentation/devicetree/bindings/usb/usb-ohci.txt | 1 + + drivers/base/core.c | 16 + + drivers/base/pinctrl.c | 3 + + drivers/thermal/max77620_thermal.c | 8 +- + drivers/usb/chipidea/otg_fsm.c | 8 +- + drivers/usb/class/cdc-wdm.c | 17 +- + drivers/usb/core/devio.c | 3 + + drivers/usb/core/hcd.c | 14 +- + drivers/usb/core/of.c | 3 +- + drivers/usb/core/usb-acpi.c | 26 +- + drivers/usb/core/usb.c | 2 + + drivers/usb/early/xhci-dbc.c | 1 - + drivers/usb/gadget/udc/core.c | 9 + + drivers/usb/host/Kconfig | 12 +- + drivers/usb/host/Makefile | 1 - + drivers/usb/host/ehci-exynos.c | 4 +- + drivers/usb/host/ehci-sched.c | 2 +- + drivers/usb/host/ehci-timer.c | 2 +- + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/ohci-omap3.c | 211 ------- + drivers/usb/host/ohci-platform.c | 13 + + drivers/usb/host/uhci-hcd.c | 17 +- + drivers/usb/host/uhci-hcd.h | 51 ++ + drivers/usb/host/uhci-platform.c | 22 +- + drivers/usb/host/xhci-ring.c | 67 ++- + drivers/usb/host/xhci.c | 2 +- + drivers/usb/host/xhci.h | 3 +- + drivers/usb/misc/iowarrior.c | 11 +- + drivers/usb/misc/usbsevseg.c | 18 +- + drivers/usb/mtu3/mtu3.h | 8 +- + drivers/usb/mtu3/mtu3_plat.c | 23 +- + drivers/usb/storage/ene_ub6250.c | 87 +-- + drivers/usb/typec/typec.c | 136 ++++- + drivers/usb/usbip/stub_main.c | 4 + + drivers/usb/usbip/stub_tx.c | 4 + + drivers/usb/usbip/vhci.h | 36 +- + drivers/usb/usbip/vhci_hcd.c | 605 +++++++++++++++------ + drivers/usb/usbip/vhci_rx.c | 16 +- + drivers/usb/usbip/vhci_sysfs.c | 138 +++-- + drivers/uwb/i1480/dfu/phy.c | 1 + + include/linux/device.h | 4 + + include/linux/usb/hcd.h | 4 +- + include/linux/usb/typec.h | 10 +- + include/uapi/linux/usbdevice_fs.h | 6 + + tools/usb/usbip/libsrc/vhci_driver.c | 133 +++-- + tools/usb/usbip/libsrc/vhci_driver.h | 10 +- + tools/usb/usbip/src/usbip_attach.c | 5 +- + 48 files changed, 1175 insertions(+), 619 deletions(-) + delete mode 100644 drivers/usb/host/ohci-omap3.c +Merging usb-gadget/next (ece7af5f787e usb: dwc3: exynos: Handle return value of clk_prepare_enable) +$ git merge usb-gadget/next +Resolved 'drivers/usb/gadget/function/f_mass_storage.c' using previous resolution. +Auto-merging drivers/usb/gadget/udc/snps_udc_core.c +Auto-merging drivers/usb/gadget/udc/renesas_usb3.c +Auto-merging drivers/usb/gadget/udc/net2280.c +Auto-merging drivers/usb/gadget/udc/dummy_hcd.c +Auto-merging drivers/usb/gadget/udc/core.c +Auto-merging drivers/usb/gadget/function/f_mass_storage.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/function/f_mass_storage.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/gadget/composite.c +Auto-merging drivers/usb/dwc3/gadget.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9d6871ecd9e8] Merge remote-tracking branch 'usb-gadget/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-class-udc | 16 +- + Documentation/devicetree/bindings/usb/dwc3.txt | 2 + + .../devicetree/bindings/usb/iproc-udc.txt | 21 + + Documentation/driver-api/usb/dwc3.rst | 712 +++++++++++++++++++++ + Documentation/driver-api/usb/index.rst | 3 + + Documentation/{ => driver-api}/usb/typec.rst | 0 + .../{ => driver-api}/usb/usb3-debug-port.rst | 0 + drivers/usb/dwc3/core.c | 57 +- + drivers/usb/dwc3/core.h | 48 +- + drivers/usb/dwc3/debug.h | 247 ++++++- + drivers/usb/dwc3/debugfs.c | 9 +- + drivers/usb/dwc3/dwc3-exynos.c | 13 +- + drivers/usb/dwc3/dwc3-st.c | 2 +- + drivers/usb/dwc3/ep0.c | 8 +- + drivers/usb/dwc3/gadget.c | 299 +++++---- + drivers/usb/dwc3/gadget.h | 22 +- + drivers/usb/dwc3/trace.h | 28 +- + drivers/usb/dwc3/ulpi.c | 12 + + drivers/usb/gadget/composite.c | 59 +- + drivers/usb/gadget/configfs.c | 14 +- + drivers/usb/gadget/function/f_fs.c | 110 ++-- + drivers/usb/gadget/function/f_mass_storage.c | 430 +++++-------- + drivers/usb/gadget/function/f_uac2.c | 12 +- + drivers/usb/gadget/function/storage_common.h | 18 +- + drivers/usb/gadget/function/u_fs.h | 3 + + drivers/usb/gadget/legacy/mass_storage.c | 8 +- + drivers/usb/gadget/udc/Kconfig | 18 +- + drivers/usb/gadget/udc/Makefile | 3 +- + drivers/usb/gadget/udc/amd5536udc.h | 18 +- + drivers/usb/gadget/udc/amd5536udc_pci.c | 1 + + drivers/usb/gadget/udc/atmel_usba_udc.h | 11 - + drivers/usb/gadget/udc/core.c | 37 +- + drivers/usb/gadget/udc/dummy_hcd.c | 39 +- + drivers/usb/gadget/udc/mv_udc_core.c | 9 +- + drivers/usb/gadget/udc/net2280.c | 5 +- + drivers/usb/gadget/udc/renesas_usb3.c | 392 ++++++++++++ + .../gadget/udc/{amd5536udc.c => snps_udc_core.c} | 80 ++- + drivers/usb/gadget/udc/snps_udc_plat.c | 344 ++++++++++ + drivers/usb/gadget/udc/udc-xilinx.c | 2 +- + drivers/usb/phy/Kconfig | 6 +- + drivers/usb/phy/phy-msm-usb.c | 85 +-- + drivers/usb/phy/phy-qcom-8x16-usb.c | 20 +- + drivers/usb/phy/phy.c | 57 ++ + include/linux/usb/gadget.h | 4 + + include/linux/usb/phy.h | 7 + + include/uapi/linux/usb/functionfs.h | 7 +- + tools/usb/testusb.c | 16 +- + 47 files changed, 2594 insertions(+), 720 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/iproc-udc.txt + create mode 100644 Documentation/driver-api/usb/dwc3.rst + rename Documentation/{ => driver-api}/usb/typec.rst (100%) + rename Documentation/{ => driver-api}/usb/usb3-debug-port.rst (100%) + rename drivers/usb/gadget/udc/{amd5536udc.c => snps_udc_core.c} (97%) + create mode 100644 drivers/usb/gadget/udc/snps_udc_plat.c +Merging usb-serial/usb-next (08f741a93333 USB: serial: qcserial: expose methods for modem control) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/qcserial.c +Merge made by the 'recursive' strategy. + drivers/usb/serial/qcserial.c | 2 ++ + drivers/usb/serial/upd78f0730.c | 6 +++--- + 2 files changed, 5 insertions(+), 3 deletions(-) +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 +Auto-merging drivers/usb/chipidea/core.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/core.c | 29 +++++++++++++++++++++-------- + 1 file changed, 21 insertions(+), 8 deletions(-) +Merging phy-next/next (787f24543c4a phy: phy-bcm-ns2-usbdrd: Broadcom USB DRD PHY driver for Northstar2) +$ git merge phy-next/next +Auto-merging drivers/phy/ti/phy-tusb1210.c +Auto-merging drivers/phy/rockchip/phy-rockchip-inno-usb2.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/amlogic/phy-meson8b-usb2.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/brcm,ns2-drd-phy.txt | 30 + + .../devicetree/bindings/phy/meson-gxl-usb2-phy.txt | 17 + + .../devicetree/bindings/phy/meson8b-usb2-phy.txt | 3 +- + .../devicetree/bindings/phy/phy-cpcap-usb.txt | 40 ++ + .../bindings/phy/phy-rockchip-inno-usb2.txt | 1 + + .../devicetree/bindings/phy/rcar-gen3-phy-usb3.txt | 46 ++ + MAINTAINERS | 20 +- + drivers/phy/Kconfig | 492 +-------------- + drivers/phy/Makefile | 71 +-- + 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 | 27 + + drivers/phy/amlogic/Makefile | 2 + + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 273 +++++++++ + drivers/phy/{ => amlogic}/phy-meson8b-usb2.c | 5 +- + drivers/phy/broadcom/Kconfig | 68 +++ + drivers/phy/broadcom/Makefile | 7 + + 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-bcm-ns2-usbdrd.c | 437 +++++++++++++ + 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/motorola/Kconfig | 12 + + drivers/phy/motorola/Makefile | 5 + + drivers/phy/motorola/phy-cpcap-usb.c | 674 +++++++++++++++++++++ + 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 | 0 + 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 | 24 + + drivers/phy/renesas/Makefile | 3 + + drivers/phy/{ => renesas}/phy-rcar-gen2.c | 0 + drivers/phy/{ => renesas}/phy-rcar-gen3-usb2.c | 0 + drivers/phy/renesas/phy-rcar-gen3-usb3.c | 226 +++++++ + 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 | 74 ++- + 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 | 41 +- + drivers/phy/{ => ti}/phy-twl4030-usb.c | 0 + {drivers => include/linux}/phy/ulpi_phy.h | 0 + 97 files changed, 2506 insertions(+), 561 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/brcm,ns2-drd-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/meson-gxl-usb2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-cpcap-usb.txt + create mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt + 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 + create mode 100644 drivers/phy/amlogic/phy-meson-gxl-usb2.c + rename drivers/phy/{ => amlogic}/phy-meson8b-usb2.c (98%) + 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%) + create mode 100644 drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c + 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/motorola/Kconfig + create mode 100644 drivers/phy/motorola/Makefile + create mode 100644 drivers/phy/motorola/phy-cpcap-usb.c + 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 (100%) + 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/renesas/phy-rcar-gen3-usb3.c + 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 (94%) + 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 (78%) + rename drivers/phy/{ => ti}/phy-twl4030-usb.c (100%) + rename {drivers => include/linux}/phy/ulpi_phy.h (100%) +Merging tty/tty-next (92c8f7c0e109 tty/serial: atmel: make the driver DT only) +$ git merge tty/tty-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-aspeed-vuart | 15 + + Documentation/devicetree/bindings/serial/8250.txt | 3 + + Documentation/serial/n_gsm.txt | 7 + + MAINTAINERS | 2 +- + arch/alpha/include/uapi/asm/ioctls.h | 1 + + arch/ia64/hp/sim/simserial.c | 13 - + arch/mips/include/uapi/asm/ioctls.h | 1 + + arch/parisc/include/uapi/asm/ioctls.h | 1 + + arch/powerpc/include/uapi/asm/ioctls.h | 1 + + arch/sh/include/uapi/asm/ioctls.h | 1 + + arch/sparc/include/uapi/asm/ioctls.h | 3 +- + arch/xtensa/include/uapi/asm/ioctls.h | 1 + + drivers/tty/Makefile | 3 +- + drivers/tty/amiserial.c | 23 +- + drivers/tty/cyclades.c | 21 +- + drivers/tty/n_gsm.c | 54 ++-- + drivers/tty/n_null.c | 80 +++++ + drivers/tty/pty.c | 93 +++++- + drivers/tty/rocket.c | 27 +- + drivers/tty/serdev/serdev-ttyport.c | 2 +- + drivers/tty/serial/8250/8250.h | 3 + + drivers/tty/serial/8250/8250_aspeed_vuart.c | 323 +++++++++++++++++++++ + drivers/tty/serial/8250/8250_bcm2835aux.c | 2 +- + drivers/tty/serial/8250/8250_exar.c | 16 +- + drivers/tty/serial/8250/8250_of.c | 10 + + drivers/tty/serial/8250/8250_omap.c | 4 + + drivers/tty/serial/8250/8250_port.c | 8 +- + drivers/tty/serial/8250/Kconfig | 10 + + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/Kconfig | 16 +- + drivers/tty/serial/amba-pl010.c | 31 +- + drivers/tty/serial/atmel_serial.c | 164 +++-------- + drivers/tty/serial/imx.c | 26 +- + drivers/tty/serial/meson_uart.c | 63 ++-- + drivers/tty/serial/pch_uart.c | 3 +- + drivers/tty/serial/sccnxp.c | 15 +- + drivers/tty/serial/serial_core.c | 5 +- + drivers/tty/serial/sh-sci.c | 45 ++- + drivers/tty/serial/xilinx_uartps.c | 10 +- + drivers/tty/tty_ldisc.c | 44 ++- + drivers/tty/vt/consolemap.c | 56 +--- + drivers/tty/vt/keyboard.c | 3 +- + drivers/tty/vt/vt.c | 8 +- + drivers/tty/vt/vt_ioctl.c | 8 - + drivers/usb/serial/ftdi_sio.c | 67 +---- + fs/compat_ioctl.c | 6 - + include/linux/platform_data/atmel.h | 10 - + include/linux/serial_core.h | 1 + + include/linux/tty.h | 1 - + include/uapi/asm-generic/ioctls.h | 1 + + include/uapi/linux/serial.h | 3 + + include/uapi/linux/serial_core.h | 2 +- + include/uapi/linux/tty.h | 2 + + net/irda/ircomm/ircomm_tty_ioctl.c | 107 +------ + 54 files changed, 845 insertions(+), 581 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-aspeed-vuart + create mode 100644 drivers/tty/n_null.c + create mode 100644 drivers/tty/serial/8250/8250_aspeed_vuart.c +Merging char-misc/char-misc-next (cbbdc6082917 misc: apds990x: Use sysfs_match_string() helper) +$ git merge char-misc/char-misc-next +Resolved 'Documentation/admin-guide/index.rst' using previous resolution. +Auto-merging lib/Makefile +Auto-merging include/linux/w1.h +Removing drivers/w1/w1_int.h +Removing drivers/w1/w1_family.h +Auto-merging arch/arm64/boot/dts/qcom/msm8916.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/index.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/index.rst +CONFLICT (modify/delete): Documentation/DocBook/w1.tmpl deleted in HEAD and modified in char-misc/char-misc-next. Version char-misc/char-misc-next of Documentation/DocBook/w1.tmpl left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/DocBook/w1.tmpl +Documentation/DocBook/w1.tmpl: needs merge +rm 'Documentation/DocBook/w1.tmpl' +$ git commit -v -a +[master cde7d50f30f5] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-fsi | 38 + + Documentation/ABI/testing/sysfs-bus-thunderbolt | 110 ++ + Documentation/ABI/testing/sysfs-class-mux | 16 + + Documentation/admin-guide/devices.txt | 4 +- + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 7 + + Documentation/admin-guide/thunderbolt.rst | 199 ++++ + .../bindings/arm/coresight-cpu-debug.txt | 49 + + .../devicetree/bindings/fsi/fsi-master-gpio.txt | 24 + + .../devicetree/bindings/i2c/i2c-mux-gpmux.txt | 99 ++ + .../bindings/iio/multiplexer/io-channel-mux.txt | 39 + + .../devicetree/bindings/mux/adi,adg792a.txt | 75 ++ + Documentation/devicetree/bindings/mux/gpio-mux.txt | 69 ++ + Documentation/devicetree/bindings/mux/mmio-mux.txt | 60 + + .../devicetree/bindings/mux/mux-controller.txt | 157 +++ + .../devicetree/bindings/nvmem/rockchip-efuse.txt | 1 + + Documentation/driver-model/devres.txt | 7 +- + Documentation/trace/coresight-cpu-debug.txt | 175 +++ + MAINTAINERS | 22 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 64 ++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 32 + + arch/x86/include/asm/mshyperv.h | 1 - + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/auxdisplay/panel.c | 5 +- + drivers/firmware/google/memconsole-coreboot.c | 54 +- + drivers/firmware/google/memconsole-x86-legacy.c | 18 +- + drivers/firmware/google/memconsole.c | 14 +- + drivers/firmware/google/memconsole.h | 7 +- + drivers/firmware/google/vpd.c | 39 +- + drivers/fsi/Kconfig | 26 + + drivers/fsi/Makefile | 3 + + drivers/fsi/fsi-core.c | 841 ++++++++++++++ + drivers/fsi/fsi-master-gpio.c | 604 ++++++++++ + drivers/fsi/fsi-master-hub.c | 327 ++++++ + drivers/fsi/fsi-master.h | 43 + + drivers/fsi/fsi-scom.c | 263 +++++ + drivers/hv/channel.c | 8 +- + drivers/hv/channel_mgmt.c | 69 +- + drivers/hv/connection.c | 11 +- + drivers/hv/hv.c | 9 +- + drivers/hv/hv_kvp.c | 14 +- + drivers/hv/hv_util.c | 164 +-- + drivers/hv/hyperv_vmbus.h | 11 + + drivers/hv/vmbus_drv.c | 80 +- + drivers/hwtracing/coresight/Kconfig | 14 + + drivers/hwtracing/coresight/Makefile | 1 + + drivers/hwtracing/coresight/coresight-cpu-debug.c | 700 ++++++++++++ + 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 | 47 +- + drivers/i2c/muxes/Kconfig | 13 + + drivers/i2c/muxes/Makefile | 1 + + drivers/i2c/muxes/i2c-mux-gpmux.c | 173 +++ + drivers/iio/Kconfig | 1 + + drivers/iio/Makefile | 1 + + drivers/iio/inkern.c | 60 + + drivers/iio/multiplexer/Kconfig | 18 + + drivers/iio/multiplexer/Makefile | 6 + + drivers/iio/multiplexer/iio-mux.c | 459 ++++++++ + drivers/ipack/ipack.c | 3 +- + drivers/memory/ti-aemif.c | 5 +- + drivers/misc/Kconfig | 8 + + drivers/misc/Makefile | 1 + + drivers/misc/apds990x.c | 16 +- + drivers/misc/aspeed-lpc-snoop.c | 261 +++++ + drivers/misc/bh1770glc.c | 2 +- + drivers/misc/mei/bus.c | 2 +- + drivers/misc/mei/hw.h | 2 +- + drivers/misc/mei/init.c | 6 - + drivers/misc/mei/interrupt.c | 26 +- + drivers/misc/mei/mei_dev.h | 1 - + drivers/misc/sram-exec.c | 27 +- + drivers/mux/Kconfig | 59 + + drivers/mux/Makefile | 8 + + drivers/mux/mux-adg792a.c | 157 +++ + drivers/mux/mux-core.c | 547 +++++++++ + drivers/mux/mux-gpio.c | 114 ++ + drivers/mux/mux-mmio.c | 141 +++ + drivers/nvmem/bcm-ocotp.c | 4 +- + drivers/nvmem/core.c | 22 +- + drivers/nvmem/rockchip-efuse.c | 4 + + drivers/platform/goldfish/goldfish_pipe.c | 2 +- + drivers/power/supply/ds2760_battery.c | 2 +- + drivers/power/supply/ds2780_battery.c | 2 +- + drivers/power/supply/ds2781_battery.c | 2 +- + drivers/pps/Kconfig | 12 +- + drivers/pps/clients/Kconfig | 6 +- + drivers/pps/generators/Kconfig | 3 +- + drivers/spmi/spmi-pmic-arb.c | 608 ++++++---- + drivers/thunderbolt/Kconfig | 13 +- + drivers/thunderbolt/Makefile | 2 +- + drivers/thunderbolt/cap.c | 169 +-- + drivers/thunderbolt/ctl.c | 665 +++++++---- + drivers/thunderbolt/ctl.h | 105 +- + drivers/thunderbolt/dma_port.c | 524 +++++++++ + drivers/thunderbolt/dma_port.h | 34 + + drivers/thunderbolt/domain.c | 456 ++++++++ + drivers/thunderbolt/eeprom.c | 121 +- + drivers/thunderbolt/icm.c | 1089 ++++++++++++++++++ + drivers/thunderbolt/nhi.c | 306 ++++- + drivers/thunderbolt/nhi.h | 93 +- + drivers/thunderbolt/nhi_regs.h | 27 + + drivers/thunderbolt/switch.c | 1178 ++++++++++++++++++-- + drivers/thunderbolt/tb.c | 240 ++-- + drivers/thunderbolt/tb.h | 251 ++++- + drivers/thunderbolt/tb_msgs.h | 260 +++++ + drivers/thunderbolt/tb_regs.h | 50 +- + drivers/thunderbolt/tunnel_pci.c | 17 +- + drivers/uio/uio_pci_generic.c | 20 +- + drivers/vhost/vsock.c | 4 +- + drivers/w1/masters/ds1wm.c | 3 +- + drivers/w1/masters/ds2482.c | 48 +- + drivers/w1/masters/ds2490.c | 36 +- + drivers/w1/masters/matrox_w1.c | 43 +- + drivers/w1/masters/mxc_w1.c | 3 +- + drivers/w1/masters/omap_hdq.c | 60 +- + drivers/w1/masters/w1-gpio.c | 3 +- + drivers/w1/slaves/w1_bq27000.c | 15 +- + drivers/w1/slaves/w1_ds2405.c | 5 +- + drivers/w1/slaves/w1_ds2406.c | 12 +- + drivers/w1/slaves/w1_ds2408.c | 15 +- + drivers/w1/slaves/w1_ds2413.c | 14 +- + drivers/w1/slaves/w1_ds2423.c | 8 +- + drivers/w1/slaves/w1_ds2431.c | 8 +- + drivers/w1/slaves/w1_ds2433.c | 14 +- + drivers/w1/slaves/w1_ds2438.c | 5 +- + drivers/w1/slaves/w1_ds2760.c | 18 +- + drivers/w1/slaves/w1_ds2780.c | 9 +- + drivers/w1/slaves/w1_ds2781.c | 9 +- + drivers/w1/slaves/w1_ds28e04.c | 14 +- + drivers/w1/slaves/w1_smem.c | 17 +- + drivers/w1/slaves/w1_therm.c | 26 +- + drivers/w1/w1.c | 22 +- + drivers/w1/w1_family.c | 8 +- + drivers/w1/w1_family.h | 98 -- + drivers/w1/w1_int.c | 6 +- + drivers/w1/w1_int.h | 27 - + drivers/w1/w1_internal.h | 87 ++ + drivers/w1/w1_io.c | 2 +- + drivers/w1/w1_netlink.c | 2 +- + drivers/w1/w1_netlink.h | 2 +- + include/dt-bindings/mux/mux.h | 16 + + include/linux/coresight.h | 10 +- + include/linux/crc4.h | 8 + + include/linux/fsi.h | 35 +- + include/linux/iio/consumer.h | 37 + + include/linux/miscdevice.h | 1 + + include/linux/mux/consumer.h | 32 + + include/linux/mux/driver.h | 108 ++ + include/linux/{i2c => platform_data}/apds990x.h | 0 + include/linux/{i2c => platform_data}/bh1770glc.h | 0 + include/linux/sram.h | 8 +- + {drivers/w1 => include/linux}/w1.h | 114 +- + include/trace/events/fsi.h | 127 +++ + include/trace/events/fsi_master_gpio.h | 68 ++ + kernel/configs/android-base.config | 11 +- + kernel/configs/android-recommended.config | 5 +- + lib/Kconfig | 8 + + lib/Makefile | 1 + + lib/crc4.c | 46 + + tools/hv/hv_kvp_daemon.c | 44 +- + tools/hv/hv_vss_daemon.c | 4 +- + 166 files changed, 12810 insertions(+), 1621 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-fsi + create mode 100644 Documentation/ABI/testing/sysfs-bus-thunderbolt + create mode 100644 Documentation/ABI/testing/sysfs-class-mux + create mode 100644 Documentation/admin-guide/thunderbolt.rst + create mode 100644 Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt + create mode 100644 Documentation/devicetree/bindings/fsi/fsi-master-gpio.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt + create mode 100644 Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/adi,adg792a.txt + create mode 100644 Documentation/devicetree/bindings/mux/gpio-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/mmio-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/mux-controller.txt + create mode 100644 Documentation/trace/coresight-cpu-debug.txt + create mode 100644 drivers/fsi/fsi-master-gpio.c + create mode 100644 drivers/fsi/fsi-master-hub.c + create mode 100644 drivers/fsi/fsi-master.h + create mode 100644 drivers/fsi/fsi-scom.c + create mode 100644 drivers/hwtracing/coresight/coresight-cpu-debug.c + create mode 100644 drivers/i2c/muxes/i2c-mux-gpmux.c + create mode 100644 drivers/iio/multiplexer/Kconfig + create mode 100644 drivers/iio/multiplexer/Makefile + create mode 100644 drivers/iio/multiplexer/iio-mux.c + create mode 100644 drivers/misc/aspeed-lpc-snoop.c + create mode 100644 drivers/mux/Kconfig + create mode 100644 drivers/mux/Makefile + create mode 100644 drivers/mux/mux-adg792a.c + create mode 100644 drivers/mux/mux-core.c + create mode 100644 drivers/mux/mux-gpio.c + create mode 100644 drivers/mux/mux-mmio.c + create mode 100644 drivers/thunderbolt/dma_port.c + create mode 100644 drivers/thunderbolt/dma_port.h + create mode 100644 drivers/thunderbolt/domain.c + create mode 100644 drivers/thunderbolt/icm.c + create mode 100644 drivers/thunderbolt/tb_msgs.h + delete mode 100644 drivers/w1/w1_family.h + delete mode 100644 drivers/w1/w1_int.h + create mode 100644 drivers/w1/w1_internal.h + create mode 100644 include/dt-bindings/mux/mux.h + create mode 100644 include/linux/crc4.h + create mode 100644 include/linux/mux/consumer.h + create mode 100644 include/linux/mux/driver.h + rename include/linux/{i2c => platform_data}/apds990x.h (100%) + rename include/linux/{i2c => platform_data}/bh1770glc.h (100%) + rename {drivers/w1 => include/linux}/w1.h (76%) + create mode 100644 include/trace/events/fsi.h + create mode 100644 include/trace/events/fsi_master_gpio.h + create mode 100644 lib/crc4.c +$ git am -3 ../patches/0001-docs-rst-merge-fix-for-DocBook-w1-Update-W1-file-loc.patch +Applying: docs-rst: merge fix for "DocBook: w1: Update W1 file locations and names in DocBook" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/driver-api/w1.rst +$ git add -A . +$ git commit -v -a --amend +[master 5c3cff073b17] Merge remote-tracking branch 'char-misc/char-misc-next' + Date: Fri Jun 16 14:17:46 2017 +1000 +Merging extcon/extcon-next (1f4be24786b8 extcon: int3496: Switch to devm_acpi_dev_add_driver_gpios()) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/Kconfig | 1 + + drivers/extcon/extcon-arizona.c | 4 +--- + drivers/extcon/extcon-intel-int3496.c | 5 +---- + drivers/extcon/extcon.c | 11 +++++------ + 4 files changed, 8 insertions(+), 13 deletions(-) +Merging staging/staging-next (d567b0fe2d63 staging: android: ion: Improve memory alloc style) +$ git merge staging/staging-next +Resolved 'include/uapi/linux/tty.h' using previous resolution. +Auto-merging include/uapi/linux/tty.h +CONFLICT (content): Merge conflict in include/uapi/linux/tty.h +Auto-merging include/linux/tty.h +Auto-merging drivers/tty/tty_ldisc.c +Auto-merging drivers/staging/rtl8188eu/os_dep/mon.c +Removing drivers/staging/most/aim-network/networking.h +Auto-merging drivers/staging/iio/light/tsl2x7x.c +Removing drivers/staging/ccree/hw_queue_defs_plat.h +Removing drivers/staging/ccree/dx_env.h +Removing drivers/staging/ccree/cc_pal_types_plat.h +Removing drivers/staging/ccree/cc_pal_types.h +Removing drivers/staging/ccree/cc_pal_log_plat.h +Removing drivers/staging/ccree/cc_pal_log.h +Removing drivers/staging/ccree/cc_bitops.h +Auto-merging drivers/iio/light/isl29028.c +Auto-merging drivers/iio/inkern.c +Auto-merging drivers/iio/adc/meson_saradc.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3b9d2f798dd0] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 11 + + Documentation/ABI/testing/sysfs-bus-iio-meas-spec | 1 - + .../ABI/testing/sysfs-bus-iio-timer-stm32 | 48 + + .../bindings/iio/adc/amlogic,meson-saradc.txt | 2 + + .../bindings/iio/adc/renesas,gyroadc.txt | 7 +- + .../devicetree/bindings/iio/adc/ti-adc084s021.txt | 19 + + .../devicetree/bindings/iio/adc/ti-adc108s102.txt | 18 + + .../devicetree/bindings/trivial-devices.txt | 1 + + MAINTAINERS | 1 + + drivers/iio/accel/bma180.c | 45 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 2 +- + drivers/iio/accel/st_accel_core.c | 7 +- + drivers/iio/adc/Kconfig | 24 + + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/hi8435.c | 50 +- + drivers/iio/adc/ina2xx-adc.c | 12 +- + drivers/iio/adc/meson_saradc.c | 86 +- + drivers/iio/adc/rcar-gyroadc.c | 16 +- + drivers/iio/adc/ti-adc084s021.c | 275 ++++ + drivers/iio/adc/ti-adc108s102.c | 348 ++++ + .../iio/common/hid-sensors/hid-sensor-attributes.c | 54 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 80 + + drivers/iio/dac/Kconfig | 3 +- + drivers/iio/dac/ad5064.c | 71 +- + drivers/iio/humidity/hts221.h | 3 + + drivers/iio/humidity/hts221_core.c | 54 +- + drivers/iio/humidity/hts221_i2c.c | 1 + + drivers/iio/humidity/hts221_spi.c | 1 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 6 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 52 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 1 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 1 + + drivers/iio/industrialio-core.c | 4 +- + drivers/iio/inkern.c | 4 +- + drivers/iio/light/Kconfig | 10 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/isl29018.c | 2 + + drivers/{staging => }/iio/light/isl29028.c | 76 +- + drivers/iio/light/rpr0521.c | 307 +++- + drivers/iio/light/tsl2583.c | 106 +- + drivers/iio/orientation/hid-sensor-rotation.c | 55 +- + drivers/iio/pressure/Kconfig | 2 +- + drivers/iio/pressure/st_pressure_core.c | 8 +- + drivers/iio/pressure/zpa2326.c | 18 +- + drivers/iio/proximity/as3935.c | 6 +- + drivers/iio/temperature/maxim_thermocouple.c | 1 + + drivers/iio/trigger/stm32-timer-trigger.c | 113 +- + drivers/staging/android/ion/ion-ioctl.c | 4 +- + drivers/staging/android/ion/ion.c | 24 +- + drivers/staging/android/ion/ion.h | 14 - + drivers/staging/android/ion/ion_carveout_heap.c | 2 +- + drivers/staging/android/ion/ion_system_heap.c | 6 +- + drivers/staging/android/uapi/ion.h | 24 - + drivers/staging/ccree/cc_bitops.h | 62 - + drivers/staging/ccree/cc_crypto_ctx.h | 147 +- + drivers/staging/ccree/cc_hal.h | 15 +- + drivers/staging/ccree/cc_hw_queue_defs.h | 918 +++++------ + drivers/staging/ccree/cc_lli_defs.h | 57 +- + 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 | 98 +- + drivers/staging/ccree/dx_crys_kernel.h | 314 ++-- + drivers/staging/ccree/dx_env.h | 224 --- + drivers/staging/ccree/dx_host.h | 262 +-- + drivers/staging/ccree/dx_reg_base_host.h | 15 +- + drivers/staging/ccree/dx_reg_common.h | 8 +- + drivers/staging/ccree/hash_defs.h | 62 +- + drivers/staging/ccree/hw_queue_defs_plat.h | 43 - + drivers/staging/ccree/ssi_aead.c | 1261 +++++++-------- + drivers/staging/ccree/ssi_aead.h | 51 +- + drivers/staging/ccree/ssi_buffer_mgr.c | 513 +++--- + drivers/staging/ccree/ssi_buffer_mgr.h | 34 +- + drivers/staging/ccree/ssi_cipher.c | 469 ++---- + drivers/staging/ccree/ssi_cipher.h | 20 +- + drivers/staging/ccree/ssi_config.h | 19 +- + drivers/staging/ccree/ssi_driver.c | 48 +- + drivers/staging/ccree/ssi_driver.h | 72 +- + drivers/staging/ccree/ssi_fips.c | 26 +- + drivers/staging/ccree/ssi_fips.h | 24 +- + drivers/staging/ccree/ssi_fips_data.h | 117 +- + drivers/staging/ccree/ssi_fips_ext.c | 52 +- + drivers/staging/ccree/ssi_fips_ll.c | 899 ++++++----- + drivers/staging/ccree/ssi_fips_local.c | 53 +- + drivers/staging/ccree/ssi_fips_local.h | 8 +- + drivers/staging/ccree/ssi_hash.c | 1672 +++++++++----------- + drivers/staging/ccree/ssi_hash.h | 56 +- + drivers/staging/ccree/ssi_ivgen.c | 144 +- + drivers/staging/ccree/ssi_ivgen.h | 40 +- + drivers/staging/ccree/ssi_pm.c | 8 +- + drivers/staging/ccree/ssi_pm.h | 8 +- + drivers/staging/ccree/ssi_pm_ext.c | 20 +- + drivers/staging/ccree/ssi_pm_ext.h | 8 +- + drivers/staging/ccree/ssi_request_mgr.c | 298 ++-- + drivers/staging/ccree/ssi_request_mgr.h | 20 +- + drivers/staging/ccree/ssi_sram_mgr.c | 46 +- + drivers/staging/ccree/ssi_sram_mgr.h | 46 +- + drivers/staging/ccree/ssi_sysfs.c | 55 +- + drivers/staging/ccree/ssi_sysfs.h | 8 +- + drivers/staging/comedi/drivers/ni_labpc_isadma.h | 2 +- + drivers/staging/comedi/drivers/ni_labpc_regs.h | 2 +- + drivers/staging/comedi/drivers/s626.c | 9 +- + drivers/staging/dgnc/dgnc_driver.c | 2 - + 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/fb_hx8340bn.c | 2 +- + drivers/staging/fbtft/fbtft-io.c | 2 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 267 ++-- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 33 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 64 +- + drivers/staging/fsl-mc/README.txt | 6 +- + drivers/staging/fsl-mc/bus/dpbp-cmd.h | 2 +- + drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 2 +- + drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 2 +- + drivers/staging/fsl-mc/bus/dpmng-cmd.h | 2 +- + drivers/staging/fsl-mc/bus/dprc-cmd.h | 2 +- + drivers/staging/fsl-mc/bus/dprc-driver.c | 4 +- + drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 20 +- + drivers/staging/fsl-mc/bus/fsl-mc-msi.c | 1 + + drivers/staging/fsl-mc/bus/fsl-mc-private.h | 1 - + drivers/staging/fsl-mc/include/dprc.h | 3 - + drivers/staging/fsl-mc/include/mc-sys.h | 1 - + drivers/staging/gdm724x/gdm_usb.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/iio/frequency/ad9834.c | 22 +- + drivers/staging/iio/frequency/dds.h | 2 +- + drivers/staging/iio/light/Kconfig | 10 - + drivers/staging/iio/light/Makefile | 3 +- + .../iio/light/{tsl2x7x_core.c => tsl2x7x.c} | 66 +- + drivers/staging/iio/meter/ade7753.c | 101 +- + drivers/staging/iio/meter/ade7754.c | 56 +- + drivers/staging/iio/meter/ade7758_core.c | 50 +- + drivers/staging/iio/meter/ade7854.c | 88 +- + drivers/staging/ks7010/eap_packet.h | 4 +- + drivers/staging/ks7010/ks7010_sdio.c | 10 +- + drivers/staging/ks7010/ks_hostif.c | 105 +- + drivers/staging/ks7010/ks_hostif.h | 192 +-- + drivers/staging/ks7010/ks_wlan.h | 8 +- + drivers/staging/ks7010/ks_wlan_net.c | 20 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 4 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 12 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 20 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 2 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 11 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 20 +- + drivers/staging/lustre/lustre/llite/dir.c | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 13 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 8 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 54 +- + 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 | 40 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 131 +- + 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/core/rtw_sta_mgt.c | 8 - + 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/dot11d.h | 4 +- + 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_core.c | 10 +- + 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/hal_com.c | 5 +- + 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_hal_init.c | 3 +- + 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/ieee80211.h | 8 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 4 +- + 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/rtl8723bs/os_dep/wifi_regd.c | 46 +- + drivers/staging/rts5208/rtsx_scsi.c | 2 +- + drivers/staging/rts5208/sd.c | 4 +- + drivers/staging/rts5208/xd.c | 2 +- + 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 | 28 +- + drivers/staging/sm750fb/sm750_accel.c | 15 +- + drivers/staging/sm750fb/sm750_cursor.c | 17 +- + drivers/staging/speakup/Makefile | 1 + + drivers/staging/speakup/main.c | 2 + + drivers/staging/speakup/serialio.c | 28 +- + 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_bns.c | 8 +- + 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/Documentation/overview.txt | 14 +- + drivers/staging/unisys/include/channel.h | 60 +- + drivers/staging/unisys/include/iochannel.h | 39 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 56 +- + drivers/staging/unisys/visorbus/vbuschannel.h | 25 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 125 +- + drivers/staging/unisys/visorbus/visorbus_private.h | 24 +- + drivers/staging/unisys/visorbus/visorchannel.c | 8 +- + drivers/staging/unisys/visorbus/visorchipset.c | 226 ++- + drivers/staging/unisys/visorhba/visorhba_main.c | 17 +- + .../staging/unisys/visorinput/ultrainputreport.h | 49 +- + drivers/staging/unisys/visorinput/visorinput.c | 51 +- + drivers/staging/unisys/visornic/visornic_main.c | 23 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 21 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 14 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 95 +- + drivers/staging/vme/devices/vme_pio2.h | 80 +- + drivers/staging/vt6655/card.c | 2 +- + drivers/staging/vt6655/card.h | 2 +- + drivers/staging/vt6655/device_main.c | 19 +- + drivers/staging/vt6655/key.c | 4 +- + 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 | 88 +- + drivers/staging/wilc1000/host_interface.h | 19 +- + drivers/staging/wilc1000/linux_wlan.c | 37 +- + drivers/staging/wilc1000/wilc_debugfs.c | 28 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 36 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 + + drivers/staging/wilc1000/wilc_wlan_if.h | 2 +- + drivers/staging/wlan-ng/hfa384x.h | 4 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 18 +- + drivers/staging/wlan-ng/prism2fw.c | 24 +- + drivers/staging/wlan-ng/prism2mgmt.c | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 2 +- + drivers/staging/wlan-ng/prism2sta.c | 100 +- + drivers/tty/tty_io.c | 10 +- + drivers/tty/tty_ldisc.c | 2 + + include/linux/hid-sensor-hub.h | 5 + + include/linux/hid-sensor-ids.h | 5 + + include/linux/iio/timer/stm32-timer-trigger.h | 2 + + include/linux/mfd/stm32-timers.h | 2 + + include/linux/tty.h | 2 + + tools/iio/Makefile | 2 +- + tools/iio/iio_utils.h | 2 +- + 302 files changed, 8262 insertions(+), 8493 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc084s021.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc108s102.txt + create mode 100644 drivers/iio/adc/ti-adc084s021.c + create mode 100644 drivers/iio/adc/ti-adc108s102.c + rename drivers/{staging => }/iio/light/isl29028.c (89%) + delete mode 100644 drivers/staging/ccree/cc_bitops.h + 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 + rename drivers/staging/iio/light/{tsl2x7x_core.c => tsl2x7x.c} (95%) + 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 (4afb424efe3f Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/arm-pl08x.txt | 9 +- + .../devicetree/bindings/dma/brcm,iproc-sba.txt | 29 + + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 5 +- + Documentation/devicetree/bindings/dma/shdma.txt | 2 +- + arch/arm/mach-lpc32xx/phy3250.c | 3 + + arch/arm/mach-s3c64xx/pl080.c | 28 +- + arch/arm/mach-spear/spear3xx.c | 14 +- + arch/arm/mach-spear/spear6xx.c | 14 +- + crypto/async_tx/async_pq.c | 5 +- + drivers/dma/Kconfig | 23 +- + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 970 ++++++++--- + drivers/dma/bcm-sba-raid.c | 1785 ++++++++++++++++++++ + drivers/dma/dw/platform.c | 6 +- + drivers/dma/imx-dma.c | 7 +- + drivers/dma/imx-sdma.c | 27 +- + drivers/dma/ioat/dca.c | 8 +- + drivers/dma/mv_xor_v2.c | 62 +- + drivers/dma/mxs-dma.c | 2 +- + drivers/dma/pl330.c | 75 +- + drivers/dma/sh/rcar-dmac.c | 27 +- + drivers/dma/ste_dma40.c | 5 +- + include/linux/amba/pl080.h | 107 +- + include/linux/amba/pl08x.h | 30 +- + include/linux/raid/pq.h | 1 + + lib/raid6/mktables.c | 20 + + 26 files changed, 2942 insertions(+), 323 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 (b6053d40e338 cgroup: fix lockdep warning in debug controller) +$ git merge cgroup/for-next +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 3 + + init/Kconfig | 7 +- + kernel/cgroup/Makefile | 1 + + kernel/cgroup/cgroup-internal.h | 2 + + kernel/cgroup/cgroup-v1.c | 155 +---------------- + kernel/cgroup/cgroup.c | 10 ++ + kernel/cgroup/debug.c | 357 ++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 380 insertions(+), 155 deletions(-) + create mode 100644 kernel/cgroup/debug.c +Merging scsi/for-next (1080f7ec6125 scsi: lpfc: update to revision to 11.4.0.0) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_scan.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/qedf/qedf_main.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/atari_scsi.c | 2 +- + drivers/scsi/csiostor/csio_hw.c | 98 +- + drivers/scsi/csiostor/csio_hw.h | 1 + + 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_lnode.c | 43 +- + drivers/scsi/csiostor/csio_wr.c | 4 +- + drivers/scsi/esas2r/esas2r.h | 4 +- + drivers/scsi/esas2r/esas2r_init.c | 4 +- + drivers/scsi/esas2r/esas2r_ioctl.c | 10 +- + drivers/scsi/fcoe/fcoe.c | 12 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +- + drivers/scsi/hpsa.c | 849 ++------- + drivers/scsi/hpsa.h | 4 +- + drivers/scsi/hpsa_cmd.h | 20 +- + drivers/scsi/libiscsi.c | 4 +- + drivers/scsi/lpfc/lpfc.h | 23 +- + drivers/scsi/lpfc/lpfc_attr.c | 94 +- + drivers/scsi/lpfc/lpfc_ct.c | 31 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 78 +- + drivers/scsi/lpfc/lpfc_els.c | 17 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 14 +- + drivers/scsi/lpfc/lpfc_hw4.h | 14 + + drivers/scsi/lpfc/lpfc_init.c | 125 +- + drivers/scsi/lpfc/lpfc_nvme.c | 178 +- + drivers/scsi/lpfc/lpfc_nvme.h | 2 - + drivers/scsi/lpfc/lpfc_nvmet.c | 222 ++- + drivers/scsi/lpfc/lpfc_nvmet.h | 14 +- + drivers/scsi/lpfc/lpfc_scsi.c | 19 +- + drivers/scsi/lpfc/lpfc_sli.c | 79 +- + drivers/scsi/lpfc/lpfc_sli.h | 1 + + drivers/scsi/lpfc/lpfc_sli4.h | 12 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_mm.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8 +- + drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 2 +- + drivers/scsi/qedf/drv_fcoe_fw_funcs.h | 2 +- + drivers/scsi/qedf/drv_scsi_fw_funcs.c | 2 +- + drivers/scsi/qedf/drv_scsi_fw_funcs.h | 2 +- + drivers/scsi/qedf/qedf.h | 2 +- + drivers/scsi/qedf/qedf_attr.c | 59 +- + drivers/scsi/qedf/qedf_dbg.h | 2 +- + drivers/scsi/qedf/qedf_debugfs.c | 2 +- + drivers/scsi/qedf/qedf_els.c | 8 +- + drivers/scsi/qedf/qedf_fip.c | 22 +- + drivers/scsi/qedf/qedf_hsi.h | 2 +- + drivers/scsi/qedf/qedf_io.c | 37 +- + drivers/scsi/qedf/qedf_main.c | 203 +- + drivers/scsi/qedf/qedf_version.h | 8 +- + drivers/scsi/qla2xxx/qla_attr.c | 2 +- + drivers/scsi/qla2xxx/qla_bsg.c | 2 +- + drivers/scsi/qla2xxx/qla_dbg.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 9 +- + drivers/scsi/qla2xxx/qla_dfs.c | 8 +- + drivers/scsi/qla2xxx/qla_gbl.h | 3 +- + drivers/scsi/qla2xxx/qla_gs.c | 141 +- + drivers/scsi/qla2xxx/qla_init.c | 372 ++-- + drivers/scsi/qla2xxx/qla_inline.h | 16 + + drivers/scsi/qla2xxx/qla_iocb.c | 4 +- + drivers/scsi/qla2xxx/qla_isr.c | 35 +- + drivers/scsi/qla2xxx/qla_mbx.c | 73 +- + drivers/scsi/qla2xxx/qla_nx.h | 17 +- + drivers/scsi/qla2xxx/qla_os.c | 166 +- + drivers/scsi/qla2xxx/qla_target.c | 408 ++-- + drivers/scsi/qla2xxx/qla_target.h | 8 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 16 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 15 +- + drivers/scsi/scsi.c | 9 +- + drivers/scsi/scsi_error.c | 8 +- + drivers/scsi/scsi_lib.c | 306 +-- + drivers/scsi/scsi_priv.h | 3 + + drivers/scsi/scsi_scan.c | 16 +- + drivers/scsi/scsi_sysfs.c | 34 +- + drivers/scsi/scsi_transport_srp.c | 7 +- + drivers/scsi/sd.c | 7 +- + drivers/scsi/smartpqi/smartpqi.h | 194 +- + drivers/scsi/smartpqi/smartpqi_init.c | 2419 ++++++++++++++++++------ + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 2 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 100 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 7 +- + drivers/scsi/snic/snic_scsi.c | 2 - + drivers/scsi/storvsc_drv.c | 52 +- + drivers/scsi/ufs/tc-dwc-g210-pci.c | 2 - + drivers/scsi/ufs/ufshcd-pci.c | 60 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 2 - + drivers/scsi/ufs/ufshcd.c | 12 +- + drivers/scsi/virtio_scsi.c | 1 - + drivers/scsi/xen-scsifront.c | 1 - + include/linux/hyperv.h | 1 - + include/scsi/scsi_cmnd.h | 1 + + include/scsi/scsi_device.h | 7 +- + 100 files changed, 4576 insertions(+), 2887 deletions(-) +Merging scsi-mkp/for-next (1080f7ec6125 scsi: lpfc: update to revision to 11.4.0.0) +$ git merge scsi-mkp/for-next +Already up-to-date. +Merging target-updates/for-next (28d44b983000 tcmu: Add Type of reconfig into netlink) +$ git merge target-updates/for-next +Resolved 'drivers/scsi/qla2xxx/qla_target.c' using previous resolution. +Auto-merging drivers/target/target_core_pscsi.c +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 936e5b19d3ab] Merge remote-tracking branch 'target-updates/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 156 ++++++++++++++++++++-- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 25 +++- + drivers/scsi/ibmvscsi_tgt/libsrp.h | 5 +- + drivers/scsi/qla2xxx/qla_target.c | 37 ++---- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- + drivers/target/iscsi/iscsi_target.c | 22 +++- + drivers/target/iscsi/iscsi_target_nego.c | 24 ---- + drivers/target/iscsi/iscsi_target_tpg.c | 8 +- + drivers/target/target_core_alua.c | 8 +- + drivers/target/target_core_configfs.c | 6 +- + drivers/target/target_core_device.c | 28 ++-- + drivers/target/target_core_fabric_configfs.c | 25 ++-- + drivers/target/target_core_fabric_lib.c | 6 +- + drivers/target/target_core_iblock.c | 44 ++++--- + drivers/target/target_core_internal.h | 2 +- + drivers/target/target_core_pr.c | 99 +++----------- + drivers/target/target_core_pscsi.c | 20 ++- + drivers/target/target_core_rd.c | 4 +- + drivers/target/target_core_sbc.c | 65 +++------ + drivers/target/target_core_spc.c | 42 +++--- + drivers/target/target_core_tmr.c | 34 ++--- + drivers/target/target_core_tpg.c | 17 ++- + drivers/target/target_core_transport.c | 188 +++++++++++++++++++++++---- + drivers/target/target_core_user.c | 152 +++++++++++++++++++++- + drivers/target/target_core_xcopy.c | 114 +++++++++------- + drivers/vhost/scsi.c | 11 +- + drivers/xen/xen-scsiback.c | 36 ++--- + include/target/iscsi/iscsi_target_core.h | 1 - + include/target/target_core_backend.h | 8 ++ + include/target/target_core_base.h | 9 +- + include/target/target_core_fabric.h | 1 + + include/uapi/linux/target_core_user.h | 9 ++ + 33 files changed, 781 insertions(+), 433 deletions(-) +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 (2ea659a9ef48 Linux 4.12-rc1) +$ git merge target-bva/for-next +Already up-to-date. +Merging libata/for-next (d6f6f8c3f726 Merge branch 'for-4.13' into for-next) +$ git merge libata/for-next +Auto-merging include/linux/libata.h +Auto-merging include/linux/ata.h +Auto-merging drivers/ata/sata_via.c +Auto-merging drivers/ata/libata.h +Auto-merging drivers/ata/libata-sff.c +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libahci.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/ata/cortina,gemini-sata-bridge.txt | 55 ++ + .../devicetree/bindings/ata/faraday,ftide010.txt | 38 ++ + MAINTAINERS | 9 + + drivers/ata/Kconfig | 21 + + drivers/ata/Makefile | 2 + + drivers/ata/ahci_qoriq.c | 14 + + drivers/ata/libahci.c | 4 +- + drivers/ata/libata-core.c | 212 +++++--- + drivers/ata/libata-eh.c | 64 --- + drivers/ata/libata-scsi.c | 117 ++++- + drivers/ata/libata-sff.c | 44 +- + drivers/ata/libata.h | 4 +- + drivers/ata/pata_bf54x.c | 2 - + drivers/ata/pata_ep93xx.c | 1 - + drivers/ata/pata_ftide010.c | 567 +++++++++++++++++++++ + drivers/ata/pata_rb532_cf.c | 2 - + drivers/ata/pata_rdc.c | 2 +- + drivers/ata/pata_samsung_cf.c | 2 - + drivers/ata/pata_sch.c | 2 +- + drivers/ata/sata_dwc_460ex.c | 1 - + drivers/ata/sata_fsl.c | 2 - + drivers/ata/sata_gemini.c | 438 ++++++++++++++++ + drivers/ata/sata_gemini.h | 21 + + drivers/ata/sata_inic162x.c | 2 +- + drivers/ata/sata_via.c | 6 +- + include/linux/ata.h | 11 +- + include/linux/libata.h | 1 + + 27 files changed, 1431 insertions(+), 213 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/cortina,gemini-sata-bridge.txt + create mode 100644 Documentation/devicetree/bindings/ata/faraday,ftide010.txt + create mode 100644 drivers/ata/pata_ftide010.c + create mode 100644 drivers/ata/sata_gemini.c + create mode 100644 drivers/ata/sata_gemini.h +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 (0696d197bda1 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwlock/sprd-hwspinlock.txt | 23 + + .../devicetree/bindings/soc/qcom/qcom,glink.txt | 73 ++ + drivers/hwspinlock/Kconfig | 26 +- + drivers/hwspinlock/Makefile | 1 + + drivers/hwspinlock/sprd_hwspinlock.c | 183 +++ + drivers/remoteproc/remoteproc_core.c | 178 +-- + drivers/rpmsg/Kconfig | 10 + + drivers/rpmsg/Makefile | 1 + + drivers/rpmsg/qcom_glink_rpm.c | 1233 ++++++++++++++++++++ + drivers/rpmsg/qcom_smd.c | 11 + + drivers/rpmsg/virtio_rpmsg_bus.c | 9 + + 11 files changed, 1672 insertions(+), 76 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt + create mode 100644 drivers/hwspinlock/sprd_hwspinlock.c + create mode 100644 drivers/rpmsg/qcom_glink_rpm.c +Merging gpio/for-next (65e82a93ae35 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging include/linux/gpio/machine.h +Auto-merging drivers/pinctrl/pinctrl-mcp23s08.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/acpi/gpio-properties.txt | 65 +++ + .../devicetree/bindings/gpio/gpio-mvebu.txt | 6 +- + Documentation/devicetree/bindings/gpio/gpio.txt | 13 +- + MAINTAINERS | 15 + + arch/arm/configs/lpc32xx_defconfig | 2 +- + arch/arm/mach-davinci/board-da830-evm.c | 2 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- + arch/arm/mach-pxa/balloon3.c | 2 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/stargate2.c | 2 +- + arch/blackfin/configs/BF609-EZKIT_defconfig | 2 +- + arch/blackfin/mach-bf527/boards/tll6527m.c | 8 +- + arch/blackfin/mach-bf537/boards/stamp.c | 2 +- + arch/blackfin/mach-bf609/boards/ezkit.c | 4 +- + arch/mips/ath79/mach-pb44.c | 2 +- + drivers/gpio/Kconfig | 27 +- + drivers/gpio/Makefile | 2 +- + drivers/gpio/gpio-adp5588.c | 2 +- + drivers/gpio/gpio-arizona.c | 35 +- + drivers/gpio/gpio-davinci.c | 11 +- + drivers/gpio/gpio-max732x.c | 2 +- + drivers/gpio/gpio-merrifield.c | 1 - + drivers/gpio/gpio-ml-ioh.c | 16 +- + drivers/gpio/gpio-mockup.c | 37 +- + drivers/gpio/gpio-mvebu.c | 458 ++++++++------- + drivers/gpio/gpio-pcf857x.c | 2 +- + drivers/gpio/gpio-pch.c | 15 +- + drivers/gpio/gpio-sta2x11.c | 12 +- + drivers/gpio/gpio-xra1403.c | 237 ++++++++ + drivers/gpio/gpio-zynq.c | 26 +- + drivers/gpio/gpiolib-acpi.c | 185 +++--- + drivers/gpio/gpiolib-of.c | 5 +- + drivers/gpio/gpiolib.c | 31 +- + drivers/gpio/gpiolib.h | 18 +- + drivers/input/keyboard/adp5588-keys.c | 2 +- + drivers/pinctrl/Kconfig | 13 + + drivers/pinctrl/Makefile | 1 + + .../gpio-mcp23s08.c => pinctrl/pinctrl-mcp23s08.c} | 647 +++++++++++++-------- + drivers/pnp/pnpacpi/rsparser.c | 38 +- + include/dt-bindings/gpio/gpio.h | 4 + + include/linux/acpi.h | 7 + + include/linux/gpio/driver.h | 3 + + include/linux/gpio/machine.h | 2 + + include/linux/of_gpio.h | 1 + + include/linux/{i2c => platform_data}/adp5588.h | 0 + include/linux/{i2c => platform_data}/max732x.h | 0 + include/linux/{i2c => platform_data}/pcf857x.h | 0 + include/linux/spi/mcp23s08.h | 38 +- + 49 files changed, 1346 insertions(+), 663 deletions(-) + create mode 100644 drivers/gpio/gpio-xra1403.c + rename drivers/{gpio/gpio-mcp23s08.c => pinctrl/pinctrl-mcp23s08.c} (64%) + rename include/linux/{i2c => platform_data}/adp5588.h (100%) + rename include/linux/{i2c => platform_data}/max732x.h (100%) + rename include/linux/{i2c => platform_data}/pcf857x.h (100%) +Merging pinctrl/for-next (97ce3e6dc904 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Resolved 'MAINTAINERS' using previous resolution. +Removing drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c +Removing drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h +Removing drivers/pinctrl/mediatek/pinctrl-mt7623.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Removing arch/mips/jz4740/gpio.c +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2c3e200fb54c] Merge remote-tracking branch 'pinctrl/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/ingenic,gpio.txt | 46 + + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 + + .../bindings/pinctrl/ingenic,pinctrl.txt | 41 + + .../devicetree/bindings/pinctrl/pinctrl-zx.txt | 85 + + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 2 + + Documentation/pinctrl.txt | 1124 ++++++------ + MAINTAINERS | 1 + + arch/mips/Kconfig | 1 + + arch/mips/boot/dts/ingenic/ci20.dts | 60 + + arch/mips/boot/dts/ingenic/jz4740.dtsi | 68 + + arch/mips/boot/dts/ingenic/jz4780.dtsi | 98 + + arch/mips/boot/dts/ingenic/qi_lb60.dts | 13 + + arch/mips/include/asm/mach-jz4740/gpio.h | 371 ---- + arch/mips/jz4740/Makefile | 2 - + arch/mips/jz4740/board-qi_lb60.c | 48 +- + arch/mips/jz4740/gpio.c | 519 ------ + drivers/gpio/Kconfig | 11 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-ingenic.c | 394 ++++ + drivers/mmc/host/jz4740_mmc.c | 44 +- + drivers/mtd/nand/jz4740_nand.c | 23 +- + drivers/pinctrl/Kconfig | 12 + + drivers/pinctrl/Makefile | 2 + + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 13 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 20 +- + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 12 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 6 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 6 +- + drivers/pinctrl/core.c | 30 +- + drivers/pinctrl/freescale/Kconfig | 2 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 135 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 29 + + drivers/pinctrl/freescale/pinctrl-vf610.c | 2 + + drivers/pinctrl/intel/Kconfig | 8 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-cannonlake.c | 442 +++++ + drivers/pinctrl/intel/pinctrl-intel.c | 200 +- + drivers/pinctrl/intel/pinctrl-intel.h | 65 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 1 + + 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-meson-gxbb.c | 48 +- + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 63 +- + drivers/pinctrl/meson/pinctrl-meson.h | 15 +- + drivers/pinctrl/meson/pinctrl-meson8.c | 147 +- + drivers/pinctrl/meson/pinctrl-meson8b.c | 32 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 229 +++ + drivers/pinctrl/pinconf.c | 35 +- + drivers/pinctrl/pinctrl-amd.c | 95 +- + drivers/pinctrl/pinctrl-ingenic.c | 852 +++++++++ + drivers/pinctrl/pinctrl-rockchip.c | 343 +++- + drivers/pinctrl/pinctrl-single.c | 8 +- + drivers/pinctrl/pinctrl-xway.c | 2 +- + drivers/pinctrl/sh-pfc/Kconfig | 10 + + drivers/pinctrl/sh-pfc/Makefile | 2 + + drivers/pinctrl/sh-pfc/core.c | 12 + + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 1341 +++++++------- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 1256 ++++++------- + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 30 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 20 +- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 606 +++++- + drivers/pinctrl/sh-pfc/sh_pfc.h | 2 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 69 +- + drivers/pinctrl/stm32/pinctrl-stm32.h | 5 +- + drivers/pinctrl/sunxi/Kconfig | 10 +- + drivers/pinctrl/sunxi/Makefile | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 287 ++- + drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 1056 ----------- + drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c | 128 ++ + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 3 + + drivers/pinctrl/tegra/pinctrl-tegra.c | 1 - + drivers/pinctrl/tegra/pinctrl-tegra114.c | 11 +- + drivers/pinctrl/tegra/pinctrl-tegra124.c | 11 +- + drivers/pinctrl/tegra/pinctrl-tegra20.c | 11 +- + drivers/pinctrl/tegra/pinctrl-tegra210.c | 9 +- + drivers/pinctrl/tegra/pinctrl-tegra30.c | 11 +- + 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 +++++++++++ + drivers/pwm/pwm-jz4740.c | 29 - + drivers/video/fbdev/jz4740_fb.c | 104 +- + 87 files changed, 7976 insertions(+), 6779 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/ingenic,gpio.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt + delete mode 100644 arch/mips/jz4740/gpio.c + create mode 100644 drivers/gpio/gpio-ingenic.c + create mode 100644 drivers/pinctrl/intel/pinctrl-cannonlake.c + delete mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7623.c + delete mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h + create mode 100644 drivers/pinctrl/pinctrl-ingenic.c + delete mode 100644 drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c + 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 (a453f3693f2a pinctrl: samsung: Explicitly cast pointer returned by of_iomap() to iomem) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/Kconfig | 10 + + drivers/pinctrl/samsung/Makefile | 2 + + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 815 +++++++++++++++++ + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 399 ++++++++ + drivers/pinctrl/samsung/pinctrl-exynos.c | 1169 +----------------------- + drivers/pinctrl/samsung/pinctrl-exynos.h | 13 + + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 15 +- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 2 +- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 2 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 39 +- + 10 files changed, 1269 insertions(+), 1197 deletions(-) + create mode 100644 drivers/pinctrl/samsung/pinctrl-exynos-arm.c + create mode 100644 drivers/pinctrl/samsung/pinctrl-exynos-arm64.c +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 3957baeeee75] 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 (296990deb389 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 (9d9035bc6d78 random: suppress duplicate crng_init=0 warnings) +$ git merge random/dev +Auto-merging net/ipv4/route.c +Auto-merging net/core/neighbour.c +Auto-merging net/ceph/ceph_common.c +Auto-merging lib/Kconfig.debug +Auto-merging drivers/target/iscsi/iscsi_target_login.c +Merge made by the 'recursive' strategy. + drivers/char/random.c | 77 +++++++++++++++++++++++++------ + drivers/target/iscsi/iscsi_target_auth.c | 14 ++++-- + drivers/target/iscsi/iscsi_target_login.c | 22 +++++---- + fs/cifs/cifsfs.c | 2 +- + include/linux/net.h | 2 + + include/linux/once.h | 2 + + include/linux/random.h | 26 +++++++++++ + lib/Kconfig.debug | 16 +++++++ + lib/rhashtable.c | 2 +- + net/ceph/ceph_common.c | 6 ++- + net/core/neighbour.c | 3 +- + net/ipv4/route.c | 3 +- + 12 files changed, 143 insertions(+), 32 deletions(-) +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (34539b6c487c kselftest: membarrier: make test names more informative) +$ git merge kselftest/next +Resolved 'Documentation/dev-tools/index.rst' using previous resolution. +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging tools/testing/selftests/kselftest_harness.h +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/dev-tools/kselftest.rst +Auto-merging Documentation/dev-tools/index.rst +CONFLICT (content): Merge conflict in Documentation/dev-tools/index.rst +Auto-merging Documentation/00-INDEX +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f7ab22a99fcc] Merge remote-tracking branch 'kselftest/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/00-INDEX | 2 - + Documentation/dev-tools/index.rst | 1 + + .../{kselftest.txt => dev-tools/kselftest.rst} | 100 ++- + MAINTAINERS | 6 +- + kernel/trace/trace.c | 3 +- + .../selftests/breakpoints/breakpoint_test.c | 29 +- + .../selftests/breakpoints/breakpoint_test_arm64.c | 3 +- + .../breakpoints/step_after_suspend_test.c | 47 +- + tools/testing/selftests/ftrace/ftracetest | 2 +- + .../ftrace/test.d/event/toplevel-enable.tc | 8 +- + .../ftrace/test.d/ftrace/func-filter-glob.tc | 28 +- + .../ftrace/test.d/ftrace/func_event_triggers.tc | 9 + + .../test.d/ftrace/func_traceonoff_triggers.tc | 13 + + .../ftrace/test.d/instances/instance-event.tc | 5 +- + .../ftrace/test.d/kprobe/kretprobe_maxactive.tc | 1 + + .../selftests/futex/functional/futex_requeue_pi.c | 3 +- + .../functional/futex_requeue_pi_mismatched_ops.c | 4 +- + .../functional/futex_requeue_pi_signal_restart.c | 3 +- + .../functional/futex_wait_private_mapped_file.c | 5 +- + .../futex/functional/futex_wait_timeout.c | 4 +- + .../functional/futex_wait_uninitialized_heap.c | 3 +- + .../futex/functional/futex_wait_wouldblock.c | 3 +- + tools/testing/selftests/futex/include/logging.h | 4 +- + tools/testing/selftests/kselftest.h | 57 +- + .../test_harness.h => kselftest_harness.h} | 689 +++++++++++++-------- + .../testing/selftests/membarrier/membarrier_test.c | 38 +- + tools/testing/selftests/seccomp/Makefile | 2 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 4 +- + tools/testing/selftests/size/get_size.c | 27 +- + tools/testing/selftests/sync/sync_test.c | 13 + + tools/testing/selftests/vm/virtual_address_range.c | 35 +- + 31 files changed, 756 insertions(+), 395 deletions(-) + rename Documentation/{kselftest.txt => dev-tools/kselftest.rst} (52%) + rename tools/testing/selftests/{seccomp/test_harness.h => kselftest_harness.h} (52%) +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 (c87a040fb6c5 Merge branch 'for-4.12/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (92cd7037795e arm64: dts: qcom: msm8916: Add debug unit) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (5c82a6ae0242 rtc: remove rtc_device.name) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + Documentation/rtc.txt | 44 ++-- + drivers/rtc/class.c | 7 +- + drivers/rtc/interface.c | 9 +- + drivers/rtc/rtc-dev.c | 2 +- + drivers/rtc/rtc-ds1307.c | 604 +++++++++++++++++----------------------------- + drivers/rtc/rtc-m41t80.c | 251 +++++++++++++------ + drivers/rtc/rtc-opal.c | 10 + + drivers/rtc/rtc-pcf8563.c | 2 +- + drivers/rtc/rtc-sysfs.c | 3 +- + include/linux/rtc.h | 1 - + 10 files changed, 445 insertions(+), 488 deletions(-) +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 uuid/for-next (87085ff2e90e thermal: int340x_thermal: fix compile after the UUID API switch) +$ git merge uuid/for-next +Recorded preimage for 'drivers/acpi/apei/ghes.c' +Recorded preimage for 'include/uapi/linux/uuid.h' +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging include/uapi/linux/uuid.h +CONFLICT (content): Merge conflict in include/uapi/linux/uuid.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/acpi.h +Auto-merging include/acpi/acpi_bus.h +Removing fs/xfs/uuid.h +Removing fs/xfs/uuid.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/pci/pci-label.c +Auto-merging drivers/pci/pci-acpi.c +Auto-merging drivers/nvme/host/fc.c +Auto-merging drivers/mmc/host/sdhci-pci-core.c +Auto-merging drivers/md/md.c +Auto-merging drivers/hid/i2c-hid/i2c-hid.c +Auto-merging drivers/char/tpm/tpm_crb.c +Auto-merging drivers/acpi/apei/ghes.c +CONFLICT (content): Merge conflict in drivers/acpi/apei/ghes.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git merge --abort +Merging akpm-current/current (0ed23b4f356b ipc/util.h: update documentation for ipc_getref() and ipc_putref()) +$ git merge --no-ff akpm-current/current +Resolved 'include/linux/random.h' using previous resolution. +Removing tools/testing/selftests/sysctl/run_stringtests +Removing tools/testing/selftests/sysctl/run_numerictests +Removing tools/testing/selftests/sysctl/common_tests +Auto-merging scripts/checkpatch.pl +Auto-merging mm/vmscan.c +Auto-merging mm/rmap.c +Auto-merging mm/page_io.c +Auto-merging mm/gup.c +Auto-merging mm/Kconfig +Auto-merging lib/rhashtable.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/signal.c +Auto-merging kernel/kexec_file.c +Auto-merging kernel/exit.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging include/uapi/linux/magic.h +Auto-merging include/linux/vm_event_item.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/random.h +CONFLICT (content): Merge conflict in include/linux/random.h +Auto-merging include/linux/kernel.h +Auto-merging fs/namespace.c +Auto-merging fs/jfs/jfs_metapage.c +Auto-merging fs/buffer.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/base/node.c +Auto-merging arch/x86/xen/mmu_pv.c +Auto-merging arch/x86/mm/kasan_init_64.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/mm/init.c +Auto-merging arch/s390/mm/hugetlbpage.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/kernel/fadump.c +Removing arch/mn10300/include/asm/fb.h +Removing arch/mn10300/include/asm/device.h +Removing arch/frv/include/asm/fb.h +Removing arch/frv/include/asm/device.h +Auto-merging arch/arm64/mm/hugetlbpage.c +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cf229ab8f6ca] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-zram | 10 + + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/blockdev/zram.txt | 3 + + Documentation/cgroup-v1/memory.txt | 47 +- + Documentation/cgroup-v2.txt | 48 +- + Documentation/dev-tools/kmemleak.rst | 1 + + Documentation/fault-injection/fault-injection.txt | 79 +++ + Documentation/filesystems/proc.txt | 6 +- + Documentation/kdump/kdump.txt | 12 +- + Documentation/vm/ksm.txt | 63 ++ + MAINTAINERS | 11 + + arch/arm/include/asm/page.h | 2 + + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/hugetlb.h | 4 + + arch/arm64/include/asm/stackprotector.h | 1 + + arch/arm64/mm/hugetlbpage.c | 53 +- + arch/arm64/mm/kasan_init.c | 8 +- + arch/frv/include/asm/Kbuild | 2 + + arch/frv/include/asm/device.h | 7 - + arch/frv/include/asm/fb.h | 12 - + arch/ia64/kernel/machine_kexec.c | 5 - + arch/ia64/mm/hugetlbpage.c | 4 +- + arch/ia64/mm/init.c | 11 +- + arch/metag/mm/hugetlbpage.c | 3 +- + arch/mips/mm/hugetlbpage.c | 3 +- + arch/mn10300/include/asm/Kbuild | 2 + + arch/mn10300/include/asm/device.h | 1 - + arch/mn10300/include/asm/fb.h | 23 - + arch/parisc/mm/hugetlbpage.c | 3 +- + arch/powerpc/include/asm/book3s/64/hugetlb.h | 10 + + arch/powerpc/kernel/fadump.c | 3 +- + arch/powerpc/mm/hugetlbpage.c | 90 +-- + arch/powerpc/mm/mem.c | 12 +- + arch/powerpc/platforms/Kconfig.cputype | 6 + + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/hugetlb.h | 5 +- + arch/s390/kernel/machine_kexec.c | 1 + + arch/s390/kernel/setup.c | 6 - + arch/s390/mm/hugetlbpage.c | 3 +- + arch/s390/mm/init.c | 32 +- + arch/sh/include/asm/stackprotector.h | 1 + + arch/sh/mm/hugetlbpage.c | 3 +- + arch/sh/mm/init.c | 10 +- + arch/sparc/mm/hugetlbpage.c | 3 +- + arch/tile/mm/hugetlbpage.c | 3 +- + arch/tile/mm/pgtable.c | 11 + + arch/x86/Kconfig | 3 +- + arch/x86/include/asm/hugetlb.h | 4 + + arch/x86/include/asm/stackprotector.h | 1 + + arch/x86/kernel/crash.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/mm/hugetlbpage.c | 2 +- + arch/x86/mm/init_32.c | 7 +- + arch/x86/mm/init_64.c | 11 +- + arch/x86/mm/kasan_init_64.c | 7 +- + arch/x86/xen/mmu_pv.c | 4 +- + block/genhd.c | 2 +- + drivers/base/memory.c | 83 ++- + drivers/base/node.c | 72 +- + 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 | 238 +++++-- + drivers/block/zram/zram_drv.h | 33 +- + drivers/sh/intc/virq.c | 4 +- + fs/Kconfig | 1 - + fs/bfs/inode.c | 2 +- + fs/buffer.c | 43 +- + fs/dax.c | 2 +- + fs/dcache.c | 18 +- + fs/eventpoll.c | 62 +- + fs/exofs/dir.c | 2 +- + fs/ext2/dir.c | 2 +- + fs/file.c | 22 +- + fs/hugetlbfs/inode.c | 11 + + fs/inode.c | 14 +- + fs/jfs/jfs_metapage.c | 7 +- + fs/jfs/jfs_metapage.h | 1 + + fs/minix/dir.c | 2 +- + fs/namespace.c | 10 +- + fs/ncpfs/mmap.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 66 +- + fs/ocfs2/dlm/dlmrecovery.c | 40 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/filecheck.c | 357 ++++------ + fs/ocfs2/filecheck.h | 29 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_fs.h | 5 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/super.c | 35 +- + fs/proc/base.c | 44 ++ + fs/proc/generic.c | 32 +- + fs/proc/proc_sysctl.c | 26 +- + fs/seq_file.c | 10 - + fs/sysv/dir.c | 2 +- + fs/ufs/dir.c | 2 +- + fs/userfaultfd.c | 12 +- + include/asm-generic/bug.h | 1 + + include/asm-generic/hugetlb.h | 4 +- + include/linux/bootmem.h | 1 + + include/linux/bug.h | 72 +- + include/linux/build_bug.h | 84 +++ + include/linux/crash_core.h | 9 +- + include/linux/eventpoll.h | 5 + + include/linux/gfp.h | 11 +- + include/linux/huge_mm.h | 8 + + include/linux/hugetlb.h | 92 ++- + include/linux/ipc.h | 3 + + include/linux/kernel.h | 9 +- + include/linux/kexec.h | 2 + + include/linux/khugepaged.h | 3 +- + include/linux/kmemleak.h | 7 + + include/linux/memblock.h | 25 - + include/linux/memcontrol.h | 318 +++++++-- + include/linux/memory_hotplug.h | 53 +- + include/linux/mempolicy.h | 12 +- + include/linux/mm.h | 2 +- + include/linux/mmzone.h | 63 +- + include/linux/node.h | 35 +- + include/linux/nodemask.h | 4 - + include/linux/page-flags.h | 7 +- + include/linux/random.h | 21 + + include/linux/reboot.h | 4 + + include/linux/sched.h | 3 +- + include/linux/sched/coredump.h | 5 +- + include/linux/sem.h | 24 +- + include/linux/slub_def.h | 34 +- + include/linux/swap.h | 24 +- + include/linux/swap_cgroup.h | 6 +- + include/linux/swapops.h | 9 - + include/linux/sysctl.h | 3 + + include/linux/vm_event_item.h | 1 + + include/linux/vmstat.h | 1 - + include/uapi/linux/kcmp.h | 10 + + include/uapi/linux/magic.h | 1 + + include/uapi/linux/mempolicy.h | 8 - + include/uapi/linux/sem.h | 2 +- + include/uapi/linux/sysctl.h | 4 + + ipc/msg.c | 28 +- + ipc/sem.c | 155 ++-- + ipc/shm.c | 26 +- + ipc/util.c | 65 +- + ipc/util.h | 23 +- + kernel/cgroup/cpuset.c | 33 +- + kernel/crash_core.c | 44 +- + kernel/exit.c | 1 - + kernel/fork.c | 30 +- + 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 + + kernel/signal.c | 4 + + kernel/sys.c | 6 +- + kernel/sysctl.c | 304 +++++++- + kernel/sysctl_binary.c | 2 +- + lib/Kconfig.debug | 13 +- + lib/Makefile | 1 + + lib/fault-inject.c | 7 + + lib/interval_tree_test.c | 93 ++- + lib/kstrtox.c | 12 +- + lib/rhashtable.c | 7 +- + lib/test_sysctl.c | 148 ++++ + mm/Kconfig | 39 +- + mm/cma.c | 5 +- + mm/compaction.c | 5 +- + mm/filemap.c | 10 +- + mm/gup.c | 201 ++++-- + mm/huge_memory.c | 29 +- + mm/hugetlb.c | 173 +++-- + mm/kasan/kasan.c | 152 ++-- + mm/kasan/kasan_init.c | 12 + + mm/khugepaged.c | 3 +- + mm/kmemleak.c | 136 +++- + mm/ksm.c | 820 ++++++++++++++++++++-- + mm/madvise.c | 4 +- + mm/memblock.c | 3 - + mm/memcontrol.c | 131 ++-- + mm/memory-failure.c | 342 +++++---- + mm/memory.c | 10 +- + mm/memory_hotplug.c | 544 +++++--------- + mm/mempolicy.c | 181 ++--- + mm/migrate.c | 23 +- + mm/mmap.c | 2 +- + mm/mprotect.c | 2 - + mm/nobootmem.c | 2 +- + mm/oom_kill.c | 5 + + mm/page-writeback.c | 29 +- + mm/page_alloc.c | 192 +++-- + mm/page_io.c | 23 +- + mm/page_isolation.c | 26 +- + mm/page_owner.c | 4 +- + mm/page_vma_mapped.c | 3 +- + mm/pagewalk.c | 3 +- + mm/rmap.c | 15 +- + mm/shmem.c | 15 +- + mm/slab.c | 12 +- + mm/slab.h | 18 +- + mm/slub.c | 113 +-- + mm/sparse.c | 104 ++- + mm/swap.c | 1 + + mm/swap_cgroup.c | 43 +- + mm/swap_slots.c | 16 +- + mm/swap_state.c | 108 +-- + mm/swapfile.c | 291 ++++++-- + mm/vmalloc.c | 17 +- + mm/vmpressure.c | 122 +++- + mm/vmscan.c | 107 ++- + mm/vmstat.c | 26 +- + mm/workingset.c | 9 +- + mm/zsmalloc.c | 2 +- + mm/zswap.c | 11 +- + samples/kfifo/dma-example.c | 8 +- + scripts/checkpatch.pl | 13 +- + scripts/gdb/linux/constants.py.in | 7 + + scripts/gdb/linux/proc.py | 73 ++ + scripts/gen_initramfs_list.sh | 2 + + tools/testing/selftests/sysctl/Makefile | 3 +- + tools/testing/selftests/sysctl/common_tests | 109 --- + tools/testing/selftests/sysctl/config | 1 + + tools/testing/selftests/sysctl/run_numerictests | 10 - + tools/testing/selftests/sysctl/run_stringtests | 77 -- + tools/testing/selftests/sysctl/sysctl.sh | 745 ++++++++++++++++++++ + usr/Kconfig | 24 +- + 231 files changed, 6502 insertions(+), 3165 deletions(-) + delete mode 100644 arch/frv/include/asm/device.h + delete mode 100644 arch/frv/include/asm/fb.h + delete mode 100644 arch/mn10300/include/asm/device.h + delete mode 100644 arch/mn10300/include/asm/fb.h + create mode 100644 drivers/block/zram/zram_dedup.c + create mode 100644 drivers/block/zram/zram_dedup.h + create mode 100644 include/linux/build_bug.h + create mode 100644 lib/test_sysctl.c + delete mode 100644 tools/testing/selftests/sysctl/common_tests + create mode 100644 tools/testing/selftests/sysctl/config + delete mode 100755 tools/testing/selftests/sysctl/run_numerictests + delete mode 100755 tools/testing/selftests/sysctl/run_stringtests + create mode 100644 tools/testing/selftests/sysctl/sysctl.sh +$ 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: net/netfilter/x_tables.c: use kvmalloc() in xt_alloc_table_info() +Applying: sparc64: NG4 memset 32 bits overflow +Applying: xtensa: use generic fb.h +Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 54baa043ef68...0de51ddf2e64 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (0de51ddf2e64 lib/crc-ccitt: add CCITT-FALSE CRC16 variant) +$ git merge --no-ff akpm/master +Removing arch/xtensa/include/asm/fb.h +Merge made by the 'recursive' strategy. + arch/sparc/lib/NG4memset.S | 26 +++++++++---------- + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/asm/fb.h | 12 --------- + include/linux/crc-ccitt.h | 7 +++++ + lib/crc-ccitt.c | 58 +++++++++++++++++++++++++++++++++++++++++- + net/netfilter/x_tables.c | 12 +++------ + 6 files changed, 82 insertions(+), 34 deletions(-) + delete mode 100644 arch/xtensa/include/asm/fb.h |