linux-next: Tree for Dec 1

[Stephen Rothwell]

Hi all,

Changes since 20221130:

The thermal tree still had complex conflicts against the pm tree so I dropped
the thermal tree for today.

The drm tree gained a conflict against Linus' tree.

The rcu tree gained a conflict against the printk tree.

The kvm tree gained conflicts against the block and tip trees.

The kvm-arm tree gained conflicts against the kvm tree.

The driver-core tree lost its build failure but gained a semantic conflict
against the drm tree.

The usb tree lost its build failure.

The kspp tree gained a build failure so I used the version from
next-20221130.

Non-merge commits (relative to Linus' tree): 11043
 10447 files changed, 473969 insertions(+), 189349 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 370 trees (counting Linus' and 103 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 (ef4d3ea40565 afs: Fix server->active leak in afs_put_server)
Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm)
Merging mm-hotfixes/mm-hotfixes-unstable (7357103e0297 revert "kbuild: fix -Wimplicit-function-declaration in license_is_gpl_compatible")
Merging kbuild-current/fixes (869e4ae4cd2a nios2: add FORCE for vmlinuz.gz)
Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3)
Merging arm-current/fixes (340a982825f7 ARM: 9266/1: mm: fix no-MMU ZERO_PAGE() implementation)
Merging arm64-fixes/for-next/fixes (5b47348fc0b1 arm64/mm: fix incorrect file_map_count for non-leaf pmd/pud)
Merging arm-soc-fixes/arm/fixes (da0cbf9307a2 Merge tag 'at91-fixes-6.1-3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes)
Merging davinci-current/davinci/for-current (9abf2313adc1 Linux 6.1-rc1)
Merging drivers-memory-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes)
Merging m68k-current/for-linus (dc63a086daee m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED)
Merging powerpc-fixes/fixes (2e7ec190a0e3 powerpc/64s: Add missing declaration for machine_check_early_boot())
Merging s390-fixes/fixes (adba1a9b81d5 MAINTAINERS: add S390 MM section)
Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build)
Merging fscrypt-current/for-stable (ccd30a476f8e fscrypt: fix keyring memory leak on mount failure)
Merging net/master (01f856ae6d0c Merge tag 'net-6.1-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf/master (01f856ae6d0c Merge tag 'net-6.1-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipsec/master (40781bfb836e xfrm: Fix ignored return value in xfrm6_init())
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 (3e8f7abcc347 wifi: mac8021: fix possible oob access in ieee80211_get_rate_duration)
Merging rdma-fixes/for-rc (094226ad94f4 Linux 6.1-rc5)
Merging sound-current/for-linus (b47068b4aa53 Merge tag 'asoc-fix-v6.1-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc-fixes/for-linus (3d1bb6cc1a65 ASoC: cs42l51: Correct PGA Volume minimum value)
Merging regmap-fixes/for-linus (84498d1fb35d regmap-irq: Use the new num_config_regs property in regmap_add_irq_chip_fwnode)
Merging regulator-fixes/for-linus (02228f6aa6a6 regulator: da9211: Use irq handler when ready)
Merging spi-fixes/for-linus (8e2bb5a41784 Merge remote-tracking branch 'spi/for-6.0' into spi-linus)
Merging pci-current/for-linus (ac9ccce8717d MAINTAINERS: Include PCI bindings in host bridge entry)
Merging driver-core.current/driver-core-linus (eb7081409f94 Linux 6.1-rc6)
Merging tty.current/tty-linus (eb7081409f94 Linux 6.1-rc6)
Merging usb.current/usb-linus (b7b275e60bcd Linux 6.1-rc7)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (188c9c2e0c7f USB: serial: f81534: fix division by zero on line-speed change)
Merging phy/fixes (819b885cd886 phy: ralink: mt7621-pci: add sentinel to quirks table)
Merging staging.current/staging-linus (eb7081409f94 Linux 6.1-rc6)
Merging iio-fixes/fixes-togreg (86fdd15e10e4 iio: fix memory leak in iio_device_register_eventset())
Merging counter-current/counter-current (fd5ac974fc25 counter: stm32-lptimer-cnt: fix the check on arr and cmp registers update)
Merging char-misc.current/char-misc-linus (b7b275e60bcd Linux 6.1-rc7)
Merging soundwire-fixes/fixes (49a467310dc4 soundwire: qcom: check for outanding writes before doing a read)
Merging thunderbolt-fixes/fixes (b7b275e60bcd Linux 6.1-rc7)
Merging input-current/for-linus (81cd7e848927 Input: i8042 - fix leaking of platform device on module removal)
Merging crypto-current/master (9f6035af06b5 crypto: x86/polyval - Fix crashes when keys are not 16-byte aligned)
Merging vfio-fixes/for-linus (e806e223621e vfio/pci: Check the device set open count on reset)
Merging kselftest-fixes/fixes (89c1017aac67 selftests/pidfd_test: Remove the erroneous ',')
Merging modules-fixes/modules-linus (77d6354bd422 module/decompress: generate sysfs string at compile time)
Merging dmaengine-fixes/fixes (c47e6403fa09 dmaengine: at_hdmac: Check return code of dma_async_device_register)
Merging backlight-fixes/for-backlight-fixes (8ab33943cde7 backlight: pwm_bl: Drop support for legacy PWM probing)
Merging mtd-fixes/mtd/fixes (c717b9b7d6de mtd: onenand: omap2: add dependency on GPMC)
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (5eef2141776d media: v4l2-dv-timings.c: fix too strict blanking sanity checks)
Merging reset-fixes/reset/fixes (ae358d71d462 reset: npcm: fix iprst2 and iprst4 setting)
Merging mips-fixes/mips-fixes (094226ad94f4 Linux 6.1-rc5)
Merging at91-fixes/at91-fixes (6a3fc8c330d1 ARM: at91: fix build for SAMA5D3 w/o L2 cache)
Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes)
Merging kvm-fixes/master (7e3bba93f42e Merge tag 'kvm-s390-master-6.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field)
Merging hwmon-fixes/hwmon (2745705ee6aa hwmon: (asus-ec-sensors) Add checks for devm_kcalloc)
Merging nvdimm-fixes/libnvdimm-fixes (472faf72b33d device-dax: Fix duplicate 'hmem' device registration)
Merging cxl-fixes/fixes (8f401ec1c897 cxl/region: Recycle region ids)
Merging btrfs-fixes/next-fixes (ee267181ea70 Merge branch 'misc-6.1' into next-fixes)
Merging vfs-fixes/fixes (10bc8e4af659 vfs: fix copy_file_range() averts filesystem freeze protection)
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 (b44fd994e451 platform/x86: ideapad-laptop: Add module parameters to match DMI quirk tables)
Merging samsung-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging pinctrl-samsung-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging devicetree-fixes/dt/linus (60d865bd5a9b of: property: decrement node refcount in of_fwnode_get_reference_args())
Merging dt-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging scsi-fixes/fixes (f014165faa7b scsi: iscsi: Fix possible memory leak when device_register() failed)
Merging drm-fixes/drm-fixes (b7b275e60bcd Linux 6.1-rc7)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (12b8b046e4c9 drm/i915: Never return 0 if not all requests retired)
Merging mmc-fixes/fixes (c981cdfb9925 mmc: sdhci: Fix voltage switch delay)
Merging rtc-fixes/rtc-fixes (db4e955ae333 rtc: cmos: fix build on non-ACPI platforms)
Merging gnss-fixes/gnss-linus (247f34f7b803 Linux 6.1-rc2)
Merging hyperv-fixes/hyperv-fixes (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register())
Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18)
Merging risc-v-fixes/fixes (d556a9aeb62a Merge patch series "riscv: kexec: Fxiup crash_save percpu and machine_kexec_mask_interrupts")
Merging riscv-dt-fixes/riscv-dt-fixes (9abf2313adc1 Linux 6.1-rc1)
Merging riscv-soc-fixes/riscv-soc-fixes (9abf2313adc1 Linux 6.1-rc1)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging spdx/spdx-linus (6cad1ecd4e32 testing: use the copyleft-next-0.3.1 SPDX tag)
Merging gpio-brgl-fixes/gpio/for-current (45fecdb9f658 gpio: amd8111: Fix PCI device reference count leak)
Merging gpio-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging pinctrl-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging erofs-fixes/fixes (37020bbb71d9 erofs: fix missing xas_retry() in fscache mode)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (618887768bb7 kunit: update NULL vs IS_ERR() tests)
Merging ubifs-fixes/fixes (7bdd6967fec5 ubi: ensure that VID header offset + VID header size <= alloc, size)
Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions)
Merging cel-fixes/for-rc (ac8db824ead0 NFSD: Fix reads with a non-zero offset that don't end on a page boundary)
Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC)
Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number)
Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging perf-current/perf/urgent (94d957ae513f perf tools: Add the include/perf/ directory to .gitignore)
Merging efi-fixes/urgent (1feda1dfb581 Merge tag 'efi-v6.1-arm64-sync-exception-recovery' into efi/urgent)
Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.)
Merging battery-fixes/fixes (767e684367e4 power: supply: ab8500: Defer thermal zone probe)
Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning)
Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
Merging iommufd-fixes/for-rc (30a0b95b1335 Linux 6.1-rc3)
Merging drm-misc-fixes/for-linux-next-fixes (8c115864501f drm/bridge: ti-sn65dsi86: Fix output polarity setting bug)
Merging kbuild/for-next (1a06f6a7c1c9 init/version.c: remove #include <generated/utsrelease.h>)
Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
Merging perf/perf/core (0c3852adae83 Merge remote-tracking branch 'torvalds/master' into perf/core)
Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute)
Merging dma-mapping/for-next (ffcb75458460 dma-mapping: reject __GFP_COMP in dma_alloc_attrs)
CONFLICT (content): Merge conflict in sound/core/memalloc.c
Merging asm-generic/master (5e5ff73c2e58 asm-generic/io: Add _RET_IP_ to MMIO trace for more accurate debug info)
Merging arc/for-next (f2906aa86338 Linux 5.19-rc1)
Merging arm/for-next (834f757d299e Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (de265289f18e Merge branches 'for-next/perf' and 'for-next/sve-state' into for-next/core)
Merging arm-perf/for-next/perf (316f862a787c perf/arm-cmn: Add shutdown routine)
Merging arm-soc/for-next (7587962a9cbe soc: doument merges)
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (e57e6bb6476d Merge branch 'v6.2/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (6924945aaa86 Merge branch 'asahi-soc/soc' into asahi-soc/for-next)
Merging aspeed/for-next (45c86167adde soc: nuvoton: Add SoC info driver for WPCM450)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts
Merging at91/at91-next (fb18447f4da5 Merge branch 'at91-defconfig' into at91-next)
Merging broadcom/next (64610429f8de Merge branch 'drivers/next' into next)
Merging davinci/davinci/for-next (53ad523ac435 ARM: davinci: fix repeated words in comments)
Merging drivers-memory/for-next (8dd7e4af5853 memory: omap-gpmc: fix coverity issue "Control flow issues")
Merging imx-mxs/for-next (e114f7b74f59 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (6b6221595e05 Merge branch 'v6.2-tmp/dts64' into for-next)
Merging mvebu/for-next (ce88856dec4f Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (6435241fd536 Merge branch 'musb-for-v6.2' into for-next)
Merging qcom/for-next (4d2b529bce12 Merge branches 'arm64-defconfig-for-6.2', 'arm64-for-6.2', 'clk-for-6.2', 'defconfig-for-6.2', 'drivers-for-6.2', 'dts-for-6.2' and 'arm64-fixes-for-6.1' into for-next)
Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema)
Merging renesas/next (00841e945654 Merge branch 'renesas-arm-dt-for-v6.2' into renesas-next)
Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage")
Merging rockchip/for-next (db6c57f2afd5 Merge branch 'v6.2-clock/next' into for-next)
Merging samsung-krzk/for-next (4407a1eb1faf Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (907b02743965 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 (4cca342b840e ARM: dts: stm32: Rename mdio0 to mdio on DHCOR Testbench board)
Merging sunxi/sunxi/for-next (47be7c123211 Merge branch 'sunxi/clk-for-6.2' into sunxi/for-next)
Merging tee/next (4a56b125ba20 Merge branch 'fixes' into next)
Merging tegra/for-next (d71332dded9d Merge branch for-6.2/arm64/defconfig into for-next)
Merging ti/ti-next (6a5ab20fb961 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (f922fa603ae1 Merge branch 'zynqmp/dt' into for-next)
Merging clk/clk-next (ebb6a9acf2e0 Merge branch 'clk-fixes' into clk-next)
Merging clk-imx/for-next (8178e245fa95 clk: imx: rename imx_obtain_fixed_clk_hw() to imx_get_clk_hw_by_name())
Merging clk-renesas/renesas-clk (777bcc85e1fb clk: renesas: r8a779f0: Fix Ethernet Switch clocks)
Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
Merging csky/linux-next (7e2004906fb5 Revert "csky: Add support for restartable sequence")
Merging loongarch/loongarch-next (538e11c9a923 LoongArch: Update Loongson-3 default config file)
Merging m68k/for-next (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-rc1)
Merging m68knommu/for-next (b7b275e60bcd Linux 6.1-rc7)
Merging microblaze/next (5cfe469c2654 microblaze/PCI: Moving PCI iounmap and dependent code)
Merging mips/mips-next (c5ed1fe0801f MIPS: vpe-cmp: fix possible memory leak while module exiting)
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc)
Merging parisc-hd/for-next (a77319726641 parisc: Fix kgdb_pdc console keyboard input)
Merging powerpc/next (a9ffb8ee7b65 powerpc: Use "grep -E" instead of "egrep")
Merging powerpc-objtool/topic/objtool (a39818a3fb2b objtool/powerpc: Implement arch_pc_relative_reloc())
Merging soc-fsl/next (4b0986a3613c Linux 5.18)
Merging risc-v/for-next (41555cc9e2e9 RISC-V: enable sparsemem by default for defconfig)
Merging riscv-dt/riscv-dt-for-next (4563db4b7988 Merge branch 'riscv-thead_c9xx' into riscv-dt-for-next)
Merging riscv-soc/riscv-soc-for-next (8fbf94fea0b4 soc: sifive: ccache: fix missing of_node_put() in sifive_ccache_init())
Merging s390/for-next (e1ec975c349d 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/next (193cb8372424 uml: Remove the initialization of statics to 0)
Merging xtensa/xtensa-for-next (b8c4f4db2436 xtensa: update config files)
Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next)
Merging vfs-idmapping/for-next (e95f86d0c525 Merge branch 'fs.ovl.setgid' into for-next)
Merging fscrypt/master (aa9979900808 fscrypt: add comment for fscrypt_valid_enc_modes_v1())
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 (1dd7bb25658d afs: remove afs_cache_netfs and afs_zap_permits() declarations)
Merging btrfs/for-next (07d7d9dff0c8 Merge branch 'for-next-next-v6.1-20221123' into for-next-20221123)
CONFLICT (content): Merge conflict in fs/btrfs/ctree.h
Applying: btrfs: fix up for "fs: pass dentry to set acl method"
Merging ceph/master (5bd76b8de5b7 ceph: fix NULL pointer dereference for req->r_session)
Merging cifs/for-next (587506fda17c cifs: Parse owner/group for stat in smb311 posix extensions)
Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem())
Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment)
Merging erofs/dev (aa02305d6a92 erofs: switch to prepare_ondemand_read() in fscache mode)
Merging exfat/dev (612d2ddeed4d exfat: replace magic numbers with Macros)
Merging ext3/for_next (6b46bb32a8b5 Pull ext2 fixes from Al and Rong Tao.)
Merging ext4/dev (7944b67ff7e2 ext4: remove trailing newline from ext4_msg() message)
Merging f2fs/dev (ee98bbb2147c f2fs: introduce f2fs_is_readonly() for readability)
Merging fsverity/fsverity (a4bbf53d88c7 fsverity: simplify fsverity_get_digest())
Merging fuse/for-next (1b0e94993dbe fuse: optional supplementary group in create requests)
Merging gfs2/for-next (288fc8606762 Merge tag 'gfs2-nopid-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic)
Merging ksmbd/ksmbd-for-next (5e40d197b564 ksmbd: use F_SETLK when unlocking a file)
Merging nfs/linux-next (5776a9cd2a66 NFS: Fix a race in nfs_call_unlink())
Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate slot failed)
Merging nfsd/for-next (40f2e475046f SUNRPC: Fix crasher in unwrap_integ_data())
Merging ntfs3/master (36963cf225f8 fs/ntfs3: Make if more readable)
CONFLICT (content): Merge conflict in fs/ntfs3/bitmap.c
CONFLICT (content): Merge conflict in fs/ntfs3/inode.c
CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c
Applying: fix up for "fs: rename current get acl method"
Merging orangefs/for-next (2ad4b6f5e117 Orangefs: change iterate to iterate_shared)
Merging overlayfs/overlayfs-next (58f40d56c40a ovl: Kconfig: Fix spelling mistake "undelying" -> "underlying")
Merging ubifs/next (669d204469c4 ubi: fastmap: Add fastmap control support for 'UBI_IOCATT' ioctl)
Merging v9fs/9p-next (391c18cf776e 9p/xen: check logical size for buffer size)
Merging xfs/for-next (575689fc0ffa xfs: fix super block buf log item UAF during force shutdown)
Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag)
Merging iomap/iomap-for-next (f1bd37a47352 iomap: directly use logical block size)
Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request)
Merging file-locks/locks-next (f2f2494c8aa3 Add process name and pid to locks warning)
Merging iversion/iversion-next (2b3319b35573 nfsd: remove fetch_iversion export operation)
Merging vfs/for-next (7b2f9d90994c Merge branch 'work.misc' into for-next)
CONFLICT (content): Merge conflict in fs/erofs/fscache.c
Merging printk/for-next (a04b46d8846f Merge branch 'rework/console-list-lock' into for-next)
Merging pci/next (0a9dc1e9365b Merge branch 'pci/kbuild')
Merging pstore/for-next/pstore (38b91847c314 pstore: Alert on backend write error)
Merging hid/for-next (780f0d711574 Merge branch 'for-6.1/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (ee98d665b461 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i3c/i3c/next (9abf2313adc1 Linux 6.1-rc1)
Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
Merging hwmon-staging/hwmon-next (10b7c400596e hwmon: (oxp-sensors) Fix pwm reading)
Merging jc_docs/docs-next (520076d5df31 Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (a7bab6f8b73f Merge tag 'br-v6.2e' of git://linuxtv.org/hverkuil/media_tree into media_stage)
Merging v4l-dvb-next/master (6a5a4514854a media: ipu3-cio2: make the bridge depend on i2c)
Merging pm/linux-next (dee69e7005ce Merge branches 'thermal-core' and 'thermal-intel' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (6286bbb40576 cpufreq: apple-soc: Add new driver to control Apple SoC CPU P-states)
Merging cpupower/cpupower (5975e2558e2d tools/cpupower: Choose base_cpu to display default cpupower details)
Merging devfreq/devfreq-next (5fdded844892 PM/devfreq: governor: Add a private governor_data for governor)
Merging opp/opp/linux-next (dba79b78ecc1 dt-bindings: opp-v2: Fix clock-latency-ns prop in example)
Merging thermal/thermal/linux-next (9d2bc364f677 thermal/drivers/qcom/tsens: Simplify debugfs init function)
CONFLICT (content): Merge conflict in drivers/thermal/thermal_sysfs.c
$ git merge --abort
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (7a5e9f1f83e3 fs: dlm: fix building without lockdep)
Merging rdma/for-next (ea5ef136e215 RDMA/nldev: Add checks for nla_nest_start() in fill_stat_counter_qps())
Merging net-next/master (91a7de85600d selftests/net: add csum offload test)
CONFLICT (content): Merge conflict in tools/perf/util/stat.c
Merging bpf-next/for-next (59b843691d72 selftests/bpf: Add bench test to arm64 and s390x denylist)
Merging ipsec-next/master (91a7de85600d selftests/net: add csum offload test)
Merging mlx5-next/mlx5-next (9abf2313adc1 Linux 6.1-rc1)
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 (d2cdc5f0c9be Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0cb8:0xc559)
Merging wireless-next/for-next (eceb024ee3ee Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging mtd/mtd/next (2399401feee2 mtd: maps: pxa2xx-flash: fix memory leak in probe)
Merging nand/nand/next (6408cc05a50a mtd: rawnand: Drop obsolete dependencies on COMPILE_TEST)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
Merging spi-nor/spi-nor/next (1799cd8540b6 mtd: spi-nor: add SFDP fixups for Quad Page Program)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
Merging crypto/master (83478938f78f hwrng: u2fzero - account for high quality RNG)
Merging drm/drm-next (077bd80083ab Merge tag 'drm-msm-next-2022-11-28' of https://gitlab.freedesktop.org/drm/msm into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt.c
Merging drm-misc/for-linux-next (b02897e56b4e Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper")
Merging amdgpu/drm-next (56ee51222e57 drm/amdgpu: Fix logic error)
Merging drm-intel/for-linux-next (7d579eff3e55 drm/i915/dmc: Update DG2 DMC version to v2.08)
Merging drm-tegra/for-next (08fef75f5e17 gpu: host1x: Staticize host1x_syncpt_fence_ops)
Merging drm-msm/msm-next (d73b1d02de08 drm/msm: Hangcheck progress detection)
Merging drm-msm-lumag/msm-next-lumag (8d1d17d47eae Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi' and 'msm-next-lumag-mdp5' 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 (a3b4c2f9b039 drm/etnaviv: switch to PFN mappings)
Merging fbdev/for-next (652888c46397 fbdev: ep93xx-fb: Add missing clk_disable_unprepare in ep93xxfb_probe())
Merging regmap/for-next (23a441cb2cbe Merge remote-tracking branch 'regmap/for-6.2' into regmap-next)
Merging sound/for-next (2133dc91d665 ALSA: dice: add support for Focusrite Saffire Pro 40 with TCD3070 ASIC)
Merging sound-asoc/for-next (c1dd6bf61997 ASoC: amd: yc: Add Xiaomi Redmi Book Pro 14 2022 into DMI table)
Merging modules/modules-next (c86a514f5fad kallsyms: Remove unneeded semicolon)
Merging input/next (80fb249da98e Input: elants_i2c - delete some dead code)
Merging block/for-next (04598c701786 Merge branch 'for-6.2/block' into for-next)
CONFLICT (content): Merge conflict in io_uring/net.c
Merging device-mapper/for-next (984bf2cc531e dm integrity: clear the journal on suspend)
Merging libata/for-next (3d8a3ae3d966 ata: libata: fix commands incorrectly not getting retried during NCQ error)
Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver)
Merging mmc/next (18737caf5120 mmc: core: Normalize the error handling branch in sd_read_ext_regs())
Merging mfd/for-mfd-next (c70a5ec75778 mfd: palmas: Use device_get_match_data() to simplify the code)
Merging backlight/for-backlight-next (e7647de058cb video: backlight: mt6370: Add MediaTek MT6370 support)
Merging battery/for-next (571650b3a30f power: supply: bq25890: Only use pdata->regulator_init_data for vbus)
Merging regulator/for-next (086e010f611e Merge remote-tracking branch 'regulator/for-6.2' into regulator-next)
Merging security/next (572302af1258 reiserfs: Add missing calls to reiserfs_security_free())
CONFLICT (content): Merge conflict in security/commoncap.c
Merging apparmor/apparmor-next (4295c60bbe9e apparmor: Fix uninitialized symbol 'array_size' in policy_unpack_test.c)
CONFLICT (content): Merge conflict in security/apparmor/domain.c
Merging integrity/next-integrity (b6018af440a0 ima: Fix hash dependency to correct algorithm)
Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
Merging selinux/next (048be156491f selinux: remove the sidtab context conversion indirect calls)
CONFLICT (content): Merge conflict in security/selinux/ss/services.c
CONFLICT (content): Merge conflict in security/selinux/ss/sidtab.c
CONFLICT (content): Merge conflict in security/selinux/ss/sidtab.h
Applying: selinux: fix up for "selinux: enable use of both GFP_KERNEL and GFP_ATOMIC in convert_context()"
Merging smack/next (1a3065e92046 smack_lsm: remove unnecessary type casting)
Merging tomoyo/master (88ba4e14d341 workqueue: Emit runtime message when flush_scheduled_work() is called)
Merging tpmdd/next (beaff73d55b3 tpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak)
Merging watchdog/master (9ec0b7e06835 watchdog: aspeed: Enable pre-timeout interrupt)
Merging iommu/next (69a6c7d969f5 Merge branches 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 's390', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging audit/next (50979953c0c4 audit: unify audit_filter_{uring(), inode_name(), syscall()})
Merging devicetree/for-next (e4aef3f65b90 of/kexec: Fix reading 32-bit "linux,initrd-{start,end}" values)
Merging dt-krzk/for-next (043d4036e8ee Merge branch 'next/dt' into for-next)
Merging mailbox/mailbox-for-next (b8ae88e1e75e mailbox: qcom-ipcc: flag IRQ NO_THREAD)
Merging spi/for-next (55b3515c3262 Merge remote-tracking branch 'spi/for-6.2' into spi-next)
Merging tip/master (8efdc946f320 Merge branch into tip/master: 'x86/tdx')
CONFLICT (content): Merge conflict in arch/x86/crypto/sha1_ni_asm.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sha256-avx-asm.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sha256-avx2-asm.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sha256-ssse3-asm.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sha256_ni_asm.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sm3-avx-asm_64.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sm4-aesni-avx-asm_64.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sm4-aesni-avx2-asm_64.S
CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c
CONFLICT (modify/delete): drivers/iommu/iommu-sva-lib.c deleted in HEAD and modified in tip/master.  Version tip/master of drivers/iommu/iommu-sva-lib.c left in tree.
CONFLICT (content): Merge conflict in drivers/pci/controller/Kconfig
CONFLICT (content): Merge conflict in drivers/pci/controller/dwc/Kconfig
CONFLICT (content): Merge conflict in drivers/pci/controller/mobiveil/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
CONFLICT (content): Merge conflict in tools/objtool/check.c
$ git rm -f drivers/iommu/iommu-sva-lib.c
Applying: fix up for "iommu: Rename iommu-sva-lib.{c,h}"
Merging clockevents/timers/drivers/next (af246cc6d0ed clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value)
Merging edac/edac-for-next (ad5befcd0e1d Merge branch 'edac-misc' into edac-for-next)
Merging irqchip/irq/irqchip-next (73d95dbcf75e Merge branch irq/misc-6.2 into irq/irqchip-next)
Merging ftrace/for-next (bd604f3db49c ftrace: Avoid needless updates of the ftrace function call)
Merging rcu/rcu/next (5267eaa7e2e5 Merge branch 'nolibc.2022.10.28a' into HEAD)
CONFLICT (content): Merge conflict in kernel/rcu/update.c
Merging kvm/next (1e79a9e3ab96 Merge tag 'kvm-s390-next-6.2-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h
CONFLICT (content): Merge conflict in arch/x86/kvm/cpuid.c
CONFLICT (content): Merge conflict in include/linux/mm.h
Merging kvm-arm/next (456ce3545dd0 Merge branch kvm-arm64/selftest/access-tracking into kvmarm-master/next)
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_host.h
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/access_tracking_perf_test.c
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/demand_paging_test.c
CONFLICT (modify/delete): tools/testing/selftests/kvm/include/perf_test_util.h deleted in HEAD and modified in kvm-arm/next.  Version kvm-arm/next of tools/testing/selftests/kvm/include/perf_test_util.h left in tree.
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/memslot_modification_stress_test.c
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/memslot_perf_test.c
$ git rm -f tools/testing/selftests/kvm/include/perf_test_util.h
Applying: fix up for rename of perf_test_args to memstress_args
Merging kvms390/next (bedac519eefa s390/vfio-ap: check TAPQ response code when waiting for queue reset)
Merging xen-tip/linux-next (1e9b10076d75 x86/xen: Fix memory leak in xen_init_lock_cpu())
Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next)
Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync())
Merging drivers-x86/for-next (e32354bb8fe3 platform/x86/intel/hid: Add module-params for 5 button array + SW_TABLET_MODE reporting)
Merging chrome-platform/for-next (5a2d96623670 platform/chrome: cros_usbpd_notify: Fix error handling in cros_usbpd_notify_init())
Merging hsi/for-next (3ffa9f713c39 HSI: omap_ssi_core: Fix error handling in ssi_init())
Merging leds/for-next (5f52a8ba7e91 dt-bindings: leds: Add 'cpuX' to 'linux,default-trigger')
Merging ipmi/for-next (0eb1762f3c77 ipmi/watchdog: Include <linux/kstrtox.h> when appropriate)
Merging driver-core/driver-core-next (50dc8d18f62d driver core: fix up missed drivers/s390/char/hmcdrv_dev.c class.devnode() conversion.)
Applying: fix up for "drivers/accel: define kconfig and register a new major"
Merging usb/usb-next (51daa42d6b86 Revert "i915: Move list_count() to list.h for broader use")
Merging thunderbolt/next (a5cfc9d65879 thunderbolt: Add wake on connect/disconnect on USB4 ports)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (63b8ed26cd09 USB: serial: xr: avoid requesting zero DTE rate)
Merging tty/tty-next (6373ab4dfee7 serial: atmel: don't stop the transmitter when doing PIO)
Merging char-misc/char-misc-next (bbb09f8353c1 Merge tag 'icc-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml
CONFLICT (content): Merge conflict in drivers/firmware/raspberrypi.c
Merging coresight/next (c767c3474013 coresight: etm4x: fix repeated words in comments)
Merging fpga/for-next (ee31d5038c06 dt-bindings: fpga: document Lattice sysCONFIG FPGA manager)
Merging icc/icc-next (26e90ec7a840 Merge branch 'icc-sc8280xp-l3' into icc-next)
Merging iio/togreg (f84eec02b724 iio: addac: ad74413r: fix blank line after declaration warning)
Merging phy-next/next (bea3ce759b46 phy: ti: phy-j721e-wiz: add j721s2-wiz-10g module support)
Merging soundwire/next (7cbf00bd4142 soundwire: intel: split auxdevice to different file)
Merging extcon/extcon-next (de05153ffce5 extcon: usbc-tusb320: Convert to i2c's .probe_new())
Merging gnss/gnss-next (247f34f7b803 Linux 6.1-rc2)
Merging vfio/next (2f5d8cef45c3 vfio/mlx5: Fix a typo in mlx5vf_cmd_load_vhca_state())
Merging staging/staging-next (9dadff066244 staging: iio: ade7854: Convert to i2c's .probe_new())
Merging counter-next/counter-next (30a0b95b1335 Linux 6.1-rc3)
Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST)
Merging dmaengine/next (3a0c95b61385 dmaengine: tegra: Add support for dma-channel-mask)
Merging cgroup/for-next (674b745e22b3 cgroup: remove rcu_read_lock()/rcu_read_unlock() in critical section of spin_lock_irq())
Merging scsi/for-next (0cfd1fc5a347 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (4e80eef45ad7 scsi: sg: Fix get_user() in call sg_scsi_ioctl())
Merging vhost/linux-next (be8ddea9e75e vdpa/ifcvf: add reviewer)
Merging rpmsg/for-next (56d906bb66a7 Merge branches 'rproc-next' and 'hwspinlock-next' into for-next)
CONFLICT (content): Merge conflict in include/linux/firmware/xlnx-zynqmp.h
Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1)
Merging gpio-brgl/gpio/for-next (3b7c7478eda0 gpiolib: Provide to_gpio_device() helper)
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
Merging gpio-intel/for-next (8d259847243d gpiolib: cdev: Fix typo in kernel doc for struct line)
Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4)
Merging pinctrl/for-next (c05e8b14f374 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pinctrl-intel/for-next (b14ef61314b3 pinctrl: intel: Add Intel Moorefield pin controller support)
Merging pinctrl-renesas/renesas-pinctrl (80d34260f36c pinctrl: renesas: gpio: Use dynamic GPIO base if no function GPIOs)
Merging pinctrl-samsung/for-next (9abf2313adc1 Linux 6.1-rc1)
Merging pwm/for-next (50315945d178 dt-bindings: pwm: renesas,tpu: Add r8a779g0 support)
Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next)
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging kselftest/next (8008d88e6d16 selftests/tpm2: Split async tests call to separate shell script runner)
Merging kunit/test (9abf2313adc1 Linux 6.1-rc1)
Merging kunit-next/kunit (0f08f3e2a018 kunit: tool: don't include KTAP headers and the like in the test log)
CONFLICT (content): Merge conflict in lib/kunit/string-stream.c
Merging livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' into for-next)
Merging rtc/rtc-next (a6ceee26fd5e rtc: pcf85063: Fix reading alarm)
Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next)
Merging at24/at24/for-next (9abf2313adc1 Linux 6.1-rc1)
Merging ntb/ntb-next (1a3f7484e076 NTB: ntb_transport: fix possible memory leak while device_register() fails)
Merging seccomp/for-next/seccomp (4e92863862d1 Merge branch 'for-linus/seccomp' into for-next/seccomp)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get)
Merging slimbus/for-next (371fcbd32b26 dt-bindings: slimbus: qcom,slim-ngd: convert to DT schema)
Merging nvmem/for-next (18133a57a935 dt-bindings: nvmem: add YAML schema for the ONIE tlv layout)
Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
Merging hyperv/hyperv-next (fea858dc5d90 iommu/hyper-v: Allow hyperv irq remapping without x2apic)
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 (094226ad94f4 Linux 6.1-rc5)
Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
Merging mhi/mhi-next (5562c6a9657e bus: mhi: host: pci_generic: Add definition for some VIDs)
Merging memblock/for-next (80c2fe022ef5 memblock tests: remove completed TODO item)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging cxl/next (3b39fd6cf12c cxl: Replace HDM decoder granularity magic numbers)
Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller)
Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2)
Merging efi/next (f2e862b7eae2 efi: stub: use random seed from EFI variable)
CONFLICT (content): Merge conflict in arch/loongarch/kernel/efi.c
CONFLICT (modify/delete): arch/x86/boot/compressed/efi_thunk_64.S deleted in HEAD and modified in efi/next.  Version efi/next of arch/x86/boot/compressed/efi_thunk_64.S left in tree.
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile
$ git rm -f arch/x86/boot/compressed/efi_thunk_64.S
Applying: fix up for "efi: libstub: Permit mixed mode return types other than efi_status_t"
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (dc19745ad0e4 Merge branch 'slub-tiny-v1r6' into slab/for-next)
CONFLICT (content): Merge conflict in include/linux/percpu.h
Merging random/master (1747d6cc5ded random: align entropy_timer_state to cache line)
Merging landlock/next (0b4ab8cd635e Merge tag 'landlock-6.1-rc4' into landlock-next)
Merging rust/rust-next (fd9517a1603f init/Kconfig: Specify the interpreter for rust_is_available.sh)
Merging sysctl/sysctl-next (0dff89c4488f sched: Move numa_balancing sysctls to its own file)
Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages)
CONFLICT (content): Merge conflict in include/linux/migrate.h
CONFLICT (content): Merge conflict in mm/migrate.c
CONFLICT (content): Merge conflict in mm/migrate_device.c
Merging execve/for-next/execve (cd57e443831d exec: Remove FOLL_FORCE for stack setup)
CONFLICT (content): Merge conflict in fs/binfmt_elf.c
Merging bitmap/bitmap-for-next (27bc50fc9064 Merge tag 'mm-stable-2022-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm)
Merging hte/for-next (9abf2313adc1 Linux 6.1-rc1)
Merging kspp/for-next/kspp (6fdc3fd27aec panic: Expose "warn_count" to sysfs)
$ git reset --hard HEAD^
Merging next-20221130 version of kspp
Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper)
Merging unsigned-char/unsigned-char (0445d1bae1cc lib: assume char is unsigned)
Merging iommufd/for-next (e60c7c8417da Merge tag 'v6.1-rc7' into iommufd.git for-next)
Merging mm-stable/mm-stable (e0ff42804233 mm/memory-failure.c: cleanup in unpoison_memory)
CONFLICT (content): Merge conflict in mm/damon/sysfs.c
CONFLICT (content): Merge conflict in mm/hugetlb.c
Merging mm-nonmm-stable/mm-nonmm-stable (fe5759d5bfda cpumask: limit visibility of FORCE_NR_CPUS)
Merging mm/mm-everything (33f20e4a37f3 Merge branch 'mm-nonmm-unstable' into mm-everything)
CONFLICT (content): Merge conflict in mm/gup.c
CONFLICT (content): Merge conflict in mm/huge_memory.c

Attachment: pgp7UMSL2uHDq.pgp
Description: OpenPGP digital signature