Hi all, Changes since 20240701: The mm-hotfixes tree still had its build failure for which I reverted a commit. The ipsec tree lost its build failure. The mm tree still had its build failure for which I applied a supplied patch. The qcom tree lost its build failure. The pci tree still had its build failure so I used the version from next-20240628. The hid tree lost its build failure. The bpf-next tree gained a conflict against the risc-v tree. The bluetooth tree gained a conflict against the net tree. The drm tree still had its build failures so I used the version from next-20240627 and reverted a commit. The tip tree gained a conflict against the pm tree. The leds-lj tree gained a conflict against the chrome-platform tree. The rpmsg tree lost its build failure. The random tree gained conflicts against the mm-stable, vfs-brauner and ftrace trees. Non-merge commits (relative to Linus' tree): 9054 9678 files changed, 740226 insertions(+), 172595 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 378 trees (counting Linus' and 106 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 (73e931504f8e Merge tag 'cxl-fixes-6.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (5f408bfe0d13 mm: gup: stop abusing try_grab_folio) Applying: Revert "mm: gup: stop abusing try_grab_folio" Merging vfs-brauner-fixes/vfs.fixes (9d66154f73b7 netfs: Fix netfs_page_mkwrite() to flush conflicting data, not wait) Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1) Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1) Merging btrfs-fixes/next-fixes (6ccd00e27729 Merge branch 'misc-6.10' into next-fixes) Merging vfs-fixes/fixes (bba1f6758a9e lirc: rc_dev_get_from_fd(): fix file leak) Merging erofs-fixes/fixes (9b32b063be10 erofs: ensure m_llen is reset to 0 if metadata is invalid) Merging nfsd-fixes/nfsd-fixes (ac03629b1612 Revert "nfsd: fix oops when reading pool_stats before server is started") Merging v9fs-fixes/fixes/next (1613e604df0c Linux 6.10-rc1) Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) Merging fs-current (82c419de3fb4 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git) Merging kbuild-current/fixes (a11aaf6d0bb4 kbuild: scripts/gdb: bring the "abspath" back) 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 (ecc54006f158 arm64: Clear the initial ID map correctly before remapping) Merging arm-soc-fixes/arm/fixes (07917ee08723 Merge tag 'v6.10-rockchip-dtsfixes1' of git://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 (1613e604df0c Linux 6.10-rc1) Merging sophgo-fixes/fixes (90f6cc7f8e07 riscv: dts: sophgo: disable write-protection for milkv duo) Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1) Merging powerpc-fixes/fixes (21a741eb75f8 powerpc/pseries: Fix scv instruction crash with kexec) Merging s390-fixes/fixes (cea5589e958f s390/boot: Do not adjust GOT entries for undef weak sym) Merging net/main (42391445a863 Merge tag 'for-net-2024-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth into main) Merging bpf/master (42391445a863 Merge tag 'for-net-2024-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth into main) Merging ipsec/master (2d5317753e5f xfrm: Export symbol xfrm_dev_state_delete.) Merging netfilter/main (7931d32955e0 netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers) Merging ipvs/main (7931d32955e0 netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers) Merging wireless/for-next (816c6bec09ed wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP) Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()) Merging rdma-fixes/for-rc (f2661062f16b Linux 6.10-rc5) Merging sound-current/for-linus (4b3e38107383 Merge tag 'asoc-fix-v6.10-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (2163aff6bebb firmware: cs_dsp: Prevent buffer overrun when processing V2 alg headers) Merging regmap-fixes/for-linus (76f19626bd35 regmap: add missing MODULE_DESCRIPTION() macros) Merging regulator-fixes/for-linus (f2661062f16b Linux 6.10-rc5) Merging spi-fixes/for-linus (1762dc01fc78 spi: davinci: Unset POWERDOWN bit when releasing resources) Merging pci-current/for-linus (419d57d429f6 CREDITS: Add Synopsys DesignWare eDMA driver for Gustavo Pimentel) Merging driver-core.current/driver-core-linus (6ba59ff42279 Linux 6.10-rc4) Merging tty.current/tty-linus (22a40d14b572 Linux 6.10-rc6) Merging usb.current/usb-linus (22a40d14b572 Linux 6.10-rc6) Merging usb-serial-fixes/usb-linus (4298e400dbdb USB: serial: option: add Telit generic core-dump composition) Merging phy/fixes (f2661062f16b Linux 6.10-rc5) Merging staging.current/staging-linus (22a40d14b572 Linux 6.10-rc6) Merging iio-fixes/fixes-togreg (74cb21576ea5 iio: trigger: Fix condition for own trigger) Merging counter-current/counter-current (22a40d14b572 Linux 6.10-rc6) Merging char-misc.current/char-misc-linus (22a40d14b572 Linux 6.10-rc6) Merging soundwire-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging thunderbolt-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging input-current/for-linus (7c7b1be19b22 Input: ads7846 - use spi_device_id table) Merging crypto-current/master (a5d8922ab2ae crypto: qat - fix linking errors when PCI_IOV is disabled) Merging vfio-fixes/for-linus (d71a989cf5d9 vfio/pci: Insert full vma on mmap'd MMIO fault) Merging kselftest-fixes/fixes (48236960c06d selftests/resctrl: Fix non-contiguous CBM for AMD) Merging dmaengine-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (b27d8946b5ed mtd: rawnand: rockchip: ensure NVDDR timings are rejected) Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) Merging v4l-dvb-fixes/fixes (fd404435d44b media: ivsc: Depend on IPU_BRIDGE or not IPU_BRIDGE) Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add missing MODULE_DESCRIPTION() macro) Merging mips-fixes/mips-fixes (0d5679a0aae2 mips: fix compat_sys_lseek syscall) Merging at91-fixes/at91-fixes (1613e604df0c Linux 6.10-rc1) Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb) Merging kvm-fixes/master (dee67a94d4c6 Merge tag 'kvm-x86-fixes-6.10-rcN' of https://github.com/kvm-x86/linux into HEAD) Merging kvms390-fixes/master (4c6abb7f7b34 KVM: s390: fix LPSWEY handling) Merging hwmon-fixes/hwmon (6ba59ff42279 Linux 6.10-rc4) Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) Merging cxl-fixes/fixes (a0f39d51dbf7 cxl: documentation: add missing files to cxl driver-api) Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y) Merging drivers-x86-fixes/fixes (7add1ee34692 platform/x86: add missing MODULE_DESCRIPTION() macros) Merging samsung-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-samsung-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging devicetree-fixes/dt/linus (e7985f43609c of: property: Fix fw_devlink handling of interrupt-map) Merging dt-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging scsi-fixes/fixes (ab2068a6fb84 scsi: libsas: Fix exp-attached device scan after probe failure scanned in again after probe failed) Merging drm-fixes/drm-fixes (22a40d14b572 Linux 6.10-rc6) Merging drm-intel-fixes/for-linux-next-fixes (f72383371e8c drm/i915/display: For MTL+ platforms skip mg dp programming) Merging mmc-fixes/fixes (ab069ce12596 mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro()) Merging rtc-fixes/rtc-fixes (1613e604df0c Linux 6.10-rc1) Merging gnss-fixes/gnss-linus (6ba59ff42279 Linux 6.10-rc4) Merging hyperv-fixes/hyperv-fixes (3b85a2eacd3d Documentation: hyperv: Add overview of Confidential Computing VM support) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (cc2c169e34b4 Merge patch "riscv: stacktrace: convert arch_stack_walk() to noinstr") Merging riscv-dt-fixes/riscv-dt-fixes (e21de658f8e8 MAINTAINERS: thead: update Maintainer) Merging riscv-soc-fixes/riscv-soc-fixes (1613e604df0c Linux 6.10-rc1) Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging spdx/spdx-linus (a3e18a540541 Merge tag 'xfs-6.10-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging gpio-brgl-fixes/gpio/for-current (22a40d14b572 Linux 6.10-rc6) Merging gpio-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging auxdisplay-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging kunit-fixes/kunit-fixes (1613e604df0c Linux 6.10-rc1) 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 (83a7eefedc9b Linux 6.10-rc3) Merging efi-fixes/urgent (46e27b9961d8 efi/arm64: Fix kmemleak false positive in arm64_efi_rt_init()) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) Merging battery-fixes/fixes (d3911f1639e6 power: supply: rt5033: Bring back i2c_set_clientdata) Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7) Merging rust-fixes/rust-fixes (a126eca84435 rust: avoid unused import warning in `rusttest`) Merging w1-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pmdomain-fixes/fixes (c3f38fa61af7 Linux 6.10-rc2) Merging i2c-host-fixes/i2c/i2c-host-fixes (22a40d14b572 Linux 6.10-rc6) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (2607133196c3 clk: sifive: Do not register clkdevs for PRCI clocks) Merging pwrseq-fixes/pwrseq/for-current (83a7eefedc9b Linux 6.10-rc3) Merging drm-misc-fixes/for-linux-next-fixes (704c1bef3aa4 drm: panel-orientation-quirks: Add labels for both Valve Steam Deck revisions) Merging mm-stable/mm-stable (37a658069afb selftests/damon/damon_nr_regions: test online-tuned max_nr_regions) Merging mm-nonmm-stable/mm-nonmm-stable (2a49c8b6b6d0 selftests/fpu: add missing MODULE_DESCRIPTION() macro) Merging mm/mm-everything (2c411ab262e6 foo) Applying: Revert "mm-gup-introduce-memfd_pin_folios-for-pinning-memfd-folios-fix" Applying: fs/procfs: fix integer to pointer cast warning in do_procmap_query() Merging kbuild/for-next (d9ddc122becc kconfig: remove E_LIST expression type) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (7afbf90ea2e2 perf pmu: Don't de-duplicate core PMUs) CONFLICT (content): Merge conflict in tools/perf/builtin-record.c Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL) Merging dma-mapping/for-next (82d71b53d7e7 Documentation/core-api: correct reference to SWIOTLB_DYNAMIC) Merging asm-generic/master (01b6ed5fcd5a syscalls: fix sys_fanotify_mark prototype) Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (b5e352609497 Merge branches 'clkdev', 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (2de29d1f8172 Merge branch 'for-next/vcpu-hotplug' into for-next/core) Merging arm-perf/for-next/perf (d0d7c66c537d perf: imx_perf: add support for i.MX95 platform) Merging arm-soc/for-next (bf35f851523a soc: document merges) Merging amlogic/for-next (338c92a5d195 Merge branch 'v6.11/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (73feb9cd46f1 ARM: dts: aspeed: System1: Updates to BMC board) Merging at91/at91-next (1cdb1c9626a4 Merge branch 'at91-defconfig' into at91-next) Merging broadcom/next (4caff16b6e00 Merge branch 'devicetree-arm64/next' into next) Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1) Merging drivers-memory/for-next (815cc7715ab1 dt-bindings: memory: fsl: replace maintainer) Merging imx-mxs/for-next (18fa4217da69 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (1613e604df0c Linux 6.10-rc1) Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next) Merging qcom/for-next (8f7e6bbf23c7 Merge branches 'arm32-for-6.11', 'arm64-defconfig-fixes-for-6.10', 'arm64-defconfig-for-6.11', 'arm64-fixes-for-6.10', 'arm64-for-6.11', 'clk-fixes-for-6.10', 'clk-for-6.11', 'drivers-fixes-for-6.10' and 'drivers-for-6.11' into for-next) Merging renesas/next (5c91aa40e630 Merge branches 'renesas-arm-defconfig-for-v6.11' and 'renesas-dts-for-v6.11' into renesas-next) Merging reset/reset/next (eb5d88b15388 reset: RESET_IMX8MP_AUDIOMIX should depend on ARCH_MXC) Merging rockchip/for-next (84a3d3b435e7 Merge branch 'v6.11-clk/next' into for-next) Merging samsung-krzk/for-next (b305fd6840d1 Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (eaaeef9e62f9 Merge tags 'scmi-updates-6.11', 'ffa-updates-6.11', 'vexpress-updates-6.11' and 'juno-updates-6.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging sophgo/for-next (1613e604df0c Linux 6.10-rc1) Merging stm32/stm32-next (45fad67e8307 arm64: dts: st: enable Ethernet2 on stm32mp257f-ev1 board) Merging sunxi/sunxi/for-next (0682fbf17dd9 Merge branches 'sunxi/clk-fixes-for-6.10', 'sunxi/drivers-for-6.11' and 'sunxi/dt-for-6.11' into sunxi/for-next) Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v6.11' into next) Merging tegra/for-next (5211d93c551f Merge branch for-6.11/arm64/defconfig into for-next) Merging ti/ti-next (0457310f1e9d Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (613af8986db8 Merge remote-tracking branch 'git/zynqmp/dt' into for-next) Merging clk/clk-next (28975d688935 Merge branch 'clk-fixes' into clk-next) Merging clk-imx/for-next (466da3d2d967 clk: imx: composite-7ulp: Use NULL instead of 0) Merging clk-renesas/renesas-clk (c7e58843d1e4 clk: renesas: r9a08g045: Add clock, reset and power domain support for I2C) 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 (8051b80fbeef LoongArch: Automatically disable KASLR for hibernation) Merging m68k/for-next (75d3891ca19e m68k: defconfig: Update defconfigs for v6.10-rc1) Merging m68knommu/for-next (22a40d14b572 Linux 6.10-rc6) Merging microblaze/next (1613e604df0c Linux 6.10-rc1) Merging mips/mips-next (04f38d1a4db0 mips: bmips: enable RAC on BMIPS4350) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) Merging parisc-hd/for-next (5f55e098b8d0 parisc: Add 64-bit gettimeofday() and clock_gettime() vDSO functions) Merging powerpc/next (17c743b9da9e selftests/sigaltstack: Fix ppc64 GCC build) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) Merging risc-v/for-next (60a6707f582e Merge patch series "riscv: Memory Hot(Un)Plug support") CONFLICT (content): Merge conflict in arch/riscv/kernel/patch.c Merging riscv-dt/riscv-dt-for-next (2904244a8c46 riscv: dts: starfive: add PCIe dts configuration for JH7110) Merging riscv-soc/riscv-soc-for-next (16b8597f1774 Merge branch 'riscv-cache-for-next' into riscv-soc-for-next) Merging s390/for-next (d43381018369 Merge branch 'features' into for-next) Merging sh/for-next (1613e604df0c Linux 6.10-rc1) Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask var) Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void) Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) Merging bcachefs/for-next (d6d793ae5589 bcachefs: Simplify btree key cache fill path) CONFLICT (content): Merge conflict in fs/bcachefs/super.c [fs-next 62bda85e3402] Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git 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 (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open) Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) Merging btrfs/for-next (80d54c4200e1 Merge branch 'for-next-next-v6.10-20240624' into for-next-20240624) CONFLICT (content): Merge conflict in fs/btrfs/qgroup.c CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c [fs-next 1c3d323ed216] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git Merging ceph/master (93a2221c9c1a doc: ceph: update userspace command to get CephFS metadata) Merging cifs/for-next (22a40d14b572 Linux 6.10-rc6) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging dlm/next (89b01913dc73 dlm: add rcu_barrier before destroy kmem cache) Merging erofs/dev (f2661062f16b Linux 6.10-rc5) Merging exfat/dev (0daa52fbc7ac exfat: fix potential deadlock on __exfat_get_dentry_set) Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8) Merging ext3/for_next (85f22bb5d2c2 Merge UDF consistency fixes.) Merging ext4/dev (8262fe9a902c ext4: make ext4_da_map_blocks() buffer_head unaware) Merging f2fs/dev (8cb1f4080dd9 f2fs: assign CURSEG_ALL_DATA_ATGC if blkaddr is valid) Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning) Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support) Merging gfs2/for-next (5a1906a476bc gfs2: Revert "check for no eligible quota changes") Merging jfs/jfs-next (d0fa70aca54c jfs: don't walk off the end of ealist) Merging ksmbd/ksmbd-for-next (6ba59ff42279 Linux 6.10-rc4) Merging nfs/linux-next (22a40d14b572 Linux 6.10-rc6) Merging nfs-anna/linux-next (e53a863bab58 nfs/blocklayout: SCSI layout trace points for reservation key reg/unreg) Merging nfsd/nfsd-next (b3984e398f08 MAINTAINERS: Add a bugzilla link for NFSD) Merging ntfs3/master (bde63e8eae5d fs/ntfs3: Fix formatting, change comments, renaming) Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access) Merging overlayfs/overlayfs-next (004b8d1491b4 ovl: fix encoding fid for lower only root) Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address access in jffs2_free_inode) Merging v9fs/9p-next (2211561723a6 9p: Enable multipage folios) Merging v9fs-ericvh/ericvh/for-next (1613e604df0c Linux 6.10-rc1) Merging xfs/for-next (673cd885bbbf xfs: honor init_xattrs in xfs_init_new_inode for !ATTR fs) Merging zonefs/for-next (df2f9708ff1f zonefs: enable support for large folios) 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 (6cbc40abcac6 Merge branch 'vfs.iomap' into vfs.all) CONFLICT (content): Merge conflict in fs/btrfs/inode.c [fs-next d6e1d7c0bd1d] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fs-next (d6e1d7c0bd1d Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) CONFLICT (content): Merge conflict in fs/nfs/internal.h Merging printk/for-next (07c2ab22a8da Merge branch 'for-6.11' into for-next) Merging pci/next (4548d07493dc Merge remote-tracking branch 'origin/controller/tegra194' into next) CONFLICT (content): Merge conflict in drivers/pci/pci.c $ git reset --hard HEAD^ Merging next-20240628 version of pci CONFLICT (content): Merge conflict in drivers/pci/pci.c [master 291f83a621c7] next-20240628/pci Merging pstore/for-next/pstore (9b3c13c9ea4e pstore: platform: add missing MODULE_DESCRIPTION() macro) Merging hid/for-next (07fbb3e88d22 Merge branch 'for-6.11/bpf' into for-next) Merging i2c/i2c/for-next (6367df381ba9 Merge branch 'i2c/for-current' into i2c/for-next) Merging i2c-host/i2c/i2c-host (04d6adabcdd5 dt-bindings: i2c: nxp,lpc1788-i2c: convert to dt schema) Merging i3c/i3c/next (67678602c4fc i3c: mipi-i3c-hci: Round IBI data chunk size to HW supported value) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) Merging hwmon-staging/hwmon-next (39b24cced70f hwmon: (adt7475) Fix default duty on fan is disabled) Merging jc_docs/docs-next (93dd11d0dd74 Merge branch 'docs-mw' into docs-next) Merging v4l-dvb/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK) Merging v4l-dvb-next/master (156922faabce media: atomisp: Switch to new Intel CPU model defines) Merging pm/linux-next (fc0897199e16 Merge branch 'pm-cpufreq-fixes' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (ce84b7beeb52 cpufreq: sti: add missing MODULE_DEVICE_TABLE entry for stih418) Merging cpupower/cpupower (cdaed24abf83 cpupower: Disable direct build of the 'bench' subproject) Merging devfreq/devfreq-next (1d143dde7679 PM / devfreq: exynos: Use Use devm_clk_get_enabled() helpers) Merging pmdomain/next (cc647e931a24 pmdomain: amlogic: add missing MODULE_DESCRIPTION() macros) Merging opp/opp/linux-next (e3943f00afdb OPP: Introduce an OF helper function to inform if required-opps is used) Merging thermal/thermal/linux-next (7eeb114a635a dt-bindings: thermal: convert hisilicon-thermal.txt to dt-schema) Merging rdma/for-next (589b844f1bf0 RDMA/mlx5: Send UAR page index as ioctl attribute) Merging net-next/main (74d6529b78f7 net: ethtool: Fix the panic caused by dev being null when dumping coalesce) CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h Merging bpf-next/for-next (03922e97bc30 selftests/bpf: Delete extra blank lines in test_sockmap) CONFLICT (content): Merge conflict in arch/riscv/net/bpf_jit_comp64.c Applying: HID: bpf: Fix up build Merging ipsec-next/master (f531d13bdfe3 xfrm: support sending NAT keepalives in ESP in UDP states) Merging mlx5-next/mlx5-next (b339e0a39dc3 RDMA/mlx5: Add Qcounters req_transport_retries_exceeded/req_rnr_retries_exceeded) Merging netfilter-next/main (f4ebd03496f6 netfilter: xt_recent: Lift restrictions on max hitcount value) Merging ipvs-next/main (f4ebd03496f6 netfilter: xt_recent: Lift restrictions on max hitcount value) Merging bluetooth/master (31cdab2ae178 dt-bindings: net: bluetooth: convert MT7622 Bluetooth to the json-schema) 1754e2144739 ("Bluetooth: hci_core: cancel all works upon hci_unregister_dev()") 1fc73da90b52 ("bluetooth/hci: disallow setting handle bigger than HCI_CONN_HANDLE_MAX") 39a92a55be13 ("bluetooth/l2cap: sync sock recv cb and release") 48bdb4085485 ("Bluetooth: hci_event: Fix setting of unicast qos interval") 4b5e8d5635bd ("Bluetooth: Add quirk to ignore reserved PHY bits in LE Extended Adv Report") 7274f7479942 ("Bluetooth: hci_bcm4377: Fix msgid release") 7bc60457138b ("Bluetooth: btintel_pcie: Fix REVERSE_INULL issue reported by coverity") 94a60402b1c1 ("Bluetooth: Ignore too large handle values in BIG") bafd12aba679 ("Bluetooth: btnxpuart: Enable Power Save feature on startup") c54bcd8a2f9c ("Bluetooth: ISO: Check socket flag instead of hcon") f305a9bafe14 ("Bluetooth: qca: Fix BT enable failure again for QCA6390 after warm reboot") CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c Merging wireless-next/for-next (8c62617295d3 wifi: mac80211: remove DEAUTH_NEED_MGD_TX_PREP) 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 (2538af030d6f mtd: cmdlinepart: Replace `dbg()` macro with `pr_debug()`) Merging nand/nand/next (7326d3fb1ee3 mtd: rawnand: lpx32xx: Request DMA channels using DT entries) Merging spi-nor/spi-nor/next (d35df77707bf mtd: spi-nor: winbond: fix w25q128 regression) Merging crypto/master (95c0f5c3b8bb hwrng: core - Fix wrong quality calculation at hw rng registration) Merging drm/drm-next (fb625bf6187d Merge tag 'drm-habanalabs-next-2024-06-23' of https://github.com/HabanaAI/drivers.accel.habanalabs.kernel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_idle.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c Applying: Revert "drm/omap: Allow build with COMPILE_TEST=y" $ git reset --hard HEAD^ Merging next-20240627 version of drm CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_idle.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c [master 2ee4c810e72d] next-20240627/drm Applying: Revert "drm/omap: Allow build with COMPILE_TEST=y" [master af5526287bec] next-20240627/drm Merging drm-exynos/for-linux-next (9347028bfcfc drm/exynos/vidi: convert to struct drm_edid) Merging drm-misc/for-linux-next (e31538489908 drm/tests: Add tests for the new Monochrome value of tv_mode) Merging amdgpu/drm-next (f340f2bad1c7 drm/amdgpu: rewrite convert_tiling_flags_to_modifier_gfx12) Merging drm-intel/for-linux-next (9fc97277eb2d drm/i915: Skip programming FIA link enable bits for MTL+) aaf9dc86bd80 ("drm/i915/display: For MTL+ platforms skip mg dp programming") Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (2c4c53f316f6 drm/msm/adreno: Introduce gmu_chipid for a740 & a750) Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane) Merging drm-xe/drm-xe-next (2d46ecc958c9 drm/xe/oa: Destroy the stream_lock mutex) Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active) Merging fbdev/for-next (7ee6cfe6d9cf fbdev: omap2: Return clk_prepare_enable to transfer the error) Merging regmap/for-next (438685f6714a Merge remote-tracking branch 'regmap/for-6.11' into regmap-next) Merging sound/for-next (5b707581c072 selftests/alsa:Fix printf format string in pcm-test.c) Merging ieee1394/for-next (502099acb8cb firewire: core: Fix spelling mistakes in tracepoint messages) Merging sound-asoc/for-next (9fa5527b19b2 Merge remote-tracking branch 'asoc/for-6.11' into asoc-next) Merging modules/modules-next (61842868de13 module: create weak dependecies) Merging input/next (7c459517252e Input: ili210x - use guard notation when disabling and reenabling IRQ) CONFLICT (content): Merge conflict in include/linux/interrupt.h Merging block/for-next (f759ab27f0c1 Merge branch 'for-6.11/io_uring' into for-next) CONFLICT (content): Merge conflict in fs/stat.c CONFLICT (content): Merge conflict in include/linux/fs.h Merging device-mapper/for-next (aaa53168cbcc dm: optimize flushes) Merging libata/for-next (f5a0205ad031 Merge remote-tracking branch 'libata/for-6.11' into HEAD) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) Merging mmc/next (f7e7e00f7b86 MAINTAINERS: drop entry for VIA SD/MMC controller) Merging mfd/for-mfd-next (33c0e553c8c3 dt-bindings: mfd: syscon: Add APM poweroff mailbox) Merging backlight/for-backlight-next (b337cc3ce475 backlight: lm3509_bl: Fix early returns in for_each_child_of_node()) Merging battery/for-next (b498ddb6f283 power: reset: piix4: add missing MODULE_DESCRIPTION() macro) Merging regulator/for-next (db576ed76232 Add USB VBUS regulator for RZ/G2L) Merging security/next (9ca51b3176e0 Automated merge of 'dev' into 'next') Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference) Merging integrity/next-integrity (fbf06cee6087 ima: fix wrong zero-assignment during securityfs dentry remove) Merging selinux/next (1613e604df0c Linux 6.10-rc1) Merging smack/next (e86cac0acdb1 smack: unix sockets: fix accept()ed socket label) Merging tomoyo/master (b96342141183 rtnetlink: print rtnl_mutex holder/waiter for debug purpose) Merging tpmdd/next (cf5ae3c7d48e tpm_tis_spi: add missing attpm20p SPI device ID entry) Merging watchdog/master (22a40d14b572 Linux 6.10-rc6) Merging iommu/next (cfb822815752 Merge branches 'fixes', 'allwinner/sun50i', 'qualcomm/msm', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) Merging audit/next (1613e604df0c Linux 6.10-rc1) Merging devicetree/for-next (bbf9b1ffa198 dt-bindings: interrupt-controller: convert fsl,ls-scfg-msi to yaml) Merging dt-krzk/for-next (828f810f69f3 Merge branch 'next/dt64' into for-next) Merging mailbox/for-next (10b98582bc76 dt-bindings: mailbox: qcom-ipcc: Document the SDX75 IPCC) Merging spi/for-next (5b6cad81d0c1 Merge remote-tracking branch 'spi/for-6.11' into spi-next) Merging tip/master (ec6574a634db Merge branch into tip/master: 'x86/vmware') CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h CONFLICT (content): Merge conflict in include/linux/cacheinfo.h Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const) Merging edac/edac-for-next (9a1c5fe0f0a8 Merge ras/edac-misc into for-next) Merging ftrace/for-next (5dfebf3c26dc Merge ring-buffer/for-next) CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h Merging rcu/next (a9e1661087f1 Merge branches 'doc.2024.06.06a', 'fixes.2024.06.18a', 'mb.2024.06.28a', 'nocb.2024.06.03a', 'rcu-tasks.2024.06.06a', 'rcutorture.2024.06.06a' and 'srcu.2024.06.18a' into HEAD) Merging paulmck/non-rcu/next (f5d5a3bc7a69 tools/memory-model: simple.txt: Fix stale reference to recipes-pairs.txt) Merging kvm/next (02b0d3b9d4dd Merge branch 'kvm-6.10-fixes' into HEAD) CONFLICT (content): Merge conflict in arch/x86/include/asm/sev-common.h Merging kvm-arm/next (62933f02c855 Merge branch kvm-arm64/docs into kvmarm/next) Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2) Merging kvm-ppc/topic/ppc-kvm (0b65365f3fa9 KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHPKEYR in sync) Merging kvm-riscv/riscv_kvm_next (e325618349cd RISC-V: KVM: Redirect AMO load/store access fault traps to guest) CONFLICT (content): Merge conflict in tools/perf/arch/riscv/util/Build Merging kvm-x86/next (771df9ffadb8 Merge branch 'static_calls') Merging xen-tip/linux-next (e51d31c454fb xen/manage: Constify struct shutdown_handler) Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next) Merging workqueues/for-next (03979a8f5adf Merge branch 'for-6.11' into for-next) Merging sched-ext/for-next (b651d7c39289 sched_ext: Swap argument positions in kcalloc() call to avoid compiler warning) Merging drivers-x86/for-next (4261031484d8 Merge branch 'pdx86/platform-drivers-x86-lenovo-c630' into review-ilpo) Merging chrome-platform/for-next (3664706e875f power: supply: cros_charge-control: don't load if Framework control is present) Merging chrome-platform-firmware/for-firmware-next (fc2c1d716d4a firmware: google: add missing MODULE_DESCRIPTION() macros) Merging hsi/for-next (f02cfe695047 HSI: ssi_protocol: Remove unused linux/gpio.h) Merging leds-lj/for-leds-next (940b27161afc Revert "leds: led-core: Fix refcount leak in of_led_get()") CONFLICT (content): Merge conflict in MAINTAINERS Merging ipmi/for-next (0627cef36145 ipmi: ssif_bmc: prevent integer overflow on 32bit systems) Merging driver-core/driver-core-next (6b521fc111a2 MAINTAINERS: add Rust device abstractions to DRIVER CORE) CONFLICT (content): Merge conflict in drivers/fsi/fsi-occ.c CONFLICT (content): Merge conflict in drivers/reset/reset-meson-audio-arb.c Applying: net: ethernet: rtsn: Fix up for remove() coversion to return void Applying: drm: Fix up STM LVDS driver for void remove() conversion Merging usb/usb-next (f7697db8b1b3 Merge 6.10-rc6 into usb-next) Merging thunderbolt/next (49056c95df44 thunderbolt: debugfs: Use FIELD_GET()) Merging usb-serial/usb-next (6ba59ff42279 Linux 6.10-rc4) Merging tty/tty-next (33827dc4ad89 Merge 6.10-rc6 into tty-next) Merging char-misc/char-misc-next (19ed3bb5587b Merge 6.10-rc6 into char-misc-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.yaml CONFLICT (content): Merge conflict in MAINTAINERS 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 (2e5657aa5966 hwtracing: use for_each_endpoint_of_node()) Merging fastrpc/for-next (47bf4198bf38 MAINTAINERS: CC dri-devel list on Qualcomm FastRPC patches) Merging fpga/for-next (3a0fa8e97d30 fpga: altera-fpga2sdram: remove unused struct 'prop_map') Merging icc/icc-next (3c6ffb017091 Merge branch 'icc-msm8953' into icc-next) Merging iio/togreg (3587914bf61d iio: adc: Add support for MediaTek MT6357/8/9 Auxiliary ADC) Merging phy-next/next (d7d2818b9383 phy: airoha: Add PCIe PHY driver for EN7581 SoC.) Merging soundwire/next (5a4c1f0207d8 soundwire: bus: simplify by using local slave->prop) Merging extcon/extcon-next (e508f2606c0b extcon: Add LC824206XA microUSB switch driver) Merging gnss/gnss-next (6ba59ff42279 Linux 6.10-rc4) Merging vfio/next (abe8103da3c5 vfio/pci: Fix typo in macro to declare accessors) Merging w1/for-next (26bf5fc86033 w1: Drop allocation error message) Merging spmi/spmi-next (1613e604df0c Linux 6.10-rc1) Merging staging/staging-next (d67f063101f5 Merge 6.10-rc6 into staging-next) Merging counter-next/counter-next (988609f2aaf1 counter: ti-eqep: Allow eQEP driver to be built for K3 devices) 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 (316d1225b112 dmaengine: fsl-dpaa2-qdma: add missing MODULE_DESCRIPTION() macro) Merging cgroup/for-next (147b4f64b42f Merge branch 'for-6.10-fixes' into for-next) Merging scsi/for-next (dbe36d249533 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (06b91c00db39 Merge patch series "mpi3mr: Host diag buffer support") Merging vhost/linux-next (c8fae27d141a virtio-pci: Check if is_avq is NULL) Merging rpmsg/for-next (54fb559c5467 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (7828b7bbbf20 gpio: add sloppy logic analyzer using polling) Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl/for-next (0cd9f140389b pinctrl: mlxbf3: Fix return value check for devm_platform_ioremap_resource) Merging pinctrl-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl-renesas/renesas-pinctrl (71062e52fc0a pinctrl: renesas: r8a779h0: Remove unneeded separators) Merging pinctrl-samsung/for-next (707807f4c112 pinctrl: samsung: Use scope based of_node_put() cleanups) Merging pwm/pwm/for-next (b8689bb9b901 pwm-stm32: Make use of parametrised register definitions) Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) Merging kselftest/next (15a783a493b0 selftests: Add information about TAP conformance in tests) Merging kunit/test (1613e604df0c Linux 6.10-rc1) Merging kunit-next/kunit (cf6219ee889f usercopy: Convert test_user_copy to KUnit test) Merging livepatching/for-next (046635d2eb61 Merge branch 'for-6.11' into for-next) Merging rtc/rtc-next (43696b3a9e46 rtc: isl1208: Update correct procedure for clearing alarm) Merging nvdimm/libnvdimm-for-next (b0d478e34dbf testing: nvdimm: Add MODULE_DESCRIPTION() macros) Merging at24/at24/for-next (1613e604df0c Linux 6.10-rc1) Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) Merging seccomp/for-next/seccomp (22cc0f3b4d0c selftests/seccomp: check that a zombie leader doesn't affect others) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (1613e604df0c Linux 6.10-rc1) Merging nvmem/for-next (65f09ab3b3ef Merge branches 'nvmem-fixes' and 'for-6.11' into nvmem-for-next) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator) Merging auxdisplay/for-next (2ccfe94bc3ac auxdisplay: ht16k33: Drop reference after LED registration) 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 (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (f08d4bdad612 bus: mhi: host: pci_generic: Use unique 'mhi_pci_dev_info' for product families) Merging memblock/for-next (94ff46de4a73 memblock: Move late alloc warning down to phys alloc) CONFLICT (content): Merge conflict in mm/memblock.c Merging cxl/next (1613e604df0c Linux 6.10-rc1) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (d68cc8abc357 x86/efistub: Call Apple set_os protocol on dual GPU Intel Macs) Merging unicode/for-next (68318904a775 unicode: add MODULE_DESCRIPTION() macros) Merging slab/slab/for-next (f10d55c75472 slab: delete useless RED_INACTIVE and RED_ACTIVE) CONFLICT (content): Merge conflict in lib/fortify_kunit.c Merging random/master (5036461514b4 x86: vdso: Wire up getrandom() vDSO implementation) CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in mm/rmap.c Merging landlock/next (591561c2b47b landlock: Use bit-fields for storing handled layer access masks) Merging rust/rust-next (1613e604df0c Linux 6.10-rc1) Merging sysctl/sysctl-next (acc154691fc7 sysctl: Warn on an empty procname element) Merging execve/for-next/execve (2a97388a807b ELF: fix kernel.randomize_va_space double read) Merging bitmap/bitmap-for-next (e0eeb938adb0 bitops: Add a comment explaining the double underscore macros) CONFLICT (content): Merge conflict in include/linux/cpumask.h Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) Merging kspp/for-next/kspp (350e853715b2 Merge branches 'for-linus/hardening' and 'for-next/hardening' into for-next/kspp) Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (1613e604df0c Linux 6.10-rc1) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (53e6b65693b6 iommufd/iova_bitmap: Remove iterator logic) Merging turbostat/next (c6bd6265bc18 tools/power turbostat: Group SMI counter with APERF and MPERF) Merging pwrseq/pwrseq/for-next (6140d185a43d PCI/pwrctl: Add a PCI power control driver for power sequenced devices) Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Attachment:
pgp46TT4ZWw0D.pgp
Description: OpenPGP digital signature
