$ date -R Wed, 14 Jul 2021 08:45:23 +1000 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 7fef2edf7cc7 sd: don't mess with SD_MINORS for CONFIG_DEBUG_BLOCK_EXT_DEVT Merging origin/master (40226a3d96ef Merge tag 'vboxsf-v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux) $ git merge origin/master Updating 7fef2edf7cc7..40226a3d96ef Fast-forward fs/btrfs/block-group.c | 367 ++++++++++++++++++++++++++++++++++++------------- fs/btrfs/block-group.h | 6 +- fs/btrfs/ctree.c | 67 ++------- fs/btrfs/inode.c | 147 ++++++++++++++++---- fs/btrfs/transaction.c | 15 +- fs/btrfs/transaction.h | 9 +- fs/btrfs/tree-log.c | 2 +- fs/btrfs/volumes.c | 355 +++++++++++++++++++++++++++++++++++------------ fs/btrfs/volumes.h | 5 +- fs/vboxsf/dir.c | 76 ++++++++-- fs/vboxsf/file.c | 71 ++++++---- fs/vboxsf/vfsmod.h | 7 + 12 files changed, 803 insertions(+), 324 deletions(-) Merging fixes/fixes (614124bea77e Linux 5.13-rc5) $ git merge fixes/fixes Already up to date. Merging kbuild-current/fixes (c4681547bcce Linux 5.13-rc3) $ git merge kbuild-current/fixes Already up to date. Merging arc-current/for-curr (13311e74253f Linux 5.13-rc7) $ git merge arc-current/for-curr Already up to date. Merging arm-current/fixes (dad7b9896a5d ARM: 9081/1: fix gcc-10 thumb2-kernel regression) $ git merge arm-current/fixes Already up to date. Merging arm64-fixes/for-next/fixes (8cdd23c23c3d arm64: Restrict ARM64_BTI_KERNEL to clang 12.0.0 and newer) $ git merge arm64-fixes/for-next/fixes Merge made by the 'recursive' strategy. arch/arm64/Kconfig | 3 ++- arch/arm64/include/asm/cache.h | 2 +- arch/arm64/include/asm/smp_plat.h | 1 + arch/arm64/kernel/cpufeature.c | 1 + arch/arm64/lib/strlen.S | 10 ++++++++++ 5 files changed, 15 insertions(+), 2 deletions(-) Merging arm-soc-fixes/arm/fixes (048c958f12a2 Merge tag 'tee-reviewer-for-v5.13' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/fixes) $ git merge arm-soc-fixes/arm/fixes Already up to date. Merging drivers-memory-fixes/fixes (6efb943b8616 Linux 5.13-rc1) $ git merge drivers-memory-fixes/fixes Already up to date. Merging m68k-current/for-linus (c1367ee016e3 m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning) $ git merge m68k-current/for-linus Already up to date. Merging powerpc-fixes/fixes (2c669ef6979c powerpc/preempt: Don't touch the idle task's preempt_count during hotplug) $ git merge powerpc-fixes/fixes Already up to date. Merging s390-fixes/fixes (c30e5e9ff0c6 s390/defconfig: allow early device mapper disks) $ git merge s390-fixes/fixes Merge made by the 'recursive' strategy. arch/s390/configs/debug_defconfig | 3 ++- arch/s390/configs/defconfig | 3 ++- arch/s390/kernel/vdso32/Makefile | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) $ git merge sparc/master Already up to date. Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) $ git merge fscrypt-current/for-stable Already up to date. Merging net/master (bcb9928a1554 net: dsa: properly check for the bridge_leave methods in dsa_switch_bridge_leave()) $ git merge net/master Removing include/net/caif/caif_hsi.h Auto-merging drivers/net/virtio_net.c Removing drivers/net/caif/caif_hsi.c Auto-merging MAINTAINERS Removing Documentation/devicetree/bindings/net/smsc911x.txt Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-ptp | 20 + Documentation/devicetree/bindings/net/gpmc-eth.txt | 2 +- .../devicetree/bindings/net/smsc,lan9115.yaml | 110 ++ Documentation/devicetree/bindings/net/smsc911x.txt | 43 - Documentation/networking/ethtool-netlink.rst | 22 + Documentation/networking/nf_conntrack-sysctl.rst | 6 + Documentation/networking/tipc.rst | 121 +- MAINTAINERS | 7 + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 4 +- arch/x86/net/bpf_jit_comp.c | 3 + drivers/net/bonding/bond_main.c | 181 ++- drivers/net/caif/Kconfig | 9 - drivers/net/caif/Makefile | 3 - drivers/net/caif/caif_hsi.c | 1454 -------------------- drivers/net/dsa/microchip/ksz_common.c | 4 +- drivers/net/dsa/mv88e6xxx/chip.c | 22 +- drivers/net/dsa/mv88e6xxx/serdes.c | 6 +- drivers/net/dsa/sja1105/sja1105_main.c | 14 +- drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 5 + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 23 +- drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 6 - drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 18 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 3 + drivers/net/ethernet/google/gve/gve_main.c | 19 +- drivers/net/ethernet/google/gve/gve_rx_dqo.c | 7 - drivers/net/ethernet/ibm/ibmvnic.c | 22 +- drivers/net/ethernet/intel/e1000e/netdev.c | 1 + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 + drivers/net/ethernet/intel/iavf/iavf_main.c | 1 + drivers/net/ethernet/intel/igb/igb_main.c | 15 +- drivers/net/ethernet/intel/igc/igc.h | 2 +- drivers/net/ethernet/intel/igc/igc_main.c | 3 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 + drivers/net/ethernet/intel/ixgbevf/ipsec.c | 20 +- drivers/net/ethernet/marvell/mvneta.c | 20 +- drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 292 +++- drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 10 + .../ethernet/marvell/octeontx2/af/lmac_common.h | 12 +- drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 58 +- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 1 + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 7 + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 111 +- .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 200 +++ .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 88 +- .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 3 + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 10 + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 3 +- .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 87 +- drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h | 3 +- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 3 + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 18 +- .../ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c | 173 +++ .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 229 ++- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 26 +- .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 2 +- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 1 + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 12 +- drivers/net/ethernet/microchip/sparx5/Kconfig | 1 + drivers/net/ethernet/moxa/moxart_ether.c | 4 +- drivers/net/ethernet/mscc/ocelot_net.c | 9 +- .../net/ethernet/netronome/nfp/flower/conntrack.c | 13 - drivers/net/ethernet/qualcomm/emac/emac.c | 3 +- drivers/net/ethernet/sfc/efx_channels.c | 22 +- .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 9 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 41 +- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 56 +- drivers/net/ethernet/ti/tlan.c | 3 +- drivers/net/fddi/defza.c | 3 +- drivers/net/netdevsim/ipsec.c | 8 +- drivers/net/phy/marvell10g.c | 40 +- drivers/net/usb/asix_devices.c | 1 + drivers/net/virtio_net.c | 8 +- drivers/net/vmxnet3/vmxnet3_ethtool.c | 22 +- drivers/net/wan/hdlc_cisco.c | 8 +- drivers/net/wan/hdlc_fr.c | 8 +- drivers/net/wan/hdlc_ppp.c | 8 +- drivers/net/wan/hdlc_raw.c | 8 +- drivers/net/wan/hdlc_raw_eth.c | 8 +- drivers/net/wan/hdlc_x25.c | 8 +- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 3 +- drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 21 +- drivers/net/wwan/iosm/iosm_ipc_imem_ops.h | 6 +- drivers/net/wwan/iosm/iosm_ipc_mux_codec.c | 2 +- drivers/net/wwan/iosm/iosm_ipc_uevent.c | 2 +- drivers/net/wwan/iosm/iosm_ipc_wwan.c | 11 +- drivers/ptp/Makefile | 2 +- drivers/ptp/ptp_clock.c | 44 +- drivers/ptp/ptp_private.h | 39 + drivers/ptp/ptp_sysfs.c | 160 +++ drivers/ptp/ptp_vclock.c | 219 +++ include/linux/bpf.h | 1 + include/linux/ethtool.h | 10 + include/linux/marvell_phy.h | 6 +- include/linux/ptp_clock_kernel.h | 31 +- include/linux/stmmac.h | 2 + include/net/bonding.h | 9 +- include/net/busy_poll.h | 2 +- include/net/caif/caif_hsi.h | 200 --- include/net/dst_metadata.h | 4 +- include/net/ip6_route.h | 2 +- include/net/mptcp.h | 5 +- include/net/netfilter/nf_conntrack_core.h | 1 - include/net/netns/conntrack.h | 1 + include/net/sctp/constants.h | 4 +- include/net/sock.h | 8 +- include/net/tcp.h | 4 + include/uapi/linux/ethtool_netlink.h | 15 + include/uapi/linux/net_tstamp.h | 17 +- include/uapi/linux/netfilter/nfnetlink_log.h | 2 +- include/uapi/linux/netfilter/nfnetlink_queue.h | 4 +- kernel/bpf/core.c | 8 +- kernel/bpf/devmap.c | 6 +- kernel/bpf/verifier.c | 60 +- net/802/garp.c | 14 + net/802/mrp.c | 14 + net/bridge/br_if.c | 17 +- net/bridge/br_multicast.c | 6 + net/core/dev.c | 16 + net/core/skbuff.c | 1 + net/core/sock.c | 71 +- net/dsa/switch.c | 8 +- net/ethtool/Makefile | 2 +- net/ethtool/common.c | 14 + net/ethtool/netlink.c | 10 + net/ethtool/netlink.h | 2 + net/ethtool/phc_vclocks.c | 94 ++ net/ipv4/fib_frontend.c | 2 +- net/ipv4/inet_diag.c | 5 +- net/ipv4/ip_tunnel.c | 18 +- net/ipv4/ipmr.c | 2 +- net/ipv4/raw_diag.c | 7 +- net/ipv4/tcp.c | 3 + net/ipv4/tcp_input.c | 21 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/tcp_output.c | 1 + net/ipv4/udp.c | 6 +- net/ipv4/udp_diag.c | 6 +- net/ipv4/udp_offload.c | 6 +- net/ipv6/ip6_output.c | 32 +- net/ipv6/tcp_ipv6.c | 21 +- net/ipv6/udp.c | 2 +- net/ipv6/xfrm6_output.c | 2 +- net/iucv/iucv.c | 22 +- net/mptcp/mib.c | 1 + net/mptcp/mib.h | 1 + net/mptcp/mptcp_diag.c | 6 +- net/mptcp/options.c | 19 +- net/mptcp/protocol.c | 12 +- net/mptcp/protocol.h | 10 +- net/mptcp/sockopt.c | 68 +- net/mptcp/subflow.c | 11 +- net/mptcp/syncookies.c | 16 +- net/ncsi/Kconfig | 6 + net/ncsi/internal.h | 5 + net/ncsi/ncsi-manage.c | 51 +- net/ncsi/ncsi-rsp.c | 11 +- net/netfilter/nf_conntrack_core.c | 11 +- net/netfilter/nf_conntrack_netlink.c | 3 + net/netfilter/nf_conntrack_proto.c | 7 - net/netfilter/nf_conntrack_proto_gre.c | 13 - net/netfilter/nf_conntrack_proto_tcp.c | 69 +- net/netfilter/nf_conntrack_standalone.c | 10 + net/netfilter/nf_tables_api.c | 3 +- net/netfilter/nft_last.c | 12 +- net/netlink/af_netlink.c | 2 +- net/openvswitch/flow_table.c | 6 +- net/sched/act_ct.c | 14 +- net/sched/sch_taprio.c | 2 +- net/sctp/diag.c | 6 +- net/sctp/protocol.c | 3 +- net/sctp/sm_make_chunk.c | 2 +- net/sctp/transport.c | 11 +- net/socket.c | 19 +- net/unix/diag.c | 6 +- samples/bpf/Makefile | 1 + samples/bpf/xdpsock_user.c | 28 + tools/bpf/Makefile | 7 +- tools/bpf/bpftool/jit_disasm.c | 6 +- tools/bpf/runqslower/runqslower.bpf.c | 2 +- tools/lib/bpf/libbpf.c | 4 +- tools/testing/selftests/bpf/prog_tests/tailcalls.c | 36 +- .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 18 + tools/testing/selftests/net/icmp_redirect.sh | 5 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- tools/testing/selftests/net/timestamping.c | 55 +- tools/testing/selftests/netfilter/Makefile | 2 +- .../selftests/netfilter/conntrack_tcp_unreplied.sh | 167 +++ 191 files changed, 3595 insertions(+), 2346 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/smsc,lan9115.yaml delete mode 100644 Documentation/devicetree/bindings/net/smsc911x.txt delete mode 100644 drivers/net/caif/caif_hsi.c create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c create mode 100644 drivers/ptp/ptp_vclock.c delete mode 100644 include/net/caif/caif_hsi.h create mode 100644 net/ethtool/phc_vclocks.c create mode 100755 tools/testing/selftests/netfilter/conntrack_tcp_unreplied.sh Merging bpf/master (5acc7d3e8d34 xdp, net: Fix use-after-free in bpf_xdp_link_release) $ git merge bpf/master Merge made by the 'recursive' strategy. Documentation/networking/af_xdp.rst | 6 +++--- kernel/bpf/verifier.c | 2 ++ net/bpf/test_run.c | 3 +++ net/core/dev.c | 14 ++++++++++---- 4 files changed, 18 insertions(+), 7 deletions(-) Merging ipsec/master (2580d3f40022 xfrm: Fix RCU vs hash_resize_mutex lock inversion) $ git merge ipsec/master Auto-merging net/xfrm/xfrm_policy.c Auto-merging include/net/netns/xfrm.h Merge made by the 'recursive' strategy. include/net/netns/xfrm.h | 1 + net/xfrm/xfrm_policy.c | 32 ++++++++++++-------------------- net/xfrm/xfrm_user.c | 10 ++++++++++ 3 files changed, 23 insertions(+), 20 deletions(-) Merging netfilter/master (d7fba8ff3e50 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) $ git merge netfilter/master Already up to date. Merging ipvs/master (c23a9fd209bc netfilter: ctnetlink: suspicious RCU usage in ctnetlink_dump_helpinfo) $ git merge ipvs/master Already up to date. Merging wireless-drivers/master (1f9482aa8d41 mwifiex: bring down link before deleting interface) $ git merge wireless-drivers/master Already up to date. Merging mac80211/master (f4b29d2ee903 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) $ git merge mac80211/master Already up to date. Merging rdma-fixes/for-rc (e73f0f0ee754 Linux 5.14-rc1) $ git merge rdma-fixes/for-rc Already up to date. Merging sound-current/for-linus (2e2832562c87 ALSA: pcm: Call substream ack() method upon compat mmap commit) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. sound/core/pcm_native.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) Merging sound-asoc-fixes/for-linus (3bca1d1d77ad Merge remote-tracking branch 'asoc/for-5.14' into asoc-linus) $ git merge sound-asoc-fixes/for-linus Merge made by the 'recursive' strategy. sound/soc/codecs/Kconfig | 7 +-- sound/soc/codecs/tlv320aic31xx.c | 2 + sound/soc/codecs/tlv320aic31xx.h | 4 +- sound/soc/codecs/tlv320aic32x4.c | 27 +++++------ sound/soc/codecs/wm_adsp.c | 6 ++- sound/soc/intel/boards/sof_sdw_max98373.c | 81 ++++++++++++++++++++----------- sound/soc/tegra/tegra_pcm.c | 30 +++++++----- 7 files changed, 93 insertions(+), 64 deletions(-) Merging regmap-fixes/for-linus (e73f0f0ee754 Linux 5.14-rc1) $ git merge regmap-fixes/for-linus Already up to date. Merging regulator-fixes/for-linus (af201f2ec49b Merge remote-tracking branch 'regulator/for-5.14' into regulator-linus) $ git merge regulator-fixes/for-linus Merge made by the 'recursive' strategy. .../bindings/regulator/fixed-regulator.yaml | 2 ++ drivers/regulator/bd9576-regulator.c | 4 ++-- drivers/regulator/hi6421-regulator.c | 22 +++++++++++++--------- drivers/regulator/hi6421v600-regulator.c | 16 +++++++++------- drivers/regulator/mtk-dvfsrc-regulator.c | 3 +-- drivers/regulator/rtmv20-regulator.c | 2 +- include/linux/mfd/rt5033-private.h | 4 ++-- 7 files changed, 30 insertions(+), 23 deletions(-) Merging spi-fixes/for-linus (144d3c5cc791 Merge remote-tracking branch 'spi/for-5.14' into spi-linus) $ git merge spi-fixes/for-linus Merge made by the 'recursive' strategy. drivers/spi/spi-atmel.c | 9 ++------- drivers/spi/spi-imx.c | 38 +++++++++++++++++++------------------- drivers/spi/spi-mt65xx.c | 16 +++++++++++++--- drivers/spi/spi-stm32.c | 24 +++++++++++++++++------- 4 files changed, 51 insertions(+), 36 deletions(-) Merging pci-current/for-linus (e73f0f0ee754 Linux 5.14-rc1) $ git merge pci-current/for-linus Already up to date. Merging driver-core.current/driver-core-linus (e73f0f0ee754 Linux 5.14-rc1) $ git merge driver-core.current/driver-core-linus Already up to date. Merging tty.current/tty-linus (de5540965853 Merge tag 'rtc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) $ git merge tty.current/tty-linus Already up to date. Merging usb.current/usb-linus (b0863f192732 USB: core: Fix incorrect pipe calculation in do_proc_control()) $ git merge usb.current/usb-linus Merge made by the 'recursive' strategy. drivers/usb/core/devio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) $ git merge usb-gadget-fixes/fixes Already up to date. Merging usb-serial-fixes/usb-linus (94b619a07655 USB: serial: option: add support for u-blox LARA-R6 family) $ git merge usb-serial-fixes/usb-linus Merge made by the 'recursive' strategy. drivers/usb/serial/option.c | 3 +++ 1 file changed, 3 insertions(+) Merging usb-chipidea-fixes/for-usb-fixes (42c4417937be usb: cdnsp: Fix the IMAN_IE_SET and IMAN_IE_CLEAR macro.) $ git merge usb-chipidea-fixes/for-usb-fixes Auto-merging drivers/usb/cdns3/cdnsp-gadget.c Auto-merging drivers/usb/cdns3/cdns3-ep0.c Merge made by the 'recursive' strategy. drivers/usb/cdns3/cdns3-ep0.c | 1 + drivers/usb/cdns3/cdnsp-gadget.c | 2 +- drivers/usb/cdns3/cdnsp-gadget.h | 4 ++-- drivers/usb/cdns3/cdnsp-ring.c | 18 ++++++++---------- 4 files changed, 12 insertions(+), 13 deletions(-) Merging phy/fixes (e73f0f0ee754 Linux 5.14-rc1) $ git merge phy/fixes Already up to date. Merging staging.current/staging-linus (e73f0f0ee754 Linux 5.14-rc1) $ git merge staging.current/staging-linus Already up to date. Merging iio-fixes/fixes-togreg (4377d9ab1f16 iio: accel: fxls8962af: fix potential use of uninitialized symbol) $ git merge iio-fixes/fixes-togreg Merge made by the 'recursive' strategy. drivers/iio/accel/fxls8962af-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging char-misc.current/char-misc-linus (e73f0f0ee754 Linux 5.14-rc1) $ git merge char-misc.current/char-misc-linus Already up to date. Merging soundwire-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) $ git merge soundwire-fixes/fixes Already up to date. Merging thunderbolt-fixes/fixes (13311e74253f Linux 5.13-rc7) $ git merge thunderbolt-fixes/fixes Already up to date. Merging input-current/for-linus (818b26588994 Merge branch 'next' into for-linus) $ git merge input-current/for-linus Already up to date. Merging crypto-current/master (66192b2e3fd8 crypto: hisilicon/sec - fix the process of disabling sva prefetching) $ git merge crypto-current/master Already up to date. Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow) $ git merge vfio-fixes/for-linus Already up to date. Merging kselftest-fixes/fixes (0c0f6299ba71 selftests: memory-hotplug: avoid spamming logs with dump_page(), ratio limit hot-remove error test) $ git merge kselftest-fixes/fixes Merge made by the 'recursive' strategy. tools/testing/selftests/memory-hotplug/mem-on-off-test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section()) $ git merge modules-fixes/modules-linus Already up to date. Merging dmaengine-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) $ git merge dmaengine-fixes/fixes Already up to date. Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) $ git merge backlight-fixes/for-backlight-fixes Already up to date. Merging mtd-fixes/mtd/fixes (562b4e91d3b2 mtd: parsers: ofpart: fix parsing subpartitions) $ git merge mtd-fixes/mtd/fixes Already up to date. Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") $ git merge mfd-fixes/for-mfd-fixes Already up to date. Merging v4l-dvb-fixes/fixes (61c6f04a988e media: s5p-mfc: Fix display delay control creation) $ git merge v4l-dvb-fixes/fixes Already up to date. Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) $ git merge reset-fixes/reset/fixes Already up to date. Merging mips-fixes/mips-fixes (e73f0f0ee754 Linux 5.14-rc1) $ git merge mips-fixes/mips-fixes Already up to date. Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1) $ git merge at91-fixes/at91-fixes Already up to date. Merging omap-fixes/fixes (3ff340e24c9d bus: ti-sysc: Fix gpt12 system timer issue with reserved status) $ git merge omap-fixes/fixes Merge made by the 'recursive' strategy. drivers/bus/ti-sysc.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) Merging kvm-fixes/master (f8be156be163 KVM: do not allow mapping valid but non-reference-counted pages) $ git merge kvm-fixes/master Already up to date. Merging kvms390-fixes/master (cd4220d23bf3 KVM: selftests: do not require 64GB in set_memory_region_test) $ git merge kvms390-fixes/master Auto-merging tools/testing/selftests/kvm/set_memory_region_test.c Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c Auto-merging tools/testing/selftests/kvm/include/kvm_util.h Merge made by the 'recursive' strategy. tools/testing/selftests/kvm/include/kvm_util.h | 3 ++- tools/testing/selftests/kvm/lib/guest_modes.c | 16 ++++++++++++++++ tools/testing/selftests/kvm/lib/kvm_util.c | 5 +++++ tools/testing/selftests/kvm/set_memory_region_test.c | 3 ++- 4 files changed, 25 insertions(+), 2 deletions(-) Merging hwmon-fixes/hwmon (e73f0f0ee754 Linux 5.14-rc1) $ git merge hwmon-fixes/hwmon Already up to date. Merging nvdimm-fixes/libnvdimm-fixes (b05d4c576b69 dax: Ensure errno is returned from dax_direct_access) $ git merge nvdimm-fixes/libnvdimm-fixes Auto-merging fs/fuse/dax.c Auto-merging fs/dax.c Merge made by the 'recursive' strategy. drivers/dax/super.c | 2 +- fs/dax.c | 2 +- fs/fuse/dax.c | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) $ git merge cxl-fixes/fixes Already up to date. Merging btrfs-fixes/next-fixes (2376b98e2a50 Merge branch 'misc-5.14' into next-fixes) $ git merge btrfs-fixes/next-fixes Already up to date! Merge made by the 'recursive' strategy. Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) $ git merge vfs-fixes/fixes Merge made by the 'recursive' strategy. Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) $ git merge dma-mapping-fixes/for-linus Already up to date. Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) $ git merge i3c-fixes/i3c/fixes Already up to date. Merging drivers-x86-fixes/fixes (701b54bcb7d0 platform/mellanox: mlxreg-hotplug: Revert "move to use request_irq by IRQF_NO_AUTOEN flag") $ git merge drivers-x86-fixes/fixes Already up to date. Merging samsung-krzk-fixes/fixes (6efb943b8616 Linux 5.13-rc1) $ git merge samsung-krzk-fixes/fixes Already up to date. Merging pinctrl-samsung-fixes/fixes (6efb943b8616 Linux 5.13-rc1) $ git merge pinctrl-samsung-fixes/fixes Already up to date. Merging devicetree-fixes/dt/linus (8929ef8d4dfd media: dt-bindings: media: renesas,drif: Fix fck definition) $ git merge devicetree-fixes/dt/linus Already up to date. Merging scsi-fixes/fixes (053c16ac8905 scsi: ufs: core: Add missing host_lock in ufshcd_vops_setup_xfer_req()) $ git merge scsi-fixes/fixes Merge made by the 'recursive' strategy. drivers/s390/scsi/zfcp_sysfs.c | 1 + drivers/scsi/arm/fas216.c | 2 +- drivers/scsi/hosts.c | 1 + drivers/scsi/mpi3mr/mpi3mr_fw.c | 15 ++++++------ drivers/scsi/pm8001/pm8001_ctl.c | 48 ++++++++++++++++++++----------------- drivers/scsi/pm8001/pm8001_hwi.c | 18 +++++++------- drivers/scsi/pm8001/pm8001_init.c | 29 ++++++++++++----------- drivers/scsi/pm8001/pm8001_sas.c | 41 +++++++++++++++++--------------- drivers/scsi/pm8001/pm80xx_hwi.c | 50 +++++++++++++++++++-------------------- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/ufs/ufshcd.h | 9 +++++-- 11 files changed, 115 insertions(+), 101 deletions(-) Merging drm-fixes/drm-fixes (1e7b5812f489 Merge tag 'drm-misc-fixes-2021-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) $ git merge drm-fixes/drm-fixes Merge made by the 'recursive' strategy. drivers/dma-buf/sync_file.c | 13 +++++++------ drivers/gpu/drm/panel/panel-novatek-nt35510.c | 4 +--- 2 files changed, 8 insertions(+), 9 deletions(-) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) $ git merge amdgpu-fixes/drm-fixes Already up to date. Merging drm-intel-fixes/for-linux-next-fixes (e73f0f0ee754 Linux 5.14-rc1) $ git merge drm-intel-fixes/for-linux-next-fixes Already up to date. Merging mmc-fixes/fixes (900185fe29d3 mmc: core: Don't allocate IDA for OF aliases) $ git merge mmc-fixes/fixes Auto-merging drivers/mmc/core/block.c CONFLICT (content): Merge conflict in drivers/mmc/core/block.c Resolved 'drivers/mmc/core/block.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master f13c3faf1da5] Merge remote-tracking branch 'mmc-fixes/fixes' $ git diff -M --stat --summary HEAD^.. drivers/mmc/core/block.c | 34 ++++++++++++++++++++-------------- drivers/mmc/core/host.c | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 24 deletions(-) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) $ git merge rtc-fixes/rtc-fixes Merge made by the 'recursive' strategy. drivers/rtc/rtc-cmos.c | 2 ++ 1 file changed, 2 insertions(+) Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-rc1) $ git merge gnss-fixes/gnss-linus Already up to date. Merging hyperv-fixes/hyperv-fixes (6efb943b8616 Linux 5.13-rc1) $ git merge hyperv-fixes/hyperv-fixes Already up to date. Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) $ git merge soc-fsl-fixes/fix Already up to date. Merging risc-v-fixes/fixes (7ede12b01b59 riscv: dts: fu740: fix cache-controller interrupts) $ git merge risc-v-fixes/fixes Already up to date. Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) $ git merge pidfd-fixes/fixes Auto-merging fs/file.c Merge made by the 'recursive' strategy. fs/file.c | 64 +++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 24 deletions(-) Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0) $ git merge fpga-fixes/fixes Already up to date. Merging spdx/spdx-linus (de5540965853 Merge tag 'rtc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) $ git merge spdx/spdx-linus Already up to date. Merging gpio-brgl-fixes/gpio/for-current (c6414e1a2bd2 gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP) $ git merge gpio-brgl-fixes/gpio/for-current Already up to date. Merging gpio-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) $ git merge gpio-intel-fixes/fixes Already up to date. Merging pinctrl-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) $ git merge pinctrl-intel-fixes/fixes Already up to date. Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster) $ git merge erofs-fixes/fixes Already up to date. Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) $ git merge integrity-fixes/fixes Already up to date. Merging kunit-fixes/kunit-fixes (df4b0807ca1a kunit: tool: Assert the version requirement) $ git merge kunit-fixes/kunit-fixes Merge made by the 'recursive' strategy. Documentation/dev-tools/kunit/running_tips.rst | 14 +------------- tools/testing/kunit/kunit.py | 2 ++ tools/testing/kunit/kunit_kernel.py | 6 ++---- tools/testing/kunit/kunit_parser.py | 6 ++++-- tools/testing/kunit/kunit_tool_test.py | 16 +++++++++++++--- ...og => test_is_test_passed-no_tests_run_no_header.log} | 0 .../test_is_test_passed-no_tests_run_with_header.log | 2 ++ 7 files changed, 24 insertions(+), 22 deletions(-) rename tools/testing/kunit/test_data/{test_is_test_passed-no_tests_run.log => test_is_test_passed-no_tests_run_no_header.log} (100%) create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-no_tests_run_with_header.log Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) $ git merge ubifs-fixes/fixes Already up to date. Merging memblock-fixes/fixes (024591f9a6e0 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM) $ git merge memblock-fixes/fixes Already up to date. Merging cel-fixes/for-rc (9f4ad9e425a1 Linux 5.12) $ git merge cel-fixes/for-rc Already up to date. Merging irqchip-fixes/irq/irqchip-fixes (1fee9db9b42d irqchip/mips: Fix RCU violation when using irqdomain lookup on interrupt entry) $ git merge irqchip-fixes/irq/irqchip-fixes Already up to date. Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) $ git merge renesas-fixes/fixes Merge made by the 'recursive' strategy. arch/arm/configs/shmobile_defconfig | 1 + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 4 +- drivers/clk/renesas/r9a07g044-cpg.c | 79 ++++++---- drivers/clk/renesas/renesas-rzg2l-cpg.c | 110 +++++++------- drivers/clk/renesas/renesas-rzg2l-cpg.h | 37 +++-- include/dt-bindings/clock/r9a07g044-cpg.h | 236 ++++++++++++++++++++++------- 6 files changed, 320 insertions(+), 147 deletions(-) Merging drm-misc-fixes/for-linux-next-fixes (0af778269a52 fbmem: Do not delete the mode that is still in use) $ git merge drm-misc-fixes/for-linux-next-fixes Merge made by the 'recursive' strategy. drivers/gpu/drm/qxl/qxl_ttm.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 1 - drivers/video/fbdev/core/fbmem.c | 12 +++++------- 4 files changed, 7 insertions(+), 9 deletions(-) Merging kspp-gustavo/for-next/kspp (7c4548d2cc81 Makefile: Enable -Wimplicit-fallthrough for Clang) $ git merge kspp-gustavo/for-next/kspp Auto-merging drivers/net/ethernet/netronome/nfp/flower/conntrack.c Merge made by the 'recursive' strategy. Makefile | 9 +++------ arch/mips/include/asm/fpu.h | 2 +- arch/mips/mm/tlbex.c | 2 ++ arch/s390/kernel/uprobes.c | 1 + drivers/cpufreq/longhaul.c | 2 -- drivers/dma/ipu/ipu_idmac.c | 2 ++ drivers/dma/ti/k3-udma.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 1 + drivers/gpu/drm/msm/msm_gem.c | 2 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 + drivers/mmc/host/jz4740_mmc.c | 2 ++ drivers/mtd/chips/cfi_util.c | 4 ++-- drivers/net/ethernet/netronome/nfp/flower/conntrack.c | 1 + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 1 + drivers/pci/proc.c | 2 +- drivers/power/supply/ab8500_fg.c | 2 ++ drivers/power/supply/abx500_chargalg.c | 1 + drivers/s390/char/tape_char.c | 2 -- drivers/s390/net/ctcm_fsms.c | 1 + drivers/s390/net/qeth_l3_main.c | 1 + drivers/scsi/libsas/sas_discover.c | 2 +- drivers/video/fbdev/xilinxfb.c | 2 ++ fs/fcntl.c | 2 +- fs/xfs/libxfs/xfs_attr.c | 16 ++++++++-------- include/math-emu/op-common.h | 2 +- kernel/debug/gdbstub.c | 2 +- sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 1 + 27 files changed, 40 insertions(+), 27 deletions(-) Merging kbuild/for-next (27932b6a2088 scripts: add generic syscallnr.sh) $ git merge kbuild/for-next Already up to date. Merging compiler-attributes/compiler-attributes (ca0760e7d79e Compiler Attributes: Add continue in comment) $ git merge compiler-attributes/compiler-attributes Already up to date. Merging dma-mapping/for-next (2b4bbc6231d7 dma-debug: report -EEXIST errors in add_dma_entry) $ git merge dma-mapping/for-next Already up to date. Merging asm-generic/master (14462376858e Merge branch 'asm-generic-unaligned' into asm-generic) $ git merge asm-generic/master Auto-merging arch/riscv/include/asm/io.h Merge made by the 'recursive' strategy. arch/riscv/include/asm/io.h | 5 ++-- arch/sparc/include/asm/io.h | 8 ++++++ include/asm-generic/io.h | 68 ++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 75 insertions(+), 6 deletions(-) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) $ git merge arc/for-next Already up to date. Merging arm/for-next (3bd1461d1691 Merge branches 'fixes' and 'misc' into for-next) $ git merge arm/for-next Already up to date! Merge made by the 'recursive' strategy. Merging arm64/for-next/core (3d1bf78c7b13 Merge branch 'for-next/sve' into for-next/core) $ git merge arm64/for-next/core Already up to date. Merging arm-perf/for-next/perf (d96b1b8c9f79 drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe()) $ git merge arm-perf/for-next/perf Already up to date. Merging arm-soc/for-next (2ded36511b58 ARM: Document merges) $ git merge arm-soc/for-next Merge made by the 'recursive' strategy. arch/arm/arm-soc-for-next-contents.txt | 194 +++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 arch/arm/arm-soc-for-next-contents.txt Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) $ git merge actions/for-next Merge made by the 'recursive' strategy. Merging amlogic/for-next (b03485fe99f2 Merge tags 'amlogic-arm64-dt-for-v5.14-v2' and 'amlogic-arm-dt-for-v5.14' into for-next) $ git merge amlogic/for-next Already up to date! Merge made by the 'recursive' strategy. Merging aspeed/for-next (cd946cfe2e7e Merge branches 'defconfig-for-v5.14' and 'dt-for-v5.14' into for-next) $ git merge aspeed/for-next Merge made by the 'recursive' strategy. Merging at91/at91-next (80cbaa6d3450 Merge branches 'at91-dt' and 'at91-defconfig' into at91-next) $ git merge at91/at91-next Already up to date! Merge made by the 'recursive' strategy. Merging drivers-memory/for-next (316ce128fbbe Merge branch 'for-v5.14/tegra-mc-late-or-fixes' into for-next) $ git merge drivers-memory/for-next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++---- include/soc/tegra/mc.h | 9 +++++++-- 2 files changed, 9 insertions(+), 6 deletions(-) Merging imx-mxs/for-next (5004b2d18827 Merge branch 'imx/defconfig' into for-next) $ git merge imx-mxs/for-next Already up to date! Merge made by the 'recursive' strategy. Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) $ git merge keystone/next Already up to date! Merge made by the 'recursive' strategy. Merging mediatek/for-next (a1c8c49de3d7 Merge branch 'v5.13-next/soc' into for-next) $ git merge mediatek/for-next Already up to date! Merge made by the 'recursive' strategy. Merging mvebu/for-next (72a0a49b7c77 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 (91ee322340fb Merge branch 'omap-for-v5.14/dt' into for-next) $ git merge omap/for-next Merge made by the 'recursive' strategy. drivers/bus/ti-sysc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) Merging qcom/for-next (c275bbc84be9 Merge branches 'arm64-defconfig-for-5.14', 'arm64-for-5.14', 'drivers-for-5.14' and 'dts-for-5.14' into for-next) $ git merge qcom/for-next Already up to date! Merge made by the 'recursive' strategy. Merging raspberrypi/for-next (21c6bf8304f0 arm64: dts: broadcom: Add reference to RPi 400) $ git merge raspberrypi/for-next Already up to date. Merging renesas/next (51832d6b6211 Merge branches 'renesas-arm-defconfig-for-v5.15' and 'renesas-arm-dt-for-v5.15' into renesas-next) $ git merge renesas/next Merge made by the 'recursive' strategy. arch/arm/boot/dts/r8a73a4.dtsi | 44 -------- arch/arm/boot/dts/r8a7742.dtsi | 4 +- arch/arm/boot/dts/r8a7743.dtsi | 4 +- arch/arm/boot/dts/r8a7744.dtsi | 4 +- .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 8 ++ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 4 +- arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 8 +- .../arm64/boot/dts/renesas/r8a77950-salvator-x.dts | 73 ------------ arch/arm64/boot/dts/renesas/r8a77950.dtsi | 2 + .../arm64/boot/dts/renesas/r8a77951-salvator-x.dts | 73 ------------ .../boot/dts/renesas/r8a77951-salvator-xs.dts | 122 --------------------- arch/arm64/boot/dts/renesas/r8a77951.dtsi | 5 + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 14 --- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 48 ++++++++ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 +- arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 46 +++++++- arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 26 ++--- arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 80 ++++++++++++++ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 76 ++++++++++++- arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 56 ++++++++++ arch/arm64/configs/defconfig | 1 + 23 files changed, 353 insertions(+), 355 deletions(-) Merging reset/reset/next (48a74b1147f7 reset: Add compile-test stubs) $ git merge reset/reset/next Already up to date. Merging rockchip/for-next (2deacb579c33 Merge branch 'v5.15-armsoc/dts64' into for-next) $ git merge rockchip/for-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/rk3066a.dtsi | 10 +++++----- arch/arm/boot/dts/rk3188.dtsi | 8 ++++---- arch/arm/boot/dts/rk3288.dtsi | 6 ------ arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 3 --- arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 5 ----- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 5 ----- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 -------- 9 files changed, 11 insertions(+), 38 deletions(-) Merging samsung-krzk/for-next (5ce16705e00d Merge branch 'next/defconfig' into for-next) $ git merge samsung-krzk/for-next Merge made by the 'recursive' strategy. Merging scmi/for-linux-next (067eadbb0f2f Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) $ git merge scmi/for-linux-next Merge made by the 'recursive' strategy. drivers/firmware/arm_ffa/bus.c | 6 +++--- drivers/firmware/arm_ffa/driver.c | 8 +++++--- drivers/firmware/arm_scmi/bus.c | 8 +++----- drivers/firmware/arm_scmi/driver.c | 14 +++++++++----- drivers/firmware/arm_scmi/notify.c | 4 ++++ drivers/firmware/arm_scmi/sensors.c | 6 ++++-- include/linux/scmi_protocol.h | 14 +++++++++----- include/linux/scpi_protocol.h | 8 ++++++++ 8 files changed, 45 insertions(+), 23 deletions(-) Merging stm32/stm32-next (4bf4abe19089 ARM: dts: stm32: fix stpmic node for stm32mp1 boards) $ git merge stm32/stm32-next Already up to date. Merging sunxi/sunxi/for-next (3f1c53207cf0 Merge branches 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next) $ git merge sunxi/sunxi/for-next Already up to date! Merge made by the 'recursive' strategy. Merging tegra/for-next (a5f65ad078e9 Merge branch for-5.14/arm64/dt into for-next) $ git merge tegra/for-next Merge made by the 'recursive' strategy. arch/arm64/boot/dts/nvidia/tegra194.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) $ git merge ti-k3/ti-k3-next Already up to date! Merge made by the 'recursive' strategy. Merging ti-k3-new/ti-k3-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge ti-k3-new/ti-k3-next Already up to date. Merging xilinx/for-next (d98fb9ab6255 Merge branch 'zynq/dt' into for-next) $ git merge xilinx/for-next Merge made by the 'recursive' strategy. arch/arm/boot/dts/zynq-7000.dtsi | 21 +++++++++++++++++++++ arch/arm/boot/dts/zynq-ebaz4205.dts | 12 ++++++++++++ arch/arm/configs/multi_v7_defconfig | 1 + 3 files changed, 34 insertions(+) Merging clk/clk-next (783d08bd02f5 Revert "clk: divider: Switch from .round_rate to .determine_rate by default") $ git merge clk/clk-next Already up to date. Merging clk-imx/for-next (c586f53ae159 clk: imx8mq: remove SYS PLL 1/2 clock gates) $ git merge clk-imx/for-next Already up to date. Merging clk-renesas/renesas-clk (aaac4af5b013 clk: renesas: r9a07g044: Add SSIF-2 clock and reset entries) $ git merge clk-renesas/renesas-clk Merge made by the 'recursive' strategy. drivers/clk/renesas/r8a774a1-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a774b1-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a774c0-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a774e1-cpg-mssr.c | 2 +- drivers/clk/renesas/r8a779a0-cpg-mssr.c | 5 +++- drivers/clk/renesas/r9a07g044-cpg.c | 52 +++++++++++++++++++++++++++++++++ drivers/clk/renesas/renesas-rzg2l-cpg.c | 20 ++++--------- 7 files changed, 66 insertions(+), 19 deletions(-) Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2) $ git merge clk-samsung/for-next Already up to date. Merging csky/linux-next (90dc8c0e664e csky: Kconfig: Remove unused selects) $ git merge csky/linux-next Already up to date. Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) $ git merge h8300/h8300-next Auto-merging drivers/tty/serial/sh-sci.c Auto-merging drivers/net/ethernet/smsc/smc91x.c Auto-merging arch/h8300/kernel/setup.c Merge made by the 'recursive' strategy. arch/h8300/Kconfig.cpu | 4 ++ arch/h8300/boot/dts/edosk2674.dts | 10 ++++- arch/h8300/boot/dts/h8300h_sim.dts | 2 +- arch/h8300/boot/dts/h8s_sim.dts | 2 +- arch/h8300/configs/edosk2674_defconfig | 10 ++--- arch/h8300/configs/h8300h-sim_defconfig | 8 +--- arch/h8300/configs/h8s-sim_defconfig | 8 +--- arch/h8300/kernel/setup.c | 2 +- arch/h8300/lib/memset.S | 17 +++++---- drivers/clocksource/h8300_timer8.c | 20 +++++----- drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- drivers/net/ethernet/smsc/Kconfig | 1 - drivers/net/ethernet/smsc/smc91x.c | 10 +++++ drivers/tty/serial/sh-sci.c | 5 +-- 15 files changed, 123 insertions(+), 62 deletions(-) Merging m68k/for-next (c1367ee016e3 m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning) $ git merge m68k/for-next Already up to date. Merging m68knommu/for-next (1ede60632ece m68k/nommu: prevent setting ROMKERNEL when ROM is not set) $ git merge m68knommu/for-next Merge made by the 'recursive' strategy. arch/m68k/Kconfig.machine | 1 + arch/m68k/coldfire/m525x.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) Merging microblaze/next (14a832498c23 arch: microblaze: Fix spelling mistake "vesion" -> "version") $ git merge microblaze/next Already up to date. Merging mips/mips-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge mips/mips-next Already up to date. Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to ) $ git merge nds32/next Already up to date. Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) $ git merge nios2/for-next Already up to date. Merging openrisc/for-next (ad4e600cbf89 drivers/soc/litex: remove 8-bit subregister option) $ git merge openrisc/for-next Already up to date. Merging parisc-hd/for-next (ca2b19a4bdb6 parisc: Increase gcc stack frame check to 2048 for 32- and 64-bit) $ git merge parisc-hd/for-next Auto-merging lib/Kconfig.debug Merge made by the 'recursive' strategy. drivers/parisc/led.c | 4 ++-- lib/Kconfig.debug | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) Merging powerpc/next (019b3fd94ba7 Merge tag 'powerpc-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) $ git merge powerpc/next Already up to date. Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) $ git merge soc-fsl/next Already up to date. Merging risc-v/for-next (7761e36bc722 riscv: Fix PTDUMP output now BPF region moved back to module region) $ git merge risc-v/for-next Already up to date. Merging s390/for-next (7e0946a6d995 Merge branch 'fixes' into for-next) $ git merge s390/for-next Already up to date! Merge made by the 'recursive' strategy. Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) $ git merge sh/for-next Auto-merging drivers/sh/maple/maple.c Merge made by the 'recursive' strategy. arch/sh/boards/mach-landisk/irq.c | 4 ++-- arch/sh/boot/Makefile | 4 ++-- arch/sh/boot/compressed/.gitignore | 5 ----- arch/sh/boot/compressed/Makefile | 32 +++++++++++++------------------- arch/sh/boot/compressed/ashiftrt.S | 2 ++ arch/sh/boot/compressed/ashldi3.c | 2 ++ arch/sh/boot/compressed/ashlsi3.S | 2 ++ arch/sh/boot/compressed/ashrsi3.S | 2 ++ arch/sh/boot/compressed/lshrsi3.S | 2 ++ arch/sh/include/asm/checksum_32.h | 5 +++-- arch/sh/include/asm/uaccess.h | 4 ++-- arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++-- arch/sh/kernel/crash_dump.c | 4 ++-- arch/sh/kernel/traps_32.c | 8 ++++---- arch/sh/math-emu/math.c | 4 ++-- arch/sh/mm/nommu.c | 4 ++-- drivers/sh/maple/maple.c | 5 ++++- 17 files changed, 49 insertions(+), 45 deletions(-) create mode 100644 arch/sh/boot/compressed/ashiftrt.S create mode 100644 arch/sh/boot/compressed/ashldi3.c create mode 100644 arch/sh/boot/compressed/ashlsi3.S create mode 100644 arch/sh/boot/compressed/ashrsi3.S create mode 100644 arch/sh/boot/compressed/lshrsi3.S Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) $ git merge sparc-next/master Already up to date. Merging uml/linux-next (1aee020155f3 um: remove unneeded semicolon in um_arch.c) $ git merge uml/linux-next Already up to date. Merging xtensa/xtensa-for-next (ac637a0ada71 xtensa: add fairness to IRQ handling) $ git merge xtensa/xtensa-for-next Merge made by the 'recursive' strategy. arch/xtensa/Kconfig | 2 +- arch/xtensa/kernel/traps.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) Merging pidfd/for-next (5ddf9602d711 Merge branch 'fs.mount_setattr.nosymfollow' into for-next) $ git merge pidfd/for-next Already up to date! Merge made by the 'recursive' strategy. Merging fscrypt/master (2fc2b430f559 fscrypt: fix derivation of SipHash keys on big endian CPUs) $ git merge fscrypt/master Already up to date. Merging fscache/fscache-next (5193f26aef59 fscache: Use refcount_t for the cookie refcount instead of atomic_t) $ git merge fscache/fscache-next Removing fs/fscache/object-list.c Removing fs/fscache/histogram.c Removing fs/cachefiles/proc.c Merge made by the 'recursive' strategy. fs/cachefiles/Kconfig | 19 -- fs/cachefiles/Makefile | 2 - fs/cachefiles/bind.c | 2 - fs/cachefiles/interface.c | 6 +- fs/cachefiles/internal.h | 25 --- fs/cachefiles/io.c | 6 +- fs/cachefiles/key.c | 2 +- fs/cachefiles/main.c | 7 - fs/cachefiles/namei.c | 61 ++---- fs/cachefiles/proc.c | 114 ----------- fs/cachefiles/xattr.c | 4 +- fs/fscache/Kconfig | 25 +-- fs/fscache/Makefile | 2 - fs/fscache/cache.c | 11 +- fs/fscache/cookie.c | 201 +++++++++++++----- fs/fscache/fsdef.c | 3 +- fs/fscache/histogram.c | 87 -------- fs/fscache/internal.h | 57 ++---- fs/fscache/main.c | 39 ++++ fs/fscache/netfs.c | 2 +- fs/fscache/object-list.c | 414 -------------------------------------- fs/fscache/object.c | 8 - fs/fscache/operation.c | 3 - fs/fscache/page.c | 6 - fs/fscache/proc.c | 20 +- include/linux/fscache-cache.h | 4 - include/linux/fscache.h | 4 +- include/linux/netfs.h | 2 +- include/trace/events/cachefiles.h | 68 +++---- include/trace/events/fscache.h | 160 +++++++-------- include/trace/events/netfs.h | 2 +- 31 files changed, 368 insertions(+), 998 deletions(-) delete mode 100644 fs/cachefiles/proc.c delete mode 100644 fs/fscache/histogram.c delete mode 100644 fs/fscache/object-list.c Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") $ git merge afs/afs-next Already up to date. Merging btrfs/for-next (808c6838dfee Merge branch 'for-next-current-v5.12-20210624' into for-next-20210624) $ git merge btrfs/for-next Already up to date! Merge made by the 'recursive' strategy. Merging ceph/master (4c18347238ab ceph: take reference to req->r_parent at point of assignment) $ git merge ceph/master Already up to date. Merging cifs/for-next (32eda9f08e05 cifs: handle reconnect of tcon when there is no cached dfs referral) $ git merge cifs/for-next Merge made by the 'recursive' strategy. fs/cifs/cifs_dfs_ref.c | 6 +- fs/cifs/cifsglob.h | 7 ++ fs/cifs/connect.c | 236 ++++++++++++++++++++++++++++++++++++------------- fs/cifs/dns_resolve.c | 10 ++- fs/cifs/dns_resolve.h | 2 +- fs/cifs/misc.c | 2 +- fs/cifs/smb2ops.c | 4 +- 7 files changed, 198 insertions(+), 69 deletions(-) Merging cifsd/cifsd-for-next (904729b61c37 Merge pull request #60 from namjaejeon/cifsd-for-next) $ git merge cifsd/cifsd-for-next Auto-merging fs/Kconfig Auto-merging MAINTAINERS Auto-merging Documentation/filesystems/index.rst Merge made by the 'recursive' strategy. Documentation/filesystems/cifs/index.rst | 10 + Documentation/filesystems/cifs/ksmbd.rst | 164 + Documentation/filesystems/index.rst | 2 +- MAINTAINERS | 11 +- fs/Kconfig | 1 + fs/Makefile | 1 + fs/ksmbd/Kconfig | 69 + fs/ksmbd/Makefile | 20 + fs/ksmbd/asn1.c | 343 ++ fs/ksmbd/asn1.h | 21 + fs/ksmbd/auth.c | 1364 +++++ fs/ksmbd/auth.h | 67 + fs/ksmbd/connection.c | 413 ++ fs/ksmbd/connection.h | 211 + fs/ksmbd/crypto_ctx.c | 282 + fs/ksmbd/crypto_ctx.h | 74 + fs/ksmbd/glob.h | 49 + fs/ksmbd/ksmbd_netlink.h | 395 ++ fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 | 31 + fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 | 19 + fs/ksmbd/ksmbd_work.c | 80 + fs/ksmbd/ksmbd_work.h | 117 + fs/ksmbd/mgmt/ksmbd_ida.c | 46 + fs/ksmbd/mgmt/ksmbd_ida.h | 34 + fs/ksmbd/mgmt/share_config.c | 238 + fs/ksmbd/mgmt/share_config.h | 81 + fs/ksmbd/mgmt/tree_connect.c | 121 + fs/ksmbd/mgmt/tree_connect.h | 56 + fs/ksmbd/mgmt/user_config.c | 69 + fs/ksmbd/mgmt/user_config.h | 66 + fs/ksmbd/mgmt/user_session.c | 369 ++ fs/ksmbd/mgmt/user_session.h | 106 + fs/ksmbd/misc.c | 338 ++ fs/ksmbd/misc.h | 35 + fs/ksmbd/ndr.c | 338 ++ fs/ksmbd/ndr.h | 22 + fs/ksmbd/nterr.h | 543 ++ fs/ksmbd/ntlmssp.h | 169 + fs/ksmbd/oplock.c | 1709 ++++++ fs/ksmbd/oplock.h | 131 + fs/ksmbd/server.c | 633 +++ fs/ksmbd/server.h | 70 + fs/ksmbd/smb2misc.c | 433 ++ fs/ksmbd/smb2ops.c | 308 ++ fs/ksmbd/smb2pdu.c | 8299 ++++++++++++++++++++++++++++++ fs/ksmbd/smb2pdu.h | 1684 ++++++ fs/ksmbd/smb_common.c | 655 +++ fs/ksmbd/smb_common.h | 543 ++ fs/ksmbd/smbacl.c | 1344 +++++ fs/ksmbd/smbacl.h | 212 + fs/ksmbd/smbfsctl.h | 91 + fs/ksmbd/smbstatus.h | 1822 +++++++ fs/ksmbd/transport_ipc.c | 874 ++++ fs/ksmbd/transport_ipc.h | 47 + fs/ksmbd/transport_rdma.c | 2057 ++++++++ fs/ksmbd/transport_rdma.h | 63 + fs/ksmbd/transport_tcp.c | 619 +++ fs/ksmbd/transport_tcp.h | 13 + fs/ksmbd/unicode.c | 384 ++ fs/ksmbd/unicode.h | 357 ++ fs/ksmbd/uniupr.h | 268 + fs/ksmbd/vfs.c | 1886 +++++++ fs/ksmbd/vfs.h | 197 + fs/ksmbd/vfs_cache.c | 725 +++ fs/ksmbd/vfs_cache.h | 178 + fs/ksmbd/xattr.h | 122 + 66 files changed, 32097 insertions(+), 2 deletions(-) create mode 100644 Documentation/filesystems/cifs/index.rst create mode 100644 Documentation/filesystems/cifs/ksmbd.rst create mode 100644 fs/ksmbd/Kconfig create mode 100644 fs/ksmbd/Makefile create mode 100644 fs/ksmbd/asn1.c create mode 100644 fs/ksmbd/asn1.h create mode 100644 fs/ksmbd/auth.c create mode 100644 fs/ksmbd/auth.h create mode 100644 fs/ksmbd/connection.c create mode 100644 fs/ksmbd/connection.h create mode 100644 fs/ksmbd/crypto_ctx.c create mode 100644 fs/ksmbd/crypto_ctx.h create mode 100644 fs/ksmbd/glob.h create mode 100644 fs/ksmbd/ksmbd_netlink.h create mode 100644 fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 create mode 100644 fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 create mode 100644 fs/ksmbd/ksmbd_work.c create mode 100644 fs/ksmbd/ksmbd_work.h create mode 100644 fs/ksmbd/mgmt/ksmbd_ida.c create mode 100644 fs/ksmbd/mgmt/ksmbd_ida.h create mode 100644 fs/ksmbd/mgmt/share_config.c create mode 100644 fs/ksmbd/mgmt/share_config.h create mode 100644 fs/ksmbd/mgmt/tree_connect.c create mode 100644 fs/ksmbd/mgmt/tree_connect.h create mode 100644 fs/ksmbd/mgmt/user_config.c create mode 100644 fs/ksmbd/mgmt/user_config.h create mode 100644 fs/ksmbd/mgmt/user_session.c create mode 100644 fs/ksmbd/mgmt/user_session.h create mode 100644 fs/ksmbd/misc.c create mode 100644 fs/ksmbd/misc.h create mode 100644 fs/ksmbd/ndr.c create mode 100644 fs/ksmbd/ndr.h create mode 100644 fs/ksmbd/nterr.h create mode 100644 fs/ksmbd/ntlmssp.h create mode 100644 fs/ksmbd/oplock.c create mode 100644 fs/ksmbd/oplock.h create mode 100644 fs/ksmbd/server.c create mode 100644 fs/ksmbd/server.h create mode 100644 fs/ksmbd/smb2misc.c create mode 100644 fs/ksmbd/smb2ops.c create mode 100644 fs/ksmbd/smb2pdu.c create mode 100644 fs/ksmbd/smb2pdu.h create mode 100644 fs/ksmbd/smb_common.c create mode 100644 fs/ksmbd/smb_common.h create mode 100644 fs/ksmbd/smbacl.c create mode 100644 fs/ksmbd/smbacl.h create mode 100644 fs/ksmbd/smbfsctl.h create mode 100644 fs/ksmbd/smbstatus.h create mode 100644 fs/ksmbd/transport_ipc.c create mode 100644 fs/ksmbd/transport_ipc.h create mode 100644 fs/ksmbd/transport_rdma.c create mode 100644 fs/ksmbd/transport_rdma.h create mode 100644 fs/ksmbd/transport_tcp.c create mode 100644 fs/ksmbd/transport_tcp.h create mode 100644 fs/ksmbd/unicode.c create mode 100644 fs/ksmbd/unicode.h create mode 100644 fs/ksmbd/uniupr.h create mode 100644 fs/ksmbd/vfs.c create mode 100644 fs/ksmbd/vfs.h create mode 100644 fs/ksmbd/vfs_cache.c create mode 100644 fs/ksmbd/vfs_cache.h create mode 100644 fs/ksmbd/xattr.h Merging configfs/for-next (420405ecde06 configfs: fix the read and write iterators) $ git merge configfs/for-next Merge made by the 'recursive' strategy. fs/configfs/file.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) $ git merge ecryptfs/next Already up to date. Merging erofs/dev (8215d5b7f15f MAINTAINERS: erofs: update my email address) $ git merge erofs/dev Already up to date. Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block) $ git merge exfat/dev Already up to date. Merging ext3/for_next (e73f0f0ee754 Linux 5.14-rc1) $ git merge ext3/for_next Already up to date. Merging ext4/dev (0705e8d1e220 ext4: inline jbd2_journal_[un]register_shrinker()) $ git merge ext4/dev Already up to date. Merging f2fs/dev (9b76d71fa8be Merge tag 'riscv-for-linus-5.14-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) $ git merge f2fs/dev Already up to date. Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) $ git merge fsverity/fsverity Already up to date. Merging fuse/for-next (c4e0cd4e0c16 virtiofs: Fix spelling mistakes) $ git merge fuse/for-next Already up to date. Merging gfs2/for-next (e6d1bd8d56de gfs2: Fix memory leak of object lsi on error return path) $ git merge gfs2/for-next Merge made by the 'recursive' strategy. fs/gfs2/ops_fstype.c | 1 + 1 file changed, 1 insertion(+) Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy()) $ git merge jfs/jfs-next Already up to date. Merging nfs/linux-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge nfs/linux-next Already up to date. Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl) $ git merge nfs-anna/linux-next Already up to date. Merging nfsd/nfsd-next (ab1016d39cc0 nfsd: fix NULL dereference in nfs3svc_encode_getaclres) $ git merge nfsd/nfsd-next Already up to date. Merging cel/for-next (14490d0ff202 NFSD: Batch release pages during splice read) $ git merge cel/for-next Merge made by the 'recursive' strategy. fs/nfsd/vfs.c | 20 +++++--------------- include/linux/sunrpc/svc.h | 4 ++++ net/sunrpc/svc.c | 21 +++++++++++++++++++++ net/sunrpc/svc_xprt.c | 3 +++ 4 files changed, 33 insertions(+), 15 deletions(-) Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.) $ git merge orangefs/for-next Already up to date. Merging overlayfs/overlayfs-next (5e717c6fa41f ovl: add debug print to ovl_do_getxattr()) $ git merge overlayfs/overlayfs-next Already up to date. Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode) $ git merge ubifs/next Already up to date. Merging v9fs/9p-next (cba7dcd8878e 9p/trans_virtio: Remove sysfs file on probe failure) $ git merge v9fs/9p-next Auto-merging net/9p/trans_virtio.c Merge made by the 'recursive' strategy. net/9p/trans_virtio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Merging xfs/for-next (1effb72a8179 xfs: don't wait on future iclogs when pushing the CIL) $ git merge xfs/for-next Already up to date. Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) $ git merge zonefs/for-next Auto-merging fs/zonefs/super.c Merge made by the 'recursive' strategy. fs/zonefs/super.c | 3 --- 1 file changed, 3 deletions(-) Merging iomap/iomap-for-next (6e552494fb90 iomap: remove unused private field from ioend) $ git merge iomap/iomap-for-next Already up to date. Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) $ git merge djw-vfs/vfs-for-next Already up to date. Merging file-locks/locks-next (e1cc6e8c1969 fcntl: fix potential deadlock for &fasync_struct.fa_lock) $ git merge file-locks/locks-next Auto-merging fs/fcntl.c Merge made by the 'recursive' strategy. fs/fcntl.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) Merging vfs/for-next (303392fd5c16 Merge tag 'leds-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds) $ git merge vfs/for-next Already up to date. Merging printk/for-next (70333dec4462 Merge branch 'rework/fixup-for-5.15' into for-next) $ git merge printk/for-next Merge made by the 'recursive' strategy. kernel/printk/printk.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) Merging pci/next (e73f0f0ee754 Linux 5.14-rc1) $ git merge pci/next Already up to date. Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) $ git merge pstore/for-next/pstore Merge made by the 'recursive' strategy. fs/pstore/blk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging hid/for-next (f3fb2deb517f Merge branch 'for-5.13/upstream-fixes' into for-next) $ git merge hid/for-next Already up to date! Merge made by the 'recursive' strategy. Merging i2c/i2c/for-next (5bac2a5bf0c6 Merge branch 'i2c/for-mergewindow' into i2c/for-next) $ git merge i2c/i2c/for-next Merge made by the 'recursive' strategy. Merging i3c/i3c/next (3e5feb11a829 i3c: master: svc: fix doc warning in svc-i3c-master.c) $ git merge i3c/i3c/next Already up to date. Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) $ git merge dmi/dmi-for-next Already up to date. Merging hwmon-staging/hwmon-next (3352a33e7f9c hwmon: (w83627ehf) Remove w83627ehf_remove()) $ git merge hwmon-staging/hwmon-next Merge made by the 'recursive' strategy. drivers/hwmon/intel-m10-bmc-hwmon.c | 116 ++++++++++++++++++++++++++++++++++++ drivers/hwmon/k10temp.c | 2 + drivers/hwmon/ntc_thermistor.c | 20 ++++--- drivers/hwmon/pmbus/bpa-rs600.c | 22 ++++--- drivers/hwmon/w83627ehf.c | 99 ++++++------------------------ 5 files changed, 161 insertions(+), 98 deletions(-) Merging jc_docs/docs-next (863616f3be33 docs/zh_CN: add core api cpu_hotplug translation) $ git merge jc_docs/docs-next Merge made by the 'recursive' strategy. Documentation/admin-guide/sysrq.rst | 12 +- Documentation/arm/marvell.rst | 18 + Documentation/core-api/cpu_hotplug.rst | 38 +- .../core/thread-info-in-task/arch-support.txt | 32 ++ .../time/arch-tick-broadcast/arch-support.txt | 2 +- .../translations/zh_CN/core-api/cpu_hotplug.rst | 348 ++++++++++++++++++ .../translations/zh_CN/core-api/genericirq.rst | 409 +++++++++++++++++++++ .../translations/zh_CN/core-api/index.rst | 4 +- .../translations/zh_CN/dev-tools/index.rst | 5 + .../zh_CN/dev-tools/testing-overview.rst | 108 ++++++ .../translations/zh_CN/process/2.Process.rst | 4 +- .../translations/zh_CN/process/coding-style.rst | 3 +- LICENSES/dual/CC-BY-4.0 | 2 +- scripts/spdxcheck.py | 2 +- 14 files changed, 959 insertions(+), 28 deletions(-) create mode 100644 Documentation/features/core/thread-info-in-task/arch-support.txt create mode 100644 Documentation/translations/zh_CN/core-api/cpu_hotplug.rst create mode 100644 Documentation/translations/zh_CN/core-api/genericirq.rst create mode 100644 Documentation/translations/zh_CN/dev-tools/testing-overview.rst Merging v4l-dvb/master (e73f0f0ee754 Linux 5.14-rc1) $ git merge v4l-dvb/master Already up to date. Merging v4l-dvb-next/master (379e205dab9d media: usb: dvb-usb-v2: af9035: let subdrv autoselect enable si2168 and si2157) $ git merge v4l-dvb-next/master Merge made by the 'recursive' strategy. .../userspace-api/media/cec.h.rst.exceptions | 2 +- .../userspace-api/media/v4l/ext-ctrls-codec.rst | 3 + drivers/media/dvb-frontends/cx24117.c | 1 - drivers/media/dvb-frontends/dib8000.c | 58 +++-- drivers/media/i2c/tda1997x.c | 1 + drivers/media/i2c/tvp5150.c | 2 +- drivers/media/pci/ivtv/ivtv-cards.h | 68 ++++-- drivers/media/pci/ivtv/ivtv-i2c.c | 16 +- drivers/media/pci/saa7134/saa7134-alsa.c | 4 +- drivers/media/pci/saa7134/saa7134-core.c | 7 +- drivers/media/pci/saa7164/saa7164-cmd.c | 3 - drivers/media/pci/tw5864/tw5864-reg.h | 2 +- drivers/media/platform/atmel/atmel-sama5d2-isc.c | 17 ++ drivers/media/platform/davinci/vpfe_capture.c | 2 +- drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +- drivers/media/platform/sti/delta/delta-ipc.c | 3 +- drivers/media/platform/ti-vpe/cal-camerarx.c | 247 +++++++++++-------- drivers/media/platform/ti-vpe/cal-video.c | 176 +++++++++---- drivers/media/platform/ti-vpe/cal.c | 272 ++++++++++++++------- drivers/media/platform/ti-vpe/cal.h | 66 +++-- drivers/media/platform/ti-vpe/cal_regs.h | 53 +--- drivers/media/rc/rc-main.c | 2 +- drivers/media/rc/redrat3.c | 2 +- drivers/media/rc/streamzap.c | 2 - drivers/media/spi/cxd2880-spi.c | 7 +- drivers/media/test-drivers/vivid/vivid-cec.c | 2 +- drivers/media/usb/dvb-usb-v2/Kconfig | 2 + drivers/media/usb/dvb-usb-v2/af9035.c | 1 + drivers/media/usb/dvb-usb-v2/dvbsky.c | 37 ++- drivers/media/usb/gspca/Kconfig | 1 - drivers/media/usb/gspca/vc032x.c | 6 +- drivers/media/usb/gspca/zc3xx.c | 134 +++++----- drivers/media/usb/uvc/uvc_v4l2.c | 34 ++- .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +- drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 26 +- drivers/staging/media/sunxi/cedrus/cedrus_video.c | 1 + include/media/dvb-usb-ids.h | 2 + include/media/hevc-ctrls.h | 3 +- include/uapi/linux/cec.h | 2 +- 40 files changed, 807 insertions(+), 466 deletions(-) Merging pm/linux-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge pm/linux-next Already up to date. Merging cpufreq-arm/cpufreq/arm/linux-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge cpufreq-arm/cpufreq/arm/linux-next Already up to date. Merging cpupower/cpupower (e73f0f0ee754 Linux 5.14-rc1) $ git merge cpupower/cpupower Already up to date. Merging devfreq/devfreq-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge devfreq/devfreq-next Already up to date. Merging opp/opp/linux-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge opp/opp/linux-next Already up to date. Merging thermal/thermal/linux-next (fe6a6de6692e thermal/drivers/int340x/processor_thermal: Fix tcc setting) $ git merge thermal/thermal/linux-next Already up to date. Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) $ git merge ieee1394/for-next Merge made by the 'recursive' strategy. drivers/firewire/net.c | 4 ---- 1 file changed, 4 deletions(-) Merging dlm/next (957adb68b3f7 fs: dlm: invalid buffer access in lookup error) $ git merge dlm/next Already up to date. Merging swiotlb/linux-next (7d31f1c65cc9 swiotlb: fix implicit debugfs declarations) $ git merge swiotlb/linux-next Auto-merging include/linux/device.h Auto-merging drivers/xen/swiotlb-xen.c Auto-merging drivers/of/of_private.h Auto-merging drivers/of/device.c Auto-merging drivers/of/address.c Auto-merging drivers/iommu/dma-iommu.c Auto-merging drivers/gpu/drm/nouveau/nouveau_ttm.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_internal.c Auto-merging drivers/base/core.c Merge made by the 'recursive' strategy. .../bindings/reserved-memory/reserved-memory.txt | 36 ++- drivers/base/core.c | 4 + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- drivers/iommu/dma-iommu.c | 12 +- drivers/of/address.c | 33 +++ drivers/of/device.c | 3 + drivers/of/of_private.h | 6 + drivers/pci/xen-pcifront.c | 2 +- drivers/xen/swiotlb-xen.c | 4 +- include/linux/device.h | 4 + include/linux/swiotlb.h | 53 ++++- kernel/dma/Kconfig | 14 ++ kernel/dma/direct.c | 59 +++-- kernel/dma/direct.h | 8 +- kernel/dma/swiotlb.c | 262 ++++++++++++++++----- 16 files changed, 401 insertions(+), 103 deletions(-) Merging rdma/for-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge rdma/for-next Already up to date. Merging net-next/master (5e437416ff66 Merge branch 'dsa-mv88e6xxx-topaz-fixes') $ git merge net-next/master Already up to date. Merging bpf-next/for-next (5e437416ff66 Merge branch 'dsa-mv88e6xxx-topaz-fixes') $ git merge bpf-next/for-next Already up to date. Merging ipsec-next/master (84fe73996c2e Merge branch 'do_once_lite') $ git merge ipsec-next/master Already up to date. Merging mlx5-next/mlx5-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge mlx5-next/mlx5-next Already up to date. Merging netfilter-next/master (84fe73996c2e Merge branch 'do_once_lite') $ git merge netfilter-next/master Already up to date. Merging ipvs-next/master (84fe73996c2e Merge branch 'do_once_lite') $ git merge ipvs-next/master Already up to date. Merging wireless-drivers-next/master (ff8744b5eb11 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) $ git merge wireless-drivers-next/master Already up to date. Merging bluetooth/master (3c755b4545aa Bluetooth: hci_h5: Disable the hci_suspend_notifier for btrtl devices) $ git merge bluetooth/master Merge made by the 'recursive' strategy. drivers/bluetooth/hci_h5.c | 7 +++++++ drivers/bluetooth/hci_serdev.c | 3 +++ drivers/bluetooth/hci_uart.h | 7 ++++--- 3 files changed, 14 insertions(+), 3 deletions(-) Merging mac80211-next/master (5e437416ff66 Merge branch 'dsa-mv88e6xxx-topaz-fixes') $ git merge mac80211-next/master Already up to date. Merging mtd/mtd/next (0bcc3939c98d Merge tag 'spi-nor/for-5.14' into mtd/next) $ git merge mtd/mtd/next Already up to date. Merging nand/nand/next (c06dd49fd59a mtd: rawnand: omap: Add larger page NAND chips support) $ git merge nand/nand/next Already up to date. Merging spi-nor/spi-nor/next (c17e5c85b32f mtd: spi-nor: remove redundant continue statement) $ git merge spi-nor/spi-nor/next Already up to date. Merging crypto/master (66192b2e3fd8 crypto: hisilicon/sec - fix the process of disabling sva prefetching) $ git merge crypto/master Already up to date. Merging drm/drm-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge drm/drm-next Already up to date. Merging drm-misc/for-linux-next (35d283658a61 drm/shmem-helper: Align to page size in dumb_create) $ git merge drm-misc/for-linux-next Auto-merging include/drm/drm_dp_helper.h Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_mob.c Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c Removing drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h Removing drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h Removing drivers/gpu/drm/vmwgfx/device_include/svga_types.h Removing drivers/gpu/drm/vmwgfx/device_include/svga3d_caps.h Removing drivers/gpu/drm/vmwgfx/device_include/includeCheck.h Auto-merging drivers/gpu/drm/vc4/vc4_kms.c Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c Auto-merging drivers/gpu/drm/ttm/ttm_bo.c Auto-merging drivers/gpu/drm/radeon/radeon_fence.c Auto-merging drivers/gpu/drm/radeon/radeon_drv.c Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c Auto-merging drivers/gpu/drm/msm/msm_gem.c Auto-merging drivers/gpu/drm/meson/meson_drv.c Auto-merging drivers/gpu/drm/i915/i915_irq.c Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h Auto-merging drivers/gpu/drm/i915/display/intel_display.c Removing drivers/gpu/drm/bochs/bochs_mm.c Removing drivers/gpu/drm/bochs/bochs_kms.c Removing drivers/gpu/drm/bochs/bochs_hw.c Removing drivers/gpu/drm/bochs/bochs_drv.c Removing drivers/gpu/drm/bochs/bochs.h Removing drivers/gpu/drm/bochs/Makefile Removing drivers/gpu/drm/bochs/Kconfig Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c Auto-merging arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../ABI/testing/sysfs-kernel-dmabuf-buffers | 52 + .../bindings/display/bridge/ti,sn65dsi86.yaml | 21 +- .../devicetree/bindings/display/dp-aux-bus.yaml | 37 + .../bindings/display/panel/panel-simple.yaml | 10 + .../bindings/display/panel/samsung,lms397kf04.yaml | 18 +- Documentation/driver-api/dma-buf.rst | 13 + Documentation/gpu/drm-uapi.rst | 13 + Documentation/gpu/vkms.rst | 38 +- MAINTAINERS | 12 +- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 30 +- drivers/dma-buf/Kconfig | 11 + drivers/dma-buf/Makefile | 1 + drivers/dma-buf/dma-buf-sysfs-stats.c | 337 ++ drivers/dma-buf/dma-buf-sysfs-stats.h | 62 + drivers/dma-buf/dma-buf.c | 40 + drivers/dma-buf/dma-fence-chain.c | 2 +- drivers/dma-buf/dma-resv.c | 33 +- drivers/dma-buf/st-dma-fence-chain.c | 16 +- drivers/dma-buf/udmabuf.c | 59 +- drivers/gpu/drm/Kconfig | 7 +- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 66 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 65 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 26 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 118 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 5 - drivers/gpu/drm/arm/malidp_drv.c | 4 - drivers/gpu/drm/armada/armada_drv.c | 4 +- drivers/gpu/drm/armada/armada_overlay.c | 2 - drivers/gpu/drm/armada/armada_plane.c | 29 - drivers/gpu/drm/armada/armada_plane.h | 2 - drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 1 - drivers/gpu/drm/ast/ast_drv.c | 2 +- drivers/gpu/drm/ast/ast_mode.c | 21 +- drivers/gpu/drm/bochs/Kconfig | 11 - drivers/gpu/drm/bochs/Makefile | 4 - drivers/gpu/drm/bochs/bochs.h | 98 - drivers/gpu/drm/bochs/bochs_drv.c | 205 -- drivers/gpu/drm/bochs/bochs_hw.c | 323 -- drivers/gpu/drm/bochs/bochs_kms.c | 178 - drivers/gpu/drm/bochs/bochs_mm.c | 24 - drivers/gpu/drm/bridge/Kconfig | 1 + drivers/gpu/drm/bridge/analogix/anx7625.c | 5 +- drivers/gpu/drm/bridge/nwl-dsi.c | 6 - drivers/gpu/drm/bridge/ti-sn65dsi83.c | 200 +- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 744 ++-- drivers/gpu/drm/drm_aperture.c | 19 +- drivers/gpu/drm/drm_atomic_helper.c | 10 + drivers/gpu/drm/drm_debugfs_crc.c | 8 +- drivers/gpu/drm/drm_dp_aux_bus.c | 326 ++ drivers/gpu/drm/drm_dp_helper.c | 460 +++ drivers/gpu/drm/drm_gem.c | 12 +- drivers/gpu/drm/drm_gem_atomic_helper.c | 58 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +- drivers/gpu/drm/drm_gem_vram_helper.c | 9 +- drivers/gpu/drm/drm_irq.c | 13 +- drivers/gpu/drm/drm_mipi_dbi.c | 55 +- drivers/gpu/drm/drm_of.c | 2 +- drivers/gpu/drm/drm_simple_kms_helper.c | 12 +- drivers/gpu/drm/drm_syncobj.c | 6 +- drivers/gpu/drm/drm_vblank.c | 15 +- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 3 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 - drivers/gpu/drm/gma500/oaktrail_lvds.c | 6 +- drivers/gpu/drm/gud/gud_drv.c | 61 +- drivers/gpu/drm/gud/gud_internal.h | 2 + drivers/gpu/drm/gud/gud_pipe.c | 62 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 3 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 16 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 - drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 329 +- drivers/gpu/drm/i915/gem/i915_gem_create.c | 9 +- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 126 +- drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 - drivers/gpu/drm/i915/gem/i915_gem_mman.c | 83 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 143 +- drivers/gpu/drm/i915/gem/i915_gem_object.h | 19 +- drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_region.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 647 ++++ drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 48 + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 90 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 3 +- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_gem.c | 5 +- drivers/gpu/drm/i915/i915_irq.c | 8 +- drivers/gpu/drm/i915/intel_memory_region.c | 1 - drivers/gpu/drm/i915/intel_memory_region.h | 1 - drivers/gpu/drm/i915/intel_region_ttm.c | 8 +- drivers/gpu/drm/i915/intel_region_ttm.h | 11 +- drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +- drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +- drivers/gpu/drm/imx/dcss/dcss-kms.c | 3 - drivers/gpu/drm/imx/dcss/dcss-plane.c | 1 - drivers/gpu/drm/imx/imx-drm-core.c | 11 - drivers/gpu/drm/imx/ipuv3-plane.c | 1 - drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 1 - drivers/gpu/drm/ingenic/ingenic-ipu.c | 1 - drivers/gpu/drm/lima/lima_sched.c | 3 +- drivers/gpu/drm/mcde/mcde_display.c | 1 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 - drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 - drivers/gpu/drm/meson/meson_drv.c | 12 +- drivers/gpu/drm/meson/meson_overlay.c | 1 - drivers/gpu/drm/meson/meson_plane.c | 1 - drivers/gpu/drm/mgag200/mgag200_drv.c | 64 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 14 - drivers/gpu/drm/mgag200/mgag200_mode.c | 16 +- drivers/gpu/drm/msm/msm_fbdev.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 16 +- drivers/gpu/drm/msm/msm_gem_submit.c | 6 +- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 2 - drivers/gpu/drm/nouveau/dispnv50/disp.c | 28 + drivers/gpu/drm/nouveau/nouveau_backlight.c | 166 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 6 + drivers/gpu/drm/nouveau/nouveau_connector.h | 9 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +- drivers/gpu/drm/nouveau/nouveau_encoder.h | 1 + drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.h | 2 + drivers/gpu/drm/omapdrm/omap_irq.c | 6 +- drivers/gpu/drm/omapdrm/omap_plane.c | 3 + drivers/gpu/drm/panel/Kconfig | 12 + drivers/gpu/drm/panel/Makefile | 1 + drivers/gpu/drm/panel/panel-samsung-db7430.c | 347 ++ drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 10 +- drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 83 +- drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 41 +- drivers/gpu/drm/panel/panel-samsung-s6e63m0.h | 33 +- drivers/gpu/drm/panel/panel-simple.c | 205 +- drivers/gpu/drm/panfrost/panfrost_device.c | 142 +- drivers/gpu/drm/panfrost/panfrost_device.h | 99 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 91 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 20 +- drivers/gpu/drm/panfrost/panfrost_gpu.c | 2 +- drivers/gpu/drm/panfrost/panfrost_job.c | 695 ++-- drivers/gpu/drm/panfrost/panfrost_job.h | 8 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 203 +- drivers/gpu/drm/panfrost/panfrost_mmu.h | 5 +- drivers/gpu/drm/panfrost/panfrost_regs.h | 3 - drivers/gpu/drm/pl111/pl111_display.c | 1 - drivers/gpu/drm/qxl/qxl_drv.c | 3 +- drivers/gpu/drm/qxl/qxl_drv.h | 2 - drivers/gpu/drm/qxl/qxl_prime.c | 6 - drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_fence.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 16 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 8 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 - drivers/gpu/drm/scheduler/sched_main.c | 21 +- drivers/gpu/drm/sti/sti_compositor.c | 2 - drivers/gpu/drm/stm/ltdc.c | 4 - drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- drivers/gpu/drm/sun4i/sun4i_layer.c | 1 - drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 1 - drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 1 - drivers/gpu/drm/tegra/drm.c | 9 +- drivers/gpu/drm/tidss/tidss_irq.c | 3 - drivers/gpu/drm/tidss/tidss_plane.c | 1 - drivers/gpu/drm/tiny/Kconfig | 13 + drivers/gpu/drm/tiny/Makefile | 1 + drivers/gpu/drm/tiny/bochs.c | 733 ++++ drivers/gpu/drm/tiny/cirrus.c | 2 +- drivers/gpu/drm/tiny/hx8357d.c | 1 - drivers/gpu/drm/tiny/ili9225.c | 1 - drivers/gpu/drm/tiny/ili9341.c | 1 - drivers/gpu/drm/tiny/ili9486.c | 1 - drivers/gpu/drm/tiny/mi0283qt.c | 1 - drivers/gpu/drm/tiny/repaper.c | 1 - drivers/gpu/drm/tiny/st7586.c | 1 - drivers/gpu/drm/tiny/st7735r.c | 1 - drivers/gpu/drm/ttm/ttm_bo.c | 66 +- drivers/gpu/drm/tve200/tve200_display.c | 1 - drivers/gpu/drm/v3d/v3d_sched.c | 10 +- drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +- drivers/gpu/drm/vboxvideo/vbox_mode.c | 3 +- drivers/gpu/drm/vc4/Kconfig | 1 + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 369 +- drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +- drivers/gpu/drm/vc4/vc4_kms.c | 1 - drivers/gpu/drm/vc4/vc4_regs.h | 30 + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 +- drivers/gpu/drm/virtio/virtgpu_plane.c | 64 +- drivers/gpu/drm/virtio/virtgpu_vq.c | 7 +- drivers/gpu/drm/vkms/vkms_composer.c | 26 +- drivers/gpu/drm/vkms/vkms_drv.c | 32 +- drivers/gpu/drm/vkms/vkms_drv.h | 6 +- drivers/gpu/drm/vkms/vkms_plane.c | 57 +- drivers/gpu/drm/vmwgfx/Kconfig | 8 + drivers/gpu/drm/vmwgfx/Makefile | 2 +- .../gpu/drm/vmwgfx/device_include/includeCheck.h | 3 - .../gpu/drm/vmwgfx/device_include/svga3d_caps.h | 111 - drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h | 3680 ++++++++------------ .../gpu/drm/vmwgfx/device_include/svga3d_devcaps.h | 793 ++--- drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h | 3503 +++++++++---------- .../gpu/drm/vmwgfx/device_include/svga3d_limits.h | 101 +- drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h | 15 +- .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 3132 ++++++++--------- .../gpu/drm/vmwgfx/device_include/svga3d_types.h | 3020 +++++++--------- .../gpu/drm/vmwgfx/device_include/svga_escape.h | 68 +- .../gpu/drm/vmwgfx/device_include/svga_overlay.h | 203 +- drivers/gpu/drm/vmwgfx/device_include/svga_reg.h | 2847 ++++----------- drivers/gpu/drm/vmwgfx/device_include/svga_types.h | 51 - .../gpu/drm/vmwgfx/device_include/vm_basic_types.h | 131 +- .../drm/vmwgfx/device_include/vmware_pack_begin.h | 2 - .../drm/vmwgfx/device_include/vmware_pack_end.h | 2 - drivers/gpu/drm/vmwgfx/ttm_memory.c | 2 + drivers/gpu/drm/vmwgfx/vmw_surface_cache.h | 539 +++ drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 24 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c | 142 + drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.h | 50 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 68 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 42 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 17 +- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 111 +- drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 24 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_mksstat.h | 144 + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 40 +- drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 579 ++- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 80 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 35 - drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 4 +- drivers/gpu/drm/xen/xen_drm_front_kms.c | 1 - drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 - drivers/gpu/drm/zte/zx_drm_drv.c | 6 - drivers/video/fbdev/omap2/omapfb/dss/apply.c | 4 +- include/drm/drm_aperture.h | 14 +- include/drm/drm_bridge.h | 26 +- include/drm/drm_connector.h | 5 + include/drm/drm_dp_aux_bus.h | 57 + include/drm/drm_dp_helper.h | 175 +- include/drm/drm_gem_atomic_helper.h | 6 + include/drm/drm_gem_vram_helper.h | 16 +- include/drm/drm_mipi_dbi.h | 7 +- include/drm/drm_mipi_dsi.h | 5 + include/drm/drm_modeset_helper_vtables.h | 7 +- include/drm/drm_panel.h | 8 +- include/drm/drm_simple_kms_helper.h | 7 +- include/drm/drm_vma_manager.h | 2 +- include/drm/gpu_scheduler.h | 37 +- include/drm/ttm/ttm_placement.h | 7 +- include/linux/dma-buf.h | 177 +- include/linux/dma-fence-chain.h | 52 +- include/uapi/drm/drm.h | 4 +- include/uapi/drm/drm_mode.h | 32 + include/uapi/drm/vmwgfx_drm.h | 41 + include/uapi/linux/dma-buf.h | 50 +- 274 files changed, 15901 insertions(+), 14172 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-dmabuf-buffers create mode 100644 Documentation/devicetree/bindings/display/dp-aux-bus.yaml create mode 100644 drivers/dma-buf/dma-buf-sysfs-stats.c create mode 100644 drivers/dma-buf/dma-buf-sysfs-stats.h delete mode 100644 drivers/gpu/drm/bochs/Kconfig delete mode 100644 drivers/gpu/drm/bochs/Makefile delete mode 100644 drivers/gpu/drm/bochs/bochs.h delete mode 100644 drivers/gpu/drm/bochs/bochs_drv.c delete mode 100644 drivers/gpu/drm/bochs/bochs_hw.c delete mode 100644 drivers/gpu/drm/bochs/bochs_kms.c delete mode 100644 drivers/gpu/drm/bochs/bochs_mm.c create mode 100644 drivers/gpu/drm/drm_dp_aux_bus.c create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h create mode 100644 drivers/gpu/drm/panel/panel-samsung-db7430.c create mode 100644 drivers/gpu/drm/tiny/bochs.c delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/includeCheck.h delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_caps.h delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga_types.h delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h create mode 100644 drivers/gpu/drm/vmwgfx/vmw_surface_cache.h create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.h create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_mksstat.h create mode 100644 include/drm/drm_dp_aux_bus.h Merging amdgpu/drm-next (785a89f5ed9c drm/amdgpu/display: add support for multiple backlights) $ git merge amdgpu/drm-next Auto-merging drivers/pci/quirks.c Removing drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c Removing drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h Removing drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c Auto-merging drivers/gpu/drm/Kconfig Merge made by the 'recursive' strategy. drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 35 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c | 239 ++++ .../inc/smu_v13_0_1.h => amdgpu/amdgpu_eeprom.h} | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 32 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 18 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 46 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 165 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 1258 +++++++++++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 70 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 78 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 158 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 12 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 21 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 13 + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 4 +- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 4 +- drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 7 +- drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 324 ++--- drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 15 + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 15 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 45 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 30 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 242 ++-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 4 +- .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 12 +- .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 4 +- .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 12 +- .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 16 +- .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 25 +- .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 10 +- .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 14 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 129 +- drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 24 + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_stat.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 2 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 2 +- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 11 +- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 18 +- .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 15 +- .../drm/amd/display/dc/dml/display_mode_enums.h | 4 +- .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 12 +- .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 +- drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 - .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 5 + drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 18 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 11 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 15 + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 10 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 17 + .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 4 + .../drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h | 355 ------ .../amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h | 531 --------- .../amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h | 179 +-- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 + .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 65 +- drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 +- drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 242 +--- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 118 ++ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 457 ++++--- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 239 +--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 24 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c | 311 ----- .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 49 +- drivers/gpu/drm/radeon/radeon.h | 3 + drivers/gpu/drm/radeon/radeon_audio.c | 95 ++ drivers/pci/quirks.c | 1 + drivers/usb/host/xhci-pci.c | 3 + 93 files changed, 3029 insertions(+), 3012 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c rename drivers/gpu/drm/amd/{pm/inc/smu_v13_0_1.h => amdgpu/amdgpu_eeprom.h} (53%) delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h delete mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c Merging drm-intel/for-linux-next (d5bfbad21436 Merge drm/drm-next into drm-intel-next) $ git merge drm-intel/for-linux-next Auto-merging drivers/gpu/drm/i915/i915_irq.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h Auto-merging drivers/gpu/drm/i915/display/intel_display.c Merge made by the 'recursive' strategy. drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- drivers/gpu/drm/i915/display/icl_dsi.c | 46 +- drivers/gpu/drm/i915/display/intel_acpi.c | 19 + drivers/gpu/drm/i915/display/intel_acpi.h | 3 + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +- drivers/gpu/drm/i915/display/intel_atomic_plane.h | 3 +- drivers/gpu/drm/i915/display/intel_bw.c | 41 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 11 +- drivers/gpu/drm/i915/display/intel_crt.c | 3 + drivers/gpu/drm/i915/display/intel_crtc.c | 8 +- drivers/gpu/drm/i915/display/intel_cursor.c | 4 +- drivers/gpu/drm/i915/display/intel_ddi.c | 210 +- drivers/gpu/drm/i915/display/intel_ddi.h | 4 +- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 2461 +++++++++++--------- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 68 +- drivers/gpu/drm/i915/display/intel_display.c | 170 +- .../gpu/drm/i915/display/intel_display_debugfs.c | 35 +- drivers/gpu/drm/i915/display/intel_display_power.c | 18 +- drivers/gpu/drm/i915/display/intel_display_types.h | 10 +- drivers/gpu/drm/i915/display/intel_dmc.c | 165 +- drivers/gpu/drm/i915/display/intel_dmc.h | 23 +- drivers/gpu/drm/i915/display/intel_dp.c | 10 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 15 +- drivers/gpu/drm/i915/display/intel_fbc.c | 215 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 96 +- drivers/gpu/drm/i915/display/intel_fdi.c | 25 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 42 +- drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- drivers/gpu/drm/i915/display/intel_opregion.c | 3 + drivers/gpu/drm/i915/display/intel_psr.c | 203 +- drivers/gpu/drm/i915/display/intel_quirks.c | 34 + drivers/gpu/drm/i915/display/intel_sdvo.c | 4 +- drivers/gpu/drm/i915/display/intel_sprite.c | 2 +- drivers/gpu/drm/i915/display/intel_tc.c | 34 +- drivers/gpu/drm/i915/display/intel_tc.h | 2 + drivers/gpu/drm/i915/display/intel_tv.c | 13 +- drivers/gpu/drm/i915/display/intel_vga.c | 3 + drivers/gpu/drm/i915/display/skl_scaler.c | 27 +- drivers/gpu/drm/i915/display/skl_universal_plane.c | 4 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 13 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 32 +- drivers/gpu/drm/i915/i915_irq.c | 22 +- drivers/gpu/drm/i915/i915_pci.c | 54 +- drivers/gpu/drm/i915/i915_reg.h | 30 +- drivers/gpu/drm/i915/intel_device_info.c | 14 +- drivers/gpu/drm/i915/intel_device_info.h | 5 +- drivers/gpu/drm/i915/intel_dram.c | 3 +- drivers/gpu/drm/i915/intel_pm.c | 119 +- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 50 files changed, 2529 insertions(+), 1814 deletions(-) Merging drm-tegra/drm/tegra/for-next (a562c0783b5f drm/tegra: Don't call SET_APPLICATION_ID in VIC boot) $ git merge drm-tegra/drm/tegra/for-next Auto-merging drivers/gpu/drm/tegra/dpaux.c Merge made by the 'recursive' strategy. Merging drm-msm/msm-next (e88bbc91849b Revert "drm/msm/mdp5: provide dynamic bandwidth management") $ git merge drm-msm/msm-next Already up to date. Merging imx-drm/imx-drm/next (fc1e985b67f9 drm/imx: ipuv3-plane: add color encoding and range properties) $ git merge imx-drm/imx-drm/next Already up to date. Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function) $ git merge etnaviv/etnaviv/next Merge made by the 'recursive' strategy. drivers/gpu/drm/etnaviv/etnaviv_drv.c | 14 ++----------- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 --- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 18 +++++------------ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 ------------ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 ++++++ drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 31 +++++++++++++++++++++++++++++ 6 files changed, 44 insertions(+), 41 deletions(-) Merging regmap/for-next (d63aa09f7c53 regmap: Prefer unsigned int to bare use of unsigned) $ git merge regmap/for-next Merge made by the 'recursive' strategy. drivers/base/regmap/regmap-debugfs.c | 2 +- drivers/base/regmap/regmap-mmio.c | 2 +- drivers/base/regmap/regmap.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) Merging sound/for-next (27757876d173 ALSA: intel8x0: Skip ac97 clock measurement on VM) $ git merge sound/for-next Merge made by the 'recursive' strategy. sound/pci/hda/patch_ca0132.c | 2 +- sound/pci/hda/patch_hdmi.c | 7 +++++++ sound/pci/ice1712/ice1724.c | 42 ++++++++++++++---------------------------- sound/pci/intel8x0.c | 2 ++ sound/x86/intel_hdmi_audio.c | 31 ++++++++----------------------- sound/x86/intel_hdmi_audio.h | 1 - 6 files changed, 32 insertions(+), 53 deletions(-) Merging sound-asoc/for-next (48b2d8fb74b4 Merge remote-tracking branch 'asoc/for-5.15' into asoc-next) $ git merge sound-asoc/for-next Merge made by the 'recursive' strategy. .../bindings/sound/davinci-mcasp-audio.txt | 1 + include/linux/platform_data/davinci_asp.h | 1 + include/sound/sof.h | 1 + sound/soc/amd/acp-pcm-dma.c | 12 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- sound/soc/atmel/Kconfig | 1 - sound/soc/atmel/mchp-spdifrx.c | 6 +- sound/soc/atmel/mchp-spdiftx.c | 2 +- sound/soc/atmel/tse850-pcm5142.c | 2 +- sound/soc/codecs/tlv320aic32x4.c | 2 +- sound/soc/codecs/wcd938x.c | 6 +- sound/soc/codecs/wm_adsp.c | 7 +- sound/soc/fsl/fsl_xcvr.c | 4 +- sound/soc/intel/boards/sof_cs42l42.c | 8 +- sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 15 ++ sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 43 +++-- sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 27 ++-- sound/soc/sh/rcar/dma.c | 2 +- sound/soc/sof/sof-audio.c | 42 ++++- sound/soc/ti/Kconfig | 1 + sound/soc/ti/davinci-mcasp.c | 176 ++++++++++++++++++--- sound/soc/ti/omap-abe-twl6040.c | 5 - 22 files changed, 277 insertions(+), 89 deletions(-) Merging modules/modules-next (2c0f0f363956 module: correctly exit module_kallsyms_on_each_symbol when fn() != 0) $ git merge modules/modules-next Already up to date. Merging input/next (f8f84af5da9e Input: joydev - prevent use of not validated data in JSIOCSBTNMAP ioctl) $ git merge input/next Already up to date. Merging block/for-next (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block) $ git merge block/for-next Already up to date. Merging device-mapper/for-next (5c0de3d72f8c dm writecache: make writeback pause configurable) $ git merge device-mapper/for-next Already up to date. Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting) $ git merge pcmcia/pcmcia-next Already up to date. Merging mmc/next (900185fe29d3 mmc: core: Don't allocate IDA for OF aliases) $ git merge mmc/next Already up to date. Merging mfd/for-mfd-next (495fb48dbd9b mfd: wm831x: Use DEFINE_RES_IRQ_NAMED() and DEFINE_RES_IRQ() to simplify code) $ git merge mfd/for-mfd-next Merge made by the 'recursive' strategy. Merging backlight/for-backlight-next (1181f2164135 backlight: lm3630a: Convert to atomic PWM API and check for errors) $ git merge backlight/for-backlight-next Already up to date. Merging battery/for-next (f1c74a6c07e7 power: supply: ab8500: Fix an old bug) $ git merge battery/for-next Already up to date. Merging regulator/for-next (feb9cd725da7 Merge remote-tracking branch 'regulator/for-5.15' into regulator-next) $ git merge regulator/for-next Merge made by the 'recursive' strategy. .../regulator/richtek,rtq6752-regulator.yaml | 78 +++++ drivers/regulator/Kconfig | 9 + drivers/regulator/Makefile | 1 + drivers/regulator/bd718x7-regulator.c | 369 +++++++++++++++------ drivers/regulator/dbx500-prcmu.c | 4 +- drivers/regulator/devres.c | 69 +--- drivers/regulator/hi6421v600-regulator.c | 2 +- drivers/regulator/mt6358-regulator.c | 87 +++-- drivers/regulator/mt6359-regulator.c | 19 +- drivers/regulator/mt6397-regulator.c | 15 +- drivers/regulator/rt5033-regulator.c | 21 +- drivers/regulator/rtq6752-regulator.c | 285 ++++++++++++++++ drivers/regulator/tps65910-regulator.c | 10 +- include/linux/mfd/rt5033-private.h | 4 +- include/linux/regulator/consumer.h | 15 - include/linux/regulator/driver.h | 1 - include/linux/regulator/machine.h | 2 +- 17 files changed, 716 insertions(+), 275 deletions(-) create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rtq6752-regulator.yaml create mode 100644 drivers/regulator/rtq6752-regulator.c Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) $ git merge security/next-testing Already up to date! Merge made by the 'recursive' strategy. Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) $ git merge apparmor/apparmor-next Auto-merging security/apparmor/policy_unpack.c Auto-merging security/apparmor/policy.c Auto-merging security/apparmor/lsm.c Auto-merging security/apparmor/label.c Auto-merging security/apparmor/include/label.h Auto-merging security/apparmor/include/file.h Auto-merging security/apparmor/apparmorfs.c Merge made by the 'recursive' strategy. security/apparmor/apparmorfs.c | 4 +-- security/apparmor/include/file.h | 2 +- security/apparmor/include/label.h | 1 + security/apparmor/include/policy.h | 6 ++-- security/apparmor/label.c | 4 +-- security/apparmor/lsm.c | 22 +++++++------- security/apparmor/path.c | 2 +- security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ security/apparmor/policy_unpack.c | 2 +- 9 files changed, 73 insertions(+), 29 deletions(-) Merging integrity/next-integrity (907a399de7b0 evm: Check xattr size discrepancy between kernel and user) $ git merge integrity/next-integrity Already up to date. Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) $ git merge keys/keys-next Auto-merging scripts/Makefile Auto-merging include/keys/system_keyring.h Auto-merging certs/system_keyring.c CONFLICT (content): Merge conflict in certs/system_keyring.c Auto-merging certs/Makefile Auto-merging certs/Kconfig Resolved 'certs/system_keyring.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 6e5bd7999438] Merge remote-tracking branch 'keys/keys-next' $ git diff -M --stat --summary HEAD^.. Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) $ git merge safesetid/safesetid-next Already up to date. Merging selinux/next (e73f0f0ee754 Linux 5.14-rc1) $ git merge selinux/next Already up to date. Merging smack/next (fe6bde732be8 Smack: fix doc warning) $ git merge smack/next Already up to date. Merging tomoyo/master (4fb9c588398f Bluetooth: call lock_sock() outside of spinlock section) $ git merge tomoyo/master Merge made by the 'recursive' strategy. drivers/block/loop.c | 128 +++++++++++++++++++++++++++++++++++------------ net/bluetooth/hci_sock.c | 30 ++++++++++- 2 files changed, 126 insertions(+), 32 deletions(-) Merging tpmdd/next (0178f9d0f60b tpm: Replace WARN_ONCE() with dev_err_once() in tpm_tis_status()) $ git merge tpmdd/next Already up to date. Merging watchdog/master (cf813c67d961 watchdog: iTCO_wdt: use dev_err() instead of pr_err()) $ git merge watchdog/master Already up to date. Merging iommu/next (2b9d8e3e9a9b Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/smmu', 'x86/vt-d', 'x86/amd', 'virtio' and 'core' into next) $ git merge iommu/next Already up to date. Merging audit/next (e73f0f0ee754 Linux 5.14-rc1) $ git merge audit/next Already up to date. Merging devicetree/for-next (fac4e24dcc56 dt-bindings: mxsfb: Add compatible for i.MX8MN) $ git merge devicetree/for-next Removing Documentation/devicetree/bindings/net/micrel-ks8851.txt Merge made by the 'recursive' strategy. .../devicetree/bindings/display/fsl,lcdif.yaml | 1 + .../devicetree/bindings/net/micrel,ks8851.yaml | 96 ++++++++++++++++++++++ .../devicetree/bindings/net/micrel-ks8851.txt | 18 ---- 3 files changed, 97 insertions(+), 18 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/micrel,ks8851.yaml delete mode 100644 Documentation/devicetree/bindings/net/micrel-ks8851.txt Merging mailbox/mailbox-for-next (4f197188da66 MAINTAINERS: add entry for polarfire soc mailbox) $ git merge mailbox/mailbox-for-next Already up to date. Merging spi/for-next (1b88320bc371 Merge remote-tracking branch 'spi/for-5.15' into spi-next) $ git merge spi/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/spi/spi-mt65xx.txt | 1 + drivers/spi/spi-mt65xx.c | 41 +++++-- drivers/spi/spi-stm32.c | 122 ++++++++------------- include/linux/spi/spi.h | 3 +- 4 files changed, 81 insertions(+), 86 deletions(-) Merging tip/auto-latest (dd9ced4003dd Merge branch 'core/urgent') $ git merge tip/auto-latest Merge made by the 'recursive' strategy. .../testing/sysfs-bus-event_source-devices-uncore | 13 + Documentation/atomic_t.txt | 41 ++ arch/x86/events/intel/uncore.c | 45 +- arch/x86/events/intel/uncore.h | 4 + arch/x86/events/intel/uncore_discovery.c | 42 +- arch/x86/events/intel/uncore_discovery.h | 21 + arch/x86/events/intel/uncore_snbep.c | 543 ++++++++++++++++++++- arch/x86/kernel/jump_label.c | 7 +- include/linux/sched/sysctl.h | 18 - include/linux/wait.h | 2 +- kernel/locking/mutex.c | 124 ++--- kernel/sched/core.c | 6 +- kernel/sched/debug.c | 7 + kernel/sched/fair.c | 6 +- kernel/sched/sched.h | 15 + kernel/smpboot.c | 2 +- 16 files changed, 756 insertions(+), 140 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore Merging clockevents/timers/drivers/next (6f64c8159af9 clocksource/drivers/arm_global_timer: Remove duplicated argument in arm_global_timer) $ git merge clockevents/timers/drivers/next Auto-merging drivers/clocksource/Kconfig Merge made by the 'recursive' strategy. drivers/clocksource/ingenic-sysost.c | 315 ++++++++++++++++++++++++++--------- 1 file changed, 236 insertions(+), 79 deletions(-) Merging edac/edac-for-next (d19faf0e49eb EDAC/amd64: Use DEVICE_ATTR helper macros) $ git merge edac/edac-for-next Merge made by the 'recursive' strategy. drivers/edac/amd64_edac.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) Merging irqchip/irq/irqchip-next (c51e96dace68 Merge branch irq/irqchip-driver-updates into irq/irqchip-next) $ git merge irqchip/irq/irqchip-next Already up to date. Merging ftrace/for-next (ac58f4f28369 tracing: Add trace_event helper macros __string_len() and __assign_str_len()) $ git merge ftrace/for-next Merge made by the 'recursive' strategy. include/trace/trace_events.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) Merging rcu/rcu/next (2a2ed5618a0e rcu: Fix pr_info() formats and values in show_rcu_gp_kthreads()) $ git merge rcu/rcu/next Merge made by the 'recursive' strategy. kernel/rcu/refscale.c | 6 +++--- kernel/rcu/tasks.h | 6 ++---- kernel/rcu/tree_stall.h | 4 ++-- kernel/scftorture.c | 6 +++--- 4 files changed, 10 insertions(+), 12 deletions(-) Merging kvm/next (a01b45e9d34d KVM: x86: rename apic_access_page_done to apic_access_memslot_enabled) $ git merge kvm/next Already up to date. Merging kvm-arm/next (188982cda00e Merge branch kvm-arm64/mmu/mte into kvmarm-master/next) $ git merge kvm-arm/next Already up to date. Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) $ git merge kvm-ppc/kvm-ppc-next Already up to date. Merging kvms390/next (1f703d2cf204 KVM: s390: allow facility 192 (vector-packed-decimal-enhancement facility 2)) $ git merge kvms390/next Already up to date. Merging xen-tip/linux-next (629a5d87e26f xen: sync include/xen/interface/io/ring.h with Xen's newest version) $ git merge xen-tip/linux-next Already up to date. Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) $ git merge percpu/for-next Already up to date! Merge made by the 'recursive' strategy. Merging workqueues/for-next (7f5ba4806d3c cgroup1: fix leaked context root causing sporadic NULL deref in LTP) $ git merge workqueues/for-next Merge made by the 'recursive' strategy. fs/internal.h | 1 - include/linux/fs_context.h | 1 + kernel/cgroup/cgroup-v1.c | 4 +--- 3 files changed, 2 insertions(+), 4 deletions(-) Merging drivers-x86/for-next (0e695c3f7f66 platform/x86: dell-wmi-sysman: Change user experience when Admin/System Password is modified) $ git merge drivers-x86/for-next Already up to date. Merging chrome-platform/for-next (6efb943b8616 Linux 5.13-rc1) $ git merge chrome-platform/for-next Already up to date. Merging hsi/for-next (6efb943b8616 Linux 5.13-rc1) $ git merge hsi/for-next Already up to date. Merging leds/for-next (e642197562cd leds: is31fl32xx: Fix missing error code in is31fl32xx_parse_dt()) $ git merge leds/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 2 +- drivers/leds/Kconfig | 57 -------------------------------- drivers/leds/Makefile | 6 ---- drivers/leds/flash/Kconfig | 53 +++++++++++++++++++++++++++++ drivers/leds/flash/Makefile | 6 ++++ drivers/leds/{ => flash}/leds-aat1290.c | 0 drivers/leds/{ => flash}/leds-as3645a.c | 0 drivers/leds/{ => flash}/leds-ktd2692.c | 0 drivers/leds/{ => flash}/leds-lm3601x.c | 0 drivers/leds/{ => flash}/leds-max77693.c | 0 drivers/leds/{ => flash}/leds-sgm3140.c | 0 drivers/leds/leds-is31fl32xx.c | 1 + 12 files changed, 61 insertions(+), 64 deletions(-) rename drivers/leds/{ => flash}/leds-aat1290.c (100%) rename drivers/leds/{ => flash}/leds-as3645a.c (100%) rename drivers/leds/{ => flash}/leds-ktd2692.c (100%) rename drivers/leds/{ => flash}/leds-lm3601x.c (100%) rename drivers/leds/{ => flash}/leds-max77693.c (100%) rename drivers/leds/{ => flash}/leds-sgm3140.c (100%) Merging ipmi/for-next (5b32dd281ee0 ipmi: kcs_bmc_aspeed: Fix less than zero comparison of a unsigned int) $ git merge ipmi/for-next Already up to date. Merging driver-core/driver-core-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge driver-core/driver-core-next Already up to date. Merging usb/usb-next (97db1b081e12 dt-bindings: usb: dwc3: Update dwc3 TX fifo properties) $ git merge usb/usb-next Merge made by the 'recursive' strategy. .../devicetree/bindings/usb/snps,dwc3.yaml | 15 +- drivers/of/base.c | 1 + drivers/usb/dwc3/core.c | 15 ++ drivers/usb/dwc3/core.h | 16 ++ drivers/usb/dwc3/dwc3-qcom.c | 15 ++ drivers/usb/dwc3/ep0.c | 2 + drivers/usb/dwc3/gadget.c | 232 +++++++++++++++++++++ drivers/usb/gadget/configfs.c | 4 + drivers/usb/gadget/udc/core.c | 19 ++ include/linux/of.h | 5 + include/linux/usb/gadget.h | 4 + 11 files changed, 326 insertions(+), 2 deletions(-) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) $ git merge usb-gadget/next Already up to date. Merging usb-serial/usb-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge usb-serial/usb-next Already up to date. Merging usb-chipidea-next/for-usb-next (956df1bb0ab8 usb: chipidea: host: fix port index underflow and UBSAN complains) $ git merge usb-chipidea-next/for-usb-next Auto-merging drivers/usb/cdns3/cdnsp-gadget.c Merge made by the 'recursive' strategy. drivers/usb/chipidea/host.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) Merging tty/tty-next (de5540965853 Merge tag 'rtc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) $ git merge tty/tty-next Already up to date. Merging char-misc/char-misc-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge char-misc/char-misc-next Already up to date. Merging extcon/extcon-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge extcon/extcon-next Already up to date. Merging phy-next/next (e73f0f0ee754 Linux 5.14-rc1) $ git merge phy-next/next Already up to date. Merging soundwire/next (e73f0f0ee754 Linux 5.14-rc1) $ git merge soundwire/next Already up to date. Merging thunderbolt/next (b18f901382fd thunderbolt: Fix DROM handling for USB4 DROM) $ git merge thunderbolt/next Already up to date. Merging vfio/next (6a45ece4c9af vfio/pci: Handle concurrent vma faults) $ git merge vfio/next Already up to date. Merging staging/staging-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge staging/staging-next Already up to date. Merging iio/togreg (e73f0f0ee754 Linux 5.14-rc1) $ git merge iio/togreg Already up to date. Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) $ git merge mux/for-next Already up to date. Merging icc/icc-next (46bdcac533cc interconnect: qcom: Add SC7280 interconnect provider driver) $ git merge icc/icc-next Already up to date. Merging dmaengine/next (e73f0f0ee754 Linux 5.14-rc1) $ git merge dmaengine/next Already up to date. Merging cgroup/for-next (cfeaa699186e Merge branch 'for-5.13-fixes' into for-next) $ git merge cgroup/for-next Already up to date! Merge made by the 'recursive' strategy. Merging scsi/for-next (4e65a83cd0b9 Merge branch 'misc' into for-next) $ git merge scsi/for-next Already up to date! Merge made by the 'recursive' strategy. Merging scsi-mkp/for-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge scsi-mkp/for-next Already up to date. Merging vhost/linux-next (db7b337709a1 virtio-mem: prioritize unplug from ZONE_MOVABLE in Big Block Mode) $ git merge vhost/linux-next Already up to date. Merging rpmsg/for-next (7486f29e5e60 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) $ git merge rpmsg/for-next Already up to date! Merge made by the 'recursive' strategy. Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) $ git merge gpio/for-next Already up to date. Merging gpio-brgl/gpio/for-next (c34c1228fc1c docs: driver-api: gpio: using-gpio.rst: avoid using ReST :doc:`foo` markup) $ git merge gpio-brgl/gpio/for-next Already up to date. Merging gpio-intel/for-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge gpio-intel/for-next Already up to date. Merging pinctrl/for-next (bfa50166cd9d pinctrl: ralink: rt305x: add missing include) $ git merge pinctrl/for-next Already up to date. Merging pinctrl-intel/for-next (e73f0f0ee754 Linux 5.14-rc1) $ git merge pinctrl-intel/for-next Already up to date. Merging pinctrl-renesas/renesas-pinctrl (e9d66bdbc5ab pinctrl: renesas: r8a77995: Add bias pinconf support) $ git merge pinctrl-renesas/renesas-pinctrl Merge made by the 'recursive' strategy. drivers/pinctrl/renesas/pfc-r8a77995.c | 320 ++++++++++++++++++++++++++++++++- drivers/pinctrl/renesas/pinctrl.c | 16 +- drivers/pinctrl/renesas/sh_pfc.h | 3 + 3 files changed, 323 insertions(+), 16 deletions(-) Merging pinctrl-samsung/for-next (6efb943b8616 Linux 5.13-rc1) $ git merge pinctrl-samsung/for-next Already up to date. Merging pwm/for-next (f4a8e31ed84e pwm: ep93xx: Ensure configuring period and duty_cycle isn't wrongly skipped) $ git merge pwm/for-next Merge made by the 'recursive' strategy. drivers/pwm/pwm-berlin.c | 9 ++--- drivers/pwm/pwm-ep93xx.c | 85 +++++++++++++++++++++++------------------------- drivers/pwm/pwm-spear.c | 9 ++--- drivers/pwm/pwm-sprd.c | 11 +++---- drivers/pwm/pwm-tiecap.c | 15 ++++----- 5 files changed, 56 insertions(+), 73 deletions(-) Merging userns/for-next (5e6b8a50a7ce cred: add missing return error code when set_cred_ucounts() failed) $ git merge userns/for-next Already up to date. Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) $ git merge ktest/for-next Already up to date. Merging kselftest/next (e73f0f0ee754 Linux 5.14-rc1) $ git merge kselftest/next Already up to date. Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' into for-next) $ git merge livepatching/for-next Already up to date! Merge made by the 'recursive' strategy. Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) $ git merge coresight/next Merge made by the 'recursive' strategy. Merging rtc/rtc-next (4aa90c036df6 rtc: pcf8523: rename register and bit defines) $ git merge rtc/rtc-next Already up to date. Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) $ git merge nvdimm/libnvdimm-for-next Already up to date! Merge made by the 'recursive' strategy. Merging at24/at24/for-next (6efb943b8616 Linux 5.13-rc1) $ git merge at24/at24/for-next Already up to date. Merging ntb/ntb-next (28293b6c68cd ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) $ git merge ntb/ntb-next Merge made by the 'recursive' strategy. drivers/ntb/test/ntb_msi_test.c | 4 +++- drivers/ntb/test/ntb_perf.c | 1 + drivers/ntb/test/ntb_pingpong.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) Merging seccomp/for-next/seccomp (19d67694745c Documentation: seccomp: Fix typo in user notification) $ git merge seccomp/for-next/seccomp Merge made by the 'recursive' strategy. Documentation/userspace-api/seccomp_filter.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging kspp/for-next/kspp (6a0544606ec7 pgo: rectify comment to proper kernel-doc syntax) $ git merge kspp/for-next/kspp Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging arch/x86/kernel/Makefile Auto-merging arch/x86/boot/Makefile Auto-merging arch/x86/Kconfig Auto-merging Makefile Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/dev-tools/index.rst | 1 + Documentation/dev-tools/pgo.rst | 127 +++++++++++ MAINTAINERS | 13 ++ Makefile | 3 + arch/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/boot/Makefile | 1 + arch/x86/boot/compressed/Makefile | 1 + arch/x86/crypto/Makefile | 3 + arch/x86/entry/vdso/Makefile | 1 + arch/x86/kernel/Makefile | 3 + arch/x86/kernel/vmlinux.lds.S | 2 + arch/x86/platform/efi/Makefile | 1 + arch/x86/purgatory/Makefile | 1 + arch/x86/realmode/rm/Makefile | 1 + arch/x86/um/vdso/Makefile | 1 + drivers/firmware/efi/libstub/Makefile | 1 + include/asm-generic/vmlinux.lds.h | 32 +++ kernel/Makefile | 1 + kernel/pgo/Kconfig | 37 +++ kernel/pgo/Makefile | 5 + kernel/pgo/fs.c | 413 ++++++++++++++++++++++++++++++++++ kernel/pgo/instrument.c | 188 ++++++++++++++++ kernel/pgo/pgo.h | 211 +++++++++++++++++ scripts/Makefile.lib | 10 + 25 files changed, 1059 insertions(+) create mode 100644 Documentation/dev-tools/pgo.rst create mode 100644 kernel/pgo/Kconfig create mode 100644 kernel/pgo/Makefile create mode 100644 kernel/pgo/fs.c create mode 100644 kernel/pgo/instrument.c create mode 100644 kernel/pgo/pgo.h Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) $ git merge cisco/for-next Already up to date. Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons) $ git merge gnss/gnss-next Merge made by the 'recursive' strategy. drivers/gnss/mtk.c | 2 +- drivers/gnss/serial.c | 2 +- drivers/gnss/sirf.c | 2 +- drivers/gnss/ubx.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout) $ git merge fsi/next Already up to date. Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h) $ git merge slimbus/for-next Auto-merging drivers/of/platform.c Auto-merging drivers/nvmem/Makefile CONFLICT (content): Merge conflict in drivers/nvmem/Makefile Auto-merging drivers/nvmem/Kconfig CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig Resolved 'drivers/nvmem/Kconfig' using previous resolution. Resolved 'drivers/nvmem/Makefile' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 1937dea010f5] Merge remote-tracking branch 'slimbus/for-next' $ git diff -M --stat --summary HEAD^.. drivers/slimbus/slimbus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging nvmem/for-next (76a2b9a8ab44 nvmem: qfprom: Improve the comment about regulator setting) $ git merge nvmem/for-next Auto-merging drivers/nvmem/sprd-efuse.c Auto-merging drivers/nvmem/core.c Merge made by the 'recursive' strategy. drivers/nvmem/qcom-spmi-sdam.c | 1 + drivers/nvmem/sc27xx-efuse.c | 1 + drivers/nvmem/sprd-efuse.c | 1 + 3 files changed, 3 insertions(+) Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) $ git merge xarray/main Already up to date. Merging hyperv/hyperv-next (c445535c3efb x86/hyperv: fix for unwanted manipulation of sched_clock when TSC marked unstable) $ git merge hyperv/hyperv-next Merge made by the 'recursive' strategy. arch/x86/kernel/cpu/mshyperv.c | 9 +++++++-- include/asm-generic/mshyperv.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) Merging auxdisplay/auxdisplay (c784e46c8445 auxdisplay: Add I2C gpio expander example) $ git merge auxdisplay/auxdisplay Merge made by the 'recursive' strategy. .../bindings/auxdisplay/hit,hd44780.yaml | 31 +++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) Merging kgdb/kgdb/for-next (c8daba4640ac kgdb: Fix fall-through warning for Clang) $ git merge kgdb/kgdb/for-next Already up to date. Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) $ git merge hmm/hmm Already up to date. Merging fpga/for-next (d97176f6040f fpga: dfl: pci: add device IDs for Silicom N501x PAC cards) $ git merge fpga/for-next Auto-merging include/linux/fpga/fpga-mgr.h Auto-merging drivers/fpga/fpga-bridge.c Auto-merging Documentation/fpga/dfl.rst Merge made by the 'recursive' strategy. Documentation/driver-api/fpga/fpga-bridge.rst | 10 +++++----- Documentation/driver-api/fpga/fpga-mgr.rst | 12 ++++++------ Documentation/driver-api/fpga/fpga-programming.rst | 8 ++++---- Documentation/driver-api/fpga/fpga-region.rst | 20 ++++++++++---------- Documentation/fpga/dfl.rst | 4 ++-- drivers/fpga/altera-cvp.c | 2 +- drivers/fpga/dfl-fme-pr.c | 2 +- drivers/fpga/dfl-n3000-nios.c | 2 +- drivers/fpga/dfl-pci.c | 5 +++++ drivers/fpga/dfl.h | 2 +- drivers/fpga/fpga-bridge.c | 8 ++++---- drivers/fpga/zynq-fpga.c | 6 +++--- include/linux/fpga/fpga-mgr.h | 2 +- 13 files changed, 44 insertions(+), 39 deletions(-) Merging kunit/test (e73f0f0ee754 Linux 5.14-rc1) $ git merge kunit/test Already up to date. Merging cfi/cfi/next (6efb943b8616 Linux 5.13-rc1) $ git merge cfi/cfi/next Already up to date. Merging kunit-next/kunit (e73f0f0ee754 Linux 5.14-rc1) $ git merge kunit-next/kunit Already up to date. Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) $ git merge trivial/for-next Already up to date. Merging mhi/mhi-next (3bd1d916c79b bus: mhi: core: Add range checks for BHI and BHIe) $ git merge mhi/mhi-next Auto-merging drivers/net/wireless/ath/ath11k/mhi.c Auto-merging drivers/net/mhi/net.c Auto-merging drivers/bus/mhi/pci_generic.c Auto-merging drivers/bus/mhi/core/pm.c Merge made by the 'recursive' strategy. drivers/bus/mhi/core/init.c | 61 ++++++++++++++++++++++---------- drivers/bus/mhi/core/internal.h | 2 +- drivers/bus/mhi/core/main.c | 26 +++++++++----- drivers/bus/mhi/core/pm.c | 28 +++------------ drivers/bus/mhi/pci_generic.c | 65 ++++++++++++++++++++++++++++++----- drivers/net/mhi/net.c | 2 +- drivers/net/wireless/ath/ath11k/mhi.c | 1 + drivers/net/wwan/mhi_wwan_ctrl.c | 2 +- include/linux/mhi.h | 9 ++++- net/qrtr/mhi.c | 2 +- 10 files changed, 134 insertions(+), 64 deletions(-) Merging memblock/for-next (a4d5613c4dc6 arm: extend pfn_valid to take into account freed memory map alignment) $ git merge memblock/for-next Already up to date. Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) $ git merge init/init-user-pointers Already up to date. Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) $ git merge counters/counters Already up to date. Merging rust/rust-next (5d3986cf8ed6 MAINTAINERS: Rust) $ git merge rust/rust-next Auto-merging scripts/Makefile.lib Auto-merging scripts/Makefile.build Auto-merging samples/Kconfig Auto-merging lib/vsprintf.c Auto-merging lib/Kconfig.debug Auto-merging kernel/printk/printk.c Auto-merging kernel/kallsyms.c Auto-merging init/Kconfig Auto-merging include/linux/kallsyms.h CONFLICT (content): Merge conflict in include/linux/kallsyms.h Auto-merging arch/riscv/Makefile Auto-merging Makefile Auto-merging MAINTAINERS Resolved 'include/linux/kallsyms.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit --no-edit -v -a [master 9aa6fec91ed6] Merge remote-tracking branch 'rust/rust-next' $ git diff -M --stat --summary HEAD^.. .gitignore | 5 + .rustfmt.toml | 12 + Documentation/doc-guide/kernel-doc.rst | 3 + Documentation/index.rst | 1 + Documentation/kbuild/kbuild.rst | 4 + Documentation/process/changes.rst | 13 + Documentation/rust/arch-support.rst | 35 + Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes Documentation/rust/coding.rst | 92 + Documentation/rust/docs.rst | 110 + Documentation/rust/index.rst | 20 + Documentation/rust/quick-start.rst | 222 ++ MAINTAINERS | 14 + Makefile | 176 +- arch/arm/rust/target.json | 28 + arch/arm64/rust/target.json | 35 + arch/powerpc/rust/target.json | 30 + arch/riscv/Makefile | 1 + arch/riscv/rust/rv32ima.json | 37 + arch/riscv/rust/rv32imac.json | 37 + arch/riscv/rust/rv64ima.json | 37 + arch/riscv/rust/rv64imac.json | 37 + arch/x86/rust/target.json | 37 + include/linux/kallsyms.h | 2 +- include/linux/spinlock.h | 17 +- init/Kconfig | 28 + kernel/kallsyms.c | 7 + kernel/livepatch/core.c | 4 +- kernel/printk/printk.c | 5 +- lib/Kconfig.debug | 144 ++ lib/vsprintf.c | 12 + rust/.gitignore | 6 + rust/Makefile | 316 +++ rust/alloc/README.md | 32 + rust/alloc/alloc.rs | 425 ++++ rust/alloc/borrow.rs | 493 ++++ rust/alloc/boxed.rs | 1728 ++++++++++++++ rust/alloc/collections/mod.rs | 116 + rust/alloc/fmt.rs | 587 +++++ rust/alloc/lib.rs | 197 ++ rust/alloc/macros.rs | 128 ++ rust/alloc/prelude/mod.rs | 17 + rust/alloc/prelude/v1.rs | 16 + rust/alloc/raw_vec.rs | 612 +++++ rust/alloc/rc.rs | 2539 +++++++++++++++++++++ rust/alloc/slice.rs | 1271 +++++++++++ rust/alloc/str.rs | 614 +++++ rust/alloc/string.rs | 2847 +++++++++++++++++++++++ rust/alloc/sync.rs | 2631 ++++++++++++++++++++++ rust/alloc/vec/drain.rs | 157 ++ rust/alloc/vec/drain_filter.rs | 145 ++ rust/alloc/vec/into_iter.rs | 296 +++ rust/alloc/vec/is_zero.rs | 106 + rust/alloc/vec/mod.rs | 3255 +++++++++++++++++++++++++++ rust/alloc/vec/partial_eq.rs | 49 + rust/alloc/vec/set_len_on_drop.rs | 30 + rust/alloc/vec/spec_extend.rs | 170 ++ rust/bindgen_parameters | 13 + rust/build_error.rs | 33 + rust/compiler_builtins.rs | 146 ++ rust/exports.c | 16 + rust/helpers.c | 235 ++ rust/kernel/allocator.rs | 63 + rust/kernel/bindings.rs | 28 + rust/kernel/bindings_helper.h | 24 + rust/kernel/buffer.rs | 39 + rust/kernel/build_assert.rs | 80 + rust/kernel/c_types.rs | 119 + rust/kernel/chrdev.rs | 212 ++ rust/kernel/error.rs | 272 +++ rust/kernel/file.rs | 130 ++ rust/kernel/file_operations.rs | 698 ++++++ rust/kernel/io_buffer.rs | 153 ++ rust/kernel/iov_iter.rs | 95 + rust/kernel/lib.rs | 220 ++ rust/kernel/linked_list.rs | 245 ++ rust/kernel/miscdev.rs | 113 + rust/kernel/module_param.rs | 497 ++++ rust/kernel/of.rs | 101 + rust/kernel/pages.rs | 176 ++ rust/kernel/platdev.rs | 166 ++ rust/kernel/prelude.rs | 28 + rust/kernel/print.rs | 412 ++++ rust/kernel/random.rs | 50 + rust/kernel/raw_list.rs | 361 +++ rust/kernel/rbtree.rs | 570 +++++ rust/kernel/security.rs | 79 + rust/kernel/static_assert.rs | 39 + rust/kernel/str.rs | 259 +++ rust/kernel/sync/arc.rs | 227 ++ rust/kernel/sync/condvar.rs | 136 ++ rust/kernel/sync/guard.rs | 82 + rust/kernel/sync/locked_by.rs | 112 + rust/kernel/sync/mod.rs | 84 + rust/kernel/sync/mutex.rs | 101 + rust/kernel/sync/spinlock.rs | 109 + rust/kernel/sysctl.rs | 198 ++ rust/kernel/task.rs | 193 ++ rust/kernel/traits.rs | 26 + rust/kernel/types.rs | 249 ++ rust/kernel/user_ptr.rs | 191 ++ rust/macros/lib.rs | 127 ++ rust/macros/module.rs | 754 +++++++ samples/Kconfig | 2 + samples/Makefile | 1 + samples/rust/Kconfig | 113 + samples/rust/Makefile | 12 + samples/rust/rust_chrdev.rs | 51 + samples/rust/rust_minimal.rs | 38 + samples/rust/rust_miscdev.rs | 150 ++ samples/rust/rust_module_parameters.rs | 72 + samples/rust/rust_print.rs | 57 + samples/rust/rust_random.rs | 61 + samples/rust/rust_semaphore.rs | 177 ++ samples/rust/rust_semaphore_c.c | 212 ++ samples/rust/rust_stack_probing.rs | 40 + samples/rust/rust_sync.rs | 81 + scripts/Makefile.build | 22 + scripts/Makefile.lib | 12 + scripts/generate_rust_analyzer.py | 143 ++ scripts/kallsyms.c | 33 +- scripts/kconfig/confdata.c | 67 +- scripts/rust-version.sh | 31 + tools/include/linux/kallsyms.h | 2 +- tools/include/linux/lockdep.h | 2 +- tools/lib/perf/include/perf/event.h | 2 +- tools/lib/symbol/kallsyms.h | 2 +- 129 files changed, 29600 insertions(+), 32 deletions(-) create mode 100644 .rustfmt.toml create mode 100644 Documentation/rust/arch-support.rst create mode 100644 Documentation/rust/assets/favicon-16x16.png create mode 100644 Documentation/rust/assets/favicon-32x32.png create mode 100644 Documentation/rust/assets/rust-logo.png create mode 100644 Documentation/rust/coding.rst create mode 100644 Documentation/rust/docs.rst create mode 100644 Documentation/rust/index.rst create mode 100644 Documentation/rust/quick-start.rst create mode 100644 arch/arm/rust/target.json create mode 100644 arch/arm64/rust/target.json create mode 100644 arch/powerpc/rust/target.json create mode 100644 arch/riscv/rust/rv32ima.json create mode 100644 arch/riscv/rust/rv32imac.json create mode 100644 arch/riscv/rust/rv64ima.json create mode 100644 arch/riscv/rust/rv64imac.json create mode 100644 arch/x86/rust/target.json create mode 100644 rust/.gitignore create mode 100644 rust/Makefile create mode 100644 rust/alloc/README.md create mode 100644 rust/alloc/alloc.rs create mode 100644 rust/alloc/borrow.rs create mode 100644 rust/alloc/boxed.rs create mode 100644 rust/alloc/collections/mod.rs create mode 100644 rust/alloc/fmt.rs create mode 100644 rust/alloc/lib.rs create mode 100644 rust/alloc/macros.rs create mode 100644 rust/alloc/prelude/mod.rs create mode 100644 rust/alloc/prelude/v1.rs create mode 100644 rust/alloc/raw_vec.rs create mode 100644 rust/alloc/rc.rs create mode 100644 rust/alloc/slice.rs create mode 100644 rust/alloc/str.rs create mode 100644 rust/alloc/string.rs create mode 100644 rust/alloc/sync.rs create mode 100644 rust/alloc/vec/drain.rs create mode 100644 rust/alloc/vec/drain_filter.rs create mode 100644 rust/alloc/vec/into_iter.rs create mode 100644 rust/alloc/vec/is_zero.rs create mode 100644 rust/alloc/vec/mod.rs create mode 100644 rust/alloc/vec/partial_eq.rs create mode 100644 rust/alloc/vec/set_len_on_drop.rs create mode 100644 rust/alloc/vec/spec_extend.rs create mode 100644 rust/bindgen_parameters create mode 100644 rust/build_error.rs create mode 100644 rust/compiler_builtins.rs create mode 100644 rust/exports.c create mode 100644 rust/helpers.c create mode 100644 rust/kernel/allocator.rs create mode 100644 rust/kernel/bindings.rs create mode 100644 rust/kernel/bindings_helper.h create mode 100644 rust/kernel/buffer.rs create mode 100644 rust/kernel/build_assert.rs create mode 100644 rust/kernel/c_types.rs create mode 100644 rust/kernel/chrdev.rs create mode 100644 rust/kernel/error.rs create mode 100644 rust/kernel/file.rs create mode 100644 rust/kernel/file_operations.rs create mode 100644 rust/kernel/io_buffer.rs create mode 100644 rust/kernel/iov_iter.rs create mode 100644 rust/kernel/lib.rs create mode 100644 rust/kernel/linked_list.rs create mode 100644 rust/kernel/miscdev.rs create mode 100644 rust/kernel/module_param.rs create mode 100644 rust/kernel/of.rs create mode 100644 rust/kernel/pages.rs create mode 100644 rust/kernel/platdev.rs create mode 100644 rust/kernel/prelude.rs create mode 100644 rust/kernel/print.rs create mode 100644 rust/kernel/random.rs create mode 100644 rust/kernel/raw_list.rs create mode 100644 rust/kernel/rbtree.rs create mode 100644 rust/kernel/security.rs create mode 100644 rust/kernel/static_assert.rs create mode 100644 rust/kernel/str.rs create mode 100644 rust/kernel/sync/arc.rs create mode 100644 rust/kernel/sync/condvar.rs create mode 100644 rust/kernel/sync/guard.rs create mode 100644 rust/kernel/sync/locked_by.rs create mode 100644 rust/kernel/sync/mod.rs create mode 100644 rust/kernel/sync/mutex.rs create mode 100644 rust/kernel/sync/spinlock.rs create mode 100644 rust/kernel/sysctl.rs create mode 100644 rust/kernel/task.rs create mode 100644 rust/kernel/traits.rs create mode 100644 rust/kernel/types.rs create mode 100644 rust/kernel/user_ptr.rs create mode 100644 rust/macros/lib.rs create mode 100644 rust/macros/module.rs create mode 100644 samples/rust/Kconfig create mode 100644 samples/rust/Makefile create mode 100644 samples/rust/rust_chrdev.rs create mode 100644 samples/rust/rust_minimal.rs create mode 100644 samples/rust/rust_miscdev.rs create mode 100644 samples/rust/rust_module_parameters.rs create mode 100644 samples/rust/rust_print.rs create mode 100644 samples/rust/rust_random.rs create mode 100644 samples/rust/rust_semaphore.rs create mode 100644 samples/rust/rust_semaphore_c.c create mode 100644 samples/rust/rust_stack_probing.rs create mode 100644 samples/rust/rust_sync.rs create mode 100755 scripts/generate_rust_analyzer.py create mode 100755 scripts/rust-version.sh Merging cxl/next (4ad6181e4b21 cxl/pci: Rename CXL REGLOC ID) $ git merge cxl/next Already up to date. Merging akpm-current/current (4bae9e362a11 linux-next-pre) $ git merge --no-ff akpm-current/current Auto-merging mm/filemap.c Auto-merging mm/Kconfig Auto-merging lib/Kconfig.debug Auto-merging kernel/sysctl.c Auto-merging kernel/sched/sched.h Auto-merging kernel/sched/core.c Auto-merging kernel/kthread.c Auto-merging kernel/hung_task.c Auto-merging kernel/fork.c Auto-merging kernel/exit.c Auto-merging kernel/cpu.c Auto-merging init/main.c Auto-merging include/linux/sched.h Auto-merging include/linux/mm_types.h Auto-merging include/linux/highmem.h Auto-merging include/linux/fs.h Auto-merging fs/internal.h Auto-merging fs/exec.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c Auto-merging arch/powerpc/mm/book3s64/radix_tlb.c Auto-merging arch/powerpc/kernel/smp.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/smp.c Auto-merging arch/powerpc/Kconfig Auto-merging arch/arm64/Kconfig Auto-merging arch/Kconfig Resolved 'arch/powerpc/kernel/smp.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 61e05437d915] Merge branch 'akpm-current/current' $ git diff -M --stat --summary HEAD^.. Documentation/admin-guide/mm/memory-hotplug.rst | 738 ++++++++++++++---------- arch/Kconfig | 28 + arch/arm/mach-rpc/ecard.c | 2 +- arch/arm64/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/smp.c | 2 +- arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- fs/buffer.c | 56 +- fs/drop_caches.c | 3 +- fs/exec.c | 4 +- fs/hfsplus/catalog.c | 16 +- fs/hfsplus/dir.c | 4 +- fs/hfsplus/hfsplus_raw.h | 12 +- fs/hfsplus/xattr.c | 18 +- fs/inode.c | 48 +- fs/internal.h | 1 - fs/ocfs2/namei.c | 17 +- fs/proc/kcore.c | 67 +++ fs/proc/page.c | 40 +- include/linux/compiler-clang.h | 11 + include/linux/fs.h | 1 + include/linux/highmem.h | 28 +- include/linux/memremap.h | 6 + include/linux/mm_types.h | 2 + include/linux/mm_types_task.h | 5 + include/linux/pagemap.h | 50 ++ include/linux/sched.h | 8 + include/linux/sched/mm.h | 21 + init/main.c | 25 +- kernel/cpu.c | 2 +- kernel/exit.c | 2 +- kernel/fork.c | 51 ++ kernel/hung_task.c | 44 ++ kernel/kthread.c | 21 +- kernel/sched/core.c | 35 +- kernel/sched/sched.h | 4 +- kernel/sysctl.c | 8 +- lib/Kconfig.debug | 6 + mm/Kconfig | 2 +- mm/filemap.c | 23 +- mm/kasan/kasan.h | 6 + mm/memory.c | 2 +- mm/memremap.c | 20 + mm/mprotect.c | 52 +- mm/truncate.c | 47 +- mm/vmscan.c | 16 +- mm/workingset.c | 10 + mm/zsmalloc.c | 5 +- 49 files changed, 1112 insertions(+), 467 deletions(-) $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git checkout -b akpm remotes/origin/akpm/master Switched to a new branch 'akpm' $ git rebase --onto master remotes/origin/akpm/master-base Successfully rebased and updated refs/heads/akpm. $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + 8cba1784e022...61e05437d915 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (61e05437d915 Merge branch 'akpm-current/current') $ git merge --no-ff akpm/master Already up to date.