Hi all, Changes since 20180308: The sunxi tree lost its build failure. The akpm-current tree still had its build failure for which I reverted a commit. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 5958 6369 files changed, 254856 insertions(+), 166263 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 260 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 (1b88accf6a65 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging fixes/master (7928b2cbe55b Linux 4.16-rc1) Merging kbuild-current/fixes (55fe6da9efba kbuild: Handle builtin dtb file names containing hyphens) Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) Merging arm-current/fixes (091f02483df7 ARM: net: bpf: clarify tail_call index) Merging arm64-fixes/for-next/fixes (b08e5fd90bfc arm_pmu: Use disable_irq_nosync when disabling SPI in CPU teardown hook) Merging m68k-current/for-linus (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (b0c41b8b6e43 powerpc/pseries: Fix vector5 in ibm architecture vector table) Merging sparc/master (aebb48f5e465 sparc64: fix typo in CONFIG_CRYPTO_DES_SPARC64 => CONFIG_CRYPTO_CAMELLIA_SPARC64) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (7f7f6262a57b Merge branch 'hv_netvsc-fix-multicast-flags-and-sync') Merging bpf/master (cfda06d7362b Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging ipsec/master (87cdf3148b11 xfrm: Verify MAC header exists before overwriting eth_hdr(skb)->h_proto) Merging netfilter/master (0d3601d2994a netfilter: nft_set_hash: skip fixed hash if timeout is specified) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (455f3e76cfc0 brcmfmac: fix P2P_DEVICE ethernet address generation) Merging mac80211/master (a78872363614 cfg80211: add missing dependency to CFG80211 suboptions) Merging rdma-fixes/for-rc (a5880b844303 RDMA/ucma: Check that user doesn't overflow QP state) Merging sound-current/for-linus (099fd6ca0ad2 ALSA: hda: add dock and led support for HP ProBook 640 G2) Merging pci-current/for-linus (fc110ebdd014 PCI: dwc: Fix enumeration end when reaching root subordinate) Merging driver-core.current/driver-core-linus (661e50bc8532 Linux 4.16-rc4) Merging tty.current/tty-linus (5d7f77ec72d1 serial: imx: fix bogus dev_err) Merging usb.current/usb-linus (015dbeb22820 usb: host: xhci-rcar: add support for r8a77965) Merging usb-gadget-fixes/fixes (c6ba5084ce0d usb: gadget: udc: renesas_usb3: add binging for r8a77965) Merging usb-serial-fixes/usb-linus (7920a87c40db USB: serial: cp210x: add ELDAT Easywave RX09 id) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (4fbda74501ee phy: qcom-ufs: add MODULE_LICENSE tag) Merging staging.current/staging-linus (740a5759bf22 staging: android: ashmem: Fix possible deadlock in ashmem_ioctl) Merging char-misc.current/char-misc-linus (655296c8bbef Drivers: hv: vmbus: Fix ring buffer signaling) Merging input-current/for-linus (5444a992b4a7 Revert "Input: synaptics - Lenovo Thinkpad T460p devices should use RMI") Merging crypto-current/master (c927b080c67e crypto: s5p-sss - Fix kernel Oops in AES-ECB mode) Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') Merging vfio-fixes/for-linus (563b5cbe334e iommu/arm-smmu-v3: Cope with duplicated Stream IDs) Merging kselftest-fixes/fixes (ba004a2955f7 selftests: memory-hotplug: fix emit_tests regression) 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 (2c27476e398b media: dvb: fix a Kconfig typo) Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation) Merging mips-fixes/mips-fixes (06a3f0c9f272 MIPS: BMIPS: Do not mask IPIs during suspend) Merging kvm-fixes/master (45e3b4759d23 Merge tag 'kvm-s390-master-4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux) Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries) Merging drm-intel-fixes/for-linux-next-fixes (88d3dfb6a690 drm/i915: Suspend submission tasklets around wedging) Merging drm-misc-fixes/for-linux-next-fixes (fd00c4ee76f0 drm/sun4i: crtc: Call drm_crtc_vblank_on / drm_crtc_vblank_off) Merging kbuild/for-next (240955103d35 Merge branch 'fixes' into for-next) Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) Merging efi-lock-down/efi-lock-down (89bcd5b02f12 lockdown: Print current->comm in restriction messages) Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) Merging dma-mapping/for-next (af1da6868437 dma-debug: fix memory leak in debug_dma_alloc_coherent) Merging asm-generic/master (a351e9b9fc24 Linux 4.11) Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging arm/for-next (7928b2cbe55b Linux 4.16-rc1) Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap()) Merging arm-soc/for-next (f8f4aa7097c6 arm-soc: document merges) Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next) Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) Merging amlogic/for-next (00ceeac6751f Merge branch 'v4.17/drivers' into tmp/aml-rebuild) Merging aspeed/for-next (91b55cc53a17 Merge branch 'dt-for-4.17' into for-next) Merging at91/at91-next (dc39260ac782 Merge branch 'at91-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) Merging bcm2835/for-next (f0b8461e980a Merge branch anholt/bcm2835-defconfig-next into for-next) Merging imx-mxs/for-next (ba160a451a62 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (dacf37850167 Merge branch 'for_4.17/soc-drivers' into next) Merging mvebu/for-next (8c032696fe3c Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (e9f95735cef9 Merge tag 'v4.16-rc4' into for-next to avoid a merge conflict in next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi Merging reset/reset/next (de0ba80dc5ca reset: uniphier: add Pro4/Pro5/PXs2 audio systems reset control) Merging qcom/for-next (f5788d2f2929 Merge tag 'qcom-arm64-defconfig-for-4.16' into tagged-for-4.16) Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) Merging renesas/next (10643852ee2f Merge branch 'arm64-dt-for-v4.17' into next) Merging rockchip/for-next (6a78325f4714 Merge branch 'v4.16-armsoc/dts64fixes' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (903e74d1ea65 Merge branch 'next/dt64' into for-next) Merging sunxi/sunxi/for-next (a91c1d5317ef Merge branch 'sunxi/dt-for-4.17' into sunxi/for-next) Merging tegra/for-next (7c25c61b0f89 Merge branch for-4.17/clk into for-next) Merging arm64/for-next/core (e03e61c3173c arm64: kaslr: Set TCR_EL1.NFD1 when CONFIG_RANDOMIZE_BASE=y) Merging clk/clk-next (7928b2cbe55b Linux 4.16-rc1) Merging clk-samsung/for-next (edcefb96fb07 clk: samsung: exynos5250: Move PD-dependent clocks to Exynos5 sub-CMU) Merging c6x/for-linux-next (9d440f7a2824 c6x: fix platforms/plldata.c get_coreid build error) Merging cris/for-next (fd989db807a0 cris: Fix conflicting types for _etext, _edata, _end) Merging m68k/for-next (018bb90d5043 m68k/time: Stop validating rtc_time in .read_time) Merging m68knommu/for-next (661e50bc8532 Linux 4.16-rc4) Merging metag/for-next (8d06c3302635 i2c: img-scb: Drop METAG dependency) Merging microblaze/next (9bf63916cb9d microblaze: Setup dependencies for ASM optimized lib functions) 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 (b68c25758105 MIPS: BMIPS: Add Broadcom STB watchdog nodes) Merging nds32/next (f8aad12d62a4 nds32: To use the generic dump_stack()) Merging nios2/for-next (e0691ebb33c1 nios2: defconfig: Cleanup from old Kconfig options) Merging openrisc/for-next (0fedb7653af7 openrisc: remove unused __ARCH_HAVE_MMU define) Merging parisc-hd/for-next (71c7eb5377a2 parisc: Handle case where flush_cache_range is called with no context) Merging powerpc/next (4bd13772eeb2 powerpc/8xx: Increase number of slices to 64) Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) Merging risc-v/for-next (661e50bc8532 Linux 4.16-rc4) Merging s390/features (5628683cf77b s390/dasd: set timestamps unconditionally) Merging sparc-next/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) Merging uml/linux-next (584bfe635481 um: vector: Fix an error handling path in 'vector_parse()') Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc versions) 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 (476505288e7e Merge branch 'for-next-next-v4.17-20180308' into for-next-20180308) Merging ceph/master (1c7892495788 ceph: fix potential memory leak in init_caches()) Merging cifs/for-next (13b8cb522ed3 [SMB3] fix smb3-encryption breakage when CONFIG_DEBUG_SG=y) Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) Merging ecryptfs/next (4670269faba7 eCryptfs: constify attribute_group structures.) Merging ext3/for_next (785dffe1daf9 udf: fix potential refcnt problem of nls module) Merging ext4/dev (5dc397113d19 ext4: create ext4_kset dynamically) Merging f2fs/dev (3664ce2d9309 Merge tag 'powerpc-4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging fuse/for-next (c6cdd51404b7 fuse: fix READDIRPLUS skipping an entry) Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) Merging nfs/linux-next (9c6376ebddad pNFS: Prevent the layout header refcount going to zero in pnfs_roc()) Merging nfs-anna/linux-next (c54c14ba000d xprtrdma: Spread reply processing over more CPUs) CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c CONFLICT (content): Merge conflict in net/sunrpc/xprt.c Merging nfsd/nfsd-next (219cd595cc46 lockd: make nlm_ntf_refcnt and nlm_ntf_wq static) Merging orangefs/for-next (74e938c22705 orangefs: reverse sense of is-inode-stale test in d_revalidate) Merging overlayfs/overlayfs-next (36cd95dfa1ed ovl: update Kconfig texts) Merging ubifs/linux-next (7f29ae9f977b ubi: block: Fix locking for idr_alloc/idr_remove) Merging xfs/for-next (ff3d8b9c4cb9 xfs: don't block on the ilock for RWF_NOWAIT) Merging file-locks/locks-next (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging vfs/for-next (d85e2aa2e34d annotate ep_scan_ready_list()) Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) Merging iversion/iversion-next (581e400ff935 Merge tag 'modules-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux) Merging printk/for-next (06e206db06e9 Merge branch 'for-4.17' into for-next) Merging pci/next (eda9c9dd19d1 Merge remote-tracking branch 'lorenzo/pci/xgene' into next) Merging pstore/for-next/pstore (f2531f1976d9 pstore/ram: Do not use stack VLA for parity workspace) Merging hid/for-next (b576182794e8 Merge branch 'for-4.16/upstream-fixes' into for-next) Merging i2c/i2c/for-next (371b9546b966 Merge branch 'i2c/for-current' into i2c/for-next) Merging dmi/master (4a3928c6f8a5 Linux 4.16-rc3) Merging hwmon-staging/hwmon-next (e464243586cb hwmon: (sht3x) Update data sheet URL) Merging jc_docs/docs-next (6234c7bd8c14 docs: ftrace: fix a few formatting issues) Merging v4l-dvb/master (3f127ce11353 media: em28xx-cards: fix em28xx_duplicate_dev()) Merging v4l-dvb-next/master (a1dfb4c48cc1 media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic) Merging fbdev/fbdev-for-next (250c6c49e3b6 fbdev: Fixing arbitrary kernel leak in case FBIOGETCMAP_SPARC in sbusfb_ioctl_helper().) Merging pm/linux-next (3ce1a9d19a98 Merge branch 'pm-cpuidle' into linux-next) Merging cpupower/cpupower (7928b2cbe55b Linux 4.16-rc1) Merging idle/next (8a5776a5f498 Linux 4.14-rc4) Merging opp/opp/linux-next (4a823c0be80f opp: cpu: Replace GFP_ATOMIC with GFP_KERNEL in dev_pm_opp_init_cpufreq_table) Merging thermal/next (134f4010799a Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next) Merging thermal-soc/next (d0ecbbbe518e thermal/drivers/hisi: Remove bogus const from function return type) Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump) Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) Merging net-next/master (fd372a7a9e5e Merge tag 'mlx5-updates-2018-02-28-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux) Merging bpf-next/master (12ef9bda06a5 Merge branch 'bpf-perf-sample-addr') Merging ipsec-next/master (415a13296a1a xfrm_policy: use true and false for boolean values) Merging netfilter-next/master (547c611a7639 ipvs: use true and false for boolean values) Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support) Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.) Merging wireless-drivers-next/master (fee05843801c mt7601u: make write with mask access atomic) Merging bluetooth/master (f5322735608a Bluetooth: hci_bcm: use gpiod cansleep version) Merging mac80211-next/master (2e75bb2f8b89 net: Convert hwsim_net_ops) Merging rdma/for-next (d50a8a96ee66 IB/mlx4: Move mlx4_uverbs_ex_query_device_resp to include/uapi/) Merging gfs2/for-next (d39d18e0ef73 gfs2: Improve gfs2_block_map comment) Merging mtd/master (f23def803861 mtd: nand: MTD_NAND_MARVELL should depend on HAS_DMA) Merging l2-mtd/mtd/next (0dbe4ea78d69 mtd: get rid of the mtd_add_device_partitions()) Merging nand/nand/next (3383fb35c9b8 Merge tag 'nand/pxa3xx-removal' of git://git.infradead.org/linux-mtd into nand/next) CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig Applying: mtd: nand: fix up for raw Kconfig move Merging spi-nor/spi-nor/next (a49a95096a7b mtd: spi-nor: Remove unneeded driver.bus assignment) Merging crypto/master (23ea8b63a1e2 include: psp-sev: Capitalize invalid length enum) Merging drm/drm-next (f073d78eeb8e Merge tag 'drm-intel-next-2018-02-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_tcon.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_breadcrumbs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (d586b5f4cf07 drm/i915: Index the ring frequency table by HW frequency range) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c Merging drm-tegra/drm/tegra/for-next (b8f3f500e09c drm/tegra: fb: Implement ->fb_mmap() callback) Merging drm-misc/for-linux-next (60beeccc72ca drm/rockchip: Don't use atomic constructs for psr) Merging drm-msm/msm-next (b666c0f68f33 drm/msm: fix building without debugfs) 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 (92fe715dae97 drm: mali-dp: Turn off CRTC vblank when removing module.) CONFLICT (content): Merge conflict in drivers/gpu/drm/arm/malidp_planes.c 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 (4a3928c6f8a5 Linux 4.16-rc3) Merging etnaviv/etnaviv/next (246774d17fc0 drm/etnaviv: remove the need for a gpu-subsystem DT node) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (0600de5dfb59 Merge remote-tracking branches 'regmap/topic/debugfs' and 'regmap/topic/mmio-clk' into regmap-next) Merging sound/for-next (7a33a02ffb06 ALSA: vmaster: Zero-clear ctl before calling slave get) Merging sound-asoc/for-next (aa3705f53701 Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713', 'asoc/topic/wm_adsp' and 'asoc/topic/zx_aud96p22' into asoc-next) Merging modules/modules-next (3f553b308bb0 module: propagate error in modules_open()) Merging input/next (62f0f079b96d Input: add RAVE SP Powerbutton driver) Merging block/for-next (c5da6d0e0657 Merge branch 'for-4.17/block' into for-next) Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) Merging device-mapper/for-next (384470894628 dm bufio: delete outdated comment) Merging mmc/next (611d059f1a13 Merge branch 'fixes' into next) Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) Merging md/for-next (3de59bb9d551 md/raid1: fix NULL pointer dereference) Merging mfd/for-mfd-next (ba49f1c884e4 Revert "mfd: cros_ec: Add ACPI GPE handler for LID0 devices") Merging backlight/for-backlight-next (cfce992766ff Merge branch 'ib-backlight-drm-4.17' into ibs-for-backlight-merged) Merging battery/for-next (416a1ae673db power: supply: gpio-charger: use helper variable to access device info) Merging regulator/for-next (af07dbd0061b Merge remote-tracking branches 'regulator/topic/dt' and 'regulator/topic/gpio' into regulator-next) Merging security/next-testing (39859821366f Merge branch 'next-general' into next-testing) Merging integrity/next-integrity (5f26b1bddb4a IMA: Support using new creds in appraisal policy) Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) Merging selinux/next (68741a8adab9 selinux: Fix ltp test connect-syscall failure) CONFLICT (content): Merge conflict in net/sctp/socket.c Merging tpmdd/next (66459770ebf5 tpm: fix buffer type in tpm_transimt/_cmd) Merging watchdog/master (755ae8427820 watchdog: hpwdt: Update driver version.) Merging iommu/next (18b3c16e25fb Merge branches 'x86/amd', 'x86/vt-d', 'arm/mediatek', 'arm/exynos' and 'core' into next) Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) Merging vfio/next (46ed90f157f4 vfio: mdev: make a couple of functions and structure vfio_mdev_driver static) Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig) Merging audit/next (11dd2666375e audit: do not panic on invalid boot parameter) Merging devicetree/for-next (c679fa6e3aaa Merge branch 'dtc-update' into dt/next) Merging mailbox/mailbox-for-next (0ae7d327a64b dt-bindings: mailbox: qcom: Document the APCS clock binding) Merging spi/for-next (8919dbeb8ab4 Merge remote-tracking branches 'spi/topic/pxa2xx' and 'spi/topic/tegra20-slink' into spi-next) Merging tip/auto-latest (80c7d374a802 Merge branch 'WIP.sched/core') Merging clockevents/clockevents/next (322fd24f5e67 clocksource/drivers/stm32: Start the timer's counter sooner) CONFLICT (content): Merge conflict in drivers/clocksource/timer-stm32.c CONFLICT (content): Merge conflict in drivers/clocksource/timer-of.c CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig 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 (28dd6726e7bb EDAC, layerscape: Allow building for LS1021A) Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) Merging ftrace/for-next (841a915d20c7 vsprintf: Do not have bprintf dereference pointers) Merging rcu/rcu/next (08c5ee913265 softirq: Eliminate unused cond_resched_softirq() macro) Merging kvm/linux-next (661e50bc8532 Linux 4.16-rc4) Merging kvm-arm/next (250be9d61cf8 KVM: arm/arm64: No need to zero CNTVOFF in kvm_timer_vcpu_put() for VHE) Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) Merging kvm-ppc/kvm-ppc-next (7928b2cbe55b Linux 4.16-rc1) Merging kvms390/next (acaa9bc9750f KVM: add machine check counter to kvm_stat) CONFLICT (content): Merge conflict in drivers/video/console/Kconfig Merging xen-tip/linux-next (351b2bccede1 xen: xenbus: use put_device() instead of kfree()) Merging percpu/for-next (accd4f36a7d1 percpu: add a schedule point in pcpu_balance_workfn()) Applying: percpu: include sched.h for cond_resched() Merging workqueues/for-next (a10eb37ccf1d Merge branch 'for-4.15-fixes' into for-next) Merging drivers-x86/for-next (501f7e52de8a platform/x86: wmi: Fix misuse of vsprintf extension %pULL) Merging chrome-platform/for-next (e5ac29cbf3c4 Revert "platform/chrome: chromeos_laptop: make chromeos_laptop const") Merging hsi/for-next (b6dc80dbe6cd HSI: cmt_speech: use timespec64 instead of timespec) Merging leds/for-next (2dd1ea5b8a49 leds: Add more product/board names for PC Engines APU2) Merging ipmi/for-next (990d3a9f8659 ipmi: Remove ACPI SPMI probing from the system interface driver) Merging driver-core/driver-core-next (661e50bc8532 Linux 4.16-rc4) Merging usb/usb-next (cc9debf84ab3 USB: adutux: Delete a misleading comment) Merging usb-gadget/next (7d065dd1c1de usb: dwc3: add dual role support using OTG block) Merging usb-serial/usb-next (661e50bc8532 Linux 4.16-rc4) Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53) Merging phy-next/next (ae91a799fb3c phy: amlogic: phy-meson-gxl-usb2: rename some of the U2P_R2 registers) Merging tty/tty-next (6aed2a885041 serial: imx: document functions that are called with port.lock taken) Merging char-misc/char-misc-next (aeef9c097406 lkdtm: Add missing SPDX-License-Identifier line) Merging extcon/extcon-next (87f3af569b06 Merge branch 'ib-extcon-drm-dt-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into extcon-next) Merging staging/staging-next (08c5e1165695 staging: lustre: Remove yield() call) Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API) Merging slave-dma/next (6420bb524312 Merge branch 'topic/pl330' into next) Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded mode switching) Merging scsi/for-next (046e9e78b709 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (4c06619fc4da scsi: lpfc: use __raw_writeX on DPP copies) Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging libata/for-next (20a26a6b8848 Merge branch 'for-4.16-fixes' into for-next) Merging vhost/linux-next (4d1cf217d2cd ptr_ring: linked list fallback) Merging rpmsg/for-next (ec6e69036956 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (8b3eba33639c Merge branch 'devel' into for-next) Merging pinctrl/for-next (dfb1c1da3da7 Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (7928b2cbe55b Linux 4.16-rc1) Merging pwm/for-next (bccaa3f917c9 pwm: meson: Add clock source configuration for Meson-AXG) Merging userns/for-next (9eba1cd4b565 24 Jan 2018 Merge of my siginfo and userns trees for testing in linux-next) Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) 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 (78972f51ccf8 selftests: futex Makefile add top level TAP header echo to RUN_TESTS) Merging y2038/y2038 (69973b830859 Linux 4.9) Merging livepatching/for-next (d13f5d84ca27 Merge branch 'for-4.16/signal-sysfs-force-v2' into for-next) Merging coresight/next (c24ae3b69146 coresight: etm4x: Fix bit shifting) Merging rtc/rtc-next (74ce1a932504 rtc: remove VLA usage) Merging nvdimm/libnvdimm-for-next (949b93250a56 memremap: fix softlockup reports at teardown) Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) Merging at24/at24/for-next (56868c9b7e33 dt-bindings: at24: add Renesas R1EX24128) Merging ntb/ntb-next (53c3677c56c7 ntb: intel: change references of skx to gen3) Merging kspp/for-next/kspp (2d00fcb32f71 Merge branch 'kspp/gcc-plugin/infrastructure' into for-next/kspp) Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging akpm-current/current (b450df8c11da ipc/: clamp semmni to the real IPCMNI limit) Applying: Revert "zboot: fix stack protector in compressed boot phase" $ git checkout -b akpm remotes/origin/akpm/master Applying: ipc/mqueue: add missing error code in init_mqueue_fs() Applying: mm: introduce MAP_FIXED_NOREPLACE Applying: fs, elf: drop MAP_FIXED usage from elf_map Applying: elf: enforce MAP_FIXED on overlaying elf segments Applying: xen, mm: allow deferred page initialization for xen pv domains Applying: linux/const.h: prefix include guard of uapi/linux/const.h with _UAPI Applying: linux/const.h: move UL() macro to include/linux/const.h Applying: linux/const.h: refactor _BITUL and _BITULL a bit Applying: linux/const.h: move BIT(_ULL) to linux/const.h for use in assembly Applying: mm: memcg: remote memcg charging for kmem allocations Applying: fs: fsnotify: account fsnotify metadata to kmemcg Applying: fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix Applying: headers: untangle kmemleak.h from mm.h Applying: headers-untangle-kmemleakh-from-mmh-fix Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Applying: sparc64: NG4 memset 32 bits overflow Merging akpm/master (75e930b5d474 sparc64: NG4 memset 32 bits overflow)
Attachment:
pgpq99l4OdpQk.pgp
Description: OpenPGP digital signature
