Hi all, Changes since 20190415: The netfilter tree lost its build failure. The netfilter-next tree lost its build failure. The drm tree still had its build failure for which I disabled a driver. The drm-misc tree lost its build failure. The tpmdd tree gained a build failure so I used the version from next-20190415. Non-merge commits (relative to Linus' tree): 6960 6831 files changed, 238088 insertions(+), 117871 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 298 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 (dc4060a5dc25 Linux 5.1-rc5) Merging fixes/master (15ade5d2e777 Linux 5.1-rc4) Merging kspp-gustavo/for-next/kspp (322b38ce3dd6 drm/nouveau/nvkm: mark expected switch fall-throughs) Merging kbuild-current/fixes (79a3aaa7b82e Linux 5.1-rc3) Merging arc-current/for-curr (55c0c4c793b5 ARC: memset: fix build with L1_CACHE_SHIFT != 6) Merging arm-current/fixes (d410a8a49e3e ARM: 8849/1: NOMMU: Fix encodings for PMSAv8's PRBAR4/PRLAR4) Merging arm64-fixes/for-next/fixes (045afc24124d arm64: futex: Fix FUTEX_WAKE_OP atomic ops with non-zero result value) Merging m68k-current/for-linus (28713169d879 m68k: Add -ffreestanding to CFLAGS) Merging powerpc-fixes/fixes (cf7cf6977f53 powerpc/mm: Define MAX_PHYSMEM_BITS for all 64-bit configs) 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 (9c69a1320515 route: Avoid crash from dereferencing NULL rt->from) Merging bpf/master (ad40ddd4cef4 MIPS: eBPF: Make ebpf_to_mips_reg() static) Merging ipsec/master (8742dc86d0c7 xfrm4: Fix uninitialized memory read in _decode_session4) Merging netfilter/master (5bdac418f33f netfilter: nat: fix icmp id randomization) Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects) Merging wireless-drivers/master (832bc250d71f Merge tag 'iwlwifi-for-kalle-2019-04-03' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging mac80211/master (e9f33a8fee53 mac80211: fix RX STBC override byte order) Merging rdma-fixes/for-rc (d737b25b1ae0 IB/hfi1: Do not flush send queue in the TID RDMA second leg) Merging sound-current/for-linus (183ab39eb0ea ALSA: hda: Initialize power_state field properly) Merging sound-asoc-fixes/for-linus (dc4060a5dc25 Linux 5.1-rc5) Merging regmap-fixes/for-linus (dc1546f108cf Merge branch 'regmap-5.1' into regmap-linus) Merging regulator-fixes/for-linus (ec7794925c33 Merge branch 'regulator-5.1' into regulator-linus) Merging spi-fixes/for-linus (994d57e7e533 Merge branch 'spi-5.1' into spi-linus) Merging pci-current/for-linus (d5bc73f34cc9 PCI: Fix issue with "pci=disable_acs_redir" parameter being ignored) Merging driver-core.current/driver-core-linus (79a3aaa7b82e Linux 5.1-rc3) Merging tty.current/tty-linus (79a3aaa7b82e Linux 5.1-rc3) Merging usb.current/usb-linus (79a3aaa7b82e Linux 5.1-rc3) Merging usb-gadget-fixes/fixes (072684e8c58d USB: gadget: f_hid: fix deadlock in f_hidg_write()) Merging usb-serial-fixes/usb-linus (79a3aaa7b82e Linux 5.1-rc3) Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer) Merging phy/fixes (d5d60c3f25ab phy: fix platform_no_drv_owner.cocci warnings) Merging staging.current/staging-linus (131ac62253db staging: most: core: use device description as name) Merging char-misc.current/char-misc-linus (2aae471d66c1 drivers: power: supply: goldfish_battery: Fix bogus SPDX identifier) Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1) Merging thunderbolt-fixes/fixes (dc4060a5dc25 Linux 5.1-rc5) Merging input-current/for-linus (bf2a7ca39fd3 Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ) Merging crypto-current/master (678cce4019d7 crypto: x86/poly1305 - fix overflow during partial reduction) Merging ide/master (dc5c37736d16 drivers: ide: Kconfig: pedantic formatting) Merging vfio-fixes/for-linus (492855939bdb vfio/type1: Limit DMA mappings per container) Merging kselftest-fixes/fixes (15ade5d2e777 Linux 5.1-rc4) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (79a3aaa7b82e Linux 5.1-rc3) Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1) Merging mtd-fixes/mtd/fixes (d9b8a67b3b95 mtd: cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer) Merging mfd-fixes/for-mfd-fixes (a05a2e7998ab mfd: sun6i-prcm: Allow to compile with COMPILE_TEST) Merging v4l-dvb-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) Merging reset-fixes/reset/fixes (13e8a05b9224 reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev) Merging mips-fixes/mips-fixes (79b4a9cf0e2e MIPS: scall64-o32: Fix indirect syscall number load) Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak) Merging omap-fixes/fixes (81717283cf2c Merge commit '7d56bedb2730dc2ea8abf0fd7240ee99ecfee3c9' into omap-for-v5.1/fixes) Merging kvm-fixes/master (c73f4c998e1f KVM: x86: nVMX: fix x2APIC VTPR read intercept) Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity) Merging hwmon-fixes/hwmon (34fdbe5544c7 hwmon: (pwm-fan) Disable PWM if fetching cooling data fails) Merging nvdimm-fixes/libnvdimm-fixes (a7de824d947a Merge branch 'for-5.1/dax' into libnvdimm-for-next) Merging btrfs-fixes/next-fixes (55a74492ebf1 Merge branch 'misc-5.1' into next-fixes) Merging vfs-fixes/fixes (f51dcd0f621c apparmorfs: fix use-after-free on symlink traversal) 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 (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 (5c2442fd7899 scsi: csiostor: fix missing data copy in csio_scsi_err_handler()) Merging drm-fixes/drm-fixes (dc4060a5dc25 Linux 5.1-rc5) Merging amdgpu-fixes/drm-fixes (f7b1844bacec drm/amdgpu: Update gc golden setting for vega family) Merging drm-intel-fixes/for-linux-next-fixes (3f5f5d534bd4 Merge tag 'gvt-fixes-2019-04-11' of https://github.com/intel/gvt-linux into drm-intel-fixes) Merging mmc-fixes/fixes (dc4060a5dc25 Linux 5.1-rc5) Merging rtc-fixes/rtc-fixes (882c5e552ffd rtc: da9063: set uie_unsupported when relevant) Merging gnss-fixes/gnss-linus (79a3aaa7b82e Linux 5.1-rc3) Merging hyperv-fixes/hyperv-fixes (a0033bd1eae4 Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup()) Merging drm-misc-fixes/for-linux-next-fixes (d15d9fd02575 drm: bridge: dw-hdmi: Fix overflow workaround for Rockchip SoCs) Merging kbuild/for-next (c3236fb5a5fc Merge branch 'kconfig' into for-next) Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7) Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) Merging dma-mapping/for-next (e43e2657fe77 x86/dma: Remove the x86_dma_fallback_dev hack) Merging asm-generic/master (39036cd27273 arch: add pidfd and io_uring syscalls everywhere) 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 (c166adf6ef2c Merge remote-tracking branch 'arm64/for-next/mmiowb' into aarch64/for-next/core) Merging arm-perf/for-next/perf (3d659e7d6513 arm64: perf_event: Remove wrongfully used inline) Merging arm-soc/for-next (81b901d9009a ARM: 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 (09466d997703 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 (11c0dbdbf11b Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) CONFLICT (content): Merge conflict in arch/arm/mach-at91/pm.c Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next) Merging imx-mxs/for-next (c42a3b7bd776 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 (37c2eadde68d Merge branch 'omap-for-v5.2/dt-am3' into for-next) Merging reset/reset/next (d005aa750c9b reset: fix linux/reset.h errors) Merging qcom/for-next (52669757a5ac Merge branch 'drivers-for-5.2' into all-for-5.2) Merging renesas/next (1b4daf1a0893 Merge branch 'arm64-dt-for-v5.2' into next) Merging rockchip/for-next (ea1f8feb26d3 Merge branch 'v5.2-clk/next' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (0b428d14b485 Merge branch 'next/soc' into for-next) Merging sunxi/sunxi/for-next (202fcc634b84 Merge branches 'sunxi/dt-for-5.2', 'sunxi/dt64-for-5.2' and 'sunxi/h3-h5-for-5.2' into sunxi/for-next) Merging tegra/for-next (08746b5db23d Merge branch for-5.2/arm64/defconfig into for-next) Merging clk/clk-next (21eb35a1ae4d Merge commit 'tags/clk-fixes-for-linus^0' into clk-next) Merging clk-samsung/for-next (3c297d9e65d8 clk: samsung: exynos5410: Add gate clock for ADC) 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 (aadf615fe15f csky: Support vmlinux bootup with MMU off) 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 (733df11cfc36 m68k: defconfig: Update defconfigs for v5.1-rc1) Merging m68knommu/for-next (dc4060a5dc25 Linux 5.1-rc5) Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) Merging mips/mips-next (16b22f85bca2 Revert "MIPS: ralink: fix cpu clock of mt7621 and add dt clk devices") 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 (da1c1c649745 parisc: Use ldcw instruction for SMP spinlock release barrier) Merging powerpc/next (8c2ffd917477 Linux 5.1-rc2) 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 (15ade5d2e777 Linux 5.1-rc4) 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 (913140e22156 s390: zcrypt: initialize variables before_use) 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 (a26a70426e9b Merge branch 'xtensa-5.1-fixes' 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 (d0d85ba55d62 Merge branch 'for-next-stale-20190328' into for-next-20190328) CONFLICT (content): Merge conflict in fs/btrfs/props.c Merging ceph/master (daf5cc27eed9 ceph: fix use-after-free on symlink traversal) Merging cifs/for-next (3800f25d5d64 cifs: zero-range does not require the file is sparse) 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 (9328d3efaed3 Pull reiserfs cleanup.) Merging ext4/dev (742b06b5628f jbd2: check superblock mapped prior to committing) Merging f2fs/dev (b00c19ab29b6 f2fs: add tracepoint for f2fs_file_write_iter()) Merging fuse/for-next (fabf7e0262d0 fuse: cache readdir calls if filesystem opts out of opendir) Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) Merging nfs/linux-next (dc4060a5dc25 Linux 5.1-rc5) Merging nfs-anna/linux-next (5602c11defd6 NFS: Remove redundant open context from nfs_page) Merging nfsd/nfsd-next (b8fab687541c nfsd: knfsd must use the container user namespace) Merging orangefs/for-next (7dccb4027ef9 orangefs: copy Orangefs-sized blocks into the pagecache if possible.) 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 (2032a8a27b5c xfs: serialize unaligned dio writes against all other dio writes) Merging file-locks/locks-next (945ab8f6de94 locks: wake any locks blocked on request before deadlock check) Merging vfs/for-next (af467ef6c590 Merge branches 'work.misc' and 'work.dcache' into for-next) Merging printk/for-next (0142ada02a43 Merge branch 'for-5.2' into for-next) CONFLICT (content): Merge conflict in mm/memblock.c CONFLICT (content): Merge conflict in include/trace/events/sunrpc.h CONFLICT (content): Merge conflict in drivers/base/power/main.c Merging pci/next (5cb8ce806319 Merge branch 'pci/trivial') Merging pstore/for-next/pstore (93ee4b7d9f06 pstore/ram: Avoid needless alloc during header write) Merging hid/for-next (6659efec5011 Merge branch 'for-5.2/u2fzero' into for-next) Merging i2c/i2c/for-next (6f84665bfd0a Merge branch 'i2c/for-5.2' into i2c/for-next) Merging i3c/i3c/next (124dbd750da4 i3c: master: dw: remove dead code from dw_i3c_master_*_xfers()) Merging dmi/master (57361846b52b Linux 4.19-rc2) Merging hwmon-staging/hwmon-next (dd015b6f0833 hwmon: (pmbus/isl68137) Add driver for Intersil ISL68137 PWM Controller) Merging jc_docs/docs-next (5d2a2c59108a docs: speculation.txt: mark example blocks as such) Merging v4l-dvb/master (1c3ec30bb230 media: index.rst: exclude Indexes section from latex/pdf output) Merging v4l-dvb-next/master (81527254e151 media: seco: depend on CONFIG_RC_CORE=y when not a module) Merging fbdev/fbdev-for-next (261ac4ddfa9f video: fbdev: atmel_lcdfb: remove set but not used variable 'pdata') Merging pm/linux-next (2c28f2f928a8 Merge branch 'pm-docs' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (c1d1090c3c76 cpufreq: maple: Remove redundant code from maple_cpufreq_init()) Merging cpupower/cpupower (8c2ffd917477 Linux 5.1-rc2) Merging opp/opp/linux-next (2f36bde0fc8f OPP: Introduce dev_pm_opp_find_freq_ceil_by_volt()) 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 (54cca4bad076 dlm: allow binding to all network interfaces) Merging swiotlb/linux-next (8395c154abb7 swiotlb: dump used and total slots when swiotlb buffer is full (v2)) Merging rdma/for-next (fb652d329902 RDMA/mlx5: Remove VF representor profile) Merging net-next/master (432bc230700f Merge branch 'hsr-next') CONFLICT (content): Merge conflict in tools/testing/selftests/netfilter/nft_nat.sh CONFLICT (content): Merge conflict in tools/testing/selftests/netfilter/Makefile CONFLICT (content): Merge conflict in net/smc/af_smc.c CONFLICT (content): Merge conflict in .mailmap Merging bpf-next/master (c342dc109aa5 bpf: refactor "check_reg_arg" to eliminate code redundancy) Merging ipsec-next/master (c9500d7b7de8 xfrm: store xfrm_mode directly, not its address) Merging mlx5-next/mlx5-next (d9cb06759eca net/mlx5: E-Switch, add a new prio to be used by the RDMA side) Merging netfilter-next/master (dc2f4189dcd2 bridge: only include nf_queue.h if needed) 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 (bdfc4027de15 rtlwifi: rtl8723ae: Make rtl8723e_dm_refresh_rate_adaptive_mask static) CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/pcie/drv.c CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-trans.h Merging bluetooth/master (bbcece3d418c Bluetooth: mediatek: Fixed incorrect type in assignment) Merging mac80211-next/master (9eae47c5d122 cfg80211: don't pass pointer to pointer unnecessarily) CONFLICT (content): Merge conflict in net/mac80211/tx.c Merging gfs2/for-next (684349df4d42 gf2: Rename gfs2_trans_{add_unrevoke => remove_revoke}) Merging mtd/mtd/next (9e98c678c2d6 Linux 5.1-rc1) Merging nand/nand/next (e6a35ef45a03 mtd: nand: Remove useless line in Kconfig) Merging spi-nor/spi-nor/next (dcb4b22eeaf4 spi-nor: s25fl512s supports region locking) Merging crypto/master (f1b70d16389d crypto: mxc-scc - Remove broken driver) Merging drm/drm-next (f06ddb53096b BackMerge v5.1-rc5 into drm-next) Applying: disable the ASPEED GFX driver due to powerpc build failure Merging amdgpu/drm-next (f55be0be5b72 drm/amd/display: Add profiling tools for bandwidth validation) Merging drm-intel/for-linux-next (c856dbc887aa drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead) Merging drm-tegra/drm/tegra/for-next (11c632e1cfd3 drm/tegra: sor: Implement acquire/release for reset) Merging drm-misc/for-linux-next (4dff47c7607a drm/panfrost: Add support for 2MB page entries) 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 (e8e3cc7d39ff MAINTAINERS: Fix pattern for Documentation path for Arm Mali Komeda) Merging imx-drm/imx-drm/next (5d5fe9970c76 drm/imx: enable IDMAC watermark feature) Merging etnaviv/etnaviv/next (9e05352340d3 drm/etnaviv: potential NULL dereference) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (533df0884d83 Merge branch 'regmap-5.2' into regmap-next) Merging sound/for-next (b5fd12d6c0fc ALSA: seq: Correct unlock sequence at snd_seq_client_ioctl_unlock()) Merging sound-asoc/for-next (6ca36fd68bb3 Merge branch 'asoc-5.2' into asoc-next) CONFLICT (content): Merge conflict in MAINTAINERS Merging modules/modules-next (f9a75c1d717f modules: Only return -EEXIST for modules that have finished loading) Merging input/next (a5f50c501321 Input: goodix - add GT5663 CTP support) Merging block/for-next (f605c48a086c Merge branch 'for-5.2/block' into for-next) Merging device-mapper/for-next (4ed319c6ac08 dm integrity: fix deadlock with overlapping I/O) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) Merging mmc/next (71c733c4e1ae mmc: tegra: add sdhci tegra suspend and resume) 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 (7f042743306c mfd: cros_ec: Instantiate the CrOS USB PD logger driver) Merging backlight/for-backlight-next (a6d6a589cb09 video: lcd: Remove useless BACKLIGHT_CLASS_DEVICE dependencies) Merging battery/for-next (7d90fcc14a25 power: supply: cpcap-charger: Fix pointless EPROBE_DEFER warnings) Merging regulator/for-next (598387d3ce4b Merge branch 'regulator-5.2' into regulator-next) Merging security/next-testing (d6d060788e0a Merge branch 'next-smack' into next-testing) Merging apparmor/apparmor-next (145a0ef21c8e apparmor: fix blob compression when ns is forced on a policy load) Merging integrity/next-integrity (a2ffe5774e8e selftests/kexec: update get_secureboot_mode) Merging selinux/next (c750e6929d3c selinux: Check address length before reading address family) Merging tpmdd/next (25101f3aeb14 efi: Include tpm_eventlog.h after asm/efi.h to avoid memcpy breakage) $ git reset --hard HEAD^ Merging next-20190415 version of tpmdd Merging watchdog/master (458c8961c194 watchdog: w83877f_wdt: Mark expected switch fall-through) Merging iommu/next (9c39a1abe297 Merge branches 'iommu/fixes', '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 (7e8eda734d30 ntp: Audit NTP parameters adjustment) CONFLICT (content): Merge conflict in kernel/seccomp.c CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c Merging devicetree/for-next (af3be70a3211 of: Improve of_phandle_iterator_next() error message) Merging mailbox/mailbox-for-next (17b860bbfc84 mailbox: imx: keep MU irq working during suspend/resume) Merging spi/for-next (3cf15e2fa872 Merge branch 'spi-5.2' into spi-next) Merging tip/auto-latest (fe5b3725fda2 Merge branch 'core/core') CONFLICT (content): Merge conflict in mm/kasan/Makefile CONFLICT (content): Merge conflict in arch/s390/include/asm/Kbuild Merging clockevents/clockevents/next (dbfc6db7ba46 soc/tegra: default select TEGRA_TIMER for Tegra210) Merging edac-amd/for-next (74676a8e247a arm64: dts: stratix10: Use new Stratix10 EDAC bindings) Merging irqchip/irq/irqchip-next (fca269f201a8 irqchip/mbigen: Don't clear eventid when freeing an MSI) Merging ftrace/for-next (4f5fbd78a7b4 rcu: validate arguments for rcu tracepoints) Merging rcu/rcu/next (2613e7d78048 Merge LKMM and RCU commits) Merging kvm/linux-next (c73f4c998e1f KVM: x86: nVMX: fix x2APIC VTPR read intercept) Merging kvm-arm/next (5d8d4af24460 arm64: KVM: Fix system register enumeration) 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 (42d8644bd77d xen: Prevent buffer overflow in privcmd ioctl) Merging percpu/for-next (cb453ce4846b Merge branch 'for-5.2' into for-next) Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu) Merging drivers-x86/for-next (9ae11e237d95 platform/x86: intel_pmc_core: Mark local function static) Merging chrome-platform/for-next (ce6846c027af platform/chrome: cros_ec: Add EC host command support using rpmsg) Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings) Merging leds/for-next (174c9526ac89 Merge tag 'lm3532-driver-improvements' into for-next) Merging ipmi/for-next (b417b649a34d ipmi: Remove file from ipmi_file_private) Merging driver-core/driver-core-next (5de363b66a37 drivers: base: power: add proper SPDX identifiers on files that did not have them.) Merging usb/usb-next (8cdfd068c1ea Merge 5.1-rc3 into usb-next) Merging usb-gadget/next (5895d311d28f usb: phy: twl6030-usb: fix possible use-after-free on remove) Merging usb-serial/usb-next (f64c3ab23068 USB: serial: pl2303: fix tranceiver suspend mode) Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity) Merging phy-next/next (46c12f846a2a dt-bindings: phy: Add a new property drive-impedance-ohm for RK's emmc PHY) Merging tty/tty-next (f16aa97d3f57 tty: fix up a few remaining files without SPDX identifiers) Merging char-misc/char-misc-next (d358b1733fc3 chardev: update comment based on the code) CONFLICT (content): Merge conflict in drivers/misc/fastrpc.c Merging extcon/extcon-next (00053de52231 extcon: arizona: Disable mic detect if running when driver is removed) Merging soundwire/next (4abbd783d126 soundwire: intel: fix implicit header use of module.h/export.h) Merging thunderbolt/next (fd21b79e541e thunderbolt: Fix to check the return value of kmemdup) Merging staging/staging-next (932f98922f6f Merge tag 'iio-for-5.2a-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) CONFLICT (modify/delete): drivers/staging/mt7621-spi/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Makefile left in tree. CONFLICT (modify/delete): drivers/staging/mt7621-spi/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Kconfig left in tree. CONFLICT (modify/delete): drivers/staging/media/mt9t031/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Makefile left in tree. CONFLICT (modify/delete): drivers/staging/media/mt9t031/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Kconfig left in tree. CONFLICT (content): Merge conflict in drivers/spi/spi-mt7621.c CONFLICT (content): Merge conflict in drivers/iio/industrialio-buffer.c CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt $ git rm -f drivers/staging/media/mt9t031/Kconfig drivers/staging/media/mt9t031/Makefile drivers/staging/mt7621-spi/Kconfig drivers/staging/mt7621-spi/Makefile Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next) Merging icc/icc-next (3901460f7782 Merge branch 'icc-qcs404' into icc-next) Merging slave-dma/next (23b846396b95 dmaengine: axi-dmac: extend support for ZynqMP arch) Merging cgroup/for-next (4c38f5ca8455 Merge branch 'for-5.2' into for-next) Merging scsi/for-next (40fc71a02339 Merge branch 'misc' into for-next) CONFLICT (content): Merge conflict in drivers/scsi/sd.c CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_els.c Merging scsi-mkp/for-next (948e922fc446 scsi: core: map PQ=1, PDT=other values to SCSI_SCAN_TARGET_PRESENT) 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 (4e76105b74c1 virtio: use dependent_ptr_mb) CONFLICT (content): Merge conflict in drivers/pci/of.c CONFLICT (content): Merge conflict in drivers/net/virtio_net.c Merging rpmsg/for-next (6e9b4f32f9fa Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (fad71ca20f45 Merge branch 'devel' into for-next) Merging gpio-brgl/gpio/for-next (b0d2569d8276 gpio: mlxbf: remove unused including <linux/version.h>) Merging pinctrl/for-next (96900dd31306 Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging pwm/for-next (9ff06679e109 pwm: sysfs: fix typo "its" -> "it's") 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 (e14d314c7a48 selftests: cgroup: fix cleanup path in test_memcg_subtree_control()) Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI) Merging livepatching/for-next (55ac3597df3f Merge branch 'for-5.1-upstream-fixes' into for-next) Merging coresight/next (d5d246a56af0 coresight: Merge the static and dynamic replicator drivers) Merging rtc/rtc-next (692802d26b3a rtc: ds1685: fix crash caused by referencing wrong device struct) CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c 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 (d333bad1f6f3 dt-bindings: at24: add Renesas R1EX24016) Merging ntb/ntb-next (6202b3c150bc 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 (7cc10c5cb143 gnss: ubx: add u-blox,neo-6m compatible) 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 (f7e49c81df8e nvmem: sunxi_sid: Support SID on H6) 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 (cf451adfa392 PM / devfreq: add tracing for scheduling work) Merging akpm-current/current (9b9607c0c01d ipc: do cyclic id allocation for the ipc object.) $ 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/coda/psdev.c: remove duplicate header Applying: include/linux/sched/signal.h: replace `tsk' with `task' Applying: fs/cachefiles/namei.c: remove duplicate header Applying: fs/block_dev.c: Remove duplicate header Applying: kernel, resource: use resource_overlaps() to simplify region_intersects() Applying: treewide: replace #include <asm/sizes.h> with #include <linux/sizes.h> Applying: arch: remove <asm/sizes.h> amd <asm-generic/sizes.h> Applying: mm, memcg: rename ambiguously named memory.stat counters and functions Applying: mm-rename-ambiguously-named-memorystat-counters-and-functions-fix Applying: mm, memcg: consider subtrees in memory.events Applying: drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl Applying: drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Merging akpm/master (f40901ad75a7 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
Attachment:
pgpDsQfNpMF97.pgp
Description: OpenPGP digital signature
