Hi all, Changes since 20210323: New tree: clk-imx The net-next tree gained conflicts against the net tree. The akpm-current tree still had its its build failure. Non-merge commits (relative to Linus' tree): 6151 6042 files changed, 383707 insertions(+), 129419 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 335 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 (7acac4b3196c Merge tag 'linux-kselftest-kunit-fixes-5.12-rc5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) 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 (83520d62cc5a ARC: treewide: avoid the pointer addition with NULL pointer) Merging arm-current/fixes (a38fd8748464 Linux 5.12-rc2) Merging arm64-fixes/for-next/fixes (7011d72588d1 kselftest/arm64: sve: Do not use non-canonical FFR register value) Merging arm-soc-fixes/arm/fixes (67335b8d28cd Merge tag 'imx-fixes-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux 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 (274cb1ca2e7c powerpc/pseries/mobility: handle premature return from H_JOIN) Merging s390-fixes/fixes (0d02ec6b3136 Linux 5.12-rc4) 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 (6ab4c3117aec net: bridge: don't notify switchdev for local FDB addresses) Merging bpf/master (87d77e59d1eb docs: networking: Fix a typo) Merging ipsec/master (154deab6a3ba esp: delete NETIF_F_SCTP_CRC bit from features for esp offload) CONFLICT (content): Merge conflict in net/ipv6/ip6_vti.c CONFLICT (content): Merge conflict in net/ipv4/ip_vti.c Merging netfilter/master (c79a707072fe net: cdc-phonet: fix data-interface release on probe failure) Merging ipvs/master (b58f33d49e42 netfilter: ctnetlink: fix dump of the expect mask attribute) Merging wireless-drivers/master (bd83a2fc05ed brcmfmac: p2p: Fix recently introduced deadlock issue) Merging mac80211/master (87d77e59d1eb docs: networking: Fix a typo) Merging rdma-fixes/for-rc (af06b628a6bd RDMA/hns: Fix bug during CMDQ initialization) Merging sound-current/for-linus (e54f30befa79 ALSA: hda/realtek: call alc_update_headset_mode() in hp_automute_hook) Merging sound-asoc-fixes/for-linus (3fcef2d205f9 Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus) Merging regmap-fixes/for-linus (f29fd6d5a08d Merge remote-tracking branch 'regmap/for-5.12' into regmap-linus) Merging regulator-fixes/for-linus (595bd434897b Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus) Merging spi-fixes/for-linus (e5d94e0160f7 Merge remote-tracking branch 'spi/for-5.12' into spi-linus) Merging pci-current/for-linus (fd4162f05194 PCI: dwc: Move iATU detection earlier) Merging driver-core.current/driver-core-linus (f0acf637d60f driver core: clear deferred probe reason on probe retry) Merging tty.current/tty-linus (1e28eed17697 Linux 5.12-rc3) Merging usb.current/usb-linus (0bd860493f81 USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem) Merging usb-gadget-fixes/fixes (a38fd8748464 Linux 5.12-rc2) Merging usb-serial-fixes/usb-linus (1e28eed17697 Linux 5.12-rc3) Merging usb-chipidea-fixes/for-usb-fixes (67a788c7c3e7 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 (e78836ae76d2 staging: rtl8192e: Change state information from u16 to u8) Merging char-misc.current/char-misc-linus (01faae5193d6 drivers: video: fbcon: fix NULL dereference in fbcon_cursor()) Merging soundwire-fixes/fixes (fde5d7f27108 soundwire: bus: Fix device found flag correctly) Merging thunderbolt-fixes/fixes (0d02ec6b3136 Linux 5.12-rc4) Merging input-current/for-linus (69d5ff3e9e51 Input: nspire-keypad - enable interrupts only when opened) 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 (4ab4fcfce5b5 vfio/type1: fix vaddr_get_pfns() return in vfio_pin_page_external()) 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 (868833fbffbe dmaengine: xilinx: dpdma: Fix race condition in done IRQ) 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 (5c8fe583cce5 Linux 5.11-rc1) 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 (3f6c515d7234 MIPS: vmlinux.lds.S: Fix appended dtb not properly aligned) Merging at91-fixes/at91-fixes (2c69c8a1736e ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet) Merging omap-fixes/fixes (b3d09a06d89f ARM: OMAP4: PM: update ROM return address for OSWR and OFF) Merging kvm-fixes/master (9ce3746d6413 documentation/kvm: additional explanations on KVM_SET_BOOT_CPU_ID) 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 (7018c897c2f2 libnvdimm/dimm: Avoid race between probe and available_slots_show()) Merging btrfs-fixes/next-fixes (3b7ec4d1b5cb Merge branch 'misc-5.12' into next-fixes) Merging vfs-fixes/fixes (d36a1dd9f77a dump_common_audit_data(): fix racy accesses to ->d_name) 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 (d1635448f110 platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms) 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 (8242ff9ea9f0 dt-bindings: display: mediatek,dpi: Convert to use graph schema) Merging scsi-fixes/fixes (a50bd6461690 scsi: mpt3sas: Do not use GFP_KERNEL in atomic context) Merging drm-fixes/drm-fixes (d27ce83fa4ba Merge tag 'du-fixes-20210316' of git://linuxtv.org/pinchartl/media 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 (b61fde1beb6b drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders) Merging mmc-fixes/fixes (f06391c45e83 mmc: cqhci: Fix random crash when remove mmc module/card) 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 (fe07bfda2fb9 Linux 5.12-rc1) Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) Merging risc-v-fixes/fixes (a5406a7ff56e riscv: Correct SPARSEMEM configuration) Merging pidfd-fixes/fixes (1e28eed17697 Linux 5.12-rc3) Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0) Merging spdx/spdx-linus (88fe49249c99 Merge tag 'char-misc-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) Merging gpio-brgl-fixes/gpio/for-current (6cb59afe9e5b gpiolib: Assign fwnode to parent's if no primary one provided) Merging gpio-intel-fixes/fixes (b41ba2ec54a7 gpiolib: Read "gpio-line-names" from a firmware node) Merging pinctrl-intel-fixes/fixes (77e141266c8e pinctrl: intel: Show the GPIO base calculation explicitly) 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 (0d02ec6b3136 Linux 5.12-rc4) Merging drm-misc-fixes/for-linux-next-fixes (50891bead80b drm/etnaviv: User FOLL_LONGTERM in userptr) Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) Merging kbuild/for-next (884a7fa1b090 kbuild: replace sed with $(subst ) or $(patsubst )) Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc4) Merging dma-mapping/for-next (84fcfbdadbfd dma-mapping: remove a pointless empty line in dma_alloc_coherent) 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 (08cbcb970256 ARM: 9060/1: kexec: Remove unused kexec_reinit callback) Merging arm64/for-next/core (37dfa1441220 Merge branches 'for-next/misc', 'for-next/kselftest' and 'for-next/xntable' into for-next/core) Merging arm-perf/for-next/perf (f0c140481d1b perf: Constify static struct attribute_group) Merging arm-soc/for-next (a57e29abb79d soc: document merges) Merging actions/for-next (006828d706fd Merge branch 'v5.12/defconfig' into for-next) Merging amlogic/for-next (cf4b8849e4c2 Merge branch 'v5.13/dt64' into tmp/aml-rebuild) Merging aspeed/for-next (697dabd5d370 Merge branches 'soc-for-v5.12' and 'dt-for-v5.12' into for-next) Merging at91/at91-next (b95bbae19954 Merge branch 'at91-fixes' into at91-next) Merging drivers-memory/for-next (1ca59ca0afde memory: tegra20: Add debug statistics) Merging imx-mxs/for-next (58b195fac435 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) Merging mediatek/for-next (e6468af3b590 Merge branch 'v5.11-next/soc' into for-next) Merging mvebu/for-next (8e03d45cb7de Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (c9260dd4623a Merge branch 'fixes' into for-next) Merging qcom/for-next (c465fc2707c6 Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13' and 'drivers-for-5.13' into for-next) Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller) Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) Merging renesas/next (7ad9aafe713b 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 (d130b50223d7 Merge branch 'v5.13-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (151d4e8e6ccf Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (17d69bed53b4 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 (adc0496104b6 ARM: dts: stm32: Add Engicam i.Core STM32MP1 EDIMM2.2 Starter Kit) Merging sunxi/sunxi/for-next (582cfdb9d206 Merge branch 'sunxi/clk-for-5.13' into sunxi/for-next) Merging tegra/for-next (e7c4210a197f 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 (d5a4d5413dd8 arm64: dts: ti: k3-am642: reserve gpio in mcu domain for firmware usage) Merging clk/clk-next (9575aeae2cd1 Merge branch 'clk-cleanup' into clk-next) Merging clk-imx/for-next (d60fe8fa6c01 clk: imx: Fix reparenting of UARTs not associated with stdout) Merging clk-renesas/renesas-clk (0eedab655ec1 clk: renesas: r8a779a0: Add CMT clocks) Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) Merging csky/linux-next (74cdb2664477 csky: Fixup typos) Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) Merging m68k/for-next (f2e7e4bf38fd m68k: syscalls: switch to generic syscallhdr.sh) Merging m68knommu/for-next (06c5fa9b2168 m68k: fix flatmem memory model setup) Merging microblaze/next (bbcee72c2f7a microblaze: Fix a typo) Merging mips/mips-next (63d6c9816891 mips: kernel: use DEFINE_DEBUGFS_ATTRIBUTE with debugfs_create_file_unsafe()) 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 (8f722f67452f openrisc: Use devicetree to determine present cpus) Merging parisc-hd/for-next (711d090f0e02 parisc: syscalls: switch to generic syscallhdr.sh) Merging powerpc/next (fbda79043024 Merge tag 'powerpc-5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) Merging soc-fsl/next (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A) Merging risc-v/for-next (06c7c914de26 RISC-V: enable XIP) Merging s390/for-next (5671d9718faf s390/kernel: fix a typo) 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 (ddad5187fc2a um: irq.h: include <asm-generic/irq.h>) Merging xtensa/xtensa-for-next (d0deab8fca0e xtensa: syscalls: switch to generic syscallhdr.sh) Merging pidfd/for-next (f69e8091c4a2 xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl) Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) Merging fscache/fscache-next (42587ccf2ed5 afs: Use the fscache_write_begin() helper) Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) Merging btrfs/for-next (c7f98650557a Merge branch 'for-next-next-v5.12-20210322' into for-next-20210322) Merging ceph/master (558b4510f622 ceph: defer flushing the capsnap if the Fb is used) Merging cifs/for-next (0d02ec6b3136 Linux 5.12-rc4) Merging cifsd/cifsd-for-next (91208e87d526 Merge pull request #34 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 (f3382f3159d7 erofs: complete a missing case for inplace I/O) Merging exfat/dev (33070f7ad15a exfat: speed up iterate/lookup by fixing start point of traversing cluster chain) Merging ext3/for_next (a1e4a2fed6b2 Pull xfs real-time warning count update from Darrick.) Merging ext4/dev (64395d950bc4 ext4: initialize ret to suppress smatch warning) Merging f2fs/dev (00152bd7cabd f2fs: fix to avoid selecting full segment w/ {AT,}SSR allocator) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (0d02ec6b3136 Linux 5.12-rc4) Merging jfs/jfs-next (b462cecfa323 fs: Fix typo issue) Merging nfs/linux-next (0d02ec6b3136 Linux 5.12-rc4) 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 (29a4e914914a svcrdma: Clean up dto_q critical section in svc_rdma_recvfrom()) Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) Merging overlayfs/overlayfs-next (d46b7cd68336 ovl: plumb through flush method) Merging ubifs/next (42119dbe571e ubifs: Fix error return code in alloc_wbufs()) Merging v9fs/9p-next (324a158fe535 fs: 9p: add generic splice_write file operation) Merging xfs/for-next (8723d5ba8bda xfs: also reject BULKSTAT_SINGLE in a mount user namespace) Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone()) Merging iomap/iomap-for-next (5808fecc5723 iomap: Fix negative assignment to unsigned sis->pages in iomap_swapfile_activate) Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) Merging file-locks/locks-next (b8da9b10e26c fs/locks: print full locks information) Merging vfs/for-next (f85ebc25fa88 Merge branch 'work.misc' into for-next) Merging printk/for-next (de9a2d6a2625 Merge branch 'for-5.13-vsprintf-pgp' into for-next) Merging pci/next (55bddc9ae5fb Merge branch 'remotes/lorenzo/pci/misc') Merging pstore/for-next/pstore (7db688e99c0f pstore/ram: Rate-limit "uncorrectable error in header" message) Merging hid/for-next (30541b02f591 Merge branch 'for-5.13/thrustmaster' into for-next) Merging i2c/i2c/for-next (2acaad748aa8 Merge branch 'i2c/for-current' 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 (644b9af5c605 hwmon: replace snprintf in show functions with sysfs_emit) Merging jc_docs/docs-next (a8f2a68e42d1 Documentation: sysrq: update description about sysrq crash) Merging v4l-dvb/master (97b34809ec24 media: staging: atomisp: reduce kernel stack 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 (144389e954ef Merge branches 'pm-core' and 'pm-tools' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (2b53d1bd13e1 cpufreq: cppc: simplify default delay_us setting) Merging cpupower/cpupower (a38fd8748464 Linux 5.12-rc2) Merging devfreq/devfreq-next (cc0a62bc9731 PM / devfreq: imx8m-ddrc: Remove imx8m_ddrc_get_dev_status) Merging opp/opp/linux-next (834c0dfcec64 memory: samsung: exynos5422-dmc: Convert to use resource-managed OPP API) CONFLICT (content): Merge conflict in drivers/media/platform/qcom/venus/pm_helpers.c Merging thermal/thermal/linux-next (6e3e14c9385c thermal/core/power_allocator: Using round the division when re-divvying up power) 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 (9d232469bcd7 fs: dlm: add shutdown hook) Merging swiotlb/linux-next (2cbc2776efe4 swiotlb: remove swiotlb_nr_tbl) Merging rdma/for-next (783cf673b05e RDMA/hns: Fix memory corruption when allocating XRCDN) Merging net-next/master (4c94fe88cde4 net: ethernet: Remove duplicate include of vhca_event.h) CONFLICT (content): Merge conflict in kernel/bpf/verifier.c CONFLICT (content): Merge conflict in drivers/net/ethernet/pensando/ionic/ionic_txrx.c CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c Merging bpf-next/for-next (78b226d48106 libbpf: Skip BTF fixup if object file has no BTF) Merging ipsec-next/master (f076835a8bf2 esp6: remove a duplicative condition) Merging mlx5-next/mlx5-next (26bf30902c10 net/mlx5: Use order-0 allocations for EQs) Merging netfilter-next/master (0ce7cf4127f1 netfilter: nftables: update table flags from the commit phase) Merging ipvs-next/master (d4a96be65423 netfilter: conntrack: Remove unused variable declaration) Merging wireless-drivers-next/master (13ce240a932f rtw88: 8822c: support FW crash dump when FW crash) Merging bluetooth/master (c29fb5f65072 Bluetooth: Remove trailing semicolon in macros) Merging mac80211-next/master (a1e6f641e307 Revert "net: dsa: sja1105: Clear VLAN filtering offload netdev feature") Merging gfs2/for-next (62dd0f98a0e5 gfs2: Flag a withdraw if init_threads() fails) Merging mtd/mtd/next (3ba6d1ff041f mtd: rawnand: stm32_fmc2: Fix fall-through warnings for Clang) Merging nand/nand/next (55fbb9ba4f06 mtd: rawnand: qcom: Return actual error code instead of -ENODEV) Merging spi-nor/spi-nor/next (79321e752aff mtd: spi-nor: core: Update comment about the default flash parameters) Merging crypto/master (befb1ddaece1 hwrng: cctrng - delete redundant printing of return value) Merging drm/drm-next (06debd6e1b28 Merge tag 'drm-intel-next-2021-03-16' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/dss/dsi.c Applying: merge fix for "drm: Switch to %p4cc format modifier" Merging drm-misc/for-linux-next (b3bdf89c0260 drm/bridge/analogix/dp_core: Unregister DP AUX channel on error in analogix_dp_probe()) Merging amdgpu/drm-next (fe38caf19462 Revert "amd/amdgpu: Disable VCN DPG mode for Picasso") CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c Merging drm-intel/for-linux-next (2b5a4562edd0 drm/i915/display: Simplify GLK display version tests) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_link_training.c Merging drm-tegra/drm/tegra/for-next (dcdfe2712b68 drm/tegra: Fix reference leak when pm_runtime_get_sync() fails) Merging drm-msm/msm-next (627dc55c273d drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume) Merging imx-drm/imx-drm/next (82581fcf070b drm/modes: add non-OF stub for of_get_drm_display_mode) Merging etnaviv/etnaviv/next (7d614ab2f205 drm/etnaviv: fix NULL check before some freeing functions is not needed) Merging regmap/for-next (5af7bd5b148a Merge remote-tracking branch 'regmap/for-5.13' into regmap-next) Merging sound/for-next (940ba1f5e18d ALSA: core: avoid -Wempty-body warnings) Merging sound-asoc/for-next (1d04e14211a2 Merge remote-tracking branch 'asoc/for-5.13' into asoc-next) Merging modules/modules-next (1e80d9cb579e module: potential uninitialized return in module_kallsyms_on_each_symbol()) Merging input/next (ac1e4ca591c0 Input: cyttsp - verbose error on soft reset) Merging block/for-next (ba93c2f60ee2 Merge branch 'for-5.13/drivers' into for-next) Merging device-mapper/for-next (625e61dbd65d 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 (308a91fa2ced mmc: cavium: Use '"%s...", __func__' to print function name) Merging mfd/for-mfd-next (294a87bdd584 mfd: rn5t618: Do not cache various USB related registers) Merging backlight/for-backlight-next (225be60f3853 dt-bindings: backlight: qcom-wled: Add PMI8994 compatible) Merging battery/for-next (3aeaf5093809 power: reset: replace curly brackets in Makefile) Merging regulator/for-next (5afe322aaf98 Merge remote-tracking branch 'regulator/for-5.13' into regulator-next) Merging security/next-testing (215042ece980 Merge branch 'landlock_lsm' 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 (1e28eed17697 Linux 5.12-rc3) Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) 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 (fe07bfda2fb9 Linux 5.12-rc1) Merging tpmdd/next (8b12a62a4e3e Merge tag 'drm-fixes-2021-03-19' of git://anongit.freedesktop.org/drm/drm) Merging watchdog/master (1e28eed17697 Linux 5.12-rc3) Merging iommu/next (7851dfc68810 Merge branches 'iommu/fixes', 'unisoc', 'x86/vt-d' and 'core' into next) Merging audit/next (7c585c9dffa5 audit: document /proc/PID/sessionid) Merging devicetree/for-next (ad1ce1ab061e of: of_reserved_mem: Demote kernel-doc abuses) Merging mailbox/mailbox-for-next (6b50df2b8c20 mailbox: arm_mhuv2: Skip calling kfree() with invalid pointer) Merging spi/for-next (12403a898c37 Merge remote-tracking branch 'spi/for-5.13' into spi-next) Merging tip/auto-latest (4f469efcd03f Merge branch 'core/entry') Applying: x86: fix up for "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG" Merging clockevents/timers/drivers/next (323397ef4d00 clocksource/drivers/dw_apb_timer_of: Add handling for potential memory leak) Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' into edac-for-next) Merging irqchip/irq/irqchip-next (5fbecd2389f4 irqchip/ingenic: Add support for the JZ4760) Merging ftrace/for-next (9a6944fee68e tracing: Add a verifier to check string pointers for trace events) CONFLICT (content): Merge conflict in arch/x86/kernel/kprobes/ftrace.c Merging rcu/rcu/next (f4d010298f01 doc: Fix statement of RCU's memory-ordering requirements) Merging kvm/next (4a98623d5d90 KVM: x86/mmu: Mark the PAE roots as decrypted for shadow paging) Merging kvm-arm/next (2e2f7548094b Merge branch 'kvm-arm64/nvhe-sve' 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 (0a4ec47cc7b5 KVM: s390: VSIE: fix MVPG handling for prefixing and MSO) Merging xen-tip/linux-next (f1d20d8643e5 Xen/gntdev: don't needlessly use kvcalloc()) Merging percpu/for-next (df1c002198a8 Merge branch 'for-5.12' into for-next) Merging workqueues/for-next (a7347aa8e061 workqueue: Move the position of debug_work_activate() in __queue_work()) Merging drivers-x86/for-next (36974daf5388 platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms) CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c Merging chrome-platform/for-next (a38fd8748464 Linux 5.12-rc2) Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init) Merging leds/for-next (34731ed13e8a leds: lgm: fix gpiolib dependency) Merging ipmi/for-next (c053c4eb5a0f ipmi: Handle device properties with software node API) Merging driver-core/driver-core-next (0d02ec6b3136 Linux 5.12-rc4) Merging usb/usb-next (f85142af3641 Merge 5.12-rc4 into usb-next) Merging usb-gadget/next (a38fd8748464 Linux 5.12-rc2) Merging usb-serial/usb-next (764de1059b97 USB: serial: pl2303: TA & TB alternate divider with non-standard baud rates) Merging usb-chipidea-next/for-usb-next (c8ad0f64b7e0 usb: chipidea: tegra: Silence deferred probe error) CONFLICT (content): Merge conflict in drivers/usb/typec/tipd/core.c Merging tty/tty-next (280def1e1c17 Merge 5.12-rc3 into tty-next) Merging char-misc/char-misc-next (83be46e944f6 Merge v5.12-rc3 into char-misc-next) Merging extcon/extcon-next (cf947ad92675 extcon: qcom-spmi: Add support for VBUS detection) Merging phy-next/next (2ff8a1eeb5aa phy: Add Sparx5 ethernet serdes PHY driver) Merging soundwire/next (e6cb15b50065 soundwire: qcom: add missing \n in dev_err()) Merging thunderbolt/next (2e7a5b3e2236 thunderbolt: Unlock on error path in tb_domain_add()) Merging vfio/next (4d83de6da265 vfio/type1: Batch page pinning) Merging staging/staging-next (f7bff017741d staging: qlge: fix an error code in probe()) 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 (57bfc3abd8e5 Merge branch 'icc-fixes' into icc-next) Merging dmaengine/next (84b0aa2e0d91 dmaengine: dw-edma: Add pcim_iomap_table return check) Merging cgroup/for-next (00bfa16052cd Merge branch 'for-5.11-fixes' into for-next) Merging scsi/for-next (eb411291a754 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (cba3ebfc008e scsi: ibmvscsi_tgt: Remove duplicate section 'NOTE') Merging vhost/linux-next (723c7003c1ab vdpa: introduce virtio pci driver) Merging rpmsg/for-next (2c2564b9d64d 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 (deecc4d162c8 gpio: mockup: Adjust documentation to the code) Merging gpio-intel/for-next (49fa475634be gpio: sch: Hook into ACPI GPE handler to catch GPIO edge events) CONFLICT (content): Merge conflict in drivers/gpio/gpiolib.c Merging pinctrl/for-next (a5d5c33246eb Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (9d8c5b0d2e09 pinctrl: intel: Show the GPIO base calculation explicitly) Merging pinctrl-renesas/renesas-pinctrl (f7adcca27edf pinctrl: renesas: r8a77965: Add vin4_g8 and vin5_high8 pins) Merging pinctrl-samsung/for-next (a38fd8748464 Linux 5.12-rc2) Merging pwm/for-next (9666cec380d6 pwm: Drop function pwmchip_add_with_polarity()) 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 (a38fd8748464 Linux 5.12-rc2) Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") Merging livepatching/for-next (81840f21d416 Merge branch 'for-5.12/doc' 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 (15a2fd51384a seccomp: fix the cond to report loaded filters) Merging kspp/for-next/kspp (414eece95b98 Merge tag 'clang-lto-v5.12-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) 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/Kconfig Merging nvmem/for-next (5350a8500263 nvmem: rmem: fix undefined reference to memremap) Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders) Merging hyperv/hyperv-next (9c780083badb hv: hyperv.h: a few mundane typo fixes) 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 (6f1e376cfc68 fpga: Add support for Xilinx DFX AXI Shutdown manager) 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 (a38fd8748464 Linux 5.12-rc2) Merging kunit-next/kunit (2f9f21cdcd71 kunit: Match parenthesis alignment to improve code readability) 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 (9e40641f62cd bus: mhi: core: Check state before processing power_down) 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 (fe07bfda2fb9 Linux 5.12-rc1) Merging rust/rust-next (98898dfbdf72 Rust support) CONFLICT (content): Merge conflict in Makefile Merging akpm-current/current (c0954d9328ac modules: add CONFIG_MODPROBE_PATH) CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt Applying: hack to make SPARC32 build $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (299d14fbe6d0 secretmem: test: add basic selftest for memfd_secret(2))
Attachment:
pgpSdz57xh4gd.pgp
Description: OpenPGP digital signature
