Hi all, Changes since 20231215: New tree: header_cleanup The bpf-next tree gained a conflict against the net-next tree. The crypto tree gained a conflict against the jc_docs, wireless-next trees. The rcu tree gained a conflict against the jc_docs tree. The kunit-next gained a conflict against with Linus' tree. The execve tree gained a conflict against the net-next tree. The devicetree tree gained a conflict against the usb tree. The header_cleanup tree gained conflicts against the tip tree and some build failures, so I dropped the header_cleanup tree for today. Non-merge commits (relative to Linus' tree): 7995 8009 files changed, 370831 insertions(+), 209743 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 372 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 (0e389834672c Merge tag 'for-6.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (9238ca68a856 selftests: secretmem: floor the memory size to the multiple of page_size) Merging kbuild-current/fixes (98b1cc82c4af Linux 6.7-rc2) Merging arc-current/for-curr (9a733dc4fbee ARC: add hugetlb definitions) Merging arm-current/fixes (f54e8634d136 ARM: 9330/1: davinci: also select PINCTRL) Merging arm64-fixes/for-next/fixes (3c0696076aad arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify) Merging arm-soc-fixes/arm/fixes (d73ad797c83b Merge tag 'reset-fixes-for-v6.7' of git://git.pengutronix.de/pza/linux into arm/fixes) Merging davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-rc1) Merging drivers-memory-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) Merging m68k-current/for-linus (03191fb3db3d m68k: lib: Include <linux/libgcc.h> for __muldi3()) Merging powerpc-fixes/fixes (d2441d3e8c0c MAINTAINERS: powerpc: Add Aneesh & Naveen) Merging s390-fixes/fixes (b1a6a1a77f06 s390/scm: fix virtual vs physical address confusion) Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) Merging net/main (979e90173af8 Merge branch 'mptcp-misc-fixes') Merging bpf/master (117211aa739a bpf: Add missing BPF_LINK_TYPE invocations) Merging ipsec/master (76df934c6d5f MAINTAINERS: Add netdev subsystem profile link) Merging netfilter/main (1ae4cd3cbdd0 Merge branch 'bnxt_en-misc-fixes') Merging ipvs/main (1ae4cd3cbdd0 Merge branch 'bnxt_en-misc-fixes') Merging wireless/for-next (3c2a8ebe3fe6 wifi: cfg80211: fix certs build to not depend on file order) Merging wpan/master (83fcf26b00d7 ieee802154: Give the user the association list) Merging rdma-fixes/for-rc (a39b6ac3781d Linux 6.7-rc5) Merging sound-current/for-linus (ec1de5c214eb ALSA: hda/tas2781: select program 0, conf 0 by default) Merging sound-asoc-fixes/for-linus (f32c80d34249 ASoC: tas2781: check the validity of prm_no/cfg_no) Merging regmap-fixes/for-linus (fea88064445a regmap: fix bogus error on regcache_sync success) Merging regulator-fixes/for-linus (b85ea95d0864 Linux 6.7-rc1) Merging spi-fixes/for-linus (fc70d643a2f6 spi: atmel: Fix clock issue when using devices with different polarities) Merging pci-current/for-linus (5df12742b7e3 Revert "PCI: acpiphp: Reassign resources on bridge if necessary") Merging driver-core.current/driver-core-linus (2cc14f52aeb7 Linux 6.7-rc3) Merging tty.current/tty-linus (a39b6ac3781d Linux 6.7-rc5) Merging usb.current/usb-linus (7fbcd195e2b8 usb: fotg210-hcd: delete an incorrect bounds test) Merging usb-serial-fixes/usb-linus (06f22cd6635b USB: serial: option: add Quectel RM500Q R13 firmware support) Merging phy/fixes (2a9c713825b3 phy: sunplus: return negative error code in sp_usb_phy_probe) Merging staging.current/staging-linus (98b1cc82c4af Linux 6.7-rc2) Merging iio-fixes/fixes-togreg (1e8787459bfd iio: core: fix memleak in iio_device_register_sysfs) Merging counter-current/counter-current (a39b6ac3781d Linux 6.7-rc5) Merging char-misc.current/char-misc-linus (1e37bf84afac nvmem: brcm_nvram: store a copy of NVRAM content) Merging soundwire-fixes/fixes (393cae5f32d6 soundwire: intel_ace2x: fix AC timing setting for ACE2.x) Merging thunderbolt-fixes/fixes (f0b94c1c5c79 thunderbolt: Fix minimum allocated USB 3.x and PCIe bandwidth) Merging input-current/for-linus (c3d1610345b7 Input: xpad - add Razer Wolverine V2 support) Merging crypto-current/master (9aedd10fe384 crypto: ahash - Set using_shash for cloned ahash wrapper over shash) Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart) Merging kselftest-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) Merging dmaengine-fixes/fixes (4ee632c82d2d dmaengine: fsl-edma: fix DMA channel leak in eDMAv4) Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) Merging mtd-fixes/mtd/fixes (7c1b1906229d mtd: spinand: gigadevice: Fix the get ecc status issue) Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) Merging v4l-dvb-fixes/fixes (32138be394e5 Merge tag 'media-renesas-fixes-20231113' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git) Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets) Merging mips-fixes/mips-fixes (a39b6ac3781d Linux 6.7-rc5) Merging at91-fixes/at91-fixes (b85ea95d0864 Linux 6.7-rc1) Merging omap-fixes/fixes (c72b9c33ef96 ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init) Merging kvm-fixes/master (4cdf351d3630 KVM: SVM: Update EFER software model on CR0 trap for SEV-ES) Merging kvms390-fixes/master (27072b8e18a7 KVM: s390/mm: Properly reset no-dat) Merging hwmon-fixes/hwmon (a39b6ac3781d Linux 6.7-rc5) Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) Merging cxl-fixes/fixes (ef3d5cf9c59c cxl/pmu: Ensure put_device on pmu devices) Merging btrfs-fixes/next-fixes (cdec1b57f10a Merge branch 'misc-6.7' into next-fixes) Merging vfs-fixes/fixes (485053bb81c8 fix ufs_get_locked_folio() breakage) Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages) Merging drivers-x86-fixes/fixes (7bcd032370f8 platform/x86: intel_ips: fix kernel-doc formatting) Merging samsung-krzk-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging pinctrl-samsung-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging devicetree-fixes/dt/linus (136c6531ba12 dt-bindings: display: adi,adv75xx: Document #sound-dai-cells) Merging dt-krzk-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging scsi-fixes/fixes (77a672556096 scsi: ufs: core: Store min and max clk freq from OPP table) Merging drm-fixes/drm-fixes (7ba84cbf18c7 drm/nouveau/kms/nv50-: Don't allow inheritance of headless iors) Merging drm-intel-fixes/for-linux-next-fixes (e6861d8264cd drm/i915/edp: don't write to DP_LINK_BW_SET when using rate select) Merging mmc-fixes/fixes (1036f69e2513 mmc: core: Cancel delayed work before releasing host) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (a39b6ac3781d Linux 6.7-rc5) Merging hyperv-fixes/hyperv-fixes (564eac2860bd hv_utils: Allow implicit ICTIMESYNCFLAG_SYNC) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (eb46a0076501 riscv: Check if the code to patch lies in the exit section) Merging riscv-dt-fixes/riscv-dt-fixes (79997eda0d31 riscv: dts: microchip: move timebase-frequency to mpfs.dtsi) Merging riscv-soc-fixes/riscv-soc-fixes (b85ea95d0864 Linux 6.7-rc1) Merging fpga-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging spdx/spdx-linus (a39b6ac3781d Linux 6.7-rc5) Merging gpio-brgl-fixes/gpio/for-current (95dd1e34ff5b gpiolib: sysfs: Fix error handling on failed export) Merging gpio-intel-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging pinctrl-intel-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging erofs-fixes/fixes (62b241efff99 MAINTAINERS: erofs: add EROFS webpage) Merging kunit-fixes/kunit-fixes (1bddcf77ce66 kunit: test: Avoid cast warning when adding kfree() as an action) Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging memblock-fixes/fixes (55122e0130e5 memblock tests: fix warning ‘struct seq_file’ declared inside parameter list) Merging nfsd-fixes/nfsd-fixes (68d21604d91b NFSD: Revert 738401a9bd1ac34ccd5723d69640a4adbb1a4bc0) Merging irqchip-fixes/irq/irqchip-fixes (b673fe1a6229 MAINTAINERS: Remove myself from the general IRQ subsystem maintenance) Merging renesas-fixes/fixes (9eab43facdad soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM) Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging perf-current/perf-tools (b16937474874 perf list: Fix JSON segfault by setting the used skip_duplicate_pmus callback) Merging efi-fixes/urgent (50d7cdf7a9b1 efi/x86: Avoid physical KASLR on older Dell systems) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) Merging battery-fixes/fixes (f37669119423 power: supply: cw2015: correct time_to_empty units in sysfs) Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) Merging iommufd-fixes/for-rc (6f9c4d8c468c iommufd: Do not UAF during iommufd_put_object()) Merging rust-fixes/rust-fixes (cfd96726e611 rust: docs: fix logo replacement) Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5) Merging w1-fixes/fixes (b85ea95d0864 Linux 6.7-rc1) Merging pmdomain-fixes/fixes (0cb19e50a911 pmdomain: arm: Avoid polling for scmi_perf_domain) Merging overlayfs-fixes/ovl-fixes (413ba91089c7 ovl: fix dentry reference leak after changes to underlying layers) Merging drm-misc-fixes/for-linux-next-fixes (6c9dbee84cd0 drm/panel: ltk050h3146w: Set burst mode for ltk050h3148w) Merging mm-stable/mm-stable (d9d9bd979cce maple_tree: change return type of mas_split_final_node as void.) Merging mm-nonmm-stable/mm-nonmm-stable (fc0fbad122a7 merge mm-hotfixes-stable into mm-nonmm-stable to pick up depended-upon changes) Merging mm/mm-everything (b960ce977c11 Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (44028378399f gen_compile_commands.py: fix path resolve with symlinks in it) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (a61f89bf76ef perf top: Uniform the event name for the hybrid machine) Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4) Merging dma-mapping/for-next (b07bc2347672 dma-mapping: clear dev->dma_mem to NULL after freeing it) Merging asm-generic/master (d6e81532b10d Hexagon: Make pfn accessors statics inlines) CONFLICT (content): Merge conflict in arch/mips/include/asm/traps.h Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (f1ff4ced177d Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (fdd44642dc72 Merge branch 'for-next/fixes' into for-next/core) Merging arm-perf/for-next/perf (bb339db4d363 arm: perf: Fix ARCH=arm build with GCC) Merging arm-soc/for-next (16bcd9a4a332 Merge branch 'arm/fixes' into for-next) Merging amlogic/for-next (7406f70924e6 Merge branch 'v6.8/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (e60f7a99d378 ARM: dts: aspeed: minerva: add sgpio line name) Merging at91/at91-next (58f72e7817f1 Merge branch 'at91-dt' into at91-next) Merging broadcom/next (62a3c97f8167 Merge branch 'devicetree/next' into next) Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1) Merging drivers-memory/for-next (4a23d0f9814c memory: tegra: Protect SID override call under CONFIG_IOMMU_API) Merging imx-mxs/for-next (4db02d61a81e Merge branch 'imx/dt64' into for-next) Merging mediatek/for-next (9802b60bd6d8 Merge branch 'v6.6-next/soc' into for-next) Merging mvebu/for-next (476887312c60 Merge branch 'mvebu/drivers' into mvebu/for-next) Merging omap/for-next (0ea5e8402a47 Merge branches 'omap-for-v6.8/dt', 'omap-for-v6.8/defconfig' and 'omap-for-v6.8/maintainers' into for-next) Merging qcom/for-next (452e8fdfae6c Merge branches 'arm32-for-6.8', 'arm64-defconfig-for-6.8', 'arm64-for-6.8', 'clk-for-6.8', 'drivers-fixes-for-6.7' and 'drivers-for-6.8' into for-next) Applying: fix up for "of: Stop circularly including of_device.h and of_platform.h" Merging renesas/next (a4ce2434e9bb Merge branches 'renesas-drivers-for-v6.8' and 'renesas-dts-for-v6.8' into renesas-next) Merging reset/reset/next (c3c46acd5be9 dt-bindings: reset: hisilicon,hi3660-reset: Drop providers and consumers from example) Merging rockchip/for-next (242278ed93dd Merge branch 'v6.8-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (20c61794a302 Merge branch 'next/drivers' into for-next) Merging scmi/for-linux-next (7c2d214ab5b9 Merge tag 'scmi-updates-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (769e4b077b2e ARM: multi_v7_defconfig: enable STM32 DCMIPP media support) Merging sunxi/sunxi/for-next (d4d29dd858bb Merge branch 'sunxi/dt-for-6.8' into sunxi/for-next) Merging tee/next (84ec4fd88831 Merge branch 'tee_iov_iter_for_v6.8' into next) Merging tegra/for-next (8ebef8a28749 Merge branch for-6.8/arm/dt into for-next) Merging ti/ti-next (bfb1d67c6f85 Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (21d01d5afbc8 Merge remote-tracking branch 'zynqmp/soc' into for-next) Merging clk/clk-next (861b83030713 Merge branch 'clk-renesas' into clk-next) Merging clk-imx/for-next (144f1b70ea9e dt-bindings: clock: support i.MX93 ANATOP clock module) Merging clk-renesas/renesas-clk (515f05da372a clk: renesas: r9a08g045: Add clock and reset support for ETH0 and ETH1) Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging loongarch/loongarch-next (e2f7b3d8b4b3 LoongArch: BPF: Fix unconditional bswap instructions) Merging m68k/for-next (03191fb3db3d m68k: lib: Include <linux/libgcc.h> for __muldi3()) Merging m68knommu/for-next (a39b6ac3781d Linux 6.7-rc5) Merging microblaze/next (ffb0399437ef microblaze: defconfig: Enable the Marvell phy driver) Merging mips/mips-next (01940cd4a6b9 MIPS: SGI-IP27: hubio: fix nasid kernel-doc warning) Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment) Merging parisc-hd/for-next (33cc938e65a9 Linux 6.7-rc4) Merging powerpc/next (8fc63a91e785 Merge branch 'smp-topo' into next) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) Merging risc-v/for-next (f352a28cc2fb Merge patch series "riscv: report more ISA extensions through hwprobe") Merging riscv-dt/riscv-dt-for-next (56b10953da7e riscv: dts: starfive: Enable SDIO wifi on JH7100 boards) CONFLICT (content): Merge conflict in arch/riscv/boot/dts/sophgo/cv1800b.dtsi Applying: fixup for "riscv: dts: sophgo: Separate compatible specific for CV1800B soc" Merging riscv-soc/riscv-soc-for-next (a3ee4347490b Merge branch 'riscv-cache-for-next' into riscv-soc-for-next) Merging s390/for-next (9e81a2e6f94c Merge branch 'features' into for-next) Merging sh/for-next (b85ea95d0864 Linux 6.7-rc1) Merging uml/next (974b808d85ab um: virt-pci: fix missing declaration warning) Merging xtensa/xtensa-for-next (791beae7335c xtensa: Use PCI_HEADER_TYPE_MFD instead of literal) Merging bcachefs/for-next (ef22cfd2cd53 bcachefs: fsck -> bch2_trans_run()) Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging fscrypt/for-next (0fc24a6549f9 fscrypt: update comment for do_remove_key()) Merging afs/afs-next (f1302568cc65 afs: trace: Log afs_make_call(), including server address) Merging btrfs/for-next (9bd44dbd2924 Merge branch 'for-next-next-v6.7-20231215' into for-next-20231215) Merging ceph/master (d30d7c57a64d ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION) Merging cifs/for-next (a08c5aaa5ddb fs: cifs: Fix atime update check) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix) Merging erofs/dev (4232173f8f7f erofs: enable sub-page compressed block support) Merging exfat/dev (6dfb1f0dfdb0 exfat: do not zero the extended part) Merging ext3/for_next (46ee834035ac Pull quota cleanup from Chao Yu.) Merging ext4/dev (6c02757c9360 jbd2: fix soft lockup in journal_finish_inode_data_buffers()) Merging f2fs/dev (394e7f4dbb32 f2fs: don't set FI_PREALLOCATED_ALL for partial write) Merging fsverity/for-next (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty) Merging fuse/for-next (3f29f1c336c0 fuse: disable FOPEN_PARALLEL_DIRECT_WRITES with FUSE_DIRECT_IO_ALLOW_MMAP) Merging gfs2/for-next (9fd6b6bdb5a4 gfs2: rgrp: fix kernel-doc warnings) Merging jfs/jfs-next (cca974daeb6c jfs: fix shift-out-of-bounds in dbJoin) Merging ksmbd/ksmbd-for-next (8b8cd4beea4f Merge tag '6.7-rc5-ksmbd-server-fixes' of git://git.samba.org/ksmbd) Merging nfs/linux-next (f003a717ae90 nfs: Convert nfs_symlink() to use a folio) Merging nfs-anna/linux-next (379e4adfddd6 NFSv4.1: fixup use EXCHGID4_FLAG_USE_PNFS_DS for DS server) Merging nfsd/nfsd-next (59392e03bfaa svcrdma: Move the svc_rdma_cc_init() call) Merging ntfs3/master (652483bfbc45 fs/ntfs3: Fix c/mtime typo) Applying: ntfs3: align struct ATTR_LIST_ENTRY Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) Merging overlayfs/overlayfs-next (d17bb4620f90 overlayfs.rst: fix ReST formatting) Merging ubifs/next (75690493591f ubifs: ubifs_link: Fix wrong name len calculating when UBIFS is encrypted) Merging v9fs/9p-next (ff49bf186757 net: 9p: avoid freeing uninit memory in p9pdu_vreadf) Merging v9fs-ericvh/ericvh/for-next (2dde18cd1d8f Linux 6.5) Merging xfs/for-next (18793e050504 xfs: move xfs_ondisk.h to libxfs/) Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter()) Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging vfs-brauner/vfs.all (85ddc21d198b Merge branch 'vfs.iov_iter' into vfs.all) CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c CONFLICT (content): Merge conflict in fs/btrfs/subpage.c CONFLICT (content): Merge conflict in fs/btrfs/super.c CONFLICT (content): Merge conflict in fs/buffer.c CONFLICT (content): Merge conflict in include/linux/blk_types.h Applying: linux-next: manual merge of the vfs-brauner tree with the btrfs tree Merging vfs/for-next (3f95c5b76257 Merge branch 'work.minix' into for-next) Merging printk/for-next (6c3a34e38436 Merge branch 'for-6.8' into for-next) Merging pci/next (ab9345f3fb21 Merge branch 'pci/controller/vmd') Merging pstore/for-next/pstore (24a0b5e196cf pstore: inode: Use cleanup.h for struct pstore_private) Merging hid/for-next (96930896ab11 Merge branch 'for-6.8/nintendo' into for-next) Merging i2c/i2c/for-next (382561d16854 i2c: ocores: Move system PM hooks to the NOIRQ phase) Merging i3c/i3c/next (b4da37db3e2c i3c: master: Fix build error) Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) Merging hwmon-staging/hwmon-next (db79be9d9707 hwmon: (pmbus) Add support for MPS Multi-phase mp2856/mp2857 controller) Merging jc_docs/docs-next (0c3ebff53595 scripts: kernel-doc: Clarify missing struct member description) Merging v4l-dvb/master (a00b3f296eac media: mediatek: vcodec: Set the supported vp9 profile for each platform) Merging v4l-dvb-next/master (efa28efd9cba media: rkisp1: resizer: Stop manual allocation of v4l2_subdev_state) Merging pm/linux-next (3b6de08083e1 Merge branches 'acpi-processor' and 'acpi-extlog' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (c4a5118a3ae1 cpufreq: scmi: process the result of devm_of_clk_add_hw_provider()) Merging cpupower/cpupower (997bbf2accf6 tools cpupower bench: Override CFLAGS assignments) Merging devfreq/devfreq-next (4920ee6dcfaf PM / devfreq: Convert to use sysfs_emit_at() API) Merging pmdomain/next (05ce71929efc PM: domains: Drop the unused pm_genpd_opp_to_performance_state()) Merging opp/opp/linux-next (19cc8b1819a4 OPP: Check for invalid OPP in dev_pm_opp_find_level_ceil()) Merging thermal/thermal/linux-next (9618efe343ea thermal/qcom/tsens: Drop ops_v0_1) Merging dlm/next (0c08699744d2 dlm: implement EXPORT_OP_ASYNC_LOCK) Merging rdma/for-next (4f973e211b3b IB/ipoib: Fix mcast list locking) Merging net-next/main (54f4c2570a19 Merge branch 'phy-ackage-addr-mmd-apis') Merging bpf-next/for-next (42d45c45624a selftests/bpf: Temporarily disable dummy_struct_ops test on s390) CONFLICT (content): Merge conflict in include/linux/skbuff.h CONFLICT (modify/delete): tools/net/ynl/generated/netdev-user.c deleted in HEAD and modified in bpf-next/for-next. Version bpf-next/for-next of tools/net/ynl/generated/netdev-user.c left in tree. $ git rm -f tools/net/ynl/generated/netdev-user.c Merging ipsec-next/master (aadbd27f9674 net: phy: correctly check soft_reset ret ONLY if defined for PHY) Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device) Merging netfilter-next/main (ac40916a3f72 rtnetlink: introduce nlmsg_new_large and use it in rtnl_getlink) Merging ipvs-next/main (ac40916a3f72 rtnetlink: introduce nlmsg_new_large and use it in rtnl_getlink) Merging bluetooth/master (dea290e2e36b Bluetooth: af_bluetooth: Fix Use-After-Free in bt_sock_recvmsg) Merging wireless-next/for-next (c5a3f56fcdb0 Merge tag 'ath-next-20231215' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath) CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst Merging wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) Merging wpan-staging/staging (83fcf26b00d7 ieee802154: Give the user the association list) Merging mtd/mtd/next (a7d84a2e7663 mtd: maps: vmu-flash: Fix the (mtd core) switch to ref counters) Merging nand/nand/next (2b8aa4c3e6a5 mtd: rawnand: diskonchip: fix a potential double free in doc_probe) Merging spi-nor/spi-nor/next (c692ba6de1c5 mtd: spi-nor: micron-st: Add support for mt25qu01g) Merging crypto/master (c480a421a4fa crypto: octeontx2 - Fix cptvf driver cleanup) CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst Merging drm/drm-next (a0a28956b46e Merge tag 'amd-drm-next-6.8-2023-12-08' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) Merging drm-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape) Merging drm-exynos/for-linux-next (897da484d1c7 drm/exynos: fix accidental on-stack copy of exynos_drm_plane) Merging drm-misc/for-linux-next (b1a2aa9bcbb8 drm: ci: Update xfails) Merging amdgpu/drm-next (669080888691 drm/amd/display: Revert " drm/amd/display: Use channel_width = 2 for vram table 3.0") d0f639c58693 ("drm/amd/display: Revert "Fix conversions between bytes and KB"") Merging drm-intel/for-linux-next (8cd53c6b200e drm/i915: Simplify intel_ddi_compute_min_voltage_level()) Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (d4ca26ac4be0 drm/msm/dp: call dp_display_get_next_bridge() during probe) Applying: fix up for "drm/exec: Pass in initial # of objects" Merging drm-msm-lumag/msm-next-lumag (d4ca26ac4be0 drm/msm/dp: call dp_display_get_next_bridge() during probe) Merging etnaviv/etnaviv/next (925b10728f20 drm/etnaviv: disable MLCG and pulse eater on GPU reset) Merging fbdev/for-next (13366c25125e fbdev: amba-clcd: Delete the old CLCD driver) CONFLICT (modify/delete): drivers/video/fbdev/amba-clcd.c deleted in fbdev/for-next and modified in HEAD. Version HEAD of drivers/video/fbdev/amba-clcd.c left in tree. CONFLICT (modify/delete): drivers/video/fbdev/vermilion/vermilion.c deleted in fbdev/for-next and modified in HEAD. Version HEAD of drivers/video/fbdev/vermilion/vermilion.c left in tree. $ git rm -f drivers/video/fbdev/amba-clcd.c drivers/video/fbdev/vermilion/vermilion.c Merging regmap/for-next (a2d43f711790 Merge remote-tracking branch 'regmap/for-6.8' into regmap-next) Merging sound/for-next (c18852cf16dc ALSA: au88x0: fixed spelling mistakes in au88x0_core.c) Merging ieee1394/for-next (c12d7aa7ffa4 firewire: Annotate struct fw_node with __counted_by) Merging sound-asoc/for-next (c911534cdc7d Merge remote-tracking branch 'asoc/for-6.8' into asoc-next) Merging modules/modules-next (4652b8e4f3ff Merge tag '6.7-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd) Merging input/next (c67f8a13be4e Input: da9063 - use dev_err_probe()) Merging block/for-next (61081cba2ef3 Merge branch 'for-6.8/block' into for-next) Merging device-mapper/for-next (7f1e151e3ed4 MAINTAINERS: remove stale info for DEVICE-MAPPER) Merging libata/for-next (804901fdd637 ata: pata_pxa: convert not to use dma_request_slave_channel()) Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer()) Merging mmc/next (72cd89517fa0 mmc: Merge branch fixes into next) Merging mfd/for-mfd-next (03d790f04fb2 mfd: intel-lpss: Fix the fractional clock divider flags) Merging backlight/for-backlight-next (7d84a63a39b7 backlight: hx8357: Convert to agnostic GPIO API) Merging battery/for-next (b55d073e6501 power: supply: bq256xx: fix some problem in bq256xx_hw_init) Merging regulator/for-next (cd48f7419ad1 Add pm8010 RPMH regulators for sm8550 boards) Merging security/next (ec4e9d630a64 calipso: fix memory leak in netlbl_calipso_add_pass()) CONFLICT (content): Merge conflict in Documentation/userspace-api/index.rst CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in include/linux/security.h CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in security/selinux/hooks.c CONFLICT (content): Merge conflict in security/smack/smack_lsm.c CONFLICT (content): Merge conflict in tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl CONFLICT (content): Merge conflict in tools/perf/arch/powerpc/entry/syscalls/syscall.tbl CONFLICT (content): Merge conflict in tools/perf/arch/s390/entry/syscalls/syscall.tbl CONFLICT (content): Merge conflict in tools/perf/arch/x86/entry/syscalls/syscall_64.tbl Applying: fix up for "LSM: wireup Linux Security Module syscalls" Merging apparmor/apparmor-next (a7e405a2de69 apparmor: add missing params to aa_may_ptrace kernel-doc comments) Merging integrity/next-integrity (b4af096b5df5 KEYS: encrypted: Add check for strsep) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) Merging selinux/next (3c1e09d533db selinux: remove the wrong comment about multithreaded process handling) Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso()) Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) Merging tpmdd/next (ebf2d4e8e582 tpm: nuvoton: Use i2c_get_match_data()) Merging watchdog/master (70ec8691764f dt-bindings: watchdog: qcom,pm8916-wdt: add parent spmi node to example) Merging iommu/next (4e631678d251 Merge branches 'apple/dart', 'arm/rockchip', 'arm/smmu', 'virtio', 'x86/amd' and 'core' into next) CONFLICT (content): Merge conflict in arch/Kconfig Merging audit/next (24fade412acf Automated merge of 'dev' into 'next') Merging dt-krzk/for-next (b85ea95d0864 Linux 6.7-rc1) Merging mailbox/for-next (fbce94a444fb mailbox: qcom-apcs-ipc: re-organize compatibles with fallbacks) Merging spi/for-next (e6b0d37c0873 Merge remote-tracking branch 'spi/for-6.8' into spi-next) Merging tip/master (b14a5a4af75e Merge branch into tip/master: 'x86/tdx') Merging clockevents/timers/drivers/next (d25e52a7eb36 clocksource/drivers/cadence-ttc: Fix some kernel-doc warnings) Merging edac/edac-for-next (448709b58867 Merge edac-urgent into for-next) Merging irqchip/irq/irqchip-next (19b5a44bee16 irqchip: Add support for Amlogic-C3 SoCs) Merging ftrace/for-next (e1742fa172d5 Merge probes/for-next) Merging rcu/rcu/next (f1242ec0ad8f doc: Update checklist.rst discussion of callback execution) CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt Merging kvm/next (8ed26ab8d591 KVM: clean up directives to compile out irqfds) CONFLICT (content): Merge conflict in include/linux/pagemap.h Applying: fs: Convert error_remove_page to error_remove_folio Applying: fix up for "KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory" Merging kvm-arm/next (307c5436c3f4 Merge branch kvm-arm64/lpa2 into kvmarm-master/next) Merging kvms390/next (26fb87ffa9d9 s390/uvdevice: Report additional-data length for attestation) Merging kvm-ppc/topic/ppc-kvm (180c6b072bf3 KVM: PPC: Book3S HV nestedv2: Do not cancel pending decrementer exception) Merging kvm-riscv/riscv_kvm_next (4ad9843e1ea0 RISCV: KVM: update external interrupt atomically for IMSIC swfile) Merging kvm-x86/next (f2a3fb7234e5 Merge branches 'fixes', 'generic', 'hyperv', 'lam', 'misc', 'mmu', 'pmu', 'selftests', 'svm' and 'xen') Merging xen-tip/linux-next (7f3da4b698bc xen/events: fix error code in xen_bind_pirq_msi_to_irq()) Merging percpu/for-next (1e653a292c26 Merge branch 'for-6.8' into for-next) Merging workqueues/for-next (4a6c5607d450 workqueue: Make sure that wq_unbound_cpumask is never empty) Merging drivers-x86/for-next (ed289b98c2ae Merge tag 'platform-drivers-x86-amd-wbrf-v6.8-1' into review-hans) CONFLICT (content): Merge conflict in drivers/platform/x86/wmi.c Merging chrome-platform/for-next (59a9ccf19ee0 platform/chrome: cros_ec_vbc: Fix -Warray-bounds warnings) Merging chrome-platform-firmware/for-firmware-next (ecea08916418 firmware: coreboot: framebuffer: Avoid invalid zero physical address) Merging hsi/for-next (fa72d143471d HSI: omap_ssi: Remove usage of the deprecated ida_simple_xx() API) Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds-lj/for-leds-next (40cfa414e7f9 leds: sun50i-a100: Avoid division-by-zero warning) Merging ipmi/for-next (c5d03a0d8461 ipmi: Use regspacings passed as a module parameter) Merging driver-core/driver-core-next (532888a59505 driver core: Better advertise dev_err_probe()) Merging usb/usb-next (e9158c7e5533 usb: typec: tcpm: Parse Accessory Mode information) Merging thunderbolt/next (2cd3da4e3745 thunderbolt: Add support for Intel Lunar Lake) Merging usb-serial/usb-next (a39b6ac3781d Linux 6.7-rc5) Merging tty/tty-next (43f012df3c1e tty: serial: 8250: Set RS422 interface by default to fix Moxa RS422/RS485 PCIe boards) Merging char-misc/char-misc-next (6aa1fc5a8085 parport: parport_serial: Add Brainboxes device IDs and geometry) CONFLICT (content): Merge conflict in drivers/android/binder_alloc.c Merging accel/habanalabs-next (dfbf6719ccb4 accel/habanalabs/gaudi2: avoid overriding existing undefined opcode data) Merging coresight/next (60e5f23dc5d6 coresight: ultrasoc-smb: Use guards to cleanup) Merging fastrpc/for-next (b85ea95d0864 Linux 6.7-rc1) Merging fpga/for-next (5496fb8eedd6 drivers/fpga: use standard array-copy function) Merging icc/icc-next (da7667aef4cf Merge branch 'icc-fixes' into icc-next) Merging iio/togreg (38f0bd4cd345 iio: accel: bmi088: update comments and Kconfig) Merging phy-next/next (7f6f9e0def00 phy: qcom-qmp-usb: Add Qualcomm SDX75 USB3 PHY support) Merging soundwire/next (55d50ace6b88 soundwire: generic_bandwidth_allocation use bus->params.max_dr_freq) Merging extcon/extcon-next (7803680964c0 extcon: qcom-spmi-misc: don't use kernel-doc marker for comment) Merging gnss/gnss-next (0cbbbe09d49b gnss: ubx: add support for the reset gpio) Merging vfio/next (946cff255dfa Merge branches 'v6.8/vfio/debugfs', 'v6.8/vfio/pds' and 'v6.8/vfio/type1-account' into v6.8/vfio/next) Merging w1/for-next (efc19c44aa44 w1: amd_axi_w1: Explicitly include correct DT includes) Merging spmi/spmi-next (b85ea95d0864 Linux 6.7-rc1) Merging staging/staging-next (5e8cdb6f6ebe staging: rtl8192e: rename variable HTInitializeHTInfo) Merging counter-next/counter-next (a39b6ac3781d Linux 6.7-rc5) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (70f008fb3ea9 dmaengine: dmatest: prevent using swiotlb buffer with nobounce parameter) Merging cgroup/for-next (b7aaea747923 Merge branch 'for-6.8' into for-next) Merging scsi/for-next (6bdc5fb22b8e Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (ed340d13aa1d Merge patch series "scsi: hisi_sas: Minor fixes and cleanups") Merging vhost/linux-next (b8e079244992 virtio_blk: fix snprintf truncation compiler warning) Merging rpmsg/for-next (38f388721356 Merge branches 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (0a10d107818c gpiolib: allocate memory atomically with a spinlock held) Merging gpio-intel/for-next (92fc925f8386 gpio: tangier: simplify locking using cleanup helpers) Merging pinctrl/for-next (977f293b0b84 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (ebe7f3393784 pinctrl: intel: Add Intel Meteor Point pin controller and GPIO support) CONFLICT (content): Merge conflict in drivers/pinctrl/intel/pinctrl-baytrail.c Merging pinctrl-renesas/renesas-pinctrl (9e5889c68d99 pinctrl: renesas: rzg2l: Add input enable to the Ethernet pins) Merging pinctrl-samsung/for-next (6cf96df77338 pinctrl: samsung: add exynosautov920 pinctrl) Merging pwm/for-next (2cc2cb184833 pwm: Stop referencing pwm->chip) Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie) Merging kselftest/next (130a83879954 selftests: sched: Remove initialization to 0 for a static variable) Merging kunit/test (b85ea95d0864 Linux 6.7-rc1) Merging kunit-next/kunit (b97be817f56e drm/tests: Switch to kunit devices) CONFLICT (content): Merge conflict in lib/kunit/test.c Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next) Merging rtc/rtc-next (dc0684adf3b6 rtc: Add driver for Nuvoton ma35d1 rtc controller) Merging nvdimm/libnvdimm-for-next (9ea459e477dc libnvdimm: remove kernel-doc warnings:) Merging at24/at24/for-next (c692086d74a0 dt-bindings: at24: add ROHM BR24G04) Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) Merging seccomp/for-next/seccomp (31c65705a8cf perf/benchmark: fix seccomp_unotify benchmark for 32-bit) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (b85ea95d0864 Linux 6.7-rc1) Merging nvmem/for-next (82c6ba6a7d96 nvmem: brcm_nvram: store a copy of NVRAM content) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) Merging hyperv/hyperv-next (ce9ecca0238b Linux 6.6-rc2) Merging auxdisplay/auxdisplay (c52391fafcef auxdisplay: img-ascii-lcd: Use device_get_match_data()) Merging kgdb/kgdb/for-next (23816724fdbd kdb: Corrects comment for kdballocenv) Merging hmm/hmm (0bb80ecc33a8 Linux 6.6-rc1) Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (01bd694ac2f6 bus: mhi: host: Drop chan lock before queuing buffers) Merging memblock/for-next (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability) Merging cxl/next (5d09c63f11f0 cxl/hdm: Remove broken error path) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (94f7f6182c72 efivarfs: automatically update super block flag) Merging unicode/for-next (807f06d1074d ecryptfs: Reject casefold directory inodes) Merging slab/slab/for-next (f7eb801fcdb1 Merge branch 'slab/for-6.8/slub-hook-cleanups' into slab/for-next) CONFLICT (content): Merge conflict in mm/kasan/quarantine.c Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging landlock/next (a50156fe3dcb landlock: Document IOCTL support) Merging rust/rust-next (71479eee9da8 rust: Suppress searching builtin sysroot) Merging sysctl/sysctl-next (a6fd07f80ab7 coda: Remove the now superfluous sentinel elements from ctl_table array) Merging execve/for-next/execve (0a8a952a75f2 ELF, MAINTAINERS: specifically mention ELF) CONFLICT (content): Merge conflict in MAINTAINERS Merging bitmap/bitmap-for-next (5e95ee6fd52b sh: mach-x3proto: optimize ilsel_enable()) Merging hte/for-next (b85ea95d0864 Linux 6.7-rc1) Merging kspp/for-next/kspp (a75b3809dce2 qnx4: Use get_directory_fname() in qnx4_match()) Merging kspp-gustavo/for-next/kspp (617ab3c357d2 init: Kconfig: Disable -Wstringop-overflow for GCC-11) Merging nolibc/nolibc (d543d9ddf593 selftests/nolibc: disable coredump via setrlimit) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) Merging iommufd/for-next (b2b67c997bf7 iommufd: Organize the mock domain alloc functions closer to Joerg's tree) Merging devicetree/for-next (b492af27d0c8 Merge branch 'dt/header-fixes-for-next' into for-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/connector/usb-connector.yaml Merging header_cleanup/header_cleanup (0e034194a81f Kill sched.h dependency on rcupdate.h) CONFLICT (content): Merge conflict in arch/x86/include/asm/paravirt_types.h CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h $ git reset --hard HEAD^
Attachment:
pgpvJYZtPFPuO.pgp
Description: OpenPGP digital signature
