Hi all, Changes since 20220208: The bpf-next tree gained a build failure so I used the version from next-20220208. The drm-intel tree gained a conflict against the drm tree. The folio tree still had its build failure so I used the version from next-20220204. Non-merge commits (relative to Linus' tree): 4097 4488 files changed, 170944 insertions(+), 62826 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 345 trees (counting Linus' and 93 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 (e6251ab4551f Merge tag 'nfs-for-5.17-2' of git://git.linux-nfs.org/projects/anna/linux-nfs) Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging kbuild-current/fixes (1cf5f151d25f Makefile.extrawarn: Move -Wunaligned-access to W=1) Merging arc-current/for-curr (f982d9b7c628 arc: remove set_fs()) Merging arm-current/fixes (9f80ccda53b9 ARM: 9180/1: Thumb2: align ALT_UP() sections in modules sufficiently) Merging arm64-fixes/for-next/fixes (a4b92cebc31d arm64: Enable Cortex-A510 erratum 2051678 by default) Merging arm-soc-fixes/arm/fixes (4a64f2d3527a MAINTAINERS: add myself as a maintainer for the sl28cpld) Merging drivers-memory-fixes/fixes (e783362eb54c Linux 5.17-rc1) Merging tee-fixes/fixes (7e3c6eb44c91 Merge tags 'optee-fixes-for-v5.17' and 'optee-fix-for-v5.17' into fixes) Merging m68k-current/for-linus (1a0ae068bf6b m68k: defconfig: Update defconfigs for v5.16-rc1) Merging powerpc-fixes/fixes (8defc2a5dd8f powerpc/64s/interrupt: Fix decrementer storm) Merging s390-fixes/fixes (e286f231eab4 s390/module: fix building test_modules_helpers.o with clang) 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 (fe4f57bf7b58 net: phy: marvell: Fix RGMII Tx/Rx delays setting in 88e1121-compatible PHYs) Merging bpf/master (fe68195daf34 ixgbevf: Require large buffers for build_skb on 82599VF) Merging ipsec/master (a6d95c5a628a Revert "xfrm: xfrm_state_mtu should return at least 1280 for ipv6") Merging netfilter/master (59085208e4a2 net: mscc: ocelot: fix all IP traffic getting trapped to CPU with PTP over IP) Merging ipvs/master (59085208e4a2 net: mscc: ocelot: fix all IP traffic getting trapped to CPU with PTP over IP) Merging wireless/main (f0a6fd152706 cfg80211: fix race in netlink owner interface destruction) Merging rdma-fixes/for-rc (dfd42facf1e4 Linux 5.17-rc3) Merging sound-current/for-linus (52517d9c0c01 Merge tag 'asoc-fix-v5.17-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (4c33de0673ce ASoC: rt5682: do not block workqueue if card is unbound) Merging regmap-fixes/for-linus (b56a7cbf40c8 regmap: debugfs: Fix indentation) Merging regulator-fixes/for-linus (1aa6a7957230 Merge remote-tracking branch 'regulator/for-5.16' into regulator-linus) Merging spi-fixes/for-linus (ba8681733dbc Merge remote-tracking branch 'spi/for-5.16' into spi-linus) Merging pci-current/for-linus (b139e2632409 Revert "PCI/portdrv: Do not setup up IRQs if there are no users") Merging driver-core.current/driver-core-linus (e783362eb54c Linux 5.17-rc1) Merging tty.current/tty-linus (28cb138f559f vt_ioctl: add array_index_nospec to VT_ACTIVATE) Merging usb.current/usb-linus (117b4e96c7f3 usb: dwc3: gadget: Prevent core from processing stale TRBs) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (6ca0c6283340 USB: serial: cp210x: add CPI Bulk Coin Recycler id) Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c Merging phy/fixes (9a8406ba1a9a phy: dphy: Correct clk_pre parameter) Merging staging.current/staging-linus (426aca16e903 staging: fbtft: Fix error path in fbtft_driver_module_init()) Merging iio-fixes/fixes-togreg (ea85bf906466 iio: imu: st_lsm6dsx: wait for settling time in st_lsm6dsx_read_oneshot) Merging char-misc.current/char-misc-linus (bca828ccdd65 speakup-dectlk: Restore pitch setting) Merging soundwire-fixes/fixes (e783362eb54c Linux 5.17-rc1) Merging thunderbolt-fixes/fixes (dfd42facf1e4 Linux 5.17-rc3) Merging input-current/for-linus (762f99f4f3cb Merge branch 'next' into for-linus) Merging crypto-current/master (c6ce9c5831ca crypto: api - Move cryptomgr soft dependency into algapi) Merging vfio-fixes/for-linus (8704e8934908 vfio/pci: Fix OpRegion read) Merging kselftest-fixes/fixes (183f80fd72db selftests/ir: fix build with ancient kernel headers) Merging modules-fixes/modules-linus (2a987e65025e Merge tag 'perf-tools-fixes-for-v5.16-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) Merging dmaengine-fixes/fixes (e783362eb54c Linux 5.17-rc1) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (36415a796471 mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (d40f0b133b44 media: meson-ir-tx: remove incorrect doc comment) Merging reset-fixes/reset/fixes (92c959bae2e5 reset: renesas: Fix Runtime PM usage) Merging mips-fixes/mips-fixes (dfd42facf1e4 Linux 5.17-rc3) Merging at91-fixes/at91-fixes (fa55b7dcdc43 Linux 5.16-rc1) Merging omap-fixes/fixes (80d680fdccba ARM: dts: omap3430-sdp: Fix NAND device node) Merging kvm-fixes/master (7e6a6b400db8 Merge tag 'kvmarm-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) Merging hwmon-fixes/hwmon (bb9bb9c75482 hwmon: (ntc_thermistor) Underscore Samsung thermistor) Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) Merging btrfs-fixes/next-fixes (c30ef1bf06ac Merge branch 'misc-5.17' into next-fixes) Merging vfs-fixes/fixes (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait()) Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging drivers-x86-fixes/fixes (e3d13da7f77d platform/x86: asus-wmi: Fix regression when probing for fan curve control) Merging samsung-krzk-fixes/fixes (442b0c08db7e soc: samsung: Fix typo in CONFIG_EXYNOS_USI description) Merging pinctrl-samsung-fixes/fixes (e783362eb54c Linux 5.17-rc1) Merging devicetree-fixes/dt/linus (fa4300f060e5 of: unittest: update text of expected warnings) Merging scsi-fixes/fixes (5852ed2a6a39 scsi: lpfc: Reduce log messages seen after firmware download) Merging drm-fixes/drm-fixes (dfd42facf1e4 Linux 5.17-rc3) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (4e6f55120c7e drm/i915: Workaround broken BIOS DBUF configuration on TGL/RKL) Merging mmc-fixes/fixes (54309fde1a35 mmc: block: fix read single on recovery logic) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (e783362eb54c Linux 5.17-rc1) Merging hyperv-fixes/hyperv-fixes (6bf625a4140f Drivers: hv: vmbus: Rework use of DMA_BIT_MASK(64)) Merging soc-fsl-fixes/fix (8120bd469f55 soc: fsl: dpaa2-console: free buffer before returning from dpaa2_console_read) Merging risc-v-fixes/fixes (ca0cb9a60f6d riscv/mm: Add XIP_FIXUP for riscv_pfn_base) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (8bb7eca972ad Linux 5.15) Merging spdx/spdx-linus (e783362eb54c Linux 5.17-rc1) Merging gpio-brgl-fixes/gpio/for-current (cc38ef936840 gpio: sifive: use the correct register to read output values) Merging gpio-intel-fixes/fixes (e783362eb54c Linux 5.17-rc1) Merging pinctrl-intel-fixes/fixes (500c77eed0fe pinctrl: zynqmp: Revert "Unify pin naming") Merging erofs-fixes/fixes (24331050a3e6 erofs: fix small compressed files inlining) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (92a68053c346 Documentation: KUnit: Fix usage bug) Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) Merging memblock-fixes/fixes (d7f55471db27 memblock: fix memblock_phys_alloc() section mismatch error) Merging cel-fixes/for-rc (accd66d0a0a3 NFSD: Deprecate NFS_OFFSET_MAX) Merging irqchip-fixes/irq/irqchip-fixes (1d4df649cbb4 irqchip/sifive-plic: Add missing thead,c900-plic match string) Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) Merging perf-current/perf/urgent (dfd42facf1e4 Linux 5.17-rc3) Merging efi-fixes/urgent (f5390cd0b43c efi: runtime: avoid EFIv2 runtime services on Apple x86 machines) Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) Merging drm-misc-fixes/for-linux-next-fixes (9da1e9ab82c9 drm/rockchip: vop: Correct RK3399 VOP register fields) Merging kspp/for-next/kspp (9327f2939dc4 Merge branch 'for-next/hardening' into for-next/kspp) Applying: scsi: ibmvscsis: Silence -Warray-bounds warning Merging kspp-gustavo/for-next/kspp (c9e6606c7fe9 Linux 5.16-rc8) Merging kbuild/for-next (c6553cd5dec6 usr/include/Makefile: add linux/nfc.h to the compile-test coverage) Merging perf/perf/core (e783362eb54c Linux 5.17-rc1) Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) Merging dma-mapping/for-next (404f9373c4e5 swiotlb: simplify array allocation) Merging asm-generic/master (733e417518a6 asm-generic/error-injection.h: fix a spelling mistake, and a coding style issue) Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) Merging arm/for-next (ed43eed0a6ac Merge branch 'devel-stable' into for-next) CONFLICT (content): Merge conflict in arch/arm/Kconfig Merging arm64/for-next/core (bb425a759847 arm64: mm: apply __ro_after_init to memory_limit) Merging arm-perf/for-next/perf (602c873eb52e perf: Replace acpi_bus_get_device()) Merging arm-soc/for-next (4a64f2d3527a MAINTAINERS: add myself as a maintainer for the sl28cpld) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (2c420d79dae4 arm64: dts: meson-g12-common: add uart_ao_b pins muxing) Merging aspeed/for-next (a7e02e92755c Merge branches 'dt-for-v5.17', 'defconfig-for-v5.17' and 'soc-for-v5.17' into for-next) Merging at91/at91-next (9be3df0e718c Merge branch 'at91-defconfig' into at91-next) Merging drivers-memory/for-next (5b8950b4a7a5 Merge branch 'for-v5.18/mediatek' into for-next) Merging imx-mxs/for-next (afb77a29073e Merge branch 'imx/defconfig' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (896f47a2c39c Merge branch 'v5.17-next/dts64' into for-next) Merging mvebu/for-next (fecc54c7ccfe Merge branch 'mvebu/arm' into mvebu/for-next) Merging omap/for-next (61b6b9cfada4 Merge branch 'omap-for-v5.17/fixes-not-urgent' into for-next) Merging qcom/for-next (c924e8d6f4a4 Merge branches 'arm64-defconfig-for-5.18', 'arm64-for-5.18', 'drivers-for-5.18', 'dts-for-5.18', 'arm64-fixes-for-5.17' and 'dts-fixes-for-5.17' into for-next) Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) Merging renesas/next (65a3b7e58076 Merge branches 'renesas-arm-dt-for-v5.18' and 'renesas-drivers-for-v5.18' into renesas-next) Merging reset/reset/next (89e7a6698fdd reset: uniphier-glue: Use devm_add_action_or_reset()) Merging rockchip/for-next (061b0332abfb Merge branch 'v5.18-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (e0995440d460 Merge branch 'next/defconfig' into for-next) Merging scmi/for-linux-next (ffbdf7c8cdd2 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (59bb54bca1f5 ARM: dts: stm32: use exti 19 as main interrupt to support RTC wakeup on stm32mp157) Merging sunxi/sunxi/for-next (d7ab185b353f Merge branch 'sunxi/dt-for-5.18' into sunxi/for-next) Merging tee/next (ce352be35ba0 Merge branch 'async_notif' into next) Merging tegra/for-next (52db893a313e Merge branch for-5.18/arm64/dt into for-next) Merging ti/ti-next (3be5bf60d055 Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (3a14f0e61408 arm64: zynqmp: Rename dma to dma-controller) Merging clk/clk-next (28c7bbb2a3fc Merge branch 'clk-kunit' into clk-next) Merging clk-imx/for-next (036a4b4b4dfa clk: imx: Add imx8dxl clk driver) Merging clk-renesas/renesas-clk (9b90413c0524 clk: renesas: rzg2l-cpg: Add support for RZ/V2L SoC) Merging clk-samsung/for-next (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver) Merging csky/linux-next (a0793fdad9a1 csky: fix typo of fpu config macro) Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) Merging m68k/for-next (469d56485c1b m68k: mm: Remove check for VM_IO to fix deferred I/O) Merging m68knommu/for-next (021ff8547d2a m68k: m5441x: remove erroneous clock disable) Merging microblaze/next (fcc619621df5 microblaze/PCI: Remove pci_phys_mem_access_prot() dead code) Merging mips/mips-next (e0a8b93efa23 mips: Enable KCSAN) Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory()) CONFLICT (content): Merge conflict in arch/nds32/Kbuild CONFLICT (content): Merge conflict in arch/nds32/Kconfig Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) Merging openrisc/for-next (862cf8d5fd98 openrisc/boot: Remove unnecessary initialisation in memcpy().) Merging parisc-hd/for-next (18a1d5e19453 parisc: Add ioread64_lo_hi() and iowrite64_lo_hi()) Merging powerpc/next (29ec39fcf11e Merge tag 'powerpc-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value) Merging risc-v/for-next (e783362eb54c Linux 5.17-rc1) Merging s390/for-next (a086db89b45c Merge branch 'features' into for-next) Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) Merging uml/linux-next (db0dd9cee822 um: virtio_uml: Allow probing from devicetree) Merging xtensa/xtensa-for-next (8a900dc390da xtensa: Remove unused early_read_config_byte() et al declarations) Merging pidfd/for-next (317465bcc6f4 Merge branch 'fs.idmapped' into for-next) Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments) Merging fscache/fscache-next (dd81e1c7d5fb Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) Merging btrfs/for-next (80839488f2a7 Merge branch 'for-next-next-v5.17-20220204' into for-next-20220204) Merging ceph/master (038b8d1d1ab1 libceph: optionally use bounce buffer on recv path in crc mode) Merging cifs/for-next (cf16d89f3707 cifs: call helper functions for marking channels for reconnect) Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup()) 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 (dfd42facf1e4 Linux 5.17-rc3) Merging exfat/dev (dd81e1c7d5fb Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging ext3/for_next (ee12595147ac fanotify: Fix stale file descriptor in copy_event_to_user()) Merging ext4/dev (dfd42facf1e4 Linux 5.17-rc3) Merging f2fs/dev (728b9b5874f8 f2fs: add a way to limit roll forward recovery time) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (073c3ab6ae01 Documentation/filesystem/dax: DAX on virtiofs) Merging gfs2/for-next (9421fdba4215 gfs2: Initialize gh_error in gfs2_glock_nq) Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount) Merging ksmbd/ksmbd-for-next (1a927cda94ac Documentation: ksmbd: update Feature Status table) Merging nfs/linux-next (dfd42facf1e4 Linux 5.17-rc3) Merging nfs-anna/linux-next (b49ea673e119 SUNRPC: lock against ->sock changing during sysfs read) Merging nfsd/for-next (8dfa08baad02 SUNRPC: Record endpoint information in trace log) Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) Merging overlayfs/overlayfs-next (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper) Merging ubifs/next (aa39cc675799 jffs2: GC deadlock reading a page that is used in jffs2_write_begin()) Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first") Merging xfs/for-next (cea267c235e1 xfs: ensure log flush at the end of a synchronous fallocate call) Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) Merging iomap/iomap-for-next (ebb7fb1557b1 xfs, iomap: limit individual ioend chain lengths in writeback) Merging djw-vfs/vfs-for-next (2d86293c7075 xfs: return errors in xfs_fs_sync_fs) Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) Merging printk/for-next (65c2c0709d8e Merge branch 'rework/fast-next-seq' into for-next) Merging pci/next (e783362eb54c Linux 5.17-rc1) Merging pstore/for-next/pstore (a5d05b07961a pstore/ftrace: Allow immediate recording) Merging hid/for-next (2b3566c337c3 Merge branch 'for-5.17/upstream-fixes' into for-next) Merging i2c/i2c/for-next (b993fe2dc6b5 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (13462ba1815d i3c: master: dw: check return of dw_i3c_master_get_free_pos()) Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) Merging hwmon-staging/hwmon-next (d7334d055811 hwmon: (adt7x10) Use hwmon_notify_event) Merging jc_docs/docs-next (869f496e1aa6 docs: process: submitting-patches: Clarify the Reported-by usage) Merging v4l-dvb/master (68a99f6a0ebf media: lirc: report ir receiver overflow) Merging v4l-dvb-next/master (127efdbc51fe media: atomisp: fix dummy_ptr check to avoid duplicate active_bo) Merging pm/linux-next (1e2d75f89fc7 Merge branch 'acpi-pm' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (d776790a5536 cpufreq: mediatek-hw: Fix double devm_remap in hotplug case) Merging cpupower/cpupower (101025ff8e47 tools/power/cpupower/{ToDo => TODO}: Rename the todo file) Merging devfreq/devfreq-next (26291c54e111 Linux 5.17-rc2) Merging opp/opp/linux-next (489a00ef46c9 Documentation: power: Update outdated contents in opp.rst) Merging thermal/thermal/linux-next (8ee1c0f6526c thermal/drivers/rz2gl: Add error check for reset_control_deassert()) Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (feae43f8aa88 fs: dlm: print cluster addr if non-cluster node connects) Merging rdma/for-next (0d9c00117b8a RDMA/mlx4: remove redundant assignment to variable nreq) Merging net-next/master (c3e676b98326 Merge branch 'inet-separate-dscp-from-ecn-bits-using-new-dscp_t-type') Merging bpf-next/for-next (19face1093b0 Merge branch 'fix bpf_prog_pack build errors') $ git reset --hard HEAD^ Merging next-20220208 version of bpf-next Merging ipsec-next/master (2ecda181682e xfrm: delete duplicated functions that calls same xfrm_api_check()) Merging mlx5-next/mlx5-next (cac3231cc684 mlx5: remove usused static inlines) Merging netfilter-next/master (c828414ac935 netfilter: nft_compat: suppress comment match) Merging ipvs-next/master (c828414ac935 netfilter: nft_compat: suppress comment match) Merging bluetooth/master (4840aa67576b Bluetooth: hci_core: Fix leaking sent_cmd skb) Merging wireless-next/main (c761161851d3 mac80211: Remove redundent assignment channel_type) Merging mtd/mtd/next (ad5e35f58384 mtd: Replace the expert mode symbols with a single helper) Merging nand/nand/next (0ff4eb01ffb9 mtd: rawnand: protect access to rawnand devices while in suspend) Merging spi-nor/spi-nor/next (e783362eb54c Linux 5.17-rc1) Merging crypto/master (95e26b0391d0 crypto: sl3516 - remove redundant initializations of pointers in_sg and out_sg) Merging drm/drm-next (53dbee4926d3 Merge tag 'drm-misc-next-2022-01-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) Merging drm-misc/for-linux-next (d3cbc6e323c9 drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer) Merging amdgpu/drm-next (bb6f1d6cc7c1 drm/amdgpu/smu11.5: restore cclks in vangogh_set_performance_level) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c Merging drm-intel/for-linux-next (053f2b856313 drm/i915: Fix mbus join config lookup) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c CONFLICT (modify/delete): include/linux/dma-buf-map.h deleted in drm-intel/for-linux-next and modified in HEAD. Version HEAD of include/linux/dma-buf-map.h left in tree. $ git rm -f include/linux/dma-buf-map.h Merging drm-intel-gt/for-linux-next-gt (876f7a438e42 Merge drm/drm-next into drm-intel-gt-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h Applying: merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h" Applying: extra merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h" Applying: extra 2 merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h" Applying: fix up for "drm/i915: Move GT registers to their own header file" Merging drm-tegra/drm/tegra/for-next (22d7ee32f1fb gpu: host1x: Fix hang on Tegra186+) Merging drm-msm/msm-next (6aa89ae1fb04 drm/msm/gpu: Cancel idle/boost work on suspend) Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) Merging etnaviv/etnaviv/next (cdd156955f94 drm/etnaviv: consider completed fence seqno in hang check) Merging fbdev/for-next (c5510f53140c video: fbdev: Fix wrong file path for pvr2fb.c in Kconfig help text) Merging regmap/for-next (1056c41634d4 regmap-irq: Fix typo in comment) Merging sound/for-next (8f85b4da579e kselftest: alsa: fix spelling mistake "desciptor" -> "descriptor") Merging sound-asoc/for-next (960a89045e14 ASoC: SOF: dma-trace: Change trace_init() ops parameter list) Merging modules/modules-next (a97ac8cb24a3 module: fix signature check failures when using in-kernel decompression) Merging input/next (994673dc6657 Input: mtk-pmic-keys - add support for MT6358) CONFLICT (content): Merge conflict in drivers/input/misc/axp20x-pek.c Merging block/for-next (23a3fe5e6bb5 Merge branch 'for-5.18/drivers' into for-next) Merging device-mapper/for-next (eaac0b590a47 dm sysfs: use default_groups in kobj_type) Merging libata/for-next (0c72a87889d6 libata: make ata_host_suspend() *void*) Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards) Merging mmc/next (7fd1f3ba20b7 mmc: core: use sysfs_emit() instead of sprintf()) Merging mfd/for-mfd-next (9cb74781a436 mfd: intel_soc_pmic_crc: Set main IRQ domain bus token to DOMAIN_BUS_NEXUS) Merging backlight/for-backlight-next (ec961cf32411 backlight: qcom-wled: Respect enabled-strings in set_brightness) Merging battery/for-next (784056d36f27 power: supply: axp288_fuel_gauge: Fix spelling mistake "resisitor" -> "resistor") Merging regulator/for-next (e2a01b4e8806 regulator: Add support for TPS6286x) Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) Merging apparmor/apparmor-next (364bd29902ae apparmor: Fix some kernel-doc comments) Merging integrity/next-integrity (e27cd859ac8c MAINTAINERS: add missing "security/integrity" directory) 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 (70f4169ab421 selinux: parse contexts for mount options early) Merging smack/next (e783362eb54c Linux 5.17-rc1) Merging tomoyo/master (f702e1107601 tomoyo: use hwight16() in tomoyo_domain_quota_is_ok()) Merging tpmdd/next (a33f5c380c4b Merge tag 'xfs-5.17-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging watchdog/master (ffd264bd152c watchdog: msc313e: Check if the WDT was running at boot) Merging iommu/next (26291c54e111 Linux 5.17-rc2) Merging audit/next (e783362eb54c Linux 5.17-rc1) Merging devicetree/for-next (d029175f1420 MAINTAINERS: dt-bindings: Add Krzysztof Kozlowski) Merging mailbox/mailbox-for-next (869b6ca39c08 dt-bindings: mailbox: Add more protocol and client ID) Merging spi/for-next (c17756beacf4 spi: Add compatible for Mediatek MT8186) Merging tip/auto-latest (163812a9c80a Merge x86/cpu into tip/master) Merging clockevents/timers/drivers/next (7647204c2e81 dt-bindings: timer: Add Mstar MSC313e timer devicetree bindings documentation) Merging edac/edac-for-next (59d0e09374a3 Merge branch 'edac-urgent' into edac-for-next) Merging irqchip/irq/irqchip-next (cd448b24c621 Merge branch irq/misc-5.17 into irq/irqchip-next) Merging ftrace/for-next (6b9b6413700e ftrace: Fix assuming build time sort works for s390) Merging rcu/rcu/next (f589e15f9255 tools/nolibc/stdlib: implement abort()) Merging kvm/next (17179d0068b2 Merge tag 'kvmarm-fixes-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvm-arm/next (00e6dae00e3d Merge branch kvm-arm64/pmu-bl into kvmarm-master/next) Merging kvms390/next (812de04661c4 KVM: s390: Clarify SIGP orders versus STOP/RESTART) Merging xen-tip/linux-next (e25a8d959992 x86/Xen: streamline (and fix) PV CPU enumeration) Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) Merging workqueues/for-next (bc35f7ef9628 workqueue: Convert the type of pool->nr_running to int) Merging drivers-x86/for-next (34fc68348554 platform/surface: surface3-wmi: Simplify resource management) Merging chrome-platform/for-next (ffebd9053272 platform/chrome: cros_ec_typec: Check for EC device) Merging hsi/for-next (e783362eb54c Linux 5.17-rc1) Merging leds/for-next (d949edb503b1 leds: lp55xx: initialise output direction from dts) Merging ipmi/for-next (d134ad2574a1 ipmi: ssif: replace strlcpy with strscpy) Merging driver-core/driver-core-next (aa21a1bf97be scripts/get_abi.pl: Ignore hidden files) Merging usb/usb-next (2dac5d2864af usb: gadget: f_uac2: Neaten and reduce size of afunc_validate_opts) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (26291c54e111 Linux 5.17-rc2) Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) Merging tty/tty-next (186ab09930aa serial: core: Drop duplicate NULL check in uart_*shutdown()) Merging char-misc/char-misc-next (b86f32951d17 hpet: remove unused writeq/readq function definitions) Merging extcon/extcon-next (26291c54e111 Linux 5.17-rc2) Merging gnss/gnss-next (26291c54e111 Linux 5.17-rc2) Merging phy-next/next (1e805d190ba5 Merge tag 'phy-fixes-5.17' into next) CONFLICT (modify/delete): Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt deleted in phy-next/next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt left in tree. $ git rm -f Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt Applying: merge fix for "dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible" Merging soundwire/next (e783362eb54c Linux 5.17-rc1) Merging thunderbolt/next (7f7b571becf3 thunderbolt: Replace acpi_bus_get_device()) Merging vfio/next (2bed2ced40c9 vfio/iommu_type1: replace kfree with kvfree) Merging staging/staging-next (74e69e95f13f staging: r8188eu: remove constant variable eRFPath) Merging iio/togreg (38ac2f038666 iio: chemical: sunrise_co2: set val parameter only on success) Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) Merging icc/icc-next (9d6c7ee7c4bb interconnect: imx: Add imx_icc_get_bw function to set initial avg and peak) Merging dmaengine/next (e783362eb54c Linux 5.17-rc1) Merging cgroup/for-next (48da2ddc4c78 Merge branch 'for-5.17-fixes' into for-next) Merging scsi/for-next (c8312098022b Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (62ed6622aaf0 scsi: smartpqi: Update version to 2.1.14-035) Merging vhost/linux-next (fae0bd40fab0 virtio_console: break out of buf poll on remove) Merging rpmsg/for-next (f5d4b6d998d4 Merge branches 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) Merging gpio-brgl/gpio/for-next (4f351edd2675 dt-bindings: gpio: gpio-vf610: Add imx93 compatible string) Merging gpio-intel/for-next (a1ce76e89907 gpio: tps68470: Allow building as module) Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) Merging pinctrl/for-next (003c30d8ad1c Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (689e00887740 pinctrl: baytrail: Clear direct_irq_en flag on broken configs) Merging pinctrl-renesas/renesas-pinctrl (2e08ab0427fe pinctrl: renesas: rzg2l: Improve rzg2l_gpio_register()) Merging pinctrl-samsung/for-next (3652dc070bad pinctrl: samsung: improve wake irq info on console) Merging pwm/for-next (657e54e54ba5 pwm: pxa: Implement .apply() callback) Merging userns/for-next (f9d87929d451 ucount: Make get_ucount a safe get_user replacement) Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (6d468898d774 selftests: futex: set DEFAULT_INSTALL_HDR_PATH) Merging livepatching/for-next (32fdbc45ade0 Merge branch 'for-5.17/kallsyms' into for-next) Merging coresight/next (ebbce265bba1 coresight: trbe: Move check for kernel page table isolation from EL0 to probe) Merging rtc/rtc-next (e783362eb54c Linux 5.17-rc1) Merging nvdimm/libnvdimm-for-next (9e05e95ca8da iomap: Fix error handling in iomap_zero_iter()) Merging at24/at24/for-next (e783362eb54c Linux 5.17-rc1) Merging ntb/ntb-next (afe1c85b354c IDT: Fix Build warnings on some 32bit architectures.) Merging seccomp/for-next/seccomp (1e6d69c7b9cd selftests/seccomp: Report event mismatches more clearly) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging fsi/next (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking) Merging slimbus/for-next (e783362eb54c Linux 5.17-rc1) Merging nvmem/for-next (8043480a8cef nvmem: qfprom: fix kerneldoc warning) Merging xarray/main (22f56b8e890d XArray: Include bitmap.h from xarray.h) Merging hyperv/hyperv-next (4ee524587105 Drivers: hv: Compare cpumasks and not their weights in init_vp_index()) Merging auxdisplay/auxdisplay (4daa9ff89ef2 auxdisplay: charlcd: checking for pointer reference before dereferencing) Merging kgdb/kgdb/for-next (b77dbc86d604 kdb: Adopt scheduler's task classification) Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1) Merging fpga/for-next (21f0a239ecab fpga: dfl: pci: Remove usage of the deprecated "pci-dma-compat.h" API) Merging kunit/test (e783362eb54c Linux 5.17-rc1) Merging cfi/cfi/next (baaf965f9430 mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove) Merging kunit-next/kunit (c2741453478b kunit: cleanup assertion macro internal variables) Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) Merging mhi/mhi-next (b2aa7904752d bus: mhi: pci_generic: Add mru_default for Cinterion MV31-W) Merging memblock/for-next (a59466ee91aa memblock: Remove #ifdef __KERNEL__ from memblock.h) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) Merging cxl/next (be185c2988b4 cxl/core: Remove cxld_const_init in cxl_decoder_alloc()) Merging folio/for-next (b1ccdc7664f5 selftests/vm/transhuge-stress: Support file-backed PMD folios) $ git reset --hard HEAD^ Merging next-20220204 version of folio 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 (42f4046bc4ba efi: use default_groups in kobj_type) Merging unicode/for-next (5298d4bfe80f unicode: clean up the Kconfig symbol confusion) Merging slab/for-next (07f910f9b729 mm: Remove slab from struct page) Merging random/master (ebd8ad64804d random: fix locking in crng_fast_load()) Merging landlock/next (a691b9858300 Merge Landlock fixes into next) Merging rust/rust-next (ced9f62ec435 init/Kconfig: Specify the interpreter for rust-is-available.sh) CONFLICT (content): Merge conflict in Documentation/process/changes.rst CONFLICT (content): Merge conflict in samples/Kconfig CONFLICT (content): Merge conflict in samples/Makefile Merging akpm-current/current (d92f5865fe03 ipc/mqueue: use get_tree_nodev() in mqueue_get_tree()) CONFLICT (content): Merge conflict in lib/Kconfig.debug $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (707bc2c50c04 Merge branch 'akpm-current/current')
Attachment:
pgpY1kuEYuI5K.pgp
Description: OpenPGP digital signature
