path: root/Next/merge.log

$ date -R
Fri, 08 Apr 2022 08:22:38 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 3e732ebf7316 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Merging origin/master (42e7a03d3bad Merge tag 'hyperv-fixes-signed-20220407' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
Updating 3e732ebf7316..42e7a03d3bad
Fast-forward (no commit created; -m option ignored)
 drivers/ata/Kconfig                 |  6 ++-
 drivers/ata/ahci.c                  |  2 +-
 drivers/ata/ahci.h                  |  2 +-
 drivers/ata/libata-core.c           |  3 ++
 drivers/ata/libata-sff.c            |  2 +-
 drivers/ata/sata_dwc_460ex.c        |  6 ++-
 drivers/char/random.c               | 74 +++++++++++++++++++------------------
 drivers/hv/channel_mgmt.c           |  6 +--
 drivers/hv/hv_balloon.c             | 49 +++++++++++++++++++++---
 drivers/hv/hv_common.c              | 11 ++++++
 drivers/hv/ring_buffer.c            | 11 +++++-
 drivers/hv/vmbus_drv.c              | 65 ++++++++++++++++++++++++++------
 drivers/pci/controller/pci-hyperv.c |  9 +++++
 include/asm-generic/mshyperv.h      |  1 +
 14 files changed, 186 insertions(+), 61 deletions(-)
Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes
Already up to date.
Merging kbuild-current/fixes (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes
Already up to date.
Merging arc-current/for-curr (e783362eb54c Linux 5.17-rc1)
$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
Already up to date.
Merging arm-current/fixes (9be4c88bb792 ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame())
$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes
Already up to date.
Merging arm64-fixes/for-next/fixes (697a1d44af8b tlb: hugetlb: Add more sizes to tlb_remove_huge_tlb_entry)
$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes
Merge made by the 'ort' strategy.
 arch/arm64/include/asm/el2_setup.h |  2 +-
 arch/arm64/kernel/alternative.c    |  6 ++---
 arch/arm64/kernel/elfcore.c        | 47 +++++++++++++++++++++-----------------
 arch/arm64/kernel/hw_breakpoint.c  |  2 +-
 arch/arm64/kernel/module-plts.c    |  2 +-
 arch/arm64/kernel/smp.c            |  2 +-
 arch/arm64/kernel/suspend.c        |  2 +-
 arch/arm64/mm/init.c               |  4 ++--
 drivers/perf/Kconfig               |  2 +-
 drivers/perf/qcom_l2_pmu.c         |  6 ++---
 include/asm-generic/tlb.h          | 10 +++++---
 11 files changed, 47 insertions(+), 38 deletions(-)
Merging arm-soc-fixes/arm/fixes (475acef9ed48 Merge tag 'reset-fixes-for-v5.18' of git://git.pengutronix.de/pza/linux into arm/fixes)
$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes
Merge made by the 'ort' strategy.
 .../bindings/clock/samsung,exynos-audss-clock.yaml |   2 +-
 .../bindings/clock/samsung,exynos-clock.yaml       |   2 +-
 .../bindings/clock/samsung,exynos-ext-clock.yaml   |   2 +-
 .../clock/samsung,exynos4412-isp-clock.yaml        |   2 +-
 .../bindings/clock/samsung,exynos5260-clock.yaml   |   2 +-
 .../bindings/clock/samsung,exynos5410-clock.yaml   |   2 +-
 .../bindings/clock/samsung,exynos5433-clock.yaml   |   2 +-
 .../bindings/clock/samsung,exynos7-clock.yaml      |   2 +-
 .../bindings/clock/samsung,exynos7885-clock.yaml   |   2 +-
 .../bindings/clock/samsung,exynos850-clock.yaml    |   2 +-
 .../devicetree/bindings/clock/samsung,s2mps11.yaml |   2 +-
 .../clock/samsung,s5pv210-audss-clock.yaml         |   2 +-
 .../bindings/clock/samsung,s5pv210-clock.yaml      |   2 +-
 .../devfreq/event/samsung,exynos-nocp.yaml         |   2 +-
 .../devfreq/event/samsung,exynos-ppmu.yaml         |   2 +-
 .../display/samsung/samsung,exynos-hdmi-ddc.yaml   |   2 +-
 .../display/samsung/samsung,exynos-hdmi.yaml       |   2 +-
 .../display/samsung/samsung,exynos-mixer.yaml      |   2 +-
 .../display/samsung/samsung,exynos5433-decon.yaml  |   2 +-
 .../display/samsung/samsung,exynos5433-mic.yaml    |   2 +-
 .../display/samsung/samsung,exynos7-decon.yaml     |   2 +-
 .../bindings/display/samsung/samsung,fimd.yaml     |   2 +-
 .../devicetree/bindings/extcon/maxim,max77843.yaml |   2 +-
 .../devicetree/bindings/hwmon/lltc,ltc4151.yaml    |   2 +-
 .../bindings/hwmon/microchip,mcp3021.yaml          |   2 +-
 .../devicetree/bindings/hwmon/sensirion,sht15.yaml |   2 +-
 .../devicetree/bindings/hwmon/ti,tmp102.yaml       |   2 +-
 .../devicetree/bindings/hwmon/ti,tmp108.yaml       |   2 +-
 .../devicetree/bindings/i2c/i2c-exynos5.yaml       |   2 +-
 .../bindings/i2c/samsung,s3c2410-i2c.yaml          |   2 +-
 .../samsung,exynos4210-combiner.yaml               |   2 +-
 .../devicetree/bindings/leds/maxim,max77693.yaml   |   2 +-
 .../bindings/memory-controllers/brcm,dpfe-cpu.yaml |   2 +-
 .../ddr/jedec,lpddr2-timings.yaml                  |   2 +-
 .../memory-controllers/ddr/jedec,lpddr2.yaml       |   2 +-
 .../ddr/jedec,lpddr3-timings.yaml                  |   2 +-
 .../memory-controllers/ddr/jedec,lpddr3.yaml       |   2 +-
 .../marvell,mvebu-sdram-controller.yaml            |   2 +-
 .../qca,ath79-ddr-controller.yaml                  |   2 +-
 .../memory-controllers/renesas,h8300-bsc.yaml      |   2 +-
 .../memory-controllers/samsung,exynos5422-dmc.yaml |   2 +-
 .../memory-controllers/synopsys,ddrc-ecc.yaml      |   8 +-
 .../memory-controllers/ti,da8xx-ddrctl.yaml        |   2 +-
 .../devicetree/bindings/mfd/maxim,max14577.yaml    |   2 +-
 .../devicetree/bindings/mfd/maxim,max77686.yaml    |   2 +-
 .../devicetree/bindings/mfd/maxim,max77693.yaml    |   2 +-
 .../devicetree/bindings/mfd/maxim,max77802.yaml    |   2 +-
 .../devicetree/bindings/mfd/maxim,max77843.yaml    |   2 +-
 .../bindings/mfd/samsung,exynos5433-lpass.yaml     |   2 +-
 .../devicetree/bindings/mfd/samsung,s2mpa01.yaml   |   2 +-
 .../devicetree/bindings/mfd/samsung,s2mps11.yaml   |   2 +-
 .../devicetree/bindings/mfd/samsung,s5m8767.yaml   |   2 +-
 .../devicetree/bindings/net/nfc/marvell,nci.yaml   |   2 +-
 .../devicetree/bindings/net/nfc/nxp,nci.yaml       |   2 +-
 .../devicetree/bindings/net/nfc/nxp,pn532.yaml     |   2 +-
 .../devicetree/bindings/net/nfc/nxp,pn544.yaml     |   2 +-
 .../devicetree/bindings/net/nfc/st,st-nci.yaml     |   2 +-
 .../devicetree/bindings/net/nfc/st,st21nfca.yaml   |   2 +-
 .../devicetree/bindings/net/nfc/st,st95hf.yaml     |   2 +-
 .../devicetree/bindings/net/nfc/ti,trf7970a.yaml   |   2 +-
 .../bindings/phy/samsung,dp-video-phy.yaml         |   2 +-
 .../bindings/phy/samsung,exynos-hdmi-phy.yaml      |   2 +-
 .../bindings/phy/samsung,exynos5250-sata-phy.yaml  |   2 +-
 .../bindings/phy/samsung,mipi-video-phy.yaml       |   2 +-
 .../devicetree/bindings/phy/samsung,usb2-phy.yaml  |   2 +-
 .../bindings/phy/samsung,usb3-drd-phy.yaml         |   2 +-
 .../pinctrl/samsung,pinctrl-gpio-bank.yaml         |   2 +-
 .../bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml |   2 +-
 .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml  |   2 +-
 .../bindings/pinctrl/samsung,pinctrl.yaml          |   2 +-
 .../bindings/power/supply/maxim,max14577.yaml      |   2 +-
 .../bindings/power/supply/maxim,max77693.yaml      |   2 +-
 .../bindings/regulator/maxim,max14577.yaml         |   2 +-
 .../bindings/regulator/maxim,max77686.yaml         |   2 +-
 .../bindings/regulator/maxim,max77693.yaml         |   2 +-
 .../bindings/regulator/maxim,max77802.yaml         |   2 +-
 .../bindings/regulator/maxim,max77843.yaml         |   2 +-
 .../bindings/regulator/maxim,max8952.yaml          |   2 +-
 .../bindings/regulator/maxim,max8973.yaml          |   2 +-
 .../bindings/regulator/maxim,max8997.yaml          |   2 +-
 .../bindings/regulator/samsung,s2mpa01.yaml        |   2 +-
 .../bindings/regulator/samsung,s2mps11.yaml        |   2 +-
 .../bindings/regulator/samsung,s2mps13.yaml        |   2 +-
 .../bindings/regulator/samsung,s2mps14.yaml        |   2 +-
 .../bindings/regulator/samsung,s2mps15.yaml        |   2 +-
 .../bindings/regulator/samsung,s2mpu02.yaml        |   2 +-
 .../bindings/regulator/samsung,s5m8767.yaml        |   2 +-
 .../bindings/reset/hisilicon,hi3660-reset.yaml     |   5 +
 .../bindings/reset/socionext,uniphier-reset.yaml   |   3 +
 .../bindings/rng/samsung,exynos5250-trng.yaml      |   2 +-
 .../devicetree/bindings/rng/timeriomem_rng.yaml    |   2 +-
 .../bindings/soc/samsung/exynos-usi.yaml           |   2 +-
 .../devicetree/bindings/sound/samsung,arndale.yaml |   2 +-
 .../bindings/sound/samsung,smdk5250.yaml           |   2 +-
 .../devicetree/bindings/sound/samsung,snow.yaml    |   2 +-
 .../devicetree/bindings/sound/samsung,tm2.yaml     |   2 +-
 .../bindings/spi/samsung,spi-peripheral-props.yaml |   2 +-
 .../devicetree/bindings/spi/samsung,spi.yaml       |   2 +-
 .../bindings/thermal/samsung,exynos-thermal.yaml   |   2 +-
 .../bindings/usb/samsung,exynos-dwc3.yaml          |   2 +-
 .../bindings/usb/samsung,exynos-usb2.yaml          |   2 +-
 MAINTAINERS                                        |  36 +-
 arch/arm/boot/dts/at91-kizbox3-hs.dts              |   2 +-
 arch/arm/boot/dts/at91-kizbox3_common.dtsi         |   2 +-
 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi       |  32 +-
 .../boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi    |   4 +-
 arch/arm/boot/dts/qcom-apq8064-pins.dtsi           |  12 +-
 arch/arm/configs/imote2_defconfig                  | 365 ---------------------
 arch/arm/mach-davinci/board-da850-evm.c            |   4 +-
 arch/arm/mach-ep93xx/clock.c                       |   6 +-
 arch/arm/mach-iop32x/cp6.c                         |   2 +
 arch/arm/mach-vexpress/spc.c                       |  28 +-
 arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi  |   8 +-
 arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi  |   8 +-
 arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi     |   8 +-
 .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts  |   8 +-
 arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi     |   6 +-
 arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi     |   6 +-
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi     |   6 +-
 arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi     |   8 +-
 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts |   8 +-
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts      |   4 +-
 arch/arm64/boot/dts/qcom/msm8996.dtsi              |   4 +-
 .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi |   2 +-
 .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi |   2 +-
 drivers/firmware/arm_scmi/clock.c                  |   5 +-
 drivers/firmware/arm_scmi/driver.c                 |   3 +-
 drivers/firmware/arm_scmi/optee.c                  |   8 +-
 drivers/memory/atmel-ebi.c                         |  23 +-
 drivers/memory/fsl_ifc.c                           |   3 +-
 drivers/memory/renesas-rpc-if.c                    |  10 +-
 drivers/reset/reset-rzg2l-usbphy-ctrl.c            |   4 +-
 drivers/reset/tegra/reset-bpmp.c                   |   9 +-
 133 files changed, 264 insertions(+), 584 deletions(-)
 delete mode 100644 arch/arm/configs/imote2_defconfig
Merging drivers-memory-fixes/fixes (dd8adc713b16 memory: fsl_ifc: populate child nodes of buses and mfd devices)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes
Already up to date.
Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes)
$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/tee/optee/ffa_abi.c | 1 +
 1 file changed, 1 insertion(+)
Merging m68k-current/for-linus (0d52a01a266b m68k: defconfig: Disable fbdev on Sun3/3x)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (1ff5c8e8c835 Revert "powerpc: Set max_mapnr correctly")
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
Merge made by the 'ort' strategy.
 arch/powerpc/include/asm/kvm_book3s_64.h | 12 ----------
 arch/powerpc/include/asm/kvm_ppc.h       | 12 ++++++++++
 arch/powerpc/include/asm/page.h          |  6 ++++-
 arch/powerpc/include/asm/setup.h         |  2 ++
 arch/powerpc/kernel/exceptions-64s.S     |  4 ++++
 arch/powerpc/kernel/setup_64.c           | 28 ++++++++++++++++++++++
 arch/powerpc/kvm/Kconfig                 |  9 +++++++
 arch/powerpc/kvm/book3s_64_entry.S       | 10 ++++++--
 arch/powerpc/kvm/book3s_hv.c             | 41 +++++++++++++++++++++++++-------
 arch/powerpc/kvm/book3s_pr.c             | 26 +++++++++++++-------
 arch/powerpc/kvm/book3s_pr_papr.c        | 20 ++++++++++++++++
 arch/powerpc/kvm/powerpc.c               | 17 +++++++++++++
 arch/powerpc/mm/mem.c                    |  2 +-
 arch/powerpc/mm/numa.c                   |  2 +-
 arch/powerpc/platforms/pseries/setup.c   | 13 +++++++++-
 15 files changed, 169 insertions(+), 35 deletions(-)
Merging s390-fixes/fixes (711136bb6620 s390/kexec: silence -Warray-bounds warning)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
Merge made by the 'ort' strategy.
 arch/s390/Kconfig                | 19 +++++++++++++++++++
 arch/s390/Makefile               |  2 ++
 arch/s390/kernel/machine_kexec.c |  2 +-
 arch/s390/kernel/processor.c     |  4 ++++
 4 files changed, 26 insertions(+), 1 deletion(-)
Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master
Already up to date.
Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX)
$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable
Already up to date.
Merging net/master (ec4eb8a86ade drivers: net: slip: fix NPD bug in sl_tx_timeout())
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master
Merge made by the 'ort' strategy.
 .../bindings/net/ethernet-controller.yaml          |   6 +
 Documentation/devicetree/bindings/net/micrel.txt   |  17 ---
 .../devicetree/bindings/net/xilinx_axienet.txt     |   8 +-
 Documentation/networking/dsa/dsa.rst               |  64 ++++-----
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |   7 +
 drivers/net/ethernet/broadcom/bnxt/bnxt.h          |   5 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c      |  14 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h      |   2 +
 drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c   |   4 +-
 drivers/net/ethernet/fungible/funcore/fun_dev.c    |   4 +-
 drivers/net/ethernet/intel/ice/ice.h               |   3 +-
 drivers/net/ethernet/intel/ice/ice_fltr.c          |  44 +++++-
 drivers/net/ethernet/intel/ice/ice_lib.c           |   3 +
 drivers/net/ethernet/intel/ice/ice_main.c          | 127 ++++++++++++------
 drivers/net/ethernet/intel/ice/ice_virtchnl.c      |   4 +-
 drivers/net/ethernet/intel/ice/ice_xsk.c           |   6 +-
 drivers/net/ethernet/marvell/mv643xx_eth.c         |   2 +-
 drivers/net/ethernet/micrel/Kconfig                |   2 +
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |   6 +-
 drivers/net/ethernet/qlogic/qed/qed_debug.c        |   2 +-
 drivers/net/ethernet/qlogic/qede/qede_fp.c         |   3 +
 drivers/net/ethernet/sfc/efx_channels.c            | 148 ++++++++++++---------
 drivers/net/ethernet/sfc/rx_common.c               |   3 +
 drivers/net/ethernet/sfc/tx.c                      |   3 +
 drivers/net/ethernet/sfc/tx_common.c               |   2 +
 .../net/ethernet/stmicro/stmmac/dwmac-loongson.c   |   2 +-
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |   3 +-
 drivers/net/ethernet/xilinx/xilinx_axienet.h       |   2 -
 drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |  33 ++---
 drivers/net/mctp/mctp-i2c.c                        |   2 +-
 drivers/net/mdio/mdio-mscc-miim.c                  |   6 +
 drivers/net/phy/micrel.c                           | 106 +--------------
 drivers/net/slip/slip.c                            |   2 +-
 drivers/net/usb/aqc111.c                           |   9 +-
 drivers/net/vrf.c                                  |  15 ++-
 include/linux/bpf_verifier.h                       |   4 +-
 include/net/mctp.h                                 |   2 -
 kernel/trace/bpf_trace.c                           |   4 +-
 kernel/trace/rethook.c                             |   2 +-
 net/core/filter.c                                  |  17 ++-
 net/core/skbuff.c                                  |  15 ++-
 net/dsa/master.c                                   |  25 +++-
 net/ipv4/fib_semantics.c                           |   7 +-
 net/ipv6/ip6mr.c                                   |   2 +-
 net/ipv6/route.c                                   |   2 +-
 net/mctp/af_mctp.c                                 |  46 +++++--
 net/mctp/route.c                                   |  16 ++-
 net/netfilter/nf_tables_api.c                      |   2 +-
 net/netfilter/nft_bitwise.c                        |   4 +-
 net/netfilter/nft_connlimit.c                      |   2 +-
 net/netfilter/nft_counter.c                        |   2 +-
 net/netfilter/nft_last.c                           |   2 +-
 net/netfilter/nft_limit.c                          |   2 +-
 net/netfilter/nft_quota.c                          |   2 +-
 net/openvswitch/actions.c                          |   2 +-
 net/openvswitch/flow_netlink.c                     |  99 +++++++++++++-
 net/rxrpc/net_ns.c                                 |   2 +-
 net/sctp/outqueue.c                                |   6 +-
 net/tls/tls_sw.c                                   |   2 +-
 tools/bpf/bpftool/gen.c                            |  22 ++-
 .../selftests/bpf/prog_tests/dummy_st_ops.c        |  23 ++++
 tools/testing/selftests/bpf/progs/map_ptr_kern.c   |   4 +-
 .../selftests/bpf/progs/trace_dummy_st_ops.c       |  21 +++
 .../selftests/bpf/test_tcp_check_syncookie_user.c  |  78 ++++++++---
 tools/testing/selftests/net/fib_nexthops.sh        |  14 ++
 65 files changed, 712 insertions(+), 388 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/trace_dummy_st_ops.c
Merging bpf/master (8de8b71b787f xsk: Fix l2fwd for copy mode + busy poll combo)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
Merge made by the 'ort' strategy.
 net/xdp/xsk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging ipsec/master (748b82c23e25 xfrm: Pass flowi_oif or l3mdev as oif to xfrm_dst_lookup)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
Merge made by the 'ort' strategy.
 net/xfrm/xfrm_policy.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Merging netfilter/master (dea2d93a8ba4 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master
Already up to date.
Merging ipvs/master (277f2bb14361 ibmvnic: schedule failover only if vioctl fails)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master
Already up to date.
Merging wireless/main (10cb21f4ff3f Revert "ath11k: mesh: add support for 256 bitmap in blockack frames in 11ax")
$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 MAINTAINERS                           |  7 +++----
 drivers/net/wireless/ath/ath11k/mac.c | 22 ++++++++++++++--------
 drivers/net/wireless/ath/ath9k/xmit.c |  5 ++---
 3 files changed, 19 insertions(+), 15 deletions(-)
Merging rdma-fixes/for-rc (4d809f69695d IB/rdmavt: add lock to call to rvt_error_qp to prevent a race condition)
$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 MAINTAINERS                       | 5 +----
 drivers/infiniband/core/cm.c      | 3 +--
 drivers/infiniband/hw/mlx5/mr.c   | 5 ++++-
 drivers/infiniband/sw/rdmavt/qp.c | 6 +++++-
 4 files changed, 11 insertions(+), 8 deletions(-)
Merging sound-current/for-linus (d52eee988597 ALSA: hda: intel-dsp-config: update AlderLake PCI IDs)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
Auto-merging sound/pci/hda/patch_realtek.c
Merge made by the 'ort' strategy.
 sound/hda/hdac_i915.c              | 29 +++++++++++++++++++----------
 sound/hda/intel-dsp-config.c       | 18 ++++++++++++++++--
 sound/oss/dmasound/dmasound.h      |  6 ------
 sound/oss/dmasound/dmasound_core.c | 24 +-----------------------
 sound/pci/hda/patch_realtek.c      |  1 +
 sound/usb/usbaudio.h               |  2 +-
 6 files changed, 38 insertions(+), 42 deletions(-)
Merging sound-asoc-fixes/for-linus (61085c184b07 Merge remote-tracking branch 'asoc/for-5.17' into asoc-linus)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
Merge made by the 'ort' strategy.
 include/sound/soc-component.h          |  4 +++
 sound/soc/atmel/sam9g20_wm8731.c       | 61 ----------------------------------
 sound/soc/codecs/cs35l41-lib.c         | 10 +++---
 sound/soc/codecs/msm8916-wcd-digital.c |  9 ++++-
 sound/soc/codecs/rk817_codec.c         |  2 +-
 sound/soc/codecs/rt5682.c              | 11 +++---
 sound/soc/codecs/rt5682s.c             | 11 +++---
 sound/soc/codecs/wm_adsp.c             | 10 +++---
 sound/soc/fsl/fsl_sai.c                |  2 +-
 sound/soc/generic/simple-card-utils.c  |  6 ++--
 sound/soc/intel/boards/sof_rt5682.c    | 13 ++++++++
 sound/soc/meson/aiu-acodec-ctrl.c      |  3 ++
 sound/soc/meson/aiu-codec-ctrl.c       |  3 ++
 sound/soc/meson/aiu.c                  |  3 ++
 sound/soc/soc-core.c                   |  5 +++
 sound/soc/soc-dapm.c                   |  6 ++--
 sound/soc/soc-pcm.c                    |  2 +-
 sound/soc/soc-topology.c               |  4 +--
 sound/soc/sof/sof-pci-dev.c            |  9 ++++-
 sound/soc/sof/topology.c               |  3 ++
 20 files changed, 80 insertions(+), 97 deletions(-)
Merging regmap-fixes/for-linus (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
Already up to date.
Merging regulator-fixes/for-linus (2316f0fc0ad2 regulator: atc260x: Fix missing active_discharge_on setting)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
Merge made by the 'ort' strategy.
 drivers/regulator/atc260x-regulator.c |  1 +
 drivers/regulator/rtq2134-regulator.c |  1 +
 drivers/regulator/wm8994-regulator.c  | 42 ++++++++++++++++++++++++++++++++---
 3 files changed, 41 insertions(+), 3 deletions(-)
Merging spi-fixes/for-linus (2c7d1b281286 spi: bcm-qspi: fix MSPI only access with bcm_qspi_exec_mem_op())
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
Merge made by the 'ort' strategy.
 drivers/spi/spi-bcm-qspi.c        |  4 ++--
 drivers/spi/spi-cadence-quadspi.c | 46 ++++++++++-----------------------------
 drivers/spi/spi-mxic.c            |  1 +
 drivers/spi/spi-rpc-if.c          |  8 +++++--
 drivers/spi/spi.c                 |  4 ++++
 5 files changed, 25 insertions(+), 38 deletions(-)
Merging pci-current/for-linus (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus
Already up to date.
Merging driver-core.current/driver-core-linus (cdb4f26a63c3 kobject: kobj_type: remove default_attrs)
$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus
Merge made by the 'ort' strategy.
 arch/powerpc/platforms/pseries/vas-sysfs.c |  6 ++++--
 fs/sysfs/file.c                            | 13 ------------
 include/linux/kobject.h                    |  1 -
 lib/kobject.c                              | 32 ------------------------------
 4 files changed, 4 insertions(+), 48 deletions(-)
Merging tty.current/tty-linus (dbf3f0932214 tty: serial: mpc52xx_uart: make rx/tx hooks return unsigned, part II.)
$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
Merge made by the 'ort' strategy.
 drivers/tty/serial/mpc52xx_uart.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
Merging usb.current/usb-linus (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
Already up to date.
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes
Already up to date.
Merging usb-serial-fixes/usb-linus (7e57714cd0ad Linux 5.17-rc6)
$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
Already up to date.
Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle)
$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes
Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c
Resolved 'drivers/usb/chipidea/ci_hdrc_imx.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 7ec1c7327f37] Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
$ git diff -M --stat --summary HEAD^..
Merging phy/fixes (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
Already up to date.
Merging staging.current/staging-linus (20314bacd2f9 staging: r8188eu: Fix PPPoE tag insertion on little endian systems)
$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
Merge made by the 'ort' strategy.
 drivers/staging/r8188eu/core/rtw_br_ext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging iio-fixes/fixes-togreg (108e4d4de2b5 iio:proximity:sx9324: Fix hardware gain read/write)
$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
Merge made by the 'ort' strategy.
 drivers/iio/adc/ad7280a.c            | 12 ++++++------
 drivers/iio/chemical/scd4x.c         |  5 ++++-
 drivers/iio/dac/ad3552r.c            |  2 +-
 drivers/iio/dac/ad5592r-base.c       |  2 +-
 drivers/iio/dac/ti-dac5571.c         | 28 ++++++++++++++++++----------
 drivers/iio/filter/Kconfig           |  1 +
 drivers/iio/imu/bmi160/bmi160_core.c | 20 ++++++++++++++------
 drivers/iio/proximity/sx9324.c       | 26 +++++++++++++++++++++-----
 drivers/iio/proximity/sx_common.c    |  1 +
 9 files changed, 67 insertions(+), 30 deletions(-)
Merging counter-fixes/fixes-togreg (4a14311a3b93 counter: Stop using dev_get_drvdata() to get the counter device)
$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg
Merge made by the 'ort' strategy.
Merging char-misc.current/char-misc-linus (94865e2dcb46 habanalabs: Fix test build failures)
$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus
Merge made by the 'ort' strategy.
 drivers/misc/habanalabs/common/memory.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
Merging soundwire-fixes/fixes (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
Already up to date.
Merging thunderbolt-fixes/fixes (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
Already up to date.
Merging input-current/for-linus (8b188fba7519 Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads")
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
Already up to date.
Merging crypto-current/master (aa8e73eed7d3 crypto: x86/sm3 - Fixup SLS)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
Already up to date.
Merging vfio-fixes/for-linus (8704e8934908 vfio/pci: Fix OpRegion read)
$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
Already up to date.
Merging kselftest-fixes/fixes (79ee8aa31d51 selftests/harness: Pass variant to teardown)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
Merge made by the 'ort' strategy.
 tools/testing/selftests/kselftest_harness.h        | 59 +++++++++++++++-------
 tools/testing/selftests/pid_namespace/Makefile     |  6 +--
 tools/testing/selftests/pidfd/pidfd_wait.c         |  1 -
 tools/testing/selftests/proc/proc-pid-vm.c         |  6 ++-
 .../testing/selftests/vDSO/vdso_test_correctness.c |  9 ++--
 tools/testing/selftests/x86/Makefile               |  4 ++
 6 files changed, 54 insertions(+), 31 deletions(-)
Merging modules-fixes/modules-linus (dc0ce6cc4b13 lib/test: use after free in register_test_dev_kmod())
$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus
Already up to date.
Merging dmaengine-fixes/fixes (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
Already up to date.
Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes
Already up to date.
Merging mtd-fixes/mtd/fixes (9fe4e0d3cbfe mtd: rawnand: fix ecc parameters for mt7622)
$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
Merge made by the 'ort' strategy.
 drivers/mtd/nand/raw/mtk_ecc.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes
Already up to date.
Merging v4l-dvb-fixes/fixes (62c31868f528 media: platform: imx-mipi-csis: Add dependency on VIDEO_DEV)
$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/media/platform/nxp/Kconfig        | 1 +
 drivers/media/platform/rockchip/rga/rga.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional)
$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes
Already up to date.
Merging mips-fixes/mips-fixes (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
Already up to date.
Merging at91-fixes/at91-fixes (26077968f838 dt-bindings: ARM: at91: update maintainers entry)
$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes
Already up to date.
Merging omap-fixes/fixes (8840f5460a23 ARM: dts: Use 32KiHz oscillator on devkit8000)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes
Already up to date.
Merging kvm-fixes/master (5593473a1e6c KVM: avoid NULL pointer dereference in kvm_dirty_ring_push)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
Merge made by the 'ort' strategy.
 Documentation/virt/kvm/api.rst  |  1 +
 arch/x86/include/asm/kvm_host.h |  5 +++--
 arch/x86/kvm/mmu/mmu.c          | 20 ++++++++++++++++----
 arch/x86/kvm/mmu/tdp_mmu.c      |  2 +-
 arch/x86/kvm/svm/sev.c          |  1 +
 arch/x86/kvm/x86.c              | 20 ++++++++++++++++++--
 virt/kvm/kvm_main.c             |  2 +-
 7 files changed, 41 insertions(+), 10 deletions(-)
Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
Already up to date.
Merging hwmon-fixes/hwmon (4fd45cc8568e hwmon: (asus_wmi_sensors) Fix CROSSHAIR VI HERO name)
$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
Merge made by the 'ort' strategy.
 drivers/hwmon/asus_wmi_sensors.c | 2 +-
 drivers/hwmon/pmbus/xdpe12284.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount)
$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
Already up to date.
Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
Already up to date.
Merging btrfs-fixes/next-fixes (873863d594c4 Merge branch 'misc-5.18' into next-fixes)
$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes
Auto-merging fs/btrfs/inode.c
Merge made by the 'ort' strategy.
Merging vfs-fixes/fixes (9d2231c5d74e lib/iov_iter: initialize "flags" in new pipe_buffer)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
Already up to date.
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 -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus
Already up to date.
Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes
Already up to date.
Merging drivers-x86-fixes/fixes (f632b296b007 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes
Merge made by the 'ort' strategy.
 .../ABI/testing/sysfs-class-firmware-attributes    | 48 ++++++++++++----------
 Documentation/ABI/testing/sysfs-driver-intel_sdsi  | 18 ++++----
 drivers/platform/x86/acerhdf.c                     | 21 ++--------
 drivers/platform/x86/amd-pmc.c                     | 14 ++++++-
 drivers/platform/x86/barco-p50-gpio.c              |  1 -
 drivers/platform/x86/samsung-laptop.c              |  2 -
 drivers/platform/x86/think-lmi.c                   | 44 +++++++-------------
 drivers/platform/x86/think-lmi.h                   |  1 -
 tools/power/x86/intel-speed-select/Makefile        |  2 +-
 9 files changed, 68 insertions(+), 83 deletions(-)
Merging samsung-krzk-fixes/fixes (1a9f338f9cf9 MAINTAINERS: update Krzysztof Kozlowski's email to Linaro)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
Already up to date.
Merging pinctrl-samsung-fixes/fixes (abb860ac7e3f pinctrl: samsung: staticize fsd_pin_ctrl)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging devicetree-fixes/dt/linus (5dc6ce767dc8 dt-bindings: gpu: mali-bifrost: Document RZ/V2L SoC)
$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
Auto-merging Documentation/devicetree/bindings/extcon/maxim,max77843.yaml
Merge made by the 'ort' strategy.
 .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml     |  1 -
 Documentation/devicetree/bindings/bus/ti-sysc.yaml |  1 -
 .../devicetree/bindings/extcon/maxim,max77843.yaml |  2 +-
 .../devicetree/bindings/gpu/arm,mali-bifrost.yaml  |  5 +-
 .../devicetree/bindings/iio/adc/adi,ad7476.yaml    |  1 +
 .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml       |  8 +--
 .../devicetree/bindings/iio/dac/adi,ad5360.yaml    |  6 +-
 .../devicetree/bindings/interconnect/qcom,rpm.yaml | 84 +++++++++++-----------
 .../bindings/interrupt-controller/mrvl,intc.yaml   |  6 +-
 .../bindings/media/mediatek,vcodec-encoder.yaml    |  1 -
 .../bindings/mmc/nvidia,tegra20-sdhci.yaml         |  2 +
 .../devicetree/bindings/net/snps,dwmac.yaml        |  6 +-
 .../devicetree/bindings/net/ti,davinci-mdio.yaml   |  1 +
 .../bindings/phy/nvidia,tegra20-usb-phy.yaml       | 20 +++---
 .../devicetree/bindings/phy/qcom,usb-hs-phy.yaml   | 32 +++++----
 .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 11 ++-
 .../devicetree/bindings/power/renesas,apmu.yaml    |  3 +-
 .../devicetree/bindings/power/supply/bq2415x.yaml  |  1 -
 .../bindings/regulator/fixed-regulator.yaml        | 34 ++++-----
 .../devicetree/bindings/sound/st,stm32-sai.yaml    |  6 +-
 Documentation/devicetree/bindings/sram/sram.yaml   | 16 ++---
 21 files changed, 123 insertions(+), 124 deletions(-)
Merging scsi-fixes/fixes (56495f295d8e scsi: megaraid_sas: Target with invalid LUN ID is deleted during scan)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/message/fusion/mptbase.c          |   4 +-
 drivers/scsi/aha152x.c                    | 235 +++++++-------
 drivers/scsi/aic7xxx/aic79xx_osm.h        |   2 -
 drivers/scsi/aic7xxx/aic79xx_pci.c        |   6 +-
 drivers/scsi/aic7xxx/aic7xxx_osm.h        |   2 -
 drivers/scsi/aic7xxx/aic7xxx_pci.c        |   4 +-
 drivers/scsi/bnx2fc/bnx2fc_hwi.c          |   6 +-
 drivers/scsi/bnx2i/bnx2i_hwi.c            |   4 +-
 drivers/scsi/hisi_sas/hisi_sas_main.c     |   1 -
 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c  |   2 +-
 drivers/scsi/isci/host.c                  |   6 +-
 drivers/scsi/libiscsi.c                   |   1 -
 drivers/scsi/lpfc/lpfc.h                  |   7 +-
 drivers/scsi/lpfc/lpfc_crtn.h             |   3 +
 drivers/scsi/lpfc/lpfc_hbadisc.c          | 120 ++++++--
 drivers/scsi/lpfc/lpfc_init.c             |  88 ++++--
 drivers/scsi/lpfc/lpfc_nvme.c             |  27 +-
 drivers/scsi/lpfc/lpfc_scsi.c             |  12 +-
 drivers/scsi/lpfc/lpfc_sli.c              |  75 +++--
 drivers/scsi/lpfc/lpfc_version.h          |   2 +-
 drivers/scsi/megaraid/megaraid_sas.h      |   3 +
 drivers/scsi/megaraid/megaraid_sas_base.c |   7 +
 drivers/scsi/mpt3sas/mpt3sas_base.c       |   3 +-
 drivers/scsi/mpt3sas/mpt3sas_config.c     |   9 +-
 drivers/scsi/mpt3sas/mpt3sas_scsih.c      |   5 +-
 drivers/scsi/mvsas/mv_init.c              |   1 +
 drivers/scsi/pcmcia/sym53c500_cs.c        |  52 ++--
 drivers/scsi/pmcraid.c                    | 491 ------------------------------
 drivers/scsi/pmcraid.h                    |  33 --
 drivers/scsi/scsi_debug.c                 |   8 +-
 drivers/scsi/scsi_logging.c               |   2 +-
 drivers/scsi/scsi_scan.c                  |   5 +
 drivers/scsi/scsi_sysfs.c                 |   4 -
 drivers/scsi/sd.c                         |   3 +-
 drivers/scsi/sr.c                         |   2 +-
 drivers/scsi/ufs/ufs-qcom.c               |  15 -
 drivers/scsi/ufs/ufshcd-pci.c             |  17 ++
 drivers/scsi/ufs/ufshcd.h                 |   2 -
 drivers/scsi/ufs/ufshpb.c                 |  11 +-
 drivers/scsi/virtio_scsi.c                |   8 +-
 drivers/scsi/zorro7xx.c                   |   2 +
 drivers/target/target_core_user.c         |   3 +-
 42 files changed, 467 insertions(+), 826 deletions(-)
Merging drm-fixes/drm-fixes (dc7d19d27d01 Merge tag 'amd-drm-fixes-5.18-2022-04-06' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes)
$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes
Merge made by the 'ort' strategy.
 drivers/gpu/drm/amd/amdgpu/ObjectID.h              |   1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c            |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c            |   6 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h            |   7 ++
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |   7 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c              |   5 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c              |   2 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c              |   4 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |  71 ++++++++++++++
 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c              |  12 ++-
 drivers/gpu/drm/amd/amdkfd/kfd_device.c            |  14 +--
 drivers/gpu/drm/amd/amdkfd/kfd_events.c            |   2 +
 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c        |  24 +++--
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  10 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |   6 ++
 .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 107 +++++++++++++--------
 .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c |  19 +++-
 .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.h |   4 +-
 drivers/gpu/drm/amd/display/dc/core/dc.c           |  19 ++++
 drivers/gpu/drm/amd/display/dc/core/dc_link.c      |   3 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |  65 +++++++++++++
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |   4 +-
 drivers/gpu/drm/amd/display/dc/dc.h                |  23 ++++-
 drivers/gpu/drm/amd/display/dc/dc_stream.h         |   2 +
 .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |  20 ++--
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c |  12 +++
 .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c  |   1 -
 .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c  |   2 +-
 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c |   5 +-
 .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c    |   2 +
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c  |   8 ++
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c |  19 ++--
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c  |   5 +-
 .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c  |   3 +
 .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c   |  18 +++-
 .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c  |  13 +++
 .../drm/amd/display/dc/dml/display_mode_structs.h  |   2 +
 drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c        |   4 +-
 drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h    |   1 +
 drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h       |   3 +
 .../amd/display/modules/info_packet/info_packet.c  |   5 +-
 drivers/gpu/drm/amd/pm/amdgpu_dpm.c                |  17 ++++
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c   |   8 +-
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c   |   2 +-
 drivers/gpu/drm/imx/dw_hdmi-imx.c                  |   8 +-
 drivers/gpu/drm/imx/imx-ldb.c                      |   2 +
 drivers/gpu/drm/imx/parallel-display.c             |   4 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9341.c       |   4 +-
 drivers/gpu/ipu-v3/ipu-di.c                        |   5 +-
 54 files changed, 477 insertions(+), 131 deletions(-)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes
Already up to date.
Merging drm-intel-fixes/for-linux-next-fixes (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes
Already up to date.
Merging mmc-fixes/fixes (03e59b1e2f56 mmc: renesas_sdhi: don't overwrite TAP settings when HS400 tuning is complete)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/mmc/core/block.c             | 46 ++++++++++++++++++++++++++++++++----
 drivers/mmc/host/mmci_stm32_sdmmc.c  |  6 ++---
 drivers/mmc/host/renesas_sdhi_core.c |  8 +++----
 drivers/mmc/host/sdhci-xenon.c       | 10 --------
 4 files changed, 49 insertions(+), 21 deletions(-)
Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
Auto-merging drivers/rtc/rtc-cmos.c
Merge made by the 'ort' strategy.
Merging gnss-fixes/gnss-linus (e783362eb54c Linux 5.17-rc1)
$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
Already up to date.
Merging hyperv-fixes/hyperv-fixes (eaa03d345358 Drivers: hv: vmbus: Replace smp_store_mb() with virt_store_mb())
$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
Already up to date.
Merging soc-fsl-fixes/fix (a222fd854139 soc: fsl: qe: Check of ioremap return value)
$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix
Already up to date.
Merging risc-v-fixes/fixes (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
Already up to date.
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes
Already up to date.
Merging fpga-fixes/fixes (8bb7eca972ad Linux 5.15)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga-fixes/fixes
Already up to date.
Merging spdx/spdx-linus (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus
Already up to date.
Merging gpio-brgl-fixes/gpio/for-current (5467801f1fcb gpio: Restrict usage of GPIO chip irq members before initialization)
$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
Merge made by the 'ort' strategy.
 drivers/gpio/gpiolib.c      | 19 +++++++++++++++++++
 include/linux/gpio/driver.h |  9 +++++++++
 2 files changed, 28 insertions(+)
Merging gpio-intel-fixes/fixes (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes
Already up to date.
Merging pinctrl-intel-fixes/fixes (0be0b70df661 pinctrl: alderlake: Fix register offsets for ADL-N variant)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/pinctrl/intel/pinctrl-alderlake.c | 60 ++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 20 deletions(-)
Merging erofs-fixes/fixes (24331050a3e6 erofs: fix small compressed files inlining)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes
Already up to date.
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes
Already up to date.
Merging kunit-fixes/kunit-fixes (02c7efa43627 Documentation: kunit: fix path to .kunitconfig in start.rst)
$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
Merge made by the 'ort' strategy.
 Documentation/dev-tools/kunit/start.rst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb())
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes
Already up to date.
Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes
Already up to date.
Merging cel-fixes/for-rc (e2e917f8677d SUNRPC: Fix the svc_deferred_event trace class)
$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc
Auto-merging fs/nfsd/filecache.c
Auto-merging include/trace/events/sunrpc.h
Auto-merging net/sunrpc/svc_xprt.c
Merge made by the 'ort' strategy.
 fs/nfsd/filecache.c                     | 25 +++++++++++++++----------
 fs/nfsd/nfs2acl.c                       | 24 ++++++++++++------------
 include/linux/sunrpc/svc.h              |  1 +
 include/trace/events/sunrpc.h           |  9 +++++----
 net/sunrpc/svc_xprt.c                   |  3 +++
 net/sunrpc/xprtrdma/svc_rdma_recvfrom.c |  2 +-
 6 files changed, 37 insertions(+), 27 deletions(-)
$ git am -3 ../patches/0001-Revert-SUNRPC-Fix-the-svc_deferred_event-trace-class.patch
Applying: Revert "SUNRPC: Fix the svc_deferred_event trace class"
$ git reset HEAD^
Unstaged changes after reset:
M	include/trace/events/sunrpc.h
$ git add -A .
$ git commit -v -a --amend
[master 1e3940a8c1b3] Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
 Date: Fri Apr 8 08:38:12 2022 +1000
Merging irqchip-fixes/irq/irqchip-fixes (544808f7e21c irqchip/gic, gic-v3: Prevent GSI to SGI translations)
$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes
Merge made by the 'ort' strategy.
 drivers/irqchip/Kconfig          |  1 +
 drivers/irqchip/irq-gic-v3-its.c | 28 +++++++++++++++++++---------
 drivers/irqchip/irq-gic-v3.c     | 14 ++++++++++----
 drivers/irqchip/irq-gic.c        |  6 ++++++
 drivers/irqchip/irq-qcom-mpm.c   |  2 +-
 5 files changed, 37 insertions(+), 14 deletions(-)
Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
Already up to date.
Merging perf-current/perf/urgent (be2d3ecedd99 Merge tag 'perf-tools-for-v5.18-2022-04-02' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent
Already up to date.
Merging efi-fixes/urgent (9feaf8b387ee efi: fix return value of __setup handlers)
$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
Already up to date.
Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.)
$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
Merge made by the 'ort' strategy.
 include/linux/zstd_lib.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging drm-misc-fixes/for-linux-next-fixes (1ecc0c09f19f dt-bindings: display: panel: mipi-dbi-spi: Make width-mm/height-mm mandatory)
$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes
Auto-merging drivers/gpu/drm/panel/panel-ilitek-ili9341.c
Merge made by the 'ort' strategy.
 .../bindings/display/bridge/chipone,icn6211.yaml   |   1 -
 .../bindings/display/bridge/toshiba,tc358762.yaml  |   1 -
 .../bindings/display/panel/panel-mipi-dbi-spi.yaml |   2 +
 Documentation/driver-api/dma-buf.rst               |   6 +
 drivers/dma-buf/Makefile                           |   1 +
 drivers/dma-buf/dma-fence-array.c                  |  32 +++
 drivers/dma-buf/selftests.h                        |   1 +
 drivers/dma-buf/st-dma-fence-unwrap.c              | 261 +++++++++++++++++++++
 drivers/dma-buf/sync_file.c                        | 141 +++++------
 drivers/gpu/drm/drm_of.c                           |  99 ++++----
 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c    |   1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c    |   2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c    |   1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h     |   1 +
 drivers/video/fbdev/core/fbmem.c                   |   9 +-
 include/linux/dma-fence-array.h                    |  19 ++
 include/linux/dma-fence-chain.h                    |   2 +
 include/linux/dma-fence-unwrap.h                   |  95 ++++++++
 18 files changed, 554 insertions(+), 121 deletions(-)
 create mode 100644 drivers/dma-buf/st-dma-fence-unwrap.c
 create mode 100644 include/linux/dma-fence-unwrap.h
Merging kbuild/for-next (7972d49b8f70 kbuild: refactor cmd_modversions_S)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
Merge made by the 'ort' strategy.
 Documentation/kbuild/kconfig-language.rst |  6 +++
 Makefile                                  |  3 +-
 certs/Makefile                            |  4 +-
 scripts/Makefile                          |  4 +-
 scripts/Makefile.build                    | 67 ++++++++++++-------------------
 scripts/kconfig/gconf-cfg.sh              | 12 +++---
 scripts/kconfig/mconf-cfg.sh              | 16 ++++----
 scripts/kconfig/nconf-cfg.sh              | 16 ++++----
 scripts/kconfig/qconf-cfg.sh              | 14 +++----
 scripts/mod/modpost.c                     | 49 ++++++----------------
 scripts/mod/modpost.h                     |  4 --
 tools/objtool/Makefile                    |  4 +-
 usr/include/Makefile                      |  2 +-
 13 files changed, 81 insertions(+), 120 deletions(-)
Merging perf/perf/core (be2d3ecedd99 Merge tag 'perf-tools-for-v5.18-2022-04-02' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core
Already up to date.
Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn)
$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes
Already up to date.
Merging dma-mapping/for-next (4fe87e818ea4 dma-mapping: move pgprot_decrypted out of dma_pgprot)
$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next
Already up to date.
Merging asm-generic/master (fba2689ee77e Merge branch 'remove-h8300' of git://git.infradead.org/users/hch/misc into asm-generic)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
CONFLICT (modify/delete): Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml deleted in asm-generic/master and modified in HEAD.  Version HEAD of Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml left in tree.
Auto-merging MAINTAINERS
Auto-merging drivers/irqchip/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml
rm 'Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml'
$ git commit --no-edit -v -a
[master 78e2495f3f77] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
$ git diff -M --stat --summary HEAD^..
 .../bindings/clock/renesas,h8300-div-clock.txt     |  24 --
 Documentation/devicetree/bindings/h8300/cpu.txt    |  13 -
 .../interrupt-controller/renesas,h8300h-intc.txt   |  22 --
 .../interrupt-controller/renesas,h8s-intc.txt      |  22 --
 .../memory-controllers/renesas,h8300-bsc.yaml      |  35 --
 .../features/core/cBPF-JIT/arch-support.txt        |   1 -
 .../features/core/eBPF-JIT/arch-support.txt        |   1 -
 .../core/generic-idle-thread/arch-support.txt      |   1 -
 .../features/core/jump-labels/arch-support.txt     |   1 -
 .../core/thread-info-in-task/arch-support.txt      |   1 -
 .../features/core/tracehook/arch-support.txt       |   1 -
 .../features/debug/KASAN/arch-support.txt          |   1 -
 .../debug/debug-vm-pgtable/arch-support.txt        |   1 -
 .../debug/gcov-profile-all/arch-support.txt        |   1 -
 Documentation/features/debug/kcov/arch-support.txt |   1 -
 Documentation/features/debug/kgdb/arch-support.txt |   1 -
 .../features/debug/kmemleak/arch-support.txt       |   1 -
 .../debug/kprobes-on-ftrace/arch-support.txt       |   1 -
 .../features/debug/kprobes/arch-support.txt        |   1 -
 .../features/debug/kretprobes/arch-support.txt     |   1 -
 .../features/debug/optprobes/arch-support.txt      |   1 -
 .../features/debug/stackprotector/arch-support.txt |   1 -
 .../features/debug/uprobes/arch-support.txt        |   1 -
 .../debug/user-ret-profiler/arch-support.txt       |   1 -
 .../features/io/dma-contiguous/arch-support.txt    |   1 -
 .../locking/cmpxchg-local/arch-support.txt         |   1 -
 .../features/locking/lockdep/arch-support.txt      |   1 -
 .../locking/queued-rwlocks/arch-support.txt        |   1 -
 .../locking/queued-spinlocks/arch-support.txt      |   1 -
 .../features/perf/kprobes-event/arch-support.txt   |   1 -
 .../features/perf/perf-regs/arch-support.txt       |   1 -
 .../features/perf/perf-stackdump/arch-support.txt  |   1 -
 .../sched/membarrier-sync-core/arch-support.txt    |   1 -
 .../features/sched/numa-balancing/arch-support.txt |   1 -
 .../seccomp/seccomp-filter/arch-support.txt        |   1 -
 .../time/arch-tick-broadcast/arch-support.txt      |   1 -
 .../features/time/clockevents/arch-support.txt     |   1 -
 .../time/context-tracking/arch-support.txt         |   1 -
 .../features/time/irq-time-acct/arch-support.txt   |   1 -
 .../features/time/virt-cpuacct/arch-support.txt    |   1 -
 .../features/vm/ELF-ASLR/arch-support.txt          |   1 -
 .../features/vm/PG_uncached/arch-support.txt       |   1 -
 Documentation/features/vm/THP/arch-support.txt     |   1 -
 Documentation/features/vm/TLB/arch-support.txt     |   1 -
 .../features/vm/huge-vmap/arch-support.txt         |   1 -
 .../features/vm/ioremap_prot/arch-support.txt      |   1 -
 .../features/vm/pte_special/arch-support.txt       |   1 -
 MAINTAINERS                                        |  11 -
 arch/h8300/Kbuild                                  |   5 -
 arch/h8300/Kconfig                                 |  49 ---
 arch/h8300/Kconfig.cpu                             |  99 -----
 arch/h8300/Kconfig.debug                           |   2 -
 arch/h8300/Makefile                                |  44 ---
 arch/h8300/boot/Makefile                           |  27 --
 arch/h8300/boot/compressed/Makefile                |  45 ---
 arch/h8300/boot/compressed/head.S                  |  49 ---
 arch/h8300/boot/compressed/misc.c                  |  76 ----
 arch/h8300/boot/compressed/vmlinux.lds             |  35 --
 arch/h8300/boot/compressed/vmlinux.scr             |   9 -
 arch/h8300/boot/dts/Makefile                       |   6 -
 arch/h8300/boot/dts/edosk2674.dts                  | 108 -----
 arch/h8300/boot/dts/h8300h_sim.dts                 |  97 -----
 arch/h8300/boot/dts/h8s_sim.dts                    | 100 -----
 arch/h8300/configs/edosk2674_defconfig             |  48 ---
 arch/h8300/configs/h8300h-sim_defconfig            |  48 ---
 arch/h8300/configs/h8s-sim_defconfig               |  48 ---
 arch/h8300/include/asm/Kbuild                      |   8 -
 arch/h8300/include/asm/bitops.h                    | 179 ---------
 arch/h8300/include/asm/bug.h                       |  13 -
 arch/h8300/include/asm/byteorder.h                 |   7 -
 arch/h8300/include/asm/cache.h                     |  12 -
 arch/h8300/include/asm/elf.h                       | 102 -----
 arch/h8300/include/asm/flat.h                      |  36 --
 arch/h8300/include/asm/hash.h                      |  54 ---
 arch/h8300/include/asm/io.h                        |  67 ----
 arch/h8300/include/asm/irq.h                       |  25 --
 arch/h8300/include/asm/irqflags.h                  |  97 -----
 arch/h8300/include/asm/kgdb.h                      |  45 ---
 arch/h8300/include/asm/mmu_context.h               |   6 -
 arch/h8300/include/asm/page.h                      |  17 -
 arch/h8300/include/asm/page_offset.h               |   2 -
 arch/h8300/include/asm/pgtable.h                   |  43 --
 arch/h8300/include/asm/processor.h                 | 126 ------
 arch/h8300/include/asm/ptrace.h                    |  39 --
 arch/h8300/include/asm/signal.h                    |  23 --
 arch/h8300/include/asm/smp.h                       |   1 -
 arch/h8300/include/asm/string.h                    |  18 -
 arch/h8300/include/asm/switch_to.h                 |  52 ---
 arch/h8300/include/asm/syscall.h                   |  43 --
 arch/h8300/include/asm/thread_info.h               | 102 -----
 arch/h8300/include/asm/tlb.h                       |   7 -
 arch/h8300/include/asm/traps.h                     |  41 --
 arch/h8300/include/asm/user.h                      |  71 ----
 arch/h8300/include/asm/vmalloc.h                   |   4 -
 arch/h8300/include/uapi/asm/Kbuild                 |   2 -
 arch/h8300/include/uapi/asm/byteorder.h            |   7 -
 arch/h8300/include/uapi/asm/posix_types.h          |  13 -
 arch/h8300/include/uapi/asm/ptrace.h               |  43 --
 arch/h8300/include/uapi/asm/sigcontext.h           |  19 -
 arch/h8300/include/uapi/asm/signal.h               |  92 -----
 arch/h8300/include/uapi/asm/unistd.h               |   8 -
 arch/h8300/kernel/.gitignore                       |   2 -
 arch/h8300/kernel/Makefile                         |  22 --
 arch/h8300/kernel/asm-offsets.c                    |  70 ----
 arch/h8300/kernel/entry.S                          | 433 ---------------------
 arch/h8300/kernel/h8300_ksyms.c                    |  35 --
 arch/h8300/kernel/head_ram.S                       |  60 ---
 arch/h8300/kernel/head_rom.S                       | 111 ------
 arch/h8300/kernel/irq.c                            |  99 -----
 arch/h8300/kernel/kgdb.c                           | 135 -------
 arch/h8300/kernel/module.c                         |  71 ----
 arch/h8300/kernel/process.c                        | 173 --------
 arch/h8300/kernel/ptrace.c                         | 199 ----------
 arch/h8300/kernel/ptrace_h.c                       | 256 ------------
 arch/h8300/kernel/ptrace_s.c                       |  44 ---
 arch/h8300/kernel/setup.c                          | 213 ----------
 arch/h8300/kernel/signal.c                         | 287 --------------
 arch/h8300/kernel/sim-console.c                    |  31 --
 arch/h8300/kernel/syscalls.c                       |  15 -
 arch/h8300/kernel/traps.c                          | 156 --------
 arch/h8300/kernel/vmlinux.lds.S                    |  69 ----
 arch/h8300/lib/Makefile                            |   9 -
 arch/h8300/lib/abs.S                               |  21 -
 arch/h8300/lib/ashldi3.c                           |  25 --
 arch/h8300/lib/ashrdi3.c                           |  25 --
 arch/h8300/lib/delay.c                             |  41 --
 arch/h8300/lib/libgcc.h                            |  78 ----
 arch/h8300/lib/lshrdi3.c                           |  24 --
 arch/h8300/lib/memcpy.S                            |  86 ----
 arch/h8300/lib/memset.S                            |  70 ----
 arch/h8300/lib/moddivsi3.S                         |  73 ----
 arch/h8300/lib/modsi3.S                            |  73 ----
 arch/h8300/lib/muldi3.c                            |  45 ---
 arch/h8300/lib/mulsi3.S                            |  39 --
 arch/h8300/lib/ucmpdi2.c                           |  18 -
 arch/h8300/lib/udivsi3.S                           |  77 ----
 arch/h8300/mm/Makefile                             |   6 -
 arch/h8300/mm/fault.c                              |  57 ---
 arch/h8300/mm/init.c                               |  95 -----
 arch/h8300/mm/memory.c                             |  52 ---
 drivers/clk/Makefile                               |   1 -
 drivers/clk/h8300/Makefile                         |   3 -
 drivers/clk/h8300/clk-div.c                        |  57 ---
 drivers/clk/h8300/clk-h8s2678.c                    | 145 -------
 drivers/clocksource/Kconfig                        |  20 -
 drivers/clocksource/Makefile                       |   3 -
 drivers/clocksource/h8300_timer16.c                | 192 ---------
 drivers/clocksource/h8300_timer8.c                 | 211 ----------
 drivers/clocksource/h8300_tpu.c                    | 158 --------
 drivers/irqchip/Kconfig                            |  11 -
 drivers/irqchip/Makefile                           |   2 -
 drivers/irqchip/irq-renesas-h8300h.c               |  94 -----
 drivers/irqchip/irq-renesas-h8s.c                  | 102 -----
 drivers/net/ethernet/smsc/Kconfig                  |   4 +-
 drivers/net/ethernet/smsc/smc91x.h                 |  11 -
 drivers/tty/serial/Kconfig                         |   5 +-
 init/Kconfig                                       |   3 +-
 tools/arch/h8300/include/asm/bitsperlong.h         |  15 -
 tools/arch/h8300/include/uapi/asm/mman.h           |   7 -
 159 files changed, 5 insertions(+), 6922 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt
 delete mode 100644 Documentation/devicetree/bindings/h8300/cpu.txt
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8300h-intc.txt
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8s-intc.txt
 delete mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml
 delete mode 100644 arch/h8300/Kbuild
 delete mode 100644 arch/h8300/Kconfig
 delete mode 100644 arch/h8300/Kconfig.cpu
 delete mode 100644 arch/h8300/Kconfig.debug
 delete mode 100644 arch/h8300/Makefile
 delete mode 100644 arch/h8300/boot/Makefile
 delete mode 100644 arch/h8300/boot/compressed/Makefile
 delete mode 100644 arch/h8300/boot/compressed/head.S
 delete mode 100644 arch/h8300/boot/compressed/misc.c
 delete mode 100644 arch/h8300/boot/compressed/vmlinux.lds
 delete mode 100644 arch/h8300/boot/compressed/vmlinux.scr
 delete mode 100644 arch/h8300/boot/dts/Makefile
 delete mode 100644 arch/h8300/boot/dts/edosk2674.dts
 delete mode 100644 arch/h8300/boot/dts/h8300h_sim.dts
 delete mode 100644 arch/h8300/boot/dts/h8s_sim.dts
 delete mode 100644 arch/h8300/configs/edosk2674_defconfig
 delete mode 100644 arch/h8300/configs/h8300h-sim_defconfig
 delete mode 100644 arch/h8300/configs/h8s-sim_defconfig
 delete mode 100644 arch/h8300/include/asm/Kbuild
 delete mode 100644 arch/h8300/include/asm/bitops.h
 delete mode 100644 arch/h8300/include/asm/bug.h
 delete mode 100644 arch/h8300/include/asm/byteorder.h
 delete mode 100644 arch/h8300/include/asm/cache.h
 delete mode 100644 arch/h8300/include/asm/elf.h
 delete mode 100644 arch/h8300/include/asm/flat.h
 delete mode 100644 arch/h8300/include/asm/hash.h
 delete mode 100644 arch/h8300/include/asm/io.h
 delete mode 100644 arch/h8300/include/asm/irq.h
 delete mode 100644 arch/h8300/include/asm/irqflags.h
 delete mode 100644 arch/h8300/include/asm/kgdb.h
 delete mode 100644 arch/h8300/include/asm/mmu_context.h
 delete mode 100644 arch/h8300/include/asm/page.h
 delete mode 100644 arch/h8300/include/asm/page_offset.h
 delete mode 100644 arch/h8300/include/asm/pgtable.h
 delete mode 100644 arch/h8300/include/asm/processor.h
 delete mode 100644 arch/h8300/include/asm/ptrace.h
 delete mode 100644 arch/h8300/include/asm/signal.h
 delete mode 100644 arch/h8300/include/asm/smp.h
 delete mode 100644 arch/h8300/include/asm/string.h
 delete mode 100644 arch/h8300/include/asm/switch_to.h
 delete mode 100644 arch/h8300/include/asm/syscall.h
 delete mode 100644 arch/h8300/include/asm/thread_info.h
 delete mode 100644 arch/h8300/include/asm/tlb.h
 delete mode 100644 arch/h8300/include/asm/traps.h
 delete mode 100644 arch/h8300/include/asm/user.h
 delete mode 100644 arch/h8300/include/asm/vmalloc.h
 delete mode 100644 arch/h8300/include/uapi/asm/Kbuild
 delete mode 100644 arch/h8300/include/uapi/asm/byteorder.h
 delete mode 100644 arch/h8300/include/uapi/asm/posix_types.h
 delete mode 100644 arch/h8300/include/uapi/asm/ptrace.h
 delete mode 100644 arch/h8300/include/uapi/asm/sigcontext.h
 delete mode 100644 arch/h8300/include/uapi/asm/signal.h
 delete mode 100644 arch/h8300/include/uapi/asm/unistd.h
 delete mode 100644 arch/h8300/kernel/.gitignore
 delete mode 100644 arch/h8300/kernel/Makefile
 delete mode 100644 arch/h8300/kernel/asm-offsets.c
 delete mode 100644 arch/h8300/kernel/entry.S
 delete mode 100644 arch/h8300/kernel/h8300_ksyms.c
 delete mode 100644 arch/h8300/kernel/head_ram.S
 delete mode 100644 arch/h8300/kernel/head_rom.S
 delete mode 100644 arch/h8300/kernel/irq.c
 delete mode 100644 arch/h8300/kernel/kgdb.c
 delete mode 100644 arch/h8300/kernel/module.c
 delete mode 100644 arch/h8300/kernel/process.c
 delete mode 100644 arch/h8300/kernel/ptrace.c
 delete mode 100644 arch/h8300/kernel/ptrace_h.c
 delete mode 100644 arch/h8300/kernel/ptrace_s.c
 delete mode 100644 arch/h8300/kernel/setup.c
 delete mode 100644 arch/h8300/kernel/signal.c
 delete mode 100644 arch/h8300/kernel/sim-console.c
 delete mode 100644 arch/h8300/kernel/syscalls.c
 delete mode 100644 arch/h8300/kernel/traps.c
 delete mode 100644 arch/h8300/kernel/vmlinux.lds.S
 delete mode 100644 arch/h8300/lib/Makefile
 delete mode 100644 arch/h8300/lib/abs.S
 delete mode 100644 arch/h8300/lib/ashldi3.c
 delete mode 100644 arch/h8300/lib/ashrdi3.c
 delete mode 100644 arch/h8300/lib/delay.c
 delete mode 100644 arch/h8300/lib/libgcc.h
 delete mode 100644 arch/h8300/lib/lshrdi3.c
 delete mode 100644 arch/h8300/lib/memcpy.S
 delete mode 100644 arch/h8300/lib/memset.S
 delete mode 100644 arch/h8300/lib/moddivsi3.S
 delete mode 100644 arch/h8300/lib/modsi3.S
 delete mode 100644 arch/h8300/lib/muldi3.c
 delete mode 100644 arch/h8300/lib/mulsi3.S
 delete mode 100644 arch/h8300/lib/ucmpdi2.c
 delete mode 100644 arch/h8300/lib/udivsi3.S
 delete mode 100644 arch/h8300/mm/Makefile
 delete mode 100644 arch/h8300/mm/fault.c
 delete mode 100644 arch/h8300/mm/init.c
 delete mode 100644 arch/h8300/mm/memory.c
 delete mode 100644 drivers/clk/h8300/Makefile
 delete mode 100644 drivers/clk/h8300/clk-div.c
 delete mode 100644 drivers/clk/h8300/clk-h8s2678.c
 delete mode 100644 drivers/clocksource/h8300_timer16.c
 delete mode 100644 drivers/clocksource/h8300_timer8.c
 delete mode 100644 drivers/clocksource/h8300_tpu.c
 delete mode 100644 drivers/irqchip/irq-renesas-h8300h.c
 delete mode 100644 drivers/irqchip/irq-renesas-h8s.c
 delete mode 100644 tools/arch/h8300/include/asm/bitsperlong.h
 delete mode 100644 tools/arch/h8300/include/uapi/asm/mman.h
Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next
Already up to date.
Merging arm/for-next (012d2fb6c8c9 Merge branch 'devel-stable' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next
Auto-merging arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Auto-merging arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Auto-merging arch/arm/Kconfig.debug
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
Auto-merging arch/arm/boot/compressed/Makefile
CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile
Auto-merging arch/arm/include/asm/assembler.h
Auto-merging arch/arm/include/asm/cacheflush.h
Auto-merging arch/arm/include/asm/switch_to.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/switch_to.h
Auto-merging arch/arm/kernel/entry-armv.S
Auto-merging arch/arm/kernel/setup.c
Auto-merging arch/arm/kernel/smp.c
Auto-merging arch/arm/kernel/stacktrace.c
Auto-merging arch/arm/kernel/traps.c
CONFLICT (content): Merge conflict in arch/arm/kernel/traps.c
Auto-merging arch/arm/kernel/traps.c
Auto-merging arch/arm/mach-s3c/mach-jive.c
Auto-merging arch/arm/mm/ioremap.c
Auto-merging drivers/irqchip/irq-nvic.c
Auto-merging lib/Kconfig
Resolved 'arch/arm/Kconfig' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 0aa7d53dd8f1] Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git
$ git diff -M --stat --summary HEAD^..
 arch/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)
Merging arm64/for-next/core (641d80415729 Merge branch 'for-next/spectre-bhb' into for-next/core)
$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
Already up to date.
Merging arm-perf/for-next/perf (602c873eb52e perf: Replace acpi_bus_get_device())
$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf
Already up to date.
Merging arm-soc/for-next (bc2fb47db586 arm/arm64: dts: qcom: Fix boolean properties with values)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
Already up to date.
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next
Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts
Merge made by the 'ort' strategy.
Merging amlogic/for-next (0663dce87af9 Merge branch 'v5.19/dt64' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
Merge made by the 'ort' strategy.
 .../dts/amlogic/meson-axg-jethome-jethub-j100.dts  | 16 ++++++++---
 .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts |  6 ++++
 arch/arm64/boot/dts/amlogic/meson-s4.dtsi          | 33 ++++++++++++++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)
Merging aspeed/for-next (d9540eeaa3d1 Merge branches 'nuvoton-dt-for-v5.18' and 'dt-for-v5.18' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
Auto-merging arch/arm/boot/dts/aspeed-g4.dtsi
Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi
Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi
Merge made by the 'ort' strategy.
 arch/arm/boot/dts/aspeed-ast2600-evb.dts | 18 ++++++++++++++++++
 arch/arm/boot/dts/aspeed-g4.dtsi         |  6 ++++++
 arch/arm/boot/dts/aspeed-g5.dtsi         |  7 +++++++
 arch/arm/boot/dts/aspeed-g6.dtsi         | 19 +++++++++++++++++++
 4 files changed, 50 insertions(+)
Merging at91/at91-next (a845fa592554 Merge branch 'clk-at91' into at91-next)
$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
Auto-merging drivers/soc/microchip/mpfs-sys-controller.c
Auto-merging include/dt-bindings/clock/at91.h
Merge made by the 'ort' strategy.
Merging drivers-memory/for-next (c0e3693ba3f9 Merge branch 'mem-ctrl-next' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next
Merge made by the 'ort' strategy.
 drivers/memory/emif.c                   | 11 +----------
 drivers/memory/samsung/exynos5422-dmc.c |  5 ++---
 2 files changed, 3 insertions(+), 13 deletions(-)
Merging imx-mxs/for-next (d8d609f7588a Merge branch 'imx/dt64' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next
Auto-merging arch/arm/boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi
Merge made by the 'ort' strategy.
 Documentation/devicetree/bindings/arm/fsl.yaml     |  47 +
 arch/arm/boot/dts/Makefile                         |   7 +
 arch/arm/boot/dts/imx6dl-victgo.dts                |  85 +-
 arch/arm/boot/dts/imx6qdl-vicut1.dtsi              |  51 +-
 .../boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi    |   3 +-
 arch/arm/boot/dts/imx6ul-tqma6ul-common.dtsi       | 211 +++++
 arch/arm/boot/dts/imx6ul-tqma6ul1-mba6ulx.dts      |  55 ++
 arch/arm/boot/dts/imx6ul-tqma6ul1.dtsi             |  37 +
 arch/arm/boot/dts/imx6ul-tqma6ul2-mba6ulx.dts      |  15 +
 arch/arm/boot/dts/imx6ul-tqma6ul2.dtsi             |  71 ++
 arch/arm/boot/dts/imx6ul-tqma6ul2l-mba6ulx.dts     |  15 +
 arch/arm/boot/dts/imx6ul-tqma6ul2l.dtsi            |  71 ++
 arch/arm/boot/dts/imx6ul-tqma6ulx-common.dtsi      |  43 +
 arch/arm/boot/dts/imx6ul-tqma6ulxl-common.dtsi     |  48 +
 arch/arm/boot/dts/imx6ull-phytec-tauri-emmc.dts    |  20 +
 arch/arm/boot/dts/imx6ull-phytec-tauri-nand.dts    |  20 +
 arch/arm/boot/dts/imx6ull-phytec-tauri.dtsi        | 588 ++++++++++++
 arch/arm/boot/dts/imx6ull-tqma6ull2-mba6ulx.dts    |  15 +
 arch/arm/boot/dts/imx6ull-tqma6ull2.dtsi           |  76 ++
 arch/arm/boot/dts/imx6ull-tqma6ull2l-mba6ulx.dts   |  15 +
 arch/arm/boot/dts/imx6ull-tqma6ull2l.dtsi          |  76 ++
 arch/arm/boot/dts/mba6ulx.dtsi                     | 571 ++++++++++++
 arch/arm64/boot/dts/freescale/Makefile             |   1 +
 .../dts/freescale/imx8mm-data-modul-edm-sbc.dts    | 996 +++++++++++++++++++++
 .../boot/dts/freescale/imx8mm-kontron-n801x-s.dts  |   2 +-
 .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi   |   2 +-
 .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi   |   2 +-
 .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi   |   2 +-
 .../boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts    |  90 ++
 arch/arm64/boot/dts/freescale/imx8mn-evk.dts       |  54 +-
 arch/arm64/boot/dts/freescale/imx8mq.dtsi          |   7 +
 drivers/bus/imx-weim.c                             |   3 +-
 32 files changed, 3216 insertions(+), 83 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul-common.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul1-mba6ulx.dts
 create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul1.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2-mba6ulx.dts
 create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2l-mba6ulx.dts
 create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2l.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ulx-common.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ulxl-common.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri-emmc.dts
 create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri-nand.dts
 create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2-mba6ulx.dts
 create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2l-mba6ulx.dts
 create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2l.dtsi
 create mode 100644 arch/arm/boot/dts/mba6ulx.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc.dts
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next
Merge made by the 'ort' strategy.
Merging mediatek/for-next (6ceb6a96db4e Merge branch 'v5.17-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next
Auto-merging arch/arm/Kconfig
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'ort' strategy.
Merging mvebu/for-next (8885ae5142a4 Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi
Merge made by the 'ort' strategy.
Merging omap/for-next (f9ecc209330a Merge branch 'omap-for-v5.18/dt' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'ort' strategy.
Merging qcom/for-next (b8277c8275a1 Merge branches 'arm64-defconfig-for-5.18', 'arm64-for-5.18', 'clk-for-5.18', 'defconfig-for-5.18', 'drivers-for-5.18', 'dts-for-5.18', 'arm64-fixes-for-5.17' and 'dts-fixes-for-5.17' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml
Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml
Auto-merging arch/arm/configs/multi_v7_defconfig
CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
Auto-merging arch/arm/configs/multi_v7_defconfig
Auto-merging arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
Auto-merging arch/arm64/boot/dts/qcom/sm8350.dtsi
Auto-merging arch/arm64/boot/dts/qcom/sm8450.dtsi
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm64/configs/defconfig
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Resolved 'arch/arm64/configs/defconfig' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 063c4e60a89c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
$ git diff -M --stat --summary HEAD^..
 arch/arm64/configs/defconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)
Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next
Merge made by the 'ort' strategy.
 arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging renesas/next (eee41de7440d Merge branches 'renesas-arm-defconfig-for-v5.19', 'renesas-arm-dt-for-v5.19', 'renesas-drivers-for-v5.19' and 'renesas-dt-bindings-for-v5.19' into renesas-next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
Auto-merging arch/arm64/configs/defconfig
Merge made by the 'ort' strategy.
 .../bindings/power/renesas,rzg2l-sysc.yaml         |   5 +-
 arch/arm64/boot/dts/renesas/r8a77961.dtsi          |  25 +
 .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi      |  12 +-
 arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts    |  24 +
 arch/arm64/boot/dts/renesas/r8a779a0.dtsi          |  56 ++
 arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts  |  70 ---
 arch/arm64/boot/dts/renesas/r9a07g054.dtsi         | 584 ++++++++++++++++++++-
 arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts  |   8 -
 arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi   |  15 -
 arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi       |  15 +
 .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi |  57 +-
 arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi  |  61 +++
 arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi      |  15 +
 arch/arm64/configs/defconfig                       |   1 +
 drivers/soc/renesas/Kconfig                        |   6 +
 drivers/soc/renesas/renesas-soc.c                  |  13 +
 16 files changed, 833 insertions(+), 134 deletions(-)
Merging reset/reset/next (3f7bdc13154a dt-bindings: reset: uniphier-glue: Clean up clocks, resets, and their names using compatible string)
$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next
Merge made by the 'ort' strategy.
 .../bindings/reset/amlogic,meson-reset.yaml        |   1 +
 .../reset/socionext,uniphier-glue-reset.yaml       |  52 ++++++---
 drivers/reset/Kconfig                              |   2 +-
 drivers/reset/core.c                               |  15 ++-
 drivers/reset/reset-meson.c                        |   6 +
 drivers/reset/reset-simple.c                       |   1 +
 drivers/reset/reset-uniphier-glue.c                |  75 ++++++-------
 include/dt-bindings/reset/amlogic,meson-s4-reset.h | 125 +++++++++++++++++++++
 8 files changed, 220 insertions(+), 57 deletions(-)
 create mode 100644 include/dt-bindings/reset/amlogic,meson-s4-reset.h
Merging rockchip/for-next (f62180385a21 Merge branch 'v5.19-armsoc/soc32' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/arm/rockchip.yaml          |   5 +
 .../devicetree/bindings/soc/rockchip/grf.yaml      |   2 +
 arch/arm/boot/dts/rk3036.dtsi                      |   2 +-
 arch/arm/boot/dts/rk3188-bqedison2qc.dts           |   3 +-
 arch/arm/boot/dts/rk322x.dtsi                      |   2 +-
 arch/arm/mach-rockchip/platsmp.c                   |   2 +-
 arch/arm64/boot/dts/rockchip/Makefile              |   3 +-
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts    |   3 +-
 arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts |   3 +-
 .../boot/dts/rockchip/rk3399-khadas-edge.dtsi      |   3 +-
 arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts  |   3 +-
 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi   |   2 +-
 arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts   |   3 +-
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts |   2 +-
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts |   2 +-
 arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi   |   3 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           |   2 +-
 arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts |  40 +-
 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts    | 502 +++++++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk3568.dtsi           |  14 +
 arch/arm64/boot/dts/rockchip/rk356x.dtsi           |  28 ++
 drivers/soc/rockchip/pm_domains.c                  |   6 +-
 22 files changed, 612 insertions(+), 23 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
Merging samsung-krzk/for-next (2bf92593ef58 Merge branch 'for-v5.19/arm-dts-cleanups' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
Merge made by the 'ort' strategy.
 .../bindings/soc/samsung/exynos-usi.yaml           |  2 +-
 arch/arm/boot/dts/exynos3250.dtsi                  |  3 +-
 arch/arm/boot/dts/exynos4.dtsi                     |  4 +-
 arch/arm/boot/dts/exynos4412-odroidu3.dts          |  4 +-
 arch/arm/boot/dts/exynos4412-odroidx.dts           |  8 +--
 arch/arm/boot/dts/exynos5250.dtsi                  |  8 +--
 arch/arm/boot/dts/exynos5260.dtsi                  |  3 +-
 arch/arm/boot/dts/exynos5410-odroidxu.dts          |  4 +-
 arch/arm/boot/dts/exynos5422-odroid-core.dtsi      |  7 +--
 arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts    |  6 +--
 arch/arm/boot/dts/exynos5422-odroidxu3.dts         |  6 +--
 arch/arm/boot/dts/exynos54xx.dtsi                  |  3 +-
 arch/arm/boot/dts/nspire-classic.dtsi              | 10 ++--
 arch/arm/boot/dts/nspire-cx.dts                    |  4 +-
 arch/arm/boot/dts/nspire.dtsi                      | 60 +++++++++++-----------
 arch/arm/boot/dts/ox820.dtsi                       |  2 +-
 arch/arm/boot/dts/s5pv210.dtsi                     | 22 +++-----
 arch/arm/boot/dts/socfpga.dtsi                     |  2 +-
 arch/arm/boot/dts/socfpga_arria10.dtsi             |  2 +-
 arch/arm/configs/mini2440_defconfig                |  3 +-
 arch/arm/configs/s3c2410_defconfig                 |  2 +
 arch/arm/mach-s3c/Kconfig                          |  8 ---
 arch/arm/mach-s3c/Kconfig.s3c24xx                  |  2 -
 arch/arm/mach-s3c/iotiming-s3c2410.c               |  2 +-
 arch/arm/mach-s3c/pm-s3c64xx.c                     |  2 +-
 arch/arm/mach-s3c/s3c24xx.c                        |  2 +-
 arch/arm64/boot/dts/exynos/exynos5433.dtsi         |  3 +-
 arch/arm64/boot/dts/exynos/exynos850-e850-96.dts   |  5 ++
 arch/arm64/boot/dts/exynos/exynos850.dtsi          | 19 +------
 arch/arm64/boot/dts/tesla/fsd.dtsi                 |  2 +-
 30 files changed, 92 insertions(+), 118 deletions(-)
Merging scmi/for-linux-next (da005f876630 Merge tag 'scmi-fixes-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
Merge made by the 'ort' strategy.
Merging stm32/stm32-next (73ab99aad50c ARM: dts: stm32: Switch DWMAC RMII clock to MCO2 on DHCOM)
$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
Merge made by the 'ort' strategy.
 arch/arm/boot/dts/stm32mp15-pinctrl.dtsi     | 49 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 22 ++++++++++---
 2 files changed, 67 insertions(+), 4 deletions(-)
Merging sunxi/sunxi/for-next (cb6baf285212 Merge branch 'sunxi/dt-for-5.19' into sunxi/for-next)
$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
Merge made by the 'ort' strategy.
 Documentation/devicetree/bindings/arm/sunxi.yaml   |   5 +
 .../bindings/spi/allwinner,sun6i-a31-spi.yaml      |   1 +
 .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml |  24 ++---
 arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts  |  31 ++++++
 arch/arm/boot/dts/suniv-f1c100s.dtsi               | 104 +++++++++++++++++++--
 drivers/clk/sunxi-ng/ccu-sun6i-rtc.c               |   1 +
 6 files changed, 141 insertions(+), 25 deletions(-)
Merging tee/next (17522923771d Merge branch 'fixes' into next)
$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
Merge made by the 'ort' strategy.
 drivers/tee/Kconfig      |  5 +----
 drivers/tee/optee/call.c |  2 +-
 drivers/tee/tee_shm.c    | 35 +++++++++++++++++++++++++----------
 3 files changed, 27 insertions(+), 15 deletions(-)
Merging tegra/for-next (aee7f609222b Merge branch for-5.19/arm64/dt into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next
Merge made by the 'ort' strategy.
 arch/arm/configs/multi_v7_defconfig                |   1 +
 arch/arm/configs/tegra_defconfig                   |   3 +-
 arch/arm/mach-tegra/platsmp.c                      |   2 +-
 arch/arm64/boot/dts/nvidia/tegra194.dtsi           |  10 ++
 .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi |  12 +++
 arch/arm64/boot/dts/nvidia/tegra234.dtsi           |  28 ++++++
 drivers/memory/tegra/Makefile                      |   2 +
 drivers/memory/tegra/mc.c                          |   3 +
 drivers/memory/tegra/mc.h                          |   7 +-
 drivers/memory/tegra/tegra186-emc.c                |   3 +
 drivers/memory/tegra/tegra234.c                    | 101 +++++++++++++++++++++
 drivers/soc/tegra/fuse/fuse-tegra.c                |   8 +-
 drivers/soc/tegra/fuse/fuse-tegra30.c              |  17 +++-
 drivers/soc/tegra/pmc.c                            |  33 +++++--
 include/dt-bindings/clock/tegra234-clock.h         |   8 ++
 include/dt-bindings/reset/tegra234-reset.h         |   2 +
 16 files changed, 224 insertions(+), 16 deletions(-)
 create mode 100644 drivers/memory/tegra/tegra234.c
Merging ti/ti-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
Already up to date.
Merging xilinx/for-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
Already up to date.
Merging clk/clk-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
Already up to date.
Merging clk-imx/for-next (cdc86e473b35 clk: imx8mq: add 27m phy pll ref clock)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
Merge made by the 'ort' strategy.
 drivers/clk/imx/clk-imx8mq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging clk-renesas/renesas-clk (3733db1f7713 dt-bindings: clock: renesas: Document RZ/G2UL SoC)
$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
Merge made by the 'ort' strategy.
 Documentation/devicetree/bindings/clock/renesas,rzg2l-cpg.yaml | 7 ++++---
 drivers/clk/renesas/rzg2l-cpg.c                                | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)
Merging clk-samsung/for-next (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next
Already up to date.
Merging csky/linux-next (8c4d16471e2b csky: patch_text: Fixup last cpu should be master)
$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
Merge made by the 'ort' strategy.
 arch/csky/kernel/module.c         | 2 +-
 arch/csky/kernel/probes/kprobes.c | 2 +-
 arch/csky/kernel/probes/uprobes.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Merging m68k/for-next (0d52a01a266b m68k: defconfig: Disable fbdev on Sun3/3x)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
Already up to date.
Merging m68knommu/for-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
Already up to date.
Merging microblaze/next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
Already up to date.
Merging mips/mips-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
Already up to date.
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next
Already up to date.
Merging openrisc/for-next (862cf8d5fd98 openrisc/boot: Remove unnecessary initialisation in memcpy().)
$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next
Already up to date.
Merging parisc-hd/for-next (e34799ccc126 parisc: Change MAX_ADDRESS to become unsigned long long)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
Merge made by the 'ort' strategy.
 arch/parisc/Kconfig                         |  1 +
 arch/parisc/configs/generic-32bit_defconfig |  4 +++-
 arch/parisc/configs/generic-64bit_defconfig |  3 ++-
 arch/parisc/include/asm/cache.h             |  1 +
 arch/parisc/include/asm/cacheflush.h        |  5 +++--
 arch/parisc/include/asm/pgtable.h           |  2 +-
 arch/parisc/kernel/cache.c                  | 17 ++++++++++++++++-
 arch/parisc/kernel/pacache.S                |  3 ---
 arch/parisc/kernel/processor.c              | 11 +++++++++--
 drivers/video/console/sticore.c             | 21 +++++++++++++++++++++
 10 files changed, 57 insertions(+), 11 deletions(-)
Merging powerpc/next (af41d2866f7d powerpc/64: Fix build failure with allyesconfig in book3s_64_entry.S)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
Already up to date.
Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
Merging risc-v/for-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next
Already up to date.
Merging s390/for-next (c48d9782a16b Merge branch 'fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
Merge made by the 'ort' strategy.
Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size)
$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next
Already up to date.
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 -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master
Already up to date.
Merging uml/linux-next (82017457957a um: run_helper: Write error message to kernel log on exec failure on host)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next
Already up to date.
Merging xtensa/xtensa-for-next (a524d1566e0f xtensa: patch_text: Fixup last cpu should be master)
$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
Merge made by the 'ort' strategy.
 arch/xtensa/kernel/jump_label.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging pidfd/for-next (6009ff9e8020 Merge branch 'fs.mount_setattr.fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
Merging fscrypt/master (cdaa1b1941f6 fscrypt: update documentation for direct I/O support)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master
Already up to date.
Merging fscache/fscache-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next
Already up to date.
Merging afs/afs-next (26291c54e111 Linux 5.17-rc2)
$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next
Already up to date.
Merging btrfs/for-next (9b58921a376a Merge branch 'for-next-next-v5.18-20220404' into for-next-20220404)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
Auto-merging fs/btrfs/inode.c
Merge made by the 'ort' strategy.
 fs/btrfs/acl.c              |   39 +-
 fs/btrfs/block-group.c      |  107 +--
 fs/btrfs/block-group.h      |    4 +
 fs/btrfs/check-integrity.c  |   10 +-
 fs/btrfs/compression.c      |   44 +-
 fs/btrfs/ctree.c            |  100 ++-
 fs/btrfs/ctree.h            |  113 +++-
 fs/btrfs/delalloc-space.c   |    9 +-
 fs/btrfs/dev-replace.c      |   52 +-
 fs/btrfs/dir-item.c         |   31 +-
 fs/btrfs/disk-io.c          |   62 +-
 fs/btrfs/disk-io.h          |    4 +-
 fs/btrfs/extent-tree.c      |   11 +-
 fs/btrfs/extent_io.c        |  172 +++--
 fs/btrfs/extent_io.h        |    2 +
 fs/btrfs/file.c             |  280 +++-----
 fs/btrfs/free-space-cache.c |    7 +-
 fs/btrfs/inode.c            | 1550 ++++++++++++++++++++++---------------------
 fs/btrfs/ioctl.c            |  241 ++++---
 fs/btrfs/props.c            |   40 +-
 fs/btrfs/props.h            |    4 -
 fs/btrfs/qgroup.c           |    7 +-
 fs/btrfs/qgroup.h           |   12 +-
 fs/btrfs/raid56.c           |   29 +-
 fs/btrfs/reflink.c          |   23 +-
 fs/btrfs/relocation.c       |   16 +-
 fs/btrfs/root-tree.c        |    3 +-
 fs/btrfs/scrub.c            |  708 ++++++++++----------
 fs/btrfs/send.c             |  227 ++-----
 fs/btrfs/space-info.c       |   11 +-
 fs/btrfs/space-info.h       |    6 +
 fs/btrfs/subpage.c          |   55 +-
 fs/btrfs/subpage.h          |    2 +
 fs/btrfs/super.c            |    6 +-
 fs/btrfs/sysfs.c            |   43 +-
 fs/btrfs/tree-checker.c     |   55 ++
 fs/btrfs/tree-checker.h     |    1 +
 fs/btrfs/tree-log.c         |    8 +-
 fs/btrfs/volumes.c          |   56 +-
 fs/btrfs/xattr.c            |   40 +-
 fs/btrfs/zoned.c            |   27 +
 fs/btrfs/zoned.h            |   12 +-
 include/linux/fs.h          |    5 +
 43 files changed, 2169 insertions(+), 2065 deletions(-)
Merging ceph/master (f639d9867eea ceph: fix memory leak in ceph_readdir when note_last_dentry returns error)
$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
Already up to date.
Merging cifs/for-next (7cd1cc415dd8 cifs: update internal module number)
$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
Merge made by the 'ort' strategy.
 fs/cifs/cifsfs.h   |  2 +-
 fs/cifs/connect.c  | 15 +++++++++------
 fs/cifs/netmisc.c  |  2 +-
 fs/cifs/smb2misc.c | 10 ++++++----
 4 files changed, 17 insertions(+), 12 deletions(-)
Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem())
$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next
Already up to date.
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 -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
Already up to date.
Merging erofs/dev (a1108dcd9373 erofs: rename ctime to mtime)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
Already up to date.
Merging exfat/dev (0c404308d41f exfat: fix referencing wrong parent directory information after renaming)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
Merge made by the 'ort' strategy.
 fs/exfat/namei.c | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)
Merging ext3/for_next (f06e95c3a4ca Merge fsnotify cleanup from Bang Li.)
$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
Merge made by the 'ort' strategy.
Merging ext4/dev (c7cded845fc1 ext4: truncate during setxattr leads to kernel panic)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
Auto-merging fs/ext4/inode.c
Auto-merging fs/ext4/super.c
Merge made by the 'ort' strategy.
 fs/ext4/ext4.h    |  2 +-
 fs/ext4/extents.c | 32 +++++++++++++++++++++++++-------
 fs/ext4/inode.c   |  7 ++++++-
 fs/ext4/super.c   |  1 +
 fs/ext4/xattr.c   | 34 ++++++++++++++++++++++++++++++++--
 5 files changed, 65 insertions(+), 11 deletions(-)
Merging f2fs/dev (519129040766 Merge tag 'for-5.18-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
Already up to date.
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity
Already up to date.
Merging fuse/for-next (0c4bcfdecb1a fuse: fix pipe buffer lifetime for direct_io)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
Already up to date.
Merging gfs2/for-next (1b2de0791571 gfs2: Mark the remaining process-independent glock holders as GL_NOPID)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
Merge made by the 'ort' strategy.
 fs/gfs2/file.c       |  7 +++++--
 fs/gfs2/glock.c      | 39 +++++++++++++++++++++++++++++----------
 fs/gfs2/glock.h      |  1 +
 fs/gfs2/inode.c      |  7 +++++--
 fs/gfs2/lops.c       |  5 +++--
 fs/gfs2/ops_fstype.c | 14 ++++++++------
 fs/gfs2/quota.c      | 13 +++++--------
 fs/gfs2/recovery.c   | 22 ++++++++++------------
 fs/gfs2/super.c      |  3 ++-
 fs/gfs2/util.c       |  5 +++--
 10 files changed, 71 insertions(+), 45 deletions(-)
Merging jfs/jfs-next (a53046291020 jfs: prevent NULL deref in diFree)
$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
Already up to date.
Merging ksmbd/ksmbd-for-next (edf5f0548fbb ksmbd: replace usage of found with dedicated list iterator variable)
$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
Already up to date.
Merging nfs/linux-next (f00432063db1 SUNRPC: Ensure we flush any closed sockets before xs_xprt_free())
$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next
Auto-merging fs/nfs/inode.c
Auto-merging include/linux/sunrpc/xprt.h
Auto-merging include/trace/events/sunrpc.h
Auto-merging net/sunrpc/xprt.c
Merge made by the 'ort' strategy.
 fs/file_table.c               |  1 +
 fs/nfs/Kconfig                |  4 ----
 fs/nfs/dir.c                  | 19 +++----------------
 fs/nfs/inode.c                |  1 -
 fs/nfs/internal.h             | 10 ++++++++++
 fs/nfs/nfs4file.c             |  6 ++++--
 include/linux/sunrpc/xprt.h   |  5 ++---
 include/trace/events/sunrpc.h |  1 -
 net/sunrpc/clnt.c             |  6 +++---
 net/sunrpc/xprt.c             | 30 ++++++++++++++++--------------
 net/sunrpc/xprtsock.c         | 20 +++++++++++++++-----
 11 files changed, 54 insertions(+), 49 deletions(-)
Merging nfs-anna/linux-next (d19e0183a883 NFS: Do not report writeback errors in nfs_getattr())
$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next
Already up to date.
Merging nfsd/for-next (c1dbd5583235 fs/lock: add helper locks_owner_has_blockers to check for blockers)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next
Auto-merging Documentation/filesystems/locking.rst
Auto-merging include/linux/fs.h
Merge made by the 'ort' strategy.
 Documentation/filesystems/locking.rst |  2 ++
 fs/locks.c                            | 48 ++++++++++++++++++++++++++++++-----
 include/linux/fs.h                    |  8 ++++++
 3 files changed, 51 insertions(+), 7 deletions(-)
Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED)
$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
Auto-merging fs/ntfs3/file.c
Auto-merging fs/ntfs3/inode.c
Merge made by the 'ort' strategy.
 fs/ntfs3/file.c    |  12 +++--
 fs/ntfs3/frecord.c |  10 ++--
 fs/ntfs3/fslog.c   |   6 ++-
 fs/ntfs3/inode.c   |   8 +++-
 fs/ntfs3/xattr.c   | 136 ++++++++++++++++++++++++++++++++++++++++++++++-------
 5 files changed, 145 insertions(+), 27 deletions(-)
Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper)
$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next
Already up to date.
Merging ubifs/next (705757274599 ubifs: rename_whiteout: correct old_dir size computing)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
Already up to date.
Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first")
$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
Already up to date.
Merging xfs/for-next (919edbadebe1 xfs: drop async cache flushes from CIL commits.)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
Already up to date.
Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
Auto-merging fs/zonefs/super.c
CONFLICT (content): Merge conflict in fs/zonefs/super.c
Resolved 'fs/zonefs/super.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master b14710f009f5] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
$ git diff -M --stat --summary HEAD^..
Merging iomap/iomap-for-next (ebb7fb1557b1 xfs, iomap: limit individual ioend chain lengths in writeback)
$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next
Already up to date.
Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap)
$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next
Already up to date.
Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes)
$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next
Auto-merging include/linux/fs.h
Merge made by the 'ort' strategy.
Merging vfs/for-next (fd78f28f9f50 Merge branch 'work.namei' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
Auto-merging fs/internal.h
Auto-merging fs/namespace.c
Auto-merging fs/namespace.c
Auto-merging fs/nfs/nfs4file.c
Auto-merging include/linux/fs.h
Merge made by the 'ort' strategy.
 arch/alpha/kernel/osf_sys.c |  1 +
 fs/fsopen.c                 |  4 ++--
 fs/internal.h               |  1 +
 fs/namei.c                  | 11 ++---------
 fs/namespace.c              | 13 ++++---------
 fs/nfs/nfs4file.c           |  4 ++--
 include/linux/fs.h          | 11 -----------
 include/linux/mount.h       | 29 +++++++++++++++++------------
 kernel/usermode_driver.c    |  4 ++--
 security/smack/smackfs.c    |  1 +
 10 files changed, 32 insertions(+), 47 deletions(-)
Merging printk/for-next (c5f75d490fc2 Merge branch 'for-5.18' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
Auto-merging kernel/printk/printk.c
Auto-merging lib/vsprintf.c
Merge made by the 'ort' strategy.
Merging pci/next (5e8cf6bbbf3d Merge branch 'pci/resource')
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next
Merge made by the 'ort' strategy.
 arch/x86/include/asm/e820/api.h |  5 +++++
 arch/x86/kernel/resource.c      | 25 +++++++++++++++++--------
 arch/x86/pci/acpi.c             |  5 +++++
 drivers/pci/pci-acpi.c          | 41 ++++++++++++++++++++++++++++++-----------
 4 files changed, 57 insertions(+), 19 deletions(-)
Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code)
$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
Already up to date.
Merging hid/for-next (ceaaa0282c06 Merge branch 'for-5.18/upstream-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
Merge made by the 'ort' strategy.
 drivers/hid/hid-ids.h                   | 1 +
 drivers/hid/hid-multitouch.c            | 6 ++++++
 drivers/hid/intel-ish-hid/ipc/hw-ish.h  | 2 ++
 drivers/hid/intel-ish-hid/ipc/pci-ish.c | 2 ++
 4 files changed, 11 insertions(+)
Merging i2c/i2c/for-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
Already up to date.
Merging i3c/i3c/next (6cbf8b38dfe3 i3c: fix uninitialized variable use in i2c setup)
$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
Already up to date.
Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias)
$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next
Already up to date.
Merging hwmon-staging/hwmon-next (a5af7ccaf512 hwmon: (aquacomputer_d5next) Add support for Aquacomputer Octo)
$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next
Merge made by the 'ort' strategy.
 Documentation/hwmon/aquacomputer_d5next.rst |   4 +
 drivers/hwmon/Kconfig                       |   7 +-
 drivers/hwmon/aquacomputer_d5next.c         | 433 ++++++++++++++++++++++++----
 drivers/hwmon/asus-ec-sensors.c             |   3 +-
 drivers/hwmon/jc42.c                        |   2 +
 drivers/hwmon/peci/dimmtemp.c               |  13 +-
 6 files changed, 399 insertions(+), 63 deletions(-)
Merging jc_docs/docs-next (4407cca0109c docs/zh_CN: Add schedutil Chinese translation)
$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
Merge made by the 'ort' strategy.
 Documentation/dev-tools/testing-overview.rst       |  63 +++++
 Documentation/doc-guide/kernel-doc.rst             |   2 +
 Documentation/doc-guide/sphinx.rst                 |   5 +-
 Documentation/driver-api/thermal/intel_dptf.rst    |   2 +-
 Documentation/kernel-hacking/hacking.rst           |  36 +--
 Documentation/kernel-hacking/locking.rst           |   5 +-
 .../process/embargoed-hardware-issues.rst          |   2 +-
 Documentation/process/submitting-patches.rst       |   5 +-
 .../zh_CN/admin-guide/mm/damon/reclaim.rst         |   4 +-
 .../zh_CN/admin-guide/mm/damon/usage.rst           | 291 ++++++++++++++++++++-
 .../translations/zh_CN/scheduler/index.rst         |   2 +
 .../translations/zh_CN/scheduler/sched-debug.rst   |  51 ++++
 .../translations/zh_CN/scheduler/schedutil.rst     | 165 ++++++++++++
 .../translations/zh_CN/vm/damon/design.rst         |   7 +-
 Documentation/translations/zh_CN/vm/frontswap.rst  | 196 ++++++++++++++
 Documentation/translations/zh_CN/vm/hwpoison.rst   | 166 ++++++++++++
 Documentation/translations/zh_CN/vm/index.rst      |  24 +-
 .../translations/zh_CN/vm/memory-model.rst         | 135 ++++++++++
 .../translations/zh_CN/vm/mmu_notifier.rst         |  97 +++++++
 .../zh_CN/vm/overcommit-accounting.rst             |  86 ++++++
 Documentation/translations/zh_CN/vm/page_frags.rst |  38 +++
 Documentation/translations/zh_CN/vm/page_owner.rst | 116 ++++++++
 .../translations/zh_CN/vm/page_table_check.rst     |  56 ++++
 .../translations/zh_CN/vm/remap_file_pages.rst     |  32 +++
 .../zh_CN/vm/split_page_table_lock.rst             |  96 +++++++
 Documentation/translations/zh_CN/vm/z3fold.rst     |  31 +++
 Documentation/translations/zh_CN/vm/zsmalloc.rst   |  78 ++++++
 Documentation/w1/slaves/w1_therm.rst               |   9 +-
 Documentation/x86/exception-tables.rst             |  23 +-
 29 files changed, 1757 insertions(+), 66 deletions(-)
 create mode 100644 Documentation/translations/zh_CN/scheduler/sched-debug.rst
 create mode 100644 Documentation/translations/zh_CN/scheduler/schedutil.rst
 create mode 100644 Documentation/translations/zh_CN/vm/frontswap.rst
 create mode 100644 Documentation/translations/zh_CN/vm/hwpoison.rst
 create mode 100644 Documentation/translations/zh_CN/vm/memory-model.rst
 create mode 100644 Documentation/translations/zh_CN/vm/mmu_notifier.rst
 create mode 100644 Documentation/translations/zh_CN/vm/overcommit-accounting.rst
 create mode 100644 Documentation/translations/zh_CN/vm/page_frags.rst
 create mode 100644 Documentation/translations/zh_CN/vm/page_owner.rst
 create mode 100644 Documentation/translations/zh_CN/vm/page_table_check.rst
 create mode 100644 Documentation/translations/zh_CN/vm/remap_file_pages.rst
 create mode 100644 Documentation/translations/zh_CN/vm/split_page_table_lock.rst
 create mode 100644 Documentation/translations/zh_CN/vm/z3fold.rst
 create mode 100644 Documentation/translations/zh_CN/vm/zsmalloc.rst
Merging v4l-dvb/master (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master
Already up to date.
Merging v4l-dvb-next/master (535f49a9e1f9 media: platform: imx-mipi-csis: Add dependency on VIDEO_DEV)
$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
Merge made by the 'ort' strategy.
 drivers/media/usb/dvb-usb/a800.c            |  18 +-
 drivers/media/usb/dvb-usb/af9005.c          |  19 +-
 drivers/media/usb/dvb-usb/az6027.c          |  45 +-
 drivers/media/usb/dvb-usb/cinergyT2-core.c  |  10 +-
 drivers/media/usb/dvb-usb/cxusb.c           |  88 +---
 drivers/media/usb/dvb-usb/dib0700_devices.c | 428 +++++++++++--------
 drivers/media/usb/dvb-usb/dibusb-mb.c       | 165 ++++----
 drivers/media/usb/dvb-usb/dibusb-mc.c       |  88 ++--
 drivers/media/usb/dvb-usb/digitv.c          |  13 +-
 drivers/media/usb/dvb-usb/dtt200u.c         |  56 ++-
 drivers/media/usb/dvb-usb/dtv5100.c         |  11 +-
 drivers/media/usb/dvb-usb/dw2102.c          |  84 ++--
 drivers/media/usb/dvb-usb/gp8psk.c          |  36 +-
 drivers/media/usb/dvb-usb/m920x.c           |  51 ++-
 drivers/media/usb/dvb-usb/nova-t-usb2.c     |  18 +-
 drivers/media/usb/dvb-usb/opera1.c          |  15 +-
 drivers/media/usb/dvb-usb/pctv452e.c        |  22 +-
 drivers/media/usb/dvb-usb/technisat-usb2.c  |  11 +-
 drivers/media/usb/dvb-usb/ttusb2.c          |  36 +-
 drivers/media/usb/dvb-usb/umt-010.c         |  18 +-
 drivers/media/usb/dvb-usb/vp702x.c          |  23 +-
 drivers/media/usb/dvb-usb/vp7045.c          |  28 +-
 include/media/dvb-usb-ids.h                 | 632 +++++++++++++++-------------
 23 files changed, 1071 insertions(+), 844 deletions(-)
Merging pm/linux-next (2f7fc67b4d3f Merge branch 'thermal-int340x' into linux-next)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
Auto-merging drivers/spi/spi.c
Merge made by the 'ort' strategy.
 drivers/acpi/processor_idle.c                      |  3 +-
 drivers/acpi/property.c                            | 36 ++++++++++++++++---
 drivers/acpi/scan.c                                | 13 -------
 drivers/base/property.c                            | 42 ++++------------------
 drivers/iio/chemical/scd30.h                       |  5 +--
 drivers/iio/chemical/scd30_core.c                  | 10 +++---
 drivers/iio/chemical/scd30_i2c.c                   |  3 +-
 drivers/iio/chemical/scd30_serial.c                |  3 +-
 drivers/of/property.c                              | 34 ++++++++++++++++++
 drivers/spi/spi.c                                  |  3 +-
 .../intel/int340x_thermal/int3400_thermal.c        | 24 +++++--------
 include/acpi/acpi_bus.h                            |  1 -
 include/linux/fwnode.h                             |  5 +++
 include/linux/pm.h                                 | 14 +++++---
 include/linux/pm_runtime.h                         | 10 ++++--
 15 files changed, 116 insertions(+), 90 deletions(-)
Merging cpufreq-arm/cpufreq/arm/linux-next (f84ccad5f566 cpufreq: qcom-cpufreq-hw: Fix throttle frequency value on EPSS platforms)
$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next
Merge made by the 'ort' strategy.
 drivers/cpufreq/qcom-cpufreq-hw.c | 62 +++++++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 13 deletions(-)
Merging cpupower/cpupower (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
Already up to date.
Merging devfreq/devfreq-next (93515220624f PM / devfreq: rk3399_dmc: Avoid static (reused) profile)
$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/devfreq/rk3399_dmc.txt     | 212 ------------
 .../memory-controllers/rockchip,rk3399-dmc.yaml    | 384 +++++++++++++++++++++
 drivers/devfreq/rk3399_dmc.c                       | 299 +++++++---------
 3 files changed, 518 insertions(+), 377 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt
 create mode 100644 Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml
Merging opp/opp/linux-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next
Already up to date.
Merging thermal/thermal/linux-next (1379d28e840f thermal: rcar_thermal: Use platform_get_irq_optional() to get the interrupt)
$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/thermal/rzg2l-thermal.yaml      |  1 +
 drivers/thermal/rcar_thermal.c                          | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next
Already up to date.
Merging dlm/next (e425ac99b157 fs: dlm: cast resource pointer to uintptr_t)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
Merge made by the 'ort' strategy.
 fs/dlm/dir.c          |   2 +-
 fs/dlm/dlm_internal.h |  66 +++---
 fs/dlm/lock.c         | 620 ++++++++++++++++++++++++++------------------------
 fs/dlm/lockspace.c    |  12 +
 fs/dlm/lockspace.h    |   1 +
 fs/dlm/lowcomms.c     |  12 +-
 fs/dlm/member.c       |  11 +-
 fs/dlm/midcomms.c     |  61 ++---
 fs/dlm/plock.c        | 178 +++++++--------
 fs/dlm/rcom.c         | 120 +++++-----
 fs/dlm/recover.c      |  49 ++--
 fs/dlm/requestqueue.c |  20 +-
 fs/dlm/user.c         |  16 +-
 fs/dlm/util.c         |  92 +-------
 fs/dlm/util.h         |   8 +-
 15 files changed, 613 insertions(+), 655 deletions(-)
Merging rdma/for-next (22cbc6c2681a IB/rdmavt: add missing locks in rvt_ruc_loopback)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
Auto-merging drivers/infiniband/sw/rdmavt/qp.c
Merge made by the 'ort' strategy.
 drivers/infiniband/core/uverbs_cmd.c |   6 +-
 drivers/infiniband/hw/irdma/puda.c   |   7 +-
 drivers/infiniband/sw/rdmavt/qp.c    |   6 +-
 include/rdma/ib_verbs.h              | 122 ++++++++++++++++++++++-------------
 include/uapi/rdma/ib_user_verbs.h    |  38 +++++++++++
 5 files changed, 126 insertions(+), 53 deletions(-)
Merging net-next/master (e8bd70250a82 prestera: acl: add action hw_stats support)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master
Auto-merging drivers/net/mdio/mdio-mscc-miim.c
Auto-merging net/core/filter.c
Auto-merging net/mctp/af_mctp.c
Merge made by the 'ort' strategy.
 .../arm/mediatek/mediatek,mt7622-pcie-mirror.yaml  |   42 +
 .../bindings/arm/mediatek/mediatek,mt7622-wed.yaml |   50 +
 .../devicetree/bindings/net/mediatek-net.txt       |   10 +
 .../devicetree/bindings/net/mscc,miim.yaml         |   61 +
 .../devicetree/bindings/net/mscc-miim.txt          |   26 -
 arch/arm64/boot/dts/mediatek/mt7622.dtsi           |   32 +-
 arch/mips/configs/gpr_defconfig                    |    1 -
 arch/mips/configs/mtx1_defconfig                   |    1 -
 drivers/isdn/mISDN/socket.c                        |    2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h    |    2 +-
 .../net/ethernet/marvell/prestera/prestera_acl.c   |    7 -
 .../ethernet/marvell/prestera/prestera_flower.c    |   18 +
 drivers/net/ethernet/mediatek/Kconfig              |    4 +
 drivers/net/ethernet/mediatek/Makefile             |    5 +
 drivers/net/ethernet/mediatek/mtk_eth_soc.c        |  131 +-
 drivers/net/ethernet/mediatek/mtk_eth_soc.h        |   14 +-
 drivers/net/ethernet/mediatek/mtk_ppe.c            |  368 +++-
 drivers/net/ethernet/mediatek/mtk_ppe.h            |   89 +-
 drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c    |    1 -
 drivers/net/ethernet/mediatek/mtk_ppe_offload.c    |  189 +-
 drivers/net/ethernet/mediatek/mtk_wed.c            |  875 +++++++++
 drivers/net/ethernet/mediatek/mtk_wed.h            |  135 ++
 drivers/net/ethernet/mediatek/mtk_wed_debugfs.c    |  175 ++
 drivers/net/ethernet/mediatek/mtk_wed_ops.c        |    8 +
 drivers/net/ethernet/mediatek/mtk_wed_regs.h       |  251 +++
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |   20 +-
 drivers/net/ethernet/xilinx/ll_temac_main.c        |    2 +-
 drivers/net/mdio/mdio-mscc-miim.c                  |   58 +-
 drivers/net/ppp/pppoe.c                            |    3 +-
 drivers/net/usb/qmi_wwan.c                         |    1 -
 drivers/net/wan/Kconfig                            |   28 -
 drivers/net/wan/Makefile                           |    2 -
 drivers/net/wan/lmc/Makefile                       |   18 -
 drivers/net/wan/lmc/lmc.h                          |   33 -
 drivers/net/wan/lmc/lmc_debug.c                    |   65 -
 drivers/net/wan/lmc/lmc_debug.h                    |   52 -
 drivers/net/wan/lmc/lmc_ioctl.h                    |  255 ---
 drivers/net/wan/lmc/lmc_main.c                     | 2009 --------------------
 drivers/net/wan/lmc/lmc_media.c                    | 1206 ------------
 drivers/net/wan/lmc/lmc_proto.c                    |  106 --
 drivers/net/wan/lmc/lmc_proto.h                    |   18 -
 drivers/net/wan/lmc/lmc_var.h                      |  468 -----
 include/linux/netdevice.h                          |   10 +-
 include/linux/skbuff.h                             |    3 +-
 include/linux/soc/mediatek/mtk_wed.h               |  131 ++
 include/net/if_inet6.h                             |    8 +
 include/net/tcp.h                                  |   19 +-
 include/trace/events/tcp.h                         |    2 +-
 include/uapi/linux/tipc_config.h                   |   28 +-
 net/appletalk/ddp.c                                |    3 +-
 net/atm/common.c                                   |    2 +-
 net/ax25/af_ax25.c                                 |    3 +-
 net/bluetooth/af_bluetooth.c                       |    3 +-
 net/bluetooth/hci_sock.c                           |    3 +-
 net/caif/caif_socket.c                             |    2 +-
 net/can/bcm.c                                      |    5 +-
 net/can/isotp.c                                    |    4 +-
 net/can/j1939/socket.c                             |    2 +-
 net/can/raw.c                                      |    6 +-
 net/core/datagram.c                                |    5 +-
 net/core/dev.c                                     |    6 +-
 net/core/filter.c                                  |    2 +-
 net/core/rtnetlink.c                               |   33 +
 net/ieee802154/socket.c                            |    6 +-
 net/ipv4/ping.c                                    |    3 +-
 net/ipv4/raw.c                                     |    3 +-
 net/ipv4/tcp.c                                     |    8 +-
 net/ipv4/tcp_bbr.c                                 |   20 +-
 net/ipv4/tcp_bic.c                                 |   14 +-
 net/ipv4/tcp_cdg.c                                 |   30 +-
 net/ipv4/tcp_cong.c                                |   18 +-
 net/ipv4/tcp_cubic.c                               |   22 +-
 net/ipv4/tcp_dctcp.c                               |   11 +-
 net/ipv4/tcp_highspeed.c                           |   18 +-
 net/ipv4/tcp_htcp.c                                |   10 +-
 net/ipv4/tcp_hybla.c                               |   18 +-
 net/ipv4/tcp_illinois.c                            |   12 +-
 net/ipv4/tcp_input.c                               |   36 +-
 net/ipv4/tcp_ipv4.c                                |    2 +-
 net/ipv4/tcp_lp.c                                  |    6 +-
 net/ipv4/tcp_metrics.c                             |   12 +-
 net/ipv4/tcp_nv.c                                  |   24 +-
 net/ipv4/tcp_output.c                              |   30 +-
 net/ipv4/tcp_rate.c                                |    2 +-
 net/ipv4/tcp_scalable.c                            |    4 +-
 net/ipv4/tcp_vegas.c                               |   21 +-
 net/ipv4/tcp_veno.c                                |   24 +-
 net/ipv4/tcp_westwood.c                            |    3 +-
 net/ipv4/tcp_yeah.c                                |   30 +-
 net/ipv6/addrconf.c                                |   30 +-
 net/ipv6/ip6_tunnel.c                              |    2 -
 net/ipv6/raw.c                                     |    3 +-
 net/ipv6/tcp_ipv6.c                                |    2 +-
 net/iucv/af_iucv.c                                 |    3 +-
 net/key/af_key.c                                   |    2 +-
 net/l2tp/l2tp_ip.c                                 |    3 +-
 net/l2tp/l2tp_ip6.c                                |    3 +-
 net/l2tp/l2tp_ppp.c                                |    3 +-
 net/mctp/af_mctp.c                                 |    2 +-
 net/mctp/test/route-test.c                         |    8 +-
 net/netlink/af_netlink.c                           |    3 +-
 net/netrom/af_netrom.c                             |    3 +-
 net/nfc/llcp_sock.c                                |    3 +-
 net/nfc/rawsock.c                                  |    3 +-
 net/packet/af_packet.c                             |    2 +-
 net/phonet/datagram.c                              |    3 +-
 net/phonet/pep.c                                   |    6 +-
 net/qrtr/af_qrtr.c                                 |    3 +-
 net/rose/af_rose.c                                 |    3 +-
 net/unix/af_unix.c                                 |    5 +-
 net/vmw_vsock/vmci_transport.c                     |    5 +-
 net/x25/af_x25.c                                   |    3 +-
 112 files changed, 2886 insertions(+), 4725 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-pcie-mirror.yaml
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml
 create mode 100644 Documentation/devicetree/bindings/net/mscc,miim.yaml
 delete mode 100644 Documentation/devicetree/bindings/net/mscc-miim.txt
 create mode 100644 drivers/net/ethernet/mediatek/mtk_wed.c
 create mode 100644 drivers/net/ethernet/mediatek/mtk_wed.h
 create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
 create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_ops.c
 create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_regs.h
 delete mode 100644 drivers/net/wan/lmc/Makefile
 delete mode 100644 drivers/net/wan/lmc/lmc.h
 delete mode 100644 drivers/net/wan/lmc/lmc_debug.c
 delete mode 100644 drivers/net/wan/lmc/lmc_debug.h
 delete mode 100644 drivers/net/wan/lmc/lmc_ioctl.h
 delete mode 100644 drivers/net/wan/lmc/lmc_main.c
 delete mode 100644 drivers/net/wan/lmc/lmc_media.c
 delete mode 100644 drivers/net/wan/lmc/lmc_proto.c
 delete mode 100644 drivers/net/wan/lmc/lmc_proto.h
 delete mode 100644 drivers/net/wan/lmc/lmc_var.h
 create mode 100644 include/linux/soc/mediatek/mtk_wed.h
Merging bpf-next/for-next (ded6dffaed5e libbpf: Fix use #ifdef instead of #if to avoid compiler warning)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
Auto-merging kernel/trace/bpf_trace.c
Auto-merging tools/lib/bpf/Makefile
Merge made by the 'ort' strategy.
 arch/arm64/include/asm/insn.h                      |    9 +
 arch/arm64/lib/insn.c                              |   67 +-
 arch/arm64/net/bpf_jit.h                           |   17 +
 arch/arm64/net/bpf_jit_comp.c                      |  255 +++-
 include/uapi/linux/btf.h                           |    4 +-
 kernel/bpf/bpf_iter.c                              |   30 +-
 kernel/bpf/stackmap.c                              |    1 -
 kernel/bpf/verifier.c                              |   61 +-
 kernel/trace/bpf_trace.c                           |    6 +-
 lib/test_bpf.c                                     |  315 ++++-
 net/netfilter/nf_conntrack_bpf.c                   |   22 +-
 samples/bpf/Makefile                               |   10 +-
 samples/bpf/syscall_tp_user.c                      |    3 +
 samples/bpf/xdp_router_ipv4.bpf.c                  |  180 +++
 samples/bpf/xdp_router_ipv4_kern.c                 |  186 ---
 samples/bpf/xdp_router_ipv4_user.c                 |  465 +++----
 tools/bpf/bpftool/feature.c                        |    2 +-
 tools/bpf/bpftool/link.c                           |    3 +
 tools/bpf/bpftool/prog.c                           |    1 +
 tools/include/uapi/linux/btf.h                     |    4 +-
 tools/lib/bpf/Build                                |    3 +-
 tools/lib/bpf/Makefile                             |    2 +-
 tools/lib/bpf/btf.c                                |    6 +-
 tools/lib/bpf/libbpf.c                             |  466 ++++++-
 tools/lib/bpf/libbpf.h                             |   41 +-
 tools/lib/bpf/libbpf.map                           |    1 +
 tools/lib/bpf/libbpf_internal.h                    |   30 +
 tools/lib/bpf/usdt.bpf.h                           |  256 ++++
 tools/lib/bpf/usdt.c                               | 1280 ++++++++++++++++++++
 tools/testing/selftests/bpf/Makefile               |   25 +-
 .../selftests/bpf/prog_tests/attach_probe.c        |   85 +-
 tools/testing/selftests/bpf/prog_tests/for_each.c  |   12 +
 tools/testing/selftests/bpf/prog_tests/ksyms_btf.c |   17 +-
 tools/testing/selftests/bpf/prog_tests/netcnt.c    |    2 +-
 .../selftests/bpf/prog_tests/test_global_funcs.c   |    1 +
 .../selftests/bpf/prog_tests/uprobe_autoattach.c   |   49 +
 tools/testing/selftests/bpf/prog_tests/usdt.c      |  421 +++++++
 .../bpf/progs/for_each_map_elem_write_key.c        |   27 +
 tools/testing/selftests/bpf/progs/profiler.inc.h   |    5 +-
 .../selftests/bpf/progs/test_attach_probe.c        |   41 +-
 .../testing/selftests/bpf/progs/test_bpf_cookie.c  |    4 +-
 .../selftests/bpf/progs/test_global_func17.c       |   16 +
 .../bpf/progs/test_ksyms_btf_write_check.c         |   18 +-
 .../selftests/bpf/progs/test_l4lb_noinline.c       |    2 +-
 tools/testing/selftests/bpf/progs/test_sk_assign.c |    4 +-
 .../selftests/bpf/progs/test_task_pt_regs.c        |    2 +-
 .../selftests/bpf/progs/test_uprobe_autoattach.c   |   73 ++
 .../selftests/bpf/progs/test_urandom_usdt.c        |   70 ++
 tools/testing/selftests/bpf/progs/test_usdt.c      |   96 ++
 .../selftests/bpf/progs/test_usdt_multispec.c      |   32 +
 .../selftests/bpf/progs/test_xdp_noinline.c        |   12 +-
 tools/testing/selftests/bpf/progs/trigger_bench.c  |    2 +-
 tools/testing/selftests/bpf/sdt-config.h           |    6 +
 tools/testing/selftests/bpf/sdt.h                  |  513 ++++++++
 .../selftests/bpf/test_bpftool_synctypes.py        |    2 +-
 tools/testing/selftests/bpf/test_cgroup_storage.c  |    3 +-
 tools/testing/selftests/bpf/test_offload.py        |    2 +-
 tools/testing/selftests/bpf/test_progs.c           |    6 +-
 tools/testing/selftests/bpf/test_progs.h           |    2 +
 tools/testing/selftests/bpf/testing_helpers.c      |    2 +-
 tools/testing/selftests/bpf/trace_helpers.c        |    9 +-
 tools/testing/selftests/bpf/urandom_read.c         |   63 +-
 tools/testing/selftests/bpf/urandom_read_aux.c     |    9 +
 tools/testing/selftests/bpf/urandom_read_lib1.c    |   13 +
 tools/testing/selftests/bpf/urandom_read_lib2.c    |    8 +
 65 files changed, 4754 insertions(+), 626 deletions(-)
 create mode 100644 samples/bpf/xdp_router_ipv4.bpf.c
 delete mode 100644 samples/bpf/xdp_router_ipv4_kern.c
 create mode 100644 tools/lib/bpf/usdt.bpf.h
 create mode 100644 tools/lib/bpf/usdt.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/usdt.c
 create mode 100644 tools/testing/selftests/bpf/progs/for_each_map_elem_write_key.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_global_func17.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_urandom_usdt.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_usdt.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_usdt_multispec.c
 create mode 100644 tools/testing/selftests/bpf/sdt-config.h
 create mode 100644 tools/testing/selftests/bpf/sdt.h
 create mode 100644 tools/testing/selftests/bpf/urandom_read_aux.c
 create mode 100644 tools/testing/selftests/bpf/urandom_read_lib1.c
 create mode 100644 tools/testing/selftests/bpf/urandom_read_lib2.c
Merging ipsec-next/master (b58b1f563ab7 xfrm: rework default policy structure)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
Already up to date.
Merging mlx5-next/mlx5-next (0276bd3a94c0 IB/mlx5: Fix undefined behavior due to shift overflowing the constant)
$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
Merge made by the 'ort' strategy.
 drivers/net/ethernet/mellanox/mlx5/core/Kconfig    |  25 +-
 drivers/net/ethernet/mellanox/mlx5/core/Makefile   |   5 +-
 .../net/ethernet/mellanox/mlx5/core/accel/tls.c    | 125 -----
 .../net/ethernet/mellanox/mlx5/core/accel/tls.h    | 156 ------
 drivers/net/ethernet/mellanox/mlx5/core/en.h       |   1 -
 .../net/ethernet/mellanox/mlx5/core/en/params.c    |   6 +-
 .../mellanox/mlx5/core/en_accel/en_accel.h         |  11 +-
 .../ethernet/mellanox/mlx5/core/en_accel/ktls.c    |  71 ++-
 .../ethernet/mellanox/mlx5/core/en_accel/ktls.h    |  86 ++-
 .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c |   2 +-
 .../core/en_accel/{tls_stats.c => ktls_stats.c}    |  51 +-
 .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c |  20 +-
 .../mellanox/mlx5/core/en_accel/ktls_txrx.h        |  28 +-
 .../mellanox/mlx5/core/en_accel/ktls_utils.h       |   1 -
 .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 247 --------
 .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 132 -----
 .../mellanox/mlx5/core/en_accel/tls_rxtx.c         | 390 -------------
 .../mellanox/mlx5/core/en_accel/tls_rxtx.h         |  91 ---
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |  12 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c    |   5 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_stats.c |   8 +-
 .../net/ethernet/mellanox/mlx5/core/fpga/core.h    |   1 -
 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 622 ---------------------
 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h |  74 ---
 drivers/net/ethernet/mellanox/mlx5/core/fw.c       |   3 +-
 drivers/net/ethernet/mellanox/mlx5/core/main.c     |  10 -
 include/linux/mlx5/mlx5_ifc_fpga.h                 |  63 ---
 include/linux/mlx5/port.h                          |   2 +-
 28 files changed, 222 insertions(+), 2026 deletions(-)
 delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c
 delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h
 rename drivers/net/ethernet/mellanox/mlx5/core/en_accel/{tls_stats.c => ktls_stats.c} (63%)
 delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c
 delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h
 delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c
 delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.h
 delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
 delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h
Merging netfilter-next/master (c84d86a0295c Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master
Already up to date.
Merging ipvs-next/master (c828414ac935 netfilter: nft_compat: suppress comment match)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master
Already up to date.
Merging bluetooth/master (38a1944deda4 Bluetooth: btusb: Set HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
Merge made by the 'ort' strategy.
 drivers/bluetooth/btbcm.c        | 52 +++++++++++++++++++++++++++++++++++++++-
 drivers/bluetooth/btintel.c      |  2 +-
 drivers/bluetooth/btmtksdio.c    |  2 +-
 drivers/bluetooth/btusb.c        |  5 ++++
 drivers/bluetooth/hci_qca.c      |  4 ++--
 include/net/bluetooth/hci.h      |  9 +++++++
 include/net/bluetooth/hci_core.h |  8 +++++--
 net/bluetooth/hci_conn.c         |  2 +-
 net/bluetooth/hci_sync.c         | 31 ++++++++++++++++++++++++
 net/bluetooth/mgmt_util.c        |  2 +-
 net/bluetooth/sco.c              | 23 +++++++++++-------
 11 files changed, 122 insertions(+), 18 deletions(-)
Merging wireless-next/main (92bbf95df768 ipw2x00: use DEVICE_ATTR_*() macro)
$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/main
Auto-merging drivers/net/wireless/ath/ath11k/mac.c
Merge made by the 'ort' strategy.
 drivers/net/wireless/ath/ath10k/ahb.c              |   9 +-
 drivers/net/wireless/ath/ath10k/core.c             |  25 +
 drivers/net/wireless/ath/ath10k/hw.h               |   2 +
 drivers/net/wireless/ath/ath10k/usb.c              |  27 +
 drivers/net/wireless/ath/ath11k/Makefile           |   6 +-
 drivers/net/wireless/ath/ath11k/core.c             | 372 ++++++--
 drivers/net/wireless/ath/ath11k/core.h             | 132 ++-
 drivers/net/wireless/ath/ath11k/debugfs.c          |   4 +
 drivers/net/wireless/ath/ath11k/htc.c              |   6 +
 drivers/net/wireless/ath/ath11k/hw.h               |  23 +-
 drivers/net/wireless/ath/ath11k/mac.c              | 388 ++++++--
 drivers/net/wireless/ath/ath11k/mac.h              |   3 +-
 drivers/net/wireless/ath/ath11k/mhi.c              | 285 ++----
 drivers/net/wireless/ath/ath11k/mhi.h              |  17 +-
 drivers/net/wireless/ath/ath11k/pci.c              | 982 ++++-----------------
 drivers/net/wireless/ath/ath11k/pci.h              |  28 +-
 drivers/net/wireless/ath/ath11k/pcic.c             | 741 ++++++++++++++++
 drivers/net/wireless/ath/ath11k/pcic.h             |  46 +
 drivers/net/wireless/ath/ath11k/peer.c             | 373 +++++++-
 drivers/net/wireless/ath/ath11k/peer.h             |  10 +-
 drivers/net/wireless/ath/ath11k/qmi.c              |  19 +-
 drivers/net/wireless/ath/ath11k/reg.c              |  44 +-
 drivers/net/wireless/ath/ath11k/reg.h              |   2 +-
 drivers/net/wireless/ath/ath11k/wmi.c              | 635 ++++++++++++-
 drivers/net/wireless/ath/ath11k/wmi.h              | 366 +++++++-
 drivers/net/wireless/ath/ath11k/wow.c              | 763 ++++++++++++++++
 drivers/net/wireless/ath/ath11k/wow.h              |  45 +
 drivers/net/wireless/ath/ath6kl/htc_mbox.c         |   2 +-
 drivers/net/wireless/ath/ath9k/ahb.c               |   8 +-
 drivers/net/wireless/ath/ath9k/ar9002_mac.c        |   9 +-
 drivers/net/wireless/ath/ath9k/ar9003_calib.c      |   2 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  85 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h     |   2 +
 drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   9 +-
 drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |  10 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |  25 +-
 drivers/net/wireless/ath/ath9k/mac.h               |   6 +-
 drivers/net/wireless/ath/ath9k/reg.h               |  10 +-
 drivers/net/wireless/ath/wcn36xx/hal.h             |   7 +-
 drivers/net/wireless/ath/wcn36xx/main.c            | 142 +--
 drivers/net/wireless/ath/wcn36xx/smd.c             |  57 ++
 drivers/net/wireless/ath/wcn36xx/smd.h             |   2 +
 drivers/net/wireless/ath/wcn36xx/txrx.c            |  29 +
 drivers/net/wireless/ath/wcn36xx/txrx.h            |   1 +
 drivers/net/wireless/broadcom/b43/phy_n.c          |   2 +-
 drivers/net/wireless/broadcom/b43legacy/phy.c      |   2 +-
 .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c  |  39 +-
 drivers/net/wireless/intel/ipw2x00/ipw2100.c       |  64 +-
 drivers/net/wireless/intel/ipw2x00/ipw2200.c       | 119 ++-
 drivers/net/wireless/intel/ipw2x00/libipw_tx.c     |   2 +-
 .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h    |   4 +-
 drivers/net/wireless/intel/iwlwifi/fw/api/debug.h  |   4 +-
 drivers/net/wireless/intel/iwlwifi/fw/api/filter.h |   2 +-
 drivers/net/wireless/intel/iwlwifi/fw/api/scan.h   |   4 +-
 drivers/net/wireless/intel/iwlwifi/fw/api/sta.h    |   2 +-
 drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h   |   2 +-
 drivers/net/wireless/intel/iwlwifi/fw/error-dump.h |   2 +-
 drivers/net/wireless/intel/iwlwifi/fw/file.h       |  10 +-
 drivers/net/wireless/intel/iwlwifi/mei/sap.h       |   2 +-
 drivers/net/wireless/intersil/orinoco/airport.c    |   1 +
 drivers/net/wireless/marvell/mwifiex/11h.c         |   2 +
 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 104 ++-
 drivers/net/wireless/realtek/rtlwifi/base.c        |  13 +-
 drivers/net/wireless/realtek/rtlwifi/pci.c         |  15 +-
 drivers/net/wireless/realtek/rtw88/main.c          |   7 +-
 drivers/net/wireless/realtek/rtw89/cam.c           |  20 +-
 drivers/net/wireless/realtek/rtw89/coex.c          |  12 +-
 drivers/net/wireless/realtek/rtw89/core.c          | 166 +++-
 drivers/net/wireless/realtek/rtw89/core.h          |  93 +-
 drivers/net/wireless/realtek/rtw89/debug.c         |  70 +-
 drivers/net/wireless/realtek/rtw89/fw.c            | 163 +++-
 drivers/net/wireless/realtek/rtw89/fw.h            |  27 +-
 drivers/net/wireless/realtek/rtw89/mac.c           | 327 ++++---
 drivers/net/wireless/realtek/rtw89/mac.h           |  73 +-
 drivers/net/wireless/realtek/rtw89/mac80211.c      |   4 +-
 drivers/net/wireless/realtek/rtw89/pci.c           | 630 +++++++++++--
 drivers/net/wireless/realtek/rtw89/pci.h           | 245 +++++
 drivers/net/wireless/realtek/rtw89/phy.c           |  28 +-
 drivers/net/wireless/realtek/rtw89/reg.h           | 187 ++++
 drivers/net/wireless/realtek/rtw89/regd.c          | 513 ++++++-----
 drivers/net/wireless/realtek/rtw89/rtw8852a.c      |  29 +-
 .../net/wireless/realtek/rtw89/rtw8852a_table.c    | 581 ++++++++++++
 drivers/net/wireless/realtek/rtw89/rtw8852ae.c     |  32 +
 drivers/net/wireless/realtek/rtw89/rtw8852c.c      |  64 +-
 drivers/net/wireless/realtek/rtw89/rtw8852ce.c     |  32 +
 drivers/net/wireless/realtek/rtw89/ser.c           | 245 ++++-
 drivers/net/wireless/realtek/rtw89/txrx.h          | 107 +++
 87 files changed, 7599 insertions(+), 2210 deletions(-)
 create mode 100644 drivers/net/wireless/ath/ath11k/pcic.c
 create mode 100644 drivers/net/wireless/ath/ath11k/pcic.h
Merging mtd/mtd/next (4c38eded8070 mtd: parsers: bcm47xxpart: print correct offset on read error)
$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
Merge made by the 'ort' strategy.
 drivers/mtd/parsers/bcm47xxpart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging nand/nand/next (f7c48bccf1a0 mtd: rawnand: print offset instead of page number for bad blocks)
$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
Merge made by the 'ort' strategy.
 drivers/mtd/nand/raw/davinci_nand.c |   2 +-
 drivers/mtd/nand/raw/nand_base.c    |   9 +-
 drivers/mtd/nand/spi/gigadevice.c   | 158 +++++++++++++++++++++++++++++++++++-
 3 files changed, 163 insertions(+), 6 deletions(-)
Merging spi-nor/spi-nor/next (151c6b49d679 mtd: spi-nor: Skip erase logic when SPI_NOR_NO_ERASE is set)
$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next
Already up to date.
Merging crypto/master (0e03b8fd2936 crypto: xilinx - Turn SHA into a tristate and allow COMPILE_TEST)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
Already up to date.
Merging drm/drm-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next
Already up to date.
Merging drm-misc/for-linux-next (be273ecfbe8a drm/vc4: Use newer fence API properly to fix build errors)
$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next
Auto-merging MAINTAINERS
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/imx/imx-ldb.c
Merge made by the 'ort' strategy.
 .../bindings/display/bridge/ite,it66121.yaml       |   3 +
 .../bindings/display/bridge/toshiba,tc358767.yaml  |  22 +-
 .../display/panel/leadtek,ltk035c5444t.yaml        |  59 ++
 .../bindings/display/sitronix,st7735r.yaml         |   6 +-
 .../bindings/display/solomon,ssd1307fb.yaml        |  13 +
 .../devicetree/bindings/vendor-prefixes.yaml       |   2 +
 Documentation/gpu/drm-mm.rst                       |   9 +
 Documentation/gpu/drm-uapi.rst                     |   4 +-
 MAINTAINERS                                        |  11 +
 arch/x86/Kconfig                                   |   6 +
 arch/x86/boot/video-vesa.c                         |   4 +-
 drivers/dma-buf/dma-buf.c                          |  26 +-
 drivers/dma-buf/dma-resv.c                         | 459 ++++++++-------
 drivers/dma-buf/st-dma-resv.c                      | 157 ++---
 drivers/firmware/Kconfig                           |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |  66 +--
 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h        |   1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |  50 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |   3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c        |  14 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |   3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c        |  49 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c            |  26 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c             |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |  29 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c           |   3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c            |   3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  85 +--
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |   3 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c         |  11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c        |  11 +-
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |   2 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   3 +-
 drivers/gpu/drm/arm/display/komeda/komeda_plane.c  |  13 +-
 drivers/gpu/drm/bridge/Kconfig                     |   2 +
 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c       |   1 +
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |  20 +-
 drivers/gpu/drm/bridge/analogix/anx7625.c          |  36 +-
 drivers/gpu/drm/bridge/chipone-icn6211.c           | 497 ++++++++++++++--
 drivers/gpu/drm/bridge/ite-it66121.c               | 629 ++++++++++++++++++++-
 drivers/gpu/drm/bridge/lontium-lt9611.c            |  49 +-
 drivers/gpu/drm/bridge/nwl-dsi.c                   |  30 +-
 drivers/gpu/drm/bridge/nxp-ptn3460.c               |   7 +-
 drivers/gpu/drm/bridge/panel.c                     |   3 +
 drivers/gpu/drm/bridge/parade-ps8622.c             |   7 +-
 drivers/gpu/drm/bridge/parade-ps8640.c             |   9 +-
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |   2 +-
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c      |  51 +-
 drivers/gpu/drm/bridge/tc358762.c                  |   9 +-
 drivers/gpu/drm/bridge/tc358764.c                  | 104 +---
 drivers/gpu/drm/bridge/tc358767.c                  | 585 ++++++++++++++++---
 drivers/gpu/drm/bridge/tc358775.c                  |  11 +-
 drivers/gpu/drm/bridge/ti-sn65dsi83.c              |  17 +-
 drivers/gpu/drm/bridge/ti-sn65dsi86.c              |   8 +-
 drivers/gpu/drm/drm_atomic.c                       |  20 +
 drivers/gpu/drm/drm_atomic_uapi.c                  |   4 -
 drivers/gpu/drm/drm_blend.c                        |   2 +-
 drivers/gpu/drm/drm_bridge_connector.c             |   4 +-
 drivers/gpu/drm/drm_edid.c                         | 620 +++++++++++---------
 drivers/gpu/drm/drm_format_helper.c                |  76 +--
 drivers/gpu/drm/drm_gem.c                          |  83 +--
 drivers/gpu/drm/drm_gem_atomic_helper.c            |  18 +-
 drivers/gpu/drm/drm_gem_vram_helper.c              |   2 +-
 drivers/gpu/drm/drm_modes.c                        |  17 +
 drivers/gpu/drm/etnaviv/etnaviv_gem.c              |   6 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem.h              |   5 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c       |  77 +--
 drivers/gpu/drm/etnaviv/etnaviv_sched.c            |  63 +--
 drivers/gpu/drm/etnaviv/etnaviv_sched.h            |   3 +-
 drivers/gpu/drm/exynos/exynos_drm_dsi.c            | 241 ++------
 drivers/gpu/drm/exynos/exynos_drm_mic.c            |  22 +
 drivers/gpu/drm/gma500/cdv_device.c                |  11 +-
 drivers/gpu/drm/gma500/cdv_intel_crt.c             |   6 +-
 drivers/gpu/drm/gma500/cdv_intel_display.c         |   9 +-
 drivers/gpu/drm/gma500/cdv_intel_dp.c              |   6 +-
 drivers/gpu/drm/gma500/cdv_intel_hdmi.c            |   5 +-
 drivers/gpu/drm/gma500/cdv_intel_lvds.c            |   5 +-
 drivers/gpu/drm/gma500/framebuffer.c               |  10 +-
 drivers/gpu/drm/gma500/gem.c                       | 161 +++++-
 drivers/gpu/drm/gma500/gem.h                       |  13 +-
 drivers/gpu/drm/gma500/gma_display.c               |  53 +-
 drivers/gpu/drm/gma500/gma_display.h               |  10 +-
 drivers/gpu/drm/gma500/gtt.c                       | 295 +++++-----
 drivers/gpu/drm/gma500/gtt.h                       |   8 +-
 drivers/gpu/drm/gma500/oaktrail_crtc.c             |  25 +-
 drivers/gpu/drm/gma500/oaktrail_device.c           |   1 -
 drivers/gpu/drm/gma500/oaktrail_hdmi.c             |   1 -
 drivers/gpu/drm/gma500/oaktrail_lvds.c             |  16 +-
 drivers/gpu/drm/gma500/opregion.c                  |   5 +-
 drivers/gpu/drm/gma500/power.c                     |  15 +-
 drivers/gpu/drm/gma500/psb_device.c                |  29 +-
 drivers/gpu/drm/gma500/psb_drv.c                   |  29 +-
 drivers/gpu/drm/gma500/psb_drv.h                   |  90 +--
 drivers/gpu/drm/gma500/psb_intel_display.c         |  39 +-
 drivers/gpu/drm/gma500/psb_intel_lvds.c            |   5 +-
 drivers/gpu/drm/gma500/psb_intel_sdvo.c            |   6 +-
 drivers/gpu/drm/gma500/psb_irq.c                   |  94 ++-
 drivers/gpu/drm/gma500/psb_irq.h                   |  19 +-
 drivers/gpu/drm/i915/display/intel_atomic_plane.c  |   3 +-
 drivers/gpu/drm/i915/gem/i915_gem_busy.c           |  10 +-
 drivers/gpu/drm/i915/gem/i915_gem_clflush.c        |   6 +-
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c     |  10 +-
 drivers/gpu/drm/i915/gem/i915_gem_lmem.c           |   2 +-
 drivers/gpu/drm/i915/gem/i915_gem_object.c         |  41 +-
 drivers/gpu/drm/i915/gem/i915_gem_object.h         |   8 +-
 drivers/gpu/drm/i915/gem/i915_gem_ttm.c            |   4 +-
 drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c       |  26 +-
 drivers/gpu/drm/i915/gem/i915_gem_userptr.c        |   2 +-
 drivers/gpu/drm/i915/gem/i915_gem_wait.c           |   6 +-
 .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c   |   3 +-
 .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c  |   6 +-
 drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c |   4 +-
 drivers/gpu/drm/i915/i915_request.c                |   3 +-
 drivers/gpu/drm/i915/i915_sw_fence.c               |   2 +-
 drivers/gpu/drm/i915/i915_vma.c                    |  27 +-
 .../gpu/drm/i915/selftests/intel_memory_region.c   |  10 +-
 drivers/gpu/drm/imx/imx-ldb.c                      |   3 +-
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c          |  34 +-
 drivers/gpu/drm/lima/lima_gem.c                    |  17 +-
 drivers/gpu/drm/mcde/mcde_dsi.c                    |  43 +-
 drivers/gpu/drm/mediatek/mtk_dsi.c                 |  12 +
 drivers/gpu/drm/meson/meson_drv.c                  |   2 +-
 drivers/gpu/drm/msm/msm_gem.c                      |   3 +-
 drivers/gpu/drm/msm/msm_gem_submit.c               |  24 +-
 drivers/gpu/drm/nouveau/dispnv50/atom.h            |   6 +-
 drivers/gpu/drm/nouveau/dispnv50/crc.c             |  27 +-
 drivers/gpu/drm/nouveau/dispnv50/wndw.c            |  15 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c               |  18 +-
 drivers/gpu/drm/nouveau/nouveau_fence.c            |  20 +-
 drivers/gpu/drm/nouveau/nouveau_gem.c              |   3 +-
 drivers/gpu/drm/nouveau/nouveau_prime.c            |  17 +-
 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c  |   2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c     |   6 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c |   2 +-
 drivers/gpu/drm/omapdrm/omap_gem.c                 | 198 ++++---
 drivers/gpu/drm/omapdrm/omap_gem.h                 |   3 +-
 drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c          |   5 +-
 drivers/gpu/drm/omapdrm/omap_overlay.c             |   2 +-
 drivers/gpu/drm/panel/Kconfig                      |   9 +
 drivers/gpu/drm/panel/Makefile                     |   1 +
 drivers/gpu/drm/panel/panel-abt-y030xx067a.c       |  30 +-
 drivers/gpu/drm/panel/panel-edp.c                  |   2 +
 drivers/gpu/drm/panel/panel-innolux-ej030na.c      |  31 +-
 drivers/gpu/drm/panel/panel-newvision-nv3052c.c    | 484 ++++++++++++++++
 drivers/gpu/drm/panel/panel-truly-nt35597.c        |   3 +-
 drivers/gpu/drm/panel/panel-visionox-rm69299.c     |   4 +-
 drivers/gpu/drm/panfrost/panfrost_drv.c            |   3 +-
 drivers/gpu/drm/panfrost/panfrost_job.c            |   6 +-
 drivers/gpu/drm/qxl/qxl_debugfs.c                  |   3 +-
 drivers/gpu/drm/qxl/qxl_kms.c                      |   4 +-
 drivers/gpu/drm/qxl/qxl_release.c                  |   5 +-
 drivers/gpu/drm/qxl/qxl_ttm.c                      |   6 +-
 drivers/gpu/drm/radeon/radeon_cs.c                 |   4 +
 drivers/gpu/drm/radeon/radeon_display.c            |   8 +-
 drivers/gpu/drm/radeon/radeon_gem.c                |   9 +-
 drivers/gpu/drm/radeon/radeon_mn.c                 |   4 +-
 drivers/gpu/drm/radeon/radeon_object.c             |  21 +-
 drivers/gpu/drm/radeon/radeon_prime.c              |  16 +-
 drivers/gpu/drm/radeon/radeon_sync.c               |   2 +-
 drivers/gpu/drm/radeon/radeon_uvd.c                |  12 +-
 drivers/gpu/drm/radeon/radeon_vm.c                 |   2 +-
 drivers/gpu/drm/scheduler/sched_main.c             |   5 +-
 drivers/gpu/drm/selftests/test-drm_buddy.c         |  10 +-
 drivers/gpu/drm/solomon/Kconfig                    |  11 +-
 drivers/gpu/drm/solomon/ssd130x-i2c.c              |  11 +
 drivers/gpu/drm/solomon/ssd130x.c                  | 115 +++-
 drivers/gpu/drm/solomon/ssd130x.h                  |   2 +
 drivers/gpu/drm/sti/sti_gdp.c                      |   2 +-
 drivers/gpu/drm/sti/sti_hdmi.c                     |  22 +-
 drivers/gpu/drm/stm/ltdc.c                         |  16 +-
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c               |   2 +-
 drivers/gpu/drm/tilcdc/tilcdc_external.c           |   8 +-
 drivers/gpu/drm/tiny/repaper.c                     |   2 +-
 drivers/gpu/drm/ttm/ttm_agp_backend.c              |   2 +-
 drivers/gpu/drm/ttm/ttm_bo.c                       | 255 ++++-----
 drivers/gpu/drm/ttm/ttm_bo_util.c                  |  25 +-
 drivers/gpu/drm/ttm/ttm_bo_vm.c                    |  34 +-
 drivers/gpu/drm/ttm/ttm_device.c                   |  82 ++-
 drivers/gpu/drm/ttm/ttm_execbuf_util.c             |  21 +-
 drivers/gpu/drm/ttm/ttm_resource.c                 | 197 ++++++-
 drivers/gpu/drm/ttm/ttm_tt.c                       |  12 +-
 drivers/gpu/drm/v3d/v3d_gem.c                      |  19 +-
 drivers/gpu/drm/vc4/vc4_crtc.c                     |  14 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |  15 +-
 drivers/gpu/drm/vc4/vc4_gem.c                      |  15 +-
 drivers/gpu/drm/vc4/vc4_hdmi.c                     | 442 +++++++++++++--
 drivers/gpu/drm/vc4/vc4_hdmi.h                     |  23 +-
 drivers/gpu/drm/vc4/vc4_hdmi_phy.c                 |   2 +-
 drivers/gpu/drm/vc4/vc4_hdmi_regs.h                |   6 +
 drivers/gpu/drm/vc4/vc4_hvs.c                      | 127 +++--
 drivers/gpu/drm/vc4/vc4_irq.c                      |   5 +
 drivers/gpu/drm/vc4/vc4_kms.c                      |  48 +-
 drivers/gpu/drm/vc4/vc4_regs.h                     |  28 +-
 drivers/gpu/drm/vc4/vc4_trace.h                    |  95 ++++
 drivers/gpu/drm/vgem/vgem_fence.c                  |  13 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |   2 +
 drivers/gpu/drm/virtio/virtgpu_gem.c               |  12 +-
 drivers/gpu/drm/virtio/virtgpu_ioctl.c             |   8 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_bo.c                 |  23 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c                |  13 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |  20 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |  23 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fence.c              |  28 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c              |  27 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_irq.c                |  81 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                | 445 ++++++++++++---
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |  29 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |  36 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c           |  18 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |  17 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |  27 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c         |   2 +-
 drivers/infiniband/core/umem_dmabuf.c              |   9 +-
 drivers/video/fbdev/Kconfig                        |  14 +-
 drivers/video/fbdev/core/fb_defio.c                |   9 +-
 include/drm/drm_atomic.h                           |  27 +-
 include/drm/drm_edid.h                             |  12 +-
 include/drm/drm_file.h                             |   2 +-
 include/drm/drm_format_helper.h                    |   5 +-
 include/drm/drm_gem.h                              |   5 -
 include/drm/drm_mipi_dsi.h                         |   2 +
 include/drm/drm_modes.h                            |   2 +
 include/drm/drm_modeset_helper_vtables.h           |   2 +-
 include/drm/gpu_scheduler.h                        |   1 +
 include/drm/ttm/ttm_bo_api.h                       |  64 +--
 include/drm/ttm/ttm_bo_driver.h                    |  29 +-
 include/drm/ttm/ttm_device.h                       |  11 -
 include/drm/ttm/ttm_resource.h                     |  74 +++
 include/drm/ttm/ttm_tt.h                           |   4 +-
 include/linux/dma-buf.h                            |  26 +-
 include/linux/dma-resv.h                           | 233 ++++----
 include/linux/efi.h                                |   4 -
 include/linux/seqlock.h                            |   8 +-
 include/uapi/drm/vmwgfx_drm.h                      |   9 +-
 kernel/futex/futex.h                               |   1 +
 237 files changed, 6392 insertions(+), 3440 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/panel/leadtek,ltk035c5444t.yaml
 create mode 100644 drivers/gpu/drm/panel/panel-newvision-nv3052c.c
$ git am -3 ../patches/0001-fixup-for-spi-make-remove-callback-a-void-function.patch
Applying: fixup for "spi: make remove callback a void function"
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/gpu/drm/panel/panel-newvision-nv3052c.c
$ git add -A .
$ git commit -v -a --amend
[master 455bdc5fd0cc] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc
 Date: Fri Apr 8 10:00:52 2022 +1000
$ git reset --hard HEAD^
HEAD is now at 40277f9cda81 Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Merging next-20220407 version of drm-misc
$ git merge -m next-20220407/drm-misc c8d4c18bfbc4ab467188dbe45cc8155759f49d9e
Auto-merging MAINTAINERS
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
Auto-merging drivers/gpu/drm/imx/imx-ldb.c
Merge made by the 'ort' strategy.
 .../bindings/display/bridge/ite,it66121.yaml       |   3 +
 .../bindings/display/bridge/toshiba,tc358767.yaml  |  22 +-
 .../display/panel/leadtek,ltk035c5444t.yaml        |  59 ++
 .../bindings/display/sitronix,st7735r.yaml         |   6 +-
 Documentation/gpu/drm-mm.rst                       |   9 +
 Documentation/gpu/drm-uapi.rst                     |   4 +-
 MAINTAINERS                                        |  11 +
 arch/x86/Kconfig                                   |   6 +
 arch/x86/boot/video-vesa.c                         |   4 +-
 drivers/dma-buf/dma-buf.c                          |   2 +-
 drivers/dma-buf/dma-resv.c                         | 142 ++++-
 drivers/dma-buf/st-dma-resv.c                      |  64 +--
 drivers/firmware/Kconfig                           |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |  53 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |  15 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c        |  49 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c            |  23 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |   8 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |   1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  78 +--
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |   3 -
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |   2 +-
 drivers/gpu/drm/arm/display/komeda/komeda_plane.c  |  13 +-
 drivers/gpu/drm/bridge/Kconfig                     |   2 +
 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c       |   1 +
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |  20 +-
 drivers/gpu/drm/bridge/analogix/anx7625.c          |  36 +-
 drivers/gpu/drm/bridge/chipone-icn6211.c           | 497 ++++++++++++++--
 drivers/gpu/drm/bridge/ite-it66121.c               | 629 ++++++++++++++++++++-
 drivers/gpu/drm/bridge/lontium-lt9611.c            |  49 +-
 drivers/gpu/drm/bridge/nwl-dsi.c                   |  30 +-
 drivers/gpu/drm/bridge/nxp-ptn3460.c               |   7 +-
 drivers/gpu/drm/bridge/panel.c                     |   3 +
 drivers/gpu/drm/bridge/parade-ps8622.c             |   7 +-
 drivers/gpu/drm/bridge/parade-ps8640.c             |   9 +-
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |   2 +-
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c      |  51 +-
 drivers/gpu/drm/bridge/tc358762.c                  |   9 +-
 drivers/gpu/drm/bridge/tc358764.c                  | 104 +---
 drivers/gpu/drm/bridge/tc358767.c                  | 585 ++++++++++++++++---
 drivers/gpu/drm/bridge/tc358775.c                  |  11 +-
 drivers/gpu/drm/bridge/ti-sn65dsi83.c              |  17 +-
 drivers/gpu/drm/bridge/ti-sn65dsi86.c              |   8 +-
 drivers/gpu/drm/drm_atomic.c                       |  20 +
 drivers/gpu/drm/drm_atomic_uapi.c                  |   4 -
 drivers/gpu/drm/drm_blend.c                        |   2 +-
 drivers/gpu/drm/drm_bridge_connector.c             |   4 +-
 drivers/gpu/drm/drm_edid.c                         | 620 +++++++++++---------
 drivers/gpu/drm/drm_format_helper.c                |  76 +--
 drivers/gpu/drm/drm_gem.c                          |  80 ---
 drivers/gpu/drm/drm_gem_atomic_helper.c            |  18 +-
 drivers/gpu/drm/drm_gem_vram_helper.c              |   2 +-
 drivers/gpu/drm/drm_modes.c                        |  17 +
 drivers/gpu/drm/etnaviv/etnaviv_gem.h              |   5 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c       |  67 ++-
 drivers/gpu/drm/etnaviv/etnaviv_sched.c            |  63 +--
 drivers/gpu/drm/etnaviv/etnaviv_sched.h            |   3 +-
 drivers/gpu/drm/exynos/exynos_drm_dsi.c            | 241 ++------
 drivers/gpu/drm/exynos/exynos_drm_mic.c            |  22 +
 drivers/gpu/drm/gma500/cdv_device.c                |  11 +-
 drivers/gpu/drm/gma500/cdv_intel_crt.c             |   6 +-
 drivers/gpu/drm/gma500/cdv_intel_display.c         |   9 +-
 drivers/gpu/drm/gma500/cdv_intel_dp.c              |   6 +-
 drivers/gpu/drm/gma500/cdv_intel_hdmi.c            |   5 +-
 drivers/gpu/drm/gma500/cdv_intel_lvds.c            |   5 +-
 drivers/gpu/drm/gma500/framebuffer.c               |  10 +-
 drivers/gpu/drm/gma500/gem.c                       | 161 +++++-
 drivers/gpu/drm/gma500/gem.h                       |  13 +-
 drivers/gpu/drm/gma500/gma_display.c               |  53 +-
 drivers/gpu/drm/gma500/gma_display.h               |  10 +-
 drivers/gpu/drm/gma500/gtt.c                       | 295 +++++-----
 drivers/gpu/drm/gma500/gtt.h                       |   8 +-
 drivers/gpu/drm/gma500/oaktrail_crtc.c             |  25 +-
 drivers/gpu/drm/gma500/oaktrail_device.c           |   1 -
 drivers/gpu/drm/gma500/oaktrail_hdmi.c             |   1 -
 drivers/gpu/drm/gma500/oaktrail_lvds.c             |  16 +-
 drivers/gpu/drm/gma500/opregion.c                  |   5 +-
 drivers/gpu/drm/gma500/power.c                     |  15 +-
 drivers/gpu/drm/gma500/psb_device.c                |  29 +-
 drivers/gpu/drm/gma500/psb_drv.c                   |  29 +-
 drivers/gpu/drm/gma500/psb_drv.h                   |  90 +--
 drivers/gpu/drm/gma500/psb_intel_display.c         |  39 +-
 drivers/gpu/drm/gma500/psb_intel_lvds.c            |   5 +-
 drivers/gpu/drm/gma500/psb_intel_sdvo.c            |   6 +-
 drivers/gpu/drm/gma500/psb_irq.c                   |  94 ++-
 drivers/gpu/drm/gma500/psb_irq.h                   |  19 +-
 drivers/gpu/drm/i915/gem/i915_gem_clflush.c        |   3 +-
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c     |  10 +-
 drivers/gpu/drm/i915/gem/i915_gem_ttm.c            |   4 +-
 drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c       |   6 +-
 .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c  |   5 +-
 drivers/gpu/drm/i915/i915_vma.c                    |  10 +-
 .../gpu/drm/i915/selftests/intel_memory_region.c   |   7 +
 drivers/gpu/drm/imx/imx-ldb.c                      |   3 +-
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c          |  34 +-
 drivers/gpu/drm/lima/lima_gem.c                    |  10 +-
 drivers/gpu/drm/mcde/mcde_dsi.c                    |  43 +-
 drivers/gpu/drm/mediatek/mtk_dsi.c                 |  12 +
 drivers/gpu/drm/meson/meson_drv.c                  |   2 +-
 drivers/gpu/drm/msm/msm_gem_submit.c               |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/atom.h            |   6 +-
 drivers/gpu/drm/nouveau/dispnv50/crc.c             |  27 +-
 drivers/gpu/drm/nouveau/dispnv50/wndw.c            |  14 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c               |   9 +-
 drivers/gpu/drm/nouveau/nouveau_fence.c            |   8 +-
 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c  |   2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c     |   6 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c |   2 +-
 drivers/gpu/drm/omapdrm/omap_gem.c                 | 198 ++++---
 drivers/gpu/drm/omapdrm/omap_gem.h                 |   3 +-
 drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c          |   5 +-
 drivers/gpu/drm/omapdrm/omap_overlay.c             |   2 +-
 drivers/gpu/drm/panel/Kconfig                      |   9 +
 drivers/gpu/drm/panel/Makefile                     |   1 +
 drivers/gpu/drm/panel/panel-abt-y030xx067a.c       |  30 +-
 drivers/gpu/drm/panel/panel-edp.c                  |   2 +
 drivers/gpu/drm/panel/panel-innolux-ej030na.c      |  31 +-
 drivers/gpu/drm/panel/panel-newvision-nv3052c.c    | 484 ++++++++++++++++
 drivers/gpu/drm/panel/panel-truly-nt35597.c        |   3 +-
 drivers/gpu/drm/panel/panel-visionox-rm69299.c     |   4 +-
 drivers/gpu/drm/panfrost/panfrost_job.c            |   4 +
 drivers/gpu/drm/qxl/qxl_kms.c                      |   4 +-
 drivers/gpu/drm/qxl/qxl_release.c                  |   2 +-
 drivers/gpu/drm/qxl/qxl_ttm.c                      |   6 +-
 drivers/gpu/drm/radeon/radeon_cs.c                 |   4 +
 drivers/gpu/drm/radeon/radeon_display.c            |   7 +-
 drivers/gpu/drm/radeon/radeon_object.c             |   8 +
 drivers/gpu/drm/radeon/radeon_vm.c                 |   2 +-
 drivers/gpu/drm/scheduler/sched_main.c             |   2 +
 drivers/gpu/drm/selftests/test-drm_buddy.c         |  10 +-
 drivers/gpu/drm/solomon/Kconfig                    |   2 +-
 drivers/gpu/drm/solomon/ssd130x.c                  |  42 +-
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c               |   2 +-
 drivers/gpu/drm/tilcdc/tilcdc_external.c           |   8 +-
 drivers/gpu/drm/tiny/repaper.c                     |   2 +-
 drivers/gpu/drm/ttm/ttm_agp_backend.c              |   2 +-
 drivers/gpu/drm/ttm/ttm_bo.c                       | 225 ++++----
 drivers/gpu/drm/ttm/ttm_bo_util.c                  |  13 +-
 drivers/gpu/drm/ttm/ttm_device.c                   |  82 ++-
 drivers/gpu/drm/ttm/ttm_execbuf_util.c             |  15 +-
 drivers/gpu/drm/ttm/ttm_resource.c                 | 197 ++++++-
 drivers/gpu/drm/ttm/ttm_tt.c                       |  12 +-
 drivers/gpu/drm/v3d/v3d_gem.c                      |  15 +-
 drivers/gpu/drm/vc4/vc4_crtc.c                     |  14 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |  15 +-
 drivers/gpu/drm/vc4/vc4_gem.c                      |   9 +-
 drivers/gpu/drm/vc4/vc4_hdmi.c                     | 442 +++++++++++++--
 drivers/gpu/drm/vc4/vc4_hdmi.h                     |  23 +-
 drivers/gpu/drm/vc4/vc4_hdmi_phy.c                 |   2 +-
 drivers/gpu/drm/vc4/vc4_hdmi_regs.h                |   6 +
 drivers/gpu/drm/vc4/vc4_hvs.c                      | 127 +++--
 drivers/gpu/drm/vc4/vc4_irq.c                      |   5 +
 drivers/gpu/drm/vc4/vc4_kms.c                      |  48 +-
 drivers/gpu/drm/vc4/vc4_regs.h                     |  28 +-
 drivers/gpu/drm/vc4/vc4_trace.h                    |  95 ++++
 drivers/gpu/drm/vgem/vgem_fence.c                  |  12 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |   2 +
 drivers/gpu/drm/virtio/virtgpu_gem.c               |   9 +
 drivers/gpu/drm/virtio/virtgpu_ioctl.c             |   3 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_bo.c                 |  16 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c                |  13 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |  20 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |  23 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fence.c              |  28 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c              |  27 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_irq.c                |  81 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                | 445 ++++++++++++---
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |  29 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |  36 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c           |  19 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |  17 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |  27 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c         |   2 +-
 drivers/infiniband/core/umem_dmabuf.c              |   8 +-
 drivers/video/fbdev/Kconfig                        |  14 +-
 drivers/video/fbdev/core/fb_defio.c                |   9 +-
 include/drm/drm_atomic.h                           |  27 +-
 include/drm/drm_edid.h                             |  12 +-
 include/drm/drm_file.h                             |   2 +-
 include/drm/drm_format_helper.h                    |   5 +-
 include/drm/drm_gem.h                              |   5 -
 include/drm/drm_mipi_dsi.h                         |   2 +
 include/drm/drm_modes.h                            |   2 +
 include/drm/drm_modeset_helper_vtables.h           |   2 +-
 include/drm/gpu_scheduler.h                        |   1 +
 include/drm/ttm/ttm_bo_api.h                       |  62 +-
 include/drm/ttm/ttm_bo_driver.h                    |  29 +-
 include/drm/ttm/ttm_device.h                       |  11 -
 include/drm/ttm/ttm_resource.h                     |  74 +++
 include/drm/ttm/ttm_tt.h                           |   4 +-
 include/linux/dma-buf.h                            |   4 +-
 include/linux/dma-resv.h                           |  73 +--
 include/linux/efi.h                                |   4 -
 include/uapi/drm/vmwgfx_drm.h                      |   9 +-
 195 files changed, 5770 insertions(+), 2763 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/panel/leadtek,ltk035c5444t.yaml
 create mode 100644 drivers/gpu/drm/panel/panel-newvision-nv3052c.c
$ git am -3 ../patches/0001-fixup-for-spi-make-remove-callback-a-void-function.patch
Applying: fixup for "spi: make remove callback a void function"
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/gpu/drm/panel/panel-newvision-nv3052c.c
$ git add -A .
$ git commit -v -a --amend
[master aeb79f15ad42] next-20220407/drm-misc
 Date: Fri Apr 8 10:51:56 2022 +1000
Merging amdgpu/drm-next (49aa98ca30cd drm/amd/amdgpu: Only reserve vram for firmware with vega9 MS_HYPERV host.)
$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
Auto-merging drivers/gpu/drm/amd/display/dc/dc.h
Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c
Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c
Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c' using previous resolution.
Resolved 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master bc779447fa74] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
$ git diff -M --stat --summary HEAD^..
 drivers/gpu/drm/amd/amdgpu/Makefile                |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |    8 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h         |    6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |   18 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   14 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |    7 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |   52 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |   18 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h            |    1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c            |    9 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c            |   40 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h            |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h           |    8 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |   13 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |    9 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |    3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c           |   23 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h           |    2 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c            |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h            |    9 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             | 1120 ++------------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |   48 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c          |  979 +++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c        |    2 +-
 drivers/gpu/drm/amd/amdgpu/atombios_encoders.c     |   21 -
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |    2 +
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c            |   14 +
 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c             |   74 ++
 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h             |    7 +
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c              |   71 ++
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h              |    6 +
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c           |   19 +-
 drivers/gpu/drm/amd/amdkfd/kfd_events.c            |  119 ++-
 drivers/gpu/drm/amd/amdkfd/kfd_events.h            |    1 +
 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c    |   49 +-
 drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c         |   11 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |    1 +
 drivers/gpu/drm/amd/amdkfd/kfd_process.c           |   13 +-
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |   24 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |    8 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  |    2 +-
 .../drm/amd/display/dc/bios/bios_parser_common.c   |    3 +
 .../gpu/drm/amd/display/dc/bios/command_table.c    |    3 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link.c      |   90 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |   26 +-
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |    9 +
 drivers/gpu/drm/amd/display/dc/dc.h                |    2 +-
 drivers/gpu/drm/amd/display/dc/dc_dp_types.h       |   14 +-
 drivers/gpu/drm/amd/display/dc/dc_link.h           |   12 +-
 .../gpu/drm/amd/display/dc/dce/dce_clock_source.c  |    2 +-
 .../amd/display/dc/dce110/dce110_hw_sequencer.c    |   25 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h  |    1 +
 .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |   30 +-
 .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c  |   16 +
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c |   14 +-
 .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c  |    6 +-
 .../drm/amd/display/dc/dcn302/dcn302_resource.c    |    6 +-
 drivers/gpu/drm/amd/display/dc/dcn31/Makefile      |   26 -
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c |    6 +-
 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c  |    3 +-
 .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c  |  361 +------
 .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h  |    4 +-
 drivers/gpu/drm/amd/display/dc/dcn315/Makefile     |   26 -
 .../drm/amd/display/dc/dcn315/dcn315_resource.c    |  235 +---
 .../drm/amd/display/dc/dcn315/dcn315_resource.h    |    3 +
 drivers/gpu/drm/amd/display/dc/dcn316/Makefile     |   26 -
 .../drm/amd/display/dc/dcn316/dcn316_resource.c    |  234 +---
 .../drm/amd/display/dc/dcn316/dcn316_resource.h    |    3 +
 drivers/gpu/drm/amd/display/dc/dml/Makefile        |    2 +
 .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c   |   19 +-
 .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c   |    2 -
 .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c   |  863 +++++++++++++++
 .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h   |   44 +
 drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h     |    2 +-
 drivers/gpu/drm/amd/display/dc/inc/link_hwss.h     |    1 +
 .../gpu/drm/amd/display/dc/link/link_dp_trace.c    |   20 +
 .../gpu/drm/amd/display/dc/link/link_dp_trace.h    |    5 +
 .../gpu/drm/amd/display/dc/link/link_hwss_dio.c    |   41 +
 .../gpu/drm/amd/display/dc/link/link_hwss_dio.h    |    1 +
 .../gpu/drm/amd/display/dc/link/link_hwss_dpia.c   |    1 +
 .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c |   17 +
 .../drm/amd/display/dc/link/link_hwss_hpo_frl.c    |   19 +
 .../drm/amd/display/dc/virtual/virtual_link_hwss.c |    5 +
 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |   48 +-
 .../gpu/drm/amd/display/include/grph_object_id.h   |    1 +
 .../drm/amd/display/modules/freesync/freesync.c    |   73 +-
 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c    |   38 +-
 drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h    |    8 +
 .../drm/amd/display/modules/hdcp/hdcp1_execution.c |    6 +-
 .../gpu/drm/amd/display/modules/inc/mod_freesync.h |   12 +
 drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h |    2 +-
 .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h  |   13 +
 .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h |   24 +
 drivers/gpu/drm/amd/pm/amdgpu_pm.c                 |   81 +-
 drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c   |   17 +
 .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c  |  147 +++
 drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h       |    2 +
 drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h      |    2 +
 .../inc/pmfw_if/smu11_driver_if_sienna_cichlid.h   |    7 +-
 .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c    |   31 +
 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c |   16 +-
 drivers/gpu/drm/radeon/Makefile                    |    2 +-
 drivers/gpu/drm/radeon/radeon_pm.c                 |    2 +-
 drivers/gpu/drm/radeon/si_blit_shaders.c           |  253 -----
 drivers/gpu/drm/radeon/si_blit_shaders.h           |  223 +++-
 108 files changed, 3426 insertions(+), 2653 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h
 delete mode 100644 drivers/gpu/drm/radeon/si_blit_shaders.c
$ git am -3 ../patches/0001-fix-up-for-drm-ttm-rework-bulk-move-handling-v5.patch
Applying: fix up for "drm/ttm: rework bulk move handling v5"
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
$ git add -A .
$ git commit -v -a --amend
[master 826ed36e244f] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
 Date: Fri Apr 8 11:10:03 2022 +1000
Merging drm-intel/for-linux-next (4b276ed3c7ac drm/i915/uncore: Warn on previous unclaimed accesses)
$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/dp/drm_dp.c
Auto-merging drivers/gpu/drm/i915/Makefile
Auto-merging drivers/gpu/drm/i915/display/intel_atomic_plane.c
Auto-merging drivers/gpu/drm/i915/display/intel_bw.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bw.c
Auto-merging drivers/gpu/drm/i915/display/intel_crtc.c
Auto-merging drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c
Auto-merging drivers/gpu/drm/i915/display/intel_psr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_region.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_stolen.c
Auto-merging drivers/gpu/drm/i915/gem/selftests/huge_pages.c
Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c
Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c
Auto-merging drivers/gpu/drm/i915/gt/intel_gt_regs.h
Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.c
Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.h
Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c
Auto-merging drivers/gpu/drm/i915/gt/intel_sseu.c
Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
Auto-merging drivers/gpu/drm/i915/i915_driver.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_params.c
Auto-merging drivers/gpu/drm/i915/i915_pci.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/intel_device_info.c
Auto-merging drivers/gpu/drm/i915/intel_device_info.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.h
Auto-merging drivers/gpu/drm/i915/intel_memory_region.c
Auto-merging drivers/gpu/drm/i915/intel_memory_region.h
Auto-merging drivers/gpu/drm/i915/intel_pch.c
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_step.c
Auto-merging drivers/iommu/intel/iommu.c
Auto-merging include/drm/dp/drm_dp_helper.h
Resolved 'drivers/gpu/drm/i915/display/intel_bw.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/display/intel_display.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/display/intel_psr.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/i915_pci.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/intel_device_info.h' using previous resolution.
Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 65c0214b4cdf] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel
$ git diff -M --stat --summary HEAD^..
 Documentation/gpu/i915.rst                         |  14 +-
 arch/x86/kernel/early-quirks.c                     |   1 +
 drivers/gpu/drm/dp/drm_dp.c                        |  58 +-
 drivers/gpu/drm/i915/Makefile                      |   1 +
 drivers/gpu/drm/i915/display/g4x_dp.c              |  73 +-
 drivers/gpu/drm/i915/display/g4x_hdmi.c            |  36 +-
 drivers/gpu/drm/i915/display/i9xx_plane.c          |  24 +-
 drivers/gpu/drm/i915/display/icl_dsi.c             |  16 +-
 drivers/gpu/drm/i915/display/intel_atomic_plane.c  | 140 ++--
 drivers/gpu/drm/i915/display/intel_atomic_plane.h  |   3 +-
 drivers/gpu/drm/i915/display/intel_audio.c         |  45 +-
 drivers/gpu/drm/i915/display/intel_backlight.c     |   3 +-
 drivers/gpu/drm/i915/display/intel_bios.c          |  41 +-
 drivers/gpu/drm/i915/display/intel_bw.c            | 312 +++++----
 drivers/gpu/drm/i915/display/intel_bw.h            |  12 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c         |  96 +--
 drivers/gpu/drm/i915/display/intel_cdclk.h         |   2 +
 drivers/gpu/drm/i915/display/intel_color.c         |  95 ++-
 drivers/gpu/drm/i915/display/intel_color.h         |   3 +-
 drivers/gpu/drm/i915/display/intel_combo_phy.c     |  35 +-
 drivers/gpu/drm/i915/display/intel_connector.c     |   4 +-
 drivers/gpu/drm/i915/display/intel_crtc.c          |   8 +-
 drivers/gpu/drm/i915/display/intel_cursor.c        |  27 +-
 drivers/gpu/drm/i915/display/intel_ddi.c           |  33 +-
 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c |  40 +-
 drivers/gpu/drm/i915/display/intel_display.c       | 776 ++++++++++-----------
 drivers/gpu/drm/i915/display/intel_display.h       |   3 +-
 .../gpu/drm/i915/display/intel_display_debugfs.c   | 302 +++-----
 drivers/gpu/drm/i915/display/intel_display_power.c | 541 +++-----------
 drivers/gpu/drm/i915/display/intel_display_power.h |  37 +-
 .../drm/i915/display/intel_display_power_well.c    | 113 +++
 .../drm/i915/display/intel_display_power_well.h    | 153 ++++
 drivers/gpu/drm/i915/display/intel_display_trace.h |   9 +-
 drivers/gpu/drm/i915/display/intel_display_types.h |  43 +-
 drivers/gpu/drm/i915/display/intel_dmc.c           | 131 +++-
 drivers/gpu/drm/i915/display/intel_dmc.h           |  10 +-
 drivers/gpu/drm/i915/display/intel_dmc_regs.h      |  30 +
 drivers/gpu/drm/i915/display/intel_dp.c            | 564 +++++++++------
 .../gpu/drm/i915/display/intel_dp_link_training.c  |  31 +-
 drivers/gpu/drm/i915/display/intel_dp_mst.c        |   8 +-
 drivers/gpu/drm/i915/display/intel_dpll.c          |  44 +-
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c      | 144 ++--
 drivers/gpu/drm/i915/display/intel_dpt.c           |   2 +-
 drivers/gpu/drm/i915/display/intel_drrs.c          | 406 ++++-------
 drivers/gpu/drm/i915/display/intel_drrs.h          |  20 +-
 drivers/gpu/drm/i915/display/intel_dsb.c           |   7 +-
 drivers/gpu/drm/i915/display/intel_dsi.c           |  24 +-
 drivers/gpu/drm/i915/display/intel_dsi_vbt.c       |   7 +-
 drivers/gpu/drm/i915/display/intel_dvo.c           |  49 +-
 drivers/gpu/drm/i915/display/intel_fb.c            |  15 +-
 drivers/gpu/drm/i915/display/intel_fb.h            |   1 +
 drivers/gpu/drm/i915/display/intel_fbc.c           |   8 +-
 drivers/gpu/drm/i915/display/intel_fdi.c           |   8 +-
 drivers/gpu/drm/i915/display/intel_gmbus.c         | 142 ++--
 drivers/gpu/drm/i915/display/intel_hdcp.c          |   1 +
 drivers/gpu/drm/i915/display/intel_hdmi.c          |   3 +-
 drivers/gpu/drm/i915/display/intel_lvds.c          |  57 +-
 drivers/gpu/drm/i915/display/intel_overlay.c       |  22 +-
 drivers/gpu/drm/i915/display/intel_panel.c         | 359 ++++++----
 drivers/gpu/drm/i915/display/intel_panel.h         |  33 +-
 drivers/gpu/drm/i915/display/intel_pch_display.c   |  99 ++-
 drivers/gpu/drm/i915/display/intel_pch_display.h   |  10 +
 drivers/gpu/drm/i915/display/intel_plane_initial.c |   1 +
 drivers/gpu/drm/i915/display/intel_psr.c           | 183 ++++-
 drivers/gpu/drm/i915/display/intel_psr.h           |   5 +-
 drivers/gpu/drm/i915/display/intel_sdvo.c          |  88 +--
 drivers/gpu/drm/i915/display/intel_snps_phy.c      |   8 +-
 drivers/gpu/drm/i915/display/intel_sprite.c        |  51 +-
 drivers/gpu/drm/i915/display/intel_tv.c            |  12 +-
 drivers/gpu/drm/i915/display/intel_vbt_defs.h      |  16 +-
 drivers/gpu/drm/i915/display/intel_vdsc.c          |  24 +-
 drivers/gpu/drm/i915/display/intel_vrr.c           |   4 +-
 drivers/gpu/drm/i915/display/skl_scaler.c          |  22 +-
 drivers/gpu/drm/i915/display/skl_universal_plane.c | 223 ++++--
 drivers/gpu/drm/i915/display/vlv_dsi.c             |  15 +-
 drivers/gpu/drm/i915/display/vlv_dsi_pll.c         |   8 +-
 drivers/gpu/drm/i915/gem/i915_gem_context.c        |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c     |   3 +-
 drivers/gpu/drm/i915/gem/i915_gem_lmem.c           |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_object.c         |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_phys.c           |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_region.c         |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_shmem.c          |   3 +-
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c         |   3 +-
 drivers/gpu/drm/i915/gem/i915_gem_tiling.c         |   8 +
 drivers/gpu/drm/i915/gem/i915_gem_tiling.h         |   2 +
 drivers/gpu/drm/i915/gem/i915_gemfs.c              |   3 +-
 drivers/gpu/drm/i915/gem/selftests/huge_pages.c    |  10 +-
 .../gpu/drm/i915/gem/selftests/i915_gem_context.c  |   7 +-
 drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c |   1 +
 drivers/gpu/drm/i915/gt/intel_breadcrumbs.c        |   3 +-
 drivers/gpu/drm/i915/gt/intel_engine_cs.c          |  11 +-
 .../gpu/drm/i915/gt/intel_execlists_submission.c   |   7 +-
 drivers/gpu/drm/i915/gt/intel_ggtt.c               |   5 +-
 drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c       |   2 +
 drivers/gpu/drm/i915/gt/intel_gt_pm.c              |   3 +-
 drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c      |  54 +-
 drivers/gpu/drm/i915/gt/intel_gt_regs.h            |   1 -
 drivers/gpu/drm/i915/gt/intel_gtt.c                |  12 +
 drivers/gpu/drm/i915/gt/intel_gtt.h                |   2 +
 drivers/gpu/drm/i915/gt/intel_rc6.c                |   5 +-
 drivers/gpu/drm/i915/gt/intel_reset.c              |   3 +-
 drivers/gpu/drm/i915/gt/intel_rps.c                |  13 +-
 drivers/gpu/drm/i915/gt/intel_sseu.c               |   9 +-
 drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c       |  10 +-
 drivers/gpu/drm/i915/gt/selftest_timeline.c        |   3 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c          |   5 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.c         |   5 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c          |   6 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c        |   3 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc.c              |  14 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c      |  20 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c           |   1 +
 drivers/gpu/drm/i915/gvt/handlers.c                |  20 +-
 drivers/gpu/drm/i915/i915_cmd_parser.c             |   2 +
 drivers/gpu/drm/i915/i915_debugfs.c                |  18 +-
 drivers/gpu/drm/i915/i915_driver.c                 |   5 +-
 drivers/gpu/drm/i915/i915_driver.h                 |   4 +
 drivers/gpu/drm/i915/i915_drv.h                    | 121 +---
 drivers/gpu/drm/i915/i915_gpu_error.c              |  21 +-
 drivers/gpu/drm/i915/i915_gpu_error.h              |   6 +
 drivers/gpu/drm/i915/i915_params.c                 |   7 +-
 drivers/gpu/drm/i915/i915_pci.c                    |  39 +-
 drivers/gpu/drm/i915/i915_pmu.c                    |   5 +-
 drivers/gpu/drm/i915/i915_reg.h                    | 133 ++--
 drivers/gpu/drm/i915/i915_utils.c                  |  11 +
 drivers/gpu/drm/i915/i915_utils.h                  |  37 +-
 drivers/gpu/drm/i915/intel_device_info.c           |  11 +-
 drivers/gpu/drm/i915/intel_device_info.h           |   1 +
 drivers/gpu/drm/i915/intel_dram.c                  |  10 +-
 drivers/gpu/drm/i915/intel_memory_region.c         |   2 +
 drivers/gpu/drm/i915/intel_memory_region.h         |   2 +-
 drivers/gpu/drm/i915/intel_pch.c                   |   3 +-
 drivers/gpu/drm/i915/intel_pm.c                    | 526 +++++++-------
 drivers/gpu/drm/i915/intel_pm.h                    |   1 +
 drivers/gpu/drm/i915/intel_step.c                  |   7 +
 drivers/gpu/drm/i915/intel_uncore.c                |  29 +-
 drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c       |   4 +-
 drivers/gpu/drm/i915/pxp/intel_pxp_session.c       |   2 -
 drivers/gpu/drm/i915/selftests/i915_active.c       |   3 +-
 drivers/gpu/drm/i915/vlv_suspend.c                 |   3 +-
 drivers/iommu/intel/iommu.c                        |   2 +-
 include/drm/dp/drm_dp_helper.h                     |   2 +
 include/drm/i915_drm.h                             |   3 +-
 include/drm/i915_pciids.h                          |   4 +-
 include/uapi/drm/drm_fourcc.h                      |  11 +
 146 files changed, 3829 insertions(+), 3464 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.c
 create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.h
 create mode 100644 drivers/gpu/drm/i915/display/intel_dmc_regs.h
Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats)
$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next
Merge made by the 'ort' strategy.
Merging drm-msm/msm-next (0fe35b8dcb8b drm/msm/dpu: Use indexed array initializer to prevent mismatches)
$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
Merge made by the 'ort' strategy.
 .../bindings/display/msm/dpu-qcm2290.yaml          |  4 +-
 drivers/gpu/drm/msm/adreno/adreno_device.c         | 79 ++++++++++++++++++----
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c  | 34 +++++-----
 drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c  |  2 +
 drivers/gpu/drm/msm/msm_gem.c                      |  1 +
 5 files changed, 87 insertions(+), 33 deletions(-)
Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation)
$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next
Merge made by the 'ort' strategy.
 drivers/gpu/drm/imx/imx-tve.c          | 4 +---
 drivers/gpu/drm/imx/ipuv3-plane.c      | 8 +-------
 drivers/gpu/ipu-v3/ipu-dc.c            | 5 +++--
 drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------
 4 files changed, 8 insertions(+), 18 deletions(-)
Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary)
$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next
Merge made by the 'ort' strategy.
 drivers/gpu/drm/etnaviv/etnaviv_gem.c | 11 ++-----
 drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 54 +++++++++++++++++++++++++++++++++--
 2 files changed, 55 insertions(+), 10 deletions(-)
Merging fbdev/for-next (5c8f867d5c34 video: fbdev: s3fb: Error out if 'pixclock' equals zero)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
Merge made by the 'ort' strategy.
 drivers/video/fbdev/arkfb.c                |  3 +++
 drivers/video/fbdev/aty/aty128fb.c         |  1 -
 drivers/video/fbdev/aty/atyfb_base.c       |  1 -
 drivers/video/fbdev/aty/radeon_pm.c        |  1 -
 drivers/video/fbdev/aty/radeonfb.h         |  2 +-
 drivers/video/fbdev/controlfb.c            |  3 ---
 drivers/video/fbdev/imxfb.c                |  2 ++
 drivers/video/fbdev/kyro/fbdev.c           |  2 ++
 drivers/video/fbdev/matrox/matroxfb_base.h |  1 -
 drivers/video/fbdev/mb862xx/mb862xxfbdrv.c |  2 ++
 drivers/video/fbdev/neofb.c                |  2 +-
 drivers/video/fbdev/omap/hwa742.c          |  6 +++---
 drivers/video/fbdev/omap/lcdc.c            |  6 +++---
 drivers/video/fbdev/omap/sossi.c           |  5 +++--
 drivers/video/fbdev/platinumfb.c           |  2 +-
 drivers/video/fbdev/pm2fb.c                |  8 ++------
 drivers/video/fbdev/pxafb.c                |  4 ++--
 drivers/video/fbdev/s3fb.c                 |  3 +++
 drivers/video/fbdev/sis/sis_main.c         |  2 +-
 drivers/video/fbdev/tridentfb.c            |  3 +++
 drivers/video/fbdev/udlfb.c                | 14 ++++++++++++--
 drivers/video/fbdev/valkyriefb.c           |  3 +--
 drivers/video/fbdev/vt8623fb.c             |  3 +++
 drivers/video/of_display_timing.c          |  2 +-
 include/uapi/linux/fb.h                    |  2 +-
 25 files changed, 50 insertions(+), 33 deletions(-)
Merging regmap/for-next (bd941dfaae35 regmap: Constify static regmap_bus structs)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
Merge made by the 'ort' strategy.
 drivers/base/regmap/regmap-i3c.c     | 2 +-
 drivers/base/regmap/regmap-sccb.c    | 2 +-
 drivers/base/regmap/regmap-sdw-mbq.c | 2 +-
 drivers/base/regmap/regmap-sdw.c     | 2 +-
 drivers/base/regmap/regmap-slimbus.c | 2 +-
 drivers/base/regmap/regmap-w1.c      | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)
Merging sound/for-next (b2405aa948b9 firewire: add kernel API to access packet structure in request structure for AR context)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
Merge made by the 'ort' strategy.
 drivers/firewire/core-card.c        | 39 +++++++++++++++++++++++++++++++++++++
 drivers/firewire/core-cdev.c        |  6 ++++--
 drivers/firewire/core-transaction.c | 18 +++++++++++++++++
 include/linux/firewire.h            |  3 +++
 sound/pci/echoaudio/midi.c          |  1 -
 sound/pci/emu10k1/emu10k1_main.c    |  5 +----
 6 files changed, 65 insertions(+), 7 deletions(-)
Merging sound-asoc/for-next (e8f7a4155518 Merge remote-tracking branch 'asoc/for-5.19' into asoc-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 .../devicetree/bindings/sound/cirrus,cs35l45.yaml  |   75 ++
 .../sound/mt8195-mt6359-rt1011-rt5682.yaml         |   51 -
 ...t6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} |    9 +-
 .../bindings/sound/nvidia,tegra186-asrc.yaml       |   81 ++
 .../bindings/sound/nvidia,tegra210-ahub.yaml       |    4 +
 .../devicetree/bindings/sound/qcom,lpass-cpu.yaml  |   17 +-
 .../bindings/sound/qcom,lpass-rx-macro.yaml        |   17 +-
 .../bindings/sound/qcom,lpass-tx-macro.yaml        |   17 +-
 .../bindings/sound/qcom,lpass-va-macro.yaml        |   11 +-
 .../devicetree/bindings/sound/qcom,wcd938x.yaml    |    3 +
 .../devicetree/bindings/sound/wlf,wm8731.yaml      |   97 ++
 Documentation/devicetree/bindings/sound/wm8731.txt |   27 -
 MAINTAINERS                                        |    2 +
 arch/arm/configs/multi_v5_defconfig                |    3 +-
 include/dt-bindings/sound/cs35l45.h                |   20 +
 include/sound/cs35l41.h                            |    1 -
 include/sound/soc.h                                |    8 +
 sound/soc/Kconfig                                  |    9 +-
 sound/soc/Makefile                                 |    5 +
 sound/soc/atmel/Kconfig                            |    4 +-
 sound/soc/atmel/sam9g20_wm8731.c                   |   13 +-
 sound/soc/au1x/Kconfig                             |    2 +-
 sound/soc/codecs/Kconfig                           |   53 +-
 sound/soc/codecs/Makefile                          |   14 +
 sound/soc/codecs/ad193x-i2c.c                      |    6 +-
 sound/soc/codecs/adau1372-i2c.c                    |    4 +-
 sound/soc/codecs/adau1373.c                        |    5 +-
 sound/soc/codecs/adau1701.c                        |    5 +-
 sound/soc/codecs/adau1761-i2c.c                    |    8 +-
 sound/soc/codecs/adau1781-i2c.c                    |    8 +-
 sound/soc/codecs/adau1977-i2c.c                    |    8 +-
 sound/soc/codecs/adau7118-i2c.c                    |    5 +-
 sound/soc/codecs/adav803.c                         |    5 +-
 sound/soc/codecs/ak4613.c                          |  367 ++++--
 sound/soc/codecs/cs35l32.c                         |    5 +-
 sound/soc/codecs/cs35l33.c                         |    5 +-
 sound/soc/codecs/cs35l34.c                         |    5 +-
 sound/soc/codecs/cs35l35.c                         |    5 +-
 sound/soc/codecs/cs35l36.c                         |    5 +-
 sound/soc/codecs/cs35l41-i2c.c                     |    5 +-
 sound/soc/codecs/cs35l41-lib.c                     |   16 +-
 sound/soc/codecs/cs35l45-i2c.c                     |   72 ++
 sound/soc/codecs/cs35l45-spi.c                     |   72 ++
 sound/soc/codecs/cs35l45-tables.c                  |  202 ++++
 sound/soc/codecs/cs35l45.c                         |  693 +++++++++++
 sound/soc/codecs/cs35l45.h                         |  217 ++++
 sound/soc/codecs/cs4234.c                          |    4 +-
 sound/soc/codecs/cs4265.c                          |    5 +-
 sound/soc/codecs/cs4270.c                          |    5 +-
 sound/soc/codecs/cs4271-i2c.c                      |    5 +-
 sound/soc/codecs/cs42l42.c                         |    5 +-
 sound/soc/codecs/cs42l51-i2c.c                     |    5 +-
 sound/soc/codecs/cs42l52.c                         |    5 +-
 sound/soc/codecs/cs42l56.c                         |    5 +-
 sound/soc/codecs/cs42l73.c                         |    5 +-
 sound/soc/codecs/cs42xx8-i2c.c                     |    5 +-
 sound/soc/codecs/cs43130.c                         |    5 +-
 sound/soc/codecs/cs4341.c                          |    5 +-
 sound/soc/codecs/cs4349.c                          |    5 +-
 sound/soc/codecs/cs53l30.c                         |    5 +-
 sound/soc/codecs/da7210.c                          |    5 +-
 sound/soc/codecs/da7213.c                          |    5 +-
 sound/soc/codecs/da7218.c                          |   19 +-
 sound/soc/codecs/da7219.c                          |    5 +-
 sound/soc/codecs/da732x.c                          |    5 +-
 sound/soc/codecs/da9055.c                          |    5 +-
 sound/soc/codecs/isabelle.c                        |    5 +-
 sound/soc/codecs/lm49453.c                         |    5 +-
 sound/soc/codecs/lpass-macro-common.c              |   35 +-
 sound/soc/codecs/mt6660.c                          |    5 +-
 sound/soc/codecs/pcm3060-i2c.c                     |    5 +-
 sound/soc/codecs/rt1011.c                          |    5 +-
 sound/soc/codecs/rt1015.c                          |    5 +-
 sound/soc/codecs/rt1016.c                          |    5 +-
 sound/soc/codecs/rt1019.c                          |    5 +-
 sound/soc/codecs/rt1305.c                          |    5 +-
 sound/soc/codecs/rt1308.c                          |    5 +-
 sound/soc/codecs/rt274.c                           |    5 +-
 sound/soc/codecs/rt286.c                           |    5 +-
 sound/soc/codecs/rt298.c                           |    5 +-
 sound/soc/codecs/rt5514.c                          |    5 +-
 sound/soc/codecs/rt5616.c                          |    5 +-
 sound/soc/codecs/rt5631.c                          |    5 +-
 sound/soc/codecs/rt5640.c                          |    5 +-
 sound/soc/codecs/rt5645.c                          |    5 +-
 sound/soc/codecs/rt5651.c                          |    5 +-
 sound/soc/codecs/rt5659.c                          |    5 +-
 sound/soc/codecs/rt5660.c                          |    5 +-
 sound/soc/codecs/rt5663.c                          |    5 +-
 sound/soc/codecs/rt5665.c                          |    5 +-
 sound/soc/codecs/rt5668.c                          |    5 +-
 sound/soc/codecs/rt5670.c                          |    5 +-
 sound/soc/codecs/rt5682-i2c.c                      |    5 +-
 sound/soc/codecs/rt5682s.c                         |   32 +-
 sound/soc/codecs/rt5682s.h                         |    6 +-
 sound/soc/codecs/sgtl5000.c                        |    5 +-
 sound/soc/codecs/ssm2518.c                         |    5 +-
 sound/soc/codecs/ssm2602-i2c.c                     |    8 +-
 sound/soc/codecs/ssm4567.c                         |    5 +-
 sound/soc/codecs/tscs42xx.c                        |    5 +-
 sound/soc/codecs/tscs454.c                         |    5 +-
 sound/soc/codecs/wm1250-ev1.c                      |    5 +-
 sound/soc/codecs/wm2000.c                          |    5 +-
 sound/soc/codecs/wm2200.c                          |    5 +-
 sound/soc/codecs/wm5100.c                          |    5 +-
 sound/soc/codecs/wm8510.c                          |    5 +-
 sound/soc/codecs/wm8523.c                          |    5 +-
 sound/soc/codecs/wm8580.c                          |    5 +-
 sound/soc/codecs/wm8711.c                          |    5 +-
 sound/soc/codecs/wm8728.c                          |    5 +-
 sound/soc/codecs/wm8731-i2c.c                      |   68 ++
 sound/soc/codecs/wm8731-spi.c                      |   59 +
 sound/soc/codecs/wm8731.c                          |  266 +----
 sound/soc/codecs/wm8731.h                          |   27 +
 sound/soc/codecs/wm8737.c                          |    5 +-
 sound/soc/codecs/wm8741.c                          |    5 +-
 sound/soc/codecs/wm8750.c                          |    5 +-
 sound/soc/codecs/wm8753.c                          |    5 +-
 sound/soc/codecs/wm8776.c                          |    5 +-
 sound/soc/codecs/wm8804-i2c.c                      |    5 +-
 sound/soc/codecs/wm8900.c                          |    5 +-
 sound/soc/codecs/wm8903.c                          |    5 +-
 sound/soc/codecs/wm8904.c                          |    9 +-
 sound/soc/codecs/wm8940.c                          |    5 +-
 sound/soc/codecs/wm8955.c                          |    5 +-
 sound/soc/codecs/wm8960.c                          |    5 +-
 sound/soc/codecs/wm8961.c                          |    5 +-
 sound/soc/codecs/wm8962.c                          |    5 +-
 sound/soc/codecs/wm8971.c                          |    5 +-
 sound/soc/codecs/wm8974.c                          |    5 +-
 sound/soc/codecs/wm8978.c                          |    5 +-
 sound/soc/codecs/wm8983.c                          |    5 +-
 sound/soc/codecs/wm8985.c                          |    8 +-
 sound/soc/codecs/wm8988.c                          |    5 +-
 sound/soc/codecs/wm8990.c                          |    5 +-
 sound/soc/codecs/wm8991.c                          |    5 +-
 sound/soc/codecs/wm8993.c                          |    5 +-
 sound/soc/codecs/wm8995.c                          |    5 +-
 sound/soc/codecs/wm8996.c                          |    5 +-
 sound/soc/codecs/wm9081.c                          |    5 +-
 sound/soc/codecs/wm9090.c                          |    5 +-
 sound/soc/intel/atom/sst/sst.c                     |    1 -
 sound/soc/intel/boards/cht_bsw_max98090_ti.c       |   18 +-
 sound/soc/intel/catpt/messages.h                   |    4 +-
 sound/soc/mediatek/Kconfig                         |   26 +-
 sound/soc/mediatek/mt2701/mt2701-wm8960.c          |    9 +-
 sound/soc/mediatek/mt8173/mt8173-max98090.c        |    5 +-
 sound/soc/mediatek/mt8195/Makefile                 |    3 +-
 .../mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c  | 1198 --------------------
 ...8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} |  862 +++++++++-----
 sound/soc/pxa/Kconfig                              |    4 +-
 sound/soc/qcom/Kconfig                             |    2 +
 sound/soc/qcom/sc7280.c                            |  107 ++
 sound/soc/samsung/bells.c                          |    4 +-
 sound/soc/samsung/littlemill.c                     |    4 +-
 sound/soc/samsung/lowland.c                        |    4 +-
 sound/soc/samsung/speyside.c                       |    4 +-
 sound/soc/samsung/tobermory.c                      |    4 +-
 sound/soc/sh/rcar/core.c                           |    2 +-
 sound/soc/soc-core.c                               |   80 ++
 sound/soc/soc-topology.c                           |  455 ++++----
 sound/soc/soc-utils-test.c                         |  186 +++
 sound/soc/soc-utils.c                              |   45 +
 sound/soc/sof/compress.c                           |    8 +-
 sound/soc/sof/control.c                            |   33 -
 sound/soc/sof/debug.c                              |    2 +-
 sound/soc/sof/intel/hda-dsp.c                      |    8 +-
 sound/soc/sof/intel/hda-loader.c                   |   12 +-
 sound/soc/sof/intel/tgl.c                          |    6 +-
 sound/soc/sof/ipc.c                                |   76 +-
 sound/soc/sof/ipc3-pcm.c                           |    8 +-
 sound/soc/sof/ipc3-topology.c                      |   26 +-
 sound/soc/sof/ipc3.c                               |    4 +-
 sound/soc/sof/pcm.c                                |    5 +-
 sound/soc/sof/pm.c                                 |   20 +-
 sound/soc/sof/sof-audio.c                          |    3 -
 sound/soc/sof/sof-audio.h                          |    1 -
 sound/soc/sof/sof-client.c                         |    2 +-
 sound/soc/sof/sof-priv.h                           |   27 +-
 sound/soc/sof/topology.c                           |   24 +-
 sound/soc/sof/trace.c                              |   61 +-
 sound/soc/tegra/Kconfig                            |   12 +
 sound/soc/tegra/Makefile                           |    2 +
 sound/soc/tegra/tegra186_asrc.c                    | 1046 +++++++++++++++++
 sound/soc/tegra/tegra186_asrc.h                    |  112 ++
 sound/soc/tegra/tegra210_ahub.c                    |   82 +-
 186 files changed, 5105 insertions(+), 2724 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs35l45.yaml
 delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml
 rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} (84%)
 create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml
 create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8731.yaml
 delete mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
 create mode 100644 include/dt-bindings/sound/cs35l45.h
 create mode 100644 sound/soc/codecs/cs35l45-i2c.c
 create mode 100644 sound/soc/codecs/cs35l45-spi.c
 create mode 100644 sound/soc/codecs/cs35l45-tables.c
 create mode 100644 sound/soc/codecs/cs35l45.c
 create mode 100644 sound/soc/codecs/cs35l45.h
 create mode 100644 sound/soc/codecs/wm8731-i2c.c
 create mode 100644 sound/soc/codecs/wm8731-spi.c
 delete mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c
 rename sound/soc/mediatek/mt8195/{mt8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} (78%)
 create mode 100644 sound/soc/soc-utils-test.c
 create mode 100644 sound/soc/tegra/tegra186_asrc.c
 create mode 100644 sound/soc/tegra/tegra186_asrc.h
Merging modules/modules-next (eeaec7801c42 powerpc: Select ARCH_WANTS_MODULES_DATA_IN_VMALLOC on book3s/32 and 8xx)
$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 MAINTAINERS                                        |    4 +-
 arch/Kconfig                                       |    6 +
 arch/powerpc/Kconfig                               |    1 +
 include/linux/kdb.h                                |    1 +
 include/linux/module.h                             |   29 +-
 kernel/Makefile                                    |    5 +-
 kernel/debug/kdb/kdb_io.c                          |    1 -
 kernel/debug/kdb/kdb_keyboard.c                    |    1 -
 kernel/debug/kdb/kdb_main.c                        |   49 -
 kernel/debug/kdb/kdb_private.h                     |    4 -
 kernel/debug/kdb/kdb_support.c                     |    1 -
 kernel/module-internal.h                           |   50 -
 kernel/module/Makefile                             |   20 +
 kernel/module/debug_kmemleak.c                     |   30 +
 .../{module_decompress.c => module/decompress.c}   |    5 +-
 kernel/module/internal.h                           |  268 +++
 kernel/module/kallsyms.c                           |  512 +++++
 kernel/module/kdb.c                                |   62 +
 kernel/module/livepatch.c                          |   74 +
 kernel/{module.c => module/main.c}                 | 2007 ++------------------
 kernel/module/procfs.c                             |  146 ++
 kernel/module/signing.c                            |  122 ++
 kernel/module/strict_rwx.c                         |  143 ++
 kernel/module/sysfs.c                              |  436 +++++
 kernel/module/tree_lookup.c                        |  117 ++
 kernel/module/version.c                            |  109 ++
 kernel/module_signing.c                            |   45 -
 27 files changed, 2243 insertions(+), 2005 deletions(-)
 delete mode 100644 kernel/module-internal.h
 create mode 100644 kernel/module/Makefile
 create mode 100644 kernel/module/debug_kmemleak.c
 rename kernel/{module_decompress.c => module/decompress.c} (99%)
 create mode 100644 kernel/module/internal.h
 create mode 100644 kernel/module/kallsyms.c
 create mode 100644 kernel/module/kdb.c
 create mode 100644 kernel/module/livepatch.c
 rename kernel/{module.c => module/main.c} (62%)
 create mode 100644 kernel/module/procfs.c
 create mode 100644 kernel/module/signing.c
 create mode 100644 kernel/module/strict_rwx.c
 create mode 100644 kernel/module/sysfs.c
 create mode 100644 kernel/module/tree_lookup.c
 create mode 100644 kernel/module/version.c
 delete mode 100644 kernel/module_signing.c
Merging input/next (a949087c2285 Input: adi - remove redundant variable z)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
Already up to date.
Merging block/for-next (4a8ac351444c Merge branch 'for-5.19/io_uring' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
Auto-merging fs/internal.h
Merge made by the 'ort' strategy.
 block/bio.c                        |   88 ++-
 block/blk.h                        |    7 -
 block/fops.c                       |   11 +-
 drivers/block/drbd/drbd_bitmap.c   |    2 +-
 drivers/block/drbd/drbd_main.c     |   11 +-
 drivers/block/drbd/drbd_nl.c       |   33 +-
 drivers/block/drbd/drbd_receiver.c |   15 +-
 drivers/block/drbd/drbd_req.c      |    2 +-
 drivers/block/drbd/drbd_state.c    |    3 +-
 drivers/block/drbd/drbd_worker.c   |    2 +-
 fs/internal.h                      |   29 +
 fs/io-wq.h                         |    1 +
 fs/io_uring.c                      | 1449 ++++++++++++++++++------------------
 fs/xattr.c                         |  141 ++--
 include/linux/bio.h                |    8 +-
 include/linux/blk_types.h          |    3 +-
 include/uapi/linux/io_uring.h      |    8 +-
 17 files changed, 960 insertions(+), 853 deletions(-)
Merging device-mapper/for-next (7f790f4da003 dm: remove bio polling debug checks)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next
Merge made by the 'ort' strategy.
 drivers/md/dm-core.h   |  38 +++--
 drivers/md/dm-delay.c  |   3 +-
 drivers/md/dm-flakey.c |   4 +-
 drivers/md/dm-linear.c |  11 +-
 drivers/md/dm-stats.c  |   3 +
 drivers/md/dm-table.c  |  16 +-
 drivers/md/dm.c        | 447 +++++++++++++++++++++++++++++--------------------
 drivers/md/dm.h        |   4 +-
 8 files changed, 314 insertions(+), 212 deletions(-)
Merging libata/for-next (eaeb9fb2739b ata: pata_mpc52xx: Prepare cleanup of powerpc's asm/prom.h)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next
Merge made by the 'ort' strategy.
 drivers/ata/pata_mpc52xx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards)
$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
Auto-merging drivers/pcmcia/Kconfig
Merge made by the 'ort' strategy.
 drivers/pcmcia/Kconfig          | 2 +-
 drivers/pcmcia/rsrc_nonstatic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Merging mmc/next (81980c8e5600 MAINTAINERS: Add linux-renesas-soc@vger.kernel.org list for Renesas TMIO/SDHI driver)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 .../bindings/mmc/marvell,xenon-sdhci.txt           | 173 -------------
 .../bindings/mmc/marvell,xenon-sdhci.yaml          | 275 +++++++++++++++++++++
 Documentation/devicetree/bindings/mmc/mtk-sd.yaml  |  15 +-
 MAINTAINERS                                        |   3 +-
 drivers/mmc/core/block.c                           |  16 +-
 drivers/mmc/core/core.c                            |   3 +
 drivers/mmc/core/mmc.c                             |  21 +-
 drivers/mmc/host/mmci_stm32_sdmmc.c                |  88 +++++--
 drivers/mmc/host/of_mmc_spi.c                      |   4 +
 drivers/mmc/host/omap.c                            |  23 +-
 drivers/mmc/host/renesas_sdhi.h                    |   2 +
 drivers/mmc/host/renesas_sdhi_core.c               |   2 -
 drivers/mmc/host/renesas_sdhi_internal_dmac.c      |  76 +++---
 13 files changed, 446 insertions(+), 255 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
 create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
Merging mfd/for-mfd-next (d99460ed5cdc dt-bindings: mfd: syscon: Add microchip,lan966x-cpu-syscon compatible)
$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next
Already up to date.
Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight())
$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next
Already up to date.
Merging battery/for-next (c22fca40522e power: ab8500_chargalg: Use CLOCK_MONOTONIC)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
Already up to date.
Merging regulator/for-next (6480f54414b7 Merge remote-tracking branch 'regulator/for-5.19' into regulator-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
Merge made by the 'ort' strategy.
 .../bindings/regulator/mt6358-regulator.txt        |  22 +-
 .../regulator/richtek,rt4801-regulator.yaml        |   7 +-
 .../regulator/richtek,rt5759-regulator.yaml        |  90 +++++
 drivers/regulator/Kconfig                          |  10 +
 drivers/regulator/Makefile                         |   1 +
 drivers/regulator/core.c                           |  18 +
 drivers/regulator/fixed.c                          |   5 +-
 drivers/regulator/mt6358-regulator.c               | 213 +++++++++++-
 drivers/regulator/rpi-panel-attiny-regulator.c     |   1 -
 drivers/regulator/rt5759-regulator.c               | 369 +++++++++++++++++++++
 include/linux/regulator/mt6358-regulator.h         |  45 +++
 11 files changed, 761 insertions(+), 20 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt5759-regulator.yaml
 create mode 100644 drivers/regulator/rt5759-regulator.c
Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing
Auto-merging security/commoncap.c
Merge made by the 'ort' strategy.
Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize')
$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
Auto-merging MAINTAINERS
Auto-merging security/apparmor/lsm.c
Merge made by the 'ort' strategy.
 MAINTAINERS                            |  7 ++-
 security/apparmor/Kconfig              | 86 ++++++++++++++++++++---------
 security/apparmor/apparmorfs.c         | 99 +++++++++++++++++++---------------
 security/apparmor/audit.c              |  2 +-
 security/apparmor/include/apparmor.h   |  1 +
 security/apparmor/include/apparmorfs.h | 14 +++++
 security/apparmor/include/lib.h        |  5 ++
 security/apparmor/label.c              | 17 +++---
 security/apparmor/lib.c                |  2 +-
 security/apparmor/lsm.c                | 23 ++++----
 security/apparmor/mount.c              | 11 ++--
 security/apparmor/policy.c             | 35 ++++++------
 security/apparmor/policy_unpack.c      | 37 ++++++++-----
 security/apparmor/policy_unpack_test.c | 34 ++++++------
 security/apparmor/procattr.c           |  2 +-
 15 files changed, 234 insertions(+), 141 deletions(-)
Merging integrity/next-integrity (29d1c2b47ef3 ima: remove redundant initialization of pointer 'file'.)
$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
Merge made by the 'ort' strategy.
 security/integrity/ima/ima_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next
Already up to date.
Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata)
$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next
Already up to date.
Merging selinux/next (81200b0265b1 selinux: checkreqprot is deprecated, add some ssleep() discomfort)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
Merge made by the 'ort' strategy.
 security/selinux/avc.c              | 4 ++--
 security/selinux/hooks.c            | 5 +++--
 security/selinux/include/security.h | 6 ++++++
 security/selinux/selinuxfs.c        | 6 ++++--
 security/selinux/ss/services.c      | 1 -
 5 files changed, 15 insertions(+), 7 deletions(-)
Merging smack/next (ba6b652bd863 smack: Remove redundant assignments)
$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
Auto-merging security/smack/smackfs.c
Merge made by the 'ort' strategy.
 security/smack/smackfs.c | 1 -
 1 file changed, 1 deletion(-)
Merging tomoyo/master (99499a2b0ff0 loop: yet another approach to fix the loop lock order inversions)
$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master
Auto-merging include/linux/blk_types.h
Merge made by the 'ort' strategy.
 block/bdev.c                  |  16 +--
 block/partitions/core.c       |   2 +-
 drivers/block/loop.c          | 257 ++++++++++++++++++------------------------
 drivers/block/loop.h          |   1 -
 drivers/block/nbd.c           |  16 +--
 drivers/block/zram/zram_drv.c |  29 +++--
 include/linux/blk_types.h     |   2 +-
 include/linux/blkdev.h        |  15 +++
 include/linux/workqueue.h     |  15 +--
 kernel/workqueue.c            |  36 ++++--
 10 files changed, 190 insertions(+), 199 deletions(-)
Merging tpmdd/next (8467b0ed6ce3 Merge tag 'for-5.18/drivers-2022-04-01' of git://git.kernel.dk/linux-block)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
Already up to date.
Merging watchdog/master (826270373f17 Watchdog: sp5100_tco: Enable Family 17h+ CPUs)
$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
Already up to date.
Merging iommu/next (e17c6debd4b2 Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next
Already up to date.
Merging audit/next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
Already up to date.
Merging devicetree/for-next (981a34054038 dt-bindings: power: renesas,rcar-sysc: drop useless consumer example)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
Auto-merging Documentation/devicetree/bindings/clock/samsung,exynos4412-isp-clock.yaml
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 .../clock/samsung,exynos4412-isp-clock.yaml        |   1 -
 .../bindings/crypto/allwinner,sun8i-ce.yaml        |   1 -
 .../bindings/display/amlogic,meson-dw-hdmi.yaml    |   1 -
 .../display/bridge/google,cros-ec-anx7688.yaml     |   1 -
 .../devicetree/bindings/display/bridge/ps8640.yaml |   1 -
 .../bindings/display/imx/nxp,imx8mq-dcss.yaml      |   1 -
 .../bindings/display/mediatek/mediatek,merge.yaml  |   1 -
 .../bindings/display/panel/ilitek,ili9341.yaml     |   1 -
 .../bindings/display/panel/orisetech,otm8009a.yaml |   1 -
 .../display/sprd/sprd,display-subsystem.yaml       |   1 -
 .../devicetree/bindings/display/st,stm32-ltdc.yaml |   1 -
 .../devicetree/bindings/dma/st,stm32-dmamux.yaml   |   1 -
 .../devicetree/bindings/dma/st,stm32-mdma.yaml     |   1 -
 .../devicetree/bindings/example-schema.yaml        |  14 +--
 .../devicetree/bindings/gpu/samsung-rotator.yaml   |   1 -
 .../devicetree/bindings/hwmon/adt7475.yaml         |   1 -
 .../devicetree/bindings/i2c/i2c-gate.yaml          |   1 -
 .../devicetree/bindings/i2c/i2c-mt65xx.txt         |  53 ---------
 .../devicetree/bindings/i2c/i2c-mt65xx.yaml        | 118 ++++++++++++++++++
 .../devicetree/bindings/i2c/i2c-mux-gpmux.yaml     |   1 -
 .../devicetree/bindings/i2c/qcom,i2c-qup.txt       |  40 -------
 .../devicetree/bindings/i2c/qcom,i2c-qup.yaml      |  89 ++++++++++++++
 .../devicetree/bindings/iio/adc/adi,ad7291.yaml    |   1 -
 .../devicetree/bindings/iio/dac/lltc,ltc1660.yaml  |   2 +-
 .../devicetree/bindings/iommu/samsung,sysmmu.yaml  |   1 -
 .../bindings/leds/backlight/qcom-wled.yaml         |   2 +-
 .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml   |   1 -
 .../devicetree/bindings/media/microchip,xisc.yaml  |   1 -
 .../bindings/mtd/hisilicon,fmc-spi-nor.txt         |   2 +-
 .../devicetree/bindings/net/qcom,ipa.yaml          |   7 ++
 .../devicetree/bindings/net/smsc,lan91c111.yaml    |  61 ++++++++++
 .../devicetree/bindings/net/smsc-lan91c111.txt     |  17 ---
 .../devicetree/bindings/net/ti,k3-am654-cpts.yaml  |   1 -
 .../bindings/net/wireless/qcom,ath11k.yaml         |   2 +-
 .../bindings/pci/socionext,uniphier-pcie.yaml      |  96 +++++++++++++++
 .../devicetree/bindings/pci/uniphier-pcie.txt      |  82 -------------
 .../bindings/power/amlogic,meson-sec-pwrc.yaml     |   1 -
 .../bindings/power/renesas,rcar-sysc.yaml          |  15 +--
 .../bindings/power/supply/cw2015_battery.yaml      |   1 -
 .../bindings/power/supply/power-supply.yaml        |   1 -
 .../bindings/power/supply/ti,lp8727.yaml           |   1 -
 .../bindings/power/supply/tps65217-charger.yaml    |   2 +-
 .../regulator/socionext,uniphier-regulator.yaml    |   1 -
 .../bindings/regulator/st,stm32-vrefbuf.yaml       |   1 -
 .../bindings/reserved-memory/ramoops.yaml          |   1 -
 .../bindings/reset/hisilicon,hi6220-reset.txt      |  37 ------
 .../devicetree/bindings/reset/microchip,rst.yaml   |   1 -
 .../devicetree/bindings/rng/intel,ixp46x-rng.yaml  |   1 -
 .../devicetree/bindings/serial/qcom,msm-uartdm.txt |  81 -------------
 .../bindings/serial/qcom,msm-uartdm.yaml           | 112 +++++++++++++++++
 .../devicetree/bindings/serial/sprd-uart.yaml      |   2 +-
 .../bindings/soc/amlogic/amlogic,canvas.yaml       |   1 -
 .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml |   3 +-
 .../devicetree/bindings/soc/qcom/qcom,gsbi.txt     |  87 --------------
 .../devicetree/bindings/soc/qcom/qcom,gsbi.yaml    | 132 +++++++++++++++++++++
 .../devicetree/bindings/sound/adi,adau1372.yaml    |   1 -
 .../bindings/sound/amlogic,gx-sound-card.yaml      |   1 -
 .../devicetree/bindings/sound/maxim,max98520.yaml  |   1 -
 .../devicetree/bindings/sound/mchp,spdifrx.yaml    |   2 +-
 .../devicetree/bindings/sound/mchp,spdiftx.yaml    |   2 +-
 .../bindings/sound/nvidia,tegra-audio-rt5640.yaml  |   1 -
 .../bindings/sound/samsung,aries-wm8994.yaml       |   1 -
 .../devicetree/bindings/sound/samsung,odroid.yaml  |   1 -
 .../devicetree/bindings/sound/tas2562.yaml         |   1 -
 .../devicetree/bindings/sound/tas2770.yaml         |   1 -
 .../bindings/spi/amlogic,meson-gx-spicc.yaml       |   1 -
 .../bindings/spi/amlogic,meson6-spifc.yaml         |   1 -
 .../bindings/spi/qcom,spi-qcom-qspi.yaml           |   3 +-
 .../devicetree/bindings/spi/qcom,spi-qup.txt       | 103 ----------------
 .../devicetree/bindings/spi/qcom,spi-qup.yaml      |  81 +++++++++++++
 .../devicetree/bindings/spi/renesas,hspi.yaml      |   1 -
 .../devicetree/bindings/spi/spi-davinci.txt        |   2 +-
 .../devicetree/bindings/spi/spi-pl022.yaml         |   2 +-
 Documentation/devicetree/bindings/usb/dwc2.yaml    |   4 +-
 .../devicetree/bindings/usb/smsc,usb3503.yaml      |   2 +-
 .../devicetree/bindings/vendor-prefixes.yaml       |   2 +
 .../devicetree/bindings/writing-bindings.rst       |  25 ++++
 .../devicetree/bindings/writing-schema.rst         |   6 +
 MAINTAINERS                                        |   4 +-
 drivers/of/platform.c                              |  14 +--
 80 files changed, 761 insertions(+), 590 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
 delete mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt
 create mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-qup.yaml
 create mode 100644 Documentation/devicetree/bindings/net/smsc,lan91c111.yaml
 delete mode 100644 Documentation/devicetree/bindings/net/smsc-lan91c111.txt
 create mode 100644 Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml
 delete mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie.txt
 delete mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt
 delete mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt
 create mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uartdm.yaml
 delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt
 create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.yaml
 delete mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.txt
 create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.yaml
Merging mailbox/mailbox-for-next (1b0d0f7c12d5 dt-bindings: mailbox: add definition for mt8186)
$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next
Already up to date.
Merging spi/for-next (877c8c091688 Merge remote-tracking branch 'spi/for-5.19' into spi-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
Auto-merging Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.yaml
Merge made by the 'ort' strategy.
 .../bindings/spi/mediatek,spi-mt65xx.yaml          |   4 +
 .../bindings/spi/qcom,spi-qcom-qspi.yaml           |   1 +
 drivers/spi/spi-cadence.c                          |   8 +-
 drivers/spi/spi-mpc52xx-psc.c                      |   1 +
 drivers/spi/spi-mpc52xx.c                          |   3 +
 drivers/spi/spi-mt65xx.c                           | 386 ++++++++++++++++++++-
 drivers/spi/spidev.c                               | 101 +++---
 7 files changed, 428 insertions(+), 76 deletions(-)
Merging tip/master (7bcafc1e843a Merge x86/cpu into tip/master)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
Auto-merging arch/x86/Kconfig
Auto-merging drivers/acpi/processor_idle.c
Auto-merging kernel/Makefile
Auto-merging scripts/Makefile.build
Merge made by the 'ort' strategy.
 Documentation/admin-guide/kernel-parameters.txt |  24 +-
 Documentation/process/maintainer-tip.rst        |  14 +
 Documentation/x86/cpuinfo.rst                   |   5 +-
 Documentation/x86/x86_64/boot-options.rst       |   9 -
 arch/arm64/kernel/entry-common.c                |   8 +-
 arch/powerpc/include/asm/static_call.h          |   1 +
 arch/x86/Kconfig                                |  11 -
 arch/x86/Makefile                               |   1 +
 arch/x86/events/Kconfig                         |   8 +
 arch/x86/events/amd/Makefile                    |   1 +
 arch/x86/events/amd/brs.c                       | 364 ++++++++++++++++
 arch/x86/events/amd/core.c                      | 252 ++++++++++-
 arch/x86/events/core.c                          |  19 +-
 arch/x86/events/intel/core.c                    |   9 +-
 arch/x86/events/intel/cstate.c                  |  22 +-
 arch/x86/events/intel/lbr.c                     |  36 +-
 arch/x86/events/intel/uncore.c                  |   1 +
 arch/x86/events/intel/uncore_snb.c              |  20 +
 arch/x86/events/msr.c                           |   1 +
 arch/x86/events/perf_event.h                    | 143 ++++++-
 arch/x86/include/asm/amd_nb.h                   |   1 -
 arch/x86/include/asm/bug.h                      |   4 +-
 arch/x86/include/asm/cpu_entry_area.h           |   2 +-
 arch/x86/include/asm/cpufeature.h               |   7 +-
 arch/x86/include/asm/cpufeatures.h              |   1 +
 arch/x86/include/asm/disabled-features.h        |   8 +-
 arch/x86/include/asm/msr-index.h                |   4 +
 arch/x86/include/asm/page_64.h                  |   2 +-
 arch/x86/include/asm/percpu.h                   |   6 +-
 arch/x86/include/asm/perf_event.h               |  28 ++
 arch/x86/include/asm/pkeys.h                    |   8 -
 arch/x86/include/asm/proto.h                    |   1 -
 arch/x86/include/asm/smap.h                     |  24 --
 arch/x86/include/asm/static_call.h              |   2 +
 arch/x86/include/asm/svm.h                      |   8 +-
 arch/x86/kernel/amd_nb.c                        |   7 +-
 arch/x86/kernel/cpu/bugs.c                      |   7 +
 arch/x86/kernel/cpu/common.c                    | 101 ++---
 arch/x86/kernel/cpu/mce/amd.c                   |  32 +-
 arch/x86/kernel/cpu/mce/core.c                  |   4 +-
 arch/x86/kernel/setup.c                         |  28 +-
 arch/x86/kernel/sev.c                           |   3 +-
 arch/x86/kernel/static_call.c                   |   5 +-
 arch/x86/lib/delay.c                            |   4 +-
 arch/x86/mm/Makefile                            |   3 +-
 arch/x86/mm/fault.c                             |   2 +-
 arch/x86/mm/init_64.c                           |   1 -
 arch/x86/mm/setup_nx.c                          |  62 ---
 arch/x86/mm/tlb.c                               |  37 +-
 drivers/acpi/acpi_pad.c                         |   7 +
 drivers/acpi/processor_idle.c                   |   5 +
 drivers/char/agp/amd64-agp.c                    |   2 +-
 drivers/edac/amd64_edac.c                       |   2 +-
 include/linux/irqflags.h                        |   4 +-
 include/linux/kvm_host.h                        |   2 +-
 include/linux/local_lock_internal.h             |   6 +-
 include/linux/perf_event.h                      |  22 +
 include/linux/sched.h                           |  41 ++
 include/linux/sched/task_stack.h                |   2 +-
 include/linux/static_call.h                     |  48 ++-
 include/trace/events/lock.h                     |  63 ++-
 kernel/Makefile                                 |   3 +-
 kernel/configs/x86_debug.config                 |  18 +
 kernel/entry/common.c                           |   8 +-
 kernel/events/core.c                            | 212 +++------
 kernel/kcsan/kcsan_test.c                       |   5 +-
 kernel/locking/lockdep.c                        |  23 +-
 kernel/locking/mutex.c                          |  18 +-
 kernel/locking/percpu-rwsem.c                   |   5 +
 kernel/locking/qrwlock.c                        |   9 +
 kernel/locking/qspinlock.c                      |   5 +
 kernel/locking/rtmutex.c                        |  11 +
 kernel/locking/rwbase_rt.c                      |   7 +
 kernel/locking/rwsem.c                          | 130 +++---
 kernel/locking/semaphore.c                      |  15 +-
 kernel/sched/core.c                             |  28 +-
 kernel/sched/idle.c                             |   3 +-
 kernel/sched/sched.h                            |   6 -
 kernel/static_call.c                            | 541 -----------------------
 kernel/static_call_inline.c                     | 543 ++++++++++++++++++++++++
 kernel/trace/trace.c                            |  14 +-
 kernel/trace/trace_preemptirq.c                 |   4 +-
 mm/page_alloc.c                                 |   2 +-
 scripts/Makefile.build                          |   2 +-
 scripts/link-vmlinux.sh                         |   6 +-
 tools/arch/x86/include/asm/disabled-features.h  |   8 +-
 tools/objtool/check.c                           |  30 +-
 87 files changed, 2041 insertions(+), 1170 deletions(-)
 create mode 100644 arch/x86/events/amd/brs.c
 delete mode 100644 arch/x86/mm/setup_nx.c
 create mode 100644 kernel/configs/x86_debug.config
 create mode 100644 kernel/static_call_inline.c
Merging clockevents/timers/drivers/next (49c14f94ccfe clocksource/drivers/timer-of: check return value of of_iomap in timer_of_base_init())
$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
Merge made by the 'ort' strategy.
Merging edac/edac-for-next (b2fa90ef6255 powerpc/85xx: Remove fsl,85... bindings)
$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next
Merge made by the 'ort' strategy.
 .../bindings/memory-controllers/fsl/fsl,ddr.yaml           |  6 ------
 Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt  |  6 ------
 drivers/edac/mpc85xx_edac.c                                | 14 --------------
 3 files changed, 26 deletions(-)
Merging irqchip/irq/irqchip-next (de26a7424331 Merge branch irq/qcom-mpm into irq/irqchip-next)
$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next
Already up to date.
Merging ftrace/for-next (c87857e21486 Merge branch 'trace/for-next-rtla' into trace/for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next
Auto-merging include/linux/trace_events.h
Auto-merging kernel/trace/ftrace.c
Auto-merging kernel/trace/trace.c
Auto-merging kernel/trace/trace.h
Auto-merging kernel/trace/trace_events_hist.c
Merge made by the 'ort' strategy.
Merging rcu/rcu/next (d0c78768fd9c rcu: Fix expedited GP polling against UP/no-preempt environment)
$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'ort' strategy.
 .../RCU/Design/Requirements/Requirements.rst       |   32 +
 Documentation/RCU/stallwarn.rst                    |   18 +
 Documentation/admin-guide/kernel-parameters.txt    |   81 +-
 .../litmus-tests/locking/DCL-broken.litmus         |   55 +
 .../litmus-tests/locking/DCL-fixed.litmus          |   56 +
 .../litmus-tests/locking/RM-broken.litmus          |   42 +
 Documentation/litmus-tests/locking/RM-fixed.litmus |   42 +
 include/linux/rcupdate.h                           |    1 +
 include/linux/rcutiny.h                            |   20 +
 include/linux/rcutree.h                            |    4 +
 include/linux/srcutree.h                           |   32 +-
 include/linux/torture.h                            |    2 +-
 include/trace/events/rcu.h                         |    1 +
 kernel/rcu/Kconfig.debug                           |   13 +
 kernel/rcu/rcu.h                                   |   23 +-
 kernel/rcu/rcu_segcblist.c                         |    8 +-
 kernel/rcu/rcutorture.c                            |   18 +-
 kernel/rcu/srcutree.c                              |  639 +++--
 kernel/rcu/tasks.h                                 |   67 +-
 kernel/rcu/tree.c                                  |  141 +-
 kernel/rcu/tree.h                                  |   11 +-
 kernel/rcu/tree_exp.h                              |  212 +-
 kernel/rcu/tree_nocb.h                             |   39 +-
 kernel/rcu/tree_plugin.h                           |   17 +-
 kernel/rcu/tree_stall.h                            |   34 +-
 kernel/rcu/update.c                                |    2 +
 kernel/scftorture.c                                |    5 +-
 kernel/smp.c                                       |    7 +-
 tools/include/nolibc/arch-aarch64.h                |  200 ++
 tools/include/nolibc/arch-arm.h                    |  205 ++
 tools/include/nolibc/arch-i386.h                   |  197 ++
 tools/include/nolibc/arch-mips.h                   |  216 ++
 tools/include/nolibc/arch-riscv.h                  |  205 ++
 tools/include/nolibc/arch-x86_64.h                 |  216 ++
 tools/include/nolibc/arch.h                        |   32 +
 tools/include/nolibc/ctype.h                       |   99 +
 tools/include/nolibc/errno.h                       |   27 +
 tools/include/nolibc/nolibc.h                      | 2540 +-------------------
 tools/include/nolibc/signal.h                      |   22 +
 tools/include/nolibc/std.h                         |   49 +
 tools/include/nolibc/stdio.h                       |  296 +++
 tools/include/nolibc/stdlib.h                      |  311 +++
 tools/include/nolibc/string.h                      |  212 ++
 tools/include/nolibc/sys.h                         | 1168 +++++++++
 tools/include/nolibc/time.h                        |   28 +
 tools/include/nolibc/types.h                       |  184 ++
 tools/include/nolibc/unistd.h                      |   54 +
 tools/memory-model/Documentation/locking.txt       |  320 +++
 tools/memory-model/litmus-tests/.gitignore         |    2 +-
 tools/memory-model/scripts/README                  |   16 +-
 tools/memory-model/scripts/checkalllitmus.sh       |   29 +-
 tools/memory-model/scripts/checkghlitmus.sh        |   11 +-
 tools/memory-model/scripts/checklitmus.sh          |   25 +-
 tools/memory-model/scripts/checklitmushist.sh      |    2 +-
 tools/memory-model/scripts/checktheselitmus.sh     |   43 +
 tools/memory-model/scripts/cmplitmushist.sh        |   49 +-
 tools/memory-model/scripts/hwfnseg.sh              |   20 +
 tools/memory-model/scripts/initlitmushist.sh       |    2 +-
 tools/memory-model/scripts/judgelitmus.sh          |  120 +-
 tools/memory-model/scripts/newlitmushist.sh        |    4 +-
 tools/memory-model/scripts/parseargs.sh            |   21 +-
 tools/memory-model/scripts/runlitmus.sh            |   80 +
 tools/memory-model/scripts/runlitmushist.sh        |   29 +-
 tools/memory-model/scripts/simpletest.sh           |   35 +
 .../testing/selftests/rcutorture/bin/functions.sh  |    2 +-
 .../selftests/rcutorture/bin/kvm-find-errors.sh    |    2 +-
 .../selftests/rcutorture/bin/kvm-recheck.sh        |    7 +-
 .../testing/selftests/rcutorture/bin/kvm-remote.sh |   14 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh      |    4 +-
 tools/testing/selftests/rcutorture/bin/torture.sh  |   21 +-
 .../selftests/rcutorture/configs/rcu/TRACE01       |    1 +
 .../selftests/rcutorture/configs/rcu/TREE04        |    5 +-
 .../selftests/rcutorture/configs/rcu/TREE07        |    1 +
 .../selftests/rcutorture/configs/rcu/TREE10        |    1 +
 .../rcutorture/configs/scf/ver_functions.sh        |    3 +-
 75 files changed, 5841 insertions(+), 2911 deletions(-)
 create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus
 create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus
 create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus
 create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus
 create mode 100644 tools/include/nolibc/arch-aarch64.h
 create mode 100644 tools/include/nolibc/arch-arm.h
 create mode 100644 tools/include/nolibc/arch-i386.h
 create mode 100644 tools/include/nolibc/arch-mips.h
 create mode 100644 tools/include/nolibc/arch-riscv.h
 create mode 100644 tools/include/nolibc/arch-x86_64.h
 create mode 100644 tools/include/nolibc/arch.h
 create mode 100644 tools/include/nolibc/ctype.h
 create mode 100644 tools/include/nolibc/errno.h
 create mode 100644 tools/include/nolibc/signal.h
 create mode 100644 tools/include/nolibc/std.h
 create mode 100644 tools/include/nolibc/stdio.h
 create mode 100644 tools/include/nolibc/stdlib.h
 create mode 100644 tools/include/nolibc/string.h
 create mode 100644 tools/include/nolibc/sys.h
 create mode 100644 tools/include/nolibc/time.h
 create mode 100644 tools/include/nolibc/types.h
 create mode 100644 tools/include/nolibc/unistd.h
 create mode 100644 tools/memory-model/Documentation/locking.txt
 create mode 100755 tools/memory-model/scripts/checktheselitmus.sh
 create mode 100755 tools/memory-model/scripts/hwfnseg.sh
 create mode 100755 tools/memory-model/scripts/runlitmus.sh
 create mode 100755 tools/memory-model/scripts/simpletest.sh
Merging kvm/next (945024d764a1 KVM: x86: optimize PKU branching in kvm_load_{guest|host}_xsave_state)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
Auto-merging Documentation/virt/kvm/api.rst
Auto-merging arch/x86/include/asm/kvm_host.h
Auto-merging arch/x86/kernel/kvm.c
CONFLICT (content): Merge conflict in arch/x86/kernel/kvm.c
Auto-merging arch/x86/kvm/x86.c
Auto-merging include/linux/kvm_host.h
Auto-merging tools/testing/selftests/kvm/.gitignore
Auto-merging tools/testing/selftests/kvm/Makefile
Resolved 'arch/x86/kernel/kvm.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 49bf9de9fe4d] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git
$ git diff -M --stat --summary HEAD^..
 Documentation/virt/kvm/api.rst                     |  149 ++-
 arch/x86/include/asm/kvm-x86-ops.h                 |    1 +
 arch/x86/include/asm/kvm_host.h                    |   34 +-
 arch/x86/include/uapi/asm/kvm.h                    |   11 +-
 arch/x86/kernel/asm-offsets_64.c                   |    4 +-
 arch/x86/kernel/kvm.c                              |   77 +-
 arch/x86/kvm/i8259.c                               |    1 -
 arch/x86/kvm/irq.c                                 |   10 +-
 arch/x86/kvm/irq_comm.c                            |    2 +-
 arch/x86/kvm/svm/avic.c                            |   10 +-
 arch/x86/kvm/svm/nested.c                          |  297 +++--
 arch/x86/kvm/svm/svm.c                             |  207 +++-
 arch/x86/kvm/svm/svm.h                             |   53 +-
 arch/x86/kvm/vmx/vmx.c                             |    2 +-
 arch/x86/kvm/x86.c                                 |  211 ++--
 arch/x86/kvm/xen.c                                 | 1246 ++++++++++++++++----
 arch/x86/kvm/xen.h                                 |   62 +-
 include/linux/kvm_host.h                           |    3 +-
 include/uapi/linux/kvm.h                           |   48 +-
 tools/testing/selftests/kvm/.gitignore             |    1 +
 tools/testing/selftests/kvm/Makefile               |    2 +
 .../selftests/kvm/x86_64/fix_hypercall_test.c      |  170 +++
 .../selftests/kvm/x86_64/tsc_scaling_sync.c        |  119 ++
 .../testing/selftests/kvm/x86_64/xen_shinfo_test.c |  366 +++++-
 24 files changed, 2534 insertions(+), 552 deletions(-)
 create mode 100644 tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
 create mode 100644 tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c
Merging kvm-arm/next (21ea45784275 KVM: arm64: fix typos in comments)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
Already up to date.
Merging kvms390/next (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
Auto-merging arch/s390/kvm/kvm-s390.c
Merge made by the 'ort' strategy.
 arch/s390/kvm/kvm-s390.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
Merging xen-tip/linux-next (262fc47ac174 xen/balloon: don't use PV mode extra memory for zone device allocations)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
Merge made by the 'ort' strategy.
 drivers/xen/balloon.c           | 54 ++++++++++++++++++-----------------------
 drivers/xen/unpopulated-alloc.c | 33 -------------------------
 2 files changed, 23 insertions(+), 64 deletions(-)
Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
Merge made by the 'ort' strategy.
Merging workqueues/for-next (bc35f7ef9628 workqueue: Convert the type of pool->nr_running to int)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
Already up to date.
Merging drivers-x86/for-next (b49f72e7f96d platform/x86: think-lmi: Certificate authentication support)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next
Already up to date.
Merging chrome-platform/for-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
Already up to date.
Merging hsi/for-next (e783362eb54c Linux 5.17-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
Already up to date.
Merging leds/for-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next
Already up to date.
Merging ipmi/for-next (ae085d7f9365 mm: kfence: fix missing objcg housekeeping for SLAB)
$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
Already up to date.
Merging driver-core/driver-core-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next
Already up to date.
Merging usb/usb-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
Already up to date.
Merging thunderbolt/next (03941ed91c72 thunderbolt: Replace usage of found with dedicated list iterator variable)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
Merge made by the 'ort' strategy.
 drivers/thunderbolt/ctl.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next
Already up to date.
Merging usb-serial/usb-next (4ac56b1f1ef8 USB: serial: usb_wwan: remove redundant assignment to variable i)
$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
Already up to date.
Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed)
$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next
Auto-merging drivers/usb/chipidea/udc.c
Merge made by the 'ort' strategy.
Merging tty/tty-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
Already up to date.
Merging char-misc/char-misc-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
Already up to date.
Merging coresight/next (286f950545e0 coresight: Drop unused 'none' enum value for each component)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
Already up to date.
Merging fpga/for-next (21f0a239ecab fpga: dfl: pci: Remove usage of the deprecated "pci-dma-compat.h" API)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next
Already up to date.
Merging icc/icc-next (52c85167e413 Merge branch 'icc-msm8939' into icc-next)
$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
Already up to date.
Merging iio/togreg (b28bc9ebbe23 iio: adc: ti-ads1015: Switch to read_avail)
$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 .../devicetree/bindings/iio/adc/ti,ads1015.yaml    |   7 +-
 .../bindings/iio/imu/invensense,mpu6050.yaml       |  34 +-
 .../devicetree/bindings/iio/st,st-sensors.yaml     |   1 +
 MAINTAINERS                                        |   4 +-
 drivers/iio/accel/dmard09.c                        |   2 +-
 drivers/iio/accel/kxsd9-spi.c                      |   4 +-
 drivers/iio/accel/st_accel.h                       |  28 +-
 drivers/iio/accel/st_accel_core.c                  |   1 +
 drivers/iio/accel/st_accel_i2c.c                   |   5 +
 drivers/iio/accel/st_accel_spi.c                   |   5 +
 drivers/iio/adc/ad7124.c                           |  86 ++++-
 drivers/iio/adc/ad7192.c                           |  64 +++-
 drivers/iio/adc/ad_sigma_delta.c                   | 143 +++++++-
 drivers/iio/adc/palmas_gpadc.c                     |   3 +-
 drivers/iio/adc/ti-ads1015.c                       | 398 ++++++++++++---------
 drivers/iio/common/ssp_sensors/ssp_spi.c           |  13 +-
 drivers/iio/dac/ltc2688.c                          |  19 +-
 drivers/iio/dummy/iio_simple_dummy.c               |  20 +-
 drivers/iio/imu/inv_mpu6050/Kconfig                |   4 +-
 drivers/iio/imu/inv_mpu6050/inv_mpu_core.c         |   9 +
 drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c          |   6 +
 drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h          |   2 +
 drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c          |   5 +
 drivers/iio/industrialio-buffer.c                  |  24 +-
 drivers/iio/industrialio-core.c                    |   3 +-
 drivers/iio/multiplexer/Kconfig                    |   1 -
 drivers/iio/multiplexer/iio-mux.c                  |  49 ++-
 drivers/iio/temperature/ltc2983.c                  | 236 ++++++------
 drivers/iio/trigger/iio-trig-sysfs.c               |  11 +-
 include/linux/iio/adc/ad_sigma_delta.h             |  38 ++
 30 files changed, 812 insertions(+), 413 deletions(-)
Merging phy-next/next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
Already up to date.
Merging soundwire/next (60657fb9b19d dt-bindings: soundwire: qcom: Add bindings for audio clock reset control property)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
Merge made by the 'ort' strategy.
 Documentation/devicetree/bindings/soundwire/qcom,sdw.txt | 14 ++++++++++++++
 drivers/soundwire/qcom.c                                 |  3 ++-
 drivers/soundwire/stream.c                               |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)
Merging extcon/extcon-next (4a17c3246de7 extcon: sm5502: Add support for SM5703)
$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
Merge made by the 'ort' strategy.
 .../bindings/extcon/siliconmitus,sm5502-muic.yaml  |  5 +-
 drivers/extcon/Kconfig                             |  2 +-
 drivers/extcon/extcon-axp288.c                     |  4 +-
 drivers/extcon/extcon-intel-int3496.c              | 54 ++++++++++++++++++----
 drivers/extcon/extcon-sm5502.c                     |  2 +
 drivers/extcon/extcon-usb-gpio.c                   | 15 ------
 drivers/extcon/extcon-usbc-cros-ec.c               |  2 +-
 drivers/extcon/extcon.c                            |  8 +++-
 drivers/power/supply/axp288_charger.c              | 17 ++++---
 drivers/power/supply/charger-manager.c             |  7 +--
 drivers/power/supply/max8997_charger.c             |  8 ++--
 drivers/usb/dwc3/drd.c                             |  9 +---
 drivers/usb/phy/phy-omap-otg.c                     |  4 +-
 drivers/usb/typec/tcpm/fusb302.c                   |  4 +-
 include/linux/extcon.h                             |  2 +-
 15 files changed, 85 insertions(+), 58 deletions(-)
Merging gnss/gnss-next (26291c54e111 Linux 5.17-rc2)
$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
Already up to date.
Merging vfio/next (f621eb13facb vfio-pci: Provide reviewers and acceptance criteria for variant drivers)
$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
Already up to date.
Merging staging/staging-next (f8525b9763c6 Merge branch 'wfx-move-out-of-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next into staging-next)
$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
Auto-merging MAINTAINERS
Auto-merging drivers/staging/r8188eu/core/rtw_br_ext.c
Merge made by the 'ort' strategy.
 .../{staging => }/net/wireless/silabs,wfx.yaml     |   2 +-
 MAINTAINERS                                        |   4 +-
 drivers/net/wireless/Kconfig                       |   1 +
 drivers/net/wireless/Makefile                      |   1 +
 drivers/net/wireless/silabs/Kconfig                |  18 ++
 drivers/net/wireless/silabs/Makefile               |   3 +
 .../{staging => net/wireless/silabs}/wfx/Kconfig   |   0
 .../{staging => net/wireless/silabs}/wfx/Makefile  |   0
 drivers/{staging => net/wireless/silabs}/wfx/bh.c  |   0
 drivers/{staging => net/wireless/silabs}/wfx/bh.h  |   0
 drivers/{staging => net/wireless/silabs}/wfx/bus.h |   0
 .../wireless/silabs}/wfx/bus_sdio.c                |   0
 .../{staging => net/wireless/silabs}/wfx/bus_spi.c |   0
 .../{staging => net/wireless/silabs}/wfx/data_rx.c |   0
 .../{staging => net/wireless/silabs}/wfx/data_rx.h |   0
 .../{staging => net/wireless/silabs}/wfx/data_tx.c |   0
 .../{staging => net/wireless/silabs}/wfx/data_tx.h |   0
 .../{staging => net/wireless/silabs}/wfx/debug.c   |   0
 .../{staging => net/wireless/silabs}/wfx/debug.h   |   0
 .../{staging => net/wireless/silabs}/wfx/fwio.c    |   0
 .../{staging => net/wireless/silabs}/wfx/fwio.h    |   0
 .../wireless/silabs}/wfx/hif_api_cmd.h             |   0
 .../wireless/silabs}/wfx/hif_api_general.h         |   0
 .../wireless/silabs}/wfx/hif_api_mib.h             |   0
 .../{staging => net/wireless/silabs}/wfx/hif_rx.c  |   0
 .../{staging => net/wireless/silabs}/wfx/hif_rx.h  |   0
 .../{staging => net/wireless/silabs}/wfx/hif_tx.c  |  10 +-
 .../{staging => net/wireless/silabs}/wfx/hif_tx.h  |   0
 .../wireless/silabs}/wfx/hif_tx_mib.c              |   0
 .../wireless/silabs}/wfx/hif_tx_mib.h              |   0
 .../{staging => net/wireless/silabs}/wfx/hwio.c    |   0
 .../{staging => net/wireless/silabs}/wfx/hwio.h    |   0
 drivers/{staging => net/wireless/silabs}/wfx/key.c |   0
 drivers/{staging => net/wireless/silabs}/wfx/key.h |   0
 .../{staging => net/wireless/silabs}/wfx/main.c    |   2 +-
 .../{staging => net/wireless/silabs}/wfx/main.h    |   0
 .../{staging => net/wireless/silabs}/wfx/queue.c   |   0
 .../{staging => net/wireless/silabs}/wfx/queue.h   |   0
 .../{staging => net/wireless/silabs}/wfx/scan.c    |   0
 .../{staging => net/wireless/silabs}/wfx/scan.h    |   0
 drivers/{staging => net/wireless/silabs}/wfx/sta.c |  20 +-
 drivers/{staging => net/wireless/silabs}/wfx/sta.h |   0
 .../{staging => net/wireless/silabs}/wfx/traces.h  |   0
 drivers/{staging => net/wireless/silabs}/wfx/wfx.h |   0
 drivers/staging/Kconfig                            |   1 -
 drivers/staging/Makefile                           |   1 -
 drivers/staging/greybus/audio_codec.c              |  24 +-
 drivers/staging/r8188eu/core/rtw_ap.c              |   3 -
 drivers/staging/r8188eu/core/rtw_br_ext.c          |  15 +-
 drivers/staging/r8188eu/core/rtw_cmd.c             | 125 +++++----
 drivers/staging/r8188eu/core/rtw_led.c             |   6 +-
 drivers/staging/r8188eu/core/rtw_mlme.c            |  95 +++----
 drivers/staging/r8188eu/core/rtw_mlme_ext.c        | 115 +++++---
 drivers/staging/r8188eu/core/rtw_p2p.c             |   8 +-
 drivers/staging/r8188eu/core/rtw_pwrctrl.c         |  41 +--
 drivers/staging/r8188eu/core/rtw_recv.c            | 309 +++++++++------------
 drivers/staging/r8188eu/core/rtw_sta_mgt.c         |   4 +-
 drivers/staging/r8188eu/core/rtw_wlan_util.c       | 103 +++++--
 drivers/staging/r8188eu/core/rtw_xmit.c            |   6 +-
 drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c     |   6 +-
 drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c    |   2 +-
 drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c     |   2 +-
 drivers/staging/r8188eu/hal/hal_com.c              |   2 +-
 drivers/staging/r8188eu/hal/odm_HWConfig.c         |   8 +-
 drivers/staging/r8188eu/hal/rtl8188e_cmd.c         |   7 +-
 drivers/staging/r8188eu/hal/rtl8188e_phycfg.c      |   8 +-
 drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c      |   3 +-
 drivers/staging/r8188eu/hal/usb_halinit.c          | 242 +---------------
 drivers/staging/r8188eu/hal/usb_ops_linux.c        |   8 +-
 drivers/staging/r8188eu/include/HalVerDef.h        |   4 +-
 drivers/staging/r8188eu/include/hal_intf.h         |  23 +-
 drivers/staging/r8188eu/include/ieee80211.h        |  18 --
 drivers/staging/r8188eu/include/rtl8188e_hal.h     |   3 -
 drivers/staging/r8188eu/include/rtl8188e_spec.h    |  10 +-
 drivers/staging/r8188eu/include/rtw_mlme.h         |   5 +-
 drivers/staging/r8188eu/include/rtw_mlme_ext.h     |  38 +--
 drivers/staging/r8188eu/include/rtw_pwrctrl.h      |  19 +-
 drivers/staging/r8188eu/include/rtw_recv.h         |   1 -
 drivers/staging/r8188eu/include/usb_ops.h          |  22 +-
 drivers/staging/r8188eu/include/wifi.h             |  58 +---
 drivers/staging/r8188eu/os_dep/ioctl_linux.c       |  25 +-
 drivers/staging/r8188eu/os_dep/os_intfs.c          |  16 +-
 drivers/staging/r8188eu/os_dep/osdep_service.c     |  11 +-
 drivers/staging/r8188eu/os_dep/usb_ops_linux.c     |   3 +-
 drivers/staging/rtl8712/drv_types.h                |   3 +-
 drivers/staging/rtl8712/os_intfs.c                 |   1 -
 drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h   |   1 -
 .../staging/rtl8712/rtl8712_macsetting_bitdef.h    |   3 -
 .../staging/rtl8712/rtl8712_macsetting_regdef.h    |   2 -
 drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h  |   1 -
 drivers/staging/rtl8712/rtl8712_recv.c             |  16 +-
 drivers/staging/rtl8712/rtl8712_security_bitdef.h  |   1 -
 drivers/staging/rtl8712/rtl8712_spec.h             |   3 -
 drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h    |   4 -
 drivers/staging/rtl8712/rtl8712_syscfg_regdef.h    |   2 -
 drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h  |   1 -
 drivers/staging/rtl8712/rtl8712_wmac_bitdef.h      |   1 -
 drivers/staging/rtl8712/rtl871x_cmd.c              |   2 +-
 drivers/staging/rtl8712/rtl871x_cmd.h              |   2 -
 drivers/staging/rtl8712/rtl871x_ioctl.h            |   1 -
 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c        |   1 -
 drivers/staging/rtl8712/rtl871x_ioctl_set.c        |   1 -
 drivers/staging/rtl8712/rtl871x_mlme.c             | 102 +++----
 drivers/staging/rtl8712/rtl871x_mp_ioctl.h         |   1 -
 drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h    |   3 -
 drivers/staging/rtl8712/rtl871x_recv.c             |   1 -
 drivers/staging/rtl8712/rtl871x_security.c         |   1 -
 drivers/staging/rtl8712/sta_info.h                 |   1 -
 drivers/staging/rtl8712/usb_intf.c                 |   8 +-
 drivers/staging/rtl8712/wifi.h                     |   1 -
 drivers/staging/rtl8712/xmit_linux.c               |   8 +-
 drivers/staging/rtl8723bs/core/rtw_cmd.c           |  12 +-
 drivers/staging/rtl8723bs/core/rtw_efuse.c         |  54 ++--
 drivers/staging/rtl8723bs/core/rtw_ieee80211.c     |  44 ++-
 drivers/staging/rtl8723bs/core/rtw_mlme.c          |  54 +---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c      | 180 +++++-------
 drivers/staging/rtl8723bs/core/rtw_rf.c            |  56 ++--
 drivers/staging/rtl8723bs/os_dep/os_intfs.c        |   2 +-
 drivers/staging/rts5208/rtsx_transport.c           |  12 +-
 drivers/staging/sm750fb/sm750_hw.c                 |   1 +
 drivers/staging/unisys/visornic/visornic_main.c    |  17 --
 .../vc04_services/interface/vchiq_arm/vchiq_arm.c  |  26 +-
 .../vc04_services/interface/vchiq_arm/vchiq_dev.c  |  13 +-
 drivers/staging/vme/devices/vme_user.c             |   2 +-
 drivers/staging/vt6655/mac.h                       | 169 ++---------
 drivers/staging/vt6656/channel.c                   |   1 -
 drivers/staging/vt6656/rf.c                        |   1 -
 drivers/staging/wfx/TODO                           |   6 -
 drivers/staging/wlan-ng/cfg80211.c                 |  10 +-
 129 files changed, 802 insertions(+), 1491 deletions(-)
 rename Documentation/devicetree/bindings/{staging => }/net/wireless/silabs,wfx.yaml (98%)
 create mode 100644 drivers/net/wireless/silabs/Kconfig
 create mode 100644 drivers/net/wireless/silabs/Makefile
 rename drivers/{staging => net/wireless/silabs}/wfx/Kconfig (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/Makefile (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/bh.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/bh.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/bus.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/bus_sdio.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/bus_spi.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/debug.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/debug.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/fwio.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/fwio.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_cmd.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_general.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_mib.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.c (98%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hwio.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/hwio.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/key.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/key.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/main.c (99%)
 rename drivers/{staging => net/wireless/silabs}/wfx/main.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/queue.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/queue.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/scan.c (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/scan.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/sta.c (98%)
 rename drivers/{staging => net/wireless/silabs}/wfx/sta.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/traces.h (100%)
 rename drivers/{staging => net/wireless/silabs}/wfx/wfx.h (100%)
 delete mode 100644 drivers/staging/wfx/TODO
Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4)
$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next
Already up to date.
Merging dmaengine/next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
Already up to date.
Merging cgroup/for-next (1be9b7206b7d Merge branch 'for-5.18' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
Auto-merging kernel/cgroup/cgroup.c
Auto-merging kernel/cgroup/cpuset.c
Merge made by the 'ort' strategy.
Merging scsi/for-next (56495f295d8e scsi: megaraid_sas: Target with invalid LUN ID is deleted during scan)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
Already up to date.
Merging scsi-mkp/for-next (0848ccaea664 scsi: vmw_pvscsi: No need to clear memory after a dma_alloc_coherent() call)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
Merge made by the 'ort' strategy.
 drivers/scsi/ufs/ufshcd-pltfrm.c      | 10 ++++----
 drivers/scsi/vmw_pvscsi.c             |  1 -
 drivers/target/target_core_configfs.c | 47 +++++++++++++++++++++--------------
 3 files changed, 33 insertions(+), 25 deletions(-)
Merging vhost/linux-next (1c80cf031e02 vdpa: mlx5: synchronize driver status with CVQ)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
Already up to date.
Merging rpmsg/for-next (9ea79a3861c9 Merge branches 'rpmsg-next', 'rproc-next' and 'hwspinlock-next' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
Merge made by the 'ort' strategy.
Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next
Already up to date.
Merging gpio-brgl/gpio/for-next (43ebbb92e43f gpio: rcar: Add R-Car Gen4 support)
$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
Auto-merging drivers/gpio/gpiolib.c
Merge made by the 'ort' strategy.
 .../bindings/gpio/renesas,rcar-gpio.yaml           |  5 ++
 .../bindings/gpio/socionext,uniphier-gpio.yaml     | 17 ++++++
 drivers/gpio/gpio-rcar.c                           |  7 ++-
 drivers/gpio/gpiolib-cdev.c                        | 66 ++++++++++++----------
 drivers/gpio/gpiolib.c                             | 12 ++--
 5 files changed, 67 insertions(+), 40 deletions(-)
Merging gpio-intel/for-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next
Already up to date.
Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4)
$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim
Already up to date.
Merging pinctrl/for-next (4a6d01495a16 pinctrl: mediatek: common-v1: fix semicolon.cocci warnings)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
Already up to date.
Merging pinctrl-intel/for-next (0be0b70df661 pinctrl: alderlake: Fix register offsets for ADL-N variant)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
Already up to date.
Merging pinctrl-renesas/renesas-pinctrl (715c9faa2d2d pinctrl: renesas: r8a77990: Add drive-strength)
$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
Merge made by the 'ort' strategy.
 .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml    |  5 +--
 drivers/pinctrl/renesas/pfc-r8a77990.c             | 39 ++++++++++++++++++++--
 drivers/pinctrl/renesas/sh_pfc.h                   |  2 +-
 3 files changed, 41 insertions(+), 5 deletions(-)
Merging pinctrl-samsung/for-next (abb860ac7e3f pinctrl: samsung: staticize fsd_pin_ctrl)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
Already up to date.
Merging pwm/for-next (ed14d36498c8 pwm: rcar: Simplify multiplication/shift logic)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next
Already up to date.
Merging userns/for-next (9def41809e95 Merge of prlimit-tasklist_lock-for-v5.18, per-namespace-ipc-sysctls-for-v5.18, and ptrace-for-v5.18 for testing in linux-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next
Auto-merging MAINTAINERS
Auto-merging arch/x86/kernel/ptrace.c
Auto-merging fs/io_uring.c
Auto-merging include/linux/posix-timers.h
Auto-merging ipc/mqueue.c
Auto-merging kernel/seccomp.c
Auto-merging kernel/signal.c
Auto-merging kernel/time/posix-cpu-timers.c
Auto-merging mm/memcontrol.c
Merge made by the 'ort' strategy.
 include/linux/ipc_namespace.h |  37 ++++++++-
 ipc/ipc_sysctl.c              | 189 +++++++++++++++++++++++++++---------------
 ipc/mq_sysctl.c               | 121 +++++++++++++++------------
 ipc/mqueue.c                  |  10 +--
 ipc/namespace.c               |  10 +++
 5 files changed, 235 insertions(+), 132 deletions(-)
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
Already up to date.
Merging kselftest/next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
Already up to date.
Merging livepatching/for-next (0e1b951d6de0 Merge branch 'for-5.18/selftests-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
Merge made by the 'ort' strategy.
Merging rtc/rtc-next (915593a7a663 rtc: check if __rtc_read_time was successful)
$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
Already up to date.
Merging nvdimm/libnvdimm-for-next (ada8d8d337ee nvdimm/blk: Fix title level)
$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
Already up to date.
Merging at24/at24/for-next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
Already up to date.
Merging ntb/ntb-next (5cf4bc46c2f2 IDT: Fix Build warnings on some 32bit architectures.)
$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
Merge made by the 'ort' strategy.
 drivers/ntb/hw/idt/Makefile | 1 +
 1 file changed, 1 insertion(+)
Merging seccomp/for-next/seccomp (8a3d3ea66f0d selftests/seccomp: Add SKIP for failed unshare())
$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
Auto-merging tools/testing/selftests/kselftest_harness.h
Auto-merging tools/testing/selftests/seccomp/Makefile
Merge made by the 'ort' strategy.
 tools/testing/selftests/seccomp/Makefile      |  1 +
 tools/testing/selftests/seccomp/seccomp_bpf.c | 78 ++++++++++++++++++++++++---
 2 files changed, 73 insertions(+), 6 deletions(-)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next
Already up to date.
Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
Already up to date.
Merging slimbus/for-next (0eb1fb16396c slimbus: qcom-ngd-ctrl: Use platform_get_irq() to get the interrupt)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
Merge made by the 'ort' strategy.
 drivers/slimbus/qcom-ngd-ctrl.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
Merging nvmem/for-next (bdf79b27260b dt-bindings: nvmem: brcm,nvram: add basic NVMEM cells)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Auto-merging drivers/mtd/mtdcore.c
Resolved 'MAINTAINERS' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master ee31cfac66a6] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS | 6 ++++++
 1 file changed, 6 insertions(+)
Merging xarray/main (3ed4bb77156d XArray: Update the LRU list in xas_split())
$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
Already up to date.
Merging hyperv/hyperv-next (eeda29db98f4 x86/hyperv: Output host build info as normal Windows version number)
$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
Already up to date.
Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy())
$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay
Already up to date.
Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function)
$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
Already up to date.
Merging hmm/hmm (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
Already up to date.
Merging kunit/test (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
Already up to date.
Merging cfi/cfi/next (e783362eb54c Linux 5.17-rc1)
$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
Already up to date.
Merging kunit-next/kunit (59729170afcd kunit: Make kunit_remove_resource() idempotent)
$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
Auto-merging net/mctp/test/route-test.c
CONFLICT (content): Merge conflict in net/mctp/test/route-test.c
Auto-merging security/apparmor/policy_unpack_test.c
CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c
Resolved 'net/mctp/test/route-test.c' using previous resolution.
Resolved 'security/apparmor/policy_unpack_test.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 46c9ec9b0c55] Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
$ git diff -M --stat --summary HEAD^..
 Documentation/dev-tools/kunit/api/index.rst    |   5 +
 Documentation/dev-tools/kunit/api/resource.rst |  13 +
 Documentation/dev-tools/kunit/running_tips.rst |   3 +-
 drivers/thunderbolt/test.c                     | 134 ++++-----
 include/kunit/resource.h                       | 318 ++++++++++++++++++++
 include/kunit/test.h                           | 387 ++++++------------------
 lib/kunit/Makefile                             |   1 +
 lib/kunit/kunit-example-test.c                 |   2 +
 lib/kunit/kunit-test.c                         |  37 ++-
 lib/kunit/resource.c                           | 129 ++++++++
 lib/kunit/test.c                               | 116 +-------
 lib/list-test.c                                | 397 ++++++++++++++++++++++++-
 lib/test_kasan.c                               |   2 +-
 net/mctp/test/route-test.c                     |   4 +-
 security/apparmor/policy_unpack_test.c         |   6 +-
 tools/testing/kunit/kunit.py                   |  54 ++--
 tools/testing/kunit/kunit_config.py            |   9 +-
 tools/testing/kunit/kunit_json.py              |  63 ++--
 tools/testing/kunit/kunit_kernel.py            |  53 ++--
 tools/testing/kunit/kunit_parser.py            |   7 +
 tools/testing/kunit/kunit_tool_test.py         |  15 +-
 tools/testing/kunit/qemu_config.py             |  17 +-
 22 files changed, 1177 insertions(+), 595 deletions(-)
 create mode 100644 Documentation/dev-tools/kunit/api/resource.rst
 create mode 100644 include/kunit/resource.h
 create mode 100644 lib/kunit/resource.c
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next
Already up to date.
Merging mhi/mhi-next (5d4be19cbe6a bus: mhi: ep: Add uevent support for module autoloading)
$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
Merge made by the 'ort' strategy.
 drivers/bus/mhi/Kconfig         |    1 +
 drivers/bus/mhi/Makefile        |    3 +
 drivers/bus/mhi/common.h        |   22 +
 drivers/bus/mhi/ep/Kconfig      |   10 +
 drivers/bus/mhi/ep/Makefile     |    2 +
 drivers/bus/mhi/ep/internal.h   |  218 ++++++
 drivers/bus/mhi/ep/main.c       | 1591 +++++++++++++++++++++++++++++++++++++++
 drivers/bus/mhi/ep/mmio.c       |  273 +++++++
 drivers/bus/mhi/ep/ring.c       |  207 +++++
 drivers/bus/mhi/ep/sm.c         |  148 ++++
 include/linux/mhi_ep.h          |  277 +++++++
 include/linux/mod_devicetable.h |    2 +
 scripts/mod/file2alias.c        |   10 +
 13 files changed, 2764 insertions(+)
 create mode 100644 drivers/bus/mhi/ep/Kconfig
 create mode 100644 drivers/bus/mhi/ep/Makefile
 create mode 100644 drivers/bus/mhi/ep/internal.h
 create mode 100644 drivers/bus/mhi/ep/main.c
 create mode 100644 drivers/bus/mhi/ep/mmio.c
 create mode 100644 drivers/bus/mhi/ep/ring.c
 create mode 100644 drivers/bus/mhi/ep/sm.c
 create mode 100644 include/linux/mhi_ep.h
Merging memblock/for-next (58ffc34896db memblock tests: Add TODO and README files)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next
Already up to date.
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers
Already up to date.
Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters
Already up to date.
Merging cxl/next (05e815539f3f cxl/core/port: Fix NULL but dereferenced coccicheck error)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
Already up to date.
Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller)
$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap
Already up to date.
Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.)
$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
Already up to date.
Merging efi/next (e783362eb54c Linux 5.17-rc1)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
Already up to date.
Merging unicode/for-next (5298d4bfe80f unicode: clean up the Kconfig symbol confusion)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
Already up to date.
Merging slab/for-next (b7e683afaf86 Merge branch 'slab/for-5.19/stackdepot' into slab/for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next
Auto-merging init/Kconfig
Merge made by the 'ort' strategy.
 Documentation/vm/slub.rst  |  64 +++++++++++++++++++++
 include/linux/slab.h       |   7 +++
 include/linux/stackdepot.h |  26 +++++++--
 init/Kconfig               |   1 +
 lib/Kconfig.debug          |   1 +
 lib/slub_kunit.c           |  10 ++--
 lib/stackdepot.c           |  67 ++++++++++++++--------
 mm/page_owner.c            |   9 ++-
 mm/slab.c                  |  29 +++-------
 mm/slab.h                  |   5 +-
 mm/slab_common.c           |   5 ++
 mm/slub.c                  | 138 ++++++++++++++++++++++++++++++---------------
 12 files changed, 261 insertions(+), 101 deletions(-)
Merging random/master (9af53efd39ff random: allow partial reads if later user copies fail)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
Merge made by the 'ort' strategy.
 drivers/char/random.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
Merging landlock/next (7325fd5614aa Merge Landlock fixes into next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
Auto-merging fs/open.c
Auto-merging include/linux/syscalls.h
Auto-merging kernel/sysctl.c
Auto-merging tools/testing/selftests/Makefile
Merge made by the 'ort' strategy.
 Documentation/admin-guide/sysctl/fs.rst            |  50 +++
 arch/alpha/kernel/syscalls/syscall.tbl             |   1 +
 arch/arm/tools/syscall.tbl                         |   1 +
 arch/arm64/include/asm/unistd.h                    |   2 +-
 arch/arm64/include/asm/unistd32.h                  |   2 +
 arch/ia64/kernel/syscalls/syscall.tbl              |   1 +
 arch/m68k/kernel/syscalls/syscall.tbl              |   1 +
 arch/microblaze/kernel/syscalls/syscall.tbl        |   1 +
 arch/mips/kernel/syscalls/syscall_n32.tbl          |   1 +
 arch/mips/kernel/syscalls/syscall_n64.tbl          |   1 +
 arch/mips/kernel/syscalls/syscall_o32.tbl          |   1 +
 arch/parisc/kernel/syscalls/syscall.tbl            |   1 +
 arch/powerpc/kernel/syscalls/syscall.tbl           |   1 +
 arch/s390/kernel/syscalls/syscall.tbl              |   1 +
 arch/sh/kernel/syscalls/syscall.tbl                |   1 +
 arch/sparc/kernel/syscalls/syscall.tbl             |   1 +
 arch/x86/entry/syscalls/syscall_32.tbl             |   1 +
 arch/x86/entry/syscalls/syscall_64.tbl             |   1 +
 arch/xtensa/kernel/syscalls/syscall.tbl            |   1 +
 fs/open.c                                          | 133 ++++++++
 fs/proc/proc_sysctl.c                              |   2 +-
 include/linux/syscalls.h                           |   1 +
 include/linux/sysctl.h                             |   3 +
 include/uapi/asm-generic/unistd.h                  |   5 +-
 include/uapi/linux/trusted-for.h                   |  18 +
 kernel/printk/sysctl.c                             |   9 -
 kernel/sysctl.c                                    |   9 +
 tools/testing/selftests/Makefile                   |   1 +
 tools/testing/selftests/interpreter/.gitignore     |   2 +
 tools/testing/selftests/interpreter/Makefile       |  21 ++
 tools/testing/selftests/interpreter/config         |   1 +
 .../selftests/interpreter/trust_policy_test.c      | 362 +++++++++++++++++++++
 32 files changed, 625 insertions(+), 12 deletions(-)
 create mode 100644 include/uapi/linux/trusted-for.h
 create mode 100644 tools/testing/selftests/interpreter/.gitignore
 create mode 100644 tools/testing/selftests/interpreter/Makefile
 create mode 100644 tools/testing/selftests/interpreter/config
 create mode 100644 tools/testing/selftests/interpreter/trust_policy_test.c
Merging rust/rust-next (011150424cd9 rust: avoid all GCC plugins, not just the randstruct one)
$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
Auto-merging Documentation/doc-guide/kernel-doc.rst
Auto-merging MAINTAINERS
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging arch/Kconfig
Auto-merging arch/arm/Kconfig
Auto-merging arch/powerpc/Kconfig
Auto-merging arch/x86/Kconfig
Auto-merging arch/x86/Makefile
Auto-merging init/Kconfig
Auto-merging lib/Kconfig.debug
Auto-merging scripts/Makefile
Auto-merging scripts/Makefile.build
Resolved 'Makefile' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 8b880c3c9702] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
$ 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              |   17 +
 Documentation/kbuild/makefiles.rst           |   50 +-
 Documentation/process/changes.rst            |   41 +
 Documentation/rust/arch-support.rst          |   34 +
 Documentation/rust/coding-guidelines.rst     |  214 ++
 Documentation/rust/general-information.rst   |   77 +
 Documentation/rust/index.rst                 |   20 +
 Documentation/rust/logo.svg                  |  357 +++
 Documentation/rust/quick-start.rst           |  230 ++
 MAINTAINERS                                  |   15 +
 Makefile                                     |  175 +-
 arch/Kconfig                                 |    6 +
 arch/arm/Kconfig                             |    1 +
 arch/arm64/Kconfig                           |    1 +
 arch/powerpc/Kconfig                         |    1 +
 arch/riscv/Kconfig                           |    1 +
 arch/riscv/Makefile                          |    5 +
 arch/x86/Kconfig                             |    1 +
 arch/x86/Makefile                            |   14 +
 drivers/android/Kconfig                      |    6 +
 drivers/android/Makefile                     |    2 +
 drivers/android/allocation.rs                |  266 ++
 drivers/android/context.rs                   |   80 +
 drivers/android/defs.rs                      |   99 +
 drivers/android/node.rs                      |  476 ++++
 drivers/android/process.rs                   |  960 ++++++++
 drivers/android/range_alloc.rs               |  189 ++
 drivers/android/rust_binder.rs               |  111 +
 drivers/android/thread.rs                    |  870 +++++++
 drivers/android/transaction.rs               |  326 +++
 drivers/gpio/Kconfig                         |    8 +
 drivers/gpio/Makefile                        |    1 +
 drivers/gpio/gpio_pl061_rust.rs              |  370 +++
 include/linux/kallsyms.h                     |    2 +-
 include/linux/spinlock.h                     |   17 +-
 include/uapi/linux/android/binder.h          |   28 +-
 init/Kconfig                                 |   50 +-
 kernel/kallsyms.c                            |   26 +-
 kernel/livepatch/core.c                      |    4 +-
 lib/Kconfig.debug                            |  143 ++
 lib/vsprintf.c                               |   13 +
 rust/.gitignore                              |    8 +
 rust/Makefile                                |  376 +++
 rust/alloc/README.md                         |   32 +
 rust/alloc/alloc.rs                          |  440 ++++
 rust/alloc/borrow.rs                         |  498 ++++
 rust/alloc/boxed.rs                          | 2008 +++++++++++++++
 rust/alloc/collections/mod.rs                |  156 ++
 rust/alloc/fmt.rs                            |  601 +++++
 rust/alloc/lib.rs                            |  231 ++
 rust/alloc/macros.rs                         |  126 +
 rust/alloc/raw_vec.rs                        |  561 +++++
 rust/alloc/slice.rs                          | 1279 ++++++++++
 rust/alloc/str.rs                            |  632 +++++
 rust/alloc/string.rs                         | 2862 ++++++++++++++++++++++
 rust/alloc/vec/drain.rs                      |  186 ++
 rust/alloc/vec/drain_filter.rs               |  145 ++
 rust/alloc/vec/into_iter.rs                  |  356 +++
 rust/alloc/vec/is_zero.rs                    |  106 +
 rust/alloc/vec/mod.rs                        | 3353 ++++++++++++++++++++++++++
 rust/alloc/vec/partial_eq.rs                 |   49 +
 rust/alloc/vec/set_len_on_drop.rs            |   30 +
 rust/alloc/vec/spec_extend.rs                |  174 ++
 rust/bindgen_parameters                      |   13 +
 rust/build_error.rs                          |   29 +
 rust/compiler_builtins.rs                    |   57 +
 rust/exports.c                               |   20 +
 rust/helpers.c                               |  531 ++++
 rust/kernel/allocator.rs                     |   65 +
 rust/kernel/amba.rs                          |  259 ++
 rust/kernel/bindings.rs                      |   47 +
 rust/kernel/bindings_helper.h                |   37 +
 rust/kernel/build_assert.rs                  |   80 +
 rust/kernel/c_types.rs                       |  119 +
 rust/kernel/chrdev.rs                        |  207 ++
 rust/kernel/clk.rs                           |   75 +
 rust/kernel/cred.rs                          |   73 +
 rust/kernel/device.rs                        |  554 +++++
 rust/kernel/driver.rs                        |  440 ++++
 rust/kernel/error.rs                         |  560 +++++
 rust/kernel/file.rs                          |  873 +++++++
 rust/kernel/gpio.rs                          |  478 ++++
 rust/kernel/hwrng.rs                         |  242 ++
 rust/kernel/io_buffer.rs                     |  153 ++
 rust/kernel/io_mem.rs                        |  237 ++
 rust/kernel/iov_iter.rs                      |   81 +
 rust/kernel/irq.rs                           |  409 ++++
 rust/kernel/lib.rs                           |  260 ++
 rust/kernel/linked_list.rs                   |  247 ++
 rust/kernel/miscdev.rs                       |  291 +++
 rust/kernel/mm.rs                            |  149 ++
 rust/kernel/module_param.rs                  |  498 ++++
 rust/kernel/of.rs                            |   63 +
 rust/kernel/pages.rs                         |  144 ++
 rust/kernel/platform.rs                      |  224 ++
 rust/kernel/power.rs                         |  118 +
 rust/kernel/prelude.rs                       |   36 +
 rust/kernel/print.rs                         |  414 ++++
 rust/kernel/random.rs                        |   42 +
 rust/kernel/raw_list.rs                      |  361 +++
 rust/kernel/rbtree.rs                        |  562 +++++
 rust/kernel/revocable.rs                     |  163 ++
 rust/kernel/security.rs                      |   36 +
 rust/kernel/static_assert.rs                 |   39 +
 rust/kernel/std_vendor.rs                    |  150 ++
 rust/kernel/str.rs                           |  592 +++++
 rust/kernel/sync/arc.rs                      |  500 ++++
 rust/kernel/sync/condvar.rs                  |  138 ++
 rust/kernel/sync/guard.rs                    |  166 ++
 rust/kernel/sync/locked_by.rs                |  112 +
 rust/kernel/sync/mod.rs                      |  157 ++
 rust/kernel/sync/mutex.rs                    |  114 +
 rust/kernel/sync/revocable_mutex.rs          |  184 ++
 rust/kernel/sync/rwsem.rs                    |  149 ++
 rust/kernel/sync/seqlock.rs                  |  202 ++
 rust/kernel/sync/spinlock.rs                 |  192 ++
 rust/kernel/sysctl.rs                        |  199 ++
 rust/kernel/task.rs                          |  182 ++
 rust/kernel/types.rs                         |  569 +++++
 rust/kernel/user_ptr.rs                      |  175 ++
 rust/macros/helpers.rs                       |   79 +
 rust/macros/lib.rs                           |   94 +
 rust/macros/module.rs                        |  631 +++++
 samples/Kconfig                              |    2 +
 samples/Makefile                             |    1 +
 samples/rust/Kconfig                         |  130 +
 samples/rust/Makefile                        |   15 +
 samples/rust/hostprogs/.gitignore            |    3 +
 samples/rust/hostprogs/Makefile              |    5 +
 samples/rust/hostprogs/a.rs                  |    7 +
 samples/rust/hostprogs/b.rs                  |    5 +
 samples/rust/hostprogs/single.rs             |   12 +
 samples/rust/rust_chrdev.rs                  |   50 +
 samples/rust/rust_minimal.rs                 |   35 +
 samples/rust/rust_miscdev.rs                 |  143 ++
 samples/rust/rust_module_parameters.rs       |   69 +
 samples/rust/rust_platform.rs                |   22 +
 samples/rust/rust_print.rs                   |   54 +
 samples/rust/rust_random.rs                  |   60 +
 samples/rust/rust_semaphore.rs               |  171 ++
 samples/rust/rust_semaphore_c.c              |  212 ++
 samples/rust/rust_stack_probing.rs           |   36 +
 samples/rust/rust_sync.rs                    |   93 +
 scripts/.gitignore                           |    1 +
 scripts/Kconfig.include                      |    6 +-
 scripts/Makefile                             |    3 +
 scripts/Makefile.build                       |   60 +
 scripts/Makefile.debug                       |   10 +
 scripts/Makefile.host                        |   34 +-
 scripts/Makefile.lib                         |   12 +
 scripts/Makefile.modfinal                    |    8 +-
 scripts/cc-version.sh                        |   12 +-
 scripts/decode_stacktrace.sh                 |   14 +
 scripts/generate_rust_analyzer.py            |  133 +
 scripts/generate_rust_target.rs              |  227 ++
 scripts/is_rust_module.sh                    |   13 +
 scripts/kallsyms.c                           |   40 +-
 scripts/kconfig/confdata.c                   |   75 +
 scripts/min-tool-version.sh                  |    6 +
 scripts/rust-is-available-bindgen-libclang.h |    2 +
 scripts/rust-is-available.sh                 |  158 ++
 tools/include/linux/kallsyms.h               |    2 +-
 tools/lib/perf/include/perf/event.h          |    2 +-
 tools/lib/symbol/kallsyms.h                  |    2 +-
 168 files changed, 35289 insertions(+), 64 deletions(-)
 create mode 100644 .rustfmt.toml
 create mode 100644 Documentation/rust/arch-support.rst
 create mode 100644 Documentation/rust/coding-guidelines.rst
 create mode 100644 Documentation/rust/general-information.rst
 create mode 100644 Documentation/rust/index.rst
 create mode 100644 Documentation/rust/logo.svg
 create mode 100644 Documentation/rust/quick-start.rst
 create mode 100644 drivers/android/allocation.rs
 create mode 100644 drivers/android/context.rs
 create mode 100644 drivers/android/defs.rs
 create mode 100644 drivers/android/node.rs
 create mode 100644 drivers/android/process.rs
 create mode 100644 drivers/android/range_alloc.rs
 create mode 100644 drivers/android/rust_binder.rs
 create mode 100644 drivers/android/thread.rs
 create mode 100644 drivers/android/transaction.rs
 create mode 100644 drivers/gpio/gpio_pl061_rust.rs
 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/raw_vec.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/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/amba.rs
 create mode 100644 rust/kernel/bindings.rs
 create mode 100644 rust/kernel/bindings_helper.h
 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/clk.rs
 create mode 100644 rust/kernel/cred.rs
 create mode 100644 rust/kernel/device.rs
 create mode 100644 rust/kernel/driver.rs
 create mode 100644 rust/kernel/error.rs
 create mode 100644 rust/kernel/file.rs
 create mode 100644 rust/kernel/gpio.rs
 create mode 100644 rust/kernel/hwrng.rs
 create mode 100644 rust/kernel/io_buffer.rs
 create mode 100644 rust/kernel/io_mem.rs
 create mode 100644 rust/kernel/iov_iter.rs
 create mode 100644 rust/kernel/irq.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/mm.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/platform.rs
 create mode 100644 rust/kernel/power.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/revocable.rs
 create mode 100644 rust/kernel/security.rs
 create mode 100644 rust/kernel/static_assert.rs
 create mode 100644 rust/kernel/std_vendor.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/revocable_mutex.rs
 create mode 100644 rust/kernel/sync/rwsem.rs
 create mode 100644 rust/kernel/sync/seqlock.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/types.rs
 create mode 100644 rust/kernel/user_ptr.rs
 create mode 100644 rust/macros/helpers.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/hostprogs/.gitignore
 create mode 100644 samples/rust/hostprogs/Makefile
 create mode 100644 samples/rust/hostprogs/a.rs
 create mode 100644 samples/rust/hostprogs/b.rs
 create mode 100644 samples/rust/hostprogs/single.rs
 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_platform.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 100644 scripts/generate_rust_target.rs
 create mode 100755 scripts/is_rust_module.sh
 create mode 100644 scripts/rust-is-available-bindgen-libclang.h
 create mode 100755 scripts/rust-is-available.sh
Merging sysctl/sysctl-next (8e4e83b2278b ftrace: move sysctl_ftrace_enabled to ftrace.c)
$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next
Auto-merging kernel/locking/lockdep.c
Auto-merging kernel/rcu/rcu.h
Auto-merging kernel/sched/core.c
Auto-merging kernel/sched/sched.h
Auto-merging kernel/sysctl.c
Merge made by the 'ort' strategy.
 include/linux/acct.h         |   1 -
 include/linux/delayacct.h    |   3 -
 include/linux/ftrace.h       |   3 -
 include/linux/initrd.h       |   2 -
 include/linux/lockdep.h      |   4 -
 include/linux/oom.h          |   4 -
 include/linux/panic.h        |   6 -
 include/linux/reboot.h       |   4 -
 include/linux/sched/sysctl.h |  41 -------
 include/linux/writeback.h    |  15 ---
 init/do_mounts_initrd.c      |  22 +++-
 kernel/acct.c                |  22 +++-
 kernel/delayacct.c           |  22 +++-
 kernel/locking/lockdep.c     |  35 +++++-
 kernel/panic.c               |  26 +++-
 kernel/rcu/rcu.h             |   2 +
 kernel/reboot.c              |  34 +++++-
 kernel/sched/core.c          |  69 ++++++++---
 kernel/sched/deadline.c      |  42 +++++--
 kernel/sched/fair.c          |  32 ++++-
 kernel/sched/rt.c            |  63 +++++++++-
 kernel/sched/sched.h         |   7 ++
 kernel/sched/topology.c      |  25 +++-
 kernel/sysctl.c              | 277 -------------------------------------------
 kernel/trace/ftrace.c        |  22 +++-
 mm/oom_kill.c                |  38 +++++-
 mm/page-writeback.c          | 103 ++++++++++++++--
 27 files changed, 510 insertions(+), 414 deletions(-)
Merging folio/for-next (98ea02597b99 mm/rmap: Fix handling of hugetlbfs pages in page_vma_mapped_walk)
$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next
Merge made by the 'ort' strategy.
 include/linux/gfp.h  |  8 ++++--
 mm/huge_memory.c     | 11 ++++----
 mm/mempolicy.c       | 38 ++++++++++++++++---------
 mm/migrate.c         | 80 +++++++++++++++++-----------------------------------
 mm/page_vma_mapped.c |  6 ++--
 5 files changed, 64 insertions(+), 79 deletions(-)
Merging execve/for-next/execve (dd664099002d binfmt_elf: Don't write past end of notes for regset gap)
$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
Already up to date.
Merging kspp/for-next/kspp (f4fe9fc39c71 Merge branch 'for-next/hardening' into for-next/kspp)
$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
Merge made by the 'ort' strategy.
 arch/x86/include/asm/highmem.h   |  1 +
 include/linux/highmem-internal.h | 10 +++++
 include/uapi/linux/stddef.h      |  4 ++
 mm/usercopy.c                    | 97 +++++++++++-----------------------------
 security/Kconfig                 | 13 +-----
 5 files changed, 43 insertions(+), 82 deletions(-)
Merging kspp-gustavo/for-next/kspp (452d059ea2b6 drm/amd/display: Fix Wstringop-overflow warnings in dc_link_dp.c)
$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
Auto-merging drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h
Auto-merging drivers/virt/acrn/mm.c
Merge made by the 'ort' strategy.
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c |  4 ++--
 drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h  |  4 ++--
 drivers/scsi/fcoe/fcoe_ctlr.c                    |  2 +-
 drivers/virt/acrn/acrn_drv.h                     | 10 ++++++----
 drivers/virt/acrn/mm.c                           |  9 ++++-----
 fs/afs/security.c                                |  3 +--
 include/scsi/libfcoe.h                           |  3 ++-
 include/uapi/linux/wireless.h                    |  2 +-
 8 files changed, 19 insertions(+), 18 deletions(-)
$ git am -3 ../patches/0001-Revert-drm-amd-amdgpu-Only-reserve-vram-for-firmware.patch
Applying: Revert "drm/amd/amdgpu: Only reserve vram for firmware with vega9 MS_HYPERV host."
Merging akpm-current/current (fd61e89eda93 ipc/mqueue: use get_tree_nodev() in mqueue_get_tree())
$ git merge --no-ff akpm-current/current
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Auto-merging Documentation/filesystems/locking.rst
Auto-merging arch/arm64/Kconfig
Auto-merging arch/x86/Kconfig
Auto-merging arch/x86/mm/init_64.c
Auto-merging drivers/block/loop.c
Auto-merging drivers/block/zram/zram_drv.c
Auto-merging fs/namei.c
Auto-merging fs/open.c
Auto-merging include/asm-generic/tlb.h
Auto-merging include/linux/fs.h
Auto-merging include/linux/gfp.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/writeback.h
Auto-merging ipc/mqueue.c
Auto-merging lib/Kconfig.debug
Auto-merging mm/huge_memory.c
Auto-merging mm/mempolicy.c
CONFLICT (content): Merge conflict in mm/mempolicy.c
Auto-merging mm/migrate.c
CONFLICT (content): Merge conflict in mm/migrate.c
Auto-merging mm/page_alloc.c
Auto-merging mm/page_vma_mapped.c
Recorded preimage for 'mm/mempolicy.c'
Recorded preimage for 'mm/migrate.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'mm/mempolicy.c'.
Recorded resolution for 'mm/migrate.c'.
[master c27b4813f757] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
 .mailmap                                        |   4 +
 Documentation/admin-guide/blockdev/zram.rst     |   5 +
 Documentation/admin-guide/kernel-parameters.txt |   4 +-
 Documentation/admin-guide/mm/hugetlbpage.rst    |   2 +-
 Documentation/admin-guide/mm/ksm.rst            |  18 +
 Documentation/admin-guide/sysctl/vm.rst         |   9 +
 Documentation/filesystems/locking.rst           |  18 +-
 Documentation/filesystems/vfs.rst               |  17 +-
 Documentation/vm/balance.rst                    |   2 +-
 Documentation/vm/page_owner.rst                 |  44 ++-
 arch/arm64/Kconfig                              |   1 +
 arch/arm64/include/asm/pgtable-prot.h           |   1 +
 arch/arm64/include/asm/pgtable.h                |  23 +-
 arch/arm64/mm/flush.c                           |  13 +
 arch/ia64/kernel/kprobes.c                      |  64 ++--
 arch/ia64/kernel/palinfo.c                      |   2 +-
 arch/ia64/kernel/ptrace.c                       |   2 +-
 arch/ia64/kernel/traps.c                        |   2 +-
 arch/ia64/mm/init.c                             |   2 +-
 arch/ia64/mm/tlb.c                              |   4 +-
 arch/powerpc/include/asm/book3s/64/pgtable.h    |  31 +-
 arch/s390/include/asm/pgtable.h                 |  36 +-
 arch/x86/Kconfig                                |   1 +
 arch/x86/include/asm/io.h                       |   2 +-
 arch/x86/include/asm/pgtable.h                  |  21 ++
 arch/x86/include/asm/pgtable_64.h               |   4 +-
 arch/x86/include/asm/pgtable_types.h            |   7 +
 arch/x86/include/asm/tlbflush.h                 |  97 ++++++
 arch/x86/kernel/crash_dump_64.c                 |   2 +-
 arch/x86/mm/init_64.c                           |   2 +-
 arch/x86/mm/pgtable.c                           |  10 +
 drivers/base/node.c                             |   1 +
 drivers/block/loop.c                            |   4 +-
 drivers/block/zram/zram_drv.c                   |  10 +-
 drivers/iommu/tegra-smmu.c                      |   4 +-
 drivers/rapidio/devices/rio_mport_cdev.c        |   4 +-
 fs/Kconfig                                      |  22 +-
 fs/buffer.c                                     |  56 +++-
 fs/cifs/file.c                                  |   7 +-
 fs/dax.c                                        |  98 +-----
 fs/exec.c                                       |   6 +-
 fs/fat/fat.h                                    |   9 +-
 fs/fat/fatent.c                                 |   7 +-
 fs/fat/inode.c                                  |   6 +-
 fs/fat/misc.c                                   |  14 +-
 fs/fcntl.c                                      |   9 +-
 fs/namei.c                                      |   8 +-
 fs/nfs/file.c                                   |  21 +-
 fs/ocfs2/dlm/dlmdebug.c                         |  12 +-
 fs/ocfs2/dlm/dlmunlock.c                        |  21 +-
 fs/ocfs2/namei.c                                |  49 +--
 fs/ocfs2/namei.h                                |   2 +
 fs/ocfs2/quota_local.c                          |  10 +-
 fs/ocfs2/refcounttree.c                         |  15 +-
 fs/ocfs2/xattr.c                                |  12 +-
 fs/ocfs2/xattr.h                                |   1 +
 fs/open.c                                       |   9 +-
 fs/overlayfs/file.c                             |  13 +-
 fs/pipe.c                                       |   2 +-
 fs/proc/base.c                                  |  22 ++
 fs/proc/fd.c                                    |  23 +-
 fs/proc/generic.c                               |   3 +
 fs/proc/kcore.c                                 |  14 +-
 fs/proc/page.c                                  |  40 +--
 fs/proc/proc_net.c                              |   3 +
 fs/sysv/super.c                                 |   4 +-
 include/asm-generic/tlb.h                       |  14 +
 include/linux/fs.h                              |   4 +
 include/linux/gfp.h                             |  12 +-
 include/linux/huge_mm.h                         |  19 +-
 include/linux/hugetlb.h                         |  10 +-
 include/linux/khugepaged.h                      |  59 +---
 include/linux/list.h                            |   6 +-
 include/linux/memcontrol.h                      |   5 +
 include/linux/memory_hotplug.h                  |   2 +-
 include/linux/memremap.h                        |   6 +
 include/linux/migrate.h                         |  34 +-
 include/linux/mm.h                              |  64 +++-
 include/linux/mm_types.h                        |  24 +-
 include/linux/mmzone.h                          |  11 +-
 include/linux/page-flags.h                      |  57 +++-
 include/linux/pgtable.h                         |  49 +++
 include/linux/pipe_fs_i.h                       |   2 +-
 include/linux/rmap.h                            | 121 ++++++-
 include/linux/sched.h                           |   8 +
 include/linux/sched/coredump.h                  |   3 +-
 include/linux/shmem_fs.h                        |   2 +-
 include/linux/swap.h                            | 143 +-------
 include/linux/swapops.h                         |  27 ++
 include/linux/vm_event_item.h                   |   3 +
 include/linux/writeback.h                       |   7 +
 include/trace/events/mmflags.h                  |   1 -
 include/uapi/linux/acct.h                       |   3 +-
 include/uapi/linux/taskstats.h                  |  24 +-
 init/main.c                                     |  25 +-
 ipc/mqueue.c                                    |  14 +
 kernel/events/uprobes.c                         |   2 +-
 kernel/fork.c                                   |   4 +-
 kernel/hung_task.c                              |  46 ++-
 kernel/irq_work.c                               |   2 +-
 kernel/kexec_core.c                             |   2 -
 kernel/pid_namespace.c                          |   2 +-
 kernel/taskstats.c                              |  23 ++
 kernel/tsacct.c                                 |  10 +-
 kernel/watchdog.c                               |   4 +-
 lib/Kconfig.debug                               |  27 +-
 lib/glob.c                                      |   2 +-
 lib/lz4/lz4_decompress.c                        |   8 +-
 lib/string.c                                    |  25 +-
 lib/test_meminit.c                              |  12 +-
 lib/test_printf.c                               |   8 +-
 lib/test_string.c                               |  33 ++
 mm/Makefile                                     |   2 +-
 mm/compaction.c                                 |  12 +-
 mm/damon/vaddr-test.h                           |   8 +-
 mm/debug_vm_pgtable.c                           |  46 ++-
 mm/gup.c                                        | 106 +++++-
 mm/highmem.c                                    |   4 +-
 mm/huge_memory.c                                | 162 ++++++---
 mm/hugetlb.c                                    | 205 ++++++++----
 mm/hugetlb_vmemmap.c                            |  56 ++--
 mm/hugetlb_vmemmap.h                            |  24 +-
 mm/internal.h                                   | 145 +++++---
 mm/khugepaged.c                                 |  86 +++--
 mm/ksm.c                                        |  23 +-
 mm/list_lru.c                                   |   6 -
 mm/madvise.c                                    |   9 +-
 mm/memcontrol.c                                 |  48 +--
 mm/memory-failure.c                             | 158 ++++++---
 mm/memory.c                                     | 375 ++++++++++++---------
 mm/memory_hotplug.c                             |  95 +++---
 mm/mempolicy.c                                  |  10 +-
 mm/memremap.c                                   |  29 ++
 mm/migrate.c                                    | 120 +++----
 mm/migrate_device.c                             |  23 +-
 mm/mincore.c                                    |   1 +
 mm/mmap.c                                       |  67 ++--
 mm/mmu_gather.c                                 |  16 +-
 mm/mprotect.c                                   | 101 +++---
 mm/mremap.c                                     |  17 +-
 mm/page_alloc.c                                 | 187 ++++-------
 mm/page_io.c                                    | 302 ++++++++++-------
 mm/page_isolation.c                             |   9 +-
 mm/page_vma_mapped.c                            |  17 +-
 mm/pgtable-generic.c                            |   8 +
 mm/rmap.c                                       | 168 +++++++---
 mm/secretmem.c                                  |  17 +
 mm/shmem.c                                      |  22 +-
 mm/sparse-vmemmap.c                             |   4 +-
 mm/swap.c                                       |   4 +-
 mm/swap.h                                       | 157 +++++++++
 mm/swap_state.c                                 |  23 +-
 mm/swapfile.c                                   |  33 +-
 mm/userfaultfd.c                                |  23 +-
 mm/util.c                                       |   1 +
 mm/vmalloc.c                                    |  23 +-
 mm/vmscan.c                                     |  47 ++-
 mm/vmstat.c                                     |   5 +-
 mm/workingset.c                                 |   2 +-
 mm/z3fold.c                                     |  64 +---
 mm/zswap.c                                      |   2 +
 scripts/get_maintainer.pl                       |   1 +
 tools/accounting/.gitignore                     |   1 +
 tools/accounting/Makefile                       |   2 +-
 tools/accounting/procacct.c                     | 417 ++++++++++++++++++++++++
 tools/include/linux/gfp.h                       |   3 +-
 tools/perf/builtin-kmem.c                       |   1 -
 tools/testing/selftests/vm/Makefile             |   3 +
 tools/testing/selftests/vm/migration.c          | 193 +++++++++++
 tools/vm/page-types.c                           |   8 +-
 tools/vm/page_owner_sort.c                      | 266 ++++++++++++---
 171 files changed, 4147 insertions(+), 1780 deletions(-)
 create mode 100644 mm/swap.h
 create mode 100644 tools/accounting/procacct.c
 create mode 100644 tools/testing/selftests/vm/migration.c
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

Successfully rebased and updated refs/heads/akpm.
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + 5aa551285751...752a38a306c1 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (752a38a306c1 kselftest/vm: override TARGETS from arguments)
$ git merge --no-ff akpm/master
Merge made by the 'ort' strategy.
 mm/oom_kill.c                           |  58 ++++----
 tools/testing/selftests/vm/.gitignore   |   1 +
 tools/testing/selftests/vm/Makefile     |   3 +-
 tools/testing/selftests/vm/config       |   2 +
 tools/testing/selftests/vm/soft-dirty.c | 238 ++++++++++++++++++++++++++++++++
 5 files changed, 272 insertions(+), 30 deletions(-)
 create mode 100644 tools/testing/selftests/vm/soft-dirty.c