Hi all, Changes since 20220615: New trees: broadcom-fixes, broadcom, drm-msm-lumag The net-next tree gained a conflict against the rockchip tree. The amdgpu tree lost one build failure. The amdgpu tree still had its build failures, so I used the version from next-20220601 again. Non-merge commits (relative to Linus' tree): 3480 4117 files changed, 215956 insertions(+), 66506 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 356 trees (counting Linus' and 97 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 (30306f6194ca Merge tag 'hardening-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) 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 (1e8d6502ba4b mm/memory-failure: disable unpoison once hw error happens) Merging kbuild-current/fixes (b13baccc3850 Linux 5.19-rc2) Merging arc-current/for-curr (f978e8023f33 ARC: bitops: Change __fls to return unsigned long) Merging arm-current/fixes (3cfb30199796 ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2) Merging arm64-fixes/for-next/fixes (0d8116ccd83b arm64: ftrace: remove redundant label) Merging arm-soc-fixes/arm/fixes (5e93207e962a bus: bt1-axi: Don't print error on -EPROBE_DEFER) Merging drivers-memory-fixes/fixes (1332661e0930 memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings) 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 (8e1278444446 powerpc/32: Fix overread/overwrite of thread_struct via ptrace) Merging s390-fixes/fixes (f2906aa86338 Linux 5.19-rc1) 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 (219b51a6f040 net: ax25: Fix deadlock caused by skb_recv_datagram in ax25_recvmsg) Merging bpf/master (d1a374a1aeb7 bpf: Limit maximum modifier chain length in btf_check_type_tags) Merging ipsec/master (f85daf0e7253 xfrm: xfrm_policy: fix a possible double xfrm_pols_put() in xfrm_bundle_lookup()) 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/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging wireless/for-next (c2b3a0759c76 dt-bindings: net: wireless: ath11k: change Kalle's email) Merging rdma-fixes/for-rc (118f767413ad RDMA/qedr: Fix reporting QP timeout attribute) Merging sound-current/for-linus (56ec3e755bd1 ALSA: hda/realtek: Apply fixup for Lenovo Yoga Duet 7 properly) Merging sound-asoc-fixes/for-linus (0a6d2c147bed Merge remote-tracking branch 'asoc/for-5.18' into asoc-linus) Merging regmap-fixes/for-linus (f2906aa86338 Linux 5.19-rc1) Merging regulator-fixes/for-linus (122e951eb804 regulator: qcom_smd: correct MP5496 ranges) Merging spi-fixes/for-linus (6aa27071e435 spi: dt-bindings: Fix unevaluatedProperties warnings in examples) Merging pci-current/for-linus (f2906aa86338 Linux 5.19-rc1) Merging driver-core.current/driver-core-linus (f2906aa86338 Linux 5.19-rc1) Merging tty.current/tty-linus (be03b0651ffd serial: 8250: Store to lsr_save_flags after lsr read) Merging usb.current/usb-linus (0698f0209d80 usb: gadget: f_fs: change ep->ep safe in ffs_epfile_io()) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (158f7585bfce USB: serial: option: add support for Cinterion MV31 with new baseline) Merging phy/fixes (f2906aa86338 Linux 5.19-rc1) Merging staging.current/staging-linus (cd756dafd86e staging: Also remove the Unisys visorbus.h) Merging iio-fixes/fixes-togreg (8204d960f5b1 iio: adc: stm32: fix maximum clock rate for stm32mp15x) Merging counter-fixes/fixes-togreg (f2906aa86338 Linux 5.19-rc1) Merging char-misc.current/char-misc-linus (928ea98252ad bus: fsl-mc-bus: fix KASAN use-after-free in fsl_mc_bus_remove()) Merging soundwire-fixes/fixes (f2906aa86338 Linux 5.19-rc1) Merging thunderbolt-fixes/fixes (b13baccc3850 Linux 5.19-rc2) Merging input-current/for-linus (6ab2e51898cd Input: soc_button_array - also add Lenovo Yoga Tablet2 1051F to dmi_use_low_level_irq) Merging crypto-current/master (abfed87e2a12 crypto: memneq - move into lib/) Merging vfio-fixes/for-linus (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used) Merging kselftest-fixes/fixes (795285ef2425 selftests: Fix clang cross compilation) Merging modules-fixes/modules-linus (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section()) Merging dmaengine-fixes/fixes (a7cd3cf0b2e5 dmaengine: imx-sdma: Allow imx8m for imx7 FW revs) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (2c5947cffd81 Revert "mtd: rawnand: add support for Toshiba TC58NVG0S3HTA00 NAND flash") Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (d3daf73380ce media: dvb_vb2: fix possible out of bound access) Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional) Merging mips-fixes/mips-fixes (41e456400212 MIPS: Loongson-3: fix compile mips cpu_hwmon as module build error.) 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 (e0f3f46e4206 KVM: selftests: Restrict test region to 48-bit physical addresses when using nested) Merging kvms390-fixes/master (242c04f01377 KVM: s390: selftests: Use TAP interface in the reset test) Merging hwmon-fixes/hwmon (ec41c6d82056 hwmon: (asus-ec-sensors) add missing comma in board name list.) 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 (5f414c4e30de Merge branch 'misc-5.19' into next-fixes) Merging vfs-fixes/fixes (1c7c0f168f97 fix short copy handling in copy_mc_pipe_to_iter()) 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 (d4fe9cc4ff86 platform/x86/intel: hid: Add Surface Go to VGBS allow list) Merging samsung-krzk-fixes/fixes (c4c79525042a ARM: exynos: Fix refcount leak in exynos_map_pmu) Merging pinctrl-samsung-fixes/fixes (f2906aa86338 Linux 5.19-rc1) Merging devicetree-fixes/dt/linus (0b9431c8221c dt-bindings: display: arm,malidp: remove bogus RQOS property) Merging scsi-fixes/fixes (f6eed15f3ea7 scsi: iscsi: Exclude zero from the endpoint ID range) Merging drm-fixes/drm-fixes (b13baccc3850 Linux 5.19-rc2) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (2636e0081124 drm/i915/uc: remove accidental static from a local variable) Merging mmc-fixes/fixes (89bcd9a64b84 mmc: mediatek: wait dma stop bit reset to 0) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (f2906aa86338 Linux 5.19-rc1) Merging hyperv-fixes/hyperv-fixes (49d6a3c062a1 x86/Hyper-V: Add SEV negotiate protocol support in Isolation VM) Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) Merging risc-v-fixes/fixes (f2906aa86338 Linux 5.19-rc1) Merging risc-v-mc-fixes/dt-fixes (5e757deddd91 riscv: dts: microchip: re-add pdma to mpfs device tree) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (f2906aa86338 Linux 5.19-rc1) Merging spdx/spdx-linus (de0130355306 x86/crypto: Remove stray comment terminator) Merging gpio-brgl-fixes/gpio/for-current (a01a40e33499 gpio: realtek-otto: Make the irqchip immutable) Merging gpio-intel-fixes/fixes (b93a8b2c5161 gpio: dln2: make irq_chip immutable) Merging pinctrl-intel-fixes/fixes (ba79c5e45eec MAINTAINERS: Update Intel pin control to Supported) 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 (f2906aa86338 Linux 5.19-rc1) 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 (da9e94fe000e SUNRPC: Remove pointer type casts from xdr_get_next_encode_buffer()) Merging irqchip-fixes/irq/irqchip-fixes (6fac824f4098 irqchip/loongson-liointc: Use architecture register to get coreid) Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) Merging broadcom-fixes/fixes (0070ff32d9fc Merge branch 'maintainers/fixes' into fixes) 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 (05c800c26b21 efi/x86: libstub: Fix typo in __efi64_argmap* name) Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) Merging battery-fixes/fixes (093d27bb6f2d power: supply: core: Fix boundary conditions in interpolation) Merging drm-misc-fixes/for-linux-next-fixes (0f9cd1ea10d3 drm/ttm: fix bulk move handling v2) Merging kbuild/for-next (b13baccc3850 Linux 5.19-rc2) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf/core (9886142c7a22 Merge tag 'input-for-v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) Merging dma-mapping/for-next (e15db62bc564 swiotlb: fix setting ->force_bounce) Merging asm-generic/master (6f1de1da8156 soc: qcom: geni: Disable MMIO tracing for GENI SE) Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) Merging arm/for-next (bafa10435c4f ARM: 9209/1: Spectre-BHB: avoid pr_info() every time a CPU comes out of idle) Merging arm64/for-next/core (78c09c0f4df8 kselftest/arm64: signal: Skip SVE signal test if not enough VLs supported) Merging arm-perf/for-next/perf (c5781212985a perf/arm-cmn: Decode CAL devices properly in debugfs) Merging arm-soc/for-next (3949559bf346 arm: document merges) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (47aa99515d85 Merge branch 'v5.20/arm64-dt' into for-next) Merging aspeed/for-next (bfcbea2c93e5 ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom) Merging at91/at91-next (3519476d99a4 Merge branch 'at91-dt' into at91-next) Merging broadcom/next (ef08835a543e Merge branch 'soc/next' into next) Merging drivers-memory/for-next (44a5f0330d32 Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (71f7a4d5e7cd Merge branch 'imx/defconfig' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (b7fb186ebab3 Merge branch 'v5.19-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 (b50ea0548bb5 Merge branches 'renesas-arm-defconfig-for-v5.20', 'renesas-arm-dt-for-v5.20' and 'renesas-drivers-for-v5.20' into renesas-next) Merging reset/reset/next (2ca065dc9468 dt-bindings: reset: st,sti-powerdown: Convert to yaml) Merging rockchip/for-next (e27728b91489 Merge branch 'v5.20-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (97eab4d7fd79 Merge branch 'next/soc' into for-next) Merging scmi/for-linux-next (c220f18efe25 Merge branch 'for-next/juno' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (a7f6f44add8d ARM: dts: stm32: correct vcc-supply for eeprom on stm32mp15xx-osd32) Merging sunxi/sunxi/for-next (96d0ea7d04b4 Merge branch 'sunxi/dt-for-5.20' into sunxi/for-next) Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) Merging tegra/for-next (22cd13a29127 Merge branch for-5.20/arm64/defconfig into for-next) Merging ti/ti-next (f2906aa86338 Linux 5.19-rc1) Merging xilinx/for-next (63623390c0d6 arm64: dts: zynqmp: add AMS driver to device tree) Merging clk/clk-next (f2906aa86338 Linux 5.19-rc1) Merging clk-imx/for-next (cf7f3f4fa9e5 clk: imx8mp: fix usb_root_clk parent) Merging clk-renesas/renesas-clk (fc9e01676cc4 dt-bindings: clock: renesas,rzg2l: Simplify header file references) 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 (b13baccc3850 Linux 5.19-rc2) Merging m68k/for-next (a02227d13bb8 m68k: mac: Fix typos in comments) Merging m68knommu/for-next (43f754134a92 m68k: Fix syntax errors in comments) Merging microblaze/next (78b5f52ab6f6 microblaze: fix typos in comments) Merging mips/mips-next (f2906aa86338 Linux 5.19-rc1) 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 (1d0811b03eb3 parisc/stifb: Fix fb_is_primary_device() only available with CONFIG_FB_STI) Merging powerpc/next (6112bd00e84e Merge tag 'powerpc-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (f2906aa86338 Linux 5.19-rc1) Merging risc-v-mc/dt-for-next (294b2111ff10 riscv: dts: microchip: remove spi-max-frequency property) Merging s390/for-next (f2906aa86338 Linux 5.19-rc1) 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 (2a4a62a14be1 um: Fix out-of-bounds read in LDT setup) Merging xtensa/xtensa-for-next (dc60001e1a30 xtensa: Return true/false (not 1/0) from bool function) Merging pidfd/for-next (168f91289340 fs: account for group membership) Merging fscrypt/master (218d921b581e fscrypt: add new helper functions for test_dummy_encryption) 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 (26291c54e111 Linux 5.17-rc2) Merging btrfs/for-next (9685dd451a3f Merge branch 'for-next-next-v5.19-20220615' into for-next-20220615) Merging ceph/master (45d719fe7562 fscrypt: add fscrypt_context_for_new_inode) Merging cifs/for-next (997952851843 Merge tag 'platform-drivers-x86-v5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) 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 (94f870f13595 MAINTAINERS: erofs: add myself as reviewer) Merging exfat/dev (204e6ceaa103 exfat: use updated exfat_chain directly during renaming) Merging ext3/for_next (46b6418e26c7 writeback: Avoid grabbing the wb if the we don't add it to dirty list) Merging ext4/dev (5f41fdaea63d ext4: only allow test_dummy_encryption when supported) Merging f2fs/dev (9f3b1322b441 f2fs: optimize error handling in redirty_blocks) 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 (565f82b57abe gfs2: Rewrap overlong comment in do_promote) Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) Merging ksmbd/ksmbd-for-next (06ee1c0aebd5 ksmbd: smbd: Remove useless license text when SPDX-License-Identifier is already used) Merging nfs/linux-next (b13baccc3850 Linux 5.19-rc2) Merging nfs-anna/linux-next (304791255a2d sunrpc: set cl_max_connect when cloning an rpc_clnt) Merging nfsd/for-next (b13baccc3850 Linux 5.19-rc2) Merging ntfs3/master (926034353d3c fs/ntfs3: Don't clear upper bits accidentally in log_replay()) 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 (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed) Merging v9fs/9p-next (74b37b2b0864 9p: fix EBADF errors in cached mode) Merging xfs/for-next (7146bda743e6 Merge branch 'guilt/xfs-5.19-larp-cleanups' 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) Merging printk/for-next (a1a2e9c6e1d2 Merge branch 'rework/kthreads' into for-next) Merging pci/next (20ba3070acb6 Merge branch 'pci/ctrl/vmd') Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code) Merging hid/for-next (6c55e6cce170 Merge branch 'for-5.20/nintendo' into for-next) Merging i2c/i2c/for-next (8c8636f50eb2 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (f2906aa86338 Linux 5.19-rc1) Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) Merging hwmon-staging/hwmon-next (ad9542b26754 hwmon: (dell-smm) Add Dell G5 5590 to DMI table) Merging jc_docs/docs-next (387c67afccbb docs: arm: tcm: Fix typo in description of TCM and MMU usage) Merging v4l-dvb/master (f2906aa86338 Linux 5.19-rc1) Merging v4l-dvb-next/master (83916ec5a8c7 media: pvrusb2: fix memory leak in pvr_probe) Merging pm/linux-next (d3104995c583 Merge branches 'acpi-processor' and 'acpi-apei' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (695d7fbc2941 drivers: cpufreq: Add missing of_node_put() in qoriq-cpufreq.c) Merging cpupower/cpupower (f2906aa86338 Linux 5.19-rc1) Merging devfreq/devfreq-next (9f3ec0f65421 PM / devfreq: mediatek: Introduce MediaTek CCI devfreq driver) Merging opp/opp/linux-next (82437291c968 OPP: Provide a simple implementation to configure multiple clocks) 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 (158e71bb69e3 RDMA/mlx5: Add a umr recovery flow) Merging net-next/master (fbb89d02e33a net: sparx5: Allow mdb entries to both CPU and ports) CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts Merging bpf-next/for-next (3831cd1f9ff6 selftests/bpf: Avoid skipping certain subtests) Merging ipsec-next/master (0f9008e5c510 Merge branch 'Be explicit with XFRM offload direction') Merging mlx5-next/mlx5-next (cdcdce948d64 net/mlx5: Add bits and fields to support enhanced CQE compression) Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bluetooth/master (0b537674e072 Bluetooth: use memset avoid memory leaks) Merging wireless-next/for-next (8092a0eed408 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging mtd/mtd/next (6f6536a0e309 mtd: st_spi_fsm: Simplify error checking in .probe() a bit) Merging nand/nand/next (fc602b4f692c mtd: spinand: Add support for ATO25D1GA) Merging spi-nor/spi-nor/next (c47452194641 mtd: spi-nor: debugfs: fix format specifier) Merging crypto/master (7e8df1fc2d66 crypto: sun8i-ss - fix a NULL vs IS_ERR() check in sun8i_ss_hashkey) Merging drm/drm-next (0f95ee9a0c57 Merge tag 'drm-misc-next-2022-06-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) Merging drm-misc/for-linux-next (abf0ba5a34ea drm/bridge: it6505: Add missing CRYPTO_HASH dependency) CONFLICT (content): Merge conflict in include/uapi/linux/dma-buf.h Applying: drm/amdgpu/display: fix build when CONFIG_DEBUG_FS is not set Merging drm-intel/for-linux-next (8d2ba05b099a drm/i915/bios: split ddi port parsing and debug printing) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc_regs.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_rps.c 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 drm-msm-lumag/msm-next-lumag (fef1db6b1b62 Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi', 'msm-next-lumag-mdp5' and 'msm-next-lumag-mdp4' into msm-next-lumag) 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 (f1b03cf05746 fbcon: Fix accelerated fbdev scrolling while logo is still shown) Merging regmap/for-next (26968e614adb Merge tag 'regmap-field-bit-helpers' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-5.20) Merging sound/for-next (f777316e52e1 Merge branch 'topic/ctl-enhancements' into for-next) Merging sound-asoc/for-next (63cddf7cc93e Merge remote-tracking branch 'asoc/for-5.20' into asoc-next) Merging modules/modules-next (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section()) Merging input/next (69cf890d8b28 Input: mtk-pmic-keys - move long press debounce mask to mtk_pmic_regs) Merging block/for-next (d0e6f0db59e7 Merge branch 'for-5.20/io_uring' into for-next) Merging device-mapper/for-next (10eb3a0d517f dm: fix race in dm_start_io_acct) Merging libata/for-next (5eb8deb4af56 ata: libata-core: get rid of *else* branches in ata_id_n_sectors()) Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt) Merging mmc/next (bdc997a769ee mmc: core: Do not evaluate HS400 capabilities if bus has no MMC capability) Merging mfd/for-mfd-next (f93afd8e7567 dt-bindings: cros-ec: Fix a typo in description) Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight()) Merging battery/for-next (e08f8a118514 power: supply: ab8500: Exit maintenance if too low voltage) Merging regulator/for-next (901a2827fdf9 Merge remote-tracking branch 'regulator/for-5.20' into regulator-next) Merging security/next-testing (88c9c5679a06 Merge tag 'v5.18' into next-testing) Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize') CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c Merging integrity/next-integrity (51dd64bb99e4 Revert "evm: Fix memleak in init_desc") 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 (15ec76fb29be selinux: Add boundary check in put_entry()) Merging smack/next (b50503990d88 smack: Remove the redundant lsm_inode_alloc) Merging tomoyo/master (b13baccc3850 Linux 5.19-rc2) Merging tpmdd/next (27b5b22d252c certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build) Merging watchdog/master (b6c8cd80ace3 watchdog: gxp: Add missing MODULE_LICENSE) 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) Merging audit/next (546093206ba1 audit: make is_audit_feature_set() static) Merging devicetree/for-next (38a85b9d95c7 dt-bindings: sram: qcom,imem: add IMEM memory region) Merging mailbox/mailbox-for-next (79f9fbe30352 mailbox: qcom-ipcc: Fix -Wunused-function with CONFIG_PM_SLEEP=n) Merging spi/for-next (7094a5c3f99e Merge remote-tracking branch 'spi/for-5.20' into spi-next) Merging tip/master (84bf7291902a Merge branch into tip/master: 'x86/mm') 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 (01dca6d03bb3 Merge branch 'trace/for-next-rtla' into trace/for-next) Merging rcu/rcu/next (e607cc386016 context_tracking: Interrupts always disabled for ct_idle_exit()) Applying: Contextual conflict between kspp and rcu trees Merging kvm/next (fcba483e8246 KVM: selftests: Sanity check input to ioctls() at build time) CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/memop.c CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/resets.c CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/sync_regs_test.c CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/tprot.c Merging kvm-arm/next (5c0ad551e9aa Merge branch kvm-arm64/its-save-restore-fixes-5.19 into kvmarm-master/next) Merging kvms390/next (b1edf7f159a6 KVM: s390: selftests: Use TAP interface in the reset test) Merging xen-tip/linux-next (dbac14a5a05f xen: unexport __init-annotated xen_xlate_map_ballooned_pages()) Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) Merging workqueues/for-next (8bee9dd953b6 workqueue: Switch to new kerneldoc syntax for named variable macro argument) Merging drivers-x86/for-next (f2906aa86338 Linux 5.19-rc1) Merging chrome-platform/for-next (203b2aff4786 platform/chrome: cros_ec_proto: Fix spelling mistake "unknwon" -> "unknown") Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe) Merging leds/for-next (f2906aa86338 Linux 5.19-rc1) Merging ipmi/for-next (a508e33956b5 ipmi:ipmb: Fix refcount leak in ipmi_ipmb_probe) Merging driver-core/driver-core-next (c21b0837983d spi: Use device_find_any_child() instead of custom approach) Merging usb/usb-next (235a6d80f021 Revert "ARM: dts: aspeed: Add USB2.0 device controller node") Merging thunderbolt/next (7ec58378a985 thunderbolt: Add support for Intel Raptor Lake) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (f2906aa86338 Linux 5.19-rc1) Merging tty/tty-next (65534736d9a5 tty: Use flow-control char function on closing path) Merging char-misc/char-misc-next (0a35780c755c eeprom: at25: Split reads into chunks and cap write size) Merging coresight/next (b13baccc3850 Linux 5.19-rc2) Merging fpga/for-next (2df84a757d87 fpga: altera-pr-ip: fix unsigned comparison with less than zero) Merging icc/icc-next (3be0ec65fd17 dt-bindings: interconnect: Remove sc7180/sdx55 ipa compatibles) Merging iio/togreg (10897f34309b iio: temp: maxim_thermocouple: Fix alignment for DMA safety) Merging phy-next/next (e991c2ee65e9 phy: qcom-qmp-usb: use bulk reset_control API) Merging soundwire/next (f2906aa86338 Linux 5.19-rc1) Merging extcon/extcon-next (51bd0abd873d extcon: fsa9480: Drop no-op remove function) Merging gnss/gnss-next (f2906aa86338 Linux 5.19-rc1) Merging vfio/next (421cfe6596f6 vfio: remove VFIO_GROUP_NOTIFY_SET_KVM) Merging staging/staging-next (de9257ae1d3b staging: rtl8723bs: uninitialize static variable) CONFLICT (content): Merge conflict in drivers/staging/r8188eu/os_dep/ioctl_linux.c Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) Merging dmaengine/next (c9357195c577 dmaengine: dw-edma: remove a macro conditional with similar branches) Merging cgroup/for-next (5f69a6577bc3 psi: dont alloc memory for psi by default) Merging scsi/for-next (9a54029e312d Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (defd530b0eab scsi: ufs: exynos: Constify driver data) Merging vhost/linux-next (eacea844594f um: virt-pci: set device ready in probe()) Merging rpmsg/for-next (e088c15dc457 Merge branches 'rproc-next' and 'rpmsg-next' into for-next) Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) Merging gpio-brgl/gpio/for-next (f2906aa86338 Linux 5.19-rc1) Merging gpio-intel/for-next (b93a8b2c5161 gpio: dln2: make irq_chip immutable) Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) Merging pinctrl/for-next (f5143c44df51 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (ba79c5e45eec MAINTAINERS: Update Intel pin control to Supported) Merging pinctrl-renesas/renesas-pinctrl (5223c511eb4f pinctrl: renesas: rzg2l: Return -EINVAL for pins which have input disabled) Merging pinctrl-samsung/for-next (c98ebe065e07 pinctrl: samsung: do not use bindings header with constants) 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) Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (cb6849a14c90 userfaultfd/selftests: Fix typo in comment) Merging livepatching/for-next (df44b1ee72f4 Merge branch 'for-5.20/selftests-fixes' into for-next) Merging rtc/rtc-next (f2906aa86338 Linux 5.19-rc1) 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 (73a8dbafd31a selftests/seccomp: Fix compile warning when CC=clang) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path) Merging slimbus/for-next (4ad3deabeea2 slimbus: messaging: fix typos in comments) Merging nvmem/for-next (2a2588243061 MAINTAINERS: rectify file pattern in MICROCHIP OTPC DRIVER) Merging xarray/main (63b1898fffcd XArray: Disallow sibling entries of nodes) Merging hyperv/hyperv-next (d27423bf048d hv_balloon: Fix balloon_probe() and balloon_remove() error handling) 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 (457c42326fb9 RDMA/erdma: Add driver to kernel build environment) Merging kunit/test (f2906aa86338 Linux 5.19-rc1) Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) Merging kunit-next/kunit (f2906aa86338 Linux 5.19-rc1) 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 (902c2d91582c memblock: Disable mirror feature if kernelcore is not specified) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (c01651bc1ae4 Merge branches 'slab/for-5.20/trivial', 'slab/for-5.20/cleanup', 'slab/for-5.20/tracing' and 'slab/for-5.20/optimizations' into slab/for-next) Merging random/master (b13baccc3850 Linux 5.19-rc2) Merging landlock/next (b13baccc3850 Linux 5.19-rc2) 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 (acdc07ace871 kernel/sysctl.c: Clean up indentation, replace spaces with tab.) Merging folio/for-next (62b927ca10f0 mm/folio-compat: Remove migration compatibility functions) CONFLICT (content): Merge conflict in include/linux/netfs.h Merging execve/for-next/execve (6342140db660 selftests/timens: add a test for vfork+exit) Merging bitmap/bitmap-for-next (0dfe54071d7c nodemask: Fix return values to be unsigned) Merging hte/hte/for-next (5dad4eccd2b4 dt-bindings: timestamp: Correct id path) Merging kspp/for-next/kspp (e1d337335207 cfi: Fix __cfi_slowpath_diag RCU usage with cpuidle) CONFLICT (content): Merge conflict in kernel/cfi.c Merging kspp-gustavo/for-next/kspp (f2906aa86338 Linux 5.19-rc1) Merging mm-stable/mm-stable (b13baccc3850 Linux 5.19-rc2) Merging mm-nonmm-stable/mm-nonmm-stable (b13baccc3850 Linux 5.19-rc2) Merging mm/mm-everything (6f7bb9d7feed Merge branch 'mm-nonmm-unstable' into mm-everything) Merging amdgpu/drm-next (c435f61d0eb3 drm/amd/display: Drop unnecessary guard from DC resource) $ git reset --hard HEAD^ Merging next-20220601 version of amdgpu CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h [master 92fde8e54dd3] next-20220601/amdgpu $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (92fde8e54dd3 next-20220601/amdgpu)
Attachment:
pgpge4hcE0a2Z.pgp
Description: OpenPGP digital signature
