Hi all, Changes since 20171208: The clk tree gained build failures so I used the version from next-20171208. The v4l-dvb-next tree gained conflicts against the vfs tree. The akpm-current tree gained a build failure for which I added a fix patch. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 3585 4000 files changed, 125336 insertions(+), 123397 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 251 trees (counting Linus' and 43 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 (98087c05b9fc hpfs: don't bother with the i_version counter or f_version) Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging kbuild-current/fixes (cfe17c9bbe6a kbuild: move cc-option and cc-disable-warning after incl. arch Makefile) Merging arc-current/for-curr (60e134d94018 ARC: provide for gcc "isolate path" induced generated abort calls) Merging arm-current/fixes (3aaf33bebda8 ARM: avoid faulting on qemu) Merging m68k-current/for-linus (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (d81041820873 powerpc/xmon: Don't print hashed pointers in xmon) Merging sparc/master (a0908a1b7d68 Merge branch 'akpm' (patches from Andrew)) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (f335195adf04 kmemcheck: rip it out for real) Merging bpf/master (195bd525d5f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging ipsec/master (75bf50f4aaa1 xfrm: fix xfrm_do_migrate() with AEAD e.g(AES-GCM)) Merging netfilter/master (96307a0a75d8 netfilter: ipt_CLUSTERIP: fix clusterip_net_exit build regression) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (a41886f56b7b Merge tag 'iwlwifi-for-kalle-2017-12-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging mac80211/master (156324d6e92c mac80211: fix locking in ieee80211_sta_tear_down_BA_sessions) Merging sound-current/for-linus (2b4584d00a6b ALSA: hda - Add vendor id for Cannonlake HDMI codec) Merging pci-current/for-linus (a19e2696135e x86/PCI: Only enable a 64bit BAR on single-socket AMD Family 15h) Merging driver-core.current/driver-core-linus (0946b2fb38fd firmware: cleanup FIRMWARE_IN_KERNEL message) Merging tty.current/tty-linus (c8ec2041f549 MIPS: Add custom serial.h with BASE_BAUD override for generic kernel) Merging usb.current/usb-linus (72b663a99c07 usb: xhci: fix TDS for MTK xHCI1.1) Merging usb-gadget-fixes/fixes (a3acc696085e usb: f_fs: Force Reserved1=1 in OS_DESC_EXT_COMPAT) Merging usb-serial-fixes/usb-linus (762ff4678e89 USB: serial: usb_debug: add new USB device id) Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) Merging phy/fixes (521e84ab2507 phy: rcar-gen3-usb2: select USB_COMMON) Merging staging.current/staging-linus (202fc673c626 staging: pi433: Fixes issue with bit shift in rf69_get_modulation) Merging char-misc.current/char-misc-linus (66bc5df31110 MAINTAINERS: update Android driver maintainers.) Merging input-current/for-linus (4c83c071b784 Input: elants_i2c - do not clobber interrupt trigger on x86) Merging crypto-current/master (ecaaab564978 crypto: salsa20 - fix blkcipher_walk API usage) Merging ide/master (0c86a6bd85ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging vfio-fixes/for-linus (e41dd1556d4d Merge branch 'iommu-fixes/vt-d' into for-linus) Merging kselftest-fixes/fixes (ae64f9bd1d36 Linux 4.15-rc2) 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 (ae64f9bd1d36 Linux 4.15-rc2) Merging mfd-fixes/for-mfd-fixes (b860b419d970 mfd: Fix RTS5227 (and others) powermanagement) Merging v4l-dvb-fixes/fixes (781b045baefd media: imx274: Fix error handling, add MAINTAINERS entry) Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation) Merging mips-fixes/mips-fixes (b084116f8587 MIPS: AR7: Ensure that serial ports are properly set up) Merging kvm-fixes/master (b1394e745b94 KVM: x86: fix APIC page invalidation) Merging kvms390-fixes/master (ca76ec9ca871 KVM: s390: Fix skey emulation permission check) Merging drm-intel-fixes/for-linux-next-fixes (d85936ab62f9 Merge tag 'gvt-fixes-2017-12-06' of https://github.com/intel/gvt-linux into drm-intel-fixes) Merging drm-misc-fixes/for-linux-next-fixes (babc8110057c drm/vc4: Release fence after signalling) Merging kbuild/for-next (a815d4e94be0 Merge remote-tracking branch 'kconfig' into for-next) Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) Merging dma-mapping/for-next (c9eb6172c328 dma-mapping: turn dma_cache_sync into a dma_map_ops method) Merging asm-generic/master (a351e9b9fc24 Linux 4.11) Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging arm/for-next (383f07dc0a84 Merge branches 'fixes', 'misc' and 'sa1111' into for-next) Merging arm-perf/for-next/perf (07141342149a arm64: MAINTAINERS: hisi: Add HiSilicon SoC PMU support) Merging arm-soc/for-next (8be0b9886b64 Merge branch 'fixes' into for-next) Merging actions/for-next (a15f031b7361 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 (5f6497b9aae8 Merge branch 'v4.16/dt64' into tmp/aml-rebuild) Merging aspeed/for-next (9c9ae757dc8b Merge branch 'dt-for-v4.15' into for-next) Merging at91/at91-next (bee152d6af7d Merge branch 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) Merging bcm2835/for-next (a6189bcc0012 Merge branch anholt/bcm2835-drivers-next into for-next) Merging imx-mxs/for-next (3d48b83d1ab5 Merge branch 'imx/dt64' into for-next) Merging keystone/next (f594d414d4f4 Merge branch 'for_4.16/keystone-config' into next) Merging mvebu/for-next (c6c5ff72be36 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (aa40a77609db Merge branch 'omap-for-v4.15/fixes-v2' into for-next) Merging reset/reset/next (0e5721f76252 reset: meson-axg: add compatible string for Meson-AXG SoC) Merging qcom/for-next (e7048ed58ed9 Merge tag 'qcom-drivers-for-4.15-2' into final-for-4.15) Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) Merging renesas/next (327134b5cc38 Merge branch 'dt-for-v4.16' into next) Merging rockchip/for-next (c73d733c7515 Merge branch 'v4.15-armsoc/fixes64' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (05b751dd2d8a Merge branch 'next/dt' into for-next) CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig Merging sunxi/sunxi/for-next (68865e126ffb Merge branches 'sunxi/clk-for-4.16', 'sunxi/dt-for-4.16' and 'sunxi/dt64-for-4.16' into sunxi/for-next) Merging tegra/for-next (ec0c973f47c7 Merge branch for-4.15/reset into for-next) Merging arm64/for-next/core (6cfa7cc46b1a arm64: Make ARMV8_DEPRECATED depend on SYSCTL) Merging clk/clk-next (3279e463717f Merge branch 'clk-qcom-alpha-pll' into clk-next) $ git reset --hard HEAD^ Merging next-20171208 version of clk Merging clk-samsung/for-next (bebc6082da0a Linux 4.14) Merging c6x/for-linux-next (62016565bb04 c6x: remove unused KTHREAD_SIZE definition) Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) Merging m68k/for-next (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7) Merging m68knommu/for-next (4cc9ce65974b m68k/defconfig: fix stmark2 broken local compilation) Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) Merging microblaze/next (da25f490a0b3 microblaze: add missing include to mmu_context_mm.h) Merging mips/mips-next (e0c5f36b2a63 MIPS: Add iomem resource for kernel bss section.) Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles only if initialized) Merging openrisc/for-next (610f01b9a88a openrisc: fix possible deadlock scenario during timer sync) Merging parisc-hd/for-next (bebc6082da0a Linux 4.14) Merging powerpc/next (ae64f9bd1d36 Linux 4.15-rc2) Merging fsl/next (a4e89ffb5923 powerpc/e6500: Update machine check for L1D cache err) Merging risc-v/for-linux-next (fe3f16cdfb97 automerging branch "github.com-riscv/next-audit_dir_write" into "for-linux-next") Merging s390/features (4c48b1da1d91 s390/vdso: revise CFI annotations of vDSO functions) Merging sparc-next/master (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) Merging uml/linux-next (02eb0b11eab5 um: Add missing EXPORT for free_irq_by_fd()) Merging xtensa/xtensa-for-next (1e17e68617a4 Merge branch 'xtensa-asm-cleanups' into xtensa-for-next) Merging fscrypt/master (a0b3bc855374 fscrypt: lock mutex before checking for bounce page pool) Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) Merging btrfs/next (5226fcac7841 squashfs: Add zstd support) Merging btrfs-kdave/for-next (523dedd3dedf Merge branch 'for-next-next-v4.15-20171206' into for-next-20171206) Merging ceph/master (040d786032bf ceph: drop negative child dentries before try pruning inode's alias) Merging cifs/for-next (5702591fc6a3 CIFS: don't log STATUS_NOT_FOUND errors for DFS) 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 (88bc0ede8d35 quota: Check for register_shrinker() failure.) Merging ext4/dev (e243560f12d7 ext4: fix fdatasync(2) after fallocate(2) operation) Merging f2fs/dev (4fbd8d194f06 Linux 4.15-rc1) 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 (51090c5d6de0 Merge tag 'for-4.15-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging nfs-anna/linux-next (c54c14ba000d xprtrdma: Spread reply processing over more CPUs) Merging nfsd/nfsd-next (a14fbdff76ba lockd: convert nlm_rqst.a_count from atomic_t to refcount_t) Merging orangefs/for-next (db0267e7afc7 orangefs: call op_release sooner when creating inodes) Merging overlayfs/overlayfs-next (d9768076068f ovl: remove unneeded arg from ovl_verify_origin()) Merging ubifs/linux-next (15e5178339b9 ubi: fastmap: Clean up the initialization of pointer p) Merging xfs/for-next (b7e0b6ff54dd xfs: make iomap_begin functions trim iomaps consistently) Merging file-locks/locks-next (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging vfs/for-next (18c4468d431b Merge branch 'for-linus' into for-next) CONFLICT (content): Merge conflict in net/netfilter/xt_bpf.c CONFLICT (content): Merge conflict in drivers/net/ethernet/via/via-rhine.c CONFLICT (content): Merge conflict in arch/score/include/uapi/asm/Kbuild CONFLICT (content): Merge conflict in arch/mn10300/include/uapi/asm/Kbuild CONFLICT (content): Merge conflict in arch/alpha/include/uapi/asm/Kbuild Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) Merging printk/for-next (926adbad7320 Merge commit 'da6af54dc0014d733ce014a196e4c84ee43cabec' into for-4.16-deprecate-printk-pf) Merging pci/next (329c863b0c1d Merge branch 'pci/virtualization' into next) Merging pstore/for-next/pstore (a99f41a1b441 fs: pstore: remove unused hardirq.h) Merging hid/for-next (421f664d5eb4 Merge branch 'for-4.16/hid-quirks-cleanup/pixart' into for-next) Merging i2c/i2c/for-next (c86d671f7d85 Merge branch 'i2c/for-4.16' into i2c/for-next) Merging dmi/master (0bcea5c474d1 firmware: dmi: handle missing DMI data gracefully) Merging hwmon-staging/hwmon-next (ccdb35594d7b hwmon: (w83773g) Fix fault detection and reporting) Merging jc_docs/docs-next (9956cfef3409 Documentation: fix docs build error after source file removed) Merging v4l-dvb/master (0393e735649d media: uvcvideo: Stream error events carry no data) Merging v4l-dvb-next/master (ba815f198ca2 media: RC docs: add enum rc_proto description at the docs) CONFLICT (modify/delete): include/media/lirc_dev.h deleted in v4l-dvb-next/master and modified in HEAD. Version HEAD of include/media/lirc_dev.h left in tree. CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_zilog.c deleted in v4l-dvb-next/master and modified in HEAD. Version HEAD of drivers/staging/media/lirc/lirc_zilog.c left in tree. CONFLICT (content): Merge conflict in drivers/media/rc/lirc_dev.c $ git rm -f include/media/lirc_dev.h $ git rm -f drivers/staging/media/lirc/lirc_zilog.c Merging fbdev/fbdev-for-next (5f215d252496 OMAPFB: prevent buffer underflow in omapfb_parse_vram_param()) Merging pm/linux-next (f39b28a15c58 Merge branch 'pm-core-fix-next' into linux-next) Merging cpupower/cpupower (ae64f9bd1d36 Linux 4.15-rc2) Merging idle/next (8a5776a5f498 Linux 4.14-rc4) Merging opp/opp/linux-next (4fbd8d194f06 Linux 4.15-rc1) Merging thermal/next (1e032393d968 Merge branches 'thermal-core', 'thermal-tool', 'thermal-intel' and 'thermal-soc' into next) Merging thermal-soc/next (fd6d2e506ce6 Merge tag 'docs-4.15-fixes' of git://git.lwn.net/linux) Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) 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 (51e18a453f5f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) CONFLICT (content): Merge conflict in net/smc/smc_clc.c Merging bpf-next/master (97c50589229f Merge branch 'bpf-bpftool-makefile-cleanups') Merging ipsec-next/master (9b7e14dba0c0 xfrm: Remove redundant state assignment in xfrm_input()) Merging netfilter-next/master (e02538c6458b netfilter: reduce size of hook entry point locations) CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_h323_asn1.c 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 (53ac79359327 wireless: use ARRAY_SIZE) CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/pcie/drv.c Merging bluetooth/master (68841962f52c Bluetooth: hci_ll: Add endianness conversion when setting baudrate) Merging mac80211-next/master (5048a9c329af mac80211: make __ieee80211_start_rx_ba_session static) CONFLICT (content): Merge conflict in net/mac80211/agg-tx.c CONFLICT (content): Merge conflict in net/mac80211/agg-rx.c Merging rdma/for-next (335ebf6fa35c iw_cxgb4: only clear the ARMED bit if a notification is needed) Merging gfs2/for-next (9aa015932727 gfs2: Remove unused gfs2_write_jdata_pagevec parameter) Merging mtd/master (36de80740008 mtd: nand: atmel: fix buffer overflow in atmel_pmecc_user) Merging l2-mtd/master (1530578abdac mtd: Avoid probe failures when mtd->dbg.dfs_dir is invalid) Merging nand/nand/next (258eeed92280 mtd: nand: samsung: add ECC requirements for K9F4G08U0D) Merging spi-nor/spi-nor/next (b3fbf5e23f8c mtd: spi-nor: Check that BP bits are set properly) Merging crypto/master (45223b78118c crypto: arm64/aes - do not call crypto_unregister_skcipher twice on error) Merging drm/drm-next (9428088c90b6 drm/qxl: reapply cursor after resetting primary) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/scheduler.c Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (2d8d1afb4d7d drm/i915: Add is-wedged flag to intel_engine_dump()) Merging drm-tegra/drm/tegra/for-next (e1335e2f0cfc drm/tegra: sor: Reimplement pad clock) Merging drm-misc/for-linux-next (d3820952ea1b drm/tinydrm: Use drm_fb_cma_fbdev_init_with_funcs/fini()) Merging drm-msm/msm-next (ad9d50c79043 drm/msm: free kstrdup'd cmdline) 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 (d66611856832 drm/imx: advertise supported plane format modifiers) Merging etnaviv/etnaviv/next (49b82c389d2a drm/etnaviv: make THERMAL selectable) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (a7821505a87c Merge remote-tracking branches 'regmap/topic/hwspinlock' and 'regmap/topic/nolock' into regmap-next) Merging sound/for-next (108884e6c5aa ALSA: usb-audio: Change the semantics of the enable option) Merging sound-asoc/for-next (69d24f08c555 Merge remote-tracking branches 'asoc/topic/wm8903', 'asoc/topic/wm8994', 'asoc/topic/wm8997' and 'asoc/topic/wm8998' into asoc-next) Merging modules/modules-next (ece1996a21ee module: Do not paper over type mismatches in module_param_call()) Merging input/next (c1b433e04ef9 Input: gamecon - mark expected switch fall-throughs) Merging block/for-next (50da70ed9c48 Merge branch 'for-4.15/block' into for-next) Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) Merging device-mapper/for-next (aecefd4919de dm: fix __send_changing_extent_only() to send first bio and chain remainder) Merging mmc/next (40d72bbbc868 mmc: sdhci-of-esdhc: fix the mmc error after sleep on ls1046ardb) Merging md/for-next (3f5b7d277da9 md/raid1,raid10: silence warning about wait-within-wait) Merging mfd/for-mfd-next (15a94ce2b7ae mfd: stm32: Adopt SPDX identifier) Applying: misc: rtsx: fix symbol clashes Merging backlight/for-backlight-next (29fae2c1db24 backlight: ili922x: Remove redundant variable len) Merging battery/for-next (70a39e107501 Add support for bq27521 battery monitor) Merging regulator/for-next (ff2cc8313d94 Merge remote-tracking branches 'regulator/topic/doc', 'regulator/topic/sc2731' and 'regulator/topic/tps65218' into regulator-next) Merging security/next-testing (4c6082336a74 Merge tag 'seccomp-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next-testing) Merging integrity/next (e87dafe70acc ima: Remove redundant conditional operator) CONFLICT (content): Merge conflict in include/linux/module.h CONFLICT (content): Merge conflict in fs/namespace.c CONFLICT (content): Merge conflict in Documentation/ABI/testing/evm Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) Merging selinux/next (4b14752ec4e0 selinux: skip bounded transition processing if the policy isn't loaded) Merging tpmdd/next (db3248e8a036 tpm: Keep CLKRUN enabled throughout the duration of transmit_cmd()) CONFLICT (content): Merge conflict in include/linux/tpm_eventlog.h Merging watchdog/master (14807b07a7d8 watchdog: pcwd_usb: remove unneeded DRIVER_LICENSE #define) CONFLICT (content): Merge conflict in drivers/watchdog/mpc8xxx_wdt.c Merging iommu/next (a593472591a5 Merge branches 'iommu/fixes', 'arm/omap', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'core' into next) Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) Merging vfio/next (d04222983379 Merge branches 'iommu/arm/smmu', 'iommu/updates', 'vfio/fixes', 'vfio/platform', 'iommu/vt-d', 'iommu/ipmmu-vmsa' and 'iommu/iova' into next) Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig) Merging audit/next (42d5e37654e4 audit: filter PATH records keyed on filesystem magic) Merging devicetree/for-next (589b754df3f3 of: overlay: Make node skipping in init_overlay_changeset() clearer) Merging mailbox/mailbox-for-next (1f90a2162fb3 mailbox/omap: unregister mbox class) Merging spi/for-next (4944486c01d8 Merge remote-tracking branch 'spi/topic/xilinx' into spi-next) Merging tip/auto-latest (b6a912bbf060 Merge branch 'x86/urgent') Merging clockevents/clockevents/next (8a7507eea818 clocksource/drivers/mips-gic-timer: Add fastpath for local timer updates) CONFLICT (content): Merge conflict in drivers/clocksource/mips-gic-timer.c 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 (86a18ee21e5e EDAC, ti: Add support for TI keystone and DRA7xx EDAC) Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) Merging ftrace/for-next (a96a5037ed0f tracing, thermal: Hide cpu cooling trace events when not in use) Merging rcu/rcu/next (b9623f0e768f doc: Fixed typo in rcutorture documentation) Merging kvm/linux-next (ae64f9bd1d36 Linux 4.15-rc2) Merging kvm-arm/next (4fbd8d194f06 Linux 4.15-rc1) Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) Merging kvm-ppc/kvm-ppc-next (432953b4455d KVM: PPC: Book3S HV: Cosmetic post-merge cleanups) Merging kvms390/next (da9a1446d248 KVM: s390: provide a capability for AIS state migration) Merging xen-tip/linux-next (1ab134ca3151 xen/pvcalls: Fix a check in pvcalls_front_remove()) Merging percpu/for-next (abee210500ed percpu: hack to let the CRIS architecture to boot until they clean up) Merging workqueues/for-next (62408c1ef007 workqueue/hotplug: remove the workaround in rebind_workers()) Merging drivers-x86/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging chrome-platform/for-next (859eb05676f6 platform/chrome: Use proper protocol transfer function) Merging hsi/for-next (b6dc80dbe6cd HSI: cmt_speech: use timespec64 instead of timespec) Merging leds/for-next (92fdb03c084e leds: blinkm: avoid uninitialized data use) Merging ipmi/for-next (92dc2d24748e ipmi_si: fix crash on parisc) CONFLICT (content): Merge conflict in drivers/char/ipmi/ipmi_si_intf.c Merging driver-core/driver-core-next (328257099077 driver core: Remove redundant license text) Merging usb/usb-next (16e791e76596 doc: usb: chipidea: Fix typo in 'enumerate') Merging usb-gadget/next (ce2b21a4e5ce usb: dwc2: Fix UDC state tracking) Merging usb-serial/usb-next (d8a42b1ff8a3 USB: serial: ark3116: clean up return values of register accessors) Merging usb-chipidea-next/ci-for-usb-next (2a53e060a053 usb: chipidea: fix trivial typo in Kconfig) Merging phy-next/next (4fbd8d194f06 Linux 4.15-rc1) Merging tty/tty-next (4fbd8d194f06 Linux 4.15-rc1) Merging char-misc/char-misc-next (9a450484089d lp: support 64-bit time_t user space) Merging extcon/extcon-next (4f65b63ecc4c extcon: axp288:: Handle return value of platform_get_irq) Merging staging/staging-next (93d3ad90c2d4 drivers: visorbus: move driver out of staging) CONFLICT (content): Merge conflict in drivers/staging/most/video/video.c CONFLICT (content): Merge conflict in drivers/staging/most/cdev/cdev.c Merging mux/for-next (6cd361c99ef2 mux: add SPDX identifiers to all mux source files) Merging slave-dma/next (f1b8ae7acceb Merge branch 'topic/mic' into next) Merging cgroup/for-next (c2f31b79d510 cgroup: add warning about RT not being supported on cgroup2) Merging scsi/for-next (5271b8a207ba Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (7ee6d1b4357a scsi: scsi_debug: Add support for injecting SCSI_MLQUEUE_HOST_BUSY) Merging target-updates/for-next (97488c73190b tcmu: Add a missing unlock on an error path) Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging libata/for-next (2dc0b46b5ea3 libata: sata_down_spd_limit should return if driver has not recorded sstatus speed) Merging vhost/linux-next (e073f74a5a39 Merge branch 'this' into vhost) Merging rpmsg/for-next (aae5207dd9c4 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (e3ce8c16971c Merge branch 'devel' into for-next) Merging pinctrl/for-next (8ed259d4f687 Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging pwm/for-next (bccaa3f917c9 pwm: meson: Add clock source configuration for Meson-AXG) Merging userns/for-next (116ceac9741e autofs4: Modify autofs_wait to use current_uid() and current_gid()) 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 (ae64f9bd1d36 Linux 4.15-rc2) Merging y2038/y2038 (69973b830859 Linux 4.9) Merging livepatching/for-next (c99a2be790b0 livepatch: force transition to finish) Merging coresight/next (2bbe5ac62413 coresight: etb10: remove duplicate includes) Merging rtc/rtc-next (9f33399c9074 rtc: stm32: Fix copyright) Merging nvdimm/libnvdimm-for-next (4247f24c2358 Merge branch 'for-4.15/dax' into libnvdimm-for-next) Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) Merging at24/at24/for-next (7cd632bd3949 eeprom: at24: support eeproms that do not auto-rollover reads) Merging ntb/ntb-next (c47963de5204 ntb_hw_switchtec: Force down the link before initializing) Merging kspp/for-next/kspp (589cde432c02 lkdtm: Update usercopy tests for whitelisting) Merging akpm-current/current (829fd21e7e5c lustre: don't set f_version in ll_readdir) Applying: mm, hugetlbfs: move testing of vma_mmu_pagesize to after incusion of asm/hugetlb.h Applying: mm, hugetlbfs: move testing of vma_mmu_pagesize to after incusion of asm/hugetlb.h $ git checkout -b akpm remotes/origin/akpm/master Applying: tools/objtool/Makefile: don't assume sync-check.sh is executable Applying: vfs: remove might_sleep() from clear_inode() Applying: mm/userfaultfd.c: remove duplicate include Applying: ipc, mqueue: lazy call kern_mount_data in new namespaces Applying: epoll: use the waitqueue lock to protect ep->wq Applying: sched/wait: assert the wait_queue_head lock is held in __wake_up_common Applying: mm: remove unneeded kallsyms include Applying: power: remove unneeded kallsyms include Applying: pci: remove unneeded kallsyms include Applying: pnp: remove unneeded kallsyms include Applying: workqueue: remove unneeded kallsyms include Applying: hrtimer: remove unneeded kallsyms include Applying: genirq: remove unneeded kallsyms include Applying: sparc64: NG4 memset 32 bits overflow Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant Merging akpm/master (3874cd38bb72 lib/crc-ccitt: add CCITT-FALSE CRC16 variant) -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
