linux-next: Tree for Apr 3

* linux-next: Tree for Apr 3
@ 2020-04-03  5:29 Stephen Rothwell
  2020-04-03  8:54 ` Yuehaibing
  0 siblings, 1 reply; 14+ messages in thread
From: Stephen Rothwell @ 2020-04-03  5:29 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

The merge window has opened, so please do not add any material for the
next release into your linux-next included trees/branches until after
the merge window closes.

Changes since 20200402:

The akpm-current tree gained conflicts against the drm tree.

Non-merge commits (relative to Linus' tree): 4919
 4882 files changed, 195091 insertions(+), 80338 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 316 trees (counting Linus' and 78 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 (7be97138e727 Merge tag 'xfs-5.7-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fixes/master (5ed25ddf2c86 Revert "irqchip/xilinx: Enable generic irq multi handler")
Merging kbuild-current/fixes (e595dd94515e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging arc-current/for-curr (f09d3174f002 ARC: allow userspace DSP applications to use AGU extensions)
Merging arm-current/fixes (89604523a76e ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin)
Merging arm-soc-fixes/arm/fixes (c8042d1e5cb3 soc: samsung: chipid: Fix return value on non-Exynos platforms)
Merging arm64-fixes/for-next/fixes (6f5459da2b87 arm64: alternative: fix build with clang integrated assembler)
Merging m68k-current/for-linus (86cded5fc525 m68k: defconfig: Update defconfigs for v5.6-rc4)
Merging powerpc-fixes/fixes (1d0c32ec3b86 KVM: PPC: Fix kernel crash with PR KVM)
Merging s390-fixes/fixes (16fbf79b0f83 Linux 5.6-rc7)
Merging sparc/master (11648b8339f8 sparc64: fix adjtimex regression)
Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key)
Merging net/master (21f64e72e707 net: stmmac: xgmac: Fix VLAN register handling)
Merging bpf/master (b9258a2cece4 slcan: Don't transmit uninitialized stack data in padding)
Merging ipsec/master (0141317611ab Merge branch 'hns3-fixes')
Merging netfilter/master (21f64e72e707 net: stmmac: xgmac: Fix VLAN register handling)
Merging ipvs/master (0141317611ab Merge branch 'hns3-fixes')
Merging wireless-drivers/master (0433ae556ec8 iwlwifi: don't send GEO_TX_POWER_LIMIT if no wgds table)
Merging mac80211/master (a0ba26f37ea0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging rdma-fixes/for-rc (7111951b8d49 Linux 5.6)
Merging sound-current/for-linus (5c6cd7021a05 ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor)
Merging sound-asoc-fixes/for-linus (52ac54e1de31 Merge branch 'asoc-5.7' into asoc-linus)
Merging regmap-fixes/for-linus (87fc8230f7aa Merge branch 'regmap-5.6' into regmap-linus)
Merging regulator-fixes/for-linus (bae4cb90541a Merge branch 'regulator-5.6' into regulator-linus)
Merging spi-fixes/for-linus (16fbf79b0f83 Linux 5.6-rc7)
Merging pci-current/for-linus (5901b51f3e5d MAINTAINERS: Correct Cadence PCI driver path)
Merging driver-core.current/driver-core-linus (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging tty.current/tty-linus (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging usb.current/usb-linus (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging usb-gadget-fixes/fixes (42cd5ffe46c1 usb: dwc3: debug: fix string position formatting mixup with ret and len)
Merging usb-serial-fixes/usb-linus (16fbf79b0f83 Linux 5.6-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (7cbf3dd3139a usb: chipidea: udc: fix sleeping function called from invalid context)
Merging phy/fixes (be4e3c737eeb phy: mapphone-mdm6600: Fix timeouts by adding wake-up handling)
Merging staging.current/staging-linus (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging char-misc.current/char-misc-linus (16fbf79b0f83 Linux 5.6-rc7)
Merging soundwire-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging thunderbolt-fixes/fixes (16fbf79b0f83 Linux 5.6-rc7)
Merging input-current/for-linus (4134252ab7e2 Input: fix stale timestamp on key autorepeat events)
Merging crypto-current/master (fcb90d51c375 crypto: af_alg - bool type cosmetics)
Merging ide/master (94f2630b1897 Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6)
Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base)
Merging kselftest-fixes/fixes (f3a60268f5ce selftest/lkdtm: Use local .gitignore)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging slave-dma-fixes/fixes (018af9be3dd5 dmaengine: ti: k3-udma-glue: Fix an error handling path in 'k3_udma_glue_cfg_rx_flow()')
Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
Merging mtd-fixes/mtd/fixes (def9d2780727 Linux 5.5-rc7)
Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core)
Merging v4l-dvb-fixes/fixes (2632e7b618a7 media: venus: firmware: Ignore secure call error on first resume)
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
Merging mips-fixes/mips-fixes (f7d5f5655ef7 MAINTAINERS: Correct MIPS patchwork URL)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
Merging omap-fixes/fixes (07bdc492cff6 ARM: dts: OMAP3: disable RNG on N950/N9)
Merging kvm-fixes/master (e1be9ac8e601 KVM: X86: Narrow down the IPI fastpath to single target IPI)
Merging kvms390-fixes/master (e93fc7b4544a KVM: s390: Also reset registers in sync regs for initial cpu reset)
Merging hwmon-fixes/hwmon (4eb981e97679 hwmon: (pmbus/isl68137) Fix up chip IDs)
Merging nvdimm-fixes/libnvdimm-fixes (f84afbdd3a9e libnvdimm: Out of bounds read in __nd_ioctl())
Merging btrfs-fixes/next-fixes (f5bf9a8fa525 Merge branch 'misc-5.6' into next-fixes)
Merging vfs-fixes/fixes (d9a9f4849fe0 cifs_atomic_open(): fix double-put on late allocation failure)
Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU)
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
Merging drivers-x86-fixes/fixes (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging samsung-krzk-fixes/fixes (0d935f0bf77d ARM: dts: exynos: Fix regulator node aliasing on Midas-based boards)
Merging pinctrl-samsung-fixes/pinctrl-fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging devicetree-fixes/dt/linus (e33a814e772c scripts/dtc: Remove redundant YYLOC global declaration)
Merging scsi-fixes/fixes (ea697a8bf5a4 scsi: sd: Fix optimal I/O size for devices that change reported values)
Merging drm-fixes/drm-fixes (c4b979ebcafe Merge tag 'amd-drm-fixes-5.6-2020-03-26' 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 (7111951b8d49 Linux 5.6)
Merging mmc-fixes/fixes (16fbf79b0f83 Linux 5.6-rc7)
Merging rtc-fixes/rtc-fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging gnss-fixes/gnss-linus (f8788d86ab28 Linux 5.6-rc3)
Merging hyperv-fixes/hyperv-fixes (032d4a480220 hv: hyperv_vmbus.h: Replace zero-length array with flexible-array member)
Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create)
Merging risc-v-fixes/fixes (2191b4f298fa RISC-V: Move all address space definition macros to one place)
Merging pidfd-fixes/fixes (10dab84caf40 pid: make ENOMEM return value more obvious)
Merging fpga-fixes/fixes (3c2760b78f90 fpga: dfl: pci: fix return value of cci_pci_sriov_configure)
Merging spdx/spdx-linus (71db3aa2816d ASoC: MT6660: make spdxcheck.py happy)
CONFLICT (modify/delete): tools/testing/selftests/networking/timestamping/.gitignore deleted in HEAD and modified in spdx/spdx-linus. Version spdx/spdx-linus of tools/testing/selftests/networking/timestamping/.gitignore left in tree.
$ git rm -f tools/testing/selftests/networking/timestamping/.gitignore
Merging gpio-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging pinctrl-intel-fixes/fixes (16fbf79b0f83 Linux 5.6-rc7)
Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2)
Merging drm-misc-fixes/for-linux-next-fixes (83a196773b8b drm/bridge: analogix_dp: Split bind() into probe() and real bind())
Merging kspp-gustavo/for-next/kspp (90e5d84c7b06 xattr.h: Replace zero-length array with flexible-array member)
Merging kbuild/for-next (580ff3dfafe3 Documentation/llvm: fix the name of llvm-size)
Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (fd27a526bb38 ARM/dma-mapping: merge __dma_supported into arm_dma_supported)
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 (52d3b2f98483 Merge branch 'devel-stable' into for-next)
Merging arm64/for-next/core (e16e65a02913 arm64: remove CONFIG_DEBUG_ALIGN_RODATA feature)
Merging arm-perf/for-next/perf (8673e02e5841 arm64: perf: Add support for ARMv8.5-PMU 64-bit counters)
Merging arm-soc/for-next (d9725e56e1d8 soc: document merges)
CONFLICT (content): Merge conflict in arch/arm/configs/omap2plus_defconfig
Merging amlogic/for-next (e304af8727dd Merge branch 'v5.7/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (de285b938cf3 ARM: dts: aspeed: ast2600: Fix SCU IRQ controller nodes)
Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
Merging imx-mxs/for-next (e506dba69a5e Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (560b4d4691b0 Merge branch 'for_5.7/keystone-dts' into next)
Merging mediatek/for-next (6906847e14b5 Merge branch 'v5.6-next/soc' into for-next)
Merging mvebu/for-next (9d32706f8aa8 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (e90f16cc1a48 Merge branch 'fixes' into for-next)
Merging qcom/for-next (8dc3769c8a68 Merge branches 'arm64-for-5.7', 'arm64-defconfig-for-5.7', 'defconfig-for-5.7', 'drivers-for-5.7' and 'dts-for-5.7' into for-next)
Merging raspberrypi/for-next (e7b7daeb48e0 ARM: dts: bcm283x: Use firmware PM driver for V3D)
CONFLICT (content): Merge conflict in arch/arm/configs/bcm2835_defconfig
Merging realtek/for-next (45698e00d5a9 Merge branch 'v5.6/dt' into next)
Merging renesas/next (bf4540d5148c Merge branch 'renesas-arm64-dt-for-v5.7' into renesas-next)
Merging reset/reset/next (2ebf89fd4ecf reset: hi6220: Add support for AO reset controller)
Merging rockchip/for-next (c018aff1a201 Merge branch 'v5.7-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (5c1cb4ae848e Merge branch 'next/dt-late' into for-next)
Merging scmi/for-linux-next (7111951b8d49 Linux 5.6)
Merging sunxi/sunxi/for-next (8afff9da61ea Merge branch 'sunxi/dt-for-5.7' into sunxi/for-next)
Merging tegra/for-next (df0a178cf2df Merge branch for-5.7/usb into for-next)
Merging clk/clk-next (fe3419f5acf0 Merge branch 'clk-imx' into clk-next)
Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-rc1)
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging csky/linux-next (0ef5b782a807 csky: Enable the gcov function in csky achitecture)
Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
Merging ia64/next (172e7890406d tty/serial: cleanup after ioc*_serial driver removal)
Merging m68k/for-next (86cded5fc525 m68k: defconfig: Update defconfigs for v5.6-rc4)
Merging m68knommu/for-next (ba000760eb0f m68k: Replace setup_irq() by request_irq())
Merging microblaze/next (9fd1a1c9b3f2 microblaze: Replace setup_irq() by request_irq())
Merging mips/mips-next (ba15533275dd Merge tag 'v5.6' into mips-next)
Merging nds32/next (d785c5a324cd nds32: configs: Cleanup CONFIG_CROSS_COMPILE)
Merging nios2/for-next (051d75d3bb31 MAINTAINERS: Update Ley Foon Tan's email address)
Merging openrisc/for-next (9737e2c5f0bc openrisc: Remove obsolete show_trace_task function)
Merging parisc-hd/for-next (8a29e21d8cb0 parisc: Replace setup_irq() by request_irq())
Merging powerpc/next (c17eb4dca5a3 powerpc: Make setjmp/longjmp signature standard)
CONFLICT (content): Merge conflict in fs/sysfs/group.c
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
Merging soc-fsl/next (461c3ac0dc46 soc: fsl: qe: fix sparse warnings for ucc_slow.c)
Merging risc-v/for-next (f1e58583b9c7 RISC-V: Support cpu hotplug)
CONFLICT (content): Merge conflict in arch/riscv/include/asm/pgtable.h
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging s390/features (1058c163dc31 s390/mm: cleanup init_new_context() callback)
Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay)
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging uml/linux-next (4a7c46247f9c um: Remove some unnecessary NULL checks in vector_user.c)
Merging xtensa/xtensa-for-next (adc044bf2320 Merge branch 'xtensa-5.7-fixes' into xtensa-for-next)
Merging fscrypt/master (861261f2a9cc ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE)
Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret')
Merging btrfs/for-next (5a7ef5cb05dc Merge branch 'for-next-current-v5.6-20200331' into for-next-20200331)
Merging ceph/master (3e10eb7331c7 rbd: don't mess with a page vector in rbd_notify_op_lock())
Merging cifs/for-next (c037725d043e cifs: ignore cached share root handle closing errors)
Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item)
Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
Merging erofs/dev (20741a6e146c MAINTAINERS: erofs: update my email address)
Merging ext3/for_next (a32f0ecd79b4 Merge fanotify fix from Nathan Chancellor.)
Merging ext4/dev (54d3adbc29f0 ext4: save all error info in save_error_info() and drop ext4_set_errno())
Merging f2fs/dev (8a1ca11a95e2 f2fs: keep inline_data when compression conversion)
Merging fsverity/fsverity (98d54f81e36b Linux 5.6-rc4)
Merging fuse/for-next (3e8cb8b2eaeb fuse: fix stack use after return)
Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member)
Merging nfs/linux-next (f764a1e1cb8b Merge tag 'nfs-rdma-for-5.7-1' of git://git.linux-nfs.org/projects/anna/linux-nfs)
Merging nfs-anna/linux-next (55dee1bc0d72 nfs: add minor version to nfs_server_key for fscache)
Merging nfsd/nfsd-next (2653de9f0398 fs: nfsd: fileache.c: Use built-in RCU list checking)
Merging orangefs/for-next (9f198a2ac543 help_next should increase position index)
Merging overlayfs/overlayfs-next (2eda9eaa6d7e ovl: document xino expected behavior)
Merging ubifs/linux-next (3676f32a98cd ubi: ubi-media.h: Replace zero-length array with flexible-array member)
Merging v9fs/9p-next (43657496e466 net/9p: remove unused p9_req_t aux field)
Merging xfs/for-next (d9fdd0adf932 xfs: fix inode number overflow in ifree cluster helper)
Merging zonefs/for-next (0dda2ddb7ded zonefs: select FS_IOMAP)
Merging iomap/iomap-for-next (457df33e035a iomap: Handle memory allocation failure in readahead)
Merging djw-vfs/vfs-for-next (56939e014a6c hibernate: Allow uswsusp to write to swap)
Merging file-locks/locks-next (dbdaf6a3250b locks: reinstate locks_delete_block optimization)
Merging vfs/for-next (575beddbd7f4 Merge branches 'work.exfat' and 'work.dotdot' into for-next)
CONFLICT (modify/delete): drivers/staging/exfat/Kconfig deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/staging/exfat/Kconfig left in tree.
CONFLICT (content): Merge conflict in MAINTAINERS
$ git rm -f drivers/staging/exfat/Kconfig
Merging printk/for-next (d34f14ae521f Merge branch 'for-5.7-preferred-console' into for-next)
Merging pci/next (86ce3c90c910 Merge branch 'remotes/lorenzo/pci/vmd')
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_main.c
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pstore/for-next/pstore (8128d3aac0ee pstore/ram: Replace zero-length array with flexible-array member)
Merging hid/for-next (c2320c3ee0e6 Merge branch 'for-5.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (ae7a83a5275b Merge branch 'i2c/for-5.7' into i2c/for-next)
Merging i3c/i3c/next (c4b9de11d010 i3c: convert to use i2c_new_client_device())
Merging dmi/master (12028f913eb9 firmware/dmi: Report DMI Bios & EC firmware release)
Merging hwmon-staging/hwmon-next (5b10a8194664 docs: hwmon: Update documentation for isl68137 pmbus driver)
Merging jc_docs/docs-next (abcb1e021ae5 Documentation: x86: exception-tables: document CONFIG_BUILDTIME_TABLE_SORT)
Merging v4l-dvb/master (2632e7b618a7 media: venus: firmware: Ignore secure call error on first resume)
Merging v4l-dvb-next/master (54ecb8f7028c Linux 5.4-rc1)
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (90ffa1f5a089 Merge branch 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (a8811ec764f9 cpufreq: qcom: Add support for krait based socs)
Merging cpupower/cpupower (2de7fb60a474 cpupower: avoid multiple definition with gcc -fno-common)
Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter)
Merging thermal/thermal/linux-next (76a5c400aae5 thermal: imx8mm: Fix build warning of incorrect argument type)
CONFLICT (content): Merge conflict in drivers/thermal/cpufreq_cooling.c
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 (a48f9721e6db dlm: no need to check return value of debugfs_create functions)
Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
Merging rdma/for-next (b4d8ddf8356d RDMA/bnxt_re: make bnxt_re_ib_init static)
Merging net-next/master (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging bpf-next/master (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging ipsec-next/master (308491755f36 xfrm: add prep for esp beet mode offload)
Merging mlx5-next/mlx5-next (826096d84f50 mlx5: Remove uninitialized use of key in mlx5_core_create_mkey)
Merging netfilter-next/master (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook)
Merging wireless-drivers-next/master (5988b8ec7132 Merge tag 'iwlwifi-next-for-kalle-2020-03-27' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
Merging bluetooth/master (92516cd97fd4 Bluetooth: Always request for user confirmation for Just Works)
Merging mac80211-next/master (1e8f471425f4 mac80211_hwsim: notify wmediumd of used MAC addresses)
Merging gfs2/for-next (75b46c437f6b gfs2: Fix oversight in gfs2_ail1_flush)
Merging mtd/mtd/next (025a06c1104c mtd: Convert fallthrough comments into statements)
Merging nand/nand/next (fca88925d769 mtd: rawnand: toshiba: Support reading the number of bitflips for BENAND (Built-in ECC NAND))
Merging spi-nor/spi-nor/next (f3f2b7eb2f1c mtd: spi-nor: Enable locking for n25q512ax3/n25q512a)
Merging crypto/master (fcb90d51c375 crypto: af_alg - bool type cosmetics)
Merging drm/drm-next (0e7e6198af28 Merge branch 'ttm-transhuge' of git://people.freedesktop.org/~thomash/linux into drm-next)
Merging amdgpu/drm-next (03eab26d6a9a drm/amdgpu/display: fix logic inversion in program_timing_sync())
Merging drm-intel/for-linux-next (17d0c1062a0c Merge tag 'gvt-next-fixes-2020-03-31' of https://github.com/intel/gvt-linux into drm-intel-next-fixes)
Merging drm-tegra/drm/tegra/for-next (e32c8c2a5fbe drm/tegra: hdmi: Silence deferred-probe error)
Merging drm-misc/for-linux-next (d8a26d8fc37c drm/mm: revert "Break long searches in fragmented address spaces")
Merging drm-msm/msm-next (a5fb8b918920 drm/msm/a6xx: Use the DMA API for GMU memory objects)
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 (2c76b324c794 drm/imx: parallel-display: Adjust bus_flags handling)
Merging etnaviv/etnaviv/next (f232d9ec029c drm/etnaviv: fix TS cache flushing on GPUs with BLT engine)
Merging regmap/for-next (2060986f04ad Merge branch 'regmap-5.7' into regmap-next)
Merging sound/for-next (dbdd24eaac4e edd: Use scnprintf() for avoiding potential buffer overflow)
Merging sound-asoc/for-next (52ac54e1de31 Merge branch 'asoc-5.7' into asoc-linus)
Merging modules/modules-next (0f74226649fb kernel: module: Replace zero-length array with flexible-array member)
Merging input/next (3a8579629665 Input: update SPDX tag for input-event-codes.h)
Merging block/for-next (d9e92da49f29 Merge branch 'for-5.7/block' into for-next)
CONFLICT (content): Merge conflict in include/linux/genhd.h
Merging device-mapper/for-next (fdd5b7d474f8 Revert "dm: always call blk_queue_split() in dm_process_bio()")
Merging pcmcia/pcmcia-next (af741b0bad23 pcmcia: soc_common.h: Replace zero-length array with flexible-array member)
Merging mmc/next (92075d98abf0 mmc: cavium-octeon: remove nonsense variable coercion)
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
Merging mfd/for-mfd-next (d2923aa45356 mfd: intel-lpss: Fix Intel Elkhart Lake LPSS I2C input clock)
Merging backlight/for-backlight-next (ee0c8e494cc3 backlight: corgi: Convert to use GPIO descriptors)
Merging battery/for-next (f78c55e3b480 power: reset: sc27xx: Allow the SC27XX poweroff driver building into a module)
Applying: power: reset: sc27xx: use remove_cpu instead of cpu_down
Merging regulator/for-next (24bd2afda8ce Merge branch 'regulator-5.7' into regulator-next)
Merging security/next-testing (3e27a33932df security: remove duplicated include from security.h)
Merging apparmor/apparmor-next (01df52d726b5 apparmor: remove duplicate check of xattrs on profile attachment.)
Merging integrity/next-integrity (9e2b4be377f0 ima: add a new CONFIG for loading arch-specific policies)
Merging keys/keys-next (43672cf93c6d Merge branch 'notifications-pipe-core' into keys-next)
CONFLICT (content): Merge conflict in include/linux/lsm_hooks.h
CONFLICT (content): Merge conflict in fs/pipe.c
Applying: io_uring: fix up for get_pipe_info() API change
Applying: security: keys: fixup for "security: Refactor declaration of LSM hooks"
Merging selinux/next (c753924b6285 selinux: clean up indentation issue with assignment statement)
Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock)
Merging tomoyo/master (9efcc4a12936 afs: Fix unpinned address list during probing)
Merging tpmdd/next (2e356101e72a KEYS: reaching the keys quotas correctly)
Merging watchdog/master (2d63908bdbfb watchdog: Add K3 RTI watchdog support)
Merging iommu/next (ff68eb23308e Merge branches 'iommu/fixes', 'arm/qcom', 'arm/omap', 'arm/smmu', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next)
Merging vfio/next (f44efca0493d vfio: Ignore -ENODEV when getting MSI cookie)
Merging audit/next (1320a4052ea1 audit: trigger accompanying records when no rules present)
Merging devicetree/for-next (8967918e7cee MAINTAINERS: drop an old reference to stm32 pwm timers doc)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/generic.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/trivial-devices.yaml
Merging mailbox/mailbox-for-next (0a67003b1985 mailbox: imx: add SCU MU support)
Merging spi/for-next (1ba0b52ea73b Merge branch 'spi-5.7' into spi-next)
Merging tip/auto-latest (ee8bac724cc7 Merge branch 'irq/urgent')
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging clockevents/timers/drivers/next (c1ac28a4de6f Revert "clocksource: Avoid creating dead devices")
Merging edac/edac-for-next (ad49d9a8228e Merge branch 'edac-misc' into edac-for-next)
Merging irqchip/irq/irqchip-next (4cea749d56be Revert "irqchip/xilinx: Enable generic irq multi handler")
Merging ftrace/for-next (2ab2a0924b99 tracing: Add documentation on set_ftrace_notrace_pid and set_event_notrace_pid)
Merging rcu/rcu/next (1503af98f54d rcutorture: Add test of holding scheduler locks across rcu_read_unlock())
CONFLICT (content): Merge conflict in tools/memory-model/litmus-tests/.gitignore
Merging kvm/linux-next (514ccc194971 x86/kvm: fix a missing-prototypes "vmread_error")
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/.gitignore
Merging kvm-arm/next (463050599742 Merge tag 'kvm-arm-removal' into kvmarm-master/next)
Merging kvm-ppc/kvm-ppc-next (9a5788c615f5 KVM: PPC: Book3S HV: Add a capability for enabling secure guests)
Merging kvms390/next (7a2653612bb6 s390/gmap: return proper error code on ksm unsharing)
Merging xen-tip/linux-next (c3881eb58d56 x86/xen: Make the secondary CPU idle tasks reliable)
Merging percpu/for-next (dedac37ea96b Merge branch 'for-5.7' into for-next)
Merging workqueues/for-next (4acf8a423cd3 Merge branch 'for-5.7' into for-next)
Merging drivers-x86/for-next (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging chrome-platform/for-next (317a0ebe53f4 iio: cros_ec: Use Hertz as unit for sampling frequency)
Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging leds/for-next (10a6cce3c1a1 Group LED functions according to functionality, and add some explaining comments.)
Merging ipmi/for-next (26455d00ee58 drivers: char: ipmi: ipmi_msghandler: Pass lockdep expression to RCU lists)
Merging driver-core/driver-core-next (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging usb/usb-next (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging usb-gadget/next (4a5dbd900957 dt-bindings: usb: add documentation for aspeed usb-vhub)
Merging usb-serial/usb-next (57aa9f294b09 USB: serial: io_edgeport: fix slab-out-of-bounds read in edge_interrupt_callback)
Merging usb-chipidea-next/ci-for-usb-next (86b17c7f14ed usb: chipidea: core: show the real pointer value for register)
Merging phy-next/next (89d715371a05 phy: qcom-qusb2: Add new overriding tuning parameters in QUSB2 V2 PHY)
Merging tty/tty-next (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging char-misc/char-misc-next (885a64715fd8 Revert "driver core: platform: Initialize dma_parms for platform devices")
Merging extcon/extcon-next (9c94553099ef extcon: axp288: Add wakeup support)
Merging soundwire/next (39ec6f992131 soundwire: qcom: add support for get_sdw_stream())
Merging thunderbolt/next (3010518964dc thunderbolt: Use scnprintf() for avoiding potential buffer overflow)
Merging staging/staging-next (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (03c4e6186bbb interconnect: qcom: Add OSM L3 support on SC7180)
Merging slave-dma/next (cea582b5ee56 dt-bindings: dma: renesas,usb-dmac: add r8a77961 support)
CONFLICT (content): Merge conflict in drivers/dma/ti/k3-udma.c
Merging cgroup/for-next (6fc331767f41 Merge branch 'for-5.7' into for-next)
Merging scsi/for-next (c128052e6991 Merge branch 'misc' into for-next)
CONFLICT (modify/delete): Documentation/scsi/scsi_mid_low_api.txt deleted in scsi/for-next and modified in HEAD. Version HEAD of Documentation/scsi/scsi_mid_low_api.txt left in tree.
$ git rm -f Documentation/scsi/scsi_mid_low_api.txt
Applying: scsi: fix up for "scsi: simplify scsi_partsize"
Merging scsi-mkp/for-next (1b55940b9bcc scsi: core: Add DID_ALLOC_FAILURE and DID_MEDIUM_ERROR to hostbyte_table)
Merging vhost/linux-next (c9b9f5f8c0f3 vdpa: move to drivers/vdpa)
CONFLICT (modify/delete): arch/arm/kvm/Kconfig deleted in HEAD and modified in vhost/linux-next. Version vhost/linux-next of arch/arm/kvm/Kconfig left in tree.
$ git rm -f arch/arm/kvm/Kconfig
Applying: Revert "virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM"
Merging rpmsg/for-next (45c2824de341 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Applying: Build failure in omap_remoteproc due to 02e6d546e3bd
Merging gpio/for-next (4ed7d7dd4890 Revert "gpio: eic-sprd: Use devm_platform_ioremap_resource()")
CONFLICT (content): Merge conflict in drivers/gpio/gpiolib.c
Merging gpio-brgl/gpio/for-next (975516250253 tools: gpio: Fix typo in gpio-utils)
Merging gpio-intel/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging pinctrl/for-next (c42f69b4207e pinctrl: qcom: fix compilation error)
Merging pinctrl-intel/for-next (16fbf79b0f83 Linux 5.6-rc7)
Merging pinctrl-samsung/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging pwm/for-next (a2005fc79179 pwm: jz4740: Allow selection of PWM channels 0 and 1)
Merging userns/for-next (d1e7fd6462ca signal: Extend exec_id to 64bits)
Merging ktest/for-next (1091c8fce8aa ktest: Fix typos in ktest.pl)
Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds)
Merging kselftest/next (1056d3d2c97e selftests: enforce local header dependency in lib.mk)
Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
Merging livepatching/for-next (d28b4c1b2b3d Merge branch 'for-5.6/selftests' into for-next)
Merging coresight/next (ed0efaa66ad8 docs: trace: coresight-ect.rst: fix a build warning)
Merging rtc/rtc-next (3edf29d9d585 rtc: class: remove redundant assignment to variable err)
Merging nvdimm/libnvdimm-for-next (6ab3463a5fcd Merge branch 'for-5.6/libnvdimm-space-align' into libnvdimm-for-next)
Merging at24/at24/for-next (4837621cd61e eeprom: at24: add TPF0001 ACPI ID for 24c1024 device)
Merging ntb/ntb-next (b9fc54c38e2e NTB: ntb_test: Fix bug when counting remote files)
Merging kspp/for-next/kspp (2e8993d77697 gcc-plugins/stackleak: Avoid assignment for unused macro argument)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (f8788d86ab28 Linux 5.6-rc3)
Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values)
CONFLICT (content): Merge conflict in drivers/fsi/Kconfig
Merging slimbus/for-next (ba1589ff458e slimbus: ngd: add v2.1.0 compatible)
Merging nvmem/for-next (990df6402752 nvmem: mxs-ocotp: Use devm_add_action_or_reset() for cleanup)
CONFLICT (modify/delete): drivers/nvmem/nvmem-sysfs.c deleted in HEAD and modified in nvmem/for-next. Version nvmem/for-next of drivers/nvmem/nvmem-sysfs.c left in tree.
$ git rm -f drivers/nvmem/nvmem-sysfs.c
Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked)
Merging hyperv/hyperv-next (86fd319b9240 x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set)
Merging auxdisplay/auxdisplay (2f920c0f0e29 auxdisplay: charlcd: replace zero-length array with flexible-array member)
Merging kgdb/kgdb/for-next (5ea771abd5a3 kdb: Censor attempts to set PROMPT without ENABLE_MEM_READ)
Merging pidfd/for-next (6952a4f64644 selftests: add pid namespace ENOMEM regression test)
Merging devfreq/devfreq-next (04982b957b3c PM / devfreq: tegra30: Make CPUFreq notifier to take into account boosting)
Merging hmm/hmm (bd5d3587b218 mm/hmm: return error for non-vma snapshots)
Merging fpga/for-next (cef0ca6417de fpga: dfl: afu: support debug access to memory-mapped afu regions)
Merging kunit/test (bb6d3fb354c5 Linux 5.6-rc1)
Merging cel/cel-next (1a33d8a284b1 svcrdma: Fix leak of transport addresses)
CONFLICT (content): Merge conflict in net/sunrpc/cache.c
Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache)
Merging cfi/cfi/next (b6fe8bc67d2d mtd: hyperbus: move direct mapping setup to AM654 HBMC driver)
Merging kunit-next/kunit (e23349af9ee2 kunit: tool: add missing test data file content)
Merging trivial/for-next (fad7c9020948 err.h: remove deprecated PTR_RET for good)
Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7)
Merging akpm-current/current (56303282d2cc ipc/mqueue.c: fix a brace coding style issue)
CONFLICT (content): Merge conflict in mm/memory.c
CONFLICT (content): Merge conflict in include/linux/huge_mm.h
CONFLICT (content): Merge conflict in arch/x86/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: Change email address for Pali Rohár
Applying: mm/kmemleak: silence KCSAN splats in checksum
Applying: drivers/dma/tegra20-apb-dma.c: fix platform_get_irq.cocci warnings
Applying: mm/frontswap: mark various intentional data races
Applying: mm/page_io: mark various intentional data races
Applying: mm-page_io-mark-various-intentional-data-races-v2
Applying: mm/swap_state: mark various intentional data races
Applying: mm/filemap.c: fix a data race in filemap_fault()
Applying: mm/swapfile: fix and annotate various data races
Applying: mm-swapfile-fix-and-annotate-various-data-races-v2
Applying: mm/page_counter: fix various data races at memsw
Applying: mm/memcontrol: fix a data race in scan count
Applying: mm/list_lru: fix a data race in list_lru_count_one
Applying: mm/mempool: fix a data race in mempool_free()
Applying: mm/util.c: annotate an data race at vm_committed_as
Applying: mm/rmap: annotate a data race at tlb_flush_batched
Applying: mm: annotate a data race in page_zonenum()
Applying: mm/swap.c: annotate data races for lru_rotate_pvecs
Applying: mm/memory.c: refactor insert_page to prepare for batched-lock insert
Applying: mm: bring sparc pte_index() semantics inline with other platforms
Applying: mm: define pte_index as macro for x86
Applying: mm/memory.c: add vm_insert_pages()
Applying: mm-add-vm_insert_pages-fix
Applying: add missing page_count() check to vm_insert_pages().
Applying: mm: vm_insert_pages() checks if pte_index defined.
Applying: net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy
Applying: net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix
Applying: mm/vma: define a default value for VM_DATA_DEFAULT_FLAGS
Applying: mm/vma: introduce VM_ACCESS_FLAGS
Applying: mm/special: create generic fallbacks for pte_special() and pte_mkspecial()
Applying: mm-special-create-generic-fallbacks-for-pte_special-and-pte_mkspecial-v3
Applying: mm/debug: add tests validating architecture page table helpers
Applying: mm/memory_hotplug: drop the flags field from struct mhp_restrictions
Applying: mm/memory_hotplug: rename mhp_restrictions to mhp_params
Applying: x86/mm: thread pgprot_t through init_memory_mapping()
Applying: x86/mm: introduce __set_memory_prot()
Applying: powerpc/mm: thread pgprot_t through create_section_mapping()
Applying: mm/memory_hotplug: add pgprot_t to mhp_params
Applying: mm/memremap: set caching mode for PCI P2PDMA memory to WC
Applying: mm/madvise: pass task and mm to do_madvise
Applying: mm/madvise: introduce process_madvise() syscall: an external memory hinting API
Applying: fix process_madvise build break for arm64
Applying: mm/madvise: check fatal signal pending of target process
Applying: pid: move pidfd_get_pid() to pid.c
Applying: mm/madvise: support both pid and pidfd for process_madvise
Applying: mm/madvise: employ mmget_still_valid() for write lock
Applying: mm/madvise: allow KSM hints for remote API
Applying: kmod: make request_module() return an error when autoloading is disabled
Applying: fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()
Applying: docs: admin-guide: document the kernel.modprobe sysctl
Applying: docs-admin-guide-document-the-kernelmodprobe-sysctl-v5
Applying: selftests: kmod: fix handling test numbers above 9
Applying: selftests: kmod: test disabling module autoloading
Applying: kexec: prevent removal of memory in use by a loaded kexec image
Applying: mm/memory_hotplug: allow arch override of non boot memory resource names
Applying: arm64: memory: give hotplug memory a different resource name
Applying: fs/seq_file.c: seq_read(): add info message about buggy .next functions
Applying: seq_read-info-message-about-buggy-next-functions-fix
Applying: kernel/gcov/fs.c: gcov_seq_next() should increase position index
Applying: ipc/util.c: sysvipc_find_ipc() should increase position index
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (8cbeecd470ba drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

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

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