Hi all, Changes since 20190320: The amdgpu tree still had its build failure for which I reverted a commit. The scsi tree still had its build failure for which I applied a patch. Non-merge commits (relative to Linus' tree): 2187 1820 files changed, 61493 insertions(+), 30479 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 299 trees (counting Linus' and 70 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 (54c490164523 Merge tag 'arc-5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc) Merging fixes/master (b352face4ca9 adfs: mark expected switch fall-throughs) Merging kspp-gustavo/for-next/kspp (1f7ae812f87e x86/syscalls: Mark expected switch fall-throughs) Merging kbuild-current/fixes (9e98c678c2d6 Linux 5.1-rc1) Merging arc-current/for-curr (9a18b5a412ba arch: arc: Kconfig: pedantic formatting) Merging arm-current/fixes (d410a8a49e3e ARM: 8849/1: NOMMU: Fix encodings for PMSAv8's PRBAR4/PRLAR4) Merging arm64-fixes/for-next/fixes (e5a5af771861 arm64: remove obsolete selection of MULTI_IRQ_HANDLER) Merging m68k-current/for-linus (28713169d879 m68k: Add -ffreestanding to CFLAGS) Merging powerpc-fixes/fixes (4622a2d43101 powerpc/6xx: fix setup and use of SPRN_SPRG_PGDIR for hash32) Merging sparc/master (7d762d69145a afs: Fix manually set volume location server list) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (cb8075d934ec Merge branch 'ks8851-fixes') Merging bpf/master (f01a7dbe98ae bpf: Try harder when allocating memory for large maps) Merging ipsec/master (bfc01ddff2b0 Revert "net: xfrm: Add '_rcu' tag for rcu protected pointer in netns_xfrm") Merging netfilter/master (b25a31bf0ca0 netfilter: nf_tables: add missing ->release_ops() in error path of newrule()) Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects) Merging wireless-drivers/master (7dfc45e6282a mt76x02: do not enable RTS/CTS by default) Merging mac80211/master (d235c48b40d3 net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X) Merging rdma-fixes/for-rc (ec4fe4bcc584 i40iw: Avoid panic when handling the inetdev event) Merging sound-current/for-linus (b5a236c175b0 ALSA: hda - Enforces runtime_resume after S3 and S4 for each codec) Merging sound-asoc-fixes/for-linus (c47255b61129 ASoC: stm32: dfsdm: fix debugfs warnings on entry creation) Merging regmap-fixes/for-linus (9e98c678c2d6 Linux 5.1-rc1) Merging regulator-fixes/for-linus (0bf41b432655 Merge branch 'regulator-5.1' into regulator-linus) Merging spi-fixes/for-linus (2bfce67d9a07 Merge branch 'spi-5.1' into spi-linus) Merging pci-current/for-linus (9e98c678c2d6 Linux 5.1-rc1) Merging driver-core.current/driver-core-linus (cd1b772d4881 driver core: remove BUS_ATTR()) Merging tty.current/tty-linus (93bcefd4c6ba serial: sh-sci: Fix setting SCSCR_TIE while transferring data) Merging usb.current/usb-linus (22feda47b574 usb: usb251xb: Remove unnecessary comparison of unsigned integer with >= 0) Merging usb-gadget-fixes/fixes (a53469a68eb8 usb: phy: am335x: fix race condition in _probe) Merging usb-serial-fixes/usb-linus (2908b076f519 USB: serial: mos7720: fix mos_parport refcount imbalance on error path) Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer) Merging phy/fixes (9e98c678c2d6 Linux 5.1-rc1) Merging staging.current/staging-linus (90cd9bed5adb staging, mt7621-pci: fix build without pci support) Merging char-misc.current/char-misc-linus (9e98c678c2d6 Linux 5.1-rc1) Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1) Merging thunderbolt-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) Merging input-current/for-linus (44fc95e218a0 Input: wacom_serial4 - add support for Wacom ArtPad II tablet) Merging crypto-current/master (00e87449430d crypto: caam - add missing put_device() call) Merging ide/master (dc5c37736d16 drivers: ide: Kconfig: pedantic formatting) Merging vfio-fixes/for-linus (9a71ac7e15a7 vfio-pci/nvlink2: Fix ancient gcc warnings) Merging kselftest-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) 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 (9e98c678c2d6 Linux 5.1-rc1) Merging reset-fixes/reset/fixes (8ec49035c8a6 dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets) Merging mips-fixes/mips-fixes (f6cab793d4a7 MIPS: Remove custom MIPS32 __kernel_fsid_t type) 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 (de3ccd26fafc KVM: MMU: record maximum physical address width in kvm_mmu_extended_role) Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity) Merging hwmon-fixes/hwmon (b93334a50b3c hwmon: (ntc_thermistor) Fix temperature type reporting) Merging nvdimm-fixes/libnvdimm-fixes (11189c1089da acpi/nfit: Fix command-supported detection) Merging btrfs-fixes/next-fixes (fb7d5dc911b1 Merge branch 'misc-5.1' into next-fixes) Merging vfs-fixes/fixes (d3d6a18d7d35 aio: Fix locking in aio_poll()) 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 (9e98c678c2d6 Linux 5.1-rc1) Merging samsung-krzk-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (9e98c678c2d6 Linux 5.1-rc1) Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds) Merging scsi-fixes/fixes (ac444b4f0ace scsi: qla2xxx: Fix NULL pointer crash due to stale CPUID) Merging drm-fixes/drm-fixes (9e98c678c2d6 Linux 5.1-rc1) Merging amdgpu-fixes/drm-fixes (f7b1844bacec drm/amdgpu: Update gc golden setting for vega family) Merging drm-intel-fixes/for-linux-next-fixes (000c4f90e3f0 drm/i915: Sanity check mmap length against object size) Merging mmc-fixes/fixes (9ce58dd7d9da mmc: davinci: remove extraneous __init annotation) Merging rtc-fixes/rtc-fixes (15d82d224987 rtc: sh: Fix invalid alarm warning for non-enabled alarm) Merging gnss-fixes/gnss-linus (9e98c678c2d6 Linux 5.1-rc1) Merging hyperv-fixes/hyperv-fixes (bfeffd155283 Linux 5.0-rc1) Merging drm-misc-fixes/for-linux-next-fixes (e9abc611a941 drm/rockchip: vop: reset scale mode when win is disabled) Merging kbuild/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7) Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) Merging dma-mapping/for-next (9eb9e96e97b3 Documentation/DMA-API-HOWTO: update dma_mask sections) Merging asm-generic/master (d724444ab97d asm-generic/page.h: fix typo in #error text requiring a real asm/page.h) Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8) Merging arm/for-next (4c2741ac5e10 Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next) Merging arm64/for-next/core (b855b58ac1b7 arm64: mmu: drop paging_init comments) Merging arm-perf/for-next/perf (cf2d65ec1d21 perf: xgene: Remove set but not used variable 'config') Merging arm-soc/for-next (48d1dbf3918f arm-soc: document merges) 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 (e37c380254ef Merge branch 'v5.2/drivers' into tmp/aml-rebuild) Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1) Merging at91/at91-next (69dd6b9f7d58 Merge branches 'at91-soc' and 'at91-dt' into at91-next) Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next) Merging imx-mxs/for-next (9a830227f26b Merge branch 'imx/defconfig' 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 (22815f1825e4 reset: Add acquire/release support for arrays) Merging qcom/for-next (75920dd0498d Merge tag 'qcom-fixes-for-5.0-rc8' into doof) Merging renesas/next (647bcd505199 Merge branches 'arm-dt-for-v5.2', 'arm-soc-for-v5.2', 'arm64-defconfig-for-v5.2', 'arm64-dt-for-v5.2', 'drivers-for-v5.2' and 'dt-bindings-for-v5.2' into next) Merging rockchip/for-next (6a8281008f61 Merge branch 'v5.1-armsoc/dts-fixes' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (b21eea8bbcc3 Merge branch 'next/dt64' into for-next) Merging sunxi/sunxi/for-next (fb41e7f98110 Merge branch 'sunxi/dt64-for-5.2' into sunxi/for-next) Merging tegra/for-next (d92dde4f12f1 Merge branch for-5.1/fixes into for-next) Merging clk/clk-next (1772ee64946d Merge branch 'clk-fixes' 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 (9e98c678c2d6 Linux 5.1-rc1) Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) Merging mips/mips-next (371a415153be arch: mips: Kconfig: pedantic formatting) Merging nds32/next (4e8fa54d3d99 nds32: fix semicolon code style issue) 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 (4433887f3cd2 Revert: parisc: Use F_EXTEND() macro in iosapic code) Merging powerpc/next (de3c83c2fd2b powerpc/64s: Include <asm/nmi.h> header file to fix a warning) 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 (13fd5de06514 RISC-V: Fixmap support and MM cleanups) 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 (152e9b8676c6 s390/vtime: steal time exponential moving average) 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 (aea05eb56e47 um: Fix for a possible OOPS in ubd initialization) Merging xtensa/xtensa-for-next (036ef74b3ecb Merge branch 'xtensa-5.1' into xtensa-for-next) Merging fscrypt/master (129ca2d2a83f MAINTAINERS: add Eric Biggers as an fscrypt maintainer) 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 (836b12f8c30d Merge branch 'for-next-next-v5.0-20190228' into for-next-20190228) CONFLICT (content): Merge conflict in fs/btrfs/transaction.c Merging ceph/master (9d4a227f6ef1 rbd: drop wait_for_latest_osdmap()) Merging cifs/for-next (643b07d8a67a fix incorrect error code mapping for OBJECTID_NOT_FOUND) 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 (b0ad51173b3d Pull udf truncate fix.) Merging ext4/dev (6c7328400e04 ext4: report real fs size after failed resize) Merging f2fs/dev (aff7b628ac2d f2fs: set pin_file under CAP_SYS_ADMIN) 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 (9e98c678c2d6 Linux 5.1-rc1) Merging nfs-anna/linux-next (a3b22b9f11d9 Linux 5.0-rc7) Merging nfsd/nfsd-next (f875a792abe9 nfsd: allow nfsv3 readdir request to be larger.) 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 (5578e48e5c0b ubi: wl: Silence uninitialized variable warning) Merging v9fs/9p-next (bb06c388fa20 9p/net: fix memory leak in p9_client_create) Merging xfs/for-next (6ef50fe9afae xfs: clean up xfs_dir2_leaf_addname) Merging file-locks/locks-next (bf77ae4c98d7 locks: fix error in locks_move_blocks()) Merging vfs/for-next (c0abe5af7341 Merge branches 'work.mount', 'work.misc' and 'work.iov_iter' into for-next) Merging printk/for-next (943ca6ad81e5 printk/docs: Add extra integer types to printk-formats) Merging pci/next (9e98c678c2d6 Linux 5.1-rc1) Merging pstore/for-next/pstore (93ee4b7d9f06 pstore/ram: Avoid needless alloc during header write) Merging hid/for-next (53be96ab821a Merge branch 'for-5.1/upstream-fixes' into for-next) Merging i2c/i2c/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging i3c/i3c/next (988bb4a1937b i3c: master: dw-i3c-master: mark expected switch fall-through) Merging dmi/master (57361846b52b Linux 4.19-rc2) Merging hwmon-staging/hwmon-next (c6450aa8220c hwmon: (mlxreg-fan) Add support for fan capability registers) Merging jc_docs/docs-next (9834857754ff doc:it_IT: translations for documents in process/) Merging v4l-dvb/master (8a3946cad244 media: v4l2-fwnode: Add a deprecation note in the old ACPI parsing example) Merging v4l-dvb-next/master (81527254e151 media: seco: depend on CONFIG_RC_CORE=y when not a module) Merging fbdev/fbdev-for-next (9a9f1d1a81a9 fbdev: mbx: fix a misspelled variable name) Merging pm/linux-next (9e98c678c2d6 Linux 5.1-rc1) Merging cpufreq-arm/cpufreq/arm/linux-next (0334906c0696 cpufreq: kryo: Release OPP tables on module removal) 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 (2d7c4e17811f Merge branches 'fixes' and 'thermal-intel' into next) Merging thermal-soc/next (8834f5600cf3 Linux 5.0-rc5) Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs) Merging dlm/next (8526e331c56f dlm: Fix test for -ERESTARTSYS) Merging swiotlb/linux-next (22cb45d7692a swiotlb: drop pointless static qualifier in swiotlb_create_debugfs()) Merging rdma/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging net-next/master (a534ea30e70f net: isdn: Make isdn_ppp_mp_discard and isdn_ppp_mp_reassembly static) Merging bpf-next/master (a0cfa79f8470 ibmveth: Make array ibmveth_stats static) 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 (8c4238df4d0c Merge branch 'mlxsw-minimal-Add-ethtool-and-resource-query-support') 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 (501faf710230 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging bluetooth/master (bbcece3d418c Bluetooth: mediatek: Fixed incorrect type in assignment) Merging mac80211-next/master (be9cefe796f3 selftests: rtnetlink: use internal netns switch for ip commands) Merging gfs2/for-next (d86dbd82b9a0 gfs2: Fix loop in gfs2_rbm_find (v2)) Merging mtd/mtd/next (9220d7befc9c Merge tag 'nand/for-5.1' of git://git.infradead.org/linux-mtd into mtd/next) Merging nand/nand/next (53bcbb839438 mtd: rawnand: denali_dt: remove single anonymous clock support) Merging spi-nor/spi-nor/next (225c0eda36bd mtd: spi-nor: Fix wrong abbreviation HWCPAS) Merging crypto/master (0918f18c7179 crypto: s5p - add AES support for Exynos5433) Merging drm/drm-next (9e98c678c2d6 Linux 5.1-rc1) Merging amdgpu/drm-next (efb399511304 drm/amdgpu: revert "cleanup setting bulk_movable") CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c Applying: Revert "drm/amd/display: On DCN1, Wait for vupdate on cursor updates" Merging drm-intel/for-linux-next (159367bb9e74 drm/i915: always use masks on FW regs) Merging drm-tegra/drm/tegra/for-next (ca52507efc03 drm/tegra: vic: Fix implicit function declaration warning) Merging drm-misc/for-linux-next (34965a52dcf9 drm/selftests/mm: Switch to bitmap_zalloc()) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_hdmi.c Merging drm-msm/msm-next (745b19d74716 drm/msm/dpu: check split role for single flush) Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) Merging mali-dp/for-upstream/mali-dp (b4a650fb0d72 drm/komeda: Add debugfs node "register" for register dump) Merging imx-drm/imx-drm/next (a0ea4ffff266 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 (cc6a8d69ba62 regmap: debugfs: Jump to the next readable register) Merging sound/for-next (cc4f8e91c4ed ALSA: firewire-lib: use 8 byte header for IR context to get isochronous cycle) Merging sound-asoc/for-next (3f03c617ce87 Merge branch 'asoc-5.2' into asoc-next) Merging modules/modules-next (9672e2cb0fbd vmlinux.lds.h: drop unused __vermagic) Merging input/next (6d3a41ab0c37 Input: edt-ft5x06 - convert to use SPDX identifier) Merging block/for-next (602d674ce90f nvme-tcp: support C2HData with SUCCESS flag) Merging device-mapper/for-next (225557446856 dm integrity: limit the rate of error messages) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) Merging mmc/next (19f4f021ac04 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 (d2d833e0bf2b mfd: mxs-lradc: Mark expected switch fall-through) 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 (9fbb5d5db8a8 Merge branch 'regulator-5.2' into regulator-next) Merging security/next-testing (3963bdb87e66 Merge branch 'next-general' into next-testing) Merging apparmor/apparmor-next (6c07c1c74394 apparmor: fix blob compression when ns is forced on a policy load) Merging integrity/next-integrity (e7fde070f39b evm: Use defined constant for UUID representation) Merging selinux/next (ccd19d4cafaa scripts/selinux: fix build) Merging tpmdd/next (5812f97c0a22 tpm: Fix the type of the return value in calc_tpm2_event_size()) Merging watchdog/master (458c8961c194 watchdog: w83877f_wdt: Mark expected switch fall-through) Merging iommu/next (1150bc31ffe6 Merge branches 'iommu/fixes' and 'x86/vt-d' 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 (95e0b46fcebd audit: fix a memleak caused by auditing load module) Merging devicetree/for-next (935665c1a117 of: unittest: unflatten device tree on UML when testing) Merging mailbox/mailbox-for-next (17b860bbfc84 mailbox: imx: keep MU irq working during suspend/resume) Merging spi/for-next (7cd00457dba4 Merge branch 'spi-5.2' into spi-next) Merging tip/auto-latest (796a7fd73cd9 Merge branch 'x86/cpu') Merging clockevents/clockevents/next (dbfc6db7ba46 soc/tegra: default select TEGRA_TIMER for Tegra210) Merging edac-amd/for-next (580b5cf50ca8 EDAC/altera: Add separate SDRAM EDAC config) Merging irqchip/irq/irqchip-next (3ae764ada68e irqchip/mbigen: Don't clear eventid when freeing an MSI) Merging ftrace/for-next (85f726a35e50 tracing: Use strncpy instead of memcpy when copying comm in trace.c) Merging rcu/rcu/next (e880edadc149 Merge LKMM and RCU) Merging kvm/linux-next (4a605bc08e98 kvm: vmx: fix formatting of a comment) Merging kvm-arm/next (c88b093693cc arm64: KVM: Fix architecturally invalid reset value for FPEXC32_EL2) Merging kvm-ppc/kvm-ppc-next (2b57ecd0208f KVM: PPC: Book3S: Add count cache flush parameters to kvmppc_get_cpu_char()) Merging kvms390/next (11ba5961a215 KVM: s390: add debug logging for cpu model subfunctions) Merging xen-tip/linux-next (0266def91377 xen/balloon: Fix mapping PG_offline pages to user space) Merging percpu/for-next (d33d9f3dd96b percpu: use chunk scan_hint to skip some scanning) Merging workqueues/for-next (8194fe94ab08 kernel/workqueue: Document wq_worker_last_func() argument) Merging drivers-x86/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging chrome-platform/for-next (9309d60c0274 Merge tag 'tag-chrome-platform-fixes-for-v5.1-rc2' into chrome-platform-5.2) Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings) Merging leds/for-next (d016843fd39c leds: pca955x: Revert "Add ACPI support") Merging ipmi/for-next (487ecb21fa66 ipmi: fix sleep-in-atomic in free_user at cleanup SRCU user->release_barrier) Merging driver-core/driver-core-next (9e98c678c2d6 Linux 5.1-rc1) Merging usb/usb-next (bb31b352510b usb: typec: fusb302: Add __printf attribute to fusb302_log function) Merging usb-gadget/next (5895d311d28f usb: phy: twl6030-usb: fix possible use-after-free on remove) Merging usb-serial/usb-next (9e98c678c2d6 Linux 5.1-rc1) Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity) Merging phy-next/next (b8998e928030 phy: tegra: xusb: Add Tegra186 support) Merging tty/tty-next (9e98c678c2d6 Linux 5.1-rc1) Merging char-misc/char-misc-next (9e98c678c2d6 Linux 5.1-rc1) Merging extcon/extcon-next (97faf3b90ee3 extcon: Fix build warning for extcon_unregister_notifier comment) Merging soundwire/next (bfeffd155283 Linux 5.0-rc1) Merging thunderbolt/next (9c6601f889f3 thunderbolt: Fix to check for kmemdup failure) Merging staging/staging-next (ac22353f803b staging: rtl8188eu: remove unused WFD defines) Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next) Merging icc/icc-next (fcf9d0b7d2f5 drm/msm/a6xx: Add support for an interconnect path) Merging slave-dma/next (9e98c678c2d6 Linux 5.1-rc1) Merging cgroup/for-next (0fcc4c8c044e device_cgroup: fix RCU imbalance in error case) Merging scsi/for-next (d9e2ec4af09a Merge branch 'misc' into for-next) Applying: scsi: lpfc: remove inappropriate inline Merging scsi-mkp/for-next (7512ddef6307 scsi: mvumi: Stop using plain integer as NULL pointer) 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 (3fbdb54c7d5a arch: move common mmap flags to linux/mman.h) CONFLICT (content): Merge conflict in drivers/iommu/Makefile CONFLICT (content): Merge conflict in drivers/iommu/Kconfig Merging rpmsg/for-next (6e9b4f32f9fa Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gpio-brgl/gpio/for-next (2e35bb6cd421 gpio: vf610: Don't use explicit &pdev->dev in vf610_gpio_probe()) Merging pinctrl/for-next (9bc8fee96e9a pinctrl: imx: fix scu link errors) Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging pwm/for-next (d7d96312fe10 pwm: atmel: Remove useless symbolic definitions) 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 (9e98c678c2d6 Linux 5.1-rc1) 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 (0b7ba42535b7 coresight: catu: fix clang build warning) Merging rtc/rtc-next (ba1afcd68cd2 rtc: x1205: Add DT probing support) Merging nvdimm/libnvdimm-for-next (1ffc664f9b8c Merge branch 'for-5.1/dax' into libnvdimm-for-next) CONFLICT (content): Merge conflict in fs/dax.c Merging at24/at24/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging ntb/ntb-next (a04f317072c9 NTB: ntb_test: Fix bug when counting remote files) Merging kspp/for-next/kspp (50ceaa95ea09 lib: Introduce test_stackinit module) Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (9e98c678c2d6 Linux 5.1-rc1) Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) Merging slimbus/for-next (80471330ec58 slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register) Merging nvmem/for-next (6b37a3af354e nvmem: core: add nvmem_cell_read_u16) Merging xarray/xarray (dd12805ed1db XArray: Remove radix tree compatibility) Merging hyperv/hyperv-next (396ae57ef1ef Drivers: hv: vmbus: Expose counters for interrupts and full conditions) Merging auxdisplay/auxdisplay (cc5d04d840d6 auxdisplay: charlcd: make backlight initial state configurable) Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops) Merging pidfd/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging devfreq/for-next (ca740a8f3e7f PM / devfreq: Fix static checker warning in try_then_request_governor) Merging akpm-current/current (90dcc77f765a ipc: do cyclic id allocation with ipcmni_extend mode) $ 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: fs: fs_parser: fix printk format warning Applying: include/linux/sched/signal.h: replace `tsk' with `task' Applying: mm, memcg: rename ambiguously named memory.stat counters and functions Applying: mm, memcg: consider subtrees in memory.events Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Merging akpm/master (8a8a883f3e54 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
Attachment:
pgphi5gpC7S1W.pgp
Description: OpenPGP digital signature
