Hi all, Changes since 20220706: The net-next tree gained a build failure so I used the version from next-20220706. The crypto tree gained a conflict against the arm-perf, arm64 trees. The sound-asoc tree lost its build failure but gained another for which I reverted a commit. The regulator tree gained a build failure so I used the version from next-20220706. The phy-next tree gained a conflict against the drm-msm tree and a build failure so I used the version from next-20220706. The soundwire tree gained a conflict against the sound-asoc tree. The random tree gained a conflict against the powerpc tree. Non-merge commits (relative to Linus' tree): 7611 8344 files changed, 661832 insertions(+), 167519 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 357 trees (counting Linus' and 98 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 (9f09069cde34 Merge tag 'for-linus' of https://github.com/openrisc/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 (cdd7ce7cab06 mm/hugetlb: separate path for hwpoison entry in copy_hugetlb_page_range()) Merging kbuild-current/fixes (a4ab14e1d8fe gen_compile_commands: handle multiple lines per .mod file) Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name) Merging arm-current/fixes (3cfb30199796 ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2) Merging arm64-fixes/for-next/fixes (410982303772 arm64: hugetlb: Restore TLB invalidation for BBM on contiguous ptes) Merging arm-soc-fixes/arm/fixes (aafc013e8297 Merge tag 'v5.19-rockchip-socfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes) 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 (887502826549 powerpc/powernv: delay rng platform device creation until later in boot) Merging s390-fixes/fixes (d7d488f41b41 s390/qdio: Fix spelling mistake) 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 (a069a9055416 Revert "tls: rx: move counting TlsDecryptErrors for sync") Merging bpf/master (1fd6e5675336 xdp: Fix spurious packet loss in generic XDP TX path) 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 (8d70f33ed720 wifi: cfg80211: Allow P2P client interface to indicate port authorization) Merging rdma-fixes/for-rc (88084a3df167 Linux 5.19-rc5) Merging sound-current/for-linus (c5e58c4545a6 ALSA: cs46xx: Fix missing snd_card_free() call at probe error) Merging sound-asoc-fixes/for-linus (aae7b91fd253 Merge remote-tracking branch 'asoc/for-5.18' into asoc-linus) Merging regmap-fixes/for-linus (3f05010f243b regmap-irq: Fix offset/index mismatch in read_sub_irq_data()) Merging regulator-fixes/for-linus (122e951eb804 regulator: qcom_smd: correct MP5496 ranges) Merging spi-fixes/for-linus (5b1a01c16292 spi: Merge AMD fix) Merging pci-current/for-linus (a2b36ffbf5b6 x86/PCI: Revert "x86/PCI: Clip only host bridge windows for E820 regions") Merging driver-core.current/driver-core-linus (f2906aa86338 Linux 5.19-rc1) Merging tty.current/tty-linus (b941e487152e serial: 8250: dw: Fix the macro RZN1_UART_xDMACR_8_WORD_BURST) Merging usb.current/usb-linus (5812175389e2 usb: dwc3-am62: remove unnecesary clk_put()) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (03c765b0e3b4 Linux 5.19-rc4) Merging phy/fixes (f2906aa86338 Linux 5.19-rc1) Merging staging.current/staging-linus (ee6c6e734247 staging/wlan-ng: get the correct struct hfa384x in work callback) Merging iio-fixes/fixes-togreg (315f7e15c261 Merge tag 'iio-fixes-for-5.19a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next) Merging counter-fixes/fixes-togreg (f2906aa86338 Linux 5.19-rc1) Merging char-misc.current/char-misc-linus (2cd37c2e7244 misc: rtsx_usb: set return value in rsp_buf alloc err path) Merging soundwire-fixes/fixes (f2906aa86338 Linux 5.19-rc1) Merging thunderbolt-fixes/fixes (03c765b0e3b4 Linux 5.19-rc4) Merging input-current/for-linus (039d4ed3428c Input: usbtouchscreen - add driver_info sanity check) Merging crypto-current/master (87d044096ea6 crypto: ccp - Fix device IRQ counting by using platform_irq_count()) Merging vfio-fixes/for-linus (afe4e376ac5d vfio: Move IOMMU_CAP_CACHE_COHERENCY test to after we know we have a group) Merging kselftest-fixes/fixes (9b4d5c01eb23 selftests: make use of GUP_TEST_FILE macro) Merging modules-fixes/modules-linus (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section()) Merging dmaengine-fixes/fixes (607a48c78e6b dt-bindings: dma: allwinner,sun50i-a64-dma: Fix min/max typo) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (06781a502635 mtd: rawnand: gpmi: Fix setting busy timeout setting) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (3bcc2c1eade4 media: rkvdec: Disable H.264 error detection) Merging reset-fixes/reset/fixes (a57f68ddc886 reset: Fix devm bulk optional exclusive control getter) Merging mips-fixes/mips-fixes (88084a3df167 Linux 5.19-rc5) Merging at91-fixes/at91-fixes (91d60e259c0f ARM: at91: pm: Mark at91_pm_secure_init as __init) Merging omap-fixes/fixes (46ff3df87215 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35) Merging kvm-fixes/master (6defa24d3b12 KVM: SEV: Init target VMCBs in sev_migrate_from) Merging kvms390-fixes/master (242c04f01377 KVM: s390: selftests: Use TAP interface in the reset test) Merging hwmon-fixes/hwmon (d0e51022a025 hwmon: (ibmaem) don't call platform_device_del() if platform_device_add() fails) Merging nvdimm-fixes/libnvdimm-fixes (ef9102004a87 nvdimm: Fix badblocks clear off-by-one error) Merging cxl-fixes/fixes (e35f5718903b cxl/mbox: Fix missing variable payload checks in cmd size validation) Merging btrfs-fixes/next-fixes (8e71e0e77e30 Merge branch 'misc-5.19' into next-fixes) Merging vfs-fixes/fixes (c3497fd009ef fix short copy handling in copy_mc_pipe_to_iter()) Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging drivers-x86-fixes/fixes (9ab762a84b80 platform/x86: hp-wmi: Ignore Sanitization Mode event) 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 dt-krzk-fixes/fixes (f2906aa86338 Linux 5.19-rc1) Merging scsi-fixes/fixes (fce54ed02757 scsi: hisi_sas: Limit max hw sectors for v3 HW) Merging drm-fixes/drm-fixes (b8f0009bc9ed Merge tag 'drm-misc-fixes-2022-06-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (79538490fd7a drm/i915: tweak the ordering in cpu_write_needs_clflush) 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 (a111daf0c53a Linux 5.19-rc3) 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 (e83031564137 riscv: Fix ALT_THEAD_PMA's asm parameters) Merging risc-v-mc-fixes/dt-fixes (efa310ba0071 riscv: dts: microchip: hook up the mpfs' l2cache) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (f2906aa86338 Linux 5.19-rc1) Merging spdx/spdx-linus (58301e1c15db Documentation: samsung-s3c24xx: Add blank line after SPDX directive) Merging gpio-brgl-fixes/gpio/for-current (8af3a0b23818 gpio: vf610: fix compilation error) 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 (a23dd544debc SUNRPC: Fix READ_PLUS crasher) Merging irqchip-fixes/irq/irqchip-fixes (1357d2a65601 irqchip/apple-aic: Make symbol 'use_fast_ipi' static) Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) Merging broadcom-fixes/fixes (a26f045984e7 Merge branch 'devicetree/fixes' into fixes) Merging perf-current/perf/urgent (ff898552fb32 perf synthetic-events: Ignore dead threads during event synthesis) Merging efi-fixes/urgent (aa6d1ed107eb 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 (9fc33eaaa979 drm/panfrost: Fix shrinker list corruption by madvise IOCTL) Merging kbuild/for-next (e1769fb8d04e kbuild: remove sed command from cmd_ar_builtin) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf/core (52f28b7bac75 perf script: Add some missing event dumps) Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) Merging dma-mapping/for-next (0bf28fc40d89 swiotlb: panic if nslabs is too small) Merging asm-generic/master (4313a24985f0 arch/*/: remove CONFIG_VIRT_TO_BUS) 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 (b31f932090da Merge branch 'for-next/sysregs' into for-next/core) Merging arm-perf/for-next/perf (66637ab137b4 drivers/perf: hisi: add driver for HNS3 PMU) Merging arm-soc/for-next (3cf613f45558 soc: document merges) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (147c83586707 Merge branch 'v5.20/drivers' into for-next) Merging aspeed/for-next (bfcbea2c93e5 ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom) Merging at91/at91-next (4dd1a613e464 ARM: dts: lan966x: Add UDPHS support) Merging broadcom/next (e1b194757fc9 Merge branch 'drivers/next' into next) Merging drivers-memory/for-next (0d97f2176dec memory: mtk-smi: Add support for MT6795 Helio X10) Merging imx-mxs/for-next (0f4614dd7a36 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (931c273b9fab 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 (ad2fe4582c48 Merge branches 'omap-for-v5.20/omap1', 'omap-for-v5.20/ti-sysc' and 'omap-for-v5.20/soc' into for-next) Merging qcom/for-next (d014f9463260 Merge branches 'arm64-for-5.20', 'arm64-defconfig-for-5.20', 'clk-for-5.20', 'dts-for-5.20', 'dts-fixes-for-5.19' and 'drivers-for-5.20' into for-next) Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) Merging renesas/next (b7d295b5ef2e Merge branches 'renesas-arm-dt-for-v5.20' and 'renesas-arm-soc-for-v5.20' into renesas-next) Merging reset/reset/next (b6b9585876da reset: microchip-sparx5: allow building as a module) Merging rockchip/for-next (2e1170c71ec0 Merge branch 'v5.20-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (5642cb8ce0f1 Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (22a21d2e5103 Merge branch 'for-next/arch_topology' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (4b43ff02d2a4 ARM: dts: stm32: Add ST MIPID02 bindings to AV96) Merging sunxi/sunxi/for-next (1a87c800a929 Merge branch 'sunxi/drivers-for-5.20' into sunxi/for-next) Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) Merging tegra/for-next (190a8de573a4 Merge branch for-5.20/arm64/defconfig into for-next) Merging ti/ti-next (9b123c7c630c Merge branches 'ti-keystone-dts-next', 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (516de80d448f Merge branch 'zynqmp/soc' into for-next) Merging clk/clk-next (16615b92d4dc Merge branch 'clk-renesas' into clk-next) Merging clk-imx/for-next (c196175acdd3 clk: imx: clk-fracn-gppll: Add more freq config for video pll) Merging clk-renesas/renesas-clk (0e704f6c42dc clk: renesas: rcar-gen4: Fix initconst confusion for cpg_pll_config) Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) Merging csky/linux-next (f5ac0fb05b23 csky: Move HEAD_TEXT_SECTION out of __init_begin-end) Merging loongarch/loongarch-next (a111daf0c53a Linux 5.19-rc3) Merging m68k/for-next (c2a6236024b7 m68k: sun3: Fix spelling mistake) Merging m68knommu/for-next (a37e6853fcb9 m68k: Fix syntax errors in comments) Merging microblaze/next (78b5f52ab6f6 microblaze: fix typos in comments) Merging mips/mips-next (08472f6ebdc2 MIPS: Loongson64: Fix section mismatch warning) Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) Merging openrisc/for-next (48bddb89d59e openrisc: unwinder: Fix grammar issue in comment) Merging parisc-hd/for-next (03c765b0e3b4 Linux 5.19-rc4) Merging powerpc/next (54c15ec3b738 powerpc: dts: Add DTS file for CZ.NIC Turris 1.x routers) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (54f0f3b298e2 riscv: Kconfig: Style cleanups) Merging risc-v-mc/dt-for-next (3f8ccf5f1a8c riscv: dts: microchip: remove spi-max-frequency property) Merging s390/for-next (8c04229c2a88 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 (2a4a62a14be1 um: Fix out-of-bounds read in LDT setup) Merging xtensa/xtensa-for-next (a2d9b75b19dc xtensa: change '.bss' to '.section .bss') Merging pidfd/for-next (77940f0d96cd mnt_idmapping: align kernel doc and parameter order) 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 (df302b62096a Merge branch 'for-next-next-v5.19-20220622' into for-next-20220622) Merging ceph/master (152444d50ab5 fscrypt: add fscrypt_context_for_new_inode) Merging cifs/for-next (56e123ff7c4a cifs: remove redundant initialization to variable mnt_sign_enabled) 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 (dec0a44c82d0 erofs: wake up all waiters after z_erofs_lzma_head ready) Merging exfat/dev (204e6ceaa103 exfat: use updated exfat_chain directly during renaming) Merging ext3/for_next (e252f2ed1c8c fanotify: introduce FAN_MARK_IGNORE) Merging ext4/dev (729e657ab8d4 ext4: fix a doubled word "need" in a comment) Merging f2fs/dev (785c1904b28d f2fs: add a sysfs entry to show zone capacity) 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 (44dab005fd42 gfs2: Minor gfs2_glock_nq_m cleanup) Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) Merging ksmbd/ksmbd-for-next (732f30694325 Merge tag '5.19-rc4-ksmbd-server-fixes' of git://git.samba.org/ksmbd) Merging nfs/linux-next (88084a3df167 Linux 5.19-rc5) Merging nfs-anna/linux-next (4f40a5b55446 NFSv4: Add an fattr allocation to _nfs4_discover_trunking()) Merging nfsd/for-next (a56bf306ec75 NFSD: NFSv4 CLOSE should release an nfsd_file immediately) Merging ntfs3/master (604a9d272dc3 fs/ntfs3: Remove unnecessary 'NULL' values from pointers) 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 (e3baced02a52 9p: Fix some kernel-doc comments) Merging xfs/for-next (7561cea5dbb9 xfs: prevent a UAF when log IO errors race with unmount) Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag) Merging iomap/iomap-for-next (f8189d5d5fbf dax: set did_zero to true when zeroing successfully) 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 (b13baccc3850 Linux 5.19-rc2) Merging printk/for-next (ab3547e3c281 Merge branch 'rework/kthreads' into for-next) Merging pci/next (62171cf15eb8 Merge branch 'pci/ctrl/vmd') Merging pstore/for-next/pstore (2c09d1443b9b pstore/zone: cleanup "rcnt" type) Merging hid/for-next (6c55e6cce170 Merge branch 'for-5.20/nintendo' into for-next) Merging i2c/i2c/for-next (790a1d064e6b 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 (9f6ca00b5be4 hwmon: (asus_wmi_sensors) Save a few bytes of memory) Merging jc_docs/docs-next (4d627ef12b40 docs/doc-guide: Mention make variable SPHINXDIRS) Merging v4l-dvb/master (d8e8aa866ed8 media: mediatek: vcodec: Report supported bitrate modes) Merging v4l-dvb-next/master (81e005842d0b media: isl7998x: select V4L2_FWNODE to fix build error) Merging pm/linux-next (f97e5813664c Merge branches 'pm-sleep' and 'powercap' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (f250ac6ca9d2 cpufreq: qcom-cpufreq-hw: use HZ_PER_KHZ macro in units.h) Merging cpupower/cpupower (f2906aa86338 Linux 5.19-rc1) Merging devfreq/devfreq-next (fb021366974a PM / devfreq: imx-bus: use NULL to pass a null pointer rather than zero) Merging opp/opp/linux-next (30b62d123f4f OPP: Remove dev{m}_pm_opp_of_add_table_noclk()) Merging thermal/thermal/linux-next (4768f717d85c dt-bindings: thermal: rcar-gen3-thermal: Add r8a779f0 support) Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (0f24debbb847 fs: dlm: move kref_put assert for lkb structs) Merging rdma/for-next (f5d1f6d63c9a RDMA/rxe: Replace include statement) Merging net-next/master (cd355d0bc60d Merge branch 'hinic-dev_get_stats-fixes') CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts $ git reset --hard HEAD^ Merging next-20220706 version of net-next CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts [master 719b2b124c40] next-20220706/net-next Merging bpf-next/for-next (7c8121af1bfe libbpf: Remove unnecessary usdt_rel_ip assignments) Merging ipsec-next/master (f41b284a2c18 xfrm: change the type of xfrm_register_km and xfrm_unregister_km) 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 (bf909caec390 Bluetooth: core: Fix deadlock on hci_power_on_sync.) Merging wireless-next/for-next (8bc65d38ee46 wifi: nl80211: retrieve EHT related elements in AP mode) Merging mtd/mtd/next (ad9b10d1eaad mtd: core: introduce of support for dynamic partitions) Merging nand/nand/next (e16eceea863b mtd: rawnand: arasan: Fix clock rate in NV-DDR) Merging spi-nor/spi-nor/next (77d4ac6d3848 mtd: spi-nor: move SECT_4K_PMC special handling) Merging crypto/master (fac76f226089 crypto: arm64/gcm - Select AEAD for GHASH_ARM64_CE) CONFLICT (content): Merge conflict in MAINTAINERS Merging drm/drm-next (f929217499cf Merge tag 'drm-misc-next-2022-06-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_aperture.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_drv.c Merging drm-misc/for-linux-next (3915f8bddefd drm: xlnx: add <linux/io.h> for readl/writel) Merging amdgpu/drm-next (fc25fd602b1e drm/amdgpu/display: disable prefer_shadow for generic fb helpers) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c Merging drm-intel/for-linux-next (3d9c653cf635 drm/i915: Nuke PCH_JSP) Merging drm-tegra/drm/tegra/for-next (06764bb32be0 MAINTAINERS: Rectify entry for NVIDIA TEGRA DRM and VIDEO DRIVER) Merging drm-msm/msm-next (1ff1da40d6fc 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 drm-msm-lumag/msm-next-lumag (1ff1da40d6fc 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 (72b158e973e6 fbcon: Use fbcon_info_from_console() in fbcon_modechange_possible()) Merging regmap/for-next (773d09b4c3ac regmap-irq: Fix bug in regmap_irq_get_irq_reg_linear()) Merging sound/for-next (61c606a43b6c ALSA: usb-audio: Add endianness annotations) Merging sound-asoc/for-next (3f4322bb413a 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 (c4bcc1b99b8b Input: goodix - switch use of acpi_gpio_get_*_resource() APIs) Merging block/for-next (6c0d138a4e13 Merge branch 'for-5.20/drivers' into for-next) Merging device-mapper/for-next (2140d0fb3c55 docs: device-mapper: add a blank line at writecache.rst) Merging libata/for-next (0184898dd14d ata: libata-scsi: fix result type of ata_ioc32()) Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt) Merging mmc/next (fddbf585ab1f mmc: sdhci-of-esdhc: Fixup use of of_find_compatible_node()) Merging mfd/for-mfd-next (e6f3e3314910 mfd: mt6397: Add basic support for MT6331+MT6332 PMIC) Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight()) Merging battery/for-next (a578cc3af5ce power: reset: pwr-mlxbf: change rst_pwr_hid and low_pwr_hid from global to local variables) Merging regulator/for-next (d08412328e4f regulator: Fix parameter declaration and spelling mistake.) $ git reset --hard HEAD^ Merging next-20220706 version of regulator Merging security/next-testing (88c9c5679a06 Merge tag 'v5.18' into next-testing) Merging apparmor/apparmor-next (362f7f8b9f01 apparmor: fix reference count leak in aa_pivotroot()) 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 (ef54ccb61616 selinux: selinux_add_opt() callers free memory) Merging smack/next (b50503990d88 smack: Remove the redundant lsm_inode_alloc) Merging tomoyo/master (b13baccc3850 Linux 5.19-rc2) Merging tpmdd/next (10a1e332f3d3 KEYS: asymmetric: enforce SM2 signature use pkey algo) Merging watchdog/master (a111daf0c53a Linux 5.19-rc3) Merging iommu/next (bc11db25f743 Merge branches 'iommu/fixes', 'arm/mediatek', 'x86/amd' and 'core' into next) Merging audit/next (546093206ba1 audit: make is_audit_feature_set() static) Merging devicetree/for-next (128a16b9704b dt-bindings: hwinfo: samsung,s5pv210-chipid: add S5PV210 ChipID) Merging dt-krzk/for-next (ad0d6ea39195 Merge branch 'for-v5.20/dt-bindings-qcom' into next/dt-bindings) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/qcom.yaml Merging mailbox/mailbox-for-next (79f9fbe30352 mailbox: qcom-ipcc: Fix -Wunused-function with CONFIG_PM_SLEEP=n) Merging spi/for-next (c76cc11b6c84 Merge remote-tracking branch 'spi/for-5.20' into spi-next) Merging tip/master (3c1ec304a1bc Merge branch into tip/master: 'x86/vmware') 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 (ee4aae577721 Merge branch irq/plic-edge-fixes into irq/irqchip-next) Merging ftrace/for-next (01dca6d03bb3 Merge branch 'trace/for-next-rtla' into trace/for-next) Merging rcu/rcu/next (2b4ad13e89bc doc: Emphasize the need for explicit RCU read-side markers) Merging kvm/next (4b88b1a518b3 KVM: selftests: Enhance handling WRMSR ICR register in x2APIC mode) CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/lib/aarch64/ucall.c 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 (156c5a072a2c Merge branch kvm-arm64/misc-5.20 into kvmarm-master/next) Merging kvms390/next (b1edf7f159a6 KVM: s390: selftests: Use TAP interface in the reset test) Merging xen-tip/linux-next (dbe97cff7dd9 xen/gntdev: Avoid blocking in unmap_grant_pages()) Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3) Merging workqueues/for-next (8bee9dd953b6 workqueue: Switch to new kerneldoc syntax for named variable macro argument) Merging drivers-x86/for-next (2ac96c800dd1 platform/x86: hp-wmi: Ignore Sanitization Mode event) Merging chrome-platform/for-next (3de7203115af platform/chrome: wilco_ec: event: Fix typo in comment) 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 (2fd26970cf66 Revert "kernfs: Change kernfs_notify_list to llist.") Merging usb/usb-next (90557fa89d3e dt-bindings: usb: atmel: Add Microchip LAN9662 compatible string) CONFLICT (content): Merge conflict in MAINTAINERS Merging thunderbolt/next (34b9715b7cae thunderbolt: Fix typo in comment) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (7828466cff6b USB: serial: use kmemdup instead of kmalloc + memcpy) Merging tty/tty-next (734966043860 tty: n_gsm: fix resource allocation order in gsm_activate_mux()) Merging char-misc/char-misc-next (1045a06724f3 remove CONFIG_ANDROID) Merging coresight/next (774daad3c0d8 Documentation: coresight: Expand branch broadcast documentation) Merging fpga/for-next (ee794221a6f6 fpga: fpga-mgr: Fix spelling mistake "bitsream" -> "bitstream") Merging icc/icc-next (9f8c52f9a24b Merge branch 'icc-imx8mp' into icc-next) Merging iio/togreg (883f50ead31c iio: adc: stm32-adc: disable adc before calibration) Merging phy-next/next (fa384dd8b9b8 drm/msm/dp: delete vdda regulator related functions from eDP/DP controller) CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dp/dp_parser.h $ git reset --hard HEAD^ Merging next-20220706 version of phy-next Merging soundwire/next (3f4a70268d54 soundwire: qcom: Enable software clock gating requirement flag) CONFLICT (content): Merge conflict in drivers/soundwire/intel.c Merging extcon/extcon-next (187dc83647a0 extcon: rt8973a: Drop useless mask_invert flag on irqchip) Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API) Merging vfio/next (7654a8881a54 Merge branches 'v5.20/vfio/migration-enhancements-v3', 'v5.20/vfio/simplify-bus_type-determination-v3', 'v5.20/vfio/check-vfio_register_iommu_driver-return-v2', 'v5.20/vfio/check-iommu_group_set_name_return-v1', 'v5.20/vfio/clear-caps-buf-v3', 'v5.20/vfio/remove-useless-judgement-v1' and 'v5.20/vfio/move-device_open-count-v2' into v5.20/vfio/next) CONFLICT (content): Merge conflict in drivers/vfio/vfio.c Merging staging/staging-next (3355a12760de staging: r8188eu: remove unneeded semicolon) Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) Merging dmaengine/next (4348d99efa01 dmaengine: altera-msgdma: Fixed some inconsistent function name descriptions) Merging cgroup/for-next (27924b13fcce Merge branch 'for-5.20' into for-next) Merging scsi/for-next (1b72be9c3656 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (bcec04b3cce4 scsi: ufs: ufs-qcom: Remove unneeded code) Merging vhost/linux-next (6a9720576cd0 virtio: VIRTIO_HARDEN_NOTIFICATION is broken) Merging rpmsg/for-next (913b6fd2e157 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 (44f36ddb2b7f gpio: adp5588: sort header inclusion alphabetically) Merging gpio-intel/for-next (b65bb2c14891 gpio: pch: Change PCI device macros) Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) Merging pinctrl/for-next (1ddcae6cd6c1 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (25097de7b236 pinctrl: intel: Add Intel Meteor Lake pin controller support) Merging pinctrl-renesas/renesas-pinctrl (36611d28f513 pinctrl: renesas: r8a779g0: Add missing MODSELx for AVBx) Merging pinctrl-samsung/for-next (c98ebe065e07 pinctrl: samsung: do not use bindings header with constants) Merging pwm/for-next (394b517585da pwm: mediatek: Add MT8365 support) Merging userns/for-next (86dc18bcc88e Merge of free-mq_sysctls-for-v5.19, ptrace_unfreeze_fix-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 (b7ecce6800eb selftests:timers: globals don't need initialization to 0) Merging livepatching/for-next (df44b1ee72f4 Merge branch 'for-5.20/selftests-fixes' into for-next) Merging rtc/rtc-next (592ff0c8d064 rtc: Directly use ida_alloc()/free()) 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 (9297e01b038b drivers/ntb/test: avoid 64-bit modulus operation) 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 (04823dd2af87 fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe) Merging slimbus/for-next (4ad3deabeea2 slimbus: messaging: fix typos in comments) Merging nvmem/for-next (432ee5a3cfcf nvmem: mtk-efuse: Simplify with devm_platform_get_and_ioremap_resource()) 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 (efa0855c5b84 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 (671007281de9 apparmor: test: Remove some casts which are no-longer required) Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) Merging mhi/mhi-next (2113651ddf3d bus: mhi: host: pci_generic: Add another Foxconn T99W175) Merging memblock/for-next (fe833b4edc59 memblock tests: remove completed TODO items) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) Merging cxl/next (a111daf0c53a Linux 5.19-rc3) 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 (df3c9072ef90 Merge branch 'efivars-cleanup' into efi/next) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (b77d5b1b83e3 mm: slab: optimize memcg_slab_free_hook()) Merging random/master (2d29184c1c10 random: remove "nordrand" flag in favor of "random.trust_cpu") CONFLICT (content): Merge conflict in arch/powerpc/Kconfig 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 (9e0d6442d867 fs: remove the NULL get_block case in mpage_writepages) Merging execve/for-next/execve (5036793d7dbd exec: Fix a spelling mistake) Merging bitmap/bitmap-for-next (52cdf267e77d lib/cpumask: move some one-line wrappers to header file) Merging hte/hte/for-next (85ff37e302ef gpiolib: cdev: Fix kernel doc for struct line) 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 (94dfc73e7cf4 treewide: uapi: Replace zero-length arrays with flexible-array members) Merging mm-stable/mm-stable (4f2930c6718a selftests/vm: only run 128TBswitch with 5-level paging) CONFLICT (file location): Documentation/translations/zh_CN/vm/page_migration.rst added in HEAD inside a directory that was renamed in mm-stable/mm-stable, suggesting it should perhaps be moved to Documentation/translations/zh_CN/mm/page_migration.rst. CONFLICT (file location): Documentation/translations/zh_CN/vm/vmalloced-kernel-stacks.rst added in HEAD inside a directory that was renamed in mm-stable/mm-stable, suggesting it should perhaps be moved to Documentation/translations/zh_CN/mm/vmalloced-kernel-stacks.rst. CONFLICT (content): Merge conflict in include/linux/pagevec.h Merging mm-nonmm-stable/mm-nonmm-stable (ee56c3e8eec1 Merge branch 'master' into mm-nonmm-stable) Merging mm/mm-everything (bc776a61d0a1 Merge branch 'mm-nonmm-unstable' into mm-everything) CONFLICT (content): Merge conflict in include/linux/cpumask.h CONFLICT (content): Merge conflict in include/linux/gfp.h Applying: fix up for "mm: split include/linux/gfp.h" Applying: Revert "ASoC: amd: enable machine driver build for Jadeite platform"
Attachment:
pgpyN_JgyGaMk.pgp
Description: OpenPGP digital signature
