Hi all, Note: please do not add any v5.20 material to your linux-next included branches until after v5.19-rc1 has been related. Changes since 20220523: The net-next tree gained a conflict against the net tree. The block tree lost its build failure. Non-merge commits (relative to Linus' tree): 12402 12465 files changed, 1025044 insertions(+), 255957 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 350 trees (counting Linus' and 94 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 (140e40e39a29 Merge tag 'zonefs-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs) Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging mm-hotfixes/mm-hotfixes-unstable (2505a981114d zsmalloc: fix races between asynchronous zspage free and page migration) Merging kbuild-current/fixes (312310928417 Linux 5.18-rc1) Merging arc-current/for-curr (c6ed4d84a2c4 ARC: remove redundant READ_ONCE() in cmpxchg loop) Merging arm-current/fixes (3cfb30199796 ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2) Merging arm64-fixes/for-next/fixes (1d0cb4c8864a arm64: mte: Ensure the cleared tags are visible before setting the PTE) Merging arm-soc-fixes/arm/fixes (609a097f5f06 Merge tag 'v5.18-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes) Merging drivers-memory-fixes/fixes (73039c6c7f36 memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode) Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) Merging m68k-current/for-linus (30b5e6ef4a32 m68k: atari: Make Atari ROM port I/O write macros return void) Merging powerpc-fixes/fixes (ee8348496c77 KVM: PPC: Book3S PR: Enable MSR_DR for switch_mmu_context()) Merging s390-fixes/fixes (a06afe838308 KVM: s390: vsie/gmap: reduce gmap_rmap overhead) Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) Merging net/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging bpf/master (8c3b8dc5cc9b net/smc: fix listen processing for SMC-Rv2) Merging ipsec/master (015c44d7bff3 net: af_key: check encryption module availability consistency) Merging netfilter/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too) Merging ipvs/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too) Merging wireless/main (a36e07dfe6ee rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition) Merging rdma-fixes/for-rc (c5eb0a61238d Linux 5.18-rc6) Merging sound-current/for-linus (0163717ed5de Merge tag 'asoc-v5.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (3efa637bc85d Merge remote-tracking branch 'asoc/for-5.18' into asoc-linus) Merging regmap-fixes/for-linus (312310928417 Linux 5.18-rc1) Merging regulator-fixes/for-linus (b11b3d21a94d regulator: qcom_smd: Fix up PM8950 regulator configuration) Merging spi-fixes/for-linus (0cf8d32600cf spi: stm32-qspi: Always check SR_TCF flags in stm32_qspi_wait_cmd()) Merging pci-current/for-linus (4246970a3bcb Revert "PCI: brcmstb: Split brcm_pcie_setup() into two funcs") Merging driver-core.current/driver-core-linus (42226c989789 Linux 5.18-rc7) Merging tty.current/tty-linus (42226c989789 Linux 5.18-rc7) Merging usb.current/usb-linus (42226c989789 Linux 5.18-rc7) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (42226c989789 Linux 5.18-rc7) Merging phy/fixes (2c8045d48dee phy: amlogic: fix error path in phy_g12a_usb3_pcie_probe()) Merging staging.current/staging-linus (ce522ba9ef7e Linux 5.18-rc2) Merging iio-fixes/fixes-togreg (b5e1cf77d1a0 iio: adc: aspeed: Fix refcount leak in aspeed_adc_set_trim_data) Merging counter-fixes/fixes-togreg (ce522ba9ef7e Linux 5.18-rc2) Merging char-misc.current/char-misc-linus (42226c989789 Linux 5.18-rc7) Merging soundwire-fixes/fixes (312310928417 Linux 5.18-rc1) Merging thunderbolt-fixes/fixes (4b0986a3613c Linux 5.18) Merging input-current/for-linus (b26ff9137183 Input: ili210x - use one common reset implementation) Merging crypto-current/master (16287397ec5c crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ) Merging vfio-fixes/for-linus (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used) Merging kselftest-fixes/fixes (e8f0c8965932 selftest/vm: add skip support to mremap_test) Merging modules-fixes/modules-linus (dc0ce6cc4b13 lib/test: use after free in register_test_dev_kmod()) Merging dmaengine-fixes/fixes (7495a5bbf89f dt-bindings: dmaengine: qcom: gpi: Add minItems for interrupts) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (ba7542eb2dd5 mtd: rawnand: qcom: fix memory corruption that causes panic) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (d4cb77112c7b media: isl7998x: select V4L2_FWNODE to fix build error) Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional) Merging mips-fixes/mips-fixes (f0a6c68f6998 MIPS: Fix CP0 counter erratum detection for R4k CPUs) Merging at91-fixes/at91-fixes (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles) Merging omap-fixes/fixes (46ff3df87215 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35) Merging kvm-fixes/master (9f46c187e2e6 KVM: x86/mmu: fix NULL pointer dereference on guest INVPCID) Merging kvms390-fixes/master (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop) Merging hwmon-fixes/hwmon (42226c989789 Linux 5.18-rc7) Merging nvdimm-fixes/libnvdimm-fixes (d28820419ca3 cxl/pci: Drop shadowed variable) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) Merging btrfs-fixes/next-fixes (48de4dc26894 Merge branch 'misc-5.18' into next-fixes) Merging vfs-fixes/fixes (fb4554c2232e Fix double fget() in vhost_net_set_backend()) Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging drivers-x86-fixes/fixes (44acfc22c7d0 platform/surface: aggregator: Fix initialization order when compiling as builtin module) Merging samsung-krzk-fixes/fixes (436ce66003d5 ARM: s3c: mark as deprecated and schedule removal) Merging pinctrl-samsung-fixes/fixes (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config) Merging devicetree-fixes/dt/linus (5dc463042651 dt-bindings: pci: apple,pcie: Drop max-link-speed from example) Merging scsi-fixes/fixes (d5d92b644084 scsi: ufs: core: Fix referencing invalid rsp field) Merging drm-fixes/drm-fixes (4b0986a3613c Linux 5.18) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (4b0986a3613c Linux 5.18) Merging mmc-fixes/fixes (e949dee3625e mmc: core: Fix busy polling for MMC_SEND_OP_COND again) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (312310928417 Linux 5.18-rc1) Merging hyperv-fixes/hyperv-fixes (eaa03d345358 Drivers: hv: vmbus: Replace smp_store_mb() with virt_store_mb()) Merging soc-fsl-fixes/fix (a222fd854139 soc: fsl: qe: Check of ioremap return value) Merging risc-v-fixes/fixes (c932edeaf6d6 riscv: dts: microchip: fix gpio1 reg property typo) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (312310928417 Linux 5.18-rc1) Merging spdx/spdx-linus (53c83d6d8e39 siphash: add SPDX tags as sole licensing authority) Merging gpio-brgl-fixes/gpio/for-current (3ecb10175b1f gpio: mvebu/pwm: Refuse requests with inverted polarity) Merging gpio-intel-fixes/fixes (0c2cae09a765 gpiolib: acpi: Convert type for pin to be unsigned) Merging pinctrl-intel-fixes/fixes (7b923e67a4a7 pinctrl: intel: Fix kernel doc format, i.e. add return sections) Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (02c7efa43627 Documentation: kunit: fix path to .kunitconfig in start.rst) Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) Merging cel-fixes/for-rc (4b0986a3613c Linux 5.18) Merging irqchip-fixes/irq/irqchip-fixes (544808f7e21c irqchip/gic, gic-v3: Prevent GSI to SGI translations) Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) Merging perf-current/perf/urgent (eaea45fc0e7b Merge tag 'perf-tools-fixes-for-v5.18-2022-05-21' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) Merging efi-fixes/urgent (9feaf8b387ee efi: fix return value of __setup handlers) Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) Merging drm-misc-fixes/for-linux-next-fixes (edbc7960bef7 drm/bridge: ti-sn65dsi83: Handle dsi_lanes == 0 as invalid) Merging kbuild/for-next (193ce6b16e10 scripts/kallsyms: update usage message of the kallsyms program) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf/core (5d2b6bc3a6a2 perf intel-pt: Add guest_code support) Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) Merging dma-mapping/for-next (4a37f3dd9a83 dma-direct: don't over-decrypt memory) Merging asm-generic/master (b2441b3bdce6 h8300: remove stale bindings and symlink) CONFLICT (modify/delete): Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml deleted in asm-generic/master and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml left in tree. $ git rm -f Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml Merging arc/for-next (6aa98f621786 ARC: bpf: define uapi for BPF_PROG_TYPE_PERF_EVENT program type) Merging arm/for-next (b6f21d14f1ac ARM: 9204/2: module: Add all unwind tables when load module) Merging arm64/for-next/core (0616ea3f1b93 Merge branch 'for-next/esr-elx-64-bit' into for-next/core) Merging arm-perf/for-next/perf (c5781212985a perf/arm-cmn: Decode CAL devices properly in debugfs) Merging arm-soc/for-next (2b7d17d4b7c1 soc: document merges) CONFLICT (content): Merge conflict in arch/arm/Kconfig Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (ed532523b458 Merge branch 'v5.18/fixes' into for-next) Merging aspeed/for-next (8dc7aa0a7246 ARM: dts: aspeed: ast2600-evb: Enable GFX device) Merging at91/at91-next (3519476d99a4 Merge branch 'at91-dt' into at91-next) Merging drivers-memory/for-next (1e2b798e9664 Merge branch 'for-v5.19/tegra-mc' into for-next) Merging imx-mxs/for-next (6ed2affe8f7f Merge branch 'imx/defconfig' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (8434c5a06e3c Merge branch 'v5.18-next/soc' into for-next) Merging mvebu/for-next (58ec0844bd13 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (b5418fc0478c Merge branch 'omap-for-v5.19/dt' into for-next) Merging qcom/for-next (5faa5cd718a4 Merge branches 'arm64-for-5.19', 'arm64-defconfig-for-5.19', 'clk-for-5.19', 'defconfig-for-5.19', 'drivers-for-5.19', 'dts-for-5.19' and 'arm64-fixes-for-5.18' into for-next) Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) Merging renesas/next (7ae962c56cea Merge branch 'renesas-arm-dt-for-v5.19' into renesas-next) Merging reset/reset/next (2ca065dc9468 dt-bindings: reset: st,sti-powerdown: Convert to yaml) Merging rockchip/for-next (1378fa35abe3 Merge branch 'v5.19-clk/next' into for-next) Merging samsung-krzk/for-next (88fb0c4d0aff Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (42226c989789 Linux 5.18-rc7) Merging stm32/stm32-next (747a29b9a5a5 dt-bindings: clock: stm32mp1: adapt example for "st,stm32mp1-rcc-secure") Merging sunxi/sunxi/for-next (073220ee354d Merge branch 'sunxi/dt-for-5.19' into sunxi/for-next) Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) Merging tegra/for-next (864067632632 Merge branch for-5.19/arm64/defconfig into for-next) Merging ti/ti-next (4cc89036bc4f Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (63623390c0d6 arm64: dts: zynqmp: add AMS driver to device tree) Merging clk/clk-next (219a97ed96be Merge branch 'clk-cleanup' into clk-next) Merging clk-imx/for-next (cf7f3f4fa9e5 clk: imx8mp: fix usb_root_clk parent) Merging clk-renesas/renesas-clk (23426d1be3c2 clk: renesas: r9a09g011: Add eth clock and reset entries) Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) Merging csky/linux-next (64d83f067746 csky: Move $(core-y) into arch/csky/Kbuild) Merging loongarch/loongarch-next (cdfe896c18ca MAINTAINERS: Add maintainer information for LoongArch) Merging m68k/for-next (30b5e6ef4a32 m68k: atari: Make Atari ROM port I/O write macros return void) Merging m68knommu/for-next (13a55e3a00d1 m68knommu: fix 68000 CPU link with no platform selected) CONFLICT (content): Merge conflict in arch/m68k/kernel/ptrace.c Merging microblaze/next (78b5f52ab6f6 microblaze: fix typos in comments) Merging mips/mips-next (e205a9945cf9 MIPS: bmips: Fix compiler warning observed on W=1 build) Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) Merging openrisc/for-next (83da38d82b2f openrisc: Allow power off handler overriding) Merging parisc-hd/for-next (c17709184924 parisc: Optimize tmpalias function calls) Merging powerpc/next (a5d28039ecb2 powerpc/powernv/pci: Drop VF MPS fixup) Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value) Merging risc-v/for-next (19bc59bbeddf Merge tag 'generic-ticket-spinlocks-v6' into for-next) CONFLICT (content): Merge conflict in arch/riscv/boot/dts/sifive/fu540-c000.dtsi Merging s390/for-next (4969d2ec2926 Merge branch 'features' into for-next) Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) Merging uml/linux-next (82017457957a um: run_helper: Write error message to kernel log on exec failure on host) Merging xtensa/xtensa-for-next (dc60001e1a30 xtensa: Return true/false (not 1/0) from bool function) Merging pidfd/for-next (e1bbcd277a53 fs: hold writers when changing mount's idmapping) Merging fscrypt/master (218d921b581e fscrypt: add new helper functions for test_dummy_encryption) Merging fscache/fscache-next (713423282ae1 netfs: Fix gcc-12 warning by embedding vfs inode in netfs_i_context) Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) Merging btrfs/for-next (a593e0fd315b Merge branch 'for-next-next-v5.18-20220517' into for-next-20220517) Merging ceph/master (b2ef8cf16c4f fs: change test in inode_insert5 for adding to the sb list) Merging cifs/for-next (df2087874608 cifs: fix minor compile warning) Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) Merging erofs/dev (ba73eadd23d1 erofs: scan devices from device table) Merging exfat/dev (64ba4b15e5c0 exfat: check if cluster num is valid) Merging ext3/for_next (5c905e1a0180 Pull typo fix from Julia Lawall.) Merging ext4/dev (d177c151d748 ext4: only allow test_dummy_encryption when supported) Merging f2fs/dev (759820c92a34 f2fs: fix typo in comment) Merging fsverity/fsverity (e6af1bb07704 fs-verity: Use struct_size() helper in enable_verity()) Merging fuse/for-next (6b49bc9d8a5f fuse: avoid unnecessary spinlock bump) Merging gfs2/for-next (11330d507642 gfs2: Convert function bh_get to use iomap) Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) Merging ksmbd/ksmbd-for-next (376b91338268 ksmbd: fix outstanding credits related bugs) Merging nfs/linux-next (42226c989789 Linux 5.18-rc7) Merging nfs-anna/linux-next (9c4a5c75a62e NFS: Pass i_size to fscache_unuse_cookie() when a file is released) Merging nfsd/for-next (fd5e363eac77 nfsd: destroy percpu stats counters after reply cache shutdown) Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) Merging overlayfs/overlayfs-next (bc70682a497c ovl: support idmapped layers) Merging ubifs/next (705757274599 ubifs: rename_whiteout: correct old_dir size computing) Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first") Merging xfs/for-next (ab6a8d3f1a2a Merge branch 'guilt/xfs-5.19-misc-3' into xfs-5.19-for-next) Merging zonefs/for-next (31a644b3c2ae documentation: zonefs: Document sysfs attributes) Merging iomap/iomap-for-next (e9c3a8e820ed iomap: don't invalidate folios after writeback errors) Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) Merging vfs/for-next (e9921ffd594f Merge branches 'work.namei', 'work.mount' and 'work.fd' into for-next) CONFLICT (content): Merge conflict in fs/io_uring.c Merging printk/for-next (a110b11164a5 Merge branch 'rework/kthreads' into for-next) Merging pci/next (bd11b0c88586 Merge branch 'remotes/lorenzo/pci/vmd') Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code) Merging hid/for-next (b01c83388f54 Revert "HID: Driver for Google Hangouts Meet Speakermic") Merging i2c/i2c/for-next (44e66c3bda45 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (227fab1ee7ca i3c: master: svc: fix returnvar.cocci warning) Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) Merging hwmon-staging/hwmon-next (8877ecb0fc8d hwmon: (aquacomputer_d5next) Fix an error handling path in aqc_probe()) Merging jc_docs/docs-next (b86f46d5ce3e docs: pdfdocs: Add space for chapter counts >= 100 in TOC) CONFLICT (content): Merge conflict in Documentation/process/embargoed-hardware-issues.rst Merging v4l-dvb/master (340ce50f75a6 media: hantro: Enable HOLD_CAPTURE_BUF for H.264) Merging v4l-dvb-next/master (340ce50f75a6 media: hantro: Enable HOLD_CAPTURE_BUF for H.264) Merging pm/linux-next (3d22e39d225d Merge branch 'acpica' into linux-next) CONFLICT (content): Merge conflict in include/acpi/actbl2.h Merging cpufreq-arm/cpufreq/arm/linux-next (39b360102f3a cpufreq: mediatek: Add support for MT8186) Merging cpupower/cpupower (312310928417 Linux 5.18-rc1) Merging devfreq/devfreq-next (2e691421a2c9 PM / devfreq: rk3399_dmc: Block PMU during transitions) Merging opp/opp/linux-next (22079af7df5a opp: Reorder definition of ceil/floor helpers) Merging thermal/thermal/linux-next (72b3fc61c752 thermal: k3_j72xx_bandgap: Add the bandgap driver support) Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (8e51ec6146fd dlm: use kref_put_lock in __put_lkb) Merging rdma/for-next (9cf62d91e4b7 RDMA/mlx4: Avoid flush_scheduled_work() usage) CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/main.c Merging net-next/master (1ef0736c0711 Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/macb_main.c CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/main.c CONFLICT (content): Merge conflict in net/smc/af_smc.c Merging bpf-next/for-next (608b638ebf36 Merge branch 'Dynamic pointers') Merging ipsec-next/master (0f9008e5c510 Merge branch 'Be explicit with XFRM offload direction') Merging mlx5-next/mlx5-next (846e437387e7 net/mlx5: Expose mlx5_sriov_blocking_notifier_register / unregister APIs) Merging netfilter-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case) Merging ipvs-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case) Merging bluetooth/master (edcb185fa9c4 Bluetooth: hci_sync: use hci_skb_event() helper) Merging wireless-next/main (805cb5aadc2a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next) Merging mtd/mtd/next (2c51d0d88020 Merge tag 'nand/for-5.19' into mtd/next) Merging nand/nand/next (6a2277a0ebe7 mtd: rawnand: renesas: Use runtime PM instead of the raw clock API) Merging spi-nor/spi-nor/next (c47452194641 mtd: spi-nor: debugfs: fix format specifier) Merging crypto/master (e4e62bbc6aba hwrng: omap3-rom - fix using wrong clk_disable() in omap_rom_rng_runtime_resume()) Merging drm/drm-next (f8122500a039 Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c Applying: fi up for "drm/i915/dmc: Add MMIO range restrictions" Merging drm-misc/for-linux-next (5ee8c8f930ba drm/rockchip: Change register space names in vop2) Merging amdgpu/drm-next (965e4fc0d716 drm/amd/pm: enable memory temp reading for SMU 13.0.0) Merging drm-intel/for-linux-next (0ea917819d12 drm/i915/dsi: fix VBT send packet port selection for ICL+) Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats) Merging drm-msm/msm-next (24df12013853 MAINTAINERS: Add Dmitry as MSM DRM driver co-maintainer) Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary) Merging fbdev/for-next (d87ad457f7e1 video: fbdev: pxa3xx-gcu: release the resources correctly in pxa3xx_gcu_probe/remove()) Merging regmap/for-next (5c422f0b970d regmap: Add missing map->bus check) Merging sound/for-next (0163717ed5de Merge tag 'asoc-v5.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc/for-next (3efa637bc85d Merge remote-tracking branch 'asoc/for-5.18' into asoc-linus) Merging modules/modules-next (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section()) CONFLICT (content): Merge conflict in arch/powerpc/Kconfig CONFLICT (content): Merge conflict in kernel/module/main.c Applying: fix up for "module: Move version support into a separate file" Merging input/next (fabcf4d86968 Input: cypress_ps2 - fix typo in comment) Merging block/for-next (9e812278be4c Merge branch 'for-5.19/drivers' into for-next) CONFLICT (content): Merge conflict in fs/io_uring.c CONFLICT (content): Merge conflict in fs/io_uring.c CONFLICT (content): Merge conflict in fs/io_uring.c Merging device-mapper/for-next (d254c3699fdd dm cache metadata: remove unnecessary variable in __dump_mapping) Merging libata/for-next (71abb4df2981 ata: pata_ftide010: Remove unneeded ERROR check before clk_disable_unprepare) Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards) Merging mmc/next (ded2c4c34500 mmc: sdhci-of-arasan: Add NULL check for data field) CONFLICT (content): Merge conflict in drivers/mmc/core/queue.c Merging mfd/for-mfd-next (eeb0a442da2f mfd: intel-lpss: Add support for ADL-P i2c6 and i2c7) Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight()) Merging battery/for-next (d96a89407e5f power: supply: bq24190_charger: using pm_runtime_resume_and_get instead of pm_runtime_get_sync) Merging regulator/for-next (a5b8e4a5ceec Merge remote-tracking branch 'regulator/for-5.19' into regulator-next) Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize') Merging integrity/next-integrity (048ae41bb080 integrity: Fix sparse warnings in keyring_handler) Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) Merging selinux/next (1af0e4a0233f security: declare member holding string literal const) Merging smack/next (ba6b652bd863 smack: Remove redundant assignments) Merging tomoyo/master (e449c388913c workqueue: Wrap flush_workqueue() using an inline function) Merging tpmdd/next (7f3113e3b9f7 MAINTAINERS: add KEYS-TRUSTED-CAAM) CONFLICT (content): Merge conflict in drivers/crypto/caam/Kconfig Merging watchdog/master (5d24df3d6908 watchdog: ts4800_wdt: Fix refcount leak in ts4800_wdt_probe) Merging iommu/next (b0dacee202ef Merge branches 'apple/dart', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd' and 'vfio-notifier-fix' into next) CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/iommu/amd/iommu.c Merging audit/next (312310928417 Linux 5.18-rc1) Merging devicetree/for-next (d036d915b61f of/irq: fix typo in comment) Merging mailbox/mailbox-for-next (bca1a1004615 mailbox: forward the hrtimer if not queued and under a lock) Merging spi/for-next (9c63b846e6df spi: spi-mem: Convert Aspeed SMC driver to spi-mem) Merging tip/master (cfbb29a89e8b Merge branch into tip/master: 'x86/vdso') CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt CONFLICT (content): Merge conflict in drivers/virt/Kconfig CONFLICT (content): Merge conflict in drivers/virt/Makefile CONFLICT (content): Merge conflict in kernel/sysctl.c CONFLICT (content): Merge conflict in scripts/Makefile.build Merging clockevents/timers/drivers/next (ff714ee7191b clocksource/drivers/timer-ti-dm: Add compatible for am6 SoCs) Merging edac/edac-for-next (92705c9f9956 Merge edac-misc into for-next) Merging irqchip/irq/irqchip-next (492449ae4f0a Merge branch irq/gic-v3-nmi-fixes-5.19 into irq/irqchip-next) Merging ftrace/for-next (c87857e21486 Merge branch 'trace/for-next-rtla' into trace/for-next) Merging rcu/rcu/next (409db57c8d45 Merge branch 'lkmm.2022.05.03a' into HEAD) Merging kvm/next (a6717fc663bd KVM: x86/pmu: Use only the uniform interface reprogram_counter()) CONFLICT (content): Merge conflict in arch/arm64/kvm/sys_regs.c Merging kvm-arm/next (5c0ad551e9aa Merge branch kvm-arm64/its-save-restore-fixes-5.19 into kvmarm-master/next) Merging kvms390/next (c71159648c3c KVM: s390: selftest: Test suppression indication on key prot exception) Merging xen-tip/linux-next (5b3353949e89 xen: add support for initializing xenstore later as HVM domain) CONFLICT (content): Merge conflict in arch/x86/xen/enlighten_pv.c Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) Merging workqueues/for-next (10a5a651e3af workqueue: Restrict kworker in the offline CPU pool running on housekeeping CPUs) Merging drivers-x86/for-next (badb81a58b9e platform/x86/intel/ifs: Add CPU_SUP_INTEL dependency) Merging chrome-platform/for-next (abd4fd43f2af platform/chrome: Use imperative mood for ChromeOS ACPI sysfs ABI descriptions) Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe) Merging leds/for-next (73bce575ed90 leds: lp50xx: Remove duplicated error reporting in .remove()) Merging ipmi/for-next (a508e33956b5 ipmi:ipmb: Fix refcount leak in ipmi_ipmb_probe) Merging driver-core/driver-core-next (b232b02bf3c2 driver core: fix deadlock in __device_attach) Merging usb/usb-next (97fa5887cf28 USB: new quirk for Dell Gen 2 devices) Merging thunderbolt/next (c7c99a09ef0e thunderbolt: Add KUnit test for devices with no DisplayPort adapters) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (33b7af2f459d USB: serial: option: add Quectel BG95 modem) Merging tty/tty-next (25e02ba60f0f tty: Rework receive flow control char logic) Merging char-misc/char-misc-next (90de6805267f habanalabs: use separate structure info for each error collect data) CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/slimbus/qcom-ctrl.c CONFLICT (content): Merge conflict in drivers/usb/dwc3/drd.c Applying: fixup for "usb: dwc3: Don't switch OTG -> peripheral if extcon is present" Merging coresight/next (1adff542d67a coresight: cpu-debug: Replace mutex with mutex_trylock on panic notifier) Merging fpga/for-next (ae23f746d744 fpga: dfl: Allow Port to be linked to FME's DFL) Merging icc/icc-next (3be0ec65fd17 dt-bindings: interconnect: Remove sc7180/sdx55 ipa compatibles) Merging iio/togreg (c321674386d8 iio: adc: rzg2l_adc: Remove unnecessary channel check from rzg2l_adc_read_label()) Merging phy-next/next (d413a34932f9 phy: qcom-qmp: rename error labels) Merging soundwire/next (74da272400b4 soundwire: qcom: adjust autoenumeration timeout) Merging extcon/extcon-next (5dcc2afe716d extcon: Modify extcon device to be created after driver data is set) Merging gnss/gnss-next (312310928417 Linux 5.18-rc1) Merging vfio/next (7ab5e10eda02 vfio/pci: Move the unused device into low power state with runtime PM) Merging staging/staging-next (6a31a95135da staging: r8188eu: remove include/rtw_debug.h) CONFLICT (content): Merge conflict in drivers/net/wireless/silabs/wfx/sta.c Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) Merging dmaengine/next (d1a285978082 dmaengine: idxd: make idxd_wq_enable() return 0 if wq is already enabled) CONFLICT (content): Merge conflict in drivers/dma/idxd/device.c Merging cgroup/for-next (8a4f243bd5cf Merge branch 'for-5.19' into for-next) Merging scsi/for-next (f619d4a66989 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (b23a0b8388bf scsi: libiscsi: Improve conn_send_pdu API) Merging vhost/linux-next (73211bf1bc3a vdpasim: allow to enable a vq repeatedly) Merging rpmsg/for-next (01a1a0c8d456 Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next) Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) Merging gpio-brgl/gpio/for-next (c680c6a814a2 gpio: sim: Use correct order for the parameters of devm_kcalloc()) Merging gpio-intel/for-next (edc5601db664 pinctrl: meson: Replace custom code by gpiochip_node_count() call) Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) Merging pinctrl/for-next (374e72d721d1 Merge tag 'intel-pinctrl-v5.19-2' of gitolite.kernel.org:pub/scm/linux/kernel/git/pinctrl/intel into devel) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt Merging pinctrl-intel/for-next (7b923e67a4a7 pinctrl: intel: Fix kernel doc format, i.e. add return sections) Merging pinctrl-renesas/renesas-pinctrl (fc883ed5a43e pinctrl: renesas: checker: Add reserved field checks) Merging pinctrl-samsung/for-next (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config) Merging pwm/for-next (3d593b6e80ad pwm: pwm-cros-ec: Add channel type support) Merging userns/for-next (a58ea318d8b9 Merge of per-namespace-ipc-sysctls-for-v5.19, kthread-cleanups-for-v5.19, ptrace_stop-cleanup-for-v5.19, and ucount-rlimits-cleanups-for-v5.19 for testing in linux-next) CONFLICT (modify/delete): arch/h8300/kernel/process.c deleted in HEAD and modified in userns/for-next. Version userns/for-next of arch/h8300/kernel/process.c left in tree. CONFLICT (content): Merge conflict in arch/x86/kernel/process.c $ git rm -f arch/h8300/kernel/process.c Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (15477b31db10 kselftests/ir : Improve readability of modprobe error message) Merging livepatching/for-next (6d111a66d8b0 Merge branch 'for-5.19/cleanup' into for-next) Merging rtc/rtc-next (b520cbe5be37 rtc: ftrtc010: Fix error handling in ftrtc010_rtc_probe) Merging nvdimm/libnvdimm-for-next (f42e8e5088b9 pmem: implement pmem_recovery_write()) Merging at24/at24/for-next (312310928417 Linux 5.18-rc1) Merging ntb/ntb-next (e9d0fa5e2482 IDT: Fix Build warnings on some 32bit architectures.) Merging seccomp/for-next/seccomp (5e91d2a41469 selftests/seccomp: Fix spelling mistake "Coud" -> "Could") Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path) Merging slimbus/for-next (54bf672111ee slimbus: qcom: Fix IRQ check in qcom_slim_probe) CONFLICT (content): Merge conflict in drivers/slimbus/qcom-ctrl.c Merging nvmem/for-next (0f07cbb92a28 nvmem: sfp: Add support for TA 2.1 devices) CONFLICT (content): Merge conflict in MAINTAINERS Merging xarray/main (63b1898fffcd XArray: Disallow sibling entries of nodes) Merging hyperv/hyperv-next (b4927bd27262 PCI: hv: Fix synchronization between channel callback and hv_pci_bus_exit()) Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) Merging hmm/hmm (312310928417 Linux 5.18-rc1) Merging kunit/test (312310928417 Linux 5.18-rc1) Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) Merging kunit-next/kunit (e7eaffce47b7 kunit: tool: Use qemu-system-i386 for i386 runs) CONFLICT (content): Merge conflict in drivers/thunderbolt/test.c CONFLICT (content): Merge conflict in net/mctp/test/route-test.c CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) Merging mhi/mhi-next (13b9b814da2d bus: mhi: host: Add support for Foxconn T99W373 and T99W368) Merging memblock/for-next (000605cd1b14 memblock tests: remove completed TODO item) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) Merging cxl/next (34e37b4c432c cxl/port: Enable HDM Capability after validating DVSEC Ranges) Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) Merging efi/next (3f68e69520d3 riscv/efi_stub: Add support for RISCV_EFI_BOOT_PROTOCOL) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (6b2d72729581 Merge branches 'slab/for-5.19/stackdepot' and 'slab/for-5.19/refactor' into slab/for-next) Merging random/master (1ce6c8d68f8a random: check for signals after page of pool writes) Merging landlock/next (7c2536771184 landlock: Explain how to support Landlock) Merging rust/rust-next (9a5fe747d99e init/Kconfig: Specify the interpreter for rust-is-available.sh) CONFLICT (content): Merge conflict in Makefile CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h Merging sysctl/sysctl-next (494dcdf46e5c sched: Fix build warning without CONFIG_SYSCTL) CONFLICT (content): Merge conflict in kernel/trace/ftrace.c Merging folio/for-next (516edb456f12 nilfs2: Fix some kernel-doc comments) CONFLICT (content): Merge conflict in fs/btrfs/ctree.h CONFLICT (content): Merge conflict in fs/btrfs/inode.c CONFLICT (content): Merge conflict in fs/btrfs/send.c CONFLICT (content): Merge conflict in fs/ext4/namei.c CONFLICT (content): Merge conflict in fs/f2fs/data.c Applying: fix up for "btrfs: move btrfs_readpage to extent_io.c" Applying: fixup for "mm,fs: Remove stray references to ->readpage" Merging execve/for-next/execve (70578ff3367d binfmt_flat: Remove shared library support) Merging bitmap/bitmap-for-next (db7b4edf37fe nodemask: Fix return values to be unsigned) CONFLICT (content): Merge conflict in arch/x86/kvm/hyperv.c Merging hte/hte/for-next (af583852d2ef dt-bindings: Renamed hte directory to timestamp) Merging kspp/for-next/kspp (0b8134f738fe gcc-plugins: Require utsrelease.h before scripts target) CONFLICT (content): Merge conflict in drivers/misc/lkdtm/stackleak.c CONFLICT (content): Merge conflict in include/linux/netfs.h Merging kspp-gustavo/for-next/kspp (0cf2b91d74b7 Merge branch 'for-next/kspp-stringop-overflow' into for-next/kspp) Merging mm-stable/mm-stable (02e34fff195d mm: damon: use HPAGE_PMD_SIZE) CONFLICT (content): Merge conflict in arch/x86/mm/Makefile CONFLICT (content): Merge conflict in fs/nfs/file.c CONFLICT (content): Merge conflict in include/linux/slab.h CONFLICT (content): Merge conflict in mm/page_io.c Merging mm-nonmm-stable/mm-nonmm-stable (69bc169ec33f fs/ntfs: remove redundant variable idx) CONFLICT (content): Merge conflict in include/linux/ptrace.h Merging mm/mm-everything (ca2284476829 Merge branch 'mm-nonmm-unstable' into mm-everything) Applying: fixup for "mm: change huge_ptep_clear_flush() to return the original pte" $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (90cc070c17f8 mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery)
Attachment:
pgpkEuyyE1gPk.pgp
Description: OpenPGP digital signature
