From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0ACD4C4332F for ; Thu, 24 Nov 2022 06:48:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229448AbiKXGsM (ORCPT ); Thu, 24 Nov 2022 01:48:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229590AbiKXGsJ (ORCPT ); Thu, 24 Nov 2022 01:48:09 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14FBB2F007; Wed, 23 Nov 2022 22:48:04 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NHpTv16MTz4xGK; Thu, 24 Nov 2022 17:48:03 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1669272483; bh=R2Lb6Qp7NbxyKsHpJs5WCheR0diHVEfwoGcACDVYsJQ=; h=Date:From:To:Cc:Subject:From; b=bNtp1qIGRPhLU7vojK7iWCL33hu0mDUlpVLE7UXMk5zFOMnn4JCTuFLUjqxQdxBch Alm7HPZZdanFbxhGv7BNBZhSmVUULJv9tj0YMA/rwl3lbEblEQB/rPomf0ghiGLnMZ AqEwkBv1z1hkURNf9NCHQuxfqWdFbYZ5Gj7GIIdjE20egd+gTSDXVtmdGY6eMYNtTR 4JjgrbwrDEUPk6g1W/dw3Ub7JnMEW9+Ut7BkifZRHeTqOgnA4u76HjZC7fhPc3PyJs LH9S6ZShT/PZSI6VDZZWbEJZZHgxeasRyVWc3p8CTUZpsUrBd51TcQRkR8+feeBWGX lXk76tGKE37Jw== Date: Thu, 24 Nov 2022 17:48:01 +1100 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Nov 24 Message-ID: <20221124174801.63818612@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/d67ihT9Zr3oQzzB942Hg4LI"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/d67ihT9Zr3oQzzB942Hg4LI Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20221123: New tree: powerpc-objtool The thermal tree still had complex conflicts against the pm tree so I dropp= ed the thermal tree for today. The net-next tree lost its build failure. The tip tree gained a conflict against the powerpc-objtool tree. The slab tree gained a build failure so I used the version from next-20221123. I reverted a commit from the mm tree on request. Non-merge commits (relative to Linus' tree): 9419 9082 files changed, 416861 insertions(+), 165174 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. --=20 Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (4312098baf37 Merge tag 'spi-fix-v6.1-rc6' of git://g= it.kernel.org/pub/scm/linux/kernel/git/broonie/spi) Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://= anongit.freedesktop.org/drm/drm) Merging mm-hotfixes/mm-hotfixes-unstable (ee7adde56890 mm: migrate: Fix THP= 's mapcount on isolation) Merging kbuild-current/fixes (534bd70374d6 init/Kconfig: fix CC_HAS_ASM_GOT= O_TIED_OUTPUT test with dash) Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3) Merging arm-current/fixes (340a982825f7 ARM: 9266/1: mm: fix no-MMU ZERO_PA= GE() implementation) Merging arm64-fixes/for-next/fixes (5b47348fc0b1 arm64/mm: fix incorrect fi= le_map_count for non-leaf pmd/pud) Merging arm-soc-fixes/arm/fixes (706450b5c321 Merge tag 'v6.1-rockchip-dtsf= ixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchi= p 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 (eb761a1760bf powerpc: Fix writable sections be= ing moved into the rodata region) Merging s390-fixes/fixes (9ac74f0666ce s390/ap: fix memory leak in ap_init_= qci_info()) Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) Merging fscrypt-current/for-stable (ccd30a476f8e fscrypt: fix keyring memor= y leak on mount failure) Merging net/master (748064b54c99 net/cdc_ncm: Fix multicast RX support for = CDC NCM devices with ZLP) Merging bpf/master (8be602dadb2f selftests/bpf: Make test_bench_attach seri= al) Merging ipsec/master (40781bfb836e xfrm: Fix ignored return value in xfrm6_= init()) Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging ipvs/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://g= it.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging wireless/for-next (2d0b08c15743 MAINTAINERS: mark rsi wifi driver a= s orphan) Merging rdma-fixes/for-rc (094226ad94f4 Linux 6.1-rc5) Merging sound-current/for-linus (ecae4c8954a1 Merge tag 'asoc-fix-v6.1-rc6'= of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-= linus) Merging sound-asoc-fixes/for-linus (db8f91d424fe ASoC: soc-pcm: Add NULL ch= eck in BE reparenting) Merging regmap-fixes/for-linus (84498d1fb35d regmap-irq: Use the new num_co= nfig_regs property in regmap_add_irq_chip_fwnode) Merging regulator-fixes/for-linus (089bac50c2b6 Merge remote-tracking branc= h 'regulator/for-6.0' into regulator-linus) Merging spi-fixes/for-linus (23cf6bdf194a Merge remote-tracking branch 'spi= /for-6.0' into spi-linus) Merging pci-current/for-linus (ac9ccce8717d MAINTAINERS: Include PCI bindin= gs 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 (7a21b27aafa3 usb: cdnsp: fix issue with ZLP = - added TD_SIZE =3D 1) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (c1547f12df8b USB: serial: option: add u= -blox LARA-L6 modem) Merging phy/fixes (819b885cd886 phy: ralink: mt7621-pci: add sentinel to qu= irks table) Merging staging.current/staging-linus (eb7081409f94 Linux 6.1-rc6) Merging iio-fixes/fixes-togreg (86fdd15e10e4 iio: fix memory leak in iio_de= vice_register_eventset()) Merging counter-current/counter-current (30a0b95b1335 Linux 6.1-rc3) Merging char-misc.current/char-misc-linus (8ac3b5cd3e05 lib/vdso: use "grep= -E" instead of "egrep") Merging soundwire-fixes/fixes (49a467310dc4 soundwire: qcom: check for outa= nding writes before doing a read) Merging thunderbolt-fixes/fixes (eb7081409f94 Linux 6.1-rc6) 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 crash= es when keys are not 16-byte aligned) Merging vfio-fixes/for-linus (e806e223621e vfio/pci: Check the device set o= pen count on reset) Merging kselftest-fixes/fixes (89c1017aac67 selftests/pidfd_test: Remove th= e erroneous ',') Merging modules-fixes/modules-linus (77d6354bd422 module/decompress: genera= te sysfs string at compile time) Merging dmaengine-fixes/fixes (c47e6403fa09 dmaengine: at_hdmac: Check retu= rn code of dma_async_device_register) Merging backlight-fixes/for-backlight-fixes (6dfad94814c7 dt-bindings: back= light: qcom-wled: Add PMI8950 compatible) Merging mtd-fixes/mtd/fixes (c717b9b7d6de mtd: onenand: omap2: add dependen= cy on GPMC) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Re= vert "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 i= prst4 setting) Merging mips-fixes/mips-fixes (094226ad94f4 Linux 6.1-rc5) Merging at91-fixes/at91-fixes (40a2226e8bfa ARM: dts: at91: sam9g20ek: enab= le udc vbus gpio pinctrl) Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) Merging kvm-fixes/master (6d3085e4d89a KVM: x86/mmu: Block all page faults = during kvm_zap_gfn_range()) Merging kvms390-fixes/master (b6662e377727 KVM: s390: pci: Fix allocation s= ize of aift kzdev elements) Merging hwmon-fixes/hwmon (595fc93c64f8 hwmon: (coretemp) fix pci device re= fcount leak in nv1a_ram_new()) Merging nvdimm-fixes/libnvdimm-fixes (472faf72b33d device-dax: Fix duplicat= e 'hmem' device registration) Merging cxl-fixes/fixes (8f401ec1c897 cxl/region: Recycle region ids) Merging btrfs-fixes/next-fixes (e6c556c9e623 Merge branch 'misc-6.1' into n= ext-fixes) Merging vfs-fixes/fixes (406c706c7b7f vfs: vfs_tmpfile: ensure O_EXCL flag = is enforced) Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the corre= ct 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 nod= e 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 lea= k when device_register() failed) Merging drm-fixes/drm-fixes (eb7081409f94 Linux 6.1-rc6) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_= cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (14af5d385878 Merge tag 'gvt-f= ixes-2022-11-11' of https://github.com/intel/gvt-linux into drm-intel-fixes) Merging mmc-fixes/fixes (a3cab1d21324 mmc: sdhci-esdhc-imx: correct CQHCI e= xit halt state check) 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 pos= sible memory leak in vmbus_device_register()) Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) Merging risc-v-fixes/fixes (fcae44fd36d0 RISC-V: vdso: Do not add missing s= ymbols to version section in linker script) 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_ran= ge()) 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 (30a0b95b1335 Linux 6.1-rc3) 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 f= scache mode) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_d= esc()) 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 <=3D alloc, size) Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release= kmalloced memblock regions) Merging cel-fixes/for-rc (5a01c805441b NFSD: Fix trace_nfsd_fh_verify_err()= crasher) Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI s= hould depend on ARCH_MXC) Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fi= x 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 (9b9eaee9828f arm64: efi: Fix handling of misalign= ed runtime regions and drop warning) Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word= in comment.) Merging battery-fixes/fixes (767e684367e4 power: supply: ab8500: Defer ther= mal zone probe) Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executab= le 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 (a6a00d7e8ffd fbcon: Use kzallo= c() in fbcon_prepare_logo()) Merging kbuild/for-next (8818039f959b kbuild: add ability to make source rp= m buildable using koji) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space aft= er for_each macros) Merging perf/perf/core (c66a36af7ba3 perf lock contention: Do not use BPF t= ask local storage) Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attr= ibutes: Introduce __access_*() function attribute) Merging dma-mapping/for-next (ffcb75458460 dma-mapping: reject __GFP_COMP i= n dma_alloc_attrs) CONFLICT (content): Merge conflict in sound/core/memalloc.c Merging asm-generic/master (5e5ff73c2e58 asm-generic/io: Add _RET_IP_ to MM= IO trace for more accurate debug info) Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) Merging arm/for-next (a893cdeb4f7c Merge branches 'misc' and 'fixes' into f= or-next) Merging arm64/for-next/core (4bd41b7b3e6a Merge branches 'for-next/acpi', '= for-next/asm-const', 'for-next/cpufeature', 'for-next/dynamic-scs', 'for-ne= xt/errata', 'for-next/fpsimd', 'for-next/insn', 'for-next/kbuild', 'for-nex= t/kdump', 'for-next/mm', 'for-next/perf', 'for-next/selftests', 'for-next/s= tacks', 'for-next/trivial', 'for-next/uaccess' and 'for-next/undef-traps' i= nto for-next/core) Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.r= st in toctree to fix 'htmldocs' WARNING) Merging arm-soc/for-next (e377f2aeadda soc: document 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 fo= r-next) Merging asahi-soc/asahi-soc/for-next (56fed763f6b2 arm64: dts: apple: Add A= DMAC resets on t8103/t600x) Merging aspeed/for-next (45c86167adde soc: nuvoton: Add SoC info driver for= WPCM450) CONFLICT (content): Merge conflict in arch/arm/boot/dts/nuvoton-wpcm450-sup= ermicro-x9sci-ln4f.dts Merging at91/at91-next (ecdb99be14fa Merge branch 'at91-dt' into at91-next) Merging broadcom/next (64610429f8de Merge branch 'drivers/next' into next) Merging davinci/davinci/for-next (53ad523ac435 ARM: davinci: fix repeated w= ords in comments) Merging drivers-memory/for-next (8dd7e4af5853 memory: omap-gpmc: fix coveri= ty issue "Control flow issues") Merging imx-mxs/for-next (e114f7b74f59 Merge branch 'imx/defconfig' into fo= r-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' int= o next) Merging mediatek/for-next (6b6221595e05 Merge branch 'v6.2-tmp/dts64' into = for-next) Merging mvebu/for-next (d5c48679d56c Merge branch 'mvebu/dt64' into mvebu/f= or-next) Merging omap/for-next (6435241fd536 Merge branch 'musb-for-v6.2' into for-n= ext) 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 b= rcm,bcm2835-vchiq to json-schema) Merging renesas/next (00841e945654 Merge branch 'renesas-arm-dt-for-v6.2' i= nto 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 (5a549e2d0bab Merge branch 'next/clk' into fo= r-next) Merging scmi/for-linux-next (25882cfe4a6b Merge branch 'for-next/juno' of g= it://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-li= nux-next) Merging stm32/stm32-next (4cca342b840e ARM: dts: stm32: Rename mdio0 to mdi= o 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 i= nto 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 (0413dd4d95da ARM: dts: zynq: add QSPI controller n= ode) Merging clk/clk-next (ebb6a9acf2e0 Merge branch 'clk-fixes' into clk-next) Merging clk-imx/for-next (ec689c152985 clk: imx: imxrt1050: add IMXRT1050_C= LK_LCDIF_PIX clock gate) Merging clk-renesas/renesas-clk (777bcc85e1fb clk: renesas: r8a779f0: Fix E= thernet 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 restart= able sequence") Merging loongarch/loongarch-next (247f34f7b803 Linux 6.1-rc2) Merging m68k/for-next (553b20b211c4 m68k: defconfig: Update defconfigs for = v6.1-rc1) Merging m68knommu/for-next (094226ad94f4 Linux 6.1-rc5) Merging microblaze/next (493ffd6605b2 Merge tag 'ucount-rlimits-cleanups-fo= r-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-nam= espace) Merging mips/mips-next (c5ed1fe0801f MIPS: vpe-cmp: fix possible memory lea= k 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 (9b90cc8aadff parisc: Fix kgdb keyboard input in= pdc early console driver) Merging powerpc/next (247f34f7b803 Linux 6.1-rc2) Merging powerpc-objtool/topic/objtool (a39818a3fb2b objtool/powerpc: Implem= ent arch_pc_relative_reloc()) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (effae0e3d9e1 riscv: Kconfig: Enable cpufreq kconfi= g menu) 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 (b4f38dc22074 Merge branch 'features' into for-next) Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer f= rom 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 (c0192a847c96 Merge branch 'fs.acl.rework' i= nto for-next) Merging fscrypt/master (02aef4225258 fscrypt: pass super_block to fscrypt_p= ut_master_key_activeref()) 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-20221= 123' 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 re= q->r_session) Merging cifs/for-next (beb6004ff91c Fix path in cifs/usage.rst) 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 (312fe643ad11 erofs: clean up erofs_iget()) Merging exfat/dev (3d0cdf1b32dc exfat: hint the empty entry which at the en= d of cluster chain) Merging ext3/for_next (600b6f8dcbf0 Pull ->writepage removal patches.) Merging ext4/dev (0d043351e5ba ext4: fix fortify warning in fs/ext4/fast_co= mmit.c:1551) Merging f2fs/dev (967eaad1fed5 f2fs: fix to set flush_merge opt and show no= flush_merge) Merging fsverity/fsverity (276616fff35d fsverity: stop using PG_error to tr= ack error status) Merging fuse/for-next (1b0e94993dbe fuse: optional supplementary group in c= reate 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_moun= t_rw atomic) Merging ksmbd/ksmbd-for-next (5e40d197b564 ksmbd: use F_SETLK when unlockin= g a file) Merging nfs/linux-next (094226ad94f4 Linux 6.1-rc5) Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate = slot failed) Merging nfsd/for-next (7c3bdf7bd3ba NFSD: add CB_RECALL_ANY tracepoints) 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 (b337e5ae0e42 ovl: Kconfig: Fix spelling m= istake "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 si= ze) Merging xfs/for-next (28b4b0596343 xfs: fix incorrect i_nlink caused by ino= de racing) Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page a= cquired with GFP_KERNEL flag) Merging iomap/iomap-for-next (f1bd37a47352 iomap: directly use logical bloc= k size) Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in ioma= p_fiemap) Merging file-locks/locks-next (0513283941f6 Add process name and pid to loc= ks warning) Merging iversion/iversion-next (2b3319b35573 nfsd: remove fetch_iversion ex= port operation) Merging vfs/for-next (3aca47127a64 fs: drop useless condition from inode_ne= eds_update_time) Merging printk/for-next (11f1e536902b Merge branch 'for-6.2' 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' in= to for-next) Merging i2c/i2c/for-next (ee98d665b461 Merge branch 'i2c/for-mergewindow' i= nto i2c/for-next) Merging i3c/i3c/next (9abf2313adc1 Linux 6.1-rc1) Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point l= ength checks) Merging hwmon-staging/hwmon-next (2c71b3246ec3 hwmon: (gsc-hwmon) Switch to= flexible array to simplify code) Merging jc_docs/docs-next (6da1f1e246d0 Merge branch 'docs-mw' into docs-ne= xt) Merging v4l-dvb/master (1e284ea984d3 Merge git://linuxtv.org/sailus/media_t= ree into media_stage) Merging v4l-dvb-next/master (b9fbe29c5906 Merge tag 'br-v6.2d' of git://lin= uxtv.org/hverkuil/media_tree into media_stage) Merging pm/linux-next (611bfa6eb1e0 Merge branches 'thermal-core' and 'ther= mal-intel' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (84063a1cbe9e cpufreq: qcom-hw: = Add CPU clock provider support) Merging cpupower/cpupower (9abf2313adc1 Linux 6.1-rc1) Merging devfreq/devfreq-next (5fdded844892 PM/devfreq: governor: Add a priv= ate governor_data for governor) Merging opp/opp/linux-next (dba79b78ecc1 dt-bindings: opp-v2: Fix clock-lat= ency-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 (0c5e259b06a8 RDMA/hns: Fix incorrect sge nums calcul= ation) Merging net-next/master (2094dbbd82f9 Merge branch 'net-complete-conversion= -to-i2c_probe_new') CONFLICT (content): Merge conflict in tools/perf/util/stat.c Merging bpf-next/for-next (264c21867a0e docs/bpf: Document BPF_MAP_TYPE_BLO= OM_FILTER) CONFLICT (content): Merge conflict in include/linux/bpf.h CONFLICT (content): Merge conflict in tools/lib/bpf/ringbuf.c Merging ipsec-next/master (cc2bbbfd9a50 xfrm: Remove not-used total variabl= e) 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/l= inux/kernel/git/netdev/net) Merging bluetooth/master (f492d22c0e7f dt-bindings: bluetooth: broadcom: ad= d BCM43430A0 & BCM43430A1) Merging wireless-next/for-next (3b79d4bad3a0 wifi: p54: Replace zero-length= array of trailing structs with flex-array) Merging mtd/mtd/next (085679b15b5a mtd: parsers: refer to ARCH_BCMBCA inste= ad of ARCH_BCM4908) Merging nand/nand/next (c13bf589e5cf mtd: rawnand: marvell: Enable NFC/DEVB= US arbiter) 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 fo= r Quad Page Program) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd= /jedec,spi-nor.yaml Merging crypto/master (8e96729fc26c crypto: ccree - Make cc_debugfs_global_= fini() available for module init function) Merging drm/drm-next (3d335a523b93 Merge tag 'drm-intel-next-2022-11-18' of= git://anongit.freedesktop.org/drm/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_job= .c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_crat.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn20/= dcn20_hwseq.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dd= i.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_di= splay_power_well.c CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i915/display/intel_dk= l_phy.c CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i915/display/intel_dk= l_phy.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp= .c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp= ll_mgr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_lv= ds.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_sd= vo.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_dma= buf.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h CONFLICT (content): Merge conflict in drivers/gpu/drm/rcar-du/Kconfig CONFLICT (content): Merge conflict in drivers/gpu/drm/scheduler/sched_entit= y.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c Merging drm-misc/for-linux-next (b02897e56b4e Revert "drm/fb-helper: Perfor= m damage handling in deferred-I/O helper") Merging amdgpu/drm-next (10d2d1fc05f0 drm/amdgpu: Partially revert "drm/amd= gpu: update drm_display_info correctly when the edid is read") Merging drm-intel/for-linux-next (3d335a523b93 Merge tag 'drm-intel-next-20= 22-11-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) Merging drm-tegra/for-next (1eb336ed12cd gpu: host1x: Staticize host1x_sync= pt_fence_ops) Merging drm-msm/msm-next (d73b1d02de08 drm/msm: Hangcheck progress detectio= n) Merging drm-msm-lumag/msm-next-lumag (2c039475d5bc Merge branches 'msm-next= -lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-ds= i', '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 red= undant color encoding and range initialisation) Merging etnaviv/etnaviv/next (a3b4c2f9b039 drm/etnaviv: switch to PFN mappi= ngs) Merging fbdev/for-next (652888c46397 fbdev: ep93xx-fb: Add missing clk_disa= ble_unprepare in ep93xxfb_probe()) Merging regmap/for-next (d041845f53bf Merge remote-tracking branch 'regmap/= for-6.2' into regmap-next) Merging sound/for-next (cf59e1e4c79b ALSA: seq: fix undefined behavior in b= it shift for SNDRV_SEQ_FILTER_USE_EVENT) Merging sound-asoc/for-next (288f75c2e6d4 Merge remote-tracking branch 'aso= c/for-6.2' into asoc-next) Merging modules/modules-next (c86a514f5fad kallsyms: Remove unneeded semico= lon) Merging input/next (9f4211bf7f81 HID: add mapping for camera access keys) Merging block/for-next (6321e75e0bc5 Merge branch 'for-6.2/io_uring' into f= or-next) Merging device-mapper/for-next (984bf2cc531e dm integrity: clear the journa= l 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 (cb713d1f69ae memstick/ms_block: Add check for alloc_order= ed_workqueue) Merging mfd/for-mfd-next (2c9918463543 mfd: tc6393xb: Remove #ifdef guards = for PM related functions) Merging backlight/for-backlight-next (e7647de058cb video: backlight: mt6370= : Add MediaTek MT6370 support) Merging battery/for-next (922bde5a0955 power: supply: z2_battery: Convert t= o i2c's .probe_new()) Merging regulator/for-next (a339d1c0b57d Merge remote-tracking branch 'regu= lator/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 sy= mbol 'array_size' in policy_unpack_test.c) CONFLICT (content): Merge conflict in security/apparmor/domain.c Merging integrity/next-integrity (25369175ce84 ima: Fix misuse of dereferen= ce of pointer in template_desc_init_fields()) Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kern= el.org/pub/scm/linux/kernel/git/viro/vfs) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroup= s() testing to selftest) Merging selinux/next (048be156491f selinux: remove the sidtab context conve= rsion 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 G= FP_ATOMIC in convert_context()" Merging smack/next (1a3065e92046 smack_lsm: remove unnecessary type casting) Merging tomoyo/master (88ba4e14d341 workqueue: Emit runtime message when fl= ush_scheduled_work() is called) Merging tpmdd/next (fd6628650d1a KEYS: trusted: tee: Make registered shm de= pendency explicit) Merging watchdog/master (9ec0b7e06835 watchdog: aspeed: Enable pre-timeout = interrupt) Merging iommu/next (69a6c7d969f5 Merge branches 'arm/allwinner', 'arm/exyno= s', '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 (0bce07c75819 dt-bindings: Move fixed string no= de names under 'properties') 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 (d86d298f31fa Merge remote-tracking branch 'spi/for-6.= 2' into spi-next) Merging tip/master (1682b36ba353 Merge x86/cpu into tip/master) 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/Kconf= ig 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/a= rm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value) Merging edac/edac-for-next (b998a2babf4e Merge edac-misc into for-next) Merging irqchip/irq/irqchip-next (732d69c80cb0 Merge branch irq/misc-6.1 in= to irq/irqchip-next) Merging ftrace/for-next (0934ae9977c2 tracing: Fix reading strings from syn= thetic events) Merging rcu/rcu/next (39035b41bccb tools/memory-model: Use "grep -E" instea= d of "egrep") Merging kvm/next (d72cf8ffe460 Merge tag 'kvm-s390-master-6.1-1' of https:/= /git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvm-arm/next (34afaeadba94 Merge branch kvm-arm64/pmu-unchained int= o kvmarm-master/next) Merging kvms390/next (bedac519eefa s390/vfio-ap: check TAPQ response code w= hen waiting for queue reset) CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h Merging xen-tip/linux-next (4abb77fc5531 xen/platform-pci: use define inste= ad of literal number) Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep wor= k dependency in cancel_work_sync()) Merging drivers-x86/for-next (e32354bb8fe3 platform/x86/intel/hid: Add modu= le-params for 5 button array + SW_TABLET_MODE reporting) Merging chrome-platform/for-next (f9e510dc92df platform/chrome: cros_ec: Co= nvert to i2c's .probe_new()) Merging hsi/for-next (8acbca3a92b8 headers: Remove some left-over license t= ext in include/uapi/linux/hsi/) Merging leds/for-next (5f52a8ba7e91 dt-bindings: leds: Add 'cpuX' to 'linux= ,default-trigger') Merging ipmi/for-next (0eb1762f3c77 ipmi/watchdog: Include when appropriate) Merging driver-core/driver-core-next (24b3e3dd9c9c kernfs: fix all kernel-d= oc warnings and multiple typos) Merging usb/usb-next (907140462eb5 usb: usb251xb: Convert to i2c's .probe_n= ew()) Merging thunderbolt/next (a5cfc9d65879 thunderbolt: Add wake on connect/dis= connect on USB4 ports) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (247f34f7b803 Linux 6.1-rc2) Merging tty/tty-next (8be3a7bf7737 serial: pch: Fix PCI device refcount lea= k in pch_request_dma()) Merging char-misc/char-misc-next (08c9d2f56178 Merge tag 'mhi-for-v6.2' of = git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-next) Merging coresight/next (3c728e079d83 coresight: etm4x: add CPU hotplug supp= ort for probing) Merging fpga/for-next (ee31d5038c06 dt-bindings: fpga: document Lattice sys= CONFIG FPGA manager) Merging icc/icc-next (26e90ec7a840 Merge branch 'icc-sc8280xp-l3' into icc-= next) Merging iio/togreg (eda549e2e524 iio: frequency: adf4377: add support for A= DF4377) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio= /addac/adi,ad74413r.yaml Merging phy-next/next (742859441d44 phy: renesas: Add Renesas Ethernet SERD= ES driver for R-Car S4-8) Merging soundwire/next (febc50b82bc9 dt-bindings: soundwire: Convert text b= indings to DT Schema) Merging extcon/extcon-next (de05153ffce5 extcon: usbc-tusb320: Convert to i= 2c'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_vh= ca_state()) Merging staging/staging-next (9dadff066244 staging: iio: ade7854: Convert t= o i2c's .probe_new()) Merging counter-next/counter-next (30a0b95b1335 Linux 6.1-rc3) Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) Merging dmaengine/next (3a0c95b61385 dmaengine: tegra: Add support for dma-= channel-mask) Merging cgroup/for-next (674b745e22b3 cgroup: remove rcu_read_lock()/rcu_re= ad_unlock() in critical section of spin_lock_irq()) Merging scsi/for-next (6f1be50a0e3d Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (ae8011fe076d scsi: target: core: Change the way = target_xcopy_do_work() sets restiction on max I/O) Merging vhost/linux-next (be8ddea9e75e vdpa/ifcvf: add reviewer) Merging rpmsg/for-next (86747c0093ff Merge branches 'rproc-next' and 'hwspi= nlock-next' into for-next) Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging gpio-brgl/gpio/for-next (40059212f99c dt-bindings: gpio: gpio-davin= ci: Increase maxItems in gpio-line-names) 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 (06ec38c85f48 Merge branch 'devel' into for-next) CONFLICT (content): Merge conflict in MAINTAINERS Merging pinctrl-intel/for-next (b14ef61314b3 pinctrl: intel: Add Intel Moor= efield pin controller support) Merging pinctrl-renesas/renesas-pinctrl (80d34260f36c pinctrl: renesas: gpi= o: 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 r8a77= 9g0 support) Merging userns/for-next (b5df013cd194 Merge of ucount-rlimits-cleanups-for-= v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, retire_mq_sys= ctls-for-v5.19, and unpriv-ipc-sysctls-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 (c93924267fe6 selftests/efivarfs: Add checking of th= e test return value) Merging kunit/test (9abf2313adc1 Linux 6.1-rc1) Merging kunit-next/kunit (99c8c9276be7 kunit: tool: make --json do nothing = if --raw_ouput is set) CONFLICT (content): Merge conflict in lib/kunit/string-stream.c Merging livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' int= o for-next) Merging rtc/rtc-next (a6ceee26fd5e rtc: pcf85063: Fix reading alarm) Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdim= m' 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/secc= omp' 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 fo= r the ONIE tlv layout) Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was all= ocated) Merging hyperv/hyperv-next (0b90efa6ca81 clocksource: hyper-v: Add TSC page= support for root partition) Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array si= ze explicitly in lcd2s_gotoxy()) Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper functi= on) 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 definit= ion for some VIDs) Merging memblock/for-next (80c2fe022ef5 memblock tests: remove completed TO= DO item) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in = do_copy) Merging cxl/next (3b39fd6cf12c cxl: Replace HDM decoder granularity magic n= umbers) Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_it= er into its caller) Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) Merging efi/next (196dff2712ca efi: random: combine bootloader provided RNG= seed with RNG protocol output) CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation fa= ilures in mkutf8data) Merging slab/for-next (935229676642 Merge branch 'slub-tiny-v1r3' into slab= /for-next) CONFLICT (content): Merge conflict in include/linux/percpu.h $ git reset --hard HEAD^ Merging next-20221123 version of slab CONFLICT (content): Merge conflict in include/linux/percpu.h [master 214c0363f296] next-20221123/slab Merging random/master (e7b813b32a42 efi: random: refresh non-volatile rando= m seed when RNG is initialized) Merging landlock/next (0b4ab8cd635e Merge tag 'landlock-6.1-rc4' into landl= ock-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 st= ack setup) Merging bitmap/bitmap-for-next (27bc50fc9064 Merge tag 'mm-stable-2022-10-0= 8' 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 (d38b7b141afc mm: Make ksize() a reporting-only = function) Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-len= gth array with DECLARE_FLEX_ARRAY() helper) Merging unsigned-char/unsigned-char (0445d1bae1cc lib: assume char is unsig= ned) Merging iommufd/for-next (57f62422b6f0 Merge remote-tracking branch 'linus/= master' into k.o-iommufd/for-next) Merging mm-stable/mm-stable (ea0ffd0c08d0 swap: add a limit for readahead p= age-cluster value) CONFLICT (content): Merge conflict in mm/hugetlb.c Merging mm-nonmm-stable/mm-nonmm-stable (7b9cbc7701d5 scripts/spelling.txt:= add more spellings to spelling.txt) Merging mm/mm-everything (7e7b4bc9d0dc Merge branch 'mm-nonmm-unstable' int= o mm-everything) CONFLICT (content): Merge conflict in include/linux/gfp.h CONFLICT (content): Merge conflict in mm/damon/sysfs.c CONFLICT (content): Merge conflict in mm/gup.c CONFLICT (content): Merge conflict in mm/huge_memory.c Applying: Revert "mm: remove lock_page_memcg() from rmap" --Sig_/d67ihT9Zr3oQzzB942Hg4LI Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN/E6EACgkQAVBC80lX 0GwATAf/d669Rf3nmDmUPUHBqD5zsNVp8xf9V1ZC/tg/IqYG1eSAkZ95FPtSXCt9 TDPBycUDOK14pidTraFnpc2I7HA8FHP79FE97Cpp74Ydxa/yiNXMjhZI1iiKfKnL taURiL2Bwa/aUKLPrVhmgGm7cEkWwK1EENP2DfpkoWFrvaTntTeqQ8a7BqvSQjKC LGsbRGWNIbBWl1/6L5nBYqbCHU266DN9ia4hrSpawWST6i4KTFG92Ch/nKbY9NYk 4fYLWJEveOu+s+4fC6+Jtkftwfygpl+CKy4R6DXjVC3VNAHCBb2AYngopJcEuqdo hhxZ65DJzQgap0IsrcssN2bIWIRHvg== =j61e -----END PGP SIGNATURE----- --Sig_/d67ihT9Zr3oQzzB942Hg4LI--