linux-next: Tree for Oct 6

* linux-next: Tree for Oct 6
@ 2020-10-06 12:12 Stephen Rothwell
  2020-10-06 18:54 ` linux-next: Tree for Oct 6 (sound/soc/intel/catpt/device.c) Randy Dunlap
  2020-10-06 19:29 ` linux-next: Tree for Oct 6 (drivers/misc/hisi_hikey_usb.c) Randy Dunlap
  0 siblings, 2 replies; 11+ messages in thread
From: Stephen Rothwell @ 2020-10-06 12:12 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 38136 bytes --]

Hi all,

Changes since 20201002:

The arm-soc tree gained conflicts against the dma-mapping tree.

The sunxi tree gained a conflict against the arm-soc tree.

The vfs tree lost its build failure.

The net-next tree gained a semantic coflict against the dma-mapping tree.

The input tree gained a conflict against the arm-soc tree.

The mmc tree gained a build failure so I used the version from
next-20201002.

The devicetree tree gained a conflict against the mfd tree.

The tip tree gained a conflict against the dma-mapping tree.

The char-misc tree gained a conflict against the powerpc tree.

The staging tree gained a conflict against the devicetree tree.

The hmm tree gained a semantic conflict against the drm tree.

The akpm-current tree gained a conflict against the risc-v tree.

The akpm tree gained a conflict against the kselftest-fixes tree.

Non-merge commits (relative to Linus' tree): 12407
 12126 files changed, 683220 insertions(+), 253478 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 (7575fdda569b Merge tag 'platform-drivers-x86-v5.9-2' of git://git.infradead.org/linux-platform-drivers-x86)
Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging kbuild-current/fixes (e30d694c3381 Documentation/llvm: Fix clang target examples)
Merging arc-current/for-curr (db320a000251 ARC: [dts] fix the errors detected by dtbs_check)
Merging arm-current/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging arm64-fixes/for-next/fixes (a509a66a9d0d arm64: permit ACPI core to map kernel memory used for table overrides)
Merging arm-soc-fixes/arm/fixes (6869f774b1cd Merge tag 'omap-for-v5.9/fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap 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 (a1b8638ba132 Linux 5.9-rc7)
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 (4296adc3e32f net/core: check length before updating Ethertype in skb_mpls_{push,pop})
Merging bpf/master (d82a532a6115 bpf: Fix "unresolved symbol" build error with resolve_btfids)
Merging ipsec/master (e94ee171349d xfrm: Use correct address family in xfrm_state_find)
Merging netfilter/master (48d072c4e8cd selftests: netfilter: add time counter check)
Merging ipvs/master (48d072c4e8cd selftests: netfilter: add time counter check)
Merging wireless-drivers/master (efb1676306f6 mt76: mt7615: reduce maximum VHT MPDU length to 7991)
Merging mac80211/master (ef9da46ddef0 r8169: fix data corruption issue on RTL8402)
Merging rdma-fixes/for-rc (a1b8638ba132 Linux 5.9-rc7)
Merging sound-current/for-linus (08befca40026 ALSA: hda/realtek - Add mute Led support for HP Elitebook 845 G7)
Merging sound-asoc-fixes/for-linus (fc3e317b130b Merge remote-tracking branch 'asoc/for-5.9' into asoc-linus)
Merging regmap-fixes/for-linus (549738f15da0 Linux 5.9-rc8)
Merging regulator-fixes/for-linus (549738f15da0 Linux 5.9-rc8)
Merging spi-fixes/for-linus (2bc60fa690ad Merge remote-tracking branch 'spi/for-5.9' into spi-linus)
Merging pci-current/for-linus (76a6b0b90d53 MAINTAINERS: Add Pali Rohár as aardvark PCI maintainer)
Merging driver-core.current/driver-core-linus (856deb866d16 Linux 5.9-rc5)
Merging tty.current/tty-linus (ba4f184e126b Linux 5.9-rc6)
Merging usb.current/usb-linus (549738f15da0 Linux 5.9-rc8)
Merging usb-gadget-fixes/fixes (51609fba0cca usb: dwc3: simple: add support for Hikey 970)
Merging usb-serial-fixes/usb-linus (856deb866d16 Linux 5.9-rc5)
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 (549738f15da0 Linux 5.9-rc8)
Merging char-misc.current/char-misc-linus (856deb866d16 Linux 5.9-rc5)
Merging soundwire-fixes/fixes (3fbbf2148a40 soundwire: fix double free of dangling pointer)
Merging thunderbolt-fixes/fixes (549738f15da0 Linux 5.9-rc8)
Merging input-current/for-linus (5fc27b098daf Input: i8042 - add nopnp quirk for Acer Aspire 5 A515)
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 (aa803771a80a tools: Avoid comma separated statements)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging dmaengine-fixes/fixes (549738f15da0 Linux 5.9-rc8)
Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
Merging mtd-fixes/mtd/fixes (1afc0c89f6a1 Revert "mtd: spi-nor: Add capability to disable flash quad mode")
Merging mfd-fixes/for-mfd-fixes (22380b65dc70 mfd: mfd-core: Ensure disabled devices are ignored without error)
Merging v4l-dvb-fixes/fixes (d0254f82d702 media: dt-bindings: media: imx274: Convert to json-schema)
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
Merging mips-fixes/mips-fixes (be090fa62080 MIPS: BCM47XX: Remove the needless check with the 1074K)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
Merging omap-fixes/fixes (8f04aea048d5 ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails)
Merging kvm-fixes/master (e2e1a1c86bf3 Merge tag 'kvmarm-fixes-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master)
Merging kvms390-fixes/master (f20d4e924b44 docs: kvm: add documentation for KVM_CAP_S390_DIAG318)
Merging hwmon-fixes/hwmon (18360b33a071 hwmon: (w83627ehf) Fix a resource leak in probe)
Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX)
Merging btrfs-fixes/next-fixes (2a851de0233a Merge branch 'misc-5.9' into next-fixes)
Merging vfs-fixes/fixes (8a018eb55e3a pipe: Fix memory leaks in create_pipe_files())
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 (720ef73d1a23 platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse)
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 (efe84d408bf4 scripts/dtc: only append to HOST_EXTRACFLAGS instead of overwriting)
Merging scsi-fixes/fixes (bcf3a2953d36 scsi: iscsi: iscsi_tcp: Avoid holding spinlock while calling getpeername())
Merging drm-fixes/drm-fixes (132d7c8abeaa Merge tag 'amd-drm-fixes-5.9-2020-09-30' of git://people.freedesktop.org/~agd5f/linux 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 (a1b8638ba132 Linux 5.9-rc7)
Merging mmc-fixes/fixes (afd7f30886b0 mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models)
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 (911e1987efc8 Drivers: hv: vmbus: Add timeout to vmbus_wait_for_unload)
Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create)
Merging risc-v-fixes/fixes (a78c6f5956a9 RISC-V: Make sure memblock reserves the memory containing DT)
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 (c5c553850899 scripts/spdxcheck.py: handle license identifiers in XML comments)
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 (82206a0c06cc kunit: tool: handle when .kunit exists but .kunitconfig does not)
Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
Merging memblock-fixes/fixes (5f7b81c18366 ia64: fix min_low_pfn/max_low_pfn build errors)
Merging drm-misc-fixes/for-linux-next-fixes (27204b99b082 drm: drm_dsc.h: fix a kernel-doc markup)
Merging kspp-gustavo/for-next/kspp (736116436e5b include: jhash/signal: Fix fall-through warnings for Clang)
Merging kbuild/for-next (e42c8717dace Merge branch 'kconfig' into for-next)
Merging compiler-attributes/compiler-attributes (e5fc436f06ee sparse: use static inline for __chk_{user,io}_ptr())
Merging dma-mapping/for-next (a3cf77774abf dma-mapping: merge <linux/dma-noncoherent.h> into <linux/dma-map-ops.h>)
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 (adc5f7029376 ARM: add malloc size to decompressor kexec size structure)
Merging arm64/for-next/core (baab853229ec Merge branch 'for-next/mte' into for-next/core)
Merging arm-perf/for-next/perf (887e2cff0f8d perf: arm-cmn: Fix conversion specifiers for node type)
Merging arm-soc/for-next (4bb6c7b93462 ARM: Document merges)
CONFLICT (modify/delete): arch/arm/mach-imx/mach-mx31moboard.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-imx/mach-mx31moboard.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-imx/mach-imx27_visstrim_m10.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-imx/mach-imx27_visstrim_m10.c left in tree.
$ git rm -f arch/arm/mach-imx/mach-imx27_visstrim_m10.c
$ git rm -f arch/arm/mach-imx/mach-mx31moboard.c
Merging amlogic/for-next (ad6aebe534aa Merge branch 'v5.10/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (48127d01a153 Merge branch 'soc-for-v5.10' into for-next)
Merging at91/at91-next (d1f170f8447d Merge branches 'at91-soc' and 'at91-dt' into at91-next)
Merging drivers-memory/for-next (94ca85733699 memory: emif: Convert to DEFINE_SHOW_ATTRIBUTE)
Merging imx-mxs/for-next (bc421f7da477 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (703dff8cb900 Merge branch 'for_5.10/drivers-soc' into next)
Merging mediatek/for-next (b05dfbba9c46 Merge branch 'v5.9-next/soc' into for-next)
Merging mvebu/for-next (f89c9685f6a1 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (7a159a1ad494 Merge branch 'fixes' into for-next)
Merging qcom/for-next (abea2a011c54 Merge branches 'arm64-for-5.10', 'arm64-defconfig-for-5.10' and 'drivers-for-5.10' into for-next)
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 (1ff27687ae7e Merge branch 'renesas-fixes-for-v5.9' into renesas-next)
Merging reset/reset/next (68a215164e19 reset: sti: reset-syscfg: fix struct description warnings)
Merging rockchip/for-next (ba0ceb95f560 Merge branch 'v5.10-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (62315959a263 Merge branch 'next/dt' into for-next)
Merging scmi/for-linux-next (a1b8638ba132 Linux 5.9-rc7)
Merging sunxi/sunxi/for-next (a2e5e8054a26 Merge branch 'sunxi/dt-for-5.10', remote-tracking branches 'korg/sunxi/sunxi/clk-for-5.10', 'korg/sunxi/sunxi/fixes-for-5.9' and 'korg/sunxi/sunxi/drivers-for-5.10' into sunxi/for-next)
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml
Merging tegra/for-next (9ea55312ba10 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 (48a78787c0f3 Merge branch 'ti-k3-dts-next' into ti-k3-next)
Merging uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next)
Merging clk/clk-next (426eab515007 Merge branch 'clk-rockchip' into clk-next)
Merging clk-samsung/for-next (ff8e0ff9b996 clk: samsung: Use cached clk_hws instead of __clk_lookup() calls)
Merging csky/linux-next (1c8499089bc6 csky: Add memory layout 2.5G(user):1.5G(kernel))
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 (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver)
Merging m68knommu/for-next (322c512f476f m68knommu: include SDHC support only when hardware has it)
CONFLICT (content): Merge conflict in arch/m68k/Kconfig
Merging microblaze/next (4a17e8513376 microblaze: fix kbuild redundant file warning)
Merging mips/mips-next (047248cab16b MIPS: process: include exec.h header in process.c)
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 (9da548539dbf parisc: Improve spinlock handling)
Merging powerpc/next (ebbfeef0d809 powerpc/32: Declare stack_overflow_exception() prototype)
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
Merging soc-fsl/next (d97b957e32b1 soc: fsl: qe: Remove unnessesary check in ucc_set_tdm_rxtx_clk)
Merging risc-v/for-next (c29c38fa2a8b RISC-V: Remove any memblock representing unusable memory area)
CONFLICT (content): Merge conflict in arch/m68k/Kconfig
Merging s390/for-next (9fa030854731 Merge branch 'features' into for-next)
Merging sh/for-next (b0cfc315ff38 sh: fix syscall tracing)
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 (5b2a828b98ec fscrypt: export fscrypt_d_revalidate())
Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly)
Merging btrfs/for-next (d6e05fb2b680 Merge branch 'for-next-next-v5.9-20200923' into for-next-20200923)
CONFLICT (content): Merge conflict in fs/btrfs/dev-replace.c
Merging ceph/master (f44d04e696fe rbd: require global CAP_SYS_ADMIN for mapping and unmapping)
Merging cifs/for-next (25053b5a3356 cifs: compute full_path already in cifs_readdir())
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 (6ea5aad32dd8 erofs: add REQ_RAHEAD flag to readahead requests)
Merging exfat/dev (217963859f24 exfat: fix use of uninitialized spinlock on error path)
Merging ext3/for_next (c2bb80b8bdd0 reiserfs: Fix oops during mount)
Merging ext4/dev (d39783839c03 ext4: limit entries returned when counting fsmap records)
Merging f2fs/dev (eede846af512 f2fs: f2fs_get_meta_page_nofail should not be failed)
Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info)
Merging fuse/for-next (d78092e4937d fuse: fix page dereference after free)
Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member)
Merging nfs/linux-next (549738f15da0 Linux 5.9-rc8)
Merging nfs-anna/linux-next (d8b15267af18 nfs: remove incorrect fallthrough label)
Merging nfsd/nfsd-next (856deb866d16 Linux 5.9-rc5)
Merging cel/cel-next (13a9a9d74d4d SUNRPC: Fix svc_flush_dcache())
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 (b30e2238b7ff ubifs: Fix some kernel-doc warnings in tnc.c)
Merging v9fs/9p-next (2ed0b7578170 9p: Remove unneeded cast from memory allocation)
Merging xfs/for-next (fe341eb151ec xfs: ensure that fpunch, fcollapse, and finsert operations are aligned to rt extent size)
Merging zonefs/for-next (48bfd5c6fac1 zonefs: document the explicit-open mount option)
Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() before generic_write_sync())
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 (c186eef9720f Merge branches 'work.misc', 'work.sparc', 'base.set_fs', 'work.csum_and_copy', 'work.quota-compat', 'compat.mount' and 'work.iov_iter', remote-tracking branch 'vfs/work.epoll' into for-next)
CONFLICT (content): Merge conflict in arch/s390/include/asm/checksum.h
Merging printk/for-next (ece33d6abfbc Merge branch 'for-5.10' into for-next)
Merging pci/next (18dcce7bc583 Merge branch 'remotes/lorenzo/pci/xilinx')
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 (f5795950202d Merge branch 'for-5.10/vivaldi' into for-next)
Merging i2c/i2c/for-next (f3927562495e Merge branch 'i2c/for-5.10' into i2c/for-next)
Merging i3c/i3c/next (cc3a392d69b6 i3c: master: fix for SETDASA and DAA process)
Merging dmi/dmi-for-next (a3d13a0a23ea Replace HTTP links with HTTPS ones: DMI/SMBIOS SUPPORT)
Merging hwmon-staging/hwmon-next (f6a496a5ce8d docs: hwmon: (ltc2945) update datasheet link)
Merging jc_docs/docs-next (905705a8fd43 docs: programming-languages: refresh blurb on clang support)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging v4l-dvb/master (463c43fcd97e Merge tag 'v5.9-rc7' into patchwork)
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 (66bebc5f7cab Merge branch 'pnp' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (bc9b9c5ab9d8 cpufreq: qcom: Don't add frequencies without an OPP)
Merging cpupower/cpupower (527b7779e5ec cpupower: speed up generating git version string)
Merging devfreq/devfreq-next (d353d1202b89 PM / devfreq: tegra30: Improve initial hardware resetting)
Merging opp/opp/linux-next (a5663c9b1e31 opp: Allow opp-level to be set to 0)
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 (4f2b30fd9b4b fs: dlm: fix race in nodeid2con)
Merging swiotlb/linux-next (b51e627158cb swiotlb: Mark max_segment with static keyword)
Merging rdma/for-next (cf4c0fb00d5a RDMA/hns: Remove unused variables and definitions)
Merging net-next/master (8b0308fe319b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Applying: xsk: fix up for "dma-mapping: merge <linux/dma-noncoherent.h> into <linux/dma-map-ops.h>"
Merging bpf-next/master (dca4121cdc48 bpf, doc: Update Andrii's email in MAINTAINERS)
CONFLICT (content): Merge conflict in net/xdp/xsk_buff_pool.c
Merging ipsec-next/master (61e7113e48d3 Merge 'xfrm: Add compat layer')
Merging mlx5-next/mlx5-next (9d8feb460adb RDMA/mlx5: Add sw_owner_v2 bit capability)
Merging netfilter-next/master (c2568c8c9e63 Merge branch 'net-Constify-struct-genl_small_ops')
Merging ipvs-next/master (10fdd6d80e4c netfilter: nf_tables: Implement fast bitwise expression)
Merging wireless-drivers-next/master (c2568c8c9e63 Merge branch 'net-Constify-struct-genl_small_ops')
Merging bluetooth/master (44d59235ace5 Bluetooth: hci_h5: close serdev device and free hu in h5_close)
Merging mac80211-next/master (75f87eaeaced mac80211: avoid processing non-S1G elements on S1G band)
Merging gfs2/for-next (4d53c8279a20 gfs2: call truncate_inode_pages_final for address space glocks)
Merging mtd/mtd/next (b597cc75f7fe mtd: parsers: bcm63xx: Do not make it modular)
Merging nand/nand/next (88e315d12fbb mtd: onenand: simplify the return expression of onenand_transfer_auto_oob)
Merging spi-nor/spi-nor/next (6eedfd858ff6 mtd: spi-nor: winbond: Add support for w25q64jwm)
Merging crypto/master (ed4424f2fb02 crypto: atmel-tdes - use semicolons rather than commas to separate statements)
CONFLICT (content): Merge conflict in drivers/crypto/Kconfig
Merging drm/drm-next (edb899841c4e drm/vmwgfx: fix regression in thp code due to ttm init refactor.)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/mock_gem_device.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
Applying: mark DRM_INGENIC as BROKEN
Merging amdgpu/drm-next (4bfec118a9f5 drm/amdgpu/swsmu: clean up a bunch of stale interfaces)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Merging drm-intel/for-linux-next (c60b93cd4862 drm/i915: Avoid mixing integer types during batch copies)
Merging drm-tegra/drm/tegra/for-next (d9f980ebcd01 drm/tegra: output: rgb: Wrap directly-connected panel into DRM bridge)
Merging drm-misc/for-linux-next (8ba0b6d19631 drm/vc4: crtc: Keep the previously assigned HVS FIFO)
Merging drm-msm/msm-next (d1ea91492585 drm/msm/dp: fix incorrect function prototype of dp_debug_get())
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 (3136fed4f91e drm/etnaviv: Drop local dma_parms)
Merging regmap/for-next (6e0545c4f083 Merge remote-tracking branch 'regmap/for-5.10' into regmap-next)
Merging sound/for-next (716a0c288193 ALSA: usb-audio: fix spelling mistake "Frequence" -> "Frequency")
Merging sound-asoc/for-next (75484966d0a5 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 (127e4a1bc11e Input: synaptics - enable InterTouch for ThinkPad P1/X1E gen 2)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.yaml
Merging block/for-next (30636632d693 Merge branch 'for-5.10/block' into for-next)
Merging device-mapper/for-next (61931c0ee9cf dm: export dm_copy_name_and_uuid)
Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static)
Merging mmc/next (e9b80bb74fdd mmc: sdhci-acpi: AMDI0040: Allow changing HS200/HS400 driver strength)
CONFLICT (content): Merge conflict in drivers/mmc/host/Kconfig
$ git reset --hard HEAD^
Merging next-20201002 version of mmc
CONFLICT (content): Merge conflict in drivers/mmc/host/Kconfig
[master b947e60d16b5] next-20201002/mmc
Merging mfd/for-mfd-next (55e7ed855ce6 mfd: kempld-core: Fix unused variable 'kempld_acpi_table' when !ACPI)
Merging backlight/for-backlight-next (97ecfda1a8ff backlight: tosa_bl: Include the right header)
Merging battery/for-next (d6e24aa0bf15 power: supply: sbs-battery: keep error code when get_property() fails)
Merging regulator/for-next (c6e70a6fd5ce 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 (aa662fc04f5b ima: Fix NULL pointer dereference in ima_file_hash)
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 (0d50f059c4cd selinux: provide a "no sooner than" date for the checkreqprot removal)
Merging smack/next (edd615371b66 Smack: Remove unnecessary variable initialization)
Merging tomoyo/master (5384d92e4e02 tomoyo: Loosen pathname/domainname validation.)
Merging tpmdd/next (7b9be800756f MAINTAINERS: TPM DEVICE DRIVER: Update GIT)
Merging watchdog/master (a1b8638ba132 Linux 5.9-rc7)
Merging iommu/next (7be249839948 Merge branches 'iommu/fixes', 'arm/allwinner', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'arm/qcom', 'arm/smmu', 'ppc/pamu', 'x86/amd', 'x86/vt-d' and 'core' into next)
Applying: merge fix upt for iommu_flush_iotlb_all() rename
Merging vfio/next (3de066f8f86b Merge branches 'v5.10/vfio/bardirty', 'v5.10/vfio/dma_avail', 'v5.10/vfio/misc', 'v5.10/vfio/no-cmd-mem' and 'v5.10/vfio/yan_zhao_fixes' into v5.10/vfio/next)
CONFLICT (content): Merge conflict in arch/s390/pci/pci_bus.c
Merging audit/next (c07203516439 audit: Remove redundant null check)
Merging devicetree/for-next (a54dcf0bc3e9 Merge branch 'dt/linus' into dt/next)
CONFLICT (modify/delete): Documentation/devicetree/bindings/arm/samsung/sysreg.yaml deleted in HEAD and modified in devicetree/for-next. Version devicetree/for-next of Documentation/devicetree/bindings/arm/samsung/sysreg.yaml left in tree.
$ git rm -f Documentation/devicetree/bindings/arm/samsung/sysreg.yaml
Merging mailbox/mailbox-for-next (884996986347 mailbox: mediatek: cmdq: clear task in channel before shutdown)
Merging spi/for-next (a791d372eeec Merge remote-tracking branch 'spi/for-5.10' into spi-next)
Merging tip/auto-latest (0f33ece60c73 Merge branch 'core/build')
CONFLICT (content): Merge conflict in include/linux/iommu.h
CONFLICT (content): Merge conflict in drivers/pci/controller/vmd.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_priv.h
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in arch/x86/kernel/apic/msi.c
CONFLICT (content): Merge conflict in arch/s390/Kconfig
CONFLICT (content): Merge conflict in arch/ia64/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Makefile
Merging clockevents/timers/drivers/next (f087e452f27e clocksource: sp804: enable Hisilicon sp804 timer 64bit mode)
Merging edac/edac-for-next (34e06e4faf3f Merge branch 'edac-misc' into edac-for-next)
Merging irqchip/irq/irqchip-next (9b64efa83726 Merge branch 'irq/ipi-as-irq', remote-tracking branches 'origin/irq/dw' and 'origin/irq/owl' into irq/irqchip-next)
Merging ftrace/for-next (fdb46faeab2f x86: Use tracepoint_enabled() for msr tracepoints instead of open coding it)
Merging rcu/rcu/next (d429a8e5aae5 rcu,ftrace: Fix ftrace recursion)
Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup)
Merging kvm-arm/next (4e5dc64c4319 Merge branches 'kvm-arm64/pt-new' and 'kvm-arm64/pmu-5.9' into kvmarm-master/next)
Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol undeclared warnings)
Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset)
Merging xen-tip/linux-next (32118f97f41d x86/xen: Fix typo in xen_pagetable_p2m_free())
Merging percpu/for-next (eff623d602db 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 (720ef73d1a23 platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse)
Merging chrome-platform/for-next (3e98fd6d816c ARM: dts: cros-ec-keyboard: Add alternate keymap for KEY_LEFTMETA)
Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging leds/for-next (98d278ca00bd leds: lm3697: Fix out-of-bound access)
Merging ipmi/for-next (8fe7990ceda8 ipmi_si: Fix wrong return value in try_smi_init())
Merging driver-core/driver-core-next (ee4906770ee9 regmap: debugfs: use semicolons rather than commas to separate statements)
Merging usb/usb-next (a4f88430af89 usb: cdc-acm: add quirk to blacklist ETAS ES58X devices)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c
CONFLICT (content): Merge conflict in drivers/usb/dwc3/dwc3-of-simple.c
CONFLICT (content): Merge conflict in drivers/usb/cdns3/gadget.c
CONFLICT (content): Merge conflict in drivers/pci/controller/pcie-brcmstb.c
Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.)
Merging usb-serial/usb-next (a70bb7b1e07f USB: serial: option: add Cellient MPL200 card)
Merging usb-chipidea-next/ci-for-usb-next (71ac680e6339 usb: chipidea: ci_hdrc_imx: restore pinctrl)
Merging phy-next/next (60f5a24c11f7 phy: qcom-qmp: initialize the pointer to NULL)
Merging tty/tty-next (4be87603b6dc serial: mcf: add sysrq capability)
Merging char-misc/char-misc-next (05dbb6285335 w1: w1_therm: make w1_poll_completion static)
CONFLICT (content): Merge conflict in drivers/misc/ocxl/Kconfig
CONFLICT (content): Merge conflict in MAINTAINERS
Merging extcon/extcon-next (dbc888072a97 extcon: axp288: Use module_platform_driver to simplify the code)
Merging soundwire/next (0173f525b2c1 soundwire: sysfs: add slave status and device number before probe)
Merging thunderbolt/next (810278da901c thunderbolt: Capitalize comment on top of QUIRK_FORCE_POWER_LINK_CONTROLLER)
Merging staging/staging-next (6c75a92a0065 staging: greybus: use __force when assigning __u8 value to snd_ctl_elem_type_t)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr)
Merging icc/icc-next (86d6e5793e0f interconnect: imx: simplify the return expression of imx_icc_unregister)
Merging dmaengine/next (7a40871da4a3 dt-bindings: Fix 'reg' size issues in zynqmp examples)
Merging cgroup/for-next (65026da59cda cgroup: Zero sized write should be no-op)
Merging scsi/for-next (e0165bf16ff4 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/aacraid/aachba.c
Merging scsi-mkp/for-next (eb382d70a334 scsi: hisi_sas: Recover PHY state according to the status before reset)
Merging vhost/linux-next (7ed9e3d97c32 vhost-vdpa: fix page pinning leakage in error path)
Merging rpmsg/for-next (62180d7eae2f Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (72a31192b5a9 Merge branch 'devel' into for-next)
Merging gpio-brgl/gpio/for-next (cf048e05b687 tools: gpio: add debounce support to gpio-event-mon)
Merging gpio-intel/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging pinctrl/for-next (c348abca14dc Merge branch 'devel' into for-next)
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 (1f2bd2271a10 pwm: Allow store 64-bit duty cycle from sysfs interface)
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 (997a91fd4448 selftests: Add missing gitignore entries)
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 (347732627745 coresight: etm4x: Fix save and restore of TRCVMIDCCTLR1 register)
Merging rtc/rtc-next (179b4bcc4c0c rtc: rv8803: simplify the return expression of rv8803_nvram_write)
Merging nvdimm/libnvdimm-for-next (a1b8638ba132 Linux 5.9-rc7)
Merging at24/at24/for-next (61f764c307f6 eeprom: at24: Support custom device names for AT24 EEPROMs)
Merging ntb/ntb-next (b8e2c8bbdf77 NTB: Use struct_size() helper in devm_kzalloc())
Merging seccomp/for-next/seccomp (ed2d479d3335 seccomp: Make duplicate listener detection non-racy)
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 (1cf257875246 slimbus: qcom-ngd-ctrl: disable ngd in qmi server down callback)
Merging nvmem/for-next (02200a863b9a nvmem: core: fix missing of_node_put() in of_nvmem_device_get())
Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked)
Merging hyperv/hyperv-next (1f3aed01473c hv: clocksource: Add notrace attribute to read_hv_sched_clock_*() functions)
Merging auxdisplay/auxdisplay (46d4a403a04c auxdisplay: Replace HTTP links with HTTPS ones)
Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings)
Merging pidfd/for-next (e06ce5515b74 Merge branch 'pidfd_o_nonblock' into for-next)
Merging hmm/hmm (0c16d9635e3a RDMA/umem: Move to allocate SG table from pages)
Applying: lib/scatterlist: merge fix for "drm: allow limiting the scatter list size."
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 (00c9cf49a613 mtd: hyperbus: hbmc-am654: Add DMA support for reads)
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 (298edb32160f bus: mhi: debugfs: Print channel context read-pointer)
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)
Merging akpm-current/current (5e64912209ae x86: add failure injection to get/put/clear_user)
CONFLICT (content): Merge conflict in mm/page-writeback.c
CONFLICT (content): Merge conflict in mm/filemap.c
CONFLICT (content): Merge conflict in include/acpi/acpi_numa.h
CONFLICT (content): Merge conflict in drivers/acpi/numa/hmat.c
CONFLICT (content): Merge conflict in arch/riscv/mm/init.c
CONFLICT (content): Merge conflict in arch/powerpc/platforms/pseries/hotplug-memory.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/kasan/kasan_init_32.c
CONFLICT (content): Merge conflict in arch/arm64/mm/mmu.c
Applying: fs/fuse/virtio_fs.c: fix 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 tools/testing/selftests/vm/gup_test.c
Merging akpm/master (9af6d63c19f6 mm: remove duplicate include statement in mmu.c)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread