Hi all, Changes since 20210415: New trees: cxl-fixes, cxl The rust tree gained conflicts against the printk and char-misc trees. Non-merge commits (relative to Linus' tree): 12231 10888 files changed, 590734 insertions(+), 269274 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, 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 340 trees (counting Linus' and 87 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 (7e25f40eab52 Merge tag 'acpi-5.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) Merging kbuild-current/fixes (bcbcf50f5218 kbuild: fix ld-version.sh to not be affected by locale) Merging arc-current/for-curr (163630b2d95b arc: Fix typos/spellos) Merging arm-current/fixes (30e3b4f256b4 ARM: footbridge: fix PCI interrupt mapping) Merging arm64-fixes/for-next/fixes (22315a2296f4 arm64: alternatives: Move length validation in alternative_{insn, endif}) Merging arm-soc-fixes/arm/fixes (b9a9786a13ea Merge tag 'omap-for-v5.12/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes) Merging drivers-memory-fixes/fixes (a38fd8748464 Linux 5.12-rc2) Merging m68k-current/for-linus (a65a802aadba m68k: Fix virt_addr_valid() W=1 compiler warnings) Merging powerpc-fixes/fixes (791f9e36599d powerpc/vdso: Make sure vdso_wrapper.o is rebuilt everytime vdso.so is rebuilt) Merging s390-fixes/fixes (a994eddb947e s390/entry: save the caller of psw_idle) Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) Merging net/master (4e39a072a6a0 i40e: fix the panic when running bpf in xdpdrv mode) Merging bpf/master (afd0be729953 libbpf: Fix potential NULL pointer dereference) Merging ipsec/master (6628ddfec758 net: geneve: check skb is large enough for IPv4/IPv6 header) Merging netfilter/master (ccb39c628558 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) Merging ipvs/master (fbea31808ca1 netfilter: conntrack: do not print icmpv6 as unknown via /proc) Merging wireless-drivers/master (65db391dd874 iwlwifi: mvm: fix beacon protection checks) Merging mac80211/master (864db232dc70 net: ipv6: check for validity before dereferencing cfg->fc_nlinfo.nlh) Merging rdma-fixes/for-rc (d434405aaab7 Linux 5.12-rc7) Merging sound-current/for-linus (c8426b2700b5 ALSA: hda/realtek: Fix speaker amp setup on Acer Aspire E1) Merging sound-asoc-fixes/for-linus (f655ede26d66 Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus) Merging regmap-fixes/for-linus (78d889705732 Merge remote-tracking branch 'regmap/for-5.12' into regmap-linus) Merging regulator-fixes/for-linus (6068cc31dedd Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus) Merging spi-fixes/for-linus (49dff37f84d5 Merge remote-tracking branch 'spi/for-5.12' into spi-linus) Merging pci-current/for-linus (cf673bd0cc97 PCI: switchtec: Fix Spectre v1 vulnerability) Merging driver-core.current/driver-core-linus (d434405aaab7 Linux 5.12-rc7) Merging tty.current/tty-linus (e49d033bddf5 Linux 5.12-rc6) Merging usb.current/usb-linus (d434405aaab7 Linux 5.12-rc7) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (0d02ec6b3136 Linux 5.12-rc4) Merging usb-chipidea-fixes/for-usb-fixes (cf97d7af2468 usb: cdnsp: Fixes issue with dequeuing requests after disabling endpoint) Merging phy/fixes (da848f9a0e13 phy: qcom-qmp: add hbr3_hbr2 voltage and premphasis swing table) Merging staging.current/staging-linus (e49d033bddf5 Linux 5.12-rc6) Merging iio-fixes/fixes-togreg (e49d033bddf5 Linux 5.12-rc6) Merging char-misc.current/char-misc-linus (e49d033bddf5 Linux 5.12-rc6) Merging soundwire-fixes/fixes (fde5d7f27108 soundwire: bus: Fix device found flag correctly) Merging thunderbolt-fixes/fixes (d434405aaab7 Linux 5.12-rc7) Merging input-current/for-linus (56cfe6f820a6 Input: elants_i2c - drop zero-checking of ABS_MT_TOUCH_MAJOR resolution) Merging crypto-current/master (0de9dc80625b hwrng: timeriomem - Use device-managed registration API) Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) Merging vfio-fixes/for-linus (909290786ea3 vfio/pci: Add missing range check in vfio_pci_mmap) Merging kselftest-fixes/fixes (a38fd8748464 Linux 5.12-rc2) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) Merging dmaengine-fixes/fixes (ea9aadc06a9f dmaengine: idxd: fix wq cleanup of WQCFG registers) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (2fb164f0ce95 mtd: rawnand: mtk: Fix WAITRDY break condition and timeout) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (0e37b4fa67f5 media: coda: fix macroblocks count control usage) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (9ae31e2ab293 MIPS: kernel: setup.c: fix compilation error) Merging at91-fixes/at91-fixes (2c69c8a1736e ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet) Merging omap-fixes/fixes (fc85dc42a384 ARM: OMAP2+: Fix uninitialized sr_inst) Merging kvm-fixes/master (04c4f2ee3f68 KVM: VMX: Don't use vcpu->run->internal.ndata as an array index) Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) Merging hwmon-fixes/hwmon (a38fd8748464 Linux 5.12-rc2) Merging nvdimm-fixes/libnvdimm-fixes (99a81dcc717d Merge branch 'for-5.12/cxl' into libnvdimm-fixes) Merging btrfs-fixes/next-fixes (3b7ec4d1b5cb Merge branch 'misc-5.12' into next-fixes) Merging vfs-fixes/fixes (4f0ed93fb92d LOOKUP_MOUNTPOINT: we are cleaning "jumped" flag too late) Merging dma-mapping-fixes/for-linus (d17405d52bac dma-mapping: benchmark: fix kernel crash when dma_map_single fails) Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging drivers-x86-fixes/fixes (a3790a8a94fc platform/x86: intel-hid: Fix spurious wakeups caused by tablet-mode events during suspend) Merging samsung-krzk-fixes/fixes (a38fd8748464 Linux 5.12-rc2) Merging pinctrl-samsung-fixes/fixes (a38fd8748464 Linux 5.12-rc2) Merging devicetree-fixes/dt/linus (d473d32c2fba of: property: fw_devlink: do not link ".*,nr-gpios") Merging scsi-fixes/fixes (176ddd89171d scsi: libsas: Reset num_scatter if libata marks qc as NODATA) Merging drm-fixes/drm-fixes (4d2e1288372c Merge tag 'drm-intel-fixes-2021-04-15' 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 (aee6f25e9c91 drm/i915/display/vlv_dsi: Do not skip panel_pwr_cycle_delay when disabling the panel) Merging mmc-fixes/fixes (a5e13c6df0e4 Linux 5.12-rc5) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2) Merging hyperv-fixes/hyperv-fixes (37df9f3fedb6 video: hyperv_fb: Fix a double free in hvfb_probe) Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) Merging risc-v-fixes/fixes (79c338ab575e riscv: keep interrupts disabled for BREAKPOINT exception) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0) Merging spdx/spdx-linus (e49d033bddf5 Linux 5.12-rc6) Merging gpio-brgl-fixes/gpio/for-current (23cf00ddd2e1 gpio: sysfs: Obey valid_mask) Merging gpio-intel-fixes/fixes (b41ba2ec54a7 gpiolib: Read "gpio-line-names" from a firmware node) Merging pinctrl-intel-fixes/fixes (196d94175329 pinctrl: lewisburg: Update number of pins in community) Merging erofs-fixes/fixes (9f377622a484 erofs: fix bio->bi_max_vecs behavior change) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (7fd53f41f771 kunit: tool: Disable PAGE_POISONING under --alltests) Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) Merging memblock-fixes/fixes (17cbe03872be mm/memblock: Fix typo in comment of memblock_phys_alloc_try_nid()) Merging cel-fixes/for-rc (e49d033bddf5 Linux 5.12-rc6) Merging drm-misc-fixes/for-linux-next-fixes (d434405aaab7 Linux 5.12-rc7) Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) Merging kbuild/for-next (03209c641c4a Merge branch 'kconfig' into for-next) Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc4) Merging dma-mapping/for-next (a7f3d3d3600c dma-mapping: add unlikely hint to error path in dma_mapping_error) Merging asm-generic/master (38489db09b10 Merge branch 'asm-generic-fixes' into asm-generic) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (0ae6d1f52670 Merge branches 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (a27a88165689 Merge branch 'for-next/pac-set-get-enabled-keys' into for-next/core) CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpucaps.h Merging arm-perf/for-next/perf (2c2e21e78a94 arm64: perf: Remove redundant initialization in perf_event.c) Merging arm-soc/for-next (a3689dbaeca3 soc: document merges) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (6373d6d2ee83 Merge branch 'v5.13/dt64' into tmp/aml-rebuild) Merging aspeed/for-next (61fbc42084f4 Merge branches 'wpcm450-for-v5.13', 'dt-for-v5.13' and 'lpc-for-v5.13' into for-next) Merging at91/at91-next (969bbb49f36c Merge branch 'at91-dt' into at91-next) Merging drivers-memory/for-next (93567c59f9b0 Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (1f0f76f795d5 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) Merging mediatek/for-next (068acd3c4e4c Merge branch 'v5.12-next/dts64-2' into for-next) Merging mvebu/for-next (79e93f9dc81a Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (44e97f6fb29b Merge branch 'fixes' into for-next) Merging qcom/for-next (f63813c31ac6 Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13', 'drivers-for-5.13' and 'dts-for-5.13' into for-next) Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller) CONFLICT (content): Merge conflict in arch/arm/boot/dts/bcm2711.dtsi Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) Merging renesas/next (e9903a1559e0 Merge branch 'renesas-arm-dt-for-v5.13' into renesas-next) Merging reset/reset/next (d4e4dffec50b reset: oxnas: replace file name with short description) Merging rockchip/for-next (f40c51456fe0 Merge branch 'v5.13-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (8a4d4cd15c39 Merge branch 'next/soc' into for-next) Merging scmi/for-linux-next (4c2443962313 Merge tag 'scmi-updates-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (6ed9269265e1 ARM: dts: stm32: Add PTP clock to Ethernet controller) Merging sunxi/sunxi/for-next (9fa021aa01fd Merge tags 'sunxi-dt-for-5.13-1' and 'sunxi-fixes-for-5.12' into sunxi/for-next) Merging tegra/for-next (93b9ea9ca307 Merge branch for-5.13/arm64/dt into for-next) Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) Merging ti-k3-new/ti-k3-next (112e5934ff3a arm64: dts: ti: k3-am64-main: Fix ospi compatible) Merging xilinx/for-next (fe07bfda2fb9 Linux 5.12-rc1) Merging clk/clk-next (e3efa50969a8 Merge branch 'clk-ralink' into clk-next) Merging clk-imx/for-next (054ef44ea3ef clk: imx: Reference preceded by free) Merging clk-renesas/renesas-clk (f2fb4fe62390 clk: renesas: Zero init clk_init_data) Merging clk-samsung/for-next (7f32917642c7 clk: samsung: Remove redundant dev_err calls) Merging csky/linux-next (74cdb2664477 csky: Fixup typos) Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) Merging m68k/for-next (f829b4b212a3 m68k: Add missing mmap_read_lock() to sys_cacheflush()) Merging m68knommu/for-next (08782216ecbb m68k: fix flatmem memory model setup) Merging microblaze/next (bbcee72c2f7a microblaze: Fix a typo) Merging mips/mips-next (dbd815c0dcca MIPS: Alchemy: Use DEFINE_SPINLOCK() for spinlock) Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) Merging openrisc/for-next (1683f7de65db soc: litex: Remove duplicated header file inclusion) Merging parisc-hd/for-next (711d090f0e02 parisc: syscalls: switch to generic syscallhdr.sh) Merging powerpc/next (7098f8f0cf03 powerpc/mm/radix: Make radix__change_memory_range() static) Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) Merging risc-v/for-next (e9efb21fe352 riscv: Prepare ptdump for vm layout dynamic addresses) Merging s390/for-next (74a68dd3113b Merge branch 'features' into for-next) Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) 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 (ed102bf2afed um: Fix W=1 missing-include-dirs warnings) Merging xtensa/xtensa-for-next (6a8eb99e130f xtensa: ISS: add GDBIO implementation to semihosting interface) Merging pidfd/for-next (8fac44cbbaa2 Merge branch 'fs/idmapped_mounts/helpers' into for-next) Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) Merging fscache/fscache-next (3b541757ad58 afs: Use the netfs_write_begin() helper) Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) Merging btrfs/for-next (3c1750120613 Merge branch 'for-next-next-v5.12-20210406' into for-next-20210406) Merging ceph/master (558b4510f622 ceph: defer flushing the capsnap if the Fb is used) Merging cifs/for-next (4a74844556e0 cifs: Deferred close for files) Merging cifsd/cifsd-for-next (43c157144230 Merge pull request #37 from namjaejeon/cifsd-for-next) Merging configfs/for-next (14fbbc829772 configfs: fix a use-after-free in __configfs_open_file) Merging ecryptfs/next (902af369942f ecryptfs: use DEFINE_MUTEX() for mutex lock) Merging erofs/dev (8e6c8fa9f2e9 erofs: enable big pcluster feature) Merging exfat/dev (f9b23f1f6ca0 exfat: speed up iterate/lookup by fixing start point of traversing cluster chain) Merging ext3/for_next (652a066ee959 Pull kmap_local ext2 conversion from Ira Weiny.) Merging ext4/dev (4811d9929cda ext4: allow the dax flag to be set and cleared on inline directories) Merging f2fs/dev (5f029c045c94 f2fs: clean up build warnings) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (3c9c14338c12 cuse: simplify refcount) Merging jfs/jfs-next (b462cecfa323 fs: Fix typo issue) Merging nfs/linux-next (febfeaaefefb NFSv42: Don't force attribute revalidation of the copy offload source) Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl) Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) Merging cel/for-next (70c530756403 nfsd: removed unused argument in nfsd_startup_generic()) Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) Merging overlayfs/overlayfs-next (5e717c6fa41f ovl: add debug print to ovl_do_getxattr()) Merging ubifs/next (9a29f7f020e0 ubi: Remove unnecessary struct declaration) Merging v9fs/9p-next (f8b139e2f241 fs: 9p: fix v9fs_file_open writeback fid error check) Merging xfs/for-next (e7a3d7e792a5 xfs: drop unnecessary setfilesize helper) Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone()) Merging iomap/iomap-for-next (ad89b66cbad1 iomap: improve the warnings from iomap_swapfile_activate) Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) Merging file-locks/locks-next (cbe6fc4e0142 fs/locks: remove useless assignment in fcntl_getlk) Merging vfs/for-next (09e08c97a7a4 Merge remote-tracking branch 'ovl/fileattr_v6' into for-next) CONFLICT (content): Merge conflict in fs/xfs/xfs_ioctl.c CONFLICT (content): Merge conflict in fs/overlayfs/file.c CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c Merging printk/for-next (94a67011a225 Merge branch 'for-5.13' into for-next) Merging pci/next (e4e573c9a390 Merge branch 'remotes/lorenzo/pci/misc') Merging pstore/for-next/pstore (9d843e8fafc7 pstore: Add mem_type property DT parsing support) Merging hid/for-next (2b84a0f6c2c2 Merge branch 'for-5.13/wacom' into for-next) Merging i2c/i2c/for-next (ddbdf77756f6 Merge branch 'i2c/for-5.13' into i2c/for-next) Merging i3c/i3c/next (e43d5c7c3c34 dt-bindings: i3c: Fix silvaco,i3c-master-v1 compatible string) Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) Merging hwmon-staging/hwmon-next (fdf70b5de6f3 hwmon: Add driver for fsp-3y PSUs and PDUs) Merging jc_docs/docs-next (f9bbc12ccb35 scripts: kernel-doc: improve parsing for kernel-doc comments syntax) Merging v4l-dvb/master (0b276e470a4d media: coda: fix macroblocks count control usage) CONFLICT (content): Merge conflict in MAINTAINERS Merging v4l-dvb-next/master (1e28eed17697 Linux 5.12-rc3) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (a5b1c231c4a8 Merge branches 'acpi-scan' and 'acpi-utils' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (dbbd49bade05 cpufreq: armada-37xx: Fix module unloading) Merging cpupower/cpupower (a38fd8748464 Linux 5.12-rc2) Merging devfreq/devfreq-next (0a7dc8318c28 PM / devfreq: imx8m-ddrc: Remove unneeded of_match_ptr()) Merging opp/opp/linux-next (a8bb0e872bfb memory: samsung: exynos5422-dmc: Convert to use resource-managed OPP API) Merging thermal/thermal/linux-next (70955f08376c thermal/drivers/bcm2835: Remove redundant dev_err call in bcm2835_thermal_probe()) Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') Merging dlm/next (2fd8db2dd05d fs: dlm: fix missing unlock on error in accept_from_sock()) Merging swiotlb/linux-next (2726bf3ff252 swiotlb: Make SWIOTLB_NO_FORCE perform no allocation) Merging rdma/for-next (3ccbd9333f27 RDMA/ipoib: Print a message if only child interface is UP) CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/hfi.h Merging net-next/master (392c36e5be1d Merge branch 'ehtool-fec-stats') CONFLICT (content): Merge conflict in net/nfc/nci/uart.c CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/stmmac_main.c Applying: merger fix for "netfilter: bridge: add pre_exit hooks for ebtable unregistration" Merging bpf-next/for-next (cdf0e80e9fbe Merge branch 'bpf: tools: support build selftests/bpf with clang') Merging ipsec-next/master (6ad2dd6c14d3 ipv6: fix clang Wformat warning) Merging mlx5-next/mlx5-next (63f9c44bca5e net/mlx5: Add MEMIC operations related bits) Merging netfilter-next/master (78ed0a9bc6db netfilter: flowtable: Add FLOW_OFFLOAD_XMIT_UNSPEC xmit type) Merging ipvs-next/master (db3685b4046f net: remove obsolete members from struct net) Merging wireless-drivers-next/master (3a1aa533f7f6 Merge tag 'linux-can-next-for-5.13-20210414' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next) Merging bluetooth/master (1c55c39f8232 Bluetooth: cmtp: fix file refcount when cmtp_attach_device fails) Merging mac80211-next/master (8a16ffdc4cf3 cfg80211: Remove wrong RNR IE validation check) Merging gfs2/for-next (c551f66c5dfe gfs2: Fix a number of kernel-doc warnings) Merging mtd/mtd/next (ef4ed780d005 Merge tag 'nand/for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next) Merging nand/nand/next (32cbc7cb70b0 mtd: rawnand: qcom: Use dma_mapping_error() for error check) Merging spi-nor/spi-nor/next (46094049a49b Revert "mtd: spi-nor: macronix: Add support for mx25l51245g") Merging crypto/master (16a9874fe468 crypto: chelsio - Read rxchannel-id from firmware) Merging drm/drm-next (af8352f1ff54 Merge tag 'drm-msm-next-2021-04-11' of https://gitlab.freedesktop.org/drm/msm into drm-next) Applying: merge fix for "drm: Switch to %p4cc format modifier" Merging drm-misc/for-linux-next (9c0fed84d575 Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) Merging amdgpu/drm-next (0739b4816007 drm/amdkfd: Update L1 and add L2/3 cache information) Merging drm-intel/for-linux-next (1884b579c0cf drm/i915/display/psr: Fix cppcheck warnings) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c Merging drm-tegra/drm/tegra/for-next (c79184a9c029 drm/tegra: Fix shift overflow in tegra_shared_plane_atomic_update) Merging drm-msm/msm-next (a29c8c024165 drm/msm/disp/dpu1: fix display underruns during modeset.) Merging imx-drm/imx-drm/next (74181df8c6db drm/imx: ipuv3-plane: Remove two unnecessary export symbols) CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c Merging etnaviv/etnaviv/next (7d614ab2f205 drm/etnaviv: fix NULL check before some freeing functions is not needed) Merging regmap/for-next (ccac12acc0c0 Merge remote-tracking branch 'regmap/for-5.13' into regmap-next) Merging sound/for-next (ebe8dc5afb39 ALSA: usb-audio: Apply implicit feedback mode for BOSS devices) Merging sound-asoc/for-next (0f3475ef251d Merge remote-tracking branch 'asoc/for-5.13' into asoc-next) Merging modules/modules-next (33121347fb1c module: treat exit sections the same as init sections when !CONFIG_MODULE_UNLOAD) Merging input/next (aa2f62cf211a Input: add driver for the Hycon HY46XX touchpanel series) Merging block/for-next (307f05465aaf Merge branch 'for-5.13/io_uring' into for-next) Merging device-mapper/for-next (db7b93e38106 dm integrity: add the "reset_recalculate" feature flag) Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting) Merging mmc/next (e614740a063f mmc: sdhci-s3c: constify uses of driver/match data) Merging mfd/for-mfd-next (f9386c91574f mfd: intel-m10-bmc: Add support for MAX10 BMC Secure Updates) Merging backlight/for-backlight-next (225be60f3853 dt-bindings: backlight: qcom-wled: Add PMI8994 compatible) Merging battery/for-next (a4d5ed3b54f0 power: supply: surface-charger: Make symbol 'surface_ac_pm_ops' static) Merging regulator/for-next (dc6c17ce1886 Merge remote-tracking branch 'regulator/for-5.13' into regulator-next) Merging security/next-testing (b0ccf48b958e Merge branch 'landlock_lsm_v33' into next-testing) CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) Merging integrity/next-integrity (282c0a4d15b6 integrity: Add declarations to init_once void arguments.) Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) CONFLICT (content): Merge conflict in certs/system_keyring.c Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) Merging selinux/next (1fb057dcde11 smack: differentiate between subjective and objective task credentials) Merging smack/next (7ef4c19d245f smackfs: restrict bytes count in smackfs write functions) Merging tomoyo/master (5dc33592e955 lockdep: Allow tuning tracing capacity constants.) Merging tpmdd/next (aec00aa04b11 KEYS: trusted: Fix missing null return from kzalloc call) Merging watchdog/master (1e28eed17697 Linux 5.12-rc3) Merging iommu/next (60c5cde2bda9 Merge branches 'iommu/fixes', 'arm/mediatek', 'arm/smmu', 'arm/exynos', 'unisoc', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging audit/next (b75d8f38bcc9 audit: drop /proc/PID/loginuid documentation Format field) Merging devicetree/for-next (56ddc4cd4c8f docs: dt: update writing-schema.rst references) CONFLICT (content): Merge conflict in drivers/of/of_net.c Merging mailbox/mailbox-for-next (a683246a069b mailbox: arm_mhu_db: Remove redundant dev_err call in mhu_db_probe()) Merging spi/for-next (ee7ead487585 Merge remote-tracking branch 'spi/for-5.13' into spi-next) Merging tip/auto-latest (8b1fdf97491f Merge branch 'core/entry') Merging clockevents/timers/drivers/next (8120891105ba dt-bindings: timer: nuvoton,npcm7xx: Add wpcm450-timer) Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' into edac-for-next) Merging irqchip/irq/irqchip-next (94bc94209a66 irqchip/wpcm450: Drop COMPILE_TEST) CONFLICT (content): Merge conflict in drivers/irqchip/Makefile CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig Merging ftrace/for-next (ceaaa12904df ftrace: Simplify the calculation of page number for ftrace_page->records some more) CONFLICT (content): Merge conflict in arch/x86/kernel/kprobes/ftrace.c Merging rcu/rcu/next (2f366f66d631 rcu: Make rcu_gp_cleanup() be noinline for tracing) Merging kvm/next (657f1d86a38e Merge branch 'kvm-tdp-fix-rcu' into HEAD) CONFLICT (content): Merge conflict in arch/x86/kvm/svm/nested.c Merging kvm-arm/next (979a265264d1 Merge branch 'kvm-arm64/nvhe-panic-info' into kvmarm-master/next) Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) Merging kvms390/next (44bada282190 KVM: s390: fix guarded storage control register handling) Merging xen-tip/linux-next (d120198bd5ff xen/evtchn: Change irq_info lock to raw_spinlock_t) Merging percpu/for-next (bd0d09ebd4f8 Merge branch 'for-5.12-fixes' into for-next) Merging workqueues/for-next (89e28ce60cb6 workqueue/watchdog: Make unbound workqueues aware of touch_softlockup_watchdog() 84;0;0c84;0;0c There are two workqueue-specific watchdog timestamps:) Merging drivers-x86/for-next (823b31517ad3 platform/x86: intel_chtdc_ti_pwrbtn: Fix missing IRQF_ONESHOT as only threaded handler) CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c CONFLICT (content): Merge conflict in MAINTAINERS Merging chrome-platform/for-next (c6e939c63c80 platform/chrome: cros_ec_typec: fix clang -Wformat warning) Merging hsi/for-next (5c08b0f75575 HSI: core: fix resource leaks in hsi_add_client_from_dt()) Merging leds/for-next (d9dfac5419d0 leds: rt4505: Add support for Richtek RT4505 flash LED controller) Merging ipmi/for-next (07cbd87b0416 ipmi_si: Join string literals back) Merging driver-core/driver-core-next (bd2a895f21eb PM / wakeup: use dev_set_name() directly) CONFLICT (content): Merge conflict in drivers/of/property.c Merging usb/usb-next (4b853c236c7b usb: xhci-mtk: remove unused members) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (039b81d50a48 USB: cdc-acm: add more Maxlinear/Exar models to ignore list) Merging usb-chipidea-next/for-usb-next (10076de33b5e usb: cdnsp: Fixes issue with Configure Endpoint command) Merging tty/tty-next (f9f54983005c serial: sh-sci: remove obsolete latency workaround) Merging char-misc/char-misc-next (ed917b028d0c phy: Revert "phy: ti: j721e-wiz: add missing of_node_put") CONFLICT (content): Merge conflict in drivers/phy/qualcomm/phy-qcom-qmp.c Merging extcon/extcon-next (7b1222b224af extcon: qcom-spmi: Add support for VBUS detection) Merging phy-next/next (8a6b85b14f08 phy: Revert "phy: ti: j721e-wiz: add missing of_node_put") Merging soundwire/next (14968dd36a50 soundwire: intel_init: test link->cdns) Merging thunderbolt/next (6f3badead6a0 thunderbolt: Hide authorized attribute if router does not support PCIe tunnels) Merging vfio/next (43dcf6ccf895 vfio/iommu_type1: Remove unused pinned_page_dirty_scope in vfio_iommu) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/gvt.c Merging staging/staging-next (71d3edc61e29 staging: rtl8723bs: Remove led_blink_hdl() and everything related) CONFLICT (content): Merge conflict in drivers/iio/common/scmi_sensors/scmi_iio.c Applying: iio: adc: merge fix for "spi: core: remove 'delay_usecs' field from spi_transfer" Merging iio/togreg (6470a8206a10 Merge tag 'iio-for-5.13b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging icc/icc-next (c1de07884f2b Merge branch 'icc-sm8350' into icc-next) Merging dmaengine/next (84b0aa2e0d91 dmaengine: dw-edma: Add pcim_iomap_table return check) Merging cgroup/for-next (d95af61df072 cgroup/cpuset: fix typos in comments) Merging scsi/for-next (15cc26df6552 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (7a3beeae2893 scsi: target: tcm_fc: Fix a kernel-doc header) CONFLICT (content): Merge conflict in drivers/target/iscsi/iscsi_target.c Merging vhost/linux-next (89d54fb5f508 virtio-balloon: fix a typo in comment of virtballoon_migratepage()) Merging rpmsg/for-next (dc0e14fa833b Merge branches 'hwspinlock-next', '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 (14a4e9ea3ce2 gpio: mxs: remove useless function) Merging gpio-intel/for-next (058459043e71 gpio: ich: Switch to be dependent on LPC_ICH) Merging pinctrl/for-next (cbde6c823bfa pinctrl: at91-pio4: Fix slew rate disablement) Merging pinctrl-intel/for-next (5b613df3f499 pinctrl: intel: No need to disable IRQs in the handler) Merging pinctrl-renesas/renesas-pinctrl (61232cd6efca pinctrl: renesas: r8a7791: Add bias pinconf support) Merging pinctrl-samsung/for-next (a38fd8748464 Linux 5.12-rc2) Merging pwm/for-next (64d7d074acd5 pwm: lpss: Don't modify HW state in .remove callback) Merging userns/for-next (95ebabde382c capabilities: Don't allow writing ambiguous v3 file capabilities) Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) Merging kselftest/next (e75074781f17 selftests/resctrl: Change a few printed messages) Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' into for-next) Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) Merging rtc/rtc-next (8d69f62fddf6 rtc: rx6110: add ACPI bindings to I2C) Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) Merging at24/at24/for-next (fe07bfda2fb9 Linux 5.12-rc1) Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) Merging seccomp/for-next/seccomp (a3fc712c5b37 seccomp: Fix "cacheable" typo in comments) Merging kspp/for-next/kspp (f4648c741299 Merge branch 'for-next/overflow' into for-next/kspp) Merging gnss/gnss-next (994adcbd3714 gnss: drop stray semicolons) Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h) CONFLICT (content): Merge conflict in drivers/nvmem/Makefile CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig Merging nvmem/for-next (e8405ad55f4c nvmem: sprd: Add missing MODULE_DEVICE_TABLE) Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) Merging hyperv/hyperv-next (61d74d8e39c8 Drivers: hv: vmbus: remove unused function) CONFLICT (content): Merge conflict in arch/x86/include/asm/mshyperv.h Applying: fix up for "x86/paravirt: Switch time pvops functions to use static_call()" Merging auxdisplay/auxdisplay (701454bce906 auxdisplay: Remove in_interrupt() usage.) Merging kgdb/kgdb/for-next (2bbd9b0f2b4e kernel: debug: Ordinary typo fixes in the file gdbstub.c) Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) Merging fpga/for-next (a78a51a851ed fpga: dfl: pci: add DID for D5005 PAC cards) Merging kunit/test (a38fd8748464 Linux 5.12-rc2) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) Merging cfi/cfi/next (f3907773d602 mtd: cfi_cmdset_0002: remove redundant assignment to variable timeo) Merging kunit-next/kunit (de2fcb3e6201 Documentation: kunit: add tips for using current->kunit_test) Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) Merging mhi/mhi-next (a503d1628c9c bus: mhi: fix typo in comments for struct mhi_channel_config) Merging memblock/for-next (097d43d85704 mm: memblock: remove return value of memblock_free_all()) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) Merging iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup (ac8b8400620a mm: unexport follow_pfn) Merging rust/rust-next (47ff3585216b kbuild: dummy-tools: Add elfedit.) CONFLICT (content): Merge conflict in kernel/printk/printk.c CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h CONFLICT (content): Merge conflict in Makefile Applying: rust merge resolution fix up Merging cxl/next (e49d033bddf5 Linux 5.12-rc6) Merging akpm-current/current (255dae90cf5b ipc/sem.c: mundane typo fixes) CONFLICT (content): Merge conflict in mm/slub.c CONFLICT (content): Merge conflict in lib/test_kasan.c CONFLICT (content): Merge conflict in include/linux/bitmap.h CONFLICT (content): Merge conflict in block/blk-settings.c CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c CONFLICT (content): Merge conflict in arch/arm64/Kconfig CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (70698348207e memfd_secret: use unsigned int rather than long as syscall flags type)
Attachment:
pgpHTLCGq68U7.pgp
Description: OpenPGP digital signature
