Hi all, Changes since 20190221: New tree: devfreq The powerpc tree gained conflicts against the dma-mapping tree and a build failure for which I reverted a commit. The nfs-anna tree gained a conflict against the nfs tree. The swiotlb tree gained a conflict against the powerpc tree. The rpmsg tree gained a build failure due to an interaction with the dma-mapping tree for which i applied a merge fix patch. Non-merge commits (relative to Linus' tree): 9472 9717 files changed, 436628 insertions(+), 230618 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 297 trees (counting Linus' and 69 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 (8a61716ff2ab Merge tag 'ceph-for-5.0-rc8' of git://github.com/ceph/ceph-client) Merging fixes/master (ed3ce4cfc919 adfs: mark expected switch fall-throughs) Merging kspp-gustavo/for-next/kspp (6f6c95f09001 ASN.1: mark expected switch fall-through) Merging kbuild-current/fixes (207a369e3c08 sh: fix build error for invisible CONFIG_BUILTIN_DTB_SOURCE) Merging arc-current/for-curr (b6835ea77729 ARC: define ARCH_SLAB_MINALIGN = 8) Merging arm-current/fixes (fc67e6f120a3 ARM: 8835/1: dma-mapping: Clear DMA ops on teardown) Merging arm64-fixes/for-next/fixes (74698f6971f2 arm64: Relax GIC version check during early boot) Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related crashes) Merging powerpc-fixes/fixes (8f5b27347e88 powerpc/powernv/sriov: Register IOMMU groups for VFs) Merging sparc/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (d7cf4a3bf3a8 net/smc: fix smc_poll in SMC_INIT state) Merging bpf/master (11fe9262ed22 Revert "xsk: simplify AF_XDP socket teardown") Merging ipsec/master (660899ddf06a xfrm: Fix inbound traffic via XFRM interfaces across network namespaces) Merging netfilter/master (1765f5dcd009 sky2: Increase D3 delay again) Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects) Merging wireless-drivers/master (d04ca383860b mt76x0u: fix suspend/resume) Merging mac80211/master (83e37e0bdd14 mac80211: Restore vif beacon interval if start ap fails) Merging rdma-fixes/for-rc (f09ef134a7ca iw_cxgb4: cq/qp mask depends on bar2 pages in a host page) Merging sound-current/for-linus (268836649c07 Merge tag 'asoc-fix-v5.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (0cb26f410319 Merge branch 'asoc-5.0' into asoc-linus) Merging regmap-fixes/for-linus (f17b5f06cb92 Linux 5.0-rc4) Merging regulator-fixes/for-linus (6a1fe3419310 Merge branch 'regulator-5.0' into regulator-linus) Merging spi-fixes/for-linus (2d068aef6639 Merge branch 'spi-5.0' into spi-linus) Merging pci-current/for-linus (f57a98e1b713 PCI: Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX)) Merging driver-core.current/driver-core-linus (d13937116f1e Linux 5.0-rc6) Merging tty.current/tty-linus (d13937116f1e Linux 5.0-rc6) Merging usb.current/usb-linus (d13937116f1e Linux 5.0-rc6) Merging usb-gadget-fixes/fixes (a53469a68eb8 usb: phy: am335x: fix race condition in _probe) Merging usb-serial-fixes/usb-linus (8d7fa3d4ea3f USB: serial: ftdi_sio: add ID for Hjelmslund Electronics USB485) Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer) Merging phy/fixes (827cb0323928 phy: ath79-usb: Fix the main reset name to match the DT binding) Merging staging.current/staging-linus (d13937116f1e Linux 5.0-rc6) Merging char-misc.current/char-misc-linus (d13937116f1e Linux 5.0-rc6) Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1) Merging thunderbolt-fixes/fixes (d13937116f1e Linux 5.0-rc6) Merging input-current/for-linus (7ad222b3aed3 Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK) Merging crypto-current/master (1358c13a48c4 crypto: ccree - fix resume race condition on init) Merging ide/master (adf040ddd001 ide: Use of_node_name_eq for node name comparisons) Merging vfio-fixes/for-linus (9a71ac7e15a7 vfio-pci/nvlink2: Fix ancient gcc warnings) Merging kselftest-fixes/fixes (7d4e591bc051 selftests: timers: use LDLIBS instead of LDFLAGS) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (d13937116f1e Linux 5.0-rc6) Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1) Merging mtd-fixes/master (3e35730dd754 mtd: powernv_flash: Fix device registration error) Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) Merging mfd-fixes/for-mfd-fixes (48a2ca0ee399 Revert "mfd: cros_ec: Use devm_kzalloc for private data") Merging v4l-dvb-fixes/fixes (7bdf2c8fee51 media: v4l: ioctl: Sanitize num_planes before using it) Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0) Merging mips-fixes/mips-fixes (74f03104ed46 MIPS: lantiq: pass struct device to DMA API functions) Merging at91-fixes/at91-fixes (bfeffd155283 Linux 5.0-rc1) Merging omap-fixes/fixes (dc30e7039137 ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized) Merging kvm-fixes/master (73de65f5b9de Merge tag 'kvm-s390-master-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master) Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity) Merging hwmon-fixes/hwmon (ff066653aeed hwmon: (pmbus/tps53679) Fix driver info initialization in probe routine) Merging nvdimm-fixes/libnvdimm-fixes (11189c1089da acpi/nfit: Fix command-supported detection) Merging btrfs-fixes/next-fixes (8834f5600cf3 Linux 5.0-rc5) Merging vfs-fixes/fixes (f612acfae86a exec: Fix mem leak in kernel_read_file) Merging dma-mapping-fixes/for-linus (60d8cd572f65 arm64/xen: fix xen-swiotlb cache flushing) Merging i3c-fixes/master (f36c1f9a8dfd i3c: master: dw: fix deadlock) Merging drivers-x86-fixes/fixes (6a730fcb9cb4 Documentation/ABI: Correct mlxreg-io KernelVersion for 5.0) Merging samsung-krzk-fixes/fixes (bfeffd155283 Linux 5.0-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1) Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds) Merging scsi-fixes/fixes (4a067cf823d9 scsi: core: reset host byte in DID_NEXUS_FAILURE case) Merging drm-fixes/drm-fixes (a3b22b9f11d9 Linux 5.0-rc7) Merging drm-intel-fixes/for-linux-next-fixes (d179b88deb3b drm/i915/fbdev: Actually configure untiled displays) Merging mmc-fixes/fixes (83e418a805d8 mmc: meson-gx: fix interrupt name) Merging rtc-fixes/rtc-fixes (bfeffd155283 Linux 5.0-rc1) Merging gnss-fixes/gnss-linus (bfeffd155283 Linux 5.0-rc1) Merging hyperv-fixes/hyperv-fixes (52d3b4949192 hv_netvsc: fix typos in code comments) Merging drm-misc-fixes/for-linux-next-fixes (04b9c4885158 drm/bochs: Fix the ID mismatch error) Merging kbuild/for-next (db16511c00e3 Merge branch 'kconfig' into for-next) Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7) Merging leaks/leaks-next (982ef2f7ef0a leaking_addresses: Completely remove --version flag) Merging dma-mapping/for-next (9eb9e96e97b3 Documentation/DMA-API-HOWTO: update dma_mask sections) Merging asm-generic/master (746c9398f5ac arch: move common mmap flags to linux/mman.h) Merging arc/for-next (8834f5600cf3 Linux 5.0-rc5) Merging arm/for-next (d25495e864b9 Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next) Merging arm64/for-next/core (0543371a57e3 Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux) Merging arm-perf/for-next/perf (cf2d65ec1d21 perf: xgene: Remove set but not used variable 'config') Merging arm-soc/for-next (2a22964b73f1 Merge branch 'arm/drivers' into for-next) Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) Merging amlogic/for-next (a7c5fed5c7e4 Merge branch 'v5.1/drivers' into tmp/aml-rebuild) Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1) Merging at91/at91-next (3850dd7a32a0 Merge branch 'at91-dt' into at91-next) Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next) Merging imx-mxs/for-next (fe0b295f61af Merge branch 'imx/maintainers' into for-next) Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next) Merging mediatek/for-next (d542127adb0c Merge branch 'v5.0-next/soc' into for-next) Merging mvebu/for-next (c51f7f863552 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (af3b69ea03a2 Merge branch 'omap-for-v5.1/cpsw' into for-next) Merging reset/reset/next (dbfc54534dfc dt-bindings: reset: meson: add g12a bindings) Merging qcom/for-next (4d216cf2443b Merge tag 'qcom-drivers-for-5.1-3' into 5.1-final) Merging renesas/next (817697a462a4 Merge branches 'fixes-for-v5.0', 'arm-defconfig-for-v5.1', 'arm-dt-for-v5.1', 'arm-soc-for-v5.1', 'arm64-dt-for-v5.1', 'arm64-defconfig-for-v5.1' and 'dt-bindings-for-v5.1' into next) Merging rockchip/for-next (8444545ff72a Merge branch 'v5.1-clk/next' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (8ecb112edde9 Merge branch 'fixes-late-dt' into for-next) Merging sunxi/sunxi/for-next (1fc3dc289134 Merge remote-tracking branches 'korg/sunxi/sunxi/dt-for-5.1', 'korg/sunxi/sunxi/dt64-for-5.1' and 'korg/sunxi/sunxi/h3-h5-for-5.1' into sunxi/for-next) Merging tegra/for-next (d92dde4f12f1 Merge branch for-5.1/fixes into for-next) Merging clk/clk-next (643979d292da Merge branches 'clk-renesas' and 'clk-imx' into clk-next) Merging clk-samsung/for-next (81faa30df9b6 clk: samsung: exynos5433: Add selected IMEM clocks) 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 (88d5f20a8139 csky: Fixup vdsp&fpu issues in kernel) Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq) Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files) Merging m68k/for-next (28713169d879 m68k: Add -ffreestanding to CFLAGS) Merging m68knommu/for-next (6ce1874de854 m68k: add ColdFire mcf5441x eDMA platform support) Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) Merging mips/mips-next (72faa7a773ca MIPS: irq: Allocate accurate order pages for irq stack) CONFLICT (content): Merge conflict in arch/mips/include/asm/pgtable.h CONFLICT (content): Merge conflict in arch/mips/include/asm/barrier.h Merging nds32/next (bfeffd155283 Linux 5.0-rc1) Merging nios2/for-next (1c286267aedf nios2: 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 (2d0da7c7f5e5 parisc: use memblock_alloc() instead of custom get_memblock()) Merging powerpc/next (5df1cfa43394 powerpc: Move page table dump files in a dedicated subdirectory) CONFLICT (content): Merge conflict in kernel/dma/Kconfig CONFLICT (modify/delete): arch/powerpc/kernel/dma.c deleted in powerpc/next and modified in HEAD. Version HEAD of arch/powerpc/kernel/dma.c left in tree. CONFLICT (content): Merge conflict in arch/powerpc/kernel/dma-swiotlb.c $ git rm -f arch/powerpc/kernel/dma.c Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") 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 (79a47bad61bb riscv: remove the HAVE_KPROBES option) 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 (f1777625c5aa s390/extmem: print DCSS range with %px) Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) Merging uml/linux-next (940b241d9050 um: Remove obsolete reenable_XX calls) Merging xtensa/xtensa-for-next (036ef74b3ecb Merge branch 'xtensa-5.1' into xtensa-for-next) Merging fscrypt/master (f5e55e777cc9 fscrypt: return -EXDEV for incompatible rename or link into encrypted dir) Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) Merging btrfs/next (29dcea88779c Linux 4.17) Merging btrfs-kdave/for-next (8d293bf657b3 Merge branch 'for-next-next-v5.0-20190218' into for-next-20190218) Merging ceph/master (04242ff3ac0a ceph: avoid repeatedly adding inode to mdsc->snap_flush_list) Merging cifs/for-next (a490205caa0a cifs: update internal module version number) Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal) Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file) Merging ext3/for_next (2337494f7c0f Merge udf cleanup.) Merging ext4/dev (bc1d69d6151f ext4: add sysfs attr /sys/fs/ext4/<disk>/journal_task) Merging f2fs/dev (6afbeef75215 f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG) Merging fuse/for-next (fabf7e0262d0 fuse: cache readdir calls if filesystem opts out of opendir) Merging jfs/jfs-next (2e3bc6125154 fs/jfs: Switch to use new generic UUID API) Merging nfs/linux-next (6f9449be53f3 NFS: Fix a soft lockup in the delegation recovery code) Merging nfs-anna/linux-next (7517d01d20e1 NFS: Pass error information to the pgio error cleanup routine) CONFLICT (content): Merge conflict in fs/nfs/pagelist.c Merging nfsd/nfsd-next (b7e5034cbecf svcrpc: fix UDP on servers with lots of threads) Merging orangefs/for-next (6e356d45950e orangefs: remove two un-needed BUG_ONs...) Merging overlayfs/overlayfs-next (993a0b2aec52 ovl: Do not lose security.capability xattr over metadata file copy-up) Merging ubifs/linux-next (e58725d51fa8 ubifs: Handle re-linking of inodes correctly while recovery) Merging v9fs/9p-next (3bbe8b1a4ae9 9p: mark expected switch fall-through) Merging xfs/for-next (081a8ae2a54e xfs: fix uninitialized error variable) Merging file-locks/locks-next (bf77ae4c98d7 locks: fix error in locks_move_blocks()) Merging vfs/for-next (b799a82237a5 Merge branches 'fixes' and 'work.misc' into for-next) CONFLICT (content): Merge conflict in fs/Makefile Merging printk/for-next (cbae05d32ff6 printk: Pass caller information to log_store().) Merging pci/next (1a6ccb159371 Merge branch 'remotes/lorenzo/pci/vmd') Merging pstore/for-next/pstore (93ee4b7d9f06 pstore/ram: Avoid needless alloc during header write) Merging hid/for-next (c81eee9fb58c Merge branch 'for-5.1/hid-uclogic' into for-next) Merging i2c/i2c/for-next (44bfa3e9e2ea Merge branch 'i2c/for-5.1' into i2c/for-next) Merging i3c/i3c/next (25ac3da61ba1 i3c: master: cdns: fix I2C transfers in Cadence I3C master driver) Merging dmi/master (57361846b52b Linux 4.19-rc2) Merging hwmon-staging/hwmon-next (e4e6c0b0ad79 hwmon: (f71882fg) Mark expected switch fall-through) Merging jc_docs/docs-next (e85a198e30e9 perf-security: wrap paragraphs on 72 columns) Merging v4l-dvb/master (9fabe1d108ca media: ipu3-mmu: fix some kernel-doc macros) CONFLICT (modify/delete): drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c left in tree. $ git rm -f drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c Merging v4l-dvb-next/master (9fabe1d108ca media: ipu3-mmu: fix some kernel-doc macros) Merging fbdev/fbdev-for-next (f40298444e8c video: fbdev: Fix potential NULL pointer dereference) Merging pm/linux-next (23b56a58df0a Merge branch 'pm-core-fixes' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (40b46b3b2f09 cpufreq: davinci: move configuration to include/linux/platform_data) Merging cpupower/cpupower (ae2917093fb6 tools/power/cpupower: Display boost frequency separately) Merging opp/opp/linux-next (a9a744dd5b82 cpufreq: OMAP: Register an Energy Model) Merging thermal/next (b537f89a9e4b Merge branches 'fixes' and 'thermal-intel' into next) Merging thermal-soc/next (8834f5600cf3 Linux 5.0-rc5) Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA in case of platform dependency) Merging dlm/next (8526e331c56f dlm: Fix test for -ERESTARTSYS) Merging swiotlb/linux-next (22cb45d7692a swiotlb: drop pointless static qualifier in swiotlb_create_debugfs()) CONFLICT (content): Merge conflict in kernel/dma/swiotlb.c Merging rdma/for-next (d0e02bf6cd6d RDMA/core: Verify that memory window type is legal) Merging net-next/master (2fb44dd0e803 Merge branch 'mlxsw-Support-for-shared-buffers-in-Spectrum-2') CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/ib_rep.c Merging bpf-next/master (e80d02dd7630 seccomp, bpf: disable preemption before calling into bpf prog) Merging ipsec-next/master (590ce401c207 dt-bindings: net: dsa: ksz9477: fix indentation for switch spi bindings) Merging mlx5-next/mlx5-next (37b6bb77c6fd net/mlx5: Factor out HCA capabilities functions) Merging netfilter-next/master (d2cf821ff677 Merge branch 'ieee802154-for-davem-2019-02-19' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next) Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols) Merging wireless-drivers-next/master (5c0c4c854634 Merge tag 'iwlwifi-next-for-kalle-2019-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) Merging bluetooth/master (e0b67035a90b Bluetooth: mediatek: update the common setup between MT7622 and other devices) Merging mac80211-next/master (f440b125450d virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED) Merging gfs2/for-next (2abbf9a4d262 gfs: no need to check return value of debugfs_create functions) Merging mtd/mtd/next (b0dd77a79642 mtd: docg3: fix a possible memory leak of mtd->name) Merging nand/nand/next (53bcbb839438 mtd: rawnand: denali_dt: remove single anonymous clock support) CONFLICT (content): Merge conflict in MAINTAINERS Merging spi-nor/spi-nor/next (225c0eda36bd mtd: spi-nor: Fix wrong abbreviation HWCPAS) Merging crypto/master (cf64e495fe22 crypto: caam - weak key checking for cbc des, 3des) Merging drm/drm-next (a5f2fafece14 Merge https://gitlab.freedesktop.org/drm/msm into drm-next) Merging drm-intel/for-linux-next (24d2727ccc14 drm/i915/selftests: Always free spinner on __sseu_prepare error) Merging drm-tegra/drm/tegra/for-next (ca52507efc03 drm/tegra: vic: Fix implicit function declaration warning) Merging drm-misc/for-linux-next (37406a60fac7 drm: Merge __drm_atomic_helper_disable_all() into drm_atomic_helper_disable_all()) Merging drm-msm/msm-next (860433ed2a55 drm/msm: Truncate the buffer object name if the copy from user failed) Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) Merging mali-dp/for-upstream/mali-dp (dcc9d76b6d83 drm/komeda: Off by one in komeda_fb_get_pixel_addr()) Merging imx-drm/imx-drm/next (e4a2457f459b drm/imx: only send commit done event when all state has been applied) Merging etnaviv/etnaviv/next (9e05352340d3 drm/etnaviv: potential NULL dereference) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (66fb181d6f82 Merge remote-tracking branch 'regmap/topic/irq' into regmap-next) Merging sound/for-next (8bb37a2a4d7c ALSA: hda/realtek: Enable audio jacks of ASUS UX362FA with ALC294) CONFLICT (content): Merge conflict in sound/soc/generic/simple-card.c Merging sound-asoc/for-next (db03f85540e0 Merge branch 'asoc-5.1' into asoc-next) Merging modules/modules-next (93d77e7f1410 ARM: module: Fix function kallsyms on Thumb-2) Merging input/next (44466306ebec Input: ti_am335x_tsc - remove set but not used variable 'tscadc_dev') Merging block/for-next (baa9d88781e8 Merge branch 'for-5.1/block' into for-next) CONFLICT (content): Merge conflict in fs/gfs2/lops.c CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c Merging device-mapper/for-next (80a3ff4cf10e dm: remove noclone bio access from dm_bio_from_per_bio_data()) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) Merging mmc/next (a1b458bca74a mmc: sdhci-xenon: Fixup already marked switch fall-through) 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 (d2d833e0bf2b mfd: mxs-lradc: Mark expected switch fall-through) CONFLICT (content): Merge conflict in drivers/mfd/Kconfig Merging backlight/for-backlight-next (cec2b18832e2 backlight: pwm_bl: Use gpiod_get_value_cansleep() to get initial state) Merging battery/for-next (655ab0bc462d power: reset: at91-reset: add support for sam9x60 SoC) Merging regulator/for-next (34033da668ba Merge branch 'regulator-5.1' into regulator-next) CONFLICT (modify/delete): arch/arm/mach-pxa/raumfeld.c deleted in HEAD and modified in regulator/for-next. Version regulator/for-next of arch/arm/mach-pxa/raumfeld.c left in tree. $ git rm -f arch/arm/mach-pxa/raumfeld.c Merging security/next-testing (db9ed620ddea Merge branch 'next-integrity' into next-testing) Merging apparmor/apparmor-next (df4d55f2e1b8 apparmor: fix double free when unpack of secmark rules fails) Merging integrity/next-integrity (e7fde070f39b evm: Use defined constant for UUID representation) Merging selinux/next (45189a1998e0 selinux: fix avc audit messages) Merging tpmdd/next (5812f97c0a22 tpm: Fix the type of the return value in calc_tpm2_event_size()) Merging watchdog/master (59600d045ff4 dt-bindings: watchdog: renesas-wdt: Document r8a77470 support) Merging iommu/next (f1fc9f79bf1a Merge branches 'arm/msm', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) Merging vfio/next (0cfd027be1d6 vfio_pci: Enable memory accesses before calling pci_map_rom) Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (131d34cb0795 audit: mark expected switch fall-through) Merging devicetree/for-next (fca9a2d382e2 of: mark early_init_dt_alloc_reserved_memory_arch static) CONFLICT (modify/delete): Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt left in tree. $ git rm -f Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt Merging mailbox/mailbox-for-next (d69e11648e48 mailbox: tegra-hsp: Use device-managed registration API) Merging spi/for-next (7c01821bd2e2 Merge branch 'spi-5.1' into spi-next) CONFLICT (modify/delete): arch/mips/ath79/dev-spi.h deleted in HEAD and modified in spi/for-next. Version spi/for-next of arch/mips/ath79/dev-spi.h left in tree. $ git rm -f arch/mips/ath79/dev-spi.h Merging tip/auto-latest (7bb209768006 Merge branch 'perf/core') CONFLICT (content): Merge conflict in kernel/time/timer.c CONFLICT (content): Merge conflict in kernel/time/hrtimer.c CONFLICT (content): Merge conflict in include/uapi/linux/time.h CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl Applying: time: fix up for "y2038: remove struct definition redirects" Merging clockevents/clockevents/next (7cd6dca3600d clocksource/drivers/arch_timer: Workaround for Allwinner A64 timer instability) Merging edac-amd/for-next (7f736599d632 EDAC, altera: Add missing of_node_put()) Merging irqchip/irq/irqchip-next (33517881ede7 irqchip/brcmstb-l2: Use _irqsave locking variants in non-interrupt code) Merging ftrace/for-next (1c347a94ca79 tracing: Comment why cond_snapshot is checked outside of max_lock protection) Merging rcu/rcu/next (e880edadc149 Merge LKMM and RCU) Merging kvm/linux-next (a67794cafbc4 Revert "KVM: Eliminate extra function calls in kvm_get_dirty_log_protect()") CONFLICT (content): Merge conflict in arch/x86/kvm/vmx/vmx.h CONFLICT (content): Merge conflict in arch/x86/kvm/vmx/vmx.c Merging kvm-arm/next (c2be79a0bcf3 KVM: arm/arm64: Remove unused gpa_end variable) CONFLICT (content): Merge conflict in arch/arm/include/asm/kvm_host.h Merging kvm-ppc/kvm-ppc-next (0a0c50f771f5 Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next) Merging kvms390/next (b9fa6d6ee9b8 KVM: s390: fix possible null pointer dereference in pending_irqs()) Merging xen-tip/linux-next (1d988ed46543 x86/xen: dont add memory above max allowed allocation) Merging percpu/for-next (718f6757a29b Merge branch 'for-4.21' into for-next) Merging workqueues/for-next (8bdc6201785d workqueue: fix typo in comment) Merging drivers-x86/for-next (872342527120 platform/x86: dell_rbu: fix lock imbalance in img_update_realloc) Merging chrome-platform/for-next (0d2f2a3da1f2 platform/chrome: wilco_ec: Add RTC driver) Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings) Merging leds/for-next (5ddb0869bfc1 leds: lp55xx: fix null deref on firmware load failure) Merging ipmi/for-next (938923b22250 ipmi_si: Remove hacks for adding a dummy platform devices) Merging driver-core/driver-core-next (a7013ba5a930 driver core: Add missing description of new struct device_link field) Merging usb/usb-next (8a863a608d47 usb: typec: tps6598x: handle block writes separately with plain-I2C adapters) CONFLICT (content): Merge conflict in drivers/phy/marvell/Makefile CONFLICT (content): Merge conflict in drivers/phy/marvell/Kconfig Merging usb-gadget/next (5895d311d28f usb: phy: twl6030-usb: fix possible use-after-free on remove) Merging usb-serial/usb-next (6431866b6707 USB: serial: option: add Telit ME910 ECM composition) Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity) Merging phy-next/next (203d9b11928c phy: qcom-qmp: Add QMP UFS PHY support for msm8998) Merging tty/tty-next (be24c2701859 tty: serial: msm_serial: Remove __init from msm_console_setup()) Merging char-misc/char-misc-next (37fd0b623023 mei: hbm: clean the feature flags on link reset) Merging extcon/extcon-next (3dfed89512d3 extcon: ptn5150: Fix return value check in ptn5150_i2c_probe()) Merging soundwire/next (bfeffd155283 Linux 5.0-rc1) Merging thunderbolt/next (d13937116f1e Linux 5.0-rc6) Merging staging/staging-next (047d4abc4df7 staging: erofs: remove rcu_read_lock() in erofs_try_to_free_cached_page) Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next) Merging icc/icc-next (a3b22b9f11d9 Linux 5.0-rc7) Merging slave-dma/next (95781b704e43 Merge branch 'for-linus' into next) CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c CONFLICT (content): Merge conflict in Documentation/driver-api/dmaengine/client.rst Merging cgroup/for-next (6a613d24effc cpuset: remove unused task_has_mempolicy()) Merging scsi/for-next (6826ef48b99a Merge branch 'misc' into for-next) CONFLICT (content): Merge conflict in include/linux/blkdev.h CONFLICT (modify/delete): fs/exofs/ore_raid.c deleted in scsi/for-next and modified in HEAD. Version HEAD of fs/exofs/ore_raid.c left in tree. CONFLICT (modify/delete): fs/exofs/ore.c deleted in scsi/for-next and modified in HEAD. Version HEAD of fs/exofs/ore.c left in tree. CONFLICT (content): Merge conflict in drivers/scsi/arcmsr/arcmsr_hba.c $ git rm -f fs/exofs/ore.c fs/exofs/ore_raid.c Merging scsi-mkp/for-next (8beb90aaf334 scsi: fcoe: make use of fip_mode enum complete) Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) Merging vhost/linux-next (53cb6e5b4ab4 arch: move common mmap flags to linux/mman.h) CONFLICT (content): Merge conflict in kernel/dma/swiotlb.c Merging rpmsg/for-next (6a4ac1cc9997 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Applying: remoteproc: fix for "dma-mapping: remove the DMA_MEMORY_EXCLUSIVE flag" Merging gpio/for-next (18fadd6abd5a gpio: tqmx86: Set proper output level for direction_output) Merging gpio-brgl/gpio/for-next (2a9e27408e12 gpio: mockup: rework debugfs interface) Merging pinctrl/for-next (dcab77888da9 dt-bindings: pinctrl: Document the i.MX50 IOMUXC binding) Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1) Merging pwm/for-next (7ca17b207127 pwm: imx: Signedness bug in imx_pwm_get_state()) Merging userns/for-next (cf43a757fd49 signal: Restore the stop PTRACE_EVENT_EXIT) Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static) Merging kselftest/next (6d771c60e50f selftests: ir: skip when non-root user runs the test) Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI) Merging livepatching/for-next (b420648f103d Merge branch 'for-5.1-atomic-replace' into for-next) Merging coresight/next (37af13cc74d1 perf record: implement --affinity=node|cpu option) Merging rtc/rtc-next (67075b63cce2 rtc: add AB-RTCMC-32.768kHz-EOZ9 RTC support) Merging nvdimm/libnvdimm-for-next (8a6f7591ddf5 Merge branch 'for-5.0/dax' into libnvdimm-for-next) Merging at24/at24/for-next (950bcbbe3154 eeprom: at24: implement support for 'num-addresses' property) Merging ntb/ntb-next (8af642c76ef5 NTB: ntb_test: Fix bug when counting remote files) Merging kspp/for-next/kspp (ddf89e25fad8 lib: Introduce test_stackinit module) Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging cisco/for-next (84a401a27506 Merge branch 'for-x86' into for-next) CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c Merging gnss/gnss-next (d4584bbfcf2a gnss: add driver for mediatek receivers) Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) Merging slimbus/for-next (81648d8bc222 slimbus: core: add missing spin_lock_init on txn_lock) Merging nvmem/for-next (c86d78c459db nvmem: allow to select i.MX nvmem driver for i.MX 7D) Merging xarray/xarray (4a5c8d898948 XArray: Fix xa_reserve for 2-byte aligned entries) Applying: RDMA/devices: fix up for xa_alloc API change Applying: RDMA/restrack: fix for __xa_alloc() API change Merging hyperv/hyperv-next (27207b76011f vmbus: Switch to use new generic UUID API) Merging auxdisplay/auxdisplay (a3b22b9f11d9 Linux 5.0-rc7) Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops) Merging pidfd/for-next (f67dcc84eb36 selftests: add tests for pidfd_send_signal()) CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl Merging devfreq/for-next (08cacec421f6 PM / devfreq: tegra: remove unneeded variable) Applying: Revert "powerpc: Move page table dump files in a dedicated subdirectory" Merging akpm-current/current (b2a8a71340cc zram: default to lzo-rle instead of lzo) CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile CONFLICT (content): Merge conflict in scripts/gcc-plugins/Kconfig CONFLICT (content): Merge conflict in include/linux/sched.h CONFLICT (content): Merge conflict in include/linux/kernfs.h CONFLICT (content): Merge conflict in include/linux/fs.h $ git checkout -b akpm remotes/origin/akpm/master Applying: pinctrl: fix pxa2xx.c build warnings Applying: scripts/atomic/gen-atomics.sh: don't assume that scripts are executable Applying: mm: create the new vm_fault_t type Applying: x86/mm/fault.c: Convert to use vm_fault_t Applying: mm/hmm: convert to use vm_fault_t Applying: drm/nouveau/dmem: update for struct hmm_devmem_ops member change Applying: MAINTAINERS: fix GTA02 entry and mark as orphan Applying: fs: fs_parser: fix printk format warning Applying: mm: refactor readahead defines in mm.h Applying: mm-refactor-readahead-defines-in-mmh-fix Applying: proc: calculate end pointer for /proc/*/* lookup at compile time Applying: proc: merge fix for proc_pident_lookup() API change Applying: unicore32: stop printing the virtual memory layout Applying: arch/nios2/mm/fault.c: remove duplicate include Applying: include/linux/sched/signal.h: replace `tsk' with `task' Applying: openrisc: prefer memblock APIs returning virtual address Applying: powerpc: use memblock functions returning virtual address Applying: memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_alloc Applying: memblock: drop memblock_alloc_base_nid() Applying: memblock: emphasize that memblock_alloc_range() returns a physical address Applying: memblock: memblock_phys_alloc_try_nid(): don't panic Applying: memblock: memblock_phys_alloc(): don't panic Applying: memblock: drop __memblock_alloc_base() Applying: memblock: drop memblock_alloc_base() Applying: memblock: refactor internal allocation functions Applying: memblock: fix parameter order in memblock_phys_alloc_try_nid() Applying: memblock: make memblock_find_in_range_node() and choose_memblock_flags() static Applying: arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0) Applying: arch: don't memset(0) memory returned by memblock_alloc() Applying: ia64: add checks for the return value of memblock_alloc*() Applying: sparc: add checks for the return value of memblock_alloc*() Applying: mm/percpu: add checks for the return value of memblock_alloc*() Applying: init/main: add checks for the return value of memblock_alloc*() Applying: swiotlb: add checks for the return value of memblock_alloc*() Applying: treewide: add checks for the return value of memblock_alloc*() Applying: mm: sparse: Use '%pa' with 'phys_addr_t' type Applying: memblock: fix format strings for panics after memblock_alloc Applying: mm/sparse: don't panic if the allocation in sparse_buffer_init fails Applying: treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-3-fix Applying: memblock: memblock_alloc_try_nid: don't panic Applying: memblock: drop memblock_alloc_*_nopanic() variants Applying: memblock: remove memblock_{set,clear}_region_flags Applying: memblock: split checks whether a region should be skipped to a helper function Applying: mm: memblock: update comments and kernel-doc Applying: memblock-update-comments-and-kernel-doc-fix Applying: of: fix kmemleak crash caused by imbalance in early memory reservation Applying: mm, memcg: rename ambiguously named memory.stat counters and functions Applying: mm, memcg: consider subtrees in memory.events Applying: openvswitch: convert to kvmalloc Applying: md: convert to kvmalloc Applying: selinux: convert to kvmalloc Applying: Generic radix trees Applying: proc: commit to genradix Applying: sctp: convert to genradix Applying: Drop flex_arrays Applying: include/linux/relay.h: fix percpu annotation in struct rchan Applying: kernel/fork.c: remove duplicated include Applying: samples/mic/mpssd/mpssd.h: remove duplicate header Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Merging akpm/master (c66e6d16ac28 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
Attachment:
pgp7KdhpxiwHG.pgp
Description: OpenPGP digital signature
