Hi all, Changes since 20230914: The btrfs tree gained a conflist against the mm tree. The device-mapper tree gained a build failure so I used the version from next-20230914. The kspp tree lost its build failure. Non-merge commits (relative to Linus' tree): 5026 2501 files changed, 391711 insertions(+), 34318 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 366 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 (9fdfb15a3dbf Merge tag 'net-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (63f29827e9c2 filemap: add filemap_map_order0_folio() to handle order0 folio) Merging kbuild-current/fixes (552c5013f2bc kbuild: avoid long argument lists in make modules_install) Merging arc-current/for-curr (0bb80ecc33a8 Linux 6.6-rc1) Merging arm-current/fixes (6995e2de6891 Linux 6.4) Merging arm64-fixes/for-next/fixes (8bd795fedb84 arm64: csum: Fix OoB access in IP checksum code for negative lengths) Merging arm-soc-fixes/arm/fixes (3c78dbf25135 Merge tag 'qcom-arm64-fixes-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes) Merging davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-rc1) Merging drivers-memory-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) Merging m68k-current/for-linus (010d358b9087 m68k: sun3/3x: Add and use "sun3.h") Merging powerpc-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging s390-fixes/fixes (e5b7ca09e9aa Merge tag 's390-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) 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 (9fdfb15a3dbf Merge tag 'net-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf/master (6bd5bcb18f94 netfilter, bpf: Adjust timeouts of non-confirmed CTs in bpf_ct_insert_entry()) Merging ipsec/master (3e4bc23926b8 xfrm: fix a data-race in xfrm_gen_index()) Merging netfilter/main (7153a404fb70 Merge tag 'nf-23-09-06' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) Merging ipvs/main (931abcdcad10 Merge branch 'mlxsw-fixes') Merging wireless/for-next (6e48ebffc2db wifi: mac80211: fix mesh id corruption on 32 bit systems) Merging wpan/master (9a43827e876c net: dpaa2-mac: add 25gbase-r support) Merging rdma-fixes/for-rc (0bb80ecc33a8 Linux 6.6-rc1) Merging sound-current/for-linus (72ca56664e48 ALSA: hda: cs35l56: Don't 'return ret' if ret is always zero) Merging sound-asoc-fixes/for-linus (fac58baf8fcf ASoC: imx-rpmsg: Set ignore_pmdown_time for dai_link) Merging regmap-fixes/for-linus (0bb80ecc33a8 Linux 6.6-rc1) Merging regulator-fixes/for-linus (6223e073db78 regulator: Fix voltage range selection) Merging spi-fixes/for-linus (9855d60cfc72 spi: intel-pci: Add support for Granite Rapids SPI serial flash) Merging pci-current/for-linus (0bb80ecc33a8 Linux 6.6-rc1) Merging driver-core.current/driver-core-linus (fd6f7ad2fd4d driver core: return an error when dev_set_name() hasn't happened) Merging tty.current/tty-linus (0bb80ecc33a8 Linux 6.6-rc1) Merging usb.current/usb-linus (f26a679ed799 usb: typec: ucsi: Fix NULL pointer dereference) Merging usb-serial-fixes/usb-linus (0bb80ecc33a8 Linux 6.6-rc1) Merging phy/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging staging.current/staging-linus (0bb80ecc33a8 Linux 6.6-rc1) Merging iio-fixes/fixes-togreg (00be24c416e4 iio: light: vcnl4000: Don't power on/off chip in config) Merging counter-current/counter-current (df8fdd01c98b counter: microchip-tcb-capture: Fix the use of internal GCLK logic) Merging char-misc.current/char-misc-linus (98a158166360 Revert "comedi: add HAS_IOPORT dependencies") Merging soundwire-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging thunderbolt-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging input-current/for-linus (1ac731c529cd Merge branch 'next' into for-linus) Merging crypto-current/master (ba22e81872c1 crypto: powerpc/chacha20,poly1305-p10 - Add dependency on VSX) Merging vfio-fixes/for-linus (4752354af710 vfio/type1: check pfn valid before converting to struct page) Merging kselftest-fixes/fixes (7e021da80f48 selftests: tracing: Fix to unmount tracefs for recovering environment) Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) Merging dmaengine-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) Merging mtd-fixes/mtd/fixes (9836a987860e mtd: spinand: micron: correct bitmask for ecc status) Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) Merging v4l-dvb-fixes/fixes (735de5caf79e media: vb2: frame_vector.c: replace WARN_ONCE with a comment) Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) Merging mips-fixes/mips-fixes (6eaae1980760 Linux 6.5-rc3) Merging at91-fixes/at91-fixes (06c2afb862f9 Linux 6.5-rc1) Merging omap-fixes/fixes (06f114cf7cbe Merge branches 'fixes-mapphone' and 'fixes-ti-sysc' into fixes) Merging kvm-fixes/master (7c7cce2cf7ee Merge tag 'kvmarm-fixes-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvms390-fixes/master (c2fceb59bbda KVM: s390: pv: fix index value of replaced ASCE) Merging hwmon-fixes/hwmon (0bb80ecc33a8 Linux 6.6-rc1) Merging nvdimm-fixes/libnvdimm-fixes (e98d14fa7315 tools/testing/nvdimm: Drop empty platform remove function) Merging cxl-fixes/fixes (55b8ff06a0c7 cxl/pci: Replace host_bridge->native_aer with pcie_aer_is_native()) Merging btrfs-fixes/next-fixes (850c8ce8d391 Merge branch 'misc-6.6' into next-fixes) Merging vfs-fixes/fixes (609d54441493 fs: prevent out-of-bounds array speculation when closing a file descriptor) Merging dma-mapping-fixes/for-linus (bbb73a103fbb swiotlb: fix a braino in the alignment check fix) Merging drivers-x86-fixes/fixes (4106a70ddad5 platform/x86: asus-wmi: Support 2023 ROG X16 tablet mode) Merging samsung-krzk-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging pinctrl-samsung-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging devicetree-fixes/dt/linus (55e95bfccf6d of: dynamic: Fix potential memory leak in of_changeset_action()) Merging dt-krzk-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging scsi-fixes/fixes (dae40be7a1a7 scsi: lpfc: Prevent use-after-free during rmmod with mapped NVMe rports) Merging drm-fixes/drm-fixes (15794f9dc371 Merge tag 'drm-misc-fixes-2023-09-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (7c95ec3b5947 drm/i915: Only check eDP HPD when AUX CH is shared) Merging mmc-fixes/fixes (049639d6ee3a mmc: core: Fix error propagation for some ioctl commands) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (0bb80ecc33a8 Linux 6.6-rc1) Merging hyperv-fixes/hyperv-fixes (6ad0f2f91ad1 Drivers: hv: vmbus: Remove unused extern declaration vmbus_ontimer()) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (8eb8fe67e2c8 riscv: errata: fix T-Head dcache.cva encoding) Merging riscv-dt-fixes/riscv-dt-fixes (1558209533f1 riscv: dts: starfive: visionfive 2: Fix uart0 pins sort order) Merging riscv-soc-fixes/riscv-soc-fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging fpga-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) Merging spdx/spdx-linus (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl-fixes/gpio/for-current (2d48c30176fa MAINTAINERS: gpio-regmap: make myself a maintainer of it) Merging gpio-intel-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging pinctrl-intel-fixes/fixes (2d325e54d9e2 pinctrl: baytrail: fix debounce disable case) Merging erofs-fixes/fixes (75a5221630fe erofs: fix memory leak of LZMA global compressed deduplication) Merging kunit-fixes/kunit-fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging memblock-fixes/fixes (4b2d63123693 memblock tests: Fix compilation errors.) Merging nfsd-fixes/nfsd-fixes (88956eabfdea NFSD: fix possible oops when nfsd/pool_stats is closed.) Merging irqchip-fixes/irq/irqchip-fixes (cfa1f9db6d60 dt-bindings: interrupt-controller: renesas,rzg2l-irqc: Update description for '#interrupt-cells' property) Merging renesas-fixes/fixes (4c188fa183eb arm64: dts: renesas: rzg2l: Update overfow/underflow IRQ names for MTU3 channels) Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging perf-current/perf-tools (c2122b687c21 tools headers UAPI: Update tools's copy of drm.h headers) Merging efi-fixes/urgent (560f54eaa44c efi/x86: Disable buggy QueryVariableInfo() on HP ProBook x360) Merging zstd-fixes/zstd-linus (6906598f1ce9 zstd: Fix definition of assert()) Merging battery-fixes/fixes (cba320408d63 power: supply: rt9467: Fix rt9467_run_aicl()) 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 (0bb80ecc33a8 Linux 6.6-rc1) Merging rust-fixes/rust-fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5) Merging w1-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging pmdomain-fixes/fixes (e2ad626f8f40 pmdomain: Rename the genpd subsystem to pmdomain) Merging drm-misc-fixes/for-linux-next-fixes (139a27854bf5 drm/tests: helpers: Avoid a driver uaf) Merging mm-stable/mm-stable (0bb80ecc33a8 Linux 6.6-rc1) Merging mm-nonmm-stable/mm-nonmm-stable (0bb80ecc33a8 Linux 6.6-rc1) Merging mm/mm-everything (0afa242a6ce9 Merge branch 'mm-nonmm-unstable' into mm-everything) CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_dfs.c Merging kbuild/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging clang-format/clang-format (5d0c230f1de8 Linux 6.5-rc4) Merging perf/perf-tools-next (19d8ab40f89b perf test stat+shadow_stat.sh: Add threshold for rounding errors) Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4) Merging dma-mapping/for-next (8556f6921c28 swiotlb: fix the check whether a device has used software IO TLB) Merging asm-generic/master (6e8d96909a23 asm-generic: partially revert "Unify uapi bitsperlong.h for arm64, riscv and loongarch") Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (133789d4a458 Revert part of ae1f8d793a19 ("ARM: 9304/1: add prototype for function called only from asm")) Merging arm64/for-next/core (e1df27213941 Merge branch 'for-next/selftests' into for-next/core) Merging arm-perf/for-next/perf (21b61fe48c2f drivers/perf: hisi: Update HiSilicon PMU maintainers) Merging arm-soc/for-next (42ed07054d75 soc: document merges) Merging amlogic/for-next (929266f846b3 Merge branch 'v6.7/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (eaf935fa48ec soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX) CONFLICT (content): Merge conflict in drivers/soc/apple/Makefile Merging aspeed/for-next (05f42491c813 ARM: dts: aspeed: bonnell: Add reserved memory for TPM event log) Merging at91/at91-next (b04dba7c1c30 Merge branch 'at91-dt' into at91-next) Merging broadcom/next (a70e8c9ff89a Merge branch 'soc/next' into next) Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1) Merging drivers-memory/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging imx-mxs/for-next (246e2cc22265 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (f6925844c82a Merge branch 'v6.4-next/soc' into for-next) Merging mvebu/for-next (a8e364c2c428 Merge branch 'mvebu/drivers' into mvebu/for-next) Merging omap/for-next (6387fcbea64f Merge branch 'omap-for-v6.6/ti-sysc' into for-next) Merging qcom/for-next (8bd7b2c3151a Merge branches 'arm64-defconfig-for-6.7', 'arm64-fixes-for-6.6', 'arm64-for-6.7', 'clk-for-6.7' and 'drivers-for-6.7' into for-next) Merging renesas/next (f1f80f16cf65 Merge branches 'renesas-drivers-for-v6.7' and 'renesas-dts-for-v6.7' into renesas-next) Merging reset/reset/next (417a3a5ae44a reset: ti: syscon: remove unneeded call to platform_set_drvdata()) Merging rockchip/for-next (6d1fa8808888 Merge branch 'v6.5-armsoc/dtsfixes' into for-next) Merging samsung-krzk/for-next (4399e5a4a1aa Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (a184af4d455d Merge branches 'for-next/scmi/fixes', 'for-next/scmi/updates' and 'for-next/pcc/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (c848f884d1b4 ARM: dts: stm32: Add Octavo OSD32MP1-RED board) Merging sunxi/sunxi/for-next (aa333f5e8461 Merge branch 'sunxi/dt-for-6.6' into sunxi/for-next) Merging tee/next (6a8b7e801054 tee: optee: Use kmemdup() to replace kmalloc + memcpy) Merging tegra/for-next (c62440bd774b Merge branch for-6.6/arm64/dt into for-next) Merging ti/ti-next (0bb80ecc33a8 Linux 6.6-rc1) Merging xilinx/for-next (65d6e954e378 Merge tag 'gfs2-v6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) Merging clk/clk-next (78fd9cf91630 Merge branch 'clk-fixes' into clk-next) Merging clk-imx/for-next (72d00e560d10 clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz) Merging clk-renesas/renesas-clk (f3ea14c6a243 clk: renesas: r9a06g032: Use for_each_compatible_node()) Merging csky/linux-next (5195c35ac4f0 csky: Fixup compile error) Merging loongarch/loongarch-next (91f3eb2e7791 LoongArch: Don't inline kasan_mem_to_shadow()/kasan_shadow_to_mem()) Merging m68k/for-next (eb1e6ccdcf78 zorro: Include zorro.h in names.c) Merging m68knommu/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging microblaze/next (65d6e954e378 Merge tag 'gfs2-v6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) Merging mips/mips-next (e7513eccb7d7 MIPS: TXx9: Do PCI error checks on own line) Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment) Merging parisc-hd/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging powerpc/next (0bb80ecc33a8 Linux 6.6-rc1) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) Merging risc-v/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging riscv-dt/riscv-dt-for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging riscv-soc/riscv-soc-for-next (78a03b9f8e6b riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE) Merging s390/for-next (06fc3b0d2251 s390/vmem: do not silently ignore mapping limit) Merging sh/for-next (246f80a0b17f sh: push-switch: Reorder cleanup operations to avoid use-after-free bug) Merging uml/next (974b808d85ab um: virt-pci: fix missing declaration warning) Merging xtensa/xtensa-for-next (8a55454ad4c0 xtensa: import ESP32S3 core variant) Merging bcachefs/for-next (60126357704b powerpc: Export kvm_guest static key, for bcachefs six locks) Applying: bcachefs: convert to dynamically allocated shrinkers 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 (324718ddddc4 fscrypt: improve the "Encryption modes and usage" section) Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums) Merging btrfs/for-next (7368638e1a1f Merge branch 'for-next-next-v6.6-20230914' into for-next-20230914) CONFLICT (content): Merge conflict in fs/btrfs/delayed-ref.c CONFLICT (content): Merge conflict in fs/btrfs/super.c CONFLICT (content): Merge conflict in fs/btrfs/transaction.c Merging ceph/master (ce0d5bd3a6c1 ceph: make num_fwd and num_retry to __u32) Merging cifs/for-next (05d0f8f55ad6 smb3: move server check earlier when setting channel sequence number) Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix) Merging erofs/dev (91b1ad0815fb erofs: release ztailpacking pclusters properly) Merging exfat/dev (b3a62a988600 exfat: support create zero-size directory) Merging ext3/for_next (d3cc1b0be258 quota: explicitly forbid quota files from being encrypted) Merging ext4/dev (b016ebb300e5 ext4: do not let fstrim block system suspend) Merging f2fs/dev (3669558bdf35 Merge tag 'for-6.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging fsverity/for-next (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty) Merging fuse/for-next (f73016b63b09 fuse: conditionally fill kstat in fuse_do_statx()) Merging gfs2/for-next (4f575b4604de gfs2: Fix another freeze/thaw hang) Merging jfs/jfs-next (0225e10972fa jfs: validate max amount of blocks before allocation.) Merging ksmbd/ksmbd-for-next (59d8d24f4610 ksmbd: fix passing freed memory 'aux_payload_buf') Merging nfs/linux-next (2dde18cd1d8f Linux 6.5) Merging nfs-anna/linux-next (806a3bc421a1 NFSv4.1: fix pnfs MDS=DS session trunking) Merging nfsd/nfsd-next (11d1df89720e lockd: add doc to enable EXPORT_OP_ASYNC_LOCK) Merging ntfs3/master (44b4494d5c59 fs/ntfs3: Correct mode for label entry inside /proc/fs/ntfs3/) Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) Merging overlayfs/overlayfs-next (724768a39374 ovl: fix incorrect fdput() on aio completion) Merging ubifs/next (017c73a34a66 ubi: Refuse attaching if mtd's erasesize is 0) Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7) Merging v9fs-ericvh/ericvh/for-next (2dde18cd1d8f Linux 6.5) Merging xfs/for-next (c1950a111dd8 fs/xfs: Fix typos in comments) Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) Merging iomap/iomap-for-next (4aa8cdd5e523 iomap: handle error conditions more gracefully in iomap_to_bh) 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 (f1aeef9b7b37 Merge branch 'vfs.mount.write' into vfs.all) Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' into for-next) Merging printk/for-next (189f53ec6668 Merge branch 'for-6.6-fixup' into for-next) Merging pci/next (0bb80ecc33a8 Linux 6.6-rc1) Merging pstore/for-next/pstore (94160062396d pstore: Base compression input buffer size on estimated compressed size) Merging hid/for-next (bd0ffb67f8d3 Merge branch 'for-6.6/upstream-fixes' into for-next) Merging i2c/i2c/for-next (637f33a4fe86 i2c: cadence: Fix the kernel-doc warnings) Merging i3c/i3c/next (0bb80ecc33a8 Linux 6.6-rc1) Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) Merging hwmon-staging/hwmon-next (80369d9e1f2f hwmon: (sch5627) Document behaviour of limit registers) Merging jc_docs/docs-next (86a0adc029d3 Documentation/sphinx: fix Python string escapes) Merging v4l-dvb/master (0bb80ecc33a8 Linux 6.6-rc1) Merging v4l-dvb-next/master (0835b195d034 media: ivsc: Depend on VIDEO_DEV) Merging pm/linux-next (77717cab9205 Merge branch 'pm-sleep' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (16567117aa0c cpufreq: Add QCM6490 to cpufreq-dt-platdev blocklist) Merging cpupower/cpupower (0bb80ecc33a8 Linux 6.6-rc1) Merging devfreq/devfreq-next (5693d077595d PM / devfreq: Fix leak in devfreq_dev_release()) Merging pmdomain/next (ae3a94e4adee pmdomain: starfive: Add JH7110 AON PMU support) Merging opp/opp/linux-next (e576a9a8603f dt-bindings: cpufreq: Convert ti-cpufreq to json schema) Merging thermal/thermal/linux-next (edd220b33f47 thermal: core: Drop thermal_zone_device_register()) Merging dlm/next (7c53e847ff5e dlm: fix plock lookup when using multiple lockspaces) Merging rdma/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging net-next/main (f2fa1c812c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf-next/for-next (971f7c32147f selftests/bpf: Skip module_fentry_shadow test when bpf_testmod is not available) Applying: bpf: Skip unit_size checking for global per-cpu allocator Merging ipsec-next/master (a94fd40a18ae xfrm: delete not-needed clear to zero of encap_oa) Merging mlx5-next/mlx5-next (0bb80ecc33a8 Linux 6.6-rc1) Merging netfilter-next/main (73be7fb14e83 Merge tag 'net-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs-next/main (c2e5f4fd1148 Merge branch 'netconsole-enable-compile-time-configuration') Merging bluetooth/master (e1030955f7aa Bluetooth: qca: add support for QCA2066) Merging wireless-next/for-next (9c386911b16d wifi: cfg80211: fix kernel-doc for wiphy_delayed_work_flush()) CONFLICT (content): Merge conflict in drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c CONFLICT (content): Merge conflict in net/wireless/nl80211.c Merging wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) Merging mtd/mtd/next (8ffd18a6744b mtd: lpddr_cmds: Add literal suffix) Merging nand/nand/next (48919c6c4838 mtd: rawnand: remove 'nand_exit_status_op()' prototype) Merging spi-nor/spi-nor/next (69d50d0461a1 mtd: spi-nor: nxp-spifi: Use helper function devm_clk_get_enabled()) Merging crypto/master (85b9bf9a514d Revert "dt-bindings: crypto: qcom,prng: Add SM8450") Merging drm/drm-next (0bb80ecc33a8 Linux 6.6-rc1) Merging drm-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape) Merging drm-misc/for-linux-next (d51f9fbd98b6 drm/ssd130x: Store the HW buffer in the driver-private CRTC state) CONFLICT (content): Merge conflict in drivers/gpu/drm/mediatek/mtk_dpi.c Merging amdgpu/drm-next (addd7aef251c drm/amdgpu: add remap_hdp_registers callback for nbio 7.11) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c Merging drm-intel/for-linux-next (3106c34df6ac drm/i915/dsc: Fix pic_width readout) Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (34b149ecae85 drm/msm/a6xx: Bail out early if setting GPU OOB fails) Merging drm-msm-lumag/msm-next-lumag (d93cf453f51d drm/msm/dpu: fix the irq index in dpu_encoder_phys_wb_wait_for_commit_done) Merging etnaviv/etnaviv/next (88c31d2dd191 drm/etnaviv: fix error code in event_alloc()) Merging fbdev/for-next (2dde18cd1d8f Linux 6.5) Merging regmap/for-next (d3601857e14d regmap: debugfs: Fix a erroneous check after snprintf()) Merging sound/for-next (72ca56664e48 ALSA: hda: cs35l56: Don't 'return ret' if ret is always zero) Merging ieee1394/for-next (2dde18cd1d8f Linux 6.5) Merging sound-asoc/for-next (b7c53e82862b Merge remote-tracking branch 'asoc/for-6.7' into asoc-next) Merging modules/modules-next (33c24bee4b78 kallsyms: Add more debug output for selftest) Merging input/next (305dd7645503 Input: wdt87xx_i2c - use device core to create driver-specific device attributes) Merging block/for-next (d975b468819a Merge branch 'io_uring-futex' into for-next) Merging device-mapper/for-next (edcabec81f12 dm thin: Use the extent allocator) $ git reset --hard HEAD^ Merging next-20230914 version of device-mapper Merging libata/for-next (fa2259a59966 ata: libata: Cleanup inline DMA helper functions) Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer()) Merging mmc/next (ca53cc22f099 mmc: Merge branch fixes into next) Merging mfd/for-mfd-next (9aab92bc3a89 mfd: mc13xxx: Simplify device data fetching in probe()) Merging backlight/for-backlight-next (a4464092f2c5 backlight: led_bl: Remove redundant of_match_ptr()) Merging battery/for-next (1769142a14c3 power: supply: rk817: query battery properties right after resume) Merging regulator/for-next (451e85e29c9d Merge remote-tracking branch 'regulator/for-6.7' into regulator-next) Merging security/next (20a2aa47097a lsm: constify 'sb' parameter in security_sb_kern_mount()) Merging apparmor/apparmor-next (8884ba07786c apparmor: fix invalid reference on profile->disconnected) Merging integrity/next-integrity (55e2b69649be kexec_lock: Replace kexec_mutex() by kexec_lock() in two comments) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) Merging selinux/next (9d140885e35d selinux: hweight optimization in avtab_read_item) Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso()) Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) Merging tpmdd/next (ea72883a3bf1 tpm: Fix typo in tpmrm class definition) Merging watchdog/master (8c776a0401f1 watchdog: Add support for Amlogic-T7 SoCs) Merging iommu/next (d8fe59f11096 Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'unisoc', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging audit/next (97f576eb38ae audit: Annotate struct audit_chunk with __counted_by) Merging devicetree/for-next (d117ca218b16 Merge branch 'dt/header-cleanups-for-6.6' into dt/next) Merging dt-krzk/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging mailbox/mailbox-for-next (a493208079e2 mailbox: qcom-ipcc: fix incorrect num_chans counting) Merging spi/for-next (678466ba6891 Merge remote-tracking branch 'spi/for-6.7' into spi-next) Merging tip/master (8bfcf4ca8b48 Merge branch into tip/master: 'x86/urgent') Merging clockevents/timers/drivers/next (0a8b07c77ea0 clocksource: Explicitly include correct DT includes) Merging edac/edac-for-next (ce53ad81ed36 EDAC/igen6: Fix the issue of no error events) Merging irqchip/irq/irqchip-next (19b5a44bee16 irqchip: Add support for Amlogic-C3 SoCs) Merging ftrace/for-next (fc1653abba0d Merge probes/for-next) Merging rcu/rcu/next (94e70d269433 Merge branch 'csd-lock.2023.07.14b' into HEAD) Merging kvm/next (7c7cce2cf7ee Merge tag 'kvmarm-fixes-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvm-arm/next (169c0f23cacc KVM: arm64: Properly return allocated EL2 VA from hyp_alloc_private_va_range()) Merging kvms390/next (899e2206f46a KVM: s390: pv: Allow AP-instructions for pv-guests) Merging kvm-riscv/riscv_kvm_next (477069398ed6 KVM: riscv: selftests: Add get-reg-list test) Merging kvm-x86/next (0bb80ecc33a8 Linux 6.6-rc1) Merging xen-tip/linux-next (475505975093 xen: simplify evtchn_do_upcall() call maze) Merging percpu/for-next (3fcf62f24c80 Merge branch 'for-6.6' into for-next) Merging workqueues/for-next (96796025f400 Merge branch 'for-6.6' into for-next) Merging drivers-x86/for-next (89f3eed9e13c platform/x86: think-lmi: Add bulk save feature) Merging chrome-platform/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging chrome-platform-firmware/for-firmware-next (0bb80ecc33a8 Linux 6.6-rc1) Merging hsi/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds-lj/for-leds-next (baca986e1f2c leds: aw2013: Enable pull-up supply for interrupt and I2C) Merging ipmi/for-next (b00839ca4cca ipmi: refactor deprecated strncpy) Merging driver-core/driver-core-next (0bb80ecc33a8 Linux 6.6-rc1) Merging usb/usb-next (0bb80ecc33a8 Linux 6.6-rc1) Merging thunderbolt/next (0bb80ecc33a8 Linux 6.6-rc1) Merging usb-serial/usb-next (0bb80ecc33a8 Linux 6.6-rc1) Merging tty/tty-next (0bb80ecc33a8 Linux 6.6-rc1) Merging char-misc/char-misc-next (0bb80ecc33a8 Linux 6.6-rc1) Merging accel/habanalabs-next (ef8b0cb1ba37 accel/habanalabs: fix ETR/ETF flush logic) CONFLICT (content): Merge conflict in drivers/accel/habanalabs/common/habanalabs.h Merging coresight/next (c0a232f1e19e coresight: trbe: Fix TRBE potential sleep in atomic context) Merging fastrpc/for-next (06c2afb862f9 Linux 6.5-rc1) Merging fpga/for-next (1a22ec09a2c1 fpga: region: make fpga_region_class a static const structure) Merging icc/icc-next (6ac3f01201fa Merge branch 'icc-debugfs' into icc-next) Merging iio/togreg (22da192f43f7 iio: pressure: ms5637: Use i2c_get_match_data()) Merging phy-next/next (0bb80ecc33a8 Linux 6.6-rc1) Merging soundwire/next (0bb80ecc33a8 Linux 6.6-rc1) Merging extcon/extcon-next (d20a3a8a32e3 extcon: cht_wc: add POWER_SUPPLY dependency) Merging gnss/gnss-next (0bb80ecc33a8 Linux 6.6-rc1) Merging vfio/next (642265e22ecc vfio/pds: Send type for SUSPEND_STATUS command) Merging w1/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging staging/staging-next (0bb80ecc33a8 Linux 6.6-rc1) Merging counter-next/counter-next (631c15d5f14d counter: chrdev: remove a typo in header file comment) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (0bb80ecc33a8 Linux 6.6-rc1) Merging cgroup/for-next (78d44b824ed0 cgroup: Avoid -Wstringop-overflow warnings) Merging scsi/for-next (dae40be7a1a7 scsi: lpfc: Prevent use-after-free during rmmod with mapped NVMe rports) Merging scsi-mkp/for-next (17d119498273 Merge patch series "scsi: ufs: qcom: Align programming sequence as per HW spec") Merging vhost/linux-next (1acfe2c12258 virtio_ring: fix avail_wrap_counter in virtqueue_add_packed) Merging rpmsg/for-next (9af45bbdcbbb remoteproc: zynqmp: fix TCM carveouts in lockstep mode) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (7777fa924754 gpio: eic-sprd: use a helper variable for &pdev->dev) Merging gpio-intel/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging pinctrl/for-next (020e9c593a0d Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (2d325e54d9e2 pinctrl: baytrail: fix debounce disable case) Merging pinctrl-renesas/renesas-pinctrl (21c11421db1f pinctrl: renesas: r8a7779: s/LSBC/LBSC/) Merging pinctrl-samsung/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging pwm/for-next (4aae44f65827 pwm: lpc32xx: Remove handling of PWM channels) 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 (3f3f384139ed selftests: Keep symlinks, when possible) Merging kunit/test (0bb80ecc33a8 Linux 6.6-rc1) Merging kunit-next/kunit (9076bc476d7e kunit: Fix possible memory leak in kunit_filter_suites()) Merging livepatching/for-next (ac4890f97211 Merge branch 'for-6.5/core' into for-next) Merging rtc/rtc-next (0bb80ecc33a8 Linux 6.6-rc1) Merging nvdimm/libnvdimm-for-next (08ca6906a4b7 nvdimm: Fix dereference after free in register_nvdimm_pmu()) Merging at24/at24/for-next (4cdc5dbbc1df eeprom: at24: Drop at24_get_chip_data()) Merging ntb/ntb-next (643982232860 ntb: Check tx descriptors outstanding instead of head/tail for tx queue) Merging seccomp/for-next/seccomp (46822860a5a9 seccomp: Add missing kerndoc notations) Merging fsi/next (f04d61a379d6 fsi: fix some spelling mistakes in comment) Merging slimbus/for-next (06c2afb862f9 Linux 6.5-rc1) Merging nvmem/for-next (06c2afb862f9 Linux 6.5-rc1) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) Merging hyperv/hyperv-next (284930a0146a x86/hyperv: Remove duplicate include) Merging auxdisplay/auxdisplay (35b464e32c8b auxdisplay: hd44780: move cursor home after clear display command) Merging kgdb/kgdb/for-next (b6464883f45a kdb: move kdb_send_sig() declaration to a better header file) Merging hmm/hmm (0bb80ecc33a8 Linux 6.6-rc1) Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (0724869ede9c bus: mhi: host: pci_generic: add support for Telit FE990 modem) Merging memblock/for-next (0f5e4adb608c memblock: report failures when memblock_can_resize is not set) Merging cxl/next (fe77cc2e5a6a cxl: Fix one kernel-doc comment) Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) Merging efi/next (b691118f2c44 Merge remote-tracking branch 'linux-efi/urgent' into efi/next) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/slab/for-next (46a9ea668190 mm/slab_common: fix slab_caches list corruption after kmem_cache_destroy()) 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 (2a2015495142 selftests/landlock: Fix a resource leak) Merging rust/rust-next (0bb80ecc33a8 Linux 6.6-rc1) Merging sysctl/sysctl-next (53f3811dfd5e sysctl: Use ctl_table_size as stopping criteria for list macro) Merging execve/for-next/execve (fdf0eaf11452 Linux 6.5-rc2) Merging bitmap/bitmap-for-next (bcafd8b927ed bitmap: Remove dead code, i.e. bitmap_copy_le()) Merging hte/for-next (06c2afb862f9 Linux 6.5-rc1) Merging kspp/for-next/kspp (32a4ec211d41 uapi: stddef.h: Fix __DECLARE_FLEX_ARRAY for C++) Merging kspp-gustavo/for-next/kspp (4d8cbf6dbcda fs: omfs: Use flexible-array member in struct omfs_extent) Merging nolibc/nolibc (0bb80ecc33a8 Linux 6.6-rc1) Merging iommufd/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Attachment:
pgpJHnCopNHZV.pgp
Description: OpenPGP digital signature
