Hi all, Changes since 20210511: The next-next tree gained a build failure do I used the version from next-20210511. The amdgpu tree gained a conflict against the drm-misc tree. The drm-misc tree gained a build failure for which I reverted a commit. The drm-intel tree gained a conflict against Linus' tree. The iio tree gained a conflict against the staging.current tree. The cgroup tree lost its build failure. The hyperv tree gained a conflict against Linus' tree. The akpm-current gained a conflict against with the rcu tree. Also build failures for which I reverted 4 commits. Non-merge commits (relative to Linus' tree): 2096 2189 files changed, 96106 insertions(+), 23195 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 342 trees (counting Linus' and 89 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 (88b06399c9c7 Merge tag 'for-5.13-rc1-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) Merging kbuild-current/fixes (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging arc-current/for-curr (1d5e4640e5df ARC: mm: Use max_high_pfn as a HIGHMEM zone border) Merging arm-current/fixes (d2f7eca60b29 ARM: 9071/1: uprobes: Don't hook on thumb instructions) Merging arm64-fixes/for-next/fixes (37a8024d2655 arm64: mte: initialize RGSR_EL1.SEED in __cpu_setup) Merging arm-soc-fixes/arm/fixes (b5144a2bf401 dt-bindings: nvmem: mediatek: remove duplicate mt8192 line) Merging drivers-memory-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging m68k-current/for-linus (34e5269bf987 m68k: sun3x: Remove unneeded semicolon) Merging powerpc-fixes/fixes (791f9e36599d powerpc/vdso: Make sure vdso_wrapper.o is rebuilt everytime vdso.so is rebuilt) Merging s390-fixes/fixes (6efb943b8616 Linux 5.13-rc1) 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 (297c4de6f780 net: dsa: felix: re-enable TAS guard band mode) Merging bpf/master (569c484f9995 bpf: Limit static tcp-cc functions in the .BTF_ids list to x86) Merging ipsec/master (b515d2637276 xfrm: xfrm_state_mtu should return at least 1280 for ipv6) Merging netfilter/master (55bc1af3d911 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) Merging ipvs/master (bbd6f0a94813 bnxt_en: Fix RX consumer index logic in the error path.) Merging wireless-drivers/master (e7020bb068d8 iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd()) Merging mac80211/master (210f563b0979 ath11k: Drop multicast fragments) Merging rdma-fixes/for-rc (54d87913f147 RDMA/core: Prevent divide-by-zero error triggered by the user) Merging sound-current/for-linus (f2be77fee648 ALSA: hda/realtek: Add fixup for HP Spectre x360 15-df0xxx) Merging sound-asoc-fixes/for-linus (caf089077ed7 Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus) Merging regmap-fixes/for-linus (6efb943b8616 Linux 5.13-rc1) Merging regulator-fixes/for-linus (6efb943b8616 Linux 5.13-rc1) Merging spi-fixes/for-linus (f16c8ea90afb Merge remote-tracking branch 'spi/for-5.13' into spi-linus) Merging pci-current/for-linus (2ee4c8a26876 MAINTAINERS: Add Krzysztof as PCI host/endpoint controllers reviewer) Merging driver-core.current/driver-core-linus (bb4031b8af80 clk: Skip clk provider registration when np is NULL) Merging tty.current/tty-linus (6efb943b8616 Linux 5.13-rc1) Merging usb.current/usb-linus (d9ff1096a840 usb: musb: Fix an error message) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (f8e8c1b2f782 USB: serial: pl2303: add device id for ADLINK ND-6530 GC) Merging usb-chipidea-fixes/for-usb-fixes (3b414d1b0107 usb: cdnsp: Fix lack of removing request from pending list.) Merging phy/fixes (6efb943b8616 Linux 5.13-rc1) Merging staging.current/staging-linus (ba9c25d94dea Merge tag 'iio-fixes-5.13a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging iio-fixes/fixes-togreg (af0e1871d79c iio: tsl2583: Fix division by a zero lux_val) Merging char-misc.current/char-misc-linus (ba2b062ffa3d Merge tag 'misc-habanalabs-fixes-2021-05-08' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-linus) Merging soundwire-fixes/fixes (f136f3279d85 soundwire: qcom: fix handling of qcom,ports-block-pack-mode) Merging thunderbolt-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging input-current/for-linus (05665cef4b74 Input: xpad - add support for Amazon Game Controller) Merging crypto-current/master (e3a606f2c544 fsverity: relax build time dependency on CRYPTO_SHA256) Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) Merging vfio-fixes/for-linus (cc35518d29bc docs: vfio: fix typo) 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 (538ea65a9fd1 dmaengine: xilinx: dpdma: initialize registers before request_irq) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (562b4e91d3b2 mtd: parsers: ofpart: fix parsing subpartitions) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (6efb943b8616 Linux 5.13-rc1) 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 (9c1a07442c95 KVM: x86/xen: Take srcu lock when accessing kvm_memslots()) Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) Merging hwmon-fixes/hwmon (8370e5b09308 hwmon: (ltc2992) Put fwnode in error case during ->probe()) Merging nvdimm-fixes/libnvdimm-fixes (99a81dcc717d Merge branch 'for-5.12/cxl' into libnvdimm-fixes) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) Merging btrfs-fixes/next-fixes (2e4f4de38d26 Merge branch 'misc-5.13' into next-fixes) Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) 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 (a3790a8a94fc platform/x86: intel-hid: Fix spurious wakeups caused by tablet-mode events during suspend) Merging samsung-krzk-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging pinctrl-samsung-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging devicetree-fixes/dt/linus (0bd50826a40e leds: Fix reference file name of documentation) Merging scsi-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging drm-fixes/drm-fixes (875d598db60a MAINTAINERS: Update address for Emma Anholt) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (a5c936add6a2 drm/i915/dp: Use slow and wide link training for everything) Merging mmc-fixes/fixes (a1149a6c06ee mmc: sdhci-pci-gli: increase 1.8V regulator wait) 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 (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) 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 (6efb943b8616 Linux 5.13-rc1) Merging gpio-brgl-fixes/gpio/for-current (6efb943b8616 Linux 5.13-rc1) Merging gpio-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging pinctrl-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging erofs-fixes/fixes (46f2e04484ae erofs: update documentation about data compression) 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 (9f4ad9e425a1 Linux 5.12) Merging drm-misc-fixes/for-linux-next-fixes (c55b44c9386f Merge drm/drm-fixes into drm-misc-fixes) Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) Merging kbuild/for-next (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) 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 (d3506d256d94 Merge branch 'misc' into for-next) Merging arm64/for-next/core (c76fba33467b arm64: kernel: Update the stale comment) Merging arm-perf/for-next/perf (2c2e21e78a94 arm64: perf: Remove redundant initialization in perf_event.c) Merging arm-soc/for-next (6efb943b8616 Linux 5.13-rc1) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (09dc799bceb5 Merge branch 'v5.13/fixes' 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 (907c5bbb514a memory: atmel-ebi: add missing of_node_put for loop iteration) 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 (0109038cffef Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13', 'defconfig-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 (81ca6c161d39 Merge branch 'renesas-arm-dt-for-v5.14' into renesas-next) Merging reset/reset/next (466ba3c8ff4f reset: a10sr: add missing of_match_table reference) Merging rockchip/for-next (0ac75916f338 Merge branch 'v5.14-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (6fed39b8b597 Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (79053496a28d Merge tag 'scmi-fixes-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 (401c54f3951e Merge branches 'sunxi/core-for-5.14' and 'sunxi/dt-for-5.14' 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 (6efb943b8616 Linux 5.13-rc1) Merging xilinx/for-next (6efb943b8616 Linux 5.13-rc1) Merging clk/clk-next (6efb943b8616 Linux 5.13-rc1) Merging clk-imx/for-next (054ef44ea3ef clk: imx: Reference preceded by free) Merging clk-renesas/renesas-clk (6bd913f54f2f clk: renesas: r9a06g032: Switch to .determine_rate()) Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2) Merging csky/linux-next (1294d89b48b0 csky: Fixup 610 bootup failed) Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) Merging m68k/for-next (eeff86b6d18c m68k: dma: Remove unnecessary include of asm/cacheflush.h) Merging m68knommu/for-next (6efb943b8616 Linux 5.13-rc1) Merging microblaze/next (6efb943b8616 Linux 5.13-rc1) Merging mips/mips-next (33ae8f801ad8 hugetlb: clear huge pte during flush function on mips platform) 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 (9f4ad9e425a1 Linux 5.12) Merging powerpc/next (f96271cefe6d Merge branch 'master' into next) 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 (beaf5ae15a13 riscv: remove unused handle_exception symbol) Merging s390/for-next (6efb943b8616 Linux 5.13-rc1) 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 (3003bbd0697b afs: Use the netfs_write_begin() helper) Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") Merging btrfs/for-next (768ccafb15c7 Merge branch 'fixes-for-master' into for-next-20210511) CONFLICT (content): Merge conflict in fs/btrfs/zoned.c Merging ceph/master (0e1c1526416f Merge commit 'ed94f87c2b123241ae5644cf82327e2da653adb6') Merging cifs/for-next (e87dbd1cec70 Fix kernel oops when CONFIG_DEBUG_ATOMIC_SLEEP is enabled.) Merging cifsd/cifsd-for-next (2018da7d40e5 Merge pull request #46 from namjaejeon/cifsd-for-next) Merging configfs/for-next (14fbbc829772 configfs: fix a use-after-free in __configfs_open_file) 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 (8e6c8fa9f2e9 erofs: enable big pcluster feature) Merging exfat/dev (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging ext3/for_next (2335e1b8ee3b Pull MAINTAINERS file update.) Merging ext4/dev (6c0912739699 ext4: wipe ext4_dir_entry2 upon file deletion) Merging f2fs/dev (6c73ab1db371 f2fs: compress: fix to assign cc.cluster_idx correctly) 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 (9e895cd9649a xprtrdma: Fix a NULL dereference in frwr_unmap_sync()) 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 (b9f83ffaa0c0 SUNRPC: Fix null pointer dereference in svc_rqst_free()) Merging orangefs/for-next (211f9f2e0503 orangefs: leave files in the page cache for a few micro seconds at least) 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 (8e9800f9f2b8 xfs: don't allow log writes if the data device is readonly) Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone()) Merging iomap/iomap-for-next (6e552494fb90 iomap: remove unused private field from ioend) 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 (e8727aec724e Merge branch 'work.misc' into for-next) Merging printk/for-next (a386d19acc30 Merge branch 'for-5.13' into for-next) Merging pci/next (6efb943b8616 Linux 5.13-rc1) Merging pstore/for-next/pstore (9d843e8fafc7 pstore: Add mem_type property DT parsing support) Merging hid/for-next (adfd5f216d25 Merge branch 'for-5.13/upstream-fixes' into for-next) Merging i2c/i2c/for-next (f9743e4d0a62 Merge branch 'i2c/for-5.13' into i2c/for-next) Merging i3c/i3c/next (0d95f41ebde4 Revert "i3c master: fix missing destroy_workqueue() on error in i3c_master_register") Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) Merging hwmon-staging/hwmon-next (607040aaa8b5 dt-bindings: Add MP2888 voltage regulator device) Merging jc_docs/docs-next (7240cd200541 Remove link to nonexistent rocket driver docs) Merging v4l-dvb/master (73edc4da4063 media: staging: media: atomisp: pci: Format comments according to coding-style in file atomisp_cmd.h) Merging v4l-dvb-next/master (bf05bf16c76b Linux 5.12-rc8) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (cb7accda3e01 Merge branch 'devprop' 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 (c310e546164d thermal/drivers/mtk_thermal: Remove redundant initializations of several variables) 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 (dfc06b389a4f swiotlb: don't override user specified size in swiotlb_adjust_size) Merging rdma/for-next (6efb943b8616 Linux 5.13-rc1) Merging net-next/master (faa5f5da809b net/sched: taprio: Drop unnecessary NULL check after container_of) $ git reset --hard HEAD^ Merging next-20210511 version of net-next Merging bpf-next/for-next (e5670fa0293b libbpf: Treat STV_INTERNAL same as STV_HIDDEN for functions) Merging ipsec-next/master (747b67088f8d xfrm: ipcomp: remove unnecessary get_cpu()) Merging mlx5-next/mlx5-next (63f9c44bca5e net/mlx5: Add MEMIC operations related bits) Merging netfilter-next/master (9d31d2338950 Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging ipvs-next/master (99ba0ea616aa sfc: adjust efx->xdp_tx_queue_count with the real number of initialized queues) Merging wireless-drivers-next/master (9382531ec63f Merge tag 'mt76-for-kvalo-2021-04-21' of https://github.com/nbd168/wireless) Merging bluetooth/master (da68ad722e54 Bluetooth: btqca: Don't modify firmware contents in-place) Merging mac80211-next/master (9d31d2338950 Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging gfs2/for-next (a673e827f904 gfs2: Fix mmap + page fault deadlock) Merging mtd/mtd/next (cc9d663a00a0 drivers: mtd: sm_ftl: Fix alignment of block comment) Merging nand/nand/next (fd0d8d85f723 mtd: nand: bbt: Fix corner case in bad block table handling) Merging spi-nor/spi-nor/next (46094049a49b Revert "mtd: spi-nor: macronix: Add support for mx25l51245g") Merging crypto/master (e3a606f2c544 fsverity: relax build time dependency on CRYPTO_SHA256) Merging drm/drm-next (6efb943b8616 Linux 5.13-rc1) Applying: merge fix for "drm: Switch to %p4cc format modifier" Merging drm-misc/for-linux-next (523375c943e5 drm/vmwgfx: Port vmwgfx to arm64) Merging amdgpu/drm-next (92598fb3227f drm/amdgpu/display: restore the backlight on modeset (v2)) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c Merging drm-intel/for-linux-next (09df8ba5c181 drm/i915/display/xelpd: Implement Wa_14013475917) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fbc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.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 (f2f46b878777 drm/msm/dp: initialize audio_comp when audio starts) Merging imx-drm/imx-drm/next (fc1e985b67f9 drm/imx: ipuv3-plane: add color encoding and range properties) Merging etnaviv/etnaviv/next (4bfdd2aa67fb drm/etnaviv: rework linear window offset calculation) Merging regmap/for-next (6efb943b8616 Linux 5.13-rc1) Merging sound/for-next (f2be77fee648 ALSA: hda/realtek: Add fixup for HP Spectre x360 15-df0xxx) Merging sound-asoc/for-next (b8e2e691eea1 Merge remote-tracking branch 'asoc/for-5.14' into asoc-next) Merging modules/modules-next (33121347fb1c module: treat exit sections the same as init sections when !CONFIG_MODULE_UNLOAD) Merging input/next (d12b64b9764e MAINTAINERS: repair reference in HYCON HY46XX TOUCHSCREEN SUPPORT) Merging block/for-next (9e62f6899bca Merge branch 'for-5.14/block' into for-next) Merging device-mapper/for-next (7ee06ddc4038 dm snapshot: fix a crash when an origin has no snapshots) Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting) Merging mmc/next (3fb6180b0b97 mmc: core: Add support for cache ctrl for SD cards) Merging mfd/for-mfd-next (f9386c91574f mfd: intel-m10-bmc: Add support for MAX10 BMC Secure Updates) Merging backlight/for-backlight-next (04758386757c backlight: journada720: Fix Wmisleading-indentation warning) Merging battery/for-next (6efb943b8616 Linux 5.13-rc1) Merging regulator/for-next (d019f38a1af3 regulator: uniphier: Add missing MODULE_DEVICE_TABLE) Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) Merging integrity/next-integrity (781a57394899 ima: ensure IMA_APPRAISE_MODSIG has necessary dependencies) 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 (1ca86ac1ec8d LSM: SafeSetID: Fix code specification by scripts/checkpatch.pl) Merging selinux/next (fd781f459b60 selinux: Remove redundant assignment to rc) Merging smack/next (49ec114a6e62 smackfs: restrict bytes count in smk_set_cipso()) Merging tomoyo/master (6efb943b8616 Linux 5.13-rc1) Merging tpmdd/next (403eae104ce9 tpm, tpm_tis: Reserve locality in tpm_tis_resume()) Merging watchdog/master (bf05bf16c76b Linux 5.12-rc8) Merging iommu/next (2d471b20c55e iommu: Streamline registration interface) Merging audit/next (254c8b96c4af audit: add blank line after variable declarations) Merging devicetree/for-next (de3d7018372c dt-bindings: memory: tegra20: emc: Convert to schema) Merging mailbox/mailbox-for-next (2335f556b3af dt-bindings: mailbox: qcom-ipcc: Add compatible for SC7280) Merging spi/for-next (31f1a85f928e Merge remote-tracking branch 'spi/for-5.14' into spi-next) Merging tip/auto-latest (6efb943b8616 Linux 5.13-rc1) Merging clockevents/timers/drivers/next (8120891105ba dt-bindings: timer: nuvoton,npcm7xx: Add wpcm450-timer) Merging edac/edac-for-next (89f5f8fb5bf4 EDAC/thunderx: Remove irrelevant variable from error messages) Merging irqchip/irq/irqchip-next (5b44955dc198 irqchip/apple-aic: APPLE_AIC should depend on ARCH_APPLE) Merging ftrace/for-next (8c9af478c06b ftrace: Handle commands when closing set_ftrace_filter file) Merging rcu/rcu/next (eb644db2c64e torture: Add clocksource-watchdog testing to torture.sh) Merging kvm/next (ce7ea0cfdc2e KVM: SVM: Move GHCB unmapping to fix RCU warning) Merging kvm-arm/next (9a8aae605b80 Merge branch 'kvm-arm64/kill_oprofile_dependency' 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 (dbc03e81586f xen/unpopulated-alloc: fix error return code in fill_list()) Merging percpu/for-next (0aabad0a0456 Merge branch 'for-5.14' 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 (e7882cd7aebe platform/x86: gigabyte-wmi: add support for B550M AORUS PRO-P) Merging chrome-platform/for-next (d61b3f9b91be platform/chrome: cros_ec_lpc: Use DEFINE_MUTEX() for mutex lock) Merging hsi/for-next (6efb943b8616 Linux 5.13-rc1) Merging leds/for-next (ee522bcf026e leds: tlc591xx: fix return value check in tlc591xx_probe()) Merging ipmi/for-next (d72cd4ad4174 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging driver-core/driver-core-next (6efb943b8616 Linux 5.13-rc1) Merging usb/usb-next (4676be28a46e usb: xhci-mtk: use first-fit for LS/FS) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (6efb943b8616 Linux 5.13-rc1) Merging usb-chipidea-next/for-usb-next (4ae08bc23e1b usb: cdnsp: Useless condition has been removed) Merging tty/tty-next (6efb943b8616 Linux 5.13-rc1) Merging char-misc/char-misc-next (6efb943b8616 Linux 5.13-rc1) Merging extcon/extcon-next (7b1222b224af extcon: qcom-spmi: Add support for VBUS detection) Merging phy-next/next (6efb943b8616 Linux 5.13-rc1) Merging soundwire/next (037219925e7a soundwire: dmi-quirks: remove duplicate initialization) Merging thunderbolt/next (6efb943b8616 Linux 5.13-rc1) Merging vfio/next (adaeb718d46f vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV) Merging staging/staging-next (f6d5d118462d staging: rtl8192e: Fix whitespace around conditional statement) Merging iio/togreg (454a2be5d0c1 iio: accel: fxls8962af: fix errata bug E3 - I2C burst reads) CONFLICT (content): Merge conflict in drivers/iio/industrialio-core.c 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 (1fd86e280d8b interconnect: qcom: Add missing MODULE_DEVICE_TABLE) Merging dmaengine/next (6f64aa5746d2 dt-bindings: dma: convert arm-pl08x to yaml) Merging cgroup/for-next (f4f809f66b75 cgroup: inline cgroup_task_freeze()) Merging scsi/for-next (39107e8577ad scsi: aacraid: Replace one-element array with flexible-array member) Merging scsi-mkp/for-next (39107e8577ad scsi: aacraid: Replace one-element array with flexible-array member) Merging vhost/linux-next (7ff6e99e021c virtio_net: disable cb aggressively) 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 (6efb943b8616 Linux 5.13-rc1) Merging gpio-intel/for-next (6efb943b8616 Linux 5.13-rc1) Merging pinctrl/for-next (835109266494 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (6efb943b8616 Linux 5.13-rc1) Merging pinctrl-renesas/renesas-pinctrl (904ec4bebc1d pinctrl: renesas: r8a779{51,6,65}: Reduce non-functional differences) Merging pinctrl-samsung/for-next (6efb943b8616 Linux 5.13-rc1) Merging pwm/for-next (a6efb35019d0 pwm: Reword docs about pwm_apply_state()) Merging userns/for-next (ef566ba2d7d9 signal: Remove the last few si_perf references) 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 (4d0185e67806 rtc: sysfs: check features instead of ops) Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) Merging at24/at24/for-next (6efb943b8616 Linux 5.13-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 cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) 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 (8e74d1f319bf scsi: storvsc: Use blk_mq_unique_tag() to generate requestIDs) CONFLICT (content): Merge conflict in drivers/hv/ring_buffer.c Merging auxdisplay/auxdisplay (701454bce906 auxdisplay: Remove in_interrupt() usage.) Merging kgdb/kgdb/for-next (83fa2d13d628 kdb: Refactor env variables get/set code) Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) Merging fpga/for-next (ded39fc4a5b4 docs: driver-api: fpga: avoid using UTF-8 chars) 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 (fef0214731cc rust: allow printing in the kernel crate) 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 Merging cxl/next (e49d033bddf5 Linux 5.12-rc6) Merging tpmdd-jejb/tpmdd-for-next (69977d1aeeca Merge branch 'tpmdd-fixes' into tpmdd-for-next) Applying: Revert "drm: Remove pdev field from struct drm_device" Merging akpm-current/current (5535e265199f ipc: use kmalloc for msg_queue and shmid_kernel) CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.rst Applying: Revert "mm: memcg/slab: disable cache merging for KMALLOC_NORMAL caches" Applying: Revert "mm: memcg/slab: don't create kmalloc-cg caches with cgroup.memory=nokmem" Applying: Revert "mm: memcg/slab: create a new set of kmalloc-cg-<n> caches" Applying: Revert "mm/ioremap: fix iomap_max_page_shift" $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (1f9219d9c4bc kdump: use vmlinux_build_id to simplify) Applying: Revert "mm/vmalloc: print a warning message first on failure" Applying: Revert "mm/vmalloc: switch to bulk allocator in __vmalloc_area_node()"
Attachment:
pgpqIgAYHI76r.pgp
Description: OpenPGP digital signature
