Hi all, Changes since 20231211: The amdgpu tree gained a conflict against the jc_docs tree. And a build failure for which I applied a patch. The nvmem tree gained a build failure for which I applied a patch. The percpu tree gained a build failure for which I applied a patch. Non-merge commits (relative to Linus' tree): 6220 6512 files changed, 287891 insertions(+), 184122 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 370 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 (a39b6ac3781d Linux 6.7-rc5) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (65b297fcd8de mm/mglru: reclaim offlined memcgs harder) Merging kbuild-current/fixes (98b1cc82c4af Linux 6.7-rc2) Merging arc-current/for-curr (0bb80ecc33a8 Linux 6.6-rc1) Merging arm-current/fixes (f54e8634d136 ARM: 9330/1: davinci: also select PINCTRL) Merging arm64-fixes/for-next/fixes (f5259997f3e8 arm64: Avoid enabling KPTI unnecessarily) Merging arm-soc-fixes/arm/fixes (fd1e5745f87a Merge tag 'v6.7-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes) Merging davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-rc1) Merging drivers-memory-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) Merging m68k-current/for-linus (03191fb3db3d m68k: lib: Include <linux/libgcc.h> for __muldi3()) Merging powerpc-fixes/fixes (4b3338aaa74d powerpc/ftrace: Fix stack teardown in ftrace_no_trace) Merging s390-fixes/fixes (b1a6a1a77f06 s390/scm: fix virtual vs physical address confusion) Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) 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 (e307b5a845c5 octeontx2-af: Fix pause frame configuration) Merging bpf/master (e307b5a845c5 octeontx2-af: Fix pause frame configuration) Merging ipsec/master (76df934c6d5f MAINTAINERS: Add netdev subsystem profile link) Merging netfilter/main (1ae4cd3cbdd0 Merge branch 'bnxt_en-misc-fixes') Merging ipvs/main (54d4434da824 Merge branch 'hv_netvsc-fix-race-of-netvsc-vf-register-and-slave-bit') Merging wireless/for-next (91fdb30ddfdb net: libwx: fix memory leak on msix entry) Merging wpan/master (2d1c882d4434 Merge tag 'mlx5-fixes-2023-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) Merging rdma-fixes/for-rc (a39b6ac3781d Linux 6.7-rc5) Merging sound-current/for-linus (33071422714a ALSA: hda/tas2781: handle missing EFI calibration data) Merging sound-asoc-fixes/for-linus (dc96528b176f ASoC: cs42l43: Don't enable bias sense during type detect) Merging regmap-fixes/for-linus (fea88064445a regmap: fix bogus error on regcache_sync success) Merging regulator-fixes/for-linus (b85ea95d0864 Linux 6.7-rc1) Merging spi-fixes/for-linus (e9b220aeacf1 spi: spi-imx: correctly configure burst length when using dma) Merging pci-current/for-linus (7ff2b7a1821b PCI/ASPM: Add pci_disable_link_state_locked() lockdep assert) Merging driver-core.current/driver-core-linus (2cc14f52aeb7 Linux 6.7-rc3) Merging tty.current/tty-linus (a39b6ac3781d Linux 6.7-rc5) Merging usb.current/usb-linus (a39b6ac3781d Linux 6.7-rc5) Merging usb-serial-fixes/usb-linus (2cc14f52aeb7 Linux 6.7-rc3) Merging phy/fixes (2a9c713825b3 phy: sunplus: return negative error code in sp_usb_phy_probe) Merging staging.current/staging-linus (98b1cc82c4af Linux 6.7-rc2) Merging iio-fixes/fixes-togreg (408d4b33c244 iio: adc: MCP3564: fix hardware identification logic) Merging counter-current/counter-current (a39b6ac3781d Linux 6.7-rc5) Merging char-misc.current/char-misc-linus (a39b6ac3781d Linux 6.7-rc5) Merging soundwire-fixes/fixes (393cae5f32d6 soundwire: intel_ace2x: fix AC timing setting for ACE2.x) Merging thunderbolt-fixes/fixes (f0b94c1c5c79 thunderbolt: Fix minimum allocated USB 3.x and PCIe bandwidth) Merging input-current/for-linus (59b6a747e2d3 Input: ipaq-micro-keys - add error handling for devm_kmemdup) Merging crypto-current/master (9aedd10fe384 crypto: ahash - Set using_shash for cloned ahash wrapper over shash) Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart) Merging kselftest-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) Merging dmaengine-fixes/fixes (4ee632c82d2d dmaengine: fsl-edma: fix DMA channel leak in eDMAv4) Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) Merging mtd-fixes/mtd/fixes (7c1b1906229d mtd: spinand: gigadevice: Fix the get ecc status issue) Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) Merging v4l-dvb-fixes/fixes (32138be394e5 Merge tag 'media-renesas-fixes-20231113' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git) Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets) Merging mips-fixes/mips-fixes (a39b6ac3781d Linux 6.7-rc5) Merging at91-fixes/at91-fixes (b85ea95d0864 Linux 6.7-rc1) Merging omap-fixes/fixes (c72b9c33ef96 ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init) Merging kvm-fixes/master (4cdf351d3630 KVM: SVM: Update EFER software model on CR0 trap for SEV-ES) Merging kvms390-fixes/master (27072b8e18a7 KVM: s390/mm: Properly reset no-dat) Merging hwmon-fixes/hwmon (a39b6ac3781d Linux 6.7-rc5) Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) Merging cxl-fixes/fixes (8f61d48c83f6 tools/testing/cxl: Slow down the mock firmware transfer) Merging btrfs-fixes/next-fixes (cdec1b57f10a Merge branch 'misc-6.7' into next-fixes) Merging vfs-fixes/fixes (dc32464a5fe4 ceph_wait_on_conflict_unlink(): grab reference before dropping ->d_lock) 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 (7bcd032370f8 platform/x86: intel_ips: fix kernel-doc formatting) Merging samsung-krzk-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging pinctrl-samsung-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging devicetree-fixes/dt/linus (136c6531ba12 dt-bindings: display: adi,adv75xx: Document #sound-dai-cells) Merging dt-krzk-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging scsi-fixes/fixes (235f2b548d7f scsi: be2iscsi: Fix a memleak in beiscsi_init_wrb_handle()) Merging drm-fixes/drm-fixes (b7b5a56acec8 Merge tag 'exynos-drm-next-for-v6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (e6861d8264cd drm/i915/edp: don't write to DP_LINK_BW_SET when using rate select) Merging mmc-fixes/fixes (1036f69e2513 mmc: core: Cancel delayed work before releasing host) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (98b1cc82c4af Linux 6.7-rc2) Merging hyperv-fixes/hyperv-fixes (564eac2860bd hv_utils: Allow implicit ICTIMESYNCFLAG_SYNC) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (eb46a0076501 riscv: Check if the code to patch lies in the exit section) Merging riscv-dt-fixes/riscv-dt-fixes (79997eda0d31 riscv: dts: microchip: move timebase-frequency to mpfs.dtsi) Merging riscv-soc-fixes/riscv-soc-fixes (b85ea95d0864 Linux 6.7-rc1) Merging fpga-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging spdx/spdx-linus (a39b6ac3781d Linux 6.7-rc5) Merging gpio-brgl-fixes/gpio/for-current (95dd1e34ff5b gpiolib: sysfs: Fix error handling on failed export) Merging gpio-intel-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging pinctrl-intel-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging erofs-fixes/fixes (62b241efff99 MAINTAINERS: erofs: add EROFS webpage) Merging kunit-fixes/kunit-fixes (1bddcf77ce66 kunit: test: Avoid cast warning when adding kfree() as an action) Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging memblock-fixes/fixes (55122e0130e5 memblock tests: fix warning ‘struct seq_file’ declared inside parameter list) Merging nfsd-fixes/nfsd-fixes (bf51c52a1f3c NFSD: Fix checksum mismatches in the duplicate reply cache) Merging irqchip-fixes/irq/irqchip-fixes (b673fe1a6229 MAINTAINERS: Remove myself from the general IRQ subsystem maintenance) Merging renesas-fixes/fixes (9eab43facdad soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM) Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging perf-current/perf-tools (b16937474874 perf list: Fix JSON segfault by setting the used skip_duplicate_pmus callback) Merging efi-fixes/urgent (271f2a4a9576 efi/loongarch: Use load address to calculate kernel entry address) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) Merging battery-fixes/fixes (f37669119423 power: supply: cw2015: correct time_to_empty units in sysfs) Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) Merging iommufd-fixes/for-rc (6f9c4d8c468c iommufd: Do not UAF during iommufd_put_object()) Merging rust-fixes/rust-fixes (cfd96726e611 rust: docs: fix logo replacement) Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5) Merging w1-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging pmdomain-fixes/fixes (0cb19e50a911 pmdomain: arm: Avoid polling for scmi_perf_domain) Merging overlayfs-fixes/ovl-fixes (37f32f526438 ovl: fix memory leak in ovl_parse_param()) Merging drm-misc-fixes/for-linux-next-fixes (759f14e20891 drm/edid: also call add modes in EDID connector update fallback) Merging mm-stable/mm-stable (5d4c6ac94694 kasan: record and report more information) Merging mm-nonmm-stable/mm-nonmm-stable (e52ec6a2db2e scripts/gdb: remove exception handling and refine print format) Merging mm/mm-everything (a883f17be32d Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (44028378399f gen_compile_commands.py: fix path resolve with symlinks in it) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (01261d8a0f08 perf thread: Add missing RC_CHK_EQUAL) Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4) Merging dma-mapping/for-next (53c87e846e33 swiotlb: fix out-of-bounds TLB allocations with CONFIG_SWIOTLB_DYNAMIC) Merging asm-generic/master (d6e81532b10d Hexagon: Make pfn accessors statics inlines) CONFLICT (content): Merge conflict in arch/mips/include/asm/traps.h Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (f1ff4ced177d Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (e38a3ff35eee Merge branches 'for-next/cpufeature', 'for-next/fixes', 'for-next/fpsimd', 'for-next/kbuild', 'for-next/lpa2-prep', 'for-next/misc', 'for-next/mm', 'for-next/perf', 'for-next/rip-vpipt', 'for-next/selftests', 'for-next/stacktrace' and 'for-next/sysregs' into for-next/core) Merging arm-perf/for-next/perf (46fe448ec3b7 perf: fsl_imx8_ddr: Add driver support for i.MX8DXL DDR Perf) Merging arm-soc/for-next (52cff57c4356 Merge branch 'arm/fixes' into for-next) Merging amlogic/for-next (4b87b5f60812 Merge branch 'v6.8/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (ecab6c95f79b ARM: dts: aspeed: asrock: Add ASRock X570D4U BMC) Merging at91/at91-next (83400f6cbb7a Merge branch 'at91-dt' into at91-next) Merging broadcom/next (62a3c97f8167 Merge branch 'devicetree/next' into next) Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1) Merging drivers-memory/for-next (4a23d0f9814c memory: tegra: Protect SID override call under CONFIG_IOMMU_API) Merging imx-mxs/for-next (8c3c7094bf5b Merge branch 'imx/dt64' into for-next) Merging mediatek/for-next (9802b60bd6d8 Merge branch 'v6.6-next/soc' into for-next) Merging mvebu/for-next (ca8454133d38 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (0ea5e8402a47 Merge branches 'omap-for-v6.8/dt', 'omap-for-v6.8/defconfig' and 'omap-for-v6.8/maintainers' into for-next) Merging qcom/for-next (fc538f5c65c2 Merge branches 'arm32-for-6.8', 'arm64-defconfig-for-6.8', 'arm64-for-6.8', 'clk-for-6.8', 'drivers-fixes-for-6.7' and 'drivers-for-6.8' into for-next) Applying: fix up for "of: Stop circularly including of_device.h and of_platform.h" Merging renesas/next (a89ef75a0104 Merge branch 'renesas-dts-for-v6.8' into renesas-next) Merging reset/reset/next (c3c46acd5be9 dt-bindings: reset: hisilicon,hi3660-reset: Drop providers and consumers from example) Merging rockchip/for-next (52e1d2603e7d Merge branch 'v6.8-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (b08d7c17150d Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (d6c1868380d1 Merge branch 'for-next/scmi/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (9a7308232a11 ARM: dts: stm32: add SPI support on STM32F746) Merging sunxi/sunxi/for-next (715a9e70bdd4 Merge branch 'sunxi/clk-for-6.8' into sunxi/for-next) Merging tee/next (f51c4f974be2 Merge branch 'kern_priv_shm_for_v6.8' into next) Merging tegra/for-next (650220c2b474 Merge branch for-6.7/arm64/dt into for-next) Merging ti/ti-next (362622bfcf48 Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next) Merging xilinx/for-next (1d4723dec415 Merge branch 'zynqmp/soc' into for-next) Merging clk/clk-next (78140324e480 Merge branch 'clk-renesas' into clk-next) Merging clk-imx/for-next (144f1b70ea9e dt-bindings: clock: support i.MX93 ANATOP clock module) Merging clk-renesas/renesas-clk (5f9e29b9159a clk: renesas: rzg2l-cpg: Reuse code in rzg2l_cpg_reset()) 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 (e2f7b3d8b4b3 LoongArch: BPF: Fix unconditional bswap instructions) Merging m68k/for-next (03191fb3db3d m68k: lib: Include <linux/libgcc.h> for __muldi3()) Merging m68knommu/for-next (a39b6ac3781d Linux 6.7-rc5) Merging microblaze/next (ffb0399437ef microblaze: defconfig: Enable the Marvell phy driver) Merging mips/mips-next (01940cd4a6b9 MIPS: SGI-IP27: hubio: fix nasid kernel-doc warning) Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment) Merging parisc-hd/for-next (33cc938e65a9 Linux 6.7-rc4) Merging powerpc/next (27951e1d8274 powerpc/pseries/memhp: Log more error conditions in add path) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) Merging risc-v/for-next (b85ea95d0864 Linux 6.7-rc1) Merging riscv-dt/riscv-dt-for-next (0678df827182 riscv: dts: microchip: add the mpfs' system controller qspi & associated flash) CONFLICT (content): Merge conflict in arch/riscv/boot/dts/sophgo/cv1800b.dtsi Applying: fixup for "riscv: dts: sophgo: Separate compatible specific for CV1800B soc" Merging riscv-soc/riscv-soc-for-next (d06e9ec2adc4 Merge branch 'riscv-soc-drivers-for-next' into riscv-soc-for-next) Merging s390/for-next (12ffbd4cfe8c Merge branch 'features' into for-next) Merging sh/for-next (b85ea95d0864 Linux 6.7-rc1) Merging uml/next (974b808d85ab um: virt-pci: fix missing declaration warning) Merging xtensa/xtensa-for-next (791beae7335c xtensa: Use PCI_HEADER_TYPE_MFD instead of literal) Merging bcachefs/for-next (b4679e3a4e31 bcachefs: kill btree_trans->wb_updates) 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 (0fc24a6549f9 fscrypt: update comment for do_remove_key()) Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums) Merging btrfs/for-next (4f96fbafeb31 Merge branch 'for-next-next-v6.7-20231206' into for-next-20231206) Merging ceph/master (d30d7c57a64d ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION) Merging cifs/for-next (3a42709fa909 smb: client: fix OOB in smb2_query_reparse_point()) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix) Merging erofs/dev (6b07eb162932 erofs: enable sub-page compressed block support) Merging exfat/dev (19a481032091 exfat: using hweight instead of internal logic) Merging ext3/for_next (46ee834035ac Pull quota cleanup from Chao Yu.) Merging ext4/dev (619f75dae2cf ext4: fix warning in ext4_dio_write_end_io()) Merging f2fs/dev (d346fa09abff f2fs: sysfs: support discard_io_aware) Merging fsverity/for-next (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty) Merging fuse/for-next (3f29f1c336c0 fuse: disable FOPEN_PARALLEL_DIRECT_WRITES with FUSE_DIRECT_IO_ALLOW_MMAP) Merging gfs2/for-next (9fd6b6bdb5a4 gfs2: rgrp: fix kernel-doc warnings) Merging jfs/jfs-next (cca974daeb6c jfs: fix shift-out-of-bounds in dbJoin) Merging ksmbd/ksmbd-for-next (137366544811 ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE) Merging nfs/linux-next (f003a717ae90 nfs: Convert nfs_symlink() to use a folio) Merging nfs-anna/linux-next (379e4adfddd6 NFSv4.1: fixup use EXCHGID4_FLAG_USE_PNFS_DS for DS server) Merging nfsd/nfsd-next (59392e03bfaa svcrdma: Move the svc_rdma_cc_init() call) Merging ntfs3/master (652483bfbc45 fs/ntfs3: Fix c/mtime typo) Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) Merging overlayfs/overlayfs-next (2c3ef4f89ced ovl: initialize ovl_copy_up_ctx.destname inside ovl_do_copy_up()) Merging ubifs/next (75690493591f ubifs: ubifs_link: Fix wrong name len calculating when UBIFS is encrypted) Merging v9fs/9p-next (69cc23eb3a0b net: 9p: avoid freeing uninit memory in p9pdu_vreadf) Merging v9fs-ericvh/ericvh/for-next (2dde18cd1d8f Linux 6.5) Merging xfs/for-next (18793e050504 xfs: move xfs_ondisk.h to libxfs/) Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) 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 (0e1b3744eed8 Merge branch 'vfs.iov_iter' into vfs.all) CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c CONFLICT (content): Merge conflict in fs/btrfs/subpage.c CONFLICT (content): Merge conflict in fs/btrfs/super.c CONFLICT (content): Merge conflict in fs/buffer.c CONFLICT (content): Merge conflict in include/linux/blk_types.h Applying: linux-next: manual merge of the vfs-brauner tree with the btrfs tree Merging vfs/for-next (bbe6a7c899e7 bch2_ioctl_subvolume_destroy(): fix locking) Merging printk/for-next (6c3a34e38436 Merge branch 'for-6.8' into for-next) Merging pci/next (67e04d921cb6 Merge branch 'pci/switchtec') Merging pstore/for-next/pstore (24a0b5e196cf pstore: inode: Use cleanup.h for struct pstore_private) Merging hid/for-next (dddc7049b9da Merge branch 'for-6.8/selftests' into for-next) Merging i2c/i2c/for-next (382561d16854 i2c: ocores: Move system PM hooks to the NOIRQ phase) Merging i3c/i3c/next (b4da37db3e2c i3c: master: Fix build error) Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) Merging hwmon-staging/hwmon-next (ad6f3a4d5dea hwmon: Add driver for Gigabyte AORUS Waterforce AIO coolers) Merging jc_docs/docs-next (50709576d81b Documentation: Destage TEE subsystem documentation) Merging v4l-dvb/master (a00b3f296eac media: mediatek: vcodec: Set the supported vp9 profile for each platform) Merging v4l-dvb-next/master (efa28efd9cba media: rkisp1: resizer: Stop manual allocation of v4l2_subdev_state) Merging pm/linux-next (5173d2be59b3 Merge branch 'pm-cpufreq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (c4a5118a3ae1 cpufreq: scmi: process the result of devm_of_clk_add_hw_provider()) Merging cpupower/cpupower (997bbf2accf6 tools cpupower bench: Override CFLAGS assignments) Merging devfreq/devfreq-next (4920ee6dcfaf PM / devfreq: Convert to use sysfs_emit_at() API) Merging pmdomain/next (833811353f70 pmdomain: xilinx/zynqmp: Convert to platform remove callback returning void) Merging opp/opp/linux-next (19cc8b1819a4 OPP: Check for invalid OPP in dev_pm_opp_find_level_ceil()) Merging thermal/thermal/linux-next (9618efe343ea thermal/qcom/tsens: Drop ops_v0_1) Merging dlm/next (0c08699744d2 dlm: implement EXPORT_OP_ASYNC_LOCK) Merging rdma/for-next (288f535951aa RDMA/hns: Fix memory leak in free_mr_init()) Merging net-next/main (70028b2e51c6 Merge branch 'ipv6-data-races') CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnxt/bnxt.c CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c Merging bpf-next/for-next (2ebe81c81435 net, xdp: Allow metadata > 32) Merging ipsec-next/master (aadbd27f9674 net: phy: correctly check soft_reset ret ONLY if defined for PHY) Merging mlx5-next/mlx5-next (82f9378c443c net/mlx5: Handle IPsec steering upon master unbind/bind) Merging netfilter-next/main (ac40916a3f72 rtnetlink: introduce nlmsg_new_large and use it in rtnl_getlink) Merging ipvs-next/main (ac40916a3f72 rtnetlink: introduce nlmsg_new_large and use it in rtnl_getlink) Merging bluetooth/master (3d41844703fe Bluetooth: qca: Support HFP offload for QCA2066) Merging wireless-next/for-next (db7fac15eaf0 wifi: rtw89: mac: refine SER setting during WiFi CPU power on) Merging wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) Merging wpan-staging/staging (83fcf26b00d7 ieee802154: Give the user the association list) Merging mtd/mtd/next (b85ea95d0864 Linux 6.7-rc1) Merging nand/nand/next (3c8260ce7663 mtd: rawnand: brcmnand: exec_op implementation) Merging spi-nor/spi-nor/next (c692ba6de1c5 mtd: spi-nor: micron-st: Add support for mt25qu01g) Merging crypto/master (99bd99d3e3a7 crypto: algif_skcipher - Fix stream cipher chaining) Merging drm/drm-next (a60501d7c2d3 Merge tag 'drm-misc-next-2023-12-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) Merging drm-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape) Merging drm-misc/for-linux-next (eb3f7cbee294 drm/bridge: ti-sn65dsi86: Associate PWM device to auxiliary device) Merging amdgpu/drm-next (2f6bf026dcbe drm/amd/display: Populate dtbclk from bounding box) CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst Merging drm-intel/for-linux-next (15d03119ed21 drm/i915/display: do not use cursor size reduction on MTL) Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (236fa3873de8 drm/ci: remove rebase-merge directory) Applying: fix up for "drm/exec: Pass in initial # of objects" Merging drm-msm-lumag/msm-next-lumag (e512b4a8ec37 drm/msm/dpu: enable writeback on SM8450) Merging etnaviv/etnaviv/next (925b10728f20 drm/etnaviv: disable MLCG and pulse eater on GPU reset) Merging fbdev/for-next (64a1aed0aa07 fbdev: mmp: Fix typo and wording in code comment) Merging regmap/for-next (a2d43f711790 Merge remote-tracking branch 'regmap/for-6.8' into regmap-next) Merging sound/for-next (1ccffc2f760a ASoC: SOF: Intel: pci-mtl: add HDA_ARL PCI support) Merging ieee1394/for-next (c12d7aa7ffa4 firewire: Annotate struct fw_node with __counted_by) Merging sound-asoc/for-next (6b9163c4691f Merge remote-tracking branch 'asoc/for-6.8' into asoc-next) Merging modules/modules-next (4652b8e4f3ff Merge tag '6.7-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd) Merging input/next (909484169a7b Input: pxrc - simplify mutex handling with guard macro) Merging block/for-next (0535ce8cdb53 Merge branch 'for-6.8/io_uring' into for-next) Merging device-mapper/for-next (e842b578396b dm-integrity: don't modify bio's immutable bio_vec in integrity_metadata()) Merging libata/for-next (804901fdd637 ata: pata_pxa: convert not to use dma_request_slave_channel()) Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer()) Merging mmc/next (72cd89517fa0 mmc: Merge branch fixes into next) Merging mfd/for-mfd-next (7bb6a356ed63 dt-bindings: mfd: pm8008: Clean up example node names) Merging backlight/for-backlight-next (769ff5283f0d backlight: ili922x: Add an error code check in ili922x_write()) Merging battery/for-next (b55d073e6501 power: supply: bq256xx: fix some problem in bq256xx_hw_init) Merging regulator/for-next (16e5ac127d8d regulator: event: Add regulator netlink event support) Merging security/next (ec4e9d630a64 calipso: fix memory leak in netlbl_calipso_add_pass()) CONFLICT (content): Merge conflict in Documentation/userspace-api/index.rst 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/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/linux/security.h CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in security/selinux/hooks.c CONFLICT (content): Merge conflict in security/smack/smack_lsm.c CONFLICT (content): Merge conflict in tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl CONFLICT (content): Merge conflict in tools/perf/arch/powerpc/entry/syscalls/syscall.tbl CONFLICT (content): Merge conflict in tools/perf/arch/s390/entry/syscalls/syscall.tbl CONFLICT (content): Merge conflict in tools/perf/arch/x86/entry/syscalls/syscall_64.tbl Applying: fix up for "LSM: wireup Linux Security Module syscalls" Merging apparmor/apparmor-next (a7e405a2de69 apparmor: add missing params to aa_may_ptrace kernel-doc comments) Merging integrity/next-integrity (b4af096b5df5 KEYS: encrypted: Add check for strsep) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) Merging selinux/next (3c1e09d533db selinux: remove the wrong comment about multithreaded process handling) Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso()) Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) Merging tpmdd/next (c2d5304e6c64 Merge tag 'platform-drivers-x86-v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) Merging watchdog/master (b85ea95d0864 Linux 6.7-rc1) Merging iommu/next (bd19c7637024 Merge branches 'apple/dart', 'virtio', 'x86/amd' and 'core' into next) Merging audit/next (24fade412acf Automated merge of 'dev' into 'next') Merging dt-krzk/for-next (b85ea95d0864 Linux 6.7-rc1) Merging mailbox/for-next (fbce94a444fb mailbox: qcom-apcs-ipc: re-organize compatibles with fallbacks) Merging spi/for-next (bb1244ae35d1 Merge remote-tracking branch 'spi/for-6.8' into spi-next) Merging tip/master (d89c59ce31a9 Merge branch into tip/master: 'x86/sgx') Merging clockevents/timers/drivers/next (d25e52a7eb36 clocksource/drivers/cadence-ttc: Fix some kernel-doc warnings) Merging edac/edac-for-next (a69badad736c EDAC, pnd2: Sort headers alphabetically) Merging irqchip/irq/irqchip-next (19b5a44bee16 irqchip: Add support for Amlogic-C3 SoCs) Merging ftrace/for-next (e1742fa172d5 Merge probes/for-next) Merging rcu/rcu/next (e50e0836738d Merge tag 'rcu-next-v6.8' of ../neeraj-linux into HEAD) Merging kvm/next (8ed26ab8d591 KVM: clean up directives to compile out irqfds) CONFLICT (content): Merge conflict in include/linux/pagemap.h Applying: fs: Convert error_remove_page to error_remove_folio Applying: fix up for "KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory" Merging kvm-arm/next (307c5436c3f4 Merge branch kvm-arm64/lpa2 into kvmarm-master/next) Merging kvms390/next (26fb87ffa9d9 s390/uvdevice: Report additional-data length for attestation) Merging kvm-ppc/topic/ppc-kvm (98b1cc82c4af Linux 6.7-rc2) Merging kvm-riscv/riscv_kvm_next (d9c00f44e5de KVM: riscv: selftests: Add SBI DBCN extension to get-reg-list test) Merging kvm-x86/next (f2a3fb7234e5 Merge branches 'fixes', 'generic', 'hyperv', 'lam', 'misc', 'mmu', 'pmu', 'selftests', 'svm' and 'xen') Merging xen-tip/linux-next (7f3da4b698bc xen/events: fix error code in xen_bind_pirq_msi_to_irq()) Merging percpu/for-next (33cc938e65a9 Linux 6.7-rc4) Merging workqueues/for-next (4a6c5607d450 workqueue: Make sure that wq_unbound_cpumask is never empty) Merging drivers-x86/for-next (3799b5d2323d platform/x86: asus-laptop: remove redundant braces in if statements) CONFLICT (content): Merge conflict in drivers/platform/x86/wmi.c Merging chrome-platform/for-next (d131f1f3b459 platform/chrome: sensorhub: Implement quickselect for median calculation) Merging chrome-platform-firmware/for-firmware-next (ecea08916418 firmware: coreboot: framebuffer: Avoid invalid zero physical address) Merging hsi/for-next (fa72d143471d HSI: omap_ssi: Remove usage of the deprecated ida_simple_xx() API) Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds-lj/for-leds-next (430545cd13d0 leds: gpio: Add kernel log if devm_fwnode_gpiod_get() fails) Merging ipmi/for-next (c5d03a0d8461 ipmi: Use regspacings passed as a module parameter) Merging driver-core/driver-core-next (7c41da586e9f driver core: Emit reason for pending deferred probe) Merging usb/usb-next (51920207674e usb: fotg210-udc: fix function kernel-doc comments) Merging thunderbolt/next (655b8af57d31 thunderbolt: Remove duplicated re-assignment of pointer 'out') Merging usb-serial/usb-next (2cc14f52aeb7 Linux 6.7-rc3) Merging tty/tty-next (e045e18dbf3e Merge 6.7-rc5 into tty-next) Merging char-misc/char-misc-next (0e42b5fee8a8 Merge 6.7-rc5 into char-misc-next) CONFLICT (content): Merge conflict in drivers/android/binder_alloc.c Merging accel/habanalabs-next (dfbf6719ccb4 accel/habanalabs/gaudi2: avoid overriding existing undefined opcode data) Merging coresight/next (60e5f23dc5d6 coresight: ultrasoc-smb: Use guards to cleanup) Merging fastrpc/for-next (b85ea95d0864 Linux 6.7-rc1) Merging fpga/for-next (5496fb8eedd6 drivers/fpga: use standard array-copy function) Merging icc/icc-next (9d0f61b0aab1 Merge branch 'icc-fixes' into icc-next) Merging iio/togreg (9f4e9ffee974 iio: light: pa1203001: Drop ACPI_PTR() protection.) Merging phy-next/next (7f6f9e0def00 phy: qcom-qmp-usb: Add Qualcomm SDX75 USB3 PHY support) Merging soundwire/next (55d50ace6b88 soundwire: generic_bandwidth_allocation use bus->params.max_dr_freq) Merging extcon/extcon-next (7803680964c0 extcon: qcom-spmi-misc: don't use kernel-doc marker for comment) Merging gnss/gnss-next (98b1cc82c4af Linux 6.7-rc2) Merging vfio/next (946cff255dfa Merge branches 'v6.8/vfio/debugfs', 'v6.8/vfio/pds' and 'v6.8/vfio/type1-account' into v6.8/vfio/next) Merging w1/for-next (efc19c44aa44 w1: amd_axi_w1: Explicitly include correct DT includes) Merging spmi/spmi-next (0a080ab6bc28 spmi: mediatek: add device id check) Merging staging/staging-next (345586fed2e0 staging: rtl8192e: renamed variable IOTPeer) Merging counter-next/counter-next (a39b6ac3781d Linux 6.7-rc5) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (70f008fb3ea9 dmaengine: dmatest: prevent using swiotlb buffer with nobounce parameter) Merging cgroup/for-next (b7aaea747923 Merge branch 'for-6.8' into for-next) Merging scsi/for-next (45d0d7374dce Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (e78e59acfb69 Merge patch series "scsi: Convert to platform remove callback returning" void) Merging vhost/linux-next (b8e079244992 virtio_blk: fix snprintf truncation compiler warning) Merging rpmsg/for-next (7641890179f9 Merge branches 'rproc-next' and 'rpmsg-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (d22f93c6a0df gpio: sim: implement the dbg_show() callback) Merging gpio-intel/for-next (92fc925f8386 gpio: tangier: simplify locking using cleanup helpers) Merging pinctrl/for-next (977f293b0b84 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (6191e49de389 pinctrl: baytrail: Simplify code with cleanup helpers) CONFLICT (content): Merge conflict in drivers/pinctrl/intel/pinctrl-baytrail.c Merging pinctrl-renesas/renesas-pinctrl (dc99d4c8ac46 dt-bindings: pinctrl: renesas: Drop unneeded quotes) Merging pinctrl-samsung/for-next (e1564d6f9349 dt-bindings: pinctrl: samsung: correct ExynosAutov920 wake-up compatibles) Merging pwm/for-next (2cc2cb184833 pwm: Stop referencing pwm->chip) Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie) Merging kselftest/next (130a83879954 selftests: sched: Remove initialization to 0 for a static variable) Merging kunit/test (b85ea95d0864 Linux 6.7-rc1) Merging kunit-next/kunit (b285ba6f8cc1 kunit: test: Use an action wrapper instead of a cast) Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next) Merging rtc/rtc-next (3d762e21d563 rtc: cmos: Use ACPI alarm for non-Intel x86 systems too) Merging nvdimm/libnvdimm-for-next (9ea459e477dc libnvdimm: remove kernel-doc warnings:) Merging at24/at24/for-next (c692086d74a0 dt-bindings: at24: add ROHM BR24G04) Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) Merging seccomp/for-next/seccomp (31c65705a8cf perf/benchmark: fix seccomp_unotify benchmark for 32-bit) Merging fsi/next (f04d61a379d6 fsi: fix some spelling mistakes in comment) Merging slimbus/for-next (b85ea95d0864 Linux 6.7-rc1) Merging nvmem/for-next (82c6ba6a7d96 nvmem: brcm_nvram: store a copy of NVRAM content) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) Merging hyperv/hyperv-next (ce9ecca0238b Linux 6.6-rc2) Merging auxdisplay/auxdisplay (c52391fafcef auxdisplay: img-ascii-lcd: Use device_get_match_data()) Merging kgdb/kgdb/for-next (23816724fdbd kdb: Corrects comment for kdballocenv) Merging hmm/hmm (0bb80ecc33a8 Linux 6.6-rc1) Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (d63ddfb78b23 bus: mhi: ep: Add support for interrupt moderation timer) Merging memblock/for-next (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability) Merging cxl/next (5d09c63f11f0 cxl/hdm: Remove broken error path) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (94f7f6182c72 efivarfs: automatically update super block flag) Merging unicode/for-next (807f06d1074d ecryptfs: Reject casefold directory inodes) Merging slab/slab/for-next (f7eb801fcdb1 Merge branch 'slab/for-6.8/slub-hook-cleanups' into slab/for-next) CONFLICT (content): Merge conflict in mm/kasan/quarantine.c Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging landlock/next (a50156fe3dcb landlock: Document IOCTL support) Merging rust/rust-next (3857af38e57a docs: rust: add "The Rust experiment" section) Merging sysctl/sysctl-next (5cfe1d126ae3 sysctl: constify standard sysctl tables) CONFLICT (content): Merge conflict in include/linux/perf_event.h CONFLICT (content): Merge conflict in ipc/ipc_sysctl.c CONFLICT (content): Merge conflict in kernel/events/core.c Applying: fixup for "sysctl: treewide: constify ctl_table_root::permissions" Merging execve/for-next/execve (0a8a952a75f2 ELF, MAINTAINERS: specifically mention ELF) Merging bitmap/bitmap-for-next (27c82f14e6d2 lib/find: optimize find_*_bit_wrap) Merging hte/for-next (b85ea95d0864 Linux 6.7-rc1) Merging kspp/for-next/kspp (ac7110d883ff atags_proc: Add __counted_by for struct buffer and use struct_size()) Merging kspp-gustavo/for-next/kspp (617ab3c357d2 init: Kconfig: Disable -Wstringop-overflow for GCC-11) Merging nolibc/nolibc (d543d9ddf593 selftests/nolibc: disable coredump via setrlimit) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (b2b67c997bf7 iommufd: Organize the mock domain alloc functions closer to Joerg's tree) Merging devicetree/for-next (b492af27d0c8 Merge branch 'dt/header-fixes-for-next' into for-next) Applying: drm: remove unused function drm_atomic_replace_property_blob_from_id()
Attachment:
pgpmekxD6Arm6.pgp
Description: OpenPGP digital signature
