Hi all, Changes since 20210303: The ipsec tree gained a conflict against the net tree. The tip tree lost its build failure. The pinctrl tree gained a build failure so I used the version from next-20210303. Non-merge commits (relative to Linus' tree): 1419 1507 files changed, 35931 insertions(+), 13733 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 333 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 (f69d02e37a85 Merge tag 'misc-5.12-2021-03-02' of git://git.kernel.dk/linux-block) Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) Merging kbuild-current/fixes (207da4c82ade kbuild: Fix <linux/version.h> for empty SUBLEVEL or PATCHLEVEL again) Merging arc-current/for-curr (7c53f6b671f4 Linux 5.11-rc3) Merging arm-current/fixes (4d62e81b60d4 ARM: kexec: fix oops after TLB are invalidated) Merging arm64-fixes/for-next/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging arm-soc-fixes/arm/fixes (090e502e4e63 Merge tag 'socfpga_dts_fix_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes) Merging drivers-memory-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging m68k-current/for-linus (5d2b62832c2e m68k: Fix virt_addr_valid() W=1 compiler warnings) Merging powerpc-fixes/fixes (5c88a17e1579 powerpc/sstep: Fix VSX instruction emulation) Merging s390-fixes/fixes (f7546a8f6613 s390: remove IBM_PARTITION and CONFIGFS_FS from zfcpdump defconfig) Merging sparc/master (cf64c2a905e0 Merge branch 'work.sparc32' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) Merging net/master (dbbe7c962c3a docs: networking: drop special stable handling) Merging bpf/master (6185266c5a85 selftests/bpf: Mask bpf_csum_diff() return value to 16 bits in test_verifier) Merging ipsec/master (4c38255892c0 vti6: fix ipv4 pmtu check to honor ip header df) CONFLICT (content): Merge conflict in net/ipv6/ip6_vti.c CONFLICT (content): Merge conflict in net/ipv4/ip_vti.c Merging netfilter/master (9cc0001a18b4 netfilter: nftables: disallow updates on table ownership) Merging ipvs/master (44a674d6f798 Merge tag 'mlx5-fixes-2021-01-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) Merging wireless-drivers/master (295d4cd82b01 iwlwifi: don't call netif_napi_add() with rxq->lock held (was Re: Lockdep warning in iwl_pcie_rx_handle())) Merging mac80211/master (8811f4a9836e tcp: add sanity tests to TCP_QUEUE_SEQ) Merging rdma-fixes/for-rc (3a9b3d4536e0 IB/mlx5: Add missing error code) Merging sound-current/for-linus (26af17722a07 ALSA: hda/realtek: Apply dual codec quirks for MSI Godlike X570 board) Merging sound-asoc-fixes/for-linus (0bf36bd63292 Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus) Merging regmap-fixes/for-linus (fe07bfda2fb9 Linux 5.12-rc1) Merging regulator-fixes/for-linus (a077a13f9baf Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus) Merging spi-fixes/for-linus (21bb242db523 Merge remote-tracking branch 'spi/for-5.12' into spi-linus) Merging pci-current/for-linus (7e69d07d7c3c Revert "PCI/ASPM: Save/restore L1SS Capability for suspend/resume") Merging driver-core.current/driver-core-linus (fe07bfda2fb9 Linux 5.12-rc1) Merging tty.current/tty-linus (511a9d5dc2d4 Revert "serial: max310x: rework RX interrupt handling") Merging usb.current/usb-linus (466b4bed6798 usb: gadget: f_uac1: stop playback on function disable) Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup) Merging usb-serial-fixes/usb-linus (9a962f427abb USB: serial: xr: fix NULL-deref on disconnect) Merging usb-chipidea-fixes/for-usb-fixes (491b1bea0004 MAINTAINERS: update Peter Chen's email address) Merging phy/fixes (c92e72ae9e0e phy: ti: j721e-wiz: add missing call to of_node_put()) Merging staging.current/staging-linus (d1a5bd3f875c staging: comedi: pcl726: Use 16-bit 0 for interrupt data) Merging char-misc.current/char-misc-linus (62cde0ebfa5d Merge tag 'misc-habanalabs-fixes-2021-03-03' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-linus) Merging soundwire-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging thunderbolt-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging input-current/for-linus (1bff77f41a80 Input: st1232 - fix NORMAL vs. IDLE state handling) 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 (e4eccb853664 vfio/pci: Bypass IGD init in case of -ENODEV) Merging kselftest-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) Merging dmaengine-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging backlight-fixes/for-backlight-fixes (5c8fe583cce5 Linux 5.11-rc1) Merging mtd-fixes/mtd/fixes (b135b3358d73 mtd: rawnand: omap: Use BCH private fields in the specific OOB layout) Merging mfd-fixes/for-mfd-fixes (5c8fe583cce5 Linux 5.11-rc1) Merging v4l-dvb-fixes/fixes (246dc3e4a75b media: rc: compile rc-cec.c into rc-core) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging at91-fixes/at91-fixes (16457a528e63 ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet) Merging omap-fixes/fixes (816fa08a1a32 ARM: OMAP4: Fix cpu_pm handling for HS/EMU interrupt save) Merging kvm-fixes/master (fe07bfda2fb9 Linux 5.12-rc1) Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) Merging hwmon-fixes/hwmon (4008bc7d3953 hwmon: (dell-smm) Add XPS 15 L502X to fan control blacklist) Merging nvdimm-fixes/libnvdimm-fixes (7018c897c2f2 libnvdimm/dimm: Avoid race between probe and available_slots_show()) Merging btrfs-fixes/next-fixes (026fb436af2e 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 (fe07bfda2fb9 Linux 5.12-rc1) Merging samsung-krzk-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging pinctrl-samsung-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging devicetree-fixes/dt/linus (8242ff9ea9f0 dt-bindings: display: mediatek,dpi: Convert to use graph schema) Merging scsi-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging drm-fixes/drm-fixes (f69d02e37a85 Merge tag 'misc-5.12-2021-03-02' of git://git.kernel.dk/linux-block) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging mmc-fixes/fixes (4d52020545ac mmc: mmci: Add MMC_CAP_NEED_RSP_BUSY for the stm32 variants) Merging rtc-fixes/rtc-fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging gnss-fixes/gnss-linus (fe07bfda2fb9 Linux 5.12-rc1) Merging hyperv-fixes/hyperv-fixes (a22662138477 Drivers: hv: vmbus: Drop error message when 'No request id available') Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) Merging risc-v-fixes/fixes (f01e631cccab RISC-V: Make NUMA depend on SMP) Merging pidfd-fixes/fixes (a409ed156a90 Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fpga-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging spdx/spdx-linus (c03c21ba6f4e Merge tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) Merging gpio-brgl-fixes/gpio/for-current (235c2d137007 gpio: fix gpio-device list corruption) Merging gpio-intel-fixes/fixes (437b57d20859 gpio: pca953x: Set IRQ type when handle Intel Galileo Gen 2) Merging pinctrl-intel-fixes/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (d50ffcd2c371 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 (76f3011fc516 rpc: fix NULL dereference on kmalloc failure) Merging drm-misc-fixes/for-linux-next-fixes (bde649441366 fbdev: atyfb: use LCD management functions for PPC_PMAC also) Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) Merging kbuild/for-next (6fbd6cf85a3b Merge tag 'kbuild-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc4) Merging dma-mapping/for-next (fe07bfda2fb9 Linux 5.12-rc1) 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 (1afb7e6348aa Merge branch 'devel-stable' into for-next) Merging arm64/for-next/core (1ffa9763828c Merge branch 'for-next/vdso' into for-next/core) Merging arm-perf/for-next/perf (f0c140481d1b perf: Constify static struct attribute_group) Merging arm-soc/for-next (e6c44b8c57c9 soc: document merges) Merging actions/for-next (006828d706fd Merge branch 'v5.12/defconfig' into for-next) Merging amlogic/for-next (9faeb18107d1 Merge branch 'v5.12/soc' 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 (fe07bfda2fb9 Linux 5.12-rc1) Merging drivers-memory/for-next (cd6eb6742578 memory: tegra: replace DEFINE_SIMPLE_ATTRIBUTE with DEFINE_DEBUGFS_ATTRIBUTE) Merging imx-mxs/for-next (7535d59c5f11 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 (01e73147cbf8 Merge branch 'fixes' into for-next) Merging qcom/for-next (d242adf2067e Merge branch 'arm64-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 (3158164f1526 Merge branches 'renesas-arm-dt-for-v5.13' and 'renesas-drivers-for-v5.13' into renesas-next) Merging reset/reset/next (d17655759b3f reset: Add devm_reset_control_get_optional_exclusive_released()) Merging rockchip/for-next (38051549ac38 Merge branch 'v5.12-clk/next' into for-next) Merging samsung-krzk/for-next (944aa7186d59 Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (f40ddce88593 Linux 5.11) Merging stm32/stm32-next (a9c92a9671d7 ARM: dts: stm32: add #clock-cells property to usbphyc node on stm32mp151) Merging sunxi/sunxi/for-next (981e0af7e064 Merge branches 'sunxi/dt-for-5.13' and 'sunxi/clk-for-5.13' into sunxi/for-next) Merging tegra/for-next (b62f4a3fbb22 Merge branch for-5.12/arm64/defconfig 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 (0d7571c36331 arm64: dts: ti: k3-am65-main: Add device_type to pcie*_rc nodes) Merging clk/clk-next (4d5c4ae32945 Merge branches 'clk-socfpga', 'clk-mstar', 'clk-qcom' and 'clk-warnings' into clk-next) Merging clk-renesas/renesas-clk (24ece96554a9 clk: renesas: cpg-mssr: Fix formatting issues for 'smstpcr_saved's documentation) Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) Merging csky/linux-next (499725927061 module: remove duplicate include in arch/csky/kernel/entry.S) Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) Merging m68k/for-next (5d2b62832c2e m68k: Fix virt_addr_valid() W=1 compiler warnings) Merging m68knommu/for-next (751e8e413e59 m68k: fix flatmem memory model setup) Merging microblaze/next (9dc12e4ccd97 microblaze: tag highmem_setup() with __meminit) Merging mips/mips-next (aa697abd60e2 MIPS: force CONFIG_PCI to on for IP27 and IP30) 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 (778e45d7720d parisc: Enable -mlong-calls gcc option with CONFIG_COMPILE_TEST) Merging powerpc/next (fe07bfda2fb9 Linux 5.12-rc1) 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 (dd2d082b5760 riscv: Cleanup setup_bootmem()) Merging s390/for-next (1f6f48a8c81e Merge branch 'fixes' 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 (ddad5187fc2a um: irq.h: include <asm-generic/irq.h>) Merging xtensa/xtensa-for-next (d5cd31a2b6af xtensa: move coprocessor_flush to the .text section) 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 (58e7ffc82f41 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 (9cee91bcf4db Merge branch 'for-next-next-v5.12-20210226' into for-next-20210226) CONFLICT (content): Merge conflict in fs/btrfs/file.c Merging ceph/master (558b4510f622 ceph: defer flushing the capsnap if the Fb is used) Merging cifs/for-next (a671cb46c294 smb3: allow files to be created with backslash in name) Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue) Merging ecryptfs/next (902af369942f ecryptfs: use DEFINE_MUTEX() for mutex lock) Merging erofs/dev (ce0631291813 erofs: initialized fields can only be observed after bit is set) Merging exfat/dev (fe07bfda2fb9 Linux 5.12-rc1) Merging ext3/for_next (c5b8ccc3da76 Pull udf & isofs UID/GID parsing fixes.) Merging ext4/dev (0a76945fd1ba ext4: add .kunitconfig fragment to enable ext4-specific tests) Merging f2fs/dev (c11aa54f38ff f2fs: fix error handling in f2fs_end_enable_verity()) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (5d069dbe8aaf fuse: fix bad inode) Merging jfs/jfs-next (c03c21ba6f4e Merge tag 'keys-misc-20210126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) Merging nfs/linux-next (92bf22614b21 Linux 5.11-rc7) Merging nfs-anna/linux-next (7ae017c7322e NFS: Support the '-owrite=' option in /proc/self/mounts and mountinfo) Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) Merging cel/for-next (26d89fd782b0 nfsd: helper for laundromat expiry calculations) 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 (756b1c343333 xfs: use current->journal_info for detecting transaction recursion) Merging zonefs/for-next (059c01039c01 zonefs: Fix file size of zones in full condition) Merging iomap/iomap-for-next (ed1128c2d0c8 xfs: reduce exclusive locking on unaligned dio) Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) Merging file-locks/locks-next (cc4a3f885e8f fcntl: make F_GETOWN(EX) return 0 on dead owner task) Merging vfs/for-next (086e94e6f4c3 Merge branches 'work.recursive_removal' and 'work.coredump' into for-next) Merging printk/for-next (f78dd21aa363 Merge branch 'for-5.12-no_hash_pointers' into for-next) Merging pci/next (e18fb64b7986 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 (914fe0466c86 Merge branch 'for-5.12/playstation-v2' into for-next) Merging i2c/i2c/for-next (fe07bfda2fb9 Linux 5.12-rc1) Merging i3c/i3c/next (fe07bfda2fb9 Linux 5.12-rc1) Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) Merging hwmon-staging/hwmon-next (6ab3332cc692 MAINTAINERS: Add entry for Texas Instruments TPS23861 PoE PSE) Merging jc_docs/docs-next (ba5cb300e0b5 docs: arm: /chosen node parameters) Merging v4l-dvb/master (f3ea6a19f413 media: vbi_hsync.svg: fix the viewports) Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include) CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_helper.c CONFLICT (content): Merge conflict in Documentation/dev-tools/kasan.rst CONFLICT (content): Merge conflict in Documentation/conf.py Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (51165d52eceb Merge branch 'powercap' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (8f9d3ee02bcc cpufreq: blacklist Arm Vexpress platforms in cpufreq-dt-platdev) Merging cpupower/cpupower (fe07bfda2fb9 Linux 5.12-rc1) Merging devfreq/devfreq-next (0d844b9f3177 PM / devfreq: rk3399_dmc: Simplify with dev_err_probe()) Merging opp/opp/linux-next (de04241ab87a opp: Don't skip freq update for different frequency) Merging thermal/thermal/linux-next (a51afb13311c thermal: cpufreq_cooling: freq_qos_update_request() returns < 0 on error) 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 (c7a3549673d8 fs: dlm: add shutdown hook) Merging swiotlb/linux-next (daf9514fd5eb swiotlb: Validate bounce size in the sync/unmap path) Merging rdma/for-next (fe07bfda2fb9 Linux 5.12-rc1) Merging net-next/master (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging bpf-next/for-next (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging ipsec-next/master (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging mlx5-next/mlx5-next (fe07bfda2fb9 Linux 5.12-rc1) Merging netfilter-next/master (38b5133ad607 octeontx2-pf: Fix otx2_get_fecparam()) Merging ipvs-next/master (a61e4b60761f Merge branch 'net-dsa-hellcreek-add-taprio-offloading') Merging wireless-drivers-next/master (773dc50d7169 Merge branch 'Xilinx-axienet-updates') Merging bluetooth/master (ff02db13e9bf Bluetooth: Allow scannable adv with extended MGMT APIs) Merging mac80211-next/master (38b5133ad607 octeontx2-pf: Fix otx2_get_fecparam()) Merging gfs2/for-next (f6e1e1d1e149 Merge tag 'gfs2-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) Merging mtd/mtd/next (457da931b608 mtd: parsers: ofpart: support BCM4908 fixed partitions) Merging nand/nand/next (99a8e1154eb1 mtd: rawnand: qcom: Return actual error code instead of -ENODEV) Merging spi-nor/spi-nor/next (fe07bfda2fb9 Linux 5.12-rc1) Merging crypto/master (0de9dc80625b hwrng: timeriomem - Use device-managed registration API) Merging drm/drm-next (d153e8c156da Merge tag 'drm-intel-next-fixes-2021-02-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) Merging drm-misc/for-linux-next (5fd3de7a5185 drm/compat: Clear bounce structures) Merging amdgpu/drm-next (47e72ce732de drm/amdgpu/dc: fill in missing call to atom cmd table for pll adjust v2) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c Merging drm-intel/for-linux-next (9d8fddf8579a drm/i915: Disable outputs during unregister) Merging drm-tegra/drm/tegra/for-next (dcdfe2712b68 drm/tegra: Fix reference leak when pm_runtime_get_sync() fails) Merging drm-msm/msm-next (7bf168c8fe8c drm/msm: Fix speed-bin support not to access outside valid memory) 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 (fe07bfda2fb9 Linux 5.12-rc1) Merging sound/for-next (2c48653c1bc3 ALSA: pci: vx222: fix kernel-doc warning) Merging sound-asoc/for-next (1bc068f39415 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 (4c47097f8514 Input: aiptek - convert sysfs sprintf/snprintf family to sysfs_emit) Merging block/for-next (0fcab68db7db Merge branch 'io_uring-5.12' into for-next) Merging device-mapper/for-next (a666e5c05e7c dm: fix deadlock when swapping to encrypted device) Merging pcmcia/pcmcia-next (4ce6b242b78d pcmcia: Switch to using the new API kobj_to_dev()) Merging mmc/next (4e596fc8a610 mmc: sdhci-pci-o2micro: Add missing checks in sdhci_pci_o2_probe) Merging mfd/for-mfd-next (14711e8f92cc dt-bindings: mfd: ricoh,rn5t618: Trivial: Fix spelling mistake of 'additionally') Merging backlight/for-backlight-next (0b5e0f45af40 backlight/video: Use Platform getter/setter functions) Merging battery/for-next (ef11d03735ac power: supply: smb347-charger: Clean up whitespaces in the code) Merging regulator/for-next (c54607a8383c Merge remote-tracking branch 'regulator/for-5.13' into regulator-next) Merging security/next-testing (9dcd47fc1f7d Merge branch 'fixes-v5.10' into next-testing) Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) Merging integrity/next-integrity (f6692213b504 integrity: Make function integrity_add_key() static) Merging keys/keys-next (ea20ea8b8ba4 integrity: Load mokx variables into the blacklist keyring) Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) Merging selinux/next (365982aba1f2 fs: anon_inodes: rephrase to appropriate kernel-doc) Merging smack/next (7ef4c19d245f smackfs: restrict bytes count in smackfs write functions) Merging tomoyo/master (fe07bfda2fb9 Linux 5.12-rc1) Merging tpmdd/next (232a37ea3aee tpm: Remove unintentional dump_stack() call) Merging watchdog/master (a4f3407c4160 watchdog: qcom: Remove incorrect usage of QCOM_WDT_ENABLE_IRQ) Merging iommu/next (45e606f27269 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next) Merging audit/next (127c8c5f0589 audit: Make audit_filter_syscall() return void) Merging devicetree/for-next (cb8be8b4b27f driver core: platform: Drop of_device_node_put() wrapper) Merging mailbox/mailbox-for-next (6b50df2b8c20 mailbox: arm_mhuv2: Skip calling kfree() with invalid pointer) Merging spi/for-next (86afa3913263 Merge remote-tracking branch 'spi/for-5.13' into spi-next) Merging tip/auto-latest (43e65ddac19c Merge branch 'locking/core') Merging clockevents/timers/drivers/next (e85c1d21b16b clocksource/drivers/timer-microchip-pit64b: Add clocksource suspend/resume) Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' into edac-for-next) Merging irqchip/irq/irqchip-next (c83fd57be3fe irqdomain: Remove debugfs_file from struct irq_domain) Merging ftrace/for-next (e23db805da2d tracing/tools: Add the latency-collector to tools directory) Merging rcu/rcu/next (08804dc76ea2 rcu/tree: Add a trace event for RCU CPU stall warnings) Merging kvm/next (9e46f6c6c959 KVM: SVM: Clear the CR4 register on reset) Merging kvm-arm/next (255af9c2d1df Merge remote-tracking branch 'kvmarm/fixes' 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 (50a05be484cb KVM: s390: track synchronous pfault events in kvm_stat) Merging xen-tip/linux-next (53f131c284e8 xen-front-pgdir-shbuf: don't record wrong grant handle upon error) 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 (fe07bfda2fb9 Linux 5.12-rc1) Merging chrome-platform/for-next (b996c10e0f5b Merge tag 'tag-chrome-platform-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init) Merging leds/for-next (b0a82efa51ad leds: lp50xx: Get rid of redundant explicit casting) Merging ipmi/for-next (fc26067c7417 ipmi: remove open coded version of SMBus block write) Merging driver-core/driver-core-next (fe07bfda2fb9 Linux 5.12-rc1) Merging usb/usb-next (5bb9cdb320a5 USB: remove usb_bus_type from usb.h) Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.) Merging usb-serial/usb-next (fe07bfda2fb9 Linux 5.12-rc1) Merging usb-chipidea-next/for-usb-next (1ee18ded86ec usb: cdnsp: Removes some useless trace events) Merging tty/tty-next (1f8a51ee3242 tty: serial: pch_uart.c: remove debugfs dentry pointer) Merging char-misc/char-misc-next (870ef26e952c drivers: habanalabs: remove unused dentry pointer for debugfs files) Merging extcon/extcon-next (b906ab549836 extcon: qcom-spmi: Add support for VBUS detection) Merging phy-next/next (8e6b3a78eddd phy: tusb1210: use bitmasks to set VENDOR_SPECIFIC2) Merging soundwire/next (fe07bfda2fb9 Linux 5.12-rc1) Merging thunderbolt/next (a5b18338eb39 thunderbolt: Drop unused functions tb_switch_is_[ice|tiger]_lake()) Merging vfio/next (4d83de6da265 vfio/type1: Batch page pinning) Merging staging/staging-next (4e1c5d4c35d8 staging: wimax/i2400m: convert __le32 type to host byte-order) 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 (3ffdec2843e1 Merge branch 'icc-fixes' into HEAD) Merging dmaengine/next (fe07bfda2fb9 Linux 5.12-rc1) Merging cgroup/for-next (00bfa16052cd Merge branch 'for-5.11-fixes' into for-next) Merging scsi/for-next (586b0f072857 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (100d21c4ff29 scsi: target: core: Make completion affinity configurable) Merging vhost/linux-next (1f77f124f2f2 ALSA: virtio: introduce device suspend/resume support) Merging rpmsg/for-next (fcb4c469244b 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 (fe07bfda2fb9 Linux 5.12-rc1) Merging gpio-intel/for-next (437b57d20859 gpio: pca953x: Set IRQ type when handle Intel Galileo Gen 2) Merging pinctrl/for-next (292bdd2cf719 Merge branch 'devel' into for-next) $ git reset --hard HEAD^ Merging next-20210303 version of pinctrl Merging pinctrl-intel/for-next (fe07bfda2fb9 Linux 5.12-rc1) Merging pinctrl-renesas/renesas-pinctrl (a5cda861ed57 pinctrl: renesas: r8a779a0: Add TPU pins, groups and functions) Merging pinctrl-samsung/for-next (fe07bfda2fb9 Linux 5.12-rc1) Merging pwm/for-next (9a9dd7e47351 pwm: lpc18xx-sct: remove unneeded semicolon) 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 (fe07bfda2fb9 Linux 5.12-rc1) 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 (fe07bfda2fb9 Linux 5.12-rc1) 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 (a381b70a1cf8 seccomp: Improve performace by optimizing rmb()) 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 (eaa895a2f4df 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 (667fbb3fcde1 nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer) Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders) Merging hyperv/hyperv-next (513ef616b19b drivers: hv: Fix whitespace errors) Merging auxdisplay/auxdisplay (b45616445a6e auxdisplay: Fix duplicate CHARLCD config symbol) Merging kgdb/kgdb/for-next (f11e2bc682cc kgdb: Remove kgdb_schedule_breakpoint()) Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) Merging fpga/for-next (fe07bfda2fb9 Linux 5.12-rc1) Merging kunit/test (fe07bfda2fb9 Linux 5.12-rc1) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) Merging cfi/cfi/next (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver) Merging kunit-next/kunit (fe07bfda2fb9 Linux 5.12-rc1) 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 (9e04adfcab78 mhi: Fix double dma free) 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 oprofile-removal/oprofile/removal (be65de6b03aa fs: Remove dcookies support) Merging akpm-current/current (a2c9f62c837e aio: simplify read_events()) $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (9ce8c05f0c26 Merge branch 'akpm-current/current')
Attachment:
pgprHMgI9Zych.pgp
Description: OpenPGP digital signature
