path: root/Next/merge.log

$ date -R
Fri, 15 Jun 2018 10:59:57 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at be779f03d563 Merge tag 'kbuild-v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Merging origin/master (b5d903c2d656 Merge branch 'akpm' (patches from Andrew))
$ git merge origin/master
Updating be779f03d563..b5d903c2d656
Fast-forward
 .../ABI/testing/sysfs-platform-ideapad-laptop      |   13 +
 Documentation/admin-guide/LSM/apparmor.rst         |    6 +-
 .../devicetree/bindings/i2c/i2c-davinci.txt        |    2 +-
 Documentation/devicetree/bindings/i2c/i2c-rcar.txt |    1 +
 .../devicetree/bindings/i2c/i2c-s3c2410.txt        |    4 +-
 .../devicetree/bindings/mfd/stm32-timers.txt       |   20 +
 .../features/debug/stackprotector/arch-support.txt |    2 +-
 Documentation/filesystems/ceph.txt                 |    8 +-
 Documentation/i2c/busses/i2c-mlxcpld               |    4 +
 Documentation/i2c/busses/i2c-ocores                |    2 +-
 Documentation/i2c/muxes/i2c-mux-gpio               |    4 +-
 Documentation/kbuild/kconfig-language.txt          |    2 +-
 Documentation/laptops/thinkpad-acpi.txt            |    2 +
 Documentation/security/self-protection.rst         |    2 +-
 MAINTAINERS                                        |    8 +-
 Makefile                                           |    4 +-
 arch/Kconfig                                       |   10 +-
 arch/arm/Kconfig                                   |    5 +-
 arch/arm/boot/compressed/Makefile                  |    3 +
 arch/arm/kernel/asm-offsets.c                      |    2 +-
 arch/arm/kernel/entry-armv.S                       |    4 +-
 arch/arm/kernel/process.c                          |    2 +-
 arch/arm/kvm/hyp/Makefile                          |    8 +
 arch/arm/mach-ks8695/board-acs5k.c                 |    2 +-
 arch/arm/mach-omap1/board-htcherald.c              |    2 +-
 arch/arm/mach-omap1/common.h                       |    2 +-
 arch/arm/mach-omap1/i2c.c                          |    2 +-
 arch/arm/mach-omap2/common.h                       |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_54xx_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c          |    2 +-
 arch/arm/mach-pxa/palmz72.c                        |    2 +-
 arch/arm/mach-pxa/viper.c                          |    2 +-
 arch/arm/mach-sa1100/simpad.c                      |    2 +-
 arch/arm/vdso/Makefile                             |    3 +
 arch/arm64/Kconfig                                 |    2 +-
 arch/arm64/kernel/process.c                        |    2 +-
 arch/arm64/mm/init.c                               |    6 +-
 arch/hexagon/include/asm/pgtable.h                 |    1 -
 arch/hexagon/kernel/setup.c                        |    2 +-
 arch/hexagon/mm/init.c                             |    3 -
 arch/mips/Kconfig                                  |    2 +-
 arch/mips/alchemy/board-gpr.c                      |    2 +-
 arch/mips/kernel/asm-offsets.c                     |    2 +-
 arch/mips/kernel/octeon_switch.S                   |    2 +-
 arch/mips/kernel/process.c                         |    2 +-
 arch/mips/kernel/r2300_switch.S                    |    2 +-
 arch/mips/kernel/r4k_switch.S                      |    2 +-
 arch/mips/kernel/setup.c                           |    4 +-
 arch/powerpc/mm/mem.c                              |    2 +-
 arch/sh/Kconfig                                    |    2 +-
 arch/sh/boards/board-sh7785lcr.c                   |    2 +-
 arch/sh/kernel/process.c                           |    2 +-
 arch/sh/kernel/process_32.c                        |    2 +-
 arch/sparc/mm/init_64.c                            |    2 +-
 arch/x86/Kconfig                                   |    4 +-
 arch/x86/entry/entry_32.S                          |    2 +-
 arch/x86/entry/entry_64.S                          |    2 +-
 arch/x86/include/asm/processor.h                   |    2 +-
 arch/x86/include/asm/segment.h                     |    2 +-
 arch/x86/include/asm/stackprotector.h              |    6 +-
 arch/x86/kernel/asm-offsets.c                      |    2 +-
 arch/x86/kernel/asm-offsets_32.c                   |    2 +-
 arch/x86/kernel/asm-offsets_64.c                   |    2 +-
 arch/x86/kernel/cpu/common.c                       |    2 +-
 arch/x86/kernel/head_32.S                          |    2 +-
 arch/x86/mm/init.c                                 |    4 +-
 arch/x86/mm/init_32.c                              |    2 +-
 arch/x86/mm/init_64.c                              |    2 +-
 arch/xtensa/Kconfig                                |    2 +-
 arch/xtensa/kernel/asm-offsets.c                   |    2 +-
 arch/xtensa/kernel/entry.S                         |    2 +-
 arch/xtensa/kernel/process.c                       |    2 +-
 drivers/acpi/acpi_lpss.c                           |    2 +
 drivers/block/rbd.c                                |   11 +-
 drivers/firmware/efi/arm-init.c                    |    2 +-
 drivers/firmware/efi/efi-pstore.c                  |   27 +-
 drivers/i2c/algos/i2c-algo-bit.c                   |    4 +-
 drivers/i2c/algos/i2c-algo-pca.c                   |    5 +-
 drivers/i2c/algos/i2c-algo-pcf.c                   |    8 +-
 drivers/i2c/busses/Kconfig                         |    1 +
 drivers/i2c/busses/Makefile                        |    3 +-
 drivers/i2c/busses/i2c-aspeed.c                    |    3 +-
 drivers/i2c/busses/i2c-at91.c                      |   12 +-
 drivers/i2c/busses/i2c-axxia.c                     |   31 +-
 drivers/i2c/busses/i2c-designware-common.c         |   20 +-
 drivers/i2c/busses/i2c-designware-core.h           |   14 +-
 drivers/i2c/busses/i2c-designware-master.c         |    8 +-
 drivers/i2c/busses/i2c-designware-slave.c          |    6 +-
 drivers/i2c/busses/i2c-diolan-u2c.c                |   11 +-
 drivers/i2c/busses/i2c-efm32.c                     |    3 +-
 drivers/i2c/busses/i2c-eg20t.c                     |    5 +-
 drivers/i2c/busses/i2c-emev2.c                     |    2 +-
 drivers/i2c/busses/i2c-exynos5.c                   |   29 +-
 drivers/i2c/busses/i2c-gpio.c                      |    2 +-
 drivers/i2c/busses/i2c-hix5hd2.c                   |   22 +-
 drivers/i2c/busses/i2c-i801.c                      |    7 +-
 drivers/i2c/busses/i2c-ibm_iic.c                   |    3 -
 drivers/i2c/busses/i2c-imx-lpi2c.c                 |   16 +-
 drivers/i2c/busses/i2c-imx.c                       |   21 +-
 drivers/i2c/busses/i2c-kempld.c                    |    7 +-
 drivers/i2c/busses/i2c-mlxcpld.c                   |   68 +-
 drivers/i2c/busses/i2c-mt65xx.c                    |    8 +-
 drivers/i2c/busses/i2c-mxs.c                       |   16 +-
 drivers/i2c/busses/i2c-nomadik.c                   |    2 -
 drivers/i2c/busses/i2c-ocores.c                    |    7 +-
 drivers/i2c/busses/i2c-omap.c                      |    2 +-
 drivers/i2c/busses/i2c-opal.c                      |    4 -
 drivers/i2c/busses/i2c-pasemi.c                    |    2 +-
 drivers/i2c/busses/i2c-pca-platform.c              |    2 +-
 drivers/i2c/busses/i2c-pnx.c                       |   21 +-
 drivers/i2c/busses/i2c-qup.c                       |   59 +-
 drivers/i2c/busses/i2c-rcar.c                      |    4 +-
 drivers/i2c/busses/i2c-riic.c                      |    5 +-
 drivers/i2c/busses/i2c-rk3x.c                      |    2 -
 drivers/i2c/busses/i2c-robotfuzz-osif.c            |   21 +-
 drivers/i2c/busses/i2c-s3c2410.c                   |    2 -
 drivers/i2c/busses/i2c-sh_mobile.c                 |   11 -
 drivers/i2c/busses/i2c-stm32.c                     |  153 +++
 drivers/i2c/busses/i2c-stm32.h                     |   37 +
 drivers/i2c/busses/i2c-stm32f7.c                   | 1045 +++++++++++++++++++-
 drivers/i2c/busses/i2c-stu300.c                    |   22 +-
 drivers/i2c/busses/i2c-synquacer.c                 |    2 +-
 drivers/i2c/busses/i2c-tegra.c                     |   33 -
 drivers/i2c/busses/i2c-xiic.c                      |   17 +-
 drivers/i2c/busses/i2c-xlp9xx.c                    |   89 +-
 drivers/i2c/i2c-core-base.c                        |   10 +-
 drivers/i2c/i2c-core-of.c                          |   51 +-
 drivers/i2c/i2c-core-smbus.c                       |    2 +
 drivers/i2c/i2c-mux.c                              |    2 +-
 drivers/i2c/muxes/i2c-demux-pinctrl.c              |    5 +-
 drivers/i2c/muxes/i2c-mux-gpio.c                   |    2 +-
 drivers/i2c/muxes/i2c-mux-ltc4306.c                |    7 +-
 drivers/i2c/muxes/i2c-mux-pca954x.c                |   18 +-
 drivers/i2c/muxes/i2c-mux-reg.c                    |    4 +-
 drivers/media/platform/marvell-ccic/mmp-driver.c   |    2 +-
 drivers/mfd/sm501.c                                |    2 +-
 drivers/mfd/timberdale.c                           |    4 +-
 drivers/misc/eeprom/at24.c                         |   71 +-
 drivers/platform/mellanox/mlxreg-hotplug.c         |   54 +-
 drivers/platform/x86/acer-wmi.c                    |    1 +
 drivers/platform/x86/apple-gmux.c                  |    2 +-
 drivers/platform/x86/asus-laptop.c                 |    3 +-
 drivers/platform/x86/asus-wireless.c               |    2 +-
 drivers/platform/x86/asus-wmi.c                    |    3 +-
 drivers/platform/x86/dell-laptop.c                 |   17 +-
 drivers/platform/x86/dell-smbios-base.c            |    5 +-
 drivers/platform/x86/dell-wmi.c                    |   16 +-
 drivers/platform/x86/fujitsu-laptop.c              |   47 +-
 drivers/platform/x86/ideapad-laptop.c              |   66 +-
 drivers/platform/x86/intel_scu_ipc.c               |    4 +-
 drivers/platform/x86/mlx-platform.c                |  289 +++++-
 drivers/platform/x86/samsung-laptop.c              |    3 +-
 drivers/platform/x86/silead_dmi.c                  |  101 +-
 drivers/platform/x86/thinkpad_acpi.c               |   30 +-
 drivers/pwm/Kconfig                                |    2 +-
 drivers/pwm/pwm-atmel-tcb.c                        |    6 +-
 drivers/pwm/pwm-lpss-platform.c                    |    5 +
 drivers/pwm/pwm-lpss.c                             |   30 +
 drivers/pwm/pwm-lpss.h                             |    2 +
 drivers/pwm/pwm-meson.c                            |    4 +-
 drivers/pwm/pwm-rcar.c                             |    3 +-
 drivers/pwm/pwm-stm32.c                            |    4 +-
 drivers/remoteproc/qcom_q6v5_pil.c                 |    2 +-
 drivers/scsi/aacraid/commctrl.c                    |    4 +-
 drivers/scsi/aic7xxx/aic79xx_core.c                |    8 +-
 drivers/scsi/hpsa.c                                |   10 +-
 drivers/scsi/mpt3sas/mpt3sas_base.c                |    1 +
 drivers/scsi/qla2xxx/qla_init.c                    |    3 +-
 drivers/scsi/qla2xxx/qla_isr.c                     |    8 +-
 drivers/scsi/qla2xxx/qla_mbx.c                     |    8 +
 drivers/scsi/sd_zbc.c                              |    2 +-
 drivers/soc/qcom/mdt_loader.c                      |    4 +-
 drivers/tty/tty_io.c                               |   15 +-
 drivers/usb/gadget/function/f_fs.c                 |    2 +-
 fs/adfs/inode.c                                    |    7 +-
 fs/afs/fsclient.c                                  |    2 +-
 fs/attr.c                                          |   14 +-
 fs/bad_inode.c                                     |    2 +-
 fs/binfmt_elf.c                                    |   17 +-
 fs/btrfs/ctree.h                                   |    2 +-
 fs/btrfs/extent_io.c                               |    4 +-
 fs/btrfs/file.c                                    |    6 +-
 fs/btrfs/inode.c                                   |   34 +-
 fs/btrfs/ioctl.c                                   |    8 +-
 fs/btrfs/root-tree.c                               |    4 +-
 fs/btrfs/scrub.c                                   |    2 +-
 fs/btrfs/transaction.c                             |    2 +-
 fs/ceph/addr.c                                     |   13 +-
 fs/ceph/cache.c                                    |    4 +-
 fs/ceph/caps.c                                     |  166 ++--
 fs/ceph/dir.c                                      |    2 +
 fs/ceph/file.c                                     |    7 +-
 fs/ceph/inode.c                                    |  153 +--
 fs/ceph/mds_client.c                               |    7 +-
 fs/ceph/snap.c                                     |    6 +-
 fs/ceph/super.c                                    |   35 +-
 fs/ceph/xattr.c                                    |   60 +-
 fs/cifs/cache.c                                    |    4 +-
 fs/cifs/fscache.c                                  |    8 +-
 fs/cifs/inode.c                                    |   26 +-
 fs/coda/coda_linux.c                               |   12 +-
 fs/configfs/inode.c                                |   12 +-
 fs/cramfs/inode.c                                  |    2 +-
 fs/exofs/ore.c                                     |   84 +-
 fs/exofs/ore_raid.c                                |   75 +-
 fs/exofs/super.c                                   |   23 +-
 fs/ext4/ext4.h                                     |   34 +-
 fs/ext4/ialloc.c                                   |    4 +-
 fs/ext4/namei.c                                    |    2 +-
 fs/f2fs/f2fs.h                                     |   10 +-
 fs/f2fs/file.c                                     |   12 +-
 fs/f2fs/inode.c                                    |   12 +-
 fs/f2fs/namei.c                                    |    4 +-
 fs/fat/inode.c                                     |   28 +-
 fs/fat/namei_msdos.c                               |   21 +-
 fs/fat/namei_vfat.c                                |   22 +-
 fs/fuse/inode.c                                    |    2 +-
 fs/gfs2/dir.c                                      |    6 +-
 fs/gfs2/glops.c                                    |    4 +-
 fs/hfs/inode.c                                     |    4 +-
 fs/hfsplus/inode.c                                 |   12 +-
 fs/hostfs/hostfs_kern.c                            |   12 +-
 fs/inode.c                                         |   58 +-
 fs/jffs2/dir.c                                     |   18 +-
 fs/jffs2/file.c                                    |    2 +-
 fs/jffs2/fs.c                                      |   12 +-
 fs/kernfs/dir.c                                    |    4 +-
 fs/kernfs/inode.c                                  |    8 +-
 fs/locks.c                                         |    2 +-
 fs/nfs/callback_proc.c                             |    4 +-
 fs/nfs/fscache-index.c                             |    4 +-
 fs/nfs/fscache.c                                   |   12 +-
 fs/nfs/inode.c                                     |   49 +-
 fs/nfs/nfs2xdr.c                                   |   25 +-
 fs/nfs/nfs3xdr.c                                   |    8 +-
 fs/nfs/nfs4xdr.c                                   |    7 +-
 fs/nfsd/blocklayout.c                              |    8 +-
 fs/nfsd/nfs3xdr.c                                  |   14 +-
 fs/nfsd/nfs4xdr.c                                  |    7 +-
 fs/nfsd/nfsxdr.c                                   |    2 +-
 fs/ntfs/inode.c                                    |   30 +-
 fs/ocfs2/dlmglue.c                                 |   20 +-
 fs/ocfs2/file.c                                    |    6 +-
 fs/orangefs/inode.c                                |    2 +-
 fs/orangefs/orangefs-kernel.h                      |    2 +-
 fs/overlayfs/inode.c                               |    2 +-
 fs/overlayfs/overlayfs.h                           |    2 +-
 fs/proc/base.c                                     |    9 +-
 fs/proc/uptime.c                                   |    2 +-
 fs/pstore/platform.c                               |    2 +-
 fs/pstore/ram.c                                    |   18 +-
 fs/reiserfs/namei.c                                |    2 +-
 fs/reiserfs/xattr.c                                |    4 +-
 fs/ubifs/dir.c                                     |    4 +-
 fs/ubifs/file.c                                    |   23 +-
 fs/ubifs/ubifs.h                                   |    2 +-
 fs/udf/ialloc.c                                    |    4 +-
 fs/udf/inode.c                                     |   59 +-
 fs/udf/super.c                                     |   17 +-
 fs/udf/udfdecl.h                                   |    4 +-
 fs/udf/udftime.c                                   |    9 +-
 fs/xfs/xfs_inode.c                                 |    2 +-
 fs/xfs/xfs_iops.c                                  |    2 +-
 fs/xfs/xfs_trans_inode.c                           |    2 +-
 include/linux/ceph/ceph_fs.h                       |    1 +
 include/linux/ceph/osd_client.h                    |    8 +-
 include/linux/ceph/osdmap.h                        |    8 +-
 include/linux/fs.h                                 |   24 +-
 include/linux/i2c-pnx.h                            |   38 -
 include/linux/i2c.h                                |   12 +-
 include/linux/kcov.h                               |   14 +
 include/linux/memcontrol.h                         |   26 +-
 include/linux/{ => platform_data}/i2c-gpio.h       |    0
 include/linux/{ => platform_data}/i2c-mux-gpio.h   |    0
 include/linux/{ => platform_data}/i2c-ocores.h     |    0
 include/linux/{ => platform_data}/i2c-omap.h       |    0
 .../linux/{ => platform_data}/i2c-pca-platform.h   |    0
 include/linux/{ => platform_data}/i2c-xiic.h       |    0
 include/linux/platform_data/mlxreg.h               |    3 +-
 include/linux/pstore.h                             |    2 +-
 include/linux/sched.h                              |    4 +-
 include/linux/slab.h                               |    1 +
 include/linux/stackprotector.h                     |    2 +-
 include/linux/stat.h                               |    8 +-
 include/linux/string_helpers.h                     |    1 +
 ipc/sem.c                                          |   18 +-
 ipc/shm.c                                          |    2 +-
 kernel/configs/android-recommended.config          |    2 +-
 kernel/configs/tiny.config                         |    4 -
 kernel/fork.c                                      |   10 +-
 kernel/kcov.c                                      |   21 +-
 kernel/kexec_core.c                                |    4 +
 kernel/panic.c                                     |    2 +-
 kernel/relay.c                                     |    2 +-
 kernel/sched/core.c                                |    4 +
 lib/Kconfig.debug                                  |   36 +-
 lib/test_printf.c                                  |    7 +
 mm/cleancache.c                                    |   10 +-
 mm/cma_debug.c                                     |   25 +-
 mm/compaction.c                                    |    2 +-
 mm/dmapool.c                                       |    2 +-
 mm/failslab.c                                      |    2 +-
 mm/frontswap.c                                     |   11 +-
 mm/ksm.c                                           |   14 +-
 mm/memblock.c                                      |   10 +-
 mm/memcontrol.c                                    |   10 +-
 mm/mremap.c                                        |    4 -
 mm/oom_kill.c                                      |    2 +-
 mm/page_alloc.c                                    |    2 +-
 mm/page_idle.c                                     |    2 +-
 mm/page_owner.c                                    |    4 +-
 mm/shmem.c                                         |    9 +-
 mm/slab_common.c                                   |   37 +-
 mm/swapfile.c                                      |    2 +-
 mm/vmalloc.c                                       |    4 +-
 mm/zsmalloc.c                                      |    5 +-
 mm/zswap.c                                         |   38 +-
 net/ceph/messenger.c                               |   31 +-
 net/ceph/osd_client.c                              |  216 ++--
 net/ceph/osdmap.c                                  |   19 +-
 security/apparmor/audit.c                          |   90 +-
 security/apparmor/domain.c                         |    2 +-
 security/apparmor/include/audit.h                  |    6 +
 security/apparmor/include/label.h                  |    2 +-
 security/apparmor/include/path.h                   |   33 +-
 security/apparmor/include/secid.h                  |   17 +-
 security/apparmor/label.c                          |   15 +-
 security/apparmor/lib.c                            |    2 +-
 security/apparmor/lsm.c                            |   50 +-
 security/apparmor/match.c                          |    2 +-
 security/apparmor/mount.c                          |    2 +-
 security/apparmor/policy.c                         |    7 +-
 security/apparmor/resource.c                       |    2 +-
 security/apparmor/secid.c                          |  151 ++-
 339 files changed, 4055 insertions(+), 1622 deletions(-)
 create mode 100644 drivers/i2c/busses/i2c-stm32.c
 delete mode 100644 include/linux/i2c-pnx.h
 rename include/linux/{ => platform_data}/i2c-gpio.h (100%)
 rename include/linux/{ => platform_data}/i2c-mux-gpio.h (100%)
 rename include/linux/{ => platform_data}/i2c-ocores.h (100%)
 rename include/linux/{ => platform_data}/i2c-omap.h (100%)
 rename include/linux/{ => platform_data}/i2c-pca-platform.h (100%)
 rename include/linux/{ => platform_data}/i2c-xiic.h (100%)
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge fixes/master
Already up to date.
Merging kbuild-current/fixes (2837461dbe6f Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
$ git merge kbuild-current/fixes
Already up to date.
Merging arc-current/for-curr (e6c62399504c ARCv2: support manual regfile save on interrupts)
$ git merge arc-current/for-curr
Auto-merging arch/arc/Kconfig
Merge made by the 'recursive' strategy.
 arch/arc/Kconfig                   |  8 ++++++
 arch/arc/Makefile                  | 15 +----------
 arch/arc/include/asm/entry-arcv2.h | 54 ++++++++++++++++++++++++++++++++++++++
 arch/arc/kernel/entry-arcv2.S      |  4 ++-
 arch/arc/kernel/intc-arcv2.c       |  2 ++
 5 files changed, 68 insertions(+), 15 deletions(-)
Merging arm-current/fixes (92d44a42af81 ARM: fix kill( ,SIGFPE) breakage)
$ git merge arm-current/fixes
Already up to date.
Merging arm64-fixes/for-next/fixes (82034c23fcbc arm64: Make sure permission updates happen for pmd/pud)
$ git merge arm64-fixes/for-next/fixes
Already up to date.
Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices)
$ git merge m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (faf37c44a105 powerpc/64s: Clear PCR on boot)
$ git merge powerpc-fixes/fixes
Already up to date.
Merging sparc/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
$ git merge sparc/master
Already up to date.
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
$ git merge fscrypt-current/for-stable
Already up to date.
Merging net/master (7f6afc338405 Merge branch 'l2tp-fixes')
$ git merge net/master
Auto-merging net/netfilter/nf_tables_api.c
Auto-merging net/bridge/netfilter/ebtables.c
Removing include/net/netfilter/nft_dup.h
Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Merge made by the 'recursive' strategy.
 drivers/net/ethernet/cavium/thunder/nic.h          |   2 +
 drivers/net/ethernet/cavium/thunder/nicvf_main.c   |  50 +++--
 drivers/net/ethernet/intel/ixgbe/ixgbe.h           |   4 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c     |  34 ++-
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |   8 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  21 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |   6 +-
 drivers/net/ethernet/netronome/nfp/flower/main.c   |   1 +
 .../ethernet/netronome/nfp/flower/tunnel_conf.c    |   2 +
 drivers/net/ethernet/netronome/nfp/nfp_net.h       |   4 +
 .../net/ethernet/netronome/nfp/nfp_net_common.c    |   4 +-
 .../ethernet/netronome/nfp/nfpcore/nfp_resource.c  |   7 +-
 drivers/net/ethernet/qualcomm/emac/emac-sgmii.c    |   1 +
 .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c    |   7 +-
 drivers/net/ethernet/xilinx/xilinx_emaclite.c      |  12 +-
 drivers/net/hyperv/Kconfig                         |   1 -
 drivers/net/hyperv/hyperv_net.h                    |   4 +-
 drivers/net/hyperv/netvsc_drv.c                    | 242 ++++++++++++++++-----
 drivers/net/phy/mdio-gpio.c                        |   3 -
 drivers/net/xen-netfront.c                         |   4 +-
 include/linux/netfilter.h                          |   2 +-
 include/linux/netfilter/ipset/ip_set_timeout.h     |  20 +-
 include/net/ip_vs.h                                |  30 +++
 include/net/netfilter/nf_conntrack_count.h         |   3 +-
 include/net/netfilter/nft_dup.h                    |  10 -
 include/net/sctp/structs.h                         |   5 +
 include/net/tls.h                                  |   6 +-
 include/uapi/linux/netfilter/nf_conntrack_common.h |   2 +-
 include/uapi/linux/netfilter/nf_tables.h           |   2 +-
 kernel/bpf/inode.c                                 |  14 +-
 net/bridge/netfilter/ebtables.c                    |  25 ++-
 net/bridge/netfilter/nft_reject_bridge.c           |   2 +-
 net/core/sock.c                                    |  15 +-
 net/dsa/tag_trailer.c                              |   3 +-
 net/ipv4/netfilter/ip_tables.c                     |   1 +
 net/ipv4/tcp_ipv4.c                                |   4 +
 net/ipv4/tcp_offload.c                             |   2 -
 net/ipv6/addrconf.c                                |   2 +-
 net/ipv6/netfilter/ip6_tables.c                    |   1 +
 net/ipv6/route.c                                   |   3 -
 net/ipv6/tcp_ipv6.c                                |   4 +
 net/l2tp/l2tp_ppp.c                                |  26 +++
 net/netfilter/ipset/ip_set_hash_gen.h              |   5 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |   4 +
 net/netfilter/ipvs/ip_vs_xmit.c                    |   2 +-
 net/netfilter/nf_conncount.c                       |  13 +-
 net/netfilter/nf_conntrack_netlink.c               |   3 +-
 net/netfilter/nf_tables_api.c                      |  36 ++-
 net/netfilter/nf_tables_core.c                     |   3 +-
 net/netfilter/nfnetlink.c                          |  10 +-
 net/netfilter/nft_chain_filter.c                   |   5 +
 net/netfilter/nft_connlimit.c                      |   2 +-
 net/netfilter/nft_dynset.c                         |   4 +-
 net/netfilter/nft_set_rbtree.c                     |   2 +-
 net/netfilter/nft_socket.c                         |   1 +
 net/netfilter/xt_CT.c                              |  10 +
 net/netfilter/xt_connmark.c                        |   2 +-
 net/netfilter/xt_set.c                             |  10 +-
 net/sctp/output.c                                  |  28 ++-
 net/smc/af_smc.c                                   |  12 +-
 net/tls/tls_main.c                                 |   2 +-
 net/tls/tls_sw.c                                   |  19 +-
 net/xdp/xdp_umem.c                                 |   3 +-
 tools/testing/selftests/bpf/Makefile               |   4 +-
 .../selftests/tc-testing/tc-tests/actions/ife.json |   2 +-
 65 files changed, 535 insertions(+), 246 deletions(-)
 delete mode 100644 include/net/netfilter/nft_dup.h
Merging bpf/master (3bce593ac06b selftests: bpf: config: add config fragments)
$ git merge bpf/master
Merge made by the 'recursive' strategy.
 net/xdp/xsk.c                      |  3 +++
 tools/bpf/bpftool/perf.c           |  5 +++--
 tools/testing/selftests/bpf/config | 10 ++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
Merging ipsec/master (d6990976af7c vti6: fix PMTU caching and reporting on xmit)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
 net/ipv6/ip6_vti.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
Merging netfilter/master (60d061e34703 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
$ git merge netfilter/master
Already up to date.
Merging ipvs/master (312564269535 net: netsec: reduce DMA mask to 40 bits)
$ git merge ipvs/master
Already up to date.
Merging wireless-drivers/master (ab1068d6866e iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs)
$ git merge wireless-drivers/master
Already up to date.
Merging mac80211/master (885892fb378d mlx4_core: restore optimal ICM memory allocation)
$ git merge mac80211/master
Already up to date.
Merging rdma-fixes/for-rc (1eb9364ce81d IB/uverbs: Fix ordering of ucontext check in ib_uverbs_write)
$ git merge rdma-fixes/for-rc
Auto-merging drivers/infiniband/hw/qedr/verbs.c
Auto-merging drivers/infiniband/hw/mlx5/main.c
Merge made by the 'recursive' strategy.
 drivers/infiniband/core/uverbs_main.c | 14 ++++++++++----
 drivers/infiniband/hw/mlx4/mr.c       |  7 +++++--
 drivers/infiniband/hw/mlx5/main.c     | 36 ++++++++++++++++++++---------------
 drivers/infiniband/hw/qedr/verbs.c    |  3 +++
 drivers/infiniband/sw/rxe/rxe_req.c   |  2 +-
 5 files changed, 40 insertions(+), 22 deletions(-)
Merging sound-current/for-linus (ad6baae62381 ALSA: usb-audio: Always create the interrupt pipe for the mixer)
$ git merge sound-current/for-linus
Auto-merging sound/usb/mixer.c
Auto-merging sound/usb/format.c
Merge made by the 'recursive' strategy.
 include/uapi/linux/usb/audio.h |  8 ++++++++
 sound/pci/emu10k1/emupcm.c     |  4 +++-
 sound/pci/fm801.c              | 16 +++++++++++----
 sound/pci/hda/patch_conexant.c |  2 ++
 sound/pci/hda/patch_realtek.c  |  3 +++
 sound/pci/lx6464es/lx6464es.c  |  7 +++++++
 sound/pci/sonicvibes.c         | 12 +++++++++--
 sound/usb/card.h               |  1 +
 sound/usb/format.c             |  5 ++++-
 sound/usb/mixer.c              | 45 ++++++++++++++++++++++++++++++------------
 sound/usb/quirks-table.h       |  5 +++++
 sound/usb/quirks.c             | 19 +++++++++++++-----
 12 files changed, 101 insertions(+), 26 deletions(-)
Merging sound-asoc-fixes/for-linus (2858e2cfc2ef Merge branch 'asoc-4.17' into asoc-linus)
$ git merge sound-asoc-fixes/for-linus
Already up to date!
Merge made by the 'recursive' strategy.
Merging regmap-fixes/for-linus (97fe106a8027 Merge branch 'regmap-4.17' into regmap-linus)
$ git merge regmap-fixes/for-linus
Already up to date!
Merge made by the 'recursive' strategy.
Merging regulator-fixes/for-linus (59ce5f3e5530 Merge branch 'regulator-4.17' into regulator-linus)
$ git merge regulator-fixes/for-linus
Already up to date!
Merge made by the 'recursive' strategy.
Merging spi-fixes/for-linus (5d3257b8ea48 Merge branch 'spi-4.17' into spi-linus)
$ git merge spi-fixes/for-linus
Already up to date!
Merge made by the 'recursive' strategy.
Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages)
$ git merge pci-current/for-linus
Already up to date.
Merging driver-core.current/driver-core-linus (3ca24ce9ff76 Merge branch 'proc-cmdline')
$ git merge driver-core.current/driver-core-linus
Already up to date.
Merging tty.current/tty-linus (3ca24ce9ff76 Merge branch 'proc-cmdline')
$ git merge tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (3ca24ce9ff76 Merge branch 'proc-cmdline')
$ git merge usb.current/usb-linus
Already up to date.
Merging usb-gadget-fixes/fixes (6d08b06e67cd Linux 4.17-rc2)
$ git merge usb-gadget-fixes/fixes
Already up to date.
Merging usb-serial-fixes/usb-linus (75bc37fefc44 Linux 4.17-rc4)
$ git merge usb-serial-fixes/usb-linus
Already up to date.
Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Already up to date.
Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1)
$ git merge phy/fixes
Already up to date.
Merging staging.current/staging-linus (3ca24ce9ff76 Merge branch 'proc-cmdline')
$ git merge staging.current/staging-linus
Already up to date.
Merging char-misc.current/char-misc-linus (3ca24ce9ff76 Merge branch 'proc-cmdline')
$ git merge char-misc.current/char-misc-linus
Already up to date.
Merging input-current/for-linus (01f7e67a053f Merge branch 'next' into for-linus)
$ git merge input-current/for-linus
Auto-merging drivers/input/rmi4/rmi_f54.c
Auto-merging drivers/input/rmi4/rmi_f12.c
Auto-merging drivers/input/rmi4/rmi_f11.c
Auto-merging drivers/input/rmi4/rmi_driver.c
Auto-merging drivers/input/input-mt.c
Merge made by the 'recursive' strategy.
 .../bindings/input/sprd,sc27xx-vibra.txt           |  23 +++
 drivers/input/input-mt.c                           |  12 +-
 drivers/input/keyboard/goldfish_events.c           |   9 +-
 drivers/input/misc/Kconfig                         |  10 ++
 drivers/input/misc/Makefile                        |   1 +
 drivers/input/misc/sc27xx-vibra.c                  | 154 +++++++++++++++++++++
 drivers/input/rmi4/Kconfig                         |   1 +
 drivers/input/rmi4/rmi_2d_sensor.c                 |  34 +++--
 drivers/input/rmi4/rmi_bus.c                       |  50 ++++++-
 drivers/input/rmi4/rmi_bus.h                       |  10 +-
 drivers/input/rmi4/rmi_driver.c                    |  52 +++----
 drivers/input/rmi4/rmi_f01.c                       |  10 +-
 drivers/input/rmi4/rmi_f03.c                       |   9 +-
 drivers/input/rmi4/rmi_f11.c                       |  42 +++---
 drivers/input/rmi4/rmi_f12.c                       |   8 +-
 drivers/input/rmi4/rmi_f30.c                       |   9 +-
 drivers/input/rmi4/rmi_f34.c                       |   5 +-
 drivers/input/rmi4/rmi_f54.c                       |   6 -
 drivers/input/touchscreen/silead.c                 |   1 +
 include/linux/input/mt.h                           |   2 +-
 include/linux/rmi.h                                |   2 +
 21 files changed, 338 insertions(+), 112 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt
 create mode 100644 drivers/input/misc/sc27xx-vibra.c
Merging crypto-current/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache)
$ git merge crypto-current/master
Already up to date.
Merging ide/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
$ git merge ide/master
Already up to date.
Merging vfio-fixes/for-linus (89c29def6b01 Revert "vfio/type1: Improve memory pinning process for raw PFN mapping")
$ git merge vfio-fixes/for-linus
Already up to date.
Merging kselftest-fixes/fixes (75bc37fefc44 Linux 4.17-rc4)
$ git merge kselftest-fixes/fixes
Already up to date.
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
$ git merge modules-fixes/modules-linus
Already up to date.
Merging slave-dma-fixes/fixes (dbad41e7bb5f dmaengine: qcom: bam_dma: check if the runtime pm enabled)
$ git merge slave-dma-fixes/fixes
Already up to date.
Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks)
$ git merge backlight-fixes/for-backlight-fixes
Merge made by the 'recursive' strategy.
Merging mtd-fixes/master (9f825e74d761 mtd: rawnand: Fix return type of __DIVIDE() when called with 32-bit)
$ git merge mtd-fixes/master
Already up to date.
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
$ git merge nand-fixes/nand/fixes
Already up to date.
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
$ git merge spi-nor-fixes/spi-nor/fixes
Already up to date.
Merging mfd-fixes/for-mfd-fixes (11799564fc7e mfd: cros_ec: Retry commands when EC is known to be busy)
$ git merge mfd-fixes/for-mfd-fixes
Already up to date.
Merging v4l-dvb-fixes/fixes (e88f5e9ebd54 media: uvcvideo: Prevent setting unavailable flags)
$ git merge v4l-dvb-fixes/fixes
Merge made by the 'recursive' strategy.
Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20)
$ git merge reset-fixes/reset/fixes
Already up to date.
Merging mips-fixes/mips-fixes (d8a9a51afaa9 MIPS: pb44: Fix i2c-gpio GPIO descriptor table)
$ git merge mips-fixes/mips-fixes
Merge made by the 'recursive' strategy.
 arch/mips/ath79/mach-pb44.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging omap-fixes/fixes (41bd6adf3c5d Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references")
$ git merge omap-fixes/fixes
Already up to date.
Merging kvm-fixes/master (696ca779a928 KVM: x86: fix #UD address of failed Hyper-V hypercalls)
$ git merge kvm-fixes/master
Already up to date.
Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba)
$ git merge kvms390-fixes/master
Already up to date.
Merging hwmon-fixes/hwmon (da81850b2c82 hwmon: (nct6775) Fix loop limit)
$ git merge hwmon-fixes/hwmon
Auto-merging drivers/hwmon/nct6775.c
Merge made by the 'recursive' strategy.
 drivers/hwmon/dell-smm-hwmon.c | 7 +++++++
 drivers/hwmon/nct6775.c        | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4)
$ git merge nvdimm-fixes/libnvdimm-fixes
Already up to date.
Merging btrfs-fixes/next-fixes (3a7e0e2622f6 Merge branch 'misc-4.18' into next-fixes)
$ git merge btrfs-fixes/next-fixes
Merge made by the 'recursive' strategy.
Merging vfs-fixes/fixes (b1b94fcbd399 Revert "fs: fold open_check_o_direct into do_dentry_open")
$ git merge vfs-fixes/fixes
Merge made by the 'recursive' strategy.
Merging dma-mapping-fixes/for-linus (4dc6d8e22728 Revert "iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()")
$ git merge dma-mapping-fixes/for-linus
Merge made by the 'recursive' strategy.
Merging drivers-x86-fixes/fixes (32ffd6e8d1f6 platform/x86: asus-wmi: Fix NULL pointer dereference)
$ git merge drivers-x86-fixes/fixes
Already up to date.
Merging samsung-krzk-fixes/fixes (60cc43fc8884 Linux 4.17-rc1)
$ git merge samsung-krzk-fixes/fixes
Already up to date.
Merging pinctrl-samsung-fixes/pinctrl-fixes (60cc43fc8884 Linux 4.17-rc1)
$ git merge pinctrl-samsung-fixes/pinctrl-fixes
Already up to date.
Merging devicetree-fixes/dt/linus (737dd8e1a4c4 Documentation: devicetree: tilcdc: fix spelling mistake "suppors" -> "supports")
$ git merge devicetree-fixes/dt/linus
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging scsi-fixes/fixes (5b10177e2dd8 scsi: qla2xxx: Spinlock recursion in qla_target)
$ git merge scsi-fixes/fixes
Auto-merging include/uapi/linux/target_core_user.h
Auto-merging drivers/target/target_core_user.c
Auto-merging drivers/scsi/qla2xxx/qla_target.c
Auto-merging drivers/scsi/ipr.c
Merge made by the 'recursive' strategy.
 drivers/scsi/ipr.c                    |  2 --
 drivers/scsi/qla2xxx/qla_target.c     |  6 ++---
 drivers/target/target_core_user.c     | 44 ++++++++++++++++++++++++++++-------
 include/uapi/linux/target_core_user.h |  4 +++-
 4 files changed, 42 insertions(+), 14 deletions(-)
Merging drm-intel-fixes/for-linux-next-fixes (65b3bdc807ac drm/i915/query: nospec expects no more than an unsigned long)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up to date.
Merging mmc-fixes/fixes (3de06d5a1f05 mmc: sdhci-iproc: add SDHCI_QUIRK2_HOST_OFF_CARD_ON for cygnus)
$ git merge mmc-fixes/fixes
Already up to date.
Merging rtc-fixes/rtc-fixes (60cc43fc8884 Linux 4.17-rc1)
$ git merge rtc-fixes/rtc-fixes
Already up to date.
Merging drm-misc-fixes/for-linux-next-fixes (c7d6d511eb56 drm/bridge/sii8620: fix HDMI cable connection to dongle)
$ git merge drm-misc-fixes/for-linux-next-fixes
Auto-merging drivers/gpu/drm/qxl/qxl_display.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/bridge/sil-sii8620.c | 292 ++++++++++++++---------------------
 drivers/gpu/drm/qxl/qxl_display.c    |   7 +-
 2 files changed, 121 insertions(+), 178 deletions(-)
Merging kbuild/for-next (2837461dbe6f Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
$ git merge kbuild/for-next
Already up to date.
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
$ git merge leaks/leaks-next
Merge made by the 'recursive' strategy.
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
$ git merge uuid/for-next
Already up to date.
Merging dma-mapping/for-next (2550bbfd4952 dma-direct: don't crash on device without dma_mask)
$ git merge dma-mapping/for-next
Already up to date.
Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers)
$ git merge asm-generic/master
Already up to date.
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
$ git merge arc/for-next
Already up to date.
Merging arm/for-next (0ac000e86703 Merge branches 'fixes', 'misc' and 'spectre' into for-linus)
$ git merge arm/for-next
Already up to date.
Merging arm-perf/for-next/perf (73acc0315cd7 ARM: mcpm, perf/arm-cci: export mcpm_is_available)
$ git merge arm-perf/for-next/perf
Already up to date.
Merging arm-soc/for-next (c7953e19db50 ARM: Document merges)
$ git merge arm-soc/for-next
Merge made by the 'recursive' strategy.
 arch/arm/arm-soc-for-next-contents.txt | 211 +++++++++++++++++++++++++++++++++
 1 file changed, 211 insertions(+)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging actions/for-next (7858428186db Merge branch 'v4.19/drivers' into next)
$ git merge actions/for-next
Auto-merging drivers/soc/actions/owl-sps.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                       | 1 +
 arch/arm/boot/dts/owl-s500-cubieboard6.dts        | 3 +--
 arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts    | 3 +--
 arch/arm/boot/dts/owl-s500-guitar.dtsi            | 3 +--
 arch/arm/boot/dts/owl-s500.dtsi                   | 3 +--
 arch/arm64/boot/dts/actions/Makefile              | 2 ++
 arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 3 +--
 arch/arm64/boot/dts/actions/s900.dtsi             | 3 +--
 drivers/soc/actions/Makefile                      | 2 ++
 drivers/soc/actions/owl-sps-helper.c              | 6 +-----
 drivers/soc/actions/owl-sps.c                     | 6 +-----
 11 files changed, 13 insertions(+), 22 deletions(-)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
$ git merge alpine/alpine/for-next
Already up to date.
Merging amlogic/for-next (793d8ab66802 Merge branch 'v4.18/defconfig' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Merge made by the 'recursive' strategy.
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi                   |  4 ++--
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi                    | 12 +++++++++---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts |  3 ---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi        |  7 +++++++
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi                   |  8 --------
 5 files changed, 18 insertions(+), 16 deletions(-)
Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next)
$ git merge aspeed/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next)
$ git merge at91/at91-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging bcm2835/for-next (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next)
$ git merge bcm2835/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (452daaaf6021 Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging keystone/next (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into next)
$ git merge keystone/next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mediatek/for-next (9378b3427341 Merge branch 'v4.17-next/soc' into for-next)
$ git merge mediatek/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (78e5d8c26c70 Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +-
 arch/arm64/boot/dts/marvell/armada-cp110.dtsi   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Merging omap/for-next (1b7e42c1dfe8 Merge branch 'omap-for-v4.18/soc' into for-next)
$ git merge omap/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/dra7.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control)
$ git merge reset/reset/next
Already up to date.
Merging qcom/for-next (509d20563e5d firmware: qcom: scm: Fix crash in qcom_scm_call_atomic1())
$ git merge qcom/for-next
Merge made by the 'recursive' strategy.
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
$ git merge realtek/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging renesas/next (550ca2e6c090 Merge branch 'fixes-for-v4.18' into next)
$ git merge renesas/next
Merge made by the 'recursive' strategy.
 drivers/soc/renesas/rcar-sysc.c | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)
Merging rockchip/for-next (42568f346f65 Merge branch 'v4.18-clk/next' into for-next)
$ git merge rockchip/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging samsung/for-next (bebc6082da0a Linux 4.14)
$ git merge samsung/for-next
Already up to date.
Merging samsung-krzk/for-next (fba97222728d Merge branch 'next/dt64' into for-next)
$ git merge samsung-krzk/for-next
Merge made by the 'recursive' strategy.
Merging sunxi/sunxi/for-next (e97360054391 Merge branch 'sunxi/dt64-for-4.18' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Auto-merging drivers/clk/Makefile
Merge made by the 'recursive' strategy.
 arch/arm64/boot/dts/allwinner/Makefile             |   1 +
 .../dts/allwinner/sun50i-a64-amarula-relic.dts     | 188 +++++++++++++++++++++
 .../boot/dts/allwinner/sun50i-a64-sopine.dtsi      |  12 ++
 .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts  |  12 ++
 drivers/clk/Makefile                               |   2 +-
 drivers/clk/sunxi-ng/Makefile                      |  39 ++---
 6 files changed, 229 insertions(+), 25 deletions(-)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
Merging tegra/for-next (6de9ae597a79 Merge branch for-4.18/clk into for-next)
$ git merge tegra/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging arm64/for-next/core (0fe42512b2f0 arm64: Fix syscall restarting around signal suppressed by tracer)
$ git merge arm64/for-next/core
Already up to date.
Merging clk/clk-next (55913c2d3330 Merge branch 'clk-imx6ul' into clk-next)
$ git merge clk/clk-next
Already up to date.
Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata)
$ git merge clk-samsung/for-next
Merge made by the 'recursive' strategy.
Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse)
$ git merge c6x/for-linux-next
Already up to date.
Merging m68k/for-next (b12c8a70643f m68k: Set default dma mask for platform devices)
$ git merge m68k/for-next
Already up to date.
Merging m68knommu/for-next (082f55c45984 m68k: fix ColdFire PCI config reads and writes)
$ git merge m68knommu/for-next
Already up to date.
Merging microblaze/next (5cf8da7bc035 microblaze: Remove architecture heart beat code)
$ git merge microblaze/next
Removing arch/microblaze/kernel/heartbeat.c
Merge made by the 'recursive' strategy.
 arch/microblaze/Kconfig.debug       |  7 ----
 arch/microblaze/include/asm/setup.h |  3 --
 arch/microblaze/kernel/Makefile     |  2 --
 arch/microblaze/kernel/heartbeat.c  | 72 -------------------------------------
 arch/microblaze/kernel/timer.c      |  7 ----
 5 files changed, 91 deletions(-)
 delete mode 100644 arch/microblaze/kernel/heartbeat.c
Merging mips/mips-next (9ed8b56b80c1 MAINTAINERS: Add Paul Burton as MIPS co-maintainer)
$ git merge mips/mips-next
Already up to date.
Merging nds32/next (e5dd7e2f8a59 nds32: define __NDS32_E[BL]__ for sparse)
$ git merge nds32/next
Merge made by the 'recursive' strategy.
 arch/nds32/Makefile | 2 ++
 1 file changed, 2 insertions(+)
Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock())
$ git merge nios2/for-next
Already up to date.
Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define)
$ git merge openrisc/for-next
Already up to date.
Merging parisc-hd/for-next (8d40c754fbac parisc: Drop struct sigaction from not exported header file)
$ git merge parisc-hd/for-next
Auto-merging arch/parisc/Makefile
Merge made by the 'recursive' strategy.
 arch/parisc/Makefile             | 4 ----
 arch/parisc/include/asm/signal.h | 8 --------
 2 files changed, 12 deletions(-)
Merging powerpc/next (ff5bc793e47b powerpc/64s/radix: Fix missing ptesync in flush_cache_vmap)
$ git merge powerpc/next
Already up to date.
Merging powerpc-pkey/topic/pkey (d86a4ba02fc6 powerpc/pkeys: Drop private VM_PKEY definitions)
$ git merge powerpc-pkey/topic/pkey
Already up to date.
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device)
$ git merge fsl/next
Already up to date.
Merging risc-v/for-next (29dcea88779c Linux 4.17)
$ git merge risc-v/for-next
Already up to date.
Merging s390/features (ec530174c437 s390/dasd: only use preallocated requests)
$ git merge s390/features
Auto-merging drivers/s390/block/dasd_eer.c
Merge made by the 'recursive' strategy.
 arch/s390/include/asm/css_chars.h |  62 +++++++-------
 drivers/s390/block/dasd.c         | 171 +++++++++++++-------------------------
 drivers/s390/block/dasd_alias.c   |   6 +-
 drivers/s390/block/dasd_diag.c    |   3 +-
 drivers/s390/block/dasd_eckd.c    |  46 +++++-----
 drivers/s390/block/dasd_eer.c     |  10 +--
 drivers/s390/block/dasd_fba.c     |   6 +-
 drivers/s390/block/dasd_int.h     |  26 ++----
 drivers/s390/cio/Makefile         |   1 +
 drivers/s390/cio/vfio_ccw_cp.c    | 140 ++++++++++++++++---------------
 drivers/s390/cio/vfio_ccw_drv.c   |   5 +-
 drivers/s390/cio/vfio_ccw_fsm.c   |  17 +++-
 drivers/s390/cio/vfio_ccw_trace.h |  54 ++++++++++++
 13 files changed, 282 insertions(+), 265 deletions(-)
 create mode 100644 drivers/s390/cio/vfio_ccw_trace.h
Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
$ git merge sparc-next/master
Already up to date.
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
$ git merge sh/for-next
Already up to date.
Merging uml/linux-next (5ec9121195a4 um: Fix raw interface options)
$ git merge uml/linux-next
Auto-merging arch/um/drivers/vector_kern.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                      |  3 +--
 arch/um/drivers/vector_kern.c    | 20 ++++++++++++++------
 arch/um/include/asm/common.lds.S |  6 ------
 arch/um/include/shared/init.h    |  5 -----
 arch/um/os-Linux/main.c          | 12 ------------
 5 files changed, 15 insertions(+), 31 deletions(-)
Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next)
$ git merge xtensa/xtensa-for-next
Auto-merging arch/xtensa/kernel/pci-dma.c
Merge made by the 'recursive' strategy.
 arch/xtensa/kernel/pci-dma.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations)
$ git merge fscrypt/master
Already up to date.
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
$ git merge befs/for-next
Merge made by the 'recursive' strategy.
 fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 46 deletions(-)
Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits)
$ git merge btrfs/next
Auto-merging kernel/cgroup/cgroup.c
Auto-merging include/linux/fs.h
Auto-merging include/linux/buffer_head.h
Auto-merging include/linux/backing-dev.h
Auto-merging fs/ext4/super.c
Auto-merging fs/ext4/inode.c
Auto-merging fs/ext2/super.c
Auto-merging fs/ext2/inode.c
Auto-merging fs/buffer.c
Auto-merging fs/btrfs/super.c
Auto-merging fs/btrfs/ioctl.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/disk-io.c
Auto-merging fs/btrfs/check-integrity.c
Auto-merging fs/block_dev.c
Auto-merging block/blk-cgroup.c
Merge made by the 'recursive' strategy.
 block/blk-cgroup.c          |  1 +
 fs/block_dev.c              |  3 +--
 fs/btrfs/check-integrity.c  |  2 +-
 fs/btrfs/disk-io.c          |  4 ++++
 fs/btrfs/inode.c            | 15 ++++++++++++---
 fs/btrfs/ioctl.c            |  8 +++++++-
 fs/btrfs/super.c            |  1 -
 fs/buffer.c                 | 42 ++++++++++++++++++++++++++++++++++--------
 fs/ext2/inode.c             |  3 ++-
 fs/ext2/super.c             |  1 -
 fs/ext4/inode.c             |  4 +++-
 fs/ext4/super.c             |  2 --
 include/linux/backing-dev.h |  2 +-
 include/linux/buffer_head.h |  3 +++
 include/linux/fs.h          |  3 ++-
 kernel/cgroup/cgroup.c      |  1 +
 16 files changed, 72 insertions(+), 23 deletions(-)
$ git am -3 ../patches/0001-f2fs-fixup-for-cgroup-writeback-change.patch
Applying: f2fs: fixup for cgroup/writeback change
$ git reset HEAD^
Unstaged changes after reset:
M	fs/f2fs/inode.c
M	fs/f2fs/super.c
$ git add -A .
$ git commit -v -a --amend
[master f5494530d7ee] Merge remote-tracking branch 'btrfs/next'
 Date: Fri Jun 15 11:41:35 2018 +1000
Merging btrfs-kdave/for-next (e4eada7b2b40 Merge branch 'for-next-current-v4.17-20180608' into for-next-20180608)
$ git merge btrfs-kdave/for-next
Auto-merging fs/btrfs/super.c
Auto-merging fs/btrfs/inode.c
Merge made by the 'recursive' strategy.
 fs/btrfs/inode.c | 26 --------------------------
 fs/btrfs/super.c |  1 -
 2 files changed, 27 deletions(-)
Merging ceph/master (23edca864951 rbd: flush rbd_dev->watch_dwork after watch is unregistered)
$ git merge ceph/master
Already up to date.
Merging cifs/for-next (9b00c628b652 cifs: Fix kernel oops when traceSMB is enabled)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 Documentation/filesystems/cifs/AUTHORS |   7 +-
 Documentation/filesystems/cifs/CHANGES |   3 +
 Documentation/filesystems/cifs/TODO    |  17 +-
 fs/cifs/cifs_debug.c                   |  27 ++++
 fs/cifs/cifsencrypt.c                  |  23 ++-
 fs/cifs/cifsglob.h                     |  36 ++++-
 fs/cifs/cifsproto.h                    |   7 +-
 fs/cifs/cifssmb.c                      |   8 +-
 fs/cifs/connect.c                      |   8 +-
 fs/cifs/misc.c                         |   9 +-
 fs/cifs/smb2misc.c                     |  16 +-
 fs/cifs/smb2ops.c                      | 277 +++++++++++++++++++++++++--------
 fs/cifs/smb2pdu.c                      | 180 +++++++++++++++------
 fs/cifs/smb2pdu.h                      |  23 ++-
 fs/cifs/smb2transport.c                |  18 +--
 fs/cifs/transport.c                    | 158 ++++++++-----------
 16 files changed, 559 insertions(+), 258 deletions(-)
Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
$ git merge configfs/for-next
Already up to date.
Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption)
$ git merge ecryptfs/next
Already up to date.
Merging ext3/for_next (20a653d458c3 Merge fsnotify cleanups from Amir into for_next)
$ git merge ext3/for_next
Auto-merging fs/ext2/super.c
Merge made by the 'recursive' strategy.
 fs/ext2/ext2.h                       |   2 -
 fs/ext2/super.c                      |   6 +-
 fs/notify/dnotify/dnotify.c          |   8 +-
 fs/notify/fanotify/fanotify.c        |  46 ++++++------
 fs/notify/fdinfo.c                   |   6 +-
 fs/notify/fsnotify.c                 | 138 +++++++++++++++++++++--------------
 fs/notify/fsnotify.h                 |   6 --
 fs/notify/group.c                    |   2 +-
 fs/notify/inotify/inotify.h          |   2 -
 fs/notify/inotify/inotify_fsnotify.c |   6 +-
 fs/notify/inotify/inotify_user.c     |  10 ++-
 fs/notify/mark.c                     |  52 +++++++------
 fs/quota/dquot.c                     |   7 +-
 include/linux/fsnotify_backend.h     |  79 +++++++++++++++++---
 kernel/audit_fsnotify.c              |   5 +-
 kernel/audit_tree.c                  |  12 ++-
 kernel/audit_watch.c                 |   5 +-
 17 files changed, 235 insertions(+), 157 deletions(-)
Merging ext4/dev (4f2f76f75143 ext4: fix fencepost error in check for inode count overflow during resize)
$ git merge ext4/dev
Already up to date.
Merging f2fs/dev (d54d35c501bc Merge tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
$ git merge f2fs/dev
Already up to date.
Merging fuse/for-next (543b8f8662fe fuse: don't keep dead fuse_conn at fuse_fill_super().)
$ git merge fuse/for-next
Already up to date.
Merging jfs/jfs-next (92d34134193e jfs: Fix inconsistency between memory allocation and ea_buf->max_size)
$ git merge jfs/jfs-next
Merge made by the 'recursive' strategy.
 fs/jfs/xattr.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
Merging nfs/linux-next (d5681f59ee3d NFS: Fix an rcu deadlock in nfs_delegation_find_inode())
$ git merge nfs/linux-next
Merge made by the 'recursive' strategy.
 fs/nfs/delegation.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes)
$ git merge nfs-anna/linux-next
Merge made by the 'recursive' strategy.
Merging nfsd/nfsd-next (fdfeda224cb7 nfsd: update obselete comment referencing the BKL)
$ git merge nfsd/nfsd-next
Auto-merging fs/nfsd/nfs4xdr.c
Auto-merging fs/nfsd/nfs4state.c
Merge made by the 'recursive' strategy.
 fs/nfsd/netns.h      |  1 +
 fs/nfsd/nfs4proc.c   |  4 ++++
 fs/nfsd/nfs4state.c  | 51 ++++++++++++++++++++++++++++++++++++++++-----------
 fs/nfsd/nfs4xdr.c    | 40 +++++++++++++++++++++++++++++++++++++---
 fs/nfsd/nfsctl.c     |  5 +++--
 fs/nfsd/nfsd.h       |  1 +
 include/linux/nfs4.h |  8 ++++++++
 7 files changed, 94 insertions(+), 16 deletions(-)
Merging orangefs/for-next (b1116bc03c00 orangefs: use sparse annotations for holding locks across function calls.)
$ git merge orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (c03e30790cad ovl: Enable metadata only feature)
$ git merge overlayfs/overlayfs-next
Auto-merging include/uapi/linux/fs.h
Auto-merging include/linux/fs.h
Auto-merging fs/xfs/xfs_file.c
Auto-merging fs/xattr.c
Auto-merging fs/read_write.c
CONFLICT (content): Merge conflict in fs/read_write.c
Auto-merging fs/overlayfs/overlayfs.h
CONFLICT (content): Merge conflict in fs/overlayfs/overlayfs.h
Auto-merging fs/overlayfs/namei.c
Auto-merging fs/overlayfs/inode.c
CONFLICT (content): Merge conflict in fs/overlayfs/inode.c
Auto-merging fs/ocfs2/file.c
Auto-merging fs/namespace.c
Auto-merging fs/namei.c
Auto-merging fs/locks.c
Auto-merging fs/ioctl.c
Auto-merging fs/inode.c
CONFLICT (content): Merge conflict in fs/inode.c
Auto-merging fs/btrfs/ioctl.c
CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c
Auto-merging fs/btrfs/ctree.h
Auto-merging Documentation/filesystems/vfs.txt
Auto-merging Documentation/filesystems/Locking
Resolved 'fs/btrfs/ioctl.c' using previous resolution.
Resolved 'fs/inode.c' using previous resolution.
Resolved 'fs/overlayfs/inode.c' using previous resolution.
Resolved 'fs/overlayfs/overlayfs.h' using previous resolution.
Resolved 'fs/read_write.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 1a11f5f59a0c] Merge remote-tracking branch 'overlayfs/overlayfs-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/filesystems/Locking       |   3 +-
 Documentation/filesystems/overlayfs.txt |  90 ++++--
 Documentation/filesystems/vfs.txt       |  16 +-
 fs/btrfs/ctree.h                        |   5 +-
 fs/btrfs/ioctl.c                        |   7 +-
 fs/file_table.c                         |  13 +-
 fs/inode.c                              |  46 +--
 fs/internal.h                           |  17 +-
 fs/ioctl.c                              |   1 +
 fs/locks.c                              |  20 +-
 fs/namei.c                              |   2 +-
 fs/namespace.c                          |  69 +----
 fs/ocfs2/file.c                         |  10 +-
 fs/open.c                               |  87 +++---
 fs/overlayfs/Kconfig                    |  19 ++
 fs/overlayfs/Makefile                   |   4 +-
 fs/overlayfs/copy_up.c                  | 190 ++++++++----
 fs/overlayfs/dir.c                      | 105 +++++--
 fs/overlayfs/export.c                   |   3 +
 fs/overlayfs/file.c                     | 508 ++++++++++++++++++++++++++++++++
 fs/overlayfs/inode.c                    | 175 +++++++----
 fs/overlayfs/namei.c                    | 195 +++++++-----
 fs/overlayfs/overlayfs.h                |  47 ++-
 fs/overlayfs/ovl_entry.h                |   6 +-
 fs/overlayfs/super.c                    | 103 ++++---
 fs/overlayfs/util.c                     | 252 +++++++++++++++-
 fs/read_write.c                         |  94 +++---
 fs/xattr.c                              |   9 +-
 fs/xfs/xfs_file.c                       |   8 +-
 include/linux/dcache.h                  |  15 +-
 include/linux/fs.h                      |  31 +-
 include/linux/fsnotify.h                |  14 +-
 include/uapi/linux/fs.h                 |   1 -
 33 files changed, 1591 insertions(+), 574 deletions(-)
 create mode 100644 fs/overlayfs/file.c
$ git am -3 ../patches/0001-overlayfs-merge-fix-for-vfs-change-inode-times-to-us.patch
Applying: overlayfs: merge fix for "vfs: change inode times to use struct timespec64"
$ git reset HEAD^
Unstaged changes after reset:
M	fs/overlayfs/file.c
$ git add -A .
$ git commit -v -a --amend
[master be98e630cc3a] Merge remote-tracking branch 'overlayfs/overlayfs-next'
 Date: Fri Jun 15 12:02:13 2018 +1000
Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual license)
$ git merge ubifs/linux-next
Already up to date.
Merging xfs/for-next (89e9b5c0915a xfs: update incore per-AG inode count)
$ git merge xfs/for-next
Already up to date.
Merging file-locks/locks-next (1cf8e5de4055 fs/lock: show locks taken by processes from another pidns)
$ git merge file-locks/locks-next
Auto-merging fs/locks.c
Merge made by the 'recursive' strategy.
 fs/locks.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
Merging vfs/for-next (5f181c9ca108 Merge branch 'work.compat' into for-next)
$ git merge vfs/for-next
Auto-merging fs/splice.c
Auto-merging fs/signalfd.c
Auto-merging fs/proc/internal.h
Auto-merging fs/orangefs/devorangefs-req.c
Auto-merging fs/afs/fsclient.c
Auto-merging fs/afs/cmservice.c
Merge made by the 'recursive' strategy.
 fs/afs/cell.c                 |  12 +-
 fs/afs/cmservice.c            |   2 +-
 fs/afs/fsclient.c             | 100 +++---
 fs/afs/internal.h             |  45 +--
 fs/afs/main.c                 |  33 +-
 fs/afs/netdevices.c           |   6 +-
 fs/afs/proc.c                 | 787 ++++++++++++++++--------------------------
 fs/afs/rxrpc.c                |   2 +-
 fs/afs/super.c                |  20 +-
 fs/orangefs/devorangefs-req.c |  54 +--
 fs/proc/generic.c             |  24 ++
 fs/proc/internal.h            |   2 +
 fs/proc/proc_net.c            |  92 +++++
 fs/signalfd.c                 |  50 +--
 fs/splice.c                   |  98 +++---
 include/linux/proc_fs.h       |  12 +
 16 files changed, 632 insertions(+), 707 deletions(-)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
$ git merge vfs-miklos/next
Already up to date.
Merging printk/for-next (8bafa2a44ff3 Merge branch 'for-4.18-vsprintf-pcr-removal' into for-4.18)
$ git merge printk/for-next
Already up to date.
Merging pci/next (ce4c7b241227 Merge branch 'pci/aer-squash')
$ git merge pci/next
Already up to date.
Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression)
$ git merge pstore/for-next/pstore
Already up to date.
Merging hid/for-next (f1b6ae6701a7 Merge branch 'for-4.18/rmi' into for-next)
$ git merge hid/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging i2c/i2c/for-next (1840b5ac656f Merge branch 'i2c/for-4.18' into i2c/for-next)
$ git merge i2c/i2c/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging dmi/master (5cb06cfce4a8 firmware: dmi: Add access to the SKU ID string)
$ git merge dmi/master
Auto-merging include/linux/mod_devicetable.h
Merge made by the 'recursive' strategy.
 drivers/firmware/dmi-id.c       | 2 ++
 drivers/firmware/dmi_scan.c     | 1 +
 include/linux/mod_devicetable.h | 1 +
 3 files changed, 4 insertions(+)
Merging hwmon-staging/hwmon-next (c9bdf291542e hwmon: (asus_atk0110) Make use of device managed memory)
$ git merge hwmon-staging/hwmon-next
Already up to date.
Merging jc_docs/docs-next (a49d9c0ae46e Documentation: document hung_task_panic kernel parameter)
$ git merge jc_docs/docs-next
Already up to date.
Merging v4l-dvb/master (f2809d20b925 media: omap2: fix compile-testing with FB_OMAP2=m)
$ git merge v4l-dvb/master
Merge made by the 'recursive' strategy.
Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED())
$ git merge v4l-dvb-next/master
Already up to date.
Merging fbdev/fbdev-for-next (85ebd164de56 fb_omap2: add gpiolib dependency)
$ git merge fbdev/fbdev-for-next
Removing include/video/sh_mobile_meram.h
Removing include/video/auo_k190xfb.h
Auto-merging drivers/video/fbdev/via/viafbdev.c
Removing drivers/video/fbdev/sh_mobile_meram.c
Auto-merging drivers/video/fbdev/nvidia/nvidia.c
Auto-merging drivers/video/fbdev/mmp/fb/mmpfb.c
CONFLICT (content): Merge conflict in drivers/video/fbdev/mmp/fb/mmpfb.c
Removing drivers/video/fbdev/auo_k190x.h
Removing drivers/video/fbdev/auo_k190x.c
Removing drivers/video/fbdev/auo_k1901fb.c
Removing drivers/video/fbdev/auo_k1900fb.c
Auto-merging drivers/video/fbdev/au1100fb.c
Auto-merging drivers/media/platform/via-camera.c
Auto-merging MAINTAINERS
Resolved 'drivers/video/fbdev/mmp/fb/mmpfb.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3ba586c8112a] Merge remote-tracking branch 'fbdev/fbdev-for-next'
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS                                        |    6 +-
 drivers/gpu/drm/shmobile/Kconfig                   |    1 -
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c          |   42 -
 drivers/gpu/drm/shmobile/shmob_drm_crtc.h          |    1 -
 drivers/gpu/drm/shmobile/shmob_drm_drv.h           |    2 -
 drivers/gpu/drm/shmobile/shmob_drm_kms.c           |   11 -
 drivers/gpu/drm/shmobile/shmob_drm_kms.h           |    1 -
 drivers/gpu/drm/shmobile/shmob_drm_plane.c         |    2 -
 drivers/media/platform/via-camera.c                |    5 +
 drivers/video/fbdev/Kconfig                        |   48 +-
 drivers/video/fbdev/Makefile                       |    4 -
 drivers/video/fbdev/aty/aty128fb.c                 |    2 +-
 drivers/video/fbdev/aty/radeon_pm.c                |    8 +-
 drivers/video/fbdev/au1100fb.c                     |    2 +-
 drivers/video/fbdev/au1200fb.c                     |    2 +-
 drivers/video/fbdev/auo_k1900fb.c                  |  204 ----
 drivers/video/fbdev/auo_k1901fb.c                  |  257 -----
 drivers/video/fbdev/auo_k190x.c                    | 1195 --------------------
 drivers/video/fbdev/auo_k190x.h                    |  129 ---
 drivers/video/fbdev/core/fb_defio.c                |    4 +-
 drivers/video/fbdev/mmp/fb/mmpfb.c                 |    5 +-
 drivers/video/fbdev/mmp/hw/mmp_ctrl.c              |    8 +-
 drivers/video/fbdev/nvidia/nvidia.c                |    2 +-
 drivers/video/fbdev/omap/lcd_ams_delta.c           |    4 +
 drivers/video/fbdev/omap/lcd_h3.c                  |    4 +
 drivers/video/fbdev/omap/lcd_htcherald.c           |    4 +
 drivers/video/fbdev/omap/lcd_inn1510.c             |    4 +
 drivers/video/fbdev/omap/lcd_inn1610.c             |    4 +
 drivers/video/fbdev/omap/lcd_osk.c                 |    4 +
 drivers/video/fbdev/omap/lcd_palmte.c              |    4 +
 drivers/video/fbdev/omap/lcd_palmtt.c              |    4 +
 drivers/video/fbdev/omap/lcd_palmz71.c             |    4 +
 drivers/video/fbdev/omap/omapfb_main.c             |    2 +-
 drivers/video/fbdev/omap2/omapfb/Kconfig           |    1 +
 .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c     |   18 +-
 drivers/video/fbdev/pxafb.c                        |    8 +-
 drivers/video/fbdev/savage/savagefb_driver.c       |    8 +-
 drivers/video/fbdev/sh_mobile_lcdcfb.c             |   77 +-
 drivers/video/fbdev/sh_mobile_lcdcfb.h             |    1 -
 drivers/video/fbdev/sh_mobile_meram.c              |  758 -------------
 drivers/video/fbdev/sm501fb.c                      |    3 +-
 drivers/video/fbdev/via/global.h                   |    6 +
 drivers/video/fbdev/via/hw.c                       |    1 -
 drivers/video/fbdev/via/via-core.c                 |    1 -
 drivers/video/fbdev/via/via_clock.c                |    2 +-
 drivers/video/fbdev/via/viafbdev.c                 |    1 -
 include/linux/platform_data/shmob_drm.h            |    4 -
 include/video/auo_k190xfb.h                        |  107 --
 include/video/sh_mobile_lcdc.h                     |    3 -
 include/video/sh_mobile_meram.h                    |   95 --
 50 files changed, 87 insertions(+), 2986 deletions(-)
 delete mode 100644 drivers/video/fbdev/auo_k1900fb.c
 delete mode 100644 drivers/video/fbdev/auo_k1901fb.c
 delete mode 100644 drivers/video/fbdev/auo_k190x.c
 delete mode 100644 drivers/video/fbdev/auo_k190x.h
 delete mode 100644 drivers/video/fbdev/sh_mobile_meram.c
 delete mode 100644 include/video/auo_k190xfb.h
 delete mode 100644 include/video/sh_mobile_meram.h
Merging pm/linux-next (c243466225cb Merge branch 'acpi-soc' into linux-next)
$ git merge pm/linux-next
Auto-merging drivers/acpi/acpi_lpss.c
Merge made by the 'recursive' strategy.
 drivers/acpi/acpi_lpss.c | 18 +++++++++++-------
 drivers/base/core.c      | 15 +++++++++++----
 2 files changed, 22 insertions(+), 11 deletions(-)
Merging cpupower/cpupower (f9652d5cae04 cpupower : Fix header name to read idle state name)
$ git merge cpupower/cpupower
Already up to date.
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
$ git merge idle/next
Already up to date.
Merging opp/opp/linux-next (8a352fd8787c OPP: Allow same OPP table to be used for multiple genpd)
$ git merge opp/opp/linux-next
Already up to date.
Merging thermal/next (e9ed3ee61aa6 Merge branches 'thermal-core' and 'thermal-intel' into next)
$ git merge thermal/next
Already up to date.
Merging thermal-soc/next (6d7c70d1cd65 thermal: qcom: tsens: Allow number of sensors to come from DT)
$ git merge thermal-soc/next
Already up to date.
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers)
$ git merge ieee1394/for-next
Already up to date.
Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock)
$ git merge dlm/next
Already up to date.
Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent)
$ git merge swiotlb/linux-next
Already up to date.
Merging rdma/for-next (c1191a19feca RDMA/mlx5: Update SPDX tags to show proper license)
$ git merge rdma/for-next
Already up to date.
Merging net-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge net-next/master
Already up to date.
Merging bpf-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge bpf-next/master
Already up to date.
Merging ipsec-next/master (f03329627b46 Merge branch 'hns3-next')
$ git merge ipsec-next/master
Already up to date.
Merging netfilter-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge netfilter-next/master
Already up to date.
Merging nfc-next/master (7579d009c4a1 NFC: fdp: Remove __func__ from dev_dbg())
$ git merge nfc-next/master
Auto-merging drivers/nfc/fdp/i2c.c
Merge made by the 'recursive' strategy.
 drivers/nfc/fdp/fdp.c      | 22 +++++-----------------
 drivers/nfc/fdp/i2c.c      | 26 +++++++++++++-------------
 drivers/nfc/st21nfca/dep.c |  3 ++-
 drivers/nfc/st21nfca/se.c  |  5 +++--
 drivers/nfc/st95hf/core.c  |  7 ++-----
 net/nfc/hci/core.c         | 10 ++++++++++
 net/nfc/netlink.c          |  6 ++++--
 7 files changed, 39 insertions(+), 40 deletions(-)
Merging ipvs-next/master (e523452ac0e0 netfilter: nf_tables: remove unused variables)
$ git merge ipvs-next/master
Already up to date.
Merging wireless-drivers-next/master (76606886c9f4 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
$ git merge wireless-drivers-next/master
Already up to date.
Merging bluetooth/master (3a979e8c07e3 Merge tag 'mailbox-v4.18' of git://git.linaro.org/landing-teams/working/fujitsu/integration)
$ git merge bluetooth/master
Already up to date.
Merging mac80211-next/master (7d840a606515 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge mac80211-next/master
Already up to date.
Merging gfs2/for-next (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge gfs2/for-next
Already up to date.
Merging mtd/mtd/next (b771327a4530 Merge tag 'spi-nor/for-4.18' of git://git.infradead.org/linux-mtd into mtd/next)
$ git merge mtd/mtd/next
Already up to date.
Merging nand/nand/next (f567c71f4f91 mtd: nand: Pass mode information to nand_page_io_req)
$ git merge nand/nand/next
Already up to date.
Merging spi-nor/spi-nor/next (771ff17e82fa mtd: spi-nor: Add support for EN25QH32)
$ git merge spi-nor/spi-nor/next
Already up to date.
Merging crypto/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache)
$ git merge crypto/master
Already up to date.
Merging drm/drm-next (daf0678c2036 Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-next)
$ git merge drm/drm-next
Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         | 18 ++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c   |  1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             | 38 ++++++-----
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         | 12 ++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            | 15 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         | 17 +++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h         |  3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c            | 52 ++++-----------
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h            |  2 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  6 +-
 drivers/gpu/drm/amd/amdgpu/df_v3_6.c               |  2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              | 21 +++---
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c              | 27 +++++++-
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |  1 +
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |  4 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  | 67 ++++++++++----------
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c  |  3 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 45 ++++++++++++-
 drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c |  5 ++
 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   | 37 +++++++++--
 .../drm/amd/display/dc/dce/dce_stream_encoder.c    |  6 +-
 .../drm/amd/display/dc/dce110/dce110_compressor.c  |  8 +--
 .../amd/display/dc/dce110/dce110_hw_sequencer.c    |  2 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c   |  3 +-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h   |  6 +-
 .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c  |  8 +--
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c  | 14 ++--
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h  |  8 +++
 .../amd/display/dc/dcn10/dcn10_stream_encoder.c    |  4 ++
 drivers/gpu/drm/amd/display/include/fixed31_32.h   |  2 +
 .../drm/amd/include/asic_reg/df/df_3_6_sh_mask.h   |  8 +--
 drivers/gpu/drm/amd/include/atomfirmware.h         | 12 ++--
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c      | 10 +--
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c       | 13 ++--
 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c |  4 +-
 .../amd/powerplay/hwmgr/process_pptables_v1_0.c    |  6 --
 .../gpu/drm/amd/powerplay/hwmgr/processpptables.c  |  6 --
 drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c  | 74 ++++++++++++----------
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   | 12 +++-
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 15 ++++-
 .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c |  2 +-
 .../amd/powerplay/hwmgr/vega10_processpptables.c   |  6 --
 drivers/gpu/drm/scheduler/gpu_scheduler.c          |  9 ++-
 43 files changed, 365 insertions(+), 249 deletions(-)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
$ git merge drm-panel/drm/panel/for-next
Already up to date.
Merging drm-intel/for-linux-next (807cba6559cf Merge tag 'gvt-fixes-2018-04-19' of https://github.com/intel/gvt-linux into drm-intel-next-fixes)
$ git merge drm-intel/for-linux-next
Already up to date.
Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI)
$ git merge drm-tegra/drm/tegra/for-next
Already up to date.
Merging drm-misc/for-linux-next (069035c5db34 drm: Fix possible race conditions while unplugging DRM device)
$ git merge drm-misc/for-linux-next
Auto-merging drivers/gpu/drm/drm_drv.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/drm_drv.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
Merging drm-msm/msm-next (4dd454c371fd drm/msm/gpu: Increase the pm runtime autosuspend for 5xx)
$ git merge drm-msm/msm-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/msm/adreno/adreno_device.c | 14 +++++++++++++-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c    |  3 ++-
 drivers/gpu/drm/msm/adreno/adreno_gpu.h    |  1 +
 drivers/gpu/drm/msm/msm_drv.c              |  9 +++++++++
 drivers/gpu/drm/msm/msm_drv.h              |  1 +
 5 files changed, 26 insertions(+), 2 deletions(-)
Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.)
$ git merge hdlcd/for-upstream/hdlcd
Already up to date.
Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers)
$ git merge mali-dp/for-upstream/mali-dp
Already up to date.
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)
$ git merge sunxi-drm/sunxi-drm/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging imx-drm/imx-drm/next (518665524272 gpu: ipu-csi: Check for field type alternate)
$ git merge imx-drm/imx-drm/next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/imx/imx-drm.h    |  1 -
 drivers/gpu/drm/imx/imx-ldb.c    |  9 ++++++---
 drivers/gpu/drm/imx/ipuv3-crtc.c |  1 -
 drivers/gpu/ipu-v3/ipu-csi.c     | 37 ++++++++++++++++++++++++++++++-------
 4 files changed, 36 insertions(+), 12 deletions(-)
Merging etnaviv/etnaviv/next (f6ffbd4fc1a1 drm/etnaviv: replace license text with SPDX tags)
$ git merge etnaviv/etnaviv/next
Already up to date.
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
$ git merge kconfig/for-next
Already up to date.
Merging regmap/for-next (66431563e0d9 Merge branch 'regmap-4.18' into regmap-next)
$ git merge regmap/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging sound/for-next (ad6baae62381 ALSA: usb-audio: Always create the interrupt pipe for the mixer)
$ git merge sound/for-next
Already up to date.
Merging sound-asoc/for-next (5544717d416d Merge branch 'asoc-4.18' into asoc-next)
$ git merge sound-asoc/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign)
$ git merge modules/modules-next
Auto-merging kernel/module.c
Merge made by the 'recursive' strategy.
 kernel/module.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Merging input/next (5aff29efbec0 Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into next)
$ git merge input/next
Merge made by the 'recursive' strategy.
 drivers/input/keyboard/cros_ec_keyb.c |  66 +++++-------
 drivers/input/misc/xen-kbdfront.c     | 183 ++++++++++++++++++++--------------
 drivers/input/serio/i8042.c           |   3 +
 include/xen/interface/io/displif.h    |   8 ++
 include/xen/interface/io/kbdif.h      |  78 +++++++++++----
 include/xen/interface/io/sndif.h      |  10 +-
 6 files changed, 207 insertions(+), 141 deletions(-)
Merging block/for-next (28313cee1d4f Merge branch 'for-4.18/block' into for-next)
$ git merge block/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
$ git merge lightnvm/for-next
Already up to date.
Merging device-mapper/for-next (48debafe4f2f dm: add writecache target)
$ git merge device-mapper/for-next
Already up to date.
Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers)
$ git merge pcmcia/pcmcia-next
Merge made by the 'recursive' strategy.
 drivers/char/pcmcia/cm4040_cs.c    |  2 +-
 drivers/scsi/pcmcia/aha152x_stub.c | 14 +-------------
 drivers/scsi/pcmcia/nsp_cs.c       | 15 +--------------
 drivers/scsi/pcmcia/nsp_cs.h       |  4 ----
 drivers/scsi/pcmcia/qlogic_stub.c  | 13 +------------
 drivers/scsi/pcmcia/sym53c500_cs.c | 16 +---------------
 6 files changed, 5 insertions(+), 59 deletions(-)
Merging mmc/next (ef5332c10d4f mmc: renesas_sdhi: really fix WP logic regressions)
$ git merge mmc/next
Already up to date.
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy)
$ git merge kgdb/kgdb-next
Already up to date.
Merging md/for-next (07ecb3a36765 MD: cleanup resources in failure)
$ git merge md/for-next
Merge made by the 'recursive' strategy.
 drivers/md/md.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
Merging mfd/for-mfd-next (556c242045f0 mfd: cros_ec: Remove unused __remove function)
$ git merge mfd/for-mfd-next
Already up to date.
Merging backlight/for-backlight-next (d5318d302e7c backlight: as3711_bl: Fix Device Tree node leaks)
$ git merge backlight/for-backlight-next
Already up to date.
Merging battery/for-next (c42812da1395 MAINTAINERS: add entry for LEGO MINDSTORMS EV3)
$ git merge battery/for-next
Already up to date.
Merging regulator/for-next (13ed4964057e Merge branch 'regulator-4.17' into regulator-4.18 merge window)
$ git merge regulator/for-next
Already up to date.
Merging security/next-testing (d19289133b1d Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-testing)
$ git merge security/next-testing
Already up to date!
Merge made by the 'recursive' strategy.
Merging apparmor/apparmor-next (338d0be437ef apparmor: fix ptrace read check)
$ git merge apparmor/apparmor-next
Already up to date.
Merging integrity/next-integrity (b5c90a7526fe EVM: unlock on error path in evm_read_xattrs())
$ git merge integrity/next-integrity
Already up to date.
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
$ git merge keys/keys-next
Already up to date.
Merging selinux/next (d141136f523a audit: normalize MAC_POLICY_LOAD record)
$ git merge selinux/next
Already up to date.
Merging tpmdd/next (3ac7e6225c0b tpm: migrate tpm2_get_random() to use struct tpm_buf)
$ git merge tpmdd/next
Auto-merging drivers/char/tpm/tpm2-cmd.c
Auto-merging drivers/char/tpm/tpm.h
Merge made by the 'recursive' strategy.
 drivers/char/tpm/tpm.h      |  19 ++--
 drivers/char/tpm/tpm2-cmd.c | 258 ++++++++++++++++++--------------------------
 2 files changed, 116 insertions(+), 161 deletions(-)
Merging watchdog/master (16a7eec2fcd0 watchdog: da9063: remove duplicated timeout_to_sel calls)
$ git merge watchdog/master
Already up to date.
Merging iommu/next (1f568357117c Merge branches 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next)
$ git merge iommu/next
Already up to date.
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
$ git merge dwmw2-iommu/master
Already up to date.
Merging vfio/next (c1abca96b252 samples: mbochs: add DMA_SHARED_BUFFER dependency)
$ git merge vfio/next
Already up to date.
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
$ git merge trivial/for-next
Already up to date.
Merging audit/next (5b71388663c0 audit: Fix wrong task in comparison of session ID)
$ git merge audit/next
Already up to date.
Merging devicetree/for-next (44acf1058790 dt-bindings: submitting-patches: add guidance on patch content and subject)
$ git merge devicetree/for-next
Already up to date.
Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX)
$ git merge mailbox/mailbox-for-next
Already up to date.
Merging spi/for-next (39202ebf0939 Merge branch 'spi-4.18' into spi-next)
$ git merge spi/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging tip/auto-latest (cc82cbbdd454 Merge branch 'x86/apic')
$ git merge tip/auto-latest
Merge made by the 'recursive' strategy.
 arch/x86/kernel/apic/vector.c             | 17 ++++-------------
 arch/x86/kernel/cpu/mcheck/mce-severity.c |  5 +++++
 arch/x86/kernel/quirks.c                  | 11 +++++++++--
 3 files changed, 18 insertions(+), 15 deletions(-)
Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC)
$ git merge clockevents/clockevents/next
Already up to date.
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
$ git merge edac/linux_next
Already up to date.
Merging edac-amd/for-next (eaa3a1d46cfd EDAC, ghes: Make platform-based whitelisting x86-only)
$ git merge edac-amd/for-next
Already up to date.
Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti support to stm32mp157 pinctrl)
$ git merge irqchip/irq/irqchip-next
Already up to date.
Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment)
$ git merge ftrace/for-next
Already up to date.
Merging rcu/rcu/next (443da8397d9f rcu: Make rcu_seq_diff() more exact)
$ git merge rcu/rcu/next
Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot
Auto-merging kernel/rcu/rcutorture.c
Auto-merging kernel/locking/locktorture.c
Auto-merging include/linux/rcupdate.h
Auto-merging drivers/iommu/amd_iommu.c
CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu.c
Auto-merging Documentation/core-api/atomic_ops.rst
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Resolved 'drivers/iommu/amd_iommu.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 218f79828a11] Merge remote-tracking branch 'rcu/rcu/next'
$ git diff -M --stat --summary HEAD^..
 .../Design/Data-Structures/Data-Structures.html    |  118 +--
 .../Memory-Ordering/Tree-RCU-Memory-Ordering.html  |   22 +-
 .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg  |  123 +--
 .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg   |   16 +-
 .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg   |   56 +-
 .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg      |  237 ++---
 .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg      |   12 +-
 Documentation/RCU/stallwarn.txt                    |   24 +-
 Documentation/RCU/whatisRCU.txt                    |   16 +-
 Documentation/admin-guide/kernel-parameters.txt    |    4 +-
 Documentation/core-api/atomic_ops.rst              |    2 +-
 drivers/iommu/amd_iommu.c                          |    6 +
 include/linux/rcupdate.h                           |   20 +-
 include/linux/rcutiny.h                            |    2 +-
 include/linux/srcu.h                               |   17 +
 include/linux/torture.h                            |    4 +-
 include/trace/events/rcu.h                         |  112 ++-
 kernel/locking/locktorture.c                       |    5 +-
 kernel/rcu/rcu.h                                   |  124 ++-
 kernel/rcu/rcuperf.c                               |   57 +-
 kernel/rcu/rcutorture.c                            |  341 ++++---
 kernel/rcu/srcutree.c                              |   36 +-
 kernel/rcu/tiny.c                                  |    4 +-
 kernel/rcu/tree.c                                  | 1004 ++++++++++----------
 kernel/rcu/tree.h                                  |   71 +-
 kernel/rcu/tree_exp.h                              |    5 +-
 kernel/rcu/tree_plugin.h                           |  174 ++--
 kernel/rcu/update.c                                |   45 +-
 kernel/torture.c                                   |   15 +-
 .../testing/selftests/rcutorture/bin/configinit.sh |   26 +-
 .../testing/selftests/rcutorture/bin/kvm-build.sh  |   11 +-
 .../selftests/rcutorture/bin/kvm-recheck-rcu.sh    |    1 +
 .../selftests/rcutorture/bin/kvm-recheck.sh        |    1 +
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |    5 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh      |    2 +-
 .../selftests/rcutorture/bin/parse-console.sh      |    7 +
 .../selftests/rcutorture/configs/rcu/TREE03.boot   |    4 +-
 .../selftests/rcutorture/configs/rcu/TREE08-T.boot |    1 -
 .../rcutorture/configs/rcu/ver_functions.sh        |    2 +-
 39 files changed, 1545 insertions(+), 1187 deletions(-)
 delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot
Merging kvm/linux-next (766d3571d8e5 kvm: fix typo in flag name)
$ git merge kvm/linux-next
Already up to date.
Merging kvm-arm/next (e25028c8ded0 KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512)
$ git merge kvm-arm/next
Already up to date.
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
$ git merge kvm-mips/next
Already up to date.
Merging kvm-ppc/kvm-ppc-next (f61e0d3cc4ae KVM: PPC: Book3S PR: Fix failure status setting in tabort. emulation)
$ git merge kvm-ppc/kvm-ppc-next
Auto-merging arch/powerpc/kvm/powerpc.c
Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S
Auto-merging arch/powerpc/kvm/book3s_hv.c
Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c
Auto-merging arch/powerpc/kernel/asm-offsets.c
Auto-merging arch/powerpc/include/asm/asm-prototypes.h
Merge made by the 'recursive' strategy.
 arch/powerpc/include/asm/asm-prototypes.h |   6 +
 arch/powerpc/include/asm/kvm_book3s.h     |  37 +-
 arch/powerpc/include/asm/kvm_book3s_64.h  |  20 +-
 arch/powerpc/include/asm/kvm_booke.h      |  20 +-
 arch/powerpc/include/asm/kvm_host.h       |  21 +-
 arch/powerpc/include/asm/kvm_ppc.h        |  17 +-
 arch/powerpc/include/asm/reg.h            |   1 +
 arch/powerpc/include/uapi/asm/kvm.h       |   1 +
 arch/powerpc/kernel/asm-offsets.c         |  18 +-
 arch/powerpc/kvm/Makefile                 |   3 +
 arch/powerpc/kvm/book3s.c                 |  23 +-
 arch/powerpc/kvm/book3s.h                 |   6 +
 arch/powerpc/kvm/book3s_32_mmu.c          |   2 +-
 arch/powerpc/kvm/book3s_64_mmu.c          |  11 +-
 arch/powerpc/kvm/book3s_64_mmu_hv.c       |   3 +
 arch/powerpc/kvm/book3s_64_mmu_radix.c    | 348 +++++++++-----
 arch/powerpc/kvm/book3s_64_vio.c          |  71 ++-
 arch/powerpc/kvm/book3s_64_vio_hv.c       |  54 ++-
 arch/powerpc/kvm/book3s_emulate.c         | 371 ++++++++++++++-
 arch/powerpc/kvm/book3s_hv.c              |  97 +++-
 arch/powerpc/kvm/book3s_hv_builtin.c      |  21 +-
 arch/powerpc/kvm/book3s_hv_interrupts.S   |   2 +-
 arch/powerpc/kvm/book3s_hv_rm_mmu.c       |  36 +-
 arch/powerpc/kvm/book3s_hv_rm_xics.c      |   2 +-
 arch/powerpc/kvm/book3s_hv_rmhandlers.S   | 318 +++----------
 arch/powerpc/kvm/book3s_hv_tm.c           |  10 +-
 arch/powerpc/kvm/book3s_hv_tm_builtin.c   |  10 +-
 arch/powerpc/kvm/book3s_pr.c              | 482 +++++++++++++++----
 arch/powerpc/kvm/book3s_segment.S         |  13 +
 arch/powerpc/kvm/book3s_xive_template.c   |   4 +-
 arch/powerpc/kvm/booke.c                  |  41 +-
 arch/powerpc/kvm/booke_emulate.c          |   6 +-
 arch/powerpc/kvm/e500_emulate.c           |   6 +-
 arch/powerpc/kvm/e500_mmu.c               |   2 +-
 arch/powerpc/kvm/e500_mmu_host.c          |   8 +-
 arch/powerpc/kvm/emulate_loadstore.c      | 752 +++++++++---------------------
 arch/powerpc/kvm/powerpc.c                | 311 +++++++++---
 arch/powerpc/kvm/tm.S                     | 384 +++++++++++++++
 38 files changed, 2310 insertions(+), 1228 deletions(-)
 create mode 100644 arch/powerpc/kvm/tm.S
Merging kvms390/next (2c8180e885c1 KVM: s390: vsie: simplify < 8k address checks)
$ git merge kvms390/next
Already up to date.
Merging xen-tip/linux-next (7f47e1c52d0c xen/PVH: Make GDT selectors PVH-specific)
$ git merge xen-tip/linux-next
Already up to date.
Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods)
$ git merge percpu/for-next
Already up to date.
Merging workqueues/for-next (66448bc274ca workqueue: move function definitions within CONFIG_SMP block)
$ git merge workqueues/for-next
Already up to date.
Merging drivers-x86/for-next (26ed9d1c07ef platform/x86: silead_dmi: Add entry for Chuwi Hi8 tablet touchscreen)
$ git merge drivers-x86/for-next
Already up to date.
Merging chrome-platform/for-next (5cd7e690bdc1 platform/chrome: chromeos_tbmc - fix SPDX identifier)
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
 drivers/platform/chrome/chromeos_tbmc.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t)
$ git merge hsi/for-next
Already up to date.
Merging leds/for-next (6d71021ab3b0 leds: class: ensure workqueue is initialized before setting brightness)
$ git merge leds/for-next
Already up to date.
Merging ipmi/for-next (048f7c3e352e ipmi: Properly release srcu locks on error conditions)
$ git merge ipmi/for-next
Already up to date.
Merging driver-core/driver-core-next (3ca24ce9ff76 Merge branch 'proc-cmdline')
$ git merge driver-core/driver-core-next
Already up to date.
Merging usb/usb-next (3ca24ce9ff76 Merge branch 'proc-cmdline')
$ git merge usb/usb-next
Already up to date.
Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue)
$ git merge usb-gadget/next
Already up to date.
Merging usb-serial/usb-next (7041d9c3f01b USB: serial: pl2303: add support for tx xon/xoff flow control)
$ git merge usb-serial/usb-next
Already up to date.
Merging usb-chipidea-next/ci-for-usb-next (8bcf4c0bd7fb usb: chipidea: properly handle host or gadget initialization failure)
$ git merge usb-chipidea-next/ci-for-usb-next
Merge made by the 'recursive' strategy.
Merging phy-next/next (c1eb8f83845b phy: mediatek: add XS-PHY driver)
$ git merge phy-next/next
Already up to date.
Merging tty/tty-next (3ca24ce9ff76 Merge branch 'proc-cmdline')
$ git merge tty/tty-next
Already up to date.
Merging char-misc/char-misc-next (3ca24ce9ff76 Merge branch 'proc-cmdline')
$ git merge char-misc/char-misc-next
Already up to date.
Merging extcon/extcon-next (1da1063a16b4 extcon: usbc-cros-ec: Switch to SPDX identifier.)
$ git merge extcon/extcon-next
Merge made by the 'recursive' strategy.
 drivers/extcon/extcon-intel-int3496.c |  2 +-
 drivers/extcon/extcon-usbc-cros-ec.c  | 22 ++++++----------------
 2 files changed, 7 insertions(+), 17 deletions(-)
Merging staging/staging-next (3ca24ce9ff76 Merge branch 'proc-cmdline')
$ git merge staging/staging-next
Already up to date.
Merging mux/for-next (6a3d4baac84a mux: add mux_control_get_optional() API)
$ git merge mux/for-next
Merge made by the 'recursive' strategy.
 Documentation/driver-model/devres.txt |   1 +
 drivers/mux/core.c                    | 104 +++++++++++++++++++++++++++-------
 include/linux/mux/consumer.h          |   4 ++
 3 files changed, 89 insertions(+), 20 deletions(-)
Merging slave-dma/next (c79c2212f7c9 Merge branch 'for-linus' into next)
$ git merge slave-dma/next
Auto-merging drivers/dma/pl330.c
Merge made by the 'recursive' strategy.
 drivers/dma/pl330.c | 28 ----------------------------
 1 file changed, 28 deletions(-)
Merging cgroup/for-next (d8742e229021 cgroup: css_set_lock should nest inside tasklist_lock)
$ git merge cgroup/for-next
Already up to date.
Merging scsi/for-next (5b10177e2dd8 scsi: qla2xxx: Spinlock recursion in qla_target)
$ git merge scsi/for-next
Already up to date.
Merging scsi-mkp/for-next (1b5c2cb19668 scsi: lpfc: update driver version to 12.0.0.4)
$ git merge scsi-mkp/for-next
Already up to date.
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
$ git merge target-updates/for-next
Already up to date.
Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge target-bva/for-next
Already up to date.
Merging libata/for-next (ed058253618e Merge branch 'for-4.17-fixes' into for-next)
$ git merge libata/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging vhost/linux-next (2eb98105f8c7 virtio: update the comments for transport features)
$ git merge vhost/linux-next
Auto-merging drivers/virtio/virtio_pci_common.c
Auto-merging drivers/vhost/vhost.c
Merge made by the 'recursive' strategy.
 drivers/vhost/vhost.c              |  3 +++
 drivers/virtio/virtio_pci_common.c | 30 ++++++++++++++++++++++++++++++
 drivers/virtio/virtio_pci_modern.c | 14 ++++++++++++++
 include/linux/virtio_ring.h        |  4 ++--
 include/uapi/linux/virtio_config.h | 16 ++++++++++++----
 5 files changed, 61 insertions(+), 6 deletions(-)
Merging rpmsg/for-next (1601c6923d66 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge rpmsg/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging gpio/for-next (3079a27868c4 gpio: uniphier: set legitimate irq trigger type in .to_irq hook)
$ git merge gpio/for-next
Merge made by the 'recursive' strategy.
 drivers/gpio/gpio-uniphier.c | 6 +++++-
 drivers/gpio/gpiolib-of.c    | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)
Merging pinctrl/for-next (d2b6d0c74dd0 pinctrl: mt7622: fix a kernel panic when pio don't work as EINT controller)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
 drivers/pinctrl/actions/pinctrl-owl.c         |  2 +-
 drivers/pinctrl/devicetree.c                  |  7 +++++--
 drivers/pinctrl/mediatek/pinctrl-mt7622.c     |  6 +++++-
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c |  5 -----
 drivers/pinctrl/pinctrl-single.c              | 14 +++++++++++---
 5 files changed, 22 insertions(+), 12 deletions(-)
Merging pinctrl-samsung/for-next (7c24e71c8a64 pinctrl: samsung: Fix suspend/resume for Exynos5433 GPF1..5 banks)
$ git merge pinctrl-samsung/for-next
Already up to date.
Merging pwm/for-next (414c52b7899a pwm: stm32: Fix build warning with CONFIG_DMA_ENGINE disabled)
$ git merge pwm/for-next
Already up to date.
Merging userns/for-next (4b245b90065b Merge of my siginfo-next and userns-next trees for testing in linux-next)
$ git merge userns/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
$ git merge ktest/for-next
Already up to date.
Merging random/dev (bfe80ed3d7c7 vsprintf: add command line option debug_boot_weak_hash)
$ git merge random/dev
Auto-merging lib/vsprintf.c
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt |  9 ++++++++
 drivers/char/random.c                           | 23 +++++++++++--------
 include/linux/random.h                          |  2 +-
 lib/vsprintf.c                                  | 30 ++++++++++++++++++++++++-
 4 files changed, 53 insertions(+), 11 deletions(-)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
$ git merge aio/master
Already up to date.
Merging kselftest/next (53c3daf8cfea kselftest/cgroup: fix a signedness bug)
$ git merge kselftest/next
Merge made by the 'recursive' strategy.
 tools/testing/selftests/cgroup/cgroup_util.c                      | 4 ++--
 .../testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc  | 8 ++++++++
 .../testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc  | 7 +++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string definition)
$ git merge y2038/y2038
Already up to date.
Merging livepatching/for-next (d7ab8e67aa52 Merge branch 'for-4.18/upstream' into for-next)
$ git merge livepatching/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging coresight/next (b66e01615a29 coresight: tmc: Add configuration support for trace buffer size)
$ git merge coresight/next
Auto-merging include/linux/coresight.h
Auto-merging drivers/hwtracing/coresight/coresight.c
Auto-merging drivers/hwtracing/coresight/coresight-tmc.h
Auto-merging drivers/hwtracing/coresight/coresight-tmc.c
Auto-merging drivers/hwtracing/coresight/coresight-tmc-etr.c
CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-tmc-etr.c
Auto-merging drivers/hwtracing/coresight/coresight-tmc-etf.c
Auto-merging drivers/hwtracing/coresight/coresight-priv.h
Auto-merging drivers/hwtracing/coresight/coresight-etm4x.h
Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c
Auto-merging drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c
Auto-merging drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
Auto-merging drivers/hwtracing/coresight/coresight-etm.h
Auto-merging drivers/hwtracing/coresight/coresight-etb10.c
Resolved 'drivers/hwtracing/coresight/coresight-tmc-etr.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 1e103ab5ca78] Merge remote-tracking branch 'coresight/next'
$ git diff -M --stat --summary HEAD^..
 .../ABI/testing/sysfs-bus-coresight-devices-tmc    |    8 +
 .../devicetree/bindings/arm/coresight.txt          |    5 +-
 drivers/hwtracing/coresight/coresight-etb10.c      |   12 +-
 drivers/hwtracing/coresight/coresight-etm.h        |    3 -
 .../hwtracing/coresight/coresight-etm3x-sysfs.c    |   43 +-
 drivers/hwtracing/coresight/coresight-etm3x.c      |    4 +-
 .../hwtracing/coresight/coresight-etm4x-sysfs.c    |   47 +-
 drivers/hwtracing/coresight/coresight-etm4x.c      |   31 +-
 drivers/hwtracing/coresight/coresight-etm4x.h      |    3 -
 drivers/hwtracing/coresight/coresight-priv.h       |   10 +-
 drivers/hwtracing/coresight/coresight-tmc-etf.c    |   45 +-
 drivers/hwtracing/coresight/coresight-tmc-etr.c    | 1010 ++++++++++++++++++--
 drivers/hwtracing/coresight/coresight-tmc.c        |   83 +-
 drivers/hwtracing/coresight/coresight-tmc.h        |  110 ++-
 drivers/hwtracing/coresight/coresight.c            |    3 +-
 include/linux/coresight.h                          |   20 -
 16 files changed, 1219 insertions(+), 218 deletions(-)
Merging rtc/rtc-next (e4302aec8a06 rtc: pxa: fix probe function)
$ git merge rtc/rtc-next
Already up to date.
Merging nvdimm/libnvdimm-for-next (d95363c95705 Merge branch 'for-4.18/dax-memory-failure' into libnvdimm-for-next)
$ git merge nvdimm/libnvdimm-for-next
Auto-merging mm/huge_memory.c
Auto-merging include/linux/mm.h
Auto-merging include/linux/dax.h
Auto-merging fs/dax.c
Auto-merging drivers/dax/device.c
Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
Merge made by the 'recursive' strategy.
 arch/x86/include/asm/set_memory.h         |  42 +++++++++
 arch/x86/kernel/cpu/mcheck/mce-internal.h |  15 ----
 arch/x86/kernel/cpu/mcheck/mce.c          |  38 +-------
 arch/x86/mm/pat.c                         |  16 ++++
 drivers/dax/device.c                      |  97 ++++++++++++--------
 drivers/nvdimm/pmem.c                     |  26 ++++++
 drivers/nvdimm/pmem.h                     |  13 +++
 fs/dax.c                                  |  92 ++++++++++++++++++-
 include/linux/dax.h                       |  16 +++-
 include/linux/huge_mm.h                   |   5 +-
 include/linux/mm.h                        |   1 +
 include/linux/set_memory.h                |  14 +++
 mm/huge_memory.c                          |   4 +-
 mm/madvise.c                              |  18 +++-
 mm/memory-failure.c                       | 143 ++++++++++++++++++++++++++++--
 15 files changed, 434 insertions(+), 106 deletions(-)
Merging at24/at24/for-next (73b0d922cd5b eeprom: at24: provide a separate routine for creating dummy i2c clients)
$ git merge at24/at24/for-next
Already up to date.
Merging ntb/ntb-next (c9160b69258e ntb: ntb_transport: Replace GFP_ATOMIC with GFP_KERNEL in ntb_transport_create_queue)
$ git merge ntb/ntb-next
Already up to date.
Merging kspp/for-next/kspp (45888b40d2a6 rslib: Allocate decoder buffers to avoid VLAs)
$ git merge kspp/for-next/kspp
Already up to date.
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
$ git merge init_task/init_task
Already up to date.
Merging cisco/for-next (5997aab0a11e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge cisco/for-next
Already up to date.
Merging akpm-current/current (8b95a15d84a1 bfs: add sanity check at bfs_fill_super())
$ git merge --no-ff akpm-current/current
Auto-merging mm/swapfile.c
Auto-merging mm/page_owner.c
Auto-merging mm/page_alloc.c
Auto-merging mm/oom_kill.c
Auto-merging mm/memcontrol.c
Auto-merging kernel/fork.c
Auto-merging kernel/cgroup/cgroup.c
Auto-merging include/linux/memcontrol.h
Auto-merging include/linux/fs.h
Auto-merging fs/ocfs2/file.c
Auto-merging fs/ocfs2/dlmglue.c
Auto-merging fs/namei.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-bdi |   8 +
 Documentation/admin-guide/cgroup-v2.rst   |  74 ++++++++
 Documentation/sysctl/fs.txt               |  36 ++++
 Documentation/vm/hmm.rst                  |   1 -
 arch/arm/include/asm/page.h               |   2 +
 block/genhd.c                             |   2 +-
 fs/bfs/inode.c                            |   9 +-
 fs/dcache.c                               |   3 +-
 fs/exec.c                                 |   1 +
 fs/namei.c                                |  53 +++++-
 fs/ocfs2/buffer_head_io.c                 |  77 ++++++--
 fs/ocfs2/dir.c                            |   3 +-
 fs/ocfs2/dlmglue.c                        |   2 +-
 fs/ocfs2/file.c                           |   4 +-
 fs/ocfs2/journal.c                        |  51 +++--
 fs/ocfs2/stackglue.c                      |   6 -
 fs/ocfs2/stackglue.h                      |   3 -
 include/linux/cgroup-defs.h               |   5 +
 include/linux/fs.h                        |   2 +
 include/linux/hmm.h                       |   4 +-
 include/linux/memblock.h                  |  16 --
 include/linux/memcontrol.h                |  34 ++++
 include/linux/memremap.h                  |   1 +
 include/linux/oom.h                       |  12 +-
 include/linux/sched/signal.h              |   3 +
 include/linux/swap.h                      |  13 +-
 include/uapi/linux/prctl.h                |   4 +
 kernel/cgroup/cgroup.c                    |  13 +-
 kernel/cred.c                             |   1 +
 kernel/exit.c                             |   4 +
 kernel/fork.c                             |   2 +
 kernel/memremap.c                         |  39 +++-
 kernel/sys.c                              |  11 ++
 kernel/sysctl.c                           |  18 ++
 lib/percpu_ida.c                          |   2 +-
 mm/backing-dev.c                          |  35 ++++
 mm/hmm.c                                  | 297 +++++-------------------------
 mm/list_lru.c                             |   7 +
 mm/memcontrol.c                           | 279 +++++++++++++++++++++++++++-
 mm/memory.c                               |   4 +-
 mm/mincore.c                              |  12 +-
 mm/oom_kill.c                             | 210 ++++++++++++++-------
 mm/page_alloc.c                           |  33 +++-
 mm/page_owner.c                           |   4 +-
 mm/sparse-vmemmap.c                       |   1 -
 mm/sparse.c                               |  29 ++-
 mm/swap_state.c                           |  16 +-
 mm/swapfile.c                             | 156 ++++++++++++----
 scripts/checkpatch.pl                     |  30 ++-
 security/apparmor/lsm.c                   |   1 +
 security/selinux/hooks.c                  |   1 +
 51 files changed, 1148 insertions(+), 486 deletions(-)
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
First, rewinding head to replay your work on top of it...
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
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + 52d0fc3970ae...90c98c66ca9f akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (90c98c66ca9f sparc64: NG4 memset 32 bits overflow)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 arch/sparc/lib/NG4memset.S                   | 26 ++++++------
 drivers/media/platform/sti/delta/delta-ipc.c |  4 +-
 include/linux/ioport.h                       |  3 ++
 kernel/kexec_file.c                          |  2 +
 kernel/resource.c                            | 63 ++++++++++++++++++++++++++++
 5 files changed, 83 insertions(+), 15 deletions(-)