Hi all, Changes since 20231025: The vfs-brauner tree gained a conflict against the bcachefs tree. The drm tree lost its build failure. The ftrace tree still had its build failure so I used the version from next-20231020. The iommufd tree gained a conflict against the iommu tree. Non-merge commits (relative to Linus' tree): 14171 11602 files changed, 762857 insertions(+), 276354 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 369 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 (611da07b89fd Merge tag 'acpi-6.6-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (e2ed99b82ddb mm/damon/sysfs: remove requested targets when online-commit inputs) 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 (47b8def9358c powerpc/mm: Avoid calling arch_enter/leave_lazy_mmu() in set_ptes) Merging s390-fixes/fixes (c1ae1c59c8c6 s390/pci: fix iommu bitmap allocation) 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 (1711435e3e67 net: ipv6: fix typo in comments) Merging bpf/master (cd8892c07876 Merge branch 'gtp-tunnel-driver-fixes') Merging ipsec/master (de5724ca38fd xfrm: fix a data-race in xfrm_lookup_with_ifid()) Merging netfilter/main (a63b6622120c net/sched: act_ct: additional checks for outdated flows) Merging ipvs/main (a63b6622120c net/sched: act_ct: additional checks for outdated flows) Merging wireless/for-next (91535613b609 wifi: mac80211: don't drop all unprotected public action frames) 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 (99248c8902f5 ALSA: usb-audio: add quirk flag to enable native DSD for McIntosh devices) Merging sound-asoc-fixes/for-linus (7dd692217b86 ASoC: SOF: sof-pci-dev: Fix community key quirk detection) 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 (05d3ef8bba77 Linux 6.6-rc7) Merging usb-serial-fixes/usb-linus (52480e1f1a25 USB: serial: option: add Fibocom to DELL custom modem FM101R-GL) Merging phy/fixes (05d3ef8bba77 Linux 6.6-rc7) 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 (28926daf731f fpga: Fix memory leak for fpga_region_test_class_find()) 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 (920057ad521d hwmon: (nct6775) Fix incorrect variable reuse in fan_div calculation) 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 (7a444b6e7de2 Merge branch 'misc-6.6' into next-fixes) Merging vfs-fixes/fixes (57af52cacec7 sparc32: fix a braino in fault handling in csum_and_copy_..._user()) 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 (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 (05d3ef8bba77 Linux 6.6-rc7) Merging drm-intel-fixes/for-linux-next-fixes (4cbed7702eb7 drm/i915/pmu: Check if pmu is closed before stopping event) 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 (03d4bf9ff34a 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 (479ac419206b gpiolib: acpi: Add missing memset(0) to acpi_get_gpiod_from_data()) 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 (1531309aa209 soc: renesas: Make ARCH_R9A07G043 depend on required options) Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging perf-current/perf-tools (4fa008a2db48 tools build: Fix llvm feature detection, still used by bpftool) Merging efi-fixes/urgent (c03d21f05e76 Merge 3rd batch of EFI fixes into efi/urgent) 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 (cfd96726e611 rust: docs: fix logo replacement) Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5) Merging w1-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) Merging pmdomain-fixes/fixes (2e75396f1df6 pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable) Merging overlayfs-fixes/ovl-fixes (beae836e9c61 ovl: temporarily disable appending lowedirs) Merging drm-misc-fixes/for-linux-next-fixes (4e6c38c38723 drm/logicvc: Kconfig: select REGMAP and REGMAP_MMIO) Merging mm-stable/mm-stable (158978945f31 mm: perform the mapping_map_writable() check after call_mmap()) Merging mm-nonmm-stable/mm-nonmm-stable (5176140c5094 ocfs2: fix a typo in a comment) Merging mm/mm-everything (c6b4068cbd8a 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 (c4a852635edd perf data: Increase RLIMIT_NOFILE limit when open too many files in perf_data__create_dir()) Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4) Merging dma-mapping/for-next (36d91e851598 dma-debug: Fix a typo in a debugging eye-catcher) Merging asm-generic/master (550087a0ba91 hexagon: Remove unusable symbols from the ptrace.h uapi) 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 (22e877699642 Revert "arm64: pgtable: No need for checking if PMD_SIZE is defined") CONFLICT (content): Merge conflict in arch/arm64/include/asm/tlb.h Merging arm-perf/for-next/perf (b805cafc604b perf: hisi: Fix use-after-free when register pmu fails) Merging arm-soc/for-next (a82cfa293bde Merge branch 'soc/drivers' into for-next) 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 (62a3c97f8167 Merge branch 'devicetree/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 (2b05c2dc230b 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 (fd1299bf9ce8 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 (269024fecd16 Merge branch 'for-next/ffa/fixes' 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 (2234981539e7 Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (7d2da28125ce Merge branch 'zynqmp/dt' into for-next) Merging clk/clk-next (661487899769 Merge branch 'clk-mediatek' 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 (2508b608f402 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 (4b7d3ab44565 MIPS: AR7: remove platform) Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment) Merging parisc-hd/for-next (09bf42f3fe4e parisc: Show default CPU PSW.W setting as reported by PDC) Merging powerpc/next (36e826b568e4 powerpc/vmcore: Add MMU information to vmcoreinfo) 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 (8445432611b4 Merge branch 'features' into for-next) Merging sh/for-next (78a96c86a0ff Documentation: kernel-parameters: Add earlyprintk=bios on SH) 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 (7413ab70cbc1 bcachefs: Refactor memcpy into direct assignment) 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 (0bf9d90e55da smb3: fix creating FIFOs when mounting with "sfu" mount option) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix) Merging erofs/dev (07ab48016117 erofs: simplify compression configuration parser) Merging exfat/dev (b3a62a988600 exfat: support create zero-size directory) Merging ext3/for_next (482a57af3d5b Pull fanotify fixup to disallow sb marks for overlayfs.) Merging ext4/dev (c388da1dad59 ext4: properly sync file size update after O_SYNC direct IO) Merging f2fs/dev (1e7bef5f90ed f2fs: finish previous checkpoints before returning from remount) 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 (26ad55ecccd5 gfs2: fs: derive f_fsid from s_uuid) Merging jfs/jfs-next (a779ed754e52 jfs: define xtree root and page independently) Merging ksmbd/ksmbd-for-next (0c180317c654 ksmbd: add support for surrogate pair conversion) Merging nfs/linux-next (05d3ef8bba77 Linux 6.6-rc7) 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 (25d50b014f14 9p/net: xen: fix false positive printf format overflow warning) 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 (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 (46af9de45cb5 Merge branch 'vfs.f_fsid' into vfs.all) CONFLICT (content): Merge conflict in fs/xfs/xfs_buf.c CONFLICT (content): Merge conflict in include/linux/exportfs.h Applying: bcachefs: convert to new timestamp accessors Merging vfs/for-next (1aee9158bc97 nfsd: lock_rename() needs both directories to live on the same fs) Merging printk/for-next (fbddff2e98cf Merge branch 'for-6.7' into for-next) Merging pci/next (8767ea08e421 Merge branch 'pci/misc') Merging pstore/for-next/pstore (a19d48f7c5d5 pstore/platform: Add check for kstrdup) Merging hid/for-next (80eb9e65a687 Merge branch 'for-6.7/logitech' into for-next) Merging i2c/i2c/for-next (9b156db7e479 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 (45e70fd40bce hwmon: (nct6683) Add another customer ID for ASRock X670E Taichi) Merging jc_docs/docs-next (16794ed32de9 docs: usb: fix reference to nonexistent file in UVC Gadget) Merging v4l-dvb/master (94e27fbeca27 media: cec: meson: always include meson sub-directory in Makefile) Merging v4l-dvb-next/master (48016737a9af media: platform: cadence: select MIPI_DPHY dependency) Merging pm/linux-next (f9c7f9d537da Merge branch 'pm-devfreq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (6aa2f7738c6d cpufreq: qcom-nvmem: add support for IPQ8074) Merging cpupower/cpupower (6feb1a964119 cpupower: fix reference to nonexistent document) Merging devfreq/devfreq-next (8f0cd531ee18 dt-bindings: devfreq: event: rockchip,dfi: Add rk3588 support) Merging pmdomain/next (fad5bf2e2c90 pmdomain: qcom: rpmpd: Add QM215 power domains) CONFLICT (content): Merge conflict in drivers/soc/apple/Kconfig Merging opp/opp/linux-next (35e0964e4876 dt-bindings: opp: opp-v2-kryo-cpu: Document named opp-microvolt property) Merging thermal/thermal/linux-next (9618efe343ea thermal/qcom/tsens: Drop ops_v0_1) Merging dlm/next (eb53c01873ca MAINTAINERS: Update dlm maintainer and web page) Merging rdma/for-next (7a1c2abf9a2b RDMA/core: Remove NULL check before dev_{put, hold}) CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mr.c Merging net-next/main (8846f9a04b10 Merge branch 'mptcp-features-and-fixes-for-v6-7') CONFLICT (content): Merge conflict in net/mac80211/rx.c Merging bpf-next/for-next (22360fad5889 Merge branch 'Add bpf programmable net device') Merging ipsec-next/master (53a5b4f2ea85 xfrm Fix use after free in __xfrm6_udp_encap_rcv.) Merging mlx5-next/mlx5-next (82f9378c443c net/mlx5: Handle IPsec steering upon master unbind/bind) Merging netfilter-next/main (9cdee0634769 netfilter: nf_tables: Carry reset boolean in nft_set_dump_ctx) Merging ipvs-next/main (9cdee0634769 netfilter: nf_tables: Carry reset boolean in nft_set_dump_ctx) Merging bluetooth/master (0783375f2c56 Bluetooth: ISO: Allow binding a PA sync socket) Merging wireless-next/for-next (1002f8171d96 wifi: ray_cs: Remove unnecessary (void*) conversions) 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 (a2786e8bdd02 crypto: qcom-rng - Add missing dependency on hw_random) Merging drm/drm-next (0ecf4aa32b78 Merge tag 'amd-drm-next-6.7-2023-10-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) 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/gpu/drm/msm/msm_drv.c $ git rm -f arch/ia64/include/asm/fb.h Applying: fix up for "drm: Add HPD state to drm_connector_oob_hotplug_event()" Merging drm-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape) Merging drm-misc/for-linux-next (b8644c4ae2b6 drm/doc: document DRM_IOCTL_MODE_CREATE_DUMB) Merging amdgpu/drm-next (edb423e91309 drm/amd: Explicitly disable ASPM when dynamic switching disabled) Merging drm-intel/for-linux-next (bc725dc1a831 drm/i915/display: debugfs entry to list display capabilities) 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) 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 (147de49d6ead fbdev: offb: Simplify offb_init_fb()) Merging regmap/for-next (7b4d73072bcc Merge remote-tracking branch 'regmap/for-6.7' into regmap-next) Merging sound/for-next (264aeb994ea8 ASoC: SOF: Make return of remove_late void, too) Merging ieee1394/for-next (a464d2f75fa1 firewire: Annotate struct fw_node with __counted_by) Merging sound-asoc/for-next (3edc85e3bfcb Merge remote-tracking branch 'asoc/for-6.7' into asoc-next) 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 (8aa6053114f3 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 drivers/nvme/target/tcp.c 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 (bb59301c1737 dm: respect REQ_NOWAIT flag in normal bios issued to DM) 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 (07e78e215188 MAINTAINERS: mmc: take over as maintainer of MCI & SDHCI MICROCHIP DRIVERS) Merging mfd/for-mfd-next (ff1b6dd21b25 mfd: Use i2c_get_match_data() in a selection of drivers) Merging backlight/for-backlight-next (40da4737717b backlight: pwm_bl: Disable PWM on shutdown, suspend and remove) Merging battery/for-next (469d31745b9f power: reset: vexpress: Use device_get_match_data()) Merging regulator/for-next (1e04e1974449 Merge remote-tracking branch 'regulator/for-6.7' into regulator-next) Merging security/next (e50856067289 lsm: fix a spelling mistake) Merging apparmor/apparmor-next (6cede10161be apparmor: Fix some kernel-doc comments) Merging integrity/next-integrity (b302f360831c certs: Only allow certs signed by keys on the builtin keyring) 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 (03acb9ccec3f keys: Remove unused extern declarations) Merging watchdog/master (db7673e6d578 Watchdog: marvell_gti_wdt: Remove redundant dev_err_probe() for platform_get_irq()) Merging iommu/next (ae51251a36b6 Merge branches 'arm/tegra', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd', 'core' and 's390' 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 (460babc96c13 dt-bindings: irqchip: renesas,irqc: Add r8a779f0 support) 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 (f6218c7e590f Merge remote-tracking branch 'spi/for-6.7' into spi-next) Merging tip/master (6ebc9646fd8f Merge branch into tip/master: 'x86/tdx') CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl 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 (6f15b178cd63 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 (4e6d16da50fa Merge probes/for-next) CONFLICT (content): Merge conflict in tools/testing/selftests/user_events/abi_test.c $ git reset --hard HEAD^ Merging next-20231020 version of ftrace CONFLICT (content): Merge conflict in tools/testing/selftests/user_events/abi_test.c [master e0a8a278a07a] next-20231020/ftrace 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 (dfad6c40b4be Merge branch kvm-arm64/nv-trap-fixes into kvmarm/next) CONFLICT (content): Merge conflict in arch/arm64/kvm/arm.c CONFLICT (content): Merge conflict in arch/arm64/kvm/mmu.c Merging kvms390/next (70fea3019516 KVM: s390: add tracepoint in gmap notifier) Merging kvm-ppc/topic/ppc-kvm (b7bce570430e powerpc/kvm: Force cast endianness of KVM shared regs) 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 (d9c00f44e5de KVM: riscv: selftests: Add SBI DBCN extension to get-reg-list test) Merging kvm-x86/next (c076acf10c78 Merge branches 'lam', 'misc', 'mmu' and 'pmu') 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 (e485c7a1939d Merge remote-tracking branch 'intel-speed-select/intel-sst' into review-ilpo) 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 (0217f3944aeb Documentation: security-bugs.rst: linux-distros relaxed their rules) Merging usb/usb-next (ec0989703642 Revert "dt-bindings: usb: Add bindings for multiport properties on DWC3 controller") CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/ti,tps6598x.yaml CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3588s.dtsi Merging thunderbolt/next (a558892b3456 thunderbolt: Fix one kernel-doc comment) Merging usb-serial/usb-next (8a749fd1a872 Linux 6.6-rc4) Merging tty/tty-next (6f699743aebf serial: core: Fix runtime PM handling for pending tx) CONFLICT (modify/delete): arch/ia64/kernel/setup.c deleted in HEAD and modified in tty/tty-next. Version tty/tty-next of arch/ia64/kernel/setup.c left in tree. CONFLICT (modify/delete): drivers/firmware/pcdp.c deleted in HEAD and modified in tty/tty-next. Version tty/tty-next of drivers/firmware/pcdp.c left in tree. $ git rm -f arch/ia64/kernel/setup.c drivers/firmware/pcdp.c Merging char-misc/char-misc-next (421359cbdbdc parport: Drop even more 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 (fa55e63584f2 Documentation: coresight: fix `make refcheckdocs` warning) 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 (89e2233386a5 iio: proximity: sx9324: Switch to device_property_match_property_string()) Merging phy-next/next (d688c8264b8e phy: Remove duplicated include in phy-ralink-usb.c) 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 (2b88119e35b0 vfio/mtty: Enable migration support) Merging w1/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging staging/staging-next (5d9f6f26ec66 staging: vt6655: Rename variable byEIFS) CONFLICT (modify/delete): drivers/staging/qlge/qlge_devlink.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/qlge/qlge_devlink.c left in tree. $ git rm -f drivers/staging/qlge/qlge_devlink.c 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 (e76fe87efdfb Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (a75a16c62a25 scsi: ufs: core: Leave space for 'Merging vhost/linux-next (ac7e98c73c05 vhost-vdpa: fix NULL pointer deref in _compat_vdpa_reset) Merging rpmsg/for-next (6dc66a309673 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (9bc633117d6a hte: tegra194: add GPIOLIB dependency) 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 (a64f16de8076 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 (9ea459e477dc libnvdimm: remove kernel-doc warnings:) 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 (ca7384334d9b Revert "nvmem: add new config option") 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 (12606ba1d46b 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 (5329aa5101f7 efivarfs: Add uid/gid mount options) 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 (3857af38e57a docs: rust: add "The Rust experiment" section) 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 (bdcb37a5d8de buildid: reduce header file dependencies for module) Merging hte/for-next (091ac92dc79e hte: tegra194: Switch to LATE_SIMPLE_DEV_PM_OPS()) CONFLICT (content): Merge conflict in drivers/hte/Kconfig Merging kspp/for-next/kspp (9cca73d7b4bf hwmon: (acpi_power_meter) replace open-coded kmemdup_nul) 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 tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (1660f1d4d969 mm: Deprecate pasid field) CONFLICT (content): Merge conflict in drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c CONFLICT (content): Merge conflict in drivers/iommu/intel/pasid.c CONFLICT (content): Merge conflict in include/linux/iommu.h
Attachment:
pgpYSHZqz2PYw.pgp
Description: OpenPGP digital signature
