Message-ID: <20240709192458.521ae796@canb.auug.org.au>
Date: Tue, 9 Jul 2024 19:24:58 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Linux Next Mailing List <linux-next@...r.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: Tree for Jul 9

Hi all,

Changes since 20240703:

The mm-hotfixes tree lost its build failure.

The mm tree gained a build failure for which I reverted a commit.

The loongarch tree gained conflicts against the asm-generic and perf
trees.

The vfs-brauner tree gained a conflict against the asm-generic tree.

The hid tree gained a conflict against the mm tree.

The drm tree lost one of its build failures but I am still reverting
a commit.

The battery tree gained a conflict against the leds-lj tree.

The devicetree tree gained a conflict against the kbuild tree.

The driver-core tree gained a semantic conflict against the vl4-dvb-next
tree.

The tty tree gained a conflict against the tty.current tree.

The scsi-mkp tree gained a conflict against Linus' tree.

The vhost tree gained a conflict against the net-next tree.

The random tree gained conflicts against the mm-stable tree.

The rust tree gained a conflict against the block tree.

The kspp tree gained a conflict against Linus' tree.

Non-merge commits (relative to Linus' tree): 10864
 11362 files changed, 819057 insertions(+), 207252 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 (4376e966ecb7 Merge tag 'perf-tools-fixes-for-v6.10-2024-07-08' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (bd2e263b4fe4 filemap: replace pte_offset_map() with pte_offset_map_nolock())
Applying: fixup for "mm: gup: stop abusing try_grab_folio"
Merging vfs-brauner-fixes/vfs.fixes (0570730c1630 hfsplus: fix uninit-value in copy_name)
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 (f04a05bcdad5 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 (0b175af8aace Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
Merging kbuild-current/fixes (22a40d14b572 Linux 6.10-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 (ecc54006f158 arm64: Clear the initial ID map correctly before remapping)
Merging arm-soc-fixes/arm/fixes (f3a6a54104b8 MAINTAINERS: Move myself from SPRD Maintainer to Reviewer)
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 (8b7f59de92ac selftests/powerpc: Fix build with USERCFLAGS set)
Merging s390-fixes/fixes (b3a58f3b90f5 s390/dasd: Fix invalid dereferencing of indirect CCW data pointer)
Merging net/main (83c36e7cfd74 docs: networking: devlink: capitalise length value)
Merging bpf/master (5f1d18de7918 selftests/bpf: Extend tcx tests to cover late tcx_entry release)
Merging ipsec/master (2d5317753e5f xfrm: Export symbol xfrm_dev_state_delete.)
Merging netfilter/main (9f6958ba2e90 netfilter: nf_tables: unconditionally flush pending work before notifier)
Merging ipvs/main (9f6958ba2e90 netfilter: nf_tables: unconditionally flush pending work before notifier)
Merging wireless/for-next (4130c67cd123 wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference)
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 (6db03b1929e2 ALSA: hda/realtek: Limit mic boost on VAIO PRO PX)
Merging sound-asoc-fixes/for-linus (680e126ec040 firmware: cs_dsp: Use strnlen() on name fields in V1 wmfw files)
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 (8221545c440b spi: omap2-mcspi: Revert multi mode support)
Merging pci-current/for-linus (1613e604df0c Linux 6.10-rc1)
Merging driver-core.current/driver-core-linus (6ba59ff42279 Linux 6.10-rc4)
Merging tty.current/tty-linus (2ac33975abda serial: qcom-geni: do not kill the machine on fifo underrun)
Merging usb.current/usb-linus (6d3c721e686e usb: gadget: configfs: Prevent OOB read/write in usb_string_copy())
Merging usb-serial-fixes/usb-linus (ae420771551b USB: serial: option: add Rolling RW350-GL variants)
Merging phy/fixes (f2661062f16b Linux 6.10-rc5)
Merging staging.current/staging-linus (22a40d14b572 Linux 6.10-rc6)
Merging iio-fixes/fixes-togreg (1d7cfde11d49 staging: iio: frequency: ad9834: Validate frequency parameter value)
Merging counter-current/counter-current (22a40d14b572 Linux 6.10-rc6)
Merging char-misc.current/char-misc-linus (389637d4fb5f mei: vsc: Fix spelling error)
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 (66cde337fa1b selftests/vDSO: remove duplicate compiler invocations from Makefile)
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 (8ad209fc6448 Merge tag 'kvm-s390-master-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/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 (e527a6127223 platform/x86: toshiba_acpi: Fix quickstart quirk handling)
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 (2cf6b7d15a28 of/irq: Disable "interrupt-map" parsing for PASEMI Nemo)
Merging dt-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1)
Merging scsi-fixes/fixes (7a6bbc2829d4 scsi: sd: Do not repeat the starting disk message)
Merging drm-fixes/drm-fixes (256abd8e550c Linux 6.10-rc7)
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 (c562ba719df5 riscv: kexec: Avoid deadlock in kexec crash path)
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 (256abd8e550c Linux 6.10-rc7)
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 (7b2450bb4027 perf dsos: When adding a dso into sorted dsos maintain the sort order)
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 (256abd8e550c Linux 6.10-rc7)
Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
Merging clk-fixes/clk-fixes (10f84de27bd0 Merge tag 'qcom-clk-fixes-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes)
Merging pwrseq-fixes/pwrseq/for-current (83a7eefedc9b Linux 6.10-rc3)
Merging drm-misc-fixes/for-linux-next-fixes (91f9f4a37124 drm/bridge: adv7511: Fix Intermittent EDID failures)
Merging mm-stable/mm-stable (44195d1eba82 docs: mm: add enable_soft_offline sysctl)
Merging mm-nonmm-stable/mm-nonmm-stable (0f3819e8c483 nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro)
Merging mm/mm-everything (df73b40cb739 foo)
CONFLICT (content): Merge conflict in mm/gup.c
Merging kbuild/for-next (cd843d58ee1d kbuild: deb-pkg: use default string when variable is unset or null)
Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list)
Merging perf/perf-tools-next (608c3b1e612a perf install: Don't propagate subdir to Documentation submake)
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 (f564176f4e4f riscv: convert to generic syscall table)
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 (8b288f7785c6 Merge branch 'for-next/misc' into for-next/core)
Merging arm-perf/for-next/perf (dc4c33f753ca perf: arm_pmuv3: Add support for Armv9.4 PMU instruction counter)
Merging arm-soc/for-next (bf40ba18e3a4 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 (ffa7b132ee5f Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (1613e604df0c Linux 6.10-rc1)
Merging mvebu/for-next (ffd0d7df6bdb 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 (6fd4da15c334 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 (c1267e1afae6 arm64: dts: renesas: rz-smarc: Replace fixed regulator for USB VBUS)
Merging rockchip/for-next (d02701b77967 Merge branch 'v6.11-armsoc/dts64' 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 (1eafc48af859 arm64: stm32: enable scmi regulator for stm32)
  1245911be805 ("ARM: multi_v7_defconfig: Add MCP23S08 pinctrl support")
  2599b1f071f4 ("ARM: dts: stm32: Document output pins for PWMs on stm32mp135f-dk")
  32bc9d195039 ("ARM: dts: stm32: Add ethernet support for DH STM32MP13xx DHCOR DHSBC board")
  3389697affa5 ("arm64: dts: st: add HPDMA nodes on stm32mp251")
  55dc557485c7 ("arm64: dts: st: add ethernet1 and ethernet2 support on stm32mp25")
  5d6c1cef82a0 ("arm64: dts: st: describe power supplies for stm32mp257f-ev1 board")
  9bcaeb10520a ("ARM: dts: stm32: add ethernet1 for STM32MP135F-DK board")
  a11b40677a34 ("regulator: Add STM32MP25 regulator bindings")
  a29ad03d8393 ("arm64: dts: st: add scmi regulators on stm32mp25")
  a43179fe3f09 ("arm64: dts: st: add eth2 pinctrl entries in stm32mp25-pinctrl.dtsi")
  a4a0254811cc ("ARM: dts: stm32: omit unused pinctrl groups from stm32mp13 dtb files")
  a80ce2d743fb ("ARM: dts: stm32: add ethernet1 and ethernet2 support on stm32mp13")
  ba3e48a76df3 ("ARM: dts: stm32: OP-TEE async notif interrupt for ST STM32MP15x boards")
  c62c13b4efe4 ("ARM: dts: stm32: add ethernet1/2 RMII pins for STM32MP13F-DK board")
  d41b45f29bc3 ("ARM: dts: stm32: order stm32mp13-pinctrl nodes")
  de2997982cf9 ("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 (b6332e83c241 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (41aa58501753 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (0e3575a61335 Merge branch 'clk-mediatek' 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 (58202cc8341a Merge branch 'loongarch-kvm' into loongarch-next)
CONFLICT (content): Merge conflict in arch/loongarch/include/uapi/asm/unistd.h
CONFLICT (content): Merge conflict in tools/perf/arch/loongarch/util/Build
Merging m68k/for-next (75d3891ca19e m68k: defconfig: Update defconfigs for v6.10-rc1)
Merging m68knommu/for-next (256abd8e550c Linux 6.10-rc7)
Merging microblaze/next (1613e604df0c Linux 6.10-rc1)
Merging mips/mips-next (6fe920b4fc18 MAINTAINERS: Mobileye: add OLB drivers and dt-bindings)
Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs)
Merging parisc-hd/for-next (2fd4e52e442c parisc: Use max() to calculate parisc_tlb_flush_threshold)
Merging powerpc/next (45547a0a93d8 powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC)
CONFLICT (content): Merge conflict in arch/powerpc/mm/nohash/Makefile
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 (c813ef3c5f6c MAINTAINERS: drop riscv list from cache controllers)
Merging s390/for-next (313a6dadfa35 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 (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 bcachefs/for-next (d6d793ae5589 bcachefs: Simplify btree key cache fill path)
CONFLICT (content): Merge conflict in fs/bcachefs/super.c
[fs-next 58ec8d3c6da9] 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 (256abd8e550c Linux 6.10-rc7)
Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
Merging btrfs/for-next (871a1174fd0c Merge branch 'for-next-next-v6.10-20240704' into for-next-20240704)
Merging ceph/master (93a2221c9c1a doc: ceph: update userspace command to get CephFS metadata)
Merging cifs/for-next (256abd8e550c Linux 6.10-rc7)
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 (2080ca1ed3e4 erofs: tidy up `struct z_erofs_bvec`)
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 (388a2a0640e1 f2fs: remove redundant sanity check in sanity_check_inode())
Merging fsverity/for-next (256abd8e550c Linux 6.10-rc7)
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 (e2e33caa5dc2 ksmbd: discard write access to the directory open)
Merging nfs/linux-next (22a40d14b572 Linux 6.10-rc6)
Merging nfs-anna/linux-next (b571cfcb9dca nfs: don't reuse partially completed requests in nfs_lock_and_join_requests)
Merging nfsd/nfsd-next (a3123341dc35 gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey)
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 (49cdc4e834e4 xfs: get rid of xfs_ag_resv_rmapbt_alloc)
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 (5f30e082ab8b Merge branch 'vfs.iomap' into vfs.all Signed-off-by: Christian Brauner <brauner@...nel.org>)
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
[fs-next 2528528feafc] 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 (2528528feafc Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git)
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 fs/nfs/internal.h
Merging printk/for-next (07c2ab22a8da Merge branch 'for-6.11' into for-next)
Merging pci/next (cc7fe8c237ed Merge branch 'controller/tegra194' into next)
CONFLICT (content): Merge conflict in drivers/pci/pci.c
Merging pstore/for-next/pstore (9b3c13c9ea4e pstore: platform: add missing MODULE_DESCRIPTION() macro)
Merging hid/for-next (3959f155ad59 Merge branch 'for-6.11/bpf' into for-next)
CONFLICT (content): Merge conflict in include/linux/hid_bpf.h
Merging i2c/i2c/for-next (35dc6101fd9c Merge branch 'i2c/for-current' into i2c/for-next)
Merging i2c-host/i2c/i2c-host (fd6acb0d21b8 i2c: mt7621: Add Airoha EN7581 i2c support)
Merging i3c/i3c/next (145ca7b61e95 i3c: dw: Add optional apb clock)
Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
Merging hwmon-staging/hwmon-next (4814241a5817 hwmon: (amc6821) Add support for pwm1_mode attribute)
Merging jc_docs/docs-next (60ca3e59cfc4 Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (156922faabce media: atomisp: Switch to new Intel CPU model defines)
Merging v4l-dvb-next/master (5d5f67b3b23f media: atomisp: Fix spelling mistakes in sh_css_sp.c)
Merging pm/linux-next (bdf722ad7d75 Merge branch 'thermal-fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (0f5a2b9e1722 cpufreq: mediatek: Use dev_err_probe in every error path in probe)
Merging cpupower/cpupower (3a5bb5066f4c cpupower: fix lib default installation path)
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 (af48f95492dc RDMA/core: Introduce "name_assign_type" for an IB device)
Merging net-next/main (e0ee68a8bef9 selftests: net: ksft: interrupt cleanly on KeyboardInterrupt)
Merging bpf-next/for-next (90dc946059b7 selftests/bpf: DENYLIST.aarch64: Remove fexit_sleep)
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 (ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-driver-fails-to-probe')
Merging ipvs-next/main (ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-driver-fails-to-probe')
Merging bluetooth/master (41473738be53 Bluetooth: btintel: Add support for Whale Peak2)
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
Merging wireless-next/for-next (b3603133d3b7 wifi: mac80211_hwsim: fix warning)
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 (5f713030117a mtd: rawnand: lpx32xx: Fix dma_request_chan() error checks)
Merging spi-nor/spi-nor/next (d35df77707bf mtd: spi-nor: winbond: fix w25q128 regression)
Merging crypto/master (8323c036789b crypto: starfive - Fix nent assignment in rsa dec)
Merging drm/drm-next (62a05f4ae9c1 Merge tag 'drm-msm-next-2024-07-04' of https://gitlab.freedesktop.org/drm/msm into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_migrate.c
Applying: Revert "drm/omap: Allow build with COMPILE_TEST=y"
Merging drm-exynos/for-linux-next (221009347844 drm/exynos/vidi: convert to struct drm_edid)
Merging drm-misc/for-linux-next (cb31c58e8c29 drm/fbdev-dma: Fix framebuffer mode for big endian devices)
Merging amdgpu/drm-next (ee98fb71baa8 drm/amdgpu: set CP_HQD_PQ_DOORBELL_CONTROL.DOORBELL_MODE to 1)
Merging drm-intel/for-linux-next (9fc97277eb2d drm/i915: Skip programming FIA link enable bits for MTL+)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (fe34394ecdad dt-bindings: display/msm: dsi-controller-main: Add SM7150)
Merging drm-msm-lumag/msm-next-lumag (399af57ccca2 dt-bindings: display/msm/gpu: fix the schema being not applied)
Merging drm-xe/drm-xe-next (caaf1f44a6a2 drm/xe: Drop trace_xe_hw_fence_free)
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 (3dc4236dc44d Merge remote-tracking branch 'regmap/for-6.11' into regmap-next)
Merging sound/for-next (fefbbdfb59d3 ALSA: seq: Add tempo base unit for MIDI2 Set Tempo messages)
Merging ieee1394/for-next (9f349e8e532d Revert "firewire: ohci: use common macro to interpret be32 data in le32 buffer")
Merging sound-asoc/for-next (e0665761fd01 Merge remote-tracking branch 'asoc/for-6.11' into asoc-next)
Merging modules/modules-next (61842868de13 module: create weak dependecies)
Merging input/next (5e91cef94426 Input: himax_hx83112b - add support for HX83100A)
CONFLICT (content): Merge conflict in include/linux/interrupt.h
Merging block/for-next (7f8851d381f7 Merge branch 'for-6.11/block' 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 (b67a93868e50 dm-crypt: support for per-sector NVMe metadata)
Merging libata/for-next (f97106b10d9a ata: ahci: Add debug print for external port)
Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros)
Merging mmc/next (c17aecf85800 mmc: dw_mmc-bluefield: Add support for eMMC HW reset)
Merging mfd/for-mfd-next (75c3d85083ff 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 (be6299c6e55e power: supply: sysfs: use power_supply_property_is_writeable())
CONFLICT (content): Merge conflict in include/linux/leds.h
Merging regulator/for-next (ef0b29e74496 regulator: dt-bindings: pca9450: Make interrupt optional)
Merging security/next (aa99fe0d3b77 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 (e123134b39dc selinux: Use 1UL for EBITMAP_BIT to match maps type)
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 (bb3bd6a6663c tpm_tis_spi: add missing attpm20p SPI device ID entry)
Merging watchdog/master (22a40d14b572 Linux 6.10-rc6)
Merging iommu/next (87b2e7792b68 Merge branches 'iommu/core', 'iommu/fwspec-ops-removal', 'iommu/pci/ats', 'iommu/iommufd/attach-handles', 'iommu/iommufd/paging-domain-alloc', 'iommu/allwinner/sun50i', 'iommu/amd/amd-vi', 'iommu/arm/smmu', 'iommu/intel/vt-d' and 'iommu/qualcomm/msm' into iommu/next)
  40929e8e5449 ("dt-bindings: PCI: generic: Add ats-supported property")
Merging audit/next (1613e604df0c Linux 6.10-rc1)
Merging devicetree/for-next (011e6a719ead dt-bindings: soc: fsl: Add fsl,ls1028a-reset for reset syscon node)
  0620bce64afa ("dt-bindings: riscv: cpus: add ref to interrupt-controller")
  877097a2fab0 ("dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML")
  c7ce06684bf5 ("dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema")
CONFLICT (content): Merge conflict in scripts/Makefile.lib
Merging dt-krzk/for-next (828f810f69f3 Merge branch 'next/dt64' into for-next)
Merging mailbox/for-next (256abd8e550c Linux 6.10-rc7)
Merging spi/for-next (ad02097d49dd Merge remote-tracking branch 'spi/for-6.11' into spi-next)
Merging tip/master (aa9d8caba6e4 Merge timers/core into tip/master)
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 (008addaf6139 clocksource/drivers/mips-gic-timer: Correct sched_clock width)
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 (02219caa92b5 Merge branches 'doc.2024.06.06a', 'fixes.2024.07.04a', '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 (8122d6e11bd8 Merge branches 'cmpxchg.2024.07.04a', 'kcsan.2024.06.06a', 'lkmm.2024.06.06a', 'nolibc.2024.06.30a' and 'torture.2024.05.30b' into HEAD)
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 (4012664073a0 Merge branch kvm-arm64/misc into kvmarm/next)
Merging kvms390/next (7816e58967d0 kvm: s390: Reject memory region operations for ucontrol VMs)
Merging kvm-ppc/topic/ppc-kvm (ca8dad041516 KVM: PPC: add missing MODULE_DESCRIPTION() macros)
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 (611ff1b1ae98 xen: privcmd: Fix possible access to a freed kirqfd instance)
Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next)
Merging workqueues/for-next (fb7e4b92f44e Merge branch 'for-6.11' into for-next)
Merging sched-ext/for-next (6fbd643318a1 sched_ext/scx_qmap: Add an example usage of DSQ iterator)
Merging drivers-x86/for-next (4bf1ea3fc914 platform/x86: asus-wmi: support the disable camera LED on F10 of Zenbook 2023)
Merging chrome-platform/for-next (4baf1cc54433 power: supply: cros_charge-control: Fix signedness bug in charge_behaviour_store())
CONFLICT (content): Merge conflict in MAINTAINERS
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()")
Merging ipmi/for-next (19a01155ddfe ipmi: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging driver-core/driver-core-next (997197b58bf6 devres: Correct code style for functions that return a pointer type)
  573a39d05053 ("drm/mediatek: Convert to platform remove callback returning void")
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
Applying: fix up for "platform: Make platform_driver::remove() return void"
Merging usb/usb-next (179264157bba usb: dwc3: core: Check all ports when set phy suspend)
Merging thunderbolt/next (49056c95df44 thunderbolt: debugfs: Use FIELD_GET())
Merging usb-serial/usb-next (df8c0b8a03e8 USB: serial: garmin_gps: use struct_size() to allocate pkt)
Merging tty/tty-next (17199dfccd4b Documentation: kernel-parameters: Add DEVNAME:0.0 format for serial ports)
CONFLICT (content): Merge conflict in drivers/tty/serial/imx.c
Merging char-misc/char-misc-next (1ebab783647a Merge tag 'mhi-for-v6.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi 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 (1613e604df0c Linux 6.10-rc1)
Merging fpga/for-next (3a0fa8e97d30 fpga: altera-fpga2sdram: remove unused struct 'prop_map')
Merging icc/icc-next (226e58b20975 Merge branch 'icc-rpmh-qos' into icc-next)
Merging iio/togreg (1ebab783647a Merge tag 'mhi-for-v6.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-next)
Merging phy-next/next (2a011c3c12e8 phy: airoha: Add dtime and Rx AEQ IO registers)
CONFLICT (content): Merge conflict in include/linux/soc/samsung/exynos-regs-pmu.h
Merging soundwire/next (518aee32c551 drivers:soundwire: qcom: cleanup port maask calculations)
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 (d3401cefd0f7 staging: nvec: Use x instead of x != NULL to improve readability.)
Merging counter-next/counter-next (7b47e79eac4c Merge tag 'ib-mfd-counter-v5.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/lee/mfd into counter-next)
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 (ecd36a3ae7ff Merge branch 'for-6.11' into for-next)
Merging scsi/for-next (dbe36d249533 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (6cd48c8f62ad Merge patch series "mpi3mr: Support PCI Error Recovery")
CONFLICT (content): Merge conflict in drivers/scsi/mpi3mr/mpi3mr_transport.c
Merging vhost/linux-next (fd115d1b9140 net: virtio: unify code to init stats)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging rpmsg/for-next (d87dbfd31796 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 (8060be2489f9 dt-bindings: gpio: vf610: Allow gpio-line-names to be set)
Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1)
Merging pinctrl/for-next (11eaac6e8e72 Merge tag 'renesas-pinctrl-for-v6.11-tag3' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel)
Merging pinctrl-intel/for-next (1613e604df0c Linux 6.10-rc1)
Merging pinctrl-renesas/renesas-pinctrl (2453e858e945 pinctrl: renesas: rzg2l: Support output enable on RZ/G2L)
Merging pinctrl-samsung/for-next (707807f4c112 pinctrl: samsung: Use scope based of_node_put() cleanups)
Merging pwm/pwm/for-next (120a528213b6 pwm: Allow pwm state transitions from an invalid state)
Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type)
Merging kselftest/next (483d0785e8bf selftests/timers: remove unused irqcount variable)
Merging kunit/test (1613e604df0c Linux 6.10-rc1)
Merging kunit-next/kunit (67c9971cd6d3 kunit/usercopy: Add missing MODULE_DESCRIPTION())
Merging livepatching/for-next (9871e6af43db Merge branch 'for-6.11/sysfs-patch-replace' into for-next)
Merging rtc/rtc-next (a47d377e22c4 rtc: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
Merging nvdimm/libnvdimm-for-next (b0d478e34dbf testing: nvdimm: Add MODULE_DESCRIPTION() macros)
Merging at24/at24/for-next (3a9ba4e32230 dt-bindings: eeprom: at24: Add compatible for ONSemi N24S64B)
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (f0c508faea64 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 (1613e604df0c Linux 6.10-rc1)
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 (65bc58c3dcad net: wwan: mhi: make default data link id configurable)
Merging memblock/for-next (9364a7e40d54 memblock tests: fix implicit declaration of function 'numa_valid_node')
CONFLICT (content): Merge conflict in mm/memblock.c
Merging cxl/next (86588139b843 Documentation: CXL Maturity Map)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (ebf5a79acf9a x86/efistub: Drop redundant clearing of BSS)
Merging unicode/for-next (68318904a775 unicode: add MODULE_DESCRIPTION() macros)
Merging slab/slab/for-next (fe4e761669ab Merge branch 'slab/for-6.11/buckets' into slab/for-next)
Merging random/master (594a5586f022 selftests/vDSO: add tests for vgetrandom)
  14cd1a877fc6 ("selftests/vDSO: fix clang build errors and warnings")
  7bb79ef48b9d ("selftests/vDSO: remove partially duplicated "all:" target in Makefile")
  868680ffba11 ("selftests/vDSO: remove duplicate compiler invocations from Makefile")
CONFLICT (content): Merge conflict in mm/rmap.c
CONFLICT (content): Merge conflict in tools/testing/selftests/mm/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/vDSO/Makefile
Merging landlock/next (395a02d04ed4 landlock: Use bit-fields for storing handled layer access masks)
Merging rust/rust-next (fc6e66f4696b rust: add abstraction for `struct page`)
CONFLICT (content): Merge conflict in rust/bindings/bindings_helper.h
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 (70570167588d Merge branch 'for-next/hardening' into for-next/kspp)
CONFLICT (content): Merge conflict in kernel/kallsyms.c
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 (eff04be3f4aa tools/power turbostat: Extend --add option with perf counters)
Merging pwrseq/pwrseq/for-next (50b040ef3732 PCI/pwrctl: only call of_platform_populate() if CONFIG_OF is enabled)
CONFLICT (add/add): Merge conflict in drivers/power/sequencing/core.c
Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
Applying: Revert "mul_u64_u64_div_u64: make it precise always"
Applying: Revert "mul_u64_u64_div_u64: basic sanity test"

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists