Hi all, Changes since 20180420: The usb tree gained a conflict against the usb.current tree. Non-merge commits (relative to Linus' tree): 1418 1459 files changed, 55564 insertions(+), 22829 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 (5ec83b22a2dd Merge tag '4.17-rc1-SMB3-CIFS' of git://git.samba.org/sfrench/cifs-2.6) Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kbuild-current/fixes (28913ee8191a netfilter: nf_nat_snmp_basic: add correct dependency to Makefile) Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) Merging arm-current/fixes (30cfae461581 ARM: replace unnecessary perl with sed and the shell $(( )) operator) Merging arm64-fixes/for-next/fixes (b2d71b3cda19 arm64: signal: don't force known signals to SIGKILL) Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment) Merging powerpc-fixes/fixes (56376c5864f8 powerpc/kvm: Fix lockups when running KVM guests on Power8) Merging sparc/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (3a04ce7130a7 llc: fix NULL pointer deref for SOCK_ZAPPED) Merging bpf/master (6ab690aa4398 bpf: sockmap remove dead check) Merging ipsec/master (b48c05ab5d32 xfrm: Fix warning in xfrm6_tunnel_net_exit.) Merging netfilter/master (5a786232eb69 netfilter: xt_connmark: do not cast xt_connmark_tginfo1 to xt_connmark_tginfo2) Merging ipvs/master (765cca91b895 netfilter: conntrack: include kmemleak.h for kmemleak_not_leak()) Merging wireless-drivers/master (77e30e10ee28 iwlwifi: mvm: query regdb for wmm rule if needed) Merging mac80211/master (2f0605a697f4 nl80211: Free connkeys on external authentication failure) Merging rdma-fixes/for-rc (60cc43fc8884 Linux 4.17-rc1) Merging sound-current/for-linus (8a56ef4f3ffb ALSA: rawmidi: Fix missing input substream checks in compat ioctls) Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages) Merging driver-core.current/driver-core-linus (ed4564babeee drivers: change struct device_driver::coredump() return type to void) Merging tty.current/tty-linus (46c6975a1fd9 serial: mvebu-uart: Fix local flags handling on termios update) Merging usb.current/usb-linus (7fc65d4c2ba9 xhci: Fix Kernel oops in xhci dbgtty) Merging usb-gadget-fixes/fixes (c6ba5084ce0d usb: gadget: udc: renesas_usb3: add binging for r8a77965) Merging usb-serial-fixes/usb-linus (470b5d6f0cf4 USB: serial: ftdi_sio: use jtag quirk for Arrow USB Blaster) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1) Merging staging.current/staging-linus (edf5c17d866e staging: irda: remove remaining remants of irda code removal) Merging char-misc.current/char-misc-linus (60cc43fc8884 Linux 4.17-rc1) Merging input-current/for-linus (664b0bae0b87 Merge branch 'next' into for-linus) Merging crypto-current/master (eea0d3ea7546 crypto: drbg - set freed buffers to NULL) Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') Merging vfio-fixes/for-linus (834814e80268 Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it") Merging kselftest-fixes/fixes (8bf24e831961 selftests/filesystems: Don't run dnotify_test by default) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown) Merging v4l-dvb-fixes/fixes (1d338b86e17d media: v4l2-compat-ioctl32: better document the code) Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation) Merging mips-fixes/mips-fixes (b3d7e55c3f88 MIPS: uaccess: Add micromips clobbers to bzero invocation) Merging kvm-fixes/master (c18bb396d3d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries) Merging drm-intel-fixes/for-linux-next-fixes (60cc43fc8884 Linux 4.17-rc1) Merging drm-misc-fixes/for-linux-next-fixes (7eb2c4dd54ff drm/i915: Fix LSPCON TMDS output buffer enabling from low-power state) Merging syscalls/syscalls-next (c9a211951c7c bpf: whitelist all syscalls for error injection) Merging kbuild/for-next (60cc43fc8884 Linux 4.17-rc1) Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) Merging dma-mapping/for-next (9e7f06c8beee swiotlb: fix unexpected swiotlb_alloc_coherent failures) Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers) Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging arm/for-next (6dc8c9d147dd Merge branches 'fixes' and 'sa1100-for-next' into for-next) Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap()) Merging arm-soc/for-next (cb799267bb65 MAINTAINERS: Update ASPEED entry with details) Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next) Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) Merging amlogic/for-next (b9b2e4f8f5fd ARM64: dts: meson-axg: add tdm pins) Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next) Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next) Merging bcm2835/for-next (cf172af3be59 Merge branch anholt/bcm2835-defconfig-next into for-next) Merging imx-mxs/for-next (9fa2e1a1fd60 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (dacf37850167 Merge branch 'for_4.17/soc-drivers' into next) Merging mvebu/for-next (4c1b45a44e35 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (fb289e3ab10c Merge branch 'omap-for-v4.17/fixes-ti-sysc' into omap-for-v4.17/fixes) Merging reset/reset/next (0089313d8595 Merge branch 'reset/lookup' into reset/next) Merging qcom/for-next (186d88395e05 Merge tag 'qcom-arm64-defconfig-for-4.17' into all-for-4.17-final) Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) Merging renesas/next (53837ff6076d Merge branches 'arm64-dt-for-v4.18' and 'soc-for-v4.18' into next) Merging rockchip/for-next (aaa7709c6703 Merge branch 'v4.18-armsoc/dts64' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (daf547659dcc Merge branch 'next/soc' into for-next) Merging sunxi/sunxi/for-next (d0715cb8113f Merge branch 'sunxi/clk-for-4.17' into sunxi/for-next) Merging tegra/for-next (6b9b5116227d Merge branch for-4.17/clk into for-next) Merging arm64/for-next/core (24534b351182 arm64: assembler: add macros to conditionally yield the NEON under PREEMPT) Merging clk/clk-next (3baba436e3a6 Merge branch 'clk-core' into clk-next) Merging clk-samsung/for-next (182c084da5d1 clk: samsung: Add fout=196608001 Hz EPLL rate entry for exynos4412) Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse) Merging m68k/for-next (a5de04ccf0b5 m68k: Fix style, spelling, and grammar in siginfo_build_tests()) Merging m68knommu/for-next (60cc43fc8884 Linux 4.17-rc1) Merging microblaze/next (70f6283a372b 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 (3539adf568f5 MIPS: Use generic GCC library routines from lib/) Merging nds32/next (a27fc14219f2 Merge branch 'parisc-4.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock()) Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define) Merging parisc-hd/for-next (c04d31f98cf5 parisc: Fix section mismatches) Merging powerpc/next (60cc43fc8884 Linux 4.17-rc1) Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) Merging risc-v/for-next (60cc43fc8884 Linux 4.17-rc1) Merging s390/features (fae764912153 s390/signal: cleanup uapi struct sigaction) Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) Merging sh/for-next (bf9c7e3d7924 arch/sh: pcie-sh7786: handle non-zero DMA offset) Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic) Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) Merging fscrypt/master (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 (3ebdf0374c18 Merge branch 'for-next-next-v4.18-20180420' into for-next-20180420) Merging ceph/master (e2311baa73a8 ceph: check if mds create snaprealm when setting quota) Merging cifs/for-next (0d5efcd4fa73 SMB3: Fix 3.11 encryption to Windows and handle encrypted smb3 tcon) Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption) Merging ext3/for_next (b1255ee6a289 Pull UDF UTF-16 handling improvements.) Merging ext4/dev (b025a674fc5d ext4: force revalidation of directory pointer after seekdir(2)) Merging f2fs/dev (890527e9f547 f2fs: check cap_resource only for data blocks) Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation) Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) Merging nfs/linux-next (60cc43fc8884 Linux 4.17-rc1) Merging nfs-anna/linux-next (98de9ce6f666 NFS: advance nfs_entry cookie only after decoding completes successfully) Merging nfsd/nfsd-next (36e000768550 nfsd: update obselete comment referencing the BKL) Merging orangefs/for-next (8e9ba5c48ea6 Orangefs: documentation updates) Merging overlayfs/overlayfs-next (16149013f839 ovl: update documentation w.r.t "xino" feature) Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND) Merging xfs/for-next (7b38460dc8e4 xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE) Merging file-locks/locks-next (fa28b25b62ba fasync: Fix deadlock between task-context and interrupt-context kill_fasync()) Merging vfs/for-next (d944db1fd238 Merge branches 'work.dcache' and 'work.misc' into for-next) Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) Merging printk/for-next (cdb7e52d960a vsprintf: Tweak pF/pf comment) Merging pci/next (60cc43fc8884 Linux 4.17-rc1) Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression) Merging hid/for-next (00ddd17446aa Merge branch 'for-4.17/upstream-fixes' into for-next) Merging i2c/i2c/for-next (60cc43fc8884 Linux 4.17-rc1) Merging dmi/master (0a5f08c2f0c7 firmware: dmi_scan: Use lowercase letters for UUID) Merging hwmon-staging/hwmon-next (3449f321d6ae Merge tag 'ib-mfd-hwmon-v4.18' into hwmon-next) Merging jc_docs/docs-next (3b443955596e Docs: tell maintainers to put [GIT PULL] in their subject lines) Merging v4l-dvb/master (1d338b86e17d media: v4l2-compat-ioctl32: better document the code) Merging v4l-dvb-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) Merging fbdev/fbdev-for-next (7c9b845e79ea video: fbdev: s3c-fb: remove dead platform code for Exynos and S5PV210 platforms) Merging pm/linux-next (fabeef37bfd5 ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016)) 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 (b907b408ca64 Merge branches 'thermal-core' and 'thermal-soc' into next) Merging thermal-soc/next (629d835db501 thermal: imx: add i.MX7 thermal sensor support) 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 rdma/for-next (60cc43fc8884 Linux 4.17-rc1) Merging net-next/master (e0ada51db907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging bpf-next/master (878a4d328104 libbpf: fixed build error for samples/bpf/) Merging ipsec-next/master (cd027a5433d6 udp: enable UDP checksum offload for ESP) Merging netfilter-next/master (159f02977b2f Merge branch 'net-mvneta-improve-suspend-resume') Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support) Merging ipvs-next/master (9a17740e0ea1 ipvs: fix multiplicative hashing in sh/dh/lblc/lblcr algorithms) Merging wireless-drivers-next/master (5d1365940a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging bluetooth/master (24557b660705 Bluetooth: btqcomsmd: Fix rx/tx stats) Merging mac80211-next/master (8db0c433692e regulatory: Rename confusing 'country IE' in log output) Merging gfs2/for-next (9a38662ba4e2 gfs2: Remove sdp->sd_jheightsize) Merging mtd/master (87a73eb5b56f mtd: jedec_probe: Fix crash in jedec_read_mfr()) Merging l2-mtd/mtd/next (0e210b542cdb mtd: devices: simplify getting .drvdata) Merging nand/nand/next (bfc3ff92b152 mtd: onenand: simplify getting .drvdata) Merging spi-nor/spi-nor/next (f134fbbb4ff8 mtd: spi-nor: clear Winbond Extended Address Reg on switch to 3-byte addressing.) Merging crypto/master (b930f3a2292d crypto: caam: - Use kmemdup() function) Merging drm/drm-next (a10beabba213 Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux into drm-next) Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (b4615730530b drm/i915/audio: Fix audio detection issue on GLK) Merging drm-tegra/drm/tegra/for-next (27e92f1f1600 drm/tegra: prime: Implement ->{begin,end}_cpu_access()) Merging drm-misc/for-linux-next (3131f209468d drm/vc4: Fix leak of the file_priv that stored the perfmon.) Merging drm-msm/msm-next (789d4c300e10 drm/msm: don't deref error pointer in the msm_fbdev_create error path) Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers) Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) Merging imx-drm/imx-drm/next (22cd2b2b3151 drm/imx: Remove last traces of struct imx_drm_crtc) Merging etnaviv/etnaviv/next (4ed75c3e5255 drm/etnaviv: bump HW job limit to 4) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (e241e3f2bf97 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging sound/for-next (91a8561d0eed ALSA: usb-audio: add implicit fb quirk for Axe-Fx III) Merging sound-asoc/for-next (700387d6ff67 Merge branch 'asoc-4.18' into asoc-next) Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign) Merging input/next (04bb1719c4de Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad) Merging block/for-next (667eea5d591b 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 (a1c0a8e35b88 dm bufio: fix buffer alignment) Merging mmc/next (3dd6fb2377df mmc: sdhci-cadence: fix logically and structurally dead code) Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) Merging md/for-next (fd823089ffac raid5: copy write hint from origin bio to stripe) Merging mfd/for-mfd-next (b45bf45f1b82 mfd: arizona: Update reset pin to use GPIOD) Merging backlight/for-backlight-next (ea388d6cffd4 pwm-backlight: Add support for PWM delays proprieties.) Merging battery/for-next (fd73a3e61888 power: reset: at91-reset: Switch from the pr_*() to the dev_*() logging functions) Merging regulator/for-next (02f3703934a4 regulator: Don't return or expect -errno from of_map_mode()) Merging security/next-testing (0c245cb58731 security: remove security_settime) Merging apparmor/apparmor-next (588558eb6d0e apparmor: fix memory leak on buffer on error exit path) Merging integrity/next-integrity (ab60368ab6a4 ima: Fallback to the builtin hash algorithm) Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) Merging selinux/next (d141136f523a audit: normalize MAC_POLICY_LOAD record) Merging tpmdd/next (077c2a70a62b tpm: Move shared eventlog functions to common.c) CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-interface.c Merging watchdog/master (285848b0f407 Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random) Merging iommu/next (d4f96fd5c249 Merge branches 'x86/amd', 'x86/vt-d', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/exynos', 'arm/renesas', 'arm/smmu' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) Merging vfio/next (da9147140fe3 MAINTAINERS: vfio/platform: Update sub-maintainer) Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (d96f92f4aae1 audit: add syscall information to FEATURE_CHANGE records) Merging devicetree/for-next (304a39b4bc94 dt-bindings: more status property removal from examples) Merging mailbox/mailbox-for-next (dfbc9c5841fc mailbox: Remove depends on HAS_DMA in case of platform dependency) Merging spi/for-next (32c8c029da20 Merge branch 'spi-4.18' into spi-next) Merging tip/auto-latest (ef1b4a737296 Merge branch 'perf/urgent') Merging clockevents/clockevents/next (0136c741ff40 clocksource/drivers/imx-tpm: Add different counter width support) Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) Merging edac-amd/for-next (6fd052665274 EDAC, sb_edac: Remove variable length array usage) Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when updating irq type) Merging ftrace/for-next (0b3dec05dbbc tracing: Enforce passing in filter=NULL to create_filter()) Merging rcu/rcu/next (7cac6ce93a1d Merge branches 'exp.2018.04.20a', 'fixes.2018.04.20a', 'lock.2018.04.22a' and 'torture.2018.04.20a' into HEAD) Merging kvm/linux-next (c18bb396d3d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kvm-arm/next (dc6ed61d2f82 arm64: Add temporary ERRATA_MIDR_ALL_VERSIONS compatibility macro) Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) Merging kvm-ppc/kvm-ppc-next (31c8b0d0694a KVM: PPC: Book3S HV: Use __gfn_to_pfn_memslot() in page fault handler) Merging kvms390/next (ccc40c53c07b KVM: s390: provide counters for all interrupt injects/delivery) Merging xen-tip/linux-next (ebf04f331fa1 xen: xenbus_dev_frontend: Really return response string) Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next) Merging drivers-x86/for-next (60cc43fc8884 Linux 4.17-rc1) Merging chrome-platform/for-next (60cc43fc8884 Linux 4.17-rc1) Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t) Merging leds/for-next (9e50d5fb0d18 leds: add LED driver for CR0014114 board) Merging ipmi/for-next (1211229399b3 ipmi_ssif: Fix uninitialized variable issue) Merging driver-core/driver-core-next (60cc43fc8884 Linux 4.17-rc1) Merging usb/usb-next (b462e2e0d62a Documentation sysfs-bus-usb: Add rx_lanes and tx_lanes introduced in USB 3.2) CONFLICT (content): Merge conflict in drivers/usb/core/hcd.c Merging usb-gadget/next (60cc43fc8884 Linux 4.17-rc1) Merging usb-serial/usb-next (60cc43fc8884 Linux 4.17-rc1) Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53) Merging phy-next/next (60cc43fc8884 Linux 4.17-rc1) Merging tty/tty-next (394e83514541 serial: mvebu-uart: add suspend/resume support) Merging char-misc/char-misc-next (60cc43fc8884 Linux 4.17-rc1) Merging extcon/extcon-next (60cc43fc8884 Linux 4.17-rc1) Merging staging/staging-next (60cc43fc8884 Linux 4.17-rc1) Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API) Merging slave-dma/next (c964cef1618f Merge branch 'topic/txx' into next) Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded mode switching) Merging scsi/for-next (acc2587b8cf1 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (f990bee3f187 scsi: ips: fix firmware timestamps for 32-bit) 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 (fd17ed684b6e Revert "ata: ahci-platform: add reset control support") Merging vhost/linux-next (3af494dbae48 ACPI: disable extra P_LVLx access on KVM) Merging rpmsg/for-next (47c4aebb693c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (348f3cde84ab gpio: Add Spreadtrum PMIC EIC driver support) Merging pinctrl/for-next (4fc97ef94bbf pinctrl: uniphier: add UART hardware flow control pin-mux settings) Merging pinctrl-samsung/for-next (938a10bb4913 pinctrl: samsung: Document required order of banks) Merging pwm/for-next (6873842235d6 pwm: rcar: Add suspend/resume support) Merging userns/for-next (1f5781725dcb commoncap: Handle memory allocation failure.) Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) Merging random/dev (9e66317d3c92 Linux 4.14-rc3) Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) Merging kselftest/next (60cc43fc8884 Linux 4.17-rc1) Merging y2038/y2038 (5dc0b1529d21 y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop) Merging livepatching/for-next (3beed9bf1e3d Merge branch 'for-4.17/upstream-fixes' into for-next) Merging coresight/next (53531a9947ed coresight: Moving framework and drivers to SPDX identifier) Merging rtc/rtc-next (36d91a4d401c rtc: cmos: introduce quirks to enable use_acpi_alarm mode) Merging nvdimm/libnvdimm-for-next (c5794510d7b5 MAINTAINERS: Add backup maintainers for libnvdimm and DAX) Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) Merging at24/at24/for-next (22e06c32b936 eeprom: at24: provide a separate routine for creating dummy i2c clients) Merging ntb/ntb-next (53c3677c56c7 ntb: intel: change references of skx to gen3) Merging kspp/for-next/kspp (0adb32858b0b Linux 4.16) Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging akpm-current/current (3346b91e3ca1 exofs-avoid-vla-in-structures-v2) $ git checkout -b akpm remotes/origin/akpm/master Applying: mm: use octal not symbolic permissions Applying: treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX Applying: kernel/kexec_file.c: add walk_system_ram_res_rev() Applying: kernel/kexec_file.c: load kernel at top of system RAM if required Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Applying: sparc64: NG4 memset 32 bits overflow Merging akpm/master (9458d6aa2e77 sparc64: NG4 memset 32 bits overflow)
Attachment:
pgpzfBZ2wNgjS.pgp
Description: OpenPGP digital signature
