Hi all, Changes since 20180223: New tree: leaks The bpf-next tree gained a conflict against the bpf tree. The kvms390 tree gained a conflict against the nds32 tree. The percpu tree gained a build failure for which I applied a patch. The akpm-current tree gained a conflict against the metag tree and a build failure for which I applied a patch. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 3394 4140 files changed, 155342 insertions(+), 102665 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 (3664ce2d9309 Merge tag 'powerpc-4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging fixes/master (7928b2cbe55b Linux 4.16-rc1) Merging kbuild-current/fixes (36c1681678b5 genksyms: drop *.hash.c from .gitignore) Merging arc-current/for-curr (646a4c62e03a ARC: setup cpu possible mask according to possible-cpus dts property) Merging arm-current/fixes (091f02483df7 ARM: net: bpf: clarify tail_call index) 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 (eb0a2d2620ae powerpc/powernv: Support firmware disable of RFI flush) 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 (9cb9c07d6b0c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging bpf/master (ca36960211eb bpf: allow xadd only on aligned memory) Merging ipsec/master (013cb81e89f8 xfrm: Fix infinite loop in xfrm_get_dst_nexthop with transport mode.) Merging netfilter/master (7d98386d55a5 netfilter: use skb_to_full_sk in ip6_route_me_harder) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (78dc897b7ee6 rtlwifi: rtl8723be: Fix loss of signal) Merging mac80211/master (b323ac19b773 mac80211: drop frames with unexpected DS bits from fast-rx to slow path) Merging rdma-fixes/for-rc (f45765872e7a RDMA/uverbs: Fix kernel panic while using XRC_TGT QP type) Merging sound-current/for-linus (240a8af929c7 ALSA: usb-audio: Add a quirck for B&W PX headphones) Merging pci-current/for-linus (7928b2cbe55b Linux 4.16-rc1) Merging driver-core.current/driver-core-linus (91ab883eb213 Linux 4.16-rc2) Merging tty.current/tty-linus (91ab883eb213 Linux 4.16-rc2) Merging usb.current/usb-linus (0f9da844d877 MIPS: boot: Define __ASSEMBLY__ for its.S build) Merging usb-gadget-fixes/fixes (98112041bcca usb: dwc3: core: Fix ULPI PHYs and prevent phy_get/ulpi_init during suspend/resume) Merging usb-serial-fixes/usb-linus (d14ac576d10f USB: serial: cp210x: add new device ID ELV ALC 8xxx) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (7928b2cbe55b Linux 4.16-rc1) Merging staging.current/staging-linus (c6754712e053 Merge tag 'iio-fixes-for-4.16a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (3664ce2d9309 Merge tag 'powerpc-4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging input-current/for-linus (ea4f7bd2aca9 Input: matrix_keypad - fix race when disabling interrupts) 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 (9eaa1fb21961 selftests: vm: update .gitignore with new test) CONFLICT (content): Merge conflict in tools/testing/selftests/x86/Makefile 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 (3dd6b560dc5d media: Don't let tvp5150_get_vbi() go out of vbi_ram_default array) Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation) Merging mips-fixes/mips-fixes (902f4d067a50 MIPS: OCTEON: irq: Check for null return on kzalloc allocation) Merging kvm-fixes/master (9c5e0afaf157 KVM: SVM: Fix SEV LAUNCH_SECRET command) Merging kvms390-fixes/master (0e7def5fb0dc KVM: s390: provide only a single function for setting the tod (fix SCK)) Merging drm-intel-fixes/for-linux-next-fixes (15fa4d7a8fb9 drm/i915: Make global seqno known in i915_gem_request_execute tracepoint) Merging drm-misc-fixes/for-linux-next-fixes (c20bb155c2c5 drm/nouveau: prefer XBGR2101010 for addfb ioctl) Merging kbuild/for-next (69bb4fc95531 Merge branch 'kconfig' into for-next) Merging leaks/leaks-next (3470bc2ec4dc leaking_addresses: add scan_once array) 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 (3a175cdf4392 Merge branches 'fixes', 'misc', 'sa1111' 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 (8337d083507b ARM: orion: fix orion_ge00_switch_board_info initialization) 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 (b1303f3fa73b 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 (fa4cf68ab4b1 Merge tag 'at91-ab-4.16-dt' into at91-next) Merging bcm2835/for-next (5aecab364ebd Merge branch anholt/bcm2835-defconfig-next into for-next) Merging imx-mxs/for-next (9bd16cec3c1f Merge branch 'imx/defconfig' into for-next) Merging keystone/next (a29b8b93e158 Merge branch 'for_4.16/keystone-config' into next) Merging mvebu/for-next (b4e369232fa8 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (fcb508cddbce Merge branch 'omap-for-v4.17/timer' into for-next) Merging reset/reset/next (1d7592f84f92 reset: simple: Enable for ASPEED systems) 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 (60d04a4b6d41 Merge branch 'topic/renesas-defconfig' into next) Merging rockchip/for-next (aed958de4a40 Merge branch 'v4.17-armsoc/dts64' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (6e3d094fcf59 Merge branch 'next/dt' into for-next) Merging sunxi/sunxi/for-next (454c4bf0d36f Merge branch 'sunxi/dt-for-4.17' into sunxi/for-next) Merging tegra/for-next (983371acdeda Merge branch for-4.16/arm64/dt into for-next) Merging arm64/for-next/core (3a0a397ff5ff arm64: Kill PSCI_GET_VERSION as a variant-2 workaround) Merging clk/clk-next (7928b2cbe55b Linux 4.16-rc1) Merging clk-samsung/for-next (1d5013f1b64d clk: samsung: Add compile time PLL rate validators) 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 (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry) Merging m68knommu/for-next (7928b2cbe55b Linux 4.16-rc1) Merging metag/for-next (ced6c232f9c2 i2c: img-scb: Drop METAG dependency) Merging microblaze/next (5b325e3b2912 microblaze: Use generic pci_mmap_resource_range()) 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 (35868f095948 MIPS: generic: Enable crc32-mips on r6 configs) Merging nds32/next (c25a4f41b284 cris: add ioremap_nocache declaration before include asm-generic/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 (8760d9c7e2b0 parisc: Reduce irq overhead when run in qemu) Merging powerpc/next (91ab883eb213 Linux 4.16-rc2) Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) Merging risc-v/for-next (91ab883eb213 Linux 4.16-rc2) Merging s390/features (b35fe61df4bf s390: fix comment for scsw_cmd_is_valid_sctl) 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 (6537ffbd6382 Merge branch 'for-next-next-v4.16-20180213' into for-next-20180213) CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c Merging ceph/master (a25df1968a0c ceph: fix dentry leak when failing to init debugfs) 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 (1d37d05f3c2c udf: Fix handling of Partition Descriptors) 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 (1b7204064582 NFS: make struct nlmclnt_fl_close_lock_ops static) 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 (7168179fcf25 ovl: check ERR_PTR() return value from ovl_lookup_real()) Merging ubifs/linux-next (7f29ae9f977b ubi: block: Fix locking for idr_alloc/idr_remove) Merging xfs/for-next (b31c2bdcd83e xfs: reserve blocks for refcount / rmap log item recovery) 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 (02fffdcaed19 Merge branch 'for-4.17' into for-next) Merging pci/next (c8989cd7ece7 Merge branch 'pci/sparc' into next) Merging pstore/for-next/pstore (a99f41a1b441 fs: pstore: remove unused hardirq.h) Merging hid/for-next (ba6986149ce3 Merge branch 'for-4.16/upstream-fixes' into for-next) Merging i2c/i2c/for-next (91ab883eb213 Linux 4.16-rc2) Merging dmi/master (36a840c73dc6 firmware: dmi: handle missing DMI data gracefully) Merging hwmon-staging/hwmon-next (e464243586cb hwmon: (sht3x) Update data sheet URL) Merging jc_docs/docs-next (c7899551ff3a Documentation: rapidio: move sysfs interface to ABI) Merging v4l-dvb/master (a7bc5773cd16 ov13858: fix endiannes warnings) Merging v4l-dvb-next/master (a1dfb4c48cc1 media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic) Merging fbdev/fbdev-for-next (5865889fe431 video: udlfb: Switch from the pr_*() to the dev_*() logging functions) Merging pm/linux-next (a8135650d21e Merge branches 'acpica', 'acpi-battery' and 'acpi-doc' 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 (f74290fdb363 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging bpf-next/master (7d72637eb39f Merge branch 'x86-jit') CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/test_verifier.c Merging ipsec-next/master (60aa80460da1 esp4: remove redundant initialization of pointer esph) Merging netfilter-next/master (f74290fdb363 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) 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 (cf19e5e2054f Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue) Merging bluetooth/master (1ec010e70593 tun: export flags, uid, gid, queue information over netlink) Merging mac80211-next/master (318c121cf274 mac80211: support station 4-addr mode fast-rx) Merging rdma/for-next (3a148896b24a IB/srp: Fix completion vector assignment algorithm) Merging gfs2/for-next (3fc7c7e1cfaa gfs2: Fix fallocate chunk size) 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 (d8757f4c59c9 Update Boris Brezillon email address) CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig Applying: mtd: nand: fix up for raw Kconfig move Merging spi-nor/spi-nor/next (7928b2cbe55b Linux 4.16-rc1) Merging crypto/master (017457061e07 crypto: ccree - fix memdup.cocci warnings) Merging drm/drm-next (727edc744098 Merge tag 'drm-misc-next-2018-02-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) 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 Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (f6322eddaff7 drm/i915/preemption: Allow preemption between submission ports) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_breadcrumbs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c Merging drm-tegra/drm/tegra/for-next (8f62142e490d drm/tegra: dc: Properly cleanup overlay planes) Merging drm-misc/for-linux-next (879659bb87a8 drm/stm: check pitch and size calculations even if !CONFIG_MMU) Merging drm-msm/msm-next (668c5de40345 drm/msm/mdp5: don't pre-reserve LM's if no dual-dsi) 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 (54243016ae35 drm: mali-dp: Disable planes when their CRTC gets disabled.) 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 (50b0f0aee839 gpu: ipu-csi: add 10/12-bit grayscale support to mbus_code_to_bus_cfg) 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 (c3270f2b8340 Merge remote-tracking branches 'regmap/topic/bulk' and 'regmap/topic/debugfs' into regmap-next) Merging sound/for-next (248a380a3c2e ALSA: hda-beep: add SPDX identifiers) Merging sound-asoc/for-next (0de0a757faa3 Merge remote-tracking branches 'asoc/topic/wm9713', 'asoc/topic/wm9867', 'asoc/topic/wm_adsp' and 'asoc/topic/zx_aud96p22' into asoc-next) Merging modules/modules-next (0cad61d7a3d5 modpost: Remove trailing semicolon) Merging input/next (cdc2466df40f Input: synaptics - handle errors from input_mt_init_slots()) Merging block/for-next (0ccfb3c0032b Merge branch 'for-4.16/block' into for-next) Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) Merging device-mapper/for-next (51a05338a6f8 dm: use blkdev_get rather than bdgrab when issuing pass-through ioctl) Merging mmc/next (80a7d9316496 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 (0f89ffefa4e1 mfd: lpc_ich: Do not touch SPI-NOR write protection bit on Apollo Lake) 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 (076fe8483340 Merge remote-tracking branches 'regulator/topic/dt' and 'regulator/topic/gpio' into regulator-next) Merging security/next-testing (a58e3226e2e4 Merge tag 'v4.16-rc2' 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 (911887463329 selinux: fix typo in selinux_netlbl_sctp_sk_clone declaration) Merging tpmdd/next (0f7f44387244 tpm: cmd_ready command can be issued only after granting locality) Merging watchdog/master (a17f4f032b61 watchdog: sp5100_tco.c: fix potential build failure) 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 (ce423631ce1f audit: track the owner of the command mutex ourselves) Merging devicetree/for-next (7ea5c83472d3 Merge branches 'dt/next' and 'dt/linus' into for-next) Merging mailbox/mailbox-for-next (0ae7d327a64b dt-bindings: mailbox: qcom: Document the APCS clock binding) Merging spi/for-next (a48478413035 Merge remote-tracking branches 'spi/topic/orion' and 'spi/topic/pxa2xx' into spi-next) Merging tip/auto-latest (aa9410633da8 Merge branch 'x86/urgent') 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 (bf8486709ac7 EDAC, sb_edac: Fix out of bound writes during DIMM configuration on KNL) 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 (3fea14045aa4 EXP rcu: Add ->qsmask to assertion) Merging kvm/linux-next (7928b2cbe55b Linux 4.16-rc1) Merging kvm-arm/next (7928b2cbe55b Linux 4.16-rc1) 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 (416b744f4494 s390/setup : enable display support for KVM guest) CONFLICT (content): Merge conflict in drivers/video/console/Kconfig Merging xen-tip/linux-next (d1a75e0896f5 pvcalls-front: wait for other operations to return when release passive sockets) Merging percpu/for-next (accd4f36a7d1 percpu: add a schedule point in pcpu_balance_workfn()) Merging workqueues/for-next (a10eb37ccf1d Merge branch 'for-4.15-fixes' into for-next) Merging drivers-x86/for-next (027d50ccd6a0 platform/x86: intel-vbtn: Only activate tablet mode switch on 2-in-1's) Merging chrome-platform/for-next (7928b2cbe55b Linux 4.16-rc1) 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 (09c0179286c7 ipmi: kcs_bmc: mark expected switch fall-through in kcs_bmc_handle_data) Merging driver-core/driver-core-next (91ab883eb213 Linux 4.16-rc2) Merging usb/usb-next (b382a5c3c592 USB: chaoskey: Use kasprintf() over strcpy()/strcat()) Merging usb-gadget/next (8ada211d0383 usb: renesas_usbhs: add extcon notifier to set mode for non-otg channel) Merging usb-serial/usb-next (d1c48227d7c4 USB: serial: f81534: fix tx error on some baud rate) Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53) Merging phy-next/next (5a0cdc4f1d4c phy: amlogic: phy-meson-gxl-usb2: rename some of the U2P_R2 registers) Merging tty/tty-next (91ab883eb213 Linux 4.16-rc2) Merging char-misc/char-misc-next (7928b2cbe55b Linux 4.16-rc1) Merging extcon/extcon-next (7928b2cbe55b Linux 4.16-rc1) Merging staging/staging-next (721dfe4133a9 staging: speakup: remove space after a cast) CONFLICT (content): Merge conflict in drivers/staging/fsl-mc/bus/Kconfig Merging mux/for-next (6cd361c99ef2 mux: add SPDX identifiers to all mux source files) Applying: staging: fsl-mc: merge fix for CONFIG_FSL_MC_BUS moving Merging slave-dma/next (5ec91512231a Merge branch 'topic/renesas' into next) Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded mode switching) Merging scsi/for-next (0e6dbc33f387 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (cf8037f8d08a scsi: lpfc: Change Copyright of 12.0.0.0 modified files to 2018) 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 (6e627173fd12 Merge branch 'for-4.16-fixes' into for-next) Merging vhost/linux-next (fa08a3b4eba5 virtio/s390: implement PM operations for virtio_ccw) Merging rpmsg/for-next (ec6e69036956 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (58ce2cb8d9c5 Merge branch 'devel' into for-next) Merging pinctrl/for-next (fd71e799bd5c 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 (7928b2cbe55b Linux 4.16-rc1) 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 (7928b2cbe55b Linux 4.16-rc1) Merging rtc/rtc-next (b9b9f96a8df8 rtc: m41t80: remove useless indirection) Merging nvdimm/libnvdimm-for-next (6a1920f0915c vfio: disable filesystem-dax page pinning) Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) Merging at24/at24/for-next (7928b2cbe55b Linux 4.16-rc1) 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) Applying: percpu: include sched.h for cond_resched() Merging akpm-current/current (9ec53107cdd9 ipc: clamp msgmni and shmmni to the real IPC_MNI limit) CONFLICT (modify/delete): arch/metag/kernel/process.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/metag/kernel/process.c left in tree. $ git rm -f arch/metag/kernel/process.c $ git checkout -b akpm remotes/origin/akpm/master Applying: ipc/mqueue: add missing error code in init_mqueue_fs() Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Applying: sparc64: NG4 memset 32 bits overflow Merging akpm/master (bcfad214b024 sparc64: NG4 memset 32 bits overflow) Applying: KEYS: include vmalloc.h for vmap etc
Attachment:
pgpHRuXgXngjU.pgp
Description: OpenPGP digital signature
