Hi all, News: the merge window has opened, so please do not add any material intended for v6.9 to your linux-next included branches until asfter v6.8-rc1 has been released. Changes since 20240110: The btrfs tree gained a conflict against Linus' tree. A warning in the drm tree build is now a failure (I stopped building with CONFIG_WERROR=n), so I applied a supplied patch. The cxl tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 9932 9197 files changed, 475501 insertions(+), 220742 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 371 trees (counting Linus' and 104 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 (0cb552aa9784 Merge tag 'v6.8-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (8ec4efc7d34f selftests: mm: hugepage-vmemmap fails on 64K page size systems.) Merging kbuild-current/fixes (753547de0dae linux/export: Ensure natural alignment of kcrctab array) Merging arc-current/for-curr (861deac3b092 Linux 6.7-rc7) Merging arm-current/fixes (f54e8634d136 ARM: 9330/1: davinci: also select PINCTRL) Merging arm64-fixes/for-next/fixes (3c0696076aad arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify) Merging arm-soc-fixes/arm/fixes (643fe70e7bcd ARM: sun9i: smp: fix return code check of of_property_match_string) 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 (6b9c045b0602 m68k: defconfig: Update defconfigs for v6.7-rc1) Merging powerpc-fixes/fixes (d2441d3e8c0c MAINTAINERS: powerpc: Add Aneesh & Naveen) Merging s390-fixes/fixes (3d940bb18183 s390: update defconfigs) 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 (ac631873c9e7 net: ethernet: cortina: Drop TSO support) Merging bpf/master (ac631873c9e7 net: ethernet: cortina: Drop TSO support) Merging ipsec/master (76df934c6d5f MAINTAINERS: Add netdev subsystem profile link) Merging netfilter/main (ac631873c9e7 net: ethernet: cortina: Drop TSO support) Merging ipvs/main (b29be0ca8e81 netfilter: nft_immediate: drop chain reference counter on error) Merging wireless/for-next (ac631873c9e7 net: ethernet: cortina: Drop TSO support) Merging wpan/master (b85ea95d0864 Linux 6.7-rc1) Merging rdma-fixes/for-rc (a39b6ac3781d Linux 6.7-rc5) Merging sound-current/for-linus (fd38dd6abda5 kselftest/alsa - conf: Stringify the printed errno in sysfs_get()) Merging sound-asoc-fixes/for-linus (715d499e3eec Merge remote-tracking branch 'asoc/for-6.7' into asoc-linus) 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 (fc70d643a2f6 spi: atmel: Fix clock issue when using devices with different polarities) Merging pci-current/for-linus (0ee2030af4e3 MAINTAINERS: Orphan Cadence PCIe IP) 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 (610a9b8f49fb Linux 6.7-rc8) Merging usb-serial-fixes/usb-linus (610a9b8f49fb Linux 6.7-rc8) 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 (6d4850f80654 iio: magnetometer: rm3100: add boundary check for the value read from RM3100_REG_TMRC) Merging counter-current/counter-current (a39b6ac3781d Linux 6.7-rc5) Merging char-misc.current/char-misc-linus (610a9b8f49fb Linux 6.7-rc8) Merging soundwire-fixes/fixes (393cae5f32d6 soundwire: intel_ace2x: fix AC timing setting for ACE2.x) Merging thunderbolt-fixes/fixes (0dd3ee311255 Linux 6.7) Merging input-current/for-linus (ea3715941a9b Input: soc_button_array - add mapping for airplane mode button) 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 (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb) Merging kvm-fixes/master (0dd3ee311255 Linux 6.7) Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP) 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 (ceb6a6f023fd Linux 6.7-rc6) Merging btrfs-fixes/next-fixes (cdec1b57f10a Merge branch 'misc-6.7' into next-fixes) Merging vfs-fixes/fixes (485053bb81c8 fix ufs_get_locked_folio() breakage) 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 (b20712e85330 Revert "platform/x86: p2sb: Allow p2sb_bar() calls during PCI device probe") 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 (04c116e2bdfc scsi: ufs: core: Let the sq_lock protect sq_tail_slot access) Merging drm-fixes/drm-fixes (0dd3ee311255 Linux 6.7) Merging drm-intel-fixes/for-linux-next-fixes (0dd3ee311255 Linux 6.7) Merging mmc-fixes/fixes (8abf77c88929 mmc: sdhci-sprd: Fix eMMC init failure after hw reset) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (a39b6ac3781d Linux 6.7-rc5) 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 (b8b2711336f0 riscv: Fix set_direct_map_default_noflush() to reset _PAGE_EXEC) Merging riscv-dt-fixes/riscv-dt-fixes (e1b91b84ea27 riscv: dts: sophgo: separate sg2042 mtime and mtimecmp to fit aclint format) 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 (610a9b8f49fb Linux 6.7-rc8) 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 (0dd3ee311255 Linux 6.7) 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 (d988c9f511af MAINTAINERS: Add Namhyung as tools/perf/ co-maintainer) Merging efi-fixes/urgent (01638431c465 efi/x86: Fix the missing KASLR_FLAG bit in boot_params->hdr.loadflags) 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 (861deac3b092 Linux 6.7-rc7) 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 (413ba91089c7 ovl: fix dentry reference leak after changes to underlying layers) Merging drm-misc-fixes/for-linux-next-fixes (024b32db43a3 drm/bridge: parade-ps8640: Wait for HPD when doing an AUX transfer) Merging mm-stable/mm-stable (ab27740f7665 Merge tag 'linux_kselftest-next-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) Merging mm-nonmm-stable/mm-nonmm-stable (ab27740f7665 Merge tag 'linux_kselftest-next-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) Merging mm/mm-everything (004879ab0fe9 Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (0f493ceef61b linux/export.h: remove unneeded .balign directive) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (d988c9f511af MAINTAINERS: Add Namhyung as tools/perf/ co-maintainer) Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4) Merging dma-mapping/for-next (b07bc2347672 dma-mapping: clear dev->dma_mem to NULL after freeing it) Merging asm-generic/master (d93cca2f3109 asm-generic: Fix 32 bit __generic_cmpxchg_local) 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 (db32cf8e280b Merge branch 'for-next/fixes' into for-next/core) Merging arm-perf/for-next/perf (bb339db4d363 arm: perf: Fix ARCH=arm build with GCC) Merging arm-soc/for-next (5fedbec0c6f6 soc: document merges) CONFLICT (content): Merge conflict in arch/arm/kernel/perf_event_v6.c Merging amlogic/for-next (0dd3ee311255 Linux 6.7) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (e60f7a99d378 ARM: dts: aspeed: minerva: add sgpio line name) Merging at91/at91-next (58f72e7817f1 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 (365fcc03b632 memory: ti-emif-pm: Convert to platform remove callback returning void) Merging imx-mxs/for-next (4db02d61a81e 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 (476887312c60 Merge branch 'mvebu/drivers' into mvebu/for-next) Merging omap/for-next (3571685e5445 Merge branch 'fixes' into for-next) Merging qcom/for-next (4f6a031a1c8d Merge branches 'arm32-for-6.8', 'arm64-defconfig-for-6.8', 'arm64-for-6.8', 'clk-for-6.8' 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 (a4ce2434e9bb Merge branches 'renesas-drivers-for-v6.8' and '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 (3a40bdf5fbe2 Merge branch 'v6.8-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (1b97a284a293 Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (31261eceb9b0 Merge branches 'for-next/ffa/fixes' and 'for-next/scmi/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (769e4b077b2e ARM: multi_v7_defconfig: enable STM32 DCMIPP media support) Merging sunxi/sunxi/for-next (d4d29dd858bb Merge branch 'sunxi/dt-for-6.8' into sunxi/for-next) Merging tee/next (84ec4fd88831 Merge branch 'tee_iov_iter_for_v6.8' into next) Merging tegra/for-next (5e6333ef8ea5 Merge branch for-6.8/arm/dt into for-next) Merging ti/ti-next (bfb1d67c6f85 Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (21d01d5afbc8 Merge remote-tracking branch 'zynqmp/soc' into for-next) Merging clk/clk-next (4f964cfef39d Merge branch 'clk-rs9' into clk-next) Merging clk-imx/for-next (f52f00069888 clk: imx: pll14xx: change naming of fvco to fout) Merging clk-renesas/renesas-clk (515f05da372a clk: renesas: r9a08g045: Add clock and reset support for ETH0 and ETH1) 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 (aa504e7b7ab2 Merge branch 'loongarch-kvm' into loongarch-next) Merging m68k/for-next (6b9c045b0602 m68k: defconfig: Update defconfigs for v6.7-rc1) Merging m68knommu/for-next (ceb6a6f023fd Linux 6.7-rc6) Merging microblaze/next (ffb0399437ef microblaze: defconfig: Enable the Marvell phy driver) Merging mips/mips-next (2f9060b1db4a MIPS: Fix typos) CONFLICT (content): Merge conflict in arch/mips/kernel/traps.c Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment) Merging parisc-hd/for-next (098e94adcdca parisc; Make RO_DATA page aligned in vmlinux.lds.S) Merging powerpc/next (44a1aad2fe6c Merge branch 'topic/ppc-kvm' into next) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) Merging risc-v/for-next (5a2cf779e677 riscv: Select ARCH_WANTS_NO_INSTR) CONFLICT (content): Merge conflict in arch/riscv/kernel/sys_riscv.c Applying: fix up for "RISC-V: Move the hwprobe syscall to its own file" Merging riscv-dt/riscv-dt-for-next (56b10953da7e riscv: dts: starfive: Enable SDIO wifi on JH7100 boards) Merging riscv-soc/riscv-soc-for-next (a3ee4347490b Merge branch 'riscv-cache-for-next' into riscv-soc-for-next) Merging s390/for-next (efbee6221e03 Merge branch 'features' into for-next) Merging sh/for-next (b85ea95d0864 Linux 6.7-rc1) Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory) Merging xtensa/xtensa-for-next (791beae7335c xtensa: Use PCI_HEADER_TYPE_MFD instead of literal) Merging bcachefs/for-next (169de41985f5 bcachefs: eytzinger0_find() search should be const) 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 (2a0e85719892 fs: move fscrypt keyring destruction to after ->put_super) Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) Merging btrfs/for-next (932ab07c383e Merge branch 'for-next-next-v6.8-20240108' into for-next-20240108) CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c Merging ceph/master (d30d7c57a64d ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION) Merging cifs/for-next (26ba1bf310f0 cifs: update internal module version number for cifs.ko) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix) Merging erofs/dev (aa12a790d31b erofs: make erofs_{err,info}() support NULL sb parameter) Merging exfat/dev (f55c096f62f1 exfat: do not zero the extended part) Merging exportfs/exportfs-next (34e147aa0c3b fs: Create a generic is_dot_dotdot() utility) Merging ext3/for_next (46ee834035ac Pull quota cleanup from Chao Yu.) Merging ext4/dev (68da4c44b994 ext4: fix inconsistent between segment fstrim and full fstrim) Merging f2fs/dev (c3c2d45b9050 f2fs: show more discard status by sysfs) 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 (bfed9a92940b Merge tag 'gfs2-v6.7-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) Merging jfs/jfs-next (a280c9ceeca7 jfs: Add missing set_freezable() for freezable kthread) Merging ksmbd/ksmbd-for-next (8fb7b723924c ksmbd: Add missing set_freezable() for freezable kthread) Merging nfs/linux-next (f003a717ae90 nfs: Convert nfs_symlink() to use a folio) Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel) Merging nfsd/nfsd-next (17419aefcbfd nfsd: rename nfsd_last_thread() to nfsd_destroy_serv()) Merging ntfs3/master (4cdfb6e7bc9c fs/ntfs3: Disable ATTR_LIST_ENTRY size check) Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting) Merging ubifs/next (adbf4c4954e3 ubi: block: fix memleak in ubiblock_create()) Merging v9fs/9p-next (ff49bf186757 net: 9p: avoid freeing uninit memory in p9pdu_vreadf) Merging v9fs-ericvh/ericvh/for-next (5254c0cbc92d Merge tag 'block-6.7-2023-12-22' of git://git.kernel.dk/linux) Merging xfs/for-next (bcdfae6ee520 xfs: use the op name in trace_xlog_intent_recovery_failed) 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 (eab689a488ae Merge branch 'vfs.netfs' into vfs.all) CONFLICT (content): Merge conflict in fs/afs/write.c CONFLICT (content): Merge conflict in include/linux/blk_types.h Applying: fixup for "netfs: Provide a writepages implementation" Merging vfs/for-next (b345389b921f Merge branch 'work.misc' into for-next) CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c CONFLICT (content): Merge conflict in fs/tracefs/inode.c Merging printk/for-next (6c3a34e38436 Merge branch 'for-6.8' into for-next) Merging pci/next (fbfdb71c8c79 Merge branch 'pci/misc') Merging pstore/for-next/pstore (24a0b5e196cf pstore: inode: Use cleanup.h for struct pstore_private) Merging hid/for-next (6ab8d843eae6 Merge branch 'for-6.8/amd-sfh' into for-next) Merging i2c/i2c/for-next (ed3b16b344db Merge branch 'i2c/for-current' into i2c/for-next) Merging i3c/i3c/next (374c13f9080a i3c: master: cdns: Update maximum prescaler value for i2c clock) Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) Merging hwmon-staging/hwmon-next (41c71105a845 hwmon: (gigabyte_waterforce) Mark status report as received under a spinlock) CONFLICT (content): Merge conflict in drivers/platform/x86/wmi.c Merging jc_docs/docs-next (5382774515d4 A reworked process/index.rst) CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst CONFLICT (content): Merge conflict in Documentation/userspace-api/index.rst Merging v4l-dvb/master (02d4e62ae245 media: i2c: mt9m114: use fsleep() in place of udelay()) Merging v4l-dvb-next/master (02d4e62ae245 media: i2c: mt9m114: use fsleep() in place of udelay()) Merging pm/linux-next (442229299a15 Merge branches 'pnp', 'acpi-resource' and 'acpica' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (0990319a0400 cpufreq: armada-8k: Fix parameter type warning) Merging cpupower/cpupower (997bbf2accf6 tools cpupower bench: Override CFLAGS assignments) Merging devfreq/devfreq-next (aed5ed595960 PM / devfreq: Synchronize devfreq_monitor_[start/stop]) Merging pmdomain/next (d6948c13b663 PM: domains: Move genpd and its governor to the pmdomain subsystem) Merging opp/opp/linux-next (dcfec12b6798 OPP: Rename 'rate_clk_single') Merging thermal/thermal/linux-next (5314b1543787 thermal/drivers/exynos: Use set_trips ops) Merging dlm/next (5beebc1dda47 dlm: update format header reflect current format) Merging rdma/for-next (d24b923f1d69 RDMA/bnxt_re: Fix error code in bnxt_re_create_cq()) Merging net-next/main (a7fe0881d9b7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf-next/for-next (3fbf61207c66 Revert "mlx5 updates 2023-12-20") Merging ipsec-next/master (38894ff3a04b ppp: Fix spelling typo in comment in ppp_async_encode()) Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device) Merging netfilter-next/main (a7fe0881d9b7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs-next/main (42a7889a1931 Merge branch 'selftests-tcp-ao') Merging bluetooth/master (f8c47ee39e6d Bluetooth: hci_event: Use HCI error defines instead of magic values) Merging wireless-next/for-next (3fbf61207c66 Revert "mlx5 updates 2023-12-20") Merging wpan-next/master (2373699560a7 mac802154: Avoid new associations while disassociating) Merging wpan-staging/staging (2373699560a7 mac802154: Avoid new associations while disassociating) Merging mtd/mtd/next (98d4fda8f2d4 Merge tag 'nand/for-6.8' into mtd/next) Merging nand/nand/next (023e6aad7e5e mtd: rawnand: s3c2410: fix Excess struct member description kernel-doc warnings) Merging spi-nor/spi-nor/next (3c0e1dfa703c MAINTAINERS: change my mail to the kernel.org one) Merging crypto/master (b8910630c967 crypto: iaa - Account for cpu-less numa nodes) Merging drm/drm-next (b76c01f1d950 Merge tag 'drm-intel-gt-next-2023-12-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) CONFLICT (modify/delete): Documentation/devicetree/bindings/display/mediatek/mediatek,mdp-rdma.yaml deleted in HEAD and modified in drm/drm-next. Version drm/drm-next of Documentation/devicetree/bindings/display/mediatek/mediatek,mdp-rdma.yaml left in tree. CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/display/mediatek/mediatek,padding.yaml CONFLICT (content): Merge conflict in drivers/accel/qaic/qaic_data.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc.c $ git rm -f Documentation/devicetree/bindings/display/mediatek/mediatek,mdp-rdma.yaml Applying: drm/i915: don't make assumptions about intel_wakeref_t type Merging drm-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape) Merging drm-exynos/for-linux-next (10faae933f2b drm/exynos: gsc: minor fix for loop iteration in gsc_runtime_resume) Merging drm-misc/for-linux-next (89fe46019a62 drm/v3d: Fix support for register debugging on the RPi 4) Merging amdgpu/drm-next (6e7a29f011ac drm/amdgpu: add new INFO IOCTL query for input power) Merging drm-intel/for-linux-next (d505a16e00c3 drm/i915/perf: reconcile Excess struct member kernel-doc warnings) Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (d4ca26ac4be0 drm/msm/dp: call dp_display_get_next_bridge() during probe) Merging drm-msm-lumag/msm-next-lumag (d4ca26ac4be0 drm/msm/dp: call dp_display_get_next_bridge() during probe) Merging etnaviv/etnaviv/next (f1a925152c85 drm/etnaviv: add sensitive state for PE_RT_ADDR_4_PIPE(3, 0|1) address) Merging fbdev/for-next (256b7e8673a6 fbdev/intelfb: Remove driver) CONFLICT (modify/delete): drivers/video/fbdev/amba-clcd.c deleted in fbdev/for-next and modified in HEAD. Version HEAD of drivers/video/fbdev/amba-clcd.c left in tree. CONFLICT (modify/delete): drivers/video/fbdev/intelfb/intelfb_i2c.c deleted in fbdev/for-next and modified in HEAD. Version HEAD of drivers/video/fbdev/intelfb/intelfb_i2c.c left in tree. CONFLICT (modify/delete): drivers/video/fbdev/vermilion/vermilion.c deleted in fbdev/for-next and modified in HEAD. Version HEAD of drivers/video/fbdev/vermilion/vermilion.c left in tree. $ git rm -f drivers/video/fbdev/amba-clcd.c drivers/video/fbdev/vermilion/vermilion.c drivers/video/fbdev/intelfb/intelfb_i2c.c Merging regmap/for-next (632cdb1dab49 Merge remote-tracking branch 'regmap/for-6.8' into regmap-next) Merging sound/for-next (fd38dd6abda5 kselftest/alsa - conf: Stringify the printed errno in sysfs_get()) Merging ieee1394/for-next (986c20bb3e67 firewire: core: fill model field in modalias of unit device for legacy layout of configuration ROM) Merging sound-asoc/for-next (715d499e3eec Merge remote-tracking branch 'asoc/for-6.7' into asoc-linus) Merging modules/modules-next (4515d08a742c kernel/module: improve documentation for try_module_get()) Merging input/next (52c4e5985a73 Input: driver for Adafruit Seesaw Gamepad) Merging block/for-next (25c863bf8a6f Merge branch 'for-6.8/block' into for-next) CONFLICT (content): Merge conflict in fs/btrfs/zoned.h CONFLICT (content): Merge conflict in security/selinux/hooks.c CONFLICT (content): Merge conflict in security/smack/smack_lsm.c Merging device-mapper/for-next (5d6f447b07d5 MAINTAINERS: remove stale info for DEVICE-MAPPER) Merging libata/for-next (fa7280e5dd81 MAINTAINERS: Add Niklas Cassel as libata maintainer) Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer()) Merging mmc/next (5d4021334748 mmc: xenon: Add ac5 support via bounce buffer) Merging mfd/for-mfd-next (284d16c456e5 mfd: ti_am335x_tscadc: Fix TI SoC dependencies) Merging backlight/for-backlight-next (7d84a63a39b7 backlight: hx8357: Convert to agnostic GPIO API) Merging battery/for-next (b150a703b56f power: supply: bq24190_charger: Add support for BQ24296) Merging regulator/for-next (94cc3087aac4 dt-bindings: regulator: Convert ti,tps65132 to YAML) Merging security/next (f1bb47a31dff lsm: new security_file_ioctl_compat() hook) Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile()) Merging integrity/next-integrity (c00f94b3a5be overlay: disable EVM) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) Merging selinux/next (bbf5a1d0e5d0 selinux: Fix error priority for bind with AF_UNSPEC on PF_INET6 socket) Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso()) Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) Merging tpmdd/next (2b6fad7a900d tpm: cr50: fix kernel-doc warning and spelling) Merging watchdog/master (9546b21ea672 watchdog: mlx_wdt: fix all kernel-doc warnings) Merging iommu/next (75f74f85a42e Merge branches 'apple/dart', 'arm/rockchip', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next) CONFLICT (content): Merge conflict in arch/Kconfig 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 (5d81c811f371 Merge remote-tracking branch 'spi/for-6.8' into spi-next) Merging tip/master (30389e86e7f6 Merge branch into tip/master: 'x86/tdx') Merging clockevents/timers/drivers/next (c0c4579d79d0 clocksource/drivers/ep93xx: Fix error handling during probe) Merging edac/edac-for-next (e6e10e8939e0 Merge branch 'edac-misc' into edac-for-next) Merging ftrace/for-next (4af12c95cbe8 Merge probes/for-next) CONFLICT (content): Merge conflict in fs/tracefs/inode.c Merging rcu/rcu/next (7dfb03dd24d4 Merge branches 'doc.2023.12.13a', 'torture.2023.11.23a', 'fixes.2023.12.13a', 'rcu-tasks.2023.12.12b' and 'srcu.2023.12.13a' into rcu-merge.2023.12.13a) Merging kvm/next (1c6d984f523f x86/kvm: Do not try to disable kvmclock if it was not enabled) CONFLICT (content): Merge conflict in io_uring/io_uring.c 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" Applying: LoongArch: KVM: Fix build due to API changes Merging kvm-arm/next (040113fa32f2 KVM: arm64: Add missing memory barriers when switching to pKVM's hyp pgd) Merging kvms390/next (10f7b1dcdfe0 KVM: s390: cpu model: Use proper define for facility mask size) Merging kvm-ppc/topic/ppc-kvm (180c6b072bf3 KVM: PPC: Book3S HV nestedv2: Do not cancel pending decrementer exception) Merging kvm-riscv/riscv_kvm_next (aad86da229bc RISC-V: KVM: selftests: Add get-reg-list test for STA registers) Merging kvm-x86/next (1c6d984f523f x86/kvm: Do not try to disable kvmclock if it was not enabled) Merging xen-tip/linux-next (2d2db7d40254 xen/gntdev: Fix the abuse of underlying struct page in DMA-buf import) Merging percpu/for-next (1e653a292c26 Merge branch 'for-6.8' into for-next) Merging workqueues/for-next (4a6c5607d450 workqueue: Make sure that wq_unbound_cpumask is never empty) Merging drivers-x86/for-next (236f7d8034ff platform/x86/amd/pmc: Modify SMU message port for latest AMD platform) Merging chrome-platform/for-next (57eb6dcd32cf platform/chrome/wilco_ec: Remove usage of the deprecated ida_simple_xx() API) Merging chrome-platform-firmware/for-firmware-next (09aeaabebdaf firmware: coreboot: Convert to platform remove callback returning void) 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 (4289e434c46c leds: trigger: netdev: Add core support for hw not supporting fallback to LED sw control) Merging ipmi/for-next (9bd9fbd9032a ipmi: Remove usage of the deprecated ida_simple_xx() API) Merging driver-core/driver-core-next (c312828c37a7 kernfs: convert kernfs_idr_lock to an irq safe raw spinlock) Merging usb/usb-next (933bb7b878dd usb: typec: tipd: fix use of device-specific init function) Merging thunderbolt/next (04b99eac389a thunderbolt: Reduce retry timeout to speed up boot for some devices) Merging usb-serial/usb-next (a39b6ac3781d Linux 6.7-rc5) Merging tty/tty-next (0c84bea0cabc serial: sc16is7xx: refactor EFR lock) Merging char-misc/char-misc-next (5850edccec30 android: removed duplicate linux/errno) CONFLICT (content): Merge conflict in drivers/android/binder_alloc.c Merging accel/habanalabs-next (a9f07790a4b2 accel/habanalabs: fix information leak in sec_attest_info()) Merging coresight/next (60e5f23dc5d6 coresight: ultrasoc-smb: Use guards to cleanup) Merging fastrpc/for-next (b85ea95d0864 Linux 6.7-rc1) Merging fpga/for-next (c849ecb2ae84 fpga: zynq-fpga: Convert to platform remove callback returning void) Merging icc/icc-next (869b601db3b7 Merge branch 'icc-fixes' into icc-next) Merging iio/togreg (b1a1eaf61836 Merge tag 'iio-for-6.8b' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next) Merging phy-next/next (2029e71482fc phy: ti: j721e-wiz: Add SGMII support in WIZ driver for J784S4) Merging soundwire/next (becfce5233a7 soundwire: amd: drop bus freq calculation and set 'max_clk_freq') Merging extcon/extcon-next (7803680964c0 extcon: qcom-spmi-misc: don't use kernel-doc marker for comment) Merging gnss/gnss-next (0cbbbe09d49b gnss: ubx: add support for the reset gpio) Merging vfio/next (78f70c02bdbc vfio/virtio: fix virtio-pci dependency) Merging w1/for-next (93c4bb3666a3 w1: ds2433: add support for ds28ec20 eeprom) Merging spmi/spmi-next (b85ea95d0864 Linux 6.7-rc1) Merging staging/staging-next (0a46c21c21c1 Staging: rtl8192e: Rename variable OpMode) Merging counter-next/counter-next (49ca40f8d6ce counter: linux/counter.h: fix Excess kernel-doc description warning) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (3d0b2176e042 dmaengine: xilinx: xdma: statify xdma_prep_interleaved_dma) Merging cgroup/for-next (b7aaea747923 Merge branch 'for-6.8' into for-next) Merging scsi/for-next (2d1fce73f826 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (904fdd2062f3 scsi: mpi3mr: Fix mpi3mr_fw.c kernel-doc warnings) Merging vhost/linux-next (6fa5e0b86f2b virtio_net: Fix "‘%d’ directive writing between 1 and 11 bytes into a region of size 10" warnings) Merging rpmsg/for-next (ff9af5732fe7 Merge branches 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (1979a2807547 gpiolib: replace the GPIO device mutex with a read-write semaphore) Merging gpio-intel/for-next (92fc925f8386 gpio: tangier: simplify locking using cleanup helpers) Merging pinctrl/for-next (0ef4b05e2dfb Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (ebe7f3393784 pinctrl: intel: Add Intel Meteor Point pin controller and GPIO support) Merging pinctrl-renesas/renesas-pinctrl (9e5889c68d99 pinctrl: renesas: rzg2l: Add input enable to the Ethernet pins) Merging pinctrl-samsung/for-next (6cf96df77338 pinctrl: samsung: add exynosautov920 pinctrl) Merging pwm/for-next (d73f444d06fb pwm: linux/pwm.h: fix Excess kernel-doc description warning) 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 (ee9793be08b1 tracing/selftests: Add ownership modification tests for eventfs) Merging kunit/test (b85ea95d0864 Linux 6.7-rc1) Merging kunit-next/kunit (539e582a375d kunit: Fix some comments which were mistakenly kerneldoc) Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next) Merging rtc/rtc-next (e3d3fe7e7bf0 rtc: class: Remove usage of the deprecated ida_simple_xx() API) Merging nvdimm/libnvdimm-for-next (a085a5eb6594 acpi/nfit: Use sysfs_emit() for all attributes) 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 (98b1cc82c4af Linux 6.7-rc2) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (b85ea95d0864 Linux 6.7-rc1) Merging nvmem/for-next (b85ea95d0864 Linux 6.7-rc1) 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 (01bd694ac2f6 bus: mhi: host: Drop chan lock before queuing buffers) Merging memblock/for-next (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability) Merging cxl/next (3601311593eb Merge branch 'for-6.8/cxl-cper' into for-6.8/cxl) CONFLICT (content): Merge conflict in drivers/acpi/apei/ghes.c CONFLICT (content): Merge conflict in include/linux/acpi.h CONFLICT (content): Merge conflict in lib/fw_table.c Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (4afa688d7141 efi: memmap: fix kernel-doc warnings) Merging unicode/for-next (b837a816b36f MAINTAINERS: update unicode maintainer e-mail address) Merging slab/slab/for-next (61d7e367f8bc Merge branch 'slab/for-6.8/slub-hook-cleanups' into slab/for-next) 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 (40ab4e0407f6 landlock: Document IOCTL support) Merging rust/rust-next (711cbfc71765 docs: rust: Clarify that 'rustup override' applies to build directory) Merging sysctl/sysctl-next (561429807d50 sysctl: remove struct ctl_path) Merging execve/for-next/execve (38132920f430 exec: remove useless comment) CONFLICT (content): Merge conflict in MAINTAINERS Merging bitmap/bitmap-for-next (071ad962baf5 bitmap: Step down as a reviewer) CONFLICT (content): Merge conflict in drivers/tty/serial/sc16is7xx.c Merging hte/for-next (b85ea95d0864 Linux 6.7-rc1) Merging kspp/for-next/kspp (a75b3809dce2 qnx4: Use get_directory_fname() in qnx4_match()) Merging kspp-gustavo/for-next/kspp (5ea9350aab7e 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 (453586c6035e iommufd/selftest: Check the bus type during probe) Merging devicetree/for-next (c80d96febb31 Merge branch 'dt/header-fixes-for-next' into for-next) Merging header_cleanup/header_cleanup (1e2f2d31997a Kill sched.h dependency on rcupdate.h) CONFLICT (content): Merge conflict in arch/x86/include/asm/paravirt_types.h CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h
Attachment:
pgpZZNYifi5v3.pgp
Description: OpenPGP digital signature
