Hi all, Changes since 20240906: News: Something has broken my powerpc ppc44x_defconfig build, The mm tree gained a conflict against Linus' tree. The vfs-brauner tree still has its build failure so I used a supplied patch. The drm tree gained a conflict against Linus' tree. The slab tree gained conflicts against the vfs-brauner tree due to duplicated commits, which become a build failure so I used the slab tree from next-20240906 for today. The execve tree gained a conflict against the mm tree. The kspp tree gained a build failure due to an interaction with the drm-xe tree for which I applied a patch. Non-merge commits (relative to Linus' tree): 9489 9541 files changed, 372887 insertions(+), 174715 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There is also the merge.log file in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64 defconfig and htmldocs. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 375 trees (counting Linus' and 140 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (da3ea35007d0 Linux 6.11-rc7) Merging vfs-brauner-fixes/vfs.fixes (72a6e22c604c fscache: delete fscache_cookie_lru_timer when fscache exits to avoid UAF) Merging fscrypt-current/for-current (256abd8e550c Linux 6.10-rc7) Merging fsverity-current/for-current (256abd8e550c Linux 6.10-rc7) Merging btrfs-fixes/next-fixes (eda7182ee922 Merge branch 'misc-6.11' into next-fixes) Merging vfs-fixes/fixes (8c86f1a45749 close_range(): fix the logics in descriptor table trimming) Merging erofs-fixes/fixes (5be63fc19fca Linux 6.11-rc5) Merging nfsd-fixes/nfsd-fixes (40927f3d0972 nfsd: fix nfsd4_deleg_getattr_conflict in presence of third party lease) Merging v9fs-fixes/fixes/next (0c3836482481 Linux 6.10) Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) Merging bcachefs/for-next (2d5e650276dd bcachefs: Fix negative timespecs) Merging fscrypt/for-next (256abd8e550c Linux 6.10-rc7) Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) Merging btrfs/for-next (084e6b2e25a3 Merge branch 'for-next-next-v6.11-20240907' into for-next-20240907) Merging ceph/master (ede0b1d30b82 libceph: use min() to simplify code in ceph_dns_resolve_name()) Merging cifs/for-next (0fa8d04ff36d smb3: mark compression as CONFIG_EXPERIMENTAL and fix missing compression operation) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging dlm/next (652b0ae675fe dlm: add missing -ENOMEM if alloc_workqueue() fails) Merging erofs/dev (8d8f113f5fa4 erofs: simplify erofs_map_blocks_flatmode()) Merging exfat/dev (98ad7b9012b5 exfat: Implement sops->shutdown and ioctl) Merging exportfs/exportfs-next (0c3836482481 Linux 6.10) Merging ext3/for_next (1a4c492eadd0 Merge fanotify HSM events implementation.) CONFLICT (content): Merge conflict in fs/bcachefs/fs.c Merging ext4/dev (ff2beee206d2 ext4: convert EXT4_B2C(sbi->s_stripe) users to EXT4_NUM_B2C) Merging f2fs/dev (5697e94daab9 f2fs: get rid of page->index) Merging fsverity/for-next (256abd8e550c Linux 6.10-rc7) Merging fuse/for-next (9dc504f24489 virtio_fs: allow idmapped mounts) Merging gfs2/for-next (6888c1e85f5d gfs2: Remove gfs2_aspace_writepage()) Merging jfs/jfs-next (2b59ffad47db jfs: Fix uninit-value access of new_ea in ea_buffer) Merging ksmbd/ksmbd-for-next (d8abb73f5847 Merge tag 'v6.11-rc6-server-fixes' of git://git.samba.org/ksmbd) Merging nfs/linux-next (67784a74e258 Merge tag 'ata-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux) Merging nfs-anna/linux-next (f92214e4c312 NFS: Avoid unnecessary rescanning of the per-server delegation list) Merging nfsd/nfsd-next (22e044f2eecb nfsd: handle delegated timestamps in SETATTR) Merging ntfs3/master (689ecd06ef8d fs/ntfs3: Rename ntfs3_setattr into ntfs_setattr) Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access) Merging overlayfs/overlayfs-next (6c4a5f964504 ovl: fail if trusted xattrs are needed but caller lacks permission) Merging ubifs/next (92a286e90203 ubi: Fix ubi_init() ubiblock_exit() section mismatch) Merging v9fs/9p-next (2211561723a6 9p: Enable multipage folios) Merging v9fs-ericvh/ericvh/for-next (0c3836482481 Linux 6.10) Merging xfs/for-next (90fa22da6d6b xfs: ensure st_blocks never goes to zero during COW writes) Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH) Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging vfs-brauner/vfs.all (f4ef340b86e6 Merge branch 'vfs.procfs' into vfs.all Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>) CONFLICT (content): Merge conflict in fs/btrfs/super.c CONFLICT (content): Merge conflict in fs/exfat/inode.c CONFLICT (content): Merge conflict in fs/ext4/inline.c CONFLICT (content): Merge conflict in fs/ext4/inode.c CONFLICT (content): Merge conflict in fs/ext4/super.c CONFLICT (content): Merge conflict in fs/f2fs/data.c CONFLICT (modify/delete): fs/netfs/io.c deleted in vfs-brauner/vfs.all and modified in HEAD. Version HEAD of fs/netfs/io.c left in tree. CONFLICT (content): Merge conflict in fs/smb/client/cifssmb.c CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c CONFLICT (content): Merge conflict in include/linux/fs.h $ git rm -f fs/netfs/io.c Applying: fix up for "uapi: explain how per-syscall AT_* flags should be allocated" Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (72511d0e5a5f zsmalloc: use unique zsmalloc caches names) Merging fs-current (41caf10411f8 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) Merging kbuild-current/fixes (431c1646e1f8 Linux 6.11-rc6) Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6) Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses) Merging arm64-fixes/for-next/fixes (c060f93253ca arm64: stacktrace: fix the usage of ftrace_graph_ret_addr()) Merging arm-soc-fixes/arm/fixes (2650fd867929 Merge tag 'v6.11-rockchip-dtsfixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes) Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1) Merging drivers-memory-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging sophgo-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging m68k-current/for-linus (21b9e722ad28 m68k: cmpxchg: Fix return value for default case in __arch_xchg()) Merging powerpc-fixes/fixes (734ad0af3609 powerpc/qspinlock: Fix deadlock in MCS queue) Merging s390-fixes/fixes (1642285e511c s390/boot: Fix KASLR base offset off by __START_KERNEL bytes) Merging net/main (d759ee240d3c Merge tag 'net-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf/master (b831f83e40a2 Merge tag 'bpf-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging ipsec/master (9b0874286768 Merge branch 'mctp-serial-tx-escapes') Merging netfilter/main (d759ee240d3c Merge tag 'net-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs/main (031ae72825ce ila: call nf_unregister_net_hooks() sooner) Merging wireless/for-next (f0417c50fddd Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue) Merging ath/for-current (2f833e8948d6 Revert "wifi: ath11k: support hibernation") Merging wpan/master (3682c302e72d ieee802154: Correct spelling in nl802154.h) Merging rdma-fixes/for-rc (8400291e289e Linux 6.11-rc1) Merging sound-current/for-linus (c491b044cf5f Merge tag 'asoc-fix-v6.11-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (bf6d7a44a144 ASoC: Intel: soc-acpi-intel-mtl-match: add missing empty item) Merging regmap-fixes/for-linus (10a650193899 Merge remote-tracking branch 'regmap/for-6.10' into regmap-linus) Merging regulator-fixes/for-linus (1a5caec7f80c regulator: core: Stub devm_regulator_bulk_get_const() if !CONFIG_REGULATOR) Merging spi-fixes/for-linus (c9ca76e82398 MAINTAINERS: SPI: Add mailing list imx@xxxxxxxxxxxxxxx for nxp spi drivers) Merging pci-current/for-linus (8f62819aaace PCI/pwrctl: Rescan bus on a separate thread) Merging driver-core.current/driver-core-linus (47ac09b91bef Linux 6.11-rc4) Merging tty.current/tty-linus (47ac09b91bef Linux 6.11-rc4) Merging usb.current/usb-linus (87eb3cb4ec61 usb: typec: ucsi: Fix cable registration) Merging usb-serial-fixes/usb-linus (7d47d22444bb USB: serial: pl2303: add device id for Macrosilicon MS3020) Merging phy/fixes (431c1646e1f8 Linux 6.11-rc6) Merging staging.current/staging-linus (8400291e289e Linux 6.11-rc1) Merging iio-fixes/fixes-togreg (48b9a8dabcc3 VMCI: Fix use-after-free when removing resource in vmci_resource_remove()) Merging counter-current/counter-current (8400291e289e Linux 6.11-rc1) Merging char-misc.current/char-misc-linus (48b9a8dabcc3 VMCI: Fix use-after-free when removing resource in vmci_resource_remove()) Merging soundwire-fixes/fixes (431c1646e1f8 Linux 6.11-rc6) Merging thunderbolt-fixes/fixes (431c1646e1f8 Linux 6.11-rc6) Merging input-current/for-linus (e06edf96dea0 Input: i8042 - add TUXEDO Stellaris 16 Gen5 AMD to i8042 quirk table) Merging crypto-current/master (df1e9791998a hwrng: core - remove (un)register_miscdev()) Merging vfio-fixes/for-linus (5a88a3f67e37 vfio/pci: Init the count variable in collecting hot-reset devices) Merging kselftest-fixes/fixes (170c966cbe27 selftests: ksft: Fix finished() helper exit code on skipped tests) Merging dmaengine-fixes/fixes (431c1646e1f8 Linux 6.11-rc6) Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (bd92c1e07beb mtd: hyperbus: rpc-if: Add missing MODULE_DEVICE_TABLE) Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) Merging v4l-dvb-fixes/fixes (63de936b513f media: atomisp: Fix streaming no longer working on BYT / ISP2400 devices) Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add missing MODULE_DESCRIPTION() macro) Merging mips-fixes/mips-fixes (5be63fc19fca Linux 6.11-rc5) Merging at91-fixes/at91-fixes (e9408fa234fb MAINTAINERS: Update DTS path for ARM/Microchip (AT91) SoC) Merging omap-fixes/fixes (5062d9c0cbbc ARM: dts: omap3-n900: correct the accelerometer orientation) Merging kvm-fixes/master (59cbd4eea48f KVM: Remove HIGH_RES_TIMERS dependency) Merging kvms390-fixes/master (cff59d8631e1 s390/uv: Panic for set and remove shared access UVC errors) Merging hwmon-fixes/hwmon (a54da9df75cd hwmon: (hp-wmi-sensors) Check if WMI event data exists) Merging nvdimm-fixes/libnvdimm-fixes (d5240fa65db0 nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases) Merging cxl-fixes/fixes (5be63fc19fca Linux 6.11-rc5) Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y) Merging drivers-x86-fixes/fixes (d34af755a533 platform/x86/amd: pmf: Make ASUS GA403 quirk generic) Merging samsung-krzk-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging pinctrl-samsung-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging devicetree-fixes/dt/linus (b739dffa5d57 of/irq: Prevent device address out-of-bounds read in interrupt map walk) Merging dt-krzk-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging scsi-fixes/fixes (0f9592ae26ff scsi: ufs: ufs-mediatek: Add UFSHCD_QUIRK_BROKEN_LSDBS_CAP) Merging drm-fixes/drm-fixes (141bb6bc73cf Merge tag 'amd-drm-fixes-6.11-2024-09-05' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (a13494de5325 drm/i915/display: Increase Fast Wake Sync length as a quirk) Merging mmc-fixes/fixes (aea62c744a9a mmc: cqhci: Fix checking of CQHCI_HALT state) Merging rtc-fixes/rtc-fixes (8400291e289e Linux 6.11-rc1) Merging gnss-fixes/gnss-linus (8400291e289e Linux 6.11-rc1) Merging hyperv-fixes/hyperv-fixes (895384881ec9 hv: vmbus: Constify struct kobj_type and struct attribute_group) Merging risc-v-fixes/fixes (1ff95eb2bebd riscv: Fix RISCV_ALTERNATIVE_EARLY) Merging riscv-dt-fixes/riscv-dt-fixes (7d9d88890f04 MAINTAINERS: invert Misc RISC-V SoC Support's pattern) Merging riscv-soc-fixes/riscv-soc-fixes (61f2e8a3a941 riscv: dts: starfive: jh7110-common: Fix lower rate of CPUfreq by setting PLL0 rate to 1.5GHz) Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging spdx/spdx-linus (47ac09b91bef Linux 6.11-rc4) Merging gpio-brgl-fixes/gpio/for-current (a5135526426d gpio: modepin: Enable module autoloading) Merging gpio-intel-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging pinctrl-intel-fixes/fixes (a366e46da10d pinctrl: meteorlake: Add Arrow Lake-H/U ACPI ID) Merging auxdisplay-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging kunit-fixes/kunit-fixes (12cb32a52eb6 kunit: Fix missing kerneldoc comment) Merging memblock-fixes/fixes (8043832e2a12 memblock: use numa_valid_node() helper to check for invalid node ID) Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) Merging perf-current/perf-tools (e162cb25c410 perf daemon: Fix the build on more 32-bit architectures) Merging efi-fixes/urgent (ae835a96d72c x86/efistub: Revert to heap allocated boot_params for PE entrypoint) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) Merging battery-fixes/fixes (7c626ce4bae1 Linux 6.11-rc3) Merging iommufd-fixes/for-rc (cf1e515c9a40 iommufd/selftest: Make dirty_ops static) Merging rust-fixes/rust-fixes (cff56ff737e2 MAINTAINERS: update Andreas Hindborg's email address) Merging w1-fixes/fixes (8400291e289e Linux 6.11-rc1) Merging pmdomain-fixes/fixes (9ec87c5957ea OPP: Fix support for required OPPs for multiple PM domains) Merging i2c-host-fixes/i2c/i2c-host-fixes (431c1646e1f8 Linux 6.11-rc6) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (71c03a8cb213 clk: qcom: gcc-sc8280xp: don't use parking clk_ops for QUPs) Merging pwrseq-fixes/pwrseq/for-current (431c1646e1f8 Linux 6.11-rc6) Merging thead-dt-fixes/thead-dt-fixes (8400291e289e Linux 6.11-rc1) Merging drm-misc-fixes/for-linux-next-fixes (5a498d4d06d6 drm/fbdev-dma: Only install deferred I/O if necessary) Merging mm-stable/mm-stable (6f1833b8208c mm: memory_hotplug: unify Huge/LRU/non-LRU movable folio isolation) Merging mm-nonmm-stable/mm-nonmm-stable (74b0099340e0 nilfs2: refactor nilfs_segctor_thread()) Merging mm/mm-everything (a8bb838e0f21 foo) CONFLICT (content): Merge conflict in kernel/events/uprobes.c CONFLICT (content): Merge conflict in kernel/resource.c Merging kbuild/for-next (4dda2081d843 scripts: import more hash table macros) Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) Merging perf/perf-tools-next (003265bb6f02 perf mem: Fix the wrong reference in parse_record_events()) Merging compiler-attributes/compiler-attributes (8400291e289e Linux 6.11-rc1) Merging dma-mapping/for-next (19156263cb1f dma-mapping: use IOMMU DMA calls for common alloc/free page calls) Merging asm-generic/master (b82c1d235a30 syscalls: add back legacy __NR_nfsservctl macro) Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (9016915e3c5f Merge branches 'amba', 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (6c01aa4b01dd Merge branch 'for-next/poe' into for-next/core) Merging arm-perf/for-next/perf (7c626ce4bae1 Linux 6.11-rc3) Merging arm-soc/for-next (dba40c7311ec Merge branch 'soc/drivers' into for-next) Merging amlogic/for-next (034835342aab Merge branch 'v6.12/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (b4c322c2783a ARM: dts: aspeed: catalina: Update io expander line names) Merging at91/at91-next (ee735afc2dae Merge branch 'at91-soc' into at91-next) Merging broadcom/next (7eff0651abbb Merge branch 'soc/next' into next) Merging davinci/davinci/for-next (973d248c43f2 ARM: davinci: remove unused cpuidle code) Merging drivers-memory/for-next (32960b4f25c2 memory: pl353-smc: simplify with scoped for each OF child loop) Merging imx-mxs/for-next (79e1b8171ca4 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (9dd04bf6bf1c Merge branch 'v6.11-next/dts64' into for-next) Merging mvebu/for-next (dea56c781ed3 ARM: dove: Drop a write-only variable) Merging omap/for-next (ba1b153f6d27 Merge branch 'omap-for-v6.12/drivers' into tmp/omap-next-20240904.164705) Merging qcom/for-next (2adcf3941db7 Merge branches 'arm32-for-6.12', 'arm64-defconfig-fixes-for-6.11', 'arm64-defconfig-for-6.12', 'arm64-fixes-for-6.11', 'arm64-for-6.12', 'clk-fixes-for-6.11', 'clk-for-6.12', 'drivers-fixes-for-6.11' and 'drivers-for-6.12' into for-next) Merging renesas/next (5379c9e0a6ad Merge branch 'renesas-dts-for-v6.12' into renesas-next) Merging reset/reset/next (487b1b32e317 reset: eyeq: add platform driver) Merging rockchip/for-next (bae9cc0db172 Merge branch 'v6.12-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (6a8afff2166f Merge branch 'next/drivers' into for-next) Merging scmi/for-linux-next (8aaf45bcb48e Merge branch 'for-next/scmi/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging sophgo/for-next (d18743463667 riscv: dts: sophgo: cv1812h: add pinctrl support) Merging stm32/stm32-next (b14c9f6bd0ba ARM: dts: stm32: Use SAI to generate bit and frame clock on STM32MP15xx DHCOM PDK2) Merging sunxi/sunxi/for-next (0acd49860124 Merge branch 'sunxi/dt-for-6.12' into sunxi/for-next) Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v6.11' into next) Merging tegra/for-next (6726d2c6a157 Merge branch for-6.12/arm64/defconfig into for-next) Merging thead-dt/thead-dt-for-next (2d98fea7491a riscv: dts: thead: change TH1520 SPI node to use clock controller) Merging ti/ti-next (657b48ad4c7a Merge branches 'ti-drivers-soc-next', 'ti-k3-config-next' and 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (bc810ecbb30a Merge branch 'zynq/soc' into for-next) Merging clk/clk-next (547389da7af1 Merge branch 'clk-samsung' into clk-next) Merging clk-imx/for-next (32c055ef563c clk: imx6ul: fix clock parent for IMX6UL_CLK_ENETx_REF_SEL) Merging clk-renesas/renesas-clk (3aeccbe08171 clk: renesas: r9a09g057: Add clock and reset entries for GTM/RIIC/SDHI/WDT) Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging loongarch/loongarch-next (4956e07f05e2 LoongArch: KVM: Invalidate guest steal time address on vCPU reset) Merging m68k/for-next (b90fae5df917 m68k: defconfig: Update defconfigs for v6.11-rc1) Merging m68knommu/for-next (2e04cbed1278 m68k: remove trailing space after Merging microblaze/next (d829e7ee6354 microblaze: Export xmb_manager functions) Merging mips/mips-next (439667fb943c mips: Remove posix_types.h include from sigcontext.h) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) Merging parisc-hd/for-next (319eb43c0b3e parisc: Allow mmap(MAP_STACK) memory to automatically expand upwards) Merging powerpc/next (a5a670df1db7 macintosh/via-pmu: register_pmu_pm_ops() can be __init) Merging risc-v/for-next (0e3f3649d44b riscv: Enable generic CPU vulnerabilites support) Merging riscv-dt/riscv-dt-for-next (8400291e289e Linux 6.11-rc1) Merging riscv-soc/riscv-soc-for-next (8400291e289e Linux 6.11-rc1) Merging s390/for-next (14f9faa84b02 Merge branch 'features' into for-next) Applying: fixup for "s390/mm/ptdump: Generate address marker array dynamically" Merging sh/for-next (8fe76a1c2264 sh: push-switch: Add missing MODULE_DESCRIPTION() macro) Merging sparc/for-next (a3da15389112 sparc64: Fix prototype warnings in hibernate.c) Merging uml/next (98ff534ec2cd um: vector: always reset vp->opened) Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) Merging fs-next (9887df7822f0 Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) CONFLICT (content): Merge conflict in include/linux/huge_mm.h CONFLICT (content): Merge conflict in mm/filemap.c Merging printk/for-next (daeed1595b4d printk: Avoid false positive lockdep report for legacy printing) Merging pci/next (4aefeda2a4fc Merge branch 'pci/misc') Merging pstore/for-next/pstore (1bf8012fc699 pstore: replace spinlock_t by raw_spinlock_t) Merging hid/for-next (14bc9ce0792b Merge branch 'for-6.12/constify-rdesc' into for-next) Merging i2c/i2c/for-next (642e257c3ec3 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i2c-host/i2c/i2c-host (39d86d26dc8a i2c: muxes: add support for tsd,mule-i2c multiplexer) Merging i3c/i3c/next (061dd21ca712 i3c/master: cmd_v1: Fix the rule for getting i3c mode) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) Merging hwmon-staging/hwmon-next (d22bd451d560 hwmon: (pmbus/mpq7932) Constify struct regulator_desc) Merging jc_docs/docs-next (8e1c119c6c6a Merge branch 'docs-mw' into docs-next) Merging v4l-dvb/master (3f52e32445a1 media: MAINTAINERS: Add "qcom," substring for Qualcomm Camera Subsystem) Merging v4l-dvb-next/master (a043ea54bbb9 Merge tag 'next-media-rkisp1-20240814' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git) Merging pm/linux-next (8cc214312cf8 Merge branch 'pm-opp' into linux-next) CONFLICT (content): Merge conflict in arch/riscv/include/asm/irq.h Merging cpufreq-arm/cpufreq/arm/linux-next (6b612d1bac67 cpufreq: ti-cpufreq: Use socinfo to get revision in AM62 family) Merging cpupower/cpupower (80e67f1802d0 pm:cpupower: Add error warning when SWIG is not installed) Merging devfreq/devfreq-next (d47552124bb0 PM / devfreq: imx-bus: Use of_property_present()) Merging pmdomain/next (208e0280f776 OPP: Drop redundant _opp_attach|detach_genpd()) Merging opp/opp/linux-next (a84372012e93 dt-bindings: opp: operating-points-v2-ti-cpu: Update maintainers) Merging thermal/thermal/linux-next (7d8abc5f3b5c thermal/drivers/imx_sc_thermal: Use dev_err_probe) Merging rdma/for-next (cf2840f59119 RDMA/erdma: Return QP state in erdma_query_qp) Merging net-next/main (c259acab839e ptp/ioctl: support MONOTONIC{,_RAW} timestamps for PTP_SYS_OFFSET_EXTENDED) CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlxsw/core_thermal.c Merging bpf-next/for-next (52332699abc9 Merge branch 'bpf-next/master' into for-next) CONFLICT (content): Merge conflict in drivers/net/netkit.c Merging ipsec-next/master (17163f23678c xfrm: minor update to sdb and xfrm_policy comments) Merging mlx5-next/mlx5-next (c772a2c69018 net/mlx5: Add IFC related stuff for data direct) Merging netfilter-next/main (d5c4546062fd net: sched: consistently use rcu_replace_pointer() in taprio_change()) Merging ipvs-next/main (4201f3938914 netfilter: nf_tables: set element timeout update support) Merging bluetooth/master (e278dcc0a237 Bluetooth: btrtl: Set msft ext address filter quirk for RTL8852B) Merging wireless-next/for-next (bca8bc0399ac wifi: mac80211: handle ieee80211_radar_detected() for MLO) Merging ath-next/for-next (02f454f9aa62 wifi: ath12k: Avoid -Wflex-array-member-not-at-end warnings) Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging mtd/mtd/next (098a573b6e8b mtd: tests: Include <linux/prandom.h> instead of <linux/random.h>) Merging nand/nand/next (9e1a23aa86fc dt-bindings: mtd: ti, gpmc-nand: support partitions node) Merging spi-nor/spi-nor/next (2095e7da8049 mtd: spi-nor: spansion: Add support for S28HS256T) Merging crypto/master (c398cb8eb0a2 crypto: octeontx* - Select CRYPTO_AUTHENC) Merging drm/drm-next (88a29f8c5ff9 Merge tag 'mediatek-drm-next-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_quirks.c CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gr3d.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/display/xe_display.c CONFLICT (content): Merge conflict in fs/pstore/platform.c Merging drm-exynos/for-linux-next (94ebc3d3235c drivers:drm:exynos_drm_gsc:Fix wrong assignment in gsc_bind()) Merging drm-misc/for-linux-next (ba2b9de0c1ac drm/tegra: fix potential uninitialized variable use) Merging amdgpu/drm-next (0df8ef6e1b5d drm/amdgpu: drop redundant W=1 warnings from Makefile) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c Merging drm-intel/for-linux-next (f5d2a0e464b1 drm/i915/display: use to_intel_display() global state macros) Merging drm-msm/msm-next (15302579373e drm/msm/dpu: enable writeback on SM6350) Merging drm-msm-lumag/msm-next-lumag (15302579373e drm/msm/dpu: enable writeback on SM6350) Merging drm-xe/drm-xe-next (0c841e47d8d9 drm/xe: Update runtime detection of has_flat_ccs) CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/display/xe_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_hwmon.c Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active) Merging fbdev/for-next (27f22f897095 fbdev: hyperv_fb: Convert comma to semicolon) Merging regmap/for-next (7da49f45bf04 Merge remote-tracking branch 'regmap/for-6.12' into regmap-next) Merging sound/for-next (b12891c7b6d2 ALSA: IEC958 definition for consumer status channel update) Merging ieee1394/for-next (b5ff50aae6f9 firewire: core: fulfill documentation of fw_iso_context_flush_completions()) Merging sound-asoc/for-next (1febd08e67ba Merge remote-tracking branch 'asoc/for-6.12' into asoc-next) Merging modules/modules-next (907fa79d787f MAINTAINERS: scale modules with more reviewers) Merging input/next (4172a64ef2c4 Input: zforce_ts - switch to using asynchronous probing) Merging block/for-next (5a1f595c3d81 Merge branch 'for-6.12/block' into for-next) Merging device-mapper/for-next (90da77987dd5 dm-integrity: support recalculation in the 'I' mode) Merging libata/for-next (d647bdf4d080 ata: libata: Fix W=1 compilation warning) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) Merging mmc/next (cf6444ba528f mmc: sdhci_am654: Add prints to tuning algorithm) Merging mfd/for-mfd-next (ae3239408c5b mfd: intel-lpss: Add Intel Panther Lake LPSS PCI IDs) Merging backlight/for-backlight-next (fea88a13a5d1 backlight: l4f00242t03: Add check for spi_setup) Merging battery/for-next (eb1ea1351da0 power: supply: ab8500: Constify struct kobj_type) Merging regulator/for-next (c46a4fd42b66 Merge remote-tracking branch 'regulator/for-6.12' into regulator-next) Merging security/next (cb8724948452 Automated merge of 'dev' into 'next') Merging apparmor/apparmor-next (8400291e289e Linux 6.11-rc1) Merging integrity/next-integrity (fa8a4ce432e8 ima: fix buffer overrun in ima_eventdigest_init_common) Merging selinux/next (83f8b733c9b7 Automated merge of 'dev' into 'next') Merging smack/next (2749749afa07 smackfs: Use rcu_assign_pointer() to ensure safe assignment in smk_set_cipso) Merging tomoyo/master (dc1c8034e31b minmax: simplify min()/max()/clamp() implementation) Merging tpmdd/next (1016abf3e697 selftests: tpm2: test_smoke: Run only when TPM2 is avaialable.) Merging watchdog/master (7c626ce4bae1 Linux 6.11-rc3) Merging iommu/next (72e7bac4135e Merge branches 'arm/smmu', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) Merging audit/next (8c1867a2f0fd audit: Make use of str_enabled_disabled() helper) Merging devicetree/for-next (38e283ce47e6 of: address: Unify resource bounds overflow checking) Merging dt-krzk/for-next (08fd3b6e0df4 Merge branch 'next/dt64' into for-next) Merging mailbox/for-next (a8bd68e4329f mailbox: mtk-cmdq: Move devm_mbox_controller_register() after devm_pm_runtime_enable()) Merging spi/for-next (9524fd2b3dcf Merge remote-tracking branch 'spi/for-6.12' into spi-next) Merging tip/master (d45aab436cf0 Merge branch into tip/master: 'x86/timers') Merging clockevents/timers/drivers/next (727e8fcd969f platform/x86:intel/pmc: Fix comment for the pmc_core_acpi_pm_timer_suspend_resume function) Merging edac/edac-for-next (61124f42dcaa Merge ras/edac-drivers into for-next) Merging ftrace/for-next (2a07e30c19f3 Merge ring-buffer/for-next) Merging rcu/next (a54a47fa82d1 rcu: Defer printing stall-warning backtrace when holding rcu_node lock) CONFLICT (content): Merge conflict in include/linux/context_tracking.h Merging paulmck/non-rcu/next (f01f18f2ed7d Merge branches 'cmpxchg.2024.08.06a', 'lkmm.2024.08.02a', 'kcsan.2024.08.01a' and 'misc.2024.08.02a' into HEAD) Merging kvm/next (15e1c3d65975 KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id())) Merging kvm-arm/next (6ed84689cbda Merge branch kvm-arm64/nv-at-pan into kvmarm-master/next) CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h Merging kvms390/next (7816e58967d0 kvm: s390: Reject memory region operations for ucontrol VMs) Merging kvm-ppc/topic/ppc-kvm (46765aaec4d7 KVM: PPC: Book3S HV: remove unused varible) Merging kvm-riscv/riscv_kvm_next (5aa09297a3dc RISC-V: KVM: Fix to allow hpmcounter31 from the guest) Merging kvm-x86/next (12680d7b8ac4 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'pat_vmx_msrs', 'selftests', 'svm' and 'vmx') Merging xen-tip/linux-next (4c006734898a x86/xen: fix memblock_reserve() usage on PVH) Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next) Merging workqueues/for-next (82e29ca33e36 Merge branch 'for-6.12' into for-next) Merging sched-ext/for-next (02e65e1c1282 sched_ext: Add missing static to scx_has_op[]) Merging drivers-x86/for-next (f5dd17e30a59 platform/x86: wmi: Call both legacy and WMI driver notify handlers) Merging chrome-platform/for-next (d1b35e6d34e9 platform/chrome: chromeos_laptop: Use kmemdup_array) Merging chrome-platform-firmware/for-firmware-next (8400291e289e Linux 6.11-rc1) Merging hsi/for-next (c3eddf5e8c30 HSI: omap-ssi: Remove unnecessary debugfs_create_dir() error check) Merging leds-lj/for-leds-next (64c38866500b leds: turris-omnia: Fix module autoloading with MODULE_DEVICE_TABLE()) Merging ipmi/for-next (64dce81f8c37 ipmi: docs: don't advertise deprecated sysfs entries) Merging driver-core/driver-core-next (fea64fa04c31 devres: Correclty strip percpu address space of devm_free_percpu() argument) Merging usb/usb-next (9c0c11bb87b0 xhci: support setting interrupt moderation IMOD for secondary interrupters) CONFLICT (content): Merge conflict in drivers/usb/typec/ucsi/ucsi.c Merging thunderbolt/next (10904df3f20c thunderbolt: Improve software receiver lane margining) Merging usb-serial/usb-next (4c0d9477ba69 USB: serial: kobil_sct: restore initial terminal settings) Merging tty/tty-next (f1ec92a066b2 tty: hvc: convert comma to semicolon) Merging char-misc/char-misc-next (72486eb13b25 Merge tag 'extcon-next-for-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) Merging coresight/next (988d40a4d4e7 coresight: Make trace ID map spinlock local to the map) Merging fastrpc/for-next (8400291e289e Linux 6.11-rc1) Merging fpga/for-next (8de36789bd03 fpga: zynq-fpga: Rename 'timeout' variable as 'time_left') Merging icc/icc-next (a5733950fe35 Merge branch 'icc-sm8350' into icc-next) Merging iio/togreg (5ba0cb92584b iio: adc: axp20x_adc: add support for AXP717 ADC) Merging phy-next/next (3c2ea12a625d phy: renesas: rcar-gen3-usb2: Add support for the RZ/G3S SoC) Merging soundwire/next (5aedb8d8336b soundwire: intel_bus_common: enable interrupts before exiting reset) Merging extcon/extcon-next (2e01ac83c1c7 extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE) Merging gnss/gnss-next (8400291e289e Linux 6.11-rc1) Merging vfio/next (27a8204b26ac vfio/mdev: Constify struct kobj_type) Merging w1/for-next (8400291e289e Linux 6.11-rc1) Merging spmi/spmi-next (7c626ce4bae1 Linux 6.11-rc3) Merging staging/staging-next (fa42410edbf4 staging: vme_user: changed geoid data type from int to u32) Merging counter-next/counter-next (0d0f611bdf8e counter: ftm-quaddec: Enable module autoloading) Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) Merging mux/for-next (5be63fc19fca Linux 6.11-rc5) Merging dmaengine/next (e0bee4bcdc32 dmaengine: loongson1-apb-dma: Fix the build warning caused by the size of pdev_irqname) Merging cgroup/for-next (68d2fca079c8 Merge branch 'for-6.12' into for-next) Merging scsi/for-next (8a1f405ed3bd Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (cff06a799dbe Merge patch series "smartpqi updates") Merging vhost/linux-next (d820e8fcea38 net: virtio: unify code to init stats) Merging rpmsg/for-next (995f4465281a Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (6b5e97c02006 gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()) Merging gpio-intel/for-next (8400291e289e Linux 6.11-rc1) Merging pinctrl/for-next (b1ad05164eca Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (1652e95b17d5 pinctrl: intel: Constify struct intel_pinctrl parameter) Merging pinctrl-renesas/renesas-pinctrl (1325820dd085 pinctrl: renesas: rzg2l: Move pinconf_to_config_argument() call outside of switch cases) Merging pinctrl-samsung/for-next (39dbbd4e6778 pinctrl: samsung: Use kmemdup_array instead of kmemdup for multiple allocation) Merging pwm/pwm/for-next (f369c8d13279 dt-bindings: pwm: allwinner,sun4i-a10-pwm: add top-level constraints) Merging ktest/for-next (2351e8c65404 ktest.pl: Avoid false positives with grub2 skip regex) Merging kselftest/next (af1ec38c6ccc selftests/timers: Remove unused NSEC_PER_SEC macro) Merging kunit/test (8400291e289e Linux 6.11-rc1) Merging kunit-next/kunit (a4311c274e08 kunit: Fix kernel-doc for EXPORT_SYMBOL_IF_KUNIT) Merging livepatching/for-next (9fbf78b6d6ce Merge branch 'for-6.12/trivial' into for-next) Merging rtc/rtc-next (04dcadb87da6 rtc: stm32: add alarm A out feature) Merging nvdimm/libnvdimm-for-next (447b167bb60d nvdimm: Remove dead code for ENODEV checking in scan_labels()) Merging at24/at24/for-next (36e071d2a152 dt-bindings: eeprom: at24: Add compatible for Giantec GT24C04A) Merging ntb/ntb-next (92aee2f6d156 NTB: ntb_transport: fix all kernel-doc warnings) Merging seccomp/for-next/seccomp (de9c2c66ad8e Linux 6.11-rc2) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (8400291e289e Linux 6.11-rc1) Merging nvmem/for-next (8400291e289e Linux 6.11-rc1) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) Merging hyperv/hyperv-next (94e86b174d10 tools/hv: Add memory allocation check in hv_fcopy_start) Merging auxdisplay/for-next (8400291e289e Linux 6.11-rc1) Merging kgdb/kgdb/for-next (9bccbe7b2087 kdb: Get rid of redundant kdb_curr_task()) Merging hmm/hmm (6613476e225e Linux 6.8-rc1) Merging cfi/cfi/next (8400291e289e Linux 6.11-rc1) Merging mhi/mhi-next (84a5ae5b23ba bus: mhi: host: pci_generic: Enable EDL trigger for Foxconn modems) Merging memblock/for-next (cb088e38aab4 s390/mm: get estimated free pages by memblock api) CONFLICT (rename/delete): tools/testing/radix-tree/linux/init.h renamed to tools/testing/shared/linux/init.h in HEAD, but deleted in memblock/for-next. $ git rm -f tools/testing/shared/linux/init.h Merging cxl/next (a0328b397f33 cxl/core/pci: Move reading of control register to immediately before usage) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (d7171eb49435 efi/cper: Print correctable AER information) Merging unicode/for-next (156bb2c569cd unicode: Fix utf8_load() error path) Merging slab/slab/for-next (66dcd51a4503 Merge branch 'slab/for-6.12/kmem_cache_args' into slab/for-next) 0f389adb4b80 ("mm: Removed @freeptr_offset to prevent doc warning") c0390d541128 ("fs: pack struct file") d345bd2e9834 ("mm: add kmem_cache_create_rcu()") e446f18e98e8 ("mm: remove unused argument from create_cache()") ea566e18b4de ("fs: use kmem_cache_create_rcu()") CONFLICT (content): Merge conflict in fs/file_table.c CONFLICT (content): Merge conflict in include/linux/fs.h CONFLICT (content): Merge conflict in include/linux/slab.h CONFLICT (content): Merge conflict in kernel/rcu/tree.c CONFLICT (content): Merge conflict in mm/slab_common.c CONFLICT (content): Merge conflict in mm/slub.c $ git reset --hard HEAD^ Merging next-20240906 version of slab CONFLICT (content): Merge conflict in kernel/rcu/tree.c [master 8ca2f4288553] next-20240906/slab Merging random/master (e3d963e9823c powerpc/vdso: Wire up getrandom() vDSO implementation on VDSO64) CONFLICT (content): Merge conflict in tools/include/linux/linkage.h Merging landlock/next (ad1b27fc9877 Landlock: Document LANDLOCK_SCOPED_ABSTRACT_UNIX_SOCKET and ABI versioning) Merging rust/rust-next (93dc3be19450 docs: rust: include other expressions in conditional compilation section) CONFLICT (content): Merge conflict in rust/kernel/lib.rs Merging sysctl/sysctl-next (559d4c6a9d3b sysctl: avoid spurious permanent empty tables) Merging execve/for-next/execve (6da1cdef7907 Merge branch 'for-linus/execve' into for-next/execve) CONFLICT (content): Merge conflict in fs/binfmt_elf.c CONFLICT (content): Merge conflict in include/linux/mm.h Merging bitmap/bitmap-for-next (f7f33633ebe9 cpumask: Implement cpumask_{first,next}_{nor,andnot}) Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) Merging kspp/for-next/kspp (c00ac1f9fd7b Merge branches 'for-linus/hardening' and 'for-next/hardening' into for-next/kspp) Applying: fix up for "lib/string_choices: Add str_true_false()/str_false_true() helper' Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (248f6b935bbd Merge tag 'nolibc-20240824-for-6.12-1' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc into nolibc) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (3e6a7e3cda77 iommufd: Reorder struct forward declarations) CONFLICT (content): Merge conflict in drivers/iommu/iommufd/selftest.c Merging turbostat/next (1dd10efc87e8 tools/power turbostat: Fix trailing ' Merging pwrseq/pwrseq/for-next (8b7e0a6c443e Documentation: add a driver API doc for the power sequencing subsystem) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) Applying: fix up for "lib/string_choices: Add str_up_down() helper"
Attachment:
pgpl9boe6cGDt.pgp
Description: OpenPGP digital signature
