diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 4114 |
1 files changed, 4114 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..a147d9808c79 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4114 @@ +$ date -R +Thu, 26 Apr 2018 07:55:12 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6d08b06e67cd Linux 4.17-rc2 +Merging origin/master (3be4aaf4e2d3 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge origin/master +Updating 6d08b06e67cd..3be4aaf4e2d3 +Fast-forward + drivers/net/bonding/bond_main.c | 3 +- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 8 + + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 16 ++ + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 + + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 ++- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 + + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 196 ++++++++++++++++++++-- + drivers/net/ethernet/amd/xgbe/xgbe.h | 9 + + drivers/net/ethernet/ibm/ibmvnic.c | 4 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 2 +- + drivers/net/ethernet/intel/ice/ice_common.c | 22 ++- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 2 - + drivers/net/ethernet/intel/ice/ice_main.c | 4 - + drivers/net/ethernet/intel/ice/ice_sched.c | 4 +- + drivers/net/ethernet/intel/igb/igb_main.c | 17 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/ethernet/sfc/ef10.c | 80 +++++---- + drivers/net/ethernet/sfc/efx.c | 143 ++++++++++++++++ + drivers/net/ethernet/sfc/efx.h | 21 +++ + drivers/net/ethernet/sfc/farch.c | 41 ++++- + drivers/net/ethernet/sfc/net_driver.h | 36 ++++ + drivers/net/ethernet/sfc/rx.c | 62 ++++++- + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/phy/marvell.c | 9 + + drivers/net/ppp/pppoe.c | 4 + + drivers/net/team/team.c | 19 ++- + drivers/s390/net/qeth_core.h | 2 - + drivers/s390/net/qeth_core_main.c | 158 ++++++++--------- + drivers/s390/net/qeth_core_mpc.h | 12 ++ + drivers/s390/net/qeth_l2_main.c | 59 ++++--- + include/linux/bpf.h | 4 +- + include/linux/ethtool.h | 2 + + include/net/ife.h | 3 +- + include/net/llc_conn.h | 1 + + kernel/bpf/core.c | 45 +++-- + kernel/bpf/sockmap.c | 3 - + kernel/trace/bpf_trace.c | 25 ++- + net/bridge/netfilter/ebtables.c | 11 +- + net/ife/ife.c | 38 ++++- + net/ipv4/tcp_input.c | 7 +- + net/ipv6/netfilter/Kconfig | 55 +++--- + net/ipv6/route.c | 2 + + net/ipv6/seg6_iptunnel.c | 2 +- + net/l2tp/l2tp_debugfs.c | 5 +- + net/l2tp/l2tp_ppp.c | 12 +- + net/llc/af_llc.c | 21 ++- + net/llc/llc_c_ac.c | 9 +- + net/llc/llc_conn.c | 22 ++- + net/netfilter/Kconfig | 1 + + net/netfilter/ipvs/ip_vs_ctl.c | 8 - + net/netfilter/ipvs/ip_vs_sync.c | 155 ++++++++--------- + net/netfilter/nf_conntrack_expect.c | 5 +- + net/netfilter/nf_conntrack_extend.c | 2 + + net/netfilter/nf_conntrack_sip.c | 16 +- + net/netfilter/nf_tables_api.c | 69 ++++---- + net/netfilter/xt_connmark.c | 49 +++--- + net/packet/af_packet.c | 60 +++++-- + net/packet/internal.h | 10 +- + net/sched/act_ife.c | 9 +- + net/strparser/strparser.c | 2 +- + security/commoncap.c | 2 + + tools/testing/selftests/bpf/.gitignore | 3 + + tools/testing/selftests/bpf/test_sock.c | 1 + + tools/testing/selftests/bpf/test_sock_addr.c | 1 + + tools/testing/selftests/bpf/test_sock_addr.sh | 4 +- + 65 files changed, 1165 insertions(+), 463 deletions(-) +Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (28913ee8191a netfilter: nf_nat_snmp_basic: add correct dependency to Makefile) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (30cfae461581 ARM: replace unnecessary perl with sed and the shell $(( )) operator) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/Makefile | 8 +++----- + arch/arm/boot/compressed/head.S | 20 ++++++++++---------- + arch/arm/kernel/machine_kexec.c | 36 +++++++++++++++++++++++------------- + 3 files changed, 36 insertions(+), 28 deletions(-) +Merging arm64-fixes/for-next/fixes (ad40bdafb495 arm64: support __int128 with clang) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/Makefile | 4 ++++ + arch/arm64/include/asm/module.h | 2 +- + arch/arm64/include/asm/pgtable.h | 4 ++-- + arch/arm64/kernel/cpufeature.c | 1 + + arch/arm64/kernel/module-plts.c | 2 +- + arch/arm64/kernel/module.c | 2 +- + arch/arm64/kernel/ptrace.c | 6 ------ + arch/arm64/kernel/traps.c | 3 ++- + arch/arm64/mm/flush.c | 2 +- + 9 files changed, 13 insertions(+), 13 deletions(-) +Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (75ecfb49516c powerpc/mce: Fix a bug where mce loops on memory UE.) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/powernv.h | 2 +- + arch/powerpc/kernel/mce_power.c | 7 +-- + arch/powerpc/mm/mem.c | 2 + + arch/powerpc/platforms/powernv/memtrace.c | 17 ------ + arch/powerpc/platforms/powernv/npu-dma.c | 88 +++++++++++++++++++++++++------ + 5 files changed, 78 insertions(+), 38 deletions(-) +Merging sparc/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (91a825290ca4 rds: ib: Fix missing call to rds_ib_dev_put in rds_ib_setup_qp) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/phy/phy_device.c | 11 ++++++++++- + net/rds/ib_cm.c | 3 ++- + net/smc/af_smc.c | 4 ---- + 3 files changed, 12 insertions(+), 6 deletions(-) +Merging bpf/master (9c299a32ede9 bpf: fix for lex/yacc build error with gcc-5) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + Documentation/bpf/bpf_devel_QA.txt | 10 +++++++- + arch/x86/net/bpf_jit_comp.c | 12 ++++++++- + include/linux/bpf.h | 4 ++- + kernel/bpf/arraymap.c | 3 ++- + kernel/bpf/sockmap.c | 51 +++++++++++++++++++++++++++++++++++--- + kernel/bpf/syscall.c | 4 +-- + net/core/filter.c | 1 + + samples/sockmap/Makefile | 7 ++++-- + tools/bpf/Makefile | 2 ++ + 9 files changed, 82 insertions(+), 12 deletions(-) +Merging ipsec/master (b48c05ab5d32 xfrm: Fix warning in xfrm6_tunnel_net_exit.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 1 + + net/ipv6/xfrm6_tunnel.c | 3 +++ + net/key/af_key.c | 45 +++++++++++++++++++++++++++++++++++---------- + net/xfrm/xfrm_state.c | 6 ++++++ + 4 files changed, 45 insertions(+), 10 deletions(-) +Merging netfilter/master (6cd968f44814 Merge branch 'amd-xgbe-fixes') +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (765cca91b895 netfilter: conntrack: include kmemleak.h for kmemleak_not_leak()) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (af8a41cccf8f rtlwifi: cleanup 8723be ant_sel definition) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + .../broadcom/brcm80211/brcmfmac/firmware.c | 36 ++++--- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 13 +-- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 111 ++++++++++++++++++--- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 15 --- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 11 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 5 + + 8 files changed, 138 insertions(+), 62 deletions(-) +Merging mac80211/master (2f0605a697f4 nl80211: Free connkeys on external authentication failure) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + include/uapi/linux/nl80211.h | 2 ++ + net/mac80211/mlme.c | 2 +- + net/wireless/core.c | 3 +++ + net/wireless/nl80211.c | 1 + + net/wireless/reg.c | 1 + + 5 files changed, 8 insertions(+), 1 deletion(-) +Merging rdma-fixes/for-rc (dc5640f294e4 IB/core: Fix deleting default GIDs when changing mac adddress) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cache.c | 55 ++++++++++++++-------- + drivers/infiniband/core/roce_gid_mgmt.c | 26 +++++----- + drivers/infiniband/core/ucma.c | 44 ++++++++++------- + .../infiniband/core/uverbs_std_types_flow_action.c | 12 ++--- + drivers/infiniband/hw/mlx5/Kconfig | 1 + + drivers/infiniband/hw/mlx5/main.c | 1 - + include/uapi/linux/if_infiniband.h | 2 +- + include/uapi/linux/rds.h | 2 +- + include/uapi/linux/tls.h | 2 +- + include/uapi/rdma/cxgb3-abi.h | 2 +- + include/uapi/rdma/cxgb4-abi.h | 2 +- + include/uapi/rdma/hns-abi.h | 2 +- + include/uapi/rdma/ib_user_cm.h | 2 +- + include/uapi/rdma/ib_user_ioctl_verbs.h | 2 +- + include/uapi/rdma/ib_user_mad.h | 2 +- + include/uapi/rdma/ib_user_sa.h | 2 +- + include/uapi/rdma/ib_user_verbs.h | 2 +- + include/uapi/rdma/mlx4-abi.h | 2 +- + include/uapi/rdma/mlx5-abi.h | 2 +- + include/uapi/rdma/mthca-abi.h | 2 +- + include/uapi/rdma/nes-abi.h | 2 +- + include/uapi/rdma/qedr-abi.h | 2 +- + include/uapi/rdma/rdma_user_cm.h | 2 +- + include/uapi/rdma/rdma_user_ioctl.h | 2 +- + include/uapi/rdma/rdma_user_rxe.h | 2 +- + 25 files changed, 103 insertions(+), 74 deletions(-) +Merging sound-current/for-linus (8a7d6003df41 ALSA: hda - Skip jack and others for non-existing PCM streams) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/control.h | 7 ++- + sound/core/control.c | 2 +- + sound/core/pcm_compat.c | 7 +-- + sound/core/pcm_native.c | 30 ++++++------- + sound/core/seq/oss/seq_oss_event.c | 15 ++++--- + sound/core/seq/oss/seq_oss_midi.c | 2 + + sound/core/seq/oss/seq_oss_synth.c | 85 ++++++++++++++++++++--------------- + sound/core/seq/oss/seq_oss_synth.h | 3 +- + sound/drivers/opl3/opl3_synth.c | 7 ++- + sound/firewire/dice/dice.c | 2 +- + sound/pci/asihpi/hpimsginit.c | 13 ++++-- + sound/pci/asihpi/hpioctl.c | 4 +- + sound/pci/hda/hda_hwdep.c | 12 ++++- + sound/pci/hda/patch_hdmi.c | 9 +++- + sound/pci/hda/patch_realtek.c | 5 +++ + sound/pci/rme9652/hdspm.c | 24 +++++----- + sound/pci/rme9652/rme9652.c | 6 ++- + sound/soc/amd/acp-da7219-max98357a.c | 2 +- + sound/soc/codecs/adau17x1.c | 26 ++++++++--- + sound/soc/codecs/adau17x1.h | 3 +- + sound/soc/codecs/msm8916-wcd-analog.c | 9 ++-- + sound/soc/codecs/rt5514.c | 3 ++ + sound/soc/fsl/fsl_esai.c | 7 +++ + sound/soc/fsl/fsl_ssi.c | 14 ++++-- + sound/soc/intel/Kconfig | 22 +++++---- + sound/soc/omap/omap-dmic.c | 14 ++++-- + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/soc-topology.c | 14 +++--- + sound/usb/mixer.c | 7 +-- + sound/usb/mixer_maps.c | 3 ++ + sound/usb/stream.c | 2 +- + sound/usb/usx2y/us122l.c | 2 +- + sound/usb/usx2y/usX2Yhwdep.c | 2 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- + 34 files changed, 243 insertions(+), 126 deletions(-) +Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/dwc/pcie-kirin.c | 2 +- + drivers/pci/host/pci-aardvark.c | 53 +++++++++++++++++++++++------------------ + drivers/pci/pci.c | 4 ++-- + 3 files changed, 33 insertions(+), 26 deletions(-) +Merging driver-core.current/driver-core-linus (b93815d0f37e firmware: some documentation fixes) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + Documentation/driver-api/firmware/request_firmware.rst | 16 ++++++++-------- + Documentation/driver-api/infrastructure.rst | 2 +- + Documentation/power/suspend-and-cpuhotplug.txt | 2 +- + drivers/base/firmware_loader/fallback.c | 4 ++-- + drivers/base/firmware_loader/fallback.h | 2 +- + include/linux/device.h | 6 ++++-- + lib/kobject.c | 11 +++++------ + tools/testing/selftests/firmware/Makefile | 1 + + tools/testing/selftests/firmware/fw_lib.sh | 10 ++++++---- + tools/testing/selftests/firmware/fw_run_tests.sh | 2 +- + 10 files changed, 30 insertions(+), 26 deletions(-) +Merging tty.current/tty-linus (bcdd0ca8cb87 tty: Use __GFP_NOFAIL for tty_ldisc_get()) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + .../bindings/serial/amlogic,meson-uart.txt | 2 +- + .../devicetree/bindings/serial/mvebu-uart.txt | 2 +- + .../bindings/serial/renesas,sci-serial.txt | 2 ++ + drivers/of/fdt.c | 7 ++++-- + drivers/tty/n_gsm.c | 23 ++++++++++++++++- + drivers/tty/serial/earlycon.c | 6 +++-- + drivers/tty/serial/imx.c | 19 +++++++++++++- + drivers/tty/serial/mvebu-uart.c | 1 - + drivers/tty/serial/qcom_geni_serial.c | 10 +++++--- + drivers/tty/serial/xilinx_uartps.c | 2 +- + drivers/tty/tty_io.c | 5 +++- + drivers/tty/tty_ldisc.c | 29 ++++++++++------------ + include/asm-generic/vmlinux.lds.h | 2 +- + include/linux/serial_core.h | 21 ++++++++++------ + include/linux/tty.h | 2 +- + 15 files changed, 93 insertions(+), 40 deletions(-) +Merging usb.current/usb-linus (be75d8f1da08 USB: musb: dsps: drop duplicate phy initialisation) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/usb-xhci.txt | 5 +- + Documentation/driver-api/usb/typec.rst | 2 +- + drivers/usb/Kconfig | 1 + + drivers/usb/core/hcd.c | 19 +++-- + drivers/usb/core/hub.c | 10 ++- + drivers/usb/core/phy.c | 93 +++++++++++++++------- + drivers/usb/core/phy.h | 22 ++++- + drivers/usb/core/quirks.c | 3 + + drivers/usb/host/xhci-dbgtty.c | 8 +- + drivers/usb/host/xhci-pci.c | 5 +- + drivers/usb/host/xhci-plat.c | 32 +++++--- + drivers/usb/host/xhci.h | 3 +- + drivers/usb/musb/musb_dsps.c | 2 - + drivers/usb/musb/musb_host.c | 1 + + drivers/usb/typec/ucsi/Makefile | 2 +- + drivers/usb/typec/ucsi/ucsi.c | 2 +- + drivers/usb/usbip/stub_main.c | 5 ++ + drivers/usb/usbip/usbip_common.h | 2 +- + drivers/usb/usbip/usbip_event.c | 4 - + drivers/usb/usbip/vhci_hcd.c | 13 +++ + 20 files changed, 174 insertions(+), 60 deletions(-) +Merging usb-gadget-fixes/fixes (c6ba5084ce0d usb: gadget: udc: renesas_usb3: add binging for r8a77965) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (470b5d6f0cf4 USB: serial: ftdi_sio: use jtag quirk for Arrow USB Blaster) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/Kconfig | 1 + + drivers/usb/serial/cp210x.c | 1 + + drivers/usb/serial/ftdi_sio.c | 3 ++- + drivers/usb/serial/usb-serial-simple.c | 7 +++++++ + 4 files changed, 11 insertions(+), 1 deletion(-) +Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (b00e2fd10429 staging: wilc1000: fix NULL pointer exception in host_int_parse_assoc_resp_info()) +$ git merge staging.current/staging-linus +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/ip-sysctl.txt +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 2 -- + Documentation/networking/ip-sysctl.txt | 15 --------------- + Documentation/process/magic-number.rst | 3 --- + MAINTAINERS | 10 ---------- + drivers/staging/wilc1000/host_interface.c | 2 +- + include/uapi/linux/sysctl.h | 18 ------------------ + kernel/sysctl_binary.c | 20 +------------------- + 7 files changed, 2 insertions(+), 68 deletions(-) +Merging char-misc.current/char-misc-linus (d2ffed5185df ARM: amba: Don't read past the end of sysfs "driver_override" buffer) +$ git merge char-misc.current/char-misc-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 ++- + drivers/amba/bus.c | 14 +++++-- + drivers/android/binder.c | 8 ++++ + drivers/fpga/altera-ps-spi.c | 2 +- + drivers/slimbus/messaging.c | 2 +- + drivers/uio/uio_hv_generic.c | 72 ++++++++++---------------------- + drivers/virt/vboxguest/vboxguest_core.c | 70 +++++++++++++++++-------------- + drivers/virt/vboxguest/vboxguest_core.h | 9 ++++ + drivers/virt/vboxguest/vboxguest_linux.c | 19 +++++++-- + drivers/virt/vboxguest/vboxguest_utils.c | 17 ++++++-- + include/linux/vbox_utils.h | 23 ---------- + 11 files changed, 124 insertions(+), 118 deletions(-) +Merging input-current/for-linus (596ea7aad431 MAINTAINERS: Rakesh Iyer can't be reached anymore) +$ git merge input-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/input/input-leds.c | 8 ++++---- + drivers/input/mouse/alps.c | 2 +- + drivers/input/rmi4/rmi_spi.c | 7 +++++-- + drivers/input/touchscreen/Kconfig | 2 +- + 5 files changed, 11 insertions(+), 9 deletions(-) +Merging crypto-current/master (eea0d3ea7546 crypto: drbg - set freed buffers to NULL) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/api.c | 11 ++++++++--- + crypto/drbg.c | 2 ++ + 2 files changed, 10 insertions(+), 3 deletions(-) +Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (834814e80268 Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it") +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (8bf24e831961 selftests/filesystems: Don't run dnotify_test by default) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Merge made by the 'recursive' strategy. + kernel/module.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) +$ git merge backlight-fixes/for-backlight-fixes +Merge made by the 'recursive' strategy. + drivers/video/backlight/as3711_bl.c | 45 ++++++++++++++++++++++------------- + drivers/video/backlight/max8925_bl.c | 4 +++- + drivers/video/backlight/tps65217_bl.c | 4 ++-- + include/linux/mfd/as3711.h | 4 ++-- + 4 files changed, 36 insertions(+), 21 deletions(-) +Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +Already up to date. +Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (f017ca642e8a media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR) +$ git merge v4l-dvb-fixes/fixes +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h +Merge made by the 'recursive' strategy. + drivers/media/cec/cec-pin-error-inj.c | 10 +- + drivers/media/cec/cec-pin.c | 2 +- + drivers/media/dvb-core/dvb_frontend.c | 23 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 85 +-- + drivers/media/pci/mantis/mantis_uart.c | 7 + + drivers/media/platform/Kconfig | 4 +- + drivers/media/platform/davinci/Kconfig | 6 +- + drivers/media/platform/davinci/isif.c | 4 +- + drivers/media/platform/davinci/vpbe.c | 38 +- + drivers/media/platform/davinci/vpbe_display.c | 33 +- + drivers/media/platform/davinci/vpbe_osd.c | 21 +- + drivers/media/platform/davinci/vpbe_venc.c | 9 +- + drivers/media/platform/exynos4-is/Kconfig | 4 +- + drivers/media/platform/fsl-viu.c | 63 +- + drivers/media/platform/marvell-ccic/Kconfig | 5 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 6 +- + drivers/media/platform/omap/Kconfig | 8 +- + drivers/media/platform/omap/omap_vout.c | 17 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 4 +- + drivers/media/platform/omap3isp/isp.c | 14 +- + drivers/media/platform/omap3isp/ispccdc.c | 2 +- + drivers/media/platform/omap3isp/isppreview.c | 2 +- + drivers/media/platform/omap3isp/ispstat.c | 6 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 4 +- + drivers/media/radio/Kconfig | 4 - + drivers/media/radio/si470x/Kconfig | 16 +- + drivers/media/radio/si470x/Makefile | 8 +- + drivers/media/radio/si470x/radio-si470x-common.c | 70 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 24 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 18 +- + drivers/media/radio/si470x/radio-si470x.h | 15 +- + drivers/media/rc/st_rc.c | 16 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 3 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 807 +++++++++++++-------- + drivers/media/v4l2-core/v4l2-fwnode.c | 28 +- + .../media/atomisp/pci/atomisp2/atomisp_acc.c | 8 +- + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 9 +- + .../media/atomisp/pci/atomisp2/atomisp_compat.h | 2 +- + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 2 +- + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.c | 92 +-- + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 6 +- + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 5 +- + .../css2400/hive_isp_css_common/host/mmu.c | 4 - + .../css2400/hive_isp_css_common/host/mmu_private.h | 44 -- + .../css2400/hive_isp_css_include/host/mmu_public.h | 22 +- + .../memory_access/memory_access.h | 2 +- + .../css2400/hive_isp_css_include/mmu_device.h | 8 - + .../pci/atomisp2/css2400/ia_css_frame_public.h | 2 +- + .../pci/atomisp2/css2400/ia_css_memory_access.c | 4 +- + .../isp/kernels/eed1_8/ia_css_eed1_8.host.c | 16 +- + .../pci/atomisp2/css2400/runtime/frame/src/frame.c | 2 +- + .../atomisp/pci/atomisp2/css2400/sh_css_frac.h | 2 +- + .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 2 +- + .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 6 +- + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c | 22 +- + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h | 11 +- + .../media/atomisp/pci/atomisp2/include/hmm/hmm.h | 2 +- + .../atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 2 +- + .../platform/intel-mid/atomisp_gmin_platform.c | 6 - + drivers/staging/media/davinci_vpfe/Kconfig | 3 +- + drivers/staging/media/davinci_vpfe/Makefile | 5 + + drivers/staging/media/davinci_vpfe/TODO | 1 + + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 143 ++-- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 19 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 14 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 9 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 13 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 4 +- + drivers/staging/media/imx/imx-media-csi.c | 2 +- + drivers/staging/media/omap4iss/Kconfig | 3 +- + drivers/video/fbdev/omap2/Kconfig | 2 +- + include/linux/platform_data/media/mmp-camera.h | 19 + + 73 files changed, 1041 insertions(+), 865 deletions(-) + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h +Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (b3d7e55c3f88 MIPS: uaccess: Add micromips clobbers to bzero invocation) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging kvm-fixes/master (06e22bb6fa5b Merge tag 'kvmarm-fixes-for-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm) +$ git merge kvm-fixes/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 9 ++++- + Documentation/virtual/kvm/arm/psci.txt | 30 +++++++++++++++++ + MAINTAINERS | 4 +-- + arch/arm/include/asm/kvm_host.h | 3 ++ + arch/arm/include/uapi/asm/kvm.h | 6 ++++ + arch/arm/kvm/guest.c | 13 ++++++++ + arch/arm64/include/asm/kvm_host.h | 3 ++ + arch/arm64/include/uapi/asm/kvm.h | 6 ++++ + arch/arm64/kvm/guest.c | 14 +++++++- + arch/arm64/kvm/sys_regs.c | 6 ++-- + include/kvm/arm_psci.h | 16 +++++++-- + virt/kvm/arm/arm.c | 15 ++++++--- + virt/kvm/arm/psci.c | 60 ++++++++++++++++++++++++++++++++++ + virt/kvm/arm/vgic/vgic.c | 8 +++++ + 14 files changed, 178 insertions(+), 15 deletions(-) + create mode 100644 Documentation/virtual/kvm/arm/psci.txt +Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries) +$ git merge kvms390-fixes/master +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (0b551f1e0fc5 drm/i915/fbdev: Enable late fbdev initial configuration) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_cdclk.c | 16 ++++++++++++++-- + drivers/gpu/drm/i915/intel_drv.h | 4 ++-- + drivers/gpu/drm/i915/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++------ + 4 files changed, 22 insertions(+), 11 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (1f6b8eef11c3 drm/edid: Reset more of the display info) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_edid.c | 11 ++------ + drivers/gpu/drm/qxl/qxl_cmd.c | 6 ++-- + drivers/gpu/drm/qxl/qxl_drv.h | 1 + + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +-- + drivers/gpu/drm/qxl/qxl_release.c | 18 ++++++------ + drivers/gpu/drm/sun4i/sun4i_lvds.c | 55 ------------------------------------- + drivers/gpu/drm/virtio/virtgpu_vq.c | 4 +-- + 7 files changed, 19 insertions(+), 80 deletions(-) +Merging syscalls/syscalls-next (c9a211951c7c bpf: whitelist all syscalls for error injection) +$ git merge syscalls/syscalls-next +Already up to date. +Merging kbuild/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge kbuild/for-next +Already up to date. +Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) +$ git merge leaks/leaks-next +Merge made by the 'recursive' strategy. +Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Already up to date. +Merging dma-mapping/for-next (60695be2bb6b dma-mapping: postpone cpu addr translation on mmap) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + drivers/base/dma-coherent.c | 5 +++-- + drivers/base/dma-mapping.c | 6 ++---- + lib/dma-direct.c | 3 ++- + 3 files changed, 7 insertions(+), 7 deletions(-) +Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (6dc8c9d147dd Merge branches 'fixes' and 'sa1100-for-next' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap()) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. +Merging arm-soc/for-next (cb799267bb65 MAINTAINERS: Update ASPEED entry with details) +$ git merge arm-soc/for-next +Already up to date. +Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (b9b2e4f8f5fd ARM64: dts: meson-axg: add tdm pins) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/amlogic,gxbb-clkc.txt | 16 +- + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 58 ++++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 348 ++++++++++++++++++++- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 12 + + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 4 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 68 +++- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 17 + + 11 files changed, 524 insertions(+), 16 deletions(-) +Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 6 ++ + arch/arm/boot/dts/bcm2835-rpi-a.dts | 6 ++ + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 6 ++ + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 6 ++ + arch/arm/boot/dts/bcm2835-rpi-b.dts | 6 ++ + arch/arm/boot/dts/bcm2835-rpi.dtsi | 6 -- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 6 ++ + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 +++++++++++++++++++++ + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 26 ++++- + arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 ++++++ + arch/arm/configs/bcm2835_defconfig | 2 + + arch/arm/configs/multi_v7_defconfig | 4 + + arch/arm64/boot/dts/broadcom/Makefile | 3 +- + .../boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts | 2 + + arch/arm64/configs/defconfig | 2 + + 17 files changed, 213 insertions(+), 8 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts +Merging imx-mxs/for-next (7a3adfb6a804 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/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/imx25-pdk.dts | 1 - + arch/arm/boot/dts/imx53-tx53.dtsi | 1 - + arch/arm/boot/dts/imx6dl-mamoj.dts | 224 ++++++++++ + arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 151 +++++++ + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 476 +++++++++++++++++++++ + arch/arm/boot/dts/imx6q-icore-mipi.dts | 25 ++ + arch/arm/boot/dts/imx6q-icore-ofcap12.dts | 31 +- + arch/arm/boot/dts/imx6q-kp-tpc.dts | 22 + + arch/arm/boot/dts/imx6q-kp.dtsi | 432 +++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 52 ++- + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 47 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 25 +- + arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 8 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 22 + + arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 5 + + arch/arm/boot/dts/imx6ull-pinfunc.h | 4 + + arch/arm/boot/dts/imx7d-pinfunc.h | 6 +- + arch/arm/boot/dts/imx7d-sdb.dts | 24 ++ + arch/arm/boot/dts/imx7s.dtsi | 36 +- + arch/arm/configs/imx_v6_v7_defconfig | 7 + + arch/arm/mach-imx/mach-mx31_3ds.c | 18 +- + arch/arm/mach-imx/mach-mx31lilly.c | 12 +- + arch/arm/mach-imx/mach-mx31lite.c | 16 +- + arch/arm/mach-imx/mach-mx31moboard.c | 17 +- + arch/arm/mach-imx/mach-pca100.c | 13 +- + arch/arm/mach-imx/mach-pcm037.c | 13 +- + arch/arm/mach-imx/mach-pcm037_eet.c | 5 +- + arch/arm/mach-imx/mach-pcm043.c | 13 +- + arch/arm/mach-imx/mach-vpr200.c | 9 +- + drivers/soc/imx/gpc.c | 18 +- + drivers/soc/imx/gpcv2.c | 22 +- + include/linux/platform_data/spi-imx.h | 29 +- + 39 files changed, 1630 insertions(+), 166 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-mamoj.dts + create mode 100644 arch/arm/boot/dts/imx6q-dhcom-pdk2.dts + create mode 100644 arch/arm/boot/dts/imx6q-dhcom-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-icore-mipi.dts + create mode 100644 arch/arm/boot/dts/imx6q-kp-tpc.dts + create mode 100644 arch/arm/boot/dts/imx6q-kp.dtsi +Merging keystone/next (dacf37850167 Merge branch 'for_4.17/soc-drivers' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (4c1b45a44e35 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (fb289e3ab10c Merge branch 'omap-for-v4.17/fixes-ti-sysc' into omap-for-v4.17/fixes) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap4.dtsi | 8 ++-- + arch/arm/mach-omap2/Makefile | 6 +-- + arch/arm/mach-omap2/pm-asm-offsets.c | 3 ++ + arch/arm/mach-omap2/sleep33xx.S | 1 - + arch/arm/mach-omap2/sleep43xx.S | 1 - + drivers/memory/emif-asm-offsets.c | 72 +--------------------------------- + include/linux/ti-emif-sram.h | 75 ++++++++++++++++++++++++++++++++++++ + 7 files changed, 84 insertions(+), 82 deletions(-) +Merging reset/reset/next (0089313d8595 Merge branch 'reset/lookup' into reset/next) +$ git merge reset/reset/next +Already up to date. +Merging qcom/for-next (c78d6951a806 Merge branch 'soc-for-4.18' into all-for-4.18) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 3 +- + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 30 + + .../bindings/reserved-memory/qcom,cmd-db.txt | 37 + + .../devicetree/bindings/soc/qcom/qcom,geni-se.txt | 119 ++++ + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 1 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 17 +- + arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 26 + + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 32 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 69 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 18 +- + .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 17 + + arch/arm64/boot/dts/qcom/msm8992-pins.dtsi | 60 ++ + arch/arm64/boot/dts/qcom/msm8992.dtsi | 87 ++- + arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi | 276 ++++++++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 75 +++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 342 ++++++++++ + drivers/firmware/qcom_scm-32.c | 8 +- + drivers/firmware/qcom_scm.c | 3 + + drivers/of/platform.c | 1 + + drivers/soc/qcom/Kconfig | 18 + + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/cmd-db.c | 317 +++++++++ + drivers/soc/qcom/qcom-geni-se.c | 748 +++++++++++++++++++++ + drivers/soc/qcom/smd-rpm.c | 1 + + drivers/soc/qcom/smem.c | 50 +- + include/linux/qcom-geni-se.h | 425 ++++++++++++ + include/soc/qcom/cmd-db.h | 45 ++ + 29 files changed, 2796 insertions(+), 48 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845.dtsi + create mode 100644 drivers/soc/qcom/cmd-db.c + create mode 100644 drivers/soc/qcom/qcom-geni-se.c + create mode 100644 include/linux/qcom-geni-se.h + create mode 100644 include/soc/qcom/cmd-db.h +$ git reset --hard HEAD^ +HEAD is now at a72d0aa48d2e Merge remote-tracking branch 'omap/for-next' +Merging next-20180424 version of qcom +$ git merge -m next-20180424/qcom 186d88395e05eb087d730ff7f8fc6b7f4dbd8d90 +Already up to date! +Merge made by the 'recursive' strategy. +Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (9444640b1d77 Merge branches 'fixes-for-v4.17', 'arm64-dt-for-v4.18', 'defconfig-for-v4.18', 'dt-for-v4.18' and 'soc-for-v4.18' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 8 + + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../devicetree/bindings/reset/renesas,rst.txt | 2 + + arch/arm/Kconfig | 2 +- + arch/arm/Kconfig.debug | 13 +- + arch/arm/Makefile | 2 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/r7s72100.dtsi | 1033 +++++----- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 4 +- + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 5 + + arch/arm/boot/dts/r8a7743.dtsi | 12 +- + arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 5 + + arch/arm/boot/dts/r8a7745.dtsi | 12 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 35 + + arch/arm/boot/dts/r8a77470.dtsi | 323 +++ + arch/arm/boot/dts/r8a7790-lager.dts | 27 +- + arch/arm/boot/dts/r8a7790.dtsi | 104 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 17 +- + arch/arm/boot/dts/r8a7791-porter.dts | 21 +- + arch/arm/boot/dts/r8a7791.dtsi | 66 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 5 + + arch/arm/boot/dts/r8a7792-wheat.dts | 16 +- + arch/arm/boot/dts/r8a7792.dtsi | 12 +- + arch/arm/boot/dts/r8a7793-gose.dts | 15 +- + arch/arm/boot/dts/r8a7793.dtsi | 67 +- + arch/arm/boot/dts/r8a7794-alt.dts | 5 + + arch/arm/boot/dts/r8a7794-silk.dts | 5 + + arch/arm/boot/dts/r8a7794.dtsi | 21 +- + arch/arm/boot/dts/sh73a0.dtsi | 4 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/mach-shmobile/Kconfig | 13 + + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 + + arch/arm64/Kconfig.platforms | 6 + + arch/arm64/boot/dts/renesas/Makefile | 1 + + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 46 + + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 1 - + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 46 + + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 46 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2020 ++++++++++--------- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 28 + + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 28 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2103 ++++++++++---------- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 834 +++++--- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 101 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 8 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 451 +++-- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 23 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 37 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 127 ++ + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 721 ++++--- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 44 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 6 +- + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/Kconfig | 8 +- + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a77470-sysc.c | 29 + + drivers/soc/renesas/r8a77995-sysc.c | 3 +- + drivers/soc/renesas/rcar-rst.c | 2 + + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + drivers/soc/renesas/renesas-soc.c | 16 + + include/dt-bindings/power/r8a77470-sysc.h | 22 + + include/dt-bindings/power/r8a77990-sysc.h | 26 + + 66 files changed, 5149 insertions(+), 3521 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts + create mode 100644 arch/arm/boot/dts/r8a77470.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77990.dtsi + create mode 100644 drivers/soc/renesas/r8a77470-sysc.c + create mode 100644 include/dt-bindings/power/r8a77470-sysc.h + create mode 100644 include/dt-bindings/power/r8a77990-sysc.h +Merging rockchip/for-next (aaa7709c6703 Merge branch 'v4.18-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3036.dtsi | 2 ++ + arch/arm/boot/dts/rk322x.dtsi | 8 +++++ + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 1 + + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 3 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 2 ++ + arch/arm/boot/dts/rk3288.dtsi | 20 +++++++++--- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 10 ++++++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 10 ++++++ + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 8 +++++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 8 +++-- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 4 +++ + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 +++ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 12 ++++++++ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 23 +++++--------- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 36 ++++++++++++++++------ + 15 files changed, 119 insertions(+), 32 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (64c3552d7255 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/pd-samsung.txt | 20 +---- + arch/arm/boot/dts/exynos-syscon-restart.dtsi | 28 +++---- + arch/arm/boot/dts/exynos3250-rinato.dts | 4 + + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/boot/dts/exynos4.dtsi | 3 +- + arch/arm/boot/dts/exynos4210-origen.dts | 11 +++ + arch/arm/boot/dts/exynos5.dtsi | 1 - + arch/arm/boot/dts/exynos5250.dtsi | 5 +- + arch/arm/boot/dts/exynos5410.dtsi | 1 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- + arch/arm/boot/dts/exynos5420.dtsi | 15 +--- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 +- + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-s3c24xx/h1940-bluetooth.c | 2 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 10 +-- + arch/arm/plat-samsung/adc.c | 3 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 16 ++-- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 12 +-- + drivers/soc/samsung/pm_domains.c | 90 +--------------------- + 20 files changed, 65 insertions(+), 168 deletions(-) +Merging sunxi/sunxi/for-next (62960b11f7d9 Merge branches 'sunxi/dt-for-4.18' and 'sunxi/h3-h5-for-4.18' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../bindings/nvmem/allwinner,sunxi-sid.txt | 1 + + arch/arm/boot/dts/Makefile | 5 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 6 +- + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 3 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 33 ++++ + arch/arm/boot/dts/sun8i-a33.dtsi | 44 +++++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 5 + + .../boot/dts/sun8i-h2-plus-libretech-all-h3-cc.dts | 13 ++ + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 21 ++ + arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts | 206 +------------------- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 22 +++ + arch/arm/boot/dts/sun8i-h3.dtsi | 32 ++- + .../boot/dts/sun8i-r16-nintendo-nes-classic.dts | 56 ++++++ + .../dts/sun8i-r16-nintendo-super-nes-classic.dts | 11 ++ + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 10 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 18 ++ + arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 215 +++++++++++++++++++++ + arch/arm64/boot/dts/allwinner/Makefile | 5 +- + arch/arm64/boot/dts/allwinner/axp803.dtsi | 5 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 21 ++ + .../allwinner/sun50i-h5-libretech-all-h3-cc.dts | 14 ++ + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 20 +- + drivers/clk/Makefile | 2 +- + drivers/clk/sunxi-ng/Makefile | 39 ++-- + 25 files changed, 560 insertions(+), 249 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-libretech-all-h3-cc.dts + create mode 100644 arch/arm/boot/dts/sun8i-r16-nintendo-nes-classic.dts + create mode 100644 arch/arm/boot/dts/sun8i-r16-nintendo-super-nes-classic.dts + create mode 100644 arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-cc.dts +Merging tegra/for-next (6b9b5116227d Merge branch for-4.17/clk into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/soc/tegra/pmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arm64/for-next/core (24534b351182 arm64: assembler: add macros to conditionally yield the NEON under PREEMPT) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (3baba436e3a6 Merge branch 'clk-core' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/actions,s900-cmu.txt | 47 + + .../bindings/clock/nuvoton,npcm750-clk.txt | 100 + + .../devicetree/bindings/clock/qcom,gcc.txt | 1 + + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 2 + + drivers/clk/actions/Kconfig | 14 + + drivers/clk/actions/Makefile | 12 + + drivers/clk/actions/owl-common.c | 89 + + drivers/clk/actions/owl-common.h | 41 + + drivers/clk/actions/owl-composite.c | 199 ++ + drivers/clk/actions/owl-composite.h | 124 + + drivers/clk/actions/owl-divider.c | 94 + + drivers/clk/actions/owl-divider.h | 75 + + drivers/clk/actions/owl-factor.c | 222 ++ + drivers/clk/actions/owl-factor.h | 83 + + drivers/clk/actions/owl-fixed-factor.h | 28 + + drivers/clk/actions/owl-gate.c | 77 + + drivers/clk/actions/owl-gate.h | 73 + + drivers/clk/actions/owl-mux.c | 60 + + drivers/clk/actions/owl-mux.h | 61 + + drivers/clk/actions/owl-pll.c | 194 ++ + drivers/clk/actions/owl-pll.h | 92 + + drivers/clk/actions/owl-s900.c | 721 +++++ + drivers/clk/clk-cs2000-cp.c | 2 +- + drivers/clk/clk-mux.c | 10 +- + drivers/clk/clk-npcm7xx.c | 656 +++++ + drivers/clk/clk-stm32mp1.c | 54 +- + drivers/clk/clk.c | 28 +- + drivers/clk/meson/clk-regmap.c | 11 +- + drivers/clk/qcom/Kconfig | 8 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-alpha-pll.c | 301 ++- + drivers/clk/qcom/clk-alpha-pll.h | 18 +- + drivers/clk/qcom/clk-rcg2.c | 5 +- + drivers/clk/qcom/gcc-msm8998.c | 2834 ++++++++++++++++++++ + drivers/clk/qcom/gdsc.c | 24 +- + drivers/clk/qcom/gdsc.h | 4 +- + drivers/clk/spear/spear6xx_clock.c | 2 +- + include/dt-bindings/clock/actions,s900-cmu.h | 129 + + include/dt-bindings/clock/nuvoton,npcm7xx-clock.h | 44 + + include/dt-bindings/clock/qcom,gcc-msm8998.h | 208 ++ + include/dt-bindings/clock/stm32mp1-clks.h | 4 +- + include/linux/clk-provider.h | 5 +- + 43 files changed, 6694 insertions(+), 64 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/actions,s900-cmu.txt + create mode 100644 Documentation/devicetree/bindings/clock/nuvoton,npcm750-clk.txt + create mode 100644 drivers/clk/actions/Kconfig + create mode 100644 drivers/clk/actions/Makefile + create mode 100644 drivers/clk/actions/owl-common.c + create mode 100644 drivers/clk/actions/owl-common.h + create mode 100644 drivers/clk/actions/owl-composite.c + create mode 100644 drivers/clk/actions/owl-composite.h + create mode 100644 drivers/clk/actions/owl-divider.c + create mode 100644 drivers/clk/actions/owl-divider.h + create mode 100644 drivers/clk/actions/owl-factor.c + create mode 100644 drivers/clk/actions/owl-factor.h + create mode 100644 drivers/clk/actions/owl-fixed-factor.h + create mode 100644 drivers/clk/actions/owl-gate.c + create mode 100644 drivers/clk/actions/owl-gate.h + create mode 100644 drivers/clk/actions/owl-mux.c + create mode 100644 drivers/clk/actions/owl-mux.h + create mode 100644 drivers/clk/actions/owl-pll.c + create mode 100644 drivers/clk/actions/owl-pll.h + create mode 100644 drivers/clk/actions/owl-s900.c + create mode 100644 drivers/clk/clk-npcm7xx.c + create mode 100644 drivers/clk/qcom/gcc-msm8998.c + create mode 100644 include/dt-bindings/clock/actions,s900-cmu.h + create mode 100644 include/dt-bindings/clock/nuvoton,npcm7xx-clock.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8998.h +Merging clk-samsung/for-next (e4d61444bd51 clk: samsung: simplify getting .drvdata) +$ git merge clk-samsung/for-next +Removing include/dt-bindings/clock/exynos5440.h +Removing drivers/clk/samsung/clk-exynos5440.c +Removing Documentation/devicetree/bindings/clock/exynos5440-clock.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/exynos5440-clock.txt | 28 ---- + drivers/clk/samsung/Makefile | 1 - + drivers/clk/samsung/clk-exynos5440.c | 167 --------------------- + drivers/clk/samsung/clk-s3c2410-dclk.c | 6 +- + include/dt-bindings/clock/exynos5440.h | 44 ------ + 5 files changed, 2 insertions(+), 244 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/exynos5440-clock.txt + delete mode 100644 drivers/clk/samsung/clk-exynos5440.c + delete mode 100644 include/dt-bindings/clock/exynos5440.h +$ git reset --hard HEAD^ +HEAD is now at 0c0f54ca1f7a Merge remote-tracking branch 'clk/clk-next' +Merging next-20180424 version of clk-samsung +$ git merge -m next-20180424/clk-samsung 60cc43fc888428bb2f18f08997432d426a243338 +Already up to date. +Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse) +$ git merge c6x/for-linux-next +Already up to date. +Merging m68k/for-next (b87ed027ce5d m68k: Use read_persistent_clock64() consistently) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/apollo/config.c | 8 +++++--- + arch/m68k/configs/amiga_defconfig | 14 +++++++++----- + arch/m68k/configs/apollo_defconfig | 14 +++++++++----- + arch/m68k/configs/atari_defconfig | 14 +++++++++----- + arch/m68k/configs/bvme6000_defconfig | 14 +++++++++----- + arch/m68k/configs/hp300_defconfig | 14 +++++++++----- + arch/m68k/configs/mac_defconfig | 14 +++++++++----- + arch/m68k/configs/multi_defconfig | 14 +++++++++----- + arch/m68k/configs/mvme147_defconfig | 14 +++++++++----- + arch/m68k/configs/mvme16x_defconfig | 14 +++++++++----- + arch/m68k/configs/q40_defconfig | 14 +++++++++----- + arch/m68k/configs/sun3_defconfig | 14 +++++++++----- + arch/m68k/configs/sun3x_defconfig | 14 +++++++++----- + arch/m68k/kernel/signal.c | 23 ++++++++++++----------- + arch/m68k/kernel/time.c | 25 ++++++++++++++----------- + arch/m68k/mac/config.c | 2 +- + arch/m68k/mvme147/config.c | 4 +++- + arch/m68k/mvme16x/config.c | 4 +++- + arch/m68k/sun3/intersil.c | 8 +++++--- + arch/m68k/sun3x/time.c | 8 +++++--- + 20 files changed, 156 insertions(+), 94 deletions(-) +Merging m68knommu/for-next (6d08b06e67cd Linux 4.17-rc2) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (a7a9e2f0410d microblaze: dts: replace 'linux,stdout-path' with 'stdout-path') +$ git merge microblaze/next +Removing arch/microblaze/kernel/early_printk.c +Removing arch/microblaze/include/asm/prom.h +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig.debug | 8 -- + arch/microblaze/boot/Makefile | 10 +- + arch/microblaze/boot/dts/system.dts | 2 +- + arch/microblaze/include/asm/cpuinfo.h | 2 +- + arch/microblaze/include/asm/pci.h | 1 - + arch/microblaze/include/asm/prom.h | 27 ----- + arch/microblaze/include/asm/setup.h | 5 - + arch/microblaze/kernel/Makefile | 1 - + arch/microblaze/kernel/early_printk.c | 184 ---------------------------------- + arch/microblaze/kernel/misc.S | 35 ------- + arch/microblaze/kernel/platform.c | 1 - + arch/microblaze/kernel/prom.c | 82 --------------- + arch/microblaze/kernel/setup.c | 17 +--- + arch/microblaze/pci/indirect_pci.c | 1 - + 14 files changed, 12 insertions(+), 364 deletions(-) + delete mode 100644 arch/microblaze/include/asm/prom.h + delete mode 100644 arch/microblaze/kernel/early_printk.c +Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next) +$ git merge mips/mips-next +Auto-merging drivers/staging/octeon/ethernet-tx.c +Auto-merging drivers/staging/octeon/ethernet-rx.c +Auto-merging drivers/staging/octeon/ethernet-defines.h +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/cavium-octeon/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/Kconfig | 27 +- + arch/mips/cavium-octeon/Makefile | 1 + + arch/mips/cavium-octeon/resource-mgr.c | 351 +++++++++++++++++++++ + arch/mips/cavium-octeon/setup.c | 22 +- + arch/mips/include/asm/barrier.h | 2 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 20 +- + arch/mips/include/asm/mipsregs.h | 2 + + arch/mips/include/asm/octeon/octeon.h | 32 +- + arch/mips/include/asm/processor.h | 2 +- + arch/mips/kernel/octeon_switch.S | 2 - + arch/mips/mm/tlbex.c | 29 +- + drivers/staging/octeon/ethernet-defines.h | 6 - + drivers/staging/octeon/ethernet-rx.c | 25 +- + drivers/staging/octeon/ethernet-tx.c | 85 ++--- + 14 files changed, 473 insertions(+), 133 deletions(-) + create mode 100644 arch/mips/cavium-octeon/resource-mgr.c +Merging mips-james/mips-next (23f8adc497b7 MIPS: BCM47XX: Use __initdata for the bcm47xx_leds_pdata) +$ git merge mips-james/mips-next +Removing arch/mips/lib/ucmpdi2.c +Removing arch/mips/lib/lshrdi3.c +Removing arch/mips/lib/cmpdi2.c +Removing arch/mips/lib/ashrdi3.c +Removing arch/mips/lib/ashldi3.c +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 5 ++++ + arch/mips/bcm47xx/board.c | 2 ++ + arch/mips/bcm47xx/buttons.c | 9 ++++++ + arch/mips/bcm47xx/leds.c | 11 +++++++- + arch/mips/boot/compressed/Makefile | 11 +++++--- + arch/mips/boot/dts/brcm/Makefile | 2 +- + arch/mips/boot/dts/cavium-octeon/Makefile | 2 +- + arch/mips/boot/dts/ingenic/Makefile | 2 +- + arch/mips/boot/dts/lantiq/Makefile | 2 +- + arch/mips/boot/dts/mscc/Makefile | 2 +- + arch/mips/boot/dts/mti/Makefile | 2 +- + arch/mips/boot/dts/netlogic/Makefile | 2 +- + arch/mips/boot/dts/pic32/Makefile | 2 +- + arch/mips/boot/dts/ralink/Makefile | 2 +- + arch/mips/boot/dts/xilfpga/Makefile | 2 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/lib/Makefile | 3 +- + arch/mips/lib/ashldi3.c | 30 -------------------- + arch/mips/lib/ashrdi3.c | 32 ---------------------- + arch/mips/lib/cmpdi2.c | 28 ------------------- + arch/mips/lib/lshrdi3.c | 30 -------------------- + arch/mips/lib/ucmpdi2.c | 22 --------------- + arch/riscv/Kconfig | 6 ++-- + drivers/firmware/broadcom/bcm47xx_nvram.c | 2 +- + lib/Kconfig | 12 ++++---- + lib/Makefile | 12 ++++---- + lib/ucmpdi2.c | 2 +- + 27 files changed, 62 insertions(+), 176 deletions(-) + delete mode 100644 arch/mips/lib/ashldi3.c + delete mode 100644 arch/mips/lib/ashrdi3.c + delete mode 100644 arch/mips/lib/cmpdi2.c + delete mode 100644 arch/mips/lib/lshrdi3.c + delete mode 100644 arch/mips/lib/ucmpdi2.c +Merging nds32/next (99c7c4f57c4f nds32: Fix the allmodconfig build. To make sure CONFIG_CPU_LITTLE_ENDIAN is default y) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/Kconfig | 7 +++++++ + arch/nds32/Kconfig.cpu | 5 +++-- + arch/nds32/Makefile | 7 ++++--- + arch/nds32/include/asm/Kbuild | 2 ++ + arch/nds32/include/asm/cacheflush.h | 2 ++ + arch/nds32/include/asm/io.h | 2 ++ + arch/nds32/include/asm/page.h | 3 +++ + arch/nds32/include/asm/pgtable.h | 1 + + arch/nds32/kernel/ex-entry.S | 2 +- + arch/nds32/kernel/stacktrace.c | 2 ++ + arch/nds32/lib/copy_page.S | 3 +++ + arch/nds32/mm/cacheflush.c | 40 +++++++++++++++++++++++++++++++++++++ + arch/nds32/mm/init.c | 1 + + 13 files changed, 71 insertions(+), 6 deletions(-) +Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock()) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (c04d31f98cf5 parisc: Fix section mismatches) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Makefile | 7 +++---- + arch/parisc/kernel/drivers.c | 7 ++++--- + arch/parisc/kernel/pci.c | 2 +- + arch/parisc/kernel/time.c | 2 +- + arch/parisc/kernel/traps.c | 11 +++++++++++ + arch/parisc/mm/init.c | 2 +- + drivers/parisc/ccio-dma.c | 2 +- + 7 files changed, 22 insertions(+), 11 deletions(-) +Merging powerpc/next (60cc43fc8884 Linux 4.17-rc1) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) +$ git merge fsl/next +Already up to date. +Merging risc-v/for-next (6d08b06e67cd Linux 4.17-rc2) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (6cf09958f32b s390: correct module section names for expoline code revert) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/thread_info.h | 3 +++ + arch/s390/kernel/module.c | 4 ++-- + arch/s390/kernel/perf_cpum_cf_events.c | 8 ++++---- + arch/s390/kernel/process.c | 10 ++++++++++ + arch/s390/kernel/uprobes.c | 9 +++++++++ + drivers/s390/block/dasd_alias.c | 13 +++++++++++-- + drivers/s390/cio/chsc.c | 14 +++++++++++--- + drivers/s390/cio/vfio_ccw_fsm.c | 19 ++++++++++++------- + 8 files changed, 62 insertions(+), 18 deletions(-) +Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (bf9c7e3d7924 arch/sh: pcie-sh7786: handle non-zero DMA offset) +$ git merge sh/for-next +Already up to date. +Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/pci-dma.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc versions) +$ git merge fscrypt/master +Already up to date. +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits) +$ git merge btrfs/next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging fs/block_dev.c +Auto-merging block/blk-cgroup.c +Merge made by the 'recursive' strategy. + block/blk-cgroup.c | 1 + + fs/block_dev.c | 3 +-- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/disk-io.c | 4 ++++ + fs/btrfs/inode.c | 15 ++++++++++++--- + fs/btrfs/ioctl.c | 8 +++++++- + fs/btrfs/super.c | 1 - + fs/buffer.c | 42 ++++++++++++++++++++++++++++++++++-------- + fs/ext2/inode.c | 3 ++- + fs/ext2/super.c | 1 - + fs/ext4/inode.c | 4 +++- + fs/ext4/super.c | 2 -- + include/linux/backing-dev.h | 2 +- + include/linux/buffer_head.h | 3 +++ + include/linux/fs.h | 3 ++- + kernel/cgroup/cgroup.c | 1 + + 16 files changed, 72 insertions(+), 23 deletions(-) +$ git am -3 ../patches/0001-f2fs-fixup-for-cgroup-writeback-change.patch +Applying: f2fs: fixup for cgroup/writeback change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/inode.c +M fs/f2fs/super.c +$ git add -A . +$ git commit -v -a --amend +[master 022c9eecd3cd] Merge remote-tracking branch 'btrfs/next' + Date: Thu Apr 26 09:32:46 2018 +1000 +Merging btrfs-kdave/for-next (b2bcca2c9b16 Merge branch 'for-next-next-v4.18-20180424' into for-next-20180424) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + fs/btrfs/compression.c | 21 +- + fs/btrfs/ctree.h | 38 +-- + fs/btrfs/delayed-ref.c | 44 ++- + fs/btrfs/delayed-ref.h | 5 +- + fs/btrfs/dev-replace.c | 140 +++++++-- + fs/btrfs/disk-io.c | 62 +++- + fs/btrfs/extent-tree.c | 175 +++++++++--- + fs/btrfs/extent_io.c | 62 +--- + fs/btrfs/extent_io.h | 20 +- + fs/btrfs/extent_map.c | 6 +- + fs/btrfs/extent_map.h | 3 +- + fs/btrfs/file.c | 41 +-- + fs/btrfs/free-space-cache.c | 22 +- + fs/btrfs/free-space-cache.h | 3 +- + fs/btrfs/free-space-tree.c | 77 ++--- + fs/btrfs/inode.c | 322 ++++++++++++++++----- + fs/btrfs/ioctl.c | 578 ++++++++++++++++++++------------------ + fs/btrfs/print-tree.c | 21 ++ + fs/btrfs/props.c | 2 +- + fs/btrfs/relocation.c | 2 +- + fs/btrfs/super.c | 3 +- + fs/btrfs/sysfs.c | 2 +- + fs/btrfs/tests/extent-map-tests.c | 60 ++-- + fs/btrfs/transaction.c | 35 +-- + fs/btrfs/volumes.c | 406 +++++++++++--------------- + fs/btrfs/volumes.h | 7 +- + fs/btrfs/zstd.c | 19 +- + include/trace/events/btrfs.h | 225 ++++++++------- + include/uapi/linux/btrfs.h | 26 ++ + 29 files changed, 1401 insertions(+), 1026 deletions(-) +Merging ceph/master (ff2adf13bf7e libceph: validate con->state at the top of try_write()) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/xattr.c | 28 +++++++++++++++++++++++++--- + net/ceph/messenger.c | 6 ++++++ + net/ceph/mon_client.c | 14 +++++++++++--- + 3 files changed, 42 insertions(+), 6 deletions(-) +Merging cifs/for-next (d18ee79ecab8 cifs: smbd: Enable signing with smbdirect) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifssmb.c | 3 ++ + fs/cifs/connect.c | 40 ++++++++++--------------- + fs/cifs/smb2ops.c | 18 ++++++++--- + fs/cifs/smb2pdu.c | 86 ++++++++++++++++++++++++++++------------------------- + fs/cifs/smb2pdu.h | 2 +- + fs/cifs/smbdirect.c | 36 ++++++++-------------- + fs/cifs/transport.c | 9 ++++-- + 7 files changed, 97 insertions(+), 97 deletions(-) +Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption) +$ git merge ecryptfs/next +Already up to date. +Merging ext3/for_next (b1255ee6a289 Pull UDF UTF-16 handling improvements.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/udf/Kconfig | 6 +- + fs/udf/super.c | 12 +- + fs/udf/udfdecl.h | 3 +- + fs/udf/unicode.c | 260 +++++++++++++++++++-------------------- + include/linux/fsnotify_backend.h | 4 +- + 5 files changed, 132 insertions(+), 153 deletions(-) +Merging ext4/dev (b025a674fc5d ext4: force revalidation of directory pointer after seekdir(2)) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. +Merging f2fs/dev (b549e322861b f2fs: check cap_resource only for data blocks) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Merge made by the 'recursive' strategy. + fs/crypto/bio.c | 35 ++++--- + fs/crypto/crypto.c | 8 +- + fs/crypto/fscrypt_private.h | 1 - + fs/ext4/readpage.c | 2 +- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/data.c | 201 ++++++++++++++++++++++++++-------------- + fs/f2fs/f2fs.h | 21 +++-- + fs/f2fs/file.c | 4 +- + fs/f2fs/gc.c | 6 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/namei.c | 8 +- + fs/f2fs/node.c | 2 +- + fs/f2fs/super.c | 6 ++ + include/linux/fscrypt_notsupp.h | 13 ++- + include/linux/fscrypt_supp.h | 5 +- + 15 files changed, 204 insertions(+), 112 deletions(-) +Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation) +$ git merge fuse/for-next +Auto-merging fs/fuse/inode.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/fuse-io.txt | 38 +++++++++++++++++++++++++++++ + fs/fuse/acl.c | 4 ++-- + fs/fuse/control.c | 2 +- + fs/fuse/cuse.c | 11 ++++++--- + fs/fuse/dev.c | 40 +++++++++++++++---------------- + fs/fuse/dir.c | 45 +++++++++++++++++++++++++---------- + fs/fuse/fuse_i.h | 14 +++++++++-- + fs/fuse/inode.c | 40 +++++++++++++++++++------------ + include/uapi/linux/fuse.h | 7 +++++- + kernel/user_namespace.c | 1 + + 10 files changed, 145 insertions(+), 57 deletions(-) + create mode 100644 Documentation/filesystems/fuse-io.txt +Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (98de9ce6f666 NFS: advance nfs_entry cookie only after decoding completes successfully) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (36e000768550 nfsd: update obselete comment referencing the BKL) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/cache.h | 5 ----- + fs/nfsd/nfs4state.c | 20 ++++++++++---------- + fs/nfsd/nfscache.c | 6 ++---- + 3 files changed, 12 insertions(+), 19 deletions(-) +Merging orangefs/for-next (8e9ba5c48ea6 Orangefs: documentation updates) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (16149013f839 ovl: update documentation w.r.t "xino" feature) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND) +$ git merge ubifs/linux-next +Already up to date. +Merging xfs/for-next (7b38460dc8e4 xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_attr.c | 9 ++++++++- + fs/xfs/libxfs/xfs_bmap.c | 4 ++++ + fs/xfs/libxfs/xfs_inode_buf.c | 21 +++++++++++++++++++++ + fs/xfs/xfs_file.c | 14 +++++++++----- + 4 files changed, 42 insertions(+), 6 deletions(-) +Merging file-locks/locks-next (fa28b25b62ba fasync: Fix deadlock between task-context and interrupt-context kill_fasync()) +$ git merge file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/fcntl.c | 15 +++++++-------- + include/linux/fs.h | 2 +- + 2 files changed, 8 insertions(+), 9 deletions(-) +Merging vfs/for-next (d944db1fd238 Merge branches 'work.dcache' and 'work.misc' into for-next) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + fs/dcache.c | 122 +++++++++++++------------------------ + fs/fat/namei_msdos.c | 4 -- + fs/read_write.c | 6 +- + include/linux/sunrpc/rpc_pipe_fs.h | 2 - + net/sunrpc/rpc_pipe.c | 16 ----- + 5 files changed, 46 insertions(+), 104 deletions(-) +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 (f8521c77fcd4 Merge branch 'for-4.18-vsprintf-cleanup' into for-4.18) +$ git merge printk/for-next +Auto-merging lib/vsprintf.c +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 14 +----- + lib/test_printf.c | 2 +- + lib/vsprintf.c | 130 ++++++++++++++++++++----------------------------- + 3 files changed, 56 insertions(+), 90 deletions(-) +Merging pci/next (60cc43fc8884 Linux 4.17-rc1) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (ae8e917ce5db Merge branch 'for-4.17/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 14 ++++- + drivers/hid/Makefile | 1 + + drivers/hid/hid-ids.h | 9 +++ + drivers/hid/hid-input.c | 33 ++++++++++- + drivers/hid/hid-lenovo.c | 36 ++++++++++++ + drivers/hid/hid-redragon.c | 86 ++++++++++++++++++++++++++++ + drivers/hid/i2c-hid/i2c-hid.c | 23 ++++++-- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 36 ++++++------ + drivers/hid/wacom_sys.c | 4 +- + include/linux/hid.h | 2 + + 10 files changed, 212 insertions(+), 32 deletions(-) + create mode 100644 drivers/hid/hid-redragon.c +Merging i2c/i2c/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge i2c/i2c/for-next +Already up to date. +Merging dmi/master (0a5f08c2f0c7 firmware: dmi_scan: Use lowercase letters for UUID) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (03af583b1f65 Merge tag 'ib-mfd-hwmon-v4.18' into hwmon-next) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/k10temp.c | 17 ++++++++++--- + drivers/hwmon/mc13783-adc.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/nct6683.c | 4 +-- + drivers/hwmon/scmi-hwmon.c | 5 +++- + drivers/mfd/mc13xxx-core.c | 15 +++++++++++- + include/linux/mfd/mc13xxx.h | 2 ++ + 6 files changed, 96 insertions(+), 7 deletions(-) +Merging jc_docs/docs-next (3b443955596e Docs: tell maintainers to put [GIT PULL] in their subject lines) +$ git merge jc_docs/docs-next +Auto-merging mm/rmap.c +Auto-merging mm/huge_memory.c +Auto-merging fs/proc/task_mmu.c +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/vm/zswap.rst +Auto-merging Documentation/vm/zsmalloc.rst +Auto-merging Documentation/vm/z3fold.rst +Auto-merging Documentation/vm/userfaultfd.rst +Auto-merging Documentation/vm/unevictable-lru.rst +Auto-merging Documentation/vm/transhuge.rst +Auto-merging Documentation/vm/swap_numa.rst +Auto-merging Documentation/vm/split_page_table_lock.rst +Auto-merging Documentation/vm/soft-dirty.rst +Removing Documentation/vm/slub.txt +Auto-merging Documentation/vm/remap_file_pages.rst +Auto-merging Documentation/vm/pagemap.rst +Auto-merging Documentation/vm/page_owner.rst +Auto-merging Documentation/vm/page_migration.rst +Auto-merging Documentation/vm/page_frags.rst +Removing Documentation/vm/overcommit-accounting +Removing Documentation/vm/numa_memory_policy.txt +Auto-merging Documentation/vm/numa.rst +Removing Documentation/vm/mmu_notifier.txt +Removing Documentation/vm/ksm.txt +Auto-merging Documentation/vm/idle_page_tracking.rst +Auto-merging Documentation/vm/hwpoison.rst +Auto-merging Documentation/vm/hugetlbpage.rst +Auto-merging Documentation/vm/hugetlbfs_reserv.rst +Auto-merging Documentation/vm/hmm.rst +Auto-merging Documentation/vm/highmem.rst +Auto-merging Documentation/vm/frontswap.rst +Auto-merging Documentation/vm/cleancache.rst +Auto-merging Documentation/vm/balance.rst +Removing Documentation/vm/active_mm.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-devices-node | 2 +- + .../ABI/testing/sysfs-kernel-mm-hugepages | 2 +- + Documentation/ABI/testing/sysfs-kernel-mm-ksm | 2 +- + Documentation/ABI/testing/sysfs-kernel-slab | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/dev-tools/kasan.rst | 2 +- + Documentation/filesystems/proc.txt | 4 +- + Documentation/filesystems/tmpfs.txt | 2 +- + Documentation/index.rst | 3 +- + Documentation/process/maintainer-pgp-guide.rst | 39 +- + Documentation/process/submitting-patches.rst | 2 +- + Documentation/sound/alsa-configuration.rst | 4 +- + Documentation/sound/soc/codec.rst | 2 +- + Documentation/sound/soc/platform.rst | 2 +- + Documentation/sysctl/vm.txt | 6 +- + Documentation/trace/ftrace.rst | 7 +- + Documentation/vm/00-INDEX | 58 +-- + Documentation/vm/active_mm.rst | 91 ++++ + Documentation/vm/active_mm.txt | 83 ---- + Documentation/vm/{balance => balance.rst} | 15 +- + .../vm/{cleancache.txt => cleancache.rst} | 105 +++-- + Documentation/vm/conf.py | 10 + + Documentation/vm/{frontswap.txt => frontswap.rst} | 59 ++- + Documentation/vm/{highmem.txt => highmem.rst} | 87 ++-- + Documentation/vm/{hmm.txt => hmm.rst} | 78 ++-- + .../{hugetlbfs_reserv.txt => hugetlbfs_reserv.rst} | 212 +++++---- + .../vm/{hugetlbpage.txt => hugetlbpage.rst} | 243 ++++++----- + Documentation/vm/{hwpoison.txt => hwpoison.rst} | 141 +++--- + ...le_page_tracking.txt => idle_page_tracking.rst} | 55 ++- + Documentation/vm/index.rst | 56 +++ + Documentation/vm/ksm.rst | 183 ++++++++ + Documentation/vm/ksm.txt | 178 -------- + Documentation/vm/mmu_notifier.rst | 99 +++++ + Documentation/vm/mmu_notifier.txt | 93 ---- + Documentation/vm/{numa => numa.rst} | 6 +- + Documentation/vm/numa_memory_policy.rst | 485 +++++++++++++++++++++ + Documentation/vm/numa_memory_policy.txt | 452 ------------------- + Documentation/vm/overcommit-accounting | 80 ---- + Documentation/vm/overcommit-accounting.rst | 87 ++++ + Documentation/vm/{page_frags => page_frags.rst} | 5 +- + .../vm/{page_migration => page_migration.rst} | 149 ++++--- + .../vm/{page_owner.txt => page_owner.rst} | 34 +- + Documentation/vm/{pagemap.txt => pagemap.rst} | 170 ++++---- + .../{remap_file_pages.txt => remap_file_pages.rst} | 6 + + Documentation/vm/slub.rst | 361 +++++++++++++++ + Documentation/vm/slub.txt | 342 --------------- + .../vm/{soft-dirty.txt => soft-dirty.rst} | 20 +- + ...t_page_table_lock => split_page_table_lock.rst} | 12 +- + Documentation/vm/{swap_numa.txt => swap_numa.rst} | 55 ++- + Documentation/vm/{transhuge.txt => transhuge.rst} | 286 +++++++----- + .../{unevictable-lru.txt => unevictable-lru.rst} | 117 +++-- + .../vm/{userfaultfd.txt => userfaultfd.rst} | 66 +-- + Documentation/vm/{z3fold.txt => z3fold.rst} | 6 +- + Documentation/vm/{zsmalloc.txt => zsmalloc.rst} | 60 ++- + Documentation/vm/{zswap.txt => zswap.rst} | 71 +-- + MAINTAINERS | 2 +- + arch/alpha/Kconfig | 2 +- + arch/ia64/Kconfig | 2 +- + arch/mips/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + fs/Kconfig | 2 +- + fs/dax.c | 2 +- + fs/proc/task_mmu.c | 4 +- + include/linux/hmm.h | 2 +- + include/linux/memremap.h | 4 +- + include/linux/mmu_notifier.h | 2 +- + include/linux/sched/mm.h | 4 +- + include/linux/swap.h | 2 +- + mm/Kconfig | 6 +- + mm/cleancache.c | 2 +- + mm/frontswap.c | 2 +- + mm/hmm.c | 2 +- + mm/huge_memory.c | 4 +- + mm/hugetlb.c | 4 +- + mm/ksm.c | 4 +- + mm/mmap.c | 2 +- + mm/rmap.c | 6 +- + mm/util.c | 2 +- + 78 files changed, 2658 insertions(+), 2219 deletions(-) + create mode 100644 Documentation/vm/active_mm.rst + delete mode 100644 Documentation/vm/active_mm.txt + rename Documentation/vm/{balance => balance.rst} (96%) + rename Documentation/vm/{cleancache.txt => cleancache.rst} (83%) + create mode 100644 Documentation/vm/conf.py + rename Documentation/vm/{frontswap.txt => frontswap.rst} (91%) + rename Documentation/vm/{highmem.txt => highmem.rst} (64%) + rename Documentation/vm/{hmm.txt => hmm.rst} (91%) + rename Documentation/vm/{hugetlbfs_reserv.txt => hugetlbfs_reserv.rst} (87%) + rename Documentation/vm/{hugetlbpage.txt => hugetlbpage.rst} (64%) + rename Documentation/vm/{hwpoison.txt => hwpoison.rst} (60%) + rename Documentation/vm/{idle_page_tracking.txt => idle_page_tracking.rst} (72%) + create mode 100644 Documentation/vm/index.rst + create mode 100644 Documentation/vm/ksm.rst + delete mode 100644 Documentation/vm/ksm.txt + create mode 100644 Documentation/vm/mmu_notifier.rst + delete mode 100644 Documentation/vm/mmu_notifier.txt + rename Documentation/vm/{numa => numa.rst} (99%) + create mode 100644 Documentation/vm/numa_memory_policy.rst + delete mode 100644 Documentation/vm/numa_memory_policy.txt + delete mode 100644 Documentation/vm/overcommit-accounting + create mode 100644 Documentation/vm/overcommit-accounting.rst + rename Documentation/vm/{page_frags => page_frags.rst} (97%) + rename Documentation/vm/{page_migration => page_migration.rst} (63%) + rename Documentation/vm/{page_owner.txt => page_owner.rst} (86%) + rename Documentation/vm/{pagemap.txt => pagemap.rst} (60%) + rename Documentation/vm/{remap_file_pages.txt => remap_file_pages.rst} (92%) + create mode 100644 Documentation/vm/slub.rst + delete mode 100644 Documentation/vm/slub.txt + rename Documentation/vm/{soft-dirty.txt => soft-dirty.rst} (67%) + rename Documentation/vm/{split_page_table_lock => split_page_table_lock.rst} (95%) + rename Documentation/vm/{swap_numa.txt => swap_numa.rst} (74%) + rename Documentation/vm/{transhuge.txt => transhuge.rst} (74%) + rename Documentation/vm/{unevictable-lru.txt => unevictable-lru.rst} (92%) + rename Documentation/vm/{userfaultfd.txt => userfaultfd.rst} (89%) + rename Documentation/vm/{z3fold.txt => z3fold.rst} (97%) + rename Documentation/vm/{zsmalloc.txt => zsmalloc.rst} (71%) + rename Documentation/vm/{zswap.txt => zswap.rst} (74%) +Merging v4l-dvb/master (a2b2eff6ac27 media: v4l: fwnode: Fix comment incorrectly mentioning v4l2_fwnode_parse_endpoint) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/rcar_vin.txt | 137 ++- + Documentation/media/uapi/rc/lirc-dev-intro.rst | 2 +- + Documentation/media/uapi/rc/lirc-func.rst | 1 + + .../media/uapi/rc/lirc-set-rec-timeout.rst | 14 +- + drivers/media/cec/cec-core.c | 2 +- + drivers/media/i2c/ov7740.c | 22 +- + drivers/media/i2c/tda1997x.c | 2 +- + drivers/media/pci/cx88/cx88-input.c | 5 +- + drivers/media/platform/Kconfig | 7 +- + drivers/media/platform/omap3isp/isp.c | 8 + + drivers/media/platform/omap3isp/isppreview.c | 4 +- + drivers/media/platform/omap3isp/ispvideo.c | 2 +- + drivers/media/platform/rcar-vin/Kconfig | 2 +- + drivers/media/platform/rcar-vin/rcar-core.c | 956 +++++++++++++++++++-- + drivers/media/platform/rcar-vin/rcar-dma.c | 907 +++++++++++-------- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 480 ++++++----- + drivers/media/platform/rcar-vin/rcar-vin.h | 146 +++- + drivers/media/radio/Kconfig | 3 +- + drivers/media/rc/ir-imon-decoder.c | 1 + + drivers/media/rc/ir-jvc-decoder.c | 1 + + drivers/media/rc/ir-mce_kbd-decoder.c | 58 +- + drivers/media/rc/ir-nec-decoder.c | 1 + + drivers/media/rc/ir-rc5-decoder.c | 1 + + drivers/media/rc/ir-rc6-decoder.c | 1 + + drivers/media/rc/ir-sanyo-decoder.c | 1 + + drivers/media/rc/ir-sharp-decoder.c | 1 + + drivers/media/rc/ir-sony-decoder.c | 1 + + drivers/media/rc/ir-spi.c | 4 +- + drivers/media/rc/ir-xmp-decoder.c | 1 + + drivers/media/rc/lirc_dev.c | 31 +- + drivers/media/rc/mceusb.c | 29 +- + drivers/media/rc/mtk-cir.c | 4 +- + drivers/media/rc/rc-core-priv.h | 3 + + drivers/media/rc/rc-ir-raw.c | 31 +- + drivers/media/rc/rc-main.c | 68 +- + drivers/pnp/isapnp/Kconfig | 2 +- + include/linux/omap-iommu.h | 5 + + include/media/v4l2-fwnode.h | 2 +- + include/uapi/linux/lirc.h | 6 + + sound/isa/Kconfig | 3 +- + 40 files changed, 2202 insertions(+), 753 deletions(-) +Merging v4l-dvb-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (4f7afece3afd video: fbdev: sh_mobile_meram: Drop SUPERH platform dependency) +$ git merge fbdev/fbdev-for-next +Merge made by the 'recursive' strategy. + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/radeon_pm.c | 8 ++++---- + drivers/video/fbdev/auo_k190x.c | 12 ++++-------- + drivers/video/fbdev/core/fb_defio.c | 4 ++-- + .../video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 18 ++++++------------ + drivers/video/fbdev/savage/savagefb_driver.c | 8 ++++---- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 6 ++---- + drivers/video/fbdev/sh_mobile_meram.c | 6 ++---- + 9 files changed, 26 insertions(+), 40 deletions(-) +Merging pm/linux-next (fa3ee26bbaed Merge branches 'pm-cpufreq' and 'pm-core' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/acpi/cppc_sysfs.txt | 69 ++++++++ + drivers/acpi/acpi_video.c | 27 ++- + drivers/acpi/acpi_watchdog.c | 59 +++++-- + drivers/acpi/button.c | 24 ++- + drivers/acpi/cppc_acpi.c | 111 +++++++++--- + drivers/acpi/scan.c | 2 +- + drivers/acpi/sleep.c | 13 ++ + drivers/base/base.h | 3 + + drivers/base/core.c | 20 +++ + drivers/base/dd.c | 4 +- + drivers/cpufreq/Kconfig.arm | 10 -- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 323 +--------------------------------- + drivers/cpufreq/cppc_cpufreq.c | 80 +++++++-- + drivers/pci/pci-driver.c | 5 +- + include/acpi/cppc_acpi.h | 14 +- + 15 files changed, 372 insertions(+), 392 deletions(-) + create mode 100644 Documentation/acpi/cppc_sysfs.txt +Merging cpupower/cpupower (7928b2cbe55b Linux 4.16-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (4a823c0be80f opp: cpu: Replace GFP_ATOMIC with GFP_KERNEL in dev_pm_opp_init_cpufreq_table) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (b907b408ca64 Merge branches 'thermal-core' and 'thermal-soc' into next) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (629d835db501 thermal: imx: add i.MX7 thermal sensor support) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/imx-thermal.txt | 9 +- + .../bindings/thermal/mediatek-thermal.txt | 1 + + drivers/thermal/imx_thermal.c | 295 ++++++++++++++++----- + drivers/thermal/mtk_thermal.c | 35 +++ + 4 files changed, 275 insertions(+), 65 deletions(-) +Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (fe896ceb5772 IB/rxe: replace refcount_inc with skb_get) +$ git merge rdma/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/core/addr.c | 172 +++++++++++-------------------- + drivers/infiniband/core/cma.c | 6 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 2 +- + drivers/infiniband/sw/rxe/rxe.c | 3 - + drivers/infiniband/sw/rxe/rxe_net.c | 4 +- + drivers/infiniband/sw/rxe/rxe_net.h | 3 - + drivers/infiniband/sw/rxe/rxe_recv.c | 2 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 19 +--- + include/rdma/ib_addr.h | 20 +--- + 10 files changed, 71 insertions(+), 164 deletions(-) +Merging net-next/master (c8ad08929d1b Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue) +$ git merge net-next/master +Auto-merging net/core/filter.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/arraymap.c +Removing include/linux/platform_data/mdio-gpio.h +Auto-merging include/linux/bpf.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/microchip,lan78xx.txt | 54 + + .../bindings/net/socionext,uniphier-ave4.txt | 19 +- + .../bindings/soc/ti/keystone-navigator-qmss.txt | 9 +- + Documentation/filesystems/nfs/nfsroot.txt | 70 +- + MAINTAINERS | 3 +- + drivers/dca/dca-core.c | 2 +- + drivers/net/ethernet/8390/Kconfig | 17 +- + drivers/net/ethernet/8390/Makefile | 1 + + drivers/net/ethernet/8390/ax88796.c | 228 ++- + drivers/net/ethernet/8390/xsurf100.c | 382 ++++ + drivers/net/ethernet/amd/amd8111e.c | 16 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c | 8 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 +- + .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 54 + + .../ethernet/cavium/liquidio/cn23xx_pf_device.h | 12 + + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 54 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 28 + + drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 15 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 75 +- + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 4 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.c | 52 + + .../net/ethernet/cavium/liquidio/octeon_mailbox.h | 7 + + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 16 + + drivers/net/ethernet/freescale/fman/fman_port.c | 8 +- + drivers/net/ethernet/huawei/hinic/Kconfig | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 7 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 12 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 33 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 344 ++-- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 8 + + drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 28 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 35 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 116 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 42 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 37 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 152 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 9 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 20 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 50 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 5 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h | 2 + + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 1 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 2 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c | 45 + + .../ethernet/netronome/nfp/nfpcore/nfp_resource.c | 59 + + drivers/net/ethernet/qlogic/qed/qed_debug.c | 118 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 19 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 18 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 16 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 247 ++- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 29 + + drivers/net/ethernet/qlogic/qed/qed_vf.h | 21 + + drivers/net/ethernet/qlogic/qede/qede_filter.c | 7 +- + drivers/net/ethernet/realtek/r8169.c | 406 ++-- + drivers/net/ethernet/sfc/efx.c | 36 + + drivers/net/ethernet/socionext/Kconfig | 2 + + drivers/net/ethernet/socionext/netsec.c | 27 +- + drivers/net/ethernet/socionext/sni_ave.c | 252 ++- + drivers/net/ethernet/stmicro/stmmac/Makefile | 3 +- + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 34 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 229 +-- + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 1 - + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 29 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 23 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 - + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 41 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 19 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 6 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/hwif.c | 220 +++ + drivers/net/ethernet/stmicro/stmmac/hwif.h | 438 +++++ + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 39 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 82 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 34 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 516 ++--- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 18 +- + drivers/net/ethernet/ti/netcp.h | 3 + + drivers/net/ethernet/ti/netcp_core.c | 32 + + drivers/net/ethernet/ti/netcp_ethss.c | 181 +- + drivers/net/geneve.c | 72 +- + drivers/net/hamradio/mkiss.c | 2 +- + drivers/net/hyperv/Kconfig | 1 + + drivers/net/hyperv/hyperv_net.h | 164 ++ + drivers/net/hyperv/netvsc.c | 3 +- + drivers/net/hyperv/rndis_filter.c | 28 + + drivers/net/macvlan.c | 68 +- + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/asix.c | 63 + + drivers/net/phy/mdio-bitbang.c | 9 - + drivers/net/phy/mdio-boardinfo.c | 5 +- + drivers/net/phy/mdio-gpio.c | 122 +- + drivers/net/phy/microchip.c | 25 + + drivers/net/team/team.c | 2 +- + drivers/net/tun.c | 78 +- + drivers/net/usb/lan78xx.c | 128 +- + drivers/net/virtio_net.c | 74 +- + drivers/net/vrf.c | 25 +- + drivers/net/vxlan.c | 17 +- + drivers/soc/ti/knav_dma.c | 8 + + drivers/soc/ti/knav_qmss.h | 6 + + drivers/soc/ti/knav_qmss_queue.c | 98 +- + drivers/vhost/net.c | 19 +- + include/dt-bindings/net/microchip-lan78xx.h | 21 + + include/linux/bpf.h | 20 +- + include/linux/btf.h | 48 + + include/linux/filter.h | 24 +- + include/linux/if_macvlan.h | 29 +- + include/linux/if_tun.h | 4 +- + include/linux/mdio-bitbang.h | 2 - + include/linux/mdio-gpio.h | 9 + + include/linux/microchipphy.h | 3 + + include/linux/net.h | 1 + + include/linux/net_dim.h | 69 +- + include/linux/netdevice.h | 4 +- + include/linux/platform_data/mdio-gpio.h | 33 - + include/linux/qed/qed_eth_if.h | 1 + + include/linux/qed/qed_if.h | 3 + + include/linux/rhashtable.h | 38 +- + include/linux/skbuff.h | 5 +- + include/linux/soc/ti/knav_dma.h | 12 + + include/linux/soc/ti/knav_qmss.h | 1 + + include/linux/tcp.h | 1 + + include/net/addrconf.h | 14 + + include/net/ax88796.h | 14 + + include/net/fib_rules.h | 3 +- + include/net/if_inet6.h | 5 +- + include/net/ip.h | 3 + + include/net/ip6_fib.h | 180 +- + include/net/ip6_route.h | 59 +- + include/net/ip_tunnels.h | 11 + + include/net/ipv6.h | 2 - + include/net/neighbour.h | 19 +- + include/net/netns/ipv6.h | 4 +- + include/net/page_pool.h | 143 ++ + include/net/sctp/sm.h | 2 +- + include/net/sctp/structs.h | 4 - + include/net/tcp.h | 4 + + include/net/vxlan.h | 1 + + include/net/xdp.h | 83 + + include/trace/events/tcp.h | 69 +- + include/uapi/linux/bpf.h | 22 +- + include/uapi/linux/btf.h | 130 ++ + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/pci_regs.h | 2 + + include/uapi/linux/snmp.h | 2 + + include/uapi/linux/tcp.h | 5 + + include/uapi/linux/tipc_config.h | 5 + + include/uapi/linux/tipc_netlink.h | 1 + + kernel/bpf/Makefile | 1 + + kernel/bpf/arraymap.c | 50 + + kernel/bpf/btf.c | 2064 ++++++++++++++++++++ + kernel/bpf/cpumap.c | 132 +- + kernel/bpf/inode.c | 156 +- + kernel/bpf/syscall.c | 51 +- + lib/rhashtable.c | 51 +- + net/Kconfig | 3 + + net/bpf/test_run.c | 3 +- + net/core/Makefile | 1 + + net/core/dev.c | 11 +- + net/core/dst.c | 1 + + net/core/fib_rules.c | 495 +++-- + net/core/filter.c | 52 +- + net/core/neighbour.c | 8 +- + net/core/page_pool.c | 317 +++ + net/core/rtnetlink.c | 8 +- + net/core/skbuff.c | 14 + + net/core/sock.c | 5 +- + net/core/xdp.c | 269 +++ + net/decnet/dn_rules.c | 7 +- + net/ipv4/Makefile | 3 +- + net/ipv4/af_inet.c | 3 +- + net/ipv4/fib_rules.c | 7 +- + net/ipv4/fib_semantics.c | 43 +- + net/ipv4/ipconfig.c | 151 +- + net/ipv4/ipmr.c | 3 +- + net/ipv4/metrics.c | 53 + + net/ipv4/proc.c | 2 + + net/ipv4/tcp.c | 146 +- + net/ipv4/tcp_input.c | 57 +- + net/ipv4/tcp_output.c | 26 +- + net/ipv6/addrconf.c | 190 +- + net/ipv6/af_inet6.c | 56 +- + net/ipv6/anycast.c | 33 +- + net/ipv6/exthdrs.c | 55 +- + net/ipv6/fib6_rules.c | 7 +- + net/ipv6/ip6_fib.c | 491 ++--- + net/ipv6/ip6_input.c | 2 +- + net/ipv6/ip6_output.c | 26 +- + net/ipv6/ip6mr.c | 3 +- + net/ipv6/ndisc.c | 42 +- + net/ipv6/reassembly.c | 25 +- + net/ipv6/route.c | 1736 ++++++++-------- + net/ipv6/seg6_iptunnel.c | 24 +- + net/ipv6/sysctl_net_ipv6.c | 8 + + net/ipv6/xfrm6_policy.c | 2 - + net/ncsi/internal.h | 34 +- + net/ncsi/ncsi-manage.c | 226 +-- + net/ncsi/ncsi-netlink.c | 20 +- + net/ncsi/ncsi-rsp.c | 178 +- + net/netfilter/ipvs/ip_vs_xmit.c | 5 +- + net/sctp/associola.c | 25 - + net/sctp/outqueue.c | 48 +- + net/sctp/sm_make_chunk.c | 9 +- + net/tipc/bearer.c | 29 +- + net/tipc/bearer.h | 3 + + net/tipc/node.c | 12 +- + net/tipc/node.h | 2 +- + net/tipc/udp_media.c | 4 +- + net/tipc/udp_media.h | 14 + + net/tls/tls_sw.c | 3 +- + samples/bpf/Makefile | 4 + + samples/bpf/sock_example.c | 4 +- + samples/bpf/xdp_adjust_tail_kern.c | 152 ++ + samples/bpf/xdp_adjust_tail_user.c | 142 ++ + samples/bpf/xdp_monitor_user.c | 2 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 11 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 29 +- + tools/bpf/bpftool/bash-completion/bpftool | 14 +- + tools/bpf/bpftool/cgroup.c | 15 +- + tools/bpf/bpftool/map.c | 17 +- + tools/bpf/bpftool/prog.c | 3 + + tools/include/uapi/linux/bpf.h | 22 +- + tools/include/uapi/linux/btf.h | 130 ++ + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/bpf.c | 92 +- + tools/lib/bpf/bpf.h | 17 + + tools/lib/bpf/btf.c | 374 ++++ + tools/lib/bpf/btf.h | 22 + + tools/lib/bpf/libbpf.c | 156 +- + tools/lib/bpf/libbpf.h | 5 + + tools/testing/selftests/bpf/Makefile | 26 +- + tools/testing/selftests/bpf/bpf_helpers.h | 5 + + tools/testing/selftests/bpf/test_adjust_tail.c | 30 + + tools/testing/selftests/bpf/test_btf.c | 1669 ++++++++++++++++ + tools/testing/selftests/bpf/test_btf_haskv.c | 48 + + tools/testing/selftests/bpf/test_btf_nokv.c | 43 + + tools/testing/selftests/bpf/test_progs.c | 32 + + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 2 + + .../testing/selftests/net/forwarding/tc_flower.sh | 70 + + tools/testing/selftests/net/tcp_mmap.c | 437 +++++ + .../selftests/tc-testing/tc-tests/actions/ife.json | 1036 +++++++++- + .../tc-testing/tc-tests/actions/sample.json | 588 ++++++ + 258 files changed, 15825 insertions(+), 4369 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/microchip,lan78xx.txt + create mode 100644 drivers/net/ethernet/8390/xsurf100.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/hwif.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/hwif.h + create mode 100644 drivers/net/phy/asix.c + create mode 100644 include/dt-bindings/net/microchip-lan78xx.h + create mode 100644 include/linux/btf.h + create mode 100644 include/linux/mdio-gpio.h + delete mode 100644 include/linux/platform_data/mdio-gpio.h + create mode 100644 include/net/page_pool.h + create mode 100644 include/uapi/linux/btf.h + create mode 100644 kernel/bpf/btf.c + create mode 100644 net/core/page_pool.c + create mode 100644 net/ipv4/metrics.c + create mode 100644 samples/bpf/xdp_adjust_tail_kern.c + create mode 100644 samples/bpf/xdp_adjust_tail_user.c + create mode 100644 tools/include/uapi/linux/btf.h + create mode 100644 tools/lib/bpf/btf.c + create mode 100644 tools/lib/bpf/btf.h + create mode 100644 tools/testing/selftests/bpf/test_adjust_tail.c + create mode 100644 tools/testing/selftests/bpf/test_btf.c + create mode 100644 tools/testing/selftests/bpf/test_btf_haskv.c + create mode 100644 tools/testing/selftests/bpf/test_btf_nokv.c + create mode 100644 tools/testing/selftests/net/tcp_mmap.c + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/sample.json +Merging bpf-next/master (af487c577770 Merge branch 'bpf-optimize-neg-sums') +$ git merge bpf-next/master +Auto-merging tools/testing/selftests/bpf/test_sockmap_kern.c +Auto-merging tools/testing/selftests/bpf/test_sockmap.c +Auto-merging tools/testing/selftests/bpf/.gitignore +CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/.gitignore +Auto-merging tools/include/uapi/linux/bpf.h +Removing samples/sockmap/sockmap_test.sh +CONFLICT (modify/delete): samples/sockmap/Makefile deleted in bpf-next/master and modified in HEAD. Version HEAD of samples/sockmap/Makefile left in tree. +Auto-merging net/core/filter.c +Recorded preimage for 'tools/testing/selftests/bpf/.gitignore' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f samples/sockmap/Makefile +samples/sockmap/Makefile: needs merge +rm 'samples/sockmap/Makefile' +$ git commit -v -a +Recorded resolution for 'tools/testing/selftests/bpf/.gitignore'. +[master 7f542ae17111] Merge remote-tracking branch 'bpf-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 231 +++--- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 6 +- + drivers/net/virtio_net.c | 2 +- + include/uapi/linux/bpf.h | 25 +- + include/uapi/linux/btf.h | 8 +- + kernel/bpf/btf.c | 20 +- + kernel/bpf/verifier.c | 24 +- + net/core/filter.c | 48 ++ + samples/bpf/tcbpf2_kern.c | 16 + + samples/bpf/test_tunnel_bpf.sh | 71 ++ + samples/sockmap/Makefile | 78 -- + samples/sockmap/sockmap_test.sh | 488 ------------ + tools/include/uapi/linux/bpf.h | 25 +- + tools/include/uapi/linux/btf.h | 8 +- + tools/lib/bpf/btf.c | 2 +- + tools/lib/bpf/libbpf.c | 4 +- + tools/lib/bpf/libbpf.h | 2 + + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 7 +- + tools/testing/selftests/bpf/bpf_helpers.h | 4 +- + .../testing/selftests/bpf/test_sockmap.c | 880 +++++++++++++++++---- + .../testing/selftests/bpf/test_sockmap_kern.c | 35 +- + tools/testing/selftests/bpf/test_verifier.c | 266 +++++++ + 23 files changed, 1352 insertions(+), 899 deletions(-) + delete mode 100644 samples/sockmap/Makefile + delete mode 100755 samples/sockmap/sockmap_test.sh + rename samples/sockmap/sockmap_user.c => tools/testing/selftests/bpf/test_sockmap.c (57%) + rename samples/sockmap/sockmap_kern.c => tools/testing/selftests/bpf/test_sockmap_kern.c (91%) +Merging ipsec-next/master (cd027a5433d6 udp: enable UDP checksum offload for ESP) +$ git merge ipsec-next/master +Auto-merging net/ipv4/ip_output.c +Merge made by the 'recursive' strategy. + net/ipv4/ip_output.c | 2 +- + tools/testing/selftests/net/rtnetlink.sh | 103 +++++++++++++++++++++++++++++++ + 2 files changed, 104 insertions(+), 1 deletion(-) +Merging netfilter-next/master (159f02977b2f Merge branch 'net-mvneta-improve-suspend-resume') +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support) +$ git merge nfc-next/master +Already up to date. +Merging ipvs-next/master (9a17740e0ea1 ipvs: fix multiplicative hashing in sh/dh/lblc/lblcr algorithms) +$ git merge ipvs-next/master +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Merge made by the 'recursive' strategy. + include/net/ip_vs.h | 1 + + net/netfilter/ipvs/Kconfig | 37 +++ + net/netfilter/ipvs/Makefile | 1 + + net/netfilter/ipvs/ip_vs_ctl.c | 4 + + net/netfilter/ipvs/ip_vs_dh.c | 3 +- + net/netfilter/ipvs/ip_vs_lblc.c | 3 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 3 +- + net/netfilter/ipvs/ip_vs_mh.c | 540 +++++++++++++++++++++++++++++++++++ + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 +- + net/netfilter/ipvs/ip_vs_sh.c | 3 +- + 10 files changed, 593 insertions(+), 6 deletions(-) + create mode 100644 net/netfilter/ipvs/ip_vs_mh.c +Merging wireless-drivers-next/master (51c12756de42 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +Removing drivers/net/wireless/intel/iwlwifi/fw/nvm.c +Recorded preimage for 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c'. +[master 2e9795a2e02f] Merge remote-tracking branch 'wireless-drivers-next/master' +$ git diff -M --stat --summary HEAD^.. + .../bindings/net/wireless/qcom,ath10k.txt | 31 + + drivers/net/wireless/ath/ath10k/Kconfig | 12 + + drivers/net/wireless/ath/ath10k/Makefile | 7 +- + drivers/net/wireless/ath/ath10k/ce.c | 269 +++- + drivers/net/wireless/ath/ath10k/ce.h | 24 +- + drivers/net/wireless/ath/ath10k/core.c | 183 ++- + drivers/net/wireless/ath/ath10k/core.h | 2 + + drivers/net/wireless/ath/ath10k/hif.h | 15 +- + drivers/net/wireless/ath/ath10k/htc.c | 6 + + drivers/net/wireless/ath/ath10k/htc.h | 4 + + drivers/net/wireless/ath/ath10k/htt.c | 4 +- + drivers/net/wireless/ath/ath10k/htt.h | 111 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 24 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 19 +- + drivers/net/wireless/ath/ath10k/hw.c | 9 +- + drivers/net/wireless/ath/ath10k/hw.h | 22 +- + drivers/net/wireless/ath/ath10k/mac.c | 26 +- + drivers/net/wireless/ath/ath10k/pci.c | 8 +- + drivers/net/wireless/ath/ath10k/sdio.c | 24 +- + drivers/net/wireless/ath/ath10k/snoc.c | 1414 ++++++++++++++++++++ + drivers/net/wireless/ath/ath10k/snoc.h | 95 ++ + drivers/net/wireless/ath/ath10k/txrx.c | 8 + + drivers/net/wireless/ath/ath10k/wmi-ops.h | 46 + + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 63 + + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 357 ++++- + drivers/net/wireless/ath/ath10k/wmi.c | 34 +- + drivers/net/wireless/ath/ath10k/wmi.h | 28 + + drivers/net/wireless/ath/ath10k/wow.c | 138 +- + drivers/net/wireless/ath/ath6kl/debug.c | 2 +- + drivers/net/wireless/ath/ath9k/dfs.c | 6 +- + drivers/net/wireless/ath/wcn36xx/dxe.c | 36 +- + drivers/net/wireless/ath/wcn36xx/dxe.h | 1 - + drivers/net/wireless/ath/wcn36xx/hal.h | 8 +- + drivers/net/wireless/ath/wcn36xx/main.c | 40 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 33 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 2 + + drivers/net/wireless/ath/wcn36xx/txrx.c | 15 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 7 +- + drivers/net/wireless/ath/wil6210/main.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 1 + + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 9 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 1 + + drivers/net/wireless/intel/iwlwifi/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 1 - + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 8 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 5 - + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 42 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 156 +-- + drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 2 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 36 + + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 1 + + drivers/net/wireless/intel/iwlwifi/fw/debugfs.h | 31 - + drivers/net/wireless/intel/iwlwifi/fw/nvm.c | 162 --- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 4 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 339 ++++- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 56 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 37 + + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 7 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 7 + + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 25 + + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 33 + + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 101 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 208 +-- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 117 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 103 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 194 ++- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 28 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 57 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 430 +++++- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 5 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 55 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 28 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 3 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 1 + + drivers/net/wireless/marvell/mwifiex/pcie.c | 3 +- + drivers/net/wireless/mediatek/mt76/agg-rx.c | 12 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 11 +- + drivers/net/wireless/mediatek/mt76/mt76x2_dma.h | 7 +- + drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h | 6 + + drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2_mac.h | 1 - + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x2_phy.c | 78 +- + drivers/net/wireless/mediatek/mt7601u/mac.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 6 + + drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 5 +- + drivers/net/wireless/mediatek/mt7601u/phy.c | 11 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 9 + + drivers/net/wireless/quantenna/qtnfmac/event.c | 11 + + .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 4 + + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2800.h | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 9 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 19 +- + drivers/net/wireless/rsi/rsi_91x_core.c | 31 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 108 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 47 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 34 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 27 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 7 + + drivers/net/wireless/rsi/rsi_boot_params.h | 3 +- + drivers/net/wireless/rsi/rsi_hal.h | 3 + + drivers/net/wireless/rsi/rsi_main.h | 7 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 19 +- + drivers/net/wireless/rsi/rsi_sdio.h | 2 +- + drivers/net/wireless/rsi/rsi_usb.h | 1 + + drivers/net/wireless/st/cw1200/txrx.c | 2 +- + 121 files changed, 4903 insertions(+), 1119 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath10k/snoc.c + create mode 100644 drivers/net/wireless/ath/ath10k/snoc.h + delete mode 100644 drivers/net/wireless/intel/iwlwifi/fw/nvm.c +Merging bluetooth/master (e53e9e4e6bb8 Bluetooth: btusb: add ID for LiteOn 04ca:301a) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 30 +++ + arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 26 +++ + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 32 ++++ + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 61 +++++++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 + + drivers/bluetooth/Kconfig | 1 + + drivers/bluetooth/btbcm.c | 201 +++++++-------------- + drivers/bluetooth/btbcm.h | 5 +- + drivers/bluetooth/btqcomsmd.c | 10 + + drivers/bluetooth/btusb.c | 1 + + drivers/bluetooth/hci_bcm.c | 35 ++-- + drivers/bluetooth/hci_qca.c | 116 +++++++++++- + net/bluetooth/hci_event.c | 12 +- + net/bluetooth/hci_request.c | 30 +-- + 14 files changed, 385 insertions(+), 185 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt +Merging mac80211-next/master (8db0c433692e regulatory: Rename confusing 'country IE' in log output) +$ git merge mac80211-next/master +Auto-merging net/wireless/reg.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 1 + + net/wireless/reg.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging gfs2/for-next (9a38662ba4e2 gfs2: Remove sdp->sd_jheightsize) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 14 +------------- + fs/gfs2/incore.h | 2 -- + fs/gfs2/ops_fstype.c | 19 ------------------- + 3 files changed, 1 insertion(+), 34 deletions(-) +Merging mtd/master (7b70eb14392a mtd: cfi: cmdset_0002: Do not allow read/write to suspend erase block.) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0001.c | 33 ++++++++++++++++++++++++++++----- + drivers/mtd/chips/cfi_cmdset_0002.c | 9 ++++++--- + drivers/mtd/nand/core.c | 3 --- + drivers/mtd/nand/raw/tango_nand.c | 2 +- + drivers/mtd/spi-nor/cadence-quadspi.c | 19 +++++++++++++++++-- + include/linux/mtd/flashchip.h | 1 + + 6 files changed, 53 insertions(+), 14 deletions(-) +Merging l2-mtd/mtd/next (0e210b542cdb mtd: devices: simplify getting .drvdata) +$ git merge l2-mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/devices/docg3.c | 3 +-- + drivers/mtd/nand/raw/Kconfig | 8 ++------ + drivers/mtd/spi-nor/Kconfig | 2 +- + 3 files changed, 4 insertions(+), 9 deletions(-) +Merging nand/nand/next (bfc3ff92b152 mtd: onenand: simplify getting .drvdata) +$ git merge nand/nand/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/gpmi-nand.txt | 5 ++ + .../devicetree/bindings/mtd/sunxi-nand.txt | 2 - + MAINTAINERS | 7 ++ + drivers/mtd/nand/onenand/samsung.c | 6 +- + drivers/mtd/nand/raw/diskonchip.c | 4 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 30 ++++--- + drivers/mtd/nand/raw/mtk_ecc.c | 7 +- + drivers/mtd/nand/raw/mtk_nand.c | 10 +-- + drivers/mtd/nand/raw/sunxi_nand.c | 91 ++++------------------ + 9 files changed, 53 insertions(+), 109 deletions(-) +Merging spi-nor/spi-nor/next (f134fbbb4ff8 mtd: spi-nor: clear Winbond Extended Address Reg on switch to 3-byte addressing.) +$ git merge spi-nor/spi-nor/next +Auto-merging drivers/mtd/spi-nor/cadence-quadspi.c +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/cadence-quadspi.c | 96 ++++++++++++++++++++++++++++++++++- + drivers/mtd/spi-nor/hisi-sfc.c | 12 ++--- + drivers/mtd/spi-nor/spi-nor.c | 21 ++++++++ + include/linux/mtd/spi-nor.h | 2 + + 4 files changed, 123 insertions(+), 8 deletions(-) +Merging crypto/master (b930f3a2292d crypto: caam: - Use kmemdup() function) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + crypto/Kconfig | 9 + + crypto/Makefile | 1 + + crypto/algapi.c | 10 ++ + crypto/authenc.c | 1 + + crypto/authencesn.c | 1 + + crypto/cfb.c | 7 +- + crypto/cipher.c | 3 +- + crypto/ctr.c | 4 +- + crypto/cts.c | 5 +- + crypto/ecc.c | 66 ++++---- + crypto/ecc.h | 4 +- + crypto/ecdh.c | 4 +- + crypto/pcbc.c | 5 +- + crypto/rsa.c | 1 - + crypto/testmgr.c | 60 +++++-- + crypto/testmgr.h | 71 ++++++++ + crypto/zstd.c | 265 ++++++++++++++++++++++++++++++ + drivers/char/hw_random/via-rng.c | 2 +- + drivers/crypto/caam/caamalg.c | 231 ++++++++++++-------------- + drivers/crypto/caam/caamalg_qi.c | 227 ++++++++++++------------- + drivers/crypto/caam/caampkc.c | 63 ++++++- + drivers/crypto/caam/caampkc.h | 8 + + drivers/crypto/caam/ctrl.c | 57 ++++++- + drivers/crypto/caam/ctrl.h | 2 - + drivers/crypto/caam/regs.h | 6 + + drivers/crypto/cavium/zip/common.h | 21 +++ + drivers/crypto/cavium/zip/zip_crypto.c | 22 ++- + drivers/crypto/cavium/zip/zip_deflate.c | 4 +- + drivers/crypto/cavium/zip/zip_device.c | 4 +- + drivers/crypto/cavium/zip/zip_inflate.c | 4 +- + drivers/crypto/cavium/zip/zip_main.c | 24 ++- + drivers/crypto/cavium/zip/zip_main.h | 1 - + drivers/crypto/chelsio/chtls/chtls_cm.c | 16 ++ + drivers/crypto/chelsio/chtls/chtls_main.c | 3 +- + include/crypto/algapi.h | 8 + + 35 files changed, 869 insertions(+), 351 deletions(-) + create mode 100644 crypto/zstd.c +Merging drm/drm-next (6d08b06e67cd Linux 4.17-rc2) +$ git merge drm/drm-next +Already up to date. +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (ff047a87cfac drm/i915/icl: Correctly clear lost ctx-switch interrupts across reset for Gen11) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_bios.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Resolved 'drivers/gpu/drm/i915/intel_bios.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/intel_lrc.c' +Recorded preimage for 'drivers/gpu/drm/i915/intel_runtime_pm.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/intel_lrc.c'. +Recorded resolution for 'drivers/gpu/drm/i915/intel_runtime_pm.c'. +[master 5e1a3d083609] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 141 +++- + drivers/gpu/drm/drm_atomic.c | 10 +- + drivers/gpu/drm/i915/Kconfig.debug | 13 + + drivers/gpu/drm/i915/Makefile | 11 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 55 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 72 +- + drivers/gpu/drm/i915/gvt/gvt.h | 1 + + drivers/gpu/drm/i915/gvt/sched_policy.c | 31 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 68 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 + + drivers/gpu/drm/i915/gvt/trace.h | 24 +- + drivers/gpu/drm/i915/i915_debugfs.c | 490 ++++++------ + drivers/gpu/drm/i915/i915_drv.c | 66 +- + drivers/gpu/drm/i915/i915_drv.h | 396 ++-------- + drivers/gpu/drm/i915/i915_gem.c | 255 ++++-- + drivers/gpu/drm/i915/i915_gem.h | 7 + + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 30 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 29 +- + drivers/gpu/drm/i915/i915_gem_context.c | 19 +- + drivers/gpu/drm/i915/i915_gem_context.h | 13 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 29 + + drivers/gpu/drm/i915/i915_gem_stolen.c | 178 +++-- + drivers/gpu/drm/i915/i915_gpu_error.c | 9 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 363 +++++++++ + drivers/gpu/drm/i915/i915_irq.c | 410 ++++++---- + drivers/gpu/drm/i915/i915_oa_icl.c | 118 +++ + drivers/gpu/drm/i915/i915_oa_icl.h | 34 + + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_perf.c | 69 +- + drivers/gpu/drm/i915/i915_pmu.c | 27 +- + drivers/gpu/drm/i915/i915_pmu.h | 30 +- + drivers/gpu/drm/i915/i915_reg.h | 653 +++++++--------- + drivers/gpu/drm/i915/i915_request.c | 193 +++-- + drivers/gpu/drm/i915/i915_request.h | 46 +- + drivers/gpu/drm/i915/i915_scheduler.h | 72 ++ + drivers/gpu/drm/i915/i915_utils.h | 4 +- + drivers/gpu/drm/i915/intel_atomic.c | 19 +- + drivers/gpu/drm/i915/intel_bios.c | 17 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 50 +- + drivers/gpu/drm/i915/intel_ddi.c | 154 +++- + drivers/gpu/drm/i915/intel_device_info.c | 169 +++- + drivers/gpu/drm/i915/intel_device_info.h | 4 +- + drivers/gpu/drm/i915/intel_display.c | 307 +++++--- + drivers/gpu/drm/i915/intel_display.h | 4 + + drivers/gpu/drm/i915/intel_dp.c | 21 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 8 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 11 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 253 +++--- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 56 +- + drivers/gpu/drm/i915/intel_drv.h | 69 +- + drivers/gpu/drm/i915/intel_dsi_vbt.c | 34 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 866 ++++----------------- + drivers/gpu/drm/i915/intel_fbc.c | 28 + + drivers/gpu/drm/i915/intel_fbdev.c | 5 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 2 +- + drivers/gpu/drm/i915/intel_gpu_commands.h | 274 +++++++ + drivers/gpu/drm/i915/intel_guc.c | 231 ++++-- + drivers/gpu/drm/i915/intel_guc.h | 82 +- + drivers/gpu/drm/i915/intel_guc_ads.c | 8 +- + drivers/gpu/drm/i915/intel_guc_ct.c | 545 +++++++++++-- + drivers/gpu/drm/i915/intel_guc_ct.h | 18 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 7 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 162 +++- + drivers/gpu/drm/i915/intel_guc_log.c | 544 +++++-------- + drivers/gpu/drm/i915/intel_guc_log.h | 59 +- + drivers/gpu/drm/i915/intel_guc_reg.h | 14 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 53 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 13 +- + drivers/gpu/drm/i915/intel_hdcp.c | 185 +++-- + drivers/gpu/drm/i915/intel_hdmi.c | 40 +- + drivers/gpu/drm/i915/intel_hotplug.c | 3 + + drivers/gpu/drm/i915/intel_huc.c | 30 +- + drivers/gpu/drm/i915/intel_huc.h | 7 + + drivers/gpu/drm/i915/intel_huc_fw.c | 8 +- + drivers/gpu/drm/i915/intel_lrc.c | 355 ++++++--- + drivers/gpu/drm/i915/intel_overlay.c | 1 + + drivers/gpu/drm/i915/intel_pipe_crc.c | 53 +- + drivers/gpu/drm/i915/intel_pm.c | 474 ++++++----- + drivers/gpu/drm/i915/intel_psr.c | 390 ++++++---- + drivers/gpu/drm/i915/intel_ringbuffer.c | 34 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 47 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 9 +- + drivers/gpu/drm/i915/intel_sprite.c | 7 +- + drivers/gpu/drm/i915/intel_uc.c | 132 ++-- + drivers/gpu/drm/i915/intel_uc.h | 5 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 13 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 22 + + drivers/gpu/drm/i915/intel_uncore.c | 168 +++- + drivers/gpu/drm/i915/intel_uncore.h | 1 + + drivers/gpu/drm/i915/intel_wopcm.c | 275 +++++++ + drivers/gpu/drm/i915/intel_wopcm.h | 31 + + drivers/gpu/drm/i915/intel_workarounds.c | 830 ++++++++++++++++++++ + drivers/gpu/drm/i915/intel_workarounds.h | 17 + + .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/intel_engine_cs.c | 58 ++ + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 314 +++++--- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 509 ++++++++++++ + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 291 +++++++ + include/drm/drm_dp_helper.h | 10 + + include/drm/i915_pciids.h | 1 + + 102 files changed, 8229 insertions(+), 4151 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_gpu_error.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_icl.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_icl.h + create mode 100644 drivers/gpu/drm/i915/i915_scheduler.h + create mode 100644 drivers/gpu/drm/i915/intel_gpu_commands.h + create mode 100644 drivers/gpu/drm/i915/intel_wopcm.c + create mode 100644 drivers/gpu/drm/i915/intel_wopcm.h + create mode 100644 drivers/gpu/drm/i915/intel_workarounds.c + create mode 100644 drivers/gpu/drm/i915/intel_workarounds.h + create mode 100644 drivers/gpu/drm/i915/selftests/intel_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_lrc.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_workarounds.c +Merging drm-tegra/drm/tegra/for-next (27e92f1f1600 drm/tegra: prime: Implement ->{begin,end}_cpu_access()) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (3131f209468d drm/vc4: Fix leak of the file_priv that stored the perfmon.) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_drv.c | 1 + + 1 file changed, 1 insertion(+) +Merging drm-msm/msm-next (789d4c300e10 drm/msm: don't deref error pointer in the msm_fbdev_create error path) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 1 + + drivers/gpu/drm/msm/disp/mdp_format.c | 3 +- + drivers/gpu/drm/msm/disp/mdp_kms.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 16 +++-- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 109 +++++++++++++++++++++++++++++ + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 28 -------- + drivers/gpu/drm/msm/msm_fb.c | 3 +- + drivers/gpu/drm/msm/msm_fbdev.c | 11 +-- + drivers/gpu/drm/msm/msm_gem.c | 20 +++--- + drivers/gpu/drm/msm/msm_kms.h | 5 +- + 12 files changed, 147 insertions(+), 54 deletions(-) +Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (22cd2b2b3151 drm/imx: Remove last traces of struct imx_drm_crtc) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-drm.h | 1 - + drivers/gpu/drm/imx/ipuv3-crtc.c | 1 - + 2 files changed, 2 deletions(-) +Merging etnaviv/etnaviv/next (4ed75c3e5255 drm/etnaviv: bump HW job limit to 4) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (9e12b358300f Merge branch 'regmap-4.18' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + include/linux/regmap.h | 1 + + 1 file changed, 1 insertion(+) +Merging sound/for-next (4d31c6e41ed2 Merge branch 'for-linus' into for-next) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/emu10k1.h | 4 +- + include/sound/hdaudio.h | 5 + + sound/core/pcm_compat.c | 10 +- + sound/core/pcm_lib.c | 15 +-- + sound/core/pcm_local.h | 18 ++++ + sound/core/pcm_native.c | 176 +++++++++------------------------ + sound/firewire/dice/dice-interface.h | 9 +- + sound/firewire/dice/dice-proc.c | 10 +- + sound/firewire/dice/dice-transaction.c | 49 +++++---- + sound/hda/hdac_regmap.c | 4 +- + sound/isa/cmi8328.c | 4 +- + sound/pci/ad1889.c | 4 +- + sound/pci/cmipci.c | 2 +- + sound/pci/emu10k1/emufx.c | 9 +- + sound/pci/emu10k1/emupcm.c | 2 +- + sound/pci/hda/hda_auto_parser.c | 10 +- + sound/pci/hda/hda_codec.c | 48 +++++---- + sound/pci/hda/hda_generic.c | 27 +++-- + sound/pci/hda/hda_sysfs.c | 20 ++-- + sound/pci/hda/patch_conexant.c | 5 +- + sound/pci/hda/patch_realtek.c | 4 +- + sound/usb/pcm.c | 56 +++++------ + sound/usb/quirks.c | 27 +++++ + 23 files changed, 237 insertions(+), 281 deletions(-) +Merging sound-asoc/for-next (f6cf346128bb Merge branch 'asoc-4.18' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging Documentation/sound/soc/codec.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/mt6797-afe-pcm.txt | 42 + + .../devicetree/bindings/sound/mt6797-mt6351.txt | 14 + + Documentation/devicetree/bindings/sound/rt5668.txt | 50 + + .../devicetree/bindings/sound/tscs42xx.txt | 6 + + Documentation/sound/soc/codec.rst | 8 +- + include/linux/mfd/wm8350/audio.h | 3 - + include/sound/rt5668.h | 40 + + include/trace/events/asoc.h | 1 - + include/uapi/sound/asoc.h | 29 +- + sound/soc/amd/acp-da7219-max98357a.c | 6 + + sound/soc/amd/acp-pcm-dma.c | 259 +- + sound/soc/amd/acp.h | 22 +- + sound/soc/atmel/atmel_ssc_dai.c | 8 +- + sound/soc/bcm/Kconfig | 3 +- + sound/soc/codecs/Kconfig | 12 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/adau17x1.c | 9 + + sound/soc/codecs/max9860.c | 44 +- + sound/soc/codecs/max9860.h | 10 +- + sound/soc/codecs/nau8824.c | 9 + + sound/soc/codecs/rt1305.c | 1191 +++++++++ + sound/soc/codecs/rt1305.h | 276 ++ + sound/soc/codecs/rt5668.c | 2639 ++++++++++++++++++++ + sound/soc/codecs/rt5668.h | 1318 ++++++++++ + sound/soc/codecs/sgtl5000.c | 18 +- + sound/soc/codecs/sgtl5000.h | 5 +- + sound/soc/codecs/tfa9879.c | 48 +- + sound/soc/codecs/tfa9879.h | 7 +- + sound/soc/codecs/tscs42xx.c | 203 +- + sound/soc/codecs/tscs42xx.h | 2 +- + sound/soc/codecs/wm_adsp.c | 8 +- + sound/soc/fsl/fsl_esai.c | 6 + + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- + sound/soc/intel/boards/bxt_rt298.c | 2 +- + sound/soc/intel/boards/byt-max98090.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 2 +- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- + sound/soc/intel/boards/skl_rt286.c | 2 +- + sound/soc/intel/skylake/skl-messages.c | 2 +- + sound/soc/intel/skylake/skl-pcm.c | 36 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 3 - + sound/soc/intel/skylake/skl-sst.c | 34 +- + sound/soc/intel/skylake/skl.c | 7 + + sound/soc/kirkwood/Kconfig | 1 - + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 1241 +++++++++ + sound/soc/pxa/Kconfig | 1 - + sound/soc/qcom/Kconfig | 7 +- + sound/soc/sh/Kconfig | 6 +- + sound/soc/sh/rcar/cmd.c | 15 +- + sound/soc/sh/rcar/core.c | 49 +- + sound/soc/sh/rcar/dma.c | 11 +- + sound/soc/sh/rcar/gen.c | 3 +- + sound/soc/sh/rcar/rsnd.h | 4 +- + sound/soc/sh/rcar/ssi.c | 13 +- + sound/soc/soc-topology.c | 30 +- + 65 files changed, 7392 insertions(+), 403 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/mt6797-afe-pcm.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt6797-mt6351.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5668.txt + create mode 100644 include/sound/rt5668.h + create mode 100644 sound/soc/codecs/rt1305.c + create mode 100644 sound/soc/codecs/rt1305.h + create mode 100644 sound/soc/codecs/rt5668.c + create mode 100644 sound/soc/codecs/rt5668.h + create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-pcm.c +Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging input/next (d91abc21e1e6 Input: alps - demystify trackstick initialization for v3 and v6 protocols) +$ git merge input/next +Auto-merging drivers/input/mouse/alps.c +Merge made by the 'recursive' strategy. + drivers/input/mouse/alps.c | 80 ++++++++++++++++++++++++++++------------------ + 1 file changed, 49 insertions(+), 31 deletions(-) +Merging block/for-next (667eea5d591b Merge branch 'for-4.17/block' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up to date. +Merging device-mapper/for-next (a1c0a8e35b88 dm bufio: fix buffer alignment) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-bufio.c | 5 +++-- + drivers/md/dm-integrity.c | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging mmc/next (9e9356de51be mmc: sdhci-msm: support voltage pad switching) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 1 + + Documentation/devicetree/bindings/mmc/jz4740.txt | 38 ++++ + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + + arch/mips/boot/dts/ingenic/ci20.dts | 34 ++++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 52 ++++++ + arch/mips/configs/ci20_defconfig | 4 + + drivers/mmc/core/block.c | 3 +- + drivers/mmc/core/card.h | 6 + + drivers/mmc/core/mmc.c | 8 + + drivers/mmc/core/pwrseq_simple.c | 14 +- + drivers/mmc/core/quirks.h | 3 + + drivers/mmc/core/sd.c | 8 + + drivers/mmc/core/sdio.c | 14 +- + drivers/mmc/host/Kconfig | 23 +-- + drivers/mmc/host/davinci_mmc.c | 6 +- + drivers/mmc/host/dw_mmc-rockchip.c | 5 +- + drivers/mmc/host/dw_mmc.c | 4 + + drivers/mmc/host/jz4740_mmc.c | 203 ++++++++++++++------- + drivers/mmc/host/meson-gx-mmc.c | 63 +++++-- + drivers/mmc/host/mtk-sd.c | 7 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 30 +-- + drivers/mmc/host/sdhci-cadence.c | 22 ++- + drivers/mmc/host/sdhci-msm.c | 84 ++++++++- + drivers/mmc/host/sdhci-of-arasan.c | 9 +- + drivers/mmc/host/sdhci-pci-core.c | 38 +++- + drivers/mmc/host/sdhci-pci.h | 1 + + drivers/mmc/host/sunxi-mmc.c | 185 ++++++++++++------- + drivers/mmc/host/wmt-sdmmc.c | 6 +- + include/dt-bindings/dma/jz4780-dma.h | 49 +++++ + include/linux/mmc/card.h | 1 + + include/linux/mmc/host.h | 1 + + include/linux/mmc/sdio_ids.h | 1 + + 32 files changed, 715 insertions(+), 209 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/jz4740.txt + create mode 100644 include/dt-bindings/dma/jz4780-dma.h +Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Already up to date. +Merging md/for-next (fd823089ffac raid5: copy write hint from origin bio to stripe) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 188 +++++++++++++++++++++++++++++++++++++---------------- + drivers/md/md.h | 23 +++++-- + drivers/md/raid5.c | 6 ++ + drivers/md/raid5.h | 1 + + 4 files changed, 156 insertions(+), 62 deletions(-) +Merging mfd/for-mfd-next (ae0280fe1689 mfd: tps65911-comparator: Fix a build error) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/syscon/exynos5-pmu.h +Removing include/linux/mfd/syscon/exynos4-pmu.h +Removing drivers/mfd/cros_ec_acpi_gpe.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/motorola-cpcap.txt | 42 ++ + drivers/mfd/Makefile | 1 - + drivers/mfd/ab8500-debugfs.c | 3 +- + drivers/mfd/abx500-core.c | 25 +- + drivers/mfd/arizona-core.c | 53 ++- + drivers/mfd/axp20x.c | 252 +++-------- + drivers/mfd/cros_ec.c | 15 +- + drivers/mfd/cros_ec_acpi_gpe.c | 103 ----- + drivers/mfd/da9062-core.c | 462 +++++---------------- + drivers/mfd/htc-i2cpld.c | 4 +- + drivers/mfd/janz-cmodio.c | 4 +- + drivers/mfd/jz4740-adc.c | 4 +- + drivers/mfd/max8997.c | 4 +- + drivers/mfd/omap-usb-tll.c | 60 ++- + drivers/mfd/pcf50633-core.c | 7 +- + drivers/mfd/rave-sp.c | 107 ++++- + drivers/mfd/rc5t583.c | 6 +- + drivers/mfd/si476x-i2c.c | 6 +- + drivers/mfd/sm501.c | 32 +- + drivers/mfd/smsc-ece1099.c | 7 +- + drivers/mfd/sprd-sc27xx-spi.c | 3 + + drivers/mfd/syscon.c | 2 + + drivers/mfd/ti_am335x_tscadc.c | 5 +- + drivers/mfd/tps65090.c | 4 +- + drivers/mfd/tps6586x.c | 4 +- + drivers/mfd/tps65910.c | 18 +- + drivers/mfd/tps65911-comparator.c | 6 +- + drivers/mfd/tps68470.c | 10 +- + drivers/mfd/tps80031.c | 4 +- + drivers/mfd/twl-core.c | 2 +- + drivers/mfd/twl6030-irq.c | 4 +- + drivers/mfd/viperboard.c | 4 +- + include/linux/mfd/arizona/pdata.h | 3 +- + include/linux/mfd/axp20x.h | 10 +- + include/linux/mfd/cros_ec.h | 18 - + include/linux/mfd/syscon/exynos4-pmu.h | 21 - + include/linux/mfd/syscon/exynos5-pmu.h | 19 - + include/linux/mfd/tps65218.h | 4 +- + include/linux/mfd/tps68470.h | 17 +- + 39 files changed, 464 insertions(+), 891 deletions(-) + delete mode 100644 drivers/mfd/cros_ec_acpi_gpe.c + delete mode 100644 include/linux/mfd/syscon/exynos4-pmu.h + delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h +Merging backlight/for-backlight-next (ea388d6cffd4 pwm-backlight: Add support for PWM delays proprieties.) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/pwm-backlight.txt | 6 ++ + .../leds/backlight/zii,rave-sp-backlight.txt | 23 ++++++ + drivers/video/backlight/Kconfig | 6 ++ + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/pwm_bl.c | 28 ++++++-- + drivers/video/backlight/rave-sp-backlight.c | 82 ++++++++++++++++++++++ + include/linux/mfd/rave-sp.h | 1 + + include/linux/pwm_backlight.h | 2 + + 8 files changed, 145 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/zii,rave-sp-backlight.txt + create mode 100644 drivers/video/backlight/rave-sp-backlight.c +Merging battery/for-next (a78c0c30ec73 power: supply: axp288_fuel_gauge: Remove polling from the driver) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/bq27xxx.txt | 1 + + drivers/power/reset/gpio-poweroff.c | 4 +- + drivers/power/supply/ab8500_bmdata.c | 63 ---------- + drivers/power/supply/ab8500_btemp.c | 93 +++------------ + drivers/power/supply/ab8500_charger.c | 131 ++------------------- + drivers/power/supply/ab8500_fg.c | 14 +-- + drivers/power/supply/abx500_chargalg.c | 62 ---------- + drivers/power/supply/axp288_charger.c | 26 +++- + drivers/power/supply/axp288_fuel_gauge.c | 27 ++--- + drivers/power/supply/bq27xxx_battery.c | 9 ++ + drivers/power/supply/bq27xxx_battery_i2c.c | 2 + + drivers/power/supply/charger-manager.c | 5 +- + drivers/power/supply/gpio-charger.c | 3 +- + drivers/power/supply/power_supply_sysfs.c | 77 ++++++------ + drivers/power/supply/s3c_adc_battery.c | 8 +- + include/linux/mfd/abx500.h | 1 - + include/linux/mfd/abx500/ab8500-bm.h | 2 - + include/linux/mfd/abx500/ux500_chargalg.h | 4 - + include/linux/power/bq27xxx_battery.h | 3 +- + 19 files changed, 134 insertions(+), 401 deletions(-) +Merging regulator/for-next (49b07c0d58da Merge remote-tracking branch 'regulator/topic/bd9571mwv' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/axp20x.txt | 3 +- + .../devicetree/bindings/mfd/bd9571mwv.txt | 21 + + drivers/mfd/bd9571mwv.c | 2 + + drivers/regulator/ab8500.c | 1779 ++------------------ + drivers/regulator/axp20x-regulator.c | 2 + + drivers/regulator/bd9571mwv-regulator.c | 127 +- + drivers/regulator/cpcap-regulator.c | 2 +- + drivers/regulator/lp87565-regulator.c | 17 +- + drivers/regulator/of_regulator.c | 13 +- + drivers/regulator/pfuze100-regulator.c | 9 +- + drivers/regulator/tps6586x-regulator.c | 1 + + drivers/regulator/twl-regulator.c | 2 +- + drivers/regulator/wm8350-regulator.c | 1 + + include/linux/mfd/bd9571mwv.h | 5 + + include/linux/mfd/tps6586x.h | 1 + + include/linux/regulator/ab8500.h | 157 +- + include/linux/regulator/consumer.h | 1 + + 17 files changed, 378 insertions(+), 1765 deletions(-) +Merging security/next-testing (b393a707c84b Merge tag 'v4.17-rc2' into next-general) +$ git merge security/next-testing +Merge made by the 'recursive' strategy. + include/linux/security.h | 14 -------------- + 1 file changed, 14 deletions(-) +Merging apparmor/apparmor-next (588558eb6d0e apparmor: fix memory leak on buffer on error exit path) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (ab60368ab6a4 ima: Fallback to the builtin hash algorithm) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) +$ git merge keys/keys-next +Already up to date. +Merging selinux/next (d141136f523a audit: normalize MAC_POLICY_LOAD record) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/selinuxfs.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) +Merging tpmdd/next (33bfe29814bd tpm/st33zp24: Fix spelling mistake in macro ST33ZP24_TISREGISTER_UKNOWN) +$ git merge tpmdd/next +Auto-merging drivers/char/tpm/eventlog/tpm2.c +Auto-merging drivers/char/tpm/eventlog/tpm1.c +Auto-merging drivers/char/tpm/eventlog/of.c +Auto-merging drivers/char/tpm/eventlog/efi.c +Auto-merging drivers/char/tpm/eventlog/acpi.c +Merge made by the 'recursive' strategy. + drivers/char/tpm/Makefile | 10 +- + .../tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} | 3 +- + drivers/char/tpm/eventlog/common.c | 195 ++++++++++++++++++++ + drivers/char/tpm/eventlog/common.h | 35 ++++ + .../tpm/{tpm_eventlog_efi.c => eventlog/efi.c} | 3 +- + .../char/tpm/{tpm_eventlog_of.c => eventlog/of.c} | 7 +- + .../char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} | 200 ++------------------- + .../char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} | 3 +- + drivers/char/tpm/st33zp24/spi.c | 4 +- + drivers/char/tpm/st33zp24/st33zp24.c | 2 - + drivers/char/tpm/tpm-interface.c | 3 +- + drivers/char/tpm/tpm.h | 27 --- + 12 files changed, 266 insertions(+), 226 deletions(-) + rename drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} (98%) + create mode 100644 drivers/char/tpm/eventlog/common.c + create mode 100644 drivers/char/tpm/eventlog/common.h + rename drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} (97%) + rename drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} (94%) + rename drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} (58%) + rename drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} (99%) +Merging watchdog/master (6d08b06e67cd Linux 4.17-rc2) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (d4f96fd5c249 Merge branches 'x86/amd', 'x86/vt-d', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/exynos', 'arm/renesas', 'arm/smmu' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (da9147140fe3 MAINTAINERS: vfio/platform: Update sub-maintainer) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (23bcc480dac2 audit: allow not equal op for audit by executable) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.c | 4 ++-- + kernel/auditfilter.c | 2 +- + kernel/auditsc.c | 2 ++ + 3 files changed, 5 insertions(+), 3 deletions(-) +Merging devicetree/for-next (c01d05ef0005 Merge branches 'dt/next' and 'dt/linus' into for-next) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/serial/renesas,sci-serial.txt +Auto-merging Documentation/devicetree/bindings/mmc/tmio_mmc.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/k3dma.txt | 1 - + Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + Documentation/devicetree/bindings/dma/ti-edma.txt | 1 - + Documentation/devicetree/bindings/mips/lantiq/rcu.txt | 2 -- + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 4 ---- + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 4 ---- + Documentation/devicetree/bindings/net/renesas,ravb.txt | 1 + + Documentation/devicetree/bindings/pci/xgene-pci.txt | 7 ------- + .../devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 6 +++--- + Documentation/devicetree/bindings/pps/pps-gpio.txt | 1 - + .../devicetree/bindings/serial/renesas,sci-serial.txt | 2 ++ + .../devicetree/bindings/thermal/rcar-gen3-thermal.txt | 6 +++--- + Documentation/devicetree/bindings/vendor-prefixes.txt | 2 ++ + drivers/of/of_numa.c | 1 - + drivers/of/platform.c | 11 +++++++++++ + scripts/dtc/checks.c | 5 ++--- + 16 files changed, 25 insertions(+), 30 deletions(-) +Merging mailbox/mailbox-for-next (dfbc9c5841fc mailbox: Remove depends on HAS_DMA in case of platform dependency) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/Kconfig | 2 -- + 1 file changed, 2 deletions(-) +Merging spi/for-next (fd2c2d98e1b6 Merge branch 'spi-4.18' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/Kconfig | 12 +-- + drivers/spi/internals.h | 43 ++++++++ + drivers/spi/spi-cadence.c | 14 ++- + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-pxa2xx-dma.c | 28 ++--- + drivers/spi/spi-pxa2xx.c | 239 +++++++++++++---------------------------- + drivers/spi/spi-pxa2xx.h | 19 +--- + drivers/spi/spi-s3c64xx.c | 158 +++++++++++++++------------ + drivers/spi/spi-sh-msiof.c | 66 ++++++------ + drivers/spi/spi-stm32.c | 2 +- + drivers/spi/spi-zynqmp-gqspi.c | 92 ++++++++++++---- + drivers/spi/spi.c | 41 +++---- + 12 files changed, 371 insertions(+), 345 deletions(-) + create mode 100644 drivers/spi/internals.h +Merging tip/auto-latest (2657134b9a40 Merge branch 'x86/cpu') +$ git merge tip/auto-latest +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging arch/nds32/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/Kconfig | 15 +++++++++ + arch/alpha/include/asm/Kbuild | 1 + + arch/arc/include/asm/Kbuild | 1 + + arch/arm/include/asm/Kbuild | 1 + + arch/arm64/include/asm/compat.h | 11 ------- + arch/arm64/include/asm/stat.h | 1 + + arch/arm64/kernel/hw_breakpoint.c | 1 - + arch/arm64/kernel/perf_regs.c | 2 +- + arch/c6x/include/asm/Kbuild | 1 + + arch/h8300/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/ia64/include/asm/Kbuild | 1 + + arch/m68k/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/Kbuild | 1 + + arch/mips/include/asm/compat.h | 11 ------- + arch/mips/kernel/signal32.c | 2 +- + arch/nds32/include/asm/Kbuild | 1 + + arch/nios2/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/compat.h | 11 ------- + arch/powerpc/include/asm/compat.h | 11 ------- + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/oprofile/backtrace.c | 1 + + arch/s390/hypfs/hypfs_sprp.c | 1 - + arch/s390/include/asm/compat.h | 11 ------- + arch/s390/include/asm/elf.h | 4 +-- + arch/s390/kvm/priv.c | 1 - + arch/s390/pci/pci_clp.c | 1 - + arch/sh/include/asm/Kbuild | 1 + + arch/sparc/include/asm/compat.h | 15 +++------ + arch/um/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/Kbuild | 1 + + arch/x86/events/core.c | 2 +- + arch/x86/include/asm/compat.h | 11 ------- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/kernel/cpu/centaur.c | 48 ++++++++++++++++++++++++++++ + arch/x86/kernel/sys_x86_64.c | 2 +- + arch/xtensa/include/asm/Kbuild | 1 + + drivers/s390/block/dasd_ioctl.c | 1 - + drivers/s390/char/fs3270.c | 1 - + drivers/s390/char/sclp_ctl.c | 1 - + drivers/s390/char/vmcp.c | 1 - + drivers/s390/cio/chsc_sch.c | 1 - + drivers/s390/net/qeth_core_main.c | 2 +- + include/asm-generic/compat.h | 3 ++ + include/linux/compat.h | 12 ++++--- + include/linux/compat_time.h | 23 ++++++++++++++ + include/linux/restart_block.h | 7 ++-- + include/linux/syscalls.h | 13 ++++---- + include/linux/time.h | 4 +-- + include/linux/time64.h | 10 +++++- + include/uapi/asm-generic/posix_types.h | 1 + + include/uapi/linux/time.h | 7 ++++ + kernel/compat.c | 52 +++++------------------------- + kernel/time/hrtimer.c | 10 ++++-- + kernel/time/posix-stubs.c | 12 ++++--- + kernel/time/posix-timers.c | 24 ++++++++++---- + kernel/time/time.c | 58 +++++++++++++++++++++++++++++++--- + 58 files changed, 249 insertions(+), 176 deletions(-) + create mode 100644 include/asm-generic/compat.h + create mode 100644 include/linux/compat_time.h +Merging clockevents/clockevents/next (0136c741ff40 clocksource/drivers/imx-tpm: Add different counter width support) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up to date. +Merging edac-amd/for-next (6fd052665274 EDAC, sb_edac: Remove variable length array usage) +$ git merge edac-amd/for-next +Already up to date. +Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when updating irq type) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (0b3dec05dbbc tracing: Enforce passing in filter=NULL to create_filter()) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (248d0f34b437 Merge branches 'exp.2018.04.20a', 'fixes.2018.04.23b', 'lock.2018.04.22a' and 'torture.2018.04.20a' into HEAD) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/bin/parse-torture.sh +Merge made by the 'recursive' strategy. + Documentation/RCU/whatisRCU.txt | 2 + + drivers/nvme/host/core.c | 2 +- + include/linux/rcupdate.h | 4 +- + include/linux/rcutree.h | 1 + + include/linux/sched.h | 8 - + include/linux/srcu.h | 36 +- + include/trace/events/rcu.h | 13 +- + kernel/rcu/rcu.h | 12 +- + kernel/rcu/rcu_segcblist.c | 18 - + kernel/rcu/rcu_segcblist.h | 2 - + kernel/rcu/rcuperf.c | 2 +- + kernel/rcu/rcutorture.c | 15 +- + kernel/rcu/srcutiny.c | 9 +- + kernel/rcu/srcutree.c | 30 +- + kernel/rcu/tree.c | 375 ++++++++------------- + kernel/rcu/tree.h | 38 ++- + kernel/rcu/tree_exp.h | 235 +++++++------ + kernel/rcu/tree_plugin.h | 136 +++++--- + kernel/rcu/update.c | 50 +-- + kernel/sched/core.c | 14 - + kernel/softirq.c | 3 +- + kernel/torture.c | 2 +- + kernel/trace/trace_benchmark.c | 4 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 56 +++ + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 12 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 4 - + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 1 - + .../selftests/rcutorture/bin/parse-console.sh | 115 ++++++- + .../selftests/rcutorture/bin/parse-torture.sh | 105 ------ + 29 files changed, 669 insertions(+), 635 deletions(-) + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh + delete mode 100755 tools/testing/selftests/rcutorture/bin/parse-torture.sh +Merging kvm/linux-next (c18bb396d3d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (dc6ed61d2f82 arm64: Add temporary ERRATA_MIDR_ALL_VERSIONS compatibility macro) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (31c8b0d0694a KVM: PPC: Book3S HV: Use __gfn_to_pfn_memslot() in page fault handler) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (ccc40c53c07b KVM: s390: provide counters for all interrupt injects/delivery) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (eb0b4aa89cf2 x86/xen: Remove use of VLAs) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/xen/enlighten_pv.c | 86 ++++++++++++++++----------------------------- + 1 file changed, 31 insertions(+), 55 deletions(-) +Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next) +$ git merge workqueues/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/cmt_speech.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (9e50d5fb0d18 leds: add LED driver for CR0014114 board) +$ git merge leds/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-cr0014114.txt | 54 ++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/leds/Kconfig | 13 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-cr0014114.c | 315 +++++++++++++++++++++ + 5 files changed, 384 insertions(+) + create mode 100644 Documentation/devicetree/bindings/leds/leds-cr0014114.txt + create mode 100644 drivers/leds/leds-cr0014114.c +Merging ipmi/for-next (1211229399b3 ipmi_ssif: Fix uninitialized variable issue) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 39 + + drivers/char/ipmi/Kconfig | 15 + + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/ipmi_devintf.c | 129 +- + drivers/char/ipmi/ipmi_msghandler.c | 1842 +++++++++++--------- + drivers/char/ipmi/ipmi_poweroff.c | 32 +- + drivers/char/ipmi/ipmi_si_intf.c | 73 +- + drivers/char/ipmi/ipmi_ssif.c | 94 +- + drivers/char/ipmi/ipmi_watchdog.c | 407 ++--- + drivers/char/ipmi/kcs_bmc_npcm7xx.c | 204 +++ + include/linux/ipmi.h | 153 +- + include/linux/ipmi_smi.h | 130 +- + 12 files changed, 1733 insertions(+), 1386 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt + create mode 100644 drivers/char/ipmi/kcs_bmc_npcm7xx.c +Merging driver-core/driver-core-next (9ee84466b713 fs: kernfs: Adding new return type vm_fault_t) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + fs/kernfs/file.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging usb/usb-next (3f0989e4d366 usb: core: hcd: mark expected switch fall-through) +$ git merge usb/usb-next +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/core/hcd.c +CONFLICT (content): Merge conflict in drivers/usb/core/hcd.c +Resolved 'drivers/usb/core/hcd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 42483ef5e85e] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-usb | 18 ++ + .../devicetree/bindings/usb/fcs,fusb302.txt | 6 - + .../devicetree/bindings/usb/richtek,rt1711h.txt | 17 ++ + drivers/staging/typec/Kconfig | 8 + + drivers/staging/typec/Makefile | 1 + + drivers/staging/typec/tcpci.h | 1 + + drivers/staging/typec/tcpci_rt1711h.c | 312 +++++++++++++++++++++ + drivers/usb/core/hcd.c | 49 +--- + drivers/usb/core/hub.c | 19 +- + drivers/usb/core/sysfs.c | 22 ++ + drivers/usb/gadget/udc/Kconfig | 4 +- + drivers/usb/host/Kconfig | 4 +- + drivers/usb/host/ehci-omap.c | 5 +- + drivers/usb/host/ehci-tegra.c | 87 +++--- + drivers/usb/isp1760/isp1760-core.c | 2 +- + drivers/usb/isp1760/isp1760-hcd.c | 2 +- + drivers/usb/mon/mon_bin.c | 2 +- + drivers/usb/mtu3/Kconfig | 2 +- + drivers/usb/mtu3/mtu3_plat.c | 6 +- + drivers/usb/musb/omap2430.c | 95 +++---- + drivers/usb/phy/Kconfig | 9 + + drivers/usb/phy/Makefile | 2 +- + drivers/usb/phy/phy-am335x.c | 6 +- + drivers/usb/phy/phy-tegra-usb.c | 140 +++++++-- + drivers/usb/phy/phy.c | 133 +-------- + drivers/usb/renesas_usbhs/common.h | 1 - + drivers/usb/renesas_usbhs/rcar2.c | 29 -- + drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 + + drivers/usb/storage/freecom.c | 4 +- + drivers/usb/typec/fusb302/fusb302.c | 42 ++- + drivers/usb/typec/tcpm.c | 117 ++++---- + drivers/usb/typec/typec_wcove.c | 4 +- + drivers/usb/usbip/stub_dev.c | 4 +- + include/linux/usb.h | 4 + + include/linux/usb/audio-v2.h | 2 +- + include/linux/usb/hcd.h | 2 +- + include/linux/usb/phy.h | 36 --- + include/linux/usb/tcpm.h | 9 - + include/linux/usb/tegra_usb_phy.h | 2 + + include/uapi/linux/usb/ch11.h | 5 + + 40 files changed, 743 insertions(+), 472 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/richtek,rt1711h.txt + create mode 100644 drivers/staging/typec/tcpci_rt1711h.c +Merging usb-gadget/next (60cc43fc8884 Linux 4.17-rc1) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (86c225c1b2e0 USB: serial: option: blacklist unused dwm-158 interfaces) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. +Merging phy-next/next (cd3bf368aa7a phy: Add a driver for the ATH79 USB phy) +$ git merge phy-next/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +++ + drivers/phy/phy-core.c | 18 +++++ + drivers/phy/qualcomm/Kconfig | 11 ++- + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-ath79-usb.c | 108 ++++++++++++++++++++++++++++ + drivers/phy/samsung/phy-exynos-mipi-video.c | 34 ++++----- + 6 files changed, 159 insertions(+), 21 deletions(-) + create mode 100644 drivers/phy/qualcomm/phy-ath79-usb.c +Merging tty/tty-next (c1c734cb1f54 serial: core: Make sure compiler barfs for 16-byte earlycon names) +$ git merge tty/tty-next +Auto-merging include/linux/serial_core.h +Auto-merging drivers/tty/serial/xilinx_uartps.c +Auto-merging drivers/tty/serial/qcom_geni_serial.c +Auto-merging drivers/tty/serial/mvebu-uart.c +Auto-merging drivers/tty/serial/imx.c +Auto-merging drivers/tty/serial/earlycon.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-38x.dtsi | 4 +- + drivers/tty/ipwireless/network.c | 2 +- + drivers/tty/nozomi.c | 2 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 124 ++++++++++++++++++++++++++++ + drivers/tty/serial/8250/8250_dw.c | 31 ++++++- + drivers/tty/serial/8250/8250_of.c | 1 + + drivers/tty/serial/8250/8250_omap.c | 11 +++ + drivers/tty/serial/8250/8250_port.c | 3 +- + drivers/tty/serial/Kconfig | 6 +- + drivers/tty/serial/earlycon.c | 4 + + drivers/tty/serial/imx.c | 18 ++-- + drivers/tty/serial/msm_serial.c | 25 ++++++ + drivers/tty/serial/mvebu-uart.c | 64 ++++++++++++++ + drivers/tty/serial/qcom_geni_serial.c | 6 +- + drivers/tty/serial/serial_core.c | 4 +- + drivers/tty/serial/sh-sci.c | 73 ++++++++++------ + drivers/tty/serial/sh-sci.h | 4 + + drivers/tty/serial/st-asc.c | 6 +- + drivers/tty/serial/xilinx_uartps.c | 6 +- + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 4 +- + 21 files changed, 336 insertions(+), 63 deletions(-) +Merging char-misc/char-misc-next (3eb87d4e5a93 char: mspec: change return type to vm_fault_t) +$ git merge char-misc/char-misc-next +Auto-merging drivers/android/binder.c +Merge made by the 'recursive' strategy. + .../bindings/fpga/lattice-machxo2-spi.txt | 29 ++ + drivers/android/binder.c | 4 +- + drivers/char/mspec.c | 11 +- + drivers/firmware/google/Kconfig | 8 + + drivers/firmware/google/Makefile | 1 + + drivers/firmware/google/coreboot_table-acpi.c | 2 +- + drivers/firmware/google/coreboot_table-of.c | 2 +- + drivers/firmware/google/coreboot_table.c | 130 +++++-- + drivers/firmware/google/coreboot_table.h | 72 +++- + drivers/firmware/google/framebuffer-coreboot.c | 115 ++++++ + drivers/firmware/google/memconsole-coreboot.c | 49 +-- + drivers/firmware/google/vpd.c | 43 +-- + drivers/fpga/Kconfig | 8 +- + drivers/fpga/Makefile | 1 + + drivers/fpga/fpga-region.c | 5 + + drivers/fpga/machxo2-spi.c | 403 +++++++++++++++++++++ + drivers/misc/cxl/context.c | 7 +- + drivers/misc/ti-st/st_kim.c | 2 +- + drivers/misc/tifm_7xx1.c | 6 +- + drivers/mux/adg792a.c | 5 +- + drivers/uio/uio.c | 2 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 1 - + 22 files changed, 775 insertions(+), 131 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fpga/lattice-machxo2-spi.txt + create mode 100644 drivers/firmware/google/framebuffer-coreboot.c + create mode 100644 drivers/fpga/machxo2-spi.c +Merging extcon/extcon-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging staging/staging-next (7cc6f682ca6f Revert "staging: nvec: Augment TODO file with GPIO work item") +$ git merge staging/staging-next +Removing drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c +Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h +Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h +Removing drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h +Removing drivers/staging/lustre/include/linux/libcfs/libcfs_time.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/staging/android/Kconfig | 9 + + drivers/staging/android/Makefile | 1 + + drivers/staging/android/TODO | 10 + + drivers/staging/android/ion/ion.c | 6 +- + drivers/staging/android/uapi/vsoc_shm.h | 303 ++ + drivers/staging/android/vsoc.c | 1169 +++++ + drivers/staging/comedi/drivers/cb_pcidas64.c | 6 +- + drivers/staging/emxx_udc/Kconfig | 2 +- + drivers/staging/emxx_udc/TODO | 2 + + drivers/staging/fbtft/TODO | 4 + + drivers/staging/fbtft/fbtft-bus.c | 13 +- + drivers/staging/fsl-dpaa2/Kconfig | 8 + + drivers/staging/fsl-dpaa2/Makefile | 5 +- + drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 13 + + drivers/staging/fsl-dpaa2/ethsw/dpsw.c | 42 + + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 6 + + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 39 +- + drivers/staging/fsl-dpaa2/rtc/Makefile | 7 + + drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h | 137 + + drivers/staging/fsl-dpaa2/rtc/dprtc.c | 701 +++ + drivers/staging/fsl-dpaa2/rtc/dprtc.h | 164 + + drivers/staging/fsl-dpaa2/rtc/rtc.c | 231 + + drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 25 +- + drivers/staging/fsl-mc/bus/dpio/qbman-portal.h | 4 +- + drivers/staging/fsl-mc/include/dpaa2-io.h | 2 +- + drivers/staging/greybus/TODO | 5 + + drivers/staging/greybus/arche-platform.c | 3 +- + drivers/staging/greybus/audio_codec.h | 5 +- + drivers/staging/iio/TODO | 9 +- + drivers/staging/ks7010/eap_packet.h | 74 +- + drivers/staging/ks7010/ks7010_sdio.c | 340 +- + drivers/staging/ks7010/ks7010_sdio.h | 5 - + drivers/staging/ks7010/ks_hostif.c | 120 +- + drivers/staging/ks7010/ks_hostif.h | 277 +- + drivers/staging/ks7010/ks_wlan.h | 95 +- + drivers/staging/ks7010/ks_wlan_net.c | 229 +- + drivers/staging/ks7010/michael_mic.c | 21 +- + drivers/staging/ks7010/michael_mic.h | 4 +- + .../staging/lustre/include/linux/libcfs/curproc.h | 2 - + .../staging/lustre/include/linux/libcfs/libcfs.h | 59 +- + .../lustre/include/linux/libcfs/libcfs_cpu.h | 206 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 32 + + .../lustre/include/linux/libcfs/libcfs_time.h | 79 - + .../lustre/include/linux/libcfs/linux/libcfs.h | 133 - + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 78 - + .../lustre/include/linux/libcfs/linux/linux-time.h | 103 - + .../lustre/include/uapi/linux/lnet/lnetctl.h | 11 - + .../include/uapi/linux/lustre/lustre_ioctl.h | 2 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 32 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 6 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 17 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 15 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 87 +- + drivers/staging/lustre/lnet/libcfs/Makefile | 1 - + drivers/staging/lustre/lnet/libcfs/debug.c | 2 +- + drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c | 961 +++- + .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 1079 ----- + .../staging/lustre/lnet/libcfs/linux/linux-debug.c | 1 - + .../lustre/lnet/libcfs/linux/linux-module.c | 5 +- + drivers/staging/lustre/lnet/libcfs/module.c | 1 + + drivers/staging/lustre/lnet/libcfs/tracefile.c | 12 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 14 +- + drivers/staging/lustre/lnet/lnet/net_fault.c | 40 +- + drivers/staging/lustre/lnet/lnet/peer.c | 2 +- + drivers/staging/lustre/lnet/lnet/router.c | 17 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 13 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 14 +- + drivers/staging/lustre/lnet/selftest/console.c | 4 +- + drivers/staging/lustre/lnet/selftest/framework.c | 2 +- + drivers/staging/lustre/lnet/selftest/timer.c | 4 +- + drivers/staging/lustre/lustre/include/cl_object.h | 10 +- + drivers/staging/lustre/lustre/include/lu_object.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 13 +- + .../staging/lustre/lustre/include/lustre_export.h | 9 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 11 +- + drivers/staging/lustre/lustre/include/obd.h | 24 +- + drivers/staging/lustre/lustre/include/obd_class.h | 13 +- + .../staging/lustre/lustre/include/obd_support.h | 27 - + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 11 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 22 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 5 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 66 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 25 +- + drivers/staging/lustre/lustre/llite/file.c | 16 +- + .../staging/lustre/lustre/llite/llite_internal.h | 2 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 4 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 12 +- + drivers/staging/lustre/lustre/llite/statahead.c | 4 +- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 8 +- + drivers/staging/lustre/lustre/llite/xattr.c | 227 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 83 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 12 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 16 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 18 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 13 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 14 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 159 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 4 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 4 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 68 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 2 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 1 - + drivers/staging/lustre/lustre/obdclass/cl_object.c | 1 - + drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 36 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 3 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 12 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 8 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 163 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 2 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 10 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 7 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 11 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 4 +- + drivers/staging/lustre/lustre/osc/osc_quota.c | 136 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 164 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 23 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 6 +- + drivers/staging/media/atomisp/TODO | 5 + + drivers/staging/most/dim2/reg.h | 84 +- + drivers/staging/mt7621-eth/ethtool.c | 1 + + drivers/staging/mt7621-gpio/gpio-mt7621.c | 14 +- + drivers/staging/mt7621-mmc/board.h | 87 +- + drivers/staging/mt7621-mmc/dbg.c | 397 +- + drivers/staging/mt7621-mmc/dbg.h | 98 +- + drivers/staging/mt7621-mmc/mt6575_sd.h | 1091 ++--- + drivers/staging/mt7621-mmc/sd.c | 4576 +++++++++----------- + drivers/staging/mt7621-pci/pci-mt7621.c | 12 +- + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 1 - + drivers/staging/mt7621-spi/spi-mt7621.c | 1 - + drivers/staging/nvec/nvec.c | 81 +- + drivers/staging/nvec/nvec.h | 2 +- + drivers/staging/olpc_dcon/TODO | 4 + + .../pi433/Documentation/devicetree/pi433.txt | 6 +- + drivers/staging/pi433/Documentation/pi433.txt | 10 +- + drivers/staging/pi433/Kconfig | 2 +- + drivers/staging/pi433/pi433_if.c | 23 +- + drivers/staging/pi433/rf69.c | 182 +- + drivers/staging/pi433/rf69.h | 28 +- + drivers/staging/rtl8192e/dot11d.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/rtl8192u/r8192U_dm.c | 4 +- + drivers/staging/vboxvideo/vbox_main.c | 3 +- + drivers/staging/vc04_services/Kconfig | 1 - + .../interface/vchiq_arm/vchiq_2835_arm.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 35 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 55 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 1 - + drivers/staging/vt6655/card.c | 5 +- + drivers/staging/vt6655/device_main.c | 150 +- + drivers/staging/wilc1000/TODO | 4 + + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 3 +- + include/linux/kernel.h | 16 + + 165 files changed, 8780 insertions(+), 6883 deletions(-) + create mode 100644 drivers/staging/android/uapi/vsoc_shm.h + create mode 100644 drivers/staging/android/vsoc.c + create mode 100644 drivers/staging/fbtft/TODO + create mode 100644 drivers/staging/fsl-dpaa2/rtc/Makefile + create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h + create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc.c + create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc.h + create mode 100644 drivers/staging/fsl-dpaa2/rtc/rtc.c + create mode 100644 drivers/staging/greybus/TODO + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c +Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 1 + + drivers/mux/core.c | 104 +++++++++++++++++++++++++++------- + include/linux/mux/consumer.h | 4 ++ + 3 files changed, 89 insertions(+), 20 deletions(-) +Merging slave-dma/next (be20f0a8ebdf Merge branch 'topic/ti' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/ti/omap-dma.c +Auto-merging drivers/dma/ti/edma.c +Auto-merging drivers/dma/ti/cppi41.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 + + drivers/dma/Kconfig | 31 +-- + drivers/dma/Makefile | 5 +- + drivers/dma/at_hdmac.c | 9 +- + drivers/dma/at_xdmac.c | 9 +- + drivers/dma/dmatest.c | 16 +- + drivers/dma/dw/platform.c | 6 +- + drivers/dma/fsldma.c | 6 +- + drivers/dma/idma64.c | 6 +- + drivers/dma/pl330.c | 209 ++++++++++++++++----- + drivers/dma/qcom/hidma.c | 3 +- + drivers/dma/qcom/hidma_mgmt_sys.c | 6 +- + drivers/dma/sh/shdmac.c | 50 +++-- + drivers/dma/ste_dma40.c | 12 +- + drivers/dma/stm32-mdma.c | 98 ++++++---- + drivers/dma/ti/Kconfig | 37 ++++ + drivers/dma/ti/Makefile | 5 + + drivers/dma/{ => ti}/cppi41.c | 2 +- + .../dma/{ti-dma-crossbar.c => ti/dma-crossbar.c} | 0 + drivers/dma/{ => ti}/edma.c | 4 +- + drivers/dma/{ => ti}/omap-dma.c | 2 +- + drivers/dma/txx9dmac.c | 8 +- + 22 files changed, 330 insertions(+), 202 deletions(-) + create mode 100644 drivers/dma/ti/Kconfig + create mode 100644 drivers/dma/ti/Makefile + rename drivers/dma/{ => ti}/cppi41.c (99%) + rename drivers/dma/{ti-dma-crossbar.c => ti/dma-crossbar.c} (100%) + rename drivers/dma/{ => ti}/edma.c (99%) + rename drivers/dma/{ => ti}/omap-dma.c (99%) +Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded mode switching) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (6980151fba2a Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/net/hyperv/netvsc.c +Auto-merging drivers/net/hyperv/hyperv_net.h +Merge made by the 'recursive' strategy. + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/scsi.rst | 2 +- + Documentation/driver-api/target.rst | 64 ++ + drivers/ata/libata-scsi.c | 12 + + drivers/hv/ring_buffer.c | 2 + + drivers/message/fusion/lsi/mpi_cnfg.h | 4 +- + drivers/message/fusion/mptfc.c | 2 +- + drivers/message/fusion/mptsas.c | 1 + + drivers/net/hyperv/hyperv_net.h | 1 - + drivers/net/hyperv/netvsc.c | 18 +- + drivers/net/hyperv/netvsc_drv.c | 3 - + drivers/scsi/Kconfig | 14 + + drivers/scsi/Makefile | 3 +- + drivers/scsi/cxlflash/Kconfig | 2 +- + drivers/scsi/cxlflash/Makefile | 2 +- + drivers/scsi/cxlflash/backend.h | 50 +- + drivers/scsi/cxlflash/common.h | 11 +- + drivers/scsi/cxlflash/cxl_hw.c | 13 + + drivers/scsi/cxlflash/main.c | 86 +- + drivers/scsi/cxlflash/main.h | 1 + + drivers/scsi/cxlflash/ocxl_hw.c | 1436 +++++++++++++++++++++++++++ + drivers/scsi/cxlflash/ocxl_hw.h | 77 ++ + drivers/scsi/cxlflash/sislite.h | 41 +- + drivers/scsi/cxlflash/superpipe.c | 14 + + drivers/scsi/esas2r/esas2r_init.c | 5 +- + drivers/scsi/fnic/fnic_trace.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 - + drivers/scsi/hisi_sas/hisi_sas_main.c | 53 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 8 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 81 +- + drivers/scsi/ips.c | 78 +- + drivers/scsi/ips.h | 11 +- + drivers/scsi/isci/port_config.c | 3 +- + drivers/scsi/iscsi_tcp.c | 1 - + drivers/scsi/libsas/sas_ata.c | 5 + + drivers/scsi/libsas/sas_discover.c | 1 + + drivers/scsi/lpfc/lpfc.h | 9 +- + drivers/scsi/lpfc/lpfc_attr.c | 112 ++- + drivers/scsi/lpfc/lpfc_ct.c | 10 + + drivers/scsi/lpfc/lpfc_debugfs.c | 93 +- + drivers/scsi/lpfc/lpfc_els.c | 1 - + drivers/scsi/lpfc/lpfc_hbadisc.c | 4 - + drivers/scsi/lpfc/lpfc_hw4.h | 12 + + drivers/scsi/lpfc/lpfc_init.c | 62 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 29 +- + drivers/scsi/lpfc/lpfc_nvme.c | 146 ++- + drivers/scsi/lpfc/lpfc_nvme.h | 14 + + drivers/scsi/lpfc/lpfc_nvmet.h | 6 +- + drivers/scsi/lpfc/lpfc_scsi.c | 31 +- + drivers/scsi/lpfc/lpfc_sli.c | 16 +- + drivers/scsi/lpfc/lpfc_sli4.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 25 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 14 +- + drivers/scsi/mvumi.c | 20 +- + drivers/scsi/scsi_debug.c | 33 +- + drivers/scsi/scsi_debugfs.c | 2 +- + drivers/scsi/scsi_devinfo.c | 31 +- + drivers/scsi/scsi_dh.c | 5 +- + drivers/scsi/scsi_error.c | 7 + + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_transport_iscsi.c | 29 +- + drivers/scsi/sd.c | 2 + + drivers/scsi/sd.h | 12 +- + drivers/scsi/sd_zbc.c | 150 +-- + drivers/scsi/sg.c | 2 +- + drivers/scsi/st.c | 6 +- + drivers/scsi/storvsc_drv.c | 100 +- + drivers/scsi/ufs/ufshcd.c | 40 + + drivers/scsi/zorro_esp.c | 1172 ++++++++++++++++++++++ + drivers/target/target_core_configfs.c | 25 + + drivers/target/target_core_iblock.c | 8 +- + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_pscsi.c | 2 + + drivers/target/target_core_transport.c | 19 +- + drivers/target/target_core_user.c | 10 +- + include/linux/blkdev.h | 5 + + include/linux/hyperv.h | 12 + + include/linux/libata.h | 2 + + include/linux/log2.h | 35 +- + include/scsi/scsi_dbg.h | 2 - + include/scsi/scsi_device.h | 2 +- + include/scsi/scsi_devinfo.h | 75 +- + include/trace/events/ufs.h | 27 + + include/uapi/linux/target_core_user.h | 11 +- + 86 files changed, 3943 insertions(+), 608 deletions(-) + create mode 100644 Documentation/driver-api/target.rst + create mode 100644 drivers/scsi/cxlflash/ocxl_hw.c + create mode 100644 drivers/scsi/cxlflash/ocxl_hw.h + create mode 100644 drivers/scsi/zorro_esp.c +Merging scsi-mkp/for-next (f990bee3f187 scsi: ips: fix firmware timestamps for 32-bit) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (fd17ed684b6e Revert "ata: ahci-platform: add reset control support") +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-platform.txt | 1 - + drivers/ata/ahci.h | 1 - + drivers/ata/libahci_platform.c | 24 +++------------------- + 3 files changed, 3 insertions(+), 23 deletions(-) +Merging vhost/linux-next (cfcde40e8ce3 ACPI: disable extra P_LVLx access on KVM) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/processor_idle.c | 7 +- + drivers/char/virtio_console.c | 157 +++++++++---------- + drivers/virtio/virtio_balloon.c | 298 +++++++++++++++++++++++++++++++----- + include/linux/mm.h | 6 + + include/linux/ptr_ring.h | 79 +++++++++- + include/linux/virtio.h | 3 + + include/linux/virtio_ring.h | 4 +- + include/uapi/linux/virtio_balloon.h | 22 +++ + mm/page_alloc.c | 97 ++++++++++++ + mm/page_poison.c | 6 + + 10 files changed, 549 insertions(+), 130 deletions(-) +Merging rpmsg/for-next (d84cf4818962 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-rpmsg | 20 +++++++ + .../devicetree/bindings/soc/qcom/qcom,smd.txt | 8 ++- + drivers/hwspinlock/hwspinlock_core.c | 67 ++++++++++++++++----- + drivers/remoteproc/Kconfig | 1 - + drivers/remoteproc/qcom_q6v5_pil.c | 12 ++-- + drivers/remoteproc/remoteproc_core.c | 14 +++-- + drivers/rpmsg/Kconfig | 1 + + drivers/rpmsg/qcom_smd.c | 68 ++++++++++++++++------ + drivers/rpmsg/rpmsg_char.c | 2 + + drivers/rpmsg/rpmsg_core.c | 39 +++++++++++++ + include/linux/hwspinlock.h | 58 ++++++++++++++++++ + include/linux/remoteproc.h | 2 +- + 12 files changed, 242 insertions(+), 50 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 7c766e36ea93 Merge remote-tracking branch 'vhost/linux-next' +Merging next-20180424 version of rpmsg +$ git merge -m next-20180424/rpmsg 47c4aebb693c85cbf0dbcbd7e81c29f2f5338600 +Merge made by the 'recursive' strategy. + drivers/hwspinlock/hwspinlock_core.c | 67 +++++++++++++++++++++++++++--------- + drivers/remoteproc/qcom_q6v5_pil.c | 10 +++--- + include/linux/hwspinlock.h | 58 +++++++++++++++++++++++++++++++ + 3 files changed, 113 insertions(+), 22 deletions(-) +Merging gpio/for-next (348f3cde84ab gpio: Add Spreadtrum PMIC EIC driver support) +$ git merge gpio/for-next +Already up to date. +Merging pinctrl/for-next (4fc97ef94bbf pinctrl: uniphier: add UART hardware flow control pin-mux settings) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (938a10bb4913 pinctrl: samsung: Document required order of banks) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 30 ++++++++++++++++++++++++-- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 20 +++++++++++++++++ + 2 files changed, 48 insertions(+), 2 deletions(-) +Merging pwm/for-next (6873842235d6 pwm: rcar: Add suspend/resume support) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (918101056590 signal/xtensa: Use force_sig_fault where appropriate) +$ git merge userns/for-next +Auto-merging arch/parisc/kernel/traps.c +Auto-merging arch/arm64/kernel/traps.c +Merge made by the 'recursive' strategy. + arch/alpha/include/uapi/asm/siginfo.h | 14 ---- + arch/alpha/kernel/osf_sys.c | 11 +-- + arch/alpha/kernel/signal.c | 20 +---- + arch/alpha/kernel/traps.c | 79 +++++------------- + arch/alpha/mm/fault.c | 13 +-- + arch/arc/mm/fault.c | 2 + + arch/arm/kernel/ptrace.c | 1 + + arch/arm/kernel/swp_emulate.c | 1 + + arch/arm/kernel/traps.c | 5 ++ + arch/arm/mm/alignment.c | 1 + + arch/arm/mm/fault.c | 4 + + arch/arm/vfp/vfpmodule.c | 3 +- + arch/arm64/kernel/fpsimd.c | 2 +- + arch/arm64/kernel/sys_compat.c | 1 + + arch/arm64/kernel/traps.c | 1 + + arch/arm64/mm/fault.c | 18 ++-- + arch/c6x/kernel/traps.c | 9 +- + arch/hexagon/kernel/traps.c | 9 +- + arch/hexagon/mm/vm_fault.c | 20 ++--- + arch/ia64/include/uapi/asm/siginfo.h | 7 -- + arch/ia64/kernel/brl_emu.c | 1 + + arch/ia64/kernel/signal.c | 2 + + arch/ia64/kernel/traps.c | 31 +++++-- + arch/ia64/kernel/unaligned.c | 1 + + arch/ia64/mm/fault.c | 4 +- + arch/m68k/kernel/traps.c | 58 ++++++------- + arch/m68k/mm/fault.c | 25 +++--- + arch/microblaze/kernel/exceptions.c | 8 +- + arch/microblaze/mm/fault.c | 12 +-- + arch/mips/kernel/traps.c | 65 ++++----------- + arch/mips/mm/fault.c | 18 ++-- + arch/nds32/kernel/traps.c | 35 ++------ + arch/nds32/mm/fault.c | 18 ++-- + arch/nios2/kernel/traps.c | 8 +- + arch/openrisc/kernel/traps.c | 30 +------ + arch/openrisc/mm/fault.c | 18 ++-- + arch/parisc/kernel/ptrace.c | 10 +-- + arch/parisc/kernel/traps.c | 61 +++++--------- + arch/parisc/kernel/unaligned.c | 15 +--- + arch/parisc/math-emu/driver.c | 8 +- + arch/parisc/mm/fault.c | 54 ++++++------ + arch/powerpc/include/uapi/asm/siginfo.h | 15 ---- + arch/powerpc/kernel/process.c | 1 + + arch/powerpc/kernel/traps.c | 13 ++- + arch/powerpc/mm/fault.c | 1 + + arch/powerpc/platforms/cell/spufs/fault.c | 2 +- + arch/riscv/kernel/traps.c | 16 +--- + arch/s390/kernel/traps.c | 29 ++----- + arch/s390/mm/fault.c | 21 ++--- + arch/sh/kernel/hw_breakpoint.c | 9 +- + arch/sh/kernel/traps_32.c | 17 ++-- + arch/sh/math-emu/math.c | 8 +- + arch/sh/mm/fault.c | 9 +- + arch/sparc/include/uapi/asm/siginfo.h | 7 -- + arch/sparc/kernel/process_64.c | 9 +- + arch/sparc/kernel/sys_sparc_32.c | 8 +- + arch/sparc/kernel/sys_sparc_64.c | 8 +- + arch/sparc/kernel/traps_32.c | 104 +++++------------------- + arch/sparc/kernel/traps_64.c | 131 +++++++----------------------- + arch/sparc/kernel/unaligned_32.c | 11 +-- + arch/sparc/mm/fault_32.c | 12 +-- + arch/sparc/mm/fault_64.c | 8 +- + arch/um/kernel/ptrace.c | 13 +-- + arch/um/kernel/trap.c | 24 ++---- + arch/unicore32/kernel/fpu-ucf64.c | 8 +- + arch/unicore32/mm/fault.c | 3 + + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/kernel/ptrace.c | 2 +- + arch/x86/kernel/signal_compat.c | 2 +- + arch/x86/kernel/traps.c | 3 + + arch/x86/kernel/umip.c | 1 + + arch/x86/kvm/mmu.c | 1 + + arch/x86/mm/fault.c | 1 + + arch/xtensa/kernel/traps.c | 9 +- + arch/xtensa/mm/fault.c | 18 ++-- + fs/signalfd.c | 15 +--- + include/linux/ptrace.h | 1 - + include/linux/tracehook.h | 1 + + include/uapi/asm-generic/siginfo.h | 3 +- + kernel/signal.c | 123 +++------------------------- + virt/kvm/arm/mmu.c | 1 + + 81 files changed, 380 insertions(+), 993 deletions(-) +Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (9e66317d3c92 Linux 4.14-rc3) +$ git merge random/dev +Already up to date. +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up to date. +Merging kselftest/next (60cc43fc8884 Linux 4.17-rc1) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (5dc0b1529d21 y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop) +$ git merge y2038/y2038 +Removing arch/s390/include/uapi/asm/shmbuf.h +Removing arch/s390/include/uapi/asm/sembuf.h +Removing arch/s390/include/uapi/asm/msgbuf.h +Removing arch/ia64/include/uapi/asm/shmbuf.h +Removing arch/ia64/include/uapi/asm/sembuf.h +Removing arch/ia64/include/uapi/asm/msgbuf.h +Removing arch/ia64/include/uapi/asm/ipcbuf.h +Removing arch/alpha/include/uapi/asm/shmbuf.h +Removing arch/alpha/include/uapi/asm/sembuf.h +Removing arch/alpha/include/uapi/asm/msgbuf.h +Removing arch/alpha/include/uapi/asm/ipcbuf.h +Merge made by the 'recursive' strategy. + arch/alpha/include/uapi/asm/Kbuild | 4 ++ + arch/alpha/include/uapi/asm/ipcbuf.h | 2 - + arch/alpha/include/uapi/asm/msgbuf.h | 28 ----------- + arch/alpha/include/uapi/asm/sembuf.h | 23 --------- + arch/alpha/include/uapi/asm/shmbuf.h | 39 --------------- + arch/arm64/include/asm/compat.h | 32 ++++++------- + arch/ia64/include/uapi/asm/Kbuild | 4 ++ + arch/ia64/include/uapi/asm/ipcbuf.h | 2 - + arch/ia64/include/uapi/asm/msgbuf.h | 28 ----------- + arch/ia64/include/uapi/asm/sembuf.h | 23 --------- + arch/ia64/include/uapi/asm/shmbuf.h | 39 --------------- + arch/mips/include/asm/compat.h | 40 +++++++++------- + arch/mips/include/uapi/asm/msgbuf.h | 57 ++++++++++++++-------- + arch/mips/include/uapi/asm/sembuf.h | 15 +++++- + arch/mips/include/uapi/asm/shmbuf.h | 23 ++++++++- + arch/parisc/include/asm/compat.h | 32 ++++++------- + arch/parisc/include/uapi/asm/msgbuf.h | 33 +++++++------ + arch/parisc/include/uapi/asm/sembuf.h | 16 +++---- + arch/parisc/include/uapi/asm/shmbuf.h | 19 ++++---- + arch/powerpc/include/asm/compat.h | 32 ++++++------- + arch/powerpc/include/uapi/asm/msgbuf.h | 18 +++---- + arch/powerpc/include/uapi/asm/sembuf.h | 14 +++--- + arch/powerpc/include/uapi/asm/shmbuf.h | 19 ++++---- + arch/s390/include/asm/compat.h | 32 ++++++------- + arch/s390/include/uapi/asm/Kbuild | 3 ++ + arch/s390/include/uapi/asm/msgbuf.h | 38 --------------- + arch/s390/include/uapi/asm/sembuf.h | 30 ------------ + arch/s390/include/uapi/asm/shmbuf.h | 49 ------------------- + arch/sparc/include/asm/compat.h | 32 ++++++------- + arch/sparc/include/uapi/asm/msgbuf.h | 22 ++++----- + arch/sparc/include/uapi/asm/sembuf.h | 16 +++---- + arch/sparc/include/uapi/asm/shmbuf.h | 21 ++++----- + arch/x86/include/asm/compat.h | 32 ++++++------- + arch/x86/include/uapi/asm/sembuf.h | 11 ++++- + arch/xtensa/include/uapi/asm/msgbuf.h | 25 +++++----- + arch/xtensa/include/uapi/asm/sembuf.h | 17 ++++--- + arch/xtensa/include/uapi/asm/shmbuf.h | 37 ++++----------- + include/linux/syscalls.h | 6 +-- + include/uapi/asm-generic/msgbuf.h | 27 +++++------ + include/uapi/asm-generic/sembuf.h | 26 ++++++---- + include/uapi/asm-generic/shmbuf.h | 41 ++++++++-------- + ipc/mqueue.c | 86 +++++++++++++++++----------------- + ipc/msg.c | 20 +++++--- + ipc/sem.c | 27 +++++++---- + ipc/shm.c | 14 ++++-- + ipc/syscall.c | 13 +++-- + ipc/util.h | 4 +- + 47 files changed, 471 insertions(+), 700 deletions(-) + delete mode 100644 arch/alpha/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/alpha/include/uapi/asm/msgbuf.h + delete mode 100644 arch/alpha/include/uapi/asm/sembuf.h + delete mode 100644 arch/alpha/include/uapi/asm/shmbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/msgbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/sembuf.h + delete mode 100644 arch/ia64/include/uapi/asm/shmbuf.h + delete mode 100644 arch/s390/include/uapi/asm/msgbuf.h + delete mode 100644 arch/s390/include/uapi/asm/sembuf.h + delete mode 100644 arch/s390/include/uapi/asm/shmbuf.h +Merging livepatching/for-next (3beed9bf1e3d Merge branch 'for-4.17/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (53531a9947ed coresight: Moving framework and drivers to SPDX identifier) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + Documentation/trace/coresight.txt | 103 +++++++++++++++------ + drivers/hwtracing/coresight/coresight-cpu-debug.c | 14 +-- + .../coresight/coresight-dynamic-replicator.c | 10 +- + drivers/hwtracing/coresight/coresight-etb10.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm-cp14.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm-perf.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm-perf.h | 13 +-- + drivers/hwtracing/coresight/coresight-etm.h | 13 +-- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm3x.c | 13 +-- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm4x.c | 13 +-- + drivers/hwtracing/coresight/coresight-etm4x.h | 13 +-- + drivers/hwtracing/coresight/coresight-funnel.c | 13 +-- + drivers/hwtracing/coresight/coresight-priv.h | 13 +-- + drivers/hwtracing/coresight/coresight-replicator.c | 13 +-- + drivers/hwtracing/coresight/coresight-stm.c | 13 +-- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 13 +-- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 13 +-- + drivers/hwtracing/coresight/coresight-tmc.c | 10 +- + drivers/hwtracing/coresight/coresight-tmc.h | 13 +-- + drivers/hwtracing/coresight/coresight-tpiu.c | 13 +-- + drivers/hwtracing/coresight/coresight.c | 21 ++--- + drivers/hwtracing/coresight/of_coresight.c | 13 +-- + drivers/hwtracing/stm/ftrace.c | 10 +- + include/linux/coresight.h | 13 +-- + 26 files changed, 132 insertions(+), 296 deletions(-) +Merging rtc/rtc-next (36d91a4d401c rtc: cmos: introduce quirks to enable use_acpi_alarm mode) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-cmos.c | 155 +++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 124 insertions(+), 31 deletions(-) +Merging nvdimm/libnvdimm-for-next (c5794510d7b5 MAINTAINERS: Add backup maintainers for libnvdimm and DAX) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) +$ git merge idr/idr-4.11 +Already up to date. +Merging at24/at24/for-next (22e06c32b936 eeprom: at24: provide a separate routine for creating dummy i2c clients) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 71 ++++++++++++++++++++++++++++++---------------- + 1 file changed, 46 insertions(+), 25 deletions(-) +Merging ntb/ntb-next (53c3677c56c7 ntb: intel: change references of skx to gen3) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/intel/ntb_hw_gen1.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/intel/Makefile | 1 + + .../ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} | 713 ++------------------- + drivers/ntb/hw/intel/ntb_hw_gen1.h | 182 ++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.c | 597 +++++++++++++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.h | 110 ++++ + drivers/ntb/hw/intel/ntb_hw_intel.h | 203 ++---- + 6 files changed, 997 insertions(+), 809 deletions(-) + rename drivers/ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} (74%) + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen1.h + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.c + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.h +Merging kspp/for-next/kspp (45888b40d2a6 rslib: Allocate decoder buffers to avoid VLAs) +$ git merge kspp/for-next/kspp +Auto-merging drivers/mtd/nand/raw/diskonchip.c +Merge made by the 'recursive' strategy. + drivers/md/dm-verity-fec.c | 2 +- + drivers/mtd/nand/raw/cafe_nand.c | 7 +- + drivers/mtd/nand/raw/diskonchip.c | 67 +++++------ + include/linux/rslib.h | 74 +++++++----- + lib/reed_solomon/decode_rs.c | 34 +++--- + lib/reed_solomon/encode_rs.c | 15 +-- + lib/reed_solomon/reed_solomon.c | 240 ++++++++++++++++++++++---------------- + 7 files changed, 243 insertions(+), 196 deletions(-) +Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) +$ git merge init_task/init_task +Already up to date. +Merging akpm-current/current (e8ff6013dc39 exofs-avoid-vla-in-structures-v2) +$ git merge --no-ff akpm-current/current +Auto-merging mm/page_alloc.c +Auto-merging mm/mmap.c +Auto-merging mm/Kconfig +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/fsnotify_backend.h +Auto-merging include/linux/fs.h +Auto-merging fs/fcntl.c +Auto-merging fs/dcache.c +Auto-merging fs/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/blockdev/zram.txt | 25 + + Documentation/cgroup-v2.txt | 118 ++++- + .../features/vm/pte_special/arch-support.txt | 2 +- + Documentation/sysctl/fs.txt | 36 ++ + arch/Kconfig | 4 + + arch/arc/Kconfig | 1 + + arch/arc/include/asm/pgtable.h | 2 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgtable-3level.h | 1 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgtable.h | 2 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 3 - + arch/powerpc/include/asm/pte-common.h | 3 - + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/pgtable-bits.h | 3 - + arch/s390/Kconfig | 1 + + arch/s390/include/asm/pgtable.h | 1 - + arch/sh/Kconfig | 1 + + arch/sh/include/asm/pgtable.h | 2 - + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/pgtable_64.h | 3 - + arch/x86/Kconfig | 1 + + arch/x86/include/asm/pgtable_types.h | 1 - + block/genhd.c | 2 +- + drivers/block/zram/Kconfig | 14 +- + drivers/block/zram/zram_drv.c | 164 +++++- + drivers/block/zram/zram_drv.h | 14 +- + fs/Kconfig | 3 + + fs/binfmt_elf.c | 16 +- + fs/dcache.c | 3 +- + fs/exec.c | 1 + + fs/exofs/ore.c | 84 ++-- + fs/exofs/ore_raid.c | 75 ++- + fs/exofs/super.c | 23 +- + fs/fcntl.c | 2 +- + fs/namei.c | 52 +- + fs/notify/dnotify/dnotify.c | 5 +- + fs/notify/fanotify/fanotify.c | 6 +- + fs/notify/fanotify/fanotify_user.c | 5 +- + fs/notify/group.c | 4 + + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/notify/inotify/inotify_user.c | 5 +- + fs/ocfs2/buffer_head_io.c | 77 ++- + fs/ocfs2/cluster/heartbeat.c | 8 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/file.c | 4 +- + fs/ocfs2/journal.c | 51 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/proc/base.c | 190 +++---- + fs/seq_file.c | 10 - + include/linux/cgroup-defs.h | 5 + + include/linux/fs.h | 2 + + include/linux/fsnotify_backend.h | 12 +- + include/linux/kernel.h | 1 + + include/linux/memcontrol.h | 53 +- + include/linux/memfd.h | 16 + + include/linux/mm_types.h | 2 + + include/linux/oom.h | 12 +- + include/linux/page_counter.h | 19 +- + include/linux/pfn_t.h | 4 +- + include/linux/sched.h | 3 + + include/linux/sched/mm.h | 24 + + include/linux/sched/signal.h | 3 + + include/linux/shmem_fs.h | 13 - + include/linux/slab.h | 59 +++ + include/linux/swap.h | 13 +- + include/uapi/linux/prctl.h | 4 + + kernel/cgroup/cgroup.c | 13 +- + kernel/cred.c | 1 + + kernel/exit.c | 4 + + kernel/fork.c | 13 + + kernel/hung_task.c | 11 +- + kernel/sys.c | 298 ++++------- + kernel/sysctl.c | 18 + + lib/bitmap.c | 5 +- + lib/find_bit_benchmark.c | 7 +- + lib/idr.c | 10 +- + mm/Kconfig | 3 + + mm/Makefile | 1 + + mm/backing-dev.c | 35 ++ + mm/gup.c | 42 +- + mm/hugetlb_cgroup.c | 6 +- + mm/init-mm.c | 1 + + mm/kasan/kasan.c | 57 ++- + mm/list_lru.c | 7 + + mm/memblock.c | 22 +- + mm/memcontrol.c | 550 +++++++++++++++++---- + mm/memfd.c | 345 +++++++++++++ + mm/memory.c | 19 +- + mm/mincore.c | 12 +- + mm/mmap.c | 38 +- + mm/oom_kill.c | 240 +++++---- + mm/page_alloc.c | 9 +- + mm/page_counter.c | 71 ++- + mm/page_owner.c | 4 +- + mm/shmem.c | 342 +------------ + mm/slab.c | 2 + + mm/slob.c | 4 +- + mm/slub.c | 2 + + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 35 +- + mm/swap_slots.c | 10 +- + mm/swap_state.c | 19 +- + mm/swapfile.c | 156 ++++-- + scripts/checkpatch.pl | 7 + + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 1 + + 111 files changed, 2498 insertions(+), 1225 deletions(-) + create mode 100644 include/linux/memfd.h + create mode 100644 mm/memfd.c +$ 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: mm: use octal not symbolic permissions +Applying: treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX +Applying: kernel/kexec_file.c: add walk_system_ram_res_rev() +Applying: kernel/kexec_file.c: load kernel at top of system RAM if required +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +Applying: sparc64: NG4 memset 32 bits overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 088345fc3553...24dc823cc7e8 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (24dc823cc7e8 sparc64: NG4 memset 32 bits overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm64/mm/init.c | 6 +-- + arch/mips/kernel/setup.c | 4 +- + arch/powerpc/mm/mem.c | 2 +- + arch/sparc/lib/NG4memset.S | 26 ++++++------ + arch/sparc/mm/init_64.c | 2 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + drivers/firmware/efi/arm-init.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/remoteproc/qcom_q6v5_pil.c | 2 +- + drivers/soc/qcom/mdt_loader.c | 4 +- + include/linux/ioport.h | 3 ++ + kernel/kexec_file.c | 2 + + kernel/resource.c | 63 ++++++++++++++++++++++++++++ + mm/cleancache.c | 10 ++--- + mm/cma_debug.c | 25 +++++------ + mm/compaction.c | 2 +- + mm/dmapool.c | 2 +- + mm/failslab.c | 2 +- + mm/frontswap.c | 11 +++-- + mm/memblock.c | 9 ++-- + mm/page_alloc.c | 2 +- + mm/page_idle.c | 2 +- + mm/page_owner.c | 4 +- + mm/shmem.c | 9 ++-- + mm/slab_common.c | 4 +- + mm/vmalloc.c | 2 +- + mm/zsmalloc.c | 5 ++- + mm/zswap.c | 38 ++++++++--------- + 29 files changed, 158 insertions(+), 93 deletions(-) |