Hi all, Changes since 20200819:
New tree: ti-k3-new
My fixes tree contains:
73c7adb54169 ("device_cgroup: Fix RCU list debugging warning")
The dma-mapping tree caused my qemu test boot to fail so I reverted
a commit.
I applied a supplied patch for a runtime fault to the selinux tree.
The rcu tree lost its build failure.
The pinctrl-intel tree gained a build failure so I used the version
from next-20200819.
The mhi tree lost its failures.
Non-merge commits (relative to Linus' tree): 1787
3241 files changed, 56930 insertions(+), 22206 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 (18445bf405cb Merge tag 'spi-fix-v5.9-rc1' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging fixes/master (73c7adb54169 device_cgroup: Fix RCU list debugging
warning)
Merging kbuild-current/fixes (66c262be8f50 kconfig: qconf: remove unused colNr)
Merging arc-current/for-curr (97363c07f023 ARC: show_regs: fix r12 printing and
simplify)
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 (6a7389f0312f MAINTAINERS: Include drivers
subdirs for ARM PMU PROFILING AND DEBUGGING entry)
Merging arm-soc-fixes/arm/fixes (fe1d899f4212 ARM: dts: keystone-k2g-evm: fix
rgmii phy-mode for ksz9031 phy)
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 (801980f64979 powerpc/pseries/hotplug-cpu: wait
indefinitely for vCPU death)
Merging s390-fixes/fixes (b97bf44f9915 s390/pci: fix PF/VF linking on hot plug)
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 (d1fb55592909 netlink: fix state reallocation in policy
export)
Merging bpf/master (00fa1d83a8b5 bpftool: Handle EAGAIN error code properly in
pids collection)
Merging ipsec/master (4eb2e1341575 espintcp: restore IP CB before handing the
packet to xfrm)
Merging netfilter/master (b3b2854dcf70 mptcp: sendmsg: reset iter on error
redux)
Merging ipvs/master (7c7ab580db49 net: Convert to use the fallthrough macro)
Merging wireless-drivers/master (9a2a0862d973 brcmfmac: reserve tx credit only
when txctl is ready to send)
Merging mac80211/master (ad6641189c59 net: ipv4: remove duplicate "the the"
phrase in Kconfig text)
Merging rdma-fixes/for-rc (9123e3a74ec7 Linux 5.9-rc1)
Merging sound-current/for-linus (b90b925fd52c ALSA: hda: avoid reset of
sdo_limit)
Merging sound-asoc-fixes/for-linus (65e25c29b158 Merge remote-tracking branch
'asoc/for-5.9' into asoc-linus)
Merging regmap-fixes/for-linus (9123e3a74ec7 Linux 5.9-rc1)
Merging regulator-fixes/for-linus (ff945eff122d Merge remote-tracking branch
'regulator/for-5.9' into regulator-linus)
Merging spi-fixes/for-linus (41bc5599fe08 Merge remote-tracking branch
'spi/for-5.9' into spi-linus)
Merging pci-current/for-linus (7c2308f79fc8 PCI/P2PDMA: Fix build without DMA
ops)
Merging driver-core.current/driver-core-linus (9123e3a74ec7 Linux 5.9-rc1)
Merging tty.current/tty-linus (ea1fc02e12b6 tty: serial: imx: add dependence
and build for earlycon)
Merging usb.current/usb-linus (9a469bc9f32d usb: uas: Add quirk for PNY Pro
Elite)
Merging usb-gadget-fixes/fixes (bc9a2e226ea9 usb: dwc3: gadget: Handle ZLP for
sg requests)
Merging usb-serial-fixes/usb-linus (47ec5303d73e Merge
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core:
add wakeup support for extcon)
Merging phy/fixes (04db2304a949 phy: qualcomm: fix return value check in
qcom_ipq806x_usb_phy_probe())
Merging staging.current/staging-linus (1dffeb8b8b4c staging: greybus: audio:
fix uninitialized value issue)
Merging char-misc.current/char-misc-linus (51072c0f5b5e mei: hdcp: fix
mei_hdcp_verify_mprime() input parameter)
Merging soundwire-fixes/fixes (f8d0168e035f soundwire: bus: fix typo in comment
on INTSTAT registers)
Merging thunderbolt-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging input-current/for-linus (9e8238020c5b Merge branch 'next' into
for-linus)
Merging crypto-current/master (21dfbcd1f5cb crypto: algif_aead - fix
uninitialized ctx->init)
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 (3c01655ac82e kselftest: ksft_test_num return
type should be unsigned)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to
pass all module source files to spatch)
Merging dmaengine-fixes/fixes (e097eb7473d9 dmaengine: at_hdmac: add missing
kfree() call in at_dma_xlate())
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 (603d9299da32 mfd: mt6397: Fix probe after
changing mt6397-core)
Merging v4l-dvb-fixes/fixes (0d6db85131e0 Revert "media: atomisp: keep the ISP
powered on when setting it")
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified
HAS_IOMEM dependency)
Merging mips-fixes/mips-fixes (433c1ca0d441 MIPS: Loongson64: Do not override
watch and ejtag feature)
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 (06a81c1c7db9 Merge tag 'arm64-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins
to 1)
Merging hwmon-fixes/hwmon (51fb91ed5a6f hwmon: (pmbus/isl68137) remove
READ_TEMPERATURE_1 telemetry for RAA228228)
Merging nvdimm-fixes/libnvdimm-fixes (080b2a9dbf93 dax: do not print error
message for non-persistent memory block device)
Merging btrfs-fixes/next-fixes (c9f8e44ec4a5 Merge branch 'misc-5.9' into
next-fixes)
Merging vfs-fixes/fixes (bb1a773d5b6b kill unused dump_fpu() instances)
Merging dma-mapping-fixes/for-linus (7dc6fd0f3b84 Merge branch
'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
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 (d1ac0002dd29 of: address: Work around
missing device_type property in pcie nodes)
Merging scsi-fixes/fixes (dca93232b361 Revert "scsi: qla2xxx: Disable T10-DIF
feature with FC-NVMe during probe")
Merging drm-fixes/drm-fixes (485d41b092c8 Merge tag
'amd-drm-fixes-5.9-2020-08-12' 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 (4a4064ad7969 drm/i915/tgl: Make
sure TC-cold is blocked before enabling TC AUX power wells)
Merging mmc-fixes/fixes (ebd4050c6144 mmc: sdhci-of-aspeed: Fix clock divider
calculation)
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 (b9d8cf2eb3ce x86/hyperv: Make
hv_setup_sched_clock inline)
Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq
handlers after dpio create)
Merging risc-v-fixes/fixes (76d4467a97bd riscv: Setup exception vector for
nommu platform)
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 (9123e3a74ec7 Linux 5.9-rc1)
Merging gpio-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging pinctrl-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
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 (c63d2dd7e134 Documentation: kunit: Add some
troubleshooting tips to the FAQ)
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 (bd05220c7be3 arch/ia64: Restore arch-specific
pgd_offset_k implementation)
Merging drm-misc-fixes/for-linux-next-fixes (77ef38574beb drm/modeset-lock:
Take the modeset BKL for legacy drivers)
Merging kspp-gustavo/for-next/kspp (efd46a8da025 treewide: Use fallthrough
pseudo-keyword)
Merging kbuild/for-next (514bad879fdb Merge branch 'kconfig' into for-next)
CONFLICT (content): Merge conflict in scripts/kconfig/qconf.h
Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4)
Merging dma-mapping/for-next (04d324bf549d dma-mapping: set default
segment_boundary_mask to ULONG_MAX)
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 (3df14264ad99 recordmcount: Fix build failure on
non arm64)
Merging arm-perf/for-next/perf (55fdc1f44cd6 arm64: perf: Expose some new
events via sysfs)
Merging arm-soc/for-next (e7e7df91deea soc: document merges)
Merging amlogic/for-next (c943b84fab78 Merge branch 'v5.10/dt64' into
tmp/aml-rebuild)
Merging aspeed/for-next (2c887638a5fa ARM: dts: Aspeed: tacoma: Enable EHCI
controller)
Merging at91/at91-next (b68f43873b72 Merge branch 'at91-soc' into at91-next)
Merging drivers-memory/for-next (ea0c0ad6b6eb memory: Enable compile testing
for most of the drivers)
Merging imx-mxs/for-next (3c1a41dab7b8 Merge branch 'imx/defconfig' into
for-next)
Merging keystone/next (50c950e2c8b6 Merge branch 'for_5.9/driver-soc' into next)
Merging mediatek/for-next (647a84d1e4dc Merge branch 'v5.8-next/soc' into
for-next)
Merging mvebu/for-next (29bd9d8c2ac1 Merge branch 'mvebu/dt64' into
mvebu/for-next)
Merging omap/for-next (390f789055a0 Merge branch 'omap-for-v5.10/dt' into
for-next)
Merging qcom/for-next (0854ab24c098 Merge branch 'arm64-defconfig-for-5.10'
into for-next)
Merging raspberrypi/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
Merging renesas/next (923afaacb49d Merge branches
'renesas-arm-defconfig-for-v5.10' and 'renesas-arm-dt-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 (088d74f51158 Merge branch 'v5.9-clk/next' into
for-next)
Merging samsung-krzk/for-next (93da582407b3 Merge branch 'next/soc-s3c-cleanup'
into for-next)
Merging scmi/for-linux-next (9123e3a74ec7 Linux 5.9-rc1)
Merging sunxi/sunxi/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging tegra/for-next (8617339892a6 Merge branch for-5.9/arm64/dt into
for-next)
Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into
ti-k3-next)
Merging ti-k3-new/ti-k3-next (9123e3a74ec7 Linux 5.9-rc1)
Merging uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next)
Merging clk/clk-next (9123e3a74ec7 Linux 5.9-rc1)
Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7)
Merging csky/linux-next (bdcd93ef9afb csky: Add context tracking support)
Merging h8300/h8300-next (9d48776fc609 Merge remote-tracking branch
'origin/master' into h8300-next)
Merging ia64/next (1a9d3c34c593 x86/cpu: Add Lakefield, Alder Lake and Rocket
Lake to Intel family)
Merging m68k/for-next (382f429bb559 m68k: defconfig: Update defconfigs for
v5.8-rc3)
Merging m68knommu/for-next (89d77da0166d binfmt_flat: revert "binfmt_flat:
don't offset the data start")
Merging microblaze/next (b3a9e3b9622a Linux 5.8-rc1)
Merging mips/mips-next (07989ee3abad MIPS: BCM47xx: Include bcm47xx_sprom.h)
Merging nds32/next (0a2e478902c7 nds32: use get_kernel_nofault in dump_mem)
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 (bcf876870b95 Linux 5.8)
Merging powerpc/next (9123e3a74ec7 Linux 5.9-rc1)
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 (a407942f1825 Documentation/features: refresh RISC-V
arch support files)
Merging s390/features (9123e3a74ec7 Linux 5.9-rc1)
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 (a0fc1436f1f4 xtensa: add missing exclusive
access state management)
Merging fscrypt/master (55e32c54bbd5 fscrypt: don't load ->i_crypt_info before
it's known to be valid)
Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation
algorithm to reprobe/retry more quickly)
Merging btrfs/for-next (cd37cdd68ef1 Merge branch
'for-next-current-v5.7-20200730' into for-next-20200730)
CONFLICT (content): Merge conflict in fs/btrfs/super.c
Merging ceph/master (02e37571f9e7 ceph: handle zero-length feature mask in
session messages)
Merging cifs/for-next (9123e3a74ec7 Linux 5.9-rc1)
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 (34d41dbe5455 exfat: use i_blocksize() to get blocksize)
Merging ext3/for_next (de575ac602ab Pull reiserfs spelling fixes.)
Merging ext4/dev (12ada33d7ac4 ext4: limit the length of per-inode prealloc
list)
Merging f2fs/dev (9123e3a74ec7 Linux 5.9-rc1)
Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for
->i_verity_info)
Merging fuse/for-next (9e9e23bd2d36 fuse: update project homepage)
Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with
flexible-array member)
Merging nfs/linux-next (9123e3a74ec7 Linux 5.9-rc1)
Merging nfs-anna/linux-next (65caafd0d214 SUNRPC reverting d03727b248d0 ("NFSv4
fix CLOSE not waiting for direct IO compeletion"))
Merging nfsd/nfsd-next (b3a9e3b9622a Linux 5.8-rc1)
Merging cel/cel-next (34b09af4f54e nfsd: fix oops on mixed NFSv4/NFSv3 client
access)
Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment
to variable ret)
Merging overlayfs/overlayfs-next (4518dfcf761e ovl: fix lookup of indexed
hardlinks with metacopy)
Merging ubifs/next (798b7347e4f2 jffs2: fix UAF problem)
Merging v9fs/9p-next (2ed0b7578170 9p: Remove unneeded cast from memory
allocation)
Merging xfs/for-next (96cf2a2c7556 xfs: Fix UBSAN null-ptr-deref in
xfs_sysfs_init)
Merging zonefs/for-next (2f4b7462d2fa zonefs: update documentation to reflect
zone size vs capacity)
Merging iomap/iomap-for-next (60263d5889e6 iomap: fall back to buffered writes
for invalidation failures)
Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update
xfs_ioctl_setattr_dax_invalidate())
Merging file-locks/locks-next (c0842fbc1b18 random32: move the pseudo-random
32-bit definitions to prandom.h)
Merging vfs/for-next (bcf876870b95 Linux 5.8)
Merging printk/for-next (20d6ee092831 Merge branch 'for-5.10' into for-next)
Merging pci/next (9123e3a74ec7 Linux 5.9-rc1)
Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao)
Merging hid/for-next (de11ec5fedd9 Merge branch 'for-5.9/upstream-fixes' into
for-next)
Merging i2c/i2c/for-next (8cd60a71c849 Merge branch 'i2c/for-5.9' 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 (4f31c8c48312 hwmon: (ltc2947) use simple i2c
probe)
Merging jc_docs/docs-next (9123e3a74ec7 Linux 5.9-rc1)
Merging v4l-dvb/master (9a538b83612c media: venus: core: Add support for opp
tables/perf voting)
CONFLICT (content): Merge conflict in drivers/media/platform/pxa_camera.c
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 (1f08d51cd57f Merge branch 'opp/fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm)
Merging cpufreq-arm/cpufreq/arm/linux-next (f259eab3ea0e cpufreq: make
schedutil the default for arm and arm64)
Merging cpupower/cpupower (94bd8ea151da cpupowerutils: fix spelling mistake
"dependant" -> "dependent")
Merging devfreq/devfreq-next (9123e3a74ec7 Linux 5.9-rc1)
Merging opp/opp/linux-next (06a8a059e88b opp: Allow disabled OPPs in
dev_pm_opp_get_freq())
Merging thermal/thermal/linux-next (c569e805c7bc thermal: intel:
intel_pch_thermal: Add Cannon Lake Low Power PCH support)
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 (fa601a9ebd49 fs: dlm: implement tcp graceful shutdown)
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 (9123e3a74ec7 Linux 5.9-rc1)
Merging net-next/master (e5b15f5af21a Merge branch
'ptp-Add-generic-helper-functions')
CONFLICT (content): Merge conflict in lib/nlattr.c
Merging bpf-next/master (c1447efdafff Merge branch 'type-and-enum-value-relos')
Merging ipsec-next/master (da7955405fb2 sfc: Fix build with CONFIG_RFS_ACCEL
disabled.)
Merging mlx5-next/mlx5-next (9123e3a74ec7 Linux 5.9-rc1)
Merging netfilter-next/master (7fca4dee610d Merge tag 'powerpc-5.9-2' of
git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
Merging ipvs-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of
git://github.com/cschaufler/smack-next)
Merging wireless-drivers-next/master (eb77802e0daa Merge ath-next from
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (3b799254cf6f Bluetooth: hci_uart: Cancel init work
before unregistering)
Merging mac80211-next/master (e3ec1e8ca02b net: eliminate meaningless memcpy to
data in pskb_carve_inside_nonlinear())
Merging gfs2/for-next (e28c02b94f9e gfs2: When gfs2_dirty_inode gets a glock
error, dump the glock)
Merging mtd/mtd/next (6a1380271b75 Merge tag 'nand/for-5.9' of
git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next)
Merging nand/nand/next (da151e3458c8 dt-bindings: mtd: fsl-upm-nand: Deprecate
chip-delay and fsl, upm-wait-flags)
Merging spi-nor/spi-nor/next (e93a977367b2 mtd: revert "spi-nor: intel: provide
a range for poll_timout")
Merging crypto/master (1dbb920e342c crypto: algapi - Move crypto_yield into
internal.h)
Merging drm/drm-next (62975d27d647 drm/ttm: revert "drm/ttm: make TT creation
purely optional v3")
Merging amdgpu/drm-next (ed6b26c2fb7f Revert "drm/radeon: handle PCIe root
ports with addressing limitations")
CONFLICT (content): Merge conflict in
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
CONFLICT (content): Merge conflict in
drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h
CONFLICT (content): Merge conflict in
drivers/gpu/drm/amd/display/dc/dc_bios_types.h
CONFLICT (content): Merge conflict in
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
CONFLICT (content): Merge conflict in
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
CONFLICT (content): Merge conflict in
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Merging drm-intel/for-linux-next (d24f1341a63c drm/i915: Apply
Wa_14011264657:gen11+)
Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support
180° rotation)
Merging drm-misc/for-linux-next (62975d27d647 drm/ttm: revert "drm/ttm: make TT
creation purely optional v3")
Merging drm-msm/msm-next (9d5cbf5fe46e drm/msm: add shutdown support for
display platform_driver)
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 (9123e3a74ec7 Linux 5.9-rc1)
Merging sound/for-next (b90b925fd52c ALSA: hda: avoid reset of sdo_limit)
Merging sound-asoc/for-next (8828feede9b2 Merge remote-tracking branch
'asoc/for-5.10' into asoc-next)
Merging modules/modules-next (262e6ae7081d modules: inherit
TAINT_PROPRIETARY_MODULE)
Merging input/next (d862a3068ea5 Input: exc3000 - add support to query model
and fw_version)
Merging block/for-next (86cfccb66937 Merge tag 'dlm-5.9' of
git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging device-mapper/for-next (a9cb9f4148ef dm: don't call report zones for
more than the user requested)
Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple()
static)
Merging mmc/next (7f4bc2e8687e mmc: mediatek: make function msdc_cqe_disable()
static)
Merging mfd/for-mfd-next (e15d7f2b81d2 mfd: syscon: Use a unique name with
regmap_config)
Merging backlight/for-backlight-next (7eb99a39ef76 video: backlight: cr_bllcd:
Remove unused variable 'intensity')
Merging battery/for-next (46cbd0b05799 power: supply: wilco_ec: Add long life
charging mode)
Merging regulator/for-next (87cf76f7f898 Merge remote-tracking branch
'regulator/for-5.10' into regulator-next)
Merging security/next-testing (ddcf4ecd547e Merge branch 'for-v5.8' into
next-testing)
Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for
bool variable)
Merging integrity/next-integrity (3db0d0c276a7 integrity: remove redundant
initialization of variable ret)
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 (69ea651c40f7 selinux: fix allocation failure check on
newpolicy->sidtab)
Applying: selinux: avoid dereferencing the policy prior to initialization
Merging smack/next (42a2df3e829f Smack: prevent underflow in smk_set_cipso())
Merging tomoyo/master (9123e3a74ec7 Linux 5.9-rc1)
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 (e46b3c0d011e Merge tag 'arm-smmu-updates' of
git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next)
Merging vfio/next (ccd59dce1a21 vfio/type1: Refactor vfio_iommu_type1_ioctl())
Merging audit/next (265c32072b0c audit: uninitialize variable audit_sig_sid)
Merging devicetree/for-next (7ba58fff001d dt-bindings: Validate DT binding
schema in a single call)
Merging mailbox/mailbox-for-next (884996986347 mailbox: mediatek: cmdq: clear
task in channel before shutdown)
Merging spi/for-next (e6bf656ae6bf Merge remote-tracking branch 'spi/for-5.10'
into spi-next)
Merging tip/auto-latest (d8211042f91d Merge branch 'perf/urgent')
Merging clockevents/timers/drivers/next (9fba22584e54 clocksource: Ingenic: Add
support for the Ingenic X1000 OST.)
Merging edac/edac-for-next (e4c5913b9f2e Merge branch 'edac-urgent' into
edac-for-next)
Merging irqchip/irq/irqchip-next (7828a3ef8646 irqchip: Fix probing deferal
when using IRQCHIP_PLATFORM_DRIVER helpers)
Merging ftrace/for-next (38ce2a9e33db tracing: Add trace_array_init_printk() to
initialize instance trace_printk() buffers)
Merging rcu/rcu/next (88f8ab921c95 bitops, kcsan: Partially revert
instrumentation for non-atomic bitops)
Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by
'kvm_run' cleanup)
Merging kvm-arm/next (16314874b12b Merge branch 'kvm-arm64/misc-5.9' into
kvmarm-master/next)
Merging kvm-ppc/kvm-ppc-next (81ab595ddd3c KVM: PPC: Book3S HV: Rework secure
mem slot dropping)
Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset)
Merging xen-tip/linux-next (585c6ed738a5 drm/xen-front: Pass dumb buffer data
offset to the backend)
Merging percpu/for-next (4fa640dc5230 Merge tag 'vfio-v5.8-rc7' of
git://github.com/awilliam/linux-vfio into master)
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 (9123e3a74ec7 Linux 5.9-rc1)
Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging leds/for-next (242b81170fb8 leds: lp50xx: Add the LP50XX family of the
RGB LED driver)
Merging ipmi/for-next (83dea1285672 char: ipmi: convert tasklets to use new
tasklet_setup() API)
Merging driver-core/driver-core-next (9123e3a74ec7 Linux 5.9-rc1)
Merging usb/usb-next (28157b8c7d9a USB: Better name for __check_usb_generic())
Merging usb-gadget/next (f5e46aa4a124 usb: dwc3: gadget: when the started list
is empty stop the active xfer)
Merging usb-serial/usb-next (47ec5303d73e Merge
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging usb-chipidea-next/ci-for-usb-next (d6f93d21001e usb: chipidea: imx: get
available runtime dr mode for wakeup setting)
Merging phy-next/next (9123e3a74ec7 Linux 5.9-rc1)
Merging tty/tty-next (377c0d7ea5bb dt-bindings: timer: Add compatible for
Mediatek MT8192)
Merging char-misc/char-misc-next (d162219c655c mei: virtio: virtualization
frontend driver)
Merging extcon/extcon-next (b3a9e3b9622a Linux 5.8-rc1)
Merging soundwire/next (08abad9f45f1 soundwire: intel: refine runtime pm for
SDW_INTEL_CLK_STOP_BUS_RESET)
Merging thunderbolt/next (9123e3a74ec7 Linux 5.9-rc1)
Merging staging/staging-next (bc752d2f345b staging: hikey9xx: Kconfig: add
regulator dependency)
Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and
remove of_match_ptr)
Merging icc/icc-next (12a400b016ab interconnect: Mark all dummy functions as
static inline)
Merging dmaengine/next (144ceb27d737 dmaengine: xilinx: dpdma: Make symbol
'dpdma_debugfs_reqs' static)
Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgroup)
Merging scsi/for-next (7b08f25e38ce Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (e62212672ab5 scsi: ufs: Remove several redundant
goto statements)
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 (22cc422070d9 gpio: wcove: Request IRQ after all
initialisation done)
Merging gpio-brgl/gpio/for-next (01e8d85b68fd gpio: aggregator: Refactor
->{get, set}_multiple() to make Sparse happy)
Merging gpio-intel/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging pinctrl/for-next (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging pinctrl-intel/for-next (80c1050d3f49 pinctrl: intel: Update header
block to reflect direct dependencies)
$ git reset --hard HEAD^
Merging next-20200819 version of pinctrl-intel
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 (850d0cc64c8e selftests/harness: Limit step counter
reporting)
Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with
tv_nsec >= NSEC_PER_SEC")
Merging livepatching/for-next (bf14b015bf51 Merge branch
'for-5.9/selftests-cleanup' into for-next)
Merging coresight/next (ff1304be0a05 coresight: etm4x: Add Support for
HiSilicon ETM device)
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 (a4423cedc56f eeprom: at24: Add support for the Sony
VAIO EEPROMs)
Merging ntb/ntb-next (b3a9e3b9622a Linux 5.8-rc1)
Merging seccomp/for-next/seccomp (16b89f695313 net/scm: Fix typo in SCM_RIGHTS
compat refactoring)
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 (4ca8b73f16f0 fsi: aspeed: Support CFAM reset GPIO)
Merging slimbus/for-next (b3a9e3b9622a Linux 5.8-rc1)
Merging nvmem/for-next (a24ef5be460b nvmem: qcom-spmi-sdam: Enable multiple
devices)
CONFLICT (add/add): Merge conflict in
Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
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 (2c308ef41351 kgdb: Make "kgdbcon" work properly
with "kgdb_earlycon")
Merging pidfd/for-next (da83d0cb9237 Merge branch 'cap_checkpoint_restore' into
for-next)
Merging hmm/hmm (9123e3a74ec7 Linux 5.9-rc1)
Merging fpga/for-next (3359f5f44cb5 fpga: dfl: change data type of feature id
to u16)
Merging kunit/test (48778464bb7d Linux 5.8-rc2)
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 (d43c7fb05765 kunit: tool: fix improper treatment of
file location)
Merging trivial/for-next (c1a371cf80fb printk: fix global comment)
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)
Merging akpm-current/current (8c4285719116 ROMFS: support inode blocks
calculation)
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (cc3af00352dd mm/mmap: add inline munmap_vma_range() for
code readability)
Applying: Revert "dma-mapping: set default segment_boundary_mask to ULONG_MAX"
pgpGYjzRVWj5Z.pgp
Description: OpenPGP digital signature
