Hi all, Changes since 20190125: The vfs tree still had its build failure for which I applied a patch. The net-next tree gained a build failure for which I applied a patch. The mtd tree gained a conflict against Linus' tree. The char-misc tree gained conflicts against the qcom tree. Non-merge commits (relative to Linus' tree): 4055 4580 files changed, 177213 insertions(+), 110378 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 296 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 (4aa9fc2a435a Revert "mm, memory_hotplug: initialize struct pages for the full memory section") Merging fixes/master (d8d0c3a7f601 x86/syscalls: Mark expected switch fall-throughs) Merging kbuild-current/fixes (7c2614bf7a1f Merge tag '5.0-rc3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) Merging arc-current/for-curr (18094d0b55d5 ARC: DTB: [scripted] fix node name and address spelling) Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential uninitialized return) Merging arm64-fixes/for-next/fixes (7fa1e2e6afa7 kasan, arm64: remove redundant ARCH_SLAB_MINALIGN define) Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related crashes) Merging powerpc-fixes/fixes (7bea7ac0ca01 powerpc/syscalls: Fix syscall tracing) 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 (bfe2599dd2f9 Merge branch 'qed-Bug-fixes') Merging bpf/master (c9e4576743ee bpf: sock recvbuff must be limited by rmem_max in bpf_setsockopt()) Merging ipsec/master (6fb6e6371f8c net: dsa: mv88e6xxx: Fix serdes irq setup going recursive) Merging netfilter/master (206b8cc514d7 netfilter: ipt_CLUSTERIP: fix warning unused variable cn) Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects) Merging wireless-drivers/master (13e62626c578 wlcore: sdio: Fixup power on/off sequence) Merging mac80211/master (93183bdbe73b cfg80211: extend range deviation for DMG) Merging rdma-fixes/for-rc (951d01b96f17 IB/mlx5: Fix how advise_mr() launches async work) Merging sound-current/for-linus (e190161f96b8 ALSA: pcm: Fix tight loop of OSS capture stream) Merging sound-asoc-fixes/for-linus (dfe189574409 Merge branch 'asoc-5.0' into asoc-linus) Merging regmap-fixes/for-linus (49a57857aeea Linux 5.0-rc3) Merging regulator-fixes/for-linus (45fff6c2b44f Merge branch 'regulator-5.0' into regulator-linus) Merging spi-fixes/for-linus (e8012472356f Merge branch 'spi-5.0' into spi-linus) Merging pci-current/for-linus (0084379b5a13 Merge remote-tracking branch 'lorenzo/pci/controller-fixes' into for-linus) Merging driver-core.current/driver-core-linus (d88c93f090f7 debugfs: fix debugfs_rename parameter checking) Merging tty.current/tty-linus (f17b5f06cb92 Linux 5.0-rc4) Merging usb.current/usb-linus (f17b5f06cb92 Linux 5.0-rc4) Merging usb-gadget-fixes/fixes (87b6d2c56825 usb: dwc2: gadget: Fix Remote Wakeup interrupt bit clearing) Merging usb-serial-fixes/usb-linus (527c1e567ead USB: serial: keyspan_usa: add proper SPDX lines for .h files) 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 (f17b5f06cb92 Linux 5.0-rc4) Merging char-misc.current/char-misc-linus (f17b5f06cb92 Linux 5.0-rc4) Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1) Merging thunderbolt-fixes/fixes (f17b5f06cb92 Linux 5.0-rc4) Merging input-current/for-linus (141e5dcaa735 Input: input_event - fix the CONFIG_SPARC64 mixup) Merging crypto-current/master (356690d029e1 crypto: cavium/nitrox - Invoke callback after DMA unmap) 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 (bfeffd155283 Linux 5.0-rc1) Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1) Merging mtd-fixes/master (1c7fc5cbc339 Linux 5.0-rc2) 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 (240809ef6630 media: vim2m: only cancel work if it is for right context) Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0) Merging mips-fixes/mips-fixes (1ca1c87f91d9 DTS: CI20: Fix bugs in ci20's device tree.) Merging at91-fixes/at91-fixes (bfeffd155283 Linux 5.0-rc1) Merging omap-fixes/fixes (063c20e12f8b ARM: dts: am335x-shc.dts: fix wrong cd pin level) Merging kvm-fixes/master (826c1362e79a x86/kvm/nVMX: don't skip emulated instruction twice when vmptr address is not backed) Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs) Merging hwmon-fixes/hwmon (2a2ec4aa0577 hwmon: (nct6775) Fix fan6 detection for NCT6793D) Merging nvdimm-fixes/libnvdimm-fixes (11189c1089da acpi/nfit: Fix command-supported detection) Merging btrfs-fixes/next-fixes (4d12b1fab00b Merge branch 'misc-4.21' into next-fixes) Merging vfs-fixes/fixes (61aa329d0762 cgroup: saner refcounting for cgroup_root) 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 (d67247566450 scsi: ufs: Use explicit access size in ufshcd_dump_regs) Merging drm-fixes/drm-fixes (f0e7ce1eef58 Merge tag 'drm-msm-fixes-2019-01-24' of git://people.freedesktop.org/~robclark/linux into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (f17b5f06cb92 Linux 5.0-rc4) Merging mmc-fixes/fixes (3751e008da0d mmc: mediatek: fix incorrect register setting of hs400_cmd_int_delay) 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 (053ff09f1a8f drm/rockchip: rgb: update SPDX license identifier) Merging kbuild/for-next (e83ffce1336b kbuild: descend to scripts/kconfig/ directly when syncconfig is needed) Merging compiler-attributes/compiler-attributes (058b472f2035 lib/crc32.c: mark crc32_le_base/__crc32c_le_base aliases as __pure) Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) Merging dma-mapping/for-next (8b1cce9f5832 dma-mapping: fix inverted logic in dma_supported) Merging asm-generic/master (2b3c5a99d5f3 sh: generate uapi header and syscall table header files) Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging arm/for-next (8f839a25b9cc Merge branches 'fixes', 'misc', 'sa1100-for-next', 'smp-hotplug' (early part) and 'spectre' into for-next) Merging arm64/for-next/core (0bd3ef34d2a8 arm64: uaccess: Implement unsafe accessors) Merging arm-perf/for-next/perf (c061ce249f9b dt-bindings: arm: Convert PMU binding to json-schema) Merging arm-soc/for-next (f217b8e70c76 ARM: Document merges) CONFLICT (content): Merge conflict in MAINTAINERS 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 (59f249fca4f0 Merge branch 'v5.1/dt64' into tmp/aml-rebuild) Merging aspeed/for-next (d5e12a2c968d Merge branch 'aspeed-5.1-devicetree' into for-next) 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 (acb061708204 Merge branch 'imx/maintainers' into for-next) Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next) Merging mediatek/for-next (ecee13a082e0 Merge branch 'v5.0-next/dts64' into for-next) Merging mvebu/for-next (b5f034845e70 ARM: dts: kirkwood: Fix polarity of GPIO fan lines) Merging omap/for-next (e58fca2baa78 Merge branch 'omap-for-v5.1/dt-ti81xx' into for-next) Merging reset/reset/next (c979dbf59987 reset: imx7: Add support for i.MX8MQ IP block variant) Merging qcom/for-next (bfcc60e88dbc Merge branch 'arm64-for-5.1-2' into all-for-5.1) Merging renesas/next (b716e58aa0d0 Merge branches 'arm-defconfig-for-v5.1', 'arm64-dt-for-v5.1' and 'dt-bindings-for-v5.1' into next) Merging rockchip/for-next (21123b35a4e8 Merge branch 'v5.1-armsoc/dts64' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (bb44f1be0b93 Merge branch 'next/dt' into for-next) Merging sunxi/sunxi/for-next (647d10e09f81 Merge branches 'sunxi/clk-fixes-for-5.0', 'sunxi/dt64-for-5.1', 'sunxi/dt-for-5.1', 'sunxi/h3-h5-for-5.1' and 'sunxi/clk-for-5.1' into sunxi/for-next) Merging tegra/for-next (45bfb6b333ab Merge branch for-5.1/arm64/dt into for-next) Merging clk/clk-next (15961a572b90 Merge branch 'clk-json-schema' into clk-next) Merging clk-samsung/for-next (bfeffd155283 Linux 5.0-rc1) Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging csky/linux-next (38883c2dd34f csky: coding convention: use task_stack_page) 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 (49a57857aeea Linux 5.0-rc3) Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) Merging mips/mips-next (a0f0b69f2c15 MIPS: remove meaningless generic-(CONFIG_GENERIC_CSUM) += checksum.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 (0293c953c7a4 CREDITS/MAINTAINERS: Adjust parisc-linux.org email addresses) Merging powerpc/next (63da6caeb84c powerpc: remove unnecessary unlikely()) 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 (801009424e05 Fix a handful of audit-related issue) 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 (7dd541a3fb34 s390: no need to check return value of debugfs_create functions) 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 (95dd4c87b7a6 Merge branch 'xtensa-5.0-fixes' 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 (35dccd9c1e97 Merge branch 'for-next-next-v5.0-20190123' into for-next-20190123) Merging ceph/master (74827ee29565 ceph: quota: cleanup license mess) Merging cifs/for-next (95caaa5b473c CIFS: Do not count -ENODATA as failure for query directory) Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal) Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs) Merging ext3/for_next (e92dfb845b33 Pull ext2 fixes.) Merging ext4/dev (191ce17876c9 ext4: fix special inode number checks in __ext4_iget()) Merging f2fs/dev (cd2dcebde8b8 f2fs: sync filesystem after roll-forward recovery) Merging fuse/for-next (5a86a6974d52 fuse: support clients that don't implement 'opendir') Merging jfs/jfs-next (2e3bc6125154 fs/jfs: Switch to use new generic UUID API) Merging nfs/linux-next (f17b5f06cb92 Linux 5.0-rc4) Merging nfs-anna/linux-next (f5ef460da1ee NFS: Fix up return value on fatal errors in nfs_page_async_flush()) Merging nfsd/nfsd-next (978c707df559 svcrdma: Use struct_size() in kmalloc()) Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for service_operation returns > 0) Merging overlayfs/overlayfs-next (2424e1c7256c overlayfs: During copy up, first copy up data and then xattrs) 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 (90be9b86da90 xfs: xfs_fsops: drop useless LIST_HEAD) Merging file-locks/locks-next (bf77ae4c98d7 locks: fix error in locks_move_blocks()) Merging vfs/for-next (1fab5fff0a7a Merge branches 'work.mount', 'work.misc', 'misc.misc' and 'work.iov_iter' into for-next) CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c CONFLICT (content): Merge conflict in kernel/cgroup/cgroup-v1.c CONFLICT (content): Merge conflict in kernel/cgroup/cgroup-internal.h CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/resctrl/rdtgroup.c Applying: vfs: work around CONFIG_PRINTK=n in fs_context logging code Merging printk/for-next (15ff2069cb7f printk: Add caller information to printk() output.) Merging pci/next (4cd74d833a4d Merge branch 'pci/misc') Merging pstore/for-next/pstore (182ca6e0ae23 pstore/ram: Replace dummy_data heap memory with stack memory) Merging hid/for-next (acedafabf1bd Merge branch 'for-5.1/hid-elan' into for-next) Merging i2c/i2c/for-next (44783efdfed1 i2c: aspeed: Remove hard-coded bus timeout value setting) 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 (bb3b529277b6 hwmon: (via-cputemp) Use permission specific SENSOR[_DEVICE]_ATTR variants) Merging jc_docs/docs-next (31f433307043 Documentation: DMA-API: fix two typos) Merging v4l-dvb/master (c9d06df61297 media: vicodec: get_next_header is static) Merging v4l-dvb-next/master (76097fe1aee6 media: staging/ipu3-imgu: Add MAINTAINERS entry) CONFLICT (add/add): Merge conflict in Documentation/media/v4l-drivers/ipu3.rst CONFLICT (add/add): Merge conflict in Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst Merging fbdev/fbdev-for-next (890d14d2d4b5 fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line option) Merging pm/linux-next (3c778e685bce Merge branches 'pm-cpuidle' and 'pm-cpufreq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (5887f50a1a61 MAINTAINERS: Update the active pm tree for ARM) Merging cpupower/cpupower (bfeffd155283 Linux 5.0-rc1) Merging opp/opp/linux-next (dd7ac2422a9b opp: no need to check return value of debugfs_create functions) Merging thermal/next (301c9a43e158 Merge branches 'for-rc' and 'thermal-intel' into next) Merging thermal-soc/next (9d216211fded thermal: generic-adc: Fix adc to temp interpolation) Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA in case of platform dependency) Merging dlm/next (49a57857aeea Linux 5.0-rc3) Merging swiotlb/linux-next (227a76b64718 swiotlb: clear io_tlb_start and io_tlb_end in swiotlb_exit) Merging rdma/for-next (535005ca8e5e IB/core: Destroy QP if XRC QP fails) Merging net-next/master (bb7c778b73eb Merge branch 'qed-Error-recovery-process') Merging bpf-next/master (20600f3e9d3f Merge branch 'split-test_verifier') Merging ipsec-next/master (590ce401c207 dt-bindings: net: dsa: ksz9477: fix indentation for switch spi bindings) Merging mlx5-next/mlx5-next (73f5a82bb3c9 RDMA/mad: Reduce MAD scope to mlx5_ib only) Merging netfilter-next/master (83f529281d7a netfilter: ipv4: remove useless export_symbol) 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 (4ad0be160544 brcmfmac: Use firmware_request_nowarn for the clm_blob) Merging bluetooth/master (00df214b1faa Bluetooth: btrtl: Restore old logic to assume firmware is already loaded) Merging mac80211-next/master (2ec56f918009 mac80211: remove unused variable) Merging gfs2/for-next (2abbf9a4d262 gfs: no need to check return value of debugfs_create functions) Merging mtd/mtd/next (decbd9e173ca mtd: docg3: fix a possible memory leak of mtd->name) CONFLICT (content): Merge conflict in drivers/mtd/mtdpart.c Merging nand/nand/next (e74745d96478 mtd: rawnand: fsmc: Disable NAND on remove()) Merging spi-nor/spi-nor/next (a2126b0a0109 mtd: spi-nor: refine Spansion S25FL512S ID) Merging crypto/master (231baecdef7a crypto: clarify name of WEAK_KEY request flag) Merging drm/drm-next (f91168f48556 Merge tag 'drm-misc-next-2019-01-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) Merging drm-intel/for-linux-next (9407d3bdb048 drm/i915: Track active timelines) Merging drm-tegra/drm/tegra/for-next (f48c11644859 drm/tegra: vic: Do not clear driver data) Merging drm-misc/for-linux-next (4ba3e56340bb drm/panel: simple: Add support for PDA 91-00156-A0 panel) Merging drm-msm/msm-next (b62414c85767 dt-bindings: drm/msm/a6xx: Document GMU bindings) Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) Merging mali-dp/for-upstream/mali-dp (874cf192964e drm: arm/komeda: Remove IRQ parsing from initial series) Applying: drm/komeda: merge fix for drm_atomic_private_obj_init() API change Merging imx-drm/imx-drm/next (257ff80474ab drm/imx: allow building under COMPILE_TEST) Merging etnaviv/etnaviv/next (fd4b77e8deea drm/etnaviv: don't restrict to certain architectures) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (478a2aa27919 Merge remote-tracking branch 'regmap/topic/irq' into regmap-next) Merging sound/for-next (b2e9e1c8810e ALSA: dice: add support for Solid State Logic Duende Classic/Mini) Merging sound-asoc/for-next (2c2cd2219b0f Merge branch 'asoc-5.1' into asoc-next) Merging modules/modules-next (93d77e7f1410 ARM: module: Fix function kallsyms on Thumb-2) Merging input/next (b6eba86030bf Input: edt-ft5x06 - add offset support for ev-ft5726) Merging block/for-next (fae5efba43c2 mtip32xx: ѕtop abusing the managed resource APIs) Merging device-mapper/for-next (075c18c3e124 dm: add missing trace_block_split() to __split_and_process_bio()) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) Merging mmc/next (a5511c25e0ee mmc: jz4740: Remove platform data and use standard APIs) 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 (c52b8fd546d8 mfd: wm8400-core: Make it explicitly non-modular) Merging backlight/for-backlight-next (3cee7a7d05b1 backlight: 88pm860x_bl: Use of_node_name_eq for node name comparisons) Merging battery/for-next (f83a6ece6997 power: supply: bq25890: show max charge current/voltage as configured) Merging regulator/for-next (1a87013efe2d Merge branch 'regulator-5.1' into regulator-next) Merging security/next-testing (7bd3501ba533 Merge branch 'next-general' into next-testing) Merging apparmor/apparmor-next (43aa09fee2f0 apparmor: Fix warning about unused function apparmor_ipv6_postroute) Merging integrity/next-integrity (cd0b86fe9529 ima: define ima_post_create_tmpfile() hook and add missing call) Merging selinux/next (e6f2f381e401 selinux: replace BUG_ONs with WARN_ONs in avc.c) Merging tpmdd/next (c1a85a00ea66 LSM: generalize flag passing to security_capable) Merging watchdog/master (f17b5f06cb92 Linux 5.0-rc4) Merging iommu/next (796c6a901d01 Merge branches 'iommu/fixes', 'arm/msm', 'arm/tegra', 'x86/vt-d' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) Merging vfio/next (8ba35b3a0046 vfio-mdev/samples: Use u8 instead of char for handle functions) Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (05c7a9cb2727 audit: clean up AUDITSYSCALL prototypes and stubs) Merging devicetree/for-next (42e45a9449f1 media: s5p-mfc: Fix memdev DMA configuration) Merging mailbox/mailbox-for-next (d69e11648e48 mailbox: tegra-hsp: Use device-managed registration API) Merging spi/for-next (c458bb3626a5 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 (e65b1e5fc13b Merge branch 'x86/kdump') Merging clockevents/clockevents/next (7cd6dca3600d clocksource/drivers/arch_timer: Workaround for Allwinner A64 timer instability) Merging edac-amd/for-next (912ebd99edfa EDAC: Do not check return value of debugfs_create() functions) Merging irqchip/irq/irqchip-next (6479450f72c1 irqchip/gic-v4: Fix occasional VLPI drop) Merging ftrace/for-next (3d739c1f6156 tracing: Use the return of str_has_prefix() to remove open coded numbers) Merging rcu/rcu/next (f25bcbbbf561 Merge LKMM and RCU commits) CONFLICT (content): Merge conflict in tools/memory-model/linux-kernel.cat Merging kvm/linux-next (bfeffd155283 Linux 5.0-rc1) Merging kvm-arm/next (33a69773ef34 KVM: arm/arm64: Move kvm_is_write_fault to header file) Merging kvm-ppc/kvm-ppc-next (ae59a7e1945b KVM: PPC: Book3S HV: Keep rc bits in shadow pgtable in sync with host) Merging kvms390/next (7aedd9d48f2a KVM: s390: fix kmsg component kvm-s390) Merging xen-tip/linux-next (8d2df8a2d0fa arch/arm/xen: Remove duplicate header) Merging percpu/for-next (718f6757a29b Merge branch 'for-4.21' into for-next) Merging workqueues/for-next (4d43d395fed1 workqueue: Try to catch flush_work() without INIT_WORK().) Merging drivers-x86/for-next (e7706a4359f0 platform/x86: mlx-platform: Add support for new VMOD0007 board name) Merging chrome-platform/for-next (bfeffd155283 Linux 5.0-rc1) Merging hsi/for-next (3a658e09a215 HSI: omap_ssi: Change to use DEFINE_SHOW_ATTRIBUTE macro) Merging leds/for-next (0f85e8498a48 leds: trigger: timer: Add initialization from Device Tree) Merging ipmi/for-next (2b835103f84d ipmi: Use dedicated API for copying a UUID) Merging driver-core/driver-core-next (0fe6f7874d46 driver core: Remove the link if there is no driver with AUTO flag) Merging usb/usb-next (c9381e185fdc Merge 5.0-rc4 into usb-next) Merging usb-gadget/next (1c7fc5cbc339 Linux 5.0-rc2) Merging usb-serial/usb-next (a49e1abf0770 USB: serial: cp210x: support all gpios on CP2102N QFN28 package) Merging usb-chipidea-next/ci-for-usb-next (9049fce897ed usb: chipidea: imx: allow to configure oc polarity on i.MX25) Merging phy-next/next (49ee1406355e phy: qcom-qusb2: Add QUSB2 PHY support for msm8998) Merging tty/tty-next (83b21ed0fc2a Merge 5.0-rc4 into tty-next) Merging char-misc/char-misc-next (fdddcfd9c93c Merge 5.0-rc4 into char-misc-next) CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/sdm845.dtsi Merging extcon/extcon-next (a9857d45edf3 extcon: ptn5150: Fix return value check in ptn5150_i2c_probe()) Merging soundwire/next (bfeffd155283 Linux 5.0-rc1) Merging thunderbolt/next (f17b5f06cb92 Linux 5.0-rc4) Merging staging/staging-next (d61b5d546af2 Merge 5.0-rc4 into staging-next) Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next) Merging icc/icc-next (1c7fc5cbc339 Linux 5.0-rc2) Merging slave-dma/next (84aca9e007d2 Merge branch 'topic/xilinx' into next) CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c Merging cgroup/for-next (0623413ee0ba Merge branch 'for-4.21' into for-next) Merging scsi/for-next (75aee64ff6db Merge branch 'fixes' into for-next) CONFLICT (content): Merge conflict in drivers/scsi/arcmsr/arcmsr_hba.c Merging scsi-mkp/for-next (dfeba64dd66b scsi: arcmsr: Update driver version to v1.40.00.10-20190116) 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 (ae5d11d206fc arch: move common mmap flags to linux/mman.h) Merging rpmsg/for-next (ac1b79e48631 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (5c08179cd15f Merge branch 'devel' into for-next) Merging gpio-brgl/gpio/for-next (c131d98b590c gpio: altera-a10sr: Trivial coding style fix) CONFLICT (content): Merge conflict in drivers/gpio/gpio-altera-a10sr.c Merging pinctrl/for-next (5fe473106ea6 Merge branch 'devel' into for-next) 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 (ee17e5d6201c signal: Make siginmask safe when passed a signal of 0) 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 (bfeffd155283 Linux 5.0-rc1) Merging y2038/y2038 (4ad44aba07b7 y2038: add 64-bit time_t syscalls to all 32-bit architectures) Merging livepatching/for-next (d85ce23d3c20 Merge branch 'for-5.0/upstream-fixes' into for-next) Merging coresight/next (8b60fb322bd4 coresight: Use event attributes for sink selection) Merging rtc/rtc-next (42986fb81199 rtc: Add Cadence RTC driver) Merging nvdimm/libnvdimm-for-next (8a6f7591ddf5 Merge branch 'for-5.0/dax' into libnvdimm-for-next) Merging at24/at24/for-next (3b0548784079 eeprom: at24: remove at24_platform_data) Merging ntb/ntb-next (d9842b39e9ec ntb_hw_switchtec: Added support of >=4G memory windows) Merging kspp/for-next/kspp (be1944712d8e Merge branch 'for-next/gcc-plugin/arm-stackprotector' into for-next/kspp) 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 (f9eb86fddaf2 dt-bindings: gnss: add lna-supply property) 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 (ff3b9b5c6b1b nvmem: core: Avoid useless iterations in nvmem_cell_get_from_lookup()) Merging xarray/xarray (edcddd4c879a XArray: Fix an arithmetic error in xa_is_err) Merging hyperv/hyperv-next (27207b76011f vmbus: Switch to use new generic UUID API) Merging auxdisplay/auxdisplay (49a57857aeea Linux 5.0-rc3) Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops) Merging pidfd/for-next (5d4254ab421b 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 kspp-gustavo/for-next/kspp (482c7212e6af ASN.1: mark expected switch fall-through) Applying: enetc: include linux/vmalloc.h for vzalloc etc Merging akpm-current/current (fc4d4bfc99da ipc: conserve sequence numbers in extended IPCMNI mode) CONFLICT (content): Merge conflict in security/selinux/ss/services.c CONFLICT (content): Merge conflict in mm/rmap.c $ git checkout -b akpm remotes/origin/akpm/master Applying: scripts/atomic/check-atomics.sh: don't assume that scripts are executable Applying: include/linux/sched/signal.h: replace `tsk' with `task' Applying: locking/atomics: build atomic headers as required Applying: kernel/fork.c: remove duplicated include Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Merging akpm/master (ea6a59bf381c drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
Attachment:
pgp2VvXAAAgf2.pgp
Description: OpenPGP digital signature
