Hi all, Changes since 20180618: Dropped tree: userns (complex conflicts) The vfs tree gained conflicts against the overlayfs tree and a build failure for which I applied a merge fix patch. The userns tree gained conflicts against the vfs tree for which I dropped the userns tree. The akpm-current tree gained a conflict against the vfs tree. Non-merge commits (relative to Linus' tree): 1220 1216 files changed, 40064 insertions(+), 20562 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 279 trees (counting Linus' and 64 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 (ba4dbdedd3ed Merge tag 'jfs-4.18' of git://github.com/kleikamp/linux-shaggy) Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kbuild-current/fixes (ce397d215ccd Linux 4.18-rc1) Merging arc-current/for-curr (e6c62399504c ARCv2: support manual regfile save on interrupts) Merging arm-current/fixes (92d44a42af81 ARM: fix kill( ,SIGFPE) breakage) Merging arm64-fixes/for-next/fixes (839033b85ef7 arm64: make secondary_start_kernel() notrace) Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices) Merging powerpc-fixes/fixes (faf37c44a105 powerpc/64s: Clear PCR on boot) Merging sparc/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (7e85dc8cb35a net_sched: blackhole: tell upper qdisc about dropped packets) Merging bpf/master (6d5fc1957989 xdp: Fix handling of devmap in generic XDP) Merging ipsec/master (d6990976af7c vti6: fix PMTU caching and reporting on xmit) Merging netfilter/master (ad9852af9758 netfilter: nf_ct_helper: Fix possible panic after nf_conntrack_helper_unregister) Merging ipvs/master (312564269535 net: netsec: reduce DMA mask to 40 bits) Merging wireless-drivers/master (755abd247a3d MAINTAINERS: update Xinming's email address) Merging mac80211/master (bf2b61a6838f cfg80211: fix rcu in cfg80211_unregister_wdev) Merging rdma-fixes/for-rc (375dc53d032f IB/rxe: Fix missing completion for mem_reg work requests) Merging sound-current/for-linus (a57a46b93244 ALSA: hda/ca0132: Fix DMic data rate for Alienware M17x R4) Merging sound-asoc-fixes/for-linus (ab002985a303 Merge branch 'asoc-4.18' into asoc-linus) Merging regmap-fixes/for-linus (ce397d215ccd Linux 4.18-rc1) Merging regulator-fixes/for-linus (ce397d215ccd Linux 4.18-rc1) Merging spi-fixes/for-linus (a92295e1e39b Merge branch 'spi-4.18' into spi-linus) Merging pci-current/for-linus (ce397d215ccd Linux 4.18-rc1) Merging driver-core.current/driver-core-linus (ce397d215ccd Linux 4.18-rc1) Merging tty.current/tty-linus (ce397d215ccd Linux 4.18-rc1) Merging usb.current/usb-linus (ce397d215ccd Linux 4.18-rc1) Merging usb-gadget-fixes/fixes (cf727b922031 dwc2: gadget: Fix ISOC IN DDMA PID bitfield value calculation) Merging usb-serial-fixes/usb-linus (24160628a34a USB: serial: cp210x: add CESINEL device ids) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1) Merging staging.current/staging-linus (ce397d215ccd Linux 4.18-rc1) Merging char-misc.current/char-misc-linus (ce397d215ccd Linux 4.18-rc1) Merging input-current/for-linus (01f7e67a053f Merge branch 'next' into for-linus) Merging crypto-current/master (837bf7cc3b75 hwrng: core - Always drop the RNG in hwrng_unregister()) Merging ide/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) Merging vfio-fixes/for-linus (08ca1b52f69b vfio/pci: Make IGD support a configurable option) Merging kselftest-fixes/fixes (ce397d215ccd Linux 4.18-rc1) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (ce397d215ccd Linux 4.18-rc1) Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) Merging mtd-fixes/master (ce397d215ccd Linux 4.18-rc1) Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) Merging mfd-fixes/for-mfd-fixes (11799564fc7e mfd: cros_ec: Retry commands when EC is known to be busy) Merging v4l-dvb-fixes/fixes (e88f5e9ebd54 media: uvcvideo: Prevent setting unavailable flags) Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20) Merging mips-fixes/mips-fixes (2a027b47dba6 MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum) Merging omap-fixes/fixes (41bd6adf3c5d Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references") Merging kvm-fixes/master (696ca779a928 KVM: x86: fix #UD address of failed Hyper-V hypercalls) Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba) Merging hwmon-fixes/hwmon (91bb8f45f73f hwmon: (nct6775) Fix loop limit) Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4) Merging btrfs-fixes/next-fixes (ce397d215ccd Linux 4.18-rc1) Merging vfs-fixes/fixes (b1b94fcbd399 Revert "fs: fold open_check_o_direct into do_dentry_open") Merging dma-mapping-fixes/for-linus (cf65a0f6f6ff dma-mapping: move all DMA mapping code to kernel/dma) Merging drivers-x86-fixes/fixes (32ffd6e8d1f6 platform/x86: asus-wmi: Fix NULL pointer dereference) Merging samsung-krzk-fixes/fixes (ce397d215ccd Linux 4.18-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (ce397d215ccd Linux 4.18-rc1) Merging devicetree-fixes/dt/linus (737dd8e1a4c4 Documentation: devicetree: tilcdc: fix spelling mistake "suppors" -> "supports") Merging scsi-fixes/fixes (e6d1dd048cd4 scsi: qla2xxx: Spinlock recursion in qla_target) Merging drm-intel-fixes/for-linux-next-fixes (ce397d215ccd Linux 4.18-rc1) Merging mmc-fixes/fixes (ce397d215ccd Linux 4.18-rc1) Merging rtc-fixes/rtc-fixes (ce397d215ccd Linux 4.18-rc1) Merging drm-misc-fixes/for-linux-next-fixes (58b3d02f066e Revert "drm/sun4i: Handle DRM_BUS_FLAG_PIXDATA_*EDGE") Merging kbuild/for-next (ce397d215ccd Linux 4.18-rc1) Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) Merging dma-mapping/for-next (2550bbfd4952 dma-direct: don't crash on device without dma_mask) Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers) Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging arm/for-next (0ac000e86703 Merge branches 'fixes', 'misc' and 'spectre' into for-linus) Merging arm-perf/for-next/perf (ce397d215ccd Linux 4.18-rc1) Merging arm-soc/for-next (c7953e19db50 ARM: Document merges) Merging actions/for-next (35afadd11222 Merge branch 'v4.19/drivers' into next) Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) Merging amlogic/for-next (793d8ab66802 Merge branch 'v4.18/defconfig' into tmp/aml-rebuild) Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next) Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next) Merging bcm2835/for-next (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next) Merging imx-mxs/for-next (452daaaf6021 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into next) Merging mediatek/for-next (9378b3427341 Merge branch 'v4.17-next/soc' into for-next) Merging mvebu/for-next (78e5d8c26c70 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (1b7e42c1dfe8 Merge branch 'omap-for-v4.18/soc' into for-next) Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control) Merging qcom/for-next (509d20563e5d firmware: qcom: scm: Fix crash in qcom_scm_call_atomic1()) Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) Merging renesas/next (55bb9da815fe Merge branches 'arm-defconfig-for-v4.19', 'arm-soc-for-v4.19', 'arm-dt-for-v4.19', 'arm64-defconfig-for-v4.19', 'arm64-dt-for-v4.19' and 'dt-bindings-for-v4.19' into next) Merging rockchip/for-next (d5a5df7cf0ad Merge branch 'v4.18-armsoc/dts32-fixes' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (ce397d215ccd Linux 4.18-rc1) Merging sunxi/sunxi/for-next (dae42f9df9d9 Merge branches 'sunxi/dt-for-4.19', 'sunxi/dt64-for-4.19' and 'sunxi/h3-h5-for-4.19' into sunxi/for-next) Merging tegra/for-next (6de9ae597a79 Merge branch for-4.18/clk into for-next) Merging arm64/for-next/core (0fe42512b2f0 arm64: Fix syscall restarting around signal suppressed by tracer) Merging clk/clk-next (55913c2d3330 Merge branch 'clk-imx6ul' into clk-next) Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata) Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse) Merging m68k/for-next (b12c8a70643f m68k: Set default dma mask for platform devices) Merging m68knommu/for-next (2086e19c7118 m68k: fix "bad page state" oops on ColdFire boot) Merging microblaze/next (5cf8da7bc035 microblaze: Remove architecture heart beat code) Merging mips/mips-next (9202ed144c27 mips: ftrace: fix static function graph tracing) Merging nds32/next (e5dd7e2f8a59 nds32: define __NDS32_E[BL]__ for sparse) Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock()) Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define) Merging parisc-hd/for-next (8d40c754fbac parisc: Drop struct sigaction from not exported header file) Merging powerpc/next (ff5bc793e47b powerpc/64s/radix: Fix missing ptesync in flush_cache_vmap) Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) Merging risc-v/for-next (29dcea88779c Linux 4.17) Merging s390/features (ec530174c437 s390/dasd: only use preallocated requests) Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) Merging uml/linux-next (5ec9121195a4 um: Fix raw interface options) Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations) 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 (a160e71dd09e Merge branch 'for-next-next-v4.19-20180618' into for-next-20180618) Merging ceph/master (23edca864951 rbd: flush rbd_dev->watch_dwork after watch is unregistered) Merging cifs/for-next (c37bca639c29 smb3: if server does not support posix do not allow posix mount option) Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption) Merging ext3/for_next (20a653d458c3 Merge fsnotify cleanups from Amir into for_next) Merging ext4/dev (0238a85e379f ext4: add more mount time checks of the superblock) Merging f2fs/dev (d54d35c501bc Merge tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) Merging fuse/for-next (543b8f8662fe fuse: don't keep dead fuse_conn at fuse_fill_super().) Merging jfs/jfs-next (92d34134193e jfs: Fix inconsistency between memory allocation and ea_buf->max_size) Merging nfs/linux-next (c18c5a82d984 pNFS: Don't send layoutreturn if the layout is already invalid) Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes) Merging nfsd/nfsd-next (5b7b15aee641 nfsd: fix corrupted reply to badly ordered compound) Merging orangefs/for-next (b1116bc03c00 orangefs: use sparse annotations for holding locks across function calls.) Merging overlayfs/overlayfs-next (c03e30790cad ovl: Enable metadata only feature) CONFLICT (content): Merge conflict in fs/read_write.c CONFLICT (content): Merge conflict in fs/overlayfs/overlayfs.h CONFLICT (content): Merge conflict in fs/overlayfs/inode.c CONFLICT (content): Merge conflict in fs/inode.c CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c Applying: overlayfs: merge fix for "vfs: change inode times to use struct timespec64" Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual license) Merging xfs/for-next (89e9b5c0915a xfs: update incore per-AG inode count) Merging file-locks/locks-next (1cf8e5de4055 fs/lock: show locks taken by processes from another pidns) Merging vfs/for-next (1f15c298fa29 Merge branch 'work.mount' into for-next) CONFLICT (content): Merge conflict in include/uapi/linux/fs.h CONFLICT (content): Merge conflict in include/linux/fs.h Applying: overlayfs: fix up for MS_ constants moving Applying: scsi: cxlflash: update for fs_type->mount API change Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) Merging printk/for-next (ce041c43f222 lib/test_printf.c: accept "ptrval" as valid result for plain 'p' tests) Merging pci/next (ce397d215ccd Linux 4.18-rc1) Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression) Merging hid/for-next (f1b6ae6701a7 Merge branch 'for-4.18/rmi' into for-next) Merging i2c/i2c/for-next (ce397d215ccd Linux 4.18-rc1) Merging dmi/master (7f73745fec52 firmware: dmi: Add access to the SKU ID string) Merging hwmon-staging/hwmon-next (06399c395108 hwmon: (nct7904) Fix UNSPECIFIED_INT warning) Merging jc_docs/docs-next (a49d9c0ae46e Documentation: document hung_task_panic kernel parameter) Merging v4l-dvb/master (f2809d20b925 media: omap2: fix compile-testing with FB_OMAP2=m) Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED()) Merging fbdev/fbdev-for-next (85ebd164de56 fb_omap2: add gpiolib dependency) Merging pm/linux-next (a11bc46ec1ba Merge branches 'pm-core' and 'acpi-soc' into linux-next) Merging cpupower/cpupower (ce397d215ccd Linux 4.18-rc1) Merging idle/next (8a5776a5f498 Linux 4.14-rc4) Merging opp/opp/linux-next (9c290c40ad93 PM / OPP: Update voltage in case freq == old_freq) Merging thermal/next (e9ed3ee61aa6 Merge branches 'thermal-core' and 'thermal-intel' into next) Merging thermal-soc/next (6d7c70d1cd65 thermal: qcom: tsens: Allow number of sensors to come from DT) Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock) Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent) Merging rdma/for-next (33023fb85a42 IB/core: add max_send_sge and max_recv_sge attributes) Merging net-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging bpf-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging ipsec-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging mlx5-next/mlx5-next (d2fb9855b533 Merge commit 'shared-part-of-flow-counters' into mlx5-next) Merging netfilter-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) Merging ipvs-next/master (e523452ac0e0 netfilter: nf_tables: remove unused variables) Merging wireless-drivers-next/master (4cf44d525548 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging bluetooth/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging mac80211-next/master (8ba6731ad4c7 rfkill: add header files to MAINTAINERS) CONFLICT (content): Merge conflict in net/mac80211/scan.c Merging gfs2/for-next (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging mtd/mtd/next (ce397d215ccd Linux 4.18-rc1) Merging nand/nand/next (ce397d215ccd Linux 4.18-rc1) Merging spi-nor/spi-nor/next (ce397d215ccd Linux 4.18-rc1) Merging crypto/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache) Merging drm/drm-next (daf0678c2036 Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-next) Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (b796b9710fd5 drm/i915/icl: Handle hotplug interrupts for DP over TBT) Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI) Merging drm-misc/for-linux-next (069035c5db34 drm: Fix possible race conditions while unplugging DRM device) Merging drm-msm/msm-next (4dd454c371fd drm/msm/gpu: Increase the pm runtime autosuspend for 5xx) Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers) Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) Merging imx-drm/imx-drm/next (518665524272 gpu: ipu-csi: Check for field type alternate) Merging etnaviv/etnaviv/next (f6ffbd4fc1a1 drm/etnaviv: replace license text with SPDX tags) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (ce397d215ccd Linux 4.18-rc1) Merging sound/for-next (a8eaad7b04ea ALSA: line6: stop using get_seconds()) Merging sound-asoc/for-next (db67250fe464 Merge branch 'asoc-4.19' into asoc-next) Merging modules/modules-next (9f2d1e68cf4d module: exclude SHN_UNDEF symbols from kallsyms api) Merging input/next (5aff29efbec0 Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into next) Merging block/for-next (28313cee1d4f Merge branch 'for-4.18/block' into for-next) Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) Merging device-mapper/for-next (8bb82c1c9ad1 dm cache metadata: ensure metadata is committed before writing superblock) Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers) Merging mmc/next (ce397d215ccd Linux 4.18-rc1) Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) Merging md/for-next (bfc9dfdcb6e9 MD: cleanup resources in failure) Merging mfd/for-mfd-next (556c242045f0 mfd: cros_ec: Remove unused __remove function) Merging backlight/for-backlight-next (980d7812fdb4 dt-bindings: pwm-backlight: Move brightness-levels to optional.) Merging battery/for-next (ce397d215ccd Linux 4.18-rc1) Merging regulator/for-next (7bd0c7ba62e8 regulator: Fix typo in comment of struct regulator_linear_range) Merging security/next-testing (d19289133b1d Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-testing) Merging apparmor/apparmor-next (338d0be437ef apparmor: fix ptrace read check) Merging integrity/next-integrity (b5c90a7526fe EVM: unlock on error path in evm_read_xattrs()) Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) Merging selinux/next (ce397d215ccd Linux 4.18-rc1) Merging tpmdd/next (3ac7e6225c0b tpm: migrate tpm2_get_random() to use struct tpm_buf) Merging watchdog/master (16a7eec2fcd0 watchdog: da9063: remove duplicated timeout_to_sel calls) Merging iommu/next (1f568357117c Merge branches 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) Merging vfio/next (c1abca96b252 samples: mbochs: add DMA_SHARED_BUFFER dependency) Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (ce397d215ccd Linux 4.18-rc1) Merging devicetree/for-next (ac840f898808 dt-bindings: Add bitmain vendor prefix) Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX) Merging spi/for-next (bc5408181123 Merge branch 'spi-4.19' into spi-next) Merging tip/auto-latest (cc82cbbdd454 Merge branch 'x86/apic') Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC) Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) Merging edac-amd/for-next (6c974d4dfafe EDAC, i7core: Fix memleaks and use-after-free on probe and remove) Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti support to stm32mp157 pinctrl) Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment) Merging rcu/rcu/next (443da8397d9f rcu: Make rcu_seq_diff() more exact) CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu.c Merging kvm/linux-next (766d3571d8e5 kvm: fix typo in flag name) Merging kvm-arm/next (e25028c8ded0 KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512) Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) Merging kvm-ppc/kvm-ppc-next (ce397d215ccd Linux 4.18-rc1) Merging kvms390/next (2c8180e885c1 KVM: s390: vsie: simplify < 8k address checks) Merging xen-tip/linux-next (7f47e1c52d0c xen/PVH: Make GDT selectors PVH-specific) Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) Merging workqueues/for-next (66448bc274ca workqueue: move function definitions within CONFIG_SMP block) Merging drivers-x86/for-next (26ed9d1c07ef platform/x86: silead_dmi: Add entry for Chuwi Hi8 tablet touchscreen) Merging chrome-platform/for-next (c474e9f2be99 platform/chrome: chromeos_tbmc - fix SPDX identifier) Merging hsi/for-next (ce397d215ccd Linux 4.18-rc1) Merging leds/for-next (6d71021ab3b0 leds: class: ensure workqueue is initialized before setting brightness) Merging ipmi/for-next (ded74ec6b83f ipmi: Change to ktime_get_ts64()) Merging driver-core/driver-core-next (ce397d215ccd Linux 4.18-rc1) Merging usb/usb-next (ce397d215ccd Linux 4.18-rc1) Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue) Merging usb-serial/usb-next (ce397d215ccd Linux 4.18-rc1) Merging usb-chipidea-next/ci-for-usb-next (8bcf4c0bd7fb usb: chipidea: properly handle host or gadget initialization failure) Merging phy-next/next (c1eb8f83845b phy: mediatek: add XS-PHY driver) Merging tty/tty-next (ce397d215ccd Linux 4.18-rc1) Merging char-misc/char-misc-next (ce397d215ccd Linux 4.18-rc1) Merging extcon/extcon-next (441492c2256c extcon: Release locking when sending the notification of connector state) Merging staging/staging-next (3053339b17f8 staging: goldfish: Clear audio read buffer status after each read) Merging mux/for-next (6a3d4baac84a mux: add mux_control_get_optional() API) Merging slave-dma/next (ce397d215ccd Linux 4.18-rc1) Merging cgroup/for-next (d8742e229021 cgroup: css_set_lock should nest inside tasklist_lock) Merging scsi/for-next (5b10177e2dd8 scsi: qla2xxx: Spinlock recursion in qla_target) Merging scsi-mkp/for-next (1b5c2cb19668 scsi: lpfc: update driver version to 12.0.0.4) 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 libata/for-next (03def2fa3e3e Merge branch 'for-4.18-fixes' into for-next) Merging vhost/linux-next (2eb98105f8c7 virtio: update the comments for transport features) Merging rpmsg/for-next (ce397d215ccd Linux 4.18-rc1) Merging gpio/for-next (8968e4ced9b1 Merge branch 'devel' into for-next) Merging pinctrl/for-next (1fd2a5dce0dc Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (ce397d215ccd Linux 4.18-rc1) Merging pwm/for-next (414c52b7899a pwm: stm32: Fix build warning with CONFIG_DMA_ENGINE disabled) Merging userns/for-next (cc8cda3af2ba proc: Simplify and fix proc by removing the kernel mount) CONFLICT (content): Merge conflict in fs/proc/root.c CONFLICT (content): Merge conflict in fs/proc/inode.c $ git reset --hard HEAD Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) Merging random/dev (bfe80ed3d7c7 vsprintf: add command line option debug_boot_weak_hash) Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) Merging kselftest/next (eb83d5f7d07e selftests: sparc64: Add missing SPDX License Identifiers) Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string definition) Merging livepatching/for-next (d7ab8e67aa52 Merge branch 'for-4.18/upstream' into for-next) Merging coresight/next (dd2e68bb385e coresight: Handle errors in finding input/output ports) Merging rtc/rtc-next (ce397d215ccd Linux 4.18-rc1) Merging nvdimm/libnvdimm-for-next (d95363c95705 Merge branch 'for-4.18/dax-memory-failure' into libnvdimm-for-next) Merging at24/at24/for-next (ce397d215ccd Linux 4.18-rc1) Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch) Merging kspp/for-next/kspp (45888b40d2a6 rslib: Allocate decoder buffers to avoid VLAs) Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging cisco/for-next (5997aab0a11e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging xarray/xarray (8cfaadd09f30 test_xarray: Add missing MODULE information) Applying: filesystem-dax: fixups for xaarray changes Merging akpm-current/current (8b95a15d84a1 bfs: add sanity check at bfs_fill_super()) CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c $ git checkout -b akpm remotes/origin/akpm/master Applying: kernel/kexec_file.c: add walk_system_ram_res_rev() Applying: kernel/kexec_file.c: load kernel at top of system RAM if required Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Applying: sparc64: NG4 memset 32 bits overflow Merging akpm/master (6e204a5b5216 sparc64: NG4 memset 32 bits overflow)
Attachment:
pgp3lcKSbgcft.pgp
Description: OpenPGP digital signature
