Hi all, On Mon, 7 Feb 2022 15:40:50 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Below is a summary of the state of the merge. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (dfd42facf1e4 Linux 5.17-rc3) Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging kbuild-current/fixes (e6340b6526ee certs: Fix build error when CONFIG_MODULE_SIG_KEY is empty) Merging arc-current/for-curr (e783362eb54c Linux 5.17-rc1) 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 (c8013355ead6 ARM: dts: gpio-ranges property is now required) 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 (663d34c8df98 s390/hypfs: include z/VM guests with access control group set) 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 (28f922213886 net/smc: fix ref_tracker issue in smc_pnet_add()) 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 (7674b7b559b6 net: amd-xgbe: ensure to reset the tx_timer_active flag) Merging wireless/main (f0a6fd152706 cfg80211: fix race in netlink owner interface destruction) Merging rdma-fixes/for-rc (f3136c4ce7ac RDMA/mlx4: Don't continue event handler after memory allocation failure) 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 (618c2dc667c8 ASoC: ops: Fix stereo change notifications) Merging regmap-fixes/for-linus (8419f8e559a7 regmap-irq: Use regmap_irq_update_bits instead of regmap_write) Merging regulator-fixes/for-linus (1301ba2d6596 Merge remote-tracking branch 'regulator/for-5.16' into regulator-linus) Merging spi-fixes/for-linus (9104f6b46783 Merge remote-tracking branch 'spi/for-5.16' into spi-linus) Merging pci-current/for-linus (7dd3876205df PCI: kirin: Add dev struct for of_device_get_match_data()) 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 (5432184107cd usb: gadget: f_uac2: Define specific wTerminalType) 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 (21472ddd4258 iio: imu: st_lsm6dsx: wait for settling time in st_lsm6dsx_read_oneshot) Merging char-misc.current/char-misc-linus (05daa805a86c bus: mhi: pci_generic: Add mru_default for Cinterion MV31-W) Merging soundwire-fixes/fixes (e783362eb54c Linux 5.17-rc1) Merging thunderbolt-fixes/fixes (26291c54e111 Linux 5.17-rc2) 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 (2161ba070999 MIPS: KVM: fix vz.c kernel-doc notation) 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 (c763ec4c10f7 scsi: hisi_sas: Fix setting of hisi_sas_slot.is_internal) Merging drm-fixes/drm-fixes (9ca3d3cd0857 Merge tag 'drm-intel-fixes-2022-02-03' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (7d73c602154d drm/i915/pmu: Fix KMD and GuC race on accessing busyness) Merging mmc-fixes/fixes (bd2db32e7c3e moxart: fix potential use-after-free on remove path) 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 (3149efcdf2c6 PCI: hv: Fix NUMA node assignment when kernel boots with custom NUMA topology) 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 (2cba05451a6d gpio: aggregator: Fix calling into sleeping GPIO controllers) 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 (de4d73b16d5d kunit: fix missing f in f-string in run_checks.py) 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 (fceb62124d8f perf ftrace: system_wide collection is not effective by default) 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 (6df4432a5eca drm/panel: simple: Assign data from panel_dpi_probe() correctly) Merging kspp/for-next/kspp (9327f2939dc4 Merge branch 'for-next/hardening' into for-next/kspp) Applying: scsi: hack for building with -Warray-bounds 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 (3da4390bcdf4 arm64: perf: Don't register user access sysctl handler multiple times) Merging arm-soc/for-next (317a42bd9204 ARM: Document merges) CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apple/t8103.dtsi 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 (691396e21c14 Merge branch 'for-v5.18/tegra' 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 (c3b08f12c719 Merge branches 'renesas-arm-defconfig-for-v5.18' and 'renesas-arm-dt-for-v5.18' into renesas-next) Merging reset/reset/next (89e7a6698fdd reset: uniphier-glue: Use devm_add_action_or_reset()) Merging rockchip/for-next (a2f1c4909563 Merge branch 'v5.18-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (e0995440d460 Merge branch 'next/defconfig' into for-next) CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/exynos/exynos850.dtsi Merging scmi/for-linux-next (26291c54e111 Linux 5.17-rc2) Merging stm32/stm32-next (26291c54e111 Linux 5.17-rc2) Merging sunxi/sunxi/for-next (14eadca892dd 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 (678eb67513a9 dt-bindings: clock: renesas: Document 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 (a9940f83a6e2 m68k: Add asm/config.h) Merging m68knommu/for-next (2553301355f8 m68knommu: fix ucsimm sparse warnings) Merging microblaze/next (fcc619621df5 microblaze/PCI: Remove pci_phys_mem_access_prot() dead code) Merging mips/mips-next (e783362eb54c Linux 5.17-rc1) 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 (d7da660cab47 parisc: Fix sglist access in ccio-dma.c) 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 (ce7eefa1c265 Merge branch 'fixes' 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 (dfd42facf1e4 Linux 5.17-rc3) 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 (e783362eb54c Linux 5.17-rc1) 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 (f340b3d90274 fs/ext4: fix comments mentioning i_mutex) Merging f2fs/dev (a7b55e08008a f2fs: adjust readahead block number during recovery) 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 (f9929ef6a2a5 ksmbd: add support for key exchange) Merging nfs/linux-next (26291c54e111 Linux 5.17-rc2) Merging nfs-anna/linux-next (bde6c98853b2 xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create) 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 (934705316f0f i2c: mediatek: Add i2c compatible for Mediatek MT8186) 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 (2d894d63ecb9 hwmon: (asus-ec-sensors) read sensors as signed ints) Merging jc_docs/docs-next (869f496e1aa6 docs: process: submitting-patches: Clarify the Reported-by usage) Merging v4l-dvb/master (7dc5fc6d3bd6 media: mtk-cir: simplify code) Merging v4l-dvb-next/master (68a99f6a0ebf media: lirc: report ir receiver overflow) Merging pm/linux-next (08615cb8c0e1 Merge branch 'thermal-hfi' 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 (4667431419e9 PM / devfreq: Reduce log severity for informative message) 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 (9c1be1935fb6 net: initialize init_net earlier) Merging bpf-next/for-next (422ee58dc0ef selftests/bpf: Fix tests to use arch-dependent syscall entry points) 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 (e7d786331c62 Merge branch 'udp-ipv6-optimisations') Merging bluetooth/master (a5dc88794406 Bluetooth: btusb: Add support for Intel Madison Peak (MsP2) device) Merging wireless-next/main (c761161851d3 mac80211: Remove redundent assignment channel_type) Merging mtd/mtd/next (e02dacd3a26d mtd: rawnand: Fix misuses of of_match_node()) Merging nand/nand/next (d430e4acd99f mtd: rawnand: brcmnand: Fix sparse warnings in bcma_nand) Merging spi-nor/spi-nor/next (5f340402bbfc mtd: spi-nor: Remove debugfs entries that duplicate sysfs entries) 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 (53593d1be00c 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 (d946bc44aa0b drm/i915: Disable unused power wells left enabled by BIOS) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.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 (9d73d1928eb8 kselftest: alsa: Declare most functions static) Merging sound-asoc/for-next (d466706b9d0d ASoC: sun4i-i2s: Support for Allwinner R329 and D1 SoCs) Merging modules/modules-next (a97ac8cb24a3 module: fix signature check failures when using in-kernel decompression) Merging input/next (87a0b2fafc09 Merge tag 'v5.16' into next) CONFLICT (content): Merge conflict in drivers/input/misc/axp20x-pek.c Merging block/for-next (55afd1269c72 Merge branch 'for-5.18/io_uring' 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 (0cb63fc57859 dt-bindings: mmc: Add compatible for Mediatek MT8186) 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 (e4a7e3f741f7 regulator/rpi-panel-attiny: Use two transactions for I2C read) 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 (89677197ae70 ima: Do not print policy rule with inactive LSM labels) 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 (4e28b22225e3 spi: dt-bindings: add mising description type to reg property) Merging tip/auto-latest (6275d291a763 Merge irq/core 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 (d51c69ea4ca3 rcu-tasks: Set ->percpu_enqueue_shift to zero upon contention) 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 (1c53a1ae3612 Merge branch kvm-arm64/misc-5.17 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 (1f1b0c105b19 dt-bindings: phy: Add compatible for Mediatek MT8186) 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 (7bc8faaf4d50 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (d1d87c33f47d scsi: lpfc: Remove redundant flush_workqueue() call) Merging vhost/linux-next (fae0bd40fab0 virtio_console: break out of buf poll on remove) Merging rpmsg/for-next (ae6062c4abdb remoteproc: mtk_scp: Use dev_err_probe() where possible) Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) Merging gpio-brgl/gpio/for-next (0868ad385aff gpio: Add support for Airoha EN7523 GPIO controller) 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 (742dd872d37f pinctrl: renesas: r8a77995: Restore pin group sort order) 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 (57765eb4d4b7 selftests/kselftest/runner.sh: Pass optional command parameters in environment) 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 (7c866ef11e30 random: make credit_entropy_bits() always safe) 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 (7eb867b39a8e 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 (2080104cef88 Merge branch 'akpm-current/current')
Attachment:
pgpHoYNw_JF6i.pgp
Description: OpenPGP digital signature
