Google Git
Sign in
kernel / pub / scm / linux / kernel / git / axboe / linux-block / refs/heads/m1-test / . / Next / merge.log
blob: 3c15e0797995695d59c73d61a4d9a87d797659a8 [file] [log] [blame]
$ date -R
Tue, 18 Jan 2022 08:39:25 +1100
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 79e06c4c4950 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Merging origin/master (0c947b893d69 Merge tag '5.17-rc-part1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
Updating 79e06c4c4950..0c947b893d69
Fast-forward (no commit created; -m option ignored)
.../bindings/input/touchscreen/zinitix,bt400.yaml | 115 ++++++
.../bindings/input/touchscreen/zinitix.txt | 40 ---
.../bindings/watchdog/brcm,bcm7038-wdt.txt | 19 -
.../bindings/watchdog/brcm,bcm7038-wdt.yaml | 43 +++
.../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 7 +-
.../devicetree/bindings/watchdog/qcom-wdt.yaml | 2 +
.../bindings/watchdog/realtek,otto-wdt.yaml | 91 +++++
.../devicetree/bindings/watchdog/renesas,wdt.yaml | 75 +++-
.../devicetree/bindings/watchdog/samsung-wdt.yaml | 48 ++-
MAINTAINERS | 21 +-
arch/alpha/kernel/traps.c | 6 +-
arch/alpha/mm/fault.c | 2 +-
arch/arm/kernel/traps.c | 2 +-
arch/arm/mm/fault.c | 2 +-
arch/arm64/kernel/traps.c | 2 +-
arch/arm64/mm/fault.c | 2 +-
arch/csky/abiv1/alignment.c | 2 +-
arch/csky/kernel/traps.c | 2 +-
arch/csky/mm/fault.c | 2 +-
arch/h8300/kernel/traps.c | 3 +-
arch/h8300/mm/fault.c | 2 +-
arch/hexagon/kernel/traps.c | 2 +-
arch/ia64/kernel/mca_drv.c | 2 +-
arch/ia64/kernel/traps.c | 2 +-
arch/ia64/mm/fault.c | 2 +-
arch/m68k/kernel/ptrace.c | 12 +-
arch/m68k/kernel/traps.c | 2 +-
arch/m68k/mm/fault.c | 2 +-
arch/microblaze/kernel/exceptions.c | 4 +-
arch/mips/bcm63xx/dev-wdt.c | 8 +
arch/mips/kernel/traps.c | 2 +-
arch/nds32/kernel/fpu.c | 2 +-
arch/nds32/kernel/traps.c | 8 +-
arch/nios2/kernel/traps.c | 4 +-
arch/openrisc/kernel/traps.c | 2 +-
arch/parisc/kernel/traps.c | 2 +-
arch/powerpc/kernel/traps.c | 8 +-
arch/riscv/kernel/traps.c | 2 +-
arch/riscv/mm/fault.c | 2 +-
arch/s390/kernel/dumpstack.c | 2 +-
arch/s390/kernel/nmi.c | 2 +-
arch/sh/kernel/traps.c | 2 +-
arch/sparc/kernel/traps_32.c | 4 +-
arch/sparc/kernel/traps_64.c | 4 +-
arch/x86/entry/entry_32.S | 6 +-
arch/x86/entry/entry_64.S | 6 +-
arch/x86/kernel/dumpstack.c | 4 +-
arch/xtensa/kernel/entry.S | 2 +-
arch/xtensa/kernel/traps.c | 2 +-
crypto/algboss.c | 4 +-
drivers/base/devtmpfs.c | 7 +
drivers/i3c/master.c | 3 +-
drivers/i3c/master/dw-i3c-master.c | 4 +
drivers/i3c/master/mipi-i3c-hci/core.c | 2 +-
drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 4 +-
drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +-
drivers/i3c/master/mipi-i3c-hci/hci.h | 2 +-
drivers/i3c/master/svc-i3c-master.c | 341 +++++++++++++-----
drivers/input/ff-core.c | 2 +-
drivers/input/keyboard/gpio_keys.c | 2 +-
drivers/input/misc/axp20x-pek.c | 72 ++--
drivers/input/misc/palmas-pwrbutton.c | 9 +-
drivers/input/mouse/byd.c | 2 +-
drivers/input/touchscreen/goodix.c | 127 ++++++-
drivers/input/touchscreen/goodix.h | 1 +
drivers/input/touchscreen/silead.c | 172 ++++++++-
drivers/input/touchscreen/ti_am335x_tsc.c | 20 +-
drivers/input/touchscreen/ucb1400_ts.c | 4 +-
drivers/input/touchscreen/wacom_i2c.c | 44 ++-
drivers/input/touchscreen/zinitix.c | 22 +-
drivers/net/wireless/rsi/rsi_91x_coex.c | 2 +-
drivers/net/wireless/rsi/rsi_91x_main.c | 2 +-
drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 2 +-
drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 2 +-
drivers/ntb/hw/amd/ntb_hw_amd.c | 2 +
drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 26 +-
drivers/ntb/msi.c | 3 +-
drivers/pnp/pnpbios/core.c | 6 +-
drivers/staging/rts5208/rtsx.c | 16 +-
drivers/usb/atm/usbatm.c | 2 +-
drivers/usb/gadget/function/f_mass_storage.c | 2 +-
drivers/watchdog/Kconfig | 98 ++++--
drivers/watchdog/Makefile | 4 +-
drivers/watchdog/apple_wdt.c | 226 ++++++++++++
drivers/watchdog/bcm63xx_wdt.c | 317 -----------------
drivers/watchdog/bcm7038_wdt.c | 15 +-
drivers/watchdog/da9063_wdt.c | 12 +-
drivers/watchdog/davinci_wdt.c | 2 +-
drivers/watchdog/f71808e_wdt.c | 10 +-
drivers/watchdog/meson_gxbb_wdt.c | 1 -
drivers/watchdog/msc313e_wdt.c | 4 +
drivers/watchdog/mtk_wdt.c | 2 +-
drivers/watchdog/realtek_otto_wdt.c | 384 +++++++++++++++++++++
drivers/watchdog/rzg2l_wdt.c | 263 ++++++++++++++
drivers/watchdog/s3c2410_wdt.c | 338 +++++++++++++-----
fs/cifs/cifs_debug.c | 8 +-
fs/cifs/cifs_spnego.c | 4 +-
fs/cifs/cifs_spnego.h | 3 +-
fs/cifs/cifs_swn.c | 4 +-
fs/cifs/cifsencrypt.c | 6 +-
fs/cifs/cifsfs.c | 5 +-
fs/cifs/cifsglob.h | 79 ++---
fs/cifs/cifspdu.h | 2 +-
fs/cifs/cifsproto.h | 31 +-
fs/cifs/cifssmb.c | 94 ++++-
fs/cifs/connect.c | 232 +++++++++----
fs/cifs/netmisc.c | 4 +-
fs/cifs/ntlmssp.h | 2 +
fs/cifs/sess.c | 183 ++++++----
fs/cifs/smb1ops.c | 24 +-
fs/cifs/smb2glob.h | 2 -
fs/cifs/smb2misc.c | 5 +-
fs/cifs/smb2ops.c | 34 +-
fs/cifs/smb2pdu.c | 179 ++++++----
fs/cifs/smb2proto.h | 6 +-
fs/cifs/smb2transport.c | 61 +++-
fs/cifs/transport.c | 78 +++--
fs/coredump.c | 14 +-
fs/exec.c | 12 +-
fs/ext4/super.c | 39 +--
fs/f2fs/super.c | 38 +-
fs/f2fs/sysfs.c | 3 +-
fs/io-wq.c | 6 +-
fs/io-wq.h | 2 +-
fs/jffs2/background.c | 2 +-
fs/lockd/svc.c | 2 +-
fs/nfs/callback.c | 4 +-
fs/nfs/nfs4state.c | 2 +-
fs/nfsd/nfssvc.c | 2 +-
fs/proc/array.c | 6 +-
fs/signalfd.c | 5 +-
fs/super.c | 4 +-
fs/unicode/.gitignore | 2 +-
fs/unicode/Kconfig | 13 +-
fs/unicode/Makefile | 13 +-
fs/unicode/mkutf8data.c | 24 +-
fs/unicode/utf8-core.c | 109 +++---
fs/unicode/utf8-norm.c | 262 ++------------
fs/unicode/utf8-selftest.c | 94 +++--
.../{utf8data.h_shipped => utf8data.c_shipped} | 22 +-
fs/unicode/utf8n.h | 81 ++---
include/linux/fs_context.h | 2 +
include/linux/kernel.h | 1 -
include/linux/kthread.h | 4 +-
include/linux/module.h | 9 +-
include/linux/platform_data/bcm7038_wdt.h | 8 +
include/linux/profile.h | 45 ---
include/linux/sched.h | 4 +-
include/linux/sched/signal.h | 25 +-
include/linux/sched/task.h | 1 +
include/linux/sunrpc/svc.h | 2 +-
include/linux/switchtec.h | 2 -
include/linux/tracehook.h | 7 +-
include/linux/unicode.h | 49 ++-
include/uapi/linux/magic.h | 4 +
include/uapi/linux/module.h | 1 +
init/Kconfig | 13 +
kernel/Makefile | 1 +
kernel/exit.c | 97 +++---
kernel/fork.c | 20 +-
kernel/futex/core.c | 2 +-
kernel/kexec_core.c | 2 +-
kernel/kthread.c | 88 +++--
kernel/module-internal.h | 19 +
kernel/module.c | 51 ++-
kernel/module_decompress.c | 271 +++++++++++++++
kernel/profile.c | 73 ----
kernel/ptrace.c | 2 -
kernel/sched/core.c | 16 +-
kernel/signal.c | 61 ++--
kernel/tsacct.c | 7 +-
lib/kunit/try-catch.c | 4 +-
mm/mmap.c | 1 -
mm/oom_kill.c | 2 +-
net/bluetooth/bnep/core.c | 2 +-
net/bluetooth/cmtp/core.c | 2 +-
net/bluetooth/hidp/core.c | 2 +-
scripts/coccinelle/iterators/fen.cocci | 124 -------
scripts/coccinelle/misc/bugon.cocci | 63 ----
tools/objtool/check.c | 8 +-
180 files changed, 3953 insertions(+), 2126 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zinitix,bt400.yaml
delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/zinitix.txt
delete mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml
create mode 100644 Documentation/devicetree/bindings/watchdog/realtek,otto-wdt.yaml
create mode 100644 drivers/watchdog/apple_wdt.c
delete mode 100644 drivers/watchdog/bcm63xx_wdt.c
create mode 100644 drivers/watchdog/realtek_otto_wdt.c
create mode 100644 drivers/watchdog/rzg2l_wdt.c
rename fs/unicode/{utf8data.h_shipped => utf8data.c_shipped} (99%)
create mode 100644 include/linux/platform_data/bcm7038_wdt.h
create mode 100644 kernel/module_decompress.c
delete mode 100644 scripts/coccinelle/iterators/fen.cocci
delete mode 100644 scripts/coccinelle/misc/bugon.cocci
Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes
Already up to date.
Merging kbuild-current/fixes (e851dfae4371 Merge tag 'kgdb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux)
$ 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 (8f67f65d121c arc: use swap() to make code cleaner)
$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
Merge made by the 'recursive' strategy.
arch/arc/include/asm/irqflags-compact.h | 8 +-
arch/arc/include/asm/perf_event.h | 162 -------------------------------
arch/arc/include/asm/thread_info.h | 4 +-
arch/arc/kernel/perf_event.c | 166 +++++++++++++++++++++++++++++++-
arch/arc/kernel/unwind.c | 11 +--
arch/arc/mm/dma.c | 2 +-
arch/arc/plat-axs10x/axs10x.c | 2 +-
arch/arc/plat-hsdk/platform.c | 2 +-
8 files changed, 178 insertions(+), 179 deletions(-)
Merging arm-current/fixes (8536a5ef8860 ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling)
$ 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 (9c5d89bc1055 arm64: kexec: Fix missing error code 'ret' warning in load_other_segments())
$ 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 (c8013355ead6 ARM: dts: gpio-ranges property is now required)
$ 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 (8c5ba21c16bd memory: mtk-smi: Fix a null dereference for the ostd)
$ 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
Merge made by the 'recursive' strategy.
Merging tee-fixes/fixes (d58071a8a76d Linux 5.16-rc3)
$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes
Already up to date.
Merging m68k-current/for-linus (1a0ae068bf6b m68k: defconfig: Update defconfigs for v5.16-rc1)
$ 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 (252745240ba0 powerpc/audit: Fix syscall_get_arch())
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
Merge made by the 'recursive' strategy.
arch/powerpc/include/asm/ppc-opcode.h | 1 +
arch/powerpc/include/asm/syscall.h | 4 ++--
arch/powerpc/include/asm/thread_info.h | 2 ++
arch/powerpc/net/bpf_jit_comp.c | 29 +++++++++++++++++++++++------
arch/powerpc/net/bpf_jit_comp32.c | 9 +++++++++
arch/powerpc/net/bpf_jit_comp64.c | 29 +++++++++++++++++++----------
kernel/bpf/stackmap.c | 5 +++--
tools/bpf/runqslower/runqslower.bpf.c | 2 +-
tools/bpf/runqslower/runqslower.c | 2 +-
tools/bpf/runqslower/runqslower.h | 2 +-
10 files changed, 62 insertions(+), 23 deletions(-)
Merging s390-fixes/fixes (f0d43b3a3809 Merge tag 's390-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
$ 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 (5765cee119bf net: sfp: fix high power modules without diagnostic monitoring)
$ 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 'recursive' strategy.
.../devicetree/bindings/net/oxnas-dwmac.txt | 3 +
drivers/atm/iphase.c | 4 +-
drivers/net/bonding/bond_main.c | 34 +++--
drivers/net/ethernet/allwinner/sun4i-emac.c | 31 +++--
drivers/net/ethernet/allwinner/sun4i-emac.h | 18 +++
drivers/net/ethernet/apple/bmac.c | 5 +-
drivers/net/ethernet/apple/mace.c | 16 ++-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 10 +-
drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c | 3 +-
drivers/net/ethernet/i825xx/sni_82596.c | 3 +-
drivers/net/ethernet/marvell/prestera/prestera.h | 1 -
.../net/ethernet/marvell/prestera/prestera_hw.c | 4 +-
.../net/ethernet/marvell/prestera/prestera_main.c | 1 +
.../ethernet/marvell/prestera/prestera_router.c | 24 ++--
.../ethernet/marvell/prestera/prestera_router_hw.c | 40 +++---
.../ethernet/marvell/prestera/prestera_router_hw.h | 3 +-
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +-
.../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 5 +-
drivers/net/ethernet/mscc/ocelot.c | 5 +-
drivers/net/ethernet/mscc/ocelot_flower.c | 29 ++++-
drivers/net/ethernet/mscc/ocelot_net.c | 6 +-
drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 101 +++++++++++----
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +-
drivers/net/ethernet/vertexcom/Kconfig | 2 +-
drivers/net/ipa/ipa_endpoint.c | 28 +++--
drivers/net/ipa/ipa_endpoint.h | 17 ++-
drivers/net/phy/at803x.c | 2 +-
drivers/net/phy/marvell.c | 56 ++++++++-
drivers/net/phy/sfp.c | 25 +++-
drivers/net/usb/qmi_wwan.c | 2 +
drivers/net/usb/smsc95xx.c | 3 +-
drivers/net/wwan/mhi_wwan_mbim.c | 4 +-
drivers/nfc/pn544/i2c.c | 2 +-
drivers/nfc/st21nfca/se.c | 10 ++
include/net/inet_frag.h | 11 +-
include/net/ipv6_frag.h | 3 +-
include/net/pkt_cls.h | 4 +-
include/net/sch_generic.h | 5 +
lib/ref_tracker.c | 5 +-
net/bridge/br_if.c | 3 +-
net/core/of_net.c | 33 ++---
net/core/sock.c | 5 +
net/ipv4/fib_semantics.c | 11 +-
net/ipv4/inet_fragment.c | 8 +-
net/ipv4/ip_fragment.c | 3 +-
net/ipv4/ip_gre.c | 5 +-
net/ipv6/sit.c | 2 +-
net/mctp/test/route-test.c | 2 +-
net/netfilter/nft_connlimit.c | 2 +-
net/netfilter/nft_last.c | 2 +-
net/netfilter/nft_limit.c | 2 +-
net/netfilter/nft_quota.c | 2 +-
net/sched/sch_api.c | 2 +-
net/sched/sch_generic.c | 1 +
net/smc/af_smc.c | 6 +-
net/smc/smc.h | 1 +
net/smc/smc_cdc.c | 3 +-
net/smc/smc_clc.c | 2 +-
net/smc/smc_core.c | 137 ++++++++++++++-------
net/smc/smc_core.h | 12 ++
net/smc/smc_diag.c | 6 +-
net/smc/smc_pnet.c | 3 +-
net/smc/smc_wr.h | 4 -
net/tls/tls_sw.c | 1 +
net/unix/garbage.c | 14 ++-
net/unix/scm.c | 6 +-
net/xfrm/xfrm_policy.c | 3 +-
tools/testing/selftests/net/fcnal-test.sh | 3 +
tools/testing/selftests/net/settings | 2 +-
69 files changed, 590 insertions(+), 226 deletions(-)
Merging bpf/master (343e53754b21 bpf: Fix incorrect integer literal used for marking scratched stack.)
$ 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 'recursive' strategy.
kernel/bpf/inode.c | 14 +++++-
kernel/bpf/verifier.c | 6 +--
net/core/dev.c | 6 +++
tools/testing/selftests/bpf/prog_tests/xdp_link.c | 61 +++++++++++------------
tools/testing/selftests/bpf/progs/test_xdp_link.c | 6 +++
5 files changed, 57 insertions(+), 36 deletions(-)
Merging ipsec/master (7d6019b602de Revert "net: vertexcom: default to disabled on kbuild")
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
Already up to date.
Merging netfilter/master (cf46eacbc156 netfilter: nf_tables: remove unused variable)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master
Merge made by the 'recursive' strategy.
net/netfilter/nf_conntrack_netbios_ns.c | 5 +++--
net/netfilter/nf_tables_api.c | 2 --
2 files changed, 3 insertions(+), 4 deletions(-)
Merging ipvs/master (5471d5226c3b selftests: Calculate udpgso segment count without header adjustment)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master
Already up to date.
Merging wireless/main (fb80445c438c net_sched: restore "mpu xxx" handling)
$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main
Already up to date.
Merging rdma-fixes/for-rc (df0cc57e057f Linux 5.16)
$ 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 (5576c4f24c56 ALSA: core: Fix SSID quirk lookup for subvendor=0)
$ 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 'recursive' strategy.
sound/core/misc.c | 2 +-
sound/pci/hda/patch_realtek.c | 12 ++++++++++++
sound/usb/mixer_maps.c | 12 ++++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
Merging sound-asoc-fixes/for-linus (f7a6021aaf02 ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name)
$ 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 'recursive' strategy.
sound/soc/codecs/cpcap.c | 2 ++
sound/soc/generic/simple-card.c | 26 +++++++++++++++++++++++++-
sound/soc/xilinx/xlnx_formatter_pcm.c | 27 ++++++++++++++++++++++++---
3 files changed, 51 insertions(+), 4 deletions(-)
Merging regmap-fixes/for-linus (9c16529291ad Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus)
$ 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.
Merge made by the 'recursive' strategy.
Merging regulator-fixes/for-linus (f2fbbf96ec26 Merge remote-tracking branch 'regulator/for-5.16' 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
Merge made by the 'recursive' strategy.
drivers/regulator/max20086-regulator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging spi-fixes/for-linus (238582f974ab Merge remote-tracking branch 'spi/for-5.16' into spi-linus)
$ 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.
Merge made by the 'recursive' strategy.
Merging pci-current/for-linus (87620512681a PCI: apple: Fix PERST# polarity)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus
Already up to date.
Merging driver-core.current/driver-core-linus (0c947b893d69 Merge tag '5.17-rc-part1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
$ 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 (4d66020dcef8 Merge tag 'trace-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
$ 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 (455e73a07f6e Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux)
$ 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 (a7904a538933 Linux 5.16-rc6)
$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
Already up to date.
Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle)
$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes
Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c
Resolved 'drivers/usb/chipidea/ci_hdrc_imx.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master eddd6e7b1083] Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
$ git diff -M --stat --summary HEAD^..
Merging phy/fixes (f0ae8685b285 phy: HiSilicon: Fix copy and paste bug in error handling)
$ 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 (4d66020dcef8 Merge tag 'trace-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
$ 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 (d4b825bad320 iio:imu:adis16480: fix buffering for devices with no burst mode)
$ 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 'recursive' strategy.
drivers/iio/adc/ad7124.c | 2 +-
drivers/iio/adc/ti-tsc2046.c | 4 ++--
drivers/iio/imu/adis16480.c | 7 ++++++-
3 files changed, 9 insertions(+), 4 deletions(-)
Merging char-misc.current/char-misc-linus (0c947b893d69 Merge tag '5.17-rc-part1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
$ 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 (fa55b7dcdc43 Linux 5.16-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 (df0cc57e057f Linux 5.16)
$ 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 (762f99f4f3cb Merge branch 'next' into for-linus)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
Already up to date.
Merging crypto-current/master (5f21d7d283dd crypto: af_alg - rewrite NULL pointer check)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
Already up to date.
Merging vfio-fixes/for-linus (8704e8934908 vfio/pci: Fix OpRegion read)
$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
Already up to date.
Merging kselftest-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
Already up to date.
Merging modules-fixes/modules-linus (2a987e65025e Merge tag 'perf-tools-fixes-for-v5.16-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
$ 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 (822c9f2b833c dmaengine: st_fdma: fix MODULE_ALIAS)
$ 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 (27a030e87292 mtd: dataflash: Add device-tree SPI IDs)
$ 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 (d40f0b133b44 media: meson-ir-tx: remove incorrect doc comment)
$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes
Merge made by the 'recursive' strategy.
drivers/media/platform/rockchip/rga/rga.c | 2 +-
drivers/media/rc/meson-ir-tx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Merging reset-fixes/reset/fixes (92c959bae2e5 reset: renesas: Fix Runtime PM usage)
$ 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 (09d97da660ff MIPS: Only define pci_remap_iospace() for Ralink)
$ 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 (fa55b7dcdc43 Linux 5.16-rc1)
$ 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 (80d680fdccba ARM: dts: omap3430-sdp: Fix NAND device node)
$ 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 (fffb53237807 KVM: x86: Check for rmaps allocation)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
Already up to date.
Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
Already up to date.
Merging hwmon-fixes/hwmon (a7e54735ac43 hwmon: (lm90) Fix sysfs and udev notifications)
$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
Merge made by the 'recursive' strategy.
drivers/hwmon/lm90.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount)
$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
Already up to date.
Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
Already up to date.
Merging btrfs-fixes/next-fixes (51cdc1edfb79 Merge branch 'misc-5.17' 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
Merge made by the 'recursive' strategy.
fs/btrfs/block-group.c | 13 +++++++++++++
fs/btrfs/ioctl.c | 12 ++++++------
2 files changed, 19 insertions(+), 6 deletions(-)
Merging vfs-fixes/fixes (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait())
$ 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 (26a8b0943780 platform/x86: intel_pmc_core: fix memleak on registration failure)
$ 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 (df0cc57e057f Linux 5.16)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
Already up to date.
Merging pinctrl-samsung-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
$ 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 (b398123bff3b efi: apply memblock cap after memblock_add())
$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
Already up to date.
Merging scsi-fixes/fixes (142c779d05d1 scsi: vmw_pvscsi: Set residual data length conditionally)
$ 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 (936a93775b7c Merge tag 'amd-drm-fixes-5.16-2021-12-31' of ssh://gitlab.freedesktop.org/agd5f/linux into drm-fixes)
$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes
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 (df0cc57e057f Linux 5.16)
$ 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 (ff31ee0a0f47 mmc: mmci: stm32: clear DLYB_CR after sending tuning command)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
Already up to date.
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 'recursive' strategy.
Merging gnss-fixes/gnss-linus (136057256686 Linux 5.16-rc2)
$ 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 (1dc2f2b81a6a hv: utils: add PTP_1588_CLOCK to Kconfig to fix build)
$ 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 (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context)
$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix
Auto-merging drivers/soc/fsl/dpio/qbman-portal.c
Merge made by the 'recursive' strategy.
drivers/soc/fsl/dpio/qbman-portal.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
Merging risc-v-fixes/fixes (f6f7fbb89bf8 riscv: dts: sifive unmatched: Link the tmp451 with its power supply)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
Already up to date.
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes
Already up to date.
Merging fpga-fixes/fixes (8bb7eca972ad Linux 5.15)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga-fixes/fixes
Already up to date.
Merging spdx/spdx-linus (4d66020dcef8 Merge tag 'trace-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus
Already up to date.
Merging gpio-brgl-fixes/gpio/for-current (30fee1d7462a gpio: idt3243x: Fix IRQ check in idt_gpio_probe)
$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
Merge made by the 'recursive' strategy.
drivers/gpio/gpio-idt3243x.c | 4 ++--
drivers/gpio/gpio-mpc8xxx.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Merging gpio-intel-fixes/fixes (455e73a07f6e Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux)
$ 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 (455e73a07f6e Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux)
$ 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 (57bbeacdbee7 erofs: fix deadlock when shrink erofs slab)
$ 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 (fa55b7dcdc43 Linux 5.16-rc1)
$ 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
Merge made by the 'recursive' strategy.
drivers/mtd/ubi/build.c | 9 +-
drivers/mtd/ubi/fastmap.c | 28 ++++--
drivers/mtd/ubi/vmt.c | 8 +-
fs/ubifs/dir.c | 235 ++++++++++++++++++++++++++++------------------
fs/ubifs/file.c | 14 +--
fs/ubifs/io.c | 34 ++++++-
fs/ubifs/ioctl.c | 2 +-
fs/ubifs/journal.c | 52 ++++++++--
fs/ubifs/ubifs.h | 2 +-
9 files changed, 246 insertions(+), 138 deletions(-)
Merging memblock-fixes/fixes (d7f55471db27 memblock: fix memblock_phys_alloc() section mismatch error)
$ 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 (c9e6606c7fe9 Linux 5.16-rc8)
$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc
Already up to date.
Merging irqchip-fixes/irq/irqchip-fixes (c831d92890e0 irqchip/loongson-pch-ms: Use bitmap_free() to free bitmap)
$ 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
Auto-merging drivers/irqchip/irq-apple-aic.c
Merge made by the 'recursive' strategy.
drivers/irqchip/irq-apple-aic.c | 1 -
drivers/irqchip/irq-loongson-pch-msi.c | 2 +-
drivers/irqchip/irq-realtek-rtl.c | 18 ++++++++++++------
3 files changed, 13 insertions(+), 8 deletions(-)
Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
Already up to date.
Merging perf-current/perf/urgent (133d9c53c9dc Merge tag 'x86_vdso_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
$ 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 (4bc5e64e6cf3 efi: Move efifb_setup_from_dmi() prototype from arch headers)
$ 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 (d58071a8a76d Linux 5.16-rc3)
$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
Already up to date.
Merging drm-misc-fixes/for-linux-next-fixes (016017a195b8 drm/ttm: fix compilation on ARCH=um)
$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes
Already up to date.
Merging kbuild/for-next (c4d7f40b250c kbuild: add cmd_file_size)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
Auto-merging scripts/remove-stale-files
Auto-merging scripts/link-vmlinux.sh
CONFLICT (content): Merge conflict in scripts/link-vmlinux.sh
Auto-merging scripts/Makefile.lib
Auto-merging scripts/Makefile
Auto-merging init/Kconfig
Auto-merging include/linux/slab.h
Auto-merging drivers/acpi/Makefile
Auto-merging arch/x86/boot/compressed/Makefile
Auto-merging arch/parisc/boot/compressed/Makefile
Auto-merging arch/mips/boot/compressed/Makefile
Auto-merging arch/arm/boot/compressed/Makefile
Auto-merging arch/arm/Kconfig.debug
Auto-merging arch/Kconfig
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/process/changes.rst
Resolved 'scripts/link-vmlinux.sh' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 7a91a81a651c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
$ git diff -M --stat --summary HEAD^..
Documentation/kbuild/kconfig-language.rst | 2 +-
Documentation/process/changes.rst | 2 +-
MAINTAINERS | 1 -
Makefile | 15 +---
arch/Kconfig | 3 +-
arch/arc/Makefile | 4 +-
arch/arc/boot/dts/Makefile | 4 +-
arch/arm/Kconfig.debug | 2 -
arch/arm/boot/compressed/Makefile | 8 +-
arch/h8300/boot/compressed/Makefile | 4 +-
arch/h8300/boot/dts/Makefile | 6 +-
arch/microblaze/Makefile | 8 +-
arch/mips/boot/compressed/Makefile | 12 +--
arch/nds32/Makefile | 6 --
arch/nds32/boot/dts/Makefile | 7 +-
arch/nios2/boot/dts/Makefile | 2 +-
arch/openrisc/boot/dts/Makefile | 7 +-
arch/parisc/boot/compressed/Makefile | 24 +++--
arch/powerpc/boot/Makefile | 2 +-
arch/riscv/boot/dts/canaan/Makefile | 4 +-
arch/s390/boot/compressed/Makefile | 28 +++---
arch/sh/boot/Makefile | 16 ++--
arch/sh/boot/compressed/Makefile | 22 +++--
arch/sh/boot/dts/Makefile | 4 +-
arch/x86/boot/compressed/Makefile | 12 +--
arch/xtensa/Makefile | 2 +-
arch/xtensa/boot/dts/Makefile | 5 +-
certs/.gitignore | 1 +
certs/Kconfig | 4 +-
certs/Makefile | 125 +++++++-------------------
certs/default_x509.genkey | 17 ++++
{scripts => certs}/extract-cert.c | 2 +-
drivers/acpi/Makefile | 2 +-
drivers/base/firmware_loader/builtin/Makefile | 4 +-
include/linux/slab.h | 3 +-
include/uapi/linux/soundcard.h | 2 +-
init/Kconfig | 1 -
init/Makefile | 2 +-
kernel/gcov/Kconfig | 1 -
net/wireless/Makefile | 4 +-
scripts/.gitignore | 1 -
scripts/Kbuild.include | 47 ----------
scripts/Makefile | 11 +--
scripts/Makefile.lib | 35 ++++++--
scripts/Makefile.modinst | 4 +-
scripts/gen_autoksyms.sh | 11 +--
scripts/kconfig/Makefile | 3 +-
scripts/kconfig/conf.c | 17 ++--
scripts/kconfig/confdata.c | 24 ++---
scripts/kconfig/streamline_config.pl | 2 +-
scripts/link-vmlinux.sh | 47 +++++-----
scripts/min-tool-version.sh | 2 +-
scripts/remove-stale-files | 2 +
scripts/setlocalversion | 9 +-
usr/Makefile | 7 +-
usr/include/Makefile | 6 +-
{scripts => usr/include}/headers_check.pl | 0
57 files changed, 242 insertions(+), 366 deletions(-)
create mode 100644 certs/default_x509.genkey
rename {scripts => certs}/extract-cert.c (98%)
rename {scripts => usr/include}/headers_check.pl (100%)
Merging perf/perf/core (9bce13ea88f8 perf record: Disable debuginfod by default)
$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core
Auto-merging tools/perf/util/sort.c
Auto-merging tools/perf/util/scripting-engines/trace-event-python.c
Auto-merging tools/perf/util/python.c
Auto-merging tools/perf/util/evsel.c
Auto-merging tools/perf/builtin-trace.c
Merge made by the 'recursive' strategy.
tools/arch/x86/include/asm/cpufeatures.h | 1 +
tools/arch/x86/include/asm/msr-index.h | 17 +
tools/arch/x86/lib/memcpy_64.S | 12 +-
tools/arch/x86/lib/memset_64.S | 6 +-
tools/build/Build.include | 2 +-
tools/include/uapi/drm/drm.h | 18 +
tools/include/uapi/linux/perf_event.h | 5 +-
tools/lib/perf/Documentation/libperf.txt | 11 +-
tools/lib/perf/cpumap.c | 113 ++--
tools/lib/perf/evlist.c | 19 +-
tools/lib/perf/evsel.c | 111 ++--
tools/lib/perf/include/internal/cpumap.h | 18 +-
tools/lib/perf/include/internal/evlist.h | 5 +-
tools/lib/perf/include/internal/evsel.h | 4 +-
tools/lib/perf/include/internal/mmap.h | 5 +-
tools/lib/perf/include/perf/cpumap.h | 8 +-
tools/lib/perf/include/perf/evsel.h | 14 +-
tools/lib/perf/libperf.map | 2 +
tools/lib/perf/mmap.c | 4 +-
tools/lib/perf/tests/test-evlist.c | 162 ++++-
tools/perf/Documentation/perf-buildid-cache.txt | 5 +-
tools/perf/Documentation/perf-config.txt | 9 +
tools/perf/Documentation/perf-list.txt | 48 +-
tools/perf/Documentation/perf-record.txt | 15 +-
tools/perf/Documentation/perf-stat.txt | 10 +-
tools/perf/Documentation/perf-top.txt | 7 +-
tools/perf/Makefile.config | 10 +-
tools/perf/Makefile.perf | 4 +-
tools/perf/arch/arm/include/perf_regs.h | 42 --
tools/perf/arch/arm/util/cs-etm.c | 54 +-
tools/perf/arch/arm64/include/perf_regs.h | 78 +--
tools/perf/arch/arm64/util/machine.c | 7 +
tools/perf/arch/arm64/util/pmu.c | 2 +-
tools/perf/arch/csky/include/perf_regs.h | 82 ---
tools/perf/arch/mips/include/perf_regs.h | 69 ---
tools/perf/arch/powerpc/include/perf_regs.h | 66 --
tools/perf/arch/powerpc/util/event.c | 8 +-
tools/perf/arch/riscv/include/perf_regs.h | 74 ---
tools/perf/arch/s390/include/perf_regs.h | 78 ---
tools/perf/arch/x86/include/perf_regs.h | 82 ---
tools/perf/arch/x86/util/evlist.c | 17 +
tools/perf/bench/epoll-ctl.c | 2 +-
tools/perf/bench/epoll-wait.c | 2 +-
tools/perf/bench/futex-hash.c | 2 +-
tools/perf/bench/futex-lock-pi.c | 2 +-
tools/perf/bench/futex-requeue.c | 2 +-
tools/perf/bench/futex-wake-parallel.c | 2 +-
tools/perf/bench/futex-wake.c | 2 +-
tools/perf/builtin-bench.c | 5 +-
tools/perf/builtin-buildid-cache.c | 25 +-
tools/perf/builtin-c2c.c | 15 +-
tools/perf/builtin-ftrace.c | 447 +++++++++++---
tools/perf/builtin-kmem.c | 2 +-
tools/perf/builtin-record.c | 23 +-
tools/perf/builtin-report.c | 4 +-
tools/perf/builtin-sched.c | 71 ++-
tools/perf/builtin-script.c | 41 +-
tools/perf/builtin-stat.c | 541 ++++++++---------
tools/perf/builtin-trace.c | 3 +
tools/perf/dlfilters/dlfilter-test-api-v0.c | 2 -
.../arch/arm64/arm/neoverse-n2/branch.json | 8 +
.../pmu-events/arch/arm64/arm/neoverse-n2/bus.json | 20 +
.../arch/arm64/arm/neoverse-n2/cache.json | 155 +++++
.../arch/arm64/arm/neoverse-n2/exception.json | 47 ++
.../arch/arm64/arm/neoverse-n2/instruction.json | 143 +++++
.../arch/arm64/arm/neoverse-n2/memory.json | 38 ++
.../arch/arm64/arm/neoverse-n2/other.json | 5 +
.../arch/arm64/arm/neoverse-n2/pipeline.json | 23 +
.../pmu-events/arch/arm64/arm/neoverse-n2/spe.json | 14 +
.../arch/arm64/arm/neoverse-n2/trace.json | 29 +
...nd-microarch.json => common-and-microarch.json} | 198 ++++++
tools/perf/pmu-events/arch/arm64/mapfile.csv | 1 +
.../{armv8-recommended.json => recommended.json} | 202 +++----
tools/perf/pmu-events/jevents.c | 2 -
tools/perf/tests/Build | 1 +
tools/perf/tests/attr.c | 6 +-
tools/perf/tests/bitmap.c | 2 +-
tools/perf/tests/builtin-test.c | 16 +-
tools/perf/tests/cpumap.c | 6 +-
tools/perf/tests/event_update.c | 6 +-
tools/perf/tests/mem2node.c | 2 +-
tools/perf/tests/mmap-basic.c | 4 +-
tools/perf/tests/openat-syscall-all-cpus.c | 39 +-
tools/perf/tests/shell/stat_all_metricgroups.sh | 2 +-
tools/perf/tests/sigtrap.c | 177 ++++++
tools/perf/tests/stat.c | 3 +-
tools/perf/tests/tests.h | 1 +
tools/perf/tests/topology.c | 43 +-
tools/perf/ui/browsers/annotate.c | 23 +-
tools/perf/util/Build | 2 +
tools/perf/util/affinity.c | 2 +-
tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 2 +
tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 1 +
tools/perf/util/arm-spe.c | 67 ++-
.../perf/util/arm64-frame-pointer-unwind-support.c | 63 ++
.../perf/util/arm64-frame-pointer-unwind-support.h | 10 +
tools/perf/util/auxtrace.c | 12 +-
tools/perf/util/auxtrace.h | 5 +-
tools/perf/util/bpf-loader.c | 15 +-
tools/perf/util/bpf_counter.c | 29 +-
tools/perf/util/bpf_counter.h | 4 +-
tools/perf/util/bpf_counter_cgroup.c | 10 +-
tools/perf/util/bpf_ftrace.c | 152 +++++
tools/perf/util/bpf_skel/func_latency.bpf.c | 114 ++++
tools/perf/util/callchain.c | 14 +-
tools/perf/util/callchain.h | 4 +-
tools/perf/util/counts.c | 8 +-
tools/perf/util/counts.h | 14 +-
tools/perf/util/cpumap.c | 253 ++++----
tools/perf/util/cpumap.h | 124 +++-
tools/perf/util/cputopo.c | 9 +-
tools/perf/util/debug.c | 2 +-
tools/perf/util/env.c | 29 +-
tools/perf/util/env.h | 3 +-
tools/perf/util/evlist.c | 150 ++---
tools/perf/util/evlist.h | 52 +-
tools/perf/util/evsel.c | 166 +++--
tools/perf/util/evsel.h | 30 +-
tools/perf/util/expr.c | 37 +-
tools/perf/util/ftrace.h | 81 +++
tools/perf/util/header.c | 6 +-
tools/perf/util/hist.c | 4 +-
tools/perf/util/hist.h | 3 +-
tools/perf/util/libunwind/arm64.c | 2 +
tools/perf/util/machine.c | 50 +-
tools/perf/util/machine.h | 1 +
tools/perf/util/mem-events.c | 29 +-
tools/perf/util/metricgroup.c | 46 +-
tools/perf/util/mmap.c | 19 +-
tools/perf/util/mmap.h | 3 +-
tools/perf/util/namespaces.c | 76 ++-
tools/perf/util/namespaces.h | 2 +
tools/perf/util/parse-events-hybrid.c | 9 +-
tools/perf/util/parse-events.c | 10 +-
tools/perf/util/perf_api_probe.c | 15 +-
tools/perf/util/perf_regs.c | 666 +++++++++++++++++++++
tools/perf/util/perf_regs.h | 17 +-
tools/perf/util/python.c | 4 +-
tools/perf/util/record.c | 11 +-
.../util/scripting-engines/trace-event-python.c | 16 +-
tools/perf/util/session.c | 35 +-
tools/perf/util/smt.c | 73 ++-
tools/perf/util/sort.c | 34 +-
tools/perf/util/sort.h | 3 +-
tools/perf/util/stat-display.c | 138 +++--
tools/perf/util/stat-shadow.c | 308 +++++-----
tools/perf/util/stat.c | 47 +-
tools/perf/util/stat.h | 9 +-
tools/perf/util/svghelper.c | 6 +-
tools/perf/util/synthetic-events.c | 12 +-
tools/perf/util/synthetic-events.h | 3 +-
tools/perf/util/util.c | 15 +
tools/perf/util/util.h | 11 +-
153 files changed, 4685 insertions(+), 2175 deletions(-)
create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/branch.json
create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/bus.json
create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/cache.json
create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/exception.json
create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/instruction.json
create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/memory.json
create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/other.json
create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json
create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/spe.json
create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/trace.json
rename tools/perf/pmu-events/arch/arm64/{armv8-common-and-microarch.json => common-and-microarch.json} (76%)
rename tools/perf/pmu-events/arch/arm64/{armv8-recommended.json => recommended.json} (96%)
create mode 100644 tools/perf/tests/sigtrap.c
create mode 100644 tools/perf/util/arm64-frame-pointer-unwind-support.c
create mode 100644 tools/perf/util/arm64-frame-pointer-unwind-support.h
create mode 100644 tools/perf/util/bpf_ftrace.c
create mode 100644 tools/perf/util/bpf_skel/func_latency.bpf.c
create mode 100644 tools/perf/util/ftrace.h
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 (f857acfc457e lib/scatterlist: cleanup macros into static inline functions)
$ 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 (733e417518a6 asm-generic/error-injection.h: fix a spelling mistake, and a coding style issue)
$ 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 (6880fa6c5660 Linux 5.15-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next
Already up to date.
Merging arm/for-next (599fbe7e4044 Merge branches 'misc' and 'fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next
Already up to date.
Merge made by the 'recursive' strategy.
Merging arm64/for-next/core (945409a6ef44 Merge branches 'for-next/misc', 'for-next/cache-ops-dzp', 'for-next/stacktrace', 'for-next/xor-neon', 'for-next/kasan', 'for-next/armv8_7-fp', 'for-next/atomics', 'for-next/bti', 'for-next/sve', 'for-next/kselftest' and 'for-next/kcsan', remote-tracking branch 'arm64/for-next/perf' into for-next/core)
$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
Already up to date.
Merging arm-perf/for-next/perf (3da4390bcdf4 arm64: perf: Don't register user access sysctl handler multiple times)
$ 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 (317a42bd9204 ARM: 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
Removing Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
Removing Documentation/devicetree/bindings/clock/intc_stratix10.txt
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/arm/altera.yaml | 46 +-
.../bindings/arm/freescale/fsl,layerscape-dcfg.txt | 2 +-
.../devicetree/bindings/arm/intel,socfpga.yaml | 26 +
.../devicetree/bindings/arm/omap/omap.txt | 3 +
.../devicetree/bindings/clock/intc_stratix10.txt | 20 -
.../devicetree/bindings/clock/intel,stratix10.yaml | 35 +
.../devicetree/bindings/clock/qoriq-clock.txt | 1 +
.../devicetree/bindings/firmware/arm,scmi.yaml | 65 ++
.../bindings/memory-controllers/fsl/fsl,ifc.yaml | 113 +++
.../bindings/memory-controllers/fsl/ifc.txt | 82 ---
.../bindings/reset/hisilicon,hi3660-reset.yaml | 5 +
MAINTAINERS | 4 +-
arch/arm/arm-soc-for-next-contents.txt | 49 ++
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/am335x-wega.dtsi | 2 +-
arch/arm/boot/dts/dra7.dtsi | 20 +-
arch/arm/boot/dts/meson.dtsi | 8 +-
arch/arm/boot/dts/meson8.dtsi | 24 +-
arch/arm/boot/dts/meson8b.dtsi | 24 +-
arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 ++
arch/arm/boot/dts/omap3-beagle.dts | 33 -
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts | 2 +-
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 2 +-
arch/arm/boot/dts/socfpga_arria5_socdk.dts | 2 +-
arch/arm/configs/aspeed_g5_defconfig | 6 +
arch/arm/configs/multi_v7_defconfig | 61 +-
arch/arm/mach-omap2/display.c | 2 +-
arch/arm/mach-omap2/omap_hwmod.c | 4 +-
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 21 +-
.../boot/dts/altera/socfpga_stratix10_socdk.dts | 3 +-
.../dts/altera/socfpga_stratix10_socdk_nand.dts | 3 +-
arch/arm64/boot/dts/exynos/Makefile | 1 +
arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 195 ++++++
arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi | 643 +++++++++++++++++
arch/arm64/boot/dts/exynos/exynos850.dtsi | 759 +++++++++++++++++++++
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 2 +-
arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 1 +
.../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 1 +
arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 1 +
arch/arm64/configs/defconfig | 17 +
drivers/clocksource/timer-ti-dm-systimer.c | 2 +-
drivers/firmware/arm_scmi/Kconfig | 41 ++
drivers/firmware/arm_scmi/Makefile | 1 +
drivers/firmware/arm_scmi/common.h | 26 +-
drivers/firmware/arm_scmi/driver.c | 207 ++++--
drivers/firmware/arm_scmi/mailbox.c | 3 +-
drivers/firmware/arm_scmi/optee.c | 567 +++++++++++++++
drivers/firmware/arm_scmi/smc.c | 98 ++-
drivers/firmware/arm_scmi/virtio.c | 22 +-
drivers/memory/brcmstb_dpfe.c | 2 +-
drivers/memory/fsl_ifc.c | 9 +
drivers/memory/mtk-smi.c | 3 +-
drivers/memory/tegra/Kconfig | 1 +
drivers/memory/tegra/tegra20-emc.c | 2 +-
drivers/memory/tegra/tegra210-emc-core.c | 2 +-
drivers/memory/tegra/tegra30-emc.c | 131 +++-
drivers/reset/reset-rzg2l-usbphy-ctrl.c | 4 +-
drivers/reset/reset-uniphier-glue.c | 75 +-
drivers/soc/fsl/guts.c | 14 +-
drivers/soc/fsl/qe/qe.c | 4 +-
drivers/soc/fsl/qe/qe_io.c | 2 +
include/dt-bindings/clock/dra7.h | 14 +-
include/linux/scmi_protocol.h | 8 +
include/soc/fsl/dpaa2-fd.h | 3 +-
include/soc/fsl/qe/immap_qe.h | 3 +-
include/soc/fsl/qe/qe_tdm.h | 4 +-
include/soc/fsl/qe/ucc_fast.h | 2 +-
include/soc/fsl/qe/ucc_slow.h | 2 +-
include/trace/events/scmi.h | 28 +
69 files changed, 3256 insertions(+), 360 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/intel,socfpga.yaml
delete mode 100644 Documentation/devicetree/bindings/clock/intc_stratix10.txt
create mode 100644 Documentation/devicetree/bindings/clock/intel,stratix10.yaml
create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ifc.yaml
delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dts
create mode 100644 arch/arm64/boot/dts/exynos/exynos850-e850-96.dts
create mode 100644 arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi
create mode 100644 arch/arm64/boot/dts/exynos/exynos850.dtsi
create mode 100644 drivers/firmware/arm_scmi/optee.c
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 'recursive' strategy.
Merging amlogic/for-next (2c420d79dae4 arm64: dts: meson-g12-common: add uart_ao_b pins muxing)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/arm/amlogic.yaml | 11 +
.../devicetree/bindings/vendor-prefixes.yaml | 4 +
arch/arm64/boot/dts/amlogic/Makefile | 6 +
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 43 +++
.../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 30 +++
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 99 +++++++
.../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 129 +++++++++
.../boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 108 ++++++++
arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 300 +++++++++++++++++++++
arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 145 ++++++++++
.../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 133 +++++++++
arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 112 ++++++++
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 27 ++
13 files changed, 1147 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4.dtsi
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts
Merging aspeed/for-next (a7e02e92755c Merge branches 'dt-for-v5.17', 'defconfig-for-v5.17' and 'soc-for-v5.17' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
Auto-merging arch/arm/configs/aspeed_g5_defconfig
Merge made by the 'recursive' strategy.
arch/arm/configs/aspeed_g5_defconfig | 1 +
drivers/soc/aspeed/aspeed-lpc-ctrl.c | 7 ++--
drivers/soc/aspeed/aspeed-socinfo.c | 73 ++++++++++++++++++++++++++++++++++++
3 files changed, 77 insertions(+), 4 deletions(-)
Merging at91/at91-next (9be3df0e718c Merge branch 'at91-defconfig' into at91-next)
$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
Merging drivers-memory/for-next (ff086e15d838 Merge branch 'for-v5.17/omap-gpmc' 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
Already up to date.
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (b95a3922f285 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
Already up to date.
Merge made by the 'recursive' 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
Already up to date.
Merge made by the 'recursive' strategy.
Merging mediatek/for-next (ccf7b63aac3e Merge branch 'v5.16-next/dts64' 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
Already up to date.
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (d835946fc3d8 Merge branch 'mvebu/dt' 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
Already up to date.
Merge made by the 'recursive' strategy.
Merging omap/for-next (61b6b9cfada4 Merge branch 'omap-for-v5.17/fixes-not-urgent' 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
Already up to date.
Merge made by the 'recursive' strategy.
Merging qcom/for-next (7e5fe035d019 Merge branches 'arm64-defconfig-for-5.17', 'arm64-for-5.17', 'clk-for-5.17', 'defconfig-for-5.17' and 'drivers-for-5.17' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
Auto-merging arch/arm/configs/multi_v7_defconfig
CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 53f6869cf679] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
$ git diff -M --stat --summary HEAD^..
Documentation/devicetree/bindings/arm/qcom.yaml | 6 ------
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 +++++
2 files changed, 5 insertions(+), 6 deletions(-)
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 'recursive' strategy.
arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Merging renesas/next (743002730737 Merge branch 'renesas-arm-dt-for-v5.17' 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
Already up to date.
Merge made by the 'recursive' strategy.
Merging reset/reset/next (89e7a6698fdd reset: uniphier-glue: Use devm_add_action_or_reset())
$ 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 (2a9ed9fa8fe5 Merge branch 'v5.17-armsoc/dts64' 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 'recursive' strategy.
.../devicetree/bindings/soc/rockchip/grf.yaml | 1 +
arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 52 ++++++++++++
arch/arm64/boot/dts/rockchip/rk356x.dtsi | 98 ++++++++++++++++++++++
3 files changed, 151 insertions(+)
Merging samsung-krzk/for-next (b1cbda0fc343 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 arch/arm64/configs/defconfig
Auto-merging arch/arm64/Kconfig.platforms
Merge made by the 'recursive' strategy.
Merging scmi/for-linux-next (a0708ab07633 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
Merge made by the 'recursive' strategy.
drivers/clk/clk-scmi.c | 54 +++++--
drivers/firmware/arm_scmi/Kconfig | 15 ++
drivers/firmware/arm_scmi/clock.c | 22 ++-
drivers/firmware/arm_scmi/virtio.c | 298 +++++++++++++++++++++++++++++++++----
include/linux/scmi_protocol.h | 3 +
5 files changed, 354 insertions(+), 38 deletions(-)
Merging stm32/stm32-next (3ff0810ffc47 ARM: dts: stm32: Add Engicam i.Core STM32MP1 C.TOUCH 2.0 10.1" OF)
$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
Already up to date.
Merging sunxi/sunxi/for-next (1d21ba6546a5 Merge branch 'sunxi/dt-for-5.17' 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
Already up to date.
Merge made by the 'recursive' strategy.
Merging tee/next (ce352be35ba0 Merge branch 'async_notif' into next)
$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
Already up to date.
Merge made by the 'recursive' strategy.
Merging tegra/for-next (707b88674206 Merge branch for-5.17/arm/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
Merge made by the 'recursive' strategy.
drivers/memory/tegra/Makefile | 1 +
drivers/memory/tegra/mc.c | 3 ++
drivers/memory/tegra/mc.h | 7 +++-
drivers/memory/tegra/tegra186-emc.c | 3 ++
drivers/memory/tegra/tegra234.c | 81 +++++++++++++++++++++++++++++++++++++
5 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 drivers/memory/tegra/tegra234.c
Merging ti/ti-next (e66d73b2aa76 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 'recursive' strategy.
.../boot/dts/ti/k3-j721s2-common-proc-board.dts | 14 ++++++++++++--
arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 22 ----------------------
2 files changed, 12 insertions(+), 24 deletions(-)
Merging xilinx/for-next (2eb48e610ef7 Merge remote-tracking branch 'zynqmp/dt' into for-next)
$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
Merge made by the 'recursive' strategy.
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 28 ----------------------------
1 file changed, 28 deletions(-)
Merging clk/clk-next (818d9150f2b2 clk: visconti: Fix uninitialized variable in printk)
$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
Merge made by the 'recursive' strategy.
drivers/clk/clk-si5341.c | 2 +-
drivers/clk/visconti/pll.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
Merging clk-imx/for-next (9dd81021084f clk: imx8mp: Fix the parent clk of the audio_root_clk)
$ 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 (f0b62b0bbedc clk: renesas: r9a07g044: Add GPU 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 (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next
Already up to date.
Merging csky/linux-next (a0793fdad9a1 csky: fix typo of fpu config macro)
$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
Already up to date.
Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs)
$ git merge -m Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git h8300/h8300-next
Auto-merging drivers/tty/serial/sh-sci.c
Auto-merging drivers/net/ethernet/smsc/smc91x.c
Auto-merging drivers/net/ethernet/smsc/Kconfig
Removing arch/h8300/mm/memory.c
Auto-merging arch/h8300/mm/init.c
Auto-merging arch/h8300/kernel/setup.c
Removing arch/h8300/include/asm/segment.h
Auto-merging arch/h8300/include/asm/processor.h
Auto-merging arch/h8300/Kconfig.cpu
Merge made by the 'recursive' strategy.
arch/h8300/Kconfig | 1 -
arch/h8300/Kconfig.cpu | 4 ++
arch/h8300/boot/dts/edosk2674.dts | 10 ++++-
arch/h8300/boot/dts/h8300h_sim.dts | 2 +-
arch/h8300/boot/dts/h8s_sim.dts | 2 +-
arch/h8300/configs/edosk2674_defconfig | 10 ++---
arch/h8300/configs/h8300h-sim_defconfig | 8 +---
arch/h8300/configs/h8s-sim_defconfig | 8 +---
arch/h8300/include/asm/processor.h | 1 -
arch/h8300/include/asm/segment.h | 40 --------------------
arch/h8300/include/asm/thread_info.h | 3 --
arch/h8300/kernel/entry.S | 1 -
arch/h8300/kernel/head_ram.S | 1 -
arch/h8300/kernel/setup.c | 2 +-
arch/h8300/lib/memset.S | 17 +++++----
arch/h8300/mm/Makefile | 2 +-
arch/h8300/mm/init.c | 6 ---
arch/h8300/mm/memory.c | 53 --------------------------
drivers/clocksource/h8300_timer8.c | 20 +++++-----
drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++-
drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++--------
drivers/net/ethernet/smsc/Kconfig | 1 -
drivers/net/ethernet/smsc/smc91x.c | 10 +++++
drivers/tty/serial/sh-sci.c | 5 +--
24 files changed, 124 insertions(+), 169 deletions(-)
delete mode 100644 arch/h8300/include/asm/segment.h
delete mode 100644 arch/h8300/mm/memory.c
Merging m68k/for-next (1a0ae068bf6b m68k: defconfig: Update defconfigs for v5.16-rc1)
$ 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 (a7904a538933 Linux 5.16-rc6)
$ 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 (7b94b7f0ae24 microblaze: add const to of_device_id)
$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
Auto-merging arch/microblaze/kernel/signal.c
Merge made by the 'recursive' strategy.
arch/microblaze/kernel/signal.c | 2 +-
arch/microblaze/pci/xilinx_pci.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Merging mips/mips-next (d3115128bdaf MIPS: ath79: drop _machine_restart again)
$ 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 nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory())
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git nds32/next
Auto-merging arch/nds32/Makefile
Auto-merging arch/nds32/Kconfig
CONFLICT (content): Merge conflict in arch/nds32/Kconfig
Auto-merging arch/nds32/Kbuild
CONFLICT (content): Merge conflict in arch/nds32/Kbuild
Resolved 'arch/nds32/Kbuild' using previous resolution.
Resolved 'arch/nds32/Kconfig' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master e4bbabadeccb] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
$ git diff -M --stat --summary HEAD^..
arch/nds32/Kbuild | 3 +++
arch/nds32/Kconfig | 4 +++-
arch/nds32/Makefile | 3 ---
3 files changed, 6 insertions(+), 4 deletions(-)
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 (7f435e42fd6b openrisc: init: Add support for common clk)
$ 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 (3d3a5814228f parisc: Fix missing prototype for 'toc_intr' warning in toc.c)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
Merge made by the 'recursive' strategy.
arch/parisc/include/asm/processor.h | 1 +
arch/parisc/kernel/setup.c | 15 +++++++++++--
arch/parisc/kernel/toc.c | 3 ++-
drivers/video/fbdev/stifb.c | 45 +++++++++++++++++++++++++++++++++++--
4 files changed, 59 insertions(+), 5 deletions(-)
Merging powerpc/next (29ec39fcf11e Merge tag 'powerpc-5.17-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 (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next
Already up to date.
Merging risc-v/for-next (b579dfe71a6a RISC-V: Use SBI SRST extension when available)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next
Auto-merging scripts/sorttable.c
Auto-merging arch/riscv/net/bpf_jit_comp64.c
Auto-merging arch/riscv/mm/fault.c
Auto-merging arch/riscv/include/asm/sbi.h
CONFLICT (content): Merge conflict in arch/riscv/include/asm/sbi.h
Auto-merging arch/riscv/configs/rv32_defconfig
Auto-merging arch/riscv/configs/defconfig
Auto-merging arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
CONFLICT (content): Merge conflict in arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
Auto-merging arch/riscv/Kconfig
Resolved 'arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts' using previous resolution.
Resolved 'arch/riscv/include/asm/sbi.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 29896a6466bc] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
$ git diff -M --stat --summary HEAD^..
arch/riscv/Kconfig | 4 +-
arch/riscv/boot/dts/canaan/k210.dtsi | 23 +--
arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts | 2 +-
arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts | 2 +-
arch/riscv/boot/dts/canaan/sipeed_maix_go.dts | 2 +-
arch/riscv/boot/dts/canaan/sipeed_maixduino.dts | 2 +-
.../dts/microchip/microchip-mpfs-icicle-kit.dts | 4 +
arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 60 +++-----
arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 40 ++---
arch/riscv/boot/dts/sifive/fu740-c000.dtsi | 14 +-
.../riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 16 +-
arch/riscv/configs/defconfig | 13 +-
arch/riscv/configs/nommu_k210_defconfig | 2 -
arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 -
arch/riscv/configs/nommu_virt_defconfig | 1 -
arch/riscv/configs/rv32_defconfig | 6 +-
arch/riscv/errata/alternative.c | 3 +-
arch/riscv/include/asm/Kbuild | 1 -
arch/riscv/include/asm/asm-extable.h | 65 ++++++++
arch/riscv/include/asm/extable.h | 48 ++++++
arch/riscv/include/asm/futex.h | 30 +---
arch/riscv/include/asm/gpr-num.h | 77 ++++++++++
arch/riscv/include/asm/pgtable-bits.h | 2 +-
arch/riscv/include/asm/pgtable.h | 20 ++-
arch/riscv/include/asm/sbi.h | 24 +++
arch/riscv/include/asm/smp.h | 12 +-
arch/riscv/include/asm/uaccess.h | 163 +++------------------
arch/riscv/kernel/cpu-hotplug.c | 8 +-
arch/riscv/kernel/head.S | 11 +-
arch/riscv/kernel/kexec_relocate.S | 20 ++-
arch/riscv/kernel/machine_kexec.c | 3 +-
arch/riscv/kernel/sbi.c | 35 +++++
arch/riscv/kernel/setup.c | 10 ++
arch/riscv/kernel/smp.c | 10 --
arch/riscv/kernel/vmlinux-xip.lds.S | 1 -
arch/riscv/kernel/vmlinux.lds.S | 3 +-
arch/riscv/lib/uaccess.S | 28 ++--
arch/riscv/mm/extable.c | 66 +++++++--
arch/riscv/mm/fault.c | 2 +-
arch/riscv/mm/init.c | 22 ++-
arch/riscv/net/bpf_jit_comp64.c | 9 +-
scripts/mod/modpost.c | 15 ++
scripts/sorttable.c | 38 +----
43 files changed, 520 insertions(+), 400 deletions(-)
create mode 100644 arch/riscv/include/asm/asm-extable.h
create mode 100644 arch/riscv/include/asm/extable.h
create mode 100644 arch/riscv/include/asm/gpr-num.h
Merging s390/for-next (5754f9084f26 s390: add Sven Schnelle as reviewer)
$ 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
Merge made by the 'recursive' strategy.
MAINTAINERS | 1 +
arch/s390/include/asm/cpu_mf.h | 4 +-
arch/s390/include/asm/uaccess.h | 120 +++++++++++++++++++++------------
arch/s390/kernel/perf_cpum_cf_common.c | 4 +-
arch/s390/kernel/perf_cpum_cf_events.c | 6 +-
arch/s390/kernel/perf_cpum_sf.c | 2 +-
arch/s390/lib/uaccess.c | 24 +++++--
7 files changed, 105 insertions(+), 56 deletions(-)
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 (db0dd9cee822 um: virtio_uml: Allow probing from devicetree)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next
Already up to date.
Merging xtensa/xtensa-for-next (71874374b46b xtensa: use strscpy to copy strings)
$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
Merge made by the 'recursive' strategy.
arch/xtensa/kernel/setup.c | 8 ++++----
arch/xtensa/platforms/iss/network.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
Merging pidfd/for-next (317465bcc6f4 Merge branch 'fs.idmapped' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next
Auto-merging fs/namespace.c
Merge made by the 'recursive' strategy.
fs/namespace.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments)
$ 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 (a91e6e1c8074 cifs: Support fscache indexing rewrite)
$ 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 fs/cifs/connect.c
Auto-merging fs/cifs/cifsglob.h
Auto-merging fs/cifs/cifsfs.c
Removing fs/cifs/cache.c
Merge made by the 'recursive' strategy.
fs/cifs/Kconfig | 2 +-
fs/cifs/Makefile | 2 +-
fs/cifs/cache.c | 105 -----------------
fs/cifs/cifsfs.c | 19 +--
fs/cifs/cifsglob.h | 5 +-
fs/cifs/connect.c | 15 +--
fs/cifs/dir.c | 5 +
fs/cifs/file.c | 70 +++++++----
fs/cifs/fscache.c | 333 +++++++++++++----------------------------------------
fs/cifs/fscache.h | 126 +++++++-------------
fs/cifs/inode.c | 19 +--
11 files changed, 197 insertions(+), 504 deletions(-)
delete mode 100644 fs/cifs/cache.c
Merging afs/afs-next (52af7105eceb afs: Set mtime from the client for yfs create operations)
$ 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 (7aa1269834b4 Merge branch 'for-next-next-v5.16-20220107' into for-next-20220107)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
Auto-merging fs/btrfs/ioctl.c
Merge made by the 'recursive' strategy.
fs/btrfs/btrfs_inode.h | 12 +-
fs/btrfs/ctree.c | 40 ++++--
fs/btrfs/inode.c | 10 +-
fs/btrfs/ioctl.c | 28 ++---
fs/btrfs/transaction.c | 23 +++-
fs/btrfs/tree-log.c | 331 ++++++++++++++++++++++++++++---------------------
fs/btrfs/tree-log.h | 7 ++
7 files changed, 268 insertions(+), 183 deletions(-)
Merging ceph/master (a0b3a15eab6b ceph: move CEPH_SUPER_MAGIC definition to magic.h)
$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
Auto-merging net/ceph/messenger.c
Auto-merging net/ceph/ceph_common.c
CONFLICT (content): Merge conflict in net/ceph/ceph_common.c
Auto-merging include/uapi/linux/magic.h
Auto-merging include/linux/ceph/libceph.h
CONFLICT (content): Merge conflict in include/linux/ceph/libceph.h
Auto-merging fs/ceph/super.h
Auto-merging fs/ceph/super.c
Auto-merging fs/ceph/file.c
Auto-merging fs/ceph/caps.c
Auto-merging drivers/block/rbd.c
Resolved 'include/linux/ceph/libceph.h' using previous resolution.
Resolved 'net/ceph/ceph_common.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master dbde40af4f40] Merge branch 'master' of git://github.com/ceph/ceph-client.git
$ git diff -M --stat --summary HEAD^..
Documentation/filesystems/ceph.rst | 25 +++++-
drivers/block/rbd.c | 5 +-
fs/ceph/caps.c | 3 +-
fs/ceph/file.c | 24 ++++--
fs/ceph/metric.c | 2 -
fs/ceph/quota.c | 17 ++++
fs/ceph/super.c | 169 ++++++++++++++++++++++++++++++++++---
fs/ceph/super.h | 28 +++---
include/linux/ceph/libceph.h | 3 +-
include/linux/ceph/messenger.h | 2 +-
include/uapi/linux/magic.h | 1 +
net/ceph/ceph_common.c | 18 ++--
net/ceph/messenger.c | 15 ++--
13 files changed, 255 insertions(+), 57 deletions(-)
Merging cifs/for-next (a2809d0e1696 cifs: quirk for STATUS_OBJECT_NAME_INVALID returned for non-ASCII dfs refs)
$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
Auto-merging fs/cifs/inode.c
Auto-merging fs/cifs/connect.c
Merge made by the 'recursive' strategy.
fs/cifs/cifsproto.h | 5 +++++
fs/cifs/connect.c | 5 +++++
fs/cifs/inode.c | 6 ++++++
fs/cifs/misc.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
fs/cifs/sess.c | 15 +++++++++------
fs/cifs/smb2pdu.c | 9 +++++++--
6 files changed, 81 insertions(+), 8 deletions(-)
Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup())
$ 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 (09c543798c3c erofs: use meta buffers for zmap operations)
$ 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 (3d966521a824 exfat: fix missing REQ_SYNC in exfat_update_bhs())
$ 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 (5f0a61886e30 Pull Amir's FAN_RENAME and FAN_REPORT_TARGET_FID support for fanotify.)
$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
Already up to date.
Merge made by the 'recursive' strategy.
Merging ext4/dev (6eeaf88fd586 ext4: don't use the orphan list when migrating an inode)
$ 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 (5fed0be8583f f2fs: do not allow partial truncation on pinned file)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
Auto-merging fs/f2fs/sysfs.c
Auto-merging fs/f2fs/super.c
Auto-merging fs/f2fs/segment.c
Auto-merging fs/f2fs/recovery.c
Auto-merging fs/f2fs/node.c
Auto-merging fs/f2fs/inode.c
Auto-merging fs/f2fs/gc.c
Auto-merging fs/f2fs/f2fs.h
Auto-merging fs/f2fs/data.c
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-fs-f2fs | 12 +
Documentation/filesystems/f2fs.rst | 1 +
fs/f2fs/Kconfig | 1 +
fs/f2fs/checkpoint.c | 6 +-
fs/f2fs/compress.c | 84 +++---
fs/f2fs/data.c | 351 +++++-----------------
fs/f2fs/f2fs.h | 43 ++-
fs/f2fs/file.c | 509 ++++++++++++++++++++++++++------
fs/f2fs/gc.c | 26 +-
fs/f2fs/inline.c | 4 +-
fs/f2fs/inode.c | 18 +-
fs/f2fs/iostat.c | 40 ++-
fs/f2fs/node.c | 23 +-
fs/f2fs/recovery.c | 2 +-
fs/f2fs/segment.c | 2 +-
fs/f2fs/segment.h | 3 +-
fs/f2fs/super.c | 46 +++
fs/f2fs/sysfs.c | 26 +-
fs/f2fs/xattr.c | 40 +--
include/trace/events/f2fs.h | 27 +-
20 files changed, 759 insertions(+), 505 deletions(-)
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity
Already up to date.
Merging fuse/for-next (073c3ab6ae01 Documentation/filesystem/dax: DAX on virtiofs)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
Already up to date.
Merging gfs2/for-next (74382e277ae9 gfs2: dump inode object for iopen glocks)
$ 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 (c48a14dca2cb JFS: fix memleak in jfs_mount)
$ 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 (136dff3a6b71 ksmbd: add smb-direct shutdown)
$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
Merge made by the 'recursive' strategy.
fs/ksmbd/asn1.c | 142 ++++-------------------
fs/ksmbd/auth.c | 27 ++---
fs/ksmbd/auth.h | 10 +-
fs/ksmbd/connection.c | 10 +-
fs/ksmbd/connection.h | 12 +-
fs/ksmbd/ksmbd_netlink.h | 12 +-
fs/ksmbd/mgmt/user_config.c | 10 ++
fs/ksmbd/mgmt/user_config.h | 1 +
fs/ksmbd/mgmt/user_session.h | 1 -
fs/ksmbd/smb2misc.c | 18 ++-
fs/ksmbd/smb2ops.c | 16 ++-
fs/ksmbd/smb2pdu.c | 89 ++++++++-------
fs/ksmbd/smb2pdu.h | 1 +
fs/ksmbd/smb_common.h | 1 +
fs/ksmbd/transport_ipc.c | 2 +
fs/ksmbd/transport_rdma.c | 261 +++++++++++++++++++++++++++++++++----------
fs/ksmbd/transport_rdma.h | 4 +-
fs/ksmbd/vfs_cache.h | 10 --
18 files changed, 353 insertions(+), 274 deletions(-)
Merging nfs/linux-next (c9e6606c7fe9 Linux 5.16-rc8)
$ 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 (aed28b7a2d62 SUNRPC: Don't dereference xprt->snd_task if it's a cookie)
$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next
Auto-merging include/trace/events/sunrpc.h
Auto-merging include/linux/nfs_fs_sb.h
Auto-merging include/linux/nfs_fs.h
Auto-merging fs/nfs/nfs4state.c
Auto-merging fs/nfs/dir.c
Auto-merging fs/nfs/client.c
Merge made by the 'recursive' strategy.
fs/nfs/callback.h | 2 +-
fs/nfs/callback_proc.c | 2 +-
fs/nfs/callback_xdr.c | 18 +--
fs/nfs/client.c | 7 ++
fs/nfs/dir.c | 146 ++++++++++++++++++-----
fs/nfs/filelayout/filelayout.h | 2 +-
fs/nfs/filelayout/filelayoutdev.c | 4 +-
fs/nfs/internal.h | 1 +
fs/nfs/nfs3proc.c | 5 +-
fs/nfs/nfs42proc.c | 13 ++-
fs/nfs/nfs4_fs.h | 14 ++-
fs/nfs/nfs4client.c | 5 +-
fs/nfs/nfs4namespace.c | 19 +--
fs/nfs/nfs4proc.c | 197 +++++++++++++++++++++++++-------
fs/nfs/nfs4state.c | 6 +-
fs/nfs/nfs4xdr.c | 49 +++++++-
fs/nfs/sysfs.c | 3 +-
include/linux/nfs_fs.h | 10 +-
include/linux/nfs_fs_sb.h | 4 +-
include/linux/nfs_xdr.h | 5 +-
include/trace/events/sunrpc.h | 70 ++++++++----
net/sunrpc/auth_gss/gss_generic_token.c | 6 +-
net/sunrpc/clnt.c | 5 +-
net/sunrpc/sysfs.c | 47 ++++----
net/sunrpc/xprtrdma/backchannel.c | 4 -
net/sunrpc/xprtrdma/frwr_ops.c | 4 -
net/sunrpc/xprtrdma/rpc_rdma.c | 4 -
net/sunrpc/xprtrdma/transport.c | 4 -
net/sunrpc/xprtrdma/verbs.c | 23 ----
net/sunrpc/xprtsock.c | 2 +-
30 files changed, 474 insertions(+), 207 deletions(-)
Merging nfsd/for-next (167208616753 SUNRPC: Fix sockaddr handling in svcsock_accept_class trace points)
$ 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 (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED)
$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
Auto-merging fs/ntfs3/inode.c
Auto-merging fs/ntfs3/file.c
Merge made by the 'recursive' strategy.
fs/ntfs3/file.c | 12 +++--
fs/ntfs3/frecord.c | 10 ++--
fs/ntfs3/fslog.c | 6 ++-
fs/ntfs3/inode.c | 8 +++-
fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++-------
5 files changed, 145 insertions(+), 27 deletions(-)
Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
Merge made by the 'recursive' strategy.
fs/orangefs/orangefs-bufmap.c | 7 +++----
fs/orangefs/orangefs-sysfs.c | 21 ++++++++++++++-------
2 files changed, 17 insertions(+), 11 deletions(-)
Merging overlayfs/overlayfs-next (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper)
$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next
Merge made by the 'recursive' strategy.
fs/overlayfs/copy_up.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
Merging ubifs/next (aa39cc675799 jffs2: GC deadlock reading a page that is used in jffs2_write_begin())
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
Already up to date.
Merging v9fs/9p-next (19d1c32652bb 9p: fix enodata when reading growing file)
$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
Already up to date.
Merging xfs/for-next (b3bb9413e717 xfs: remove the XFS_IOC_{ALLOC,FREE}SP* definitions)
$ 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_ioctl.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_ioctl.c
Auto-merging fs/xfs/xfs_file.c
Auto-merging fs/xfs/xfs_bmap_util.c
Recorded preimage for 'fs/xfs/xfs_ioctl.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
Recorded resolution for 'fs/xfs/xfs_ioctl.c'.
[master 42520392f692] Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
$ git diff -M --stat --summary HEAD^..
fs/xfs/libxfs/xfs_fs.h | 37 ++++--------------
fs/xfs/xfs_bmap_util.c | 7 ++--
fs/xfs/xfs_bmap_util.h | 2 +-
fs/xfs/xfs_file.c | 3 +-
fs/xfs/xfs_ioctl.c | 102 +++++++------------------------------------------
fs/xfs/xfs_ioctl.h | 6 ---
fs/xfs/xfs_ioctl32.c | 27 -------------
fs/xfs/xfs_ioctl32.h | 4 --
8 files changed, 27 insertions(+), 161 deletions(-)
Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
Auto-merging fs/zonefs/super.c
Merge made by the 'recursive' strategy.
Merging iomap/iomap-for-next (5ad448ce2976 iomap: iomap_read_inline_data cleanup)
$ 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 (d03ef4daf33a fs: forbid invalid project ID)
$ 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 'recursive' strategy.
Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
Already up to date.
Merge made by the 'recursive' strategy.
Merging printk/for-next (395cc1cdcbd4 Merge branch 'for-5.17' 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
Already up to date.
Merge made by the 'recursive' strategy.
Merging pci/next (87c71931633b Merge branch 'pci/driver-cleanup')
$ 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 (a5d05b07961a pstore/ftrace: Allow immediate recording)
$ 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 (1bec0754eaa0 Merge branches 'for-5.16/upstream-fixes', 'for-5.17/apple', 'for-5.17/core', 'for-5.17/hidraw', 'for-5.17/i2c-hid', 'for-5.17/letsketch', 'for-5.17/logitech', 'for-5.17/magicmouse' and 'for-5.17/thrustmaster' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
Already up to date.
Merge made by the 'recursive' strategy.
Merging i2c/i2c/for-next (fe37c72debe9 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
Already up to date.
Merge made by the 'recursive' strategy.
Merging i3c/i3c/next (13462ba1815d i3c: master: dw: check return of dw_i3c_master_get_free_pos())
$ 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 (00f5117c5f78 hwmon: (nzxt-smart2) make array detect_fans_report static const)
$ 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 (cc2cf6796a90 docs: ftrace: fix ambiguous sentence)
$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
Auto-merging Documentation/staging/tee.rst
Merge made by the 'recursive' strategy.
Documentation/staging/tee.rst | 4 ++--
Documentation/trace/ftrace.rst | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Merging v4l-dvb/master (68b9bcc8a534 media: ipu3-cio2: Add support for instantiating i2c-clients for VCMs)
$ 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 (8d4ff8187bb2 media: si2157: add support for DVB-C Annex C)
$ 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 (93e5c8b5e46e Merge branch 'pm-core' 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 include/linux/efi.h
Auto-merging drivers/mmc/host/jz4740_mmc.c
Auto-merging drivers/acpi/scan.c
Auto-merging drivers/acpi/acpi_apd.c
Auto-merging drivers/acpi/Makefile
Auto-merging drivers/acpi/Kconfig
Merge made by the 'recursive' strategy.
Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
arch/x86/kernel/resource.c | 23 +-
drivers/acpi/Kconfig | 22 +
drivers/acpi/Makefile | 1 +
drivers/acpi/acpi_apd.c | 2 +
drivers/acpi/acpi_pcc.c | 2 +-
drivers/acpi/internal.h | 2 +-
drivers/acpi/pfr_telemetry.c | 435 ++++++++++++++++
drivers/acpi/pfr_update.c | 575 +++++++++++++++++++++
drivers/acpi/scan.c | 76 +--
drivers/acpi/spcr.c | 9 +-
drivers/iio/pressure/bmp280-core.c | 11 +-
drivers/iio/pressure/bmp280-i2c.c | 2 +-
drivers/iio/pressure/bmp280-spi.c | 2 +-
drivers/mmc/host/jz4740_mmc.c | 4 +-
drivers/mmc/host/mxcmmc.c | 2 +-
include/linux/efi.h | 46 ++
include/linux/pm.h | 55 +-
include/linux/pm_runtime.h | 24 +
include/uapi/linux/pfrut.h | 262 ++++++++++
tools/power/acpi/.gitignore | 1 +
tools/power/acpi/Makefile | 16 +-
tools/power/acpi/Makefile.rules | 2 +-
tools/power/acpi/man/pfrut.8 | 137 +++++
tools/power/acpi/tools/pfrut/Makefile | 23 +
tools/power/acpi/tools/pfrut/pfrut.c | 424 +++++++++++++++
26 files changed, 2068 insertions(+), 91 deletions(-)
create mode 100644 drivers/acpi/pfr_telemetry.c
create mode 100644 drivers/acpi/pfr_update.c
create mode 100644 include/uapi/linux/pfrut.h
create mode 100644 tools/power/acpi/man/pfrut.8
create mode 100644 tools/power/acpi/tools/pfrut/Makefile
create mode 100644 tools/power/acpi/tools/pfrut/pfrut.c
Merging cpufreq-arm/cpufreq/arm/linux-next (d776790a5536 cpufreq: mediatek-hw: Fix double devm_remap in hotplug case)
$ 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 (21f61b52868d tools/power/cpupower/{ToDo => TODO}: Rename the todo file)
$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
Merge made by the 'recursive' strategy.
tools/power/cpupower/{ToDo => TODO} | 0
tools/power/cpupower/man/cpupower-idle-set.1 | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename tools/power/cpupower/{ToDo => TODO} (100%)
Merging devfreq/devfreq-next (4667431419e9 PM / devfreq: Reduce log severity for informative message)
$ 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 (489a00ef46c9 Documentation: power: Update outdated contents in opp.rst)
$ 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 (8ee1c0f6526c thermal/drivers/rz2gl: Add error check for reset_control_deassert())
$ 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
Already up to date.
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 (feae43f8aa88 fs: dlm: print cluster addr if non-cluster node connects)
$ 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 (c0fe82baaeb2 Merge tag 'v5.16' into rdma.git for-next)
$ 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 (fe8152b38d3a Merge tag 'devprop-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
$ 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 (c25af830ab26 sch_cake: revise Diffserv docs)
$ 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 (fe8152b38d3a Merge tag 'devprop-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
$ 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 (685b1afd7911 net/mlx5: Introduce log_max_current_uc_list_wr_supported bit)
$ 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 (fe8152b38d3a Merge tag 'devprop-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
$ 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 (2b71e2c7b56c netfilter: nft_set_pipapo_avx2: remove redundant pointer lt)
$ 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 (3afee2118132 Bluetooth: fix null ptr deref on hci_sync_conn_complete_evt)
$ 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 'recursive' strategy.
drivers/bluetooth/btmtk.h | 35 +++++++++++++
drivers/bluetooth/btmtksdio.c | 116 ++++++++++++++++++++++++++++++++++++++----
net/bluetooth/hci_event.c | 19 +++++--
net/bluetooth/hci_sync.c | 4 +-
4 files changed, 158 insertions(+), 16 deletions(-)
Merging wireless-next/main (fe8152b38d3a Merge tag 'devprop-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/main
Already up to date.
Merging mtd/mtd/next (9ce47e43a0f0 Merge tag 'nand/for-5.17' 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 (2997e4871621 Merge tag 'memory-controller-drv-omap-5.17' into nand/next)
$ 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 (5f340402bbfc mtd: spi-nor: Remove debugfs entries that duplicate sysfs entries)
$ 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 (5f21d7d283dd crypto: af_alg - rewrite NULL pointer check)
$ 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 (4efdddbce7c1 Merge tag 'amd-drm-next-5.17-2022-01-12' 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
Already up to date.
Merging drm-misc/for-linux-next (5d474cc501b9 drm/mipi-dbi: Fix source-buffer address in mipi_dbi_buf_copy)
$ 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 (786e0a76ff5f drm/amdgpu: bump driver version for new CTX OP to set/get stable pstates)
$ 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/inc/resource.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/inc/resource.h
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
Resolved 'drivers/gpu/drm/amd/display/dc/core/dc.c' using previous resolution.
Resolved 'drivers/gpu/drm/amd/display/dc/inc/resource.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master fd010916a5bf] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
$ git diff -M --stat --summary HEAD^..
drivers/gpu/drm/Kconfig | 1 +
drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 20 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 22 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 129 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 25 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 66 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 26 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 24 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 61 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 11 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 13 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 12 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 20 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 11 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 11 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 108 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 9 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 371 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 62 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 12 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 69 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 39 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 51 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 4 +-
drivers/gpu/drm/amd/amdgpu/cik.c | 4 +
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 67 +-
drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 24 +-
drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 2 +-
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 25 +-
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 2 +-
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 16 +-
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 57 +-
drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 14 +-
drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 2 +-
drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 85 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 10 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 10 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 2 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 10 +-
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 2 +-
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 17 +-
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 2 +-
drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 +
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 4 +-
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 1 +
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 58 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 25 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h | 2 +-
drivers/gpu/drm/amd/amdgpu/soc15.c | 18 +-
drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 12 +-
drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 2 +-
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 10 +-
drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 2 +-
drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 12 +-
drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 2 +-
drivers/gpu/drm/amd/amdgpu/vi.c | 4 +
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 55 +-
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 248 +-
.../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 11 +-
.../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 11 +-
drivers/gpu/drm/amd/display/dc/core/dc.c | 40 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 10 +-
drivers/gpu/drm/amd/display/dc/inc/resource.h | 11 +
.../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 25 -
.../amd/display/dc/irq/dcn20/irq_service_dcn20.h | 2 -
.../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 25 -
.../amd/display/dc/irq/dcn21/irq_service_dcn21.h | 2 -
drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +-
drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 4 -
drivers/gpu/drm/amd/include/amd_shared.h | 2 -
drivers/gpu/drm/amd/include/kgd_pp_interface.h | 12 +-
drivers/gpu/drm/amd/pm/Makefile | 13 +-
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2513 ++++++++++----------
drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 94 +
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 549 ++---
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 342 ++-
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h | 32 +
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32 +
.../drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h | 0
.../drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 37 +-
.../drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0
.../drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 1081 +++++++++
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h | 38 +
.../drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0
.../amd/pm/{powerplay => legacy-dpm}/r600_dpm.h | 0
.../drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 182 +-
.../drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 15 +-
.../drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0
.../pm/{powerplay => legacy-dpm}/sislands_smc.h | 0
drivers/gpu/drm/amd/pm/powerplay/Makefile | 4 -
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 122 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 10 +-
.../drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0
.../drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0
.../amd/pm/{ => powerplay}/inc/hardwaremanager.h | 0
drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 3 -
.../pm/{ => powerplay}/inc/polaris10_pwrvirus.h | 0
.../drm/amd/pm/{ => powerplay}/inc/power_state.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h | 0
.../drm/amd/pm/{ => powerplay}/inc/pp_thermal.h | 0
.../drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0
drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h | 0
.../amd/pm/{ => powerplay}/inc/smu10_driver_if.h | 0
.../amd/pm/{ => powerplay}/inc/smu11_driver_if.h | 0
drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0
drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h | 0
.../amd/pm/{ => powerplay}/inc/smu71_discrete.h | 0
drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h | 0
.../amd/pm/{ => powerplay}/inc/smu72_discrete.h | 0
drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h | 0
.../amd/pm/{ => powerplay}/inc/smu73_discrete.h | 0
drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h | 0
.../amd/pm/{ => powerplay}/inc/smu74_discrete.h | 0
drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h | 0
.../amd/pm/{ => powerplay}/inc/smu75_discrete.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu7_common.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0
drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0
drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0
.../amd/pm/{ => powerplay}/inc/smu9_driver_if.h | 0
.../amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h | 2 +-
.../amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0
.../drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0
.../drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0
.../pm/{ => powerplay}/inc/vega12/smu9_driver_if.h | 0
.../drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0
.../drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 227 +-
.../gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 16 +-
.../{inc => swsmu/inc/pmfw_if}/aldebaran_ppsmc.h | 0
.../pm/{inc => swsmu/inc/pmfw_if}/arcturus_ppsmc.h | 0
.../inc/pmfw_if}/smu11_driver_if_arcturus.h | 0
.../inc/pmfw_if}/smu11_driver_if_cyan_skillfish.h | 0
.../inc/pmfw_if}/smu11_driver_if_navi10.h | 0
.../inc/pmfw_if}/smu11_driver_if_sienna_cichlid.h | 0
.../inc/pmfw_if}/smu11_driver_if_vangogh.h | 0
.../{inc => swsmu/inc/pmfw_if}/smu12_driver_if.h | 0
.../inc/pmfw_if}/smu13_driver_if_aldebaran.h | 0
.../inc/pmfw_if}/smu13_driver_if_yellow_carp.h | 0
.../{inc => swsmu/inc/pmfw_if}/smu_v11_0_7_ppsmc.h | 0
.../{inc => swsmu/inc/pmfw_if}/smu_v11_0_ppsmc.h | 0
.../pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_pmfw.h | 0
.../{inc => swsmu/inc/pmfw_if}/smu_v11_5_ppsmc.h | 2 +-
.../pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_pmfw.h | 0
.../{inc => swsmu/inc/pmfw_if}/smu_v11_8_ppsmc.h | 0
.../{inc => swsmu/inc/pmfw_if}/smu_v12_0_ppsmc.h | 0
.../{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_pmfw.h | 0
.../{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_ppsmc.h | 0
.../amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0
drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h | 2 +-
drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0
.../amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0
drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0
drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 10 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 9 +-
.../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 40 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 11 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 -
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 10 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 15 +-
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 +
drivers/gpu/drm/radeon/radeon.h | 3 +
drivers/gpu/drm/radeon/radeon_audio.c | 95 +
drivers/gpu/drm/radeon/radeon_device.c | 19 +-
include/uapi/drm/amdgpu_drm.h | 19 +-
196 files changed, 4698 insertions(+), 3122 deletions(-)
create mode 100644 drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c
create mode 100644 drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h
create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c (99%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c (100%)
create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/r600_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c (98%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h (99%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/sislands_smc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hardwaremanager.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h (99%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/polaris10_pwrvirus.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/power_state.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_thermal.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu11_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_common.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h (99%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12/smu9_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h (98%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/aldebaran_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/arcturus_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_arcturus.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_cyan_skillfish.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_navi10.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_sienna_cichlid.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_vangogh.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu12_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu13_driver_if_aldebaran.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu13_driver_if_yellow_carp.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_0_7_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_0_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_ppsmc.h (99%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v12_0_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h (99%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h (100%)
$ git am -3 ../patches/0001-fix-up-for-bad-merge-due-to-cherry-picked-and-fixed-.patch
Applying: fix up for bad merge due to cherry-picked and fixed commit
$ git reset HEAD^
Unstaged changes after reset:
M drivers/gpu/drm/amd/display/dc/core/dc_resource.c
M drivers/gpu/drm/amd/display/dc/dc.h
M drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
M drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
M drivers/gpu/drm/amd/display/dc/inc/core_types.h
$ git add -A .
$ git commit -v -a --amend
[master cf97f404b54a] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
Date: Tue Jan 18 09:54:34 2022 +1100
Merging drm-intel/for-linux-next (e26602be4869 drm/i915/display/adlp: Implement new step in the TC voltage swing prog sequence)
$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
Merge made by the 'recursive' strategy.
drivers/gpu/drm/i915/display/intel_ddi.c | 22 ++++++++++++++++++++++
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 10 +++++-----
drivers/gpu/drm/i915/i915_reg.h | 8 ++++++--
3 files changed, 33 insertions(+), 7 deletions(-)
Merging drm-intel-gt/for-linux-next-gt (e26602be4869 drm/i915/display/adlp: Implement new step in the TC voltage swing prog sequence)
$ git merge -m Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel drm-intel-gt/for-linux-next-gt
Already up to date.
Merging drm-tegra/drm/tegra/for-next (d210919dbdc8 drm/tegra: Add back arm_iommu_detach_device())
$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next
Already up to date.
Merging drm-msm/msm-next (6ed95285382d drm/msm/a5xx: Fix missing CP_PROTECT for SMMU on A540)
$ 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 (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource())
$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next
Merge made by the 'recursive' strategy.
drivers/gpu/drm/imx/imx-tve.c | 4 +---
drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------
2 files changed, 4 insertions(+), 9 deletions(-)
Merging etnaviv/etnaviv/next (cdd156955f94 drm/etnaviv: consider completed fence seqno in hang check)
$ 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 (842086bc7262 video: fbdev: controlfb: Fix COMPILE_TEST build)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/display/simple-framebuffer.yaml | 12 +++++++-----
drivers/video/backlight/lm3630a_bl.c | 1 -
drivers/video/backlight/qcom-wled.c | 1 +
drivers/video/fbdev/aty/aty128fb.c | 10 ++++++----
drivers/video/fbdev/aty/mach64_ct.c | 4 +---
drivers/video/fbdev/controlfb.c | 2 ++
drivers/video/fbdev/hyperv_fb.c | 16 +++-------------
drivers/video/fbdev/imxfb.c | 2 ++
drivers/video/fbdev/matrox/matroxfb_base.c | 2 +-
drivers/video/fbdev/mb862xx/mb862xxfb_accel.c | 2 +-
drivers/video/fbdev/ocfb.c | 2 +-
drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c | 3 ++-
drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 3 ++-
drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 3 ++-
drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 1 -
drivers/video/fbdev/sis/sis_main.c | 2 +-
16 files changed, 32 insertions(+), 34 deletions(-)
Merging regmap/for-next (b56a7cbf40c8 regmap: debugfs: Fix indentation)
$ 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 (5576c4f24c56 ALSA: core: Fix SSID quirk lookup for subvendor=0)
$ 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 (f7a6021aaf02 ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name)
$ 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 (a97ac8cb24a3 module: fix signature check failures when using in-kernel decompression)
$ 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 (b6e43dddaea3 Input: ti_am335x_tsc - fix a typo in a comment)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
Already up to date.
Merging block/for-next (a1c0aad3a9e3 Merge branch 'block-5.17' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
Merge made by the 'recursive' strategy.
block/blk-mq-tag.c | 40 ++++++++++++++++++++-----
block/blk-sysfs.c | 4 ++-
drivers/block/aoe/aoecmd.c | 2 +-
drivers/block/brd.c | 73 +++++++++++++++++++---------------------------
drivers/block/loop.c | 2 +-
fs/io_uring.c | 64 +++++++++++++++++++++++++++++++---------
include/linux/sbitmap.h | 11 +++++++
lib/sbitmap.c | 25 ++++++++++++++--
8 files changed, 151 insertions(+), 70 deletions(-)
Merging device-mapper/for-next (eaac0b590a47 dm sysfs: use default_groups in kobj_type)
$ 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 (237fe8885a3f ata: pata_ali: remove redundant return statement)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next
Merge made by the 'recursive' strategy.
drivers/ata/Kconfig | 44 ++---
drivers/ata/acard-ahci.c | 4 -
drivers/ata/ahci.c | 24 ++-
drivers/ata/ahci_brcm.c | 4 +-
drivers/ata/ahci_ceva.c | 5 +-
drivers/ata/ahci_qoriq.c | 4 -
drivers/ata/ahci_xgene.c | 12 +-
drivers/ata/ata_piix.c | 11 +-
drivers/ata/libahci.c | 33 +---
drivers/ata/libahci_platform.c | 14 +-
drivers/ata/libata-acpi.c | 69 +++----
drivers/ata/libata-core.c | 231 +++++-----------------
drivers/ata/libata-eh.c | 72 ++++---
drivers/ata/libata-pmp.c | 8 -
drivers/ata/libata-sata.c | 11 +-
drivers/ata/libata-scsi.c | 170 +++++-----------
drivers/ata/libata-sff.c | 88 +++------
drivers/ata/libata-trace.c | 47 +++++
drivers/ata/libata-transport.c | 48 ++++-
drivers/ata/libata.h | 5 +-
drivers/ata/pata_ali.c | 4 +-
drivers/ata/pata_arasan_cf.c | 3 +
drivers/ata/pata_atp867x.c | 105 +++++-----
drivers/ata/pata_cmd640.c | 2 +-
drivers/ata/pata_cmd64x.c | 4 +-
drivers/ata/pata_cs5520.c | 4 +-
drivers/ata/pata_cs5536.c | 4 +-
drivers/ata/pata_cypress.c | 2 +-
drivers/ata/pata_ep93xx.c | 1 -
drivers/ata/pata_hpt366.c | 5 +-
drivers/ata/pata_hpt37x.c | 20 +-
drivers/ata/pata_hpt3x2n.c | 12 +-
drivers/ata/pata_it821x.c | 66 ++++---
drivers/ata/pata_ixp4xx_cf.c | 6 +-
drivers/ata/pata_marvell.c | 9 +-
drivers/ata/pata_netcell.c | 5 +-
drivers/ata/pata_octeon_cf.c | 54 ++----
drivers/ata/pata_of_platform.c | 15 +-
drivers/ata/pata_pdc2027x.c | 71 +++----
drivers/ata/pata_pdc202xx_old.c | 2 -
drivers/ata/pata_rz1000.c | 4 +-
drivers/ata/pata_serverworks.c | 4 +-
drivers/ata/pata_sil680.c | 9 +-
drivers/ata/pata_via.c | 12 --
drivers/ata/pdc_adma.c | 33 +---
drivers/ata/sata_dwc_460ex.c | 165 ++++------------
drivers/ata/sata_fsl.c | 212 +++++++++-----------
drivers/ata/sata_gemini.c | 4 +-
drivers/ata/sata_inic162x.c | 4 +-
drivers/ata/sata_mv.c | 132 ++++++-------
drivers/ata/sata_nv.c | 54 ++----
drivers/ata/sata_promise.c | 31 +--
drivers/ata/sata_qstor.c | 15 +-
drivers/ata/sata_rcar.c | 26 +--
drivers/ata/sata_sil.c | 1 -
drivers/ata/sata_sil24.c | 5 +-
drivers/ata/sata_sx4.c | 148 +++++---------
include/linux/libata.h | 138 ++++++-------
include/trace/events/libata.h | 416 +++++++++++++++++++++++++++++++++++++++-
59 files changed, 1272 insertions(+), 1439 deletions(-)
Merging pcmcia/pcmcia-next (fbb3485f1f93 pcmcia: fix setting of kthread task states)
$ 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 (356f3f2c5756 dt-bindings: mmc: synopsys-dw-mshc: integrate Altera and Imagination)
$ 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 (e565615c5486 mfd: google,cros-ec: Fix property name for MediaTek rpmsg)
$ 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 (ec961cf32411 backlight: qcom-wled: Respect enabled-strings in set_brightness)
$ 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 (25fd330370ac power: supply_core: Pass pointer to battery info)
$ 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 (f2fbbf96ec26 Merge remote-tracking branch 'regulator/for-5.16' 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
Already up to date.
Merge made by the 'recursive' strategy.
Merging apparmor/apparmor-next (875e5cc6b065 lsm: Fix kernel-doc)
$ 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 security/apparmor/lsm.c
Merge made by the 'recursive' strategy.
security/apparmor/include/lib.h | 5 +++++
security/apparmor/label.c | 11 ++++++-----
security/apparmor/lsm.c | 10 +++++-----
security/apparmor/policy.c | 2 +-
security/apparmor/policy_unpack_test.c | 18 +++++++++---------
security/apparmor/procattr.c | 2 +-
6 files changed, 27 insertions(+), 21 deletions(-)
Merging integrity/next-integrity (65e38e32a959 selftests/kexec: Enable secureboot tests for PowerPC)
$ 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 (6cd9d4b97891 selinux: minor tweaks to selinux_add_opt())
$ 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 (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi)
$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
Already up to date.
Merging tomoyo/master (f702e1107601 tomoyo: use hwight16() in tomoyo_domain_quota_is_ok())
$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master
Already up to date.
Merging tpmdd/next (a33f5c380c4b Merge tag 'xfs-5.17-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
$ 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 (ffd264bd152c watchdog: msc313e: Check if the WDT was running at boot)
$ 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 (66dc1b791c58 Merge branches 'arm/smmu', 'virtio', 'x86/amd', 'x86/vt-d' and 'core' 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 (ed98ea2128b6 audit: replace zero-length array with flexible-array member)
$ 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 (d8adf5b92a9d scripts/dtc: dtx_diff: remove broken example from help text)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.yaml
Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
Resolved 'Documentation/devicetree/bindings/vendor-prefixes.yaml' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 87c48599f674] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/power/reset/gpio-restart.yaml | 4 ++--
Documentation/devicetree/bindings/trivial-devices.yaml | 8 ++++----
Documentation/devicetree/bindings/vendor-prefixes.yaml | 10 ++++++++++
scripts/dtc/dtx_diff | 8 ++------
4 files changed, 18 insertions(+), 12 deletions(-)
Merging mailbox/mailbox-for-next (869b6ca39c08 dt-bindings: mailbox: Add more protocol and client ID)
$ 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 (238582f974ab Merge remote-tracking branch 'spi/for-5.16' into spi-linus)
$ 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/auto-latest (85538cc07d6b Merge branch into tip/master: 'x86/core')
$ git merge -m Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/auto-latest
Already up to date.
Merge made by the 'recursive' strategy.
Merging clockevents/timers/drivers/next (7647204c2e81 dt-bindings: timer: Add Mstar MSC313e timer devicetree bindings documentation)
$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
Already up to date.
Merging edac/edac-for-next (3a8cccd0b519 Merge branch 'edac-amd64' into edac-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
Already up to date.
Merge made by the 'recursive' strategy.
Merging irqchip/irq/irqchip-next (cd448b24c621 Merge branch irq/misc-5.17 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 (f37c3bbc6359 tracing: Add ustring operation to filtering string pointers)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next
Already up to date.
Merging rcu/rcu/next (76a2b0bbce2c Merge branch 'kcsan.2021.12.09b' 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 'recursive' strategy.
.../litmus-tests/locking/DCL-broken.litmus | 55 ++++
.../litmus-tests/locking/DCL-fixed.litmus | 56 ++++
.../litmus-tests/locking/RM-broken.litmus | 42 +++
Documentation/litmus-tests/locking/RM-fixed.litmus | 42 +++
tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++++++++
tools/memory-model/litmus-tests/.gitignore | 2 +-
tools/memory-model/scripts/README | 16 +-
tools/memory-model/scripts/checkalllitmus.sh | 29 +-
tools/memory-model/scripts/checkghlitmus.sh | 11 +-
tools/memory-model/scripts/checklitmus.sh | 25 +-
tools/memory-model/scripts/checklitmushist.sh | 2 +-
tools/memory-model/scripts/checktheselitmus.sh | 43 +++
tools/memory-model/scripts/cmplitmushist.sh | 49 +++-
tools/memory-model/scripts/hwfnseg.sh | 20 ++
tools/memory-model/scripts/initlitmushist.sh | 2 +-
tools/memory-model/scripts/judgelitmus.sh | 120 ++++++--
tools/memory-model/scripts/newlitmushist.sh | 4 +-
tools/memory-model/scripts/parseargs.sh | 21 +-
tools/memory-model/scripts/runlitmus.sh | 80 ++++++
tools/memory-model/scripts/runlitmushist.sh | 29 +-
tools/memory-model/scripts/simpletest.sh | 35 +++
21 files changed, 915 insertions(+), 88 deletions(-)
create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus
create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus
create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus
create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus
create mode 100644 tools/memory-model/Documentation/locking.txt
create mode 100755 tools/memory-model/scripts/checktheselitmus.sh
create mode 100755 tools/memory-model/scripts/hwfnseg.sh
create mode 100755 tools/memory-model/scripts/runlitmus.sh
create mode 100755 tools/memory-model/scripts/simpletest.sh
Merging kvm/next (c862dcd19975 x86/fpu: Fix inline prefix warnings)
$ 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 (1c53a1ae3612 Merge branch kvm-arm64/misc-5.17 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 (812de04661c4 KVM: s390: Clarify SIGP orders versus STOP/RESTART)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
Already up to date.
Merging xen-tip/linux-next (54bb4a91b281 dt-bindings: xen: Clarify "reg" purpose)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
Already up to date.
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
Already up to date.
Merge made by the 'recursive' strategy.
Merging workqueues/for-next (bc35f7ef9628 workqueue: Convert the type of pool->nr_running to int)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
Merge made by the 'recursive' strategy.
kernel/workqueue.c | 58 +++++++++++++++++++-----------------------------------
1 file changed, 20 insertions(+), 38 deletions(-)
Merging drivers-x86/for-next (3367d1bd738c power: supply: Provide stubs for charge_behaviour helpers)
$ 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 (fa55b7dcdc43 Linux 5.16-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
Already up to date.
Merging hsi/for-next (a1ee1c08fcd5 HSI: core: Fix return freed object in hsi_new_client)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
Already up to date.
Merging leds/for-next (d949edb503b1 leds: lp55xx: initialise output direction from dts)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next
Auto-merging drivers/leds/Makefile
Auto-merging drivers/leds/Kconfig
Merge made by the 'recursive' strategy.
Merging ipmi/for-next (d134ad2574a1 ipmi: ssif: replace strlcpy with strscpy)
$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 1 +
drivers/char/ipmi/ipmi_ssif.c | 2 +-
drivers/char/ipmi/ipmi_watchdog.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
Merging driver-core/driver-core-next (0c947b893d69 Merge tag '5.17-rc-part1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next
Already up to date.
Merging usb/usb-next (455e73a07f6e Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux)
$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
Already up to date.
Merging 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 (2585cf9dfaad Linux 5.16-rc5)
$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
Already up to date.
Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed)
$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next
Merge made by the 'recursive' strategy.
Merging tty/tty-next (4d66020dcef8 Merge tag 'trace-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
Already up to date.
Merging char-misc/char-misc-next (0c947b893d69 Merge tag '5.17-rc-part1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
Already up to date.
Merging extcon/extcon-next (2da3db7f498d extcon: Deduplicate code in extcon_set_state_sync())
$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
Already up to date.
Merging gnss/gnss-next (547d2167c5c3 gnss: usb: add support for Sierra Wireless XM1210)
$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
Already up to date.
Merging phy-next/next (09d976b3e8e2 phy: cadence: Sierra: Add support for derived reference clock output)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
Already up to date.
Merging soundwire/next (bb349fd2d580 soundwire: qcom: remove redundant version number read)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
Already up to date.
Merging thunderbolt/next (fa487b2a900d thunderbolt: Add module parameter for CLx disabling)
$ 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 vfio/next (2bed2ced40c9 vfio/iommu_type1: replace kfree with kvfree)
$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
Merge made by the 'recursive' strategy.
drivers/vfio/pci/vfio_pci_igd.c | 15 +++++++++------
drivers/vfio/vfio_iommu_type1.c | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
Merging staging/staging-next (4d66020dcef8 Merge tag 'trace-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
Already up to date.
Merging iio/togreg (38ac2f038666 iio: chemical: sunrise_co2: set val parameter only on success)
$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
Already up to date.
Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4)
$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next
Already up to date.
Merging icc/icc-next (01f8938ad036 Merge branch 'icc-qcm2290' into icc-next)
$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
Already up to date.
Merging dmaengine/next (bbd0ff07ed12 dt-bindings: dma-controller: Split interrupt fields in example)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
Auto-merging drivers/dma/ti/k3-udma.c
Removing Documentation/devicetree/bindings/dma/arm-pl330.txt
Merge made by the 'recursive' strategy.
Documentation/ABI/stable/sysfs-driver-dma-idxd | 52 ++++-
.../devicetree/bindings/dma/arm,pl330.yaml | 83 +++++++
.../devicetree/bindings/dma/arm-pl08x.yaml | 4 +
.../devicetree/bindings/dma/arm-pl330.txt | 49 -----
.../devicetree/bindings/dma/dma-controller.yaml | 8 +-
.../devicetree/bindings/dma/ingenic,dma.yaml | 42 ++--
.../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 5 +
.../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 3 +
.../devicetree/bindings/dma/ti/k3-bcdma.yaml | 1 +
.../devicetree/bindings/dma/ti/k3-pktdma.yaml | 1 +
Documentation/driver-api/dmaengine/dmatest.rst | 17 +-
Documentation/driver-api/dmaengine/provider.rst | 23 ++
drivers/dma/at_xdmac.c | 194 ++++++++---------
drivers/dma/dma-jz4780.c | 118 +++++++---
drivers/dma/dmaengine.c | 7 +
drivers/dma/idxd/device.c | 222 ++++++++++++-------
drivers/dma/idxd/dma.c | 40 +++-
drivers/dma/idxd/idxd.h | 67 ++++--
drivers/dma/idxd/init.c | 196 +++--------------
drivers/dma/idxd/irq.c | 239 ++++++++++++++++++++-
drivers/dma/idxd/registers.h | 15 +-
drivers/dma/idxd/submit.c | 69 +++---
drivers/dma/idxd/sysfs.c | 215 ++++++++++++++----
drivers/dma/ioat/sysfs.c | 3 +-
drivers/dma/pch_dma.c | 2 +-
drivers/dma/ppc4xx/adma.c | 3 +-
drivers/dma/qcom/gpi.c | 4 +-
drivers/dma/sh/rcar-dmac.c | 17 +-
drivers/dma/sh/shdma-base.c | 6 +-
drivers/dma/stm32-mdma.c | 78 +++----
drivers/dma/ti/Makefile | 3 +-
drivers/dma/ti/edma.c | 3 +-
drivers/dma/ti/k3-psil-j721s2.c | 167 ++++++++++++++
drivers/dma/ti/k3-psil-priv.h | 1 +
drivers/dma/ti/k3-psil.c | 1 +
drivers/dma/ti/k3-udma.c | 1 +
drivers/dma/uniphier-xdmac.c | 5 +-
drivers/dma/xilinx/xilinx_dma.c | 133 +++++++++++-
include/linux/dma/xilinx_dpdma.h | 2 +-
include/linux/dmaengine.h | 20 ++
include/uapi/linux/idxd.h | 1 +
41 files changed, 1465 insertions(+), 655 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/arm,pl330.yaml
delete mode 100644 Documentation/devicetree/bindings/dma/arm-pl330.txt
create mode 100644 drivers/dma/ti/k3-psil-j721s2.c
Merging cgroup/for-next (27fe872b5169 Merge branch 'for-5.17-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
Merge made by the 'recursive' strategy.
kernel/cgroup/cpuset.c | 52 ++++++++++++++++++++++++++++++++++++++------------
1 file changed, 40 insertions(+), 12 deletions(-)
Merging scsi/for-next (556e72236781 Merge branch 'misc' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
Auto-merging include/scsi/scsi_device.h
Auto-merging drivers/scsi/sd.c
Auto-merging drivers/scsi/scsi_lib.c
Merge made by the 'recursive' strategy.
drivers/scsi/aacraid/aachba.c | 2 +-
drivers/scsi/aic7xxx/aic79xx_osm.c | 6 +--
drivers/scsi/hisi_sas/hisi_sas_main.c | 5 --
drivers/scsi/megaraid.c | 84 ++++++++++++++-------------------
drivers/scsi/mpi3mr/mpi3mr_fw.c | 11 ++---
drivers/scsi/mpt3sas/mpt3sas_base.h | 4 +-
drivers/scsi/mpt3sas/mpt3sas_ctl.c | 87 +++++++++++++++++++++++++++++++++--
drivers/scsi/pm8001/pm8001_sas.c | 7 ++-
drivers/scsi/pm8001/pm8001_sas.h | 3 ++
drivers/scsi/pm8001/pm80xx_hwi.c | 7 ++-
drivers/scsi/qedf/qedf_main.c | 2 +
drivers/scsi/scsi_lib.c | 8 ++--
drivers/scsi/sd.c | 2 +-
include/scsi/scsi_device.h | 5 +-
14 files changed, 148 insertions(+), 85 deletions(-)
Merging scsi-mkp/for-next (2576e153cd98 scsi: nsp_cs: Check of ioremap return value)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
Merge made by the 'recursive' strategy.
drivers/message/fusion/mptbase.c | 149 ++++++++++++++++++++----------------
drivers/message/fusion/mptctl.c | 82 ++++++++++++--------
drivers/message/fusion/mptlan.c | 90 ++++++++++++----------
drivers/message/fusion/mptsas.c | 94 ++++++++++++-----------
drivers/scsi/elx/efct/efct_driver.c | 11 +--
drivers/scsi/pcmcia/nsp_cs.c | 3 +
drivers/scsi/ufs/ufs-mediatek.c | 2 +-
drivers/scsi/ufs/ufshcd.c | 2 +-
8 files changed, 238 insertions(+), 195 deletions(-)
Merging vhost/linux-next (af901ad98446 virtio_mem: break device on remove)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
Auto-merging net/9p/trans_virtio.c
Auto-merging fs/fuse/virtio_fs.c
Auto-merging drivers/vdpa/mlx5/net/mlx5_vnet.c
Auto-merging drivers/scsi/virtio_scsi.c
Auto-merging drivers/net/wireless/mac80211_hwsim.c
Auto-merging drivers/net/virtio_net.c
Auto-merging drivers/iommu/virtio-iommu.c
Auto-merging drivers/firmware/qemu_fw_cfg.c
Auto-merging drivers/firmware/arm_scmi/virtio.c
Auto-merging drivers/bluetooth/virtio_bt.c
Auto-merging drivers/block/virtio_blk.c
Auto-merging arch/um/drivers/virt-pci.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-bus-vdpa | 57 ++++++++++
MAINTAINERS | 1 +
arch/um/drivers/virt-pci.c | 2 +-
drivers/block/virtio_blk.c | 4 +-
drivers/bluetooth/virtio_bt.c | 2 +-
drivers/char/hw_random/virtio-rng.c | 2 +-
drivers/char/virtio_console.c | 11 +-
drivers/crypto/virtio/virtio_crypto_core.c | 8 +-
drivers/firmware/arm_scmi/virtio.c | 2 +-
drivers/gpio/gpio-virtio.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_kms.c | 2 +-
drivers/i2c/busses/i2c-virtio.c | 2 +-
drivers/iommu/virtio-iommu.c | 2 +-
drivers/net/caif/caif_virtio.c | 2 +-
drivers/net/virtio_net.c | 4 +-
drivers/net/wireless/mac80211_hwsim.c | 2 +-
drivers/nvdimm/virtio_pmem.c | 2 +-
drivers/rpmsg/virtio_rpmsg_bus.c | 2 +-
drivers/scsi/virtio_scsi.c | 2 +-
drivers/vdpa/alibaba/eni_vdpa.c | 28 +++--
drivers/vdpa/ifcvf/ifcvf_base.c | 41 ++++++--
drivers/vdpa/ifcvf/ifcvf_base.h | 9 +-
drivers/vdpa/ifcvf/ifcvf_main.c | 40 +++----
drivers/vdpa/mlx5/net/mlx5_vnet.c | 156 ++++++++++++++++-----------
drivers/vdpa/vdpa.c | 163 +++++++++++++++++++++++++----
drivers/vdpa/vdpa_sim/vdpa_sim.c | 21 ++--
drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 2 +
drivers/vdpa/vdpa_user/vduse_dev.c | 19 +++-
drivers/vdpa/virtio_pci/vp_vdpa.c | 16 ++-
drivers/vhost/test.c | 1 +
drivers/vhost/vdpa.c | 12 +--
drivers/virtio/virtio.c | 56 +++++++---
drivers/virtio/virtio_balloon.c | 2 +-
drivers/virtio/virtio_input.c | 2 +-
drivers/virtio/virtio_mem.c | 116 +++++++++++++-------
drivers/virtio/virtio_pci_legacy.c | 2 +-
drivers/virtio/virtio_pci_legacy_dev.c | 4 +-
drivers/virtio/virtio_pci_modern_dev.c | 2 +-
drivers/virtio/virtio_ring.c | 4 +-
drivers/virtio/virtio_vdpa.c | 7 +-
fs/fuse/virtio_fs.c | 4 +-
include/linux/vdpa.h | 39 +++++--
include/linux/virtio.h | 2 +-
include/uapi/linux/vdpa.h | 6 ++
net/9p/trans_virtio.c | 2 +-
net/vmw_vsock/virtio_transport.c | 4 +-
sound/virtio/virtio_card.c | 4 +-
47 files changed, 621 insertions(+), 254 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-bus-vdpa
Merging rpmsg/for-next (d42cd7930649 Merge branches 'hwspinlock-next', 'rproc-fixes' and 'rpmsg-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
Auto-merging drivers/rpmsg/virtio_rpmsg_bus.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
CREDITS | 5 +
.../devicetree/bindings/remoteproc/qcom,adsp.yaml | 28 +++
.../bindings/remoteproc/renesas,rcar-rproc.yaml | 65 ++++++
.../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 3 +
.../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 8 +-
MAINTAINERS | 2 -
drivers/hwspinlock/stm32_hwspinlock.c | 58 ++++--
drivers/remoteproc/Kconfig | 15 ++
drivers/remoteproc/Makefile | 1 +
drivers/remoteproc/imx_rproc.c | 9 +-
drivers/remoteproc/ingenic_rproc.c | 5 +-
drivers/remoteproc/mtk_scp_ipi.c | 4 +-
drivers/remoteproc/qcom_pil_info.c | 2 +-
drivers/remoteproc/qcom_q6v5.c | 1 +
drivers/remoteproc/qcom_q6v5_pas.c | 38 ++++
drivers/remoteproc/rcar_rproc.c | 224 +++++++++++++++++++++
drivers/remoteproc/remoteproc_core.c | 4 +-
drivers/remoteproc/remoteproc_coredump.c | 2 +-
drivers/remoteproc/st_slim_rproc.c | 2 +-
drivers/remoteproc/stm32_rproc.c | 2 +-
drivers/remoteproc/ti_k3_dsp_remoteproc.c | 1 +
drivers/remoteproc/ti_k3_r5_remoteproc.c | 5 +-
drivers/rpmsg/qcom_glink_native.c | 2 +-
drivers/rpmsg/qcom_smd.c | 2 +-
drivers/rpmsg/rpmsg_char.c | 29 +--
drivers/rpmsg/rpmsg_core.c | 44 ++--
drivers/rpmsg/virtio_rpmsg_bus.c | 2 +-
27 files changed, 482 insertions(+), 81 deletions(-)
create mode 100644 Documentation/devicetree/bindings/remoteproc/renesas,rcar-rproc.yaml
create mode 100644 drivers/remoteproc/rcar_rproc.c
Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next
Already up to date.
Merging gpio-brgl/gpio/for-next (ffe31c9ed35d gpio: rcar: Propagate errors from devm_request_irq())
$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
Already up to date.
Merging gpio-intel/for-next (455e73a07f6e Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next
Already up to date.
Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4)
$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim
Already up to date.
Merging pinctrl/for-next (650d15f26aaa pinctrl: sunxi: Fix H616 I2S3 pin data)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
Merge made by the 'recursive' strategy.
drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +-
drivers/pinctrl/pinctrl-thunderbay.c | 90 +++++++++++------------------
drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 8 +--
3 files changed, 42 insertions(+), 61 deletions(-)
Merging pinctrl-intel/for-next (455e73a07f6e Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
Already up to date.
Merging pinctrl-renesas/renesas-pinctrl (ea7e26ebe6a9 pinctrl: renesas: r8a779a0: Align comments)
$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
Already up to date.
Merging pinctrl-samsung/for-next (a382d568f144 pinctrl: samsung: Use platform_get_irq_optional() to get the interrupt)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
Already up to date.
Merging pwm/for-next (3f0565451cc0 dt-bindings: pwm: Avoid selecting schema on node name match)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next
Auto-merging drivers/pwm/core.c
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/pwm/pwm.yaml | 2 +
drivers/pwm/core.c | 139 ++++++++++++++-----------
drivers/pwm/pwm-img.c | 35 +++++--
drivers/pwm/pwm-twl.c | 62 +++++++++--
drivers/pwm/pwm-vt8500.c | 57 ++++++++--
5 files changed, 213 insertions(+), 82 deletions(-)
Merging userns/for-next (a403df29789b ptrace/m68k: Stop open coding ptrace_report_syscall)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next
Already up to date.
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
Already up to date.
Merging kselftest/next (e89908201e25 selftests/vm: remove ARRAY_SIZE define from individual tests)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
Already up to date.
Merging livepatching/for-next (32fdbc45ade0 Merge branch 'for-5.17/kallsyms' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
Already up to date.
Merge made by the 'recursive' strategy.
Merging coresight/next (efa56eddf5d5 coresight: core: Fix typo in a comment)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
Already up to date.
Merging rtc/rtc-next (5ceee540fdc7 rtc: sunplus: fix return value in sp_rtc_probe())
$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/rtc/epson,rx8900.yaml | 1 +
.../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 9 +-
.../bindings/rtc/sunplus,sp7021-rtc.yaml | 56 +++
MAINTAINERS | 7 +
arch/alpha/kernel/rtc.c | 7 +-
arch/powerpc/boot/dts/wii.dts | 5 +
arch/powerpc/configs/gamecube_defconfig | 2 +-
arch/powerpc/configs/wii_defconfig | 2 +-
arch/x86/kernel/hpet.c | 8 +-
drivers/base/power/trace.c | 6 +-
drivers/rtc/Kconfig | 24 ++
drivers/rtc/Makefile | 2 +
drivers/rtc/dev.c | 6 +-
drivers/rtc/rtc-cmos.c | 201 +++++++----
drivers/rtc/rtc-da9063.c | 16 +-
drivers/rtc/rtc-ftrtc010.c | 8 +-
drivers/rtc/rtc-gamecube.c | 377 +++++++++++++++++++++
drivers/rtc/rtc-mc146818-lib.c | 182 ++++++----
drivers/rtc/rtc-pcf2127.c | 2 +-
drivers/rtc/rtc-pcf85063.c | 97 ++++--
drivers/rtc/rtc-pxa.c | 4 +
drivers/rtc/rtc-rs5c372.c | 185 +++++++++-
drivers/rtc/rtc-rv8803.c | 6 +
drivers/rtc/rtc-sunplus.c | 362 ++++++++++++++++++++
include/linux/mc146818rtc.h | 6 +-
25 files changed, 1390 insertions(+), 191 deletions(-)
create mode 100644 Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml
create mode 100644 drivers/rtc/rtc-gamecube.c
create mode 100644 drivers/rtc/rtc-sunplus.c
Merging nvdimm/libnvdimm-for-next (9e05e95ca8da iomap: Fix error handling in iomap_zero_iter())
$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
Already up to date.
Merging at24/at24/for-next (d08aea21c89d eeprom: at24: Add support for 24c1025 EEPROM)
$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
Already up to date.
Merging ntb/ntb-next (fd913240d898 IDT: Fix Build warnings on some 32bit architectures.)
$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
Merge made by the 'recursive' strategy.
drivers/ntb/hw/idt/Makefile | 1 +
1 file changed, 1 insertion(+)
Merging seccomp/for-next/seccomp (1e6d69c7b9cd selftests/seccomp: Report event mismatches more clearly)
$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
Already up to date.
Merging kspp/for-next/kspp (136057256686 Linux 5.16-rc2)
$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
Already up to date.
Merging kspp-gustavo/for-next/kspp (c9e6606c7fe9 Linux 5.16-rc8)
$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp
Already up to date.
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next
Already up to date.
Merging fsi/next (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
Already up to date.
Merging slimbus/for-next (fa55b7dcdc43 Linux 5.16-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
Already up to date.
Merging nvmem/for-next (779809c07324 dt-bindings: nvmem: Add missing 'reg' property)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
Merge made by the 'recursive' strategy.
Merging xarray/main (1c9f4b00b3cf XArray: Document the locking requirement for the xa_state)
$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
Merge made by the 'recursive' strategy.
Documentation/core-api/xarray.rst | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
Merging hyperv/hyperv-next (4eea5332d67d scsi: storvsc: Fix storvsc_queuecommand() memory leak)
$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
Already up to date.
Merging auxdisplay/auxdisplay (4daa9ff89ef2 auxdisplay: charlcd: checking for pointer reference before dereferencing)
$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay
Already up to date.
Merging kgdb/kgdb/for-next (b77dbc86d604 kdb: Adopt scheduler's task classification)
$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
Already up to date.
Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1)
$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
Already up to date.
Merging fpga/for-next (98ceca2f2932 fpga: region: fix kernel-doc)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next
Already up to date.
Merging kunit/test (fa55b7dcdc43 Linux 5.16-rc1)
$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
Already up to date.
Merging cfi/cfi/next (baaf965f9430 mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove)
$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
Already up to date.
Merging kunit-next/kunit (ad659ccb5412 kunit: tool: Default --jobs to number of CPUs)
$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
Already up to date.
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next
Already up to date.
Merging mhi/mhi-next (00776ac534cc bus: mhi: pci_generic: Introduce Sierra EM919X support)
$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
Auto-merging include/linux/mhi.h
Auto-merging drivers/bus/mhi/pci_generic.c
Auto-merging drivers/bus/mhi/core/pm.c
Merge made by the 'recursive' strategy.
Merging memblock/for-next (a59466ee91aa memblock: Remove #ifdef __KERNEL__ from memblock.h)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next
Already up to date.
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers
Already up to date.
Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters
Already up to date.
Merging rust/rust-next (ced9f62ec435 init/Kconfig: Specify the interpreter for rust-is-available.sh)
$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
Auto-merging scripts/min-tool-version.sh
Auto-merging scripts/kconfig/confdata.c
Auto-merging scripts/Makefile.lib
Auto-merging scripts/Makefile.build
Auto-merging samples/Makefile
CONFLICT (content): Merge conflict in samples/Makefile
Auto-merging samples/Kconfig
CONFLICT (content): Merge conflict in samples/Kconfig
Auto-merging lib/vsprintf.c
Auto-merging lib/Kconfig.debug
Auto-merging kernel/printk/printk.c
Auto-merging kernel/livepatch/core.c
Auto-merging kernel/kallsyms.c
Auto-merging init/Kconfig
Auto-merging include/linux/spinlock.h
Auto-merging drivers/gpio/Makefile
Auto-merging drivers/gpio/Kconfig
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/process/changes.rst
CONFLICT (content): Merge conflict in Documentation/process/changes.rst
Auto-merging Documentation/index.rst
Recorded preimage for 'Documentation/process/changes.rst'
Resolved 'samples/Kconfig' using previous resolution.
Resolved 'samples/Makefile' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
Recorded resolution for 'Documentation/process/changes.rst'.
[master 815fd7816885] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
$ git diff -M --stat --summary HEAD^..
.gitignore | 5 +
.rustfmt.toml | 12 +
Documentation/doc-guide/kernel-doc.rst | 3 +
Documentation/index.rst | 1 +
Documentation/kbuild/kbuild.rst | 4 +
Documentation/process/changes.rst | 42 +
Documentation/rust/arch-support.rst | 35 +
Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes
Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes
Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes
Documentation/rust/coding-guidelines.rst | 151 ++
Documentation/rust/general-information.rst | 80 +
Documentation/rust/index.rst | 21 +
Documentation/rust/quick-start.rst | 231 ++
MAINTAINERS | 16 +
Makefile | 152 +-
arch/arm/rust/target.json | 27 +
arch/arm64/rust/target.json | 34 +
arch/powerpc/rust/target.json | 29 +
arch/riscv/Makefile | 1 +
arch/riscv/rust/rv32ima.json | 36 +
arch/riscv/rust/rv32imac.json | 36 +
arch/riscv/rust/rv64ima.json | 36 +
arch/riscv/rust/rv64imac.json | 36 +
arch/x86/rust/target.json | 36 +
drivers/android/Kconfig | 7 +
drivers/android/Makefile | 2 +
drivers/android/allocation.rs | 266 ++
drivers/android/context.rs | 80 +
drivers/android/defs.rs | 99 +
drivers/android/node.rs | 476 ++++
drivers/android/process.rs | 964 ++++++++
drivers/android/range_alloc.rs | 189 ++
drivers/android/rust_binder.rs | 114 +
drivers/android/thread.rs | 871 +++++++
drivers/android/transaction.rs | 326 +++
drivers/gpio/Kconfig | 8 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio_pl061_rust.rs | 362 +++
include/linux/kallsyms.h | 2 +-
include/linux/spinlock.h | 17 +-
include/uapi/linux/android/binder.h | 28 +-
init/Kconfig | 50 +-
kernel/kallsyms.c | 26 +-
kernel/livepatch/core.c | 4 +-
kernel/printk/printk.c | 5 +-
lib/Kconfig.debug | 144 ++
lib/rust.h | 14 +
lib/vsprintf.c | 7 +
rust/.gitignore | 7 +
rust/Makefile | 352 +++
rust/alloc/README.md | 32 +
rust/alloc/alloc.rs | 427 ++++
rust/alloc/borrow.rs | 498 ++++
rust/alloc/boxed.rs | 1847 ++++++++++++++
rust/alloc/collections/mod.rs | 156 ++
rust/alloc/fmt.rs | 601 +++++
rust/alloc/lib.rs | 217 ++
rust/alloc/macros.rs | 126 +
rust/alloc/raw_vec.rs | 549 +++++
rust/alloc/slice.rs | 1279 ++++++++++
rust/alloc/str.rs | 624 +++++
rust/alloc/string.rs | 2864 ++++++++++++++++++++++
rust/alloc/vec/drain.rs | 159 ++
rust/alloc/vec/drain_filter.rs | 145 ++
rust/alloc/vec/into_iter.rs | 356 +++
rust/alloc/vec/is_zero.rs | 106 +
rust/alloc/vec/mod.rs | 3359 ++++++++++++++++++++++++++
rust/alloc/vec/partial_eq.rs | 49 +
rust/alloc/vec/set_len_on_drop.rs | 30 +
rust/alloc/vec/spec_extend.rs | 172 ++
rust/bindgen_parameters | 13 +
rust/build_error.rs | 29 +
rust/compiler_builtins.rs | 57 +
rust/exports.c | 16 +
rust/helpers.c | 508 ++++
rust/kernel/allocator.rs | 65 +
rust/kernel/amba.rs | 259 ++
rust/kernel/bindings.rs | 47 +
rust/kernel/bindings_helper.h | 31 +
rust/kernel/buffer.rs | 52 +
rust/kernel/build_assert.rs | 80 +
rust/kernel/c_types.rs | 119 +
rust/kernel/chrdev.rs | 209 ++
rust/kernel/clk.rs | 75 +
rust/kernel/cred.rs | 73 +
rust/kernel/device.rs | 549 +++++
rust/kernel/driver.rs | 440 ++++
rust/kernel/error.rs | 542 +++++
rust/kernel/file.rs | 147 ++
rust/kernel/file_operations.rs | 726 ++++++
rust/kernel/gpio.rs | 477 ++++
rust/kernel/io_buffer.rs | 153 ++
rust/kernel/io_mem.rs | 227 ++
rust/kernel/iov_iter.rs | 81 +
rust/kernel/irq.rs | 409 ++++
rust/kernel/lib.rs | 262 ++
rust/kernel/linked_list.rs | 247 ++
rust/kernel/miscdev.rs | 196 ++
rust/kernel/module_param.rs | 497 ++++
rust/kernel/of.rs | 63 +
rust/kernel/pages.rs | 162 ++
rust/kernel/platform.rs | 224 ++
rust/kernel/power.rs | 118 +
rust/kernel/prelude.rs | 36 +
rust/kernel/print.rs | 441 ++++
rust/kernel/random.rs | 50 +
rust/kernel/raw_list.rs | 361 +++
rust/kernel/rbtree.rs | 562 +++++
rust/kernel/revocable.rs | 163 ++
rust/kernel/security.rs | 36 +
rust/kernel/static_assert.rs | 39 +
rust/kernel/std_vendor.rs | 150 ++
rust/kernel/str.rs | 375 +++
rust/kernel/sync/arc.rs | 500 ++++
rust/kernel/sync/condvar.rs | 138 ++
rust/kernel/sync/guard.rs | 181 ++
rust/kernel/sync/locked_by.rs | 112 +
rust/kernel/sync/mod.rs | 92 +
rust/kernel/sync/mutex.rs | 112 +
rust/kernel/sync/revocable_mutex.rs | 184 ++
rust/kernel/sync/seqlock.rs | 202 ++
rust/kernel/sync/spinlock.rs | 180 ++
rust/kernel/sysctl.rs | 197 ++
rust/kernel/task.rs | 182 ++
rust/kernel/types.rs | 486 ++++
rust/kernel/user_ptr.rs | 175 ++
rust/macros/helpers.rs | 79 +
rust/macros/lib.rs | 94 +
rust/macros/module.rs | 622 +++++
samples/Kconfig | 2 +
samples/Makefile | 1 +
samples/rust/Kconfig | 123 +
samples/rust/Makefile | 13 +
samples/rust/rust_chrdev.rs | 53 +
samples/rust/rust_minimal.rs | 38 +
samples/rust/rust_miscdev.rs | 147 ++
samples/rust/rust_module_parameters.rs | 72 +
samples/rust/rust_platform.rs | 25 +
samples/rust/rust_print.rs | 57 +
samples/rust/rust_random.rs | 64 +
samples/rust/rust_semaphore.rs | 175 ++
samples/rust/rust_semaphore_c.c | 212 ++
samples/rust/rust_stack_probing.rs | 40 +
samples/rust/rust_sync.rs | 81 +
scripts/Kconfig.include | 6 +-
scripts/Makefile.build | 22 +
scripts/Makefile.debug | 10 +
scripts/Makefile.lib | 12 +
scripts/Makefile.modfinal | 8 +-
scripts/cc-version.sh | 12 +-
scripts/decode_stacktrace.sh | 14 +
scripts/generate_rust_analyzer.py | 133 +
scripts/is_rust_module.sh | 19 +
scripts/kallsyms.c | 40 +-
scripts/kconfig/confdata.c | 75 +
scripts/min-tool-version.sh | 6 +
scripts/rust-is-available-bindgen-libclang.h | 2 +
scripts/rust-is-available.sh | 159 ++
tools/include/linux/kallsyms.h | 2 +-
tools/lib/perf/include/perf/event.h | 2 +-
tools/lib/symbol/kallsyms.h | 2 +-
162 files changed, 33512 insertions(+), 58 deletions(-)
create mode 100644 .rustfmt.toml
create mode 100644 Documentation/rust/arch-support.rst
create mode 100644 Documentation/rust/assets/favicon-16x16.png
create mode 100644 Documentation/rust/assets/favicon-32x32.png
create mode 100644 Documentation/rust/assets/rust-logo.png
create mode 100644 Documentation/rust/coding-guidelines.rst
create mode 100644 Documentation/rust/general-information.rst
create mode 100644 Documentation/rust/index.rst
create mode 100644 Documentation/rust/quick-start.rst
create mode 100644 arch/arm/rust/target.json
create mode 100644 arch/arm64/rust/target.json
create mode 100644 arch/powerpc/rust/target.json
create mode 100644 arch/riscv/rust/rv32ima.json
create mode 100644 arch/riscv/rust/rv32imac.json
create mode 100644 arch/riscv/rust/rv64ima.json
create mode 100644 arch/riscv/rust/rv64imac.json
create mode 100644 arch/x86/rust/target.json
create mode 100644 drivers/android/allocation.rs
create mode 100644 drivers/android/context.rs
create mode 100644 drivers/android/defs.rs
create mode 100644 drivers/android/node.rs
create mode 100644 drivers/android/process.rs
create mode 100644 drivers/android/range_alloc.rs
create mode 100644 drivers/android/rust_binder.rs
create mode 100644 drivers/android/thread.rs
create mode 100644 drivers/android/transaction.rs
create mode 100644 drivers/gpio/gpio_pl061_rust.rs
create mode 100644 lib/rust.h
create mode 100644 rust/.gitignore
create mode 100644 rust/Makefile
create mode 100644 rust/alloc/README.md
create mode 100644 rust/alloc/alloc.rs
create mode 100644 rust/alloc/borrow.rs
create mode 100644 rust/alloc/boxed.rs
create mode 100644 rust/alloc/collections/mod.rs
create mode 100644 rust/alloc/fmt.rs
create mode 100644 rust/alloc/lib.rs
create mode 100644 rust/alloc/macros.rs
create mode 100644 rust/alloc/raw_vec.rs
create mode 100644 rust/alloc/slice.rs
create mode 100644 rust/alloc/str.rs
create mode 100644 rust/alloc/string.rs
create mode 100644 rust/alloc/vec/drain.rs
create mode 100644 rust/alloc/vec/drain_filter.rs
create mode 100644 rust/alloc/vec/into_iter.rs
create mode 100644 rust/alloc/vec/is_zero.rs
create mode 100644 rust/alloc/vec/mod.rs
create mode 100644 rust/alloc/vec/partial_eq.rs
create mode 100644 rust/alloc/vec/set_len_on_drop.rs
create mode 100644 rust/alloc/vec/spec_extend.rs
create mode 100644 rust/bindgen_parameters
create mode 100644 rust/build_error.rs
create mode 100644 rust/compiler_builtins.rs
create mode 100644 rust/exports.c
create mode 100644 rust/helpers.c
create mode 100644 rust/kernel/allocator.rs
create mode 100644 rust/kernel/amba.rs
create mode 100644 rust/kernel/bindings.rs
create mode 100644 rust/kernel/bindings_helper.h
create mode 100644 rust/kernel/buffer.rs
create mode 100644 rust/kernel/build_assert.rs
create mode 100644 rust/kernel/c_types.rs
create mode 100644 rust/kernel/chrdev.rs
create mode 100644 rust/kernel/clk.rs
create mode 100644 rust/kernel/cred.rs
create mode 100644 rust/kernel/device.rs
create mode 100644 rust/kernel/driver.rs
create mode 100644 rust/kernel/error.rs
create mode 100644 rust/kernel/file.rs
create mode 100644 rust/kernel/file_operations.rs
create mode 100644 rust/kernel/gpio.rs
create mode 100644 rust/kernel/io_buffer.rs
create mode 100644 rust/kernel/io_mem.rs
create mode 100644 rust/kernel/iov_iter.rs
create mode 100644 rust/kernel/irq.rs
create mode 100644 rust/kernel/lib.rs
create mode 100644 rust/kernel/linked_list.rs
create mode 100644 rust/kernel/miscdev.rs
create mode 100644 rust/kernel/module_param.rs
create mode 100644 rust/kernel/of.rs
create mode 100644 rust/kernel/pages.rs
create mode 100644 rust/kernel/platform.rs
create mode 100644 rust/kernel/power.rs
create mode 100644 rust/kernel/prelude.rs
create mode 100644 rust/kernel/print.rs
create mode 100644 rust/kernel/random.rs
create mode 100644 rust/kernel/raw_list.rs
create mode 100644 rust/kernel/rbtree.rs
create mode 100644 rust/kernel/revocable.rs
create mode 100644 rust/kernel/security.rs
create mode 100644 rust/kernel/static_assert.rs
create mode 100644 rust/kernel/std_vendor.rs
create mode 100644 rust/kernel/str.rs
create mode 100644 rust/kernel/sync/arc.rs
create mode 100644 rust/kernel/sync/condvar.rs
create mode 100644 rust/kernel/sync/guard.rs
create mode 100644 rust/kernel/sync/locked_by.rs
create mode 100644 rust/kernel/sync/mod.rs
create mode 100644 rust/kernel/sync/mutex.rs
create mode 100644 rust/kernel/sync/revocable_mutex.rs
create mode 100644 rust/kernel/sync/seqlock.rs
create mode 100644 rust/kernel/sync/spinlock.rs
create mode 100644 rust/kernel/sysctl.rs
create mode 100644 rust/kernel/task.rs
create mode 100644 rust/kernel/types.rs
create mode 100644 rust/kernel/user_ptr.rs
create mode 100644 rust/macros/helpers.rs
create mode 100644 rust/macros/lib.rs
create mode 100644 rust/macros/module.rs
create mode 100644 samples/rust/Kconfig
create mode 100644 samples/rust/Makefile
create mode 100644 samples/rust/rust_chrdev.rs
create mode 100644 samples/rust/rust_minimal.rs
create mode 100644 samples/rust/rust_miscdev.rs
create mode 100644 samples/rust/rust_module_parameters.rs
create mode 100644 samples/rust/rust_platform.rs
create mode 100644 samples/rust/rust_print.rs
create mode 100644 samples/rust/rust_random.rs
create mode 100644 samples/rust/rust_semaphore.rs
create mode 100644 samples/rust/rust_semaphore_c.c
create mode 100644 samples/rust/rust_stack_probing.rs
create mode 100644 samples/rust/rust_sync.rs
create mode 100755 scripts/generate_rust_analyzer.py
create mode 100755 scripts/is_rust_module.sh
create mode 100644 scripts/rust-is-available-bindgen-libclang.h
create mode 100755 scripts/rust-is-available.sh
Merging cxl/next (be185c2988b4 cxl/core: Remove cxld_const_init in cxl_decoder_alloc())
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
Already up to date.
Merging folio/for-next (3abb28e275bf filemap: Use folio_put_refs() in filemap_free_folio())
$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next
Auto-merging include/linux/mm.h
Merge made by the 'recursive' strategy.
include/linux/mm.h | 20 ++++++++++++++++++++
include/linux/pagevec.h | 1 +
mm/filemap.c | 10 ++++------
3 files changed, 25 insertions(+), 6 deletions(-)
Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller)
$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap
Already up to date.
Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string)
$ git merge -m Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git bitmap/bitmap-master-5.15
Removing tools/include/asm-generic/bitops/find.h
Auto-merging mm/percpu.c
Auto-merging lib/vsprintf.c
Auto-merging lib/Kconfig
Auto-merging kernel/time/clocksource.c
Auto-merging include/linux/cpumask.h
Auto-merging include/linux/bitmap.h
Auto-merging fs/ocfs2/dlm/dlmrecovery.c
Auto-merging fs/f2fs/segment.c
Auto-merging drivers/tty/n_tty.c
Auto-merging drivers/soc/ti/k3-ringacc.c
Auto-merging drivers/scsi/lpfc/lpfc_sli.c
Auto-merging drivers/pci/controller/dwc/pci-dra7xx.c
Auto-merging drivers/net/virtio_net.c
Auto-merging drivers/mmc/host/renesas_sdhi_core.c
Auto-merging drivers/media/cec/core/cec-core.c
Auto-merging drivers/infiniband/hw/irdma/hw.c
Auto-merging drivers/iio/adc/ad7124.c
Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c
Auto-merging drivers/dma/ti/edma.c
CONFLICT (content): Merge conflict in drivers/dma/ti/edma.c
Auto-merging drivers/block/rnbd/rnbd-clt.c
Auto-merging block/blk-mq.c
Auto-merging arch/x86/Kconfig
Auto-merging arch/s390/kvm/kvm-s390.c
CONFLICT (content): Merge conflict in arch/s390/kvm/kvm-s390.c
Auto-merging arch/s390/include/asm/bitops.h
Auto-merging arch/s390/Kconfig
Auto-merging arch/powerpc/include/asm/cputhreads.h
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/cputhreads.h
Auto-merging arch/powerpc/include/asm/bitops.h
Auto-merging arch/parisc/include/asm/bitops.h
CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h
Auto-merging arch/mips/include/asm/bitops.h
Auto-merging arch/mips/Kconfig
Auto-merging arch/m68k/include/asm/bitops.h
Auto-merging arch/csky/include/asm/bitops.h
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arc/Kconfig
Auto-merging MAINTAINERS
Resolved 'arch/parisc/include/asm/bitops.h' using previous resolution.
Resolved 'arch/powerpc/include/asm/cputhreads.h' using previous resolution.
Resolved 'arch/s390/kvm/kvm-s390.c' using previous resolution.
Resolved 'drivers/dma/ti/edma.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master c1299ad9ef66] Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git
$ git diff -M --stat --summary HEAD^..
MAINTAINERS | 4 +-
arch/alpha/include/asm/bitops.h | 2 -
arch/arc/Kconfig | 1 -
arch/arc/include/asm/bitops.h | 1 -
arch/arm/include/asm/bitops.h | 1 -
arch/arm64/Kconfig | 1 -
arch/arm64/include/asm/bitops.h | 1 -
arch/csky/include/asm/bitops.h | 1 -
arch/h8300/include/asm/bitops.h | 1 -
arch/hexagon/include/asm/bitops.h | 1 -
arch/ia64/include/asm/bitops.h | 2 -
arch/m68k/include/asm/bitops.h | 2 -
arch/mips/Kconfig | 1 -
arch/mips/include/asm/bitops.h | 1 -
arch/openrisc/include/asm/bitops.h | 1 -
arch/parisc/include/asm/bitops.h | 1 -
arch/powerpc/include/asm/bitops.h | 2 -
arch/powerpc/platforms/pasemi/dma_lib.c | 4 +-
arch/riscv/include/asm/bitops.h | 1 -
arch/s390/Kconfig | 1 -
arch/s390/include/asm/bitops.h | 1 -
arch/s390/kvm/kvm-s390.c | 2 +-
arch/sh/include/asm/bitops.h | 1 -
arch/sparc/include/asm/bitops_32.h | 1 -
arch/sparc/include/asm/bitops_64.h | 2 -
arch/x86/Kconfig | 1 -
arch/x86/include/asm/bitops.h | 2 -
arch/x86/kernel/apic/vector.c | 4 +-
arch/x86/um/Kconfig | 1 -
arch/xtensa/include/asm/bitops.h | 1 -
block/blk-mq.c | 2 +-
drivers/block/rnbd/rnbd-clt.c | 2 +-
drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +-
drivers/hwmon/ltc2992.c | 3 +-
drivers/iio/adc/ad7124.c | 2 +-
drivers/infiniband/hw/irdma/hw.c | 16 +-
drivers/media/cec/core/cec-core.c | 2 +-
drivers/media/mc/mc-devnode.c | 2 +-
drivers/mmc/host/renesas_sdhi_core.c | 2 +-
drivers/net/virtio_net.c | 2 +-
drivers/pci/controller/dwc/pci-dra7xx.c | 2 +-
drivers/scsi/lpfc/lpfc_sli.c | 10 +-
drivers/soc/fsl/qbman/bman_portal.c | 2 +-
drivers/soc/fsl/qbman/qman_portal.c | 2 +-
drivers/soc/ti/k3-ringacc.c | 4 +-
drivers/tty/n_tty.c | 2 +-
drivers/virt/acrn/ioreq.c | 3 +-
fs/f2fs/segment.c | 8 +-
fs/ocfs2/cluster/heartbeat.c | 2 +-
fs/ocfs2/dlm/dlmdomain.c | 4 +-
fs/ocfs2/dlm/dlmmaster.c | 18 +-
fs/ocfs2/dlm/dlmrecovery.c | 2 +-
fs/ocfs2/dlm/dlmthread.c | 2 +-
include/asm-generic/bitops.h | 1 -
include/asm-generic/bitops/le.h | 64 ----
include/linux/bitmap.h | 34 +-
include/linux/bitops.h | 34 --
include/linux/cpumask.h | 46 ++-
include/linux/find.h | 372 +++++++++++++++++++++
kernel/time/clocksource.c | 4 +-
lib/Kconfig | 3 -
lib/find_bit.c | 21 ++
lib/find_bit_benchmark.c | 21 ++
lib/genalloc.c | 2 +-
lib/test_bitmap.c | 37 ++
lib/vsprintf.c | 24 +-
mm/percpu.c | 35 +-
net/ncsi/ncsi-manage.c | 4 +-
tools/include/asm-generic/bitops.h | 1 -
tools/include/asm-generic/bitops/find.h | 145 --------
tools/include/linux/bitmap.h | 7 +-
.../bitops => tools/include/linux}/find.h | 54 ++-
tools/lib/find_bit.c | 20 ++
73 files changed, 635 insertions(+), 438 deletions(-)
create mode 100644 include/linux/find.h
delete mode 100644 tools/include/asm-generic/bitops/find.h
rename {include/asm-generic/bitops => tools/include/linux}/find.h (83%)
Merging zstd/zstd-next (fa55b7dcdc43 Linux 5.16-rc1)
$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
Already up to date.
Merging efi/next (42f4046bc4ba efi: use default_groups in kobj_type)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
Already up to date.
Merging unicode/for-next (e2a58d2d3416 unicode: only export internal symbols for the selftests)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
Already up to date.
Merging slab/for-next (07f910f9b729 mm: Remove slab from struct page)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next
Auto-merging mm/slab.h
Auto-merging include/linux/page-flags.h
Auto-merging include/linux/mm_types.h
Merge made by the 'recursive' strategy.
include/linux/mm_types.h | 28 ----------------------------
include/linux/page-flags.h | 37 -------------------------------------
mm/slab.h | 6 ------
3 files changed, 71 deletions(-)
Merging random/master (99e057c016b6 random: simplify arithmetic function flow in account())
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
Auto-merging lib/Kconfig
Merge made by the 'recursive' strategy.
crypto/Kconfig | 2 -
drivers/char/random.c | 645 ++++++++++++++++++------------------------
include/trace/events/random.h | 56 ++--
lib/Kconfig | 2 +
lib/crypto/Kconfig | 17 +-
5 files changed, 308 insertions(+), 414 deletions(-)
Merging landlock/next (2585cf9dfaad Linux 5.16-rc5)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
Already up to date.
Merging akpm-current/current (80323cae5166 ipc/sem: do not sleep with a spin lock held)
$ git merge --no-ff akpm-current/current
Auto-merging tools/perf/builtin-kmem.c
Auto-merging mm/zsmalloc.c
CONFLICT (content): Merge conflict in mm/zsmalloc.c
Auto-merging mm/percpu.c
Auto-merging mm/oom_kill.c
Auto-merging mm/memremap.c
Auto-merging mm/memory.c
Auto-merging mm/memcontrol.c
Auto-merging mm/internal.h
Auto-merging lib/Makefile
Auto-merging lib/Kconfig.debug
Auto-merging kernel/sysctl.c
Auto-merging kernel/locking/spinlock_rt.c
Auto-merging kernel/kthread.c
CONFLICT (content): Merge conflict in kernel/kthread.c
Auto-merging include/linux/sched.h
Auto-merging include/linux/pagemap.h
Auto-merging include/linux/page-flags.h
Auto-merging include/linux/mm.h
Auto-merging include/linux/memremap.h
Auto-merging include/linux/kthread.h
CONFLICT (content): Merge conflict in include/linux/kthread.h
Auto-merging include/linux/kernel.h
Auto-merging fs/proc/array.c
Auto-merging fs/exec.c
Auto-merging fs/buffer.c
Auto-merging fs/btrfs/ioctl.c
Auto-merging drivers/infiniband/sw/rxe/rxe_qp.c
Auto-merging arch/x86/Kconfig
Auto-merging arch/riscv/Kconfig
Auto-merging arch/powerpc/kernel/setup_64.c
Auto-merging arch/powerpc/Kconfig
Auto-merging arch/mips/Kconfig
Auto-merging arch/arm64/Kconfig
Auto-merging arch/Kconfig
Auto-merging Documentation/admin-guide/sysctl/kernel.rst
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Resolved 'include/linux/kthread.h' using previous resolution.
Resolved 'kernel/kthread.c' using previous resolution.
Resolved 'mm/zsmalloc.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 22329c1f3cc1] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
Documentation/accounting/delay-accounting.rst | 55 ++-
Documentation/admin-guide/kernel-parameters.txt | 3 +-
Documentation/admin-guide/sysctl/kernel.rst | 2 +
Documentation/vm/balance.rst | 2 +-
Documentation/vm/page_owner.rst | 29 +-
arch/Kconfig | 11 +
arch/arm64/Kconfig | 21 +-
arch/arm64/include/asm/uaccess.h | 33 ++
arch/ia64/Kconfig | 9 +-
arch/mips/Kconfig | 10 +-
arch/mips/mm/init.c | 14 +-
arch/powerpc/Kconfig | 17 +-
arch/powerpc/kernel/setup_64.c | 97 +---
arch/riscv/Kconfig | 10 +-
arch/sparc/Kconfig | 12 +-
arch/sparc/kernel/led.c | 8 +-
arch/sparc/kernel/smp_64.c | 103 +---
arch/x86/Kconfig | 19 +-
arch/x86/kernel/setup_percpu.c | 66 +--
drivers/base/arch_numa.c | 68 +--
drivers/infiniband/hw/qib/qib.h | 2 +-
drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
drivers/infiniband/sw/rxe/rxe_qp.c | 3 +-
drivers/iommu/tegra-smmu.c | 4 +-
.../wireless/broadcom/brcm80211/brcmfmac/xtlv.c | 2 +
fs/adfs/inode.c | 4 +-
fs/binfmt_elf.c | 29 +-
fs/btrfs/Kconfig | 3 +-
fs/btrfs/ioctl.c | 3 +-
fs/buffer.c | 56 ++-
fs/exec.c | 5 +-
fs/fat/file.c | 5 +-
fs/hfsplus/hfsplus_raw.h | 12 +-
fs/hfsplus/xattr.c | 4 +-
fs/nilfs2/page.c | 4 +-
fs/ocfs2/namei.c | 49 +-
fs/ocfs2/namei.h | 2 +
fs/ocfs2/refcounttree.c | 15 +-
fs/ocfs2/xattr.c | 12 +-
fs/ocfs2/xattr.h | 1 +
fs/proc/array.c | 3 +
fs/proc/base.c | 4 +-
fs/proc/fd.c | 23 +-
fs/proc/page.c | 40 +-
fs/proc/vmcore.c | 10 +-
include/kunit/assert.h | 2 +-
include/linux/delayacct.h | 107 +++--
include/linux/elfcore-compat.h | 5 +
include/linux/elfcore.h | 5 +
include/linux/gfp.h | 12 +-
include/linux/hash.h | 5 +-
include/linux/hugetlb.h | 6 -
include/linux/kernel.h | 9 +
include/linux/kthread.h | 1 +
include/linux/list.h | 36 +-
include/linux/mempolicy.h | 5 +-
include/linux/memremap.h | 6 +
include/linux/mm.h | 2 +
include/linux/page-flags.h | 90 +++-
include/linux/pagemap.h | 1 +
include/linux/percpu.h | 13 +-
include/linux/proc_fs.h | 12 +-
include/linux/rmap.h | 8 +-
include/linux/rwlock.h | 6 +
include/linux/rwlock_api_smp.h | 8 +
include/linux/rwlock_rt.h | 10 +
include/linux/sched.h | 17 +-
include/linux/spinlock_api_up.h | 1 +
include/linux/uaccess.h | 21 +
include/linux/unaligned/packed_struct.h | 2 +-
include/linux/vmalloc.h | 2 +
include/trace/events/error_report.h | 8 +-
include/trace/events/mmflags.h | 1 -
include/uapi/linux/taskstats.h | 6 +-
include/uapi/linux/uuid.h | 10 +-
init/main.c | 25 +-
ipc/sem.c | 4 +-
kernel/configs/debug.config | 105 ++++
kernel/delayacct.c | 49 +-
kernel/hung_task.c | 44 ++
kernel/kthread.c | 32 +-
kernel/locking/spinlock.c | 10 +
kernel/locking/spinlock_rt.c | 12 +
kernel/panic.c | 32 +-
kernel/sys.c | 16 +-
kernel/sysctl.c | 8 +-
lib/Kconfig.debug | 37 +-
lib/Kconfig.ubsan | 13 -
lib/Makefile | 3 +-
lib/kstrtox.c | 12 +
lib/list_debug.c | 8 +-
lib/lz4/lz4_decompress.c | 8 +-
lib/lz4/lz4defs.h | 2 +
lib/test_hash.c | 259 +++++-----
lib/test_meminit.c | 1 +
lib/test_printf.c | 8 +-
lib/test_ubsan.c | 22 -
mm/Kconfig | 12 +
mm/gup.c | 19 +
mm/hugetlb_vmemmap.c | 68 +--
mm/internal.h | 2 +-
mm/memcontrol.c | 2 +-
mm/memory.c | 4 -
mm/memory_hotplug.c | 2 +-
mm/mempolicy.c | 12 +-
mm/memremap.c | 20 +
mm/oom_kill.c | 12 +
mm/page_alloc.c | 19 +-
mm/page_io.c | 3 +
mm/percpu-vm.c | 8 +-
mm/percpu.c | 154 ++++--
mm/ptdump.c | 16 +-
mm/rmap.c | 27 +-
mm/sparse-vmemmap.c | 70 ++-
mm/vmalloc.c | 19 +-
mm/vmscan.c | 2 +-
mm/zsmalloc.c | 529 ++++++++-------------
samples/bpf/offwaketime_kern.c | 4 +-
samples/bpf/test_overhead_kprobe_kern.c | 11 +-
samples/bpf/test_overhead_tp_kern.c | 5 +-
scripts/Makefile.ubsan | 1 -
scripts/checkpatch.pl | 54 +--
scripts/const_structs.checkpatch | 23 +
tools/accounting/getdelays.c | 8 +-
tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 +-
tools/include/linux/hash.h | 5 +-
tools/perf/builtin-kmem.c | 1 -
tools/testing/radix-tree/linux/gfp.h | 3 +-
.../selftests/bpf/progs/test_stacktrace_map.c | 6 +-
.../testing/selftests/bpf/progs/test_tracepoint.c | 6 +-
tools/testing/selftests/vm/.gitignore | 1 +
tools/testing/selftests/vm/Makefile | 1 +
tools/testing/selftests/vm/hugepage-vmemmap.c | 144 ++++++
tools/testing/selftests/vm/run_vmtests.sh | 11 +
tools/vm/page_owner_sort.c | 216 +++++++--
135 files changed, 2054 insertions(+), 1463 deletions(-)
create mode 100644 kernel/configs/debug.config
create mode 100644 tools/testing/selftests/vm/hugepage-vmemmap.c
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
Rebasing (1/78) Rebasing (2/78) Rebasing (3/78) Rebasing (4/78) Rebasing (5/78) Rebasing (6/78) Rebasing (7/78) Rebasing (8/78) Rebasing (9/78) Rebasing (10/78) Rebasing (11/78) Rebasing (12/78) Rebasing (13/78) Rebasing (14/78) Rebasing (15/78) Rebasing (16/78) Rebasing (17/78) Rebasing (18/78) Rebasing (19/78) Rebasing (20/78) Rebasing (21/78) Rebasing (22/78) Rebasing (23/78) Rebasing (24/78) Rebasing (25/78) Rebasing (26/78) error: could not apply 5dbdbc41a83b... random: move the random sysctl declarations to its own file
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 5dbdbc41a83b... random: move the random sysctl declarations to its own file
Auto-merging drivers/char/random.c
CONFLICT (content): Merge conflict in drivers/char/random.c
Rebasing (27/78) Rebasing (28/78) Rebasing (29/78) Rebasing (30/78) Rebasing (31/78) Rebasing (32/78) Rebasing (33/78) Rebasing (34/78) Rebasing (35/78) Rebasing (36/78) Rebasing (37/78) Rebasing (38/78) Rebasing (39/78) Rebasing (40/78) Rebasing (41/78) Rebasing (42/78) Rebasing (43/78) Rebasing (44/78) Rebasing (45/78) Rebasing (46/78) Rebasing (47/78) Rebasing (48/78) Rebasing (49/78) Rebasing (50/78) Rebasing (51/78) Rebasing (52/78) Rebasing (53/78) Rebasing (54/78) Rebasing (55/78) Rebasing (56/78) Rebasing (57/78) Rebasing (58/78) Rebasing (59/78) Rebasing (60/78) Rebasing (61/78) Rebasing (62/78) Rebasing (63/78) Rebasing (64/78) Rebasing (65/78) Rebasing (66/78) Rebasing (67/78) Rebasing (68/78) Rebasing (69/78) Rebasing (70/78) Rebasing (71/78) Rebasing (72/78) Rebasing (73/78) Rebasing (74/78) Rebasing (75/78) Rebasing (76/78) Rebasing (77/78) Rebasing (78/78) Successfully rebased and updated refs/heads/akpm.
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
+ f5c8fc5c602d...5bc37ee6232f akpm -> akpm/master (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (5bc37ee6232f mm: hide the FRONTSWAP Kconfig symbol)
$ git merge --no-ff akpm/master
Removing mm/cleancache.c
Removing include/linux/cleancache.h
Removing Documentation/vm/cleancache.rst
Merge made by the 'recursive' strategy.
Documentation/vm/cleancache.rst | 296 ---------
Documentation/vm/frontswap.rst | 31 +-
Documentation/vm/index.rst | 1 -
MAINTAINERS | 7 -
arch/alpha/kernel/srm_env.c | 4 +-
arch/arm/configs/bcm2835_defconfig | 1 -
arch/arm/configs/qcom_defconfig | 1 -
arch/arm/kernel/atags_proc.c | 2 +-
arch/arm/mm/alignment.c | 2 +-
arch/ia64/kernel/salinfo.c | 10 +-
arch/m68k/configs/amiga_defconfig | 1 -
arch/m68k/configs/apollo_defconfig | 1 -
arch/m68k/configs/atari_defconfig | 1 -
arch/m68k/configs/bvme6000_defconfig | 1 -
arch/m68k/configs/hp300_defconfig | 1 -
arch/m68k/configs/mac_defconfig | 1 -
arch/m68k/configs/multi_defconfig | 1 -
arch/m68k/configs/mvme147_defconfig | 1 -
arch/m68k/configs/mvme16x_defconfig | 1 -
arch/m68k/configs/q40_defconfig | 1 -
arch/m68k/configs/sun3_defconfig | 1 -
arch/m68k/configs/sun3x_defconfig | 1 -
arch/powerpc/kernel/proc_powerpc.c | 4 +-
arch/s390/configs/debug_defconfig | 1 -
arch/s390/configs/defconfig | 1 -
arch/sh/mm/alignment.c | 4 +-
arch/xtensa/platforms/iss/simdisk.c | 4 +-
block/bdev.c | 5 -
drivers/acpi/proc.c | 2 +-
drivers/base/firmware_loader/fallback.c | 7 +-
drivers/base/firmware_loader/fallback.h | 11 +
drivers/base/firmware_loader/fallback_table.c | 25 +-
drivers/cdrom/cdrom.c | 23 +-
drivers/char/hpet.c | 22 +-
drivers/char/random.c | 14 +-
drivers/gpu/drm/drm_dp_mst_topology.c | 1 +
drivers/gpu/drm/drm_mm.c | 4 +
drivers/gpu/drm/drm_modeset_lock.c | 9 +
drivers/gpu/drm/i915/i915_perf.c | 22 +-
drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +
drivers/hwmon/dell-smm-hwmon.c | 4 +-
drivers/macintosh/mac_hid.c | 24 +-
drivers/net/bonding/bond_procfs.c | 8 +-
drivers/net/wireless/cisco/airo.c | 22 +-
drivers/net/wireless/intersil/hostap/hostap_ap.c | 16 +-
.../net/wireless/intersil/hostap/hostap_download.c | 2 +-
drivers/net/wireless/intersil/hostap/hostap_proc.c | 24 +-
drivers/net/wireless/ray_cs.c | 2 +-
drivers/nubus/proc.c | 36 +-
drivers/parisc/led.c | 4 +-
drivers/pci/proc.c | 10 +-
drivers/platform/x86/thinkpad_acpi.c | 4 +-
drivers/platform/x86/toshiba_acpi.c | 16 +-
drivers/pnp/isapnp/proc.c | 2 +-
drivers/pnp/pnpbios/proc.c | 4 +-
drivers/scsi/scsi_proc.c | 4 +-
drivers/scsi/sg.c | 35 +-
drivers/usb/gadget/function/rndis.c | 4 +-
drivers/zorro/proc.c | 2 +-
fs/Makefile | 2 +
fs/afs/proc.c | 6 +-
fs/aio.c | 31 +-
fs/binfmt_misc.c | 6 +-
fs/btrfs/extent_io.c | 10 -
fs/btrfs/super.c | 2 -
fs/coredump.c | 66 +-
fs/dcache.c | 37 +-
fs/eventpoll.c | 10 +-
fs/exec.c | 35 +
fs/ext4/mballoc.c | 14 +-
fs/ext4/readpage.c | 6 -
fs/ext4/super.c | 3 -
fs/f2fs/data.c | 14 -
fs/file_table.c | 47 +-
fs/inode.c | 39 +-
fs/jbd2/journal.c | 2 +-
fs/locks.c | 34 +-
fs/mpage.c | 7 -
fs/namei.c | 58 +-
fs/namespace.c | 24 +-
fs/notify/dnotify/dnotify.c | 21 +-
fs/notify/fanotify/fanotify_user.c | 10 +-
fs/notify/inotify/inotify_user.c | 11 +-
fs/ntfs3/ntfs_fs.h | 1 -
fs/ocfs2/stackglue.c | 25 +-
fs/ocfs2/super.c | 2 -
fs/pipe.c | 64 +-
fs/proc/generic.c | 6 -
fs/proc/inode.c | 1 +
fs/proc/internal.h | 5 -
fs/proc/proc_net.c | 8 +-
fs/proc/proc_sysctl.c | 63 +-
fs/super.c | 3 -
fs/sysctls.c | 39 ++
include/linux/aio.h | 4 -
include/linux/cleancache.h | 124 ----
include/linux/coredump.h | 10 +-
include/linux/dcache.h | 10 -
include/linux/dnotify.h | 1 -
include/linux/fanotify.h | 2 -
include/linux/frontswap.h | 35 +-
include/linux/fs.h | 18 -
include/linux/inotify.h | 3 -
include/linux/kprobes.h | 6 -
include/linux/migrate.h | 2 +
include/linux/mount.h | 3 -
include/linux/pipe_fs_i.h | 4 -
include/linux/poll.h | 2 -
include/linux/printk.h | 4 -
include/linux/proc_fs.h | 13 +-
include/linux/ref_tracker.h | 2 +
include/linux/sched/sysctl.h | 14 +-
include/linux/seq_file.h | 2 +-
include/linux/shmem_fs.h | 3 +-
include/linux/stackdepot.h | 25 +-
include/linux/stackleak.h | 5 -
include/linux/swapfile.h | 3 -
include/linux/sysctl.h | 67 +-
include/scsi/sg.h | 4 -
init/main.c | 9 +-
ipc/util.c | 2 +-
kernel/hung_task.c | 81 ++-
kernel/irq/proc.c | 8 +-
kernel/kprobes.c | 30 +-
kernel/printk/Makefile | 5 +-
kernel/printk/internal.h | 8 +
kernel/printk/printk.c | 4 +-
kernel/printk/sysctl.c | 85 +++
kernel/resource.c | 4 +-
kernel/stackleak.c | 26 +-
kernel/sysctl.c | 724 ++-------------------
kernel/watchdog.c | 101 +++
lib/Kconfig | 4 +
lib/Kconfig.kasan | 2 +-
lib/stackdepot.c | 46 +-
lib/test_sysctl.c | 22 +-
mm/Kconfig | 40 +-
mm/Makefile | 1 -
mm/cleancache.c | 315 ---------
mm/filemap.c | 102 ++-
mm/frontswap.c | 259 +-------
mm/kasan/common.c | 1 -
mm/migrate.c | 38 +-
mm/page_owner.c | 2 +
mm/shmem.c | 33 +-
mm/swapfile.c | 90 +--
mm/truncate.c | 15 +-
mm/zswap.c | 8 +-
net/atm/proc.c | 4 +-
net/bluetooth/af_bluetooth.c | 8 +-
net/can/bcm.c | 2 +-
net/can/proc.c | 2 +-
net/core/neighbour.c | 6 +-
net/core/pktgen.c | 6 +-
net/ipv4/netfilter/ipt_CLUSTERIP.c | 6 +-
net/ipv4/raw.c | 8 +-
net/ipv4/tcp_ipv4.c | 2 +-
net/ipv4/udp.c | 6 +-
net/netfilter/x_tables.c | 10 +-
net/netfilter/xt_hashlimit.c | 18 +-
net/netfilter/xt_recent.c | 4 +-
net/sunrpc/auth_gss/svcauth_gss.c | 4 +-
net/sunrpc/cache.c | 24 +-
net/sunrpc/stats.c | 2 +-
sound/core/info.c | 4 +-
165 files changed, 1531 insertions(+), 2480 deletions(-)
delete mode 100644 Documentation/vm/cleancache.rst
create mode 100644 fs/sysctls.c
delete mode 100644 include/linux/cleancache.h
create mode 100644 kernel/printk/sysctl.c
delete mode 100644 mm/cleancache.c