Hi all, Please do not add v5.4 material to your linux-next included branches until after v5.3-rc1 has been released.
Changes since 20190716: The kbuild tree lost its build failure. The xfs tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 2695 2480 files changed, 92109 insertions(+), 38724 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 299 trees (counting Linus' and 72 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 (c309b6f24222 Merge tag 'docs/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) Merging fixes/master (c309b6f24222 Merge tag 'docs/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) Merging kbuild-current/fixes (964a4eacef67 Merge tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) Merging arc-current/for-curr (24a20b0a443f ARC: [plat-hsdk]: Enable AXI DW DMAC in defconfig) CONFLICT (content): Merge conflict in arch/arc/mm/fault.c Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary) Merging arm-soc-fixes/arm/fixes (2659dc8d225c Merge tag 'davinci-fixes-for-v5.2-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/fixes) Merging arm64-fixes/for-next/fixes (aa69fb62bea1 arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly) Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) Merging powerpc-fixes/fixes (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging s390-fixes/fixes (9a159190414d s390/unwind: avoid int overflow in outside_of_stack) Merging sparc/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (a5b647007e9d fix: taprio: Change type of txtime-delay parameter to u32) Merging bpf/master (763ff0e7d9c7 libbpf: fix another GCC8 warning for strncpy) Merging ipsec/master (114a5c324015 Merge tag 'mlx5-fixes-2019-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) Merging netfilter/master (28b1d6ef53e3 netfilter: nft_hash: fix symhash with modulus one) Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') Merging wireless-drivers/master (41a531ffa4c5 rt2x00usb: fix rx queue hang) Merging mac80211/master (d2ce8d6bfcfe nl80211: Fix undefined behavior in bit shift) Merging rdma-fixes/for-rc (4b972a01a7da Linux 5.2-rc6) Merging sound-current/for-linus (4914da2fb0c8 ALSA: hda - Don't resume forcibly i915 HDMI/DP codec) Merging sound-asoc-fixes/for-linus (496017510d4a Merge branch 'asoc-5.2' into asoc-linus) Merging regmap-fixes/for-linus (ea09b3e21f18 Merge branch 'regmap-5.2' into regmap-linus) Merging regulator-fixes/for-linus (9b955dd030c3 Merge branch 'regulator-5.2' into regulator-linus) Merging spi-fixes/for-linus (70b5fa4cc32f Merge branch 'spi-5.2' into spi-linus) Merging pci-current/for-linus (6dbbd053e6ae PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present) Merging driver-core.current/driver-core-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging tty.current/tty-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging usb.current/usb-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging usb-gadget-fixes/fixes (42de8afc40c9 usb: dwc2: Use generic PHY width in params setup) Merging usb-serial-fixes/usb-linus (f8377eff5481 USB: serial: ftdi_sio: add ID for isodebug v1) Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) Merging phy/fixes (ada28f7b3a97 phy: tegra: xusb: Add Tegra210 PLL power supplies) Merging staging.current/staging-linus (50950626414a Merge tag 'backlight-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight) Merging char-misc.current/char-misc-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging soundwire-fixes/fixes (6fbc7275c7a9 Linux 5.2-rc7) Merging thunderbolt-fixes/fixes (6fbc7275c7a9 Linux 5.2-rc7) Merging input-current/for-linus (597473720f4d Merge branch 'next' into for-linus) Merging crypto-current/master (20e833dc3635 crypto: ccp - memset structure fields to zero before reuse) Merging ide/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal) Merging kselftest-fixes/fixes (e2e88325f4bc selftests: vm: Fix test build failure when built by itself) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (0ecfebd2b524 Linux 5.2) Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) Merging mtd-fixes/mtd/fixes (c7a87ceb17ae mtd: rawnand: sunxi: Add A23/A33 DMA support with extra MBUS configuration) Merging mfd-fixes/for-mfd-fixes (63b2de12b7ee mfd: stmfx: Fix an endian bug in stmfx_irq_handler()) Merging v4l-dvb-fixes/fixes (22be8233b34f media: videodev2.h: change V4L2_PIX_FMT_BGRA444 define: fourcc was already in use) Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev) Merging mips-fixes/mips-fixes (f2ff671f8941 MAINTAINERS: Correct path to moved files) Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak) Merging omap-fixes/fixes (fb59ee37cfe2 ARM: dts: am57xx: Disable voltage switching for SD card) Merging kvm-fixes/master (964a4eacef67 Merge tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID) Merging hwmon-fixes/hwmon (5696e4aaabf2 hwmon: (pwm-fan) Check return value from devm_add_action_or_reset) Merging nvdimm-fixes/libnvdimm-fixes (a4a357fd4477 Merge branch 'for-5.2/dax' into libnvdimm-fixes) Merging btrfs-fixes/next-fixes (02252ea054b8 Merge branch 'misc-5.2' into next-fixes) Merging vfs-fixes/fixes (75f2d86b20bf fs: VALIDATE_FS_PARSER should default to n) Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry) Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) Merging drivers-x86-fixes/fixes (9e0babf2c06c Linux 5.2-rc5) Merging samsung-krzk-fixes/fixes (a188339ca5a3 Linux 5.2-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (a188339ca5a3 Linux 5.2-rc1) Merging devicetree-fixes/dt/linus (852d095d16a6 checkpatch.pl: Update DT vendor prefix check) Merging scsi-fixes/fixes (484647088826 scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized) Merging drm-fixes/drm-fixes (a0b2cf792ac9 Merge tag 'imx-drm-fixes-2019-07-04' of git://git.pengutronix.de/git/pza/linux into drm-fixes) Merging amdgpu-fixes/drm-fixes (c08e56c647ba drm/amd/display: Don't load DMCU for Raven 1 (v2)) Merging drm-intel-fixes/for-linux-next-fixes (d7e8a19b38c8 drm/i915: Don't dereference request if it may have been retired when printing) CONFLICT (modify/delete): drivers/gpu/drm/i915/intel_context.c deleted in HEAD and modified in drm-intel-fixes/for-linux-next-fixes. Version drm-intel-fixes/for-linux-next-fixes of drivers/gpu/drm/i915/intel_context.c left in tree. CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workarounds.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_cs.c $ git rm -f drivers/gpu/drm/i915/intel_context.c Merging mmc-fixes/fixes (83293386bc95 mmc: core: Prevent processing SDIO IRQs when the card is suspended) Merging rtc-fixes/rtc-fixes (a188339ca5a3 Linux 5.2-rc1) Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3) Merging hyperv-fixes/hyperv-fixes (9be11356057a PCI: pci-hyperv: fix build errors on non-SYSFS config) Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) Merging risc-v-fixes/fixes (0db7f5cd4aeb riscv: mm: Fix code comment) Merging drm-misc-fixes/for-linux-next-fixes (2f040d27080d drm/panfrost: Fix a double-free error) Merging kspp-gustavo/for-next/kspp (d93512ef0f0e Makefile: Globally enable fall-through warning) Merging kbuild/for-next (fc173761aeed kbuild: update compile-test headers for v5.3-rc1) Applying: rdma: attempt to build rdma_counter.h stand alone again Merging compiler-attributes/compiler-attributes (a188339ca5a3 Linux 5.2-rc1) Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) Merging dma-mapping/for-next (7bb9bbcee884 dma-direct: Force unencrypted DMA under SME for certain DMA masks) Merging asm-generic/master (7f3a8dff1219 asm-generic: remove ptrace.h) Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7) Merging arm/for-next (b7a735f3a606 Merge branch 'for-arm-soc' into for-next) Merging arm64/for-next/core (0c61efd322b7 Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux) Merging arm-perf/for-next/perf (d482e575fbf0 perf: arm_spe: Enable ACPI/Platform automatic module loading) Merging arm-soc/for-next (879d1d31cdf0 ARM: Document merges) CONFLICT (modify/delete): arch/arm/include/debug/netx.S deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/include/debug/netx.S left in tree. CONFLICT (content): Merge conflict in arch/arm/configs/exynos_defconfig $ git rm -f arch/arm/include/debug/netx.S Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) Merging amlogic/for-next (11343d25a03b Merge branch 'v5.3/fixes' into tmp/aml-rebuild) Merging aspeed/for-next (a1f5c11ddb7d Merge branches 'dt-for-v5.3', 'defconfig-for-v5.3' and 'soc-for-v5.3' into for-next) Merging at91/at91-next (7eb505978425 Merge branches 'at91-soc' and 'at91-dt' into at91-next) Merging bcm2835/for-next (08e3c4158538 ARM: bcm283x: Enable DMA support for SPI controller) Merging imx-mxs/for-next (2a7f6c1a5376 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (78145dbeaea1 Merge branch 'for_5.3/driver-soc' into next) Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next) Merging mvebu/for-next (e1b0b32a5ad6 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (7376d6a65730 Merge branch 'fixes' into for-next) Merging qcom/for-next (07c1ef894030 Merge tag 'qcom-dts-for-5.3-2' into initial-for-5.3) Merging renesas/next (a16ecb14d0b0 Merge branches 'arm-dt-for-v5.3', 'arm-soc-for-v5.3', 'arm-defconfig-for-v5.3', 'arm64-defconfig-for-v5.3', 'arm64-dt-for-v5.3' and 'dt-bindings-for-v5.3' into next) Merging reset/reset/next (6b251ea99242 dt-bindings: reset: imx7: Fix the spelling of 'indices') CONFLICT (content): Merge conflict in drivers/reset/reset-simple.c Merging rockchip/for-next (13622a50d8db Merge branch 'v5.3-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (cf6664323e0f Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (0ecfebd2b524 Linux 5.2) Merging sunxi/sunxi/for-next (6c6b5d7650d9 Merge branch 'sunxi/dt64-for-5.3' into sunxi/for-next) Merging tegra/for-next (033de83170dd Merge branch for-5.3/arm64/defconfig into for-next) Merging clk/clk-next (b1511f7a48c3 Merge branches 'clk-bcm63xx', 'clk-silabs', 'clk-lochnagar' and 'clk-rockchip' into clk-next) CONFLICT (content): Merge conflict in drivers/clk/ingenic/Makefile CONFLICT (content): Merge conflict in drivers/clk/bcm/Kconfig CONFLICT (modify/delete): arch/mips/include/asm/mach-jz4740/clock.h deleted in clk/clk-next and modified in HEAD. Version HEAD of arch/mips/include/asm/mach-jz4740/clock.h left in tree. $ git rm -f arch/mips/include/asm/mach-jz4740/clock.h Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-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 (9f98b3142d22 csky: Improve string operations performance by glibc code) Merging h8300/h8300-next (38ef0515e1e8 H8300: remove unused barrier defines) Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files) Merging m68k/for-next (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) Merging m68knommu/for-next (ad97f9df0fee riscv: add binfmt_flat support) Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) Merging mips/mips-next (e5793cd1b5fe MIPS: fix some more fall through errors in arch/mips) CONFLICT (content): Merge conflict in arch/mips/include/asm/mach-ralink/pinmux.h Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) Merging nios2/for-next (f017da5c7077 nios2: configs: Remove useless UEVENT_HELPER_PATH) Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32) Merging parisc-hd/for-next (8438983b001f parisc: Wire up clone3 syscall) Merging powerpc/next (f5a9e488d623 powerpc/powernv/idle: Fix restore of SPRN_LDBAR for POWER9 stop state.) Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") Merging soc-fsl/next (21560067fb1f soc: fsl: qe: fold qe_get_num_of_snums into qe_snums_init) Merging risc-v/for-next (0f327f2aaad6 RISC-V: Add an Image header that boot loader can parse.) CONFLICT (content): Merge conflict in arch/riscv/Kconfig 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 (499723d12063 docs: s390: s390dbf: typos and formatting, update crash command) Merging sh/sh-next (d3023897b437 arch/sh: Check for kprobe trap number before trying to handle a kprobe trap) CONFLICT (content): Merge conflict in arch/sh/configs/titan_defconfig CONFLICT (content): Merge conflict in arch/sh/configs/se7721_defconfig CONFLICT (content): Merge conflict in arch/sh/configs/se7712_defconfig 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 (b482e48d29f1 um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT) Merging xtensa/xtensa-for-next (6326b440055f Merge branch 'xtensa-5.3' into xtensa-for-next) Merging fscrypt/master (0564336329f0 fscrypt: document testing with xfstests) Merging afs/afs-next (fb2b827702ba afs: Fix loop index mixup in afs_deliver_vl_get_entry_by_name_u()) Merging btrfs/next (29dcea88779c Linux 4.17) Merging btrfs-kdave/for-next (80dfdbfd37d2 Merge branch 'for-next-current-v5.2-20190705' into for-next-20190705) Merging ceph/master (d31d07b97a5e ceph: fix end offset in truncate_inode_pages_range call) Applying: rbd: fix up for lockdep_assert_held_exclusive rename Merging cifs/for-next (d000f4656e77 cifs: prepare SMB2_Flush to be usable in compounds) Merging configfs/for-next (f6122ed2a4f9 configfs: Fix use-after-free when accessing sd->s_dentry) Merging ecryptfs/next (7451c54abc91 ecryptfs: Change return type of ecryptfs_process_flags) Merging ext3/for_next (5450e8a316a6 Merge tag 'pidfd-updates-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux) Merging ext4/dev (96fcaf86c3cb ext4: fix coverity warning on error path of filename setup) Merging f2fs/dev (3d03243e4536 f2fs: allocate memory in batch in build_sit_info()) Merging fuse/for-next (766741fcaa1f Revert "fuse: require /dev/fuse reads to have enough buffer capacity") Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) Merging nfs/linux-next (50c800074446 NFSv4: Validate the stateid before applying it to state recovery) CONFLICT (content): Merge conflict in net/sunrpc/debugfs.c Merging nfs-anna/linux-next (68f461593f76 NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O) Merging nfsd/nfsd-next (b78fa45d4edb nfsd: Make __get_nfsdfs_client() static) Merging orangefs/for-next (e65682b55956 orangefs: eliminate needless variable assignments) Merging overlayfs/overlayfs-next (0be0bfd2de9d ovl: fix regression caused by overlapping layers detection) Merging ubifs/linux-next (8009ce956c3d ubifs: Don't leak orphans on memory during commit) Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init) Merging xfs/for-next (89b408a68b9d Documentation: filesystem: Convert xfs.txt to ReST) CONFLICT (content): Merge conflict in Documentation/admin-guide/index.rst Merging iomap/iomap-for-next (87bdff62e470 mtr: Build script adjustments) CONFLICT (modify/delete): fs/iomap.c deleted in iomap/iomap-for-next and modified in HEAD. Version HEAD of fs/iomap.c left in tree. $ git rm -f fs/iomap.c Applying: iomap: fix for block changes and split of iomap.c Merging djw-vfs/vfs-for-next (7e328e5930ad mm/fs: don't allow writes to immutable files) Merging file-locks/locks-next (5450e8a316a6 Merge tag 'pidfd-updates-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux) Merging vfs/for-next (3fcb59f577e2 Merge branches 'fixes' and 'work.adfs' into for-next) CONFLICT (content): Merge conflict in include/uapi/linux/magic.h CONFLICT (content): Merge conflict in fs/ubifs/super.c CONFLICT (content): Merge conflict in fs/nfsd/nfsctl.c CONFLICT (content): Merge conflict in fs/gfs2/super.c CONFLICT (content): Merge conflict in fs/ceph/super.c CONFLICT (modify/delete): Documentation/filesystems/vfs.txt deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of Documentation/filesystems/vfs.txt left in tree. $ git rm -f Documentation/filesystems/vfs.txt Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()" Applying: convert vmwballoon to use the new mount API Applying: dma-buf: convert to new mount api Merging printk/for-next (ba174ef6d224 Merge branch 'for-5.3-fixes' into for-next) Merging pci/next (7b4b0f6b34d8 Merge branch 'pci/trivial') Merging pstore/for-next/pstore (4c6d80e1144b pstore: Fix double-free in pstore_mkfile() failure path) Merging hid/for-next (bf4945efabdf Merge branch 'for-5.3/wacom' into for-next) Merging i2c/i2c/for-next (9a74c745c689 Merge branch 'i2c/for-5.3' into i2c/for-next) Merging i3c/i3c/next (ede2001569c3 i3c: master: Use struct_size() helper) Merging dmi/master (57361846b52b Linux 4.19-rc2) Merging hwmon-staging/hwmon-next (9f7546570bcb hwmon: (ina3221) Add of_node_put() before return) Merging jc_docs/docs-next (224d5fd43d25 docs: driver-api: generic-counter: fix file path to ABI doc) Merging v4l-dvb/master (22be8233b34f media: videodev2.h: change V4L2_PIX_FMT_BGRA444 define: fourcc was already in use) Merging v4l-dvb-next/master (168869492e70 docs: kbuild: fix build with pdf and fix some minor issues) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (b7ad0607bda8 Merge branch 'pm-cpufreq' into linux-next) CONFLICT (content): Merge conflict in Documentation/power/pm_qos_interface.rst Merging cpufreq-arm/cpufreq/arm/linux-next (f9020441dbc3 cpufreq: s5pv210: Don't flood kernel log after cpufreq change) Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list) Merging opp/opp/linux-next (560d1bcad715 opp: Don't use IS_ERR on invalid supplies) Merging thermal/next (6c395f66e98c drivers: thermal: processor_thermal_device: Fix build warning) Merging thermal-soc/next (4cb9f043447e thermal: thermal_mmio: remove some dead code) Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs) Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions) Merging swiotlb/linux-next (dd853b2dfa65 Merge branch 'stable/for-linus-5.2' into linux-next) Merging rdma/for-next (0b043644c0ca RMDA/siw: Require a 64 bit arch) Merging net-next/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging bpf-next/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging ipsec-next/master (c7b37c769d2a xfrm: remove get_mtu indirection from xfrm_type) Merging mlx5-next/mlx5-next (1dd7382b1bb6 net/mlx5: Introduce VHCA tunnel device capability) Merging netfilter-next/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw') Merging wireless-drivers-next/master (5adcdab6ae1b Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging bluetooth/master (0ed8a186eaff Bluetooth: hidp: Let hidp_send_message return number of queued bytes) Merging mac80211-next/master (17c74d7c5f0d nl80211: fix VENDOR_CMD_RAW_DATA) Merging gfs2/for-next (bb4cb25dd319 gfs2: Remove unused gfs2_iomap_alloc argument) Merging mtd/mtd/next (46ce10df799f Merge tag 'spi-nor/for-5.3-v2' of gitolite.kernel.org:pub/scm/linux/kernel/git/mtd/linux into mtd/next) Merging nand/nand/next (bce9437a0a48 mtd: rawnand: stm32_fmc2: increase DMA completion timeouts) Merging spi-nor/spi-nor/next (8d1336c241bd mtd: spi-nor: cadence-quadspi: add reset control) Merging crypto/master (f3880a23564e crypto: stm32/hash - remove interruptible condition for dma) Merging drm/drm-next (3729fe2bc2a0 Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next") Merging amdgpu/drm-next (9bb715bd5118 drm/amd/display: Force uclk to max for every state) Merging drm-intel/for-linux-next (bea5faf7be32 drm/i915/gtt: Tidy up ppgtt insertion for gen8) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workarounds.c Merging drm-tegra/drm/tegra/for-next (eb7cf945a8da host1x: debugfs_create_dir() can never return NULL) Merging drm-misc/for-linux-next (7aaddd96d5fe drm/modes: Don't apply cmdline's rotation if it wasn't specified) Merging drm-msm/msm-next (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) Merging mali-dp/for-upstream/mali-dp (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) Merging imx-drm/imx-drm/next (fee77829083a gpu: ipu-v3: image-convert: Enable double write reduction) Merging etnaviv/etnaviv/next (57bdd4057516 drm/etnaviv: Use devm_platform_ioremap_resource()) Merging regmap/for-next (aaccf3863ce2 Merge branch 'regmap-5.3' into regmap-next) Merging sound/for-next (4914da2fb0c8 ALSA: hda - Don't resume forcibly i915 HDMI/DP codec) Merging sound-asoc/for-next (ca4aacd92c71 Merge branch 'asoc-5.3' into asoc-next) Merging modules/modules-next (93651f80dcb6 modules: fix compile error if don't have strict module rwx) Merging input/next (5a4cee7b28ed Input: psmouse - fix build error of multiple definition) Merging block/for-next (5b9ddbdf2f36 Merge branch 'for-linus' into for-next) Merging device-mapper/for-next (bd293d071ffe dm bufio: fix deadlock with loop device) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) Merging mmc/next (59592cc1f593 mmc: sdhci_am654: Add dependency on MMC_SDHCI_AM654) Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) Merging mfd/for-mfd-next (7efd105c27fd mfd: hi655x-pmic: Fix missing return value check for devm_regmap_init_mmio_clk) Merging backlight/for-backlight-next (73fbfc499448 backlight: pwm_bl: Fix heuristic to determine number of brightness levels) Merging battery/for-next (caa2b557841c power: reset: nvmem-reboot-mode: add CONFIG_OF dependency) Merging regulator/for-next (e571e17488d4 Merge branch 'regulator-5.3' into regulator-next) Merging security/next-testing (286e47a07799 Merge branch 'next-lsm' into next-testing) Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size) Merging integrity/next-integrity (650b29dbdf2c integrity: Introduce struct evm_xattr) Merging keys/keys-next (20adf5593389 Merge tag 'keys-acl-20190703' into keys-next) Merging selinux/next (ea74a685ad81 selinux: format all invalid context as untrusted) Merging tpmdd/next (166a2809d65b tpm: Don't duplicate events from the final event log in the TCG2 log) Merging watchdog/master (7fb832ae7294 watchdog: digicolor_wdt: Remove unused variable in dc_wdt_probe) CONFLICT (add/add): Merge conflict in Documentation/watchdog/watchdog-parameters.rst CONFLICT (add/add): Merge conflict in Documentation/watchdog/index.rst CONFLICT (content): Merge conflict in Documentation/watchdog/hpwdt.rst CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt Merging iommu/next (d95c3885865b Merge branches 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/omap', 'generic-dma-ops' and 'core' into next) Merging vfio/next (1e4d09d2212d mdev: Send uevents around parent device registration) Merging audit/next (839d05e41385 audit: remove the BUG() calls in the audit rule comparison functions) Merging devicetree/for-next (f59d261180f3 dt-bindings: vendor-prefixes: add Sipeed) Merging mailbox/mailbox-for-next (25777e5784a7 mailbox: handle failed named mailbox channel request) Merging spi/for-next (2e77a18d0464 Merge branch 'spi-5.3' into spi-next) Merging tip/auto-latest (162b65ddbf2f Merge branch 'x86/debug') Merging clockevents/clockevents/next (b0c74b96d177 clocksource/drivers/davinci: Add support for clocksource) Merging edac-amd/for-next (b2572772d13e EDAC: Make edac_debugfs_create_x*() return void) CONFLICT (content): Merge conflict in arch/riscv/Kconfig Merging irqchip/irq/irqchip-next (3dae67ce600c irqchip/gic-pm: Remove PM_CLK dependency) Merging ftrace/for-next (0aeb1def4416 tracing: Make trace_get_fields() global) Merging rcu/rcu/next (b989ff070574 Merge LKMM and RCU commits) Merging kvm/linux-next (6694e4801282 KVM: nVMX: Ignore segment base for VMX memory operand when segment not FS or GS) Merging kvm-arm/next (1e0cf16cdad1 KVM: arm/arm64: Initialise host's MPIDRs by reading the actual register) Merging kvm-ppc/kvm-ppc-next (3bda7f0ae0f7 KVM: PPC: Book3S PR: Fix software breakpoints) Merging kvms390/next (8343ba2d4820 KVM: selftests: enable pgste option for the linker on s390) Merging xen-tip/linux-next (53ed9ae315ec xen: remove tmem driver) Merging percpu/for-next (03ed70fb0e5e Merge branch 'for-5.3' into for-next) Merging workqueues/for-next (be69d00d9769 workqueue: Remove GPF argument from alloc_workqueue_attrs()) Merging drivers-x86/for-next (7d67c8ac25fb platform/x86: Fix PCENGINES_APU2 Kconfig warning) Merging chrome-platform/for-next (8c3166e17cf1 mfd / platform: cros_ec_debugfs: Expose resume result via debugfs) Merging hsi/for-next (a188339ca5a3 Linux 5.2-rc1) Merging leds/for-next (2605085fba22 dt: leds-lm36274.txt: fix a broken reference to ti-lmu.txt) Merging ipmi/for-next (fec88ab0af97 Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma) Merging driver-core/driver-core-next (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging usb/usb-next (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging usb-gadget/next (b2357839c56a usb: renesas_usbhs: add a workaround for a race condition of workqueue) Merging usb-serial/usb-next (9e0babf2c06c Linux 5.2-rc5) Merging usb-chipidea-next/ci-for-usb-next (034252e37b31 usb: chipidea: msm: Use devm_platform_ioremap_resource()) Merging phy-next/next (520602640419 phy: qcom-qmp: Raise qcom_qmp_phy_enable() polling delay) Merging tty/tty-next (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging char-misc/char-misc-next (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging extcon/extcon-next (0937fbb7abeb extcon: fsa9480: Fix Kconfig warning and build errors) Merging soundwire/next (2aeac95d1a4c soundwire: add module_sdw_driver helper macro) Merging thunderbolt/next (6fbc7275c7a9 Linux 5.2-rc7) Merging staging/staging-next (50950626414a Merge tag 'backlight-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight) Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next) Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE) Merging slave-dma/next (5c274ca4cfb2 dmaengine: Revert "dmaengine: fsl-edma: add i.mx7ulp edma2 version support") CONFLICT (modify/delete): include/linux/sudmac.h deleted in slave-dma/next and modified in HEAD. Version HEAD of include/linux/sudmac.h left in tree. CONFLICT (content): Merge conflict in drivers/dma/mediatek/Makefile CONFLICT (content): Merge conflict in drivers/dma/dma-jz4780.c CONFLICT (content): Merge conflict in drivers/dma/dma-axi-dmac.c $ git rm -f include/linux/sudmac.h Merging cgroup/for-next (22a0b83583ab Merge branch 'for-5.3' into for-next) Merging scsi/for-next (484647088826 scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized) Merging scsi-mkp/for-next (484647088826 scsi: zfcp: fix GCC compiler warning emitted with -Wmaybe-uninitialized) Merging vhost/linux-next (5e663f0410fa virtio-mmio: add error check for platform_get_irq) Applying: iommu/virtio: Constify data parameter in viommu_match_node Merging rpmsg/for-next (ab1291acd4ab Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (88785b7fa74a Merge tag 'gpio-v5.3-rc1-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into fixes) Merging gpio-brgl/gpio/for-next (f360dcd4ef7f gpio: mockup: no need to check return value of debugfs_create functions) Merging pinctrl/for-next (4c105769bf6d pinctrl: aspeed: Strip moved macros and structs from private header) Merging pinctrl-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) Merging pwm/for-next (3d25025ce9c2 pwm: fsl-ftm: Make sure to unlock mutex on failure) Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus) Merging ktest/for-next (d20f6b41b7c2 ktest: update sample.conf for grub2bls) Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool) Merging kselftest/next (ee8a84c60bcc rseq/selftests: Fix Thumb mode build failure on arm32) Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI) Merging livepatching/for-next (28f28ea4343a Merge branch 'for-5.3-core' into for-next) Merging coresight/next (fec88ab0af97 Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma) Merging rtc/rtc-next (f0162d21cc80 rtc: wm831x: Add IRQF_ONESHOT flag) Merging nvdimm/libnvdimm-for-next (7c40cc44161a Merge branch 'for-5.3/dax' into libnvdimm-for-next) CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h Merging at24/at24/for-next (dce91ba39c76 eeprom: at24: modify a comment referring to platform data) Merging ntb/ntb-next (d9c53aa440b3 NTB: Describe the ntb_msi_test client in the documentation.) Merging kspp/for-next/kspp (2dcbe7fe2265 lib/test_stackinit: Handle Clang auto-initialization pattern) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3) Merging fsi/next (371975b0b075 fsi/core: Fix error paths on CFAM init) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) Merging slimbus/for-next (a188339ca5a3 Linux 5.2-rc1) Merging nvmem/for-next (341f8ae0f820 dt-bindings: nvmem: SID: Fix the examples node names) CONFLICT (content): Merge conflict in drivers/nvmem/meson-mx-efuse.c CONFLICT (content): Merge conflict in drivers/nvmem/meson-efuse.c CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt Merging xarray/xarray (91abab83839a XArray: Fix xas_next() with a single entry at 0) Merging hyperv/hyperv-next (765e33f5211a Drivers: hv: vmbus: Break out ISA independent parts of mshyperv.h) Merging auxdisplay/auxdisplay (f4bb1f895aa0 auxdisplay/ht16k33.c: Convert to use vm_map_pages_zero()) Merging kgdb-dt/kgdb/for-next (ca976bfb3154 kdb: Fix bound check compiler warning) Merging pidfd/for-next (4382fc438ca5 Merge branch 'clone' into for-next) CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl Merging devfreq/for-next (27c17be8e488 PM / devfreq: tegra20: add COMMON_CLK dependency) Merging hmm/hmm (cc5dfd59e375 Merge branch 'hmm-devmem-cleanup.4' into rdma.git hmm) Merging akpm-current/current (615329973a59 ipc/msg.c: consolidate all xxxctl_down() functions) $ git checkout -b akpm remotes/origin/akpm/master Applying: pinctrl: fix pxa2xx.c build warnings Applying: mm: section numbers use the type "unsigned long" Applying: mm-section-numbers-use-the-type-unsigned-long-fix Applying: mm-section-numbers-use-the-type-unsigned-long-v3 Applying: drivers/base/memory: Use "unsigned long" for block ids Applying: mm: make register_mem_sect_under_node() static Applying: mm/memory_hotplug: rename walk_memory_range() and pass start+size instead of pfns Applying: mm/memory_hotplug: move and simplify walk_memory_blocks() Applying: drivers/base/memory.c: Get rid of find_memory_block_hinted() Applying: drivers-base-memoryc-get-rid-of-find_memory_block_hinted-v3 Applying: drivers-base-memoryc-get-rid-of-find_memory_block_hinted-v3-fix Applying: mm/sparsemem: introduce struct mem_section_usage Applying: mm/sparsemem: introduce a SECTION_IS_EARLY flag Applying: mm/sparsemem: add helpers track active portions of a section at boot Applying: mm/hotplug: prepare shrink_{zone, pgdat}_span for sub-section removal Applying: mm/sparsemem: convert kmalloc_section_memmap() to populate_section_memmap() Applying: mm/hotplug: kill is_dev_zone() usage in __remove_pages() Applying: mm: kill is_dev_zone() helper Applying: mm/sparsemem: prepare for sub-section ranges Applying: mm/sparsemem: support sub-section hotplug Applying: mm,sparse: fix deactivate_section for early sections Applying: mm,memory_hotplug: Fix shrink_{zone,node}_span Applying: mm: document ZONE_DEVICE memory-model implications Applying: docs/vm: update ZONE_DEVICE memory model documentation Applying: mm/devm_memremap_pages: enable sub-section remap Applying: libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields Applying: libnvdimm/pfn: stop padding pmem namespaces to section alignment Applying: mm/sparsemem: cleanup 'section number' data types Applying: mm-sparsemem-cleanup-section-number-data-types-fix Applying: mm: migrate: remove unused mode argument Applying: proc/sysctl: add shared variables for range check Applying: tipc: remove two unused variables Applying: proc-sysctl-add-shared-variables-for-range-check-fix-2-fix Applying: proc/sysctl: make firmware loader table conditional Applying: proc-sysctl-add-shared-variables-for-range-check-fix-4 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 (58aea495917f drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
pgp_zbVVgqVkD.pgp
Description: OpenPGP digital signature
