Hi all, Changes since 20190531: Reinstated tree: sh New tree: risc-v-fixes My fixes tree is empty again. The crypto tree gained a conflict against Linus' tree. The net-next tree lost its build failure. The clockevents tree gained a build failure for which I reverted a commit. The xarray tree caused runtime problems for which I reverted a commit. The akpm-current tree gained a conflict against the dma-mapping tree. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 3363 3644 files changed, 138237 insertions(+), 62505 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 293 trees (counting Linus' and 71 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 (f2c7c76c5d0a Linux 5.2-rc3) Merging fixes/master (3ab4436f688c Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux) Merging kspp-gustavo/for-next/kspp (034e673710d3 platform/x86: acer-wmi: Mark expected switch fall-throughs) Merging kbuild-current/fixes (30a28f11b618 kbuild: tar-pkg: enable communication with jobserver) Merging arc-current/for-curr (46e04c25e72f ARC: [plat-hsdk] Get rid of inappropriate PHY settings) Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache) Merging arm64-fixes/for-next/fixes (1e29ab3186e3 arm64: use the correct function type for __arm64_sys_ni_syscall) Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping) Merging powerpc-fixes/fixes (8b909e354870 powerpc/kexec: Fix loading of kernel + initramfs with kexec_file_load()) Merging s390-fixes/fixes (674459be1169 MAINTAINERS: add Vasily Gorbik and Christian Borntraeger for s390) Merging sparc/master (54dee406374c Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (8c268598192d Update my email address) Merging bpf/master (1e692f09e091 bpf, riscv: clear high 32 bits for ALU32 add/sub/neg/lsh/rsh/arsh) Merging ipsec/master (7c80eb1c7e2b af_key: fix leaks in key_pol_get_resp and dump_sp.) Merging netfilter/master (5142967ab524 netfilter: nf_tables: fix module autoload with inet family) Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') Merging wireless-drivers/master (69ae4f6aac15 mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()) Merging mac80211/master (180aa422ef27 nl80211: fill all policy .type entries) Merging rdma-fixes/for-rc (4f240dfec6bc RDMA/efa: Remove MAYEXEC flag check from mmap flow) Merging sound-current/for-linus (717f43d81afc ALSA: hda/realtek - Update headset mode for ALC256) Merging sound-asoc-fixes/for-linus (6ce64b151bdf Merge branch 'asoc-5.2' into asoc-linus) Merging regmap-fixes/for-linus (38ee2a8cc70e Merge branch 'regmap-5.2' into regmap-linus) Merging regulator-fixes/for-linus (ae920866d4fc Merge branch 'regulator-5.2' into regulator-linus) Merging spi-fixes/for-linus (be02f18a60ed Merge branch 'spi-5.2' into spi-linus) Merging pci-current/for-linus (a188339ca5a3 Linux 5.2-rc1) Merging driver-core.current/driver-core-linus (cd6c84d8f0cd Linux 5.2-rc2) Merging tty.current/tty-linus (a1ad1cc9704f vt/fbcon: deinitialize resources in visual_init() after failed memory allocation) Merging usb.current/usb-linus (7bd1d5edd016 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging usb-gadget-fixes/fixes (072684e8c58d USB: gadget: f_hid: fix deadlock in f_hidg_write()) Merging usb-serial-fixes/usb-linus (f3dfd4072c3e USB: serial: option: add Telit 0x1260 and 0x1261 compositions) Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer) Merging phy/fixes (a188339ca5a3 Linux 5.2-rc1) Merging staging.current/staging-linus (e61ff0fba72d staging: kpc2000: Add dependency on MFD_CORE to kconfig symbol 'KPC2000') Merging char-misc.current/char-misc-linus (8aa75b72e3e6 Merge tag 'misc-habanalabs-fixes-2019-05-24' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linus) Merging soundwire-fixes/fixes (03ecad90d379 soundwire: stream: fix out of boundary access on port properties) Merging thunderbolt-fixes/fixes (cd6c84d8f0cd Linux 5.2-rc2) Merging input-current/for-linus (7c7da40da164 Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD) Merging crypto-current/master (7829a0c1cb9c crypto: hmac - fix memory leak in hmac_init_tfm()) Merging ide/master (54dee406374c Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) Merging vfio-fixes/for-linus (492855939bdb vfio/type1: Limit DMA mappings per container) Merging kselftest-fixes/fixes (bc2cce3f2ebc selftests: vm: install test_vmalloc.sh for run_vmtests) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (8243b87c3abb dt-bindings: dma: uart: rename binding) CONFLICT (content): Merge conflict in drivers/dma/mediatek/Makefile Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) Merging mtd-fixes/mtd/fixes (b2b5921fe4b3 mtd: rawnand: initialize ntargets with maxchips) Merging mfd-fixes/for-mfd-fixes (e93c9c99a629 Linux 5.1) Merging v4l-dvb-fixes/fixes (a200c721956c media: venus: hfi_parser: fix a regression in parser) Merging reset-fixes/reset/fixes (d5d4218e1669 reset: remove redundant null check on pointer dev) Merging mips-fixes/mips-fixes (f532beeeff0c MIPS: uprobes: remove set but not used variable 'epc') Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak) Merging omap-fixes/fixes (4ee23cd76c0c Merge branch 'omap-for-v5.2/ti-sysc' into fixes) Merging kvm-fixes/master (f8d221d2e0e1 Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master) Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID) Merging hwmon-fixes/hwmon (ef583670a438 hwmon: core: add thermal sensors only if dev->of_node is present) Merging nvdimm-fixes/libnvdimm-fixes (52f476a323f9 libnvdimm/pmem: Bypass CONFIG_HARDENED_USERCOPY overhead) Merging btrfs-fixes/next-fixes (8b1d37b7b32d Merge branch 'misc-5.2' into next-fixes) Merging vfs-fixes/fixes (d8076bdb56af uapi: Wire up the mount API syscalls on non-x86 arches [ver #2]) Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry) Merging i3c-fixes/master (709a53e19484 MAINTAINERS: Fix the I3C entry) Merging drivers-x86-fixes/fixes (d6423bd03031 platform/x86: pmc_atom: Add several Beckhoff Automation boards to critclk_systems DMI table) 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 (3b0541791453 scsi: libsas: delete sas port if expander discover failed) Merging drm-fixes/drm-fixes (2a3e0b716296 Merge tag 'imx-drm-fixes-2019-05-29' 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 (afb286bcae85 Merge tag 'gvt-fixes-2019-05-30' of https://github.com/intel/gvt-linux into drm-intel-fixes) Merging mmc-fixes/fixes (89f3c365f3e1 mmc: sdhci: Fix SDIO IRQ thread deadlock) Merging rtc-fixes/rtc-fixes (a188339ca5a3 Linux 5.2-rc1) Merging gnss-fixes/gnss-linus (cd6c84d8f0cd Linux 5.2-rc2) Merging hyperv-fixes/hyperv-fixes (01e7d61b8ace PCI: hv: Detect and fix Hyper-V PCI domain number collision) Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) Merging risc-v-fixes/fixes (a188339ca5a3 Linux 5.2-rc1) Merging drm-misc-fixes/for-linux-next-fixes (95b74ce88943 drm/qxl: drop WARN_ONCE()) Merging kbuild/for-next (2409207a73cc Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging compiler-attributes/compiler-attributes (a188339ca5a3 Linux 5.2-rc1) Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) Merging dma-mapping/for-next (cdeb0010808d USB: drop HCD_LOCAL_MEM flag) Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores) Merging arc/for-next (ef94e8ea94ed ARC: entry: EV_Trap expects r10 (vs. r9) to have exception cause) Merging arm/for-next (91da0d72dcff Merge commit 'riscpc^{/ARM: riscpc: dma: use __iomem pointers for writing DMA}' into for-next) Merging arm64/for-next/core (6127bf372add Merge branch 'for-next/mmiowb' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core) Merging arm-perf/for-next/perf (9bcb929f969e perf/arm-ccn: Clean up CPU hotplug handling) Merging arm-soc/for-next (7ad1b252cabe ARM: Document merges) Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) Merging amlogic/for-next (93b5aa93c2e5 Merge branch 'v5.3/drivers' into tmp/aml-rebuild) Merging aspeed/for-next (130413736376 ARM: dts: aspeed: Add Microsoft Olympus BMC) Merging at91/at91-next (32dfd9cfa4c6 Merge branch 'at91-dt' into at91-next) Merging bcm2835/for-next (08e3c4158538 ARM: bcm283x: Enable DMA support for SPI controller) Merging imx-mxs/for-next (83d02ffe0144 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next) Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next) Merging mvebu/for-next (891f0f865c37 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (4ee23cd76c0c Merge branch 'omap-for-v5.2/ti-sysc' into fixes) 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 qcom/for-next (d1b240beca65 Merge branch 'drivers-for-5.3' into all-for-5.3) Merging renesas/next (f7918626c158 Merge branches 'arm-soc-for-v5.3' and 'arm64-dt-for-v5.3' into next) Merging rockchip/for-next (958bf721f5d2 Merge branch 'v5.3-armsoc/dts32' into for-next) Merging samsung-krzk/for-next (8821f1861040 Merge branch 'next/dt' into for-next) Merging sunxi/sunxi/for-next (31d382a2bb08 Merge branch 'sunxi/dt-for-5.3' into sunxi/for-next) CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig Merging tegra/for-next (c47cf10c6cb2 Merge branch for-5.3/arm64/dt into for-next) Merging clk/clk-next (f191a146bcee Merge branch 'clk-fixes' into clk-next) Merging clk-samsung/for-next (c304b8d2f9aa clk: samsung: exynos5433: Use of_clk_get_parent_count()) 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 (6b436744a0b7 csky: Fixup no panic in kernel for some traps) Merging h8300/h8300-next (3ab4436f688c Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux) Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files) Merging m68k/for-next (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping) Merging m68knommu/for-next (cd6c84d8f0cd Linux 5.2-rc2) Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) Merging mips/mips-next (361686288213 MIPS: replace MBIT_ULL() with BIT_ULL()) Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE) Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32) Merging parisc-hd/for-next (029ab28a86e7 parisc: Use implicit space register selection for loading the coherence index of I/O pdirs) Merging powerpc/next (8150a153c013 powerpc/64s: Use early_mmu_has_feature() in set_kuap()) Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") Merging soc-fsl/next (5d1d046e2868 soc: fsl: qbman_portals: add APIs to retrieve the probing status) Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) Merging risc-v/for-next (8fef9900d43f riscv: fix locking violation in page fault handler) 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 (2409207a73cc Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging sh/sh-next (860dbce3d8dd Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux) 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 (1987b1b8f9f1 um: irq: don't set the chip for all irqs) Merging xtensa/xtensa-for-next (2ba543d3e7db Merge branch 'xtensa-5.2-fixes' into xtensa-for-next) Merging fscrypt/master (5858bdad4d0d fscrypt: don't set policy for a dead directory) Merging btrfs/next (29dcea88779c Linux 4.17) Merging btrfs-kdave/for-next (6fc9f4e59957 Merge branch 'for-next-current-v5.1-20190509' into for-next-20190509) Merging ceph/master (00abf69dd24f ceph: flush dirty inodes before proceeding with remount) Merging cifs/for-next (f45a72c7597d cifs: Use kmemdup in SMB2_ioctl_init()) Merging configfs/for-next (f6122ed2a4f9 configfs: Fix use-after-free when accessing sd->s_dentry) Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file) Merging ext3/for_next (3803f4dc265f Merge ext2 bitmap bh leak fix.) Merging ext4/dev (a49773064bc2 jbd2: fix typo in comment of journal_submit_inode_data_buffers) Merging f2fs/dev (b1820efff17a f2fs: add error prints for debugging mount failure) Merging fuse/for-next (26eb3bae5003 fuse: extract helper for range writeback) Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) Merging nfs/linux-next (3ab4436f688c Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux) Merging nfs-anna/linux-next (ba851a39c970 NFSv4.1: Fix bug only first CB_NOTIFY_LOCK is handled) Merging nfsd/nfsd-next (f420eae8f7c9 nfsd: Spelling s/EACCESS/EACCES/) Merging orangefs/for-next (33713cd09ccd orangefs: truncate before updating size) Merging overlayfs/overlayfs-next (5d3211b651a0 ovl: doc: add non-standard corner cases) Merging ubifs/linux-next (c16e73587ad6 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 (5cd213b0fec6 xfs: don't reserve per-AG space for an internal log) Merging file-locks/locks-next (945ab8f6de94 locks: wake any locks blocked on request before deadlock check) Merging vfs/for-next (6e14c3cf8bc4 Merge branch 'work.icache' into for-next) CONFLICT (content): Merge conflict in Documentation/filesystems/porting Merging printk/for-next (967aa2217b6d Merge branch 'for-5.2-fixes' into for-next) Merging pci/next (a188339ca5a3 Linux 5.2-rc1) Merging pstore/for-next/pstore (e070e380c674 Merge branch 'for-linus/pstore' into for-next/pstore) Merging hid/for-next (d4582ee4fc55 Merge branch 'for-5.2/fixes' into for-next) Merging i2c/i2c/for-next (6e2700c656e5 Merge branch 'i2c/for-current' into i2c/for-next) Merging i3c/i3c/next (5e343fbb7176 dt-bindings: i3c: Document dropped support for I2C 10 bit devices) Merging dmi/master (57361846b52b Linux 4.19-rc2) Merging hwmon-staging/hwmon-next (532454c231d8 hwmon: (tc654) Update to use SPDX-License-Identifier) CONFLICT (content): Merge conflict in drivers/hwmon/tc654.c Merging jc_docs/docs-next (6c01edd395a7 docs: look for sphinx-pre-install in the source tree) Merging v4l-dvb/master (3b6471c7becd media: Staging: media: Release the correct resource in an error handling path) CONFLICT (content): Merge conflict in drivers/media/i2c/cx25840/cx25840-core.c Merging v4l-dvb-next/master (a188339ca5a3 Linux 5.2-rc1) Merging fbdev/fbdev-for-next (73ee89436047 Merge tag 'v5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next) Merging pm/linux-next (ffb9ca91786f Merge branches 'acpi-pm' and 'acpi-tools' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (a02177a39344 dt-bindings: imx-cpufreq-dt: Document opp-supported-hw usage) Merging cpupower/cpupower (21027e78e7c1 cpupower: correct spelling of interval) Merging opp/opp/linux-next (c0ab9e0812da opp: Allocate genpd_virt_devs from dev_pm_opp_attach_genpd()) Merging thermal/next (6df24c3e81b9 Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next) Merging thermal-soc/next (cd6c84d8f0cd Linux 5.2-rc2) Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs) Merging dlm/next (54cca4bad076 dlm: allow binding to all network interfaces) Merging swiotlb/linux-next (063b8271ec8f swiotlb-xen: ensure we have a single callsite for xen_dma_map_page) Merging rdma/for-next (97545b10221a RDMA/hns: Bugfix for posting multiple srq work request) Merging net-next/master (57f041027909 Merge branch 'mscc-ocelot-tc-flower') Merging bpf-next/master (0462eaacee49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) Merging ipsec-next/master (f49aa1de9836 Merge tag 'for-5.2-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging mlx5-next/mlx5-next (8693115af4c2 {IB,net}/mlx5: Constify rep ops functions pointers) Merging netfilter-next/master (29930e314da3 ipvs: add checksum support for gue encapsulation) 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 (ec2e93cf1910 b43: Avoid possible double calls to b43_one_core_detach()) Merging bluetooth/master (62a91990f4c5 Bluetooth: hci_qca: Rename STATE_<flags> to QCA_<flags>) Merging mac80211-next/master (a3ce17d1495b cfg80211: Handle bss expiry during connection) Merging gfs2/for-next (d8e126ba276a gfs2: Clean up freeing struct gfs2_sbd) Merging mtd/mtd/next (a188339ca5a3 Linux 5.2-rc1) Merging nand/nand/next (84db7797ffd3 mtd: rawnand: fsmc: Use nand_op_trace for operation tracing) Merging spi-nor/spi-nor/next (a188339ca5a3 Linux 5.2-rc1) Merging crypto/master (0adb0c99594b dt-bindings: move Atmel ECC508A I2C crypto processor to trivial-devices) CONFLICT (content): Merge conflict in drivers/crypto/talitos.c CONFLICT (modify/delete): crypto/crypto_wq.c deleted in crypto/master and modified in HEAD. Version HEAD of crypto/crypto_wq.c left in tree. $ git rm -f crypto/crypto_wq.c Merging drm/drm-next (91c1ead6aee2 Merge branch 'drm-next-5.3' of git://people.freedesktop.org/~agd5f/linux into drm-next) Merging amdgpu/drm-next (b88039ffc5bb drm/amdgpu: fix a race in GPU reset with IB test (v2)) Merging drm-intel/for-linux-next (d82b4b26218d drm/i915: Report all objects with allocated pages to the shrinker) Merging drm-tegra/drm/tegra/for-next (61b51fb51c01 drm/tegra: gem: Fix CPU-cache maintenance for BO's allocated using get_pages()) Merging drm-misc/for-linux-next (ff5781634c41 drm/bridge: sii902x: Implement HDMI audio support) Merging drm-msm/msm-next (981f2aabeae6 drm/msm/a6xx: Rename a6xx_gmu_probe to a6xx_gmu_init) Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) Merging mali-dp/for-upstream/mali-dp (15e9122d9b5c drm/komeda: Mark the local functions as static) Merging imx-drm/imx-drm/next (5d5fe9970c76 drm/imx: enable IDMAC watermark feature) Merging etnaviv/etnaviv/next (2b76f5be7c27 drm/etnaviv: initialize idle mask before querying the HW db) Merging regmap/for-next (38ee2a8cc70e Merge branch 'regmap-5.2' into regmap-linus) Merging sound/for-next (e046b64b1547 ALSA: hda/ca0132: Use struct_size()) CONFLICT (content): Merge conflict in sound/pci/rme9652/hdspm.c Merging sound-asoc/for-next (c88f19f3078b Merge branch 'asoc-5.3' into asoc-next) Merging modules/modules-next (dadec066d8fa module: add stubs for within_module functions) Merging input/next (b02f6b6b711b Input: tca8418 - remove set but not used variable 'max_keys') CONFLICT (content): Merge conflict in drivers/input/misc/da9063_onkey.c Merging block/for-next (51af912e51dd Merge branch 'io_uring-next' into for-next) Merging device-mapper/for-next (51b86f9a8d1c dm: make sure to obey max_io_len_target_boundary) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) Merging mmc/next (4bacf4d920ee Merge branch 'fixes' into next) CONFLICT (content): Merge conflict in drivers/mmc/host/meson-mx-sdio.c 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 (ed835136ee67 mfd: Use dev_get_drvdata() directly) Merging backlight/for-backlight-next (53fa0f87177d backlight: lm3630a: Add firmware node support) Merging battery/for-next (a188339ca5a3 Linux 5.2-rc1) Merging regulator/for-next (f405b6c10a21 Merge branch 'regulator-5.3' into regulator-next) Merging security/next-testing (5664f5faac11 Merge branch 'next-smack' into next-testing) Merging apparmor/apparmor-next (06c13f554a71 apparmor: re-introduce a variant of PROFILE_MEDIATES_SAFE) Merging integrity/next-integrity (8902b36bab4c ima: prevent a file already mmap'ed write to be mmap'ed execute) Merging selinux/next (beee56f3543a selinux: remove some no-op BUG_ONs) Merging tpmdd/next (ff89e2f4b34d tpm: Actually fail on TPM errors during "get random") Merging watchdog/master (a9f0bda567e3 watchdog: Enforce that at least one pretimeout governor is enabled) Merging iommu/next (a02a28008bf7 Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'generic-dma-ops' and 'core' into next) CONFLICT (content): Merge conflict in drivers/iommu/intel-iommu.c Merging vfio/next (15c80c1659f2 vfio: Add Cornelia Huck as reviewer) Merging audit/next (839d05e41385 audit: remove the BUG() calls in the audit rule comparison functions) Merging devicetree/for-next (b361797f3d0b dt-bindings: vendor: Fix simtek vendor compatible) Merging mailbox/mailbox-for-next (8fbbfd966efa mailbox: Add support for Armada 37xx rWTM mailbox) Merging spi/for-next (0cde1d6bc0a5 Merge remote-tracking branch 'spi/topic/pump-rt' into spi-next) Merging tip/auto-latest (00d8b7582f55 Merge branch 'core/urgent') Merging clockevents/clockevents/next (865ee89aa3bd clocksource/drivers/exynos_mct: Increase priority over ARM arch timer) Applying: Revert "clocksource/drivers/tcb_clksrc: Register delay timer" Merging edac-amd/for-next (8de9930a4618 Revert "EDAC/amd64: Support more than two controllers for chip select handling") Merging irqchip/irq/irqchip-next (4770533f71de irqchip/renesas-irqc: Convert to managed initializations) Merging ftrace/for-next (a124692b698b ftrace: Enable trampoline when rec count returns back to one) Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits) Merging kvm/linux-next (94830f188a80 Merge tag 'kvm-s390-master-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic) Merging kvm-ppc/kvm-ppc-next (4894fbcce856 KVM: PPC: Book3S: Remove useless checks in 'release' method of KVM device) Merging kvms390/next (2ee567d31a58 KVM: selftests: enable pgste option for the linker on s390) Merging xen-tip/linux-next (d10e0cc113c9 xenbus: Avoid deadlock during suspend due to open transactions) Merging percpu/for-next (558ac86039fc Merge branch 'for-5.3' into for-next) Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu) Merging drivers-x86/for-next (ef071bab655b power: supply: olpc_battery: Allow building the driver on non-x86) Merging chrome-platform/for-next (ac5bdfdc0e1c platform/chrome: cros_ec_spi: Request the SPI thread be realtime) Merging hsi/for-next (a188339ca5a3 Linux 5.2-rc1) Merging leds/for-next (1916ebfdfbac leds: max77650: Remove set but not used variable 'parent') Merging ipmi/for-next (2cd0e54489e6 ipmi_ssif: fix unexpected driver unregister warning) Merging driver-core/driver-core-next (cd6c84d8f0cd Linux 5.2-rc2) Merging usb/usb-next (086ebf92aa79 usb: avoid redundant allocation and free of memory) Merging usb-gadget/next (2e487d280525 usb: dwc3: Rename DWC3_DCTL_LPM_ERRATA) Merging usb-serial/usb-next (cd6c84d8f0cd Linux 5.2-rc2) Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity) Merging phy-next/next (6ef72bc036bc phy: qcom: Add Qualcomm PCIe2 PHY driver) Merging tty/tty-next (324e8f5f5d9d tty: cpm_uart: drop unused iflag macro) Merging char-misc/char-misc-next (381e9760ee87 firmware: google: coreboot: Drop unnecessary headers) Merging extcon/extcon-next (fbdc60b2a787 extcon: arizona: Correct error handling on regmap_update_bits_check) Merging soundwire/next (432732b801c8 soundwire: intel_init: add checks on link numbers) Merging thunderbolt/next (cd6c84d8f0cd Linux 5.2-rc2) Merging staging/staging-next (4c1d2fc7d56c staging: mt7621-dma: sizeof via pointer dereference) Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next) Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE) Merging slave-dma/next (7b11ef9653d2 dmaengine: stm32: use to_platform_device()) CONFLICT (content): Merge conflict in drivers/dma/dma-jz4780.c Merging cgroup/for-next (a5e112e6424a cgroup: add cgroup_parse_float()) Merging scsi/for-next (1c5176c3dd8c Merge branch 'misc' into for-next) CONFLICT (content): Merge conflict in include/scsi/scsi_transport_spi.h CONFLICT (content): Merge conflict in include/scsi/scsi_transport_iscsi.h CONFLICT (content): Merge conflict in include/scsi/scsi_transport_fc.h CONFLICT (content): Merge conflict in include/scsi/scsi_transport.h CONFLICT (content): Merge conflict in include/scsi/scsi_bsg_iscsi.h CONFLICT (content): Merge conflict in include/scsi/sas_ata.h CONFLICT (content): Merge conflict in include/scsi/sas.h CONFLICT (content): Merge conflict in include/scsi/libsas.h CONFLICT (content): Merge conflict in include/scsi/libiscsi_tcp.h CONFLICT (content): Merge conflict in include/scsi/libiscsi.h CONFLICT (content): Merge conflict in include/scsi/iscsi_proto.h CONFLICT (content): Merge conflict in include/scsi/iscsi_if.h CONFLICT (content): Merge conflict in drivers/scsi/st.c CONFLICT (content): Merge conflict in drivers/scsi/sr.c CONFLICT (content): Merge conflict in drivers/scsi/sg.c CONFLICT (content): Merge conflict in drivers/scsi/ses.c CONFLICT (content): Merge conflict in drivers/scsi/sd.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_spi.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_sas.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_iscsi.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_fc.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysctl.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_pm.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_lib.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_ioctl.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c CONFLICT (content): Merge conflict in drivers/scsi/scsi.c CONFLICT (modify/delete): drivers/scsi/osst.c deleted in scsi/for-next and modified in HEAD. Version HEAD of drivers/scsi/osst.c left in tree. CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_task.c CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_internal.h CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_init.c CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c CONFLICT (content): Merge conflict in drivers/scsi/libiscsi_tcp.c CONFLICT (content): Merge conflict in drivers/scsi/libiscsi.c CONFLICT (content): Merge conflict in drivers/scsi/hosts.c $ git rm -f drivers/scsi/osst.c Merging scsi-mkp/for-next (f9ee0f083e1f scsi: message: fusion: Use kmemdup instead of memcpy and kmalloc) Merging vhost/linux-next (317e03c88c57 iommu/virtio: Add event queue) Merging rpmsg/for-next (37d3f7e0947c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (73a790c68d7e Merge branch 'devel' into for-next) Merging gpio-brgl/gpio/for-next (2674700c4c0e gpio: max732x: use devm_gpiochip_add_data()) Merging pinctrl/for-next (d62895ee9795 Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) Merging pwm/for-next (f41efceb46e6 pwm: meson: Add clock source configuration for Meson G12A) Merging userns/for-next (a89e9b8abf82 signal: Remove the signal number and task parameters from force_sig_info) CONFLICT (content): Merge conflict in arch/arm64/kernel/traps.c CONFLICT (content): Merge conflict in arch/arc/mm/fault.c 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 (fe48319243a6 selftests/timers: Add missing fflush(stdout) calls) Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI) Merging livepatching/for-next (95def8fe33ed Merge branch 'for-5.2/fixes' into for-next) Merging coresight/next (8f35caae1e1f coresight: acpi: Support for platform devices) Merging rtc/rtc-next (a3094fc1a15e rtc: imx-sc: add rtc alarm support) Merging nvdimm/libnvdimm-for-next (cd6c84d8f0cd Linux 5.2-rc2) Merging at24/at24/for-next (9ae9d9bfb72c eeprom: at24: use struct_size() in devm_kzalloc()) Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files) Merging kspp/for-next/kspp (0ff9848067b7 security/loadpin: Allow to exclude specific file types) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (cd6c84d8f0cd Linux 5.2-rc2) Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) Merging slimbus/for-next (a188339ca5a3 Linux 5.2-rc1) Merging nvmem/for-next (c8d087d040cf nvmem: Broaden the selection of NVMEM_SNVS_LPGPR) Merging xarray/xarray (fa858b6eec3f XArray: Add xas_replace) Merging hyperv/hyperv-next (a3fb7bf369ef drivers: input: serio: Add a module desription to the hyperv_keyboard driver) Merging auxdisplay/auxdisplay (f4cd7203c1d4 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 (08f2abef168d tests: add pidfd_open() tests) CONFLICT (content): Merge conflict in tools/testing/selftests/pidfd/Makefile Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work) Merging akpm-current/current (2863412db4b8 include/linux/lz4.h: fix spelling and copy-paste errors in documentation) CONFLICT (content): Merge conflict in kernel/pid.c CONFLICT (content): Merge conflict in include/linux/pid.h CONFLICT (content): Merge conflict in include/linux/genalloc.h $ git checkout -b akpm remotes/origin/akpm/master Applying: pinctrl: fix pxa2xx.c build warnings Applying: mm/hmm.c: suppress compilation warnings when CONFIG_HUGETLB_PAGE is not set Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Merging akpm/master (fdea2f25d845 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) Applying: Revert "XArray: Add xas_replace"
Attachment:
pgpWNo6oGh7ec.pgp
Description: OpenPGP digital signature
