Hi all, Changes since 20200911:
The nand tree lost its build failure but gained another for which I reverted a commit. The v4l-dvb tree gained a build failure so I marked a driver BROKEN. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 6584 7632 files changed, 242129 insertions(+), 130861 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 328 trees (counting Linus' and 86 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 (5712c3ed549e Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) Merging kbuild-current/fixes (f4d51dffc6c0 Linux 5.9-rc4) Merging arc-current/for-curr (f4d51dffc6c0 Linux 5.9-rc4) Merging arm-current/fixes (5c6360ee4a0e ARM: 8988/1: mmu: fix crash in EFI calls due to p4d typo in create_mapping_late()) Merging arm64-fixes/for-next/fixes (ed888cb0d1eb arm64: Allow CPUs unffected by ARM erratum 1418040 to come in late) Merging arm-soc-fixes/arm/fixes (a4da411e4189 Merge tag 'arm-soc/for-5.9/devicetree-fixes' of https://github.com/Broadcom/stblinux into arm/fixes) Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2) Merging drivers-memory-fixes/fixes (7ff3a2a626f7 memory: jz4780_nemc: Fix an error pointer vs NULL check in probe()) Merging m68k-current/for-linus (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3) Merging powerpc-fixes/fixes (0460534b532e powerpc/papr_scm: Limit the readability of 'perf_stats' sysfs attribute) Merging s390-fixes/fixes (4b3b4f5a156e s390/kasan: check ultravisor addressing limitations) Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) Merging net/master (5760d9acbe95 net: ethernet: ti: cpsw_new: fix suspend/resume) Merging bpf/master (fde6dedfb794 docs/bpf: Fix ringbuf documentation) Merging ipsec/master (8366685b2883 xfrm: clone whole liftime_cur structure in xfrm_do_migrate) Merging netfilter/master (9b29e26f7934 Merge branch 'net-qed-disable-aRFS-in-NPAR-and-100G') Merging ipvs/master (7c7ab580db49 net: Convert to use the fallthrough macro) Merging wireless-drivers/master (1264c1e0cfe5 Revert "wlcore: Adding suppoprt for IGTK key in wlcore driver") Merging mac80211/master (c8146fe292a7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging rdma-fixes/for-rc (0b089c1ef704 IB/isert: Fix unaligned immediate-data handling) Merging sound-current/for-linus (8949b6660c3c Merge tag 'asoc-fix-v5.9-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (953ad6f82619 Merge remote-tracking branch 'asoc/for-5.9' into asoc-linus) Merging regmap-fixes/for-linus (f75aef392f86 Linux 5.9-rc3) Merging regulator-fixes/for-linus (ba3b5b3e132f Merge remote-tracking branch 'regulator/for-5.9' into regulator-linus) Merging spi-fixes/for-linus (59e174ef2be0 Merge remote-tracking branch 'spi/for-5.9' into spi-linus) Merging pci-current/for-linus (e338eecf3fe7 PCI: rockchip: Fix bus checks in rockchip_pcie_valid_device()) Merging driver-core.current/driver-core-linus (baaabecfc80f test_firmware: Test platform fw loading on non-EFI systems) Merging tty.current/tty-linus (f75aef392f86 Linux 5.9-rc3) Merging usb.current/usb-linus (a29c0adbb688 Merge tag 'usb-serial-5.9-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) Merging usb-gadget-fixes/fixes (51609fba0cca usb: dwc3: simple: add support for Hikey 970) Merging usb-serial-fixes/usb-linus (2bb70f0a4b23 USB: serial: option: support dynamic Quectel USB compositions) Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core: add wakeup support for extcon) Merging phy/fixes (850280156f64 phy: ti: am654: Fix a leak in serdes_am654_probe()) Merging staging.current/staging-linus (a139ffa40f0c iio: adc: mcp3422: fix locking on error path) Merging char-misc.current/char-misc-linus (952e934d7f68 Revert "dyndbg: accept query terms like file=bar and module=foo") Merging soundwire-fixes/fixes (3fbbf2148a40 soundwire: fix double free of dangling pointer) Merging thunderbolt-fixes/fixes (f022ff7bf377 thunderbolt: Retry DROM read once if parsing fails) Merging input-current/for-linus (c4440b8a4577 Input: i8042 - add Entroware Proteus EL07R4 to nomux and reset lists) Merging crypto-current/master (1b0df11fde0f padata: fix possible padata_works_lock deadlock) Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) Merging vfio-fixes/for-linus (aae7a75a821a vfio/type1: Add proper error unwind for vfio_iommu_replay()) Merging kselftest-fixes/fixes (5c1e4f7e9e49 selftests/timers: Turn off timeout setting) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) Merging dmaengine-fixes/fixes (f4d51dffc6c0 Linux 5.9-rc4) Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) Merging mtd-fixes/mtd/fixes (f7e6b19bc764 mtd: properly check all write ioctls for permissions) Merging mfd-fixes/for-mfd-fixes (22380b65dc70 mfd: mfd-core: Ensure disabled devices are ignored without error) Merging v4l-dvb-fixes/fixes (288eceb08583 media: cec-adap.c: don't use flush_scheduled_work()) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (baf5cb30fbd1 MIPS: SNI: Fix SCSI interrupt) Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) Merging omap-fixes/fixes (6542e2b613c2 ARM: dts: omap5: Fix DSI base address and clocks) Merging kvm-fixes/master (37f66bbef092 KVM: emulator: more strict rsm checks.) Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins to 1) Merging hwmon-fixes/hwmon (d50e0d750004 hwmon: (sparx5) Fix initial reading of temperature) Merging nvdimm-fixes/libnvdimm-fixes (6180bb446ab6 dax: fix detection of dax support for non-persistent memory block devices) Merging btrfs-fixes/next-fixes (fd0aed2b3d46 Merge branch 'misc-5.9' into next-fixes) Merging vfs-fixes/fixes (9d682ea6bcc7 vboxsf: Fix the check for the old binary mount-arguments struct) Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) Merging drivers-x86-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) Merging samsung-krzk-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (9123e3a74ec7 Linux 5.9-rc1) Merging devicetree-fixes/dt/linus (d89a80ddbfd8 dt-bindings: crypto: sa2ul: fix a DT binding check warning) Merging scsi-fixes/fixes (244359c99fd9 scsi: libsas: Fix error path in sas_notify_lldd_dev_found()) Merging drm-fixes/drm-fixes (7f7a47952c0f Merge tag 'drm-misc-fixes-2020-09-09' of git://anongit.freedesktop.org/drm/drm-misc 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 (0c4c801b31f8 drm/i915: fix regression leading to display audio probe failure on GLK) Merging mmc-fixes/fixes (f0c393e2104e mmc: sdio: Use mmc_pre_req() / mmc_post_req()) Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1) Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) Merging hyperv-fixes/hyperv-fixes (19873eec7e13 Drivers: hv: vmbus: hibernation: do not hang forever in vmbus_bus_resume()) Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create) Merging risc-v-fixes/fixes (66d18dbda846 RISC-V: Take text_mutex in ftrace_init_nop()) Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough notation) Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake) Merging spdx/spdx-linus (f4d51dffc6c0 Linux 5.9-rc4) Merging gpio-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) Merging pinctrl-intel-fixes/fixes (3488737093e7 pinctrl: cherryview: Preserve CHV_PADCTRL1_INVRXTX_TXDATA flag on GPIOs) Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (21a6d1780d5b kunit: tool: allow generating test results in JSON) Merging ubifs-fixes/fixes (f37e99aca03f Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into master) Merging memblock-fixes/fixes (5f7b81c18366 ia64: fix min_low_pfn/max_low_pfn build errors) Merging drm-misc-fixes/for-linux-next-fixes (74ea06164cda drm/sun4i: mixer: Extend regmap max_register) Merging kspp-gustavo/for-next/kspp (cb0938372de0 Merge branch 'for-next/clang' into for-next/kspp) Merging kbuild/for-next (26bde0ed700d Merge branch 'kbuild' (early part) into for-next) Merging compiler-attributes/compiler-attributes (e5fc436f06ee sparse: use static inline for __chk_{user,io}_ptr()) Merging dma-mapping/for-next (a92df4f62fda dma-mapping: move the dma_declare_coherent_memory documentation) Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (4dffbda6a996 Merge branches 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (e35928ce20ba Merge branches 'for-next/acpi', 'for-next/cpuinfo', 'for-next/misc', 'for-next/mm', 'for-next/perf', 'for-next/topology', 'for-next/tpyos' and 'for-next/vdso' into for-next/core) Merging arm-perf/for-next/perf (f75aef392f86 Linux 5.9-rc3) Merging arm-soc/for-next (6e5fe0090bcd ARM: Document merges) Merging amlogic/for-next (c943b84fab78 Merge branch 'v5.10/dt64' into tmp/aml-rebuild) Merging aspeed/for-next (315d4a38c4b6 ARM: config: aspeed_g5: Enable IBM OP Panel driver) Merging at91/at91-next (0ec63ea2b8cd Merge branches 'at91-soc' and 'at91-dt' into at91-next) Merging drivers-memory/for-next (a8529f3b1cd8 memory: mtk-smi: add support for MT8167) Merging imx-mxs/for-next (dcb7078ce243 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (36f3ea3c42ce Merge branch 'for_5.10/drivers-soc' into next) Merging mediatek/for-next (2fb345db29ad Merge branch 'v5.9-next/soc' into for-next) Merging mvebu/for-next (29bd9d8c2ac1 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (34766a7d60e9 Merge branch 'omap-for-v5.10/defconfig' into for-next) Merging qcom/for-next (43d0665fb8f0 Merge branches 'arm64-for-5.10' and 'arm64-defconfig-for-5.10' into for-next) CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig Merging raspberrypi/for-next (4564363351e2 ARM: dts: bcm2711: Enable the display pipeline) Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) Merging renesas/next (9b060e6015d3 Merge branches 'renesas-arm-dt-for-v5.10' and 'renesas-drivers-for-v5.10' into renesas-next) Merging reset/reset/next (2983e2385ff6 reset: imx7: add the cm4 reset for i.MX8MQ) CONFLICT (content): Merge conflict in drivers/reset/reset-imx7.c Merging rockchip/for-next (5b54a6a5703f Merge branch 'v5.10-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (b8a3b763539f Merge branch 'next/dt64-schema-var' into for-next) Merging scmi/for-linux-next (08671beba822 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging sunxi/sunxi/for-next (5bcae6ef32b0 Merge branch 'sunxi/dt-for-5.10' into sunxi/for-next) Merging tegra/for-next (05ccc6eebf8e Merge branch for-5.10/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 (e5c956c4f36c arm64: dts: ti: k3-*: Fix up node_name_chars_strict warnings) Merging uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next) Merging clk/clk-next (2d0cc1cd35f2 Merge branch 'clk-fixes' into clk-next) Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7) Merging csky/linux-next (bdcd93ef9afb csky: Add context tracking support) Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) Merging ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs) Merging m68k/for-next (352e04291115 m68k: Replace HTTP links with HTTPS ones) Merging m68knommu/for-next (ef03e4545eac m68knommu: switch to using asm-generic/uaccess.h) CONFLICT (content): Merge conflict in arch/m68k/Kconfig Merging microblaze/next (4a17e8513376 microblaze: fix kbuild redundant file warning) Merging mips/mips-next (601637e42df0 MIPS: Remove mach-*/war.h) Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) Merging openrisc/for-next (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok) Merging parisc-hd/for-next (c71fcd3c4fcf parisc: disable CONFIG_IDE in defconfigs) Merging powerpc/next (dc462267d2d7 powerpc/64s: handle ISA v3.1 local copy-paste context switches) Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register) Merging risc-v/for-next (87fa497f7f9a riscv/mm/fault: Set FAULT_FLAG_INSTRUCTION flag in do_page_fault()) Merging s390/features (4bff8cb54502 s390: convert to GENERIC_VDSO) Merging sh/for-next (0c64a0dce51f sh: landisk: Add missing initialization of sh_io_port_base) 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 (f6e8c474390b um: virtio: Replace zero-length array with flexible-array) Merging xtensa/xtensa-for-next (4ca4c562efb6 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype) Merging fscrypt/master (5e895bd4d523 fscrypt: restrict IV_INO_LBLK_32 to ino_bits <= 32) Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) Merging btrfs/for-next (abecc38b009f Merge branch 'for-next-next-v5.9-20200910' into for-next-20200910) Merging ceph/master (f44d04e696fe rbd: require global CAP_SYS_ADMIN for mapping and unmapping) Merging cifs/for-next (5a3c558a9f05 Merge tag '5.9-rc4-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6) Merging configfs/for-next (059ccbfff8a8 configfs: use flush file op to commit writes to a binary file) Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) Merging erofs/dev (cfcedfe21820 erofs: avoid duplicated permission check for "trusted." xattrs) Merging exfat/dev (9764d7e25a9f exfat: eliminate dead code in exfat_find()) Merging ext3/for_next (d1c10767837c quota: Expand comment describing d_itimer) Merging ext4/dev (27bc446e2def ext4: limit the length of per-inode prealloc list) Merging f2fs/dev (6fcaebac6667 f2fs: change virtual mapping way for compression pages) Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info) Merging fuse/for-next (9a752d18c85a virtiofs: add logic to free up a memory range) Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member) Merging nfs/linux-next (729e3d091984 Merge tag 'ceph-for-5.9-rc5' of git://github.com/ceph/ceph-client) Merging nfs-anna/linux-next (65caafd0d214 SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion")) Merging nfsd/nfsd-next (9123e3a74ec7 Linux 5.9-rc1) Merging cel/cel-next (f75aef392f86 Linux 5.9-rc3) Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret) Merging overlayfs/overlayfs-next (8f6ee74c2786 ovl: rearrange ovl_can_list()) Merging ubifs/next (798b7347e4f2 jffs2: fix UAF problem) Merging v9fs/9p-next (2ed0b7578170 9p: Remove unneeded cast from memory allocation) Merging xfs/for-next (18a1031619de xfs: ensure that fpunch, fcollapse, and finsert operations are aligned to rt extent size) Merging zonefs/for-next (d012a7190fc1 Linux 5.9-rc2) Merging iomap/iomap-for-next (14284fedf59f iomap: Mark read blocks uptodate in write_begin) Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate()) Merging file-locks/locks-next (1ad5f100e3ba locks: Remove extra "0x" in tracepoint format specifier) Merging vfs/for-next (c5c8adc73309 Merge branches 'fixes', 'work.misc', 'work.sparc', 'base.set_fs' and 'work.csum_and_copy', remote-tracking branch 'vfs/work.epoll' into for-next) CONFLICT (content): Merge conflict in arch/s390/include/asm/checksum.h CONFLICT (content): Merge conflict in arch/m68k/Kconfig Merging printk/for-next (22ed34492cf7 Merge branch 'printk-rework' into for-next) Merging pci/next (763801810fc5 Merge branch 'remotes/lorenzo/pci/vmd') CONFLICT (content): Merge conflict in drivers/pci/controller/dwc/pci-imx6.c Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao) CONFLICT (content): Merge conflict in .mailmap Merging hid/for-next (5bd34639e3da Merge branch 'for-5.10/core' into for-next) Merging i2c/i2c/for-next (5b4d19dec5c9 Merge branch 'i2c/for-current' into i2c/for-next) Merging i3c/i3c/next (9da36a7ec421 i3c: master add i3c_master_attach_boardinfo to preserve boardinfo) Merging dmi/dmi-for-next (a3d13a0a23ea Replace HTTP links with HTTPS ones: DMI/SMBIOS SUPPORT) Merging hwmon-staging/hwmon-next (1d6baf062dee hwmon: (pmbus) Move boolean error condition check to generating code) Merging jc_docs/docs-next (78ff97ebd4e9 iio: iio.h: fix a warning at the kernel-doc markup) Merging v4l-dvb/master (c4176e12a755 media: media/test-drivers/Kconfig: fix broken Kconfig) Merging v4l-dvb-next/master (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it") Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (23818c154bae Merge branch 'pm-em' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (d168eaa6f6a1 cpufreq: qcom-hw: Make use of cpufreq driver_data for passing pdev) Merging cpupower/cpupower (527b7779e5ec cpupower: speed up generating git version string) Merging devfreq/devfreq-next (fe95e9d55e55 PM / devfreq: event: Change prototype of devfreq_event_get_edev_by_phandle function) Merging opp/opp/linux-next (257eba525a2e opp: Prevent memory leak in dev_pm_opp_attach_genpd()) Merging thermal/thermal/linux-next (6f55be9fd5ee Merge branch 'thermal/fixes' into thermal/linux-next) 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 (7ae0451e2e6c fs: dlm: use free_con to free connection) Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c Merging rdma/for-next (00b3c11879d7 RDMA/rxe: Convert tasklets to use new tasklet_setup() API) Merging net-next/master (e059c6f340f6 tulip: switch from 'pci_' to 'dma_' API) CONFLICT (content): Merge conflict in drivers/net/dsa/microchip/ksz9477.c Merging bpf-next/master (2bab48c5bef0 Merge branch 'improve-bpf-tcp-cc-init') Merging ipsec-next/master (02a20d4fef3d enic: switch from 'pci_' to 'dma_' API) Merging mlx5-next/mlx5-next (9123e3a74ec7 Linux 5.9-rc1) Merging netfilter-next/master (4f6a5caf187f net: dsa: b53: Report VLAN table occupancy via devlink) Merging ipvs-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next) Merging wireless-drivers-next/master (5a6bd84f8154 net: hns: use IRQ_NOAUTOEN to avoid irq is enabled due to request_irq) Merging bluetooth/master (e91172151a40 Bluetooth: btintel: Refactor firmware download function) Merging mac80211-next/master (0f091e43310f netlabel: remove unused param from audit_log_format()) Merging gfs2/for-next (2928eebec009 gfs2: Fix bad comment for trans_drain) Merging mtd/mtd/next (1840ff8d4261 mtd: mtdconcat: map: remove redundant assignment to variable 'size') Merging nand/nand/next (6534d0b57d71 mtd: rawnand: vf610: Remove unused function vf610_nfc_transfer_size()) Applying: Revert "mtd: onenand: omap2: Allow for compile-testing on !ARM" Merging spi-nor/spi-nor/next (e93a977367b2 mtd: revert "spi-nor: intel: provide a range for poll_timout") Merging crypto/master (8db1824f5a38 crypto: ux500 - Fix sparse endianness warnings) Merging drm/drm-next (166774a2c2c6 drm/i915: Fix slightly botched merge in __reloc_entry_gpu) Merging amdgpu/drm-next (1b7eca59ceb0 Revert "drm/radeon: handle PCIe root ports with addressing limitations") CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c Merging drm-intel/for-linux-next (0ea8a56de21b Merge drm/drm-next into drm-intel-next-queued) Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support 180° rotation) Merging drm-misc/for-linux-next (5684daa71383 drm: xlnx: remove defined but not used 'scaling_factors_666') Merging drm-msm/msm-next (1ef7c99d145c drm/msm/dsi: add support for 7nm DSI PHY/PLL) Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) Merging imx-drm/imx-drm/next (efd5a93d2a89 drm/imx: drop explicit drm_mode_config_cleanup) Merging etnaviv/etnaviv/next (c5d5a32ead1e drm/etnaviv: fix ref count leak via pm_runtime_get_sync) Merging regmap/for-next (b89102f28d29 Merge remote-tracking branch 'regmap/for-5.10' into regmap-next) Merging sound/for-next (2b3d2987d800 ALSA: firewire: Replace tasklet with work) Merging sound-asoc/for-next (4738d35c58e6 Merge remote-tracking branch 'asoc/for-5.10' into asoc-next) Merging modules/modules-next (14721add58ef module: Add more error message for failed kernel module loading) Merging input/next (e2c8c4ec48b5 platform/x86: thinkpad_acpi: Map Clipping tool hotkey to KEY_SELECTIVE_SCREENSHOT) Merging block/for-next (9875251dad8f Merge branch 'for-5.10/block' into for-next) Merging device-mapper/for-next (3a653b205f29 dm thin metadata: Fix use-after-free in dm_bm_set_read_only) Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) Merging mmc/next (91ca244bdcb6 mmc: sdhci-msm: Unconditionally call dev_pm_opp_of_remove_table()) CONFLICT (content): Merge conflict in drivers/mmc/host/Kconfig Merging mfd/for-mfd-next (59306d7db654 mfd: sprd: Add wakeup capability for PMIC IRQ) Merging backlight/for-backlight-next (7eb99a39ef76 video: backlight: cr_bllcd: Remove unused variable 'intensity') Merging battery/for-next (d8483f31487c dt-bindings: power: supply: Cleanup charger-manager bindings) Merging regulator/for-next (567bca9e3b92 Merge remote-tracking branch 'regulator/for-5.10' into regulator-next) Merging security/next-testing (bc62d68e2a0a device_cgroup: Fix RCU list debugging warning) Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) Merging integrity/next-integrity (48ce1ddce16b ima: Fail rule parsing when asymmetric key measurement isn't supportable) Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) Merging safesetid/safesetid-next (0476c865ded6 LSM: SafeSetID: Fix warnings reported by test bot) Merging selinux/next (e8ba53d0023a selinux: access policycaps with READ_ONCE/WRITE_ONCE) Merging smack/next (322dd63c7f98 Smack: Use the netlabel cache) Merging tomoyo/master (5384d92e4e02 tomoyo: Loosen pathname/domainname validation.) Merging tpmdd/next (9123e3a74ec7 Linux 5.9-rc1) Merging watchdog/master (18445bf405cb Merge tag 'spi-fix-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) Merging iommu/next (c59bc95e9144 Merge branches 'iommu/fixes', 'arm/allwinner', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'arm/qcom', 'x86/amd', 'x86/vt-d' and 'core' into next) Merging vfio/next (ccd59dce1a21 vfio/type1: Refactor vfio_iommu_type1_ioctl()) Merging audit/next (c07203516439 audit: Remove redundant null check) Merging devicetree/for-next (d8db9dc34871 dt-bindings: hwlock: omap: Convert binding to YAML) Merging mailbox/mailbox-for-next (884996986347 mailbox: mediatek: cmdq: clear task in channel before shutdown) Merging spi/for-next (a9928deda45e Merge remote-tracking branch 'spi/for-5.10' into spi-next) Merging tip/auto-latest (326138fc4fb6 Merge branch 'WIP.x86/seves') Merging clockevents/timers/drivers/next (9fba22584e54 clocksource: Ingenic: Add support for the Ingenic X1000 OST.) Merging edac/edac-for-next (66a7eb4cf792 Merge branch 'edac-misc' into edac-for-next) Merging irqchip/irq/irqchip-next (5660b62a26d7 Merge branch 'irq/misc-5.10' into irq/irqchip-next) Merging ftrace/for-next (38ce2a9e33db tracing: Add trace_array_init_printk() to initialize instance trace_printk() buffers) Merging rcu/rcu/next (45faed7569d3 srcu: Take early exit on memory-allocation failure) Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup) Merging kvm-arm/next (ae8bd85ca8a4 Merge branch 'kvm-arm64/pt-new' into kvmarm-master/next) Merging kvm-ppc/kvm-ppc-next (5706d14d2a94 KVM: PPC: Book3S HV: XICS: Replace the 'destroy' method by a 'release' method) Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) Merging xen-tip/linux-next (9e2369c06c8a xen: add helpers to allocate unpopulated memory) Merging percpu/for-next (e7fdd9a9bc95 Merge branch 'for-5.9-fixes' into for-next) Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON()) Merging drivers-x86/for-next (9123e3a74ec7 Linux 5.9-rc1) Merging chrome-platform/for-next (dd92f7dfe1ba platform/chrome: Kconfig: Remove the transitional MFD_CROS_EC config) Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging leds/for-next (03eb2ca44a95 leds: tlc591xx: Simplify with dev_err_probe()) Merging ipmi/for-next (e829295c9bae ipmi: Reset response handler when failing to send the command) Merging driver-core/driver-core-next (0de751169568 platform_device: switch to simpler IDA interface) Merging usb/usb-next (a5a6d2753e7e usb: typec: intel_pmc_mux: Support for device role (UFP)) Merging usb-gadget/next (f5e46aa4a124 usb: dwc3: gadget: when the started list is empty stop the active xfer) Merging usb-serial/usb-next (9123e3a74ec7 Linux 5.9-rc1) Merging usb-chipidea-next/ci-for-usb-next (71ac680e6339 usb: chipidea: ci_hdrc_imx: restore pinctrl) Merging phy-next/next (ee626660ddbd dt-binding: phy: convert ti,omap-usb2 to YAML) Merging tty/tty-next (71a174b39f10 pty: do tty_flip_buffer_push without port->lock in pty_write) Merging char-misc/char-misc-next (f7dbcd177031 Merge tag 'fsi-for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi into char-misc-next) Merging extcon/extcon-next (47af7ca21269 extcon: ptn5150: Do not print error during probe if nothing is attached) CONFLICT (content): Merge conflict in MAINTAINERS Merging soundwire/next (32d2a8935bf8 soundwire: cadence: add parity error injection through debugfs) Merging thunderbolt/next (77e4907fa620 thunderbolt: debugfs: Fix uninitialized return in counters_write()) Merging staging/staging-next (ceea93444808 drivers: most: add character device interface driver) Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) Merging icc/icc-next (f995194545ab interconnect: qcom: Add OSM L3 support on SM8150) Merging dmaengine/next (e3a52158a682 dmaengine: Kconfig: Update description for RCAR_DMAC config) Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgroup) Merging scsi/for-next (5399a4aa684d Merge branch 'misc' into for-next) CONFLICT (content): Merge conflict in drivers/scsi/aacraid/aachba.c Merging scsi-mkp/for-next (2de7649cff44 scsi: lpfc: Remove set but not used 'qp') Merging vhost/linux-next (8a7c3213db06 vdpa/mlx5: fix up endian-ness for mtu) Merging rpmsg/for-next (ca69dba7f13a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (feeaefd378ca gpio: dwapb: Use resource managed GPIO-chip add data method) Merging gpio-brgl/gpio/for-next (425c5b3e1714 gpiolib: convert to use DEFINE_SEQ_ATTRIBUTE macro) Merging gpio-intel/for-next (9123e3a74ec7 Linux 5.9-rc1) Merging pinctrl/for-next (ebc2599144b6 pinctrl: mcp23s08: Improve error messaging in ->probe()) Merging pinctrl-intel/for-next (a0bf06dc51db pinctrl: cherryview: Preserve CHV_PADCTRL1_INVRXTX_TXDATA flag on GPIOs) Merging pinctrl-samsung/for-next (9123e3a74ec7 Linux 5.9-rc1) Merging pwm/for-next (6ced5ff0be8e pwm: bcm-iproc: handle clk_get_rate() return) Merging userns/for-next (7fce69dff8db Implement kernel_execve) Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't") Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) Merging kselftest/next (f69237e1e954 selftests: more general make nesting support) Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") Merging livepatching/for-next (59fc1e476962 Merge branch 'for-5.10/flive-patching' into for-next) Merging coresight/next (cb6e4c659fb7 MAINTAINERS: Add CoreSight mailing list) Merging rtc/rtc-next (9123e3a74ec7 Linux 5.9-rc1) Merging nvdimm/libnvdimm-for-next (03b68d5d7d4b Merge branch 'for-5.9/copy_mc' into libnvdimm-for-next) Merging at24/at24/for-next (99363d1c26c8 eeprom: at24: Tidy at24_read()) Merging ntb/ntb-next (b8e2c8bbdf77 NTB: Use struct_size() helper in devm_kzalloc()) Merging seccomp/for-next/seccomp (a23042882ff2 selftests/seccomp: Use bitwise instead of arithmetic operator for flags) Merging kspp/for-next/kspp (55dde35fdb7f overflow: Add __must_check attribute to check_*() helpers) Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) Merging slimbus/for-next (9123e3a74ec7 Linux 5.9-rc1) Merging nvmem/for-next (9b7afbd83ef9 nvmem: switch to simpler IDA interface) Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked) Merging hyperv/hyperv-next (49971e6bad2d drivers: hv: remove cast from hyperv_die_event) Merging auxdisplay/auxdisplay (46d4a403a04c auxdisplay: Replace HTTP links with HTTPS ones) Merging kgdb/kgdb/for-next (e16c33e29079 kernel/debug: Fix spelling mistake in debug_core.c) Merging pidfd/for-next (f2e9aec45e9e Merge tag 'kernel-clone-v5.9' into for-next) Merging hmm/hmm (9123e3a74ec7 Linux 5.9-rc1) Merging fpga/for-next (9ba3a0aa09fe fpga: dfl: create a dfl bus type to support DFL devices) Merging kunit/test (9123e3a74ec7 Linux 5.9-rc1) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) Merging cfi/cfi/next (11399346ac39 mtd: Replace zero-length array with flexible-array) Merging kunit-next/kunit (9123e3a74ec7 Linux 5.9-rc1) Merging trivial/for-next (2a9b29b28983 xtensa: fix Kconfig typo) Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) Merging mhi/mhi-next (18e9533ac877 bus: mhi: core: Introduce APIs to allocate and free the MHI controller) Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) Merging memblock/for-next (762d4d1a174c arch/ia64: Restore arch-specific pgd_offset_k implementation) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Applying: media: disable the Virtual DVB Driver (vidtv) for now Merging akpm-current/current (4561521d1600 x86: add failure injection to get/put/clear_user) CONFLICT (content): Merge conflict in mm/filemap.c CONFLICT (content): Merge conflict in arch/powerpc/platforms/pseries/hotplug-memory.c Applying: merge fix up for "mm/memremap_pages: convert to 'struct range'" $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". CONFLICT (content): Merge conflict in drivers/media/pci/ttpci/av7110_v4l.c Merging akpm/master (f69b2973b6ca mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix-fix-fix-fix-fix)
pgpzT3PqNFjQN.pgp
Description: OpenPGP digital signature
