Hi all, Changes since 20190814: The arm-soc tree lost its build failure. The crypto tree lost its build failure. The net-next tree gained a conflict against the kbuild tree. The amdgpu tree lost its build failure. The sound-asoc tree lost its build failure. The security tree still had its build failure for which I added a patch. The keys tree gained conflicts against the fscrypt, and device_mapper trees. The scsi tree gained a conflict against the scsi-fixes tree. The gpio tree gained a build failure for which I applied a patch. The gpio-brgl tree gained a conflict against the gpio tree. The akpm-current tree gained a build failure due to an automatic mismerge which I fixed up. The akpm tree lost a patch thet turned up elsewhere. Non-merge commits (relative to Linus' tree): 6423 6831 files changed, 343060 insertions(+), 171851 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 309 trees (counting Linus' and 77 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 (a69e90512d9d Merge tag 'xfs-5.3-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging fixes/master (609488bc979f Linux 5.3-rc2) Merging kbuild-current/fixes (451577f3e3a9 Merge tag 'kbuild-fixes-v5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging arc-current/for-curr (e86d94fdda8e ARC: unwind: Mark expected switch fall-throughs) Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary) Merging arm-soc-fixes/arm/fixes (305cd70ec311 Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes) Merging arm64-fixes/for-next/fixes (5717fe5ab38f arm64: cpufeature: Don't treat granule sizes as strict) Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) Merging powerpc-fixes/fixes (b9ee5e04fd77 powerpc/64e: Drop stale call to smp_processor_id() which hangs SMP startup) Merging s390-fixes/fixes (d45331b00ddb Linux 5.3-rc4) Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (32d3182cd2cd net/packet: fix race in tpacket_snd()) Merging bpf/master (27df5c7068bf selftests/bpf: fix "bind{4, 6} deny specific IP & port" on s390) Merging ipsec/master (22d6552f827e xfrm interface: fix management of phydev) Merging netfilter/master (dfe42be15fde netfilter: nft_flow_offload: skip tcp rst and fin packets) Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') Merging wireless-drivers/master (1f6607250331 iwlwifi: dbg_ini: fix compile time assert build errors) Merging mac80211/master (d8a1de3d5bb8 isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack) Merging rdma-fixes/for-rc (2c8ccb37b08f RDMA/siw: Change CQ flags from 64->32 bits) Merging sound-current/for-linus (19bce474c45b ALSA: usb-audio: Fix a stack buffer overflow bug in check_input_term) Merging sound-asoc-fixes/for-linus (8081e64ff2ce Merge branch 'asoc-5.3' into asoc-linus) Merging regmap-fixes/for-linus (0161b8716465 Merge branch 'regmap-5.3' into regmap-linus) Merging regulator-fixes/for-linus (c8c4e33fb85d Merge branch 'regulator-5.3' into regulator-linus) Merging spi-fixes/for-linus (ec010644e3b7 Merge branch 'spi-5.3' into spi-linus) Merging pci-current/for-linus (5f9e832c1370 Linus 5.3-rc1) Merging driver-core.current/driver-core-linus (d45331b00ddb Linux 5.3-rc4) Merging tty.current/tty-linus (d45331b00ddb Linux 5.3-rc4) Merging usb.current/usb-linus (edfbcb321faf usb: add a hcd_uses_dma helper) Merging usb-gadget-fixes/fixes (4a56a478a525 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt) Merging usb-serial-fixes/usb-linus (e5d8badf37e6 USB: serial: option: add the BroadMobi BM818 card) Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) Merging phy/fixes (609488bc979f Linux 5.3-rc2) Merging staging.current/staging-linus (48b30e10bfc2 Merge tag 'iio-fixes-for-5.3b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (01fd150f4aff misc: xilinx-sdfec: fix dependency and build error) Merging soundwire-fixes/fixes (8676b3ca4673 soundwire: fix regmap dependencies and align with other serial links) Merging thunderbolt-fixes/fixes (d45331b00ddb Linux 5.3-rc4) Merging input-current/for-linus (849f5ae3a513 Input: iforce - add sanity checks) Merging crypto-current/master (e2664ecbb2f2 crypto: ccp - Ignore tag length when decrypting GCM ciphertext) Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible) Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal) Merging kselftest-fixes/fixes (fbb01c52471c selftests/livepatch: push and pop dynamic debug config) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (d555c34338ca omap-dma/omap_vout_vrfb: fix off-by-one fi value) Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) Merging mtd-fixes/mtd/fixes (834de5c1aa76 mtd: spi-nor: Fix the disabling of write protection at init) Merging mfd-fixes/for-mfd-fixes (63b2de12b7ee mfd: stmfx: Fix an endian bug in stmfx_irq_handler()) Merging v4l-dvb-fixes/fixes (92f5b0313e37 media: vivid: fix missing cec adapter name) Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev) Merging mips-fixes/mips-fixes (74034a09267c MIPS: BCM63XX: Mark expected switch fall-through) Merging at91-fixes/at91-fixes (5f9e832c1370 Linus 5.3-rc1) Merging omap-fixes/fixes (4a65bbb9109e soc: ti: pm33xx: Make two symbols static) Merging kvm-fixes/master (a738b5e75b4c Merge tag 'kvmarm-fixes-for-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID) Merging hwmon-fixes/hwmon (4207f85eb0f6 hwmon: (lm75) Fix write operations for negative temperatures) Merging nvdimm-fixes/libnvdimm-fixes (06282373ff57 mm/memremap: Fix reuse of pgmap instances with internal references) Merging btrfs-fixes/next-fixes (efa6b617e067 Merge branch 'misc-5.3' into next-fixes) Merging vfs-fixes/fixes (e272d4fb74d6 configfs: fix a deadlock in configfs_symlink()) Merging dma-mapping-fixes/for-linus (33dcb37cef74 dma-mapping: fix page attributes for dma_mmap_*) Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) Merging drivers-x86-fixes/fixes (f14312a93b34 platform/x86: pcengines-apuv2: use KEY_RESTART for front button) Merging samsung-krzk-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1) Merging devicetree-fixes/dt/linus (83f82d7a4258 of: irq: fix a trivial typo in a doc comment) Merging scsi-fixes/fixes (7c7cfdcf7f17 scsi: ufs: Fix NULL pointer dereference in ufshcd_config_vreg_hpm()) Merging drm-fixes/drm-fixes (2f62c5d6ed0a Merge tag 'drm-fixes-5.3-2019-08-14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes) Merging amdgpu-fixes/drm-fixes (e1b4ce25dbc9 drm/scheduler: use job count instead of peek) Merging drm-intel-fixes/for-linux-next-fixes (daa37200d489 Merge tag 'gvt-fixes-2019-08-13' of https://github.com/intel/gvt-linux into drm-intel-fixes) Merging mmc-fixes/fixes (b803974a8603 mmc: cavium: Add the missing dma unmap when the dma has finished.) Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1) Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3) Merging hyperv-fixes/hyperv-fixes (5d14de4c6ce5 hv: Use the correct style for SPDX License Identifier) Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) Merging risc-v-fixes/fixes (69703eb9a8ae riscv: Make __fstate_clean() work correctly.) Merging pidfd-fixes/fixes (d45331b00ddb Linux 5.3-rc4) Merging fpga-fixes/fixes (7721f61d2e76 fpga: altera-ps-spi: Fix getting of optional confd gpio) Merging spdx/spdx-linus (0dda5907b0fc i2c: stm32: Use the correct style for SPDX License Identifier) Merging gpio-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) Merging pinctrl-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) Merging drm-misc-fixes/for-linux-next-fixes (63daf4e16654 drm/omap: ensure we have a valid dma_mask) Merging kspp-gustavo/for-next/kspp (af905189716f dmaengine: fsldma: Mark expected switch fall-through) Merging kbuild/for-next (e167191e4a8a kbuild: Parameterize kallsyms generation and correct reporting) Merging compiler-attributes/compiler-attributes (6c4d6bc54864 auxdisplay: Fix a typo in cfag12864b-example.c) Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) Merging dma-mapping/for-next (ad3c7b18c5b3 arm: use swiotlb for bounce buffering on LPAE configs) 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 (436ce61aeb33 Merge branches 'for-next/error-injection', 'for-next/tbi', 'for-next/psci-cpuidle', 'for-next/cpu-topology' and 'for-next/52-bit-kva' into for-next/core) Merging arm-perf/for-next/perf (228f855fb57a perf: Remove dev_err() usage after platform_get_irq()) Merging arm-soc/for-next (50e5bf56ba2f arm-soc: document merges) Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) Merging amlogic/for-next (f2e66ae69e8b Merge branch 'v5.4/drivers' into tmp/aml-rebuild) Merging aspeed/for-next (821569c33633 Merge branch 'dt-for-v5.4' into for-next) Merging at91/at91-next (90fbe456b5f0 Merge branch 'at91-dt' into at91-next) Merging bcm2835/for-next (c165c01bb6f7 Merge branch 'bcm2835-dt-next' into for-next) Merging imx-mxs/for-next (7f2c70c95c65 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 (29baae1e8b9d Merge branch 'omap-for-v5.4/dt' into for-next) Merging qcom/for-next (e8cf1988f521 Merge branches 'arm64-for-5.4' and 'drivers-for-5.3' into for-next) Merging renesas/next (45f5d5a9e34d arm64: dts: renesas: r8a77995: draak: Fix backlight regulator name) Merging renesas-geert/next (377fbc7c31e5 Merge remote-tracking branch 'origin/fixes-for-v5.3' into renesas-next) Merging reset/reset/next (ea651ffd4f7f reset: Add DesignWare IP support to simple reset) Merging rockchip/for-next (30b2ea80df59 Merge branch 'v5.4-armsoc/dts32' into for-next) Merging samsung-krzk/for-next (1992b548e982 Merge branch 'next/drivers' into for-next) Merging scmi/for-linux-next (9ad5b02d9466 Merge tags 'scmi-updates-5.4', 'vexpress-dt-updates-5.4' and 'juno-update-5.4' into for-linux-next) Merging sunxi/sunxi/for-next (7964dd32ef47 Merge branch 'sunxi/config64-for-5.4' into sunxi/for-next) Merging tegra/for-next (6290ae1fb7e2 Merge branch for-5.4/firmware into for-next) Merging clk/clk-next (c12c7fb33b5e clk: ti: Don't reference clk_init_data after registration) 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 (ada384a7fd2d csky: Optimize arch_sync_dma_for_cpu/device with dma_inv_range) Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) Merging ia64/next (4189ff23489e kernel: only define task_struct_whitelist conditionally) Merging m68k/for-next (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) Merging m68knommu/for-next (d45331b00ddb Linux 5.3-rc4) Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) Merging mips/mips-next (c59ae0a10551 MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean) CONFLICT (content): Merge conflict in arch/mips/include/asm/vdso/vdso.h CONFLICT (content): Merge conflict in Documentation/index.rst 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 (a5ff2130a4d9 parisc: speed up flush_tlb_all_local with qemu) Merging powerpc/next (2b87a2553aa0 powerpc/64s: Make boot look nice(r)) 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 (f51edcec5288 MAINTAINERS: Add an entry for generic architecture topology) 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 (e79333569918 s390/startup: purge obsolete .gitignore patterns) 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 (b482e48d29f1 um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT) Merging xtensa/xtensa-for-next (fa4b55813b1e Merge branch 'xtensa-5.3' into xtensa-for-next) Merging fscrypt/master (ba13f2c8d7a0 fscrypt: document the new ioctls and policy version) Merging afs/afs-next (ac8ca2d9ce2f afs: Support RCU pathwalk) Merging btrfs/next (29dcea88779c Linux 4.17) Merging btrfs-kdave/for-next (a668d8d6543c Merge branch 'cleanup/sysfs-refactoring' into for-next-20190805) CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c CONFLICT (content): Merge conflict in fs/btrfs/ctree.h Applying: btrfs: merge fix up for "Btrfs: fix sysfs warning and missing raid sysfs directories" Merging ceph/master (d31d07b97a5e ceph: fix end offset in truncate_inode_pages_range call) Merging cifs/for-next (af816b1fac41 cifs: remove redundant assignment to variable rc) 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 (56db1991690f udf: prevent allocation beyond UDF partition) Merging ext4/dev (96fcaf86c3cb ext4: fix coverity warning on error path of filename setup) Merging f2fs/dev (11f3567662e0 f2fs: Support case-insensitive file name lookups) Merging fsverity/fsverity (60d7bf0f790f f2fs: add fs-verity support) CONFLICT (content): Merge conflict in fs/f2fs/inode.c CONFLICT (content): Merge conflict in fs/f2fs/file.c Merging fuse/for-next (e7d6cd694383 fuse: cleanup fuse_wait_on_page_writeback) Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) Merging nfs/linux-next (d45331b00ddb Linux 5.3-rc4) Merging nfs-anna/linux-next (68f461593f76 NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O) Merging nfsd/nfsd-next (64a38e840ce5 SUNRPC: Track writers of the 'channel' file to improve cache_listeners_exist) 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 (8612de3f7ba6 xfs: don't crash on null attr fork xfs_bmapi_read) Merging iomap/iomap-for-next (9a67b72552f8 MAINTAINERS: iomap: Remove fs/iomap.c record) Merging djw-vfs/vfs-for-next (7e328e5930ad mm/fs: don't allow writes to immutable files) Merging file-locks/locks-next (06da5a37b8ea locks: print a warning when mount fails due to lack of "mand" support) Merging vfs/for-next (dad5ea4bac62 ceph_real_mount(): missing initialization) CONFLICT (content): Merge conflict in fs/ubifs/super.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()" Merging printk/for-next (ba174ef6d224 Merge branch 'for-5.3-fixes' into for-next) Merging pci/next (882e5d3f6fe0 Merge branch 'pci/trivial') Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2) Merging hid/for-next (f28b8da266a6 Merge branch 'for-5.3/upstream-fixes' into for-next) Merging i2c/i2c/for-next (d4b7c7304363 Merge branch 'i2c/for-5.4' into i2c/for-next) Merging i3c/i3c/next (7afe9a4e5665 i3c: master: fix a memory leak bug) Merging dmi/master (57361846b52b Linux 4.19-rc2) Merging hwmon-staging/hwmon-next (8ae17b2c2e46 hwmon: (ltc2990) Generalise DT to fwnode support) Merging jc_docs/docs-next (4514fe8cd96f Documentation/arm/samsung-s3c24xx: Remove stray U+FEFF character to fix title) CONFLICT (add/add): Merge conflict in Documentation/mips/index.rst CONFLICT (content): Merge conflict in Documentation/admin-guide/cifs/todo.rst Merging v4l-dvb/master (31d5d15dfc34 media: MAINTAINERS: Add entry for the ov5670 driver) Merging v4l-dvb-next/master (5f9e832c1370 Linus 5.3-rc1) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (16c7e74669ce Merge branch 'acpi-tables' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (07e44f922529 Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next) Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list) Merging opp/opp/linux-next (0203c0343a1f Merge branch 'opp/qcom-updates' into opp/linux-next) Merging thermal/next (d093f91ff7d0 Merge branch 'for-rc' into next) CONFLICT (rename/add): Rename Documentation/thermal/index.rst->Documentation/driver-api/thermal/index.rst in HEAD. Documentation/driver-api/thermal/index.rst added in thermal/next 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 (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) Merging rdma/for-next (77905379e9b2 RDMA/hns: Remove unuseful member) Merging net-next/master (459c5fb44379 Merge branch 'mscc-PTP-support') CONFLICT (content): Merge conflict in scripts/link-vmlinux.sh CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c Merging bpf-next/master (dadb81d0afe7 libbpf: make libbpf.map source of truth for libbpf version) Merging ipsec-next/master (c7b37c769d2a xfrm: remove get_mtu indirection from xfrm_type) Merging mlx5-next/mlx5-next (b1635ee6120c net/mlx5: Add XRQ legacy commands opcodes) Merging netfilter-next/master (ecb9f80db23a net/mvpp2: Replace tasklet with softirq hrtimer) 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 (1b0b807dd746 Merge branch 'r8169-fw') Merging wireless-drivers-next/master (6004cf298a41 b43legacy: Remove pointless cond_resched() wrapper) Merging bluetooth/master (cf80618a8402 Bluetooth: hci_qca: Use kfree_skb() instead of kfree()) Merging mac80211-next/master (6a7ce95d752e staging/octeon: Fix build error without CONFIG_NETDEVICES) Merging gfs2/for-next (1e5227a3a98b gfs2: Fix possible fs name overflows) Merging mtd/mtd/next (5f9e832c1370 Linus 5.3-rc1) Merging nand/nand/next (80107e764846 mtd: rawnand: remove redundant assignment to variable ret) Merging spi-nor/spi-nor/next (5fbdac150d48 mtd: spi-nor: fix description for int (*flash_is_locked)()) Merging crypto/master (198429631a85 crypto: arm64/aegis128 - implement plain NEON version) Merging drm/drm-next (e7f7287bf5f7 Merge tag 'drm-next-5.4-2019-08-09' of git://people.freedesktop.org/~agd5f/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h Merging amdgpu/drm-next (283791cbb202 drm/amdkfd: Remove GPU ID in GWS queue creation) CONFLICT (content): Merge conflict in include/uapi/linux/kfd_ioctl.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_chardev.c Merging drm-intel/for-linux-next (e5dadff4b093 drm/i915: Protect request retirement with timeline->mutex) Merging drm-tegra/drm/tegra/for-next (2a6fc3cb5cb6 drm/tegra: Fix gpiod_get_from_of_node() regression) Merging drm-misc/for-linux-next (dc2e1e5b2799 drm/panel: Add driver for the Toppoly TD043MTEA1 panel) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c CONFLICT (modify/delete): drivers/gpu/drm/i915/i915_gem_batch_pool.c deleted in HEAD and modified in drm-misc/for-linux-next. Version drm-misc/for-linux-next of drivers/gpu/drm/i915/i915_gem_batch_pool.c left in tree. $ git rm -f drivers/gpu/drm/i915/i915_gem_batch_pool.c Applying: drm: fix up fallout from "dma-buf: rename reservation_object to dma_resv" Merging drm-msm/msm-next (ddc73f32ba95 drm/msm: drop use of drmP.h) CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_atomic.c CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c 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 (c23ef285fc67 drm/imx: Drop unused imx-ipuv3-crtc.o build) Merging etnaviv/etnaviv/next (088880ddc0b2 drm/etnaviv: implement softpin) CONFLICT (content): Merge conflict in drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c Merging regmap/for-next (1bd4584626a9 Merge branch 'regmap-5.4' into regmap-next) Merging sound/for-next (246bb4aaa4f4 Revert "ALSA: hda: Add codec on bus address table lately") Merging sound-asoc/for-next (ca25801a2c4d Merge branch 'asoc-5.4' into asoc-next) Merging modules/modules-next (38f054d549a8 modules: always page-align module section allocations) Merging input/next (f5d4c647d0dd Input: applespi - no need to check return value of debugfs_create functions) Merging block/for-next (15ea82106b89 Merge branch 'for-5.4/block' into for-next) Merging device-mapper/for-next (644332ceab35 dm verity: add root hash pkcs#7 signature verification) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) Merging mmc/next (9637eb6749b9 Merge branch 'fixes' into next) 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 (5cd690a308e8 mfd: asic3: Include the right header) Merging backlight/for-backlight-next (73fbfc499448 backlight: pwm_bl: Fix heuristic to determine number of brightness levels) Merging battery/for-next (5f9e832c1370 Linus 5.3-rc1) Merging regulator/for-next (9170108af492 Merge branch 'regulator-5.4' into regulator-next) Merging security/next-testing (a4848e06f9af Merge branch 'next-lockdown' into next-testing) CONFLICT (content): Merge conflict in kernel/trace/trace_kprobe.c CONFLICT (content): Merge conflict in fs/tracefs/inode.c Applying: early_security_init() needs a stub got !CONFIG_SECURITY Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size) Merging integrity/next-integrity (70433f67ec3a MODSIGN: make new include file self contained) Merging keys/keys-next (8cf8684e0d24 Merge branch 'keys-acl' into keys-next) CONFLICT (content): Merge conflict in include/linux/key.h CONFLICT (modify/delete): fs/crypto/keyinfo.c deleted in HEAD and modified in keys/keys-next. Version keys/keys-next of fs/crypto/keyinfo.c left in tree. CONFLICT (content): Merge conflict in fs/afs/security.c $ git rm -f fs/crypto/keyinfo.c Applying: fsverity: merge fix for keyring_alloc API change Applying: fscrypt: merge resolution for "keys: Replace uid/gid/perm permissions checking with an ACL" Applying: dm verity: merge fix for "keys: Replace uid/gid/perm permissions checking with an ACL" Merging selinux/next (ac5656d8a4cd fanotify, inotify, dnotify, security: add security hook for fs notifications) Merging tpmdd/next (2d6c25215ab2 KEYS: trusted: allow module init if TPM is inactive or deactivated) Merging watchdog/master (194108705c9e watchdog: remove w90x900 driver) Merging iommu/next (333005c20d9b Merge branches 'iommu/fixes', 'arm/omap', 'arm/exynos', 'x86/amd' and 'core' into next) Merging vfio/next (1e4d09d2212d mdev: Send uevents around parent device registration) Merging audit/next (5f9e832c1370 Linus 5.3-rc1) Merging devicetree/for-next (7aa8dd91da63 devicetree: Expose dtbs_check and dt_binding_check some more) CONFLICT (add/add): Merge conflict in Documentation/devicetree/writing-schema.rst Merging mailbox/mailbox-for-next (25777e5784a7 mailbox: handle failed named mailbox channel request) Merging spi/for-next (f27df9226672 Merge branch 'spi-5.4' into spi-next) Merging tip/auto-latest (3bd029370a75 Merge branch 'x86/mm') Merging clockevents/clockevents/next (b0c74b96d177 clocksource/drivers/davinci: Add support for clocksource) Merging edac/edac-for-next (718d58514ebc EDAC/mc: Cleanup _edac_mc_free() code) Merging irqchip/irq/irqchip-next (3dae67ce600c irqchip/gic-pm: Remove PM_CLK dependency) Merging ftrace/for-next (6d54ceb539aa tracing: Fix user stack trace "??" output) Merging rcu/rcu/next (07f038a408fb Merge LKMM and RCU commits) Merging kvm/linux-next (a738b5e75b4c Merge tag 'kvmarm-fixes-for-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvm-arm/next (16e604a437c8 KVM: arm/arm64: vgic: Reevaluate level sensitive interrupts on enable) Merging kvm-ppc/kvm-ppc-next (3bda7f0ae0f7 KVM: PPC: Book3S PR: Fix software breakpoints) Merging kvms390/next (a049a377164c KVM: selftests: Enable dirty_log_test on s390x) Merging xen-tip/linux-next (b877ac9815a8 xen/swiotlb: remember having called xen_create_contiguous_region()) 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 (e3168b874321 platform/x86: asus-wmi: fix CPU fan control on recent products) Merging chrome-platform/for-next (5f9e832c1370 Linus 5.3-rc1) Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq()) Merging leds/for-next (3881a72f8d06 leds: pca953x: Include the right header) Merging ipmi/for-next (340ff31ab00b ipmi_si: Only schedule continuously in the thread in maintenance mode) Merging driver-core/driver-core-next (2a77eec0d3ca devcoredump: fix typo in comment) CONFLICT (content): Merge conflict in drivers/base/power/runtime.c Merging usb/usb-next (4ed3350539aa USB: usbfs: Add a capability flag for runtime suspend) CONFLICT (content): Merge conflict in drivers/staging/Makefile CONFLICT (content): Merge conflict in drivers/staging/Kconfig Merging usb-gadget/next (b2357839c56a usb: renesas_usbhs: add a workaround for a race condition of workqueue) Merging usb-serial/usb-next (e21a712a9685 Linux 5.3-rc3) Merging usb-chipidea-next/ci-for-usb-next (034252e37b31 usb: chipidea: msm: Use devm_platform_ioremap_resource()) Merging phy-next/next (609488bc979f Linux 5.3-rc2) Merging tty/tty-next (591f935db448 serial: mxs-auart: Don't check for mctrl_gpio_to_gpiod() returning error) Merging char-misc/char-misc-next (77e38c19f373 Merge 5.3-rc4 into char-misc-next) Merging extcon/extcon-next (a3fc57233977 extcon: adc-jack: Remove dev_err() usage after platform_get_irq()) Merging soundwire/next (15ed3ea2280e soundwire: bus: split handling of Device0 events) Merging thunderbolt/next (04f7745300ed thunderbolt: Show key using %*pE not %*pEp) Merging staging/staging-next (c391818a10de staging: fsl-dpaa2/ethsw: do not force user to bring interface down) Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next) Merging icc/icc-next (dcc31687b8b9 interconnect: qcom: remove COMPILE_TEST from CONFIG_INTERCONNECT_QCOM_QCS404) Merging slave-dma/next (7607a121f461 dmaengine: fsldma: Mark expected switch fall-through) Merging cgroup/for-next (653a23ca7e1e Use kvmalloc in cgroups-v1) Merging scsi/for-next (182747f87687 Merge branch 'misc' into for-next) CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c Merging scsi-mkp/for-next (01749d1ac400 Merge branch '5.4/scsi-postmerge' into 5.4/scsi-next) Merging vhost/linux-next (73f628ec9e6b vhost: disable metadata prefetch optimization) Merging rpmsg/for-next (7f1345e9efcc Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (02c05fd1775c Merge branch 'devel' into for-next) Merging gpio-brgl/gpio/for-next (f2ee73147a3f gpio: lpc32xx: allow building on non-lpc32xx targets) CONFLICT (content): Merge conflict in include/linux/gpio/driver.h Merging gpio-intel/for-next (8f86a5b4ad67 gpio: merrifield: Pass irqchip when adding gpiochip) Merging pinctrl/for-next (dcd12a00f45f Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (0a1c3a93a6d2 pinctrl: intel: Allow to request locked pads) Merging pinctrl-samsung/for-next (10971e2ab6eb pinctrl: samsung: Fix device node refcount leaks in init code) Merging pwm/for-next (6cf9481b440d pwm: Fallback to the static lookup-list when acpi_pwm_get fails) Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus) Merging ktest/for-next (aecea57f84b0 ktest: Fix some typos in config-bisect.pl) Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool) Merging kselftest/next (5f9e832c1370 Linus 5.3-rc1) Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI) CONFLICT (content): Merge conflict in arch/riscv/include/uapi/asm/unistd.h Merging livepatching/for-next (28f28ea4343a Merge branch 'for-5.3-core' into for-next) Merging coresight/next (a7a03a695648 coresight: tmc-etr: Fix updating buffer in not-snapshot mode.) Merging rtc/rtc-next (b0a3fa44659c rtc: mxc: use spin_lock_irqsave instead of spin_lock_irq in IRQ context) Merging nvdimm/libnvdimm-for-next (cb3110f7452d Merge branch 'for-5.3/dax' into libnvdimm-for-next) Merging at24/at24/for-next (10742fee98eb eeprom: at24: remove unneeded include) Merging ntb/ntb-next (5f9e832c1370 Linus 5.3-rc1) Merging kspp/for-next/kspp (60f2c82ed20b randstruct: Check member structs in is_pure_ops_struct()) 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 (0a43bffb7e21 slimbus: fix slim_tid_txn()) Merging nvmem/for-next (e018ed6ecebf nvmem: meson-mx-efuse: allow reading data smaller than word_size) Merging xarray/xarray (91abab83839a XArray: Fix xas_next() with a single entry at 0) Merging hyperv/hyperv-next (221f6df008ab hv_balloon: Reorganize the probe function) 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 (590ef0128b42 waitid: Add support for waiting for the current process group) Merging devfreq/for-next (26f9b841c455 PM / devfreq: tegra20: add COMMON_CLK dependency) Merging hmm/hmm (9c240a7bb337 mm/hmm: make HMM_MIRROR an implicit option) Merging fpga/for-next (7d62460b4060 MAINTAINERS: Move linux-fpga tree to new location) Applying: gpio: stubs in headers should be inline Applying: tracefs: Fix NULL pointer dereference when no lockdown is used Merging akpm-current/current (8c2c6d2cfac7 ipc/msg.c: consolidate all xxxctl_down() functions) CONFLICT (content): Merge conflict in mm/z3fold.c CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h Applying: mm: kmemleak: fix mismerge $ git checkout -b akpm remotes/origin/akpm/master Applying: pinctrl: fix pxa2xx.c build warnings Applying: lib: untag user pointers in strn*_user Applying: mm: untag user pointers passed to memory syscalls Applying: mm: untag user pointers in mm/gup.c Applying: mm: untag user pointers in get_vaddr_frames Applying: fs/namespace: untag user pointers in copy_mount_options Applying: userfaultfd: untag user pointers Applying: drm/amdgpu: untag user pointers Applying: drm/radeon: untag user pointers in radeon_gem_userptr_ioctl Applying: media/v4l2-core: untag user pointers in videobuf_dma_contig_user_get Applying: tee/shm: untag user pointers in tee_shm_register Applying: vfio/type1: untag user pointers in vaddr_get_pfn Applying: mm: treewide: clarify pgtable_page_{ctor,dtor}() naming 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 (91f93791bf3e drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) Applying: kbuild: fix mismerge
Attachment:
pgpHd2rwCunNh.pgp
Description: OpenPGP digital signature
