Message-ID: <20220629172316.2f28afeb@canb.auug.org.au>
Date:   Wed, 29 Jun 2022 17:23:16 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Linux Next Mailing List <linux-next@...r.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: Tree for Jun 29

Hi all,

Changes since 20220628:

I finally dropped the akpm patch queue (which has mostly migrated to
git and been empty for some time).

The broadcom tree lost its build failure.

The pm tree gained a build failure so I used the version from
next-20220628.

The drm-misc tree gained a conflict against Linus' tree.

The battery tree lost its build failure.

The drivers-x86 tree gained a conflict against the drivers-x86-fixes tree.

The pinctrl tree lost its its build failure but gained another for which
I revreted 2 commits.

Non-merge commits (relative to Linus' tree): 5959
 6720 files changed, 648089 insertions(+), 111288 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 (941e3e791269 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
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 (0c5b5184deda mm: kfence: apply kmemleak_ignore_phys on early allocated pool)
Merging kbuild-current/fixes (03c765b0e3b4 Linux 5.19-rc4)
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 (c50f11c6196f arm64: mm: Don't invalidate FROM_DEVICE buffers at start of DMA transfer)
Merging arm-soc-fixes/arm/fixes (7f058112873e ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom)
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 (6886da5f49e6 powerpc/prom_init: Fix kernel config grep)
Merging s390-fixes/fixes (21e876448792 s390/pai: Fix multiple concurrent event installation)
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 (ab84db251c04 net: bonding: fix possible NULL deref in rlb code)
Merging bpf/master (512d1999b8e9 xsk: Clear page contiguity bit when unmapping pool)
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 (2990f223ffa7 RDMA/cm: Fix memory leak in ib_cm_insert_listen)
Merging sound-current/for-linus (ae8b1631561a ALSA: usb-audio: Workarounds for Behringer UMC 204/404 HD)
Merging sound-asoc-fixes/for-linus (7916aff70270 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 (419bc8f681a0 spi: rockchip: Unmask IRQ at the final to avoid preemption)
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 (ec5ad331680c tty: Add N_CAN327 line discipline ID for ELM327 based CAN driver)
Merging usb.current/usb-linus (03c765b0e3b4 Linux 5.19-rc4)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (03c765b0e3b4 Linux 5.19-rc4)
Merging phy/fixes (9293ee00cc1c phy: ti: tusb1210: Don't check for write errors when powering on)
Merging staging.current/staging-linus (a111daf0c53a Linux 5.19-rc3)
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 (19e506b31749 eeprom: at25: Rework buggy read splitting)
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 (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used)
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 (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 (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 (750a914adb7d media: mediatek: vcodec: Drop platform_get_resource(IORESOURCE_IRQ))
Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional)
Merging mips-fixes/mips-fixes (3748d2185ac4 mips: lantiq: Add missing of_node_put() in irq.c)
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 (a111daf0c53a Linux 5.19-rc3)
Merging nvdimm-fixes/libnvdimm-fixes (ef9102004a87 nvdimm: Fix badblocks clear off-by-one error)
Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
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 (03c765b0e3b4 Linux 5.19-rc4)
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 (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 (58301e1c15db Documentation: samsung-s3c24xx: Add blank line after SPDX directive)
Merging gpio-brgl-fixes/gpio/for-current (b0d473185ba8 gpio: mxs: Fix header comment)
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 (8a9ffb8c857c NFSD: restore EINVAL error translation in nfsd_commit())
Merging irqchip-fixes/irq/irqchip-fixes (4deb96e35c5c irqchip/gicv3: Handle resource request failure consistently)
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 (f8d866194082 tools headers UAPI: Synch KVM's svm.h header with the kernel)
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 (5f701324c0fb drm/vc4: perfmon: Fix variable dereferenced before check)
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 (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 (3b9e38ed1fdf Merge branch 'for-next/boot' 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 (3949559bf346 arm: 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 (f2906aa86338 Linux 5.19-rc1)
Merging broadcom/next (d1c365e4b79d 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 (333e323e7bd1 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (0c356b3c1158 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 (ce7fa6c6a59d Merge branch 'omap-for-v5.20/omap1' into for-next)
Merging qcom/for-next (7b3d521dce27 Merge branches 'arm64-fixes-for-5.19', 'arm64-for-5.20', 'clk-for-5.20', 'dts-for-5.20' 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 (64d15244c480 Merge branch 'renesas-dt-bindings-for-v5.20' into renesas-next)
Merging reset/reset/next (2ca065dc9468 dt-bindings: reset: st,sti-powerdown: Convert to yaml)
Merging rockchip/for-next (4a8d51f2a26d Merge branch 'v5.20-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b479089ca1a8 Merge branch 'next/soc' into for-next)
Merging scmi/for-linux-next (24cdefc96973 Merge branch 'arch_topology' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (3fc30e640f52 ARM: dts: stm32: add fake interrupt propoerty for ASync notif - TEMP/TO REMOVE)
Merging sunxi/sunxi/for-next (ba585a9e1791 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 (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 (63623390c0d6 arm64: dts: zynqmp: add AMS driver to device tree)
Merging clk/clk-next (292dcfc1f60e Merge branch 'clk-devm-enable' 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 (080bcd8d5997 clk: renesas: r8a779f0: Add HSCIF clocks)
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 (a111daf0c53a Linux 5.19-rc3)
Merging m68k/for-next (bcc94f9a2581 m68k: sun3: Use __func__ to get function's name in an output message)
Merging m68knommu/for-next (d6e42640c1fd m68k: Fix syntax errors in comments)
Merging microblaze/next (78b5f52ab6f6 microblaze: fix typos in comments)
Merging mips/mips-next (a111daf0c53a Linux 5.19-rc3)
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (6d76d335d6a8 wireguard: selftests: support OpenRISC)
Merging parisc-hd/for-next (96b80fcd2705 parisc/unaligned: Fix emulate_ldw() breakage)
Merging powerpc/next (d7f396461518 powerpc/powermac: Remove empty function note_scsi_host())
Merging soc-fsl/next (4b0986a3613c Linux 5.18)
Merging risc-v/for-next (bb356ddb78b2 RISC-V: PCI: Avoid handing out address 0 to devices)
Merging risc-v-mc/dt-for-next (3f8ccf5f1a8c riscv: dts: microchip: remove spi-max-frequency property)
Merging s390/for-next (21e876448792 s390/pai: Fix multiple concurrent event installation)
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 (4d0548a7b806 mnt_idmapping: return false when comparing two invalid ids)
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 (45d719fe7562 fscrypt: add fscrypt_context_for_new_inode)
Merging cifs/for-next (03c765b0e3b4 Linux 5.19-rc4)
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 (2e2125e7948e Pull inotify typo cleanup.)
Merging ext4/dev (729e657ab8d4 ext4: fix a doubled word "need" in a comment)
Merging f2fs/dev (10f3adb9c255 f2fs: remove redundant code for gc condition)
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 (067baa9a37b3 ksmbd: use vfs_llseek instead of dereferencing NULL)
Merging nfs/linux-next (03c765b0e3b4 Linux 5.19-rc4)
Merging nfs-anna/linux-next (5ee3d10f84d0 NFSv4: Add FMODE_CAN_ODIRECT after successful open of a NFS4.x file)
Merging nfsd/for-next (b13baccc3850 Linux 5.19-rc2)
Merging ntfs3/master (e4d2f4fd5341 fs/ntfs3: Enable FALLOC_FL_INSERT_RANGE)
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 (b0017602fdf6 9p: fix EBADF errors in cached mode)
Merging xfs/for-next (f94e08b602d4 xfs: clean up the end of xfs_attri_item_recover)
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 (ab3547e3c281 Merge branch 'rework/kthreads' into for-next)
Merging pci/next (20ba3070acb6 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 (bc1801ec0931 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 (c59ed392a4a3 hwmon: (dell-smm) Improve assembly code)
Merging jc_docs/docs-next (5372de4e4545 docs/doc-guide: Put meta title for kernel-doc HTML page)
Merging v4l-dvb/master (945a9a8e448b media: pvrusb2: fix memory leak in pvr_probe)
Merging v4l-dvb-next/master (d8e8aa866ed8 media: mediatek: vcodec: Report supported bitrate modes)
Merging pm/linux-next (4035647418c1 Merge branch 'acpi-bus' into linux-next)
$ git reset --hard HEAD^
Merging next-20220628 version of pm
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 (9f3ec0f65421 PM / devfreq: mediatek: Introduce MediaTek CCI devfreq driver)
Merging opp/opp/linux-next (d65e3bdd991b OPP: Provide a simple implementation to configure multiple clocks)
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 (80a14dd4c37f RDMA/rxe: Remove useless pkt parameters)
Merging net-next/master (d521bc0a0f7c Merge branch 'mlxsw-unified-bridge-conversion-part-4-6')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
Merging bpf-next/for-next (c5c7358e4c76 Merge branch 'libbpf: remove deprecated APIs')
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 (681ec6abcd7f Bluetooth: btmtksdio: Add in-band wakeup support)
Merging wireless-next/for-next (683a4647a7a3 wifi: rtw89: 8852a: rfk: fix div 0 exception)
Merging mtd/mtd/next (ac4f83482afb mtd: dataflash: Add SPI ID table)
Merging nand/nand/next (431eae20a093 mtd: rawnand: sm_common: drop unexpected word 'is' in the comments)
Merging spi-nor/spi-nor/next (77d4ac6d3848 mtd: spi-nor: move SECT_4K_PMC special handling)
Merging crypto/master (9c846c5d2d4e crypto: qat - Removes the x86 dependency on the QAT drivers)
Merging drm/drm-next (805ada63ba05 Merge tag 'drm-intel-next-2022-06-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c
Merging drm-misc/for-linux-next (9db35bb349a0 drm: lcdif: Add support for i.MX8MP LCDIF variant)
CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_drv.c
Merging amdgpu/drm-next (539bcdd15627 drm/amdgpu/display: add missing FP_START/END checks dcn32_clk_mgr.c)
Merging drm-intel/for-linux-next (cea9ed611e85 drm/i915: fix a possible refcount leak in intel_dp_add_mst_connector())
Merging drm-tegra/drm/tegra/for-next (06764bb32be0 MAINTAINERS: Rectify entry for NVIDIA TEGRA DRM and VIDEO DRIVER)
Merging drm-msm/msm-next (24df12013853 MAINTAINERS: Add Dmitry as MSM DRM driver co-maintainer)
Merging drm-msm-lumag/msm-next-lumag (a1cc2c812d84 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)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_fence.c
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 (fe04405ce5de fbmem: Prevent invalid virtual screen sizes)
Merging regmap/for-next (7cd3956c6d39 Merge remote-tracking branch 'regmap/for-5.20' into regmap-next)
Merging sound/for-next (3809db6430bf ALSA: rawmidi: Take buffer refcount while draining output)
Merging sound-asoc/for-next (9059b863fc85 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 (f0ea452715d7 dt-bindings: input: iqs7222: Extend slider-mapped GPIO to IQS7222C)
Merging block/for-next (4920ee3cb848 Merge branch 'for-5.20/io_uring' into for-next)
Merging device-mapper/for-next (332bd0778775 dm raid: fix accesses beyond end of raid member array)
Merging libata/for-next (2b5960a0e33b ata: pata_macio: Fix compilation warning)
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 (f355c11bc0f2 dt-bindings: mfd: qcom-pm8xxx: Update the maintainers section)
Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight())
Merging battery/for-next (a5a3d94fc4ed power: reset: pwr-mlxbf: add missing include)
Merging regulator/for-next (899e46f81f59 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 (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 (27b5b22d252c certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build)
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 (4908e3ace24b dt-bindings: nfc: nxp,nci: drop Charles Gorand's mail)
Merging dt-krzk/for-next (ad0d6ea39195 Merge branch 'for-v5.20/dt-bindings-qcom' into next/dt-bindings)
Merging mailbox/mailbox-for-next (79f9fbe30352 mailbox: qcom-ipcc: Fix -Wunused-function with CONFIG_PM_SLEEP=n)
Merging spi/for-next (fb3fbdbf53ae Merge remote-tracking branch 'spi/for-5.20' into spi-next)
Merging tip/master (7089155b2877 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 (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 (29dc4a374686 rcu: Back off upon fill_page_cache_func() allocation failure)
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 (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 (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 (f0da93cbaf7a platform/x86: thinkpad_acpi: Fix a memory leak of EFCH MMIO resource)
CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c
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 (38a523a2946d Revert "devcoredump: remove the useless gfp_t parameter in dev_coredumpv and dev_coredumpm")
Merging usb/usb-next (849f35422319 Merge tag 'thunderbolt-for-v5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next)
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 (f287f971e256 serial: 8250_dwlib: Support for 9th bit multipoint addressing)
Merging char-misc/char-misc-next (afa8fe4cc40e Docs/ABI/testing: Add VDUSE sysfs interface ABI document)
Merging coresight/next (a111daf0c53a Linux 5.19-rc3)
Merging fpga/for-next (e2c003bc6488 MAINTAINERS: add Microchip PolarFire FPGA drivers entry)
Merging icc/icc-next (b3d5304b64e7 Merge branch 'icc-sm6350' into icc-next)
Merging iio/togreg (88cb99daa2b5 iio: adc: stm32-adc: Use generic_handle_domain_irq())
Merging phy-next/next (18b3eb79b1cf MAINTAINERS: add include/dt-bindings/phy to GENERIC PHY FRAMEWORK)
Merging soundwire/next (f2906aa86338 Linux 5.19-rc1)
Merging extcon/extcon-next (775486c09698 extcon: rt8973a: Drop useless mask_invert flag on irqchip)
Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API)
Merging vfio/next (d1877e639bc6 vfio: de-extern-ify function prototypes)
Merging staging/staging-next (df8d0a55047b staging: r8188eu: make power sequences static)
Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4)
Merging dmaengine/next (0cae04373b77 dmaengine: remove DMA_MEMCPY_SG once again)
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 (fc356a71565b vringh: iterate on iotlb_translate to handle large translations)
Merging rpmsg/for-next (8df478f116ce 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 (097c53a72818 gpio: xgs-iproc: Drop if with an always false condition)
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 (869283d149c8 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (487b87717b85 pinctrl: intel: Drop no more used members of struct intel_pingroup)
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 (394b517585da pwm: mediatek: Add MT8365 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 (8587f3732b37 selftests/drivers/gpu: Add error messages to drm_mm.sh)
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 (f2af60bb7ce2 fsi: Add trace events in initialization path)
Merging slimbus/for-next (4ad3deabeea2 slimbus: messaging: fix typos in comments)
Merging nvmem/for-next (ccba200e4801 dt-bindings: nvmem: mediatek: efuse: add support mt8183)
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 (f2906aa86338 Linux 5.19-rc1)
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
Merging mhi/mhi-next (1227d2a20cd7 bus: mhi: host: Move IRQ allocation to controller registration phase)
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 (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 (dc977c0c9ac2 Merge branch 'efivars-cleanup' into efi/next)
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (0835f14f8218 Merge branch 'slab/for-5.20/debug' into slab/for-next)
Merging random/master (03c765b0e3b4 Linux 5.19-rc4)
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 (a0768005128d fs: remove the NULL get_block case in mpage_writepages)
Merging execve/for-next/execve (6342140db660 selftests/timens: add a test for vfork+exit)
Merging bitmap/bitmap-for-next (ba1afa676d0b lib: bitmap: fix the duplicated comments on bitmap_to_arr64())
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 (ee65728e103b docs: rename Documentation/vm to Documentation/mm)
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.
Merging mm-nonmm-stable/mm-nonmm-stable (ee56c3e8eec1 Merge branch 'master' into mm-nonmm-stable)
Merging mm/mm-everything (98c38ebbb58d Merge branch 'mm-nonmm-unstable' into mm-everything)
CONFLICT (content): Merge conflict in include/linux/pagevec.h
Applying: Revert "pinctrl: qcom: sc7280: Fix compile bug"
Applying: Revert "pinctrl: qcom: sc7280: Add clock optional check for ADSP bypass targets"

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists