Hi all, Note: please do *not* add any v4.19 material to your linux-next included branches until after v4.18-rc1 has been released. Changes since 20180614: The overlayfs tree gained conflicts against Linus' tree. Non-merge commits (relative to Linus' tree): 778 600 files changed, 13285 insertions(+), 9945 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 278 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 (b5d903c2d656 Merge branch 'akpm' (patches from Andrew)) 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 (2837461dbe6f Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) 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 (82034c23fcbc arm64: Make sure permission updates happen for pmd/pud) 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 (7f6afc338405 Merge branch 'l2tp-fixes') Merging bpf/master (3bce593ac06b selftests: bpf: config: add config fragments) Merging ipsec/master (d6990976af7c vti6: fix PMTU caching and reporting on xmit) Merging netfilter/master (60d061e34703 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) Merging ipvs/master (312564269535 net: netsec: reduce DMA mask to 40 bits) Merging wireless-drivers/master (ab1068d6866e iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs) Merging mac80211/master (885892fb378d mlx4_core: restore optimal ICM memory allocation) Merging rdma-fixes/for-rc (1eb9364ce81d IB/uverbs: Fix ordering of ucontext check in ib_uverbs_write) Merging sound-current/for-linus (ad6baae62381 ALSA: usb-audio: Always create the interrupt pipe for the mixer) Merging sound-asoc-fixes/for-linus (2858e2cfc2ef Merge branch 'asoc-4.17' into asoc-linus) Merging regmap-fixes/for-linus (97fe106a8027 Merge branch 'regmap-4.17' into regmap-linus) Merging regulator-fixes/for-linus (59ce5f3e5530 Merge branch 'regulator-4.17' into regulator-linus) Merging spi-fixes/for-linus (5d3257b8ea48 Merge branch 'spi-4.17' into spi-linus) Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages) Merging driver-core.current/driver-core-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') Merging tty.current/tty-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') Merging usb.current/usb-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') Merging usb-gadget-fixes/fixes (6d08b06e67cd Linux 4.17-rc2) Merging usb-serial-fixes/usb-linus (75bc37fefc44 Linux 4.17-rc4) 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 (3ca24ce9ff76 Merge branch 'proc-cmdline') Merging char-misc.current/char-misc-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') Merging input-current/for-linus (01f7e67a053f Merge branch 'next' into for-linus) Merging crypto-current/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache) 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 (89c29def6b01 Revert "vfio/type1: Improve memory pinning process for raw PFN mapping") Merging kselftest-fixes/fixes (75bc37fefc44 Linux 4.17-rc4) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (dbad41e7bb5f dmaengine: qcom: bam_dma: check if the runtime pm enabled) Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) Merging mtd-fixes/master (9f825e74d761 mtd: rawnand: Fix return type of __DIVIDE() when called with 32-bit) 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 (d8a9a51afaa9 MIPS: pb44: Fix i2c-gpio GPIO descriptor table) 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 (da81850b2c82 hwmon: (nct6775) Fix loop limit) Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4) Merging btrfs-fixes/next-fixes (3a7e0e2622f6 Merge branch 'misc-4.18' into next-fixes) Merging vfs-fixes/fixes (b1b94fcbd399 Revert "fs: fold open_check_o_direct into do_dentry_open") Merging dma-mapping-fixes/for-linus (4dc6d8e22728 Revert "iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()") Merging drivers-x86-fixes/fixes (32ffd6e8d1f6 platform/x86: asus-wmi: Fix NULL pointer dereference) Merging samsung-krzk-fixes/fixes (60cc43fc8884 Linux 4.17-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (60cc43fc8884 Linux 4.17-rc1) Merging devicetree-fixes/dt/linus (737dd8e1a4c4 Documentation: devicetree: tilcdc: fix spelling mistake "suppors" -> "supports") Merging scsi-fixes/fixes (5b10177e2dd8 scsi: qla2xxx: Spinlock recursion in qla_target) Merging drm-intel-fixes/for-linux-next-fixes (65b3bdc807ac drm/i915/query: nospec expects no more than an unsigned long) Merging mmc-fixes/fixes (3de06d5a1f05 mmc: sdhci-iproc: add SDHCI_QUIRK2_HOST_OFF_CARD_ON for cygnus) Merging rtc-fixes/rtc-fixes (60cc43fc8884 Linux 4.17-rc1) Merging drm-misc-fixes/for-linux-next-fixes (c7d6d511eb56 drm/bridge/sii8620: fix HDMI cable connection to dongle) Merging kbuild/for-next (2837461dbe6f Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) 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 (73acc0315cd7 ARM: mcpm, perf/arm-cci: export mcpm_is_available) Merging arm-soc/for-next (c7953e19db50 ARM: Document merges) Merging actions/for-next (7858428186db 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 (550ca2e6c090 Merge branch 'fixes-for-v4.18' into next) Merging rockchip/for-next (42568f346f65 Merge branch 'v4.18-clk/next' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (fba97222728d Merge branch 'next/dt64' into for-next) Merging sunxi/sunxi/for-next (e97360054391 Merge branch 'sunxi/dt64-for-4.18' 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 (082f55c45984 m68k: fix ColdFire PCI config reads and writes) Merging microblaze/next (5cf8da7bc035 microblaze: Remove architecture heart beat code) Merging mips/mips-next (9ed8b56b80c1 MAINTAINERS: Add Paul Burton as MIPS co-maintainer) 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 powerpc-pkey/topic/pkey (d86a4ba02fc6 powerpc/pkeys: Drop private VM_PKEY definitions) 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 (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits) Applying: f2fs: fixup for cgroup/writeback change Merging btrfs-kdave/for-next (e4eada7b2b40 Merge branch 'for-next-current-v4.17-20180608' into for-next-20180608) Merging ceph/master (23edca864951 rbd: flush rbd_dev->watch_dwork after watch is unregistered) Merging cifs/for-next (9b00c628b652 cifs: Fix kernel oops when traceSMB is enabled) 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 (4f2f76f75143 ext4: fix fencepost error in check for inode count overflow during resize) 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 (d5681f59ee3d NFS: Fix an rcu deadlock in nfs_delegation_find_inode()) Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes) Merging nfsd/nfsd-next (fdfeda224cb7 nfsd: update obselete comment referencing the BKL) 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 (5f181c9ca108 Merge branch 'work.compat' into for-next) Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) Merging printk/for-next (8bafa2a44ff3 Merge branch 'for-4.18-vsprintf-pcr-removal' into for-4.18) Merging pci/next (ce4c7b241227 Merge branch 'pci/aer-squash') 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 (1840b5ac656f Merge branch 'i2c/for-4.18' into i2c/for-next) Merging dmi/master (5cb06cfce4a8 firmware: dmi: Add access to the SKU ID string) Merging hwmon-staging/hwmon-next (c9bdf291542e hwmon: (asus_atk0110) Make use of device managed memory) 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) CONFLICT (content): Merge conflict in drivers/video/fbdev/mmp/fb/mmpfb.c Merging pm/linux-next (c243466225cb Merge branch 'acpi-soc' into linux-next) Merging cpupower/cpupower (f9652d5cae04 cpupower : Fix header name to read idle state name) Merging idle/next (8a5776a5f498 Linux 4.14-rc4) Merging opp/opp/linux-next (8a352fd8787c OPP: Allow same OPP table to be used for multiple genpd) 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 (c1191a19feca RDMA/mlx5: Update SPDX tags to show proper license) 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 (f03329627b46 Merge branch 'hns3-next') Merging netfilter-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging nfc-next/master (7579d009c4a1 NFC: fdp: Remove __func__ from dev_dbg()) Merging ipvs-next/master (e523452ac0e0 netfilter: nf_tables: remove unused variables) Merging wireless-drivers-next/master (76606886c9f4 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging bluetooth/master (3a979e8c07e3 Merge tag 'mailbox-v4.18' of git://git.linaro.org/landing-teams/working/fujitsu/integration) Merging mac80211-next/master (7d840a606515 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging gfs2/for-next (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging mtd/mtd/next (b771327a4530 Merge tag 'spi-nor/for-4.18' of git://git.infradead.org/linux-mtd into mtd/next) Merging nand/nand/next (f567c71f4f91 mtd: nand: Pass mode information to nand_page_io_req) Merging spi-nor/spi-nor/next (771ff17e82fa mtd: spi-nor: Add support for EN25QH32) 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 (807cba6559cf Merge tag 'gvt-fixes-2018-04-19' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) 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 (66431563e0d9 Merge branch 'regmap-4.18' into regmap-next) Merging sound/for-next (ad6baae62381 ALSA: usb-audio: Always create the interrupt pipe for the mixer) Merging sound-asoc/for-next (5544717d416d Merge branch 'asoc-4.18' into asoc-next) Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign) 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 (48debafe4f2f dm: add writecache target) Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers) Merging mmc/next (ef5332c10d4f mmc: renesas_sdhi: really fix WP logic regressions) Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) Merging md/for-next (07ecb3a36765 MD: cleanup resources in failure) Merging mfd/for-mfd-next (556c242045f0 mfd: cros_ec: Remove unused __remove function) Merging backlight/for-backlight-next (d5318d302e7c backlight: as3711_bl: Fix Device Tree node leaks) Merging battery/for-next (c42812da1395 MAINTAINERS: add entry for LEGO MINDSTORMS EV3) Merging regulator/for-next (13ed4964057e Merge branch 'regulator-4.17' into regulator-4.18 merge window) 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 (d141136f523a audit: normalize MAC_POLICY_LOAD record) 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 (5b71388663c0 audit: Fix wrong task in comparison of session ID) Merging devicetree/for-next (44acf1058790 dt-bindings: submitting-patches: add guidance on patch content and subject) Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX) Merging spi/for-next (39202ebf0939 Merge branch 'spi-4.18' 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 (eaa3a1d46cfd EDAC, ghes: Make platform-based whitelisting x86-only) 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 (f61e0d3cc4ae KVM: PPC: Book3S PR: Fix failure status setting in tabort. emulation) 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 (5cd7e690bdc1 platform/chrome: chromeos_tbmc - fix SPDX identifier) Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t) Merging leds/for-next (6d71021ab3b0 leds: class: ensure workqueue is initialized before setting brightness) Merging ipmi/for-next (048f7c3e352e ipmi: Properly release srcu locks on error conditions) Merging driver-core/driver-core-next (3ca24ce9ff76 Merge branch 'proc-cmdline') Merging usb/usb-next (3ca24ce9ff76 Merge branch 'proc-cmdline') Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue) Merging usb-serial/usb-next (7041d9c3f01b USB: serial: pl2303: add support for tx xon/xoff flow control) 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 (3ca24ce9ff76 Merge branch 'proc-cmdline') Merging char-misc/char-misc-next (3ca24ce9ff76 Merge branch 'proc-cmdline') Merging extcon/extcon-next (1da1063a16b4 extcon: usbc-cros-ec: Switch to SPDX identifier.) Merging staging/staging-next (3ca24ce9ff76 Merge branch 'proc-cmdline') Merging mux/for-next (6a3d4baac84a mux: add mux_control_get_optional() API) Merging slave-dma/next (c79c2212f7c9 Merge branch 'for-linus' into next) 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 (ed058253618e Merge branch 'for-4.17-fixes' into for-next) Merging vhost/linux-next (2eb98105f8c7 virtio: update the comments for transport features) Merging rpmsg/for-next (1601c6923d66 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (3079a27868c4 gpio: uniphier: set legitimate irq trigger type in .to_irq hook) Merging pinctrl/for-next (d2b6d0c74dd0 pinctrl: mt7622: fix a kernel panic when pio don't work as EINT controller) Merging pinctrl-samsung/for-next (7c24e71c8a64 pinctrl: samsung: Fix suspend/resume for Exynos5433 GPF1..5 banks) Merging pwm/for-next (414c52b7899a pwm: stm32: Fix build warning with CONFIG_DMA_ENGINE disabled) Merging userns/for-next (4b245b90065b Merge of my siginfo-next and userns-next trees for testing in linux-next) 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 (53c3daf8cfea kselftest/cgroup: fix a signedness bug) 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 (b66e01615a29 coresight: tmc: Add configuration support for trace buffer size) CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-tmc-etr.c Merging rtc/rtc-next (e4302aec8a06 rtc: pxa: fix probe function) Merging nvdimm/libnvdimm-for-next (d95363c95705 Merge branch 'for-4.18/dax-memory-failure' into libnvdimm-for-next) Merging at24/at24/for-next (73b0d922cd5b eeprom: at24: provide a separate routine for creating dummy i2c clients) Merging ntb/ntb-next (c9160b69258e ntb: ntb_transport: Replace GFP_ATOMIC with GFP_KERNEL in ntb_transport_create_queue) 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 akpm-current/current (8b95a15d84a1 bfs: add sanity check at bfs_fill_super()) $ 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 (90c98c66ca9f sparc64: NG4 memset 32 bits overflow)
Attachment:
pgpWR3b2acgvQ.pgp
Description: OpenPGP digital signature
