Hi all, Changes since 20180508: New tree: mediatek The net-next tree gained conflicts against the net tree. The nvdimm tree gained a conflict against the jc_docs tree. The akpm-current tree gained a conflict against the jc_docs tree. Non-merge commits (relative to Linus' tree): 4827 4713 files changed, 182710 insertions(+), 86191 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 258 trees (counting Linus' and 44 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 (036db8bd9637 Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata) 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 (0da7e4326114 genksyms: fix typo in parse.tab.{c,h} generation rules) Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) Merging arm-current/fixes (30cfae461581 ARM: replace unnecessary perl with sed and the shell $(( )) operator) Merging arm64-fixes/for-next/fixes (3789c122d0a0 arm64: avoid instrumenting atomic_ll_sc.o) Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment) Merging powerpc-fixes/fixes (b2d7ecbe3556 powerpc/kvm/booke: Fix altivec related build break) Merging sparc/master (fff75eb2a08c Merge tag 'errseq-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (42f02130f980 Merge tag 'linux-can-fixes-for-4.17-20180508' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can) Merging bpf/master (2ba5622fba85 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging ipsec/master (2c5d5b13c6eb llc: better deal with too small mtu) Merging netfilter/master (ccc4ef2178bf netfilter: nf_tables: bogus EBUSY in chain deletions) Merging ipvs/master (2f99aa31cd7a netfilter: nf_tables: skip synchronize_rcu if transaction log is empty) Merging wireless-drivers/master (a8d7aa17bbc9 dccp: fix tasklet usage) Merging mac80211/master (914eac248d87 mac80211: use timeout from the AddBA response instead of the request) Merging rdma-fixes/for-rc (9aa169213d11 RDMA/cma: Do not query GID during QP state transition to RTR) Merging sound-current/for-linus (f13876e2c33a ALSA: pcm: Check PCM state at xfern compat ioctl) Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages) Merging driver-core.current/driver-core-linus (6da6c0db5316 Linux v4.17-rc3) Merging tty.current/tty-linus (6da6c0db5316 Linux v4.17-rc3) Merging usb.current/usb-linus (75bc37fefc44 Linux 4.17-rc4) Merging usb-gadget-fixes/fixes (ed769520727e usb: gadget: composite Allow for larger configuration descriptors) Merging usb-serial-fixes/usb-linus (4842ed5bfcb9 USB: serial: visor: handle potential invalid device configuration) 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 (6da6c0db5316 Linux v4.17-rc3) Merging char-misc.current/char-misc-linus (6da6c0db5316 Linux v4.17-rc3) Merging input-current/for-linus (f6eeb9e54857 Input: atmel_mxt_ts - add missing compatible strings to OF device table) Merging crypto-current/master (eea0d3ea7546 crypto: drbg - set freed buffers to NULL) Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') Merging vfio-fixes/for-linus (834814e80268 Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it") Merging kselftest-fixes/fixes (c28077035ef3 tools/testing/selftests/x86: fix error: conflicting types for 'pkey_get|pkey_set') Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) 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 (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown) Merging v4l-dvb-fixes/fixes (b84c8fdf8e6c 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 (b3d7e55c3f88 MIPS: uaccess: Add micromips clobbers to bzero invocation) Merging kvm-fixes/master (ecf08dad723d KVM: x86: remove APIC Timer periodic/oneshot spikes) Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries) Merging drm-intel-fixes/for-linux-next-fixes (e8f48f96db7e drm/i915: Fix drm:intel_enable_lvds ERROR message in kernel log) Merging drm-misc-fixes/for-linux-next-fixes (7a109673899b drm/bridge/sii8620: add Kconfig dependency on extcon) Merging kbuild/for-next (8b31e5b10006 kbuild: deb-pkg improve maintainer address generation) 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 (325ef1857fff PCI: remove PCI_DMA_BUS_IS_PHYS) 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 (6dc8c9d147dd Merge branches 'fixes' and 'sa1100-for-next' into for-next) Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap()) Merging arm-soc/for-next (c12d7e9fe9af ARM: defconfig: Update Gemini defconfig) Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next) Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) Merging amlogic/for-next (8d7604c70869 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 (75ed360763f2 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into next) Merging mediatek/for-next (2916ebd42a41 Merge branch 'v4.17-next/soc' into for-next) Merging mvebu/for-next (e76bec8e643a Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (82ce9553c47f Merge branch 'omap-for-v4.17/fixes' into for-next) Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control) Merging qcom/for-next (c9fe09a79371 soc: Unconditionally include qcom Makefile) Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) Merging renesas/next (a778b21e5af9 Merge branch 'dt-for-v4.18' into next) Merging rockchip/for-next (18effb31d2ab Merge branch 'v4.18-armsoc/dts32' into for-next) CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (cc4b07f8156c Merge branch 'next/dt' into for-next) Merging sunxi/sunxi/for-next (ed1e86a06ef0 Merge branches 'sunxi/clk-for-4.18' and 'sunxi/dt64-for-4.18' into sunxi/for-next) Merging tegra/for-next (0331f709c1b5 Merge branch for-4.18/arm64/dt into for-next) Merging arm64/for-next/core (24534b351182 arm64: assembler: add macros to conditionally yield the NEON under PREEMPT) Merging clk/clk-next (96695741a646 Merge branch 'clk-qcom-sdm845' 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 (f245ff73dbe9 m68k: Use read_persistent_clock64() consistently) Merging m68knommu/for-next (262afd3d980b m68k: fix ColdFire PCI config reads and writes) Merging microblaze/next (a7a9e2f0410d microblaze: dts: replace 'linux,stdout-path' with 'stdout-path') Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next) Merging mips-james/mips-next (23f8adc497b7 MIPS: BCM47XX: Use __initdata for the bcm47xx_leds_pdata) Merging nds32/next (a4d23d2735a6 nds32: To fix a cache inconsistency issue by setting correct cacheability of NTC) 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 (07943d6329dc parisc: Build kernel without -ffunction-sections) Merging powerpc/next (7acf50e4efa6 Revert "powerpc/powernv: Increase memory block size to 1GB on radix") Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) Merging risc-v/for-next (6d08b06e67cd Linux 4.17-rc2) Merging s390/features (9e3f004f8088 s390: introduce compile time check for empty .bss section) Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) Merging sh/for-next (bf9c7e3d7924 arch/sh: pcie-sh7786: handle non-zero DMA offset) Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic) Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) Merging fscrypt/master (6da6c0db5316 Linux v4.17-rc3) 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 (a536b3a032a5 Merge branch 'for-next-next-v4.18-20180501' into for-next-20180501) Merging ceph/master (9c55ad1c214d libceph: validate con->state at the top of try_write()) Merging cifs/for-next (a9c849522509 cifs: update internal module version number for cifs.ko to 2.12) 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 (b1255ee6a289 Pull UDF UTF-16 handling improvements.) Merging ext4/dev (7ef79ad52136 ext4: add MODULE_SOFTDEP to ensure crc32c is included in the initramfs) Merging f2fs/dev (5b19d284f519 f2fs: avoid fsync() failure caused by EAGAIN in writepage()) Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation) Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) Merging nfs/linux-next (036db8bd9637 Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata) Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes) Merging nfsd/nfsd-next (36e000768550 nfsd: update obselete comment referencing the BKL) Merging orangefs/for-next (8e9ba5c48ea6 Orangefs: documentation updates) Merging overlayfs/overlayfs-next (16149013f839 ovl: update documentation w.r.t "xino" feature) Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND) Merging xfs/for-next (021ba8e98fe5 xfs: cap the length of deduplication requests) Merging file-locks/locks-next (7a107c0f55a3 fasync: Fix deadlock between task-context and interrupt-context kill_fasync()) Merging vfs/for-next (d944db1fd238 Merge branches 'work.dcache' and 'work.misc' into for-next) Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) Merging printk/for-next (f8521c77fcd4 Merge branch 'for-4.18-vsprintf-cleanup' into for-4.18) Merging pci/next (276a20f7e4a6 Merge branch 'pci/virtualization') CONFLICT (content): Merge conflict in arch/microblaze/include/asm/pci.h Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression) Merging hid/for-next (4936066ffbe9 Merge branch 'for-4.17/upstream-fixes' into for-next) Merging i2c/i2c/for-next (f4df00a90ce6 Merge branch 'i2c/for-current' into i2c/for-next) Merging dmi/master (5cb06cfce4a8 firmware: dmi: Add access to the SKU ID string) Merging hwmon-staging/hwmon-next (e6eb731f2b42 hwmon: (ltc2990) Fix incorrect conversion of negative temperatures) Merging jc_docs/docs-next (a9251553c225 Documentation: refcount-vs-atomic: Update reference to LKMM doc.) Merging v4l-dvb/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED()) Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED()) Merging fbdev/fbdev-for-next (85d108dee574 video: omap: Improve a size determination in omapfb_do_probe()) Merging pm/linux-next (4bb6e91f1729 Merge branch 'pm-cpufreq' into linux-next) Merging cpupower/cpupower (7928b2cbe55b Linux 4.16-rc1) Merging idle/next (8a5776a5f498 Linux 4.14-rc4) Merging opp/opp/linux-next (ef9a795777f5 PM / OPP: Remove dev_pm_opp_{un}register_get_pstate_helper()) Merging thermal/next (ad9a81b82d71 Merge branch 'thermal-soc' into next) Merging thermal-soc/next (9efc58dfa14a thermal: mediatek: use of_device_get_match_data()) Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) Merging dlm/next (f706d830154b dlm: make sctp_connect_to_sock() return in specified time) Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) Merging rdma/for-next (056f9c7f39bf iw_cxgb4: dump detailed driver-specific QP information) CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_resp.c Merging net-next/master (53a7bdfb2a27 dt-bindings: dsa: Remove unnecessary #address/#size-cells) CONFLICT (content): Merge conflict in tools/testing/selftests/net/Makefile CONFLICT (content): Merge conflict in net/tls/tls_main.c CONFLICT (content): Merge conflict in kernel/bpf/syscall.c CONFLICT (modify/delete): arch/s390/net/bpf_jit.S deleted in net-next/master and modified in HEAD. Version HEAD of arch/s390/net/bpf_jit.S left in tree. $ git rm -f arch/s390/net/bpf_jit.S Merging bpf-next/master (d1123b6f877b Merge branch 'bpf-fib-lookup-helper') Merging ipsec-next/master (724e47a149f5 net-next/hinic: add pci device ids for 25ge and 100ge card) Merging netfilter-next/master (90278871d4b0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next) Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support) Merging ipvs-next/master (90278871d4b0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next) Merging wireless-drivers-next/master (c990affd5abc mt76x2: fix avg_rssi estimation) Merging bluetooth/master (7f98779fd9b3 Bluetooth: Add a new 13d3:3496 QCA_ROME device) CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi Merging mac80211-next/master (57c6cb81717f mac80211: ethtool: avoid 32 bit multiplication overflow) Merging gfs2/for-next (9a38662ba4e2 gfs2: Remove sdp->sd_jheightsize) Merging mtd/master (fc3a9e15b492 mtd: rawnand: Make sure we wait tWB before polling the STATUS reg) Merging l2-mtd/mtd/next (0fe3ede7941d mtd: cfi: Add early fixup for S70GL02GS) Merging nand/nand/next (bb415dff3ab7 dt-bindings: mtd: mtk-nand: Update properties description) Merging spi-nor/spi-nor/next (f134fbbb4ff8 mtd: spi-nor: clear Winbond Extended Address Reg on switch to 3-byte addressing.) Merging crypto/master (158b52ff1436 crypto: ghash-clmulni - fix spelling mistake: "acclerated" -> "accelerated") Merging drm/drm-next (8eb008c80841 Merge tag 'drm-intel-next-2018-04-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) Applying: drm/xen-front: merge fix for "drivers: remove force dma flag from buses" Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (0adb90d330bb drm/i915: Annotate timeline lock nesting) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c Merging drm-tegra/drm/tegra/for-next (5cb02b3dbbe9 drm/tegra: dc: Rename supports_blending to has_legacy_blending) Merging drm-misc/for-linux-next (3131f209468d drm/vc4: Fix leak of the file_priv that stored the perfmon.) Merging drm-msm/msm-next (64cb96587ba6 drm/msm: Switch to atomic_helper_commit()) 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 (22cd2b2b3151 drm/imx: Remove last traces of struct imx_drm_crtc) Merging etnaviv/etnaviv/next (0b50dffa736b drm/etnaviv: remove register logging) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (76f721867da6 Merge branch 'regmap-4.18' into regmap-next) Merging sound/for-next (10aa7cad37d3 ALSA: pcm: Hide local_irq_disable/enable() and local_irqsave/restore()) Merging sound-asoc/for-next (f757bba9661f Merge remote-tracking branches 'asoc/topic/doc' and 'asoc/topic/trace' into asoc-next) Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign) Merging input/next (d91abc21e1e6 Input: alps - demystify trackstick initialization for v3 and v6 protocols) Merging block/for-next (782f569774d7 blk-wbt: throttle discards like background writes) Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) Merging device-mapper/for-next (65972a6fa914 dm mirror: remove VLA usage) Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers) Merging mmc/next (cf56c819c851 mmc: tegra: remove redundant return statement) Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) Merging md/for-next (643369299cfe raid5: copy write hint from origin bio to stripe) Merging mfd/for-mfd-next (ae0280fe1689 mfd: tps65911-comparator: Fix a build error) Merging backlight/for-backlight-next (840d40d941bf MAINTAINERS: Add dri-devel for backlight subsystem patches) Merging battery/for-next (1f140ff46708 Merge tag 'tags/tcpm-pps-4.18' into psy-next) CONFLICT (content): Merge conflict in drivers/usb/core/hcd.c Merging regulator/for-next (907219ad8036 Merge branch 'regulator-4.18' into regulator-next) Merging security/next-testing (5859cdf55063 smack: provide socketpair callback) Merging apparmor/apparmor-next (938df8352997 apparmor: update git and wiki locations in AppArmor docs) Merging integrity/next-integrity (3dea0d93d257 ima: Unify logging) 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 (3e9139deb505 tpm/st33zp24: Fix spelling mistake in macro ST33ZP24_TISREGISTER_UKNOWN) Merging watchdog/master (6d08b06e67cd Linux 4.17-rc2) Merging iommu/next (00dcb938d482 Merge branches 'iommu/fixes', '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 (da9147140fe3 MAINTAINERS: vfio/platform: Update sub-maintainer) Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (326bee0286d7 seccomp: Don't special case audited processes when logging) Merging devicetree/for-next (ca3923bd91d0 Merge branch 'dt/linus' into for-next) Merging mailbox/mailbox-for-next (dfbc9c5841fc mailbox: Remove depends on HAS_DMA in case of platform dependency) Merging spi/for-next (2494ff4aee74 Merge branch 'spi-4.18' into spi-next) Merging tip/auto-latest (a9b6b3b055ea Merge branch 'x86/vdso') CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c Merging clockevents/clockevents/next (0136c741ff40 clocksource/drivers/imx-tpm: Add different counter width support) 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 (83e548bea4e7 EDAC, i7core: Fix spelling mistake: "redundacy" -> "redundancy") Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when updating irq type) Merging ftrace/for-next (0c5a9acc8b4e tracing: Fix the file mode of stack tracer) Merging rcu/rcu/next (993f6f9ce964 rcutorture: Make kvm-find-errors.sh find close calls) Merging kvm/linux-next (c18bb396d3d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kvm-arm/next (dc6ed61d2f82 arm64: Add temporary ERRATA_MIDR_ALL_VERSIONS compatibility macro) Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) Merging kvm-ppc/kvm-ppc-next (31c8b0d0694a KVM: PPC: Book3S HV: Use __gfn_to_pfn_memslot() in page fault handler) Merging kvms390/next (911eeef91b48 KVM: s390: generalize kvm_s390_get_tod_clock_ext()) Merging xen-tip/linux-next (d1ecfa9d1f40 x86/xen: Reset VCPU0 info pointer after shared_info remap) Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next) Merging drivers-x86/for-next (6ed66c3ce095 platform/x86: Kconfig: Fix dell-laptop dependency chain.) Merging chrome-platform/for-next (60cc43fc8884 Linux 4.17-rc1) Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t) Merging leds/for-next (d54e5b522202 leds: wm831x-status: Use sysfs_match_string() helper) Merging ipmi/for-next (1211229399b3 ipmi_ssif: Fix uninitialized variable issue) Merging driver-core/driver-core-next (cd4846c5a68d Merge 4.17-rc3 into driver-core-next) Merging usb/usb-next (58318cd4df41 Merge 4.17-rc4 into usb-next) Merging usb-gadget/next (60cc43fc8884 Linux 4.17-rc1) Merging usb-serial/usb-next (4d304a6fe935 USB: serial: option: blacklist unused dwm-158 interfaces) Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53) Merging phy-next/next (cd3bf368aa7a phy: Add a driver for the ATH79 USB phy) Merging tty/tty-next (7b6c81f46c5d Merge 4.17-rc3 into tty-next) Merging char-misc/char-misc-next (720d690e3680 Merge 4.17-rc3 into char-misc-next) Merging extcon/extcon-next (60cc43fc8884 Linux 4.17-rc1) Merging staging/staging-next (26a5e9b834a6 staging: mt7621-eth: Alignment should match open parenthesis) Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API) Merging slave-dma/next (bdcc9aeeaa15 Merge branch 'topic/sprd' into next) Merging cgroup/for-next (c43c5ea75fd5 cgroup: Make cgroup_rstat_updated() ready for root cgroup usage) Merging scsi/for-next (5d2e147b4963 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (33d065ccb3b2 scsi: tcmu: refactor nl wr_cache attr with new helpers) 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 (66b3b806027e Merge branch 'for-4.17-fixes' into for-next) Merging vhost/linux-next (cfcde40e8ce3 ACPI: disable extra P_LVLx access on KVM) Merging rpmsg/for-next (c8b62c8851ba Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (22bd82b645bc Merge branch 'devel' into for-next) Merging pinctrl/for-next (8e12867fb27d Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (0ca0557e3727 pinctrl: samsung: Remove support for Exynos5440) Merging pwm/for-next (692099cdcf27 pwm: simplify getting .drvdata) Merging userns/for-next (530621b79f9e signal/um: More carefully relay signals in relay_signal.) Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) Merging random/dev (9e66317d3c92 Linux 4.14-rc3) Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) Merging kselftest/next (75bc37fefc44 Linux 4.17-rc4) Merging y2038/y2038 (5dc0b1529d21 y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop) Merging livepatching/for-next (3beed9bf1e3d Merge branch 'for-4.17/upstream-fixes' into for-next) Merging coresight/next (659d7e66340e coresight: Remove %px for printing pcsr value) Merging rtc/rtc-next (22cb47c1ea20 rtc: stm32: get DBP register and mask from DT st, syscfg property) Merging nvdimm/libnvdimm-for-next (f4fa55a42610 Merge branch 'for-4.17/dax' into libnvdimm-for-next) CONFLICT (content): Merge conflict in mm/hmm.c Merging at24/at24/for-next (22e06c32b936 eeprom: at24: provide a separate routine for creating dummy i2c clients) Merging ntb/ntb-next (9b42913698a1 ntb: intel: change references of skx to gen3) Merging kspp/for-next/kspp (bd80928a6e0a Merge branch 'kspp/gcc-plugin/stackleak-v11' into for-next/kspp) Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging akpm-current/current (d862138d207d ipc/shm: fix shmat() nil address after round-down when remapping) CONFLICT (modify/delete): Documentation/features/vm/pte_special/arch-support.txt deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of Documentation/features/vm/pte_special/arch-support.txt left in tree. $ git rm -f Documentation/features/vm/pte_special/arch-support.txt $ git checkout -b akpm remotes/origin/akpm/master Applying: mm: use octal not symbolic permissions Applying: treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX 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 (9703ae100044 sparc64: NG4 memset 32 bits overflow)
Attachment:
pgp2u8KEPxDBV.pgp
Description: OpenPGP digital signature
