Hi all, Changes since 20240312: The sound-current tree gained a build failure for which I reverted a commit. The i2c-host tree lost its build failure. The crypto tree gained a semantic conflict against the mm tree. The hyperv tree lost its build failure. Non-merge commits (relative to Linus' tree): 10049 8955 files changed, 478251 insertions(+), 176756 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 372 trees (counting Linus' and 105 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 (65d287c7eb1d Merge tag 'asm-generic-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (ded79af42f11 scripts/gdb/symbols: fix invalid escape sequence warning) Merging kbuild-current/fixes (b401b621758e Linux 6.8-rc5) Merging arc-current/for-curr (861deac3b092 Linux 6.7-rc7) 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 (2c79bd34af13 arm64: prohibit probing on arch_kunwind_consume_entry()) Merging arm-soc-fixes/arm/fixes (1c7cfb6158f6 Merge tag 'riscv-firmware-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes) Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1) Merging drivers-memory-fixes/fixes (6613476e225e Linux 6.8-rc1) Merging sophgo-fixes/fixes (41bccc98fb79 Linux 6.8-rc2) Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1) Merging powerpc-fixes/fixes (380cb2f4df78 selftests/powerpc: Fix fpu_signal failures) Merging s390-fixes/fixes (5ef1dc40ffa6 s390/cio: fix invalid -EBUSY on ccw_device_start) Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) Merging net/main (84e95149bd34 nfp: flower: handle acti_netdevs allocation failure) Merging bpf/master (df4793505abd Merge tag 'net-6.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipsec/master (e3fb8e8ba72b net: dsa: microchip: make sure drive strength configuration is not lost by soft reset) Merging netfilter/main (84e95149bd34 nfp: flower: handle acti_netdevs allocation failure) Merging ipvs/main (767146637efc netfilter: nf_conntrack_h323: Add protection for bmp length out of range) Merging wireless/for-next (413dafc8170f wifi: mac80211: only call drv_sta_rc_update for uploaded stations) Merging wpan/master (b85ea95d0864 Linux 6.7-rc1) Merging rdma-fixes/for-rc (eb5c7465c324 RDMA/srpt: fix function pointer cast warnings) Merging sound-current/for-linus (ca6f3a15de14 ALSA: hda/tas2781: remove unnecessary runtime_pm calls) Merging sound-asoc-fixes/for-linus (ec9c6bbe3fd8 Merge remote-tracking branch 'asoc/for-6.8' into asoc-linus) Merging regmap-fixes/for-linus (2f0dbb24f78a regmap: kunit: Ensure that changed bytes are actually different) Merging regulator-fixes/for-linus (a1f9fa6fcbb3 Merge remote-tracking branch 'regulator/for-6.8' into regulator-linus) Merging spi-fixes/for-linus (bd7e6fe2078e Merge remote-tracking branch 'spi/for-6.8' into spi-linus) Merging pci-current/for-linus (6613476e225e Linux 6.8-rc1) Merging driver-core.current/driver-core-linus (b401b621758e Linux 6.8-rc5) Merging tty.current/tty-linus (3d9319c27ceb Revert "tty: serial: simplify qcom_geni_serial_send_chunk_fifo()") Merging usb.current/usb-linus (b234c70fefa7 xhci: Fix failure to detect ring expansion need.) Merging usb-serial-fixes/usb-linus (d206a76d7d27 Linux 6.8-rc6) Merging phy/fixes (47b412c1ea77 phy: qcom-qmp-combo: fix type-c switch registration) Merging staging.current/staging-linus (6613476e225e Linux 6.8-rc1) Merging iio-fixes/fixes-togreg (11dadb631007 iio: accel: adxl367: fix I2C FIFO data register) Merging counter-current/counter-current (c83ccdc9586b counter: fix privdata alignment) Merging char-misc.current/char-misc-linus (a0776c214d47 mei: gsc_proxy: match component when GSC is on different bus) Merging soundwire-fixes/fixes (6613476e225e Linux 6.8-rc1) Merging thunderbolt-fixes/fixes (e8f897f4afef Linux 6.8) Merging input-current/for-linus (fbf8d7174255 Input: synaptics-rmi4 - fix UAF of IRQ domain on driver removal) Merging crypto-current/master (c0afb6b88fbb crypto: rk3288 - Fix use after free in unprepare) Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart) Merging kselftest-fixes/fixes (b54761f6e977 kselftest/seccomp: Report each expectation we assert as a KTAP test) Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) Merging dmaengine-fixes/fixes (90d35da658da Linux 6.8-rc7) Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-rc1) Merging mtd-fixes/mtd/fixes (e6a30d0c48a1 mtd: rawnand: marvell: fix layouts) Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1) Merging v4l-dvb-fixes/fixes (346c84e281a9 media: pwm-ir-tx: Depend on CONFIG_HIGH_RES_TIMERS) Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets) Merging mips-fixes/mips-fixes (b401b621758e Linux 6.8-rc5) Merging at91-fixes/at91-fixes (6613476e225e Linux 6.8-rc1) Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb) Merging kvm-fixes/master (5abf6dceb066 SEV: disable SEV-ES DebugSwap by default) Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP) Merging hwmon-fixes/hwmon (d206a76d7d27 Linux 6.8-rc6) Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) Merging cxl-fixes/fixes (d206a76d7d27 Linux 6.8-rc6) Merging btrfs-fixes/next-fixes (5aaf38c4aef2 Merge branch 'misc-6.8' into next-fixes) Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak) Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages) Merging drivers-x86-fixes/fixes (0314cebb29be platform/x86/amd/pmf: Fix missing error code in amd_pmf_init_smart_pc()) Merging samsung-krzk-fixes/fixes (eab4f56d3e75 ARM: dts: exynos4212-tab3: add samsung,invert-vclk flag to fimd) Merging pinctrl-samsung-fixes/fixes (6613476e225e Linux 6.8-rc1) Merging devicetree-fixes/dt/linus (7cb50f6c9fba of: property: fw_devlink: Fix stupid bug in remote-endpoint parsing) Merging dt-krzk-fixes/fixes (6613476e225e Linux 6.8-rc1) Merging scsi-fixes/fixes (ee0017c3ed8a scsi: mpt3sas: Prevent sending diag_reset when the controller is ready) Merging drm-fixes/drm-fixes (b7cc4ff787a5 nouveau: lock the client object tree.) Merging drm-intel-fixes/for-linux-next-fixes (e8f897f4afef Linux 6.8) Merging mmc-fixes/fixes (4af59a8df5ea mmc: core: Fix switch on gp3 partition) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (54be6c6c5ae8 Linux 6.8-rc3) Merging hyperv-fixes/hyperv-fixes (aa707b615ce1 Drivers: hv: vmbus: make hv_bus const) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (a11dd49dcb93 riscv: Sparse-Memory/vmemmap out-of-bounds fix) Merging riscv-dt-fixes/riscv-dt-fixes (2672031b20f6 riscv: dts: Move BUILTIN_DTB_SOURCE to common Kconfig) Merging riscv-soc-fixes/riscv-soc-fixes (d206a76d7d27 Linux 6.8-rc6) Merging fpga-fixes/fixes (6613476e225e Linux 6.8-rc1) Merging spdx/spdx-linus (04b8076df253 Merge tag 'firewire-fixes-6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394) Merging gpio-brgl-fixes/gpio/for-current (90d35da658da Linux 6.8-rc7) Merging gpio-intel-fixes/fixes (6613476e225e Linux 6.8-rc1) Merging pinctrl-intel-fixes/fixes (6613476e225e Linux 6.8-rc1) Merging auxdisplay-fixes/fixes (6613476e225e Linux 6.8-rc1) Merging erofs-fixes/fixes (4127caee8961 erofs: apply proper VMA alignment for memory mapped files on THP) Merging kunit-fixes/kunit-fixes (829388b725f8 kunit: device: Unregister the kunit_bus on shutdown) Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging memblock-fixes/fixes (6a9531c3a880 memblock: fix crash when reserved memory is not added to memory) Merging nfsd-fixes/nfsd-fixes (5ea9a7c5fe41 nfsd: don't take fi_lock in nfsd_break_deleg_cb()) Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) Merging perf-current/perf-tools (fdd0ae72b34e perf tools headers: update the asm-generic/unaligned.h copy with the kernel sources) Merging efi-fixes/urgent (2ce507f57ba9 efivarfs: Drop 'duplicates' bool parameter on efivar_init()) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) Merging battery-fixes/fixes (2df70149e73e power: supply: bq27xxx-i2c: Do not free non existing IRQ) Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) Merging iommufd-fixes/for-rc (bb04d1335388 iommufd/selftest: Don't check map/unmap pairing with HUGE_PAGES) Merging rust-fixes/rust-fixes (b401b621758e Linux 6.8-rc5) Merging v9fs-fixes/fixes/next (6613476e225e Linux 6.8-rc1) Merging w1-fixes/fixes (6613476e225e Linux 6.8-rc1) Merging pmdomain-fixes/fixes (2a93c6cbd5a7 pmdomain: qcom: rpmhpd: Fix enabled_corner aggregation) Merging overlayfs-fixes/ovl-fixes (420332b94119 ovl: mark xwhiteouts directory with overlay.opaque='x') Merging i2c-host-fixes/i2c/i2c-host-fixes (1f78f0901011 i2c: aspeed: Fix the dummy irq expected print) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging drm-misc-fixes/for-linux-next-fixes (16e87fe23d4a nouveau/dmem: handle kcalloc() allocation failure) Applying: Revert "ALSA: usb-audio: Stop parsing channels bits when all channels are found." Merging mm-stable/mm-stable (84d147df1334 selftests/mm: skip the hugetlb-madvise tests on unmet hugepage requirements) CONFLICT (content): Merge conflict in include/linux/sched.h CONFLICT (content): Merge conflict in init/main.c Merging mm-nonmm-stable/mm-nonmm-stable (bea0a5869587 assoc_array: fix the return value in assoc_array_insert_mid_shortcut()) 022b973a3de9 ("smp: make __smp_processor_id() 0-argument macro") CONFLICT (content): Merge conflict in Documentation/process/changes.rst CONFLICT (content): Merge conflict in arch/riscv/include/asm/ftrace.h Merging mm/mm-everything (17e1c1342c89 Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (44929bfaceaa kbuild: remove GCC's default -Wpacked-bitfield-compat flag) CONFLICT (content): Merge conflict in arch/hexagon/Kconfig Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (0f66dfe7b91d perf annotate: Add comments in the data structures) Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL) Merging dma-mapping/for-next (5db52ce55f80 swiotlb: Reinstate page-alignment for mappings >= PAGE_SIZE) Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures) Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (5616fee8981b Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (f1bbc4e9cfa4 Revert "ARM64: Dynamically allocate cpumasks and increase supported CPUs to 512") CONFLICT (content): Merge conflict in rust/Makefile Merging arm-perf/for-next/perf (b037e40a6af2 docs: perf: Fix build warning of hisi-pcie-pmu.rst) Merging arm-soc/for-next (a04a7da3982e bus: ts-nbus: Improve error reporting) Merging amlogic/for-next (7092cfae086f Merge branch 'v6.9/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project) Merging at91/at91-next (6315946ad242 Merge branch 'at91-dt' into at91-next) Merging broadcom/next (bbfdba3d4757 Merge branch 'soc/next' into next) Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1) Merging drivers-memory/for-next (e46076906722 memory: stm32-fmc2-ebi: keep power domain on) Merging imx-mxs/for-next (edb0d16255f6 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (ba90af39ba57 arm64: dts: mediatek: mt8183-pico6: Fix wake-on-X event node names) Merging mvebu/for-next (6b6f1082cb46 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (69f4343fc41d Merge branch 'omap-for-v6.9/n8x0-fixes' into for-next) Merging qcom/for-next (d0e0a21a3cb9 Merge branches 'arm32-for-6.9', 'arm64-defconfig-for-6.9', 'arm64-fixes-for-6.8', 'arm64-for-6.9', 'clk-for-6.9' and 'drivers-for-6.9' into for-next) Merging renesas/next (01fdf7d6f150 Merge branch 'renesas-dt-bindings-for-v6.9' into renesas-next) Merging reset/reset/next (c721f189e89c reset: Instantiate reset GPIO controller for shared reset-gpios) Merging rockchip/for-next (24f3ec49401a Merge branch 'v6.9-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (fb1be31d4042 Merge branches 'fixes', 'next/clk', 'next/drivers', 'next/dt', 'next/dt64' and 'next/soc' into for-next) Merging scmi/for-linux-next (a2b8119375a1 Merge tags 'vexpress-update-6.9', 'ffa-update-6.9' and 'scmi-updates-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging sophgo/for-next (0f46e1339ef1 MAINTAINERS: Setup proper info for SOPHGO vendor support) Merging stm32/stm32-next (a7b9ab6c880d arm64: dts: st: add video encoder support to stm32mp255) Merging sunxi/sunxi/for-next (c1d7282e4e92 Merge branch 'sunxi/dt-for-6.9' into sunxi/for-next) Merging tee/next (90d35da658da Linux 6.8-rc7) Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/dt into for-next) Merging ti/ti-next (68818060efdb Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next) Merging clk/clk-next (a7f078ac3d97 Merge branch 'clk-cleanup' into clk-next) Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition) Merging clk-renesas/renesas-clk (81a7a88a9806 clk: renesas: r8a779h0: Add RPC-IF clock) 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 (4581c056ceda Merge branch 'loongarch-kvm' into loongarch-next) CONFLICT (content): Merge conflict in arch/loongarch/Makefile Merging m68k/for-next (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1) Merging m68knommu/for-next (b401b621758e Linux 6.8-rc5) Merging microblaze/next (6613476e225e Linux 6.8-rc1) Merging mips/mips-next (732932220078 mips: cm: Convert __mips_cm_phys_base() to weak function) Merging openrisc/for-next (7f1e2fc49348 openrisc: Use asm-generic's version of fix_to_virt() & virt_to_fix()) Merging parisc-hd/for-next (26dd48780bd2 parisc: led: Convert to platform remove callback returning void) Merging powerpc/next (9db2235326c4 powerpc/macio: Make remove callback of macio driver void returned) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) Merging risc-v/for-next (886516fae2b7 RISC-V: fix check for zvkb with tip-of-tree clang) CONFLICT (content): Merge conflict in arch/riscv/include/asm/bitops.h Merging riscv-dt/riscv-dt-for-next (28ecaaa5af19 riscv: dts: starfive: jh7110: Add camera subsystem nodes) Merging riscv-soc/riscv-soc-for-next (6613476e225e Linux 6.8-rc1) Merging s390/for-next (b51f4a982f5a Merge branch 'features' into for-next) Merging sh/for-next (0a2d3ce0031f sh: hd64461: Make setup_hd64461 static) Merging sparc/for-next (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console) Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory) Merging xtensa/xtensa-for-next (7ab7acb68adf xtensa: fix MAKE_PC_FROM_RA second argument) Merging bcachefs/for-next (243c934566b7 bcachefs: reconstruct_alloc cleanup) CONFLICT (content): Merge conflict in fs/bcachefs/super-io.c Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly) Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) Merging btrfs/for-next (a65b40c6858c Merge branch 'for-next-next-v6.8-20240305' into for-next-20240305) Merging ceph/master (321e3c3de53c libceph: init the cursor when preparing sparse read in msgr2) Merging cifs/for-next (3681fe1b0fee cifs: update internal module version number for cifs.ko) CONFLICT (content): Merge conflict in fs/smb/client/file.c Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix) Merging erofs/dev (a1bafc3109d7 erofs: support compressed inodes over fscache) Merging exfat/dev (3b668b889ddb exfat: remove duplicate update parent dir) Merging exportfs/exportfs-next (42c3732fa807 fs: Create a generic is_dot_dotdot() utility) Merging ext3/for_next (9d7d0eb685f1 Pull fanotify fix to allow freezing of tasks waiting for event response.) Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test) Merging f2fs/dev (e88f4647d82f f2fs: Cast expression type to unsigned long in __count_extent_cache()) CONFLICT (content): Merge conflict in fs/f2fs/super.c Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock) Merging fuse/for-next (cdf6ac2a03d2 fuse: get rid of ff->readdir.lock) CONFLICT (content): Merge conflict in fs/fuse/file.c CONFLICT (content): Merge conflict in fs/fuse/inode.c Merging gfs2/for-next (6f18f897e3ff gfs2: Remove unnecessary gfs2_meta_check_ii argument) Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin") Merging ksmbd/ksmbd-for-next (c8efcc786146 ksmbd: add support for durable handles v1/v2) Merging nfs/linux-next (0f2ca83f88d8 nfs: fix panic when nfs4_ff_layout_prepare_ds() fails) Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel) Merging nfsd/nfsd-next (9b350d3e349f NFSD: Clean up nfsd4_encode_replay()) CONFLICT (content): Merge conflict in fs/nfsd/nfs4layouts.c Merging ntfs3/master (622cd3daa8ea fs/ntfs3: Slightly simplify ntfs_inode_printk()) Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.) Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting) Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems) Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage) Merging v9fs-ericvh/ericvh/for-next (be57855f5050 fs/9p: fix dups even in uncached mode) Merging xfs/for-next (75bcffbb9e75 xfs: shrink failure needs to hold AGI buffer) CONFLICT (content): Merge conflict in fs/xfs/xfs_buf.c Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api) Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter()) Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) 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 (ec0bd2fb770c Merge branch 'vfs.uuid' into vfs.all) CONFLICT (content): Merge conflict in fs/bcachefs/super-io.c CONFLICT (content): Merge conflict in fs/coredump.c Applying: fixup for "filelock: split common fields into struct file_lock_core" Merging vfs/for-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat) Merging printk/for-next (e7081d5a9d97 Merge branch 'rework/console-flushing-fixes' into for-next) Merging pci/next (aabf7173cdfe Merge branch 'pci/controller/qcom') Merging pstore/for-next/pstore (c8d25d696f52 pstore/zone: Don't clear memory twice) Merging hid/for-next (f0cd2e82460c Merge branch 'for-6.9/amd-sfh' into for-next) Merging i2c/i2c/for-next (91962feb9502 Merge tag 'i2c-host-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow) Merging i2c-host/i2c/i2c-host (bb271301b804 i2c: nomadik: sort includes) Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const) Merging hwmon-staging/hwmon-next (8debe3c1295e hwmon: (dell-smm) Add XPS 9315 to fan control whitelist) Merging jc_docs/docs-next (0c8e9b538ed7 docs: verify/bisect: fixes, finetuning, and support for Arch) CONFLICT (content): Merge conflict in Documentation/index.rst Merging v4l-dvb/master (e0b8eb0f6d65 media: visl: Add codec specific variability on output frames) CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp_cmd.c Merging v4l-dvb-next/master (b14257abe705 media: rcar-isp: Disallow unbind of devices) Merging pm/linux-next (268314880cd4 Merge branch 'pm-tools' into linux-next) CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt Merging cpufreq-arm/cpufreq/arm/linux-next (ad2a91086e28 cpufreq: scmi: Set transition_delay_us) Merging cpupower/cpupower (a114d9f1f2cf Fix cpupower-frequency-info.1 man page typo) Merging devfreq/devfreq-next (68a8582befd4 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void) Merging pmdomain/next (ccabbb6768fc pmdomain: renesas: rcar-gen4-sysc: Reduce atomic delays) Merging opp/opp/linux-next (bde3127675ff dt-bindings: opp: drop maxItems from inner items) Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M) Merging dlm/next (d7e75b6385da dlm: fix off-by-one waiters refcount handling) Merging rdma/for-next (96d9cbe2f2ff RDMA/cm: add timeout to cm_destroy_id wait) Merging net-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) CONFLICT (content): Merge conflict in drivers/net/ipa/ipa_smp2p.c CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/mvm.h CONFLICT (content): Merge conflict in mm/vmalloc.c Merging bpf-next/for-next (5f20e6ab1f65 Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) Merging ipsec-next/master (aceb147b20a2 xfrm: Do not allocate stats in the driver) Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device) Merging netfilter-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs-next/main (a4634aa71fee bonding: rate-limit bonding driver inspect messages) Merging bluetooth/master (32652c5a24c9 Bluetooth: btintel: Add support to download intermediate loader) Merging wireless-next/for-next (c2b25092864a Merge branch 'qmc-hdlc') Merging wpan-next/master (b2d23256615c ieee802154: cfg802154: make wpan_phy_class constant) Merging wpan-staging/staging (b2d23256615c ieee802154: cfg802154: make wpan_phy_class constant) Merging mtd/mtd/next (77bf03252839 mtd: Remove support for Carillo Ranch driver) Merging nand/nand/next (aacc2b6a31f0 mtd: rawnand: Ensure continuous reads are well disabled) Merging spi-nor/spi-nor/next (6a9eda34418f mtd: spi-nor: core: set mtd->eraseregions for non-uniform erase map) Merging crypto/master (77292bb8ca69 crypto: scomp - remove memcpy if sg_nents is 1 and pages are lowmem) Applying: Revert "mm/zswap: remove the memcpy if acomp is not sleepable" Applying: Revert "crypto: introduce: acomp_is_async to expose if comp drivers might sleep" Merging drm/drm-next (119b225f01e4 Merge tag 'amd-drm-next-6.9-2024-03-08-1' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_hdcp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_bo.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_bo.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_exec_queue.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_exec_queue_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_trace.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c CONFLICT (content): Merge conflict in include/uapi/drm/xe_drm.h Merging drm-exynos/for-linux-next (f112b68f273f Merge v6.8-rc6 into drm-next) Merging drm-misc/for-linux-next (dea185b71bae drm/nouveau: fix kerneldoc warnings) Merging amdgpu/drm-next (5eabf0cd2673 drm/amd/display: Removed redundant @ symbol to fix kernel-doc warnings in -next repo) Merging drm-intel/for-linux-next (7a51a2aa2384 drm/i915/dp: Fix DSC state HW readout for SST connectors) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power_well.c Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (4be445f5b6b6 drm/msm/dpu: capture snapshot on the first commit_done timeout) Merging drm-msm-lumag/msm-next-lumag (4be445f5b6b6 drm/msm/dpu: capture snapshot on the first commit_done timeout) Merging drm-xe/drm-xe-next (8e61e3192a77 drm/xe/uapi: Add IP version and stepping to GT list query) Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values) Merging fbdev/for-next (72fee6b0a3a4 fbdev: Restrict FB_SH_MOBILE_LCDC to SuperH) Merging regmap/for-next (62861ddcb27e Merge remote-tracking branch 'regmap/for-6.9' into regmap-next) Merging sound/for-next (ca6f3a15de14 ALSA: hda/tas2781: remove unnecessary runtime_pm calls) Merging ieee1394/for-next (04f082d39b99 firewire: core: fix build failure due to the caller of fw_csr_string()) Merging sound-asoc/for-next (ec9c6bbe3fd8 Merge remote-tracking branch 'asoc/for-6.8' into asoc-linus) Merging modules/modules-next (d1909c022173 module: Don't ignore errors from set_memory_XX()) Merging input/next (2d77f70bb718 Input: imagis - add touch key support) Merging block/for-next (d5ba465eb78b Merge branch 'io_uring-6.9' into for-next) Merging device-mapper/for-next (771d940f4a86 Revert "dm: set the correct discard_sectors limit") Merging libata/for-next (c1bc6ed01c16 Merge remote-tracking branch 'libata/for-6.9' into HEAD) Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant) Merging mmc/next (faf3b8014c35 mmc: core: make mmc_host_class constant) CONFLICT (content): Merge conflict in drivers/mmc/core/queue.c Merging mfd/for-mfd-next (78334c343bef mfd: cs42l43: Fix wrong GPIO_FN_SEL and SPI_CLK_CONFIG1 defaults) Merging backlight/for-backlight-next (b49c1caca529 backlight: pandora_bl: Drop unneeded ENOMEM error message) Merging battery/for-next (4e61f1e9d58f power: supply: core: fix charge_behaviour formatting) Merging regulator/for-next (a1f9fa6fcbb3 Merge remote-tracking branch 'regulator/for-6.8' into regulator-linus) Merging security/next (8f49397828ee Automated merge of 'dev' into 'next') CONFLICT (content): Merge conflict in security/security.c Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile()) Merging integrity/next-integrity (85445b964290 integrity: eliminate unnecessary "Problem loading X.509 certificate" msg) Merging selinux/next (a1fc79343abb selinux: fix style issues in security/selinux/ss/symtab.c) Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer()) Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) Merging tpmdd/next (6fa6b796e037 tpm: tis_i2c: Add compatible string nuvoton,npct75x) Merging watchdog/master (6fe5aabf7fc6 watchdog: intel-mid_wdt: Get platform data via dev_get_platdata()) Merging iommu/next (f379a7e9c3b5 Merge branches 'arm/mediatek', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging audit/next (aa13b709084a audit: use KMEM_CACHE() instead of kmem_cache_create()) Merging devicetree/for-next (54c180e73ffa of: Move all FDT reserved-memory handling into of_reserved_mem.c) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/trivial-devices.yaml Merging dt-krzk/for-next (8c82b4eef297 ARM: dts: sti: minor whitespace cleanup around '=') Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU) Merging spi/for-next (bd7e6fe2078e Merge remote-tracking branch 'spi/for-6.8' into spi-linus) Merging tip/master (626856ae9705 Merge branch into tip/master: 'x86/boot') Merging clockevents/timers/drivers/next (c819dbd07832 dt-bindings: timer: Add support for cadence TTC PWM) Merging edac/edac-for-next (fc8235a79d73 Merge ras/edac-misc into for-next) Merging ftrace/for-next (a641f0533adb tracing: Decrement the snapshot if the snapshot trigger fails to register) Merging rcu/rcu/next (3add00be5fe5 Merge branches 'rcu-doc.2024.02.14a', 'rcu-nocb.2024.02.14a', 'rcu-exp.2024.02.14a', 'rcu-tasks.2024.02.26a' and 'rcu-misc.2024.02.14a' into rcu.2024.02.26a) Merging kvm/next (7d8942d8e738 Merge tag 'kvm-x86-guest_memfd_fixes-6.8' of https://github.com/kvm-x86/linux into HEAD) CONFLICT (content): Merge conflict in arch/loongarch/Kconfig Merging kvm-arm/next (4a09ddb8333a Merge branch kvm-arm64/kerneldoc into kvmarm/next) CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_arm.h CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c Applying: fix up for "arm64/sysreg: Add register fields for ID_AA64DFR1_EL1" Merging kvms390/next (00de073e2420 KVM: s390: selftest: memop: Fix undefined behavior) Merging kvm-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2) Merging kvm-riscv/riscv_kvm_next (d8c0831348e7 KVM: riscv: selftests: Add Zacas extension to get-reg-list test) CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/Makefile Merging kvm-x86/next (964d0c614c7f Merge branch 'hyperv') CONFLICT (content): Merge conflict in arch/x86/kvm/svm/sev.c CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/include/kvm_util_base.h Merging xen-tip/linux-next (fa765c4b4aed xen/events: close evtchn after mapping cleanup) Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next) Merging workqueues/for-next (b111131e3ec7 Merge branch 'for-6.9' into for-next) Merging drivers-x86/for-next (16f8091b4917 platform/x86/intel/pmc: Improve PKGC residency counters debug) Merging chrome-platform/for-next (6613476e225e Linux 6.8-rc1) Merging chrome-platform-firmware/for-firmware-next (8a0a62941a04 firmware: coreboot: Replace tag with id table in driver struct) Merging hsi/for-next (3693760295e8 HSI: ssi_protocol: fix struct members kernel-doc warnings) Merging leds-lj/for-leds-next (45066c4bbe8c leds: ncp5623: Add MS suffix to time defines) Merging ipmi/for-next (296455ade1fd Merge tag 'char-misc-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) Merging driver-core/driver-core-next (6aeb8850e0f3 device: core: Log warning for devices pending deferred probe on timeout) Merging usb/usb-next (d99e42ce6b83 Merge tag 'usb-serial-6.9-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml Merging thunderbolt/next (b8a730836c6b thunderbolt: Constify the struct device_type usage) Merging usb-serial/usb-next (b1a8da9ff139 USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M) Merging tty/tty-next (d6c0d892b44c dt-bindings: serial: stm32: add power-domains property) Merging char-misc/char-misc-next (367b3560e10b binder: remove redundant variable page_addr) Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage) Merging coresight/next (a4f3057d19ff coresight-tpda: Change qcom,dsb-element-size to qcom,dsb-elem-bits) Merging fastrpc/for-next (6613476e225e Linux 6.8-rc1) Merging fpga/for-next (b1a91ca25f15 fpga: remove redundant checks for bridge ops) Merging icc/icc-next (d1c16491134c Merge branch 'icc-sm7150' into icc-next) Merging iio/togreg (f9d49338744b Merge branch 'togreg-cleanup' into togreg) Merging phy-next/next (00ca8a15dafa phy: constify of_phandle_args in xlate) CONFLICT (content): Merge conflict in drivers/phy/qualcomm/phy-qcom-qmp-usb.c Merging soundwire/next (e17aae16acf5 soundwire: Use snd_soc_substream_to_rtd() to obtain rtd) Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h) Merging gnss/gnss-next (54be6c6c5ae8 Linux 6.8-rc3) Merging vfio/next (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger) CONFLICT (content): Merge conflict in MAINTAINERS Merging w1/for-next (d97d263132a6 w1: w1-gpio: Convert to platform remove callback returning void) Merging spmi/spmi-next (b85ea95d0864 Linux 6.7-rc1) Merging staging/staging-next (68bb540b1aef staging: greybus: Replaces directive __attribute__((packed)) by __packed as suggested by checkpatch) Merging counter-next/counter-next (d5b71a36a6af MAINTAINERS: Update email addresses for William Breathitt Gray) Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (716141d366f4 dmaengine: of: constify of_phandle_args in of_dma_find_controller()) Merging cgroup/for-next (13eb1d6e1cfc Merge branch 'for-6.8-fixes' into for-next) Merging scsi/for-next (7b020ab8a009 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (52d8210ea45d Merge patch series "Update lpfc to revision 14.4.0.1") Merging vhost/linux-next (ac20046227aa virtio-net: add cond_resched() to the command waiting loop) Merging rpmsg/for-next (929654e8f1ad Merge branches 'rpmsg-next' and 'rproc-next' into for-next) CONFLICT (content): Merge conflict in drivers/remoteproc/imx_dsp_rproc.c Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (8636f19c2d1f gpio: sysfs: repair export returning -EPERM on 1st attempt) CONFLICT (content): Merge conflict in Documentation/userspace-api/index.rst Merging gpio-intel/for-next (6613476e225e Linux 6.8-rc1) Merging pinctrl/for-next (34675dc3a7c6 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (6613476e225e Linux 6.8-rc1) Merging pinctrl-renesas/renesas-pinctrl (a6f06b909fee pinctrl: renesas: Allow the compiler to optimize away sh_pfc_pm) Merging pinctrl-samsung/for-next (6613476e225e Linux 6.8-rc1) Merging pwm/pwm/for-next (dd6c6d57ab61 pwm: imx-tpm: fix probe crash due to access registers without clock) Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie) Merging kselftest/next (5d94da7ff00e kselftest: Add basic test for probing the rust sample modules) Merging kunit/test (6613476e225e Linux 6.8-rc1) Merging kunit-next/kunit (806cb2270237 kunit: Annotate _MSG assertion variants with gnu printf specifiers) Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next) Merging rtc/rtc-next (f0109900462d dt-bindings: rtc: zynqmp: Add support for Versal/Versal NET SoCs) Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage) Merging at24/at24/for-next (6613476e225e Linux 6.8-rc1) Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) Merging seccomp/for-next/seccomp (56af94aace8a samples: user-trap: fix strict-aliasing warning) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (6613476e225e Linux 6.8-rc1) Merging nvmem/for-next (6613476e225e Linux 6.8-rc1) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) Merging hyperv/hyperv-next (2a07badb654a hv: vmbus: Convert to platform remove callback returning void) Merging auxdisplay/for-next (5d9e12972259 auxdisplay: img-ascii-lcd: Convert to platform remove callback returning void) Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local()) Merging hmm/hmm (6613476e225e Linux 6.8-rc1) Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (2ec11b5d6d90 bus: mhi: host: pci_generic: constify modem_telit_fn980_hw_v1_config) Merging memblock/for-next (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability) Merging cxl/next (73bf93edeeea cxl/core: use sysfs_emit() for attr's _show()) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (021bc4b9d7ed virt: efi_secret: Convert to platform remove callback returning void) Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static) Merging slab/slab/for-next (78e2606d5f55 Merge branch 'slab/for-6.9/slab-flag-cleanups' into slab/for-next) Merging random/master (1f719a2f3fa6 Merge tag 'net-6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging landlock/next (a17c60e533f5 samples/landlock: Don't error out if a file path cannot be opened) Merging rust/rust-next (768409cff6cc rust: upgrade to Rust 1.76.0) Merging sysctl/sysctl-next (4f1136a55dc8 scripts: check-sysctl-docs: handle per-namespace sysctls) Merging execve/for-next/execve (725d50261285 exec: Simplify remove_arg_zero() error path) Merging bitmap/bitmap-for-next (fd8ed16c2419 bitmap: Step down as a reviewer) Merging hte/for-next (b85ea95d0864 Linux 6.7-rc1) Merging kspp/for-next/kspp (6c069c8d3cfc overflow: Change DEFINE_FLEX to take __counted_by member) CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_lib.c CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_xsk.c CONFLICT (content): Merge conflict in lib/Makefile CONFLICT (content): Merge conflict in scripts/Makefile.lib Applying: fix up for "overflow: Change DEFINE_FLEX to take __counted_by member" Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (6613476e225e Linux 6.8-rc1) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (6613476e225e Linux 6.8-rc1) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Attachment:
pgpShCb2RFGpu.pgp
Description: OpenPGP digital signature
