Hi all, Changes since 20231018: The vfs-brauner tree gained a build failure so I used the version from next-20231018. The drm tree inherited the amdgpu tree build failure but I used some supplied patches. The tip tree gained a conflict against the efi-fixes tree. The gpio-brgl tree gained a conflict against the gpio-brgl-fixes tree. The kselftest tree gained a conflict against the mm-hotfixes tree. The bitmap tree gained a conflict against the net-next tree and a build failure, so I used the version from next-20231018. Non-merge commits (relative to Linus' tree): 12590 10506 files changed, 698537 insertions(+), 239794 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 368 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 (dd72f9c7e512 Merge tag 'spi-fix-v6-6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (446d5e321008 mm/vmalloc: fix the unchecked dereference warning in vread_iter()) Merging kbuild-current/fixes (8a749fd1a872 Linux 6.6-rc4) Merging arc-current/for-curr (0bb80ecc33a8 Linux 6.6-rc1) Merging arm-current/fixes (2dde18cd1d8f Linux 6.5) Merging arm64-fixes/for-next/fixes (4785aa802853 cpuidle, ACPI: Evaluate LPI arch_flags for broadcast timer) Merging arm-soc-fixes/arm/fixes (eaf16b92b18c Merge tag 'omap-fixes-audio-clock-and-modem-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap 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 (eb1e6ccdcf78 zorro: Include zorro.h in names.c) Merging powerpc-fixes/fixes (f9bc9bbe8afd powerpc/qspinlock: Fix stale propagated yield_cpu) Merging s390-fixes/fixes (327899674eef s390/kasan: handle DCSS mapping in memory holes) 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 (2915240eddba neighbor: tracing: Move pin6 inside CONFIG_IPV6=y section) Merging bpf/master (9ff8d2717fc8 bpf: Fix unnecessary -EBUSY from htab_lock_bucket) Merging ipsec/master (de5724ca38fd xfrm: fix a data-race in xfrm_lookup_with_ifid()) Merging netfilter/main (2915240eddba neighbor: tracing: Move pin6 inside CONFIG_IPV6=y section) Merging ipvs/main (2915240eddba neighbor: tracing: Move pin6 inside CONFIG_IPV6=y section) Merging wireless/for-next (f2ac54ebf856 net: rfkill: reduce data->mtx scope in rfkill_fop_open) 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 (94f6f0550c62 Linux 6.6-rc5) Merging sound-current/for-linus (8e13caa2150b Merge tag 'asoc-fix-v6.6-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (e8ecffd9962f ASoC: da7219: Correct the process of setting up Gnd switch in AAD) Merging regmap-fixes/for-linus (7a795ac8d49e regmap: rbtree: Fix wrong register marked as in-cache when creating new node) Merging regulator-fixes/for-linus (6e800968f6a7 regulator/core: Revert "fix kobject release warning and memory leak in regulator_register()") Merging spi-fixes/for-linus (c3aa5cb264a3 spi: nxp-fspi: use the correct ioremap function) Merging pci-current/for-linus (0bb80ecc33a8 Linux 6.6-rc1) Merging driver-core.current/driver-core-linus (8a749fd1a872 Linux 6.6-rc4) Merging tty.current/tty-linus (58720809f527 Linux 6.6-rc6) Merging usb.current/usb-linus (8b695369a6f2 Merge tag 'thunderbolt-for-v6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus) Merging usb-serial-fixes/usb-linus (52480e1f1a25 USB: serial: option: add Fibocom to DELL custom modem FM101R-GL) Merging phy/fixes (089667aaaa6a phy: realtek: Realtek PHYs should depend on ARCH_REALTEK) Merging staging.current/staging-linus (0bb80ecc33a8 Linux 6.6-rc1) Merging iio-fixes/fixes-togreg (bee448390e51 iio: afe: rescale: Accept only offset channels) Merging counter-current/counter-current (58720809f527 Linux 6.6-rc6) Merging char-misc.current/char-misc-linus (2382c1b04423 nvmem: imx: correct nregs for i.MX6ULL) Merging soundwire-fixes/fixes (58720809f527 Linux 6.6-rc6) Merging thunderbolt-fixes/fixes (ec4405ed9203 thunderbolt: Call tb_switch_put() once DisplayPort bandwidth request is finished) Merging input-current/for-linus (5c15c60e7be6 Input: powermate - fix use-after-free in powermate_config_complete) Merging crypto-current/master (b11950356c4b KEYS: asymmetric: Fix sign/verify on pkcs1pad without a hash) Merging vfio-fixes/for-linus (c777b11d34e0 vfio/mdev: Fix a null-ptr-deref bug for mdev_unregister_parent()) Merging kselftest-fixes/fixes (cf5a103c98a6 selftests/user_events: Fix abi_test for BE archs) Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) Merging dmaengine-fixes/fixes (58720809f527 Linux 6.6-rc6) Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) Merging mtd-fixes/mtd/fixes (f6ca3fb6978f mtd: rawnand: Ensure the nand chip supports cached reads) Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) Merging v4l-dvb-fixes/fixes (c46f16f156ac media: i2c: ov8858: Don't set fwnode in the driver) Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) Merging mips-fixes/mips-fixes (8a749fd1a872 Linux 6.6-rc4) Merging at91-fixes/at91-fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging omap-fixes/fixes (0b9a4a67c60d clk: ti: Fix missing omap5 mcbsp functional clock and aliases) Merging kvm-fixes/master (2b3f2325e71f Merge tag 'kvm-x86-selftests-6.6-fixes' of https://github.com/kvm-x86/linux into HEAD) Merging kvms390-fixes/master (f87ef5723536 KVM: s390: fix gisa destroy operation might lead to cpu stalls) Merging hwmon-fixes/hwmon (6465e260f487 Linux 6.6-rc3) Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) Merging cxl-fixes/fixes (c66650d29764 cxl/acpi: Annotate struct cxl_cxims_data with __counted_by) Merging btrfs-fixes/next-fixes (dcb1886a86a4 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 (99c09c985e59 platform/mellanox: mlxbf-tmfifo: Fix a warning message) 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 (19007c629c63 dt-bindings: trivial-devices: Fix MEMSIC MXC4005 compatible string) Merging dt-krzk-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging scsi-fixes/fixes (097c06394c83 scsi: qla2xxx: Fix double free of dsd_list during driver load) Merging drm-fixes/drm-fixes (58720809f527 Linux 6.6-rc6) Merging drm-intel-fixes/for-linux-next-fixes (e339c6d628fe drm/i915: Retry gtt fault when out of fence registers) Merging mmc-fixes/fixes (84ee19bffc93 mmc: core: Capture correct oemid-bits for eMMC cards) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (58720809f527 Linux 6.6-rc6) Merging hyperv-fixes/hyperv-fixes (42999c904612 hv/hv_kvp_daemon:Support for keyfile based connection profile) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (3fec323339a4 drivers: perf: Fix panic in riscv SBI mmap support) Merging riscv-dt-fixes/riscv-dt-fixes (cf98fe6b579e riscv: dts: starfive: visionfive 2: correct spi's ss pin) Merging riscv-soc-fixes/riscv-soc-fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging fpga-fixes/fixes (6a935361500a fpga: Fix memory leak for fpga_region_test_class_find()) Merging spdx/spdx-linus (8a749fd1a872 Linux 6.6-rc4) Merging gpio-brgl-fixes/gpio/for-current (fc363413ef8e gpio: vf610: set value before the direction to avoid a glitch) 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 (3048102d9d68 erofs: update documentation) Merging kunit-fixes/kunit-fixes (0bb80ecc33a8 Linux 6.6-rc1) 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 (0d32a6bbb8e7 NFSD: Fix zero NFSv4 READ results when RQ_SPLICE_OK is not set) Merging irqchip-fixes/irq/irqchip-fixes (b673fe1a6229 MAINTAINERS: Remove myself from the general IRQ subsystem maintenance) 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 (f38f547314b8 perf dlfilter: Add a test for object_code()) Merging efi-fixes/urgent (db7724134c26 x86/boot: efistub: Assign global boot_params variable) Merging zstd-fixes/zstd-linus (f064f4e5ecb1 zstd: Fix array-index-out-of-bounds UBSAN warning) Merging battery-fixes/fixes (8894b4325488 power: supply: qcom_battmgr: fix enable request endianness) 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 (344b6c0a7514 rust: fix bindgen build error with fstrict-flex-arrays) Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5) Merging w1-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging pmdomain-fixes/fixes (767881c470b3 pmdomain: imx: scu-pd: correct DMA2 channel) Merging overlayfs-fixes/ovl-fixes (beae836e9c61 ovl: temporarily disable appending lowedirs) Merging drm-misc-fixes/for-linux-next-fixes (fa8391ad68c1 gpu/drm: Eliminate DRM_SCHED_PRIORITY_UNSET) Merging mm-stable/mm-stable (b0540208a59e mm/ksm: document pages_skipped sysfs knob) Merging mm-nonmm-stable/mm-nonmm-stable (c37e56cac3d6 crash_core.c: remove unneeded functions) Merging mm/mm-everything (f9363c83ed1d Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (7715d094a5c3 kbuild: unify no-compiler-targets and no-sync-config-targets) Merging clang-format/clang-format (5d0c230f1de8 Linux 6.5-rc4) Merging perf/perf-tools-next (9a13ee457a6e perf: script: fix missing ',' for fields option) Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4) Merging dma-mapping/for-next (2d5780bbef8d swiotlb: fix the check whether a device has used software IO TLB) Merging asm-generic/master (f82060480095 asm-generic: Fix spelling of architecture) CONFLICT (modify/delete): arch/ia64/include/asm/cpu.h deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/ia64/include/asm/cpu.h left in tree. CONFLICT (modify/delete): arch/ia64/kernel/setup.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/ia64/kernel/setup.c left in tree. CONFLICT (modify/delete): arch/ia64/kernel/topology.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/ia64/kernel/topology.c left in tree. $ git rm -f arch/ia64/kernel/setup.c arch/ia64/include/asm/cpu.h arch/ia64/kernel/topology.c Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (c7368ddba2ff ARM: 9326/1: make <linux/uaccess.h> self-contained for ARM) Merging arm64/for-next/core (f165830779c7 Merge branch 'for-next/misc' into for-next/core) Merging arm-perf/for-next/perf (1f33cdef8ca1 drivers/perf: xgene: Use device_get_match_data()) Merging arm-soc/for-next (4138246fc35b soc: document merges) Merging amlogic/for-next (996fc07dce79 Merge branch 'v6.7/defconfig' 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 (3be891e01a89 Merge branches 'defconfig-for-v6.7', 'dt-for-v6.7' and 'soc-for-v6.7' into for-next) Merging at91/at91-next (3cec9514911c ARM: dts: at91: sam9x60_curiosity: Add mandatory dt property for RTT) Merging broadcom/next (61641804ab35 Merge branch 'drivers/next' into next) Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1) Merging drivers-memory/for-next (09de3691daab memory: Use device_get_match_data()) Merging imx-mxs/for-next (fa81543ef854 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (9802b60bd6d8 Merge branch 'v6.6-next/soc' into for-next) Merging mvebu/for-next (93e6b023e552 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (cb1114df7bb0 Merge branch 'fixes' into for-next) Merging qcom/for-next (9916a5e4f38f Merge branches 'arm64-defconfig-for-6.7', 'arm64-fixes-for-6.6', 'arm64-for-6.7', 'clk-for-6.7', 'drivers-for-6.7' and 'dts-for-6.7' into for-next) Merging renesas/next (11476f31ceaf Merge branch '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 (5212700e76b3 Merge branch 'v6.7-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (b7df1b3a7a1b Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (b98e85977c50 Merge branches 'for-next/scmi/updates', 'for-next/ffa/updates', 'for-next/vexpress/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 (1aeb02d3f2c5 ARM: dts: stm32: add SDIO pinctrl sleep support on stm32f7 boards) Merging sunxi/sunxi/for-next (c3f7c14856eb riscv: dts: allwinner: convert isa detection to new properties) Merging tee/next (6a8b7e801054 tee: optee: Use kmemdup() to replace kmalloc + memcpy) Merging tegra/for-next (650220c2b474 Merge branch for-6.7/arm64/dt into for-next) Merging ti/ti-next (36b6a2050470 Merge branch 'ti-drivers-soc-next' into ti-next) Merging xilinx/for-next (7d2da28125ce Merge branch 'zynqmp/dt' into for-next) Merging clk/clk-next (b7c08e5d3824 Merge branch 'clk-doc' into clk-next) Merging clk-imx/for-next (2838820800dc clk: imx: imx8qm/qxp: add more resources to whitelist) Merging clk-renesas/renesas-clk (4bce4bedbe6d clk: renesas: r9a08g045: Add clock and reset support for SDHI1 and SDHI2) Merging csky/linux-next (5195c35ac4f0 csky: Fixup compile error) Merging loongarch/loongarch-next (2c10cda4b777 LoongArch: KVM: Add maintainers for LoongArch KVM) Merging m68k/for-next (03191fb3db3d m68k: lib: Include <linux/libgcc.h> for __muldi3()) Merging m68knommu/for-next (efd91d2142ed m68k: 68000: fix warning in timer code) 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 (4d0f332a6fb6 MIPS: Remove dead code in relocate_new_kernel) Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment) Merging parisc-hd/for-next (5df83bdb46b9 drm/radeon: Add flushing code for parisc architecture) Merging powerpc/next (c7e0d9bb9154 powerpc: Only define __parse_fpscr() when required) 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 (81b5948cf1a7 riscv: dts: starfive: convert isa detection to new properties) Merging riscv-soc/riscv-soc-for-next (22dedf8f4570 soc/microchip: mpfs-sys-controller: Convert to platform remove callback returning void) Merging s390/for-next (f51a3f36f7d6 Merge branch 'features' into for-next) 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 (a83a72730c33 xtensa: import ESP32S3 core variant) Merging bcachefs/for-next (a1fea94f1270 bcachefs: KEY_TYPE_error now counts towards i_sectors) 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 (15baf55481de fscrypt: track master key presence separately from secret) Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums) Merging btrfs/for-next (c6e8f898f56f btrfs: open code timespec64 in struct btrfs_inode) Merging ceph/master (07bb00ef00ac ceph: fix type promotion bug on 32bit systems) Merging cifs/for-next (647f3a88f0d1 Add definition for new smb3.1.1 command type) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix) Merging erofs/dev (78a50b6a4166 erofs: fix inode metadata space layout description in documentation) Merging exfat/dev (b3a62a988600 exfat: support create zero-size directory) Merging ext3/for_next (21cdd81765e7 Pull fsnotify cleanup.) Merging ext4/dev (a37d4c46392e ext4: fix racy may inline data check in dio write) Merging f2fs/dev (3e729e50d01e f2fs: preload extent_cache for POSIX_FADV_WILLNEED) Merging fsverity/for-next (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty) Merging fuse/for-next (ae3024a4c499 docs/fuse-io: Document the usage of DIRECT_IO_ALLOW_MMAP) Merging gfs2/for-next (18e0c7817d45 gfs2: No longer use 'extern' in function declarations) Merging jfs/jfs-next (a779ed754e52 jfs: define xtree root and page independently) Merging ksmbd/ksmbd-for-next (b0e493f09ffc ksmbd: fix kernel-doc comment of ksmbd_vfs_setxattr()) Merging nfs/linux-next (58720809f527 Linux 6.6-rc6) Merging nfs-anna/linux-next (379e4adfddd6 NFSv4.1: fixup use EXCHGID4_FLAG_USE_PNFS_DS for DS server) Merging nfsd/nfsd-next (3fd2ca5be07f svcrdma: Fix tracepoint printk format) Merging ntfs3/master (e4494770a5ca fs/ntfs3: Avoid possible memory leak) Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) Merging overlayfs/overlayfs-next (0b41c33dd34b ovl: Add documentation on nesting of overlayfs mounts) 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 (cbc06310c36f xfs: reinstate the old i_version counter as STATX_CHANGE_COOKIE) Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) Merging iomap/iomap-for-next (684f7e6d28e8 iomap: Spelling s/preceeding/preceding/g) 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 (bf41e4d8a2ae Merge branch 'vfs.super' into vfs.all) CONFLICT (content): Merge conflict in fs/internal.h CONFLICT (content): Merge conflict in fs/ntfs3/inode.c CONFLICT (content): Merge conflict in fs/ntfs3/namei.c CONFLICT (content): Merge conflict in fs/open.c CONFLICT (content): Merge conflict in fs/xfs/xfs_buf.c Applying: bcachefs: convert to new timestamp accessors $ git reset --hard HEAD^ Merging next-20231018 version of vfs-brauner CONFLICT (content): Merge conflict in fs/ntfs3/inode.c CONFLICT (content): Merge conflict in fs/ntfs3/namei.c CONFLICT (content): Merge conflict in fs/xfs/xfs_buf.c [master a73d71bdf56d] next-20231018/vfs-brauner Applying: bcachefs: convert to new timestamp accessors [master 0dc4f64e8e34] next-20231018/vfs-brauner Merging vfs/for-next (1aee9158bc97 nfsd: lock_rename() needs both directories to live on the same fs) Merging printk/for-next (a26f18f291f6 Merge branch 'rework/misc-cleanups' into for-next) Merging pci/next (6e2fca71e187 Merge branch 'pci/misc') Merging pstore/for-next/pstore (a19d48f7c5d5 pstore/platform: Add check for kstrdup) Merging hid/for-next (d4ce72c23d31 Merge branch 'for-6.7/selftests' into for-next) Merging i2c/i2c/for-next (f168a3309a18 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (57ec42b9a1b7 i3c: Fix typo "Provisional ID" to "Provisioned ID") Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) Merging hwmon-staging/hwmon-next (443f18550476 hwmon: (adt7475) Add support for Imon readout on ADT7490) Merging jc_docs/docs-next (f949cb759051 docs/zh_TW: update contents for zh_TW) Merging v4l-dvb/master (2c1bae27df78 media: qcom: camss: Fix pm_domain_on sequence in probe) Merging v4l-dvb-next/master (94e27fbeca27 media: cec: meson: always include meson sub-directory in Makefile) Applying: v4l-dvb-next: fix up for bad automatic merge. Merging pm/linux-next (701ff0817fdd Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-tools' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (2e12b516f5e6 Merge branch 'cpufreq/arm/qcom-nvmem' into HEAD) Merging cpupower/cpupower (0bb80ecc33a8 Linux 6.6-rc1) Merging devfreq/devfreq-next (6c29e29e4d7f PM / devfreq: mediatek: unlock on error in mtk_ccifreq_target()) Merging pmdomain/next (55089e1fb2d8 pmdomain: qcom: rpmhpd: Drop the ->opp_to_performance_state() callback) CONFLICT (content): Merge conflict in drivers/soc/apple/Kconfig Merging opp/opp/linux-next (5ea4911359a5 OPP: No need to defer probe from _opp_attach_genpd()) Merging thermal/thermal/linux-next (edd220b33f47 thermal: core: Drop thermal_zone_device_register()) Merging dlm/next (eb53c01873ca MAINTAINERS: Update dlm maintainer and web page) Merging rdma/for-next (5ac388db27c4 RDMA/irdma: Add support to re-register a memory region) CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mr.c Merging net-next/main (c4eee56e14fe net: skb_find_text: Ignore patterns extending past 'to') CONFLICT (content): Merge conflict in net/mac80211/key.c Merging bpf-next/for-next (0e133a133703 bpf, docs: Define signed modulo as using truncated division) Merging ipsec-next/master (efedce336d71 Merge branch 'xfrm: policy: replace session decode with flow dissector') Merging mlx5-next/mlx5-next (82f9378c443c net/mlx5: Handle IPsec steering upon master unbind/bind) Merging netfilter-next/main (c4eee56e14fe net: skb_find_text: Ignore patterns extending past 'to') Merging ipvs-next/main (c4eee56e14fe net: skb_find_text: Ignore patterns extending past 'to') Merging bluetooth/master (8a589c6d138e Bluetooth: hci_sync: Fix Opcode prints in bt_dev_dbg/err) Merging wireless-next/for-next (ee2a35fedbc9 Merge tag 'mlx5-updates-2023-10-10' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) 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 (6135e730f81d mtd: Use device_get_match_data()) Merging nand/nand/next (6dc597401cf5 mtd: rawnand: Remove unused of_gpio.h inclusion) Merging spi-nor/spi-nor/next (6823a8383420 mtd: spi-nor: micron-st: use SFDP table for mt25qu512a) Merging crypto/master (5b90073defd1 crypto: hisilicon/qm - alloc buffer to set and get xqc) Merging drm/drm-next (27442758e9b4 Merge tag 'amd-drm-next-6.7-2023-10-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) 2af351d692dd ("Revert "drm/amdgpu: Report vbios version instead of PN"") CONFLICT (modify/delete): arch/ia64/include/asm/fb.h deleted in HEAD and modified in drm/drm-next. Version drm/drm-next of arch/ia64/include/asm/fb.h left in tree. CONFLICT (content): Merge conflict in drivers/accel/ivpu/ivpu_fw.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_drv.h $ git rm -f arch/ia64/include/asm/fb.h Merging drm-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape) Merging drm-misc/for-linux-next (2d23e7d6bacb dt-bindings: display: Add SSD132x OLED controllers) Applying: fix up for "drm: Add HPD state to drm_connector_oob_hotplug_event()" Merging amdgpu/drm-next (cd90511557fd drm/amdgpu/vkms: fix a possible null pointer dereference) Applying: drm/amd/display: Reduce stack size by splitting function Applying: drm/amd/display: Fix stack size issue on DML2 Merging drm-intel/for-linux-next (213c43676beb drm/i915/mtl: Remove the 'force_probe' requirement for Meteor Lake) Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (b08d26dac1a1 drm/msm/a7xx: actually use a7xx state registers) CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c Merging drm-msm-lumag/msm-next-lumag (d3b4075b173f drm/msm/dp: use correct lifetime device for devm_drm_bridge_add) Merging etnaviv/etnaviv/next (925b10728f20 drm/etnaviv: disable MLCG and pulse eater on GPU reset) Merging fbdev/for-next (513421a2567c fbdev: omapfb: Replace custom memparse() implementation) Merging regmap/for-next (7b4d73072bcc Merge remote-tracking branch 'regmap/for-6.7' into regmap-next) Merging sound/for-next (2b17b489e47a ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support) Merging ieee1394/for-next (a464d2f75fa1 firewire: Annotate struct fw_node with __counted_by) Merging sound-asoc/for-next (ca34c962d70a Merge remote-tracking branch 'asoc/for-6.7' into asoc-next) CONFLICT (content): Merge conflict in sound/pci/hda/cs35l41_hda.c Merging modules/modules-next (3111add7f414 module: Annotate struct module_notes_attrs with __counted_by) CONFLICT (content): Merge conflict in scripts/mod/modpost.c Applying: fix up for "module: Make is_valid_name() return bool" Merging input/next (6cd256694afe Input: tegra-kbc - use device_get_match_data()) Merging block/for-next (e3db512c4ab6 Merge branch 'for-6.7/block' into for-next) CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (modify/delete): arch/ia64/kernel/syscalls/syscall.tbl deleted in HEAD and modified in block/for-next. Version block/for-next of arch/ia64/kernel/syscalls/syscall.tbl left in tree. 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/xtensa/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h $ git rm -f arch/ia64/kernel/syscalls/syscall.tbl Merging device-mapper/for-next (1d99b7e95035 dm thin: Use the extent allocator for data blocks) Merging libata/for-next (0e533cba3801 dt-bindings: ata: tegra: Disallow undefined properties) Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer()) Merging mmc/next (a2b8fa785358 mmc: jz4740: Use device_get_match_data()) Merging mfd/for-mfd-next (b5cd5e72a71e mfd: qcom-spmi-pmic: Switch to EXPORT_SYMBOL_GPL()) Merging backlight/for-backlight-next (40da4737717b backlight: pwm_bl: Disable PWM on shutdown, suspend and remove) Merging battery/for-next (b3c3a197baf2 power: supply: cpcap: Drop non-DT driver matching) Merging regulator/for-next (405c56cd47c4 Merge remote-tracking branch 'regulator/for-6.7' into regulator-next) Merging security/next (e50856067289 lsm: fix a spelling mistake) Merging apparmor/apparmor-next (8884ba07786c apparmor: fix invalid reference on profile->disconnected) Merging integrity/next-integrity (c1f30e80ce2c ima: annotate iint mutex to avoid lockdep false positive warnings) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) Merging selinux/next (19c1c9916dbf selinux: simplify avtab_insert_node() prototype) Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso()) Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) Merging tpmdd/next (1c8b86a3799f Merge tag 'xsa441-6.6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip) Merging watchdog/master (db7673e6d578 Watchdog: marvell_gti_wdt: Remove redundant dev_err_probe() for platform_get_irq()) Merging iommu/next (5b9fdb13c0fb Merge branches 'arm/tegra', 'arm/smmu', 's390', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next) CONFLICT (content): Merge conflict in drivers/iommu/Kconfig Merging audit/next (97f576eb38ae audit: Annotate struct audit_chunk with __counted_by) Merging devicetree/for-next (47b8fb4aef95 dt-bindings: usb: ti,tps6598x: Disallow undefined properties) Merging dt-krzk/for-next (d896029c9726 Merge branch 'next/dt64' into for-next) Merging mailbox/mailbox-for-next (a493208079e2 mailbox: qcom-ipcc: fix incorrect num_chans counting) Merging spi/for-next (9936214f22e4 Merge remote-tracking branch 'spi/for-6.7' into spi-next) Merging tip/master (823251ec1bf3 Merge branch into tip/master: 'x86/tdx') CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/x86-stub.c CONFLICT (content): Merge conflict in include/linux/pci_ids.h Merging clockevents/timers/drivers/next (0a8b07c77ea0 clocksource: Explicitly include correct DT includes) Merging edac/edac-for-next (0fd934580ea3 EDAC/versal: Add a Xilinx Versal memory controller driver) Merging irqchip/irq/irqchip-next (19b5a44bee16 irqchip: Add support for Amlogic-C3 SoCs) Merging ftrace/for-next (183d56f6d48e Merge probes/for-next) CONFLICT (content): Merge conflict in tools/testing/selftests/user_events/abi_test.c Merging rcu/rcu/next (5df10099418f srcu: Explain why callbacks invocations can't run concurrently) Merging kvm/next (2b3f2325e71f Merge tag 'kvm-x86-selftests-6.6-fixes' of https://github.com/kvm-x86/linux into HEAD) Merging kvm-arm/next (2e7e5ebbd62c Merge branch kvm-arm64/writable-id-regs into kvmarm/next) CONFLICT (content): Merge conflict in arch/arm64/kvm/arm.c Merging kvms390/next (70fea3019516 KVM: s390: add tracepoint in gmap notifier) Merging kvm-ppc/topic/ppc-kvm (476652297f94 docs: powerpc: Document nested KVM on POWER) CONFLICT (file location): Documentation/powerpc/kvm-nested.rst added in kvm-ppc/topic/ppc-kvm inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to Documentation/arch/powerpc/kvm-nested.rst. Merging kvm-riscv/riscv_kvm_next (62d0c458f828 KVM: riscv: selftests: get-reg-list print_reg should never fail) Merging kvm-x86/next (6f1cc3d67695 Merge branches 'apic', 'docs', 'misc', 'mmu', 'svm' and 'xen') Merging xen-tip/linux-next (2c269f42d0f3 xen-pciback: Consider INTx disabled when MSI/MSI-X is enabled) Merging percpu/for-next (3fcf62f24c80 Merge branch 'for-6.6' into for-next) Merging workqueues/for-next (d5ce8f4ed90b Merge branch 'for-6.7' into for-next) Merging drivers-x86/for-next (3f720b21ec5a platform/x86/amd/pmc: Add dump_custom_stb module parameter) Merging chrome-platform/for-next (466f70fb1b10 platform/chrome: kunit: make EC protocol tests independent) 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 (e0e29e434cdc leds: trigger: netdev: Move size check in set_device_name) Merging ipmi/for-next (b00839ca4cca ipmi: refactor deprecated strncpy) Merging driver-core/driver-core-next (36b2d7dd5a8a driver core: platform: Annotate struct irq_affinity_devres with __counted_by) Merging usb/usb-next (5220d8b04a84 dt-bindings: usb: gpio-sbu-mux: Make 'mode-switch' not required) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/ti,tps6598x.yaml Merging thunderbolt/next (274baf695b08 thunderbolt: Add DP IN added last in the head of the list of DP resources) Merging usb-serial/usb-next (8a749fd1a872 Linux 6.6-rc4) Merging tty/tty-next (fe2017ba24f3 Merge 6.6-rc6 into tty-next) Merging char-misc/char-misc-next (f7572e93d5f6 parport: Drop unneeded NULL or 0 assignments) Merging accel/habanalabs-next (08057253366d Merge tag 'drm-habanalabs-next-2023-10-10' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into drm-next) Merging coresight/next (4708eada8bd6 hwtracing: hisi_ptt: Add dummy callback pmu::read()) Merging fastrpc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging fpga/for-next (d79eed22ba97 fpga: versal: Add support for 44-bit DMA operations) Merging icc/icc-next (d4c720a19e9a Merge branch 'icc-platform-remove' into icc-next) Merging iio/togreg (89a1d2f064d2 iio: Use device_get_match_data()) Merging phy-next/next (03c866cab420 dt-bindings: phy: Convert PXA1928 USB/HSIC PHY to DT schema) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml Merging soundwire/next (4ea2b6d3128e soundwire: dmi-quirks: update HP Omen match) Merging extcon/extcon-next (b3edc3463d64 extcon: realtek: add the error handler for nvmem_cell_read) Merging gnss/gnss-next (0bb80ecc33a8 Linux 6.6-rc1) Merging vfio/next (bd885fcf28da vfio: Fix smatch errors in vfio_combine_iova_ranges()) Merging w1/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging staging/staging-next (a2fc3e821531 staging: rtl8192u: remove entry from Makefile) Merging counter-next/counter-next (7904cdf1397c counter: chrdev: remove a typo in header file comment) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (03f25d53b145 dmaengine: stm32-mdma: correct desc prep when channel running) Merging cgroup/for-next (b9a477034b11 Merge branch 'for-6.7' into for-next) Merging scsi/for-next (e0b9142e933d Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (2bbeb8d12404 scsi: core: Handle depopulation and restoration in progress) Merging vhost/linux-next (1fcc6eaf5907 vdpa/mlx5: Update cvq iotlb mapping on ASID change) Merging rpmsg/for-next (2cf7b3e8fb72 Merge branches 'hwspinlock-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (dc850faa28ee hte: tegra194: don't access struct gpio_chip) CONFLICT (content): Merge conflict in drivers/gpio/gpio-ljca.c CONFLICT (content): Merge conflict in drivers/gpio/gpio-vf610.c Merging gpio-intel/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging pinctrl/for-next (f314cd739d3f Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (8d751da9f1d7 pinctrl: intel: fetch community only when we need it) Merging pinctrl-renesas/renesas-pinctrl (583d80732055 pinctrl: renesas: rzn1: Convert to platform remove callback returning void) Merging pinctrl-samsung/for-next (8aec97decfd0 pinctrl: samsung: do not offset pinctrl numberspaces) Merging pwm/for-next (4bb36d126cb3 pwm: samsung: Document new member .channel in struct samsung_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 (5247e6dbed00 selftests/resctrl: Fix MBM test failure when MBA unavailable) CONFLICT (content): Merge conflict in tools/testing/selftests/clone3/clone3.c Merging kunit/test (0bb80ecc33a8 Linux 6.6-rc1) Merging kunit-next/kunit (8040345fdae4 kunit: test: Fix the possible memory leak in executor_test) Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next) Merging rtc/rtc-next (cfb67623ce28 dt-bindings: rtc: Add Mstar SSD202D RTC) Merging nvdimm/libnvdimm-for-next (dd6cad2dcb58 testing: nvdimm: make struct class structures constant) Merging at24/at24/for-next (3774740fb221 eeprom: at24: add ST M24C64-D Additional Write lockable page support) 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 (06c2afb862f9 Linux 6.5-rc1) Merging nvmem/for-next (24bd074c417b nvmem: Use device_get_match_data()) 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 (35b464e32c8b auxdisplay: hd44780: move cursor home after clear display command) Merging kgdb/kgdb/for-next (dd712d3d4580 kgdb: Flush console before entering kgdb on panic) Merging hmm/hmm (0bb80ecc33a8 Linux 6.6-rc1) Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (b910ee376ab3 bus: mhi: ep: Do not allocate event ring element on stack) 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 (e050a704f3c3 Merge branch 'slab/for-6.6/hotfixes' 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 (8b729be04c8f landlock: Document Landlock's network support) Merging rust/rust-next (a7135d107547 rust: Use grep -Ev rather than relying on GNU grep) Merging sysctl/sysctl-next (ccee9a2a8c00 intel drm: Remove now superfluous sentinel element from ctl_table array) Merging execve/for-next/execve (21ca59b365c0 binfmt_misc: enable sandboxed mounts) Merging bitmap/bitmap-for-next (e471961500f6 lib/bitmap: add compile-time test for __assign_bit() optimization) CONFLICT (content): Merge conflict in include/linux/linkmode.h $ git reset --hard HEAD^ Merging next-20231018 version of bitmap Merging hte/for-next (091ac92dc79e hte: tegra194: Switch to LATE_SIMPLE_DEV_PM_OPS()) Merging kspp/for-next/kspp (862c4ed787e7 string: Adjust strtomem_pad() logic to allow for smaller sources) 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 (266dcae34d8f iommufd/selftest: Rework TEST_LENGTH to test min_size explicitly) CONFLICT (content): Merge conflict in include/linux/iommu.h
Attachment:
pgp8zMt3VrVJ9.pgp
Description: OpenPGP digital signature
