blob: 15474129589a34f3dcdfc632222bfa95c99d3c7f [file] [log] [blame]
$ date -R
Thu, 02 Jun 2022 08:40:07 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 2a5699b0de4e Merge tag 'leds-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds
Merging origin/master (54eb8462f21f Merge tag 'rtc-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
Updating 2a5699b0de4e..54eb8462f21f
Fast-forward (no commit created; -m option ignored)
Documentation/admin-guide/nfs/nfs-client.rst | 15 +-
.../devicetree/bindings/i3c/cdns,i3c-master.txt | 43 --
.../devicetree/bindings/i3c/cdns,i3c-master.yaml | 60 ++
.../devicetree/bindings/i3c/snps,dw-i3c-master.txt | 41 --
.../bindings/i3c/snps,dw-i3c-master.yaml | 52 ++
Documentation/devicetree/bindings/mfd/da9063.txt | 9 +-
.../devicetree/bindings/pwm/atmel,at91sam-pwm.yaml | 47 ++
.../devicetree/bindings/pwm/atmel-pwm.txt | 35 -
.../bindings/pwm/google,cros-ec-pwm.yaml | 9 +-
.../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 75 ++
.../devicetree/bindings/pwm/pwm-mediatek.txt | 1 +
.../devicetree/bindings/pwm/pwm-mtk-disp.txt | 45 --
.../bindings/pwm/sunplus,sp7021-pwm.yaml | 42 ++
.../bindings/remoteproc/fsl,imx-rproc.yaml | 9 +-
.../devicetree/bindings/remoteproc/mtk,scp.yaml | 57 +-
.../devicetree/bindings/remoteproc/qcom,adsp.yaml | 31 +
.../bindings/remoteproc/st,stm32-rproc.yaml | 16 +-
.../devicetree/bindings/rtc/nxp,pcf85063.txt | 1 +
.../devicetree/bindings/rtc/renesas,rzn1-rtc.yaml | 70 ++
.../devicetree/bindings/timer/xlnx,xps-timer.yaml | 92 +++
.../devicetree/bindings/watchdog/da9062-wdt.txt | 6 +
.../bindings/watchdog/faraday,ftwdt010.txt | 22 -
.../bindings/watchdog/faraday,ftwdt010.yaml | 67 ++
.../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 1 +
.../devicetree/bindings/watchdog/mtk-wdt.txt | 1 +
.../devicetree/bindings/watchdog/qcom-wdt.yaml | 39 +-
.../devicetree/bindings/watchdog/renesas,wdt.yaml | 12 +-
.../bindings/watchdog/socionext,uniphier-wdt.yaml | 2 +-
.../bindings/watchdog/sunplus,sp7021-wdt.yaml | 47 ++
Documentation/driver-api/pwm.rst | 6 +
Documentation/driver-api/vfio-mediated-device.rst | 4 +-
Documentation/filesystems/erofs.rst | 64 +-
.../filesystems/nfs/client-identifier.rst | 216 ++++++
Documentation/filesystems/nfs/index.rst | 2 +
MAINTAINERS | 33 +-
arch/microblaze/kernel/timer.c | 4 +
drivers/gpu/drm/i915/gvt/gtt.c | 4 +-
drivers/gpu/drm/i915/gvt/gvt.h | 8 +-
drivers/gpu/drm/i915/gvt/kvmgt.c | 115 +--
drivers/i3c/master/mipi-i3c-hci/core.c | 7 +-
drivers/i3c/master/svc-i3c-master.c | 3 +-
drivers/md/dm-table.c | 19 +-
drivers/md/dm-verity-target.c | 1 +
drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 65 +-
drivers/pcmcia/Kconfig | 2 +-
drivers/pcmcia/bcm63xx_pcmcia.c | 9 +-
drivers/pcmcia/rsrc_nonstatic.c | 2 +-
drivers/power/supply/ab8500_fg.c | 19 +-
drivers/power/supply/axp288_fuel_gauge.c | 41 +-
drivers/power/supply/bq24190_charger.c | 63 +-
drivers/power/supply/bq27xxx_battery.c | 60 +-
drivers/power/supply/power_supply_core.c | 2 +-
drivers/pwm/Kconfig | 25 +
drivers/pwm/Makefile | 2 +
drivers/pwm/pwm-atmel-tcb.c | 14 +-
drivers/pwm/pwm-clps711x.c | 68 +-
drivers/pwm/pwm-cros-ec.c | 82 ++-
drivers/pwm/pwm-lp3943.c | 42 +-
drivers/pwm/pwm-lpc18xx-sct.c | 43 +-
drivers/pwm/pwm-lpc32xx.c | 29 +-
drivers/pwm/pwm-mediatek.c | 36 +-
drivers/pwm/pwm-raspberrypi-poe.c | 2 +-
drivers/pwm/pwm-renesas-tpu.c | 317 +++++----
drivers/pwm/pwm-samsung.c | 54 +-
drivers/pwm/pwm-sifive.c | 5 +-
drivers/pwm/pwm-sti.c | 29 +-
drivers/pwm/pwm-stmpe.c | 29 +-
drivers/pwm/pwm-sun4i.c | 18 +-
drivers/pwm/pwm-sunplus.c | 232 ++++++
drivers/pwm/pwm-tegra.c | 40 +-
drivers/pwm/pwm-twl-led.c | 76 +-
drivers/pwm/pwm-xilinx.c | 321 +++++++++
drivers/remoteproc/imx_dsp_rproc.c | 105 +--
drivers/remoteproc/imx_rproc.c | 36 +
drivers/remoteproc/mtk_common.h | 2 +
drivers/remoteproc/mtk_scp.c | 76 +-
drivers/remoteproc/qcom_q6v5_pas.c | 34 +
drivers/remoteproc/remoteproc_cdev.c | 11 -
drivers/remoteproc/remoteproc_core.c | 15 +-
drivers/remoteproc/remoteproc_debugfs.c | 17 +-
drivers/remoteproc/remoteproc_elf_loader.c | 2 +-
drivers/remoteproc/remoteproc_sysfs.c | 11 -
drivers/rpmsg/qcom_smd.c | 4 +-
drivers/rpmsg/virtio_rpmsg_bus.c | 9 +-
drivers/rtc/Kconfig | 7 +
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-ftrtc010.c | 34 +-
drivers/rtc/rtc-gamecube.c | 1 +
drivers/rtc/rtc-meson.c | 2 +-
drivers/rtc/rtc-mt6397.c | 2 +
drivers/rtc/rtc-mxc.c | 2 +-
drivers/rtc/rtc-pcf85063.c | 2 +
drivers/rtc/rtc-rx8025.c | 7 +-
drivers/rtc/rtc-rzn1.c | 418 +++++++++++
drivers/rtc/rtc-sun6i.c | 42 ++
drivers/s390/cio/vfio_ccw_cp.c | 47 +-
drivers/s390/cio/vfio_ccw_cp.h | 4 +-
drivers/s390/cio/vfio_ccw_fsm.c | 3 +-
drivers/s390/cio/vfio_ccw_ops.c | 7 +-
drivers/s390/crypto/vfio_ap_ops.c | 50 +-
drivers/s390/crypto/vfio_ap_private.h | 3 -
drivers/spi/spi-fsi.c | 12 +-
drivers/spi/spi.c | 3 +-
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 16 +-
drivers/vfio/pci/mlx5/cmd.c | 236 +++++--
drivers/vfio/pci/mlx5/cmd.h | 52 +-
drivers/vfio/pci/mlx5/main.c | 136 ++--
drivers/vfio/pci/vfio_pci.c | 6 +-
drivers/vfio/pci/vfio_pci_config.c | 56 +-
drivers/vfio/pci/vfio_pci_core.c | 254 ++++---
drivers/vfio/vfio.c | 781 +++++++--------------
drivers/watchdog/Kconfig | 19 +
drivers/watchdog/Makefile | 2 +
drivers/watchdog/bcm7038_wdt.c | 1 +
drivers/watchdog/da9063_wdt.c | 36 +
drivers/watchdog/iTCO_wdt.c | 20 +-
drivers/watchdog/mtk_wdt.c | 12 +
drivers/watchdog/rti_wdt.c | 10 +-
drivers/watchdog/rzg2l_wdt.c | 83 ++-
drivers/watchdog/rzn1_wdt.c | 203 ++++++
drivers/watchdog/sp805_wdt.c | 1 +
drivers/watchdog/sunplus_wdt.c | 220 ++++++
drivers/watchdog/ts4800_wdt.c | 5 +-
drivers/watchdog/wdat_wdt.c | 6 +-
fs/afs/dir.c | 5 +-
fs/erofs/fscache.c | 1 +
fs/erofs/inode.c | 5 +-
fs/erofs/zdata.c | 167 ++---
fs/erofs/zdata.h | 50 +-
fs/f2fs/checkpoint.c | 16 +-
fs/f2fs/data.c | 213 ++++--
fs/f2fs/debug.c | 18 +-
fs/f2fs/dir.c | 3 +-
fs/f2fs/f2fs.h | 133 ++--
fs/f2fs/file.c | 307 ++++----
fs/f2fs/gc.c | 186 +++--
fs/f2fs/hash.c | 11 +-
fs/f2fs/inline.c | 29 +-
fs/f2fs/inode.c | 34 +-
fs/f2fs/namei.c | 38 +-
fs/f2fs/node.c | 29 +-
fs/f2fs/node.h | 1 -
fs/f2fs/segment.c | 460 +++++-------
fs/f2fs/segment.h | 40 +-
fs/f2fs/super.c | 88 +--
fs/f2fs/verity.c | 2 +-
fs/ksmbd/connection.c | 22 +-
fs/ksmbd/connection.h | 27 +-
fs/ksmbd/ksmbd_netlink.h | 3 +-
fs/ksmbd/misc.c | 10 +-
fs/ksmbd/smb2misc.c | 2 +-
fs/ksmbd/smb2pdu.c | 126 ++--
fs/ksmbd/smb_common.c | 4 +-
fs/ksmbd/smbacl.c | 1 +
fs/ksmbd/transport_ipc.c | 3 +
fs/ksmbd/transport_rdma.c | 363 ++++++----
fs/ksmbd/transport_rdma.h | 8 +
fs/nfs/file.c | 50 +-
fs/nfs/filelayout/filelayout.c | 7 +-
fs/nfs/fscache.c | 7 +-
fs/nfs/internal.h | 1 +
fs/nfs/nfs4namespace.c | 9 +-
fs/nfs/nfs4proc.c | 182 +++--
fs/nfs/nfs4state.c | 29 +-
fs/nfs/nfs4xdr.c | 99 ++-
fs/nfs/pagelist.c | 3 +
fs/nfs/pnfs.c | 2 +
fs/nfs/unlink.c | 8 +
fs/nfs/write.c | 54 +-
include/clocksource/timer-xilinx.h | 73 ++
include/dt-bindings/mfd/cros_ec.h | 18 +
include/dt-bindings/reset/mt7986-resets.h | 55 ++
include/dt-bindings/reset/mt8186-resets.h | 36 +
include/linux/mlx5/driver.h | 12 +
include/linux/nfs4.h | 2 +
include/linux/nfs_fs_sb.h | 1 +
include/linux/nfs_xdr.h | 12 +-
include/linux/vfio.h | 44 +-
include/linux/vfio_pci_core.h | 3 +-
include/trace/events/f2fs.h | 141 +++-
include/uapi/linux/vfio.h | 4 +-
net/sunrpc/xprtrdma/rpc_rdma.c | 5 +
virt/kvm/vfio.c | 329 ++++-----
183 files changed, 6481 insertions(+), 3394 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
create mode 100644 Documentation/devicetree/bindings/i3c/cdns,i3c-master.yaml
delete mode 100644 Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
create mode 100644 Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml
create mode 100644 Documentation/devicetree/bindings/pwm/atmel,at91sam-pwm.yaml
delete mode 100644 Documentation/devicetree/bindings/pwm/atmel-pwm.txt
create mode 100644 Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml
delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt
create mode 100644 Documentation/devicetree/bindings/pwm/sunplus,sp7021-pwm.yaml
create mode 100644 Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml
create mode 100644 Documentation/devicetree/bindings/timer/xlnx,xps-timer.yaml
delete mode 100644 Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml
create mode 100644 Documentation/devicetree/bindings/watchdog/sunplus,sp7021-wdt.yaml
create mode 100644 Documentation/filesystems/nfs/client-identifier.rst
create mode 100644 drivers/pwm/pwm-sunplus.c
create mode 100644 drivers/pwm/pwm-xilinx.c
create mode 100644 drivers/rtc/rtc-rzn1.c
create mode 100644 drivers/watchdog/rzn1_wdt.c
create mode 100644 drivers/watchdog/sunplus_wdt.c
create mode 100644 include/clocksource/timer-xilinx.h
create mode 100644 include/dt-bindings/mfd/cros_ec.h
create mode 100644 include/dt-bindings/reset/mt7986-resets.h
create mode 100644 include/dt-bindings/reset/mt8186-resets.h
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 mm-hotfixes/mm-hotfixes-unstable (b41f9e6a0b57 mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery)
$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
.mailmap | 2 ++
MAINTAINERS | 7 +++++
arch/x86/kernel/machine_kexec_64.c | 12 ++++++--
mm/hugetlb_vmemmap.c | 2 +-
mm/memremap.c | 2 +-
mm/oom_kill.c | 58 +++++++++++++++++++-------------------
mm/page_isolation.c | 2 +-
mm/swap.c | 2 +-
8 files changed, 51 insertions(+), 36 deletions(-)
Merging kbuild-current/fixes (7e284070abe5 Merge tag 'for-5.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm)
$ 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 (c6ed4d84a2c4 ARC: remove redundant READ_ONCE() in cmpxchg loop)
$ 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 (3cfb30199796 ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2)
$ 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 (1d0cb4c8864a arm64: mte: Ensure the cleared tags are visible before setting the PTE)
$ 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
Already up to date.
Merging arm-soc-fixes/arm/fixes (609a097f5f06 Merge tag 'v5.18-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip 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
Already up to date.
Merging drivers-memory-fixes/fixes (73039c6c7f36 memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode)
$ 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
Auto-merging drivers/memory/renesas-rpc-if.c
Merge made by the 'ort' strategy.
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.
Merging m68k-current/for-linus (30b5e6ef4a32 m68k: atari: Make Atari ROM port I/O write macros return void)
$ 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 (6112bd00e84e Merge tag 'powerpc-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
Already up to date.
Merging s390-fixes/fixes (a06afe838308 KVM: s390: vsie/gmap: reduce gmap_rmap overhead)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
Already up to date.
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 (86360030cc51 net/sched: act_api: fix error code in tcf_ct_flow_table_fill_tuple_ipv6())
$ 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.
.../devicetree/bindings/net/adi,adin.yaml | 5 +-
Documentation/networking/ip-sysctl.rst | 23 ++---
drivers/net/amt.c | 6 +-
drivers/net/bonding/bond_main.c | 2 +
drivers/net/bonding/bond_netlink.c | 5 -
drivers/net/bonding/bond_options.c | 10 +-
drivers/net/bonding/bond_procfs.c | 15 +++
drivers/net/dsa/mv88e6xxx/chip.c | 1 +
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 31 +-----
drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 31 +-----
.../net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c | 32 +------
.../net/ethernet/freescale/dpaa/dpaa_eth_trace.h | 32 +------
drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 32 +------
.../net/ethernet/freescale/enetc/enetc_pci_mdio.c | 4 +-
.../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 2 +-
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 +
drivers/net/ethernet/microchip/lan743x_main.c | 32 +++++--
.../net/ethernet/microchip/lan966x/lan966x_main.c | 9 +-
.../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 4 +-
drivers/net/ethernet/sfc/efx_channels.c | 6 +-
drivers/net/ethernet/sfc/net_driver.h | 2 +-
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 8 +-
drivers/net/ipa/ipa_endpoint.c | 9 +-
drivers/net/macsec.c | 7 ++
drivers/net/phy/at803x.c | 33 ++++---
drivers/net/phy/fixed_phy.c | 6 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/xen-netback/netback.c | 2 +-
drivers/ptp/ptp_clockmatrix.c | 2 +-
include/linux/ipv6.h | 2 +-
include/net/amt.h | 2 +-
include/net/bonding.h | 6 ++
include/net/netfilter/nf_conntrack_core.h | 7 +-
include/net/sch_generic.h | 42 +++-----
include/uapi/linux/ipv6.h | 2 +-
kernel/bpf/core.c | 14 +--
net/core/neighbour.c | 2 +-
net/ipv4/tcp_input.c | 11 ++-
net/ipv4/tcp_ipv4.c | 4 +-
net/ipv4/tcp_output.c | 4 +-
net/ipv6/addrconf.c | 6 +-
net/ipv6/ndisc.c | 42 ++++----
net/ipv6/ping.c | 8 +-
net/netfilter/nf_tables_api.c | 106 +++++++++++++++------
net/netfilter/nfnetlink.c | 24 +----
net/netfilter/nfnetlink_cttimeout.c | 5 +-
net/netfilter/nft_flow_offload.c | 6 +-
net/netfilter/nft_limit.c | 2 +
net/nfc/core.c | 4 +-
net/sched/act_ct.c | 2 +-
net/smc/af_smc.c | 1 +
net/smc/smc_cdc.c | 2 +-
.../selftests/bpf/progs/test_stacktrace_build_id.c | 2 +-
.../selftests/net/ndisc_unsolicited_na_test.sh | 23 +++--
tools/testing/selftests/net/psock_snd.c | 2 +
55 files changed, 326 insertions(+), 360 deletions(-)
Merging bpf/master (e0491b11c131 bpf, arm64: Clear prog->jited_len along prog->jited)
$ 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.
arch/arm64/net/bpf_jit_comp.c | 1 +
1 file changed, 1 insertion(+)
Merging ipsec/master (6821ad877034 xfrm: do not set IPv4 DF flag when encapsulating IPv6 frames <= 1280 bytes.)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
Auto-merging net/key/af_key.c
Merge made by the 'ort' strategy.
net/key/af_key.c | 10 ++++++----
net/xfrm/xfrm_output.c | 3 ++-
2 files changed, 8 insertions(+), 5 deletions(-)
Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
$ 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 (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too)
$ 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/for-next (2965c4cdf7ad wifi: mac80211: fix use-after-free in chanctx code)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
Merge made by the 'ort' strategy.
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 34 ++++++++++++-------------
drivers/net/wireless/marvell/libertas/cfg.c | 4 +--
drivers/net/wireless/marvell/libertas/host.h | 6 +++--
drivers/net/wireless/realtek/rtw88/fw.c | 10 ++++++++
drivers/net/wireless/realtek/rtw88/fw.h | 1 +
drivers/net/wireless/realtek/rtw88/mac80211.c | 4 +--
drivers/net/wireless/realtek/rtw88/main.c | 2 ++
drivers/net/wireless/realtek/rtw88/main.h | 1 +
net/mac80211/chan.c | 7 ++---
9 files changed, 39 insertions(+), 30 deletions(-)
Merging rdma-fixes/for-rc (c5eb0a61238d Linux 5.18-rc6)
$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
Already up to date.
Merging sound-current/for-linus (672362cbe6df Merge tag 'asoc-fix-v5.19-rc0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
Merge made by the 'ort' strategy.
sound/pci/hda/patch_realtek.c | 11 +++++++++
sound/pci/hda/patch_via.c | 2 --
sound/soc/amd/acp/acp-pci.c | 1 +
sound/soc/codecs/da7219-aad.c | 18 +++++++++++---
sound/soc/codecs/rt5640.c | 11 +++++++--
sound/soc/codecs/rt5640.h | 2 ++
sound/soc/fsl/fsl_sai.h | 4 +--
sound/soc/intel/avs/board_selection.c | 3 ++-
sound/soc/intel/boards/bytcr_rt5640.c | 2 ++
sound/soc/intel/common/soc-acpi-intel-adl-match.c | 2 +-
sound/soc/soc-pcm.c | 2 --
sound/usb/clock.c | 12 ++++++---
sound/usb/midi.c | 3 +++
sound/usb/mixer_maps.c | 30 +++++++++++++++++++++++
tools/testing/selftests/alsa/Makefile | 3 +++
15 files changed, 89 insertions(+), 17 deletions(-)
Merging sound-asoc-fixes/for-linus (36513d56b7d5 Merge remote-tracking branch 'asoc/for-5.18' 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.
sound/soc/codecs/nau8822.c | 4 ++++
sound/soc/codecs/nau8822.h | 3 +++
sound/soc/codecs/tlv320adc3xxx.c | 3 +++
sound/soc/fsl/fsl_micfil.c | 19 +++++++++++++++++++
sound/soc/qcom/lpass-platform.c | 2 +-
sound/soc/soc-ops.c | 8 +++++++-
6 files changed, 37 insertions(+), 2 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 (e4296f8578b5 Merge remote-tracking branch 'regulator/for-5.18' into regulator-linus)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
Auto-merging drivers/regulator/core.c
Merge made by the 'ort' strategy.
Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Merging spi-fixes/for-linus (ebf2a3521738 spi: core: Display return code when failing to transfer message)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
Already up to date.
Merging pci-current/for-linus (833e53a4ffe9 MAINTAINERS: Update Lorenzo Pieralisi's email address)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus
Auto-merging .mailmap
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
.mailmap | 1 +
MAINTAINERS | 16 +--
drivers/pci/controller/pcie-brcmstb.c | 257 ++++------------------------------
drivers/pci/pci.c | 2 +
4 files changed, 41 insertions(+), 235 deletions(-)
Merging driver-core.current/driver-core-linus (42226c989789 Linux 5.18-rc7)
$ 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
Already up to date.
Merging tty.current/tty-linus (42226c989789 Linux 5.18-rc7)
$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (42226c989789 Linux 5.18-rc7)
$ 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 (42226c989789 Linux 5.18-rc7)
$ 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 phy/fixes (2c8045d48dee phy: amlogic: fix error path in phy_g12a_usb3_pcie_probe())
$ 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 (ce522ba9ef7e Linux 5.18-rc2)
$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
Already up to date.
Merging iio-fixes/fixes-togreg (e104588d3fe4 iio:humidity:hts221: rearrange iio trigger get and register)
$ 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/accel/bma180.c | 3 ++-
drivers/iio/accel/kxcjk-1013.c | 4 ++--
drivers/iio/accel/mma8452.c | 12 +++++++-----
drivers/iio/accel/mxc4005.c | 4 ++--
drivers/iio/adc/aspeed_adc.c | 1 +
drivers/iio/adc/axp288_adc.c | 8 ++++++++
drivers/iio/adc/rzg2l_adc.c | 8 ++++++--
drivers/iio/adc/stm32-adc-core.c | 9 +++++++--
drivers/iio/adc/stm32-adc.c | 10 ----------
drivers/iio/adc/ti-ads131e08.c | 10 +++++++---
drivers/iio/adc/xilinx-ams.c | 2 +-
drivers/iio/afe/iio-rescale.c | 2 +-
drivers/iio/chemical/ccs811.c | 4 ++--
drivers/iio/frequency/admv1014.c | 6 ++++--
drivers/iio/gyro/mpu3050-core.c | 1 +
drivers/iio/humidity/hts221_buffer.c | 5 ++++-
drivers/iio/magnetometer/yamaha-yas530.c | 2 +-
drivers/iio/trigger/iio-trig-sysfs.c | 1 +
18 files changed, 57 insertions(+), 35 deletions(-)
Merging counter-fixes/fixes-togreg (ce522ba9ef7e Linux 5.18-rc2)
$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg
Already up to date.
Merging char-misc.current/char-misc-linus (42226c989789 Linux 5.18-rc7)
$ 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
Already up to date.
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 (4b0986a3613c Linux 5.18)
$ 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 (5f92df8ddacb Input: raspberrypi-ts - add missing HAS_IOMEM dependency)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
Merge made by the 'ort' strategy.
drivers/input/joystick/Kconfig | 1 +
1 file changed, 1 insertion(+)
Merging crypto-current/master (e4e62bbc6aba hwrng: omap3-rom - fix using wrong clk_disable() in omap_rom_rng_runtime_resume())
$ 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 (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used)
$ 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 (e8f0c8965932 selftest/vm: add skip support to mremap_test)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
Auto-merging tools/testing/selftests/vm/run_vmtests.sh
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/run_vmtests.sh
Resolved 'tools/testing/selftests/vm/run_vmtests.sh' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master e67abd487c3c] Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
$ git diff -M --stat --summary HEAD^..
Merging modules-fixes/modules-linus (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section())
$ 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 (b00ed48bb0a7 Merge tag 'dmaengine-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine)
$ 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 (ba7542eb2dd5 mtd: rawnand: qcom: fix memory corruption that causes panic)
$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
Already up to date.
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
$ git merge -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 (d4cb77112c7b media: isl7998x: select V4L2_FWNODE to fix build error)
$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes
Auto-merging drivers/media/i2c/Kconfig
Merge made by the 'ort' strategy.
drivers/media/i2c/Kconfig | 1 +
1 file changed, 1 insertion(+)
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 (f0a6c68f6998 MIPS: Fix CP0 counter erratum detection for R4k CPUs)
$ 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 (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles)
$ 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 (46ff3df87215 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35)
$ 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 (17718410388f KVM: Don't null dereference ops->destroy)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
Auto-merging virt/kvm/kvm_main.c
Merge made by the 'ort' strategy.
virt/kvm/kvm_main.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Merging kvms390-fixes/master (242c04f01377 KVM: s390: selftests: Use TAP interface in the reset test)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
Auto-merging virt/kvm/kvm_main.c
Merge made by the 'ort' strategy.
arch/x86/kvm/vmx/vmx.c | 8 +-
arch/x86/kvm/x86.c | 7 +-
include/linux/kvm_types.h | 2 +
tools/testing/selftests/kvm/s390x/memop.c | 95 +++++++--
tools/testing/selftests/kvm/s390x/resets.c | 38 +++-
tools/testing/selftests/kvm/s390x/sync_regs_test.c | 87 ++++++--
tools/testing/selftests/kvm/s390x/tprot.c | 29 ++-
virt/kvm/kvm_main.c | 9 +
virt/kvm/pfncache.c | 231 +++++++++++++--------
9 files changed, 368 insertions(+), 138 deletions(-)
Merging hwmon-fixes/hwmon (42226c989789 Linux 5.18-rc7)
$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
Already up to date.
Merging nvdimm-fixes/libnvdimm-fixes (d28820419ca3 cxl/pci: Drop shadowed variable)
$ 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 (48de4dc26894 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/disk-io.c
Auto-merging fs/btrfs/inode.c
Merge made by the 'ort' strategy.
Merging vfs-fixes/fixes (fb4554c2232e Fix double fget() in vhost_net_set_backend())
$ 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 (44acfc22c7d0 platform/surface: aggregator: Fix initialization order when compiling as builtin module)
$ 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
Already up to date.
Merging samsung-krzk-fixes/fixes (436ce66003d5 ARM: s3c: mark as deprecated and schedule removal)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
Auto-merging arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Auto-merging arch/arm/mach-s3c/cpu.c
Auto-merging arch/arm/mach-s3c/s3c24xx.c
Auto-merging arch/arm/mach-s3c/s3c64xx.c
Resolved 'arch/arm/Kconfig' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 0bcb571f3802] Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
$ git diff -M --stat --summary HEAD^..
Merging pinctrl-samsung-fixes/fixes (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
Already up to date.
Merging devicetree-fixes/dt/linus (0a1e19c8a639 dt-bindings: net: Fix unevaluatedProperties warnings in examples)
$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
Merge made by the 'ort' strategy.
.../devicetree/bindings/net/cdns,macb.yaml | 1 -
.../devicetree/bindings/net/mediatek,net.yaml | 3 +++
.../devicetree/bindings/net/mediatek-dwmac.yaml | 3 +++
.../bindings/net/wireless/mediatek,mt76.yaml | 2 +-
.../bindings/pci/socionext,uniphier-pcie.yaml | 23 +++++++++++++++++++++-
.../soc/imx/fsl,imx8mp-media-blk-ctrl.yaml | 2 +-
.../devicetree/bindings/soc/qcom/qcom,smd.yaml | 4 +---
.../devicetree/bindings/usb/snps,dwc3.yaml | 2 ++
8 files changed, 33 insertions(+), 7 deletions(-)
Merging scsi-fixes/fixes (d5d92b644084 scsi: ufs: core: Fix referencing invalid rsp field)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
Already up to date.
Merging drm-fixes/drm-fixes (4b0986a3613c Linux 5.18)
$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes
Already up to date.
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 (4b0986a3613c Linux 5.18)
$ 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 (479260419fa4 dt-bindings: mmc: Fix unevaluatedProperties warnings in examples)
$ 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.
Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml | 2 --
Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 3 +++
drivers/mmc/core/block.c | 3 +--
drivers/mmc/host/sdhci-pci-gli.c | 3 +++
4 files changed, 7 insertions(+), 4 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 (312310928417 Linux 5.18-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 (4b0986a3613c Linux 5.18)
$ 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 (c932edeaf6d6 riscv: dts: microchip: fix gpio1 reg property typo)
$ 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 (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes
Already up to date.
Merging spdx/spdx-linus (53c83d6d8e39 siphash: add SPDX tags as sole licensing authority)
$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus
Auto-merging fs/freevxfs/vxfs_immed.c
Auto-merging fs/freevxfs/vxfs_subr.c
Auto-merging include/linux/siphash.h
Auto-merging lib/siphash.c
Merge made by the 'ort' strategy.
fs/freevxfs/vxfs.h | 27 +------
fs/freevxfs/vxfs_bmap.c | 26 +------
fs/freevxfs/vxfs_dir.h | 27 +------
fs/freevxfs/vxfs_extern.h | 27 +------
fs/freevxfs/vxfs_fshead.c | 26 +------
fs/freevxfs/vxfs_fshead.h | 27 +------
fs/freevxfs/vxfs_immed.c | 26 +------
fs/freevxfs/vxfs_inode.c | 26 +------
fs/freevxfs/vxfs_inode.h | 27 +------
fs/freevxfs/vxfs_lookup.c | 26 +------
fs/freevxfs/vxfs_olt.c | 26 +------
fs/freevxfs/vxfs_olt.h | 27 +------
fs/freevxfs/vxfs_subr.c | 26 +------
fs/freevxfs/vxfs_super.c | 26 +------
include/linux/siphash.h | 5 +-
lib/siphash.c | 5 +-
lib/test_siphash.c | 7 +-
scripts/spdxcheck.py | 175 ++++++++++++++++++++++++++++++++++++++++++----
scripts/spdxexclude | 18 +++++
19 files changed, 202 insertions(+), 378 deletions(-)
create mode 100644 scripts/spdxexclude
Merging gpio-brgl-fixes/gpio/for-current (43624eda86c9 gpio: pca953x: use the correct register address to do regcache sync)
$ 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
Auto-merging MAINTAINERS
Auto-merging drivers/gpio/gpio-pca953x.c
Merge made by the 'ort' strategy.
MAINTAINERS | 6 +++---
drivers/gpio/gpio-pca953x.c | 19 +++++++++++--------
2 files changed, 14 insertions(+), 11 deletions(-)
Merging gpio-intel-fixes/fixes (0c2cae09a765 gpiolib: acpi: Convert type for pin to be unsigned)
$ 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 (7b923e67a4a7 pinctrl: intel: Fix kernel doc format, i.e. add return sections)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
Already up to date.
Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors)
$ 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
Already up to date.
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 (9ff9f77f34e4 MAINTAINERS: reciprocal co-maintainership for file locking and nfsd)
$ 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 MAINTAINERS
Merge made by the 'ort' strategy.
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
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
Already up to date.
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 (eaea45fc0e7b Merge tag 'perf-tools-fixes-for-v5.18-2022-05-21' 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 (6e516faf0431 drm/panfrost: Job should reference MMU not file_priv)
$ 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/bridge/ti-sn65dsi83.c
Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c
Auto-merging drivers/gpu/drm/panfrost/panfrost_job.c
Merge made by the 'ort' strategy.
drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +-
drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +++--
drivers/gpu/drm/panfrost/panfrost_job.c | 6 +++---
drivers/gpu/drm/panfrost/panfrost_job.h | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
Merging kbuild/for-next (bcc450ecc136 scripts: kconfig: nconf: make nconfig accept jk keybindings)
$ 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.
Makefile | 4 +-
arch/parisc/Makefile | 1 -
arch/parisc/nm | 6 --
scripts/Kbuild.include | 10 ++-
scripts/Makefile.build | 110 +++++++++++-------------------
scripts/Makefile.lib | 31 +++++++--
scripts/Makefile.modfinal | 5 +-
scripts/Makefile.modpost | 12 +---
scripts/Makefile.vmlinux_o | 87 ++++++++++++++++++++++++
scripts/check-local-export | 65 ++++++++++++++++++
scripts/kallsyms.c | 2 +-
scripts/kconfig/nconf.c | 8 ++-
scripts/link-vmlinux.sh | 126 +++--------------------------------
scripts/mod/file2alias.c | 2 -
scripts/mod/modpost.c | 163 +++++++++++----------------------------------
scripts/mod/modpost.h | 3 +
scripts/objdiff | 2 +-
17 files changed, 288 insertions(+), 349 deletions(-)
delete mode 100644 arch/parisc/nm
create mode 100644 scripts/Makefile.vmlinux_o
create mode 100755 scripts/check-local-export
Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format
Already up to date.
Merging perf/perf/core (9dde6cadb92b tools arch x86: Sync the msr-index.h copy with the kernel sources)
$ 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 (4a37f3dd9a83 dma-direct: don't over-decrypt memory)
$ 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 (b2441b3bdce6 h8300: remove stale bindings and symlink)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
Already up to date.
Merging arc/for-next (6aa98f621786 ARC: bpf: define uapi for BPF_PROG_TYPE_PERF_EVENT program type)
$ 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 (d2ca1fd2bc70 ARM: 9207/1: amba: fix refcount underflow if amba_device_add() fails)
$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next
Auto-merging drivers/amba/bus.c
Merge made by the 'ort' strategy.
drivers/amba/bus.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
Merging arm64/for-next/core (ff979b2a9d97 ftrace/fgraph: fix increased missing-prototypes warnings)
$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
Auto-merging kernel/trace/fgraph.c
Merge made by the 'ort' strategy.
kernel/trace/fgraph.c | 2 ++
1 file changed, 2 insertions(+)
Merging arm-perf/for-next/perf (c5781212985a perf/arm-cmn: Decode CAL devices properly in debugfs)
$ 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 (cd4a1a61fd72 soc: document merges)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
Auto-merging MAINTAINERS
Auto-merging arch/arm/Makefile
Auto-merging drivers/watchdog/Kconfig
Auto-merging drivers/watchdog/Makefile
Merge made by the 'ort' strategy.
Documentation/arm/marvell.rst | 7 -
Documentation/devicetree/bindings/arm/hpe,gxp.yaml | 27 +
.../devicetree/bindings/arm/intel,socfpga.yaml | 1 +
.../devicetree/bindings/gpio/gpio-altera.txt | 5 +-
.../bindings/soc/intel/intel,hps-copy-engine.yaml | 51 ++
.../devicetree/bindings/timer/hpe,gxp-timer.yaml | 47 ++
MAINTAINERS | 12 +
arch/arm/Kconfig | 38 +-
arch/arm/Makefile | 2 +-
arch/arm/arm-soc-for-next-contents.txt | 47 ++
arch/arm/boot/dts/Makefile | 3 +
arch/arm/boot/dts/aspeed-ast2600-evb.dts | 39 +-
.../arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 182 ++++--
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 2 +-
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +-
arch/arm/boot/dts/aspeed-bmc-nuvia-dc-scm.dts | 190 ++++++
arch/arm/boot/dts/aspeed-g4.dtsi | 16 +-
arch/arm/boot/dts/aspeed-g5.dtsi | 16 +-
arch/arm/boot/dts/aspeed-g6.dtsi | 38 +-
arch/arm/boot/dts/at91-sama7g5ek.dts | 21 +-
arch/arm/boot/dts/at91sam9261ek.dts | 4 +
arch/arm/boot/dts/at91sam9263ek.dts | 4 +
arch/arm/boot/dts/at91sam9rlek.dts | 4 +
arch/arm/boot/dts/da850.dtsi | 2 +
arch/arm/boot/dts/hpe-bmc-dl360gen10.dts | 26 +
arch/arm/boot/dts/hpe-gxp.dtsi | 127 ++++
arch/arm/boot/dts/mmp2.dtsi | 2 +
arch/arm/boot/dts/pxa25x.dtsi | 5 +-
arch/arm/boot/dts/pxa27x.dtsi | 5 +-
arch/arm/boot/dts/pxa3xx.dtsi | 5 +-
arch/arm/boot/dts/rk3036.dtsi | 2 +
arch/arm/boot/dts/rk3066a.dtsi | 3 +-
arch/arm/boot/dts/rk3188.dtsi | 3 +-
arch/arm/boot/dts/rk322x.dtsi | 2 +
arch/arm/boot/dts/rk3288.dtsi | 2 +
arch/arm/boot/dts/rv1108.dtsi | 31 +-
arch/arm/boot/dts/sam9x60.dtsi | 2 +-
arch/arm/boot/dts/sama7g5.dtsi | 26 +-
arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_sodia.dts | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 4 +-
arch/arm/common/locomo.c | 1 -
arch/arm/common/sa1111.c | 5 +-
arch/arm/configs/am200epdkit_defconfig | 1 +
arch/arm/configs/cm_x300_defconfig | 1 +
arch/arm/configs/colibri_pxa270_defconfig | 1 +
arch/arm/configs/colibri_pxa300_defconfig | 1 +
arch/arm/configs/corgi_defconfig | 1 +
arch/arm/configs/eseries_pxa_defconfig | 1 +
arch/arm/configs/ezx_defconfig | 1 +
arch/arm/configs/h5000_defconfig | 1 +
arch/arm/configs/lpd270_defconfig | 1 +
arch/arm/configs/lubbock_defconfig | 1 +
arch/arm/configs/magician_defconfig | 1 +
arch/arm/configs/mainstone_defconfig | 1 +
arch/arm/configs/multi_v7_defconfig | 14 +
arch/arm/configs/omap1_defconfig | 3 +
arch/arm/configs/palmz72_defconfig | 1 +
arch/arm/configs/pcm027_defconfig | 1 +
arch/arm/configs/pxa255-idp_defconfig | 1 +
arch/arm/configs/pxa3xx_defconfig | 1 +
arch/arm/configs/pxa_defconfig | 1 +
arch/arm/configs/spitz_defconfig | 1 +
arch/arm/configs/trizeps4_defconfig | 1 +
arch/arm/configs/viper_defconfig | 1 +
arch/arm/configs/xcep_defconfig | 1 +
arch/arm/configs/zeus_defconfig | 1 +
arch/arm/include/asm/hardware/sa1111.h | 2 -
arch/arm/include/asm/io.h | 27 +-
arch/arm/mach-at91/Kconfig | 2 +-
arch/arm/mach-ep93xx/clock.c | 10 +-
arch/arm/mach-ep93xx/ts72xx.c | 2 +-
arch/arm/mach-hpe/Kconfig | 23 +
arch/arm/mach-hpe/Makefile | 1 +
arch/arm/mach-hpe/gxp.c | 16 +
arch/arm/mach-mmp/Kconfig | 10 +-
arch/arm/mach-mmp/Makefile | 3 -
arch/arm/mach-mmp/devices.c | 2 +-
arch/arm/mach-mmp/devices.h | 10 +-
arch/arm/mach-mmp/mfp.h | 2 +-
arch/arm/mach-mmp/mmp2.h | 48 +-
arch/arm/mach-mmp/pxa168.h | 60 +-
arch/arm/mach-mmp/pxa910.h | 38 +-
arch/arm/mach-mmp/tavorevb.c | 113 ----
arch/arm/mach-mmp/ttc_dkb.c | 6 +-
arch/arm/mach-omap1/Kconfig | 16 +
arch/arm/mach-omap1/clock.c | 693 +++++++++------------
arch/arm/mach-omap1/clock.h | 139 ++---
arch/arm/mach-omap1/clock_data.c | 483 +++++++-------
arch/arm/mach-omap1/hardware.h | 2 +-
arch/arm/mach-omap1/include/mach/uncompress.h | 117 ----
arch/arm/mach-omap1/io.c | 7 -
arch/arm/mach-omap1/serial.c | 3 +-
arch/arm/mach-omap1/{include/mach => }/serial.h | 0
arch/arm/mach-omap1/time.c | 5 +
arch/arm/mach-pxa/Kconfig | 15 +
arch/arm/mach-pxa/Makefile | 18 +-
arch/arm/mach-pxa/Makefile.boot | 3 -
arch/arm/mach-pxa/{include/mach => }/addr-map.h | 0
arch/arm/mach-pxa/am300epd.c | 2 +-
.../arm/mach-pxa/balloon3-pcmcia.c | 4 +-
arch/arm/mach-pxa/balloon3.c | 4 +-
arch/arm/mach-pxa/{include/mach => }/balloon3.h | 0
arch/arm/mach-pxa/cm-x300.c | 12 +-
arch/arm/mach-pxa/colibri-evalboard.c | 1 -
.../arm/mach-pxa/colibri-pcmcia.c | 2 +-
arch/arm/mach-pxa/colibri-pxa270-income.c | 1 -
arch/arm/mach-pxa/colibri-pxa270.c | 2 +-
arch/arm/mach-pxa/colibri-pxa300.c | 3 +-
arch/arm/mach-pxa/colibri-pxa320.c | 2 +-
arch/arm/mach-pxa/colibri-pxa3xx.c | 3 +-
arch/arm/mach-pxa/colibri.h | 2 +-
arch/arm/mach-pxa/corgi.c | 23 +-
arch/arm/mach-pxa/{include/mach => }/corgi.h | 0
arch/arm/mach-pxa/corgi_pm.c | 5 +-
arch/arm/mach-pxa/csb726.c | 5 +-
arch/arm/mach-pxa/csb726.h | 2 +-
arch/arm/mach-pxa/devices.c | 17 +-
.../arm/mach-pxa/e740-pcmcia.c | 4 +-
.../arm/mach-pxa/{include/mach => }/eseries-gpio.h | 0
arch/arm/mach-pxa/eseries.c | 38 +-
arch/arm/mach-pxa/ezx.c | 1 -
arch/arm/mach-pxa/generic.c | 62 +-
arch/arm/mach-pxa/generic.h | 9 -
arch/arm/mach-pxa/gumstix.c | 1 -
arch/arm/mach-pxa/gumstix.h | 2 +-
arch/arm/mach-pxa/h5000.c | 2 +-
.../arm/mach-pxa/hx4700-pcmcia.c | 4 +-
arch/arm/mach-pxa/hx4700.c | 18 +-
arch/arm/mach-pxa/{include/mach => }/hx4700.h | 0
arch/arm/mach-pxa/idp.c | 2 -
arch/arm/mach-pxa/idp.h | 2 +-
arch/arm/mach-pxa/include/mach/bitfield.h | 114 ----
arch/arm/mach-pxa/include/mach/dma.h | 17 -
arch/arm/mach-pxa/include/mach/generic.h | 1 -
arch/arm/mach-pxa/include/mach/mtd-xip.h | 36 --
arch/arm/mach-pxa/include/mach/uncompress.h | 70 ---
arch/arm/mach-pxa/irq.c | 5 +-
arch/arm/mach-pxa/{include/mach => }/irqs.h | 0
arch/arm/mach-pxa/littleton.c | 1 -
arch/arm/mach-pxa/lpd270.c | 6 +-
arch/arm/mach-pxa/lubbock.c | 17 +-
arch/arm/mach-pxa/{include/mach => }/lubbock.h | 4 +-
arch/arm/mach-pxa/magician.c | 56 +-
arch/arm/mach-pxa/{include/mach => }/magician.h | 2 +-
arch/arm/mach-pxa/mainstone.c | 17 +-
arch/arm/mach-pxa/{include/mach => }/mainstone.h | 4 +-
arch/arm/mach-pxa/mfp-pxa2xx.c | 3 +-
arch/arm/mach-pxa/mfp-pxa2xx.h | 2 +-
arch/arm/mach-pxa/mfp-pxa3xx.c | 3 +-
arch/arm/mach-pxa/mfp-pxa3xx.h | 2 +-
arch/arm/mach-pxa/{include/mach => }/mfp.h | 2 +-
arch/arm/mach-pxa/mioa701.c | 4 +-
arch/arm/mach-pxa/mxm8x10.c | 8 +-
arch/arm/mach-pxa/palm27x.c | 2 +-
.../arm/mach-pxa/palmld-pcmcia.c | 5 +-
arch/arm/mach-pxa/palmld.c | 23 +-
arch/arm/mach-pxa/{include/mach => }/palmld.h | 0
arch/arm/mach-pxa/palmt5.c | 11 +-
arch/arm/mach-pxa/palmt5.h | 2 +-
.../arm/mach-pxa/palmtc-pcmcia.c | 4 +-
arch/arm/mach-pxa/palmtc.c | 4 +-
arch/arm/mach-pxa/{include/mach => }/palmtc.h | 0
arch/arm/mach-pxa/palmte2.c | 2 +-
arch/arm/mach-pxa/palmtreo.c | 4 +-
.../arm/mach-pxa/palmtx-pcmcia.c | 4 +-
arch/arm/mach-pxa/palmtx.c | 13 +-
arch/arm/mach-pxa/{include/mach => }/palmtx.h | 0
arch/arm/mach-pxa/palmz72.c | 2 +-
arch/arm/mach-pxa/pcm027.h | 2 +-
arch/arm/mach-pxa/pcm990-baseboard.c | 2 +-
arch/arm/mach-pxa/pcm990_baseboard.h | 2 +-
arch/arm/mach-pxa/poodle.c | 31 +-
arch/arm/mach-pxa/{include/mach => }/poodle.h | 2 -
arch/arm/mach-pxa/pxa-dt.c | 2 +-
arch/arm/mach-pxa/pxa-regs.h | 52 ++
arch/arm/mach-pxa/pxa25x.c | 12 +-
arch/arm/mach-pxa/pxa25x.h | 6 +-
arch/arm/mach-pxa/pxa27x-udc.h | 2 +
arch/arm/mach-pxa/pxa27x.c | 12 +-
arch/arm/mach-pxa/pxa27x.h | 6 +-
arch/arm/mach-pxa/{include/mach => }/pxa2xx-regs.h | 47 +-
arch/arm/mach-pxa/pxa2xx.c | 32 +-
arch/arm/mach-pxa/pxa300.c | 1 +
arch/arm/mach-pxa/pxa320.c | 1 +
arch/arm/mach-pxa/{include/mach => }/pxa3xx-regs.h | 71 +--
arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 +-
arch/arm/mach-pxa/pxa3xx.c | 19 +-
arch/arm/mach-pxa/pxa3xx.h | 6 +-
arch/arm/mach-pxa/pxa930.c | 1 +
arch/arm/mach-pxa/{include/mach => }/regs-ost.h | 4 +-
arch/arm/mach-pxa/regs-rtc.h | 2 +-
arch/arm/mach-pxa/regs-u2d.h | 2 -
arch/arm/mach-pxa/{include/mach => }/regs-uart.h | 2 +
arch/arm/mach-pxa/reset.c | 9 +-
arch/arm/mach-pxa/{include/mach => }/reset.h | 2 +-
arch/arm/mach-pxa/sharpsl_pm.c | 2 +-
arch/arm/mach-pxa/sleep.S | 9 +-
arch/arm/mach-pxa/smemc.c | 13 +-
arch/arm/mach-pxa/{include/mach => }/smemc.h | 0
arch/arm/mach-pxa/spitz.c | 37 +-
arch/arm/mach-pxa/{include/mach => }/spitz.h | 0
arch/arm/mach-pxa/spitz_pm.c | 3 +-
arch/arm/mach-pxa/standby.S | 3 +-
arch/arm/mach-pxa/tosa.c | 80 +--
arch/arm/mach-pxa/{include/mach => }/tosa.h | 18 -
.../arm/mach-pxa/trizeps4-pcmcia.c | 6 +-
arch/arm/mach-pxa/trizeps4.c | 6 +-
arch/arm/mach-pxa/{include/mach => }/trizeps4.h | 1 +
.../arm/mach-pxa/viper-pcmcia.c | 6 +-
.../arm/mach-pxa/viper-pcmcia.h | 0
arch/arm/mach-pxa/viper.c | 20 +-
.../arm/mach-pxa/vpac270-pcmcia.c | 4 +-
arch/arm/mach-pxa/vpac270.c | 4 +-
arch/arm/mach-pxa/{include/mach => }/vpac270.h | 0
arch/arm/mach-pxa/xcep.c | 4 +-
arch/arm/mach-pxa/z2.c | 13 +-
arch/arm/mach-pxa/{include/mach => }/z2.h | 0
arch/arm/mach-pxa/zeus.c | 20 +-
arch/arm/mach-pxa/zylonite.c | 34 +-
arch/arm/mach-pxa/zylonite.h | 2 +
arch/arm/mach-pxa/zylonite_pxa300.c | 1 +
arch/arm/mach-pxa/zylonite_pxa320.c | 1 +
arch/arm/mach-sa1100/generic.c | 6 +-
arch/arm/mach-sa1100/include/mach/reset.h | 1 -
arch/arm/mm/copypage-xsc3.c | 2 +
arch/arm/mm/ioremap.c | 2 +-
arch/arm64/boot/dts/intel/Makefile | 3 +-
arch/arm64/boot/dts/intel/socfpga_agilex_n6000.dts | 66 ++
arch/arm64/boot/dts/rockchip/rk3308.dtsi | 5 +-
arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +
arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 4 +-
arch/arm64/boot/dts/rockchip/rk356x.dtsi | 2 +
arch/arm64/boot/dts/sprd/whale2.dtsi | 4 +
arch/mips/alchemy/devboards/db1300.c | 9 -
drivers/ata/pata_palmld.c | 3 +-
drivers/clk/pxa/clk-pxa.c | 8 +-
drivers/clk/pxa/clk-pxa.h | 9 +-
drivers/clk/pxa/clk-pxa25x.c | 46 +-
drivers/clk/pxa/clk-pxa27x.c | 68 +-
drivers/clk/pxa/clk-pxa2xx.h | 58 ++
drivers/clk/pxa/clk-pxa3xx.c | 139 ++++-
drivers/clocksource/Kconfig | 8 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/timer-gxp.c | 209 +++++++
drivers/cpufreq/pxa2xx-cpufreq.c | 6 +-
drivers/cpufreq/pxa3xx-cpufreq.c | 65 +-
drivers/input/mouse/pxa930_trkball.c | 1 -
drivers/input/touchscreen/Kconfig | 2 +
drivers/input/touchscreen/mainstone-wm97xx.c | 130 ++--
drivers/input/touchscreen/wm97xx-core.c | 42 +-
drivers/input/touchscreen/zylonite-wm97xx.c | 43 +-
drivers/leds/leds-locomo.c | 1 -
drivers/mfd/tc6393xb.c | 130 ++--
drivers/mmc/host/pxamci.c | 2 +-
drivers/mtd/maps/pxa2xx-flash.c | 2 -
drivers/pcmcia/Makefile | 13 -
drivers/pcmcia/pxa2xx_base.c | 48 +-
drivers/pcmcia/pxa2xx_sharpsl.c | 3 +-
drivers/pcmcia/sa1111_generic.c | 1 -
drivers/pcmcia/sa1111_lubbock.c | 1 -
drivers/pcmcia/soc_common.c | 19 +-
drivers/pcmcia/soc_common.h | 120 +---
drivers/power/supply/tosa_battery.c | 172 +++--
drivers/rtc/rtc-pxa.c | 2 -
drivers/soc/Kconfig | 1 +
drivers/soc/Makefile | 1 +
drivers/soc/ixp4xx/ixp4xx-qmgr.c | 2 +-
{arch/arm/plat-pxa => drivers/soc/pxa}/Kconfig | 5 +-
{arch/arm/plat-pxa => drivers/soc/pxa}/Makefile | 4 -
{arch/arm/plat-pxa => drivers/soc/pxa}/mfp.c | 2 +-
{arch/arm/plat-pxa => drivers/soc/pxa}/ssp.c | 0
drivers/soc/rockchip/grf.c | 2 +
drivers/usb/gadget/udc/omap_udc.c | 14 +-
drivers/usb/gadget/udc/pxa25x_udc.c | 37 +-
drivers/usb/gadget/udc/pxa25x_udc.h | 7 +-
drivers/usb/host/ohci-omap.c | 18 +-
drivers/usb/host/ohci-pxa27x.c | 3 +-
.../video/fbdev/pxa3xx-regs.h | 24 +-
drivers/video/fbdev/pxafb.c | 4 +-
drivers/watchdog/Kconfig | 11 +
drivers/watchdog/Makefile | 1 +
drivers/watchdog/gxp-wdt.c | 174 ++++++
drivers/watchdog/sa1100_wdt.c | 88 ++-
include/linux/clk/pxa.h | 16 +
include/linux/gpio/machine.h | 12 +
include/linux/mfd/tc6393xb.h | 3 -
include/linux/platform_data/asoc-poodle.h | 16 +
.../linux/platform_data/asoc-pxa.h | 4 +-
include/linux/platform_data/video-pxafb.h | 22 +-
.../mach/hardware.h => include/linux/soc/pxa/cpu.h | 61 +-
.../include/plat => include/linux/soc/pxa}/mfp.h | 6 +-
include/linux/soc/pxa/smemc.h | 13 +
include/linux/wm97xx.h | 4 -
include/pcmcia/soc_common.h | 125 ++++
include/sound/pxa2xx-lib.h | 4 +
sound/arm/pxa2xx-ac97-lib.c | 145 +++--
.../regs-ac97.h => sound/arm/pxa2xx-ac97-regs.h | 42 +-
sound/arm/pxa2xx-ac97.c | 3 +-
sound/soc/pxa/corgi.c | 43 +-
sound/soc/pxa/e740_wm9705.c | 37 +-
sound/soc/pxa/e750_wm9705.c | 33 +-
sound/soc/pxa/e800_wm9712.c | 33 +-
sound/soc/pxa/em-x270.c | 2 +-
sound/soc/pxa/hx4700.c | 37 +-
sound/soc/pxa/magician.c | 141 ++---
sound/soc/pxa/mioa701_wm9713.c | 2 +-
sound/soc/pxa/palm27x.c | 2 +-
sound/soc/pxa/poodle.c | 51 +-
sound/soc/pxa/pxa2xx-ac97.c | 24 +-
sound/soc/pxa/pxa2xx-i2s.c | 112 ++--
sound/soc/pxa/spitz.c | 58 +-
sound/soc/pxa/tosa.c | 25 +-
sound/soc/pxa/z2.c | 8 +-
315 files changed, 4096 insertions(+), 3080 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/hpe,gxp.yaml
create mode 100644 Documentation/devicetree/bindings/soc/intel/intel,hps-copy-engine.yaml
create mode 100644 Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
create mode 100644 arch/arm/boot/dts/aspeed-bmc-nuvia-dc-scm.dts
create mode 100644 arch/arm/boot/dts/hpe-bmc-dl360gen10.dts
create mode 100644 arch/arm/boot/dts/hpe-gxp.dtsi
create mode 100644 arch/arm/mach-hpe/Kconfig
create mode 100644 arch/arm/mach-hpe/Makefile
create mode 100644 arch/arm/mach-hpe/gxp.c
delete mode 100644 arch/arm/mach-mmp/tavorevb.c
delete mode 100644 arch/arm/mach-omap1/include/mach/uncompress.h
rename arch/arm/mach-omap1/{include/mach => }/serial.h (100%)
delete mode 100644 arch/arm/mach-pxa/Makefile.boot
rename arch/arm/mach-pxa/{include/mach => }/addr-map.h (100%)
rename drivers/pcmcia/pxa2xx_balloon3.c => arch/arm/mach-pxa/balloon3-pcmcia.c (98%)
rename arch/arm/mach-pxa/{include/mach => }/balloon3.h (100%)
rename drivers/pcmcia/pxa2xx_colibri.c => arch/arm/mach-pxa/colibri-pcmcia.c (99%)
rename arch/arm/mach-pxa/{include/mach => }/corgi.h (100%)
rename drivers/pcmcia/pxa2xx_e740.c => arch/arm/mach-pxa/e740-pcmcia.c (98%)
rename arch/arm/mach-pxa/{include/mach => }/eseries-gpio.h (100%)
rename drivers/pcmcia/pxa2xx_hx4700.c => arch/arm/mach-pxa/hx4700-pcmcia.c (98%)
rename arch/arm/mach-pxa/{include/mach => }/hx4700.h (100%)
delete mode 100644 arch/arm/mach-pxa/include/mach/bitfield.h
delete mode 100644 arch/arm/mach-pxa/include/mach/dma.h
delete mode 100644 arch/arm/mach-pxa/include/mach/generic.h
delete mode 100644 arch/arm/mach-pxa/include/mach/mtd-xip.h
delete mode 100644 arch/arm/mach-pxa/include/mach/uncompress.h
rename arch/arm/mach-pxa/{include/mach => }/irqs.h (100%)
rename arch/arm/mach-pxa/{include/mach => }/lubbock.h (95%)
rename arch/arm/mach-pxa/{include/mach => }/magician.h (99%)
rename arch/arm/mach-pxa/{include/mach => }/mainstone.h (98%)
rename arch/arm/mach-pxa/{include/mach => }/mfp.h (91%)
rename drivers/pcmcia/pxa2xx_palmld.c => arch/arm/mach-pxa/palmld-pcmcia.c (98%)
rename arch/arm/mach-pxa/{include/mach => }/palmld.h (100%)
rename drivers/pcmcia/pxa2xx_palmtc.c => arch/arm/mach-pxa/palmtc-pcmcia.c (98%)
rename arch/arm/mach-pxa/{include/mach => }/palmtc.h (100%)
rename drivers/pcmcia/pxa2xx_palmtx.c => arch/arm/mach-pxa/palmtx-pcmcia.c (98%)
rename arch/arm/mach-pxa/{include/mach => }/palmtx.h (100%)
rename arch/arm/mach-pxa/{include/mach => }/poodle.h (98%)
create mode 100644 arch/arm/mach-pxa/pxa-regs.h
rename arch/arm/mach-pxa/{include/mach => }/pxa2xx-regs.h (76%)
rename arch/arm/mach-pxa/{include/mach => }/pxa3xx-regs.h (61%)
rename arch/arm/mach-pxa/{include/mach => }/regs-ost.h (94%)
rename arch/arm/mach-pxa/{include/mach => }/regs-uart.h (99%)
rename arch/arm/mach-pxa/{include/mach => }/reset.h (92%)
rename arch/arm/mach-pxa/{include/mach => }/smemc.h (100%)
rename arch/arm/mach-pxa/{include/mach => }/spitz.h (100%)
rename arch/arm/mach-pxa/{include/mach => }/tosa.h (88%)
rename drivers/pcmcia/pxa2xx_trizeps4.c => arch/arm/mach-pxa/trizeps4-pcmcia.c (98%)
rename arch/arm/mach-pxa/{include/mach => }/trizeps4.h (99%)
rename drivers/pcmcia/pxa2xx_viper.c => arch/arm/mach-pxa/viper-pcmcia.c (97%)
rename include/linux/platform_data/pcmcia-pxa2xx_viper.h => arch/arm/mach-pxa/viper-pcmcia.h (100%)
rename drivers/pcmcia/pxa2xx_vpac270.c => arch/arm/mach-pxa/vpac270-pcmcia.c (98%)
rename arch/arm/mach-pxa/{include/mach => }/vpac270.h (100%)
rename arch/arm/mach-pxa/{include/mach => }/z2.h (100%)
create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex_n6000.dts
create mode 100644 drivers/clk/pxa/clk-pxa2xx.h
create mode 100644 drivers/clocksource/timer-gxp.c
rename {arch/arm/plat-pxa => drivers/soc/pxa}/Kconfig (83%)
rename {arch/arm/plat-pxa => drivers/soc/pxa}/Makefile (51%)
rename {arch/arm/plat-pxa => drivers/soc/pxa}/mfp.c (99%)
rename {arch/arm/plat-pxa => drivers/soc/pxa}/ssp.c (100%)
rename arch/arm/mach-pxa/include/mach/regs-lcd.h => drivers/video/fbdev/pxa3xx-regs.h (90%)
create mode 100644 drivers/watchdog/gxp-wdt.c
create mode 100644 include/linux/clk/pxa.h
create mode 100644 include/linux/platform_data/asoc-poodle.h
rename arch/arm/mach-pxa/include/mach/audio.h => include/linux/platform_data/asoc-pxa.h (93%)
rename arch/arm/mach-pxa/include/mach/hardware.h => include/linux/soc/pxa/cpu.h (75%)
rename {arch/arm/plat-pxa/include/plat => include/linux/soc/pxa}/mfp.h (98%)
create mode 100644 include/linux/soc/pxa/smemc.h
create mode 100644 include/pcmcia/soc_common.h
rename arch/arm/mach-pxa/include/mach/regs-ac97.h => sound/arm/pxa2xx-ac97-regs.h (71%)
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 (1dac6e1d8385 Merge branch 'v5.20/drivers' 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.
drivers/soc/amlogic/meson-mx-socinfo.c | 1 +
1 file changed, 1 insertion(+)
Merging aspeed/for-next (bfcbea2c93e5 ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom)
$ 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/Makefile
Merge made by the 'ort' strategy.
arch/arm/boot/dts/Makefile | 2 +-
.../{aspeed-bmc-nuvia-dc-scm.dts => aspeed-bmc-qcom-dc-scm-v1.dts} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
rename arch/arm/boot/dts/{aspeed-bmc-nuvia-dc-scm.dts => aspeed-bmc-qcom-dc-scm-v1.dts} (97%)
Merging at91/at91-next (3519476d99a4 Merge branch 'at91-dt' 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
Merge made by the 'ort' strategy.
Merging drivers-memory/for-next (1e2b798e9664 Merge branch 'for-v5.19/tegra-mc' 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
Auto-merging drivers/memory/renesas-rpc-if.c
Auto-merging drivers/memory/tegra/mc.c
Merge made by the 'ort' strategy.
Merging imx-mxs/for-next (6ed2affe8f7f Merge branch 'imx/defconfig' 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/imx6qdl-aristainetos2.dtsi
Auto-merging arch/arm/boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi
Auto-merging arch/arm/boot/dts/imx6ull-colibri.dtsi
Auto-merging arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
Auto-merging arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi
Auto-merging arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi
Auto-merging arch/arm64/boot/dts/freescale/imx8mn.dtsi
Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c
Merge made by the 'ort' strategy.
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 (8434c5a06e3c Merge branch 'v5.18-next/soc' 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
Merge made by the 'ort' strategy.
Merging mvebu/for-next (58ec0844bd13 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
Merge made by the 'ort' strategy.
Merging omap/for-next (b5418fc0478c Merge branch 'omap-for-v5.19/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 MAINTAINERS
Auto-merging arch/arm/boot/dts/logicpd-som-lv.dtsi
Auto-merging drivers/bus/ti-sysc.c
Merge made by the 'ort' strategy.
Merging qcom/for-next (5faa5cd718a4 Merge branches 'arm64-for-5.19', 'arm64-defconfig-for-5.19', 'clk-for-5.19', 'defconfig-for-5.19', 'drivers-for-5.19', 'dts-for-5.19' and 'arm64-fixes-for-5.18' 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/soc/qcom/qcom,smd-rpm.yaml
Auto-merging arch/arm64/boot/dts/qcom/sm8250.dtsi
Merge made by the 'ort' strategy.
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 (7ae962c56cea Merge branch 'renesas-arm-dt-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
Merge made by the 'ort' strategy.
Merging reset/reset/next (2ca065dc9468 dt-bindings: reset: st,sti-powerdown: Convert to yaml)
$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next
Already up to date.
Merging rockchip/for-next (09711f1d1f03 Merge branch 'v5.19-clk/next' 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.
Merging samsung-krzk/for-next (88fb0c4d0aff Merge branch 'next/dt64' 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
Auto-merging Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml
Auto-merging arch/arm/mach-s3c/s3c24xx.c
Merge made by the 'ort' strategy.
Merging scmi/for-linux-next (4b0986a3613c Linux 5.18)
$ 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
Already up to date.
Merging stm32/stm32-next (747a29b9a5a5 dt-bindings: clock: stm32mp1: adapt example for "st,stm32mp1-rcc-secure")
$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
Auto-merging Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.yaml
Merge made by the 'ort' strategy.
Merging sunxi/sunxi/for-next (073220ee354d 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.
Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next)
$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
Auto-merging drivers/tee/tee_shm.c
Merge made by the 'ort' strategy.
Merging tegra/for-next (864067632632 Merge branch for-5.19/arm64/defconfig 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
Auto-merging drivers/memory/tegra/mc.c
Merge made by the 'ort' strategy.
Merging ti/ti-next (4cc89036bc4f Merge branch 'ti-k3-dts-next' into ti-next)
$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
Merge made by the 'ort' strategy.
Merging xilinx/for-next (63623390c0d6 arm64: dts: zynqmp: add AMS driver to device tree)
$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
Merge made by the 'ort' strategy.
.../devicetree/bindings/gpio/gpio-zynq.yaml | 59 +++++++++++++++++++++-
arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ++
arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 2 +-
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 26 ++++++++++
4 files changed, 89 insertions(+), 2 deletions(-)
Merging clk/clk-next (71cc785d2955 Merge branch 'clk-qcom' into clk-next)
$ 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 (cf7f3f4fa9e5 clk: imx8mp: fix usb_root_clk parent)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
Already up to date.
Merging clk-renesas/renesas-clk (23426d1be3c2 clk: renesas: r9a09g011: Add eth clock and reset entries)
$ 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
Already up to date.
Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
$ 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 (64d83f067746 csky: Move $(core-y) into arch/csky/Kbuild)
$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
Already up to date.
Merging loongarch/loongarch-next (6e86125eef7e MAINTAINERS: Add maintainer information for LoongArch)
$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
Documentation/arch.rst | 1 +
Documentation/loongarch/features.rst | 3 +
Documentation/loongarch/index.rst | 21 +
Documentation/loongarch/introduction.rst | 387 +++++
Documentation/loongarch/irq-chip-model.rst | 168 +++
Documentation/translations/zh_CN/index.rst | 1 +
.../translations/zh_CN/loongarch/features.rst | 8 +
.../translations/zh_CN/loongarch/index.rst | 26 +
.../translations/zh_CN/loongarch/introduction.rst | 351 +++++
.../zh_CN/loongarch/irq-chip-model.rst | 167 +++
MAINTAINERS | 10 +
arch/loongarch/Kbuild | 6 +
arch/loongarch/Kconfig | 447 ++++++
arch/loongarch/Kconfig.debug | 0
arch/loongarch/Makefile | 105 ++
arch/loongarch/boot/.gitignore | 2 +
arch/loongarch/boot/Makefile | 20 +
arch/loongarch/boot/dts/Makefile | 4 +
arch/loongarch/configs/loongson3_defconfig | 771 ++++++++++
arch/loongarch/include/asm/Kbuild | 30 +
arch/loongarch/include/asm/acenv.h | 18 +
arch/loongarch/include/asm/acpi.h | 38 +
arch/loongarch/include/asm/addrspace.h | 112 ++
arch/loongarch/include/asm/asm-offsets.h | 5 +
arch/loongarch/include/asm/asm-prototypes.h | 7 +
arch/loongarch/include/asm/asm.h | 191 +++
arch/loongarch/include/asm/asmmacro.h | 289 ++++
arch/loongarch/include/asm/atomic.h | 362 +++++
arch/loongarch/include/asm/barrier.h | 159 ++
arch/loongarch/include/asm/bitops.h | 33 +
arch/loongarch/include/asm/bitrev.h | 34 +
arch/loongarch/include/asm/bootinfo.h | 43 +
arch/loongarch/include/asm/branch.h | 21 +
arch/loongarch/include/asm/bug.h | 23 +
arch/loongarch/include/asm/cache.h | 13 +
arch/loongarch/include/asm/cacheflush.h | 80 ++
arch/loongarch/include/asm/cacheops.h | 37 +
arch/loongarch/include/asm/clocksource.h | 12 +
arch/loongarch/include/asm/cmpxchg.h | 123 ++
arch/loongarch/include/asm/compiler.h | 15 +
arch/loongarch/include/asm/cpu-features.h | 73 +
arch/loongarch/include/asm/cpu-info.h | 116 ++
arch/loongarch/include/asm/cpu.h | 127 ++
arch/loongarch/include/asm/cpufeature.h | 24 +
arch/loongarch/include/asm/delay.h | 26 +
arch/loongarch/include/asm/dma-direct.h | 11 +
arch/loongarch/include/asm/dmi.h | 24 +
arch/loongarch/include/asm/efi.h | 41 +
arch/loongarch/include/asm/elf.h | 301 ++++
arch/loongarch/include/asm/entry-common.h | 13 +
arch/loongarch/include/asm/exec.h | 10 +
arch/loongarch/include/asm/fb.h | 23 +
arch/loongarch/include/asm/fixmap.h | 13 +
arch/loongarch/include/asm/fpregdef.h | 53 +
arch/loongarch/include/asm/fpu.h | 129 ++
arch/loongarch/include/asm/futex.h | 108 ++
arch/loongarch/include/asm/hardirq.h | 26 +
arch/loongarch/include/asm/hugetlb.h | 83 ++
arch/loongarch/include/asm/hw_irq.h | 17 +
arch/loongarch/include/asm/idle.h | 9 +
arch/loongarch/include/asm/inst.h | 117 ++
arch/loongarch/include/asm/io.h | 129 ++
arch/loongarch/include/asm/irq.h | 132 ++
arch/loongarch/include/asm/irq_regs.h | 27 +
arch/loongarch/include/asm/irqflags.h | 78 +
arch/loongarch/include/asm/kdebug.h | 23 +
arch/loongarch/include/asm/linkage.h | 36 +
arch/loongarch/include/asm/local.h | 138 ++
arch/loongarch/include/asm/loongarch.h | 1516 ++++++++++++++++++++
arch/loongarch/include/asm/loongson.h | 153 ++
arch/loongarch/include/asm/mmu.h | 16 +
arch/loongarch/include/asm/mmu_context.h | 152 ++
arch/loongarch/include/asm/mmzone.h | 18 +
arch/loongarch/include/asm/module.h | 80 ++
arch/loongarch/include/asm/module.lds.h | 7 +
arch/loongarch/include/asm/numa.h | 67 +
arch/loongarch/include/asm/page.h | 115 ++
arch/loongarch/include/asm/percpu.h | 214 +++
arch/loongarch/include/asm/perf_event.h | 10 +
arch/loongarch/include/asm/pgalloc.h | 103 ++
arch/loongarch/include/asm/pgtable-bits.h | 131 ++
arch/loongarch/include/asm/pgtable.h | 565 ++++++++
arch/loongarch/include/asm/prefetch.h | 29 +
arch/loongarch/include/asm/processor.h | 209 +++
arch/loongarch/include/asm/ptrace.h | 152 ++
arch/loongarch/include/asm/reboot.h | 10 +
arch/loongarch/include/asm/regdef.h | 41 +
arch/loongarch/include/asm/seccomp.h | 20 +
arch/loongarch/include/asm/serial.h | 11 +
arch/loongarch/include/asm/setup.h | 21 +
arch/loongarch/include/asm/shmparam.h | 12 +
arch/loongarch/include/asm/smp.h | 124 ++
arch/loongarch/include/asm/sparsemem.h | 23 +
arch/loongarch/include/asm/stackframe.h | 219 +++
arch/loongarch/include/asm/stacktrace.h | 74 +
arch/loongarch/include/asm/string.h | 12 +
arch/loongarch/include/asm/switch_to.h | 37 +
arch/loongarch/include/asm/syscall.h | 74 +
arch/loongarch/include/asm/thread_info.h | 106 ++
arch/loongarch/include/asm/time.h | 50 +
arch/loongarch/include/asm/timex.h | 33 +
arch/loongarch/include/asm/tlb.h | 180 +++
arch/loongarch/include/asm/tlbflush.h | 48 +
arch/loongarch/include/asm/topology.h | 41 +
arch/loongarch/include/asm/types.h | 19 +
arch/loongarch/include/asm/uaccess.h | 269 ++++
arch/loongarch/include/asm/unistd.h | 11 +
arch/loongarch/include/asm/vdso.h | 38 +
arch/loongarch/include/asm/vdso/clocksource.h | 8 +
arch/loongarch/include/asm/vdso/gettimeofday.h | 99 ++
arch/loongarch/include/asm/vdso/processor.h | 14 +
arch/loongarch/include/asm/vdso/vdso.h | 30 +
arch/loongarch/include/asm/vdso/vsyscall.h | 27 +
arch/loongarch/include/asm/vermagic.h | 19 +
arch/loongarch/include/asm/vmalloc.h | 4 +
arch/loongarch/include/uapi/asm/Kbuild | 2 +
arch/loongarch/include/uapi/asm/auxvec.h | 17 +
arch/loongarch/include/uapi/asm/bitsperlong.h | 9 +
arch/loongarch/include/uapi/asm/break.h | 23 +
arch/loongarch/include/uapi/asm/byteorder.h | 13 +
arch/loongarch/include/uapi/asm/hwcap.h | 20 +
arch/loongarch/include/uapi/asm/ptrace.h | 52 +
arch/loongarch/include/uapi/asm/reg.h | 59 +
arch/loongarch/include/uapi/asm/sigcontext.h | 44 +
arch/loongarch/include/uapi/asm/signal.h | 13 +
arch/loongarch/include/uapi/asm/ucontext.h | 35 +
arch/loongarch/include/uapi/asm/unistd.h | 5 +
arch/loongarch/kernel/.gitignore | 2 +
arch/loongarch/kernel/Makefile | 25 +
arch/loongarch/kernel/access-helper.h | 13 +
arch/loongarch/kernel/acpi.c | 333 +++++
arch/loongarch/kernel/asm-offsets.c | 264 ++++
arch/loongarch/kernel/cacheinfo.c | 122 ++
arch/loongarch/kernel/cpu-probe.c | 292 ++++
arch/loongarch/kernel/dma.c | 40 +
arch/loongarch/kernel/efi-header.S | 104 ++
arch/loongarch/kernel/efi.c | 226 +++
arch/loongarch/kernel/elf.c | 30 +
arch/loongarch/kernel/entry.S | 89 ++
arch/loongarch/kernel/env.c | 70 +
arch/loongarch/kernel/fpu.S | 261 ++++
arch/loongarch/kernel/genex.S | 95 ++
arch/loongarch/kernel/head.S | 129 ++
arch/loongarch/kernel/idle.c | 16 +
arch/loongarch/kernel/image-vars.h | 29 +
arch/loongarch/kernel/inst.c | 40 +
arch/loongarch/kernel/io.c | 94 ++
arch/loongarch/kernel/irq.c | 88 ++
arch/loongarch/kernel/mem.c | 64 +
arch/loongarch/kernel/module-sections.c | 121 ++
arch/loongarch/kernel/module.c | 375 +++++
arch/loongarch/kernel/numa.c | 466 ++++++
arch/loongarch/kernel/proc.c | 127 ++
arch/loongarch/kernel/process.c | 267 ++++
arch/loongarch/kernel/ptrace.c | 431 ++++++
arch/loongarch/kernel/reset.c | 102 ++
arch/loongarch/kernel/setup.c | 374 +++++
arch/loongarch/kernel/signal.c | 566 ++++++++
arch/loongarch/kernel/smp.c | 751 ++++++++++
arch/loongarch/kernel/switch.S | 35 +
arch/loongarch/kernel/syscall.c | 63 +
arch/loongarch/kernel/time.c | 214 +++
arch/loongarch/kernel/topology.c | 52 +
arch/loongarch/kernel/traps.c | 725 ++++++++++
arch/loongarch/kernel/vdso.c | 138 ++
arch/loongarch/kernel/vmlinux.lds.S | 121 ++
arch/loongarch/lib/Makefile | 6 +
arch/loongarch/lib/clear_user.S | 43 +
arch/loongarch/lib/copy_user.S | 47 +
arch/loongarch/lib/delay.c | 43 +
arch/loongarch/lib/dump_tlb.c | 111 ++
arch/loongarch/mm/Makefile | 9 +
arch/loongarch/mm/cache.c | 141 ++
arch/loongarch/mm/extable.c | 22 +
arch/loongarch/mm/fault.c | 261 ++++
arch/loongarch/mm/hugetlbpage.c | 87 ++
arch/loongarch/mm/init.c | 178 +++
arch/loongarch/mm/ioremap.c | 27 +
arch/loongarch/mm/maccess.c | 10 +
arch/loongarch/mm/mmap.c | 125 ++
arch/loongarch/mm/page.S | 84 ++
arch/loongarch/mm/pgtable.c | 130 ++
arch/loongarch/mm/tlb.c | 305 ++++
arch/loongarch/mm/tlbex.S | 546 +++++++
arch/loongarch/pci/Makefile | 7 +
arch/loongarch/vdso/.gitignore | 2 +
arch/loongarch/vdso/Makefile | 96 ++
arch/loongarch/vdso/elf.S | 15 +
arch/loongarch/vdso/gen_vdso_offsets.sh | 13 +
arch/loongarch/vdso/sigreturn.S | 24 +
arch/loongarch/vdso/vdso.S | 22 +
arch/loongarch/vdso/vdso.lds.S | 72 +
arch/loongarch/vdso/vgettimeofday.c | 25 +
drivers/firmware/efi/Kconfig | 2 +-
drivers/firmware/efi/libstub/Makefile | 10 +
drivers/firmware/efi/libstub/efi-stub-helper.c | 2 +-
drivers/firmware/efi/libstub/efi-stub.c | 2 +-
drivers/firmware/efi/libstub/loongarch-stub.c | 88 ++
drivers/gpu/drm/drm_vm.c | 2 +-
drivers/gpu/drm/ttm/ttm_module.c | 2 +-
drivers/irqchip/Kconfig | 6 +-
drivers/irqchip/irq-loongson-liointc.c | 6 +-
include/drm/drm_cache.h | 8 +
include/linux/cpuhotplug.h | 1 +
include/linux/efi.h | 1 +
include/linux/pe.h | 2 +
include/uapi/linux/audit.h | 2 +
include/uapi/linux/elf-em.h | 1 +
include/uapi/linux/elf.h | 5 +
include/uapi/linux/kexec.h | 1 +
scripts/sorttable.c | 5 +
scripts/subarch.include | 2 +-
tools/include/uapi/asm/bitsperlong.h | 2 +
213 files changed, 21498 insertions(+), 10 deletions(-)
create mode 100644 Documentation/loongarch/features.rst
create mode 100644 Documentation/loongarch/index.rst
create mode 100644 Documentation/loongarch/introduction.rst
create mode 100644 Documentation/loongarch/irq-chip-model.rst
create mode 100644 Documentation/translations/zh_CN/loongarch/features.rst
create mode 100644 Documentation/translations/zh_CN/loongarch/index.rst
create mode 100644 Documentation/translations/zh_CN/loongarch/introduction.rst
create mode 100644 Documentation/translations/zh_CN/loongarch/irq-chip-model.rst
create mode 100644 arch/loongarch/Kbuild
create mode 100644 arch/loongarch/Kconfig
create mode 100644 arch/loongarch/Kconfig.debug
create mode 100644 arch/loongarch/Makefile
create mode 100644 arch/loongarch/boot/.gitignore
create mode 100644 arch/loongarch/boot/Makefile
create mode 100644 arch/loongarch/boot/dts/Makefile
create mode 100644 arch/loongarch/configs/loongson3_defconfig
create mode 100644 arch/loongarch/include/asm/Kbuild
create mode 100644 arch/loongarch/include/asm/acenv.h
create mode 100644 arch/loongarch/include/asm/acpi.h
create mode 100644 arch/loongarch/include/asm/addrspace.h
create mode 100644 arch/loongarch/include/asm/asm-offsets.h
create mode 100644 arch/loongarch/include/asm/asm-prototypes.h
create mode 100644 arch/loongarch/include/asm/asm.h
create mode 100644 arch/loongarch/include/asm/asmmacro.h
create mode 100644 arch/loongarch/include/asm/atomic.h
create mode 100644 arch/loongarch/include/asm/barrier.h
create mode 100644 arch/loongarch/include/asm/bitops.h
create mode 100644 arch/loongarch/include/asm/bitrev.h
create mode 100644 arch/loongarch/include/asm/bootinfo.h
create mode 100644 arch/loongarch/include/asm/branch.h
create mode 100644 arch/loongarch/include/asm/bug.h
create mode 100644 arch/loongarch/include/asm/cache.h
create mode 100644 arch/loongarch/include/asm/cacheflush.h
create mode 100644 arch/loongarch/include/asm/cacheops.h
create mode 100644 arch/loongarch/include/asm/clocksource.h
create mode 100644 arch/loongarch/include/asm/cmpxchg.h
create mode 100644 arch/loongarch/include/asm/compiler.h
create mode 100644 arch/loongarch/include/asm/cpu-features.h
create mode 100644 arch/loongarch/include/asm/cpu-info.h
create mode 100644 arch/loongarch/include/asm/cpu.h
create mode 100644 arch/loongarch/include/asm/cpufeature.h
create mode 100644 arch/loongarch/include/asm/delay.h
create mode 100644 arch/loongarch/include/asm/dma-direct.h
create mode 100644 arch/loongarch/include/asm/dmi.h
create mode 100644 arch/loongarch/include/asm/efi.h
create mode 100644 arch/loongarch/include/asm/elf.h
create mode 100644 arch/loongarch/include/asm/entry-common.h
create mode 100644 arch/loongarch/include/asm/exec.h
create mode 100644 arch/loongarch/include/asm/fb.h
create mode 100644 arch/loongarch/include/asm/fixmap.h
create mode 100644 arch/loongarch/include/asm/fpregdef.h
create mode 100644 arch/loongarch/include/asm/fpu.h
create mode 100644 arch/loongarch/include/asm/futex.h
create mode 100644 arch/loongarch/include/asm/hardirq.h
create mode 100644 arch/loongarch/include/asm/hugetlb.h
create mode 100644 arch/loongarch/include/asm/hw_irq.h
create mode 100644 arch/loongarch/include/asm/idle.h
create mode 100644 arch/loongarch/include/asm/inst.h
create mode 100644 arch/loongarch/include/asm/io.h
create mode 100644 arch/loongarch/include/asm/irq.h
create mode 100644 arch/loongarch/include/asm/irq_regs.h
create mode 100644 arch/loongarch/include/asm/irqflags.h
create mode 100644 arch/loongarch/include/asm/kdebug.h
create mode 100644 arch/loongarch/include/asm/linkage.h
create mode 100644 arch/loongarch/include/asm/local.h
create mode 100644 arch/loongarch/include/asm/loongarch.h
create mode 100644 arch/loongarch/include/asm/loongson.h
create mode 100644 arch/loongarch/include/asm/mmu.h
create mode 100644 arch/loongarch/include/asm/mmu_context.h
create mode 100644 arch/loongarch/include/asm/mmzone.h
create mode 100644 arch/loongarch/include/asm/module.h
create mode 100644 arch/loongarch/include/asm/module.lds.h
create mode 100644 arch/loongarch/include/asm/numa.h
create mode 100644 arch/loongarch/include/asm/page.h
create mode 100644 arch/loongarch/include/asm/percpu.h
create mode 100644 arch/loongarch/include/asm/perf_event.h
create mode 100644 arch/loongarch/include/asm/pgalloc.h
create mode 100644 arch/loongarch/include/asm/pgtable-bits.h
create mode 100644 arch/loongarch/include/asm/pgtable.h
create mode 100644 arch/loongarch/include/asm/prefetch.h
create mode 100644 arch/loongarch/include/asm/processor.h
create mode 100644 arch/loongarch/include/asm/ptrace.h
create mode 100644 arch/loongarch/include/asm/reboot.h
create mode 100644 arch/loongarch/include/asm/regdef.h
create mode 100644 arch/loongarch/include/asm/seccomp.h
create mode 100644 arch/loongarch/include/asm/serial.h
create mode 100644 arch/loongarch/include/asm/setup.h
create mode 100644 arch/loongarch/include/asm/shmparam.h
create mode 100644 arch/loongarch/include/asm/smp.h
create mode 100644 arch/loongarch/include/asm/sparsemem.h
create mode 100644 arch/loongarch/include/asm/stackframe.h
create mode 100644 arch/loongarch/include/asm/stacktrace.h
create mode 100644 arch/loongarch/include/asm/string.h
create mode 100644 arch/loongarch/include/asm/switch_to.h
create mode 100644 arch/loongarch/include/asm/syscall.h
create mode 100644 arch/loongarch/include/asm/thread_info.h
create mode 100644 arch/loongarch/include/asm/time.h
create mode 100644 arch/loongarch/include/asm/timex.h
create mode 100644 arch/loongarch/include/asm/tlb.h
create mode 100644 arch/loongarch/include/asm/tlbflush.h
create mode 100644 arch/loongarch/include/asm/topology.h
create mode 100644 arch/loongarch/include/asm/types.h
create mode 100644 arch/loongarch/include/asm/uaccess.h
create mode 100644 arch/loongarch/include/asm/unistd.h
create mode 100644 arch/loongarch/include/asm/vdso.h
create mode 100644 arch/loongarch/include/asm/vdso/clocksource.h
create mode 100644 arch/loongarch/include/asm/vdso/gettimeofday.h
create mode 100644 arch/loongarch/include/asm/vdso/processor.h
create mode 100644 arch/loongarch/include/asm/vdso/vdso.h
create mode 100644 arch/loongarch/include/asm/vdso/vsyscall.h
create mode 100644 arch/loongarch/include/asm/vermagic.h
create mode 100644 arch/loongarch/include/asm/vmalloc.h
create mode 100644 arch/loongarch/include/uapi/asm/Kbuild
create mode 100644 arch/loongarch/include/uapi/asm/auxvec.h
create mode 100644 arch/loongarch/include/uapi/asm/bitsperlong.h
create mode 100644 arch/loongarch/include/uapi/asm/break.h
create mode 100644 arch/loongarch/include/uapi/asm/byteorder.h
create mode 100644 arch/loongarch/include/uapi/asm/hwcap.h
create mode 100644 arch/loongarch/include/uapi/asm/ptrace.h
create mode 100644 arch/loongarch/include/uapi/asm/reg.h
create mode 100644 arch/loongarch/include/uapi/asm/sigcontext.h
create mode 100644 arch/loongarch/include/uapi/asm/signal.h
create mode 100644 arch/loongarch/include/uapi/asm/ucontext.h
create mode 100644 arch/loongarch/include/uapi/asm/unistd.h
create mode 100644 arch/loongarch/kernel/.gitignore
create mode 100644 arch/loongarch/kernel/Makefile
create mode 100644 arch/loongarch/kernel/access-helper.h
create mode 100644 arch/loongarch/kernel/acpi.c
create mode 100644 arch/loongarch/kernel/asm-offsets.c
create mode 100644 arch/loongarch/kernel/cacheinfo.c
create mode 100644 arch/loongarch/kernel/cpu-probe.c
create mode 100644 arch/loongarch/kernel/dma.c
create mode 100644 arch/loongarch/kernel/efi-header.S
create mode 100644 arch/loongarch/kernel/efi.c
create mode 100644 arch/loongarch/kernel/elf.c
create mode 100644 arch/loongarch/kernel/entry.S
create mode 100644 arch/loongarch/kernel/env.c
create mode 100644 arch/loongarch/kernel/fpu.S
create mode 100644 arch/loongarch/kernel/genex.S
create mode 100644 arch/loongarch/kernel/head.S
create mode 100644 arch/loongarch/kernel/idle.c
create mode 100644 arch/loongarch/kernel/image-vars.h
create mode 100644 arch/loongarch/kernel/inst.c
create mode 100644 arch/loongarch/kernel/io.c
create mode 100644 arch/loongarch/kernel/irq.c
create mode 100644 arch/loongarch/kernel/mem.c
create mode 100644 arch/loongarch/kernel/module-sections.c
create mode 100644 arch/loongarch/kernel/module.c
create mode 100644 arch/loongarch/kernel/numa.c
create mode 100644 arch/loongarch/kernel/proc.c
create mode 100644 arch/loongarch/kernel/process.c
create mode 100644 arch/loongarch/kernel/ptrace.c
create mode 100644 arch/loongarch/kernel/reset.c
create mode 100644 arch/loongarch/kernel/setup.c
create mode 100644 arch/loongarch/kernel/signal.c
create mode 100644 arch/loongarch/kernel/smp.c
create mode 100644 arch/loongarch/kernel/switch.S
create mode 100644 arch/loongarch/kernel/syscall.c
create mode 100644 arch/loongarch/kernel/time.c
create mode 100644 arch/loongarch/kernel/topology.c
create mode 100644 arch/loongarch/kernel/traps.c
create mode 100644 arch/loongarch/kernel/vdso.c
create mode 100644 arch/loongarch/kernel/vmlinux.lds.S
create mode 100644 arch/loongarch/lib/Makefile
create mode 100644 arch/loongarch/lib/clear_user.S
create mode 100644 arch/loongarch/lib/copy_user.S
create mode 100644 arch/loongarch/lib/delay.c
create mode 100644 arch/loongarch/lib/dump_tlb.c
create mode 100644 arch/loongarch/mm/Makefile
create mode 100644 arch/loongarch/mm/cache.c
create mode 100644 arch/loongarch/mm/extable.c
create mode 100644 arch/loongarch/mm/fault.c
create mode 100644 arch/loongarch/mm/hugetlbpage.c
create mode 100644 arch/loongarch/mm/init.c
create mode 100644 arch/loongarch/mm/ioremap.c
create mode 100644 arch/loongarch/mm/maccess.c
create mode 100644 arch/loongarch/mm/mmap.c
create mode 100644 arch/loongarch/mm/page.S
create mode 100644 arch/loongarch/mm/pgtable.c
create mode 100644 arch/loongarch/mm/tlb.c
create mode 100644 arch/loongarch/mm/tlbex.S
create mode 100644 arch/loongarch/pci/Makefile
create mode 100644 arch/loongarch/vdso/.gitignore
create mode 100644 arch/loongarch/vdso/Makefile
create mode 100644 arch/loongarch/vdso/elf.S
create mode 100755 arch/loongarch/vdso/gen_vdso_offsets.sh
create mode 100644 arch/loongarch/vdso/sigreturn.S
create mode 100644 arch/loongarch/vdso/vdso.S
create mode 100644 arch/loongarch/vdso/vdso.lds.S
create mode 100644 arch/loongarch/vdso/vgettimeofday.c
create mode 100644 drivers/firmware/efi/libstub/loongarch-stub.c
Merging m68k/for-next (30b5e6ef4a32 m68k: atari: Make Atari ROM port I/O write macros return void)
$ 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 (6b8be804ff37 m68knommu: fix 68000 CPU link with no platform selected)
$ 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 (78b5f52ab6f6 microblaze: fix typos in comments)
$ 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 (7e4fd16b3892 MIPS: RALINK: Define pci_remap_iospace under CONFIG_PCI_DRIVERS_GENERIC)
$ 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 (83da38d82b2f openrisc: Allow power off handler overriding)
$ 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 (b73b2a2fb547 parisc: Drop CONFIG_SCHED_MC)
$ 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
Auto-merging arch/parisc/Kconfig
Merge made by the 'ort' strategy.
arch/parisc/Kconfig | 8 --------
arch/parisc/kernel/topology.c | 4 ----
2 files changed, 12 deletions(-)
Merging powerpc/next (6112bd00e84e Merge tag 'powerpc-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
$ 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 (4b0986a3613c Linux 5.18)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next
Already up to date.
Merging risc-v/for-next (35b51afd23c9 Merge tag 'riscv-for-linus-5.19-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
$ 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 (31c0e4c11a0f Merge branch 'features' 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
Auto-merging MAINTAINERS
Auto-merging arch/s390/Kconfig
Auto-merging arch/s390/Makefile
Auto-merging arch/s390/include/asm/kexec.h
Merge made by the 'ort' strategy.
MAINTAINERS | 1 +
arch/s390/Kconfig | 8 +-
arch/s390/Kconfig.debug | 12 +-
arch/s390/crypto/aes_s390.c | 4 +-
arch/s390/include/asm/asm-extable.h | 91 +++++++++-----
arch/s390/include/asm/kexec.h | 2 +-
arch/s390/include/asm/processor.h | 6 -
arch/s390/include/asm/stacktrace.h | 11 +-
arch/s390/include/asm/uaccess.h | 217 +++++++++++++++++---------------
arch/s390/kernel/Makefile | 2 +-
arch/s390/kernel/asm-offsets.c | 26 +++-
arch/s390/kernel/early.c | 5 +-
arch/s390/kernel/{base.S => earlypgm.S} | 33 +----
arch/s390/kernel/entry.S | 23 +---
arch/s390/kernel/entry.h | 2 +
arch/s390/kernel/perf_event.c | 2 +-
arch/s390/mm/extable.c | 39 +++++-
arch/s390/mm/gmap.c | 14 +++
arch/s390/mm/pgtable.c | 2 +-
19 files changed, 289 insertions(+), 211 deletions(-)
rename arch/s390/kernel/{base.S => earlypgm.S} (52%)
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 (2a4a62a14be1 um: Fix out-of-bounds read in LDT setup)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next
Auto-merging arch/um/Kconfig
Merge made by the 'ort' strategy.
arch/um/Kconfig | 1 +
arch/um/drivers/Kconfig | 15 +++++++++++++++
arch/um/drivers/Makefile | 2 ++
arch/um/drivers/chan_kern.c | 10 +++++-----
arch/um/drivers/chan_user.c | 9 +++++----
arch/um/drivers/daemon_kern.c | 2 +-
arch/um/drivers/line.c | 22 +++++++++++++---------
arch/um/drivers/line.h | 4 ++--
arch/um/drivers/ssl.c | 2 --
arch/um/drivers/stdio_console.c | 2 --
arch/um/drivers/virtio_uml.c | 33 +++++++++++++++++++++++----------
arch/um/drivers/xterm.c | 7 ++++---
arch/um/include/asm/Kbuild | 1 +
arch/um/include/asm/irq.h | 22 +++++++++-------------
arch/x86/um/ldt.c | 6 ++++--
15 files changed, 85 insertions(+), 53 deletions(-)
Merging xtensa/xtensa-for-next (dc60001e1a30 xtensa: Return true/false (not 1/0) from bool function)
$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
Already up to date.
Merging pidfd/for-next (e1bbcd277a53 fs: hold writers when changing mount's idmapping)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next
Already up to date.
Merging fscrypt/master (218d921b581e fscrypt: add new helper functions for test_dummy_encryption)
$ 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 (713423282ae1 netfs: Fix gcc-12 warning by embedding vfs inode in netfs_i_context)
$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next
Auto-merging Documentation/filesystems/netfs_library.rst
Auto-merging fs/9p/vfs_addr.c
Auto-merging fs/afs/dir.c
Auto-merging fs/afs/file.c
Auto-merging fs/afs/inode.c
Auto-merging fs/afs/internal.h
Auto-merging fs/afs/write.c
Auto-merging fs/ceph/addr.c
Auto-merging fs/cifs/cifsfs.c
Auto-merging fs/cifs/cifsglob.h
Auto-merging fs/cifs/file.c
Auto-merging fs/cifs/misc.c
Auto-merging fs/cifs/smb2ops.c
Auto-merging fs/netfs/buffered_read.c
Auto-merging include/linux/netfs.h
CONFLICT (content): Merge conflict in include/linux/netfs.h
Resolved 'include/linux/netfs.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 7f0d48d005cc] Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git
$ git diff -M --stat --summary HEAD^..
Documentation/filesystems/netfs_library.rst | 37 +++++-----
fs/9p/cache.c | 4 +-
fs/9p/v9fs.c | 2 +-
fs/9p/v9fs.h | 10 +--
fs/9p/vfs_addr.c | 2 +-
fs/9p/vfs_inode.c | 4 +-
fs/afs/callback.c | 2 +-
fs/afs/dir.c | 32 ++++-----
fs/afs/dir_edit.c | 10 +--
fs/afs/dir_silly.c | 4 +-
fs/afs/dynroot.c | 2 +-
fs/afs/file.c | 4 +-
fs/afs/fs_operation.c | 6 +-
fs/afs/inode.c | 38 +++++-----
fs/afs/internal.h | 23 +++---
fs/afs/super.c | 6 +-
fs/afs/write.c | 21 +++---
fs/ceph/addr.c | 4 +-
fs/ceph/cache.c | 4 +-
fs/ceph/cache.h | 2 +-
fs/ceph/caps.c | 104 ++++++++++++++--------------
fs/ceph/file.c | 2 +-
fs/ceph/inode.c | 10 +--
fs/ceph/mds_client.c | 4 +-
fs/ceph/snap.c | 8 +--
fs/ceph/super.c | 2 +-
fs/ceph/super.h | 10 +--
fs/ceph/xattr.c | 14 ++--
fs/cifs/cifsfs.c | 8 +--
fs/cifs/cifsglob.h | 12 ++--
fs/cifs/file.c | 8 +--
fs/cifs/fscache.c | 8 +--
fs/cifs/fscache.h | 8 +--
fs/cifs/inode.c | 4 +-
fs/cifs/misc.c | 4 +-
fs/cifs/smb2ops.c | 8 +--
fs/netfs/buffered_read.c | 6 +-
fs/netfs/internal.h | 2 +-
fs/netfs/objects.c | 2 +-
include/linux/netfs.h | 39 ++++-------
40 files changed, 226 insertions(+), 254 deletions(-)
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 (0a05fafe9def btrfs: zoned: introduce a minimal zone size 4M and reject mount)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
Already up to date.
Merging ceph/master (b24d20af4c2e fscrypt: add fscrypt_context_for_new_inode)
$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
Auto-merging MAINTAINERS
Auto-merging drivers/block/rbd.c
Auto-merging fs/ceph/addr.c
Auto-merging fs/ceph/caps.c
CONFLICT (content): Merge conflict in fs/ceph/caps.c
Auto-merging fs/ceph/inode.c
Auto-merging fs/ceph/mds_client.c
Auto-merging fs/ceph/super.c
Auto-merging fs/ceph/super.h
Auto-merging fs/ceph/xattr.c
Auto-merging fs/crypto/fname.c
Auto-merging fs/crypto/fscrypt_private.h
Auto-merging fs/crypto/policy.c
Auto-merging include/linux/fscrypt.h
Resolved 'fs/ceph/caps.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 512968ff3870] Merge branch 'master' of git://github.com/ceph/ceph-client.git
$ git diff -M --stat --summary HEAD^..
MAINTAINERS | 4 +-
drivers/block/rbd.c | 13 +++--
fs/ceph/addr.c | 42 ++++++++-------
fs/ceph/caps.c | 75 +++++++++++++++++----------
fs/ceph/inode.c | 35 +++++++++++--
fs/ceph/mds_client.c | 121 ++++++++++++++++++++++++++++++++++----------
fs/ceph/mds_client.h | 2 +-
fs/ceph/quota.c | 19 ++++---
fs/ceph/super.c | 1 +
fs/ceph/super.h | 29 +++++++++--
fs/ceph/xattr.c | 10 +++-
fs/crypto/fname.c | 36 ++++++++++---
fs/crypto/fscrypt_private.h | 9 ++--
fs/crypto/hooks.c | 6 +--
fs/crypto/policy.c | 35 ++++++++++---
fs/inode.c | 10 ++--
include/linux/fscrypt.h | 5 ++
net/ceph/crush/mapper.c | 5 +-
18 files changed, 330 insertions(+), 127 deletions(-)
Merging cifs/for-next (cc391b694ff0 cifs: fix potential deadlock in direct reclaim)
$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
Auto-merging fs/cifs/cifsfs.c
Auto-merging fs/cifs/cifsglob.h
Auto-merging fs/cifs/smb2ops.c
Merge made by the 'ort' strategy.
fs/cifs/cifs_swn.c | 4 ++--
fs/cifs/cifsencrypt.c | 8 ++++----
fs/cifs/cifsfs.c | 10 ++++++----
fs/cifs/cifsglob.h | 20 +++++++++++++++++++-
fs/cifs/connect.c | 27 +++++++++++++--------------
fs/cifs/dfs_cache.c | 4 ++--
fs/cifs/sess.c | 6 +++---
fs/cifs/smb1ops.c | 6 +++---
fs/cifs/smb2ops.c | 2 +-
fs/cifs/smb2pdu.c | 6 +++---
fs/cifs/smbdirect.c | 4 ++--
fs/cifs/transport.c | 40 ++++++++++++++++++++--------------------
12 files changed, 78 insertions(+), 59 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 (4398d3c31b58 erofs: fix 'backmost' member of z_erofs_decompress_frontend)
$ 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 (64ba4b15e5c0 exfat: check if cluster num is valid)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
Already up to date.
Merging ext3/for_next (5c905e1a0180 Pull typo fix from Julia Lawall.)
$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
Auto-merging fs/fs-writeback.c
Auto-merging fs/notify/fanotify/fanotify_user.c
Merge made by the 'ort' strategy.
Merging ext4/dev (5f41fdaea63d ext4: only allow test_dummy_encryption when supported)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
Already up to date.
Merging f2fs/dev (2d1fe8a86bf5 f2fs: fix to tag gcing flag on page during file defragment)
$ 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 (e6af1bb07704 fs-verity: Use struct_size() helper in enable_verity())
$ 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 (6b49bc9d8a5f fuse: avoid unnecessary spinlock bump)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
Auto-merging fs/fuse/dax.c
Auto-merging fs/fuse/dir.c
Auto-merging fs/fuse/file.c
Merge made by the 'ort' strategy.
fs/fuse/dax.c | 2 +-
fs/fuse/dir.c | 7 ++++++-
fs/fuse/file.c | 39 ++++++++++++++++++++++++++-------------
3 files changed, 33 insertions(+), 15 deletions(-)
Merging gfs2/for-next (c360abbb9db2 gfs2: Convert function bh_get to use iomap)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
Already up to date.
Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code)
$ 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 (e5b020871332 Merge tag '5.19-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd)
$ 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 (42226c989789 Linux 5.18-rc7)
$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next
Already up to date.
Merging nfs-anna/linux-next (118f09eda21d NFSv4.1 mark qualified async operations as MOVEABLE tasks)
$ 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 (08af54b3e572 NFSD: nfsd_file_put() can sleep)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next
Already up to date.
Merging ntfs3/master (724bbe49c5e4 fs/ntfs3: provide block_invalidate_folio to fix memory leak)
$ 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 | 12 +++--
fs/ntfs3/inode.c | 9 +++-
fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++-------
5 files changed, 149 insertions(+), 30 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 (bc70682a497c ovl: support idmapped layers)
$ 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 (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
Auto-merging fs/jffs2/fs.c
Merge made by the 'ort' strategy.
drivers/mtd/ubi/fastmap-wl.c | 121 +++++++++++++++++++++++++++++++++++--------
drivers/mtd/ubi/fastmap.c | 11 ----
drivers/mtd/ubi/ubi.h | 4 +-
drivers/mtd/ubi/vmt.c | 1 -
drivers/mtd/ubi/wl.c | 33 ++++++++----
drivers/mtd/ubi/wl.h | 2 +
fs/jffs2/erase.c | 6 +--
fs/jffs2/fs.c | 1 +
fs/ubifs/budget.c | 7 +--
fs/ubifs/xattr.c | 2 +-
10 files changed, 129 insertions(+), 59 deletions(-)
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 (7146bda743e6 Merge branch 'guilt/xfs-5.19-larp-cleanups' into xfs-5.19-for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
Auto-merging fs/xfs/xfs_file.c
Auto-merging fs/xfs/xfs_super.c
Merge made by the 'ort' strategy.
fs/xfs/libxfs/xfs_ag.c | 3 +-
fs/xfs/libxfs/xfs_attr.c | 198 +++++++++-----------
fs/xfs/libxfs/xfs_attr.h | 63 ++++---
fs/xfs/libxfs/xfs_attr_remote.c | 6 +-
fs/xfs/libxfs/xfs_attr_remote.h | 6 +-
fs/xfs/libxfs/xfs_btree.c | 63 +++++--
fs/xfs/libxfs/xfs_da_btree.c | 11 ++
fs/xfs/libxfs/xfs_da_btree.h | 1 +
fs/xfs/libxfs/xfs_defer.c | 67 +++++--
fs/xfs/libxfs/xfs_log_format.h | 18 +-
fs/xfs/libxfs/xfs_log_recover.h | 14 +-
fs/xfs/libxfs/xfs_symlink_remote.c | 2 +-
fs/xfs/scrub/scrub.c | 17 +-
fs/xfs/xfs_acl.c | 3 +-
fs/xfs/xfs_attr_item.c | 364 +++++++++++++++++++++----------------
fs/xfs/xfs_attr_item.h | 22 ++-
fs/xfs/xfs_buf_item_recover.c | 66 +++++++
fs/xfs/xfs_file.c | 2 +-
fs/xfs/xfs_fsops.c | 7 +-
fs/xfs/xfs_inode.c | 2 +-
fs/xfs/xfs_ioctl.c | 3 +-
fs/xfs/xfs_iops.c | 3 +-
fs/xfs/xfs_log.c | 41 -----
fs/xfs/xfs_log.h | 7 +
fs/xfs/xfs_log_priv.h | 3 -
fs/xfs/xfs_log_recover.c | 93 ++--------
fs/xfs/xfs_message.h | 6 +
fs/xfs/xfs_mount.c | 1 -
fs/xfs/xfs_mount.h | 18 +-
fs/xfs/xfs_qm.c | 9 +-
fs/xfs/xfs_super.c | 20 ++
fs/xfs/xfs_super.h | 1 -
fs/xfs/xfs_xattr.c | 79 +++++++-
fs/xfs/xfs_xattr.h | 13 ++
34 files changed, 719 insertions(+), 513 deletions(-)
create mode 100644 fs/xfs/xfs_xattr.h
Merging zonefs/for-next (31a644b3c2ae documentation: zonefs: Document sysfs attributes)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
Already up to date.
Merging iomap/iomap-for-next (e9c3a8e820ed iomap: don't invalidate folios after writeback errors)
$ 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 (e9921ffd594f Merge branches 'work.namei', 'work.mount' and 'work.fd' 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 drivers/android/binder.c
Auto-merging fs/file_table.c
Auto-merging fs/internal.h
Auto-merging fs/io_uring.c
CONFLICT (content): Merge conflict in fs/io_uring.c
Auto-merging fs/namei.c
Auto-merging fs/namespace.c
Auto-merging fs/nfs/nfs4file.c
Auto-merging include/linux/fs.h
Auto-merging security/smack/smackfs.c
Resolved 'fs/io_uring.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master bfc9325fbe6b] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
$ git diff -M --stat --summary HEAD^..
arch/alpha/kernel/osf_sys.c | 1 +
drivers/android/binder.c | 2 +-
fs/file.c | 110 +++++++++++++++++---------------------------
fs/file_table.c | 9 +---
fs/fsopen.c | 4 +-
fs/internal.h | 3 +-
fs/io_uring.c | 18 +++-----
fs/namei.c | 11 +----
fs/namespace.c | 2 +-
fs/nfs/nfs4file.c | 4 +-
include/linux/fdtable.h | 2 +-
include/linux/file.h | 2 -
include/linux/fs.h | 15 +-----
include/linux/mount.h | 29 +++++++-----
kernel/usermode_driver.c | 4 +-
security/smack/smackfs.c | 1 +
16 files changed, 84 insertions(+), 133 deletions(-)
Merging printk/for-next (d55663695b60 Merge branch 'rework/kthreads' 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
Merge made by the 'ort' strategy.
kernel/printk/printk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging pci/next (32f479d05a44 Merge branch 'remotes/lorenzo/pci/vmd')
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next
Already up to date.
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 (b01c83388f54 Revert "HID: Driver for Google Hangouts Meet Speakermic")
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
Auto-merging MAINTAINERS
Auto-merging drivers/hid/hid-ids.h
Auto-merging drivers/hid/hid-ids.h
Auto-merging drivers/hid/hid-ids.h
Merge made by the 'ort' strategy.
Merging i2c/i2c/for-next (44e66c3bda45 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
$ 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
Auto-merging drivers/i2c/busses/i2c-mt7621.c
Auto-merging drivers/i2c/busses/i2c-qcom-geni.c
Merge made by the 'ort' strategy.
Merging i3c/i3c/next (66ed42caf286 MAINTAINERS: rectify entries for some i3c drivers after dt conversion)
$ 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 (8877ecb0fc8d hwmon: (aquacomputer_d5next) Fix an error handling path in aqc_probe())
$ 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
Already up to date.
Merging jc_docs/docs-next (a27e51b45e1b documentation: Format button_dev as a pointer.)
$ 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/admin-guide/blockdev/index.rst | 6 +-
Documentation/conf.py | 2 +-
Documentation/{ => images}/COPYING-logo | 8 +
Documentation/{ => images}/logo.gif | Bin
Documentation/images/logo.svg | 2040 ++++++++++++++++++++++++++
Documentation/input/input-programming.rst | 6 +-
scripts/spdxcheck-test.sh | 2 +-
7 files changed, 2056 insertions(+), 8 deletions(-)
rename Documentation/{ => images}/COPYING-logo (64%)
rename Documentation/{ => images}/logo.gif (100%)
create mode 100644 Documentation/images/logo.svg
Merging v4l-dvb/master (340ce50f75a6 media: hantro: Enable HOLD_CAPTURE_BUF for H.264)
$ 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 (340ce50f75a6 media: hantro: Enable HOLD_CAPTURE_BUF for H.264)
$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
Already up to date.
Merging pm/linux-next (2517a0ba026a Merge branch 'acpi-osl' 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/acpi/cppc_acpi.c
Auto-merging drivers/acpi/processor_idle.c
Auto-merging include/linux/acpi.h
Merge made by the 'ort' strategy.
Merging cpufreq-arm/cpufreq/arm/linux-next (39b360102f3a cpufreq: mediatek: Add support for MT8186)
$ 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
Already up to date.
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 (2e691421a2c9 PM / devfreq: rk3399_dmc: Block PMU during transitions)
$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
Already up to date.
Merging opp/opp/linux-next (22079af7df5a opp: Reorder definition of ceil/floor helpers)
$ 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 (72b3fc61c752 thermal: k3_j72xx_bandgap: Add the bandgap driver support)
$ 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
Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
Auto-merging MAINTAINERS
Auto-merging tools/Makefile
Merge made by the 'ort' strategy.
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 (8e51ec6146fd dlm: use kref_put_lock in __put_lkb)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
Already up to date.
Merging rdma/for-next (9c477178a0a1 RDMA/rtrs-clt: Fix one kernel-doc comment)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
Already up to date.
Merging net-next/master (7e062cda7d90 Merge tag 'net-next-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master
Already up to date.
Merging bpf-next/for-next (7e062cda7d90 Merge tag 'net-next-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
$ 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
Already up to date.
Merging ipsec-next/master (0f9008e5c510 Merge branch 'Be explicit with XFRM offload direction')
$ 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 (846e437387e7 net/mlx5: Expose mlx5_sriov_blocking_notifier_register / unregister APIs)
$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
Already up to date.
Merging netfilter-next/master (677fb7525331 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/pablo/nf-next.git netfilter-next/master
Already up to date.
Merging ipvs-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case)
$ 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 (9271cf2ecc9a Bluetooth: hci_qca: Return wakeup for qca_wakeup)
$ 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/hci_qca.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging wireless-next/for-next (805cb5aadc2a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next
Already up to date.
Merging mtd/mtd/next (2c51d0d88020 Merge tag 'nand/for-5.19' into mtd/next)
$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
Already up to date.
Merging nand/nand/next (6a2277a0ebe7 mtd: rawnand: renesas: Use runtime PM instead of the raw clock API)
$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
Already up to date.
Merging spi-nor/spi-nor/next (c47452194641 mtd: spi-nor: debugfs: fix format specifier)
$ 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 (e4e62bbc6aba hwrng: omap3-rom - fix using wrong clk_disable() in omap_rom_rng_runtime_resume())
$ 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 (bf23729c7a5f Merge tag 'amd-drm-next-5.19-2022-05-26-2' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next
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
Merge made by the 'ort' strategy.
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 223 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 23 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 19 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 68 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 9 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 29 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 -
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 42 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 4 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 48 +-
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +-
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 21 +-
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 +
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 3 +
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 15 +-
drivers/gpu/drm/amd/amdgpu/soc21.c | 1 +
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 2974 +++++++++++---------
.../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 394 ++-
.../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 244 +-
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +-
drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 22 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 19 +-
.../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +-
.../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 3 +-
.../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 3 +-
drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +-
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 248 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 19 +
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 +
drivers/gpu/drm/amd/display/dc/dc.h | 6 +-
drivers/gpu/drm/amd/display/dc/dc_link.h | 2 -
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 3 +-
.../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 9 +-
.../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 27 +-
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 17 +-
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 10 +
.../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 516 +---
.../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 5 +
.../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +
.../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +
.../drm/amd/display/dc/dcn303/dcn303_resource.c | 2 +
.../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +
drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 +-
.../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 617 ++++
.../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.h | 67 +
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 7 +
drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 3 +-
drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 5 +
.../drm/amd/display/include/link_service_types.h | 6 -
.../amd/include/asic_reg/dce/dce_10_0_sh_mask.h | 2 +
.../amd/include/asic_reg/dce/dce_11_0_sh_mask.h | 2 +
.../amd/include/asic_reg/dce/dce_11_2_sh_mask.h | 2 +
.../amd/include/asic_reg/dce/dce_12_0_sh_mask.h | 2 +
.../drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h | 2 +
.../drm/amd/include/asic_reg/dcn/dcn_1_0_sh_mask.h | 2 +
.../amd/include/asic_reg/dcn/dcn_2_0_0_sh_mask.h | 2 +
.../amd/include/asic_reg/dcn/dcn_2_0_3_sh_mask.h | 4 +-
.../amd/include/asic_reg/dcn/dcn_2_1_0_sh_mask.h | 2 +
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 3 +
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 1 +
.../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 22 +-
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +-
.../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 57 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 +
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 47 +-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 62 +-
.../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 +
drivers/gpu/drm/radeon/radeon_connectors.c | 4 +
include/uapi/drm/amdgpu_drm.h | 8 +
82 files changed, 3548 insertions(+), 2536 deletions(-)
create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.h
Merging drm-misc/for-linux-next (5ee8c8f930ba drm/rockchip: Change register space names in vop2)
$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next
Already up to date.
Merging amdgpu/drm-next (4ad5768e1b3b drm/amdgpu: fix sdma doorbell issue on SDMA v6.0 and NBIO v7.7)
$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
Merge made by the 'ort' strategy.
drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 28 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 52 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 9 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h | 7 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 32 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 6 +
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 8 +-
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 10 +
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 48 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 555 +
drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.h | 28 +
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 8 +-
drivers/gpu/drm/amd/amdgpu/nv.c | 1 +
drivers/gpu/drm/amd/amdgpu/soc21.c | 5 +-
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 50 +-
drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3 +
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 103 +-
drivers/gpu/drm/amd/display/dc/Makefile | 2 +
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 950 +-
.../display/dc/bios/bios_parser_types_internal2.h | 1 +
.../gpu/drm/amd/display/dc/bios/command_table.c | 4 +-
.../amd/display/dc/bios/command_table_helper2.c | 2 +
drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 35 +
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 17 +-
.../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 15 +-
.../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h | 60 +
.../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 19 +-
.../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 2 +
.../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 15 +-
.../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 11 +-
.../gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h | 65 +
.../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 636 +
.../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h | 39 +
.../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 117 +
.../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h | 49 +
.../amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h | 108 +
drivers/gpu/drm/amd/display/dc/core/dc.c | 14 +-
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 17 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 161 +-
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 20 +-
drivers/gpu/drm/amd/display/dc/dc.h | 28 +-
drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 +
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 31 +
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 +
drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 +
drivers/gpu/drm/amd/display/dc/dc_stream.h | 21 +
drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 45 +
.../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 27 +
.../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 15 +
.../amd/display/dc/dce110/dce110_hw_sequencer.c | 23 +-
.../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 33 +
.../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 -
.../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 6 +
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 +
.../amd/display/dc/dcn10/dcn10_stream_encoder.h | 28 +
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 34 +-
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 25 +-
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 32 +-
.../display/dc/dcn30/dcn30_dio_stream_encoder.c | 16 +-
.../display/dc/dcn30/dcn30_dio_stream_encoder.h | 35 +
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 8 +-
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 16 +
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 14 +-
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 147 +
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 9 +
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 107 +-
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 16 +-
.../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 4 +-
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 22 +-
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 6 +-
drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 37 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 300 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h | 155 +
.../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 294 +
.../amd/display/dc/dcn32/dcn32_dio_link_encoder.h | 60 +
.../display/dc/dcn32/dcn32_dio_stream_encoder.c | 461 +
.../display/dc/dcn32/dcn32_dio_stream_encoder.h | 265 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c | 164 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.h | 38 +
.../display/dc/dcn32/dcn32_hpo_dp_link_encoder.c | 90 +
.../display/dc/dcn32/dcn32_hpo_dp_link_encoder.h | 63 +
.../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 964 +
.../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 172 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 148 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h | 69 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 891 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 64 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 155 +
.../hw_translate_diag.c => dcn32/dcn32_init.h} | 20 +-
.../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c | 239 +
.../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h | 225 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 810 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h | 213 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 268 +
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h | 253 +
.../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 3989 +
.../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 88 +
drivers/gpu/drm/amd/display/dc/dcn321/Makefile | 34 +
.../display/dc/dcn321/dcn321_dio_link_encoder.c | 199 +
.../display/dc/dcn321/dcn321_dio_link_encoder.h | 42 +
.../drm/amd/display/dc/dcn321/dcn321_resource.c | 2323 +
.../hw_factory_diag.c => dcn321/dcn321_resource.h} | 46 +-
drivers/gpu/drm/amd/display/dc/dml/Makefile | 7 +
.../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 36 +-
.../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 8 +-
.../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 2 +-
.../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 3835 +
.../amd/display/dc/dml/dcn32/display_mode_vba_32.h | 57 +
.../dc/dml/dcn32/display_mode_vba_util_32.c | 6254 +
.../dc/dml/dcn32/display_mode_vba_util_32.h | 1175 +
.../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 616 +
.../display/dc/dml/dcn32/display_rq_dlg_calc_32.h | 70 +
.../drm/amd/display/dc/dml/display_mode_enums.h | 88 +-
.../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 +
.../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 15 +
.../drm/amd/display/dc/dml/display_mode_structs.h | 132 +
.../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 171 +
.../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 242 +-
drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 73 +-
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 +-
drivers/gpu/drm/amd/display/dc/gpio/Makefile | 8 +-
.../amd/display/dc/gpio/dcn32/hw_factory_dcn32.c | 255 +
.../hw_factory_diag.h => dcn32/hw_factory_dcn32.h} | 13 +-
.../amd/display/dc/gpio/dcn32/hw_translate_dcn32.c | 349 +
.../hw_translate_dcn32.h} | 11 +-
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 16 +-
drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 13 +-
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 10 +
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 3 +
.../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 45 +-
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 42 +-
drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 3 +
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 7 +
.../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 2 +
drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +
drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 5 +
.../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 +
.../drm/amd/display/dc/inc/hw/timing_generator.h | 10 +-
drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 2 +
.../drm/amd/display/dc/inc/hw_sequencer_private.h | 7 +
drivers/gpu/drm/amd/display/dc/inc/resource.h | 7 +
drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 +-
.../amd/display/dc/irq/dcn32/irq_service_dcn32.c | 432 +
.../amd/display/dc/irq/dcn32/irq_service_dcn32.h | 35 +
.../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 19 +-
drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 8 +
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 26 +-
drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 +
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 11 +-
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 3 +-
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 490 +
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 256 +
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 51 +-
.../drm/amd/display/include/bios_parser_types.h | 11 +
drivers/gpu/drm/amd/display/include/dal_asic_id.h | 8 +
drivers/gpu/drm/amd/display/include/dal_types.h | 2 +
.../drm/amd/display/include/ddc_service_types.h | 2 +
drivers/gpu/drm/amd/display/modules/vmid/vmid.c | 2 +-
.../amd/include/asic_reg/dcn/dcn_3_2_0_offset.h | 14675 ++
.../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h | 222890 ++++++++++++++++++
.../amd/include/asic_reg/dcn/dcn_3_2_1_offset.h | 14559 ++
.../amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h | 56578 +++++
.../include/asic_reg/mmhub/mmhub_3_0_1_offset.h | 1769 +
.../include/asic_reg/mmhub/mmhub_3_0_1_sh_mask.h | 7483 +
.../amd/include/asic_reg/nbio/nbio_7_7_0_offset.h | 4 +
.../amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h | 10 +
drivers/gpu/drm/amd/include/atomfirmware.h | 209 +-
drivers/gpu/drm/amd/include/mes_api_def.h | 2 +-
drivers/gpu/drm/amd/include/mes_v11_api_def.h | 2 +-
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 +
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 2 +
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 +-
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 7 +
.../drm/amd/pm/swsmu/inc/pmfw_if/arcturus_ppsmc.h | 2 +-
.../swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h | 16 +-
.../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 6 +
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 4 +-
.../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 54 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 10 +
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 4 +-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 1 +
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 20 +
include/uapi/drm/drm_fourcc.h | 2 +
187 files changed, 349832 insertions(+), 701 deletions(-)
create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.h
create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h
create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c
create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h
create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c
create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h
create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/Makefile
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hpo_dp_link_encoder.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hpo_dp_link_encoder.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c
rename drivers/gpu/drm/amd/display/dc/{gpio/diagnostics/hw_translate_diag.c => dcn32/dcn32_init.h} (74%)
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/Makefile
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_dio_link_encoder.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_dio_link_encoder.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c
rename drivers/gpu/drm/amd/display/dc/{gpio/diagnostics/hw_factory_diag.c => dcn321/dcn321_resource.h} (53%)
create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h
create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.c
create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.h
create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_factory_dcn32.c
rename drivers/gpu/drm/amd/display/dc/gpio/{diagnostics/hw_factory_diag.h => dcn32/hw_factory_dcn32.h} (81%)
create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_translate_dcn32.c
rename drivers/gpu/drm/amd/display/dc/gpio/{diagnostics/hw_translate_diag.h => dcn32/hw_translate_dcn32.h} (82%)
create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.c
create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.h
create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c
create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h
create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_0_offset.h
create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h
create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_1_offset.h
create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h
create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_1_offset.h
create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_1_sh_mask.h
$ git reset --hard HEAD^
HEAD is now at 60155ebbf480 Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git
Merging next-20220601 version of amdgpu
$ git merge -m next-20220601/amdgpu 8f1689d4fd30d90ef5d3121088bacee5bef536ce
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
Merge made by the 'ort' strategy.
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 28 +---
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 2 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-
.../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 19 ++-
.../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 2 +
.../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 13 +-
.../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 11 +-
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 17 ++-
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 158 +++++++++++----------
drivers/gpu/drm/amd/display/dc/dc.h | 6 +-
.../amd/display/dc/dce110/dce110_hw_sequencer.c | 23 ++-
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 79 +++++------
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 2 +-
.../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 4 +-
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 +-
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 +
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 20 ++-
drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 5 +
.../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 +
.../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 19 ++-
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 11 +-
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 3 +-
.../drm/amd/display/include/ddc_service_types.h | 2 +
drivers/gpu/drm/amd/display/modules/vmid/vmid.c | 2 +-
drivers/gpu/drm/amd/include/mes_api_def.h | 2 +-
.../drm/amd/pm/swsmu/inc/pmfw_if/arcturus_ppsmc.h | 2 +-
.../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 6 +
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +-
.../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 4 +-
31 files changed, 254 insertions(+), 203 deletions(-)
Merging drm-intel/for-linux-next (0ea917819d12 drm/i915/dsi: fix VBT send packet port selection for ICL+)
$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
Already up to date.
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 (24df12013853 MAINTAINERS: Add Dmitry as MSM DRM driver co-maintainer)
$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
Already up to date.
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
Already up to date.
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
Already up to date.
Merging fbdev/for-next (4b0986a3613c Linux 5.18)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
Already up to date.
Merging regmap/for-next (5c422f0b970d regmap: Add missing map->bus check)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
Already up to date.
Merging sound/for-next (672362cbe6df Merge tag 'asoc-fix-v5.19-rc0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
Already up to date.
Merging sound-asoc/for-next (36513d56b7d5 Merge remote-tracking branch 'asoc/for-5.18' into asoc-linus)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
Already up to date.
Merging modules/modules-next (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section())
$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next
Already up to date.
Merging input/next (69cf890d8b28 Input: mtk-pmic-keys - move long press debounce mask to mtk_pmic_regs)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
Auto-merging MAINTAINERS
Auto-merging drivers/input/input.c
Merge made by the 'ort' strategy.
.../bindings/input/fsl,mpr121-touchkey.yaml | 4 +-
.../devicetree/bindings/input/gpio-keys.yaml | 4 +-
.../devicetree/bindings/input/iqs269a.yaml | 2 +-
.../devicetree/bindings/input/iqs626a.yaml | 2 +-
.../bindings/input/microchip,cap11xx.yaml | 2 +-
drivers/input/keyboard/Kconfig | 2 +-
drivers/input/keyboard/adp5588-keys.c | 206 +++++++++------------
drivers/input/keyboard/cros_ec_keyb.c | 89 ++++++---
drivers/input/keyboard/mtk-pmic-keys.c | 98 +++++-----
drivers/input/keyboard/omap4-keypad.c | 26 ++-
drivers/input/touchscreen/zinitix.c | 112 +++++------
11 files changed, 275 insertions(+), 272 deletions(-)
Merging block/for-next (bde0d7374edc Merge branch 'io_uring-5.19' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
Auto-merging fs/io_uring.c
Merge made by the 'ort' strategy.
block/bio.c | 9 +-
block/blk-core.c | 2 +-
block/blk-iolatency.c | 122 ++++++++++----------
block/blk-mq.c | 10 +-
block/genhd.c | 2 +
drivers/block/loop.c | 8 +-
drivers/block/nbd.c | 114 +++++++++++--------
drivers/md/bcache/bcache.h | 7 ++
drivers/md/bcache/btree.c | 59 +++++-----
drivers/md/bcache/btree.h | 2 +-
drivers/md/bcache/journal.c | 31 ++++-
drivers/md/bcache/journal.h | 2 +
drivers/md/bcache/request.c | 6 +
drivers/md/bcache/super.c | 1 +
drivers/md/bcache/writeback.c | 133 ++++++++++------------
drivers/md/bcache/writeback.h | 2 +-
drivers/md/dm-raid.c | 2 +-
drivers/md/md-linear.c | 5 +-
drivers/md/md-multipath.c | 15 +--
drivers/md/md.c | 185 ++++++++++++++----------------
drivers/md/md.h | 2 +-
drivers/md/raid0.c | 29 ++---
drivers/md/raid1.c | 24 ++--
drivers/md/raid10.c | 54 ++++-----
drivers/md/raid5-cache.c | 5 +-
drivers/md/raid5-ppl.c | 27 ++---
drivers/md/raid5.c | 37 +++---
fs/io_uring.c | 256 ++++++++++++++++++++++++++----------------
include/linux/blk_types.h | 4 +
include/linux/blkdev.h | 1 +
include/uapi/linux/io_uring.h | 6 +
31 files changed, 620 insertions(+), 542 deletions(-)
Merging device-mapper/for-next (4caae58406f8 dm verity: set DM_TARGET_IMMUTABLE feature flag)
$ 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
Already up to date.
Merging libata/for-next (71abb4df2981 ata: pata_ftide010: Remove unneeded ERROR check before clk_disable_unprepare)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next
Already up to date.
Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt)
$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
Already up to date.
Merging mmc/next (ded2c4c34500 mmc: sdhci-of-arasan: Add NULL check for data field)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
Already up to date.
Merging mfd/for-mfd-next (f93afd8e7567 dt-bindings: cros-ec: Fix a typo in description)
$ 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 (da50aad6d867 Merge power-supply 'fixes' branch)
$ 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 (e4296f8578b5 Merge remote-tracking branch 'regulator/for-5.18' into regulator-linus)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
Already up to date.
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
Auto-merging security/apparmor/policy_unpack_test.c
CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c
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 5a3d777aab3e] Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
$ git diff -M --stat --summary HEAD^..
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 | 28 +++++-----
security/apparmor/procattr.c | 2 +-
15 files changed, 231 insertions(+), 138 deletions(-)
Merging integrity/next-integrity (048ae41bb080 integrity: Fix sparse warnings in keyring_handler)
$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
Already up to date.
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 (1af0e4a0233f security: declare member holding string literal const)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
Already up to date.
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.
Merging tomoyo/master (3b8d1c0d6306 workqueue: Wrap flush_workqueue() using a macro)
$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master
Merge made by the 'ort' strategy.
include/linux/workqueue.h | 64 +++++++++++++++++++++++++++++++++++++++++------
kernel/workqueue.c | 16 +++++++++---
2 files changed, 68 insertions(+), 12 deletions(-)
Merging tpmdd/next (7f3113e3b9f7 MAINTAINERS: add KEYS-TRUSTED-CAAM)
$ 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 (5d24df3d6908 watchdog: ts4800_wdt: Fix refcount leak in ts4800_wdt_probe)
$ 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 (b0dacee202ef Merge branches 'apple/dart', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd' and 'vfio-notifier-fix' 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 (d036d915b61f of/irq: fix typo in comment)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
Already up to date.
Merging mailbox/mailbox-for-next (79f9fbe30352 mailbox: qcom-ipcc: Fix -Wunused-function with CONFIG_PM_SLEEP=n)
$ 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 (ebf2a3521738 spi: core: Display return code when failing to transfer message)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
Already up to date.
Merging tip/master (f3c3debf7700 Merge branch 'x86/microcode')
$ 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
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Auto-merging arch/x86/kernel/tracepoint.c
Auto-merging arch/x86/kvm/vmx/vmx.c
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/mm/init_64.c
Auto-merging drivers/clocksource/Kconfig
Auto-merging drivers/clocksource/timer-ti-dm.c
Resolved 'arch/x86/Kconfig' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master daa2283ca16e] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
$ git diff -M --stat --summary HEAD^..
.../bindings/timer/mediatek,mtk-timer.txt | 1 +
arch/x86/Kconfig | 116 ++++++++++-----------
arch/x86/Kconfig.debug | 29 +++---
arch/x86/events/Kconfig | 12 +--
arch/x86/events/intel/core.c | 2 +-
arch/x86/kernel/cpu/common.c | 2 +
arch/x86/kernel/cpu/microcode/core.c | 115 ++------------------
arch/x86/kernel/setup.c | 6 +-
arch/x86/kvm/vmx/vmx.c | 2 +-
arch/x86/kvm/x86.c | 2 +-
arch/x86/mm/init_64.c | 8 +-
arch/x86/platform/efi/efi_thunk_64.S | 2 +-
drivers/clocksource/Kconfig | 2 +-
drivers/clocksource/bcm_kona_timer.c | 14 +--
drivers/clocksource/jcore-pit.c | 5 +-
drivers/clocksource/mips-gic-timer.c | 9 +-
drivers/clocksource/timer-armada-370-xp.c | 5 +-
drivers/clocksource/timer-digicolor.c | 5 +-
drivers/clocksource/timer-ixp4xx.c | 25 -----
drivers/clocksource/timer-lpc32xx.c | 6 +-
drivers/clocksource/timer-orion.c | 5 +-
drivers/clocksource/timer-oxnas-rps.c | 2 +-
drivers/clocksource/timer-pistachio.c | 5 +-
drivers/clocksource/timer-riscv.c | 2 +-
drivers/clocksource/timer-sp804.c | 10 +-
drivers/clocksource/timer-sun4i.c | 5 +-
drivers/clocksource/timer-sun5i.c | 5 +-
drivers/clocksource/timer-ti-dm.c | 3 +-
include/linux/platform_data/timer-ixp4xx.h | 11 --
kernel/events/core.c | 1 -
30 files changed, 122 insertions(+), 295 deletions(-)
delete mode 100644 include/linux/platform_data/timer-ixp4xx.h
Merging clockevents/timers/drivers/next (ff714ee7191b clocksource/drivers/timer-ti-dm: Add compatible for am6 SoCs)
$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
Auto-merging arch/arm/mach-omap2/Kconfig
Auto-merging drivers/clocksource/Kconfig
Auto-merging drivers/clocksource/Makefile
Auto-merging drivers/clocksource/timer-ti-dm.c
Merge made by the 'ort' strategy.
arch/arm/mach-omap2/Kconfig | 2 +
drivers/clocksource/Kconfig | 8 ++-
drivers/clocksource/Makefile | 2 +-
drivers/clocksource/timer-ti-dm.c | 123 ++++++++++++++++++++++++++++++++
include/clocksource/timer-ti-dm.h | 144 --------------------------------------
5 files changed, 133 insertions(+), 146 deletions(-)
Merging edac/edac-for-next (92705c9f9956 Merge edac-misc into for-next)
$ 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
Auto-merging drivers/edac/synopsys_edac.c
Merge made by the 'ort' strategy.
drivers/edac/synopsys_edac.c | 44 +++++++++++++++++++++++++-------------------
1 file changed, 25 insertions(+), 19 deletions(-)
Merging irqchip/irq/irqchip-next (492449ae4f0a Merge branch irq/gic-v3-nmi-fixes-5.19 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 (01dca6d03bb3 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
Merge made by the 'ort' strategy.
Merging rcu/rcu/next (409db57c8d45 Merge branch 'lkmm.2022.05.03a' into HEAD)
$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next
Merge made by the 'ort' strategy.
Merging kvm/next (85165781c5d9 KVM: Do not pin pages tracked by gfn=>pfn caches)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
Already up to date.
Merging kvm-arm/next (5c0ad551e9aa Merge branch kvm-arm64/its-save-restore-fixes-5.19 into kvmarm-master/next)
$ 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 (b1edf7f159a6 KVM: s390: selftests: Use TAP interface in the reset test)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
Auto-merging Documentation/virt/kvm/api.rst
Merge made by the 'ort' strategy.
Documentation/virt/kvm/api.rst | 162 +++++++++++++++-
Documentation/virt/kvm/s390/index.rst | 1 +
Documentation/virt/kvm/s390/s390-pv-dump.rst | 64 +++++++
arch/s390/boot/uv.c | 4 +
arch/s390/include/asm/kvm_host.h | 1 +
arch/s390/include/asm/uv.h | 45 ++++-
arch/s390/kernel/uv.c | 53 ++++++
arch/s390/kvm/kvm-s390.c | 269 +++++++++++++++++++++++++++
arch/s390/kvm/kvm-s390.h | 5 +
arch/s390/kvm/pv.c | 198 ++++++++++++++++++++
include/uapi/linux/kvm.h | 55 ++++++
11 files changed, 854 insertions(+), 3 deletions(-)
create mode 100644 Documentation/virt/kvm/s390/s390-pv-dump.rst
Merging xen-tip/linux-next (41925b105e34 xen: replace xen_remap() with memremap())
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
Auto-merging MAINTAINERS
Auto-merging arch/x86/include/asm/xen/page.h
Auto-merging drivers/block/xen-blkfront.c
Auto-merging include/xen/arm/page.h
Merge made by the 'ort' strategy.
MAINTAINERS | 18 ++++++++++++------
arch/x86/include/asm/xen/page.h | 3 ---
drivers/block/xen-blkfront.c | 6 +++---
drivers/input/misc/xen-kbdfront.c | 4 ++--
drivers/net/xen-netfront.c | 7 +++----
drivers/tty/hvc/hvc_xen.c | 2 +-
drivers/xen/gntalloc.c | 9 +++------
drivers/xen/gntdev-dmabuf.c | 2 +-
drivers/xen/grant-table.c | 14 +++++++-------
drivers/xen/pvcalls-front.c | 6 +++---
drivers/xen/xen-front-pgdir-shbuf.c | 2 +-
drivers/xen/xenbus/xenbus_client.c | 2 +-
drivers/xen/xenbus/xenbus_probe.c | 8 ++++----
include/xen/arm/page.h | 3 ---
include/xen/grant_table.h | 6 +++---
net/9p/trans_xen.c | 8 ++++----
16 files changed, 48 insertions(+), 52 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 (10a5a651e3af workqueue: Restrict kworker in the offline CPU pool running on housekeeping CPUs)
$ 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 (badb81a58b9e platform/x86/intel/ifs: Add CPU_SUP_INTEL dependency)
$ 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 (abd4fd43f2af platform/chrome: Use imperative mood for ChromeOS ACPI sysfs ABI descriptions)
$ 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 (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
Merge made by the 'ort' strategy.
drivers/hsi/clients/ssi_protocol.c | 1 -
drivers/hsi/controllers/omap_ssi_core.c | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
Merging leds/for-next (e98a860f6542 leds: qcom-lpg: Require pattern to follow documentation)
$ 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 (a508e33956b5 ipmi:ipmb: Fix refcount leak in ipmi_ipmb_probe)
$ 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 (b232b02bf3c2 driver core: fix deadlock in __device_attach)
$ 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
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Auto-merging MAINTAINERS
Auto-merging drivers/amba/bus.c
Auto-merging drivers/base/core.c
Auto-merging drivers/base/dd.c
Auto-merging drivers/base/firmware_loader/main.c
Auto-merging drivers/base/platform.c
Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c
Auto-merging drivers/clk/imx/clk-scu.c
Auto-merging drivers/hv/vmbus_drv.c
Auto-merging drivers/spi/spi.c
Auto-merging include/linux/amba/bus.h
Auto-merging include/linux/device.h
Auto-merging include/linux/export.h
Auto-merging include/linux/fsl/mc.h
Auto-merging include/linux/hyperv.h
Auto-merging include/linux/pci.h
Auto-merging include/linux/platform_device.h
Auto-merging include/linux/spi/spi.h
Merge made by the 'ort' strategy.
Documentation/ABI/testing/sysfs-class-firmware | 77 ++++
.../ABI/testing/sysfs-devices-physical_location | 42 ++
Documentation/admin-guide/kernel-parameters.txt | 11 +-
Documentation/driver-api/firmware/fw_upload.rst | 126 ++++++
Documentation/driver-api/firmware/index.rst | 1 +
MAINTAINERS | 1 +
drivers/amba/bus.c | 28 +-
drivers/base/Makefile | 1 +
drivers/base/arch_topology.c | 5 +
drivers/base/base.h | 1 +
drivers/base/bus.c | 4 +-
drivers/base/core.c | 15 +
drivers/base/dd.c | 44 ++-
drivers/base/driver.c | 70 ++++
drivers/base/firmware_loader/Kconfig | 42 +-
drivers/base/firmware_loader/Makefile | 2 +
drivers/base/firmware_loader/fallback.c | 430 ---------------------
drivers/base/firmware_loader/fallback.h | 46 +--
drivers/base/firmware_loader/firmware.h | 16 +
drivers/base/firmware_loader/main.c | 94 ++++-
drivers/base/firmware_loader/sysfs.c | 422 ++++++++++++++++++++
drivers/base/firmware_loader/sysfs.h | 117 ++++++
drivers/base/firmware_loader/sysfs_upload.c | 397 +++++++++++++++++++
drivers/base/firmware_loader/sysfs_upload.h | 41 ++
drivers/base/physical_location.c | 143 +++++++
drivers/base/physical_location.h | 16 +
drivers/base/platform.c | 34 +-
drivers/bus/fsl-mc/fsl-mc-bus.c | 25 +-
drivers/clk/imx/clk-scu.c | 7 +-
drivers/firmware/edd.c | 3 +-
drivers/hv/vmbus_drv.c | 28 +-
drivers/pci/pci-sysfs.c | 28 +-
drivers/rpmsg/rpmsg_core.c | 42 +-
drivers/rpmsg/rpmsg_internal.h | 5 +-
drivers/rpmsg/rpmsg_ns.c | 4 +-
drivers/s390/cio/cio.h | 6 +-
drivers/s390/cio/css.c | 28 +-
drivers/slimbus/qcom-ngd-ctrl.c | 13 +-
drivers/spi/spi.c | 26 +-
drivers/vdpa/vdpa.c | 29 +-
fs/kernfs/dir.c | 31 +-
fs/kernfs/file.c | 47 ++-
include/linux/amba/bus.h | 6 +-
include/linux/device.h | 73 ++++
include/linux/device/driver.h | 2 +
include/linux/export.h | 7 +-
include/linux/firmware.h | 82 ++++
include/linux/fsl/mc.h | 6 +-
include/linux/hyperv.h | 6 +-
include/linux/pci.h | 6 +-
include/linux/platform_device.h | 6 +-
include/linux/rpmsg.h | 14 +-
include/linux/spi/spi.h | 2 +
include/linux/vdpa.h | 4 +-
include/trace/events/thermal_pressure.h | 29 ++
lib/test_firmware.c | 381 ++++++++++++++++++
scripts/get_abi.pl | 4 +-
tools/testing/selftests/firmware/Makefile | 2 +-
tools/testing/selftests/firmware/config | 1 +
tools/testing/selftests/firmware/fw_filesystem.sh | 170 ++++----
tools/testing/selftests/firmware/fw_lib.sh | 19 +-
tools/testing/selftests/firmware/fw_run_tests.sh | 4 +
tools/testing/selftests/firmware/fw_upload.sh | 214 ++++++++++
63 files changed, 2733 insertions(+), 853 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-class-firmware
create mode 100644 Documentation/ABI/testing/sysfs-devices-physical_location
create mode 100644 Documentation/driver-api/firmware/fw_upload.rst
create mode 100644 drivers/base/firmware_loader/sysfs.c
create mode 100644 drivers/base/firmware_loader/sysfs.h
create mode 100644 drivers/base/firmware_loader/sysfs_upload.c
create mode 100644 drivers/base/firmware_loader/sysfs_upload.h
create mode 100644 drivers/base/physical_location.c
create mode 100644 drivers/base/physical_location.h
create mode 100644 include/trace/events/thermal_pressure.h
create mode 100755 tools/testing/selftests/firmware/fw_upload.sh
Merging usb/usb-next (97fa5887cf28 USB: new quirk for Dell Gen 2 devices)
$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
Auto-merging Documentation/devicetree/bindings/usb/dwc2.yaml
Auto-merging arch/arm/boot/dts/qcom-ipq4019.dtsi
Auto-merging arch/arm/boot/dts/qcom-sdx55.dtsi
Auto-merging arch/arm64/boot/dts/qcom/apq8096-db820c.dts
Auto-merging arch/arm64/boot/dts/qcom/ipq6018.dtsi
Auto-merging arch/arm64/boot/dts/qcom/ipq8074.dtsi
Auto-merging arch/arm64/boot/dts/qcom/msm8953.dtsi
Auto-merging arch/arm64/boot/dts/qcom/msm8994.dtsi
Auto-merging arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi
Auto-merging arch/arm64/boot/dts/qcom/msm8998.dtsi
Auto-merging arch/arm64/boot/dts/qcom/qcs404.dtsi
Auto-merging arch/arm64/boot/dts/qcom/sc7180.dtsi
Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi
Auto-merging arch/arm64/boot/dts/qcom/sdm630.dtsi
Auto-merging arch/arm64/boot/dts/qcom/sdm845.dtsi
Auto-merging arch/arm64/boot/dts/qcom/sm6350.dtsi
Auto-merging arch/arm64/boot/dts/qcom/sm8150.dtsi
Auto-merging arch/arm64/boot/dts/qcom/sm8250.dtsi
Auto-merging arch/arm64/boot/dts/qcom/sm8350.dtsi
Auto-merging arch/arm64/boot/dts/qcom/sm8450.dtsi
Auto-merging arch/mips/boot/dts/ingenic/x1000.dtsi
Auto-merging arch/mips/boot/dts/ingenic/x1830.dtsi
Auto-merging drivers/base/property.c
Auto-merging drivers/net/usb/cdc_ncm.c
Auto-merging drivers/net/usb/lan78xx.c
Auto-merging drivers/net/usb/rndis_host.c
Auto-merging drivers/net/usb/usbnet.c
Auto-merging drivers/thunderbolt/nhi.c
Auto-merging drivers/thunderbolt/test.c
CONFLICT (content): Merge conflict in drivers/thunderbolt/test.c
Auto-merging drivers/usb/gadget/function/f_uvc.c
Auto-merging drivers/usb/gadget/function/uvc.h
Auto-merging drivers/usb/gadget/legacy/raw_gadget.c
Auto-merging drivers/usb/gadget/udc/omap_udc.c
Auto-merging drivers/usb/host/ohci-omap.c
Auto-merging drivers/usb/serial/option.c
Auto-merging drivers/usb/serial/pl2303.c
Auto-merging include/linux/property.h
Auto-merging include/linux/thunderbolt.h
Auto-merging sound/usb/midi.c
Resolved 'drivers/thunderbolt/test.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 2cab87c4a105] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/testing/configfs-usb-gadget-uvc | 1 +
Documentation/ABI/testing/sysfs-bus-thunderbolt | 10 +
.../devicetree/bindings/usb/am33xx-usb.txt | 7 +-
.../devicetree/bindings/usb/da8xx-usb.txt | 5 +-
Documentation/devicetree/bindings/usb/dwc2.yaml | 7 +
.../devicetree/bindings/usb/dwc3-xilinx.yaml | 4 +
.../devicetree/bindings/usb/fcs,fsa4480.yaml | 72 +++
.../devicetree/bindings/usb/generic-ehci.yaml | 1 +
.../devicetree/bindings/usb/generic-ohci.yaml | 1 +
.../devicetree/bindings/usb/mediatek,mtu3.yaml | 1 +
.../devicetree/bindings/usb/qcom,dwc3.yaml | 227 +++++++-
.../devicetree/bindings/usb/renesas,usbhs.yaml | 4 +
.../bindings/usb/samsung,exynos-usb2.yaml | 15 +-
.../devicetree/bindings/usb/ti,am62-usb.yaml | 103 ++++
Documentation/usb/gadget-testing.rst | 1 +
arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +-
arch/arm/boot/dts/qcom-sdx55.dtsi | 11 +-
arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 18 +-
arch/arm64/boot/dts/qcom/ipq6018.dtsi | 12 +-
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 16 +-
arch/arm64/boot/dts/qcom/msm8953.dtsi | 11 +-
arch/arm64/boot/dts/qcom/msm8994.dtsi | 7 +-
.../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 20 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 23 +-
arch/arm64/boot/dts/qcom/msm8998.dtsi | 13 +-
arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 7 +-
arch/arm64/boot/dts/qcom/qcs404.dtsi | 8 +-
arch/arm64/boot/dts/qcom/sc7180.dtsi | 13 +-
arch/arm64/boot/dts/qcom/sc7280.dtsi | 68 ++-
arch/arm64/boot/dts/qcom/sdm630.dtsi | 12 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 26 +-
arch/arm64/boot/dts/qcom/sm6125.dtsi | 16 +-
arch/arm64/boot/dts/qcom/sm6350.dtsi | 11 +-
arch/arm64/boot/dts/qcom/sm8150.dtsi | 22 +-
arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 +-
arch/arm64/boot/dts/qcom/sm8350.dtsi | 21 +-
arch/arm64/boot/dts/qcom/sm8450.dtsi | 20 +-
arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +-
arch/mips/boot/dts/ingenic/x1000.dtsi | 2 +-
arch/mips/boot/dts/ingenic/x1830.dtsi | 2 +-
drivers/base/property.c | 96 +++-
drivers/hid/usbhid/hid-core.c | 2 +-
drivers/hid/usbhid/usbkbd.c | 2 +-
drivers/hid/usbhid/usbmouse.c | 2 +-
drivers/input/misc/ati_remote2.c | 2 +-
drivers/input/misc/cm109.c | 2 +-
drivers/input/misc/powermate.c | 2 +-
drivers/input/misc/yealink.c | 2 +-
drivers/input/tablet/acecad.c | 2 +-
drivers/input/tablet/pegasus_notetaker.c | 2 +-
drivers/media/rc/ati_remote.c | 4 +-
drivers/media/rc/mceusb.c | 2 +-
drivers/media/rc/streamzap.c | 2 +-
drivers/media/rc/xbox_remote.c | 2 +-
drivers/media/usb/tm6000/tm6000-dvb.c | 2 +-
drivers/media/usb/tm6000/tm6000-input.c | 2 +-
drivers/media/usb/tm6000/tm6000-video.c | 2 +-
drivers/misc/mei/hdcp/mei_hdcp.c | 2 +-
drivers/misc/mei/pxp/mei_pxp.c | 2 +-
drivers/net/usb/cdc_ncm.c | 4 +-
drivers/net/usb/lan78xx.c | 4 +-
drivers/net/usb/rndis_host.c | 2 +-
drivers/net/usb/usbnet.c | 4 +-
drivers/net/wireless/mediatek/mt76/usb.c | 2 +-
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 4 +-
drivers/thunderbolt/ctl.c | 15 +-
drivers/thunderbolt/nhi.c | 2 +-
drivers/thunderbolt/path.c | 6 +
drivers/thunderbolt/switch.c | 109 +++-
drivers/thunderbolt/tb.c | 25 +-
drivers/thunderbolt/tb.h | 6 +-
drivers/thunderbolt/tb_msgs.h | 39 ++
drivers/thunderbolt/tb_regs.h | 5 +
drivers/thunderbolt/test.c | 108 +++-
drivers/thunderbolt/tunnel.c | 18 +-
drivers/thunderbolt/tunnel.h | 4 +-
drivers/thunderbolt/usb4_port.c | 38 ++
drivers/thunderbolt/xdomain.c | 609 ++++++++++++++++++---
drivers/usb/atm/usbatm.c | 2 +-
drivers/usb/c67x00/c67x00-drv.c | 6 +-
drivers/usb/c67x00/c67x00-sched.c | 4 +-
drivers/usb/cdns3/cdns3-gadget.c | 47 +-
drivers/usb/cdns3/cdns3-gadget.h | 9 +-
drivers/usb/core/devices.c | 47 --
drivers/usb/core/driver.c | 25 +-
drivers/usb/core/hcd-pci.c | 5 +-
drivers/usb/core/hcd.c | 29 +-
drivers/usb/core/hub.c | 10 +-
drivers/usb/core/quirks.c | 3 +
drivers/usb/core/usb-acpi.c | 7 +-
drivers/usb/dwc2/core.c | 9 +
drivers/usb/dwc2/core.h | 5 +
drivers/usb/dwc2/gadget.c | 1 -
drivers/usb/dwc2/params.c | 50 +-
drivers/usb/dwc3/Kconfig | 9 +
drivers/usb/dwc3/Makefile | 1 +
drivers/usb/dwc3/core.c | 81 ++-
drivers/usb/dwc3/core.h | 2 +
drivers/usb/dwc3/drd.c | 50 --
drivers/usb/dwc3/dwc3-am62.c | 332 +++++++++++
drivers/usb/dwc3/dwc3-pci.c | 2 +-
drivers/usb/dwc3/dwc3-xilinx.c | 17 +
drivers/usb/dwc3/ep0.c | 14 +-
drivers/usb/dwc3/gadget.c | 190 ++++---
drivers/usb/dwc3/gadget.h | 2 +
drivers/usb/dwc3/host.c | 2 -
drivers/usb/gadget/composite.c | 2 +-
drivers/usb/gadget/configfs.c | 2 +-
drivers/usb/gadget/function/f_acm.c | 10 +
drivers/usb/gadget/function/f_uvc.c | 5 +-
drivers/usb/gadget/function/u_audio.c | 4 +-
drivers/usb/gadget/function/u_uvc.h | 1 +
drivers/usb/gadget/function/uvc.h | 1 +
drivers/usb/gadget/function/uvc_configfs.c | 189 +++----
drivers/usb/gadget/function/uvc_configfs.h | 120 +++-
drivers/usb/gadget/function/uvc_queue.c | 30 +-
drivers/usb/gadget/function/uvc_queue.h | 3 +-
drivers/usb/gadget/function/uvc_video.c | 17 +-
drivers/usb/gadget/legacy/dbgp.c | 2 +-
drivers/usb/gadget/legacy/inode.c | 2 +-
drivers/usb/gadget/legacy/raw_gadget.c | 4 +-
drivers/usb/gadget/udc/core.c | 289 +++++-----
drivers/usb/gadget/udc/net2272.c | 6 +-
drivers/usb/gadget/udc/net2280.c | 14 +-
drivers/usb/gadget/udc/omap_udc.c | 2 +-
drivers/usb/gadget/udc/pxa27x_udc.h | 2 +-
drivers/usb/gadget/udc/s3c-hsudc.c | 4 +-
drivers/usb/gadget/udc/tegra-xudc.c | 4 +-
drivers/usb/gadget/udc/udc-xilinx.c | 2 +-
drivers/usb/host/ehci-omap.c | 5 -
drivers/usb/host/ehci-platform.c | 1 +
drivers/usb/host/ehci-q.c | 4 +-
drivers/usb/host/ehci-xilinx-of.c | 12 +-
drivers/usb/host/fhci-hcd.c | 3 +-
drivers/usb/host/fotg210-hcd.c | 2 +-
drivers/usb/host/isp116x-hcd.c | 11 +-
drivers/usb/host/isp1362-hcd.c | 6 +-
drivers/usb/host/max3421-hcd.c | 6 +-
drivers/usb/host/ohci-hcd.c | 3 +-
drivers/usb/host/ohci-platform.c | 1 +
drivers/usb/host/ohci-ppc-of.c | 3 -
drivers/usb/host/oxu210hp-hcd.c | 16 +-
drivers/usb/host/r8a66597-hcd.c | 3 +-
drivers/usb/host/sl811-hcd.c | 6 +-
drivers/usb/host/xhci-hub.c | 3 +-
drivers/usb/host/xhci-mem.c | 23 +-
drivers/usb/host/xhci-pci.c | 5 +-
drivers/usb/host/xhci-plat.c | 46 +-
drivers/usb/host/xhci-ring.c | 144 ++---
drivers/usb/host/xhci.c | 175 +++---
drivers/usb/host/xhci.h | 30 +-
drivers/usb/isp1760/isp1760-core.c | 8 +
drivers/usb/isp1760/isp1760-hcd.c | 6 +-
drivers/usb/misc/ftdi-elan.c | 15 +-
drivers/usb/misc/lvstest.c | 2 +-
drivers/usb/musb/mediatek.c | 73 +--
drivers/usb/musb/omap2430.c | 1 +
drivers/usb/serial/ftdi_sio.c | 2 +-
drivers/usb/serial/option.c | 2 +
drivers/usb/serial/pl2303.c | 3 +
drivers/usb/storage/alauda.c | 4 +-
drivers/usb/storage/isd200.c | 8 +-
drivers/usb/storage/karma.c | 15 +-
drivers/usb/storage/onetouch.c | 2 +-
drivers/usb/storage/shuttle_usbat.c | 28 +-
drivers/usb/storage/transport.c | 2 +-
drivers/usb/typec/bus.c | 2 +-
drivers/usb/typec/mux.c | 271 ++++++---
drivers/usb/typec/mux.h | 12 +-
drivers/usb/typec/mux/Kconfig | 10 +
drivers/usb/typec/mux/Makefile | 1 +
drivers/usb/typec/mux/fsa4480.c | 218 ++++++++
drivers/usb/typec/mux/intel_pmc_mux.c | 29 +-
drivers/usb/typec/mux/pi3usb30532.c | 8 +-
drivers/usb/typec/tipd/core.c | 32 +-
drivers/usb/typec/ucsi/ucsi.c | 85 +--
drivers/usb/typec/ucsi/ucsi.h | 6 +-
drivers/usb/usbip/stub_dev.c | 2 +-
drivers/usb/usbip/stub_rx.c | 2 +
include/linux/property.h | 5 +
include/linux/thunderbolt.h | 19 +-
include/linux/usb.h | 17 +-
include/linux/usb/gadget.h | 28 +-
include/linux/usb/hcd.h | 2 +
include/linux/usb/typec_mux.h | 22 +-
sound/usb/line6/pcm.c | 4 +-
sound/usb/midi.c | 4 +-
sound/usb/usx2y/usb_stream.c | 6 +-
sound/usb/usx2y/usbusx2yaudio.c | 2 +-
sound/usb/usx2y/usx2yhwdeppcm.c | 2 +-
tools/usb/testusb.c | 2 +-
191 files changed, 3652 insertions(+), 1474 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml
create mode 100644 Documentation/devicetree/bindings/usb/ti,am62-usb.yaml
create mode 100644 drivers/usb/dwc3/dwc3-am62.c
create mode 100644 drivers/usb/typec/mux/fsa4480.c
Merging thunderbolt/next (c7c99a09ef0e thunderbolt: Add KUnit test for devices with no DisplayPort adapters)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
Already up to date.
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 (33b7af2f459d USB: serial: option: add Quectel BG95 modem)
$ 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 tty/tty-next (25e02ba60f0f tty: Rework receive flow control char logic)
$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
Auto-merging Documentation/firmware-guide/acpi/enumeration.rst
Auto-merging Documentation/index.rst
Auto-merging MAINTAINERS
Auto-merging drivers/tty/goldfish.c
Auto-merging drivers/tty/serial/8250/8250.h
Auto-merging drivers/tty/serial/Kconfig
Auto-merging drivers/tty/serial/imx.c
Auto-merging drivers/tty/sysrq.c
Merge made by the 'ort' strategy.
.../devicetree/bindings/serial/fsl-lpuart.yaml | 4 +-
.../bindings/serial/qcom,serial-geni-qcom.yaml | 86 ++++
.../bindings/serial/renesas,em-uart.yaml | 37 +-
.../devicetree/bindings/serial/renesas,hscif.yaml | 9 +-
.../devicetree/bindings/serial/renesas,scif.yaml | 2 +-
.../devicetree/bindings/serial/rs485.yaml | 5 +
.../bindings/serial/socionext,uniphier-uart.yaml | 5 +-
Documentation/driver-api/index.rst | 1 +
Documentation/driver-api/serial/driver.rst | 2 +-
Documentation/driver-api/serial/index.rst | 2 -
Documentation/driver-api/serial/n_gsm.rst | 159 ------
Documentation/{ => driver-api}/tty/index.rst | 22 +-
.../driver-api/{serial => tty}/moxa-smartio.rst | 0
Documentation/driver-api/tty/n_gsm.rst | 153 ++++++
Documentation/{ => driver-api}/tty/n_tty.rst | 0
Documentation/{ => driver-api}/tty/tty_buffer.rst | 0
Documentation/{ => driver-api}/tty/tty_driver.rst | 0
.../{ => driver-api}/tty/tty_internals.rst | 0
Documentation/{ => driver-api}/tty/tty_ldisc.rst | 0
Documentation/{ => driver-api}/tty/tty_port.rst | 0
Documentation/{ => driver-api}/tty/tty_struct.rst | 0
Documentation/firmware-guide/acpi/enumeration.rst | 25 +
Documentation/index.rst | 1 -
Documentation/misc-devices/index.rst | 1 +
Documentation/misc-devices/oxsemi-tornado.rst | 131 +++++
MAINTAINERS | 2 +-
arch/alpha/include/uapi/asm/termbits.h | 214 +++-----
arch/mips/include/uapi/asm/termbits.h | 249 ++++------
arch/parisc/include/uapi/asm/termbits.h | 241 ++++-----
arch/powerpc/include/uapi/asm/termbits.h | 182 +++----
arch/sparc/include/uapi/asm/termbits.h | 223 ++++-----
drivers/char/Kconfig | 3 +-
drivers/char/pcmcia/synclink_cs.c | 8 +-
drivers/char/ttyprintk.c | 16 +
drivers/tty/amiserial.c | 2 -
drivers/tty/goldfish.c | 2 +
drivers/tty/hvc/Kconfig | 19 +
drivers/tty/hvc/hvc_dcc.c | 194 +++++++-
drivers/tty/hvc/hvc_opal.c | 6 +-
drivers/tty/hvc/hvc_vio.c | 2 +-
drivers/tty/hvc/hvcs.c | 5 +-
drivers/tty/hvc/hvsi.c | 2 +-
drivers/tty/mxser.c | 5 +-
drivers/tty/n_gsm.c | 37 +-
drivers/tty/n_tty.c | 73 ++-
drivers/tty/serial/8250/8250.h | 41 ++
drivers/tty/serial/8250/8250_aspeed_vuart.c | 2 +
drivers/tty/serial/8250/8250_core.c | 1 -
drivers/tty/serial/8250/8250_dma.c | 7 +-
drivers/tty/serial/8250/8250_dw.c | 229 ++++++---
drivers/tty/serial/8250/8250_dwlib.c | 116 ++++-
drivers/tty/serial/8250/8250_dwlib.h | 51 ++
drivers/tty/serial/8250/8250_fintek.c | 8 +-
drivers/tty/serial/8250/8250_mtk.c | 7 -
drivers/tty/serial/8250/8250_of.c | 2 +
drivers/tty/serial/8250/8250_pci.c | 480 ++++++++++++------
drivers/tty/serial/8250/8250_port.c | 140 ++++--
drivers/tty/serial/8250/8250_pxa.c | 1 -
drivers/tty/serial/8250/Kconfig | 2 +-
drivers/tty/serial/Kconfig | 9 +-
drivers/tty/serial/altera_jtaguart.c | 6 +-
drivers/tty/serial/amba-pl011.c | 48 +-
drivers/tty/serial/amba-pl011.h | 35 --
drivers/tty/serial/atmel_serial.c | 4 +-
drivers/tty/serial/cpm_uart/cpm_uart.h | 2 +
drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 +-
drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c | 1 -
drivers/tty/serial/digicolor-usart.c | 2 +
drivers/tty/serial/fsl_lpuart.c | 66 +--
drivers/tty/serial/icom.c | 538 +++++++++++++++------
drivers/tty/serial/icom.h | 274 -----------
drivers/tty/serial/imx.c | 2 -
drivers/tty/serial/jsm/jsm_cls.c | 8 +-
drivers/tty/serial/jsm/jsm_neo.c | 8 +-
drivers/tty/serial/max310x.c | 1 -
drivers/tty/serial/men_z135_uart.c | 1 -
drivers/tty/serial/meson_uart.c | 40 +-
drivers/tty/serial/mpc52xx_uart.c | 5 +-
drivers/tty/serial/msm_serial.c | 5 +
drivers/tty/serial/omap-serial.c | 13 +-
drivers/tty/serial/owl-uart.c | 7 +-
drivers/tty/serial/pch_uart.c | 77 +--
drivers/tty/serial/pic32_uart.c | 159 ++++--
drivers/tty/serial/pic32_uart.h | 125 -----
drivers/tty/serial/pmac_zilog.c | 69 +--
drivers/tty/serial/pmac_zilog.h | 11 -
drivers/tty/serial/qcom_geni_serial.c | 58 ++-
drivers/tty/serial/rda-uart.c | 2 +
drivers/tty/serial/sa1100.c | 4 +-
drivers/tty/serial/samsung_tty.c | 13 +
drivers/tty/serial/sc16is7xx.c | 10 -
drivers/tty/serial/serial_core.c | 89 +++-
drivers/tty/serial/serial_txx9.c | 2 +
drivers/tty/serial/sh-sci.c | 6 +-
drivers/tty/serial/sifive.c | 20 +-
drivers/tty/serial/st-asc.c | 4 +
drivers/tty/serial/stm32-usart.c | 225 +++++++--
drivers/tty/serial/stm32-usart.h | 3 +
drivers/tty/serial/sunplus-uart.c | 2 +-
drivers/tty/serial/sunsu.c | 2 -
drivers/tty/serial/uartlite.c | 3 +-
drivers/tty/serial/xilinx_uartps.c | 46 +-
drivers/tty/serial/zs.c | 2 +-
drivers/tty/synclink_gt.c | 2 +
drivers/tty/sysrq.c | 27 +-
drivers/tty/tty_baudrate.c | 35 +-
drivers/tty/tty_ioctl.c | 2 -
drivers/usb/class/cdc-acm.h | 8 -
drivers/usb/serial/ark3116.c | 3 +-
drivers/usb/serial/whiteheat.c | 4 -
include/linux/serial_core.h | 1 +
include/linux/serial_s3c.h | 3 +
include/uapi/asm-generic/termbits-common.h | 65 +++
include/uapi/asm-generic/termbits.h | 239 ++++-----
114 files changed, 3164 insertions(+), 2451 deletions(-)
create mode 100644 Documentation/devicetree/bindings/serial/qcom,serial-geni-qcom.yaml
delete mode 100644 Documentation/driver-api/serial/n_gsm.rst
rename Documentation/{ => driver-api}/tty/index.rst (81%)
rename Documentation/driver-api/{serial => tty}/moxa-smartio.rst (100%)
create mode 100644 Documentation/driver-api/tty/n_gsm.rst
rename Documentation/{ => driver-api}/tty/n_tty.rst (100%)
rename Documentation/{ => driver-api}/tty/tty_buffer.rst (100%)
rename Documentation/{ => driver-api}/tty/tty_driver.rst (100%)
rename Documentation/{ => driver-api}/tty/tty_internals.rst (100%)
rename Documentation/{ => driver-api}/tty/tty_ldisc.rst (100%)
rename Documentation/{ => driver-api}/tty/tty_port.rst (100%)
rename Documentation/{ => driver-api}/tty/tty_struct.rst (100%)
create mode 100644 Documentation/misc-devices/oxsemi-tornado.rst
delete mode 100644 drivers/tty/serial/amba-pl011.h
delete mode 100644 drivers/tty/serial/icom.h
delete mode 100644 drivers/tty/serial/pic32_uart.h
create mode 100644 include/uapi/asm-generic/termbits-common.h
Merging char-misc/char-misc-next (90de6805267f habanalabs: use separate structure info for each error collect data)
$ 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
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Auto-merging drivers/android/binder.c
Auto-merging drivers/bus/ti-sysc.c
Auto-merging drivers/char/pcmcia/synclink_cs.c
Auto-merging drivers/iio/accel/mma8452.c
Auto-merging drivers/iio/afe/iio-rescale.c
Auto-merging drivers/iio/gyro/mpu3050-core.c
Auto-merging drivers/iio/trigger/iio-trig-sysfs.c
Auto-merging drivers/misc/lkdtm/stackleak.c
CONFLICT (content): Merge conflict in drivers/misc/lkdtm/stackleak.c
Auto-merging drivers/slimbus/qcom-ctrl.c
CONFLICT (content): Merge conflict in drivers/slimbus/qcom-ctrl.c
Auto-merging drivers/slimbus/qcom-ngd-ctrl.c
Auto-merging drivers/usb/dwc3/drd.c
CONFLICT (content): Merge conflict in drivers/usb/dwc3/drd.c
Auto-merging scripts/mod/file2alias.c
Auto-merging tools/testing/selftests/filesystems/binderfs/binderfs_test.c
Resolved 'MAINTAINERS' using previous resolution.
Resolved 'drivers/misc/lkdtm/stackleak.c' using previous resolution.
Resolved 'drivers/slimbus/qcom-ctrl.c' using previous resolution.
Resolved 'drivers/usb/dwc3/drd.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 46f164d795cd] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/stable/sysfs-bus-mhi | 10 +
.../ABI/testing/debugfs-driver-habanalabs | 38 +
.../bindings/extcon/siliconmitus,sm5502-muic.yaml | 5 +-
.../bindings/iio/adc/renesas,rzg2l-adc.yaml | 3 +-
.../bindings/iio/adc/sprd,sc2720-adc.yaml | 60 +-
.../devicetree/bindings/iio/adc/ti,ads1015.yaml | 7 +-
.../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 2 +-
.../devicetree/bindings/iio/dac/lltc,ltc2632.yaml | 2 +-
.../bindings/iio/imu/invensense,mpu6050.yaml | 34 +-
.../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 38 +-
.../devicetree/bindings/iio/light/stk33xx.yaml | 6 +
.../iio/potentiometer/microchip,mcp4131.yaml | 2 +-
.../devicetree/bindings/iio/st,st-sensors.yaml | 1 +
.../bindings/interconnect/qcom,rpmh.yaml | 18 +-
.../devicetree/bindings/nvmem/apple,efuses.yaml | 50 +
.../bindings/nvmem/fsl,layerscape-sfp.yaml | 30 +-
.../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 12 +
.../bindings/phy/marvell,armada-3700-utmi-phy.yaml | 2 +-
.../devicetree/bindings/phy/mixel,mipi-dsi-phy.txt | 29 -
.../bindings/phy/mixel,mipi-dsi-phy.yaml | 107 +
.../devicetree/bindings/phy/qcom,qmp-phy.yaml | 4 +
.../devicetree/bindings/phy/renesas,usb2-phy.yaml | 1 +
.../bindings/phy/socionext,uniphier-ahci-phy.yaml | 91 +-
.../bindings/phy/socionext,uniphier-pcie-phy.yaml | 47 +-
.../bindings/phy/socionext,uniphier-usb2-phy.yaml | 3 +
.../phy/socionext,uniphier-usb3hs-phy.yaml | 89 +-
.../phy/socionext,uniphier-usb3ss-phy.yaml | 98 +-
.../devicetree/bindings/soundwire/qcom,sdw.txt | 14 +
Documentation/fpga/dfl.rst | 5 +
MAINTAINERS | 18 +-
drivers/accessibility/speakup/fakekey.c | 4 +-
drivers/accessibility/speakup/serialio.c | 2 +-
drivers/accessibility/speakup/speakup_acntpc.c | 2 +-
drivers/accessibility/speakup/speakup_acntsa.c | 2 +-
drivers/accessibility/speakup/speakup_apollo.c | 2 +-
drivers/accessibility/speakup/speakup_audptr.c | 2 +-
drivers/accessibility/speakup/speakup_bns.c | 2 +-
drivers/accessibility/speakup/speakup_decext.c | 2 +-
drivers/accessibility/speakup/speakup_dectlk.c | 2 +-
drivers/accessibility/speakup/speakup_dtlk.c | 2 +-
drivers/accessibility/speakup/speakup_dummy.c | 2 +-
drivers/accessibility/speakup/speakup_keypc.c | 2 +-
drivers/accessibility/speakup/speakup_ltlk.c | 2 +-
drivers/accessibility/speakup/speakup_soft.c | 3 +-
drivers/accessibility/speakup/speakup_spkout.c | 2 +-
drivers/accessibility/speakup/speakup_txprt.c | 2 +-
drivers/android/binder.c | 197 +-
drivers/android/binder_alloc.c | 22 +-
drivers/android/binder_internal.h | 5 +
drivers/android/binderfs.c | 8 +
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 ++
drivers/bus/mhi/host/boot.c | 22 +-
drivers/bus/mhi/host/init.c | 89 +-
drivers/bus/mhi/host/internal.h | 7 +-
drivers/bus/mhi/host/main.c | 18 +-
drivers/bus/mhi/host/pci_generic.c | 133 +-
drivers/bus/mhi/host/pm.c | 24 +-
drivers/bus/ti-sysc.c | 4 +-
drivers/char/mem.c | 2 +-
drivers/char/misc.c | 24 +-
drivers/char/pcmcia/synclink_cs.c | 2 +-
drivers/char/xillybus/xillybus_class.c | 26 +-
drivers/char/xillybus/xillyusb.c | 1 +
drivers/comedi/drivers.c | 2 +-
drivers/dio/dio.c | 5 +-
drivers/extcon/Kconfig | 3 +-
drivers/extcon/extcon-axp288.c | 4 +-
drivers/extcon/extcon-intel-int3496.c | 54 +-
drivers/extcon/extcon-ptn5150.c | 36 +
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 | 37 +-
drivers/firmware/dmi-sysfs.c | 2 +-
drivers/firmware/stratix10-svc.c | 12 +-
drivers/firmware/xilinx/zynqmp.c | 131 +-
drivers/fpga/Makefile | 6 +-
drivers/fpga/dfl-pci.c | 9 +
drivers/fpga/dfl.c | 38 +-
drivers/fpga/dfl.h | 1 +
drivers/fpga/fpga-mgr.c | 13 +-
drivers/fpga/fpga-region.c | 6 +-
drivers/fpga/of-fpga-region.c | 22 +-
drivers/hwtracing/coresight/coresight-core.c | 33 +-
drivers/hwtracing/coresight/coresight-cpu-debug.c | 7 +-
drivers/hwtracing/coresight/coresight-etm3x-core.c | 2 +-
.../hwtracing/coresight/coresight-etm3x-sysfs.c | 2 +-
drivers/hwtracing/coresight/coresight-etm4x-core.c | 136 +-
.../hwtracing/coresight/coresight-etm4x-sysfs.c | 180 +-
drivers/hwtracing/coresight/coresight-etm4x.h | 120 +-
drivers/iio/accel/Kconfig | 1 -
drivers/iio/accel/adxl355_core.c | 7 +-
drivers/iio/accel/adxl367.c | 1 -
drivers/iio/accel/bmc150-accel-core.c | 4 +-
drivers/iio/accel/dmard09.c | 2 +-
drivers/iio/accel/fxls8962af-core.c | 1 -
drivers/iio/accel/kxsd9-spi.c | 4 +-
drivers/iio/accel/mma8452.c | 1 +
drivers/iio/accel/sca3000.c | 1 -
drivers/iio/accel/ssp_accel_sensor.c | 1 -
drivers/iio/accel/st_accel.h | 28 +-
drivers/iio/accel/st_accel_core.c | 14 +-
drivers/iio/accel/st_accel_i2c.c | 5 +
drivers/iio/accel/st_accel_spi.c | 5 +
drivers/iio/adc/Kconfig | 2 +-
drivers/iio/adc/ad7124.c | 86 +-
drivers/iio/adc/ad7192.c | 68 +-
drivers/iio/adc/ad7266.c | 44 +-
drivers/iio/adc/ad7280a.c | 2 +-
drivers/iio/adc/ad_sigma_delta.c | 143 +-
drivers/iio/adc/at91-sama5d2_adc.c | 4 +-
drivers/iio/adc/ina2xx-adc.c | 3 +-
drivers/iio/adc/palmas_gpadc.c | 3 +-
drivers/iio/adc/sc27xx_adc.c | 470 +++-
drivers/iio/adc/stm32-dfsdm-adc.c | 5 +-
drivers/iio/adc/stmpe-adc.c | 21 +-
drivers/iio/adc/ti-ads1015.c | 398 ++--
drivers/iio/adc/ti-ads8688.c | 1 +
drivers/iio/adc/ti_am335x_adc.c | 4 +-
drivers/iio/afe/Kconfig | 1 -
drivers/iio/afe/iio-rescale.c | 5 +-
drivers/iio/buffer/kfifo_buf.c | 10 +-
.../common/cros_ec_sensors/cros_ec_sensors_core.c | 5 +-
drivers/iio/common/scmi_sensors/scmi_iio.c | 1 -
drivers/iio/common/ssp_sensors/ssp_spi.c | 13 +-
drivers/iio/common/st_sensors/st_sensors_core.c | 50 +-
drivers/iio/dac/Kconfig | 4 +-
drivers/iio/dac/ad5064.c | 2 +-
drivers/iio/dac/ad5360.c | 2 +-
drivers/iio/dac/ad5380.c | 2 +-
drivers/iio/dac/ad5446.c | 2 +-
drivers/iio/dac/ad5504.c | 2 +-
drivers/iio/dac/ad5624r_spi.c | 2 +-
drivers/iio/dac/ad5686.c | 2 +-
drivers/iio/dac/ad5755.c | 2 +-
drivers/iio/dac/ad5791.c | 2 +-
drivers/iio/dac/ad7303.c | 2 +-
drivers/iio/dac/ltc2632.c | 8 +-
drivers/iio/dac/ltc2688.c | 19 +-
drivers/iio/dac/max5821.c | 2 +-
drivers/iio/dac/mcp4725.c | 4 +-
drivers/iio/dac/stm32-dac.c | 2 +-
drivers/iio/dac/ti-dac082s085.c | 2 +-
drivers/iio/dac/ti-dac5571.c | 2 +-
drivers/iio/dac/ti-dac7311.c | 2 +-
drivers/iio/dummy/iio_simple_dummy.c | 20 +-
drivers/iio/frequency/ad9523.c | 2 +-
drivers/iio/gyro/fxas21002c_core.c | 8 +-
drivers/iio/gyro/mpu3050-core.c | 14 +-
drivers/iio/gyro/mpu3050-i2c.c | 4 +-
drivers/iio/gyro/mpu3050.h | 2 +-
drivers/iio/gyro/ssp_gyro_sensor.c | 1 -
drivers/iio/gyro/st_gyro_core.c | 15 +-
drivers/iio/health/max30100.c | 1 -
drivers/iio/health/max30102.c | 1 -
drivers/iio/imu/adis16480.c | 91 +-
drivers/iio/imu/bmi160/bmi160_core.c | 27 +-
drivers/iio/imu/bmi160/bmi160_i2c.c | 13 +-
drivers/iio/imu/bmi160/bmi160_spi.c | 18 +-
drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 1 -
drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 1 -
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/imu/st_lsm6dsx/Kconfig | 6 +-
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 4 +-
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 6 +-
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 +
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 +
drivers/iio/industrialio-buffer.c | 42 +-
drivers/iio/industrialio-core.c | 46 +-
drivers/iio/industrialio-event.c | 2 +-
drivers/iio/industrialio-trigger.c | 2 +-
drivers/iio/light/Kconfig | 1 -
drivers/iio/light/apds9960.c | 1 -
drivers/iio/light/stk3310.c | 25 +
drivers/iio/light/tsl2772.c | 25 +-
drivers/iio/magnetometer/Kconfig | 1 -
drivers/iio/magnetometer/rm3100-core.c | 15 +-
drivers/iio/magnetometer/st_magn_core.c | 15 +-
drivers/iio/multiplexer/Kconfig | 1 -
drivers/iio/multiplexer/iio-mux.c | 49 +-
drivers/iio/pressure/st_pressure_core.c | 8 +-
drivers/iio/proximity/mb1232.c | 8 +-
drivers/iio/proximity/ping.c | 5 +-
drivers/iio/proximity/vl53l0x-i2c.c | 7 +-
drivers/iio/temperature/ltc2983.c | 236 +-
drivers/iio/temperature/max31856.c | 6 +-
drivers/iio/temperature/max31865.c | 4 +-
drivers/iio/trigger/iio-trig-sysfs.c | 11 +-
drivers/interconnect/qcom/Kconfig | 18 +
drivers/interconnect/qcom/Makefile | 4 +
drivers/interconnect/qcom/icc-rpm.c | 16 +-
drivers/interconnect/qcom/icc-rpm.h | 6 +-
drivers/interconnect/qcom/icc-rpmh.c | 2 +-
drivers/interconnect/qcom/icc-rpmh.h | 6 +-
drivers/interconnect/qcom/msm8916.c | 12 +-
drivers/interconnect/qcom/msm8939.c | 16 +-
drivers/interconnect/qcom/msm8974.c | 28 +-
drivers/interconnect/qcom/msm8996.c | 16 +-
drivers/interconnect/qcom/osm-l3.c | 16 +-
drivers/interconnect/qcom/qcm2290.c | 24 +-
drivers/interconnect/qcom/qcs404.c | 12 +-
drivers/interconnect/qcom/sc7180.c | 66 +-
drivers/interconnect/qcom/sc7280.c | 72 +-
drivers/interconnect/qcom/sc8180x.c | 1895 ++++++++++++---
drivers/interconnect/qcom/sc8180x.h | 7 +
drivers/interconnect/qcom/sc8280xp.c | 2438 ++++++++++++++++++++
drivers/interconnect/qcom/sc8280xp.h | 209 ++
drivers/interconnect/qcom/sdm660.c | 24 +-
drivers/interconnect/qcom/sdm845.c | 32 +-
drivers/interconnect/qcom/sdx55.c | 12 +-
drivers/interconnect/qcom/sdx65.c | 231 ++
drivers/interconnect/qcom/sdx65.h | 65 +
drivers/interconnect/qcom/sm8150.c | 66 +-
drivers/interconnect/qcom/sm8250.c | 66 +-
drivers/interconnect/qcom/sm8350.c | 60 +-
drivers/interconnect/qcom/sm8450.c | 68 +-
drivers/misc/altera-stapl/altera.c | 56 +-
drivers/misc/bcm-vk/bcm_vk_msg.c | 29 +-
drivers/misc/cardreader/alcor_pci.c | 6 +-
drivers/misc/cardreader/rts5261.c | 115 +-
drivers/misc/cardreader/rtsx_usb.c | 1 +
drivers/misc/fastrpc.c | 18 +-
drivers/misc/habanalabs/common/Makefile | 2 +-
drivers/misc/habanalabs/common/command_buffer.c | 413 ++--
.../misc/habanalabs/common/command_submission.c | 89 +-
drivers/misc/habanalabs/common/context.c | 4 +-
drivers/misc/habanalabs/common/debugfs.c | 304 ++-
drivers/misc/habanalabs/common/device.c | 280 ++-
drivers/misc/habanalabs/common/firmware_if.c | 86 +-
drivers/misc/habanalabs/common/habanalabs.h | 415 ++--
drivers/misc/habanalabs/common/habanalabs_drv.c | 44 +-
drivers/misc/habanalabs/common/habanalabs_ioctl.c | 108 +-
drivers/misc/habanalabs/common/irq.c | 14 +-
drivers/misc/habanalabs/common/memory.c | 289 +--
drivers/misc/habanalabs/common/memory_mgr.c | 349 +++
drivers/misc/habanalabs/common/mmu/mmu.c | 296 +--
drivers/misc/habanalabs/common/mmu/mmu_v1.c | 297 +--
drivers/misc/habanalabs/common/pci/pci.c | 10 +-
drivers/misc/habanalabs/gaudi/gaudi.c | 412 +---
drivers/misc/habanalabs/gaudi/gaudiP.h | 4 +-
drivers/misc/habanalabs/goya/goya.c | 363 +--
drivers/misc/habanalabs/include/common/cpucp_if.h | 70 +-
.../habanalabs/include/hw_ip/mmu/mmu_general.h | 10 +
drivers/misc/lkdtm/bugs.c | 96 +-
drivers/misc/lkdtm/cfi.c | 145 +-
drivers/misc/lkdtm/core.c | 138 +-
drivers/misc/lkdtm/fortify.c | 17 +-
drivers/misc/lkdtm/heap.c | 48 +-
drivers/misc/lkdtm/lkdtm.h | 142 +-
drivers/misc/lkdtm/perms.c | 47 +-
drivers/misc/lkdtm/powerpc.c | 11 +-
drivers/misc/lkdtm/refcount.c | 65 +-
drivers/misc/lkdtm/stackleak.c | 12 +-
drivers/misc/lkdtm/usercopy.c | 146 +-
drivers/misc/pvpanic/pvpanic.c | 10 +-
drivers/misc/vmw_balloon.c | 4 +-
drivers/misc/vmw_vmci/Kconfig | 2 +-
drivers/misc/vmw_vmci/vmci_context.c | 15 +-
drivers/misc/vmw_vmci/vmci_guest.c | 4 +
drivers/misc/vmw_vmci/vmci_queue_pair.c | 12 +
drivers/nvmem/Kconfig | 13 +
drivers/nvmem/Makefile | 2 +
drivers/nvmem/apple-efuses.c | 80 +
drivers/nvmem/bcm-ocotp.c | 2 +-
drivers/nvmem/brcm_nvram.c | 2 +
drivers/nvmem/core.c | 1 +
drivers/nvmem/layerscape-sfp.c | 36 +-
drivers/nvmem/qfprom.c | 3 +-
drivers/nvmem/sunplus-ocotp.c | 4 +-
drivers/phy/Kconfig | 1 +
drivers/phy/allwinner/phy-sun6i-mipi-dphy.c | 166 +-
drivers/phy/cadence/phy-cadence-sierra.c | 193 +-
drivers/phy/freescale/phy-fsl-imx8-mipi-dphy.c | 276 ++-
drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 10 +-
drivers/phy/mediatek/phy-mtk-hdmi.c | 50 +-
drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 29 +-
drivers/phy/phy-can-transceiver.c | 24 +-
drivers/phy/phy-core.c | 44 +-
drivers/phy/qualcomm/phy-qcom-qmp.c | 124 +-
drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 7 +-
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 129 +-
drivers/phy/rockchip/phy-rockchip-typec.c | 6 +-
drivers/power/supply/axp288_charger.c | 17 +-
drivers/power/supply/charger-manager.c | 7 +-
drivers/power/supply/max8997_charger.c | 8 +-
drivers/slimbus/qcom-ctrl.c | 4 +-
drivers/slimbus/qcom-ngd-ctrl.c | 10 +-
drivers/soc/xilinx/xlnx_event_manager.c | 203 +-
drivers/soc/xilinx/zynqmp_power.c | 7 +-
drivers/soundwire/bus.c | 27 +-
drivers/soundwire/cadence_master.c | 42 +-
drivers/soundwire/intel.c | 11 +-
drivers/soundwire/qcom.c | 22 +-
drivers/soundwire/stream.c | 1 +
drivers/staging/iio/cdc/ad7746.c | 2 +-
drivers/staging/iio/impedance-analyzer/ad5933.c | 1 -
drivers/staging/iio/resolver/ad2s1210.c | 1 -
drivers/uio/uio_dfl.c | 2 +