Hi all, News: this release includes the removal of 8 architectures ... Changes since 20180314: New tree: apparmor The syscalls tree lost its build failures. The asm-generic tree gained conflicts against the input-current, kbuild and syscalls trees. The nds32 tree gained a conflict against the asm-generic tree. The printk tree gained a conflict against the asm-generic tree. The v4l-dvb tree gained a conflict against the asm-generic tree. The fbdev tree gained a conflict against the asm-generic tree. The net-next tree gained a conflict against the net tree. The nand tree gained conflicts against the asm-generic tree. The crypto tree gained conflicts against the asm-generic tree. The drm tree lost its build failure. The drm-misc tree gained a conflict against Linus' tree. The spi tree gained a conflict against the asm-generic tree. The irqchip tree gained a conflict against the nds32 tree. The tty tree gained conflicts against the arm-soc and asm-generic trees. The staging tree gained conflicts against the crypto and net-next trees. The rpmsg tree gained a conflict against the asm-generic tree. The y2038 tree gained a conflict against the asm-generic tree. The rtc tree gained a conflict against the asm-generic tree. The nvdimm tree gained a conflict against the tip tree. The akpm-current tree lost its build failure and gained conflicts against the asm-generic tree. Non-merge commits (relative to Linus' tree): 7606 9982 files changed, 343915 insertions(+), 712256 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 261 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 (274a1ff0704b Merge tag 'platform-drivers-x86-v4.16-7' of git://git.infradead.org/linux-platform-drivers-x86) 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 (e21da1c99200 arm64: Relax ARM_SMCCC_ARCH_WORKAROUND_1 discovery) 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 (e4b79900222b powerpc/64s: Fix NULL AT_BASE_PLATFORM when using DT CPU features) 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 (cf55612a9450 sunvnet: does not support GSO for sctp) Merging bpf/master (b6b76dd62c56 error-injection: Fix to prohibit jump optimization) Merging ipsec/master (0dcd7876029b net: xfrm: use preempt-safe this_cpu_read() in ipcomp_alloc_tfms()) Merging netfilter/master (f89782c2d131 qed: Use after free in qed_rdma_free()) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (87de1201ddaa Merge branch 'erspan-fixes') Merging mac80211/master (a78872363614 cfg80211: add missing dependency to CFG80211 suboptions) Merging rdma-fixes/for-rc (c2b37f76485f IB/mlx5: Fix integer overflows in mlx5_ib_create_srq) Merging sound-current/for-linus (db45dc9540ea Merge tag 'asoc-fix-v4.16-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (fc110ebdd014 PCI: dwc: Fix enumeration end when reaching root subordinate) Merging driver-core.current/driver-core-linus (0c8efd610b58 Linux 4.16-rc5) Merging tty.current/tty-linus (5d7f77ec72d1 serial: imx: fix bogus dev_err) Merging usb.current/usb-linus (94e46a4f2d5e usb: musb: Fix external abort in musb_remove on omap2430) 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 (59fba0869aca 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 (3993a16309c7 Input: silead - add Chuwi Hi8 support) 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 (f1430f145eef drm/i915: Kick the rps worker when changing the boost frequency) Merging drm-misc-fixes/for-linux-next-fixes (9ca8614980d4 drm/sun4i: Fix an error handling path in 'sun4i_drv_bind()') Merging syscalls/syscalls-next (b9c9e8048197 fs: add ksys_open() wrapper; remove in-kernel calls to sys_open()) Merging kbuild/for-next (5dc527c3be61 Merge branch 'kconfig' 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 (6f0b41929017 staging: iio: remove iio-trig-bfin-timer driver) CONFLICT (content): Merge conflict in drivers/input/joystick/analog.c CONFLICT (modify/delete): arch/tile/kernel/sys.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/tile/kernel/sys.c left in tree. CONFLICT (modify/delete): arch/tile/kernel/compat.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/tile/kernel/compat.c left in tree. CONFLICT (modify/delete): arch/score/kernel/sys_score.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/score/kernel/sys_score.c left in tree. CONFLICT (modify/delete): arch/mn10300/kernel/sys_mn10300.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/mn10300/kernel/sys_mn10300.c left in tree. CONFLICT (modify/delete): arch/frv/kernel/sys_frv.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/frv/kernel/sys_frv.c left in tree. CONFLICT (modify/delete): arch/cris/kernel/sys_cris.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/cris/kernel/sys_cris.c left in tree. CONFLICT (modify/delete): arch/blackfin/kernel/bfin_ksyms.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/blackfin/kernel/bfin_ksyms.c left in tree. $ git rm -f arch/blackfin/kernel/bfin_ksyms.c arch/cris/kernel/sys_cris.c arch/frv/kernel/sys_frv.c arch/mn10300/kernel/sys_mn10300.c arch/score/kernel/sys_score.c arch/tile/kernel/compat.c arch/tile/kernel/sys.c 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 (ae65d2a61ce9 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 (cf172af3be59 Merge branch anholt/bcm2835-defconfig-next into for-next) Merging imx-mxs/for-next (5ce066c49aa0 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (dacf37850167 Merge branch 'for_4.17/soc-drivers' into next) Merging mvebu/for-next (9c980293222d 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 (a54b7e019869 Merge branch 'arm64-defconfig-for-4.17' into all-for-4.17) CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) Merging renesas/next (b27530a1a3e1 Merge branch 'arm64-dt-for-v4.17' into next) Merging rockchip/for-next (644decba659d Merge branch 'v4.17-clk/next' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (b54709c99195 Merge branch 'next/dt' into for-next) Merging sunxi/sunxi/for-next (fa99960487b5 Merge branches 'sunxi/core-for-4.17' and 'sunxi/dt-for-4.17' into sunxi/for-next) Merging tegra/for-next (0b4db1a92edc Merge branch for-4.17/clk into for-next) Merging arm64/for-next/core (654c39c7982c Merge tag 'acpi/iort-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux into aarch64/for-next/core) Merging clk/clk-next (000996ab5523 Merge branch 'clk-rockchip' into clk-next) Merging clk-samsung/for-next (5b23fceec1ff clk: samsung: exynos5250: Add missing clocks for FIMC LITE SYSMMU devices) Merging c6x/for-linux-next (9d440f7a2824 c6x: fix platforms/plldata.c get_coreid build error) Merging m68k/for-next (275036f3ff78 zorro: Set up z->dev.dma_mask for the DMA API) Merging m68knommu/for-next (661e50bc8532 Linux 4.16-rc4) Merging metag/for-next (8d06c3302635 i2c: img-scb: Drop METAG dependency) Merging microblaze/next (b40b3b6b938e microblaze: switch to NO_BOOTMEM) 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 (b2ed33a89567 MIPS: pm-cps: Block system suspend when a JTAG probe is present) Merging nds32/next (f8aad12d62a4 nds32: To use the generic dump_stack()) CONFLICT (modify/delete): arch/cris/include/asm/io.h deleted in HEAD and modified in nds32/next. Version nds32/next of arch/cris/include/asm/io.h left in tree. $ git rm -f arch/cris/include/asm/io.h 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 (aa32d33d7531 parisc/Kconfig: SMP kernels boot on all machines) Merging powerpc/next (014a32b30e9d powerpc/mm/slice: remove radix calls to the slice code) Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) Merging risc-v/for-next (0c8efd610b58 Linux 4.16-rc5) 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 (1af996d008b0 Merge branch 'for-next-next-v4.17-20180314' into for-next-20180314) Merging ceph/master (1c7892495788 ceph: fix potential memory leak in init_caches()) Merging cifs/for-next (1e00e72f6c7d SMB3.1.1 dialect is no longer experimental) 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 (a9cee1764b6f reiserfs: Remove VLA from fs/reiserfs/reiserfs.h) Merging ext4/dev (5dc397113d19 ext4: create ext4_kset dynamically) Merging f2fs/dev (81f5af16f39a f2fs: align memory boundary for bitops) 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 (fc6eabbbf8ef Merge tag 'nfs-for-4.16-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) 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 (0ab32086d0be xfs: account only rmapbt-used blocks against rmapbt perag res) Merging file-locks/locks-next (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging vfs/for-next (de8894756258 Merge branch 'work.dcache' into for-next) 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) CONFLICT (modify/delete): arch/blackfin/kernel/dumpstack.c deleted in HEAD and modified in printk/for-next. Version printk/for-next of arch/blackfin/kernel/dumpstack.c left in tree. $ git rm -f arch/blackfin/kernel/dumpstack.c Merging pci/next (eda9c9dd19d1 Merge remote-tracking branch 'lorenzo/pci/xgene' into next) Merging pstore/for-next/pstore (cb3bee0369bc pstore: Use crypto compress API) 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 (eb693e35e850 firmware: dmi_scan: add DMI_OEM_STRING support to dmi_matches) Merging hwmon-staging/hwmon-next (81820059a428 hwmon: (nct6775) Add support for NCT6796D) 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()) CONFLICT (modify/delete): drivers/media/platform/blackfin/bfin_capture.c deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of drivers/media/platform/blackfin/bfin_capture.c left in tree. $ git rm -f drivers/media/platform/blackfin/bfin_capture.c Merging v4l-dvb-next/master (a1dfb4c48cc1 media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic) Merging fbdev/fbdev-for-next (2c81ee0a28c0 video: fbdev: via: remove VLA usage) CONFLICT (content): Merge conflict in drivers/video/console/Kconfig Merging pm/linux-next (222d946a2539 Merge branch 'acpi-battery' 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 (c292566a7779 Merge branch 'sctp-add-support-for-some-sctp-auth-APIs-from-RFC6458') CONFLICT (content): Merge conflict in net/ipv4/xfrm4_policy.c CONFLICT (content): Merge conflict in drivers/net/phy/phy.c CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlxsw/spectrum.h CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlxsw/spectrum.c Applying: mlxsw: merge fix for move of SPAN code Merging bpf-next/master (68de5ef4c786 Merge branch 'bpf-stackmap-build-id') Merging ipsec-next/master (415a13296a1a xfrm_policy: use true and false for boolean values) Merging netfilter-next/master (90eee0957b65 netfilter: nft_ct: add NFT_CT_{SRC,DST}_{IP,IP6}) 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 (28bf8312a983 mwifiex: get_channel from firmware) Merging bluetooth/master (4dd3f238ebac Bluetooth: btmrvl: Delete an unnecessary variable initialisation in btmrvl_sdio_card_to_host()) Merging mac80211-next/master (2e75bb2f8b89 net: Convert hwsim_net_ops) Merging rdma/for-next (8a18e911d0da IB: remove duplicate header files) 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 (rename/delete): drivers/mtd/nand/bf5xx_nand.c deleted in HEAD and renamed to drivers/mtd/nand/raw/bf5xx_nand.c in nand/nand/next. Version nand/nand/next of drivers/mtd/nand/raw/bf5xx_nand.c left in tree. CONFLICT (content): Merge conflict in drivers/mtd/nand/Makefile CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig CONFLICT (modify/delete): arch/cris/arch-v32/drivers/mach-fs/nandflash.c deleted in HEAD and modified in nand/nand/next. Version nand/nand/next of arch/cris/arch-v32/drivers/mach-fs/nandflash.c left in tree. CONFLICT (modify/delete): arch/cris/arch-v32/drivers/mach-a3/nandflash.c deleted in HEAD and modified in nand/nand/next. Version nand/nand/next of arch/cris/arch-v32/drivers/mach-a3/nandflash.c left in tree. $ git rm -f arch/cris/arch-v32/drivers/mach-a3/nandflash.c arch/cris/arch-v32/drivers/mach-fs/nandflash.c drivers/mtd/nand/raw/bf5xx_nand.c Applying: mtd: nand: fix up for raw Kconfig move Applying: mtd: nand: fix up for blackfin removal Merging spi-nor/spi-nor/next (a49a95096a7b mtd: spi-nor: Remove unneeded driver.bus assignment) Merging crypto/master (0ee991be4cdd crypto: ccp - Fill the result buffer only on digest, finup, and final ops) CONFLICT (modify/delete): drivers/crypto/bfin_crc.c deleted in HEAD and modified in crypto/master. Version crypto/master of drivers/crypto/bfin_crc.c left in tree. $ git rm -f drivers/crypto/bfin_crc.c Merging drm/drm-next (963976cfe9c5 Merge tag 'drm-intel-next-2018-03-08' 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_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_breadcrumbs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.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 CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (da9cb11f7662 drm/i915/cnl: Kill _MMIO_PORT6 macro) Merging drm-tegra/drm/tegra/for-next (b8f3f500e09c drm/tegra: fb: Implement ->fb_mmap() callback) Merging drm-misc/for-linux-next (25a28906ebee drm/vmwgfx: replace drm_*_unreference with drm_*_put) CONFLICT (content): Merge conflict in sound/pci/hda/hda_intel.c 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 (fc0775da8e60 drm/etnaviv: etnaviv_sched: Staticize functions when possible) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (2889312616ae Merge remote-tracking branches 'regmap/topic/debugfs' and 'regmap/topic/mmio-clk' into regmap-next) Merging sound/for-next (09b9ddfaa183 ALSA: pcm: Use krealloc() for resizing the rules array) Merging sound-asoc/for-next (f456e6212a5b Merge remote-tracking branches '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 (d924fd4f65a9 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 (8c5c147339d2 dm mpath: fix passing integrity data) 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 (1d7fbb6e03a1 mfd: viperboard: Delete an error message for a failed memory allocation in vprbrd_probe()) Merging backlight/for-backlight-next (ba11349b2a57 dt-bindings: backlight: Add binding for RAVE SP backlight driver) Merging battery/for-next (93619fdec96f power: reset: make function sc27xx_poweroff_shutdown static) Merging regulator/for-next (39f45aa126d0 Merge remote-tracking branches 'regulator/topic/88pg86x', 'regulator/topic/dt' and 'regulator/topic/gpio' into regulator-next) Merging security/next-testing (39859821366f Merge branch 'next-general' into next-testing) Merging apparmor/apparmor-next (e540c3c90193 apparmor: update MAINTAINERS file git and wiki locations) Merging integrity/next-integrity (53c7b50fc140 ima: drop vla in ima_audit_measurement()) 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 (69c6025bbd15 tpm_crb: use __le64 annotated variable for response buffer address) Merging watchdog/master (2e8ebed6ede0 Merge branch 'v4.16-fixes') Merging iommu/next (18b3c16e25fb Merge branches 'x86/amd', 'x86/vt-d', 'arm/mediatek', 'arm/exynos' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) 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 (45b578fe4c3c audit: link denied should not directly generate PATH record) Merging devicetree/for-next (54587be4962e of: unittest: local return value variable related cleanups) Merging mailbox/mailbox-for-next (0ae7d327a64b dt-bindings: mailbox: qcom: Document the APCS clock binding) Merging spi/for-next (8b382c1d91e1 Merge remote-tracking branches 'spi/topic/kconfig', 'spi/topic/orion', 'spi/topic/pxa2xx' and 'spi/topic/tegra20-slink' into spi-next) CONFLICT (content): Merge conflict in drivers/spi/Kconfig Merging tip/auto-latest (df1312cdea5a Merge branch 'x86/pti' into auto-latest) CONFLICT (content): Merge conflict in drivers/bus/arm-cci.c CONFLICT (modify/delete): Documentation/trace/ftrace.txt deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of Documentation/trace/ftrace.txt left in tree. $ git rm -f Documentation/trace/ftrace.txt Applying: perf/core: merge fix for "drivers/bus: Split Arm CCI driver" Applying: trace doc: merge fix for "tracing: Unify the "boot" and "mono" tracing clocks" Merging clockevents/clockevents/next (135643b1d63d clocksource/drivers/npcm: Add NPCM7xx timer driver) 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 (58ca9ac1463d EDAC, skx_edac: Detect non-volatile DIMMs) Merging irqchip/irq/irqchip-next (920181ce8469 irqchip/gic-v3-its: Add ability to resend MAPC on resume) CONFLICT (content): Merge conflict in drivers/irqchip/Makefile 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 (0c7f650e106c KVM: nVMX: Enforce NMI controls on vmentry of L2 guests) 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 (ccc40c53c07b KVM: s390: provide counters for all interrupt injects/delivery) 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 (4bce8063e393 percpu: include linux/sched.h for cond_resched()) Applying: percpu: include sched.h for cond_resched() Merging workqueues/for-next (6417250d3f89 workqueue: remove unused cancel_work()) Merging drivers-x86/for-next (cc69c88fbeb9 platform/x86: dell-smbios: Resolve dependency error on DCDBAS) CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig Merging chrome-platform/for-next (0c8efd610b58 Linux 4.16-rc5) Merging hsi/for-next (b6dc80dbe6cd HSI: cmt_speech: use timespec64 instead of timespec) Merging leds/for-next (d1ed7c558612 leds: Extends disk trigger for reads and writes) Merging ipmi/for-next (bc48fa1b9d3b ipmi:pci: Blacklist a Realtek "IPMI" device) Merging driver-core/driver-core-next (ad4365f13836 firmware: enable to split firmware_class into separate target files) Merging usb/usb-next (95713fb8aa03 Revert "usb: core: Add "quirks" parameter for usbcore") Merging usb-gadget/next (498f0478aba4 usb: dwc3: Prevent indefinite sleep in _dwc3_set_mode during suspend/resume) Merging usb-serial/usb-next (858c121d028f USB: serial: option: use mass-storage class define) Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53) Merging phy-next/next (d7119224bfe6 phy: allwinner: sun4i-usb: poll vbus changes on A23/A33 when driving VBUS) Merging tty/tty-next (dbb3fb45edff ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards) CONFLICT (content): Merge conflict in drivers/tty/hvc/Makefile CONFLICT (content): Merge conflict in drivers/tty/hvc/Kconfig CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih418-b2199.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih410-b2260.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih410-b2120.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih407-b2120.dts Merging char-misc/char-misc-next (bb0829a74179 mei: remove dev_err message on an unsupported ioctl) Merging extcon/extcon-next (e1eade1eb5f1 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 (2dff24d73291 staging: fsl-dpaa2/ethsw: Add TODO) CONFLICT (modify/delete): drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c left in tree. CONFLICT (modify/delete): drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c left in tree. CONFLICT (modify/delete): drivers/staging/irda/net/af_irda.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/irda/net/af_irda.c left in tree. CONFLICT (modify/delete): drivers/staging/ccree/Makefile deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/ccree/Makefile left in tree. CONFLICT (modify/delete): drivers/staging/ccree/Kconfig deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/ccree/Kconfig left in tree. $ git rm -f drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c $ git rm -f drivers/staging/ccree/Kconfig drivers/staging/ccree/Makefile $ git rm -f drivers/staging/irda/net/af_irda.c Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API) Merging slave-dma/next (56c931385f55 Merge branch 'fixes' into next) Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded mode switching) Merging scsi/for-next (435458e41180 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (e1735d9a98ab scsi: csiostor: add support for 32 bit port capabilities) CONFLICT (modify/delete): drivers/scsi/eata.c deleted in scsi-mkp/for-next and modified in HEAD. Version HEAD of drivers/scsi/eata.c left in tree. $ git rm -f drivers/scsi/eata.c 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 (905e225c7cf0 Merge branch 'for-4.17' into for-next) Merging vhost/linux-next (54939f252f97 fw_cfg: write vmcoreinfo details) Merging rpmsg/for-next (ec6e69036956 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) CONFLICT (content): Merge conflict in samples/Makefile 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 (8bad56707b0b arm64: fix perf_regs.c) CONFLICT (modify/delete): arch/tile/include/asm/compat.h deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of arch/tile/include/asm/compat.h left in tree. $ git rm -f arch/tile/include/asm/compat.h 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 (7a96880cb5b4 rtc: pcf85063: fix clearing bits in pcf85063_start_clock) CONFLICT (modify/delete): drivers/rtc/rtc-tile.c deleted in HEAD and modified in rtc/rtc-next. Version rtc/rtc-next of drivers/rtc/rtc-tile.c left in tree. $ git rm -f drivers/rtc/rtc-tile.c Merging nvdimm/libnvdimm-for-next (18965869271c Merge branch 'for-4.17/libnvdimm' into libnvdimm-pending) CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) Merging at24/at24/for-next (570b7e20f24e 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 (2623866b3006 tools/testing/selftests/sysctl/sysctl.sh: add range clamping test) CONFLICT (content): Merge conflict in mm/sparse.c CONFLICT (modify/delete): arch/tile/mm/mmap.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/tile/mm/mmap.c left in tree. CONFLICT (modify/delete): arch/tile/kernel/pci_gx.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/tile/kernel/pci_gx.c left in tree. CONFLICT (modify/delete): arch/score/mm/cache.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/score/mm/cache.c left in tree. $ git rm -f arch/score/mm/cache.c arch/tile/kernel/pci_gx.c arch/tile/mm/mmap.c $ git checkout -b akpm remotes/origin/akpm/master Applying: ipc/mqueue: add missing error code in init_mqueue_fs() Applying: drivers/infiniband/core/verbs.c: fix build with gcc-4.4.4 Applying: drivers/infiniband/ulp/srpt/ib_srpt.c: fix build with gcc-4.4.4 Applying: kexec_file: make use of purgatory optional Applying: kexec_file-make-an-use-of-purgatory-optional-fix Applying: kexec_file,x86,powerpc: factor out kexec_file_ops functions Applying: x86: kexec_file: purge system-ram walking from prepare_elf64_headers() Applying: x86: kexec_file: remove X86_64 dependency from prepare_elf64_headers() Applying: x86: kexec_file: lift CRASH_MAX_RANGES limit on crash_mem buffer Applying: x86: kexec_file: clean up prepare_elf64_headers() Applying: kexec_file, x86: move re-factored code to generic side 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: 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 (01b604efc4b8 sparc64: NG4 memset 32 bits overflow)
Attachment:
pgpJBB120g6AA.pgp
Description: OpenPGP digital signature
