Hi all, Changes since 20230317: The mm tree gained a build warning for which I applied a patch. The perf tree still has its build failure, so I used the version from next-20230316. The bpf-next tree gained a conflict against the net-next tree and a build failure, so I used the version from next-20230317.. The leds-lj tree gained a build failure, so I used the version from next-20230317. The char-misc tree gained conflicts against the driver-core and tty trees. The extcon tree gained a conflict against the driver-core tree. The scsi-mkp tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 4281 5041 files changed, 157576 insertions(+), 96008 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 are also quilt-import.log and merge.log files 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, 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 354 trees (counting Linus' and 100 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 (e8d018dd0257 Linux 6.3-rc3) Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) Merging mm-hotfixes/mm-hotfixes-unstable (268ab5f1b489 mailmap: add entries for Richard Leitner) Merging kbuild-current/fixes (a3671bd86a97 Merge tag 'fbdev-for-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev) Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3) Merging arm-current/fixes (2f62847cf6ae ARM: 9287/1: Reduce __thumb2__ definition to crypto files that require it) Merging arm64-fixes/for-next/fixes (fe15c26ee26e Linux 6.3-rc1) Merging arm-soc-fixes/arm/fixes (9f79762ef8d9 Merge tag 'samsung-dt-fixes-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes) Merging davinci-current/davinci/for-current (fe15c26ee26e Linux 6.3-rc1) Merging drivers-memory-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) Merging m68k-current/for-linus (e36a82bebbf7 m68k: Only force 030 bus error if PC not in exception table) Merging powerpc-fixes/fixes (f2c7e3562b4c powerpc/mm: Fix false detection of read faults) Merging s390-fixes/fixes (d7a0bdbf1727 s390: update defconfigs) Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) Merging net/main (6d206b1ea9f4 mlxsw: core_thermal: Fix fan speed in maximum cooling state) Merging bpf/master (c7df4813b149 xsk: Add missing overflow check in xdp_umem_reg) Merging ipsec/master (c276a706ea1f xfrm: Allow transport-mode states with AF_UNSPEC selector) Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging ipvs/main (e866f29a6ff1 Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue) Merging wireless/for-next (007ae9b268ba wifi: mac80211: Serialize ieee80211_handle_wake_tx_queue()) Merging rdma-fixes/for-rc (eeac8ede1755 Linux 6.3-rc2) Merging sound-current/for-linus (b7a5822810c4 ALSA: hda/realtek: Add quirks for some Clevo laptops) Merging sound-asoc-fixes/for-linus (205efd4619b8 ASoC: amd: yc: Add DMI entries to support Victus by HP Laptop 16-e1xxx (8A22)) Merging regmap-fixes/for-linus (eeac8ede1755 Linux 6.3-rc2) Merging regulator-fixes/for-linus (eeac8ede1755 Linux 6.3-rc2) Merging spi-fixes/for-linus (eeac8ede1755 Linux 6.3-rc2) Merging pci-current/for-linus (fe15c26ee26e Linux 6.3-rc1) Merging driver-core.current/driver-core-linus (44ac5abac86b Documentation/security-bugs: move from admin-guide/ to process/) Merging tty.current/tty-linus (18365ebf23f3 tty: vt: protect KD_FONT_OP_GET_TALL from unbound access) Merging usb.current/usb-linus (bbf860ed710b usb: gadget: Use correct endianness of the wLength field for WebUSB) Merging usb-serial-fixes/usb-linus (773e8e7d07b7 USB: serial: option: add Telit FE990 compositions) Merging phy/fixes (fe15c26ee26e Linux 6.3-rc1) Merging staging.current/staging-linus (eeac8ede1755 Linux 6.3-rc2) Merging iio-fixes/fixes-togreg (363c7dc72f79 iio: adc: ti-ads7950: Set `can_sleep` flag for GPIO chip) Merging counter-current/counter-current (00f4bc5184c1 counter: 104-quad-8: Fix Synapse action reported for Index signals) Merging char-misc.current/char-misc-linus (f551592f7256 Merge tag 'icc-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-linus) Merging soundwire-fixes/fixes (e6923fd863af soundwire: qcom: correct setting ignore bit on v1.5.1) Merging thunderbolt-fixes/fixes (c82510b1d87b thunderbolt: Use scale field when allocating USB3 bandwidth) Merging input-current/for-linus (8a0432bab6ea Input: goodix - add Lenovo Yoga Book X90F to nine_bytes_report DMI table) Merging crypto-current/master (660ca9470f9c crypto: caam - Fix edesc/iv ordering mixup) Merging vfio-fixes/for-linus (4928f67bc911 vfio/mlx5: Fix the report of dirty_bytes upon pre-copy) Merging kselftest-fixes/fixes (624c60f326c6 selftests: fix LLVM build for i386 and x86_64) Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) Merging dmaengine-fixes/fixes (b771baf3988a dmaengine: xilinx: xdma: Fix some kernel-doc comments) Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) Merging mtd-fixes/mtd/fixes (75dce6a941e3 mtd: nand: mxic-ecc: Fix mxic_ecc_data_xfer_wait_for_completion() when irq is used) Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) Merging v4l-dvb-fixes/fixes (55f1ecb11990 media: v4l: subdev: Make link validation safer) Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) Merging mips-fixes/mips-fixes (ab327f8acdf8 mips: bmips: BCM6358: disable RAC flush for TP1) Merging at91-fixes/at91-fixes (fe15c26ee26e Linux 6.3-rc1) Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) Merging kvm-fixes/master (f3e707413dbe KVM: selftests: Sync KVM exit reasons in selftests) Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field) Merging hwmon-fixes/hwmon (ab00709310ee hwmon: (ltc2992) Set `can_sleep` flag for GPIO chip) Merging nvdimm-fixes/libnvdimm-fixes (c91d71363084 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE) Merging cxl-fixes/fixes (711442e29f16 cxl/region: Fix passthrough-decoder detection) Merging btrfs-fixes/next-fixes (c637393d1e8f Merge branch 'misc-6.3' 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 (7c3940bf81e5 swiotlb: fix the deadlock in swiotlb_do_find_slots) Merging drivers-x86-fixes/fixes (1a0009abfa78 platform: mellanox: mlx-platform: Initialize shift variable to 0) Merging samsung-krzk-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) Merging pinctrl-samsung-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) Merging devicetree-fixes/dt/linus (707344c8a188 dt-bindings: interrupt-controller: arm,gic-v3: Fix typo in description of msi-controller property) Merging dt-krzk-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) Merging scsi-fixes/fixes (a13faca032ac scsi: scsi_dh_alua: Fix memleak for 'qdata' in alua_activate()) Merging drm-fixes/drm-fixes (c00133a9e87e drm/ttm: drop extra ttm_bo_put in ttm_bo_cleanup_refs) Merging drm-intel-fixes/for-linux-next-fixes (e0e6b416b25e drm/i915/active: Fix misuse of non-idle barriers as fence trackers) Merging mmc-fixes/fixes (92771cdd90de mmc: dw_mmc-starfive: Fix initialization of prev_err) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (1b929c02afd3 Linux 6.2-rc1) Merging hyperv-fixes/hyperv-fixes (f8acb24aaf89 x86/hyperv: Block root partition functionality in a Confidential VM) Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) Merging risc-v-fixes/fixes (47dd902aaee9 RISC-V: mm: Support huge page in vmalloc_fault()) Merging riscv-dt-fixes/riscv-dt-fixes (fe15c26ee26e Linux 6.3-rc1) Merging riscv-soc-fixes/riscv-soc-fixes (fe15c26ee26e Linux 6.3-rc1) Merging fpga-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) Merging spdx/spdx-linus (fe15c26ee26e Linux 6.3-rc1) Merging gpio-brgl-fixes/gpio/for-current (d49765b5f432 gpio: GPIO_REGMAP: select REGMAP instead of depending on it) Merging gpio-intel-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) Merging pinctrl-intel-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) Merging erofs-fixes/fixes (3993f4f45630 erofs: use wrapper i_blocksize() in erofs_file_read_iter()) Merging kunit-fixes/kunit-fixes (fe15c26ee26e Linux 6.3-rc1) Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging memblock-fixes/fixes (647037adcad0 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().") Merging nfsd-fixes/nfsd-fixes (27c934dd8832 nfsd: don't replace page in rq_pages if it's a continuation of last page) Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging perf-current/perf/urgent (5b201a82cd9d perf tools: Add Adrian Hunter to MAINTAINERS as a reviewer) Merging efi-fixes/urgent (5ed213dd6468 efi: sysfb_efi: Add quirk for Lenovo Yoga Book X91F/L) Merging zstd-fixes/zstd-linus (6906598f1ce9 zstd: Fix definition of assert()) Merging battery-fixes/fixes (06615d11cc78 power: supply: da9150: Fix use after free bug in da9150_charger_remove due to race condition) Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning) Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) Merging iommufd-fixes/for-rc (fe15c26ee26e Linux 6.3-rc1) Merging rust-fixes/rust-fixes (3098cb655e7c rust: bindgen: Add `alt_instr` as opaque type) Merging drm-misc-fixes/for-linux-next-fixes (4028cbf867f7 drm/meson: dw-hdmi: Fix devm_regulator_*get_enable*() conversion again) Merging mm-stable/mm-stable (819c2608ce2c Sync mm-stable with 6.3-rc1) Merging mm-nonmm-stable/mm-nonmm-stable (fe15c26ee26e Linux 6.3-rc1) Merging mm/mm-everything (c99e75dfa659 Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (b26e7a4b4ef6 kallsyms: expand symbol name into comment for debugging) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf/core (96d541699e5c perf kvm: Update documentation to reflect new changes) $ git reset --hard HEAD^ Merging next-20230316 version of perf Merging compiler-attributes/compiler-attributes (eeac8ede1755 Linux 6.3-rc2) Merging dma-mapping/for-next (9b07d27d0fbb swiotlb: mark swiotlb_memblock_alloc() as __init) Merging asm-generic/master (a13408c20526 char/agp: introduce asm-generic/agp.h) Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) Merging arm/for-next (ba07b4efc989 Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (010338d729c1 arm64: kaslr: don't pretend KASLR is enabled if offset < MIN_KIMG_ALIGN) Merging arm-perf/for-next/perf (e8a709dc2a91 perf: arm_spe: Print the version of SPE detected) Merging arm-soc/for-next (811bbcfc8ea2 Merge branch 'soc/arm' into for-next) Merging amlogic/for-next (001ba459dbec Merge branch 'v6.4/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (22991d8d5725 soc: apple: rtkit: Add register dump decoding to crashlog) Merging aspeed/for-next (bb13bd587d53 ARM: dts: aspeed: bonnell: Update eeprom size) Merging at91/at91-next (f5200f71d927 clk: microchip: Use of_property_read_bool() for boolean properties) Merging broadcom/next (a2264238029f Merge branch 'drivers/next' into next) Merging davinci/davinci/for-next (fe15c26ee26e Linux 6.3-rc1) Merging drivers-memory/for-next (538c7b5b5d8b memory: atmel-ebi: Use of_property_present() for testing DT property presence) Merging imx-mxs/for-next (a7a9bae8c567 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (9b2797522f32 Merge branch 'v6.3-next/soc' into for-next) Merging mvebu/for-next (b80b042da860 Merge branch 'mvebu/fixes' into mvebu/for-next) Merging omap/for-next (f68a6fc58073 Merge branch 'omap-for-v6.3/cleanup' into for-next) Merging qcom/for-next (f84f5d2e1ffd Merge branches 'arm64-defconfig-for-6.4', 'arm64-fixes-for-6.3', 'arm64-for-6.4', 'clk-for-6.4', 'drivers-fixes-for-6.3', 'drivers-for-6.4', 'dts-fixes-for-6.3' and 'dts-for-6.4' into for-next) Merging renesas/next (8184e7e383be Merge branches 'renesas-drivers-for-v6.4' and 'renesas-dts-for-v6.4' into renesas-next) Merging reset/reset/next (1b929c02afd3 Linux 6.2-rc1) Merging rockchip/for-next (6d6761582819 Merge branch 'v6.4-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (a81e2e2ca6ae Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (9848e199b090 Merge branch 'for-next/scmi/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (4e74ad9f3af6 ARM: configs: multi_v7: enable NVMEM driver for STM32) Merging sunxi/sunxi/for-next (6aeca5d73805 Merge branch 'sunxi/dt-for-6.4' into sunxi/for-next) Merging tee/next (f8502fba45bd tee: amdtee: fix race condition in amdtee_open_session) Merging tegra/for-next (9b0d904e7e49 Merge branch for-6.3/arm64/dt into for-next) Merging ti/ti-next (e2d18126b21e Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (fe15c26ee26e Linux 6.3-rc1) Merging clk/clk-next (d8bb7bcf754c Merge branch 'clk-mediatek' into clk-next) Merging clk-imx/for-next (fe15c26ee26e Linux 6.3-rc1) Merging clk-renesas/renesas-clk (72cd8436ece0 clk: renesas: Convert to platform remove callback returning void) Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) Merging csky/linux-next (4a3ec00957fd csky: delay: Add function alignment) Merging loongarch/loongarch-next (fc89d7fb499b Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging m68k/for-next (e36a82bebbf7 m68k: Only force 030 bus error if PC not in exception table) Merging m68knommu/for-next (eeac8ede1755 Linux 6.3-rc2) Merging microblaze/next (fe15c26ee26e Linux 6.3-rc1) Merging mips/mips-next (a45e5fe79234 MIPS: ath79: remove obsolete ATH79_DEV_* configs) Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) Merging parisc-hd/for-next (783394630553 parisc: Ensure page alignment in flush functions) Merging powerpc/next (3c1d9f36e985 powerpc: Simplify sysctl registration for nmi_wd_lpm_factor_ctl_table) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (4b740779ac03 Merge patch series "RISC-V: Apply Zicboz to clear_page") Merging riscv-dt/riscv-dt-for-next (0e9b70c1e362 riscv: dts: microchip: add mpfs specific macb reset support) Merging riscv-soc/riscv-soc-for-next (49f965b6fbca soc: canaan: Make K210_SYSCTL depend on CLK_K210) Merging s390/for-next (70cc5f4c53d5 Merge branch 'features' into for-next) Merging sh/for-next (ff30bd6a6618 sh: clk: Fix clk_enable() to return 0 on NULL clk) Merging uml/next (04df97e150c8 Documentation: rust: Fix arch support table) Merging xtensa/xtensa-for-next (1d3b7a788ca7 xtensa: fix KASAN report for show_stack) Merging pidfd/for-next (5ab18f4b061e vhost: use vhost_tasks for worker threads) Merging vfs-idmapping/for-next (9576d493741c Merge branch 'fs.misc' into for-next) Merging fscrypt/for-next (0132b633d942 fs/buffer.c: use b_folio for fscrypt work) Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums) Merging btrfs/for-next (80d1eec6927a Merge branch 'for-next-current-v6.2-20230221' into for-next-20230221) Merging ceph/master (f7c4d9b133c7 rbd: avoid use-after-free in do_rbd_add() when rbd_dev_create() fails) Merging cifs/for-next (2f0e4f034220 cifs: check only tcon status on tcon related functions) Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment) Merging erofs/dev (4f24ebae35ff erofs: support flattened block device for multi-blob images) Merging exfat/dev (fe15c26ee26e Linux 6.3-rc1) Merging ext3/for_next (dced733d7fa9 quota: simplify two-level sysctl registration for fs_dqstats_table) Merging ext4/dev (da8c7d2105be ext4: convert some BUG_ON's in mballoc to use WARN_RATELIMITED instead) Merging f2fs/dev (196036c45f8c f2fs: fix uninitialized skipped_gc_rwsem) Merging fsverity/for-next (4f92f4c24b75 fs-verity: simplify sysctls with register_sysctl()) Merging fuse/for-next (1cc4606d19e3 fuse: add inode/permission checks to fileattr_get/fileattr_set) Merging gfs2/for-next (c1b0c3cfcbad gfs2: Convert gfs2_page_add_databufs to folios) Merging jfs/jfs-next (fad376fce0af fs/jfs: fix shift exponent db_agl2size negative) Merging ksmbd/ksmbd-for-next (6686991cea8e ksmbd: set FILE_NAMED_STREAMS attribute in FS_ATTRIBUTE_INFORMATION) Merging nfs/linux-next (eeac8ede1755 Linux 6.3-rc2) Merging nfs-anna/linux-next (21fd9e8700de NFS: Correct timing for assigning access cache timestamp) Merging nfsd/nfsd-next (a5ed9be147be sunrpc: simplify two-level sysctl registration for svcrdma_parm_table) Merging ntfs3/master (2024476646ed fs/ntfs3: Fix root inode checking) CONFLICT (content): Merge conflict in fs/ntfs3/file.c CONFLICT (content): Merge conflict in fs/ntfs3/inode.c CONFLICT (content): Merge conflict in fs/ntfs3/ntfs_fs.h CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) Merging overlayfs/overlayfs-next (4f11ada10d0a ovl: fail on invalid uid/gid mapping at copy up) Merging ubifs/next (f773f0a331d6 ubi: Fix deadlock caused by recursively holding work_sem) Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7) Merging v9fs-ericvh/ericvh/for-next (9d415a425340 fs/9p: Add new mount modes) Merging xfs/for-next (e9b60c7f9713 pcpcntr: remove percpu_counter_sum_all()) Merging zonefs/for-next (2b188a2cfc4d zonefs: make kobj_type structure constant) Merging iomap/iomap-for-next (471859f57d42 iomap: Rename page_ops to folio_ops) Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) Merging file-locks/locks-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()') Merging iversion/iversion-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()') Merging vfs/for-next (d291d1858419 Merge branch 'work.fd' into for-next) Merging printk/for-next (10d639febe56 Merge branch 'for-6.3' into for-next) Merging pci/next (b0d4fc005ef2 Merge branch 'pci/controller/rcar') Merging pstore/for-next/pstore (5239a89b06d6 pstore: Revert pmsg_lock back to a normal mutex) Merging hid/for-next (1b9a2a53046a Merge branch 'for-6.3/upstream-fixes' into for-next) Merging i2c/i2c/for-next (7618417929c1 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (1dae3f1df700 i3c: dw: drop of_match_ptr for ID table) Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) Merging hwmon-staging/hwmon-next (fe6a3acdf364 hwmon: (nct6775) update ASUS WMI monitoring list A520/B360/B460/B550...) Merging jc_docs/docs-next (10d18135135c docs/mm: Physical Memory: add example of interleaving nodes) Merging v4l-dvb/master (eeac8ede1755 Linux 6.3-rc2) Merging v4l-dvb-next/master (13de5a512a44 media: cx18: fix format compliance issues) Merging pm/linux-next (1240ce78c05e Merge branches 'acpi-tables' and 'acpi-tools' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (b8f3a396a7ee cpufreq: Use of_property_present() for testing DT property presence) Merging cpupower/cpupower (fe15c26ee26e Linux 6.3-rc1) Merging devfreq/devfreq-next (b7405e3f62d6 PM / devfreq: exynos: Use of_property_present() for testing DT property presence) Merging opp/opp/linux-next (e9eadc282719 opp: Use of_property_present() for testing DT property presence) Merging thermal/thermal/linux-next (6828e402d06f thermal/drivers/st: Remove syscfg based driver) Merging dlm/next (1361737f102d fs: dlm: switch lkb_sbflags to atomic ops) Merging rdma/for-next (f2f6e1661d38 IB/rdmavt: Fix target union member for rvt_post_one_wr()) Merging net-next/main (d4671cb96fa3 Merge branch 'lan966x-tx-rx-improve') Merging bpf-next/for-next (08ff1c9f3e92 bpf, docs: Libbpf overview documentation) CONFLICT (content): Merge conflict in Documentation/bpf/bpf_devel_QA.rst $ git reset --hard HEAD^ Merging next-20230317 version of bpf-next Merging ipsec-next/master (f4796398f21b xfrm: Remove inner/outer modes from output path) Merging mlx5-next/mlx5-next (22551e77e550 net/mlx5: Configure IPsec steering for egress RoCEv2 traffic) Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs-next/main (39a86d059a78 Merge branch 'net-mlx5e-add-gbp-vxlan-hw-offload-support') Merging bluetooth/master (3e662aa4453a Bluetooth: NXP: Add protocol support for NXP Bluetooth chipsets) Merging wireless-next/for-next (499183cc3b52 wifi: iwlwifi: Avoid disabling GCC specific flag with clang) Merging mtd/mtd/next (1a7537a39b06 Merge tag 'mtd/core-fixes-before-nvmem-layouts-for-6.4' into mtd/next) Merging nand/nand/next (4080d5362416 mtd: parsers: remove reference to config MTD_NAND_TMIO) Merging spi-nor/spi-nor/next (6afcc84080c4 mtd: spi-nor: spansion: Add support for Infineon S25FS256T) Merging crypto/master (e6af5c0c4d32 crypto: stm32 - Save and restore between each request) Merging drm/drm-next (8bf6e20253b2 Merge tag 'drm-intel-next-2023-03-07' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) Merging drm-misc/for-linux-next (3cf15dc2f81f drm: fix typo in margin connector properties docs) CONFLICT (content): Merge conflict in drivers/gpu/drm/tiny/cirrus.c Merging amdgpu/drm-next (7ee938ac0060 drm/amdgpu: Don't resume IOMMU after incomplete init) Merging drm-intel/for-linux-next (b5202a93cd37 drm/i915: Extract intel_crtc_scanline_offset()) Merging drm-tegra/for-next (b9930311641c gpu: host1x: Fix uninitialized variable use) Merging drm-msm/msm-next (1844e680d56b drm/msm/dp: set self refresh aware based on PSR support) Merging drm-msm-lumag/msm-next-lumag (0c3f3cfd8ef2 drm/msm/dp: set self refresh aware based on PSR support) Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) Merging etnaviv/etnaviv/next (4c22c61e429f drm/etnaviv: show number of NN cores in GPU debugfs info) Merging fbdev/for-next (b61c2c09c5a3 video: fbdev: xilinxfb: Convert to platform remove callback returning void) Merging regmap/for-next (24d80fde40c9 regmap: cache: Silence checkpatch warning) Merging sound/for-next (6aa9b1d071bf ALSA: portman2x4: remove unused portman_read_command,data functions) Merging sound-asoc/for-next (fb829b6dd819 Merge remote-tracking branch 'asoc/for-6.4' into asoc-next) Merging modules/modules-next (3703bd54cd37 kallsyms: Delete an unused parameter related to {module_}kallsyms_on_each_symbol()) Merging input/next (f1e96f0617fc Input: bcm_iproc_tsc - drop of_match_ptr for ID table) Merging block/for-next (ed8c393ab252 Merge branch 'for-6.4/io_uring' into for-next) Merging device-mapper/for-next (d3aa3e060c4a dm stats: check for and propagate alloc_percpu failure) Merging libata/for-next (672b7ad20f7b ata: Use of_property_present() for testing DT property presence) Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) Merging mmc/next (46d19dc62b45 mmc: sdhci-pci-o2micro: Fix SDR50 mode timing issue) Merging mfd/for-mfd-next (368eb79f738a dt-bindings: mfd: qcom,spmi-pmic: Add PM2250) Merging backlight/for-backlight-next (fb200218b40b backlight: as3711: Use of_property_read_bool() for boolean properties) Merging battery/for-next (5161ec200f5a power: supply: bq256xx: Support to disable charger) Merging regulator/for-next (691c1fcda535 regulator: core: Shorten off-on-delay-us for always-on/boot-on by time since booted) Merging security/next (b9b8701b4314 security: Remove integrity from the LSM list in Kconfig) Merging apparmor/apparmor-next (cb60752f0c37 apparmor: fix use of strcpy in policy_unpack_test) Merging integrity/next-integrity (644f17412f5a IMA: allow/fix UML builds) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) Merging selinux/next (e67b79850fcc selinux: stop passing selinux_state pointers and their offspring) Merging smack/next (502a29b04d85 smack_lsm: remove unnecessary type casting) Merging tomoyo/master (ab8527429de6 workqueue: Emit runtime message when flush_scheduled_work() is called) Merging tpmdd/next (3dc8b8b705a7 tpm: remove unnecessary (void*) conversions) Merging watchdog/master (cf3be7e82b12 watchdog: at91rm9200: Only warn once about problems in .remove()) Merging iommu/next (bedd29d793da Merge branches 'apple/dart', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging audit/next (fe15c26ee26e Linux 6.3-rc1) Merging devicetree/for-next (0415d5a010d5 dt-bindings: crypto: fsl,sec-v4.0: Convert to DT schema) Merging dt-krzk/for-next (efb75299863e Merge branch 'next/dt64' into for-next) Merging mailbox/mailbox-for-next (6ccbe33a3952 dt-bindings: mailbox: qcom-ipcc: Add compatible for QDU1000/QRU1000) Merging spi/for-next (864f0513a377 spi: atmel-quadspi: Convert to platform remove) Merging tip/master (12242a871076 Merge branch into tip/master: 'x86/paravirt') Merging clockevents/timers/drivers/next (ab407a1919d2 Merge tag 'clocksource.2023.02.06b' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into timers/core) Merging edac/edac-for-next (71b1e3ba3fed EDAC/skx: Fix overflows on the DRAM row address mapping arrays) Merging irqchip/irq/irqchip-next (a83bf176fed4 Merge branch irq/bcm-l2-fixes into irq/irqchip-next) Merging ftrace/for-next (ca6cbe8c481a Merge tools/for-next) CONFLICT (content): Merge conflict in Documentation/trace/kprobetrace.rst Merging rcu/rcu/next (6b1dda8e725c Revert "rcu/kvfree: Eliminate k[v]free_rcu() single argument macro") Merging kvm/next (d8708b80fa0e KVM: Change return type of kvm_arch_vm_ioctl() to "int") Merging kvm-arm/next (96a4627dbbd4 Merge tag ' https://github.com/oupton/linux tags/kvmarm-6.3' from into kvmarm-master/next) Merging kvms390/next (5fc5b94a2736 s390/virtio: sort out physical vs virtual pointers usage) Merging kvm-x86/next (d8708b80fa0e KVM: Change return type of kvm_arch_vm_ioctl() to "int") Merging xen-tip/linux-next (7ad2c39860dc xen: remove unnecessary (void*) conversions) Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) Merging workqueues/for-next (cd2440d66fec workqueue: Print backtraces from CPUs with hung CPU bound workqueues) Merging drivers-x86/for-next (02c464b73645 platform/x86: x86-android-tablets: Add depends on PMIC_OPREGION) Merging chrome-platform/for-next (db7df0cfaff3 platform/chrome: cros_ec: remove unneeded label and if-condition) Merging hsi/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds-lj/for-leds-next (4ba9df04b7ac docs: leds: Add MT6370 RGB LED pattern document) $ git reset --hard HEAD^ Merging next-20230317 version of leds-lj Merging ipmi/for-next (d352cb47df75 ipmi: simplify sysctl registration) Merging driver-core/driver-core-next (fea087fc291b irqchip/mbigen: move to use bus_get_dev_root()) Merging usb/usb-next (55b7fa634d9f dt-bindings: usb: dwc3: Add QCM2290 compatible) Merging thunderbolt/next (68b8e15848c4 thunderbolt: Rename shadowed variables bit to interrupt_bit and auto_clear_bit) Merging usb-serial/usb-next (eeac8ede1755 Linux 6.3-rc2) Merging tty/tty-next (15ac1122fd6d serial: 8250_bcm7271: Fix arbitration handling) CONFLICT (content): Merge conflict in drivers/tty/serial/8250/8250_em.c Merging char-misc/char-misc-next (6ca8f8bf706d misc: lis3lv02d: Fix reading 'st,default-rate' property) CONFLICT (modify/delete): drivers/char/pcmcia/cm4000_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/cm4000_cs.c left in tree. CONFLICT (modify/delete): drivers/char/pcmcia/cm4040_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/cm4040_cs.c left in tree. CONFLICT (modify/delete): drivers/char/pcmcia/scr24x_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/scr24x_cs.c left in tree. CONFLICT (modify/delete): drivers/char/pcmcia/synclink_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/synclink_cs.c left in tree. $ git rm -f drivers/char/pcmcia/cm4000_cs.c drivers/char/pcmcia/cm4040_cs.c drivers/char/pcmcia/scr24x_cs.c drivers/char/pcmcia/synclink_cs.c Merging accel/habanalabs-next (79ae2078e848 accel/habanalabs: remove redundant TODOs) Merging coresight/next (669c4614236a coresight: tmc: Don't enable TMC when it's not ready.) Merging fpga/for-next (fe15c26ee26e Linux 6.3-rc1) Merging icc/icc-next (93ce96a83f93 Merge branch 'icc-fixes' into icc-next) Merging iio/togreg (225dc61e2fa8 iio: adc: stm32-adc: set some stm32-adc.c variables storage-class-specifier to static) Merging phy-next/next (fe15c26ee26e Linux 6.3-rc1) Merging soundwire/next (6c469871e801 soundwire: stream: restore cumulative bus bandwidth when compute_params callback failed) Merging extcon/extcon-next (6384c02f33a9 extcon: Remove redundant null checking for class) CONFLICT (content): Merge conflict in drivers/extcon/extcon.c Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1) Merging vfio/next (d649c34cb916 vfio: Fix NULL pointer dereference caused by uninitialized group->iommufd) Merging staging/staging-next (f4a8e711a66b Staging: octeon: Fix line ending with '(') Merging counter-next/counter-next (fe15c26ee26e Linux 6.3-rc1) Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST) Merging dmaengine/next (fe8f1a2e9b7c dt-bindings: dma: apple,admac: Add t8112-admac compatible) Merging cgroup/for-next (f7ac82ea4b45 Merge branch 'for-6.3-fixes' into for-next) Merging scsi/for-next (2b6ac25dfa2a Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (e05c006dac08 Merge patch series "mpi3mr: Few Enhancements and minor fixes") CONFLICT (content): Merge conflict in drivers/scsi/mpi3mr/mpi3mr_fw.c Merging vhost/linux-next (a8fd36ae67da virtio_ring: Use const to annotate read-only pointer params) Merging rpmsg/for-next (e19967994d34 remoteproc/mtk_scpi_ipi: Fix one kernel-doc comment) Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging gpio-brgl/gpio/for-next (03810031c91d gpio: fxl6408: add I2C GPIO expander driver) Merging gpio-intel/for-next (0928069402ec gpio: mm-lantiq: Fix typo in the newly added header filename) Merging pinctrl/for-next (5c6073d29c45 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (fe15c26ee26e Linux 6.3-rc1) Merging pinctrl-renesas/renesas-pinctrl (9d7558ed8372 pinctrl: renesas: Drop support for Renesas-specific properties) Merging pinctrl-samsung/for-next (fe15c26ee26e Linux 6.3-rc1) Merging pwm/for-next (cf70d01a62c7 pwm: dwc: Use devm_pwmchip_add()) 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 (e1e17d7debf4 kselftest: amd-pstate: Fix spelling mistakes) Merging kunit/test (fe15c26ee26e Linux 6.3-rc1) Merging kunit-next/kunit (99be6588118b kunit: Use gfp in kunit_alloc_resource() kernel-doc) Merging livepatching/for-next (5e36be5973b6 Merge branch 'for-6.4/core' into for-next) Merging rtc/rtc-next (dc87fad6448f rtc: pcf8523: remove unnecessary OR operation) Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) Merging at24/at24/for-next (fe15c26ee26e Linux 6.3-rc1) Merging ntb/ntb-next (0310a30a9395 NTB: ntb_transport: fix possible memory leak while device_register() fails) Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning) Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) Merging slimbus/for-next (fe15c26ee26e Linux 6.3-rc1) Merging nvmem/for-next (6861ff20b635 MAINTAINERS: Add myself as ONIE tlv NVMEM layout maintainer) Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) Merging hyperv/hyperv-next (fe15c26ee26e Linux 6.3-rc1) Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) Merging hmm/hmm (fe15c26ee26e Linux 6.3-rc1) Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) Merging mhi/mhi-next (14853a0676c1 bus: mhi: host: pci_generic: Revert "Add a secondary AT port to Telit FN990") Merging memblock/for-next (34875d6fc52d Add tests for memblock_alloc_node()) Merging cxl/next (e686c32590f4 dax/kmem: Fix leak of memory-hotplug resources) Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) Merging efi/next (1ca8f339d869 efi: libstub: Look for initrd LoadFile2 protocol on image handle) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (c8c04201a5e6 Merge branch 'slab/for-6.4/trivial' into slab/for-next) CONFLICT (content): Merge conflict in include/linux/slab.h 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 (ed35e2f2f0de landlock: Clarify documentation for the LANDLOCK_ACCESS_FS_REFER right) Merging rust/rust-next (fe15c26ee26e Linux 6.3-rc1) Merging sysctl/sysctl-next (0234a6faf178 arm: simplify two-level sysctl registration for ctl_isa_vars) Merging execve/for-next/execve (88603b6dc419 Linux 6.2-rc2) Merging bitmap/bitmap-for-next (714f3af11b21 cpumask: fix function description kernel-doc notation) CONFLICT (content): Merge conflict in include/linux/cpumask.h Merging hte/for-next (fe15c26ee26e Linux 6.3-rc1) Merging kspp/for-next/kspp (78f7a3fd6dc6 randstruct: disable Clang 15 support) Merging kspp-gustavo/for-next/kspp (edfea16a6dae drm/vmwgfx: Replace one-element array with flexible-array member) Merging iommufd/for-next (4ed4791afb34 iommufd/selftest: Add a selftest for iommufd_device_attach() with a hwpt argument) Applying: mm: vmalloc: fix sparc64 warning
Attachment:
pgptK3hvXGOpD.pgp
Description: OpenPGP digital signature
