linux-next: Tree for Nov 21

[Stephen Rothwell]

Hi all,

Changes since 20191120:

The arm64 tree gained a conflict against the arm64-fixes tree.

The net-next tree gained a conflict against the net tree.

The tip tree gained a conflict against the nfsd tree and a semantic
conflict against the drm tree.

The ftrace tree gained a conflict against the tip tree.

Non-merge commits (relative to Linus' tree): 11984
 10573 files changed, 519935 insertions(+), 230163 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 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 312 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 (c74386d50fba afs: Fix missing timeout reset)
Merging fixes/master (31f4f5b495a6 Linux 5.4-rc7)
Merging kbuild-current/fixes (80591e61a0f7 kbuild: tell sparse about the $ARCH)
Merging arc-current/for-curr (5effc09c4907 ARC: perf: Accommodate big-endian CPU)
Merging arm-current/fixes (39f4d4410484 Merge branch 'misc' into fixes)
Merging arm-soc-fixes/arm/fixes (db6efda85437 Merge tag 'tee-fixes-for-v5.4' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes)
Merging arm64-fixes/for-next/fixes (e50be648aaa3 arm64: uaccess: Remove uaccess_*_not_uao asm macros)
Merging m68k-current/for-linus (0f1979b402df m68k: Remove ioremap_fullcache())
Merging powerpc-fixes/fixes (7d6475051fb3 powerpc/powernv: Fix CPU idle to be called with IRQs disabled)
Merging s390-fixes/fixes (a99d8080aaf3 Linux 5.4-rc6)
Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (aee024f610cc Merge branch 'ibmvnic-regression')
Merging bpf/master (34e59836565e net/mlx4_en: fix mlx4 ethtool -N insertion)
Merging ipsec/master (a56dcc6b4558 net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size())
Merging netfilter/master (1d4639567d97 mdio_bus: Fix PTR_ERR applied after initialization to constant)
Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs)
Merging wireless-drivers/master (cb1a4badf592 iwlwifi: pcie: don't consider IV len in A-MSDU)
Merging mac80211/master (285531f9e677 mac80211: fix station inactive_time shortly after boot)
Merging rdma-fixes/for-rc (411c1e6774e2 RDMA/hns: Correct the value of srq_desc_size)
Merging sound-current/for-linus (976a68f06b2e ALSA: usb-audio: Fix incorrect size check for processing/extension units)
Merging sound-asoc-fixes/for-linus (d1463f878947 Merge branch 'asoc-5.4' into asoc-linus)
Merging regmap-fixes/for-linus (af42d3466bdc Linux 5.4-rc8)
Merging regulator-fixes/for-linus (4d2139ab0369 Merge branch 'regulator-5.4' into regulator-linus)
Merging spi-fixes/for-linus (2860e49fe766 Merge branch 'spi-5.4' into spi-linus)
Merging pci-current/for-linus (54ecb8f7028c Linux 5.4-rc1)
Merging driver-core.current/driver-core-linus (d6d5df1db6e9 Linux 5.4-rc5)
Merging tty.current/tty-linus (d6d5df1db6e9 Linux 5.4-rc5)
Merging usb.current/usb-linus (a99d8080aaf3 Linux 5.4-rc6)
Merging usb-gadget-fixes/fixes (f3fb802efaef usb: cdns3: gadget: Don't manage pullups)
Merging usb-serial-fixes/usb-linus (a99d8080aaf3 Linux 5.4-rc6)
Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue)
Merging phy/fixes (54ecb8f7028c Linux 5.4-rc1)
Merging staging.current/staging-linus (31f4f5b495a6 Linux 5.4-rc7)
Merging char-misc.current/char-misc-linus (31f4f5b495a6 Linux 5.4-rc7)
Merging soundwire-fixes/fixes (7b47ad3322d1 soundwire: slave: fix scanf format)
Merging thunderbolt-fixes/fixes (af42d3466bdc Linux 5.4-rc8)
Merging input-current/for-linus (768ea88bcb23 Input: synaptics - enable RMI mode for X1 Extreme 2nd Generation)
Merging crypto-current/master (08e97aec700a Revert "hwrng: core - Freeze khwrng thread during suspend")
Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible)
Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base)
Merging kselftest-fixes/fixes (ed2d8fa734e7 selftests: sync: Fix cast warnings on arm)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging slave-dma-fixes/fixes (bacdcb6675e1 dmaengine: cppi41: Fix cppi41_dma_prep_slave_sg() when idle)
Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1)
Merging mtd-fixes/mtd/fixes (df8fed831cbc mtd: rawnand: au1550nd: Fix au_read_buf16() prototype)
Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core)
Merging v4l-dvb-fixes/fixes (3e84a18a259e media: meson/ao-cec: move cec_notifier_cec_adap_register after hw setup)
Merging reset-fixes/reset/fixes (ba2c221a18d5 reset: Fix {of,devm}_reset_control_array_get kerneldoc return types)
Merging mips-fixes/mips-fixes (f6929c92e283 MAINTAINERS: Remove Kevin as maintainer of BMIPS generic platforms)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
Merging omap-fixes/fixes (6aed5a0e0f56 Merge branch 'watchdog-fix' into fixes)
Merging kvm-fixes/master (9cb09e7c1c9a KVM: Add a comment describing the /dev/kvm no_compat handling)
Merging kvms390-fixes/master (53936b5bf35e KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl)
Merging hwmon-fixes/hwmon (92b39ad44096 hwmon: (pmbus/ibm-cffps) Fix LED blink behavior)
Merging nvdimm-fixes/libnvdimm-fixes (6370740e5f8e fs/dax: Fix pmd vs pte conflict detection)
Merging btrfs-fixes/next-fixes (bfbbf8cb43a7 Merge branch 'misc-5.4' into next-fixes)
Merging vfs-fixes/fixes (762c69685ff7 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either)
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 (7d194c2100ad Linux 5.4-rc4)
Merging samsung-krzk-fixes/fixes (54ecb8f7028c Linux 5.4-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging devicetree-fixes/dt/linus (5dba51754b04 of: reserved_mem: add missing of_node_put() for proper ref-counting)
Merging scsi-fixes/fixes (9393c8de628c scsi: core: Handle drivers which set sg_tablesize to zero)
Merging drm-fixes/drm-fixes (af42d3466bdc Linux 5.4-rc8)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (d43e24533dc2 drm/i915: make pool objects read-only)
Merging mmc-fixes/fixes (fed23c5829ec mmc: sdhci-of-at91: fix quirk2 overwrite)
Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging gnss-fixes/gnss-linus (54ecb8f7028c Linux 5.4-rc1)
Merging hyperv-fixes/hyperv-fixes (590c28b9199c Drivers: hv: vmbus: Fix harmless building warnings without CONFIG_PM_SLEEP)
Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request())
Merging risc-v-fixes/fixes (1d9b0b66c3ef MAINTAINERS: Change to my personal email address)
Merging pidfd-fixes/fixes (9e77716a75bc fork: fix pidfd_poll()'s return type)
Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio)
Merging spdx/spdx-linus (bf49d9dd6fef export,module: add SPDX GPL-2.0 license identifier to headers with no license)
Merging gpio-intel-fixes/fixes (7d194c2100ad Linux 5.4-rc4)
Merging pinctrl-intel-fixes/fixes (af42d3466bdc Linux 5.4-rc8)
Merging erofs-fixes/fixes (da0c9ea146cb Linux 5.4-rc2)
Merging drm-misc-fixes/for-linux-next-fixes (c131280c03bd drm/mcde: dsi: Fix invalid pointer dereference if panel cannot be found)
Merging kspp-gustavo/for-next/kspp (da0c9ea146cb Linux 5.4-rc2)
Merging kbuild/for-next (7ecaf069da52 kbuild: move headers_check rule to usr/include/Makefile)
Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (68a33b179466 dma-direct: exclude dma_direct_map_resource from the min_low_pfn check)
Merging asm-generic/master (9b87647c665d asm-generic: add unlikely to default BUG_ON(x))
Merging arc/for-next (9fbea0b7e842 ARC: add kmemleak support)
Merging arm/for-next (022eb8ae8b5e ARM: 8938/1: kernel: initialize broadcast hrtimer based clock event device)
Merging arm64/for-next/core (d8e85e144bbe arm64: Kconfig: add a choice for endianness)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/asm-uaccess.h
Merging arm-perf/for-next/perf (8703317ae576 drivers/perf: hisi: update the sccl_id/ccl_id for certain HiSilicon platform)
Merging arm-soc/for-next (e1351090dd4a ARM: Document merges)
CONFLICT (modify/delete): include/Kbuild deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of include/Kbuild left in tree.
$ git rm -f include/Kbuild
Merging amlogic/for-next (320a07ac6201 Merge branch 'v5.5/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (2aee80727dca Merge branch 'defconfig-for-v5.5' into for-next)
Merging at91/at91-next (571c4b1fe42b Merge branches 'at91-drivers', 'at91-dt' and 'at91-defconfig' into at91-next)
Merging bcm2835/for-next (f14234184671 Merge branch 'bcm2835-maintainers-next' into for-next)
Merging imx-mxs/for-next (71918b15d58f Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (2af8e1f26c65 Merge branch 'for_5.5/driver-soc' into next)
Merging mediatek/for-next (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into for-next)
Merging mvebu/for-next (3aa22be2d6b1 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (6f079d80ec0f Merge branch 'omap-for-v5.5/ti-sysc-late' into for-next)
Merging qcom/for-next (5b35253b81ba Merge branches 'arm64-for-5.5-fixes' and 'drivers-for-5.5-fixes' into for-next)
Merging realtek/for-next (6a41c7019bca Merge branch 'v5.5/dt64' into next)
Merging renesas/next (9c45f53abb97 Merge branches 'renesas-arm-defconfig-for-v5.5', 'renesas-arm64-defconfig-for-v5.5', 'renesas-arm64-dt-for-v5.5', 'renesas-drivers-for-v5.5' and 'renesas-dt-bindings-for-v5.5' into renesas-next)
Merging reset/reset/next (b3f1d036f26d reset: npcm: add NPCM reset controller driver)
Merging rockchip/for-next (f0d0e0810786 Merge branch 'v5.5-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (6780daf48588 Merge branch 'next/dt' into for-next)
Merging scmi/for-linux-next (af42d3466bdc Linux 5.4-rc8)
Merging sunxi/sunxi/for-next (2ddd531f8c80 Merge branches 'sunxi/clk-for-5.5' and 'sunxi/dt-for-5.5' into sunxi/for-next)
Merging tegra/for-next (e0fd54137bf5 Merge branch for-5.5/cpufreq into for-next)
Merging clk/clk-next (cd89054e321a Merge branch 'clk-init-leak' 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 (044cf5e15357 csky: Initial stack protector support)
Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
Merging ia64/next (0d3d343560ba genirq: remove the is_affinity_mask_valid hook)
Merging m68k/for-next (5ed0794cde59 m68k/atari: Convert Falcon IDE drivers to platform drivers)
Merging m68knommu/for-next (3ad3cbe305b5 m68k/coldfire: Use CONFIG_PREEMPTION)
Merging microblaze/next (22648c989cb8 microblaze: Increase max dtb size to 64K from 32K)
Merging mips/mips-next (7d73d572111f MIPS: math-emu: Reuse name array in debugfs_fpuemu())
CONFLICT (content): Merge conflict in arch/mips/sgi-ip27/ip27-init.c
Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction)
Merging nios2/for-next (91d99a724e9c nios2: force the string buffer NULL-terminated)
Merging openrisc/for-next (f3b17320db25 openrisc: map as uncached in ioremap)
Merging parisc-hd/for-next (e9c837c6ab07 parisc: Avoid spurious inequivalent alias kernel error messages)
Merging powerpc/next (0695f8bca93e selftests/powerpc: Handle Makefile for unrecognized option)
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
Merging soc-fsl/next (3b8db0348c50 soc: fsl: add RCPM driver)
Merging risc-v/for-next (cbedd24c2074 Merge branch 'next/nommu' into for-next)
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 (6a82e23f45fe s390/cpumf: Adjust registration of s390 PMU device drivers)
Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h)
CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree.
CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree.
$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h
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 (73625ed66389 um: irq: Fix LAST_IRQ usage in init_IRQ())
Merging xtensa/xtensa-for-next (e86e4bdfc0cb Merge branch 'xtensa-5.5' into xtensa-for-next)
Merging fscrypt/master (0eee17e33226 f2fs: add support for IV_INO_LBLK_64 encryption policies)
Merging afs/afs-next (a0753c29004f afs: Support RCU pathwalk)
Merging btrfs/for-next (897636c94003 Merge branch 'misc-5.5' into for-next-20191119)
Merging ceph/master (633739b2fedb rbd: silence bogus uninitialized warning in rbd_object_map_update_finish())
Merging cifs/for-next (037d9bef0189 cifs: update internal module version number)
Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item)
Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging())
Merging erofs/dev (0602fc8bb4f2 erofs: support superblock checksum)
Merging ext3/for_next (15d8f21beaae Pull ext2 cleanup and quota stats fixes.)
Merging ext4/dev (dfdeeb41fb08 Merge branch 'tt/misc' into dev)
Merging f2fs/dev (7c15ed5f37a3 f2fs: avoid kernel panic on corruption test)
Merging fsverity/fsverity (73f0ec02d670 docs: fs-verity: mention statx() support)
Merging fuse/for-next (00929447f575 virtiofs: Fix old-style declaration)
Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
Merging nfs/linux-next (e8d70b321ecc SUNRPC: Fix another issue with MIC buffer space)
Merging nfs-anna/linux-next (79cc55422ce9 NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid())
Merging nfsd/nfsd-next (a2e2f2dc77a1 nfsd: v4 support requires CRYPTO_SHA256)
Merging orangefs/for-next (e6b998ab62be orangefs: remove redundant assignment to err)
Merging overlayfs/overlayfs-next (5c2e9f346b81 ovl: filter of trusted xattr results in audit)
Merging ubifs/linux-next (6a379f67454a jffs2: Fix memory leak in jffs2_scan_eraseblock() error path)
Merging v9fs/9p-next (aafee43b7286 9p/vfs_super.c: Remove unused parameter data in v9fs_fill_super)
Merging xfs/for-next (6519f708cc35 xfs: report corruption only as a regular error)
Merging iomap/iomap-for-next (e9f930ac88a8 iomap: fix return value of iomap_dio_bio_actor on 32bit systems)
Merging djw-vfs/vfs-for-next (7118dd2d41af splice: only read in as much information as there is pipe buffer space)
Merging file-locks/locks-next (b41dae061bbd Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging vfs/for-next (3e501af8dd7b Merge branches 'work.misc', 'work.mount3', 'work.namei', 'work.dcache' and 'work.autofs' into for-next)
Merging printk/for-next (7c88431552f3 Merge branch 'for-5.5' into for-next)
Merging pci/next (93415b9f8cd8 Merge branch 'pci/trivial')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
Merging pstore/for-next/pstore (8d82cee2f8aa pstore: Make pstore_choose_compression() static)
Merging hid/for-next (4b8c2dffbb85 Merge branch 'for-5.5/core' into for-next)
Merging i2c/i2c/for-next (3274d632cb1a Merge branch 'i2c/for-current' into i2c/for-next)
Merging i3c/i3c/next (ae24f2b6f828 MAINTAINERS: add myself as maintainer of Cadence I3C master controller driver)
Merging dmi/master (9a85ac3936ad firmware: dmi: Add dmi_memdev_handle)
Merging hwmon-staging/hwmon-next (61412ef12a84 docs: hwmon: Document bel-pfe pmbus driver)
Merging jc_docs/docs-next (83ededdb72ca docs: Add initial documentation for devfreq)
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/pensando/ionic.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ixgbevf.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ixgbe.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/igbvf.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/igb.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ice.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/iavf.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/i40e.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/fm10k.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e1000e.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e1000.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e100.rst
CONFLICT (content): Merge conflict in Documentation/admin-guide/perf/imx-ddr.rst
Merging v4l-dvb/master (dca6b3733a4a media: Revert "media: mtk-vcodec: Remove extra area allocation in an input buffer on encoding")
Merging v4l-dvb-next/master (d45331b00ddb Linux 5.3-rc4)
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (ec323217fdb0 Merge branch 'pm-qos' into linux-next)
CONFLICT (content): Merge conflict in scripts/checkpatch.pl
CONFLICT (content): Merge conflict in lib/test_printf.c
Merging cpufreq-arm/cpufreq/arm/linux-next (c23734487fb4 cpufreq: sun50i: Fix CPU speed bin detection)
Merging cpupower/cpupower (4611a4fb0cce cpupower: ToDo: Update ToDo with ideas for per_cpu_schedule handling)
Merging opp/opp/linux-next (25cb20a212a1 PM / OPP: Support adjusting OPP voltages at runtime)
Merging thermal/thermal/linux-next (def0aa869050 thermal: Fix deadlock in thermal thermal_zone_device_check)
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 (7807759e4ad8 firewire: core: code cleanup after vm_map_pages_zero introduction)
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 (9067f2f0b41d RDMA/iw_cgxb4: Fix an error handling path in 'c4iw_connect()')
CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mr.c
Merging net-next/master (e2193c933429 Merge branch 'r8169-smaller-improvements-to-firmware-handling')
CONFLICT (content): Merge conflict in drivers/s390/net/qeth_l2_main.c
Applying: powerpc: local_read() should take a const local_t argument
Merging bpf-next/master (196e8ca74886 bpf: Switch bpf_map_{area_alloc,area_mmapable_alloc}() to u64 size)
CONFLICT (content): Merge conflict in kernel/bpf/syscall.c
CONFLICT (content): Merge conflict in include/linux/bpf.h
Merging ipsec-next/master (72c996099dc6 cxgb4: Fix an error code in cxgb4_mqprio_alloc_hw_resources())
Merging mlx5-next/mlx5-next (975b992fdd4b net/mlx5: Add new chain for netfilter flow table offload)
Merging netfilter-next/master (c21709e744b4 net: phy: dp83869: fix return of uninitialized variable ret)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c
Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook)
Merging wireless-drivers-next/master (924ea58dadea Merge tag 'mt76-for-kvalo-2019-11-20' of https://github.com/nbd168/wireless)
Merging bluetooth/master (df66499a1fab Bluetooth: delete a stray unlock)
Merging mac80211-next/master (14f34e36b36c cfg80211: VLAN offload support for set_key and set_sta_vlan)
Merging gfs2/for-next (7d6d48fd4cae gfs2: Further gfs2_create_inode cleanups)
Merging mtd/mtd/next (589e1b6c47ce Merge tag 'nand/for-5.5' into mtd/next)
Merging nand/nand/next (777260a5c992 mtd: rawnand: remove unecessary checking if dmac is NULL)
Merging spi-nor/spi-nor/next (83cba933a6db mtd: spi-nor: Set default Quad Enable method for ISSI flashes)
Merging crypto/master (5620eb6c9d81 crypto: ccree - update a stale reference to ablkcipher)
CONFLICT (content): Merge conflict in arch/arm/crypto/Kconfig
Merging drm/drm-next (17cc51390c14 Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_scheduler.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig.debug
Applying: cec: fix up for "cec: add cec_adapter to cec_notifier_cec_adap_unregister()"
Applying: drm/v3d: Fix double free in v3d_submit_cl_ioctl()
Merging amdgpu/drm-next (e89012707f8c drm/amd/display: add default clocks if not able to fetch them)
Merging drm-intel/for-linux-next (0122baaa93cc Merge tag 'gvt-next-fixes-2019-11-12' of https://github.com/intel/gvt-linux into drm-intel-next-fixes)
Merging drm-tegra/drm/tegra/for-next (84db889e6d82 drm/tegra: Unconditionally select IOMMU_IOVA)
Merging drm-misc/for-linux-next (9786b65bc61a drm/ttm: fix mmap refcounting)
Merging drm-msm/msm-next (e20c9284c8f2 drm/msm/adreno: Add support for Adreno 510 GPU)
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 (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary)
Merging etnaviv/etnaviv/next (22567d017c2c dt-bindings: etnaviv: Add #cooling-cells)
Merging regmap/for-next (0c4b6e03b8ad Merge branch 'regmap-5.5' into regmap-next)
Merging sound/for-next (94722e74272c ALSA: docs: Update about the new PCM sync_stop ops)
Merging sound-asoc/for-next (0f454a2c1e4b Merge branch 'asoc-5.5' into asoc-next)
CONFLICT (content): Merge conflict in sound/soc/codecs/Kconfig
Merging modules/modules-next (5d603311615f kernel/module.c: wakeup processes in module_wq on module unload)
Merging input/next (dffe969aa7ab Input: imx_sc_key - correct SCU message structure to avoid stack corruption)
Merging block/for-next (26a52a170dc5 Merge branch 'for-5.5/io_uring-post' into for-next)
CONFLICT (modify/delete): include/Kbuild deleted in HEAD and modified in block/for-next. Version block/for-next of include/Kbuild left in tree.
$ git rm -f include/Kbuild
Merging device-mapper/for-next (f612b2132db5 Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues")
Merging mmc/next (a5c8b2ae2e51 mmc: sdhci-of-arasan: Add support for ZynqMP Platform Tap Delays Setup)
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
Merging mfd/for-mfd-next (de98a43eb76b mfd: ti_am335x_tscadc: Fix static checker warning)
CONFLICT (content): Merge conflict in drivers/mfd/mt6397-core.c
Merging backlight/for-backlight-next (9afa302473f3 backlight: gpio: Pull gpio_backlight_initial_power_state() into probe)
Merging battery/for-next (9480029fe5c2 power: supply: bd70528: Add MODULE_ALIAS to allow module auto loading)
Merging regulator/for-next (39b4c951ec76 Merge branch 'regulator-5.5' into regulator-next)
Merging security/next-testing (45893a0abee6 kexec: Fix file verification on S390)
Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size)
Merging integrity/next-integrity (2a7f0e53daf2 ima: ima_api: Use struct_size() in kzalloc())
Merging keys/keys-next (48274e1e5d24 Merge branch 'notifications-core' into keys-next)
Merging selinux/next (42345b68c2e3 selinux: default_range glblub implementation)
Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock)
Merging tomoyo/master (79c8ca578dbf Revert "printk: Monitor change of console loglevel.")
Merging tpmdd/next (0b40dbcbba92 KEYS: trusted: Remove set but not used variable 'keyhndl')
CONFLICT (modify/delete): include/Kbuild deleted in HEAD and modified in tpmdd/next. Version tpmdd/next of include/Kbuild left in tree.
$ git rm -f include/Kbuild
Merging watchdog/master (33c26ab4d6be watchdog: jz4740: Drop dependency on MACH_JZ47xx)
Merging iommu/next (9b3a713feef8 Merge branches 'iommu/fixes', 'arm/qcom', 'arm/renesas', 'arm/rockchip', 'arm/mediatek', 'arm/tegra', 'arm/smmu', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next)
Merging vfio/next (026948f01eac vfio/type1: remove hugepage checks in is_invalid_reserved_pfn())
Merging audit/next (c34c78dfc1fc audit: remove redundant condition check in kauditd_thread())
Merging devicetree/for-next (d8c313d75abf dt-bindings: pwm: Convert Samsung PWM bindings to json-schema)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/generic-ehci.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/amlogic,dwc3.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
Merging mailbox/mailbox-for-next (556a0964e28c mailbox: qcom-apcs: fix max_register value)
Merging spi/for-next (fba0ab6b70d8 Merge remote-tracking branch 'spi/topic/ptp' into spi-next)
Merging tip/auto-latest (e16a444976e9 Merge branch 'locking/core')
CONFLICT (content): Merge conflict in include/trace/events/rpcrdma.h
CONFLICT (content): Merge conflict in include/linux/security.h
CONFLICT (content): Merge conflict in fs/jbd2/transaction.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
CONFLICT (content): Merge conflict in arch/xtensa/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in arch/x86/kernel/kprobes/opt.c
CONFLICT (content): Merge conflict in arch/x86/kernel/jump_label.c
CONFLICT (content): Merge conflict in arch/x86/kernel/alternative.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/text-patching.h
Applying: drm/i915: update for mutex_release API change
Applying: fix up for "x86/asm: Change all ENTRY+ENDPROC to SYM_FUNC_*"
Applying: merge fix for "ftrace: Rework event_create_dir()"
Merging clockevents/timers/drivers/next (6e001f6a4cc7 clocksource/drivers/asm9260: Add a check for of_clk_get)
Merging edac/edac-for-next (dfb48b0a04a8 EDAC/altera: Use the Altera System Manager driver)
Merging irqchip/irq/irqchip-next (585d1183ffee pinctrl/sdm845: Add PDC wakeup interrupt map for GPIOs)
Merging ftrace/for-next (128161f47bc3 ftrace: Add helper find_direct_entry() to consolidate code)
CONFLICT (content): Merge conflict in kernel/trace/trace_export.c
CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
Merging rcu/rcu/next (e100e2f047de Merge commit '8dcdfb7096a304130ab36fbb0f2961deaf863e5a' into for-mingo)
Merging kvm/linux-next (fe289ebb65ee Merge tag 'kvm-s390-next-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (cd7056ae34af Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (modify/delete): include/Kbuild deleted in HEAD and modified in kvm-arm/next. Version kvm-arm/next of include/Kbuild left in tree.
$ git rm -f include/Kbuild
Merging kvm-ppc/kvm-ppc-next (55d7004299eb KVM: PPC: Book3S HV: Reject mflags=2 (LPCR[AIL]=2) ADDR_TRANS_MODE mode)
Merging kvms390/next (c7b7de631246 KVM: s390: Do not yield when target is already running)
Merging xen-tip/linux-next (e221065aa613 xen/mcelog: also allow building for 32-bit kernels)
Merging percpu/for-next (91998940dc4b Merge branch 'for-5.5' into for-next)
Merging workqueues/for-next (49e9d1a9faf2 workqueue: Add RCU annotation for pwq list walk)
CONFLICT (content): Merge conflict in kernel/workqueue.c
Merging drivers-x86/for-next (5c14aba77874 tools/power/x86/intel-speed-select: Increment version)
Merging chrome-platform/for-next (99bfcd3993d3 Revert "Input: cros_ec_keyb: mask out extra flags in event_type")
Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq())
Merging leds/for-next (5f820ed52371 leds: trigger: netdev: fix handling on interface rename)
Merging ipmi/for-next (8d73b2aeb808 ipmi: kill off 'timespec' usage again)
Merging driver-core/driver-core-next (553671b76859 firmware_loader: Fix labels with comma for builtin firmware)
CONFLICT (content): Merge conflict in Documentation/filesystems/debugfs.txt
Merging usb/usb-next (bc3bdb12bbb3 usb-storage: Disable UAS on JMicron SATA enclosure)
Merging usb-gadget/next (726b4fba94be usb: dwc3: of-simple: add a shutdown)
Merging usb-serial/usb-next (c1a1f273d082 USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P)
Merging usb-chipidea-next/ci-for-usb-next (4d6141288c33 usb: chipidea: imx: pinctrl for HSIC is optional)
Merging phy-next/next (4569e64ab6a5 phy: phy-rockchip-inno-usb2: add phy description for px30)
Merging tty/tty-next (55ed51fff224 {tty: serial, nand: onenand}: samsung: rename to fix build warning)
Merging char-misc/char-misc-next (9a5d847c0bda coresight: replicator: Fix missing spin_lock_init())
CONFLICT (content): Merge conflict in samples/Makefile
CONFLICT (content): Merge conflict in samples/Kconfig
Merging extcon/extcon-next (ddd1bbbae486 extcon: sm5502: remove redundant assignment to variable cable_type)
Merging soundwire/next (2e8c4ad1f044 soundwire: ignore uniqueID when irrelevant)
Merging thunderbolt/next (b001da2905e7 thunderbolt: Power cycle the router if NVM authentication fails)
Merging staging/staging-next (7da8abcf482a staging: rtl8723bs: remove set but not used variable 'change', 'pos')
CONFLICT (content): Merge conflict in drivers/staging/Makefile
Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (a99d8080aaf3 Linux 5.4-rc6)
Merging slave-dma/next (a7e335deed17 dmaengine: sprd: Add wrap address support for link-list mode)
Merging cgroup/for-next (078cb46c8a52 Merge branch 'for-5.5' into for-next)
Merging scsi/for-next (4220129431ad Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c
Merging scsi-mkp/for-next (65309ef6b258 scsi: bnx2fc: timeout calculation invalid for bnx2fc_eh_abort())
Merging vhost/linux-next (88d3c7697f25 vhost: last descriptor must have NEXT clear)
Merging rpmsg/for-next (73faac719425 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (d0d9531e38a6 Merge branch 'devel' into for-next)
Merging gpio-brgl/gpio/for-next (0f67f16a6e88 gpio: mmio: remove untrue leftover comment)
Merging gpio-intel/for-next (4a5e0f9e7351 gpio: merrifield: Pass irqchip when adding gpiochip)
Merging pinctrl/for-next (f130d5fd1fa0 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (8ae93b5ed9be pinctrl: cherryview: Missed type change to unsigned int)
Merging pinctrl-samsung/for-next (a322b3377f4b pinctrl: samsung: Fix device node refcount leaks in init code)
Merging pwm/for-next (9e1b4999a169 pwm: stm32: Pass breakinput instead of its values)
CONFLICT (modify/delete): Documentation/devicetree/bindings/pwm/pwm-stm32.txt deleted in HEAD and modified in pwm/for-next. Version pwm/for-next of Documentation/devicetree/bindings/pwm/pwm-stm32.txt left in tree.
$ git rm -f Documentation/devicetree/bindings/pwm/pwm-stm32.txt
Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus)
Merging ktest/for-next (9b5f852ae20d ktest: Make default build option oldconfig not randconfig)
Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool)
Merging kselftest/next (54ecb8f7028c Linux 5.4-rc1)
Merging y2038/y2038 (6d5b3a41ae04 Merge tag 'y2038-cleanups-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into y2038)
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
CONFLICT (content): Merge conflict in drivers/scsi/sg.c
Applying: fix up for "compat: move FS_IOC_RESVSP_32 handling to fs/ioctl.c"
Merging livepatching/for-next (7f436b3066e3 Merge branch 'for-5.5/core' into for-next)
CONFLICT (content): Merge conflict in tools/testing/selftests/livepatch/Makefile
Merging coresight/next (9a5d847c0bda coresight: replicator: Fix missing spin_lock_init())
Merging rtc/rtc-next (32c4d9e8a4eb rtc: msm6242: Remove unneeded msm6242_set()/msm6242_clear() functions)
Merging nvdimm/libnvdimm-for-next (e23d1c2d10fd dax: Add numa_node to the default device-dax attributes)
Merging at24/at24/for-next (285be87c79e1 eeprom: at24: Improve confusing log message)
Merging ntb/ntb-next (1ef512b16bc8 NTB: Fix an error in get link status)
Merging kspp/for-next/kspp (ec2f877856e0 treewide: Use sizeof_member() macro)
CONFLICT (content): Merge conflict in arch/x86/kernel/fpu/xstate.c
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (54ecb8f7028c Linux 5.4-rc1)
Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values)
Merging slimbus/for-next (54ecb8f7028c Linux 5.4-rc1)
Merging nvmem/for-next (6bd17868c992 nvmem: add Rockchip OTP driver)
Merging xarray/xarray (6b81141deb73 XArray: Improve documentation of search marks)
Merging hyperv/hyperv-next (664e8508dc28 hv_balloon: Add the support of hibernation)
Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1)
Merging kgdb/kgdb/for-next (c58ff643763c kdb: Tweak escape handling for vi users)
Merging pidfd/for-next (04882c321b26 Merge branch 'pidfd' into for-next)
CONFLICT (content): Merge conflict in include/uapi/linux/sched.h
Merging devfreq/devfreq-next (806fdcc0304d PM / devfreq: Fix Kconfig indentation)
Merging hmm/hmm (67815bec3ae9 mm/hmm: remove hmm_range_dma_map and hmm_range_dma_unmap)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/odp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
Merging fpga/for-next (fddc9fcbe69a fpga: dfl: fme: add power management support)
Merging kunit/test (ea2dd7c0875e lib/list-test: add a test for the 'list' doubly linked list)
Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6)
Merging kasan-bitops/topic/kasan-bitops (5bece3d66153 powerpc: support KASAN instrumentation of bitops)
Merging generic-ioremap/for-next (eafee5944062 nds32: use generic ioremap)
CONFLICT (content): Merge conflict in arch/riscv/mm/Makefile
CONFLICT (content): Merge conflict in arch/riscv/include/asm/io.h
Applying: fixup for moved code in riscv
Merging akpm-current/current (094a03d80b25 ipc/msg.c: consolidate all xxxctl_down() functions)
CONFLICT (content): Merge conflict in lib/ubsan.c
CONFLICT (content): Merge conflict in include/linux/syscalls.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/block/null_blk_main.c: fix layout
Applying: drivers/block/null_blk_main.c: fix uninitialized var warnings
Applying: pinctrl: fix pxa2xx.c build warnings
Applying: lib/genalloc.c: export symbol addr_in_gen_pool
Applying: lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr
Applying: Documentation: rename addr_in_gen_pool to gen_pool_has_addr
Applying: kernel-hacking: group sysrq/kgdb/ubsan into 'Generic Kernel Debugging Instruments'
Applying: kernel-hacking: create submenu for arch special debugging options
Applying: kernel-hacking: group kernel data structures debugging together
Applying: kernel-hacking: move kernel testing and coverage options to same submenu
Applying: kernel-hacking: move Oops into 'Lockups and Hangs'
Applying: kernel-hacking: move SCHED_STACK_END_CHECK after DEBUG_STACK_USAGE
Applying: kernel-hacking: create a submenu for scheduler debugging options
Applying: kernel-hacking: move DEBUG_BUGVERBOSE to 'printk and dmesg options'
Applying: kernel-hacking: move DEBUG_FS to 'Generic Kernel Debugging Instruments'
Applying: bitops: introduce the for_each_set_clump8 macro
Applying: linux/bitmap.h: fix potential sign-extension overflow
Applying: bitops-introduce-the-for_each_set_clump8-macro-fix-fix
Applying: linux/bitopts.h: Add for_each_set_clump8 documentation
Applying: lib/test_bitmap.c: add for_each_set_clump8 test cases
Applying: gpio: 104-dio-48e: utilize for_each_set_clump8 macro
Applying: gpio: 104-idi-48: utilize for_each_set_clump8 macro
Applying: gpio: gpio-mm: utilize for_each_set_clump8 macro
Applying: gpio: ws16c48: utilize for_each_set_clump8 macro
Applying: gpio: pci-idio-16: utilize for_each_set_clump8 macro
Applying: gpio: pcie-idio-24: utilize for_each_set_clump8 macro
Applying: gpio: uniphier: utilize for_each_set_clump8 macro
Applying: gpio: 74x164: utilize the for_each_set_clump8 macro
Applying: thermal: intel: intel_soc_dts_iosf: Utilize for_each_set_clump8 macro
Applying: gpio: pisosr: utilize the for_each_set_clump8 macro
Applying: gpio: max3191x: utilize the for_each_set_clump8 macro
Applying: gpio: pca953x: utilize the for_each_set_clump8 macro
Applying: lib/test_bitmap: force argument of bitmap_parselist_user() to proper address space
Applying: lib/test_bitmap: undefine macros after use
Applying: lib/test_bitmap: name EXP_BYTES properly
Applying: lib/test_bitmap: rename exp to exp1 to avoid ambiguous name
Applying: lib/test_bitmap: move exp1 and exp2 upper for others to use
Applying: lib/test_bitmap: fix comment about this file
Applying: lib/bitmap: introduce bitmap_replace() helper
Applying: gpio: pca953x: remove redundant variable and check in IRQ handler
Applying: gpio: pca953x: use input from regs structure in pca953x_irq_pending()
Applying: gpio: pca953x: convert to use bitmap API
Applying: gpio: pca953x: reduce stack usage in couple of functions
Applying: gpio: pca953x: tighten up indentation
Applying: mm: add generic p?d_leaf() macros
Applying: arc: mm: add p?d_leaf() definitions
Applying: arm: mm: add p?d_leaf() definitions
Applying: arm64: mm: add p?d_leaf() definitions
Applying: mips: mm: add p?d_leaf() definitions
Applying: powerpc: mm: add p?d_leaf() definitions
Applying: riscv: mm: add p?d_leaf() definitions
Applying: s390: mm: add p?d_leaf() definitions
Applying: sparc: mm: add p?d_leaf() definitions
Applying: x86: mm: add p?d_leaf() definitions
Applying: mm: pagewalk: add p4d_entry() and pgd_entry()
Applying: mm: pagewalk: allow walking without vma
Applying: mm-pagewalk-allow-walking-without-vma-v15
Applying: mm-pagewalk-allow-walking-without-vma-fix
Applying: mm: pagewalk: add test_p?d callbacks
Applying: mm: pagewalk: add 'depth' parameter to pte_hole
Applying: x86: mm: point to struct seq_file from struct pg_state
Applying: x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct
Applying: x86: mm: convert ptdump_walk_pgd_level_debugfs() to take an mm_struct
Applying: x86: mm: convert ptdump_walk_pgd_level_core() to take an mm_struct
Applying: mm: add generic ptdump
Applying: mm-add-generic-ptdump-v15
Applying: mm/ptdump: fix a -Wold-style-declaration warning
Applying: x86: mm: convert dump_pagetables to use walk_page_range
Applying: arm64: mm: convert mm/dump.c to use walk_page_range()
Applying: arm64: mm: display non-present entries in ptdump
Applying: mm: ptdump: reduce level numbers by 1 in note_page()
Applying: alpha: use pgtable-nopud instead of 4level-fixup
Applying: arm: nommu: use pgtable-nopud instead of 4level-fixup
Applying: c6x: use pgtable-nopud instead of 4level-fixup
Applying: m68k: nommu: use pgtable-nopud instead of 4level-fixup
Applying: m68k: mm: use pgtable-nopXd instead of 4level-fixup
Applying: microblaze: use pgtable-nopmd instead of 4level-fixup
Applying: nds32: use pgtable-nopmd instead of 4level-fixup
Applying: parisc: use pgtable-nopXd instead of 4level-fixup
Applying: parisc/hugetlb: use pgtable-nopXd instead of 4level-fixup
Applying: sparc32: use pgtable-nopud instead of 4level-fixup
Applying: um: remove unused pxx_offset_proc() and addr_pte() functions
Applying: um: add support for folded p4d page tables
Applying: mm: remove __ARCH_HAS_4LEVEL_HACK and include/asm-generic/4level-fixup.h
Applying: kernel.h: update comment about simple_strto<foo>() functions
Applying: auxdisplay: charlcd: deduplicate simple_strtoul()
Applying: drivers/tty/serial/sh-sci.c: suppress warning
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (f62d90f5d56f drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

Attachment: pgpHpJeQc67GT.pgp
Description: OpenPGP digital signature