path: root/Next/merge.log

$ date -R
Mon, 24 Jul 2017 09:35:12 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 63a86362130f Merge tag 'pm-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Merging origin/master (520eccdfe187 Linux 4.13-rc2)
$ git merge origin/master
Updating 63a86362130f..520eccdfe187
Fast-forward
 .../devicetree/bindings/net/brcm,amac.txt          |    1 +
 .../devicetree/bindings/net/brcm,bgmac-nsp.txt     |   24 -
 .../devicetree/bindings/nvmem/rockchip-efuse.txt   |    2 +-
 .../devicetree/bindings/ptp/brcm,ptp-dte.txt       |   15 +-
 .../devicetree/bindings/serial/fsl-imx-uart.txt    |    2 -
 MAINTAINERS                                        | 5126 ++++++++++----------
 Makefile                                           |    2 +-
 arch/alpha/include/uapi/asm/ioctls.h               |    2 +-
 arch/arm/include/asm/bug.h                         |    2 +-
 arch/arm64/include/asm/bug.h                       |    2 +-
 arch/blackfin/include/asm/bug.h                    |    4 +-
 arch/mips/include/uapi/asm/ioctls.h                |    2 +-
 arch/mn10300/include/asm/bug.h                     |    2 +-
 arch/parisc/include/asm/bug.h                      |    6 +-
 arch/parisc/include/uapi/asm/ioctls.h              |    2 +-
 arch/powerpc/include/asm/book3s/64/hash.h          |    1 +
 arch/powerpc/include/asm/book3s/64/pgtable.h       |    1 +
 arch/powerpc/include/asm/book3s/64/radix.h         |    1 +
 arch/powerpc/include/asm/bug.h                     |    8 +-
 arch/powerpc/include/asm/pgtable.h                 |    7 +
 arch/powerpc/include/uapi/asm/ioctls.h             |    2 +-
 arch/powerpc/kernel/exceptions-64s.S               |   28 +-
 arch/powerpc/kernel/idle_book3s.S                  |   15 +-
 arch/powerpc/mm/mem.c                              |    1 +
 arch/powerpc/mm/pgtable-hash64.c                   |   44 +-
 arch/powerpc/mm/pgtable-radix.c                    |   28 +-
 arch/powerpc/mm/pgtable_64.c                       |    8 +
 arch/powerpc/platforms/powernv/opal.c              |    2 +-
 arch/s390/include/asm/bug.h                        |    4 +-
 arch/sh/include/asm/bug.h                          |    4 +-
 arch/sh/include/uapi/asm/ioctls.h                  |    2 +-
 arch/sparc/include/uapi/asm/ioctls.h               |    2 +-
 arch/x86/Kconfig.debug                             |    1 +
 arch/x86/boot/Makefile                             |    5 +-
 arch/x86/configs/i386_defconfig                    |    3 -
 arch/x86/configs/x86_64_defconfig                  |    3 -
 arch/x86/events/core.c                             |    4 +-
 arch/x86/events/intel/core.c                       |  164 +-
 arch/x86/events/intel/cstate.c                     |   26 +-
 arch/x86/events/intel/ds.c                         |   22 +-
 arch/x86/events/intel/lbr.c                        |    4 +
 arch/x86/events/perf_event.h                       |    2 +
 arch/x86/include/asm/bug.h                         |    4 +-
 arch/x86/include/asm/io.h                          |    4 +-
 arch/x86/include/asm/mmu_context.h                 |    2 +-
 arch/x86/kernel/acpi/boot.c                        |    8 +
 arch/x86/kernel/apic/io_apic.c                     |    2 +-
 arch/x86/kernel/cpu/amd.c                          |    1 +
 arch/x86/kernel/devicetree.c                       |    3 +-
 arch/x86/kvm/Kconfig                               |    2 +-
 arch/x86/kvm/hyperv.c                              |    7 +-
 arch/x86/kvm/vmx.c                                 |   46 +-
 arch/x86/kvm/x86.c                                 |    4 +-
 arch/x86/math-emu/Makefile                         |    4 +-
 arch/x86/math-emu/fpu_emu.h                        |    2 +-
 arch/x86/math-emu/reg_compare.c                    |   16 +-
 .../intel-mid/device_libs/platform_max7315.c       |    6 +-
 arch/x86/platform/uv/tlb_uv.c                      |   29 +-
 arch/x86/xen/smp_pv.c                              |    3 +-
 arch/x86/xen/time.c                                |    1 -
 arch/xtensa/include/uapi/asm/ioctls.h              |    2 +-
 block/bfq-iosched.c                                |    3 +
 block/bfq-iosched.h                                |    2 +-
 block/bfq-wf2q.c                                   |    2 +-
 drivers/android/binder.c                           |   17 +-
 drivers/atm/zatm.c                                 |    2 +-
 drivers/block/nbd.c                                |    2 -
 drivers/clocksource/timer-of.c                     |   12 +-
 drivers/dma-buf/dma-fence.c                        |   17 +-
 drivers/dma-buf/sync_debug.c                       |    2 +-
 drivers/dma-buf/sync_file.c                        |    8 +-
 drivers/fsi/fsi-core.c                             |    7 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |    3 +-
 drivers/gpu/drm/amd/amdkfd/kfd_device.c            |    4 -
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |    7 -
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |    1 -
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h    |    3 -
 drivers/gpu/drm/drm_dp_mst_topology.c              |   41 +-
 drivers/gpu/drm/imx/ipuv3-plane.c                  |    2 +-
 drivers/gpu/drm/imx/parallel-display.c             |    2 +-
 drivers/gpu/drm/radeon/radeon_kfd.c                |    1 -
 drivers/gpu/drm/vc4/vc4_crtc.c                     |   66 +-
 drivers/hv/channel.c                               |    2 +
 drivers/hwmon/applesmc.c                           |   13 +-
 drivers/ide/ide-timings.c                          |   18 +-
 drivers/infiniband/core/cma.c                      |    2 +
 drivers/infiniband/core/uverbs_cmd.c               |   13 +-
 drivers/infiniband/hw/bnxt_re/bnxt_re.h            |    9 +
 drivers/infiniband/hw/bnxt_re/ib_verbs.c           |  119 +-
 drivers/infiniband/hw/bnxt_re/ib_verbs.h           |    3 +-
 drivers/infiniband/hw/bnxt_re/main.c               |    1 +
 drivers/infiniband/hw/bnxt_re/qplib_fp.c           |   29 +
 drivers/infiniband/hw/bnxt_re/qplib_fp.h           |    1 +
 drivers/infiniband/hw/bnxt_re/qplib_sp.c           |   16 +
 drivers/infiniband/hw/bnxt_re/qplib_sp.h           |    3 +
 drivers/infiniband/hw/cxgb3/iwch_provider.c        |    9 +-
 drivers/infiniband/hw/cxgb4/cq.c                   |    1 +
 drivers/infiniband/hw/cxgb4/qp.c                   |    2 +-
 drivers/infiniband/hw/i40iw/i40iw.h                |    1 +
 drivers/infiniband/hw/i40iw/i40iw_cm.c             |    5 +-
 drivers/infiniband/hw/i40iw/i40iw_ctrl.c           |    2 +
 drivers/infiniband/hw/i40iw/i40iw_main.c           |   60 +-
 drivers/infiniband/hw/i40iw/i40iw_puda.c           |    5 +-
 drivers/infiniband/hw/i40iw/i40iw_utils.c          |   60 +-
 drivers/infiniband/hw/i40iw/i40iw_verbs.c          |   19 +-
 drivers/infiniband/hw/i40iw/i40iw_verbs.h          |    2 +-
 drivers/infiniband/hw/mlx4/cm.c                    |    4 +
 drivers/infiniband/hw/mlx5/mr.c                    |    2 +-
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c        |    4 +-
 drivers/infiniband/hw/qedr/verbs.c                 |   16 +-
 drivers/infiniband/sw/rdmavt/qp.c                  |    4 +-
 drivers/infiniband/sw/rxe/rxe_resp.c               |    3 +
 drivers/infiniband/sw/rxe/rxe_verbs.c              |    3 +
 drivers/infiniband/ulp/ipoib/ipoib_main.c          |    1 +
 drivers/infiniband/ulp/iser/iser_initiator.c       |    6 +-
 drivers/irqchip/irq-digicolor.c                    |    2 +-
 drivers/irqchip/irq-gic-realview.c                 |    2 +-
 drivers/irqchip/irq-mips-cpu.c                     |    2 +-
 drivers/irqchip/irq-mips-gic.c                     |    2 -
 drivers/isdn/divert/isdn_divert.c                  |   25 +-
 drivers/isdn/hardware/avm/c4.c                     |    2 +-
 drivers/isdn/hardware/eicon/divasmain.c            |    2 +-
 drivers/isdn/hardware/mISDN/avmfritz.c             |    2 +-
 drivers/isdn/hardware/mISDN/hfcmulti.c             |    2 +-
 drivers/isdn/hardware/mISDN/hfcpci.c               |    2 +-
 drivers/isdn/hardware/mISDN/netjet.c               |    2 +-
 drivers/isdn/hardware/mISDN/w6692.c                |    2 +-
 drivers/isdn/hisax/config.c                        |    2 +-
 drivers/isdn/hisax/hfc4s8s_l1.c                    |    2 +-
 drivers/isdn/hisax/hisax_fcpcipnp.c                |    2 +-
 drivers/mux/Kconfig                                |   19 +-
 drivers/mux/mux-core.c                             |    2 +-
 drivers/net/bonding/bond_main.c                    |    2 +-
 drivers/net/dsa/b53/b53_common.c                   |    1 +
 drivers/net/dsa/mv88e6xxx/chip.c                   |    1 +
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c   |   22 +-
 drivers/net/ethernet/broadcom/bgmac-platform.c     |   21 +-
 drivers/net/ethernet/broadcom/bgmac.c              |   70 +-
 drivers/net/ethernet/broadcom/bgmac.h              |    1 +
 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |    7 +-
 drivers/net/ethernet/broadcom/genet/bcmgenet.c     |  299 +-
 drivers/net/ethernet/broadcom/genet/bcmgenet.h     |    2 +
 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c |    2 +-
 drivers/net/ethernet/cavium/thunder/thunder_bgx.c  |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c     |    3 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h |    2 +
 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c  |    3 +-
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c |   58 +-
 drivers/net/ethernet/mellanox/mlx4/alloc.c         |    8 +-
 drivers/net/ethernet/qualcomm/emac/emac.c          |   10 +-
 drivers/net/ethernet/sgi/ioc3-eth.c                |   14 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c  |    2 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |    9 +-
 drivers/net/ethernet/sun/niu.c                     |    4 +-
 drivers/net/ethernet/tehuti/tehuti.c               |    2 +
 drivers/net/ethernet/ti/cpsw.c                     |   49 +-
 drivers/net/phy/mdio-mux.c                         |    4 +-
 drivers/net/ppp/ppp_generic.c                      |   30 +-
 drivers/net/usb/cdc_ncm.c                          |   28 +
 drivers/net/usb/huawei_cdc_ncm.c                   |    6 +
 drivers/net/usb/smsc95xx.c                         |    1 +
 drivers/net/vmxnet3/vmxnet3_int.h                  |    2 +-
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c     |    2 +-
 drivers/nvme/host/core.c                           |    2 +-
 drivers/nvme/host/pci.c                            |   43 +-
 drivers/nvme/target/admin-cmd.c                    |   16 +-
 drivers/nvme/target/configfs.c                     |   30 +-
 drivers/nvme/target/core.c                         |    5 +-
 drivers/nvme/target/fc.c                           |    8 +-
 drivers/nvme/target/nvmet.h                        |    2 +-
 drivers/nvmem/rockchip-efuse.c                     |    2 +-
 drivers/spmi/spmi-pmic-arb.c                       |   17 +-
 drivers/spmi/spmi.c                                |   12 +
 drivers/staging/Kconfig                            |    2 +
 drivers/staging/Makefile                           |    1 +
 drivers/staging/comedi/drivers/ni_mio_common.c     |    3 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |   19 +-
 drivers/staging/rtl8188eu/core/rtw_cmd.c           |    2 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c        |    1 +
 drivers/staging/sm750fb/ddk750_chip.c              |    2 +-
 drivers/staging/sm750fb/sm750.c                    |   24 +
 drivers/staging/speakup/main.c                     |    2 +
 drivers/staging/speakup/spk_priv.h                 |    2 +
 drivers/staging/speakup/spk_ttyio.c                |   22 +-
 drivers/staging/vboxvideo/Kconfig                  |   12 +
 drivers/staging/vboxvideo/Makefile                 |    7 +
 drivers/staging/vboxvideo/TODO                     |    9 +
 drivers/staging/vboxvideo/hgsmi_base.c             |  246 +
 drivers/staging/vboxvideo/hgsmi_ch_setup.h         |   66 +
 drivers/staging/vboxvideo/hgsmi_channels.h         |   53 +
 drivers/staging/vboxvideo/hgsmi_defs.h             |   92 +
 drivers/staging/vboxvideo/modesetting.c            |  142 +
 drivers/staging/vboxvideo/vbox_drv.c               |  286 ++
 drivers/staging/vboxvideo/vbox_drv.h               |  296 ++
 drivers/staging/vboxvideo/vbox_err.h               |   50 +
 drivers/staging/vboxvideo/vbox_fb.c                |  412 ++
 drivers/staging/vboxvideo/vbox_hgsmi.c             |  115 +
 drivers/staging/vboxvideo/vbox_irq.c               |  197 +
 drivers/staging/vboxvideo/vbox_main.c              |  534 ++
 drivers/staging/vboxvideo/vbox_mode.c              |  877 ++++
 drivers/staging/vboxvideo/vbox_prime.c             |   74 +
 drivers/staging/vboxvideo/vbox_ttm.c               |  472 ++
 drivers/staging/vboxvideo/vboxvideo.h              |  491 ++
 drivers/staging/vboxvideo/vboxvideo_guest.h        |   95 +
 drivers/staging/vboxvideo/vboxvideo_vbe.h          |   84 +
 drivers/staging/vboxvideo/vbva_base.c              |  233 +
 .../vc04_services/interface/vchiq_arm/vchiq_arm.c  |   10 +-
 drivers/thunderbolt/switch.c                       |    3 +-
 drivers/tty/pty.c                                  |   85 +-
 drivers/tty/serial/fsl_lpuart.c                    |   24 +-
 drivers/tty/serial/imx.c                           |   27 +-
 drivers/tty/serial/sh-sci.c                        |   12 +-
 drivers/tty/serial/st-asc.c                        |    1 +
 drivers/usb/class/cdc-acm.c                        |    3 +
 drivers/usb/dwc2/gadget.c                          |    3 +
 drivers/usb/dwc3/core.c                            |    6 +-
 drivers/usb/dwc3/dwc3-omap.c                       |   18 +-
 drivers/usb/dwc3/gadget.c                          |    8 +-
 drivers/usb/gadget/function/f_mass_storage.c       |    2 +-
 drivers/usb/gadget/function/f_uac1.c               |   20 +-
 drivers/usb/gadget/function/f_uac2.c               |   25 +-
 drivers/usb/gadget/udc/Kconfig                     |    5 +-
 drivers/usb/gadget/udc/renesas_usb3.c              |   14 +-
 drivers/usb/gadget/udc/snps_udc_plat.c             |    6 +-
 drivers/usb/host/pci-quirks.c                      |   54 +
 drivers/usb/host/pci-quirks.h                      |    2 +
 drivers/usb/host/xhci-hub.c                        |   14 +-
 drivers/usb/host/xhci-pci.c                        |    6 +
 drivers/usb/host/xhci-ring.c                       |   11 +-
 drivers/usb/host/xhci.c                            |   10 +-
 drivers/usb/host/xhci.h                            |    1 +
 drivers/usb/renesas_usbhs/common.c                 |    4 +-
 drivers/usb/renesas_usbhs/mod_gadget.c             |   31 +-
 drivers/usb/storage/isd200.c                       |    5 +-
 drivers/usb/typec/ucsi/ucsi.h                      |    1 +
 drivers/w1/masters/omap_hdq.c                      |    3 +-
 drivers/w1/w1.c                                    |    4 +-
 drivers/xen/balloon.c                              |    3 +
 drivers/xen/grant-table.c                          |    9 +-
 drivers/xen/xen-balloon.c                          |   22 +-
 fs/nfs/client.c                                    |    1 +
 fs/nfs/dir.c                                       |   47 +-
 fs/nfs/filelayout/filelayout.c                     |   13 +-
 fs/nfs/flexfilelayout/flexfilelayout.c             |    4 +
 fs/nfs/mount_clnt.c                                |    2 +-
 fs/nfs/nfs3proc.c                                  |   11 +-
 fs/nfs/pnfs_nfs.c                                  |   24 +-
 fs/overlayfs/dir.c                                 |   22 +-
 fs/overlayfs/inode.c                               |   32 +-
 fs/overlayfs/namei.c                               |   41 +-
 fs/overlayfs/overlayfs.h                           |   10 +-
 fs/overlayfs/readdir.c                             |    5 +-
 fs/overlayfs/super.c                               |   13 +-
 fs/overlayfs/util.c                                |    7 +-
 include/linux/bpf-cgroup.h                         |    2 +-
 include/linux/bpf_verifier.h                       |    1 +
 include/linux/dma-fence.h                          |    2 +
 include/linux/ftrace.h                             |    6 +-
 include/linux/jhash.h                              |   29 +-
 include/linux/netfilter.h                          |    9 -
 include/linux/nfs_fs.h                             |    2 +-
 include/linux/nvme.h                               |   14 +-
 include/linux/trace_events.h                       |    2 +-
 include/linux/usb/audio-v2.h                       |   14 +-
 include/linux/usb/cdc_ncm.h                        |    1 +
 include/net/netlink.h                              |    4 +-
 include/net/sctp/sctp.h                            |    4 +
 include/rdma/ib_addr.h                             |    6 +-
 include/rdma/rdmavt_qp.h                           |   14 +
 include/uapi/asm-generic/ioctls.h                  |    2 +-
 include/uapi/linux/usb/audio.h                     |    6 +-
 include/xen/balloon.h                              |    8 +
 kernel/bpf/verifier.c                              |  108 +-
 kernel/events/core.c                               |   33 +-
 kernel/irq/chip.c                                  |   10 -
 kernel/irq/internals.h                             |   10 +
 kernel/irq/pm.c                                    |    2 +
 kernel/locking/rtmutex.c                           |    1 -
 kernel/sched/cputime.c                             |    6 +-
 kernel/sched/deadline.c                            |   14 +-
 kernel/trace/ftrace.c                              |   41 +-
 kernel/trace/ring_buffer.c                         |   10 +-
 kernel/trace/trace.c                               |    1 +
 kernel/trace/trace.h                               |    6 +-
 net/bridge/br_device.c                             |    3 +-
 net/bridge/br_input.c                              |    3 +-
 net/core/dev_ioctl.c                               |    3 +
 net/core/fib_rules.c                               |    3 +-
 net/core/filter.c                                  |    2 +-
 net/core/netpoll.c                                 |    2 +-
 net/core/rtnetlink.c                               |    4 +-
 net/dccp/input.c                                   |    2 +-
 net/ipv4/fib_frontend.c                            |    9 +-
 net/ipv4/ip_output.c                               |    8 +-
 net/ipv4/netfilter/nf_tables_arp.c                 |    3 +-
 net/ipv4/syncookies.c                              |    1 +
 net/ipv4/tcp_bbr.c                                 |   49 +-
 net/ipv4/udp.c                                     |   13 +-
 net/ipv6/output_core.c                             |    8 +-
 net/ipv6/syncookies.c                              |    1 +
 net/netfilter/core.c                               |  147 +-
 net/netfilter/nf_conntrack_expect.c                |    2 +-
 net/netfilter/nf_nat_core.c                        |   17 +-
 net/netfilter/nfnetlink.c                          |    6 +-
 net/openvswitch/conntrack.c                        |   51 +-
 net/packet/af_packet.c                             |    6 +-
 net/rds/send.c                                     |    6 +-
 net/sched/act_api.c                                |    4 +-
 net/sctp/sm_make_chunk.c                           |    4 +-
 net/sunrpc/xprtsock.c                              |    2 +
 scripts/parse-maintainers.pl                       |   77 +
 tools/lib/bpf/bpf.c                                |    4 +-
 tools/lib/bpf/bpf.h                                |    2 +-
 tools/perf/ui/browser.c                            |    2 +-
 tools/perf/util/evsel.c                            |    8 +-
 tools/perf/util/machine.c                          |    2 +-
 tools/testing/selftests/bpf/test_align.c           |    2 +-
 tools/testing/selftests/bpf/test_verifier.c        |  480 +-
 318 files changed, 10269 insertions(+), 3894 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt
 create mode 100644 drivers/staging/vboxvideo/Kconfig
 create mode 100644 drivers/staging/vboxvideo/Makefile
 create mode 100644 drivers/staging/vboxvideo/TODO
 create mode 100644 drivers/staging/vboxvideo/hgsmi_base.c
 create mode 100644 drivers/staging/vboxvideo/hgsmi_ch_setup.h
 create mode 100644 drivers/staging/vboxvideo/hgsmi_channels.h
 create mode 100644 drivers/staging/vboxvideo/hgsmi_defs.h
 create mode 100644 drivers/staging/vboxvideo/modesetting.c
 create mode 100644 drivers/staging/vboxvideo/vbox_drv.c
 create mode 100644 drivers/staging/vboxvideo/vbox_drv.h
 create mode 100644 drivers/staging/vboxvideo/vbox_err.h
 create mode 100644 drivers/staging/vboxvideo/vbox_fb.c
 create mode 100644 drivers/staging/vboxvideo/vbox_hgsmi.c
 create mode 100644 drivers/staging/vboxvideo/vbox_irq.c
 create mode 100644 drivers/staging/vboxvideo/vbox_main.c
 create mode 100644 drivers/staging/vboxvideo/vbox_mode.c
 create mode 100644 drivers/staging/vboxvideo/vbox_prime.c
 create mode 100644 drivers/staging/vboxvideo/vbox_ttm.c
 create mode 100644 drivers/staging/vboxvideo/vboxvideo.h
 create mode 100644 drivers/staging/vboxvideo/vboxvideo_guest.h
 create mode 100644 drivers/staging/vboxvideo/vboxvideo_vbe.h
 create mode 100644 drivers/staging/vboxvideo/vbva_base.c
 create mode 100644 scripts/parse-maintainers.pl
Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig)
$ git merge kbuild-current/fixes
Already up-to-date.
Merging arc-current/for-curr (37f1db0e85ff ARC: [plat-axs10x]: prepare dts files for enabling PAE40 on axs103)
$ git merge arc-current/for-curr
Merge made by the 'recursive' strategy.
 arch/arc/boot/dts/axc001.dtsi     | 20 +++++++++-----------
 arch/arc/boot/dts/axc003.dtsi     | 21 ++++++++++-----------
 arch/arc/boot/dts/axc003_idu.dtsi | 21 ++++++++++-----------
 arch/arc/boot/dts/axs10x_mb.dtsi  |  2 +-
 arch/arc/configs/nps_defconfig    |  1 -
 arch/arc/configs/tb10x_defconfig  |  1 -
 arch/arc/mm/cache.c               |  3 +++
 7 files changed, 33 insertions(+), 36 deletions(-)
Merging arm-current/fixes (9e25ebfe56ec ARM: 8685/1: ensure memblock-limit is pmd-aligned)
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging powerpc-fixes/fixes (029d9252b116 powerpc/mm: Mark __init memory no-execute when STRICT_KERNEL_RWX=y)
$ git merge powerpc-fixes/fixes
Already up-to-date.
Merging sparc/master (8cd3ec51c0c3 sbus: Convert to using %pOF instead of full_name)
$ git merge sparc/master
Merge made by the 'recursive' strategy.
 arch/sparc/configs/sparc32_defconfig    |  4 ----
 arch/sparc/configs/sparc64_defconfig    |  4 ----
 arch/sparc/include/asm/mmu_context_64.h | 14 +++++++++-----
 arch/sparc/kernel/tsb.S                 | 12 ++++++++++++
 arch/sparc/mm/init_64.c                 | 25 ++++++++++++++++++++++++-
 arch/sparc/power/hibernate.c            |  3 +--
 drivers/sbus/char/display7seg.c         |  4 ++--
 drivers/sbus/char/flash.c               |  4 ++--
 drivers/sbus/char/uctrl.c               |  4 ++--
 9 files changed, 52 insertions(+), 22 deletions(-)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
$ git merge fscrypt-current/for-stable
Already up-to-date.
Merging net/master (96080f697786 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge net/master
Already up-to-date.
Merging ipsec/master (e6194923237f esp: Fix memleaks on error paths.)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
 net/ipv4/esp4.c | 13 ++++++++-----
 net/ipv6/esp6.c |  9 +++++----
 2 files changed, 13 insertions(+), 9 deletions(-)
Merging netfilter/master (36ac344e16e0 netfilter: expect: fix crash when putting uninited expectation)
$ git merge netfilter/master
Already up-to-date.
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
$ git merge ipvs/master
Already up-to-date.
Merging wireless-drivers/master (d755cbc26e82 Merge tag 'iwlwifi-for-kalle-2017-07-21' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
$ git merge wireless-drivers/master
Merge made by the 'recursive' strategy.
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c |  3 ++-
 drivers/net/wireless/intel/iwlwifi/dvm/tx.c             |  2 +-
 drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h       |  4 ++--
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c       |  8 +++++++-
 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h            |  2 ++
 drivers/net/wireless/intel/iwlwifi/mvm/ops.c            |  6 +++---
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c            | 15 ++++++++++++++-
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c         |  3 ++-
 drivers/net/wireless/intel/iwlwifi/pcie/tx.c            |  3 +++
 drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c     |  3 ---
 drivers/net/wireless/realtek/rtlwifi/wifi.h             |  1 -
 11 files changed, 36 insertions(+), 14 deletions(-)
Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES)
$ git merge mac80211/master
Already up-to-date.
Merging sound-current/for-linus (e674ac9a4705 ALSA: hda/realtek - No loopback on ALC225/ALC295 codec)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
 sound/pci/fm801.c             |   4 +-
 sound/pci/hda/patch_hdmi.c    |  27 ++++++++
 sound/pci/hda/patch_realtek.c | 144 +++++++++++++++++++++++++++++++++---------
 3 files changed, 142 insertions(+), 33 deletions(-)
Merging pci-current/for-linus (34d5ac2af644 PCI: rockchip: Check for pci_scan_root_bus_bridge() failure correctly)
$ git merge pci-current/for-linus
Already up-to-date.
Merging driver-core.current/driver-core-linus (5771a8c08880 Linux v4.13-rc1)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (c6325179238f tty: Fix TIOCGPTPEER ioctl definition)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (d6f5f071f1e1 xhci: fix memleak in xhci_run())
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (b8b9c974afee usb: renesas_usbhs: gadget: disable all eps when the driver stops)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (9585e340db9f USB: serial: cp210x: add support for Qivicon USB ZigBee dongle)
$ git merge usb-serial-fixes/usb-linus
Merge made by the 'recursive' strategy.
 drivers/usb/serial/cp210x.c | 1 +
 1 file changed, 1 insertion(+)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Already up-to-date.
Merging phy/fixes (5771a8c08880 Linux v4.13-rc1)
$ git merge phy/fixes
Already up-to-date.
Merging staging.current/staging-linus (5a1d4c5dd4eb staging: rtl8188eu: add TL-WN722N v2 support)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (c89876dda018 w1: omap-hdq: fix error return code in omap_hdq_probe())
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (293b915fd9be Input: trackpoint - assume 3 buttons when buttons detection fails)
$ git merge input-current/for-linus
Merge made by the 'recursive' strategy.
 drivers/input/mouse/trackpoint.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging crypto-current/master (41cdf7a45389 crypto: authencesn - Fix digest_null crash)
$ git merge crypto-current/master
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt | 2 --
 crypto/authencesn.c                                                 | 5 +++++
 drivers/crypto/Kconfig                                              | 2 +-
 drivers/crypto/bcm/spu2.c                                           | 1 +
 drivers/crypto/cavium/nitrox/nitrox_main.c                          | 3 ++-
 drivers/crypto/inside-secure/safexcel.c                             | 5 +----
 6 files changed, 10 insertions(+), 8 deletions(-)
Merging ide/master (921edf312a6a ide: avoid warning for timings calculation)
$ git merge ide/master
Already up-to-date.
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (5771a8c08880 Linux v4.13-rc1)
$ git merge kselftest-fixes/fixes
Already up-to-date.
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
$ git merge backlight-fixes/for-backlight-fixes
Already up-to-date.
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
$ git merge ftrace-fixes/for-next-urgent
Already up-to-date.
Merging nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static)
$ git merge nand-fixes/nand/fixes
Already up-to-date.
Merging spi-nor-fixes/spi-nor/fixes (5771a8c08880 Linux v4.13-rc1)
$ git merge spi-nor-fixes/spi-nor/fixes
Already up-to-date.
Merging mfd-fixes/for-mfd-fixes (9e69672e90cc dt-bindings: mfd: Update STM32 timers clock names)
$ git merge mfd-fixes/for-mfd-fixes
Already up-to-date.
Merging v4l-dvb-fixes/fixes (745f79ac9373 media: cec-notifier: small improvements)
$ git merge v4l-dvb-fixes/fixes
Merge made by the 'recursive' strategy.
 Documentation/media/kapi/dtv-core.rst              |  443 +-
 Documentation/media/typical_media_device.svg       | 3054 +--------
 Documentation/media/uapi/dvb/dvbstb.svg            |  668 +-
 Documentation/media/uapi/v4l/bayer.svg             | 1013 +--
 Documentation/media/uapi/v4l/constraints.svg       |  356 +-
 Documentation/media/uapi/v4l/crop.svg              |  253 +-
 Documentation/media/uapi/v4l/fieldseq_bt.svg       |  170 +-
 Documentation/media/uapi/v4l/fieldseq_tb.svg       |  175 +-
 Documentation/media/uapi/v4l/nv12mt.svg            |  764 +--
 Documentation/media/uapi/v4l/nv12mt_example.svg    | 2474 +++----
 Documentation/media/uapi/v4l/selection.svg         | 6957 ++++----------------
 .../uapi/v4l/subdev-image-processing-crop.svg      |   10 +-
 .../uapi/v4l/subdev-image-processing-full.svg      |   10 +-
 ...ubdev-image-processing-scaling-multi-source.svg |   10 +-
 Documentation/media/uapi/v4l/vbi_525.svg           |  614 +-
 Documentation/media/uapi/v4l/vbi_625.svg           |  388 +-
 Documentation/media/uapi/v4l/vbi_hsync.svg         |  238 +-
 Documentation/media/uapi/v4l/vidioc-g-fmt.rst      |    6 +
 Documentation/media/v4l-drivers/imx.rst            |    7 +-
 Documentation/media/v4l-drivers/index.rst          |    1 +
 drivers/media/cec/cec-adap.c                       |    2 +-
 drivers/media/cec/cec-notifier.c                   |    6 +
 drivers/media/dvb-core/dvb_ca_en50221.c            |  143 +-
 drivers/media/dvb-core/dvb_ca_en50221.h            |    7 +
 drivers/media/dvb-frontends/cxd2841er.c            |    5 +-
 drivers/media/dvb-frontends/drx39xyj/drx_driver.h  |   15 +-
 drivers/media/dvb-frontends/lnbh25.c               |    6 +-
 drivers/media/dvb-frontends/stv0367.c              |  210 +-
 drivers/media/i2c/et8ek8/et8ek8_driver.c           |    1 -
 drivers/media/i2c/tvp5150.c                        |   25 +-
 drivers/media/pci/ddbridge/ddbridge-core.c         |  102 +-
 drivers/media/pci/ngene/ngene-core.c               |   32 +-
 drivers/media/pci/ngene/ngene-i2c.c                |    6 +-
 drivers/media/pci/ngene/ngene.h                    |    6 +-
 drivers/media/pci/tw5864/tw5864-video.c            |    1 +
 drivers/media/platform/coda/coda-bit.c             |    8 +-
 drivers/media/platform/coda/coda-common.c          |    4 +-
 drivers/media/platform/coda/coda.h                 |    2 +-
 drivers/media/platform/davinci/vpif_capture.c      |    2 -
 drivers/media/platform/davinci/vpif_display.c      |    2 -
 drivers/media/platform/omap/omap_vout_vrfb.c       |  133 +-
 drivers/media/platform/omap/omap_voutdef.h         |    6 +-
 drivers/media/platform/qcom/venus/core.c           |    2 +-
 drivers/media/platform/sti/bdisp/bdisp-debug.c     |   14 +-
 drivers/media/platform/vimc/vimc-capture.c         |   15 +-
 drivers/media/platform/vimc/vimc-debayer.c         |   15 +-
 drivers/media/platform/vimc/vimc-scaler.c          |   15 +-
 drivers/media/platform/vimc/vimc-sensor.c          |   15 +-
 drivers/media/radio/radio-wl1273.c                 |   15 +-
 drivers/media/rc/ir-lirc-codec.c                   |    2 +-
 drivers/media/tuners/fc0011.c                      |    1 +
 drivers/media/tuners/mxl5005s.c                    |    2 -
 drivers/media/usb/au0828/au0828-input.c            |    2 +-
 drivers/media/usb/dvb-usb-v2/lmedm04.c             |   10 +-
 drivers/media/usb/dvb-usb/dib0700_core.c           |   38 +-
 drivers/media/usb/em28xx/em28xx-cards.c            |   18 +
 drivers/media/usb/em28xx/em28xx-dvb.c              |    1 +
 drivers/media/usb/em28xx/em28xx-i2c.c              |    2 -
 drivers/media/usb/em28xx/em28xx-input.c            |    2 +-
 drivers/media/usb/em28xx/em28xx.h                  |    1 +
 drivers/media/usb/pulse8-cec/pulse8-cec.c          |    2 +-
 drivers/media/usb/rainshadow-cec/rainshadow-cec.c  |   18 +-
 drivers/media/usb/stkwebcam/stk-sensor.c           |   32 +-
 drivers/media/usb/stkwebcam/stk-webcam.c           |   70 +-
 drivers/media/usb/stkwebcam/stk-webcam.h           |    6 -
 drivers/media/v4l2-core/tuner-core.c               |    2 -
 drivers/staging/media/atomisp/i2c/gc0310.h         |    2 +-
 drivers/staging/media/atomisp/i2c/gc2235.h         |    2 +-
 drivers/staging/media/atomisp/i2c/ov2680.h         |    3 +-
 drivers/staging/media/atomisp/i2c/ov2722.h         |    2 +-
 drivers/staging/media/atomisp/i2c/ov5693/ov5693.h  |    2 +-
 .../staging/media/atomisp/pci/atomisp2/Makefile    |   10 +-
 drivers/staging/media/cxd2099/cxd2099.c            |  165 +-
 drivers/staging/media/cxd2099/cxd2099.h            |    6 +-
 include/media/cec-notifier.h                       |   15 +
 75 files changed, 5102 insertions(+), 13740 deletions(-)
Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
$ git merge reset-fixes/reset/fixes
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (9cc5bb18bd0a drm/i915: Fix bad comparison in skl_compute_plane_wm.)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |  2 +-
 drivers/gpu/drm/i915/intel_display.c       | 12 +++++++++++-
 drivers/gpu/drm/i915/intel_pm.c            |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)
Merging drm-misc-fixes/for-linux-next-fixes (967003bb2cae drm/dp: Don't trust drm_dp_downstream_id())
$ git merge drm-misc-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/drm_dp_helper.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Merging kbuild/for-next (5771a8c08880 Linux v4.13-rc1)
$ git merge kbuild/for-next
Already up-to-date.
Merging uuid/for-next (874f7998e62d uuid: remove uuid_be)
$ git merge uuid/for-next
Auto-merging drivers/thunderbolt/switch.c
Merge made by the 'recursive' strategy.
 drivers/thunderbolt/switch.c  |  8 ++++----
 drivers/thunderbolt/tb.h      |  4 ++--
 drivers/thunderbolt/tb_msgs.h | 12 ++++++------
 include/linux/uuid.h          | 14 --------------
 lib/test_uuid.c               |  2 +-
 5 files changed, 13 insertions(+), 27 deletions(-)
Merging dma-mapping/for-next (878ec36765fa ARM: NOMMU: Wire-up default DMA interface)
$ git merge dma-mapping/for-next
Merge made by the 'recursive' strategy.
 arch/arc/mm/dma.c               |   2 +-
 arch/arm/mm/dma-mapping-nommu.c |  45 ++++++++---
 arch/arm/mm/dma-mapping.c       |   2 +-
 arch/arm64/mm/dma-mapping.c     |   4 +-
 arch/mips/mm/dma-default.c      |   2 +-
 drivers/base/dma-coherent.c     | 164 ++++++++++++++++++++++++++--------------
 drivers/base/dma-mapping.c      |   2 +-
 include/linux/dma-mapping.h     |  40 ++++++++--
 8 files changed, 180 insertions(+), 81 deletions(-)
Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (6f8119230ed0 ARC: set boot print log level to PR_INFO)
$ git merge arc/for-next
Auto-merging arch/arc/mm/cache.c
Auto-merging arch/arc/kernel/setup.c
Merge made by the 'recursive' strategy.
 arch/arc/include/asm/irqflags-arcv2.h   |  3 ---
 arch/arc/include/asm/irqflags-compact.h |  2 --
 arch/arc/include/asm/spinlock.h         | 12 ++++++++++++
 arch/arc/kernel/entry-compact.S         | 22 +++++++++++-----------
 arch/arc/kernel/process.c               | 29 +++++++++++++++++++++++++++--
 arch/arc/kernel/setup.c                 |  6 +++---
 arch/arc/kernel/traps.c                 |  2 +-
 arch/arc/mm/cache.c                     |  2 +-
 arch/arc/mm/fault.c                     |  2 +-
 arch/arc/mm/tlb.c                       |  2 +-
 arch/arc/mm/tlbex.S                     |  9 +++++++++
 arch/arc/plat-eznps/Kconfig             | 15 +++++++++++++--
 arch/arc/plat-eznps/include/plat/ctop.h |  1 +
 arch/arc/plat-eznps/mtm.c               | 11 +++++++++--
 14 files changed, 89 insertions(+), 29 deletions(-)
Merging arm/for-next (fc256ee00f0c Merge branches 'fixes' and 'misc' into for-next)
$ git merge arm/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm-perf/for-next/perf (5771a8c08880 Linux v4.13-rc1)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (ebc5ff9e87f6 Merge branch 'next/dt64' into for-next)
$ git merge arm-soc/for-next
Merge made by the 'recursive' strategy.
 arch/arm/arm-soc-for-next-contents.txt | 251 +++++++++++++++++++++++++++++++++
 1 file changed, 251 insertions(+)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging actions/for-next (8ba75fbb148a Merge branch 'v4.13/arm+sps' into next)
$ git merge actions/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
$ git merge alpine/alpine/for-next
Merge made by the 'recursive' strategy.
Merging amlogic/for-next (bdbe8158fd32 Merge branch 'v4.13/fixes' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Merge made by the 'recursive' strategy.
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi          |   2 +-
 .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts     |   4 +-
 .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts   | 103 ++++++++++++++++++---
 3 files changed, 94 insertions(+), 15 deletions(-)
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
$ git merge aspeed/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging at91/at91-next (cd9e550740ae Merge branch 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
$ git merge at91/at91-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/Makefile                  |   1 +
 arch/arm/boot/dts/at91-sama5d27_som1.dtsi   | 102 ++++++
 arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 537 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/at91-sama5d2_xplained.dts |  23 +-
 arch/arm/boot/dts/sama5d2.dtsi              |  50 ++-
 drivers/soc/atmel/soc.c                     |   8 +
 drivers/soc/atmel/soc.h                     |   4 +
 7 files changed, 708 insertions(+), 17 deletions(-)
 create mode 100644 arch/arm/boot/dts/at91-sama5d27_som1.dtsi
 create mode 100644 arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
Merging bcm2835/for-next (389c81b7e7ae Merge branch anholt/bcm2835-defconfig-next into for-next)
$ git merge bcm2835/for-next
Merge made by the 'recursive' strategy.
 arch/arm/configs/bcm2835_defconfig | 7 +++++++
 1 file changed, 7 insertions(+)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
$ git merge berlin/berlin/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
$ git merge cortex-m/for-next
Already up-to-date.
Merging imx-mxs/for-next (078690243113 Merge branch 'zte/dt64' into for-next)
$ git merge imx-mxs/for-next
Removing arch/arm/boot/dts/imx6ul-isiot-common.dtsi
Auto-merging arch/arm/boot/dts/imx6ul-geam.dts
Removing arch/arm/boot/dts/imx6ul-geam-kit.dts
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/Makefile                         |   2 +-
 arch/arm/boot/dts/imx6dl-gw52xx.dts                |  58 +++++++
 arch/arm/boot/dts/imx6dl-gw53xx.dts                |  58 +++++++
 arch/arm/boot/dts/imx6dl-gw54xx.dts                |  58 +++++++
 arch/arm/boot/dts/imx6q-b850v3.dts                 |   2 +-
 arch/arm/boot/dts/imx6q-gw52xx.dts                 |  58 +++++++
 arch/arm/boot/dts/imx6q-gw53xx.dts                 |  58 +++++++
 arch/arm/boot/dts/imx6q-gw54xx.dts                 |  58 +++++++
 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi              |  54 ++++++
 arch/arm/boot/dts/imx6qdl-gw553x.dtsi              |  54 ++++++
 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi           |   1 -
 arch/arm/boot/dts/imx6qdl.dtsi                     |   1 +
 arch/arm/boot/dts/imx6sl.dtsi                      |   1 +
 arch/arm/boot/dts/imx6sx.dtsi                      |   1 +
 arch/arm/boot/dts/imx6ul-14x14-evk.dts             |  39 ++---
 arch/arm/boot/dts/imx6ul-geam-kit.dts              | 101 ------------
 .../boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} |  74 +++++++++
 arch/arm/boot/dts/imx6ul-isiot-common.dtsi         | 141 ----------------
 arch/arm/boot/dts/imx6ul-isiot-emmc.dts            |   1 -
 arch/arm/boot/dts/imx6ul-isiot-nand.dts            |   1 -
 arch/arm/boot/dts/imx6ul-isiot.dtsi                | 183 +++++++++++++++++++++
 arch/arm/boot/dts/imx6ul.dtsi                      |   1 +
 arch/arm/boot/dts/imx7d-sdb.dts                    |  21 +--
 arch/arm/boot/dts/imx7s.dtsi                       |   1 +
 arch/arm/boot/dts/zx296702-ad1.dts                 |   2 -
 arch/arm/configs/imx_v6_v7_defconfig               |   4 +-
 arch/arm64/boot/dts/zte/zx296718.dtsi              |   2 -
 27 files changed, 749 insertions(+), 286 deletions(-)
 delete mode 100644 arch/arm/boot/dts/imx6ul-geam-kit.dts
 rename arch/arm/boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} (87%)
 delete mode 100644 arch/arm/boot/dts/imx6ul-isiot-common.dtsi
Merging keystone/next (9fa3966f3f80 Merge branch 'for_4.14/keystone_config' into next)
$ git merge keystone/next
Removing include/dt-bindings/genpd/k2g.h
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/soc/ti/sci-pm-domain.txt   |  5 +-
 arch/arm/boot/dts/keystone-k2g.dtsi                | 29 +++++++
 arch/arm/configs/keystone_defconfig                |  6 ++
 include/dt-bindings/genpd/k2g.h                    | 90 ----------------------
 4 files changed, 38 insertions(+), 92 deletions(-)
 delete mode 100644 include/dt-bindings/genpd/k2g.h
Merging mvebu/for-next (fd63b625307d Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/armada-388-gp.dts                |  4 +-
 arch/arm/mach-mvebu/platsmp.c                      |  2 +-
 .../boot/dts/marvell/armada-3720-espressobin.dts   |  5 ++
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi       | 11 ++-
 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts  | 94 +++++++++++++++++++++-
 .../boot/dts/marvell/armada-cp110-master.dtsi      | 26 ++++--
 .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 26 ++++--
 arch/arm64/configs/defconfig                       |  1 +
 8 files changed, 147 insertions(+), 22 deletions(-)
Merging omap/for-next (05f2a5417cf1 Merge branch 'omap-for-v4.13/mmc-regulator' into for-next)
$ git merge omap/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts |  2 +-
 arch/arm/boot/dts/dm8168-evm.dts              | 34 ++++++++++++++++-
 arch/arm/boot/dts/dm816x.dtsi                 |  2 +-
 arch/arm/boot/dts/dra7-evm.dts                | 10 ++++-
 arch/arm/boot/dts/dra7.dtsi                   |  5 +++
 arch/arm/boot/dts/dra71-evm.dts               | 18 ++++++++-
 arch/arm/boot/dts/dra72-evm-common.dtsi       |  2 -
 arch/arm/boot/dts/dra72-evm-revc.dts          | 18 +++++++++
 arch/arm/boot/dts/dra72-evm.dts               | 18 +++++++++
 arch/arm/mach-omap2/pdata-quirks.c            | 31 +++++++++++++++
 arch/arm/mach-omap2/pm34xx.c                  |  1 -
 arch/arm/mach-omap2/prm3xxx.c                 |  7 +---
 arch/arm/mach-omap2/prm44xx.c                 | 55 +++++++++++++++++++++++++++
 include/linux/platform_data/hsmmc-omap.h      |  3 ++
 14 files changed, 191 insertions(+), 15 deletions(-)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
$ git merge omap-pending/for-next
Already up-to-date.
Merging reset/reset/next (e0be864f1424 ARC: reset: introduce HSDKv1 reset driver)
$ git merge reset/reset/next
Recorded preimage for 'MAINTAINERS'
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'MAINTAINERS'.
[master b94ebd551f75] Merge remote-tracking branch 'reset/reset/next'
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS                                    |   7 +
 drivers/reset/Kconfig                          |   6 +
 drivers/reset/Makefile                         |   1 +
 drivers/reset/core.c                           | 238 ++++++++++++++++++++++++-
 drivers/reset/reset-hsdk-v1.c                  | 137 ++++++++++++++
 drivers/reset/reset-zx2967.c                   |   2 +-
 include/dt-bindings/reset/snps,hsdk-v1-reset.h |  17 ++
 include/linux/reset.h                          |  68 +++++++
 8 files changed, 470 insertions(+), 6 deletions(-)
 create mode 100644 drivers/reset/reset-hsdk-v1.c
 create mode 100644 include/dt-bindings/reset/snps,hsdk-v1-reset.h
Merging qcom/for-next (6a3282b03fe6 Merge tag 'qcom-defconfig-for-4.13-2' into all-for-4.13-revised)
$ git merge qcom/for-next
Merge made by the 'recursive' strategy.
Merging realtek/for-next (007e6304223c Merge branch 'v4.13/dt64' into next)
$ git merge realtek/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging renesas/next (c2432fc935fd Merge branch 'fixes-for-v4.13' into next)
$ git merge renesas/next
Merge made by the 'recursive' strategy.
 arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +-
 arch/arm64/boot/dts/renesas/ulcb.dtsi            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Merging rockchip/for-next (ad51088d7a9f Merge branch 'v4.14-armsoc/dts64' into for-next)
$ git merge rockchip/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/gpu/arm,mali-midgard.txt   |   1 +
 .../bindings/soc/rockchip/power_domain.txt         |   3 +
 arch/arm/boot/dts/rk3036-kylin.dts                 |   2 -
 arch/arm/boot/dts/rk3036.dtsi                      |   3 +-
 arch/arm/boot/dts/rk3066a-bqcurie2.dts             |   2 -
 arch/arm/boot/dts/rk3066a-mk808.dts                |   2 -
 arch/arm/boot/dts/rk3066a-rayeager.dts             |   3 -
 arch/arm/boot/dts/rk3188-px3-evb.dts               |   2 -
 arch/arm/boot/dts/rk3188-radxarock.dts             |   1 -
 arch/arm/boot/dts/rk3229-evb.dts                   | 129 ++++++++++++++++++++-
 arch/arm/boot/dts/rk3229.dtsi                      |  89 ++++++++++++++
 arch/arm/boot/dts/rk322x.dtsi                      | 113 +++++++++++++++++-
 arch/arm/boot/dts/rk3288-evb.dtsi                  |  49 +++++++-
 arch/arm/boot/dts/rk3288-fennec.dts                |   6 +-
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi  |   1 -
 arch/arm/boot/dts/rk3288-firefly-reload.dts        |   2 -
 arch/arm/boot/dts/rk3288-firefly.dtsi              |   3 -
 arch/arm/boot/dts/rk3288-miqi.dts                  |   2 -
 arch/arm/boot/dts/rk3288-phycore-rdk.dts           |   1 -
 arch/arm/boot/dts/rk3288-phycore-som.dtsi          |   1 -
 arch/arm/boot/dts/rk3288-popmetal.dts              |   2 -
 arch/arm/boot/dts/rk3288-r89.dts                   |   1 -
 arch/arm/boot/dts/rk3288-rock2-som.dtsi            |   1 -
 arch/arm/boot/dts/rk3288-rock2-square.dts          |   2 -
 arch/arm/boot/dts/rk3288-tinker.dts                |   6 +-
 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi         |   1 -
 arch/arm/boot/dts/rk3288-veyron.dtsi               |   2 -
 arch/arm/boot/dts/rv1108-evb.dts                   |   4 +
 arch/arm/boot/dts/rv1108.dtsi                      |  20 ++--
 arch/arm/mach-rockchip/platsmp.c                   |   2 +-
 arch/arm64/boot/dts/rockchip/rk3328-evb.dts        |  24 ++++
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           |  76 ++++++++++++
 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |   1 -
 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts    |   1 -
 .../boot/dts/rockchip/rk3368-orion-r68-meta.dts    |   2 -
 arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts    |   3 -
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |   2 -
 arch/arm64/boot/dts/rockchip/rk3399-evb.dts        |   2 +-
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts    |   3 +-
 arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts  |  44 +++++++
 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi       | 119 +++++++++++++------
 arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi   |  33 ++++++
 arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi       |  33 ++++++
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           |  41 +++++--
 drivers/soc/rockchip/grf.c                         |  14 +++
 drivers/soc/rockchip/pm_domains.c                  |  32 +++++
 include/dt-bindings/power/rk3366-power.h           |  24 ++++
 47 files changed, 800 insertions(+), 110 deletions(-)
 create mode 100644 arch/arm/boot/dts/rk3229.dtsi
 create mode 100644 include/dt-bindings/power/rk3366-power.h
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
$ git merge rpi/for-rpi-next
Already up-to-date.
Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
$ git merge samsung/for-next
Already up-to-date.
Merging samsung-krzk/for-next (d745ae1ae91c Merge branch 'next/soc' into for-next)
$ git merge samsung-krzk/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/exynos3250-artik5-eval.dts       |  1 -
 arch/arm/boot/dts/exynos3250-artik5.dtsi           |  1 -
 arch/arm/boot/dts/exynos3250-monk.dts              |  1 -
 arch/arm/boot/dts/exynos3250-rinato.dts            | 22 ------
 arch/arm/boot/dts/exynos4.dtsi                     |  3 +
 arch/arm/boot/dts/exynos4210-trats.dts             | 21 ------
 arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi    |  1 -
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |  1 -
 arch/arm/boot/dts/exynos4412-origen.dts            |  1 -
 arch/arm/boot/dts/exynos4412-trats2.dts            | 22 ------
 arch/arm/boot/dts/exynos5250-arndale.dts           |  2 -
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |  2 -
 arch/arm/boot/dts/exynos5250-snow-common.dtsi      |  3 -
 arch/arm/boot/dts/exynos5250-spring.dts            |  2 -
 arch/arm/boot/dts/exynos5260-xyref5260.dts         |  2 -
 arch/arm/boot/dts/exynos5410-smdk5410.dts          |  2 -
 arch/arm/boot/dts/exynos5420-peach-pit.dts         |  3 -
 arch/arm/boot/dts/exynos5800-peach-pi.dts          |  3 -
 arch/arm/configs/exynos_defconfig                  | 79 ++++++++++++++++++++--
 arch/arm/configs/ezx_defconfig                     |  1 -
 arch/arm/configs/ixp4xx_defconfig                  |  4 --
 arch/arm/configs/multi_v7_defconfig                |  7 --
 arch/arm/configs/qcom_defconfig                    |  1 -
 arch/arm/configs/vexpress_defconfig                |  1 -
 arch/arm/mach-s3c24xx/Kconfig                      |  2 +-
 arch/arm/mach-s3c24xx/common.c                     |  2 +-
 arch/arm/mach-s3c24xx/include/mach/regs-clock.h    |  4 +-
 arch/arm/mach-s3c24xx/mach-smdk2443.c              |  8 ---
 arch/arm/mach-s3c24xx/sleep.S                      | 11 +--
 arch/arm/plat-samsung/include/plat/map-s3c.h       |  2 +-
 .../boot/dts/exynos/exynos5433-tm2-common.dtsi     | 19 +-----
 arch/arm64/boot/dts/exynos/exynos5433.dtsi         |  4 +-
 arch/arm64/boot/dts/exynos/exynos7-espresso.dts    |  2 -
 33 files changed, 91 insertions(+), 149 deletions(-)
Merging sunxi/sunxi/for-next (d6aa74d396fe Merge branch 'sunxi/dt64-for-4.14' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/sun6i-a31.dtsi                   |   6 +-
 arch/arm/boot/dts/sun7i-a20-cubietruck.dts         |   4 +
 arch/arm/boot/dts/sun8i-a23-a33.dtsi               |   6 +-
 arch/arm/boot/dts/sun8i-a83t.dtsi                  |   9 ++
 arch/arm64/boot/dts/allwinner/axp803.dtsi          | 150 +++++++++++++++++++++
 .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts |  11 ++
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      |   9 ++
 7 files changed, 189 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm64/boot/dts/allwinner/axp803.dtsi
Merging tegra/for-next (07bb9460b188 Merge branch for-4.13/arm64/dt into for-next)
$ git merge tegra/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm64/for-next/core (425e1ed73e65 arm64: fix endianness annotation for 'struct jit_ctx' and friends)
$ git merge arm64/for-next/core
Already up-to-date.
Merging clk/clk-next (1667393126d7 clk: Convert to using %pOF instead of full_name)
$ git merge clk/clk-next
Recorded preimage for 'MAINTAINERS'
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'MAINTAINERS'.
[master f71f954d98ed] Merge remote-tracking branch 'clk/clk-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/clock/idt,versaclock5.txt  |  30 +-
 .../devicetree/bindings/clock/snps,pll-clock.txt   |  28 ++
 MAINTAINERS                                        |   6 +
 drivers/clk/Kconfig                                |   6 +-
 drivers/clk/axs10x/Makefile                        |   1 +
 drivers/clk/axs10x/pll_clock.c                     | 346 +++++++++++++++++++++
 drivers/clk/berlin/bg2.c                           |   3 +-
 drivers/clk/berlin/bg2q.c                          |   7 +-
 drivers/clk/clk-asm9260.c                          |   4 +-
 drivers/clk/clk-conf.c                             |  16 +-
 drivers/clk/clk-gemini.c                           |  14 +
 drivers/clk/clk-moxart.c                           |  16 +-
 drivers/clk/clk-qoriq.c                            |  26 +-
 drivers/clk/clk-stm32f4.c                          |   4 +-
 drivers/clk/clk-versaclock5.c                      | 172 +++++++++-
 drivers/clk/clk-xgene.c                            |  15 +-
 drivers/clk/clk.c                                  |   4 +-
 drivers/clk/clkdev.c                               |   4 +-
 drivers/clk/mediatek/clk-cpumux.c                  |   6 +-
 drivers/clk/mediatek/clk-mtk.c                     |   2 +-
 drivers/clk/mediatek/reset.c                       |   2 +-
 drivers/clk/mmp/clk.c                              |   2 +-
 drivers/clk/qcom/clk-smd-rpm.c                     |   2 -
 drivers/clk/renesas/clk-mstp.c                     |   2 +-
 drivers/clk/renesas/clk-rcar-gen2.c                |   3 +-
 drivers/clk/sunxi-ng/ccu-sun5i.c                   |   3 +-
 drivers/clk/sunxi-ng/ccu-sun6i-a31.c               |   3 +-
 drivers/clk/sunxi-ng/ccu-sun8i-a23.c               |   3 +-
 drivers/clk/sunxi-ng/ccu-sun8i-a33.c               |   3 +-
 drivers/clk/sunxi-ng/ccu-sun8i-h3.c                |   3 +-
 drivers/clk/sunxi-ng/ccu-sun8i-r.c                 |   3 +-
 drivers/clk/sunxi-ng/ccu-sun8i-v3s.c               |   3 +-
 drivers/clk/sunxi/clk-sunxi.c                      |  17 +-
 drivers/clk/tegra/clk-emc.c                        |  12 +-
 drivers/clk/ti/clockdomain.c                       |   4 +-
 drivers/clk/x86/clk-pmc-atom.c                     |   7 +
 36 files changed, 670 insertions(+), 112 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/snps,pll-clock.txt
 create mode 100644 drivers/clk/axs10x/pll_clock.c
Merging c6x/for-linux-next (eab89e215ae4 c6x: defconfig: Cleanup from old Kconfig options)
$ git merge c6x/for-linux-next
Merge made by the 'recursive' strategy.
 arch/c6x/configs/dsk6455_defconfig  | 2 --
 arch/c6x/configs/evmc6457_defconfig | 2 --
 arch/c6x/configs/evmc6472_defconfig | 2 --
 arch/c6x/configs/evmc6474_defconfig | 2 --
 arch/c6x/configs/evmc6678_defconfig | 2 --
 5 files changed, 10 deletions(-)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
$ git merge cris/for-next
Already up-to-date.
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
$ git merge h8300/h8300-next
Merge made by the 'recursive' strategy.
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (204a2be30a7a m68k: Remove ptrace_signal_deliver)
$ git merge m68k/for-next
Already up-to-date.
Merging m68knommu/for-next (4658c0a43043 m68k: allow NULL clock for clk_get_rate)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/coldfire/clk.c | 3 +++
 1 file changed, 3 insertions(+)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (e36f14f04d11 Merge branch '4.13-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Merge made by the 'recursive' strategy.
 arch/mips/ath79/clock.c                         |  9 ++++-----
 arch/mips/configs/gpr_defconfig                 |  4 ----
 arch/mips/configs/lemote2f_defconfig            |  1 -
 arch/mips/configs/mtx1_defconfig                |  4 ----
 arch/mips/configs/nlm_xlp_defconfig             |  1 -
 arch/mips/configs/nlm_xlr_defconfig             |  4 ----
 arch/mips/include/asm/mach-ralink/ralink_regs.h |  2 ++
 arch/mips/kernel/mips-r2-to-r6-emul.c           |  8 ++++----
 arch/mips/pci/pci-legacy.c                      |  2 +-
 arch/mips/pci/pci-rt3883.c                      | 11 +++++------
 arch/mips/ralink/mt7620.c                       |  1 +
 11 files changed, 17 insertions(+), 30 deletions(-)
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
$ git merge nios2/for-next
Already up-to-date.
Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options)
$ git merge openrisc/for-next
Merge made by the 'recursive' strategy.
Merging parisc-hd/for-next (108ea18722df parisc: regenerate defconfig files)
$ git merge parisc-hd/for-next
Merge made by the 'recursive' strategy.
 arch/parisc/configs/712_defconfig           | 41 ++++++-----------------
 arch/parisc/configs/a500_defconfig          | 50 +++++++----------------------
 arch/parisc/configs/b180_defconfig          | 17 ++--------
 arch/parisc/configs/c3000_defconfig         | 38 ++++------------------
 arch/parisc/configs/c8000_defconfig         | 17 ++--------
 arch/parisc/configs/default_defconfig       | 49 +++++++---------------------
 arch/parisc/configs/generic-32bit_defconfig | 21 +-----------
 arch/parisc/configs/generic-64bit_defconfig | 48 +++++++++------------------
 arch/parisc/kernel/irq.c                    |  8 ++++-
 arch/parisc/kernel/vmlinux.lds.S            |  2 ++
 drivers/parisc/pdc_stable.c                 |  2 +-
 11 files changed, 69 insertions(+), 224 deletions(-)
Merging powerpc/next (1e0fc9d1eb2b powerpc/Kconfig: Enable STRICT_KERNEL_RWX for some configs)
$ git merge powerpc/next
Already up-to-date.
Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
$ git merge fsl/next
Already up-to-date.
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (622b0681cfea s390/spinlock: add niai spinlock hints)
$ git merge s390/features
Auto-merging arch/s390/kernel/setup.c
Merge made by the 'recursive' strategy.
 arch/s390/Kconfig                    |  18 ++++
 arch/s390/Makefile                   |   6 +-
 arch/s390/include/asm/elf.h          |   2 +-
 arch/s390/include/asm/ipl.h          |   2 +-
 arch/s390/include/asm/lowcore.h      |  48 ++++-----
 arch/s390/include/asm/mmu_context.h  |   6 +-
 arch/s390/include/asm/page-states.h  |   1 +
 arch/s390/include/asm/page.h         |  13 ++-
 arch/s390/include/asm/pgalloc.h      |  18 ++--
 arch/s390/include/asm/pgtable.h      | 195 +++++++++++++++++++++--------------
 arch/s390/include/asm/qdio.h         |   2 +-
 arch/s390/include/asm/setup.h        |  11 +-
 arch/s390/include/asm/spinlock.h     |   7 +-
 arch/s390/include/asm/timex.h        |  38 ++++++-
 arch/s390/include/asm/tlb.h          |   6 +-
 arch/s390/include/asm/tlbflush.h     |   7 +-
 arch/s390/kernel/asm-offsets.c       |   1 +
 arch/s390/kernel/debug.c             |   9 +-
 arch/s390/kernel/dumpstack.c         |   2 +-
 arch/s390/kernel/early.c             |  15 ++-
 arch/s390/kernel/head.S              |   3 +-
 arch/s390/kernel/head64.S            |   4 +-
 arch/s390/kernel/irq.c               |   3 +-
 arch/s390/kernel/perf_cpum_sf.c      |   2 +-
 arch/s390/kernel/relocate_kernel.S   |   5 +-
 arch/s390/kernel/setup.c             |  13 ++-
 arch/s390/kernel/suspend.c           |  24 ++++-
 arch/s390/kernel/time.c              |  65 ++++++++----
 arch/s390/kernel/vdso.c              |   2 +
 arch/s390/kernel/vdso32/vdso32.lds.S |   4 +-
 arch/s390/kernel/vdso64/vdso64.lds.S |   4 +-
 arch/s390/kvm/diag.c                 |   8 +-
 arch/s390/kvm/gaccess.c              |  35 +++----
 arch/s390/kvm/priv.c                 |   8 +-
 arch/s390/kvm/vsie.c                 |   2 +-
 arch/s390/lib/delay.c                |   2 +-
 arch/s390/lib/spinlock.c             |  83 ++++++++-------
 arch/s390/mm/fault.c                 |  10 +-
 arch/s390/mm/gmap.c                  | 124 +++++++++++-----------
 arch/s390/mm/init.c                  |   7 +-
 arch/s390/mm/page-states.c           | 192 +++++++++++++++++++++++++++++++---
 arch/s390/mm/pageattr.c              |   5 +-
 arch/s390/mm/pgalloc.c               |  12 ++-
 arch/s390/mm/pgtable.c               | 160 +++++++++++++++++++++-------
 arch/s390/mm/vmem.c                  |  47 +++------
 arch/s390/tools/gen_facilities.c     |   3 +
 drivers/s390/block/dasd_devmap.c     |   2 +-
 drivers/s390/char/raw3270.c          |   2 +-
 drivers/s390/char/sclp_cmd.c         |   1 +
 drivers/s390/char/sclp_early.c       |   6 +-
 drivers/s390/char/sclp_ocf.c         |   2 +-
 drivers/s390/char/tape_core.c        |   2 +-
 drivers/s390/cio/chp.c               |   1 +
 drivers/s390/cio/device.c            |   4 +-
 drivers/s390/crypto/zcrypt_card.c    |   2 +-
 drivers/s390/crypto/zcrypt_queue.c   |   2 +-
 drivers/s390/net/qeth_l3_sys.c       |   8 +-
 57 files changed, 845 insertions(+), 421 deletions(-)
Merging sparc-next/master (cb8c65ccff7f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
$ git merge sparc-next/master
Already up-to-date.
Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
$ git merge sh/for-next
Merge made by the 'recursive' strategy.
 arch/sh/include/asm/futex.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Merging tile/master (7c88f2bf7840 tile: defconfig: Cleanup from old Kconfig options)
$ git merge tile/master
Merge made by the 'recursive' strategy.
 arch/tile/configs/tilegx_defconfig  | 1 -
 arch/tile/configs/tilepro_defconfig | 2 --
 2 files changed, 3 deletions(-)
Merging uml/linux-next (61e8d462457f um: Correctly check for PTRACE_GETRESET/SETREGSET)
$ git merge uml/linux-next
Already up-to-date.
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
$ git merge unicore32/unicore32
Resolved 'arch/unicore32/include/asm/Kbuild' using previous resolution.
Auto-merging arch/unicore32/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d6b940a7c38f] Merge remote-tracking branch 'unicore32/unicore32'
$ git diff -M --stat --summary HEAD^..
 arch/unicore32/Kconfig                          |  14 +
 arch/unicore32/include/asm/Kbuild               |   1 -
 arch/unicore32/include/asm/signal.h             |  21 +
 arch/unicore32/include/asm/syscalls.h           |  25 +
 arch/unicore32/include/uapi/asm/sigcontext.h    |  14 +
 arch/unicore32/include/uapi/asm/stat-oldabi.h   |  71 +++
 arch/unicore32/include/uapi/asm/stat.h          |  19 +
 arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++
 arch/unicore32/include/uapi/asm/unistd.h        |   8 +
 arch/unicore32/kernel/entry.S                   |  17 +
 arch/unicore32/kernel/signal.c                  |  41 ++
 11 files changed, 1000 insertions(+), 1 deletion(-)
 create mode 100644 arch/unicore32/include/asm/signal.h
 create mode 100644 arch/unicore32/include/asm/syscalls.h
 create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h
 create mode 100644 arch/unicore32/include/uapi/asm/stat.h
 create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h
Merging xtensa/xtensa-for-next (51b5e9756efd Merge branch 'xtensa-fixes' into xtensa-for-next)
$ git merge xtensa/xtensa-for-next
Removing arch/xtensa/include/asm/param.h
Removing arch/xtensa/include/asm/device.h
Merge made by the 'recursive' strategy.
 arch/xtensa/include/asm/Kbuild   |  2 ++
 arch/xtensa/include/asm/device.h | 15 ---------------
 arch/xtensa/include/asm/param.h  | 18 ------------------
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 arch/xtensa/include/asm/device.h
 delete mode 100644 arch/xtensa/include/asm/param.h
Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool)
$ git merge fscrypt/master
Already up-to-date.
Merging befs/for-next (5771a8c08880 Linux v4.13-rc1)
$ git merge befs/for-next
Already up-to-date.
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
$ git merge btrfs/next
Already up-to-date.
Merging btrfs-kdave/for-next (7534855b334e Merge branch 'for-next-next-v4.14-20170721' into for-next-20170721)
$ git merge btrfs-kdave/for-next
Resolved 'fs/btrfs/extent_io.c' using previous resolution.
Recorded preimage for 'fs/btrfs/scrub.c'
Auto-merging fs/btrfs/volumes.c
Auto-merging fs/btrfs/super.c
Auto-merging fs/btrfs/scrub.c
CONFLICT (content): Merge conflict in fs/btrfs/scrub.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/extent_io.h
Auto-merging fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Auto-merging fs/btrfs/disk-io.h
Auto-merging fs/btrfs/disk-io.c
Auto-merging fs/btrfs/ctree.h
Auto-merging fs/btrfs/compression.h
Auto-merging fs/btrfs/compression.c
Auto-merging fs/btrfs/check-integrity.c
Auto-merging fs/btrfs/btrfs_inode.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'fs/btrfs/scrub.c'.
[master 5ec2845d8272] Merge remote-tracking branch 'btrfs-kdave/for-next'
$ git diff -M --stat --summary HEAD^..
 fs/btrfs/async-thread.c                |    6 +-
 fs/btrfs/async-thread.h                |    6 +-
 fs/btrfs/backref.c                     | 1074 ++++++++++++++------------------
 fs/btrfs/backref.h                     |   16 +-
 fs/btrfs/btrfs_inode.h                 |   13 +-
 fs/btrfs/check-integrity.c             |    6 +-
 fs/btrfs/compression.c                 |   35 +-
 fs/btrfs/compression.h                 |    2 +
 fs/btrfs/ctree.c                       |   14 +-
 fs/btrfs/ctree.h                       |  136 ++--
 fs/btrfs/dev-replace.c                 |   74 ++-
 fs/btrfs/disk-io.c                     |  225 +++----
 fs/btrfs/disk-io.h                     |   10 +-
 fs/btrfs/extent-tree.c                 |   71 +--
 fs/btrfs/extent_io.c                   |   72 +--
 fs/btrfs/extent_io.h                   |   19 +-
 fs/btrfs/free-space-cache.c            |   13 +-
 fs/btrfs/inode.c                       |   65 +-
 fs/btrfs/ioctl.c                       |   70 +--
 fs/btrfs/print-tree.c                  |   12 +-
 fs/btrfs/print-tree.h                  |    4 +-
 fs/btrfs/props.c                       |   10 +-
 fs/btrfs/qgroup.c                      |    4 +-
 fs/btrfs/relocation.c                  |    2 -
 fs/btrfs/root-tree.c                   |    2 +-
 fs/btrfs/scrub.c                       |    5 +-
 fs/btrfs/struct-funcs.c                |    9 +-
 fs/btrfs/super.c                       |   41 +-
 fs/btrfs/tests/btrfs-tests.c           |    1 -
 fs/btrfs/tests/free-space-tree-tests.c |    2 +-
 fs/btrfs/tree-log.c                    |    3 +-
 fs/btrfs/volumes.c                     |  242 +++----
 fs/btrfs/volumes.h                     |    7 +-
 include/trace/events/btrfs.h           |  313 ++++++----
 34 files changed, 1263 insertions(+), 1321 deletions(-)
Merging ceph/master (7c40b22f6f84 libceph: potential NULL dereference in ceph_msg_data_create())
$ git merge ceph/master
Already up-to-date.
Merging cifs/for-next (235b84fc862a Merge branch 'i2c/for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
$ git merge cifs/for-next
Already up-to-date.
Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero())
$ git merge configfs/for-next
Already up-to-date.
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/main.c
Auto-merging fs/ecryptfs/ecryptfs_kernel.h
Merge made by the 'recursive' strategy.
 fs/ecryptfs/crypto.c          | 15 ---------------
 fs/ecryptfs/ecryptfs_kernel.h |  9 ++++++++-
 fs/ecryptfs/keystore.c        |  2 +-
 fs/ecryptfs/main.c            |  2 +-
 fs/ecryptfs/miscdev.c         |  2 +-
 5 files changed, 11 insertions(+), 19 deletions(-)
Merging ext3/for_next (84969465ddc4 hfsplus: Don't clear SGID when inheriting ACLs)
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (ff95015648df ext4: fix spelling mistake: "prellocated" -> "preallocated")
$ git merge ext4/dev
Already up-to-date.
Merging f2fs/dev (63a86362130f Merge tag 'pm-4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
$ git merge f2fs/dev
Already up-to-date.
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
$ git merge freevxfs/for-next
Already up-to-date.
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
$ git merge fscache/fscache
Already up-to-date.
Merging fuse/for-next (68227c03cba8 fuse: initialize the flock flag in fuse_file on allocation)
$ git merge fuse/for-next
Merge made by the 'recursive' strategy.
 fs/fuse/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging jfs/jfs-next (f070e5ac9bc7 jfs: preserve i_mode if __jfs_set_acl() fails)
$ git merge jfs/jfs-next
Auto-merging fs/jfs/super.c
Merge made by the 'recursive' strategy.
 fs/jfs/acl.c    | 24 ++++++++++++++++--------
 fs/jfs/resize.c |  4 ++--
 fs/jfs/super.c  |  4 ++--
 3 files changed, 20 insertions(+), 12 deletions(-)
Merging nfs/linux-next (6f7da290413b Linux 4.12)
$ git merge nfs/linux-next
Already up-to-date.
Merging nfsd/nfsd-next (b20dae70bfa5 svcrdma: fix an incorrect check on -E2BIG and -EINVAL)
$ git merge nfsd/nfsd-next
Already up-to-date.
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
$ git merge orangefs/for-next
Already up-to-date.
Merging overlayfs/overlayfs-next (0e082555cec9 ovl: check for bad and whiteout index on lookup)
$ git merge overlayfs/overlayfs-next
Already up-to-date.
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (a6664433d383 ubifs: Set double hash cookie also for RENAME_EXCHANGE)
$ git merge ubifs/linux-next
Already up-to-date.
Merging xfs/for-next (cd87d8679201 xfs: don't crash on unexpected holes in dir/attr btrees)
$ git merge xfs/for-next
Already up-to-date.
Merging file-locks/linux-next (18230cda09f6 Documentation: add some docs for errseq_t)
$ git merge file-locks/linux-next
Auto-merging include/linux/fs.h
Auto-merging fs/fuse/file.c
Merge made by the 'recursive' strategy.
 Documentation/errseq.rst                        | 149 ++++++++++++++++++++++++
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c |   2 +-
 fs/9p/vfs_file.c                                |   2 +-
 fs/ceph/locks.c                                 |   2 +-
 fs/cifs/cifssmb.c                               |   2 +-
 fs/dlm/plock.c                                  |   2 +-
 fs/fuse/file.c                                  |   6 +-
 fs/locks.c                                      | 130 ++++++++++++++-------
 fs/sync.c                                       |   4 +-
 include/linux/errseq.h                          |  14 +--
 include/linux/fs.h                              |   5 +-
 lib/errseq.c                                    |   6 +-
 mm/filemap.c                                    |  24 +++-
 13 files changed, 276 insertions(+), 72 deletions(-)
 create mode 100644 Documentation/errseq.rst
Merging vfs/for-next (66bf97967726 annotate RWF_... flags)
$ git merge vfs/for-next
Auto-merging include/uapi/linux/fs.h
Auto-merging include/linux/fs.h
Auto-merging fs/read_write.c
Merge made by the 'recursive' strategy.
 arch/s390/include/asm/compat.h |  5 +++--
 fs/nfsd/vfs.c                  |  2 +-
 fs/read_write.c                | 50 +++++++++++++++++++++---------------------
 include/linux/compat.h         | 18 ++++++++++++---
 include/linux/fs.h             | 12 +++++-----
 include/linux/syscalls.h       | 13 ++++++-----
 include/uapi/linux/aio_abi.h   | 21 +++++++++---------
 include/uapi/linux/fs.h        | 28 ++++++++++++++++-------
 8 files changed, 89 insertions(+), 60 deletions(-)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
$ git merge vfs-jk/vfs
Already up-to-date.
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 (f4e981cba2de printk: add __printf attributes to internal functions)
$ git merge printk/for-next
Already up-to-date.
Merging pci/next (af3c8d98508d Merge tag 'drm-for-v4.13' of git://people.freedesktop.org/~airlied/linux)
$ git merge pci/next
Already up-to-date.
Merging pstore/for-next/pstore (0752e4028c00 powerpc/nvram: use memdup_user)
$ git merge pstore/for-next/pstore
Already up-to-date.
Merging hid/for-next (18c934dfb601 Merge branch 'for-4.13/upstream-fixes' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
 drivers/hid/hid-asus.c        | 144 +++++++++++++++++++++++++++++++-----------
 drivers/hid/hid-core.c        |   1 +
 drivers/hid/hid-ids.h         |   1 +
 drivers/hid/usbhid/hid-core.c |  16 +++--
 drivers/hid/wacom_sys.c       |   5 +-
 5 files changed, 119 insertions(+), 48 deletions(-)
Merging i2c/i2c/for-next (4ca6df134847 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
$ git merge i2c/i2c/for-next
Already up-to-date.
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging dmi/master (8efa050f19fe firmware: dmi_scan: Check DMI structure length)
$ git merge dmi/master
Merge made by the 'recursive' strategy.
Merging hwmon-staging/hwmon-next (2732fc0ffb35 hwmon: (i5k_amb) constify pci_device_id)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
 drivers/hwmon/adc128d818.c |  2 +-
 drivers/hwmon/ads1015.c    | 14 ++++++--------
 drivers/hwmon/adt7475.c    | 16 ++++++++--------
 drivers/hwmon/hwmon.c      |  2 +-
 drivers/hwmon/i5k_amb.c    |  2 +-
 drivers/hwmon/jc42.c       | 19 +++++++++++++++++++
 drivers/hwmon/nct7802.c    | 10 +++++-----
 7 files changed, 41 insertions(+), 24 deletions(-)
Merging jc_docs/docs-next (bc7938deaca7 docs: submitting-patches - change non-ascii character to ascii)
$ git merge jc_docs/docs-next
Auto-merging Makefile
Merge made by the 'recursive' strategy.
 Documentation/Makefile                           |  10 -
 Documentation/arm/firmware.txt                   |   2 +-
 Documentation/dev-tools/gdb-kernel-debugging.rst |   6 +-
 Documentation/dev-tools/kgdb.rst                 |  11 +-
 Documentation/doc-guide/sphinx.rst               | 109 ++++-
 Documentation/driver-api/basics.rst              |   5 +-
 Documentation/driver-api/dma-buf.rst             |   3 -
 Documentation/driver-api/s390-drivers.rst        |   2 +-
 Documentation/driver-api/scsi.rst                |   8 -
 Documentation/gpu/drm-mm.rst                     |   2 +-
 Documentation/process/changes.rst                |  16 +-
 Documentation/process/submitting-patches.rst     |   2 +-
 Documentation/sphinx-static/theme_overrides.css  |  17 +
 Documentation/sphinx/requirements.txt            |   3 +
 Documentation/translations/zh_CN/HOWTO           |   2 -
 Makefile                                         |   2 +-
 scripts/sphinx-pre-install                       | 579 +++++++++++++++++++++++
 17 files changed, 730 insertions(+), 49 deletions(-)
 create mode 100644 Documentation/sphinx/requirements.txt
 create mode 100755 scripts/sphinx-pre-install
Merging v4l-dvb/master (0e50e84a11f4 media: dvb-core/demux.h: fix kernel-doc warning)
$ git merge v4l-dvb/master
Auto-merging include/media/cec-notifier.h
Auto-merging drivers/staging/media/atomisp/i2c/gc2235.h
Auto-merging drivers/media/usb/pulse8-cec/pulse8-cec.c
Auto-merging drivers/media/i2c/ov6650.c
Auto-merging drivers/media/cec/cec-adap.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/media/i2c/adv748x.txt      |   95 +
 .../devicetree/bindings/media/renesas,drif.txt     |    1 +
 .../devicetree/bindings/media/video-interfaces.txt |    8 +-
 Documentation/media/cec-drivers/index.rst          |   32 +
 Documentation/media/cec-drivers/pulse8-cec.rst     |   11 +
 Documentation/media/index.rst                      |    1 +
 Documentation/media/kapi/cec-core.rst              |   40 +
 .../media/uapi/cec/cec-ioc-adap-g-caps.rst         |    7 +
 .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst    |    4 +-
 Documentation/media/uapi/cec/cec-ioc-dqevent.rst   |   20 +
 Documentation/media/uapi/cec/cec-ioc-g-mode.rst    |   19 +-
 Documentation/media/uapi/v4l/dev-subdev.rst        |    2 +-
 MAINTAINERS                                        |   25 +-
 drivers/media/Kconfig                              |    3 +
 drivers/media/cec/Makefile                         |    4 +
 drivers/media/cec/cec-adap.c                       |  223 +-
 drivers/media/cec/cec-api.c                        |   73 +-
 drivers/media/cec/cec-core.c                       |    7 +-
 drivers/media/cec/cec-pin.c                        |  794 ++++
 drivers/media/common/saa7146/saa7146_i2c.c         |    2 +-
 drivers/media/dvb-core/demux.h                     |    2 +-
 drivers/media/dvb-core/dvb-usb-ids.h               |    1 +
 drivers/media/dvb-core/dvb_ca_en50221.c            |  945 ++--
 drivers/media/dvb-core/dvb_ca_en50221.h            |   10 +-
 drivers/media/dvb-frontends/Kconfig                |   18 +
 drivers/media/dvb-frontends/Makefile               |    2 +
 drivers/media/dvb-frontends/cx24123.c              |    2 +-
 drivers/media/dvb-frontends/cxd2841er.c            |   73 +-
 drivers/media/dvb-frontends/dib0090.c              |    2 +-
 drivers/media/dvb-frontends/dib7000p.c             |    2 +-
 drivers/media/dvb-frontends/dib8000.c              |    2 +-
 drivers/media/dvb-frontends/dib9000.c              |    4 +-
 drivers/media/dvb-frontends/drx39xyj/drxj.c        |   35 +-
 drivers/media/dvb-frontends/drxd_hard.c            |    6 +-
 drivers/media/dvb-frontends/mb86a16.c              |   25 +-
 drivers/media/dvb-frontends/s5h1420.c              |    2 +-
 drivers/media/dvb-frontends/stv0367.c              |  154 +-
 drivers/media/dvb-frontends/stv0910.c              | 1771 ++++++++
 drivers/media/dvb-frontends/stv0910.h              |   32 +
 drivers/media/dvb-frontends/stv0910_regs.h         | 4759 ++++++++++++++++++++
 drivers/media/dvb-frontends/stv6111.c              |  674 +++
 drivers/media/dvb-frontends/stv6111.h              |   20 +
 drivers/media/dvb-frontends/zd1301_demod.c         |    2 +-
 drivers/media/i2c/Kconfig                          |   35 +
 drivers/media/i2c/Makefile                         |    3 +
 drivers/media/i2c/adv7180.c                        |    2 +
 drivers/media/i2c/adv748x/Makefile                 |    7 +
 drivers/media/i2c/adv748x/adv748x-afe.c            |  552 +++
 drivers/media/i2c/adv748x/adv748x-core.c           |  832 ++++
 drivers/media/i2c/adv748x/adv748x-csi2.c           |  326 ++
 drivers/media/i2c/adv748x/adv748x-hdmi.c           |  768 ++++
 drivers/media/i2c/adv748x/adv748x.h                |  425 ++
 drivers/media/i2c/m5mols/m5mols_core.c             |    2 +-
 drivers/media/i2c/ov5645.c                         |   49 +-
 drivers/media/i2c/ov5670.c                         | 2588 +++++++++++
 drivers/media/i2c/{soc_camera => }/ov6650.c        |   77 +-
 drivers/media/i2c/saa717x.c                        |    2 +-
 drivers/media/i2c/smiapp/smiapp-core.c             |   14 +-
 drivers/media/i2c/smiapp/smiapp-quirk.c            |    8 +-
 drivers/media/i2c/soc_camera/Kconfig               |    6 -
 drivers/media/i2c/soc_camera/Makefile              |    1 -
 drivers/media/media-device.c                       |    9 +-
 drivers/media/media-entity.c                       |    2 +-
 drivers/media/pci/cx23885/cx23885-417.c            |    2 +-
 drivers/media/pci/cx25821/cx25821-core.c           |    5 +-
 drivers/media/pci/cx25821/cx25821.h                |    2 -
 drivers/media/pci/ddbridge/Kconfig                 |    4 +
 drivers/media/pci/ddbridge/ddbridge-core.c         |  153 +-
 drivers/media/pci/ddbridge/ddbridge.h              |    2 +
 drivers/media/pci/dm1105/dm1105.c                  |    2 +-
 drivers/media/pci/mantis/mantis_i2c.c              |    2 +-
 drivers/media/pci/ngene/ngene-i2c.c                |    2 +-
 drivers/media/pci/pt3/pt3.c                        |   11 +-
 drivers/media/pci/solo6x10/solo6x10-tw28.c         |    3 +-
 drivers/media/platform/Kconfig                     |    7 +-
 drivers/media/platform/atmel/atmel-isc.c           |    2 +-
 drivers/media/platform/blackfin/bfin_capture.c     |    2 +-
 drivers/media/platform/coda/coda-bit.c             |   16 +-
 drivers/media/platform/coda/coda-common.c          |   58 +-
 drivers/media/platform/coda/coda_regs.h            |    1 +
 drivers/media/platform/davinci/ccdc_hw_device.h    |   10 -
 drivers/media/platform/davinci/dm355_ccdc.c        |   92 +-
 drivers/media/platform/davinci/dm644x_ccdc.c       |  151 +-
 drivers/media/platform/davinci/vpbe_display.c      |    2 +-
 drivers/media/platform/davinci/vpfe_capture.c      |   93 -
 drivers/media/platform/davinci/vpif_capture.c      |   12 +-
 drivers/media/platform/davinci/vpif_display.c      |    2 +-
 drivers/media/platform/fsl-viu.c                   |    2 +-
 drivers/media/platform/marvell-ccic/cafe-driver.c  |    2 +-
 drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c    |    2 +-
 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c       |    2 +-
 drivers/media/platform/omap3isp/isp.c              |   24 +-
 drivers/media/platform/omap3isp/ispccp2.c          |    6 +
 drivers/media/platform/omap3isp/ispcsiphy.c        |   41 +-
 drivers/media/platform/omap3isp/ispcsiphy.h        |    1 +
 drivers/media/platform/omap3isp/omap3isp.h         |    3 +
 drivers/media/platform/pxa_camera.c                |    5 +-
 drivers/media/platform/qcom/venus/core.c           |   16 +-
 drivers/media/platform/qcom/venus/core.h           |    1 -
 drivers/media/platform/qcom/venus/firmware.c       |   76 +-
 drivers/media/platform/qcom/venus/firmware.h       |    5 +-
 drivers/media/platform/qcom/venus/hfi_msgs.c       |   11 +-
 drivers/media/platform/rcar_fdp1.c                 |    2 +-
 drivers/media/platform/s3c-camif/camif-core.c      |    2 +-
 drivers/media/platform/soc_camera/soc_camera.c     |    2 +-
 drivers/media/platform/soc_camera/soc_mediabus.c   |    3 +
 drivers/media/platform/sti/delta/delta-v4l2.c      |    4 +-
 drivers/media/platform/stm32/stm32-dcmi.c          |    2 +-
 drivers/media/platform/video-mux.c                 |   53 +-
 drivers/media/tuners/fc0012.c                      |    2 +-
 drivers/media/tuners/fc0013.c                      |    2 +-
 drivers/media/tuners/tuner-simple.c                |    2 +-
 drivers/media/usb/au0828/au0828-video.c            |    2 +-
 drivers/media/usb/cx231xx/cx231xx-417.c            |    2 +-
 drivers/media/usb/dvb-usb-v2/af9035.c              |    2 +
 drivers/media/usb/go7007/go7007-v4l2.c             |    2 +-
 drivers/media/usb/gspca/gspca.c                    |    2 +-
 drivers/media/usb/gspca/xirlink_cit.c              |    2 +-
 drivers/media/usb/pulse8-cec/pulse8-cec.c          |    2 +-
 drivers/media/usb/pvrusb2/pvrusb2-encoder.c        |    6 +-
 drivers/media/usb/rainshadow-cec/rainshadow-cec.c  |    2 +-
 drivers/media/usb/stk1160/stk1160-v4l.c            |    2 +-
 drivers/media/usb/stkwebcam/stk-webcam.c           |    2 +-
 drivers/media/usb/tm6000/tm6000-video.c            |    2 +-
 drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c  |    2 +-
 drivers/media/usb/usbvision/usbvision-i2c.c        |    7 +-
 drivers/media/v4l2-core/v4l2-fwnode.c              |  106 +-
 drivers/media/v4l2-core/videobuf2-dma-contig.c     |    2 +-
 drivers/media/v4l2-core/videobuf2-dma-sg.c         |    2 +-
 drivers/media/v4l2-core/videobuf2-vmalloc.c        |    2 +-
 drivers/staging/fbtft/fb_st7789v.c                 |    2 +-
 drivers/staging/media/atomisp/i2c/gc0310.c         |    2 +-
 drivers/staging/media/atomisp/i2c/gc2235.c         |    4 +-
 drivers/staging/media/atomisp/i2c/gc2235.h         |    6 +-
 drivers/staging/media/atomisp/i2c/lm3554.c         |    2 +-
 drivers/staging/media/atomisp/i2c/mt9m114.c        |    2 +-
 drivers/staging/media/atomisp/i2c/ov2680.c         |    2 +-
 drivers/staging/media/atomisp/i2c/ov2722.c         |    2 +-
 drivers/staging/media/atomisp/i2c/ov5693/ov5693.c  |    8 +-
 drivers/staging/media/atomisp/i2c/ov8858.c         |    2 +-
 .../staging/media/atomisp/include/linux/atomisp.h  |    6 -
 .../media/atomisp/pci/atomisp2/atomisp_cmd.c       |   19 +-
 .../media/atomisp/pci/atomisp2/atomisp_cmd.h       |    1 -
 .../atomisp/pci/atomisp2/atomisp_compat_css20.c    |    4 +-
 .../media/atomisp/pci/atomisp2/atomisp_internal.h  |   11 -
 .../media/atomisp/pci/atomisp2/atomisp_ioctl.c     |    3 -
 .../media/atomisp/pci/atomisp2/atomisp_subdev.c    |    6 +-
 .../media/atomisp/pci/atomisp2/atomisp_v4l2.c      |   33 +-
 .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.c      |   27 +-
 .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c |    8 +-
 .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c   |  139 +-
 drivers/staging/media/bcm2048/radio-bcm2048.c      |    1 -
 include/media/cec-notifier.h                       |   12 +
 include/media/cec-pin.h                            |  183 +
 include/media/cec.h                                |   69 +-
 include/media/davinci/dm644x_ccdc.h                |   12 -
 include/media/davinci/vpfe_capture.h               |   10 -
 include/media/media-entity.h                       |    2 +-
 include/media/v4l2-fwnode.h                        |   25 +-
 include/media/v4l2-mediabus.h                      |   30 +
 include/uapi/linux/cec.h                           |    8 +-
 161 files changed, 15771 insertions(+), 1548 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.txt
 create mode 100644 Documentation/media/cec-drivers/index.rst
 create mode 100644 Documentation/media/cec-drivers/pulse8-cec.rst
 create mode 100644 drivers/media/cec/cec-pin.c
 create mode 100644 drivers/media/dvb-frontends/stv0910.c
 create mode 100644 drivers/media/dvb-frontends/stv0910.h
 create mode 100644 drivers/media/dvb-frontends/stv0910_regs.h
 create mode 100644 drivers/media/dvb-frontends/stv6111.c
 create mode 100644 drivers/media/dvb-frontends/stv6111.h
 create mode 100644 drivers/media/i2c/adv748x/Makefile
 create mode 100644 drivers/media/i2c/adv748x/adv748x-afe.c
 create mode 100644 drivers/media/i2c/adv748x/adv748x-core.c
 create mode 100644 drivers/media/i2c/adv748x/adv748x-csi2.c
 create mode 100644 drivers/media/i2c/adv748x/adv748x-hdmi.c
 create mode 100644 drivers/media/i2c/adv748x/adv748x.h
 create mode 100644 drivers/media/i2c/ov5670.c
 rename drivers/media/i2c/{soc_camera => }/ov6650.c (92%)
 create mode 100644 include/media/cec-pin.h
Merging v4l-dvb-next/master (474dfccf3685 media: svg: avoid too long lines)
$ git merge v4l-dvb-next/master
Already up-to-date.
Merging fbdev/fbdev-for-next (4c99ceda0d06 fbdev: make get_fb_unmapped_area depends of !MMU)
$ git merge fbdev/fbdev-for-next
Already up-to-date.
Merging pm/linux-next (694e73ba4521 Merge branch 'acpica' into linux-next)
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
 drivers/acpi/acpica/acapps.h         |   2 +
 drivers/acpi/acpica/aclocal.h        |   5 +-
 drivers/acpi/acpica/acobject.h       |  12 +-
 drivers/acpi/acpica/actables.h       |   5 +-
 drivers/acpi/acpica/excreate.c       |   5 +
 drivers/acpi/acpica/hwxfsleep.c      |   9 +-
 drivers/acpi/acpica/nsaccess.c       |   6 +
 drivers/acpi/acpica/psobject.c       |  26 ++++
 drivers/acpi/acpica/tbdata.c         | 230 +++++++++++++++++++++++++++++++----
 drivers/acpi/acpica/tbinstal.c       | 161 ++++--------------------
 drivers/acpi/acpica/tbxface.c        |  39 +++++-
 drivers/acpi/acpica/tbxfload.c       |   2 +-
 drivers/acpi/acpica/utresrc.c        |  14 ++-
 drivers/acpi/bus.c                   |   3 -
 drivers/acpi/ec.c                    |  39 ++++++
 drivers/acpi/internal.h              |   4 +
 drivers/acpi/sleep.c                 |   6 +-
 drivers/acpi/tables.c                |   4 +-
 drivers/acpi/video_detect.c          |  14 +++
 drivers/base/power/opp/of.c          |   8 +-
 drivers/cpufreq/cpufreq-dt-platdev.c |   1 +
 drivers/cpufreq/speedstep-ich.c      |   2 +-
 include/acpi/acpixf.h                |  15 +--
 include/acpi/actbl.h                 |   1 +
 include/acpi/actbl2.h                |  16 ++-
 include/acpi/platform/acenv.h        |   9 +-
 include/acpi/platform/aclinux.h      |   3 +
 27 files changed, 433 insertions(+), 208 deletions(-)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
$ git merge idle/next
Merge made by the 'recursive' strategy.
Merging thermal/next (5d72ed35678a Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next)
$ git merge thermal/next
Already up-to-date.
Merging thermal-soc/next (aa647852c32a Merge branch 'work-linus' into work-next)
$ git merge thermal-soc/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
$ git merge ieee1394/for-next
Auto-merging drivers/firewire/net.c
Merge made by the 'recursive' strategy.
 drivers/firewire/net.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Merging dlm/next (e94d6f64e7ba dlm: print log message when cluster name is not set)
$ git merge dlm/next
Merge made by the 'recursive' strategy.
 fs/dlm/debug_fs.c  | 25 ++++++++++++-------------
 fs/dlm/lock.c      |  8 +++-----
 fs/dlm/lockspace.c |  7 ++++++-
 fs/dlm/member.c    | 15 ++++++---------
 fs/dlm/user.c      |  2 ++
 5 files changed, 29 insertions(+), 28 deletions(-)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging net-next/master (7a68ada6ec7d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge net-next/master
Removing net/core/flow.c
Removing include/net/flowcache.h
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/net/renesas,ravb.txt       |  29 +-
 .../devicetree/bindings/net/xilinx_axienet.txt     |  55 ++
 Documentation/networking/ip-sysctl.txt             |   6 +-
 drivers/atm/ambassador.c                           |   2 +-
 drivers/atm/eni.c                                  |   2 +-
 drivers/atm/firestream.c                           |   2 +-
 drivers/atm/fore200e.c                             |   2 +-
 drivers/atm/he.c                                   |   2 +-
 drivers/atm/horizon.c                              |   2 +-
 drivers/atm/idt77252.c                             |   2 +-
 drivers/atm/iphase.c                               |   2 +-
 drivers/atm/lanai.c                                |   2 +-
 drivers/atm/nicstar.c                              |   2 +-
 drivers/atm/solos-pci.c                            |   2 +-
 drivers/atm/zatm.c                                 |   2 +-
 drivers/isdn/hardware/eicon/divacapi.h             |  16 +-
 drivers/isdn/hardware/eicon/message.c              | 247 ++-----
 drivers/net/arcnet/arcdevice.h                     |   2 +-
 drivers/net/arcnet/com20020-pci.c                  |   2 +-
 drivers/net/bonding/bond_sysfs.c                   |   2 +-
 drivers/net/can/at91_can.c                         |   2 +-
 drivers/net/can/janz-ican3.c                       |   2 +-
 drivers/net/dsa/mv88e6xxx/chip.c                   | 287 +++++---
 drivers/net/dsa/mv88e6xxx/chip.h                   | 152 +----
 drivers/net/dsa/mv88e6xxx/global2.c                | 102 ++-
 drivers/net/dsa/mv88e6xxx/global2.h                |  41 +-
 drivers/net/dsa/mv88e6xxx/phy.c                    |  97 ++-
 drivers/net/dsa/mv88e6xxx/phy.h                    |  22 +
 drivers/net/dsa/mv88e6xxx/port.c                   |  17 +
 drivers/net/dsa/mv88e6xxx/port.h                   |   6 +-
 drivers/net/dummy.c                                |   2 +-
 drivers/net/ethernet/amd/xgbe/xgbe.h               |   1 +
 drivers/net/ethernet/cadence/macb_main.c           |   2 +-
 drivers/net/ethernet/cadence/macb_pci.c            |   2 +-
 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c |   4 +
 drivers/net/ethernet/cavium/liquidio/lio_main.c    |   4 +-
 drivers/net/ethernet/cavium/liquidio/lio_vf_main.c |   4 +-
 .../net/ethernet/cavium/liquidio/liquidio_common.h |   1 +
 .../net/ethernet/cavium/liquidio/octeon_device.c   |   8 +-
 drivers/net/ethernet/cavium/liquidio/octeon_droq.c |   6 +-
 drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c    |   8 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |  14 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  57 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         | 224 ++++++-
 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h      |   2 +
 drivers/net/ethernet/dec/tulip/tulip_core.c        |   2 -
 drivers/net/ethernet/ec_bhf.c                      |   2 +-
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c   |   2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |   8 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  63 +-
 drivers/net/ethernet/mediatek/mtk_eth_soc.c        |   5 +-
 .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h   |   6 +
 drivers/net/ethernet/mellanox/mlxsw/reg.h          |  65 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c     |  68 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum.h     |   2 +
 .../mellanox/mlxsw/spectrum_acl_flex_keys.h        |   3 +
 .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c    |   3 +
 drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c |   2 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_flower.c  |  44 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  | 746 ++++++++++++++-------
 drivers/net/ethernet/mellanox/mlxsw/trap.h         |  25 +-
 drivers/net/ethernet/neterion/s2io.c               |  45 --
 .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c   |   2 +-
 drivers/net/ethernet/sfc/mcdi_port.c               | 224 +++++--
 drivers/net/ethernet/sun/ldmvsw.c                  |   2 +-
 drivers/net/ethernet/sun/sunvnet.c                 |   2 +-
 drivers/net/ethernet/sun/sunvnet_common.c          |  90 ++-
 drivers/net/ethernet/synopsys/dwc-xlgmac-net.c     |   1 +
 drivers/net/ethernet/xilinx/xilinx_axienet.h       |   4 +-
 drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |  48 +-
 drivers/net/hyperv/hyperv_net.h                    |  26 +-
 drivers/net/hyperv/netvsc.c                        |  33 +-
 drivers/net/hyperv/netvsc_drv.c                    |  83 +--
 drivers/net/hyperv/rndis_filter.c                  |  62 +-
 drivers/net/ieee802154/ca8210.c                    |   1 +
 drivers/net/ipvlan/ipvlan_main.c                   |   2 +-
 drivers/net/ipvlan/ipvtap.c                        |   2 +-
 drivers/net/macvlan.c                              |   2 +-
 drivers/net/macvtap.c                              |   2 +-
 drivers/net/phy/mdio_bus.c                         |   6 +-
 drivers/net/tap.c                                  |   7 +-
 drivers/net/tun.c                                  |   7 +-
 drivers/net/usb/cdc_ncm.c                          |   2 +-
 drivers/net/virtio_net.c                           |   6 +-
 drivers/net/wireless/cisco/airo.c                  |   2 +-
 drivers/net/wireless/intel/ipw2x00/ipw2100.c       |   2 +-
 drivers/net/wireless/intel/ipw2x00/ipw2200.c       |   2 +-
 drivers/net/wireless/intel/iwlegacy/3945-mac.c     |   2 +-
 drivers/net/wireless/intel/iwlegacy/4965-mac.c     |   2 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c   |   6 -
 include/linux/bpf.h                                |  20 +
 include/linux/bpf_types.h                          |   3 +
 include/linux/filter.h                             |  14 +
 include/linux/netdev_features.h                    |   4 +-
 include/linux/netdevice.h                          |  16 +-
 include/linux/sctp.h                               |  49 +-
 include/linux/skbuff.h                             |  37 +-
 include/linux/virtio_net.h                         |   5 -
 include/net/af_unix.h                              |   1 -
 include/net/dsa.h                                  |   5 -
 include/net/flow.h                                 |  34 -
 include/net/flowcache.h                            |  25 -
 include/net/inetpeer.h                             |  11 +-
 include/net/ip6_route.h                            |   2 +-
 include/net/netns/xfrm.h                           |  11 -
 include/net/sctp/structs.h                         |   6 +-
 include/net/tcp.h                                  |   3 +-
 include/net/xfrm.h                                 |   9 +-
 include/trace/events/xdp.h                         |  31 +-
 include/uapi/linux/bpf.h                           |  10 +-
 kernel/bpf/Makefile                                |   3 +
 kernel/bpf/devmap.c                                | 431 ++++++++++++
 kernel/bpf/verifier.c                              |  12 +
 net/bluetooth/6lowpan.c                            |   6 +-
 net/core/Makefile                                  |   1 -
 net/core/dev.c                                     | 270 ++++----
 net/core/ethtool.c                                 |   7 -
 net/core/filter.c                                  | 178 ++++-
 net/core/flow.c                                    | 516 --------------
 net/core/skbuff.c                                  |  34 +-
 net/dsa/dsa.c                                      |   5 +
 net/ipv4/af_inet.c                                 |  12 +-
 net/ipv4/gre_offload.c                             |  14 +-
 net/ipv4/inetpeer.c                                | 428 +++---------
 net/ipv4/ip_output.c                               |  76 ---
 net/ipv4/ip_vti.c                                  |  31 -
 net/ipv4/tcp_output.c                              |  17 +-
 net/ipv4/tcp_recovery.c                            |   2 +-
 net/ipv4/udp_offload.c                             |  64 +-
 net/ipv4/xfrm4_policy.c                            |  11 +-
 net/ipv6/ip6_output.c                              |  76 ---
 net/ipv6/ip6_vti.c                                 |  31 -
 net/ipv6/udp_offload.c                             | 100 +--
 net/ipv6/xfrm6_policy.c                            |  11 +-
 net/key/af_key.c                                   |   6 -
 net/openvswitch/datapath.c                         |  14 -
 net/openvswitch/flow.c                             |  16 +-
 net/openvswitch/flow.h                             |   2 +
 net/openvswitch/flow_table.c                       |   4 +-
 net/packet/af_packet.c                             |   2 -
 net/rds/connection.c                               |  16 +-
 net/rds/rds.h                                      |   2 +-
 net/rds/tcp.c                                      |   2 +-
 net/rds/tcp_connect.c                              |   4 +-
 net/rds/tcp_send.c                                 |   2 +-
 net/rds/threads.c                                  |   2 +-
 net/sched/act_csum.c                               |   6 -
 net/sctp/auth.c                                    |  13 +-
 net/sctp/endpointola.c                             |   8 +-
 net/sctp/ipv6.c                                    |   2 +-
 net/sctp/protocol.c                                |   2 +-
 net/sctp/sm_make_chunk.c                           |  32 +-
 net/sctp/sm_statefuns.c                            |  11 +-
 net/unix/af_unix.c                                 |  24 +-
 net/xfrm/xfrm_device.c                             |   4 +-
 net/xfrm/xfrm_policy.c                             | 417 +++++-------
 net/xfrm/xfrm_state.c                              |   5 +-
 net/xfrm/xfrm_user.c                               |   3 -
 samples/bpf/Makefile                               |   8 +
 samples/bpf/xdp_redirect_kern.c                    |  81 +++
 samples/bpf/xdp_redirect_map_kern.c                |  83 +++
 samples/bpf/xdp_redirect_map_user.c                | 137 ++++
 samples/bpf/xdp_redirect_user.c                    | 134 ++++
 security/selinux/include/xfrm.h                    |   4 +-
 tools/hv/bondvf.sh                                 |  27 +-
 tools/testing/selftests/bpf/bpf_helpers.h          |   2 +
 tools/testing/selftests/bpf/test_maps.c            |  15 +
 167 files changed, 3761 insertions(+), 3132 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/xilinx_axienet.txt
 delete mode 100644 include/net/flowcache.h
 create mode 100644 kernel/bpf/devmap.c
 delete mode 100644 net/core/flow.c
 create mode 100644 samples/bpf/xdp_redirect_kern.c
 create mode 100644 samples/bpf/xdp_redirect_map_kern.c
 create mode 100644 samples/bpf/xdp_redirect_map_user.c
 create mode 100644 samples/bpf/xdp_redirect_user.c
Merging ipsec-next/master (8bafd73093f2 xfrm: add UDP encapsulation port in migrate message)
$ git merge ipsec-next/master
Already up-to-date.
Merging netfilter-next/master (04ba724b659c netfilter: nfnetlink: extended ACK reporting)
$ git merge netfilter-next/master
Already up-to-date.
Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock)
$ git merge nfc-next/master
Already up-to-date.
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
$ git merge ipvs-next/master
Already up-to-date.
Merging wireless-drivers-next/master (17d9aa66b08d Merge tag 'iwlwifi-next-for-kalle-2017-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
$ git merge wireless-drivers-next/master
Already up-to-date.
Merging bluetooth/master (d98422cb6619 Bluetooth: Style fix - align block comments)
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
 drivers/bluetooth/ath3k.c       |  3 ++-
 drivers/bluetooth/bt3c_cs.c     |  8 +++++---
 drivers/bluetooth/btmrvl_sdio.c |  6 ++++--
 drivers/bluetooth/btqca.c       |  2 +-
 drivers/bluetooth/btsdio.c      |  3 ++-
 drivers/bluetooth/btuart_cs.c   |  8 +++++---
 drivers/bluetooth/btusb.c       | 24 ++++++++++++++++++------
 drivers/bluetooth/btwilink.c    |  8 ++++----
 drivers/bluetooth/hci_bcm.c     | 30 ++++++++++++++++--------------
 drivers/bluetooth/hci_ldisc.c   |  3 ++-
 drivers/bluetooth/hci_ll.c      | 11 +++--------
 drivers/bluetooth/hci_nokia.c   | 10 +---------
 drivers/bluetooth/hci_serdev.c  | 13 +++++++++++++
 drivers/bluetooth/hci_uart.h    |  1 +
 14 files changed, 77 insertions(+), 53 deletions(-)
Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups')
$ git merge mac80211-next/master
Already up-to-date.
Merging rdma/for-next (760765903025 Merge tag 'v4.13-rc1' into k.o/for-4.14)
$ git merge rdma/for-next
Auto-merging include/rdma/rdmavt_qp.h
Auto-merging include/rdma/rdma_vt.h
Auto-merging include/rdma/ib_verbs.h
Auto-merging drivers/infiniband/sw/rdmavt/qp.c
Auto-merging drivers/infiniband/hw/qib/qib_verbs.h
Auto-merging drivers/infiniband/hw/hfi1/qp.c
Auto-merging drivers/infiniband/hw/hfi1/chip.c
Merge made by the 'recursive' strategy.
 drivers/infiniband/hw/hfi1/Makefile             |   2 +-
 drivers/infiniband/hw/hfi1/affinity.c           |  18 +-
 drivers/infiniband/hw/hfi1/affinity.h           |  14 +-
 drivers/infiniband/hw/hfi1/chip.c               | 303 +++++++++++-----------
 drivers/infiniband/hw/hfi1/chip.h               |   4 +-
 drivers/infiniband/hw/hfi1/common.h             |   1 +
 drivers/infiniband/hw/hfi1/driver.c             | 169 +++++++++----
 drivers/infiniband/hw/hfi1/eprom.c              |  11 +-
 drivers/infiniband/hw/hfi1/exp_rcv.c            | 114 +++++++++
 drivers/infiniband/hw/hfi1/exp_rcv.h            | 187 ++++++++++++++
 drivers/infiniband/hw/hfi1/file_ops.c           |  43 ++--
 drivers/infiniband/hw/hfi1/hfi.h                | 103 ++++----
 drivers/infiniband/hw/hfi1/init.c               |  62 ++++-
 drivers/infiniband/hw/hfi1/mad.c                | 323 ++++++++++++++----------
 drivers/infiniband/hw/hfi1/mad.h                |   2 +-
 drivers/infiniband/hw/hfi1/mmu_rb.c             |  14 +-
 drivers/infiniband/hw/hfi1/mmu_rb.h             |   5 +-
 drivers/infiniband/hw/hfi1/pcie.c               |  80 ++----
 drivers/infiniband/hw/hfi1/platform.c           |  30 +--
 drivers/infiniband/hw/hfi1/qp.c                 |   6 -
 drivers/infiniband/hw/hfi1/rc.c                 |  42 ++-
 drivers/infiniband/hw/hfi1/ruc.c                |  91 ++++---
 drivers/infiniband/hw/hfi1/sdma.c               |   6 +-
 drivers/infiniband/hw/hfi1/trace.c              |  58 ++++-
 drivers/infiniband/hw/hfi1/trace_ibhdrs.h       | 322 +++++++++++++++--------
 drivers/infiniband/hw/hfi1/trace_misc.h         |  20 ++
 drivers/infiniband/hw/hfi1/trace_rx.h           |  90 ++++---
 drivers/infiniband/hw/hfi1/uc.c                 |  18 +-
 drivers/infiniband/hw/hfi1/ud.c                 |  64 ++---
 drivers/infiniband/hw/hfi1/user_exp_rcv.c       | 121 ---------
 drivers/infiniband/hw/hfi1/user_exp_rcv.h       |  23 +-
 drivers/infiniband/hw/hfi1/user_sdma.c          | 207 +++++++--------
 drivers/infiniband/hw/hfi1/verbs.c              | 106 ++++----
 drivers/infiniband/hw/hfi1/verbs.h              |  10 +-
 drivers/infiniband/hw/hfi1/vnic_main.c          |  11 +-
 drivers/infiniband/hw/qib/qib.h                 |   8 +-
 drivers/infiniband/hw/qib/qib_iba6120.c         |   6 +-
 drivers/infiniband/hw/qib/qib_iba7220.c         |   7 +-
 drivers/infiniband/hw/qib/qib_iba7322.c         |  48 ++--
 drivers/infiniband/hw/qib/qib_mad.c             |  13 +-
 drivers/infiniband/hw/qib/qib_pcie.c            | 149 +++++------
 drivers/infiniband/hw/qib/qib_ruc.c             |  22 +-
 drivers/infiniband/hw/qib/qib_ud.c              |  43 +---
 drivers/infiniband/hw/qib/qib_verbs.h           |   4 +-
 drivers/infiniband/sw/rdmavt/mr.c               |  51 +++-
 drivers/infiniband/sw/rdmavt/qp.c               |  60 ++---
 drivers/infiniband/sw/rdmavt/trace_mr.h         |  62 +++++
 drivers/infiniband/sw/rdmavt/trace_tx.h         |  11 +-
 drivers/infiniband/sw/rdmavt/vt.c               |   9 +-
 drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c |  27 +-
 include/rdma/ib_hdrs.h                          |  84 ++++++
 include/rdma/ib_verbs.h                         |   5 +-
 include/rdma/rdma_vt.h                          |   4 +-
 include/rdma/rdmavt_qp.h                        |   2 +-
 54 files changed, 1938 insertions(+), 1357 deletions(-)
 create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.c
 create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.h
Merging gfs2/for-next (d56f7d17c0f4 GFS2: Clear gl_object when deleting an inode in gfs2_delete_inode)
$ git merge gfs2/for-next
Auto-merging fs/gfs2/dir.c
Merge made by the 'recursive' strategy.
 fs/gfs2/acl.c     | 27 ++++++++++++++-------------
 fs/gfs2/bmap.c    |  5 +++--
 fs/gfs2/dir.c     |  4 +++-
 fs/gfs2/file.c    |  3 +--
 fs/gfs2/glock.h   | 34 ++++++++++++++++++++++++++++++++++
 fs/gfs2/glops.c   |  2 +-
 fs/gfs2/inode.c   | 12 +++++++-----
 fs/gfs2/meta_io.c |  9 ++++++---
 fs/gfs2/quota.c   |  2 +-
 fs/gfs2/super.c   | 15 ++++++++++++---
 10 files changed, 82 insertions(+), 31 deletions(-)
Merging mtd/master (5771a8c08880 Linux v4.13-rc1)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (e8e3edb95ce6 mtd: create per-device and module-scope debugfs entries)
$ git merge l2-mtd/master
Merge made by the 'recursive' strategy.
 drivers/mtd/devices/docg3.c | 49 ++++++++++++++++-----------------------------
 drivers/mtd/devices/docg3.h |  2 --
 drivers/mtd/mtdcore.c       | 16 +++++++++++++++
 drivers/mtd/mtdswap.c       | 18 ++++-------------
 drivers/mtd/nand/nandsim.c  | 48 +++++++++++---------------------------------
 include/linux/mtd/mtd.h     | 10 +++++++++
 6 files changed, 59 insertions(+), 84 deletions(-)
Merging nand/nand/next (81667e9c8ad8 mtd: nand: mtk: release lock on error path)
$ git merge nand/nand/next
Already up-to-date.
Merging spi-nor/spi-nor/next (f384b352cbf0 mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables)
$ git merge spi-nor/spi-nor/next
Merge made by the 'recursive' strategy.
 drivers/mtd/spi-nor/spi-nor.c | 775 +++++++++++++++++++++++++++++++++++++++++-
 include/linux/mtd/spi-nor.h   |   6 +
 2 files changed, 768 insertions(+), 13 deletions(-)
Merging crypto/master (10a515ddb5f1 hwrng: remember rng chosen by user)
$ git merge crypto/master
Removing drivers/crypto/ccp/ccp-platform.c
Removing drivers/crypto/ccp/ccp-pci.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/crypto/atmel-crypto.txt    |  13 +
 MAINTAINERS                                        |   6 +
 drivers/char/hw_random/core.c                      |  42 +-
 drivers/crypto/Kconfig                             |  28 +-
 drivers/crypto/Makefile                            |   1 +
 drivers/crypto/atmel-ecc.c                         | 781 +++++++++++++++++++++
 drivers/crypto/atmel-ecc.h                         | 128 ++++
 drivers/crypto/bcm/cipher.c                        |   5 +
 drivers/crypto/caam/caamalg.c                      |  66 +-
 drivers/crypto/caam/caamalg_desc.c                 |   5 +-
 drivers/crypto/caam/caamalg_qi.c                   |  55 +-
 drivers/crypto/caam/caamrng.c                      |   6 +-
 drivers/crypto/caam/ctrl.c                         |   1 -
 drivers/crypto/caam/error.c                        |  40 ++
 drivers/crypto/caam/error.h                        |   4 +
 drivers/crypto/caam/intern.h                       |   3 -
 drivers/crypto/caam/qi.c                           |  14 +-
 drivers/crypto/caam/qi.h                           |   3 +
 drivers/crypto/caam/sg_sw_sec4.h                   |  15 -
 drivers/crypto/ccp/Kconfig                         |  21 +-
 drivers/crypto/ccp/Makefile                        |   6 +-
 drivers/crypto/ccp/ccp-debugfs.c                   |  15 +-
 drivers/crypto/ccp/ccp-dev-v3.c                    |  17 +-
 drivers/crypto/ccp/ccp-dev-v5.c                    |  12 +-
 drivers/crypto/ccp/ccp-dev.c                       | 125 ++--
 drivers/crypto/ccp/ccp-dev.h                       |  25 +-
 drivers/crypto/ccp/ccp-ops.c                       |   4 +-
 drivers/crypto/ccp/ccp-pci.c                       | 356 ----------
 drivers/crypto/ccp/ccp-platform.c                  | 293 --------
 drivers/crypto/ccp/sp-dev.c                        | 277 ++++++++
 drivers/crypto/ccp/sp-dev.h                        | 132 ++++
 drivers/crypto/ccp/sp-pci.c                        | 276 ++++++++
 drivers/crypto/ccp/sp-platform.c                   | 256 +++++++
 drivers/crypto/geode-aes.c                         |  17 +-
 drivers/crypto/mediatek/mtk-platform.c             |   2 +-
 drivers/crypto/mxc-scc.c                           |   4 +-
 drivers/crypto/mxs-dcp.c                           |   8 +-
 drivers/crypto/omap-aes.c                          |   1 +
 drivers/crypto/omap-des.c                          |   3 +-
 drivers/crypto/qat/qat_common/adf_aer.c            |   2 +-
 drivers/crypto/sahara.c                            |   2 +-
 drivers/crypto/sunxi-ss/Makefile                   |   1 +
 drivers/crypto/sunxi-ss/sun4i-ss-core.c            |  30 +
 drivers/crypto/sunxi-ss/sun4i-ss-prng.c            |  56 ++
 drivers/crypto/sunxi-ss/sun4i-ss.h                 |  11 +
 drivers/crypto/virtio/virtio_crypto_algs.c         | 109 ++-
 drivers/crypto/virtio/virtio_crypto_common.h       |  22 +-
 drivers/crypto/virtio/virtio_crypto_core.c         |  37 +-
 include/crypto/kpp.h                               |  10 +
 include/linux/ccp.h                                |   8 +-
 50 files changed, 2419 insertions(+), 935 deletions(-)
 create mode 100644 drivers/crypto/atmel-ecc.c
 create mode 100644 drivers/crypto/atmel-ecc.h
 delete mode 100644 drivers/crypto/ccp/ccp-pci.c
 delete mode 100644 drivers/crypto/ccp/ccp-platform.c
 create mode 100644 drivers/crypto/ccp/sp-dev.c
 create mode 100644 drivers/crypto/ccp/sp-dev.h
 create mode 100644 drivers/crypto/ccp/sp-pci.c
 create mode 100644 drivers/crypto/ccp/sp-platform.c
 create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-prng.c
Merging drm/drm-next (a26307ced13c Merge tag 'drm-misc-next-2017-07-18' of git://anongit.freedesktop.org/git/drm-misc into drm-next)
$ git merge drm/drm-next
Recorded preimage for 'MAINTAINERS'
Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution.
Resolved 'drivers/gpu/drm/vc4/vc4_crtc.c' using previous resolution.
Auto-merging include/linux/dma-fence.h
Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_crtc.c
Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c
Auto-merging drivers/dma-buf/sync_debug.c
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'MAINTAINERS'.
[master ffb9363e5e39] Merge remote-tracking branch 'drm/drm-next'
$ git diff -M --stat --summary HEAD^..
 .../bindings/display/bridge/dw_mipi_dsi.txt        |   32 +
 .../devicetree/bindings/display/repaper.txt        |   52 +
 .../bindings/display/rockchip/dw_hdmi-rockchip.txt |    7 +-
 .../devicetree/bindings/display/st,stm32-ltdc.txt  |  105 +-
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 Documentation/gpu/drm-internals.rst                |    2 +
 Documentation/gpu/drm-kms.rst                      |   59 +-
 Documentation/gpu/drm-uapi.rst                     |    2 +
 MAINTAINERS                                        |    6 +
 arch/x86/kernel/early-quirks.c                     |    1 +
 drivers/dma-buf/sw_sync.c                          |  107 +-
 drivers/dma-buf/sync_debug.c                       |   19 +-
 drivers/dma-buf/sync_debug.h                       |   26 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |    1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c            |    1 -
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              |    2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |    2 +-
 drivers/gpu/drm/arc/arcpgu_crtc.c                  |   41 +-
 drivers/gpu/drm/arm/hdlcd_crtc.c                   |   10 +-
 drivers/gpu/drm/arm/hdlcd_drv.c                    |    2 -
 drivers/gpu/drm/arm/malidp_crtc.c                  |   10 +-
 drivers/gpu/drm/arm/malidp_drv.c                   |    2 +-
 drivers/gpu/drm/armada/armada_crtc.c               |    6 +-
 drivers/gpu/drm/armada/armada_overlay.c            |    2 +-
 drivers/gpu/drm/ast/ast_drv.c                      |    5 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c     |   18 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c       |   17 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h       |   16 +
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |   29 +
 drivers/gpu/drm/bochs/bochs_drv.c                  |    5 +-
 drivers/gpu/drm/bochs/bochs_fbdev.c                |    6 +-
 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c       |    6 +-
 drivers/gpu/drm/bridge/analogix-anx78xx.c          |    9 +-
 drivers/gpu/drm/bridge/dumb-vga-dac.c              |    9 +-
 drivers/gpu/drm/bridge/nxp-ptn3460.c               |    6 +-
 drivers/gpu/drm/bridge/panel.c                     |    5 +-
 drivers/gpu/drm/bridge/parade-ps8622.c             |    6 +-
 drivers/gpu/drm/bridge/sii902x.c                   |    8 +-
 drivers/gpu/drm/bridge/synopsys/Kconfig            |    6 +
 drivers/gpu/drm/bridge/synopsys/Makefile           |    2 +
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |    9 +-
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c      |  981 ++++++++++++++++++
 drivers/gpu/drm/bridge/tc358767.c                  |    6 +-
 drivers/gpu/drm/bridge/ti-tfp410.c                 |    6 +-
 drivers/gpu/drm/cirrus/cirrus_drv.c                |    5 +-
 drivers/gpu/drm/drm_atomic.c                       |  121 ++-
 drivers/gpu/drm/drm_atomic_helper.c                |  257 ++++-
 drivers/gpu/drm/drm_color_mgmt.c                   |    3 +
 drivers/gpu/drm/drm_debugfs_crc.c                  |   59 +-
 drivers/gpu/drm/drm_dp_mst_topology.c              |   89 +-
 drivers/gpu/drm/drm_drv.c                          |   16 +
 drivers/gpu/drm/drm_edid.c                         |  440 +++++++-
 drivers/gpu/drm/drm_fb_cma_helper.c                |    4 +-
 drivers/gpu/drm/drm_fb_helper.c                    |  532 ++++++----
 drivers/gpu/drm/drm_file.c                         |    7 +-
 drivers/gpu/drm/drm_framebuffer.c                  |    2 +-
 drivers/gpu/drm/drm_gem.c                          |   10 +-
 drivers/gpu/drm/drm_internal.h                     |   14 +-
 drivers/gpu/drm/drm_ioc32.c                        |    2 +-
 drivers/gpu/drm/drm_ioctl.c                        |   13 +-
 drivers/gpu/drm/drm_modes.c                        |   87 ++
 drivers/gpu/drm/drm_pci.c                          |   40 +-
 drivers/gpu/drm/drm_probe_helper.c                 |    4 +
 drivers/gpu/drm/drm_property.c                     |   23 +
 drivers/gpu/drm/drm_simple_kms_helper.c            |   20 +-
 drivers/gpu/drm/drm_vblank.c                       |  187 ++--
 drivers/gpu/drm/exynos/exynos_drm_crtc.c           |   10 +-
 drivers/gpu/drm/exynos/exynos_hdmi.c               |    2 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c         |    5 +-
 drivers/gpu/drm/gma500/mdfld_intel_display.c       |    4 -
 drivers/gpu/drm/gma500/psb_drv.c                   |    5 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c     |   10 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c    |    3 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c    |   10 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c    |    1 -
 drivers/gpu/drm/i2c/tda998x_drv.c                  |    2 +-
 drivers/gpu/drm/i810/i810_drv.c                    |    5 +-
 drivers/gpu/drm/i915/Kconfig                       |    1 +
 drivers/gpu/drm/i915/gvt/scheduler.c               |    2 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  103 +-
 drivers/gpu/drm/i915/i915_drv.c                    |  138 ++-
 drivers/gpu/drm/i915/i915_drv.h                    |  186 ++--
 drivers/gpu/drm/i915/i915_gem.c                    |  165 ++-
 drivers/gpu/drm/i915/i915_gem_context.c            |  186 ++--
 drivers/gpu/drm/i915/i915_gem_context.h            |   34 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   21 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |   66 +-
 drivers/gpu/drm/i915/i915_gem_gtt.h                |    3 +-
 drivers/gpu/drm/i915/i915_gem_request.c            |    7 +-
 drivers/gpu/drm/i915/i915_gem_request.h            |    2 +
 drivers/gpu/drm/i915/i915_gpu_error.c              |    3 +
 drivers/gpu/drm/i915/i915_irq.c                    |  161 ++-
 drivers/gpu/drm/i915/i915_params.c                 |   18 +-
 drivers/gpu/drm/i915/i915_params.h                 |    7 +-
 drivers/gpu/drm/i915/i915_pci.c                    |    6 +-
 drivers/gpu/drm/i915/i915_perf.c                   |    6 +-
 drivers/gpu/drm/i915/i915_reg.h                    |    6 +-
 drivers/gpu/drm/i915/i915_sysfs.c                  |   10 +-
 drivers/gpu/drm/i915/i915_vma.c                    |    9 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c          |   15 +
 drivers/gpu/drm/i915/intel_bios.c                  |    9 +
 drivers/gpu/drm/i915/intel_color.c                 |    2 +-
 drivers/gpu/drm/i915/intel_ddi.c                   |  116 ++-
 drivers/gpu/drm/i915/intel_device_info.c           |    2 +-
 drivers/gpu/drm/i915/intel_display.c               |   35 +-
 drivers/gpu/drm/i915/intel_dp.c                    |  108 +-
 drivers/gpu/drm/i915/intel_dp_aux_backlight.c      |  185 +++-
 drivers/gpu/drm/i915/intel_dp_mst.c                |   47 +-
 drivers/gpu/drm/i915/intel_drv.h                   |    5 +-
 drivers/gpu/drm/i915/intel_engine_cs.c             |   38 +-
 drivers/gpu/drm/i915/intel_fbdev.c                 |   18 +-
 drivers/gpu/drm/i915/intel_hdmi.c                  |    7 +-
 drivers/gpu/drm/i915/intel_lrc.c                   |    2 +-
 drivers/gpu/drm/i915/intel_pm.c                    |  148 ++-
 drivers/gpu/drm/i915/intel_ringbuffer.c            |    5 +-
 drivers/gpu/drm/i915/intel_ringbuffer.h            |    1 +
 drivers/gpu/drm/i915/intel_runtime_pm.c            |  139 ++-
 drivers/gpu/drm/i915/intel_sdvo.c                  |    5 +-
 drivers/gpu/drm/i915/intel_sprite.c                |    2 +-
 drivers/gpu/drm/i915/intel_uncore.c                |   15 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |   10 +-
 drivers/gpu/drm/i915/selftests/i915_vma.c          |    8 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c   |  159 +++
 drivers/gpu/drm/i915/selftests/mock_context.c      |   11 +-
 drivers/gpu/drm/i915/selftests/mock_context.h      |    2 +
 drivers/gpu/drm/i915/selftests/mock_gem_device.c   |    5 +-
 drivers/gpu/drm/i915/selftests/mock_gtt.c          |    3 +-
 drivers/gpu/drm/imx/imx-drm-core.c                 |    8 +-
 drivers/gpu/drm/imx/ipuv3-crtc.c                   |    5 +-
 drivers/gpu/drm/imx/ipuv3-plane.c                  |    2 +-
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c            |   10 +-
 drivers/gpu/drm/mediatek/mtk_drm_drv.c             |    7 +-
 drivers/gpu/drm/mediatek/mtk_hdmi.c                |    2 +-
 drivers/gpu/drm/meson/meson_crtc.c                 |   10 +-
 drivers/gpu/drm/mga/mga_drv.c                      |    5 +-
 drivers/gpu/drm/mgag200/mgag200_drv.c              |    6 +-
 drivers/gpu/drm/msm/hdmi/hdmi_bridge.c             |    2 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c           |   10 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c           |   10 +-
 drivers/gpu/drm/mxsfb/mxsfb_drv.c                  |    3 +-
 drivers/gpu/drm/nouveau/nouveau_display.c          |    2 -
 drivers/gpu/drm/nouveau/nouveau_drm.c              |   12 +-
 drivers/gpu/drm/nouveau/nv50_display.c             |    5 +-
 drivers/gpu/drm/omapdrm/omap_crtc.c                |   10 +-
 drivers/gpu/drm/omapdrm/omap_encoder.c             |    3 +-
 drivers/gpu/drm/pl111/pl111_drv.c                  |    2 +-
 drivers/gpu/drm/qxl/qxl_display.c                  |   33 +-
 drivers/gpu/drm/qxl/qxl_drv.c                      |    7 +-
 drivers/gpu/drm/qxl/qxl_drv.h                      |    1 +
 drivers/gpu/drm/qxl/qxl_ioctl.c                    |   17 +-
 drivers/gpu/drm/qxl/qxl_object.c                   |    4 +-
 drivers/gpu/drm/qxl/qxl_ttm.c                      |    2 +-
 drivers/gpu/drm/r128/r128_drv.c                    |    5 +-
 drivers/gpu/drm/radeon/radeon_audio.c              |    2 +-
 drivers/gpu/drm/radeon/radeon_dp_mst.c             |    7 -
 drivers/gpu/drm/radeon/radeon_drv.c                |    6 +-
 drivers/gpu/drm/radeon/radeon_irq_kms.c            |    1 -
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c             |   10 +-
 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c        |  110 +-
 drivers/gpu/drm/rockchip/inno_hdmi.c               |    2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c        |    2 -
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c         |    4 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   17 +-
 drivers/gpu/drm/savage/savage_drv.c                |    5 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.c           |    4 +-
 drivers/gpu/drm/sis/sis_drv.c                      |    5 +-
 drivers/gpu/drm/sti/sti_crtc.c                     |   10 +-
 drivers/gpu/drm/sti/sti_drv.c                      |    1 -
 drivers/gpu/drm/sti/sti_dvo.c                      |    2 +-
 drivers/gpu/drm/sti/sti_hdmi.c                     |    2 +-
 drivers/gpu/drm/sti/sti_hqvdp.c                    |    5 +-
 drivers/gpu/drm/stm/Kconfig                        |   10 +-
 drivers/gpu/drm/stm/Makefile                       |    2 +
 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c              |  352 +++++++
 drivers/gpu/drm/stm/ltdc.c                         |  230 +---
 drivers/gpu/drm/stm/ltdc.h                         |    3 +-
 drivers/gpu/drm/sun4i/sun4i_crtc.c                 |   10 +-
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c             |    2 +-
 drivers/gpu/drm/tdfx/tdfx_drv.c                    |    5 +-
 drivers/gpu/drm/tegra/dc.c                         |   10 +-
 drivers/gpu/drm/tegra/drm.c                        |    5 +-
 drivers/gpu/drm/tegra/hdmi.c                       |    2 +-
 drivers/gpu/drm/tegra/sor.c                        |    2 +-
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c               |   16 +-
 drivers/gpu/drm/tinydrm/Kconfig                    |   12 +
 drivers/gpu/drm/tinydrm/Makefile                   |    1 +
 drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c     |   74 +-
 drivers/gpu/drm/tinydrm/repaper.c                  | 1095 ++++++++++++++++++++
 drivers/gpu/drm/udl/udl_dmabuf.c                   |    2 +-
 drivers/gpu/drm/udl/udl_drv.c                      |    6 -
 drivers/gpu/drm/udl/udl_main.c                     |    2 -
 drivers/gpu/drm/vc4/vc4_crtc.c                     |   46 +-
 drivers/gpu/drm/vc4/vc4_dpi.c                      |   13 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |    1 -
 drivers/gpu/drm/vc4/vc4_dsi.c                      |   20 +-
 drivers/gpu/drm/vc4/vc4_hdmi.c                     |    2 +-
 drivers/gpu/drm/vc4/vc4_kms.c                      |   76 +-
 drivers/gpu/drm/vc4/vc4_plane.c                    |   17 +
 drivers/gpu/drm/vgem/vgem_drv.c                    |   82 +-
 drivers/gpu/drm/vgem/vgem_drv.h                    |    4 +
 drivers/gpu/drm/via/via_drv.c                      |    5 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |   10 +-
 drivers/gpu/drm/virtio/virtgpu_ttm.c               |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    5 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |   13 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |    2 -
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |   31 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |   23 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |   37 +-
 drivers/gpu/drm/zte/zx_drm_drv.c                   |    4 +-
 drivers/gpu/drm/zte/zx_hdmi.c                      |    2 +-
 drivers/gpu/drm/zte/zx_vou.c                       |   10 +-
 include/drm/bridge/dw_mipi_dsi.h                   |   39 +
 include/drm/drmP.h                                 |   37 +-
 include/drm/drm_atomic.h                           |  122 ++-
 include/drm/drm_atomic_helper.h                    |   11 +
 include/drm/drm_connector.h                        |   32 +
 include/drm/drm_crtc.h                             |    3 +
 include/drm/drm_dp_mst_helper.h                    |   10 +
 include/drm/drm_drv.h                              |   20 +-
 include/drm/drm_edid.h                             |   11 +-
 include/drm/drm_fb_cma_helper.h                    |    4 +-
 include/drm/drm_fb_helper.h                        |   19 +-
 include/drm/drm_gem.h                              |   15 -
 include/drm/drm_modes.h                            |   11 +
 include/drm/drm_modeset_helper_vtables.h           |  109 +-
 include/drm/drm_pci.h                              |   11 +-
 include/drm/drm_property.h                         |    2 +
 include/drm/drm_vblank.h                           |    3 +-
 include/drm/tinydrm/tinydrm-helpers.h              |    1 +
 include/linux/dma-fence.h                          |   15 +-
 include/uapi/drm/qxl_drm.h                         |    6 +-
 234 files changed, 6829 insertions(+), 2167 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt
 create mode 100644 Documentation/devicetree/bindings/display/repaper.txt
 create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
 create mode 100644 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c
 create mode 100644 drivers/gpu/drm/tinydrm/repaper.c
 create mode 100644 include/drm/bridge/dw_mipi_dsi.h
$ git am -3 ../patches/0001-drm-fixes-for-staging-due-to-API-changes-in-the-drm-.patch
Applying: drm: fixes for staging due to API changes in the drm core
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/staging/vboxvideo/vbox_drv.c
$ git add -A .
$ git commit -v -a --amend
[master 6d08fd3279c4] Merge remote-tracking branch 'drm/drm-next'
 Date: Mon Jul 24 12:10:15 2017 +1000
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 (b1abdc203367 drm/i915: Simplify scaler init during CRTC HW readout)
$ git merge drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/intel_display.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/drm_atomic_helper.c              |   18 +-
 drivers/gpu/drm/i915/i915_debugfs.c              |   76 +-
 drivers/gpu/drm/i915/i915_drv.c                  |   39 +-
 drivers/gpu/drm/i915/i915_drv.h                  |   31 +-
 drivers/gpu/drm/i915/i915_gem.c                  |   55 +-
 drivers/gpu/drm/i915/i915_gem_context.c          |    6 +-
 drivers/gpu/drm/i915/i915_gem_context.h          |    6 +-
 drivers/gpu/drm/i915/i915_gem_request.c          |    7 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c           |    3 +-
 drivers/gpu/drm/i915/i915_gpu_error.c            |    8 +-
 drivers/gpu/drm/i915/i915_irq.c                  |  183 +---
 drivers/gpu/drm/i915/i915_params.c               |   12 +-
 drivers/gpu/drm/i915/i915_params.h               |    5 +-
 drivers/gpu/drm/i915/i915_pci.c                  |    1 +
 drivers/gpu/drm/i915/i915_perf.c                 |   32 +-
 drivers/gpu/drm/i915/intel_display.c             | 1122 +---------------------
 drivers/gpu/drm/i915/intel_dp_aux_backlight.c    |   87 +-
 drivers/gpu/drm/i915/intel_dp_link_training.c    |    8 +-
 drivers/gpu/drm/i915/intel_drv.h                 |   41 +-
 drivers/gpu/drm/i915/intel_engine_cs.c           |    7 +-
 drivers/gpu/drm/i915/intel_fbdev.c               |   22 +-
 drivers/gpu/drm/i915/intel_fifo_underrun.c       |    6 +-
 drivers/gpu/drm/i915/intel_hangcheck.c           |    2 +-
 drivers/gpu/drm/i915/intel_lrc.c                 |   36 +-
 drivers/gpu/drm/i915/intel_sprite.c              |    8 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c |  164 ++++
 drivers/gpu/drm/i915/selftests/mock_context.c    |    8 +
 drivers/gpu/drm/i915/selftests/mock_context.h    |    3 +
 drivers/gpu/drm/i915/selftests/mock_gem_device.c |   27 +-
 29 files changed, 472 insertions(+), 1551 deletions(-)
Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging drm-misc/for-linux-next (5be37168d3bb drm: Improve kerneldoc for drm_modeset_lock)
$ git merge drm-misc/for-linux-next
Auto-merging include/linux/dma-fence.h
Auto-merging drivers/gpu/drm/i915/intel_fbdev.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/drm_atomic_helper.c
Auto-merging drivers/dma-buf/dma-fence.c
Auto-merging Documentation/gpu/drm-mm.rst
Merge made by the 'recursive' strategy.
 Documentation/gpu/drm-mm.rst                      |   2 +-
 drivers/dma-buf/dma-fence.c                       |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c            |   1 -
 drivers/gpu/drm/armada/armada_crtc.c              |   3 +-
 drivers/gpu/drm/armada/armada_drv.c               |   4 +-
 drivers/gpu/drm/armada/armada_fbdev.c             |   1 -
 drivers/gpu/drm/ast/ast_fb.c                      |   1 -
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c      |  13 +-
 drivers/gpu/drm/bochs/bochs_fbdev.c               |   1 -
 drivers/gpu/drm/cirrus/cirrus_fbdev.c             |   1 -
 drivers/gpu/drm/drm_atomic_helper.c               |  39 ++--
 drivers/gpu/drm/drm_fb_helper.c                   | 102 ++++++----
 drivers/gpu/drm/drm_gem_cma_helper.c              |   2 +-
 drivers/gpu/drm/drm_mipi_dsi.c                    |   6 +-
 drivers/gpu/drm/drm_modes.c                       |   4 +-
 drivers/gpu/drm/drm_modeset_lock.c                |  12 +-
 drivers/gpu/drm/drm_of.c                          |   4 +-
 drivers/gpu/drm/drm_syncobj.c                     |   2 -
 drivers/gpu/drm/exynos/exynos_drm_drv.c           |   6 +-
 drivers/gpu/drm/exynos/exynos_drm_dsi.c           |   3 +-
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c         |  26 +--
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c |   1 -
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c   |   3 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c   |  20 +-
 drivers/gpu/drm/i915/intel_display.c              |  10 +-
 drivers/gpu/drm/i915/intel_fbdev.c                |   1 -
 drivers/gpu/drm/mediatek/mtk_disp_color.c         |   4 +-
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c           |   4 +-
 drivers/gpu/drm/mediatek/mtk_disp_rdma.c          |   4 +-
 drivers/gpu/drm/mediatek/mtk_dpi.c                |   6 +-
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c           |   7 +-
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c       |   6 +-
 drivers/gpu/drm/mediatek/mtk_drm_drv.c            |  23 ++-
 drivers/gpu/drm/mediatek/mtk_dsi.c                |   4 +-
 drivers/gpu/drm/mediatek/mtk_hdmi.c               |   8 +-
 drivers/gpu/drm/meson/meson_drv.c                 |   5 +-
 drivers/gpu/drm/mgag200/mgag200_fb.c              |   1 -
 drivers/gpu/drm/msm/msm_atomic.c                  |  16 +-
 drivers/gpu/drm/msm/msm_fbdev.c                   |   1 -
 drivers/gpu/drm/nouveau/nv50_display.c            |  12 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c              |   1 -
 drivers/gpu/drm/panel/panel-lvds.c                |  16 +-
 drivers/gpu/drm/qxl/qxl_fb.c                      |   1 -
 drivers/gpu/drm/radeon/radeon_fb.c                |   1 -
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c         |   4 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c             |  16 +-
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c       |   4 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c       |   4 +-
 drivers/gpu/drm/stm/drv.c                         |  21 +-
 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c             |   2 +-
 drivers/gpu/drm/stm/ltdc.c                        | 225 +++++++++++-----------
 drivers/gpu/drm/sun4i/sun4i_drv.c                 |   9 +-
 drivers/gpu/drm/tegra/drm.c                       |   7 +-
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c              |   4 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.c               |   6 +-
 drivers/gpu/drm/udl/udl_fb.c                      |   1 -
 drivers/gpu/drm/vc4/vc4_kms.c                     |   2 +-
 drivers/gpu/drm/virtio/virtgpu_fb.c               |   1 -
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                |   1 -
 drivers/gpu/ipu-v3/ipu-common.c                   |   4 +-
 include/drm/drm_atomic_helper.h                   |   4 +-
 include/drm/drm_fb_helper.h                       |  23 +++
 include/linux/dma-fence.h                         |   4 +-
 63 files changed, 386 insertions(+), 348 deletions(-)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
$ git merge drm-exynos/exynos-drm/for-next
Already up-to-date.
Merging drm-msm/msm-next (4a630fadbb29 drm/msm: Fix potential buffer overflow issue)
$ git merge drm-msm/msm-next
Already up-to-date.
Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables)
$ git merge hdlcd/for-upstream/hdlcd
Already up-to-date.
Merging mali-dp/for-upstream/mali-dp (e40eda3dda1e drm/arm: mali-dp: Use CMA helper for plane buffer address calculation)
$ git merge mali-dp/for-upstream/mali-dp
Already up-to-date.
Merging sunxi-drm/sunxi-drm/for-next (110d33dd428e drm/sun4i: Add compatible for the A10s pipeline)
$ git merge sunxi-drm/sunxi-drm/for-next
Already up-to-date.
Merging imx-drm/imx-drm/next (790cb4c7c954 drm/imx: lock scanout transfers for consecutive bursts)
$ git merge imx-drm/imx-drm/next
Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/imx/ipuv3-plane.c | 53 +++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 11 deletions(-)
Merging etnaviv/etnaviv/next (8cc47b3ea082 drm/etnaviv: populate GEM objects on cpu_prep)
$ git merge etnaviv/etnaviv/next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/etnaviv/etnaviv_gem.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
Merging kconfig/for-next (6f7da290413b Linux 4.12)
$ git merge kconfig/for-next
Already up-to-date.
Merging regmap/for-next (65745e84ee10 Merge remote-tracking branch 'regmap/topic/namespace' into regmap-next)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
 include/linux/regmap.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
Merging sound/for-next (6c5a266029cc ALSA: hda: constify pci_device_id.)
$ git merge sound/for-next
Merge made by the 'recursive' strategy.
 sound/hda/hdac_i915.c              |  2 +-
 sound/isa/ad1848/ad1848.c          | 18 ++++++++------
 sound/isa/als100.c                 | 13 ++++++-----
 sound/isa/cs423x/cs4231.c          | 18 ++++++++------
 sound/isa/cs423x/cs4236.c          | 20 +++++++++-------
 sound/isa/opti9xx/miro.c           |  7 +++---
 sound/isa/opti9xx/opti92x-ad1848.c | 14 ++++++-----
 sound/pci/mixart/mixart.c          | 10 ++++----
 sound/pci/mixart/mixart.h          |  4 ----
 sound/pci/pcxhr/pcxhr.c            | 19 ++++++++-------
 sound/pci/pcxhr/pcxhr.h            |  3 +--
 sound/pci/rme9652/hdspm.c          | 48 ++++++++++++++++++++++----------------
 12 files changed, 97 insertions(+), 79 deletions(-)
Merging sound-asoc/for-next (f932ac9e4d3d Merge remote-tracking branch 'asoc/topic/zte' into asoc-next)
$ git merge sound-asoc/for-next
Removing include/sound/rt5677.h
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/sound/rt274.txt  |   33 +
 Documentation/devicetree/bindings/sound/rt5663.txt |    5 +
 .../devicetree/bindings/sound/tlv320aic32x4.txt    |   13 +-
 include/sound/rt5663.h                             |   20 +
 include/sound/rt5677.h                             |   45 -
 include/sound/soc.h                                |    6 -
 include/sound/tlv320aic32x4.h                      |   23 +
 sound/soc/au1x/psc-ac97.c                          |    2 +-
 sound/soc/au1x/psc-i2s.c                           |    2 +-
 sound/soc/codecs/Kconfig                           |    7 +
 sound/soc/codecs/Makefile                          |    2 +
 sound/soc/codecs/adau1977.c                        |    6 +-
 sound/soc/codecs/cs35l33.c                         |   12 +-
 sound/soc/codecs/cs35l34.c                         |    3 +-
 sound/soc/codecs/cs42l42.c                         |   11 +-
 sound/soc/codecs/cs53l30.c                         |   15 +-
 sound/soc/codecs/hdac_hdmi.c                       |   41 +-
 sound/soc/codecs/hdmi-codec.c                      |   33 +-
 sound/soc/codecs/inno_rk3036.c                     |    2 +-
 sound/soc/codecs/max9867.c                         |    2 +-
 sound/soc/codecs/max98926.c                        |    2 +-
 sound/soc/codecs/msm8916-wcd-analog.c              |    2 +-
 sound/soc/codecs/msm8916-wcd-digital.c             |    2 +-
 sound/soc/codecs/rt274.c                           | 1228 ++++++++++++++++++++
 sound/soc/codecs/rt274.h                           |  217 ++++
 sound/soc/codecs/rt5514-spi.c                      |  139 +--
 sound/soc/codecs/rt5514-spi.h                      |    7 +-
 sound/soc/codecs/rt5514.c                          |   84 +-
 sound/soc/codecs/rt5514.h                          |   12 +
 sound/soc/codecs/rt5616.c                          |    2 +-
 sound/soc/codecs/rt5663.c                          |  239 +++-
 sound/soc/codecs/rt5663.h                          |    2 +
 sound/soc/codecs/rt5665.c                          |   48 +-
 sound/soc/codecs/rt5665.h                          |   25 +-
 sound/soc/codecs/rt5677.c                          |   81 +-
 sound/soc/codecs/rt5677.h                          |   30 +-
 sound/soc/codecs/sgtl5000.c                        |    4 +-
 sound/soc/codecs/sta32x.c                          |    3 +-
 sound/soc/codecs/tas5720.c                         |    2 +-
 sound/soc/codecs/tlv320aic32x4-i2c.c               |    2 +
 sound/soc/codecs/tlv320aic32x4-spi.c               |    2 +
 sound/soc/codecs/tlv320aic32x4.c                   |  206 ++++
 sound/soc/codecs/tlv320aic32x4.h                   |    3 +
 sound/soc/codecs/twl6040.c                         |    4 +-
 sound/soc/codecs/wm8804.c                          |    3 +-
 sound/soc/dwc/dwc-i2s.c                            |    2 +-
 sound/soc/fsl/fsl_asrc.c                           |    2 +-
 sound/soc/fsl/fsl_esai.c                           |    2 +-
 sound/soc/fsl/fsl_spdif.c                          |    2 +-
 sound/soc/fsl/imx-ssi.c                            |    4 +
 sound/soc/hisilicon/hi6210-i2s.c                   |    2 +-
 sound/soc/img/img-i2s-in.c                         |    2 +-
 sound/soc/img/img-i2s-out.c                        |    2 +-
 sound/soc/img/img-parallel-out.c                   |    2 +-
 sound/soc/img/img-spdif-in.c                       |    2 +-
 sound/soc/img/img-spdif-out.c                      |    2 +-
 sound/soc/intel/atom/sst-mfld-platform-pcm.c       |    6 +-
 sound/soc/intel/boards/bxt_rt298.c                 |   85 +-
 sound/soc/intel/skylake/skl-messages.c             |   10 +-
 sound/soc/intel/skylake/skl-pcm.c                  |    8 +-
 sound/soc/kirkwood/kirkwood-i2s.c                  |    6 +-
 sound/soc/mediatek/mt2701/mt2701-afe-pcm.c         |    2 +-
 sound/soc/pxa/Kconfig                              |    1 +
 sound/soc/pxa/mmp-sspa.c                           |    2 +-
 sound/soc/samsung/i2s.c                            |   20 +-
 sound/soc/samsung/odroid.c                         |    6 +-
 sound/soc/samsung/s3c-i2s-v2.c                     |    2 +-
 sound/soc/sh/fsi.c                                 |    2 +-
 sound/soc/sh/rcar/ctu.c                            |    5 +-
 sound/soc/sh/rcar/dvc.c                            |    5 +-
 sound/soc/sh/rcar/mix.c                            |    5 +-
 sound/soc/sh/rcar/src.c                            |    6 +-
 sound/soc/sh/rcar/ssi.c                            |    6 +-
 sound/soc/sh/rcar/ssiu.c                           |    2 +-
 sound/soc/soc-core.c                               |   25 -
 sound/soc/soc-pcm.c                                |   36 +-
 sound/soc/spear/spdif_in.c                         |    6 +-
 sound/soc/stm/stm32_i2s.c                          |    2 +-
 sound/soc/stm/stm32_sai.c                          |    2 +-
 sound/soc/stm/stm32_spdifrx.c                      |    2 +-
 sound/soc/sunxi/sun4i-codec.c                      |    8 +-
 sound/soc/sunxi/sun4i-i2s.c                        |    2 +-
 sound/soc/sunxi/sun4i-spdif.c                      |    3 +-
 sound/soc/sunxi/sun8i-codec.c                      |    2 +-
 sound/soc/tegra/tegra30_ahub.c                     |    4 +-
 sound/soc/tegra/tegra30_i2s.c                      |    2 +-
 sound/soc/ux500/mop500.c                           |    4 +
 sound/soc/zte/zx-i2s.c                             |    2 +-
 sound/soc/zte/zx-spdif.c                           |    2 +-
 sound/soc/zte/zx-tdm.c                             |    2 +-
 90 files changed, 2498 insertions(+), 441 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/rt274.txt
 create mode 100644 include/sound/rt5663.h
 delete mode 100644 include/sound/rt5677.h
 create mode 100644 sound/soc/codecs/rt274.c
 create mode 100644 sound/soc/codecs/rt274.h
Merging modules/modules-next (5771a8c08880 Linux v4.13-rc1)
$ git merge modules/modules-next
Already up-to-date.
Merging input/next (4323418d62fe Input: sur40 - skip all blobs that are not touches)
$ git merge input/next
Auto-merging drivers/input/mouse/elantech.c
Merge made by the 'recursive' strategy.
 drivers/input/input.c                      |  6 ++--
 drivers/input/keyboard/gpio_keys.c         |  2 +-
 drivers/input/misc/ims-pcu.c               |  4 +--
 drivers/input/misc/yealink.c               |  2 +-
 drivers/input/mouse/elantech.c             |  2 +-
 drivers/input/mouse/psmouse-base.c         |  2 +-
 drivers/input/rmi4/rmi_f01.c               |  2 +-
 drivers/input/rmi4/rmi_f34.c               |  2 +-
 drivers/input/serio/serio.c                |  4 +--
 drivers/input/tablet/aiptek.c              |  2 +-
 drivers/input/touchscreen/ads7846.c        |  4 +--
 drivers/input/touchscreen/elants_i2c.c     |  2 +-
 drivers/input/touchscreen/raydium_i2c_ts.c |  2 +-
 drivers/input/touchscreen/sur40.c          | 46 +++++++++++++++++++-----------
 14 files changed, 48 insertions(+), 34 deletions(-)
Merging block/for-next (3b06b1a7448e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
$ git merge block/for-next
Already up-to-date.
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 (e49c0cd75de9 dm integrity: count and display checksum failures)
$ git merge device-mapper/for-next
Merge made by the 'recursive' strategy.
 drivers/md/dm-bufio.c     | 95 +++++++++++++++++++++++++++++++++--------------
 drivers/md/dm-bufio.h     |  9 +++++
 drivers/md/dm-integrity.c | 32 +++++++++++++---
 3 files changed, 102 insertions(+), 34 deletions(-)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
$ git merge pcmcia/master
Already up-to-date.
Merging mmc/next (f6aa1ee22b18 Merge branch 'fixes' into next)
$ git merge mmc/next
Auto-merging include/linux/platform_data/hsmmc-omap.h
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mmc/renesas,mmcif.txt      |   3 +-
 .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |   1 +
 arch/arm/mach-omap2/hsmmc.c                        | 239 +-----------------
 arch/arm/mach-omap2/hsmmc.h                        |   9 -
 drivers/mmc/core/block.c                           |   2 -
 drivers/mmc/core/mmc_ops.c                         |   2 +-
 drivers/mmc/host/Kconfig                           |  21 +-
 drivers/mmc/host/Makefile                          |   8 +-
 drivers/mmc/host/android-goldfish.c                |   8 +-
 drivers/mmc/host/atmel-mci.c                       |   6 +-
 drivers/mmc/host/mtk-sd.c                          |   1 +
 drivers/mmc/host/mxcmmc.c                          |   9 +-
 drivers/mmc/host/omap_hsmmc.c                      |  19 +-
 drivers/mmc/host/renesas_sdhi.h                    |   2 +
 drivers/mmc/host/renesas_sdhi_core.c               |  24 +-
 drivers/mmc/host/renesas_sdhi_internal_dmac.c      | 271 +++++++++++++++++++++
 drivers/mmc/host/renesas_sdhi_sys_dmac.c           |   8 +-
 drivers/mmc/host/rtsx_usb_sdmmc.c                  |   2 +-
 drivers/mmc/host/sdhci-of-at91.c                   | 177 +++++++++-----
 drivers/mmc/host/sdhci-st.c                        |  26 +-
 drivers/mmc/host/sdhci-xenon.c                     |   2 -
 drivers/mmc/host/sunxi-mmc.c                       |   8 +-
 drivers/mmc/host/tmio_mmc.h                        |   9 +-
 drivers/mmc/host/tmio_mmc_core.c                   |  32 ++-
 include/linux/mfd/tmio.h                           |   2 +
 include/linux/platform_data/hsmmc-omap.h           |  10 -
 26 files changed, 514 insertions(+), 387 deletions(-)
 create mode 100644 drivers/mmc/host/renesas_sdhi_internal_dmac.c
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Auto-merging kernel/debug/kdb/kdb_io.c
Merge made by the 'recursive' strategy.
 kernel/debug/kdb/kdb_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (16d56e2fcc1f md/raid1: fix writebehind bio clone)
$ git merge md/for-next
Merge made by the 'recursive' strategy.
 drivers/md/md.h       | 54 ----------------------------------
 drivers/md/raid1-10.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/md/raid1.c    | 65 ++++++++++++-----------------------------
 drivers/md/raid10.c   | 19 ++++--------
 4 files changed, 106 insertions(+), 113 deletions(-)
 create mode 100644 drivers/md/raid1-10.c
Merging mfd/for-mfd-next (48a14b9f0cc6 mfd: max8998: Fix potential NULL pointer dereference)
$ git merge mfd/for-mfd-next
Auto-merging drivers/mfd/twl4030-irq.c
Auto-merging drivers/mfd/rtsx_pcr.c
Merge made by the 'recursive' strategy.
 drivers/mfd/da9052-core.c | 2 ++
 drivers/mfd/max8925-i2c.c | 2 +-
 drivers/mfd/max8998.c     | 6 ++----
 drivers/mfd/rtsx_pcr.c    | 4 ++--
 drivers/mfd/twl-core.c    | 4 ++--
 drivers/mfd/twl4030-irq.c | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
Merging backlight/for-backlight-next (8c03a937ca99 backlight: pwm_bl: Make of_device_ids const)
$ git merge backlight/for-backlight-next
Merge made by the 'recursive' strategy.
 drivers/video/backlight/lm3630a_bl.c | 5 +++--
 drivers/video/backlight/pwm_bl.c     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
Merging battery/for-next (5771a8c08880 Linux v4.13-rc1)
$ git merge battery/for-next
Already up-to-date.
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (01be70f6b487 Merge remote-tracking branch 'regulator/topic/qcom' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/regulator/pwm-regulator.txt |  2 +-
 drivers/regulator/axp20x-regulator.c                |  6 ++++++
 drivers/regulator/core.c                            | 16 ++++++++++++----
 drivers/regulator/cpcap-regulator.c                 | 21 ++++++++++++++++++---
 drivers/regulator/fan53555.c                        | 10 ++--------
 drivers/regulator/max1586.c                         |  2 +-
 drivers/regulator/of_regulator.c                    |  2 +-
 drivers/regulator/qcom_rpm-regulator.c              |  5 +++++
 drivers/regulator/qcom_smd-regulator.c              |  5 +++++
 drivers/regulator/s5m8767.c                         |  4 ++--
 drivers/reset/reset-socfpga.c                       |  4 ++--
 11 files changed, 55 insertions(+), 22 deletions(-)
Merging security/next (3cf299314532 LSM: Remove security_task_create() hook.)
$ git merge security/next
Auto-merging kernel/fork.c
Auto-merging include/linux/lsm_hooks.h
Merge made by the 'recursive' strategy.
 include/linux/lsm_hooks.h | 7 -------
 include/linux/security.h  | 6 ------
 kernel/fork.c             | 4 ----
 security/security.c       | 5 -----
 4 files changed, 22 deletions(-)
Merging integrity/next (fc26bd50539b IMA: update IMA policy documentation to include pcr= option)
$ git merge integrity/next
Already up-to-date.
Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions)
$ git merge keys/keys-next
Merge made by the 'recursive' strategy.
Merging selinux/next (12f6dc2696a5 selinux: Assign proper class to PF_UNIX/SOCK_RAW sockets)
$ git merge selinux/next
Auto-merging security/selinux/hooks.c
Merge made by the 'recursive' strategy.
 security/selinux/hooks.c | 1 +
 1 file changed, 1 insertion(+)
Merging tpmdd/next (e7d872bf1bc5 Documentation: tpm: add powered-while-suspended binding documentation)
$ git merge tpmdd/next
Auto-merging drivers/char/tpm/tpm_crb.c
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 ++++++
 drivers/char/tpm/tpm_crb.c                                 | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
Merging watchdog/master (c013b65ad8a1 watchdog: introduce watchdog_worker_should_ping helper)
$ git merge watchdog/master
Already up-to-date.
Merging iommu/next (6a7086431fa1 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next)
$ git merge iommu/next
Already up-to-date.
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging vfio/next (7f56c30bd0a2 vfio: Remove unnecessary uses of vfio_container.group_lock)
$ git merge vfio/next
Already up-to-date.
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
$ git merge trivial/for-next
Already up-to-date.
Merging audit/next (15318a9f8015 audit: Reduce overhead using a coarse clock)
$ git merge audit/next
Auto-merging kernel/auditsc.c
Auto-merging kernel/audit.c
Merge made by the 'recursive' strategy.
 kernel/audit.c   | 2 +-
 kernel/auditsc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Merging devicetree/for-next (b041303c3e88 Merge branch 'dt/linus' into for-next)
$ git merge devicetree/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/clock/silabs,si5351.txt    |   6 +-
 .../devicetree/bindings/clock/ti,sci-clk.txt       |   7 +-
 .../devicetree/bindings/input/ti,drv260x.txt       |   2 +-
 .../devicetree/bindings/nvmem/mtk-efuse.txt        |   5 +-
 .../devicetree/bindings/trivial-devices.txt        |  10 ++
 drivers/of/address.c                               |  24 ++--
 drivers/of/base.c                                  |  22 ++--
 drivers/of/device.c                                |   2 +-
 drivers/of/dynamic.c                               |  33 +++--
 drivers/of/irq.c                                   |  47 +++----
 drivers/of/of_mdio.c                               |   4 +-
 drivers/of/of_pci.c                                |  29 ++---
 drivers/of/overlay.c                               | 142 ++++++++++++++++++---
 drivers/of/platform.c                              |  32 ++---
 drivers/of/property.c                              |  19 ++-
 drivers/of/unittest-data/Makefile                  |  19 ++-
 drivers/of/unittest-data/overlay.dts               |  25 +++-
 drivers/of/unittest-data/overlay_bad_symbol.dts    |  22 ++++
 drivers/of/unittest-data/overlay_base.dts          |  11 ++
 drivers/of/unittest.c                              |  77 ++++++-----
 scripts/dtc/dtx_diff                               |   2 +-
 21 files changed, 363 insertions(+), 177 deletions(-)
 create mode 100644 drivers/of/unittest-data/overlay_bad_symbol.dts
Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver)
$ git merge mailbox/mailbox-for-next
Already up-to-date.
Merging spi/for-next (10b26bee84ce Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/sh-msiof', 'spi/topic/stm32', 'spi/topic/sunxi' and 'spi/topic/tegra' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/spi/fsl-imx-cspi.txt       |  1 +
 Documentation/devicetree/bindings/spi/sh-msiof.txt |  1 +
 drivers/spi/spi-ath79.c                            | 13 +++--
 drivers/spi/spi-bcm63xx-hsspi.c                    |  6 +--
 drivers/spi/spi-imx.c                              | 47 ++++++++++++++---
 drivers/spi/spi-loopback-test.c                    | 28 +++++++---
 drivers/spi/spi-orion.c                            |  4 +-
 drivers/spi/spi-pxa2xx.c                           | 59 ++++++++--------------
 drivers/spi/spi-sh-msiof.c                         | 32 ++++++++----
 drivers/spi/spi-stm32.c                            |  2 +-
 drivers/spi/spi-sun6i.c                            |  2 +-
 drivers/spi/spi-tegra114.c                         |  2 +-
 drivers/spi/spi-tegra20-sflash.c                   |  2 +-
 drivers/spi/spi-tegra20-slink.c                    |  2 +-
 drivers/spi/spi.c                                  | 27 ++++------
 15 files changed, 134 insertions(+), 94 deletions(-)
Merging tip/auto-latest (6602ec8ef224 Merge branch 'x86/syscall')
$ git merge tip/auto-latest
Auto-merging tools/perf/tests/attr/test-record-no-buffering
Auto-merging include/linux/syscalls.h
Auto-merging include/linux/dma-mapping.h
Auto-merging drivers/gpu/drm/udl/udl_fb.c
Auto-merging drivers/gpu/drm/drm_gem.c
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt    |   13 +
 Documentation/x86/amd-memory-encryption.txt        |   68 ++
 Documentation/x86/x86_64/5level-paging.txt         |   64 ++
 arch/arm/include/asm/thread_info.h                 |   15 +-
 arch/arm/include/asm/uaccess.h                     |    2 +
 arch/arm/kernel/entry-common.S                     |    9 +-
 arch/arm/kernel/signal.c                           |    5 +
 arch/arm64/include/asm/thread_info.h               |    4 +-
 arch/arm64/include/asm/uaccess.h                   |    3 +
 arch/arm64/kernel/signal.c                         |    5 +
 arch/ia64/include/asm/acpi.h                       |    2 -
 arch/ia64/kernel/efi.c                             |    4 +-
 arch/x86/Kconfig                                   |   48 +
 arch/x86/Kconfig.debug                             |    2 -
 arch/x86/boot/compressed/kaslr.c                   |   63 +-
 arch/x86/boot/compressed/pagetable.c               |    7 +
 arch/x86/entry/Makefile                            |    1 -
 arch/x86/entry/calling.h                           |    5 +
 arch/x86/entry/common.c                            |    3 +
 arch/x86/entry/entry_64.S                          |  170 +++-
 arch/x86/events/intel/lbr.c                        |   52 +-
 arch/x86/include/asm/acpi.h                        |    2 -
 arch/x86/include/asm/cmdline.h                     |    2 +
 arch/x86/include/asm/cpufeatures.h                 |    1 +
 arch/x86/include/asm/disabled-features.h           |    4 +-
 arch/x86/include/asm/dma-mapping.h                 |    5 +-
 arch/x86/include/asm/dmi.h                         |    8 +-
 arch/x86/include/asm/e820/api.h                    |    2 +
 arch/x86/include/asm/elf.h                         |    4 +-
 arch/x86/include/asm/fixmap.h                      |   20 +
 arch/x86/include/asm/init.h                        |    1 +
 arch/x86/include/asm/io.h                          |    8 +
 arch/x86/include/asm/kexec.h                       |    8 +
 arch/x86/include/asm/kvm_host.h                    |    2 +-
 arch/x86/include/asm/mem_encrypt.h                 |   80 ++
 arch/x86/include/asm/mmu.h                         |   25 +-
 arch/x86/include/asm/mmu_context.h                 |   12 +-
 arch/x86/include/asm/mpx.h                         |    9 +
 arch/x86/include/asm/msr-index.h                   |    2 +
 arch/x86/include/asm/orc_types.h                   |  107 +++
 arch/x86/include/asm/page_types.h                  |    3 +-
 arch/x86/include/asm/pgtable.h                     |   28 +-
 arch/x86/include/asm/pgtable_types.h               |   57 +-
 arch/x86/include/asm/processor-flags.h             |    5 +-
 arch/x86/include/asm/processor.h                   |   23 +-
 arch/x86/include/asm/realmode.h                    |   12 +
 arch/x86/include/asm/set_memory.h                  |    3 +
 arch/x86/include/asm/thread_info.h                 |    5 +-
 arch/x86/include/asm/tlbflush.h                    |   73 +-
 arch/x86/include/asm/uaccess.h                     |    7 +-
 arch/x86/include/asm/unwind_hints.h                |  103 ++
 arch/x86/include/asm/vga.h                         |   14 +-
 arch/x86/kernel/acpi/boot.c                        |    6 +-
 arch/x86/kernel/cpu/amd.c                          |   29 +-
 arch/x86/kernel/cpu/bugs.c                         |    8 +
 arch/x86/kernel/cpu/common.c                       |   40 +
 arch/x86/kernel/cpu/scattered.c                    |    1 +
 arch/x86/kernel/dumpstack.c                        |   12 +-
 arch/x86/kernel/dumpstack_32.c                     |    4 +-
 arch/x86/kernel/dumpstack_64.c                     |    4 +-
 arch/x86/kernel/e820.c                             |   26 +-
 arch/x86/kernel/espfix_64.c                        |    2 +-
 arch/x86/kernel/head64.c                           |   93 +-
 arch/x86/kernel/head_64.S                          |   40 +-
 arch/x86/kernel/kdebugfs.c                         |   34 +-
 arch/x86/kernel/ksysfs.c                           |   28 +-
 arch/x86/kernel/machine_kexec_64.c                 |   22 +-
 arch/x86/kernel/mpparse.c                          |  108 ++-
 arch/x86/kernel/pci-dma.c                          |   11 +-
 arch/x86/kernel/pci-nommu.c                        |    2 +-
 arch/x86/kernel/pci-swiotlb.c                      |   15 +-
 arch/x86/kernel/process.c                          |   17 +-
 arch/x86/kernel/process_64.c                       |    3 +
 arch/x86/kernel/setup.c                            |    9 +
 arch/x86/kernel/sys_x86_64.c                       |   30 +-
 arch/x86/kvm/mmu.c                                 |   11 +-
 arch/x86/kvm/mmu.h                                 |    2 +-
 arch/x86/kvm/svm.c                                 |   35 +-
 arch/x86/kvm/vmx.c                                 |    2 +-
 arch/x86/kvm/x86.c                                 |    3 +-
 arch/x86/lib/cmdline.c                             |  105 ++
 arch/x86/mm/Makefile                               |    2 +
 arch/x86/mm/dump_pagetables.c                      |   29 +-
 arch/x86/mm/hugetlbpage.c                          |   27 +-
 arch/x86/mm/ident_map.c                            |   12 +-
 arch/x86/mm/init.c                                 |    1 -
 arch/x86/mm/ioremap.c                              |  287 +++++-
 arch/x86/mm/kasan_init_64.c                        |    6 +-
 arch/x86/mm/mem_encrypt.c                          |  593 ++++++++++++
 arch/x86/mm/mem_encrypt_boot.S                     |  149 +++
 arch/x86/mm/mmap.c                                 |   12 +-
 arch/x86/mm/mpx.c                                  |   33 +-
 arch/x86/mm/numa_emulation.c                       |   55 +-
 arch/x86/mm/pageattr.c                             |   67 ++
 arch/x86/mm/pat.c                                  |    9 +-
 arch/x86/mm/tlb.c                                  |  281 ++++--
 arch/x86/pci/common.c                              |    4 +-
 arch/x86/platform/efi/efi.c                        |    6 +-
 arch/x86/platform/efi/efi_64.c                     |   15 +-
 arch/x86/realmode/init.c                           |   12 +
 arch/x86/realmode/rm/trampoline_64.S               |   24 +
 arch/x86/xen/Kconfig                               |    5 +
 arch/x86/xen/enlighten_pv.c                        |    7 +
 arch/x86/xen/mmu_pv.c                              |    5 +-
 arch/x86/xen/xen-head.S                            |    2 +-
 drivers/acpi/processor_idle.c                      |    2 -
 drivers/firmware/dmi-sysfs.c                       |    5 +-
 drivers/firmware/efi/efi.c                         |   33 +
 drivers/firmware/pcdp.c                            |    4 +-
 drivers/gpu/drm/drm_gem.c                          |    2 +
 drivers/gpu/drm/drm_vm.c                           |    4 +
 drivers/gpu/drm/ttm/ttm_bo_vm.c                    |    7 +-
 drivers/gpu/drm/udl/udl_fb.c                       |    4 +
 drivers/idle/intel_idle.c                          |    9 +-
 drivers/iommu/amd_iommu.c                          |   30 +-
 drivers/iommu/amd_iommu_init.c                     |   34 +-
 drivers/iommu/amd_iommu_proto.h                    |   10 +
 drivers/iommu/amd_iommu_types.h                    |    2 +-
 drivers/sfi/sfi_core.c                             |   23 +-
 drivers/video/fbdev/core/fbmem.c                   |   12 +
 include/asm-generic/early_ioremap.h                |    2 +
 include/asm-generic/pgtable.h                      |   12 +
 include/linux/compiler-gcc.h                       |    2 +
 include/linux/compiler.h                           |    4 +
 include/linux/dma-mapping.h                        |   13 +
 include/linux/efi.h                                |    9 +-
 include/linux/io.h                                 |    2 +
 include/linux/kexec.h                              |    8 +
 include/linux/mem_encrypt.h                        |   48 +
 include/linux/swiotlb.h                            |    1 +
 include/linux/syscalls.h                           |   16 +
 include/uapi/linux/perf_event.h                    |   27 +-
 init/main.c                                        |   10 +
 kernel/cpu.c                                       |   12 +-
 kernel/kexec_core.c                                |   12 +-
 kernel/memremap.c                                  |   20 +-
 lib/swiotlb.c                                      |   57 +-
 mm/early_ioremap.c                                 |   28 +-
 tools/arch/x86/include/asm/unistd_32.h             |    3 +
 tools/arch/x86/include/asm/unistd_64.h             |    3 +
 tools/arch/x86/include/uapi/asm/unistd.h           |   17 +
 tools/build/Makefile.feature                       |    3 +-
 tools/build/feature/Makefile                       |    6 +-
 tools/build/feature/test-all.c                     |    5 +
 tools/build/feature/test-setns.c                   |    7 +
 tools/include/uapi/asm-generic/fcntl.h             |  220 +++++
 tools/include/uapi/linux/fcntl.h                   |   21 +
 tools/include/uapi/linux/perf_event.h              |   27 +-
 tools/objtool/Build                                |    3 +
 tools/objtool/Documentation/stack-validation.txt   |   56 +-
 tools/objtool/Makefile                             |    3 +
 tools/objtool/builtin-check.c                      |    2 +-
 tools/objtool/builtin-orc.c                        |   70 ++
 tools/objtool/builtin.h                            |    1 +
 tools/objtool/check.c                              |  249 ++++-
 tools/objtool/check.h                              |   19 +-
 tools/objtool/elf.c                                |  212 +++-
 tools/objtool/elf.h                                |   15 +-
 tools/objtool/objtool.c                            |    3 +-
 tools/objtool/orc.h                                |   30 +
 tools/objtool/orc_dump.c                           |  212 ++++
 tools/objtool/orc_gen.c                            |  214 +++++
 tools/objtool/orc_types.h                          |  107 +++
 tools/perf/Build                                   |    2 +-
 tools/perf/Documentation/perf-buildid-cache.txt    |    5 +
 tools/perf/Documentation/perf-probe.txt            |   14 +
 tools/perf/Documentation/perf-record.txt           |    1 +
 tools/perf/Documentation/perf.data-file-format.txt |   10 +-
 tools/perf/Makefile.config                         |    5 +
 tools/perf/arch/powerpc/util/sym-handling.c        |    2 +-
 tools/perf/arch/x86/annotate/instructions.c        |   46 +
 tools/perf/builtin-annotate.c                      |    1 +
 tools/perf/builtin-buildid-cache.c                 |   54 +-
 tools/perf/builtin-inject.c                        |    1 +
 tools/perf/builtin-probe.c                         |   45 +-
 tools/perf/builtin-record.c                        |    9 +-
 tools/perf/builtin-report.c                        |   30 +
 tools/perf/builtin-script.c                        |    4 +
 tools/perf/builtin-top.c                           |    2 +-
 tools/perf/builtin-trace.c                         |  602 ++++++------
 tools/perf/check-headers.sh                        |    1 +
 tools/perf/perf.h                                  |    1 +
 tools/perf/pmu-events/arch/powerpc/mapfile.csv     |    4 +
 .../perf/pmu-events/arch/powerpc/power9/cache.json |  176 ++++
 .../arch/powerpc/power9/floating-point.json        |   44 +
 .../pmu-events/arch/powerpc/power9/frontend.json   |  446 +++++++++
 .../pmu-events/arch/powerpc/power9/marked.json     |  782 +++++++++++++++
 .../pmu-events/arch/powerpc/power9/memory.json     |  158 +++
 .../perf/pmu-events/arch/powerpc/power9/other.json |  836 ++++++++++++++++
 .../pmu-events/arch/powerpc/power9/pipeline.json   |  680 +++++++++++++
 tools/perf/pmu-events/arch/powerpc/power9/pmc.json |  146 +++
 .../arch/powerpc/power9/translation.json           |  272 ++++++
 tools/perf/tests/attr.c                            |   12 +-
 tools/perf/tests/attr.py                           |   50 +-
 tools/perf/tests/attr/base-record                  |    6 +-
 tools/perf/tests/attr/base-stat                    |    4 +-
 tools/perf/tests/attr/test-record-C0               |    1 +
 tools/perf/tests/attr/test-record-basic            |    1 +
 tools/perf/tests/attr/test-record-branch-any       |    2 +-
 .../perf/tests/attr/test-record-branch-filter-any  |    2 +-
 .../tests/attr/test-record-branch-filter-any_call  |    2 +-
 .../tests/attr/test-record-branch-filter-any_ret   |    2 +-
 tools/perf/tests/attr/test-record-branch-filter-hv |    2 +-
 .../tests/attr/test-record-branch-filter-ind_call  |    2 +-
 tools/perf/tests/attr/test-record-branch-filter-k  |    2 +-
 tools/perf/tests/attr/test-record-branch-filter-u  |    2 +-
 tools/perf/tests/attr/test-record-count            |    1 +
 tools/perf/tests/attr/test-record-data             |    3 +-
 tools/perf/tests/attr/test-record-freq             |    1 +
 tools/perf/tests/attr/test-record-graph-default    |    1 +
 tools/perf/tests/attr/test-record-graph-dwarf      |    4 +-
 tools/perf/tests/attr/test-record-graph-fp         |    1 +
 tools/perf/tests/attr/test-record-group            |    1 +
 tools/perf/tests/attr/test-record-group-sampling   |    1 +
 tools/perf/tests/attr/test-record-group1           |    1 +
 ...st-record-no-delay => test-record-no-buffering} |    4 +-
 tools/perf/tests/attr/test-record-no-inherit       |    1 +
 tools/perf/tests/attr/test-record-no-samples       |    1 +
 tools/perf/tests/attr/test-record-period           |    1 +
 tools/perf/tests/attr/test-record-raw              |    2 +-
 tools/perf/tests/attr/test-stat-C0                 |    4 +-
 tools/perf/tests/attr/test-stat-default            |    2 +
 tools/perf/tests/attr/test-stat-detailed-1         |    2 +
 tools/perf/tests/attr/test-stat-detailed-2         |    3 +
 tools/perf/tests/attr/test-stat-detailed-3         |    5 +
 tools/perf/tests/sdt.c                             |    8 +-
 tools/perf/trace/beauty/Build                      |    1 +
 tools/perf/trace/beauty/beauty.h                   |   65 ++
 tools/perf/trace/beauty/fcntl.c                    |  100 ++
 tools/perf/trace/beauty/open_flags.c               |   29 +-
 tools/perf/trace/beauty/pid.c                      |    4 +-
 tools/perf/ui/browser.c                            |   29 +
 tools/perf/ui/browser.h                            |    2 +
 tools/perf/ui/browsers/annotate.c                  |   30 +-
 tools/perf/ui/browsers/hists.c                     |    3 -
 tools/perf/ui/gtk/annotate.c                       |    2 +-
 tools/perf/ui/stdio/hist.c                         |    3 -
 tools/perf/util/Build                              |    5 +
 tools/perf/util/annotate.c                         |   29 +-
 tools/perf/util/annotate.h                         |    4 +-
 tools/perf/util/branch.c                           |  147 +++
 tools/perf/util/branch.h                           |   24 +
 tools/perf/util/build-id.c                         |  129 ++-
 tools/perf/util/build-id.h                         |   16 +-
 tools/perf/util/callchain.c                        |  134 +--
 tools/perf/util/callchain.h                        |    5 +-
 tools/perf/util/dso.c                              |   21 +-
 tools/perf/util/dso.h                              |    3 +
 tools/perf/util/event.c                            |    1 +
 tools/perf/util/event.h                            |   11 +-
 tools/perf/util/evlist.c                           |    4 +-
 tools/perf/util/evlist.h                           |    9 +-
 tools/perf/util/evsel.c                            |   18 +-
 tools/perf/util/evsel.h                            |    3 +-
 tools/perf/util/header.c                           | 1015 +++++++++++---------
 tools/perf/util/header.h                           |   16 +-
 tools/perf/util/hist.c                             |    5 +-
 tools/perf/util/machine.c                          |   33 +-
 tools/perf/util/map.c                              |   23 +-
 tools/perf/util/map.h                              |    2 +-
 tools/perf/util/namespaces.c                       |  211 ++++
 tools/perf/util/namespaces.h                       |   38 +
 tools/perf/util/parse-branch-options.c             |    1 +
 tools/perf/util/parse-events.c                     |    2 +-
 tools/perf/util/probe-event.c                      |   86 +-
 tools/perf/util/probe-event.h                      |   10 +-
 tools/perf/util/probe-file.c                       |   19 +-
 tools/perf/util/probe-file.h                       |    4 +-
 tools/perf/util/python-ext-sources                 |    1 +
 tools/perf/util/session.c                          |    4 +
 tools/perf/util/setns.c                            |    8 +
 tools/perf/util/symbol.c                           |   92 +-
 tools/perf/util/thread.c                           |    3 +
 tools/perf/util/thread.h                           |    1 +
 tools/perf/util/tool.h                             |   10 +-
 tools/perf/util/util.c                             |   40 +-
 tools/perf/util/util.h                             |    8 +-
 277 files changed, 10851 insertions(+), 1625 deletions(-)
 create mode 100644 Documentation/x86/amd-memory-encryption.txt
 create mode 100644 Documentation/x86/x86_64/5level-paging.txt
 create mode 100644 arch/x86/include/asm/mem_encrypt.h
 create mode 100644 arch/x86/include/asm/orc_types.h
 create mode 100644 arch/x86/include/asm/unwind_hints.h
 create mode 100644 arch/x86/mm/mem_encrypt.c
 create mode 100644 arch/x86/mm/mem_encrypt_boot.S
 create mode 100644 include/linux/mem_encrypt.h
 create mode 100644 tools/arch/x86/include/uapi/asm/unistd.h
 create mode 100644 tools/build/feature/test-setns.c
 create mode 100644 tools/include/uapi/asm-generic/fcntl.h
 create mode 100644 tools/objtool/builtin-orc.c
 create mode 100644 tools/objtool/orc.h
 create mode 100644 tools/objtool/orc_dump.c
 create mode 100644 tools/objtool/orc_gen.c
 create mode 100644 tools/objtool/orc_types.h
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/cache.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/floating-point.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/frontend.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/marked.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/memory.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/other.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/pipeline.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/pmc.json
 create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/translation.json
 rename tools/perf/tests/attr/{test-record-no-delay => test-record-no-buffering} (61%)
 create mode 100644 tools/perf/trace/beauty/fcntl.c
 create mode 100644 tools/perf/util/branch.c
 create mode 100644 tools/perf/util/branch.h
 create mode 100644 tools/perf/util/setns.c
Merging clockevents/clockevents/next (2287d8664fe7 timers: Make the cpu base lock raw)
$ 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 (2efdda4a4108 EDAC, cpc925, ppc4xx: Convert to using %pOF instead of full_name)
$ git merge edac-amd/for-next
Merge made by the 'recursive' strategy.
 drivers/edac/altera_edac.c      | 2 --
 drivers/edac/amd64_edac.c       | 1 -
 drivers/edac/amd76x_edac.c      | 2 --
 drivers/edac/cpc925_edac.c      | 3 +--
 drivers/edac/e752x_edac.c       | 2 --
 drivers/edac/e7xxx_edac.c       | 2 --
 drivers/edac/edac_mc_sysfs.c    | 6 +++---
 drivers/edac/ghes_edac.c        | 3 ---
 drivers/edac/highbank_mc_edac.c | 1 -
 drivers/edac/i3000_edac.c       | 3 ---
 drivers/edac/i3200_edac.c       | 3 ---
 drivers/edac/i5000_edac.c       | 1 -
 drivers/edac/i5100_edac.c       | 1 -
 drivers/edac/i5400_edac.c       | 1 -
 drivers/edac/i7300_edac.c       | 1 -
 drivers/edac/i7core_edac.c      | 5 ++---
 drivers/edac/i82443bxgx_edac.c  | 3 ---
 drivers/edac/i82860_edac.c      | 2 --
 drivers/edac/i82875p_edac.c     | 2 --
 drivers/edac/i82975x_edac.c     | 2 --
 drivers/edac/ie31200_edac.c     | 2 --
 drivers/edac/mce_amd.c          | 6 +-----
 drivers/edac/mv64x60_edac.c     | 1 -
 drivers/edac/ppc4xx_edac.c      | 9 ++++-----
 drivers/edac/r82600_edac.c      | 2 --
 drivers/edac/sb_edac.c          | 1 -
 drivers/edac/skx_edac.c         | 3 ---
 drivers/edac/synopsys_edac.c    | 1 -
 drivers/edac/thunderx_edac.c    | 1 -
 drivers/edac/x38_edac.c         | 3 ---
 drivers/edac/xgene_edac.c       | 1 -
 include/linux/edac.h            | 1 -
 32 files changed, 11 insertions(+), 66 deletions(-)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
$ git merge irqchip/irqchip/for-next
Already up-to-date.
Merging ftrace/for-next (2e028c4fe129 ftrace: Fix uninitialized variable in match_records())
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (5a654f4c0153 rcutorture: Invoke call_rcu() from timer handler)
$ git merge rcu/rcu/next
Removing tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot
Removing kernel/rcu/tiny_plugin.h
Auto-merging kernel/cpu.c
Auto-merging include/linux/sched.h
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 .../RCU/Design/Requirements/Requirements.html      | 130 +++++++++++
 Documentation/RCU/checklist.txt                    | 121 +++++++----
 Documentation/RCU/rcu.txt                          |   9 +-
 Documentation/RCU/rcu_dereference.txt              |  61 ++----
 Documentation/RCU/rcubarrier.txt                   |   5 +
 Documentation/RCU/torture.txt                      |  20 +-
 Documentation/RCU/whatisRCU.txt                    |   5 +-
 Documentation/admin-guide/kernel-parameters.txt    |   7 +-
 Documentation/core-api/kernel-api.rst              |  49 +++++
 Documentation/memory-barriers.txt                  |  41 ++--
 arch/blackfin/kernel/module.c                      |  39 ++--
 include/linux/init_task.h                          |   8 +-
 include/linux/rcupdate.h                           |  15 +-
 include/linux/rcutiny.h                            |   8 +-
 include/linux/sched.h                              |   8 +-
 include/linux/srcutiny.h                           |  13 ++
 include/linux/srcutree.h                           |   3 +-
 include/linux/swait.h                              |  55 +++++
 include/trace/events/rcu.h                         |   7 +-
 include/uapi/linux/membarrier.h                    |  11 +
 kernel/cpu.c                                       |   1 +
 kernel/exit.c                                      |   7 +-
 kernel/membarrier.c                                |   7 +-
 kernel/rcu/Kconfig                                 |   3 +-
 kernel/rcu/rcu.h                                   | 128 ++---------
 kernel/rcu/rcu_segcblist.c                         | 108 +++-------
 kernel/rcu/rcu_segcblist.h                         |  28 +--
 kernel/rcu/rcuperf.c                               |  17 +-
 kernel/rcu/rcutorture.c                            |  83 +++----
 kernel/rcu/srcutiny.c                              |   8 +
 kernel/rcu/srcutree.c                              |  50 ++++-
 kernel/rcu/tiny.c                                  |   2 -
 kernel/rcu/tiny_plugin.h                           |  47 ----
 kernel/rcu/tree.c                                  | 236 ++++++++------------
 kernel/rcu/tree.h                                  |  15 +-
 kernel/rcu/tree_exp.h                              |   2 +-
 kernel/rcu/tree_plugin.h                           | 238 ++++++++++++---------
 kernel/rcu/update.c                                |  18 +-
 kernel/sched/core.c                                |  10 +-
 kernel/torture.c                                   |   2 +-
 .../selftests/rcutorture/bin/config_override.sh    |  61 ++++++
 .../testing/selftests/rcutorture/bin/functions.sh  |  27 ++-
 .../testing/selftests/rcutorture/bin/kvm-build.sh  |  11 +-
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |  58 ++---
 tools/testing/selftests/rcutorture/bin/kvm.sh      |  34 ++-
 .../selftests/rcutorture/configs/rcu/BUSTED.boot   |   2 +-
 .../selftests/rcutorture/configs/rcu/SRCU-C.boot   |   1 -
 .../selftests/rcutorture/configs/rcu/SRCU-u        |   3 +-
 .../selftests/rcutorture/configs/rcu/TREE01.boot   |   2 +-
 .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt  |   2 +-
 50 files changed, 1010 insertions(+), 816 deletions(-)
 delete mode 100644 kernel/rcu/tiny_plugin.h
 create mode 100755 tools/testing/selftests/rcutorture/bin/config_override.sh
 delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot
Merging kvm/linux-next (5771a8c08880 Linux v4.13-rc1)
$ git merge kvm/linux-next
Already up-to-date.
Merging kvm-arm/next (d38338e396ee arm64: Remove a redundancy in sysreg.h)
$ 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 (8b24e69fc47e KVM: PPC: Book3S HV: Close race with testing for signals on guest entry)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvms390/next (d52cd2076eb2 KVM: s390: Inject machine check into the nested guest)
$ git merge kvms390/next
Already up-to-date.
Merging xen-tip/linux-next (96edd61dcf44 xen/balloon: don't online new memory initially)
$ git merge xen-tip/linux-next
Already up-to-date.
Merging percpu/for-next (9c01516278ef percpu: update the header comment and pcpu_build_alloc_info comments)
$ git merge percpu/for-next
Merge made by the 'recursive' strategy.
 mm/percpu-internal.h |  1 +
 mm/percpu-stats.c    | 11 +++++-----
 mm/percpu.c          | 60 +++++++++++++++++++++++++++++-----------------------
 3 files changed, 40 insertions(+), 32 deletions(-)
Merging workqueues/for-next (d593b7e8b15f Merge branch 'for-4.13-fixes' into for-next)
$ git merge workqueues/for-next
Merge made by the 'recursive' strategy.
 Documentation/core-api/workqueue.rst | 10 +++++++---
 kernel/workqueue.c                   | 10 ++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)
Merging drivers-x86/for-next (5771a8c08880 Linux v4.13-rc1)
$ git merge drivers-x86/for-next
Already up-to-date.
Merging chrome-platform/for-next (3c778a7fcfaa platform/chrome : Add myself as Maintainer)
$ git merge chrome-platform/for-next
Already up-to-date.
Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions)
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (c68729119f4d leds: tlc591xx: add missing of_node_put)
$ git merge leds/for-next
Merge made by the 'recursive' strategy.
 drivers/leds/leds-tlc591xx.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
Merging ipmi/for-next (4495ec6d770e ipmi:ssif: Add missing unlock in error branch)
$ git merge ipmi/for-next
Already up-to-date.
Merging driver-core/driver-core-next (1af824f085e8 Merge branch 'bind_unbind' into driver-core-next)
$ git merge driver-core/driver-core-next
Auto-merging include/linux/kobject.h
Auto-merging drivers/input/rmi4/rmi_f01.c
Auto-merging drivers/input/keyboard/gpio_keys.c
Merge made by the 'recursive' strategy.
 drivers/base/arch_topology.c       |  78 +++++++++++-----------
 drivers/base/base.h                |   5 --
 drivers/base/core.c                | 132 +++++++++++++++++++++++++++++++++++++
 drivers/base/dd.c                  |   4 ++
 drivers/input/keyboard/gpio_keys.c |  16 +----
 drivers/input/misc/axp20x-pek.c    |  18 +----
 drivers/input/rmi4/rmi_f01.c       |  11 +---
 include/linux/arch_topology.h      |   4 +-
 include/linux/debugfs.h            |  16 +++++
 include/linux/device.h             |  30 +++++++++
 include/linux/kobject.h            |   2 +
 lib/kobject_uevent.c               |   2 +
 12 files changed, 234 insertions(+), 84 deletions(-)
Merging usb/usb-next (1bb90cf0462c usb: core: hub: controller driver name may be NULL)
$ git merge usb/usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/atm/cxacru.c             |  2 --
 drivers/usb/atm/speedtch.c           |  4 +---
 drivers/usb/atm/ueagle-atm.c         |  2 +-
 drivers/usb/atm/usbatm.c             |  4 +---
 drivers/usb/atm/xusbatm.c            |  1 -
 drivers/usb/chipidea/ci_hdrc_pci.c   |  1 -
 drivers/usb/class/cdc-wdm.c          |  4 ----
 drivers/usb/common/common.c          |  4 ++--
 drivers/usb/core/hub.c               | 17 +++++++++++++++--
 drivers/usb/core/ledtrig-usbport.c   |  4 ++--
 drivers/usb/core/sysfs.c             |  2 +-
 drivers/usb/gadget/legacy/webcam.c   |  1 -
 drivers/usb/gadget/udc/mv_udc_core.c |  2 --
 drivers/usb/gadget/udc/s3c2410_udc.c |  4 +---
 drivers/usb/host/fsl-mph-dr-of.c     |  4 ++--
 drivers/usb/image/microtek.c         |  4 ----
 drivers/usb/isp1760/isp1760-hcd.c    |  6 ++----
 drivers/usb/misc/adutux.c            |  2 --
 drivers/usb/misc/chaoskey.c          |  2 --
 drivers/usb/misc/cytherm.c           |  1 -
 drivers/usb/misc/ftdi-elan.c         |  6 +++---
 drivers/usb/misc/idmouse.c           |  2 --
 drivers/usb/misc/iowarrior.c         |  4 +---
 drivers/usb/misc/ldusb.c             |  1 -
 drivers/usb/misc/legousbtower.c      |  2 --
 drivers/usb/misc/rio500.c            |  4 ----
 drivers/usb/misc/sisusbvga/sisusb.c  | 13 +++----------
 drivers/usb/misc/trancevibrator.c    |  2 --
 drivers/usb/misc/usb251xb.c          |  1 -
 drivers/usb/misc/uss720.c            |  7 +------
 drivers/usb/mtu3/mtu3_host.c         |  4 ++--
 drivers/usb/phy/phy-mv-usb.c         |  2 --
 drivers/usb/phy/phy.c                |  4 ++--
 drivers/usb/renesas_usbhs/pipe.c     |  2 +-
 drivers/usb/storage/realtek_cr.c     |  1 -
 drivers/usb/usbip/stub_main.c        |  2 --
 drivers/usb/usbip/usbip_common.c     |  2 --
 drivers/usb/usbip/usbip_common.h     |  2 --
 drivers/usb/usbip/vhci_hcd.c         |  2 --
 39 files changed, 41 insertions(+), 93 deletions(-)
Merging usb-gadget/next (5771a8c08880 Linux v4.13-rc1)
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (5771a8c08880 Linux v4.13-rc1)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging usb-chipidea-next/ci-for-usb-next (b74c43156c0c usb: chipidea: msm: ci_hdrc_msm_probe() missing of_node_get())
$ git merge usb-chipidea-next/ci-for-usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/chipidea/ci_hdrc_msm.c | 2 +-
 drivers/usb/chipidea/udc.c         | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
Merging phy-next/next (e7cded272612 phy: allwinner: phy-sun4i-usb: Add log when probing)
$ git merge phy-next/next
Merge made by the 'recursive' strategy.
 drivers/phy/allwinner/phy-sun4i-usb.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)
Merging tty/tty-next (5771a8c08880 Linux v4.13-rc1)
$ git merge tty/tty-next
Already up-to-date.
Merging char-misc/char-misc-next (91c17449fe04 Revert "x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set")
$ git merge char-misc/char-misc-next
Auto-merging include/linux/fs.h
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-driver-altera-cvp  |    8 +
 Documentation/admin-guide/devices.txt              |    5 +
 .../bindings/fpga/altera-passive-serial.txt        |   29 +
 .../bindings/fpga/xilinx-pr-decoupler.txt          |   36 +
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 arch/arm/boot/dts/imx6q-evi.dts                    |   16 +
 arch/x86/include/asm/mshyperv.h                    |    2 +
 arch/x86/kernel/cpu/mshyperv.c                     |   12 +-
 block/genhd.c                                      |   18 +-
 drivers/android/Makefile                           |    2 +-
 drivers/android/binder.c                           | 3455 +++++++++++++-------
 drivers/android/binder_alloc.c                     |  802 +++++
 drivers/android/binder_alloc.h                     |  163 +
 drivers/android/binder_trace.h                     |   41 +-
 drivers/auxdisplay/panel.c                         |    6 +-
 drivers/char/mwave/smapi.c                         |   48 +-
 drivers/char/ppdev.c                               |    3 -
 drivers/fpga/Kconfig                               |   20 +-
 drivers/fpga/Makefile                              |    2 +
 drivers/fpga/altera-cvp.c                          |  500 +++
 drivers/fpga/altera-ps-spi.c                       |  308 ++
 drivers/hv/ring_buffer.c                           |  169 +-
 drivers/misc/aspeed-lpc-snoop.c                    |   34 +-
 drivers/misc/mei/hw-me.c                           |   45 +-
 drivers/misc/mei/hw-me.h                           |   39 +-
 drivers/misc/mei/pci-me.c                          |  109 +-
 fs/char_dev.c                                      |   58 +-
 fs/proc/devices.c                                  |    8 +-
 include/linux/bitrev.h                             |   19 +
 include/linux/fpga/fpga-mgr.h                      |    4 +
 include/linux/fs.h                                 |   10 +-
 include/linux/hyperv.h                             |   65 -
 32 files changed, 4486 insertions(+), 1551 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-driver-altera-cvp
 create mode 100644 Documentation/devicetree/bindings/fpga/altera-passive-serial.txt
 create mode 100644 Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt
 create mode 100644 drivers/android/binder_alloc.c
 create mode 100644 drivers/android/binder_alloc.h
 create mode 100644 drivers/fpga/altera-cvp.c
 create mode 100644 drivers/fpga/altera-ps-spi.c
Merging extcon/extcon-next (5c27036d2b05 extcon: Convert to using %pOF instead of full_name)
$ git merge extcon/extcon-next
Merge made by the 'recursive' strategy.
 .../bindings/extcon/extcon-usbc-cros-ec.txt        |  24 ++
 drivers/extcon/Kconfig                             |   7 +
 drivers/extcon/Makefile                            |   1 +
 drivers/extcon/extcon-intel-int3496.c              |   2 +-
 drivers/extcon/extcon-usbc-cros-ec.c               | 415 +++++++++++++++++++++
 drivers/extcon/extcon.c                            |   4 +-
 include/linux/mfd/cros_ec_commands.h               |  75 ++++
 7 files changed, 525 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
 create mode 100644 drivers/extcon/extcon-usbc-cros-ec.c
Merging staging/staging-next (a29e24907208 Merge 4.13-rc2 into staging-next)
$ git merge staging/staging-next
Removing drivers/staging/ccree/ssi_fips_local.h
Removing drivers/staging/ccree/ssi_fips_local.c
Removing drivers/staging/ccree/ssi_fips_ll.c
Removing drivers/staging/ccree/ssi_fips_ext.c
Removing drivers/staging/ccree/ssi_fips_data.h
Merge made by the 'recursive' strategy.
 drivers/staging/Kconfig                            |    2 +
 drivers/staging/Makefile                           |    1 +
 drivers/staging/android/ion/ion.h                  |   12 +-
 drivers/staging/android/ion/ion_cma_heap.c         |    5 +-
 drivers/staging/android/ion/ion_system_heap.c      |    2 -
 drivers/staging/ccree/Kconfig                      |    9 -
 drivers/staging/ccree/Makefile                     |    2 +-
 drivers/staging/ccree/cc_hw_queue_defs.h           |    3 +-
 drivers/staging/ccree/ssi_aead.c                   |  193 +--
 drivers/staging/ccree/ssi_aead.h                   |   12 +-
 drivers/staging/ccree/ssi_buffer_mgr.c             |  433 ++---
 drivers/staging/ccree/ssi_cipher.c                 |  125 +-
 drivers/staging/ccree/ssi_driver.c                 |   59 +-
 drivers/staging/ccree/ssi_driver.h                 |    1 -
 drivers/staging/ccree/ssi_fips.c                   |  119 +-
 drivers/staging/ccree/ssi_fips.h                   |   58 +-
 drivers/staging/ccree/ssi_fips_data.h              |  306 ----
 drivers/staging/ccree/ssi_fips_ext.c               |   92 --
 drivers/staging/ccree/ssi_fips_ll.c                | 1649 --------------------
 drivers/staging/ccree/ssi_fips_local.c             |  357 -----
 drivers/staging/ccree/ssi_fips_local.h             |   67 -
 drivers/staging/ccree/ssi_hash.c                   |  150 +-
 drivers/staging/ccree/ssi_ivgen.c                  |    5 +-
 drivers/staging/ccree/ssi_request_mgr.c            |   48 +-
 drivers/staging/ccree/ssi_sram_mgr.c               |    6 +-
 drivers/staging/ccree/ssi_sysfs.c                  |   80 +-
 drivers/staging/comedi/comedi_buf.c                |    2 +-
 drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c |    2 -
 drivers/staging/greybus/arche-platform.c           |   11 +-
 drivers/staging/greybus/tools/loopback_test.c      |   13 +-
 drivers/staging/gs_fpgaboot/io.c                   |    4 -
 drivers/staging/ks7010/ks_wlan_net.c               |    2 +-
 .../staging/lustre/include/linux/lnet/lib-lnet.h   |    3 +-
 .../staging/lustre/include/linux/lnet/lib-types.h  |   46 +-
 drivers/staging/lustre/include/linux/lnet/lnetst.h |  129 +-
 .../staging/lustre/include/linux/lnet/socklnd.h    |    3 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd.h    |   11 -
 .../lustre/lnet/klnds/socklnd/socklnd_lib.c        |   20 +-
 drivers/staging/lustre/lnet/selftest/conrpc.c      |    5 +-
 drivers/staging/lustre/lustre/fld/fld_cache.c      |    3 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c     |    9 +-
 drivers/staging/lustre/lustre/llite/vvp_dev.c      |    5 +-
 drivers/staging/lustre/lustre/ptlrpc/import.c      |    2 +-
 .../Documentation/devicetree/pi433-overlay.dts     |   53 +
 .../pi433/Documentation/devicetree/pi433.txt       |   62 +
 drivers/staging/pi433/Documentation/pi433.txt      |  274 ++++
 drivers/staging/pi433/Kconfig                      |   16 +
 drivers/staging/pi433/Makefile                     |    3 +
 drivers/staging/pi433/TODO                         |    5 +
 drivers/staging/pi433/pi433_if.c                   | 1314 ++++++++++++++++
 drivers/staging/pi433/pi433_if.h                   |  152 ++
 drivers/staging/pi433/rf69.c                       |  982 ++++++++++++
 drivers/staging/pi433/rf69.h                       |   82 +
 drivers/staging/pi433/rf69_enum.h                  |  201 +++
 drivers/staging/pi433/rf69_registers.h             |  489 ++++++
 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |   78 +-
 drivers/staging/rtl8192u/r8192U_core.c             |   23 +-
 drivers/staging/rtl8192u/r8192U_hw.h               |   11 +-
 drivers/staging/rtl8712/mlme_linux.c               |    4 +-
 drivers/staging/rtl8712/rtl8712_cmd.c              |    2 +-
 drivers/staging/rtl8712/rtl8712_efuse.c            |    2 +-
 drivers/staging/rtl8712/rtl8712_xmit.c             |    8 +-
 drivers/staging/rtl8723bs/core/rtw_btcoex.c        |    2 +-
 drivers/staging/typec/tcpm.c                       |    3 +-
 drivers/staging/unisys/include/channel.h           |  338 ++--
 drivers/staging/unisys/include/iochannel.h         |  524 ++++---
 drivers/staging/unisys/include/visorbus.h          |    6 +-
 drivers/staging/unisys/visorbus/controlvmchannel.h |  706 +++++----
 drivers/staging/unisys/visorbus/vbuschannel.h      |   93 +-
 drivers/staging/unisys/visorbus/visorbus_main.c    |  369 ++---
 drivers/staging/unisys/visorbus/visorbus_private.h |    4 -
 drivers/staging/unisys/visorbus/visorchannel.c     |  129 +-
 drivers/staging/unisys/visorbus/visorchipset.c     |  106 +-
 drivers/staging/unisys/visorbus/vmcallinterface.h  |   57 +-
 drivers/staging/unisys/visorhba/visorhba_main.c    |  402 ++---
 .../staging/unisys/visorinput/ultrainputreport.h   |   65 +-
 drivers/staging/unisys/visorinput/visorinput.c     |   84 +-
 drivers/staging/unisys/visornic/visornic_main.c    |  213 ++-
 .../vc04_services/interface/vchiq_arm/vchiq_util.c |    2 +-
 drivers/staging/vt6655/card.c                      |    6 +-
 drivers/staging/vt6655/mac.c                       |    2 +-
 drivers/staging/vt6656/device.h                    |    2 +-
 drivers/staging/vt6656/firmware.c                  |    2 +-
 drivers/staging/vt6656/key.h                       |    2 +-
 drivers/staging/vt6656/main_usb.c                  |    5 +-
 drivers/staging/vt6656/power.c                     |    6 +-
 drivers/staging/vt6656/rf.c                        |    6 +-
 drivers/staging/vt6656/usbpipe.c                   |    4 +-
 drivers/staging/wilc1000/host_interface.c          |    4 +-
 drivers/staging/wilc1000/linux_wlan.c              |    3 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  |   65 +-
 drivers/staging/wilc1000/wilc_wfi_netdevice.h      |    4 +-
 drivers/staging/wlan-ng/hfa384x.h                  |   12 +-
 drivers/staging/wlan-ng/prism2sta.c                |   17 +-
 94 files changed, 6213 insertions(+), 4857 deletions(-)
 delete mode 100644 drivers/staging/ccree/ssi_fips_data.h
 delete mode 100644 drivers/staging/ccree/ssi_fips_ext.c
 delete mode 100644 drivers/staging/ccree/ssi_fips_ll.c
 delete mode 100644 drivers/staging/ccree/ssi_fips_local.c
 delete mode 100644 drivers/staging/ccree/ssi_fips_local.h
 create mode 100644 drivers/staging/pi433/Documentation/devicetree/pi433-overlay.dts
 create mode 100644 drivers/staging/pi433/Documentation/devicetree/pi433.txt
 create mode 100644 drivers/staging/pi433/Documentation/pi433.txt
 create mode 100644 drivers/staging/pi433/Kconfig
 create mode 100644 drivers/staging/pi433/Makefile
 create mode 100644 drivers/staging/pi433/TODO
 create mode 100644 drivers/staging/pi433/pi433_if.c
 create mode 100644 drivers/staging/pi433/pi433_if.h
 create mode 100644 drivers/staging/pi433/rf69.c
 create mode 100644 drivers/staging/pi433/rf69.h
 create mode 100644 drivers/staging/pi433/rf69_enum.h
 create mode 100644 drivers/staging/pi433/rf69_registers.h
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
$ git merge mux/for-next
Already up-to-date.
Merging slave-dma/next (d4381f3cff0b Merge branch 'topic/bcm' into next)
$ git merge slave-dma/next
Merge made by the 'recursive' strategy.
 drivers/dma/Kconfig           |    6 +
 drivers/dma/Makefile          |    1 +
 drivers/dma/altera-msgdma.c   | 1031 +++++++++++++++++++++++++++++++++++++++++
 drivers/dma/bcm-sba-raid.c    |    6 +-
 drivers/dma/dmatest.c         |   88 +++-
 drivers/dma/ioat/init.c       |    2 +-
 drivers/dma/of-dma.c          |    8 +-
 drivers/dma/ppc4xx/adma.c     |   37 +-
 drivers/dma/qcom/hidma.c      |   37 +-
 drivers/dma/qcom/hidma.h      |    7 +-
 drivers/dma/qcom/hidma_ll.c   |   11 +-
 drivers/dma/qcom/hidma_mgmt.c |   14 +-
 12 files changed, 1181 insertions(+), 67 deletions(-)
 create mode 100644 drivers/dma/altera-msgdma.c
Merging cgroup/for-next (8acfed66d567 Merge branch 'for-4.14' into for-next)
$ git merge cgroup/for-next
Auto-merging kernel/events/core.c
Merge made by the 'recursive' strategy.
 Documentation/cgroup-v2.txt     | 188 ++++++++-
 include/linux/cgroup-defs.h     |  50 ++-
 include/linux/cgroup.h          |  15 +-
 kernel/cgroup/cgroup-internal.h |  15 +-
 kernel/cgroup/cgroup-v1.c       |  69 +++-
 kernel/cgroup/cgroup.c          | 833 ++++++++++++++++++++++++++++++----------
 kernel/cgroup/cpuset.c          |   6 +-
 kernel/cgroup/debug.c           |  53 ++-
 kernel/cgroup/freezer.c         |   6 +-
 kernel/cgroup/pids.c            |   1 +
 kernel/events/core.c            |   1 +
 mm/memcontrol.c                 |   2 +-
 net/core/netclassid_cgroup.c    |   2 +-
 13 files changed, 972 insertions(+), 269 deletions(-)
Merging scsi/for-next (14074aba4bcd scsi: sg: fix static checker warning in sg_is_valid_dxfer)
$ git merge scsi/for-next
Merge made by the 'recursive' strategy.
 drivers/scsi/hpsa.c              | 2 +-
 drivers/scsi/sg.c                | 7 +++++--
 drivers/scsi/smartpqi/smartpqi.h | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
Merging scsi-mkp/for-next (6f37e2102778 scsi: libfc: pass an error pointer to fc_disc_error())
$ git merge scsi-mkp/for-next
Already up-to-date.
Merging target-updates/for-next (138d351eefb7 iscsi-target: Add login_keys_workaround attribute for non RFC initiators)
$ git merge target-updates/for-next
Already up-to-date.
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1)
$ git merge target-bva/for-next
Already up-to-date.
Merging libata/for-next (37cbf519e8c6 Merge branch 'for-4.13-fixes' into for-next)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/ata/sata_rcar.txt | 14 +++++++++++---
 drivers/ata/Kconfig                                 |  4 ++--
 drivers/ata/libata-core.c                           |  6 +++---
 drivers/ata/libata-eh.c                             |  3 +--
 drivers/ata/libata-scsi.c                           |  6 ++++--
 drivers/ata/sata_rcar.c                             |  8 ++++++++
 drivers/ata/sata_svw.c                              |  2 +-
 include/linux/libata.h                              |  2 +-
 8 files changed, 31 insertions(+), 14 deletions(-)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
$ git merge binfmt_misc/for-next
Already up-to-date.
Merging vhost/linux-next (e41b1355508d virtio_balloon: disable VIOMMU support)
$ git merge vhost/linux-next
Already up-to-date.
Merging rpmsg/for-next (9ef2b6cc595a 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 (8d2c6297aec9 Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Resolved 'drivers/gpio/gpio-mvebu.c' using previous resolution.
Auto-merging drivers/gpio/gpio-mvebu.c
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mvebu.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master b4106f0e4db0] Merge remote-tracking branch 'gpio/for-next'
$ git diff -M --stat --summary HEAD^..
Merging pinctrl/for-next (ece5946c2eed Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
Merging pinctrl-samsung/for-next (12cdd5790fe3 pinctrl: samsung: Consistently use unsigned instead of u32 for nr_banks)
$ git merge pinctrl-samsung/for-next
Merge made by the 'recursive' strategy.
 drivers/pinctrl/samsung/pinctrl-exynos.c  | 14 ++++++-----
 drivers/pinctrl/samsung/pinctrl-exynos.h  |  1 -
 drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 37 +++++++++++++++-------------
 drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 40 ++++++++++++++-----------------
 drivers/pinctrl/samsung/pinctrl-samsung.c | 12 ++++++++--
 drivers/pinctrl/samsung/pinctrl-samsung.h | 15 ++++++------
 include/dt-bindings/pinctrl/samsung.h     |  3 ++-
 7 files changed, 67 insertions(+), 55 deletions(-)
Merging pwm/for-next (5ec8c48a6235 Merge branch 'for-4.13/drivers' into for-next)
$ git merge pwm/for-next
Already up-to-date.
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
$ git merge dma-buf/for-next
Resolved 'drivers/dma-buf/Kconfig' using previous resolution.
Auto-merging drivers/dma-buf/Kconfig
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 817cf7b08d0b] Merge remote-tracking branch 'dma-buf/for-next'
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS | 11 +++++++++++
 1 file changed, 11 insertions(+)
Merging userns/for-next (b539713a5961 signal: Fix sending signals with siginfo)
$ git merge userns/for-next
Auto-merging kernel/exit.c
Auto-merging include/linux/user_namespace.h
Auto-merging arch/sparc/kernel/traps_64.c
Merge made by the 'recursive' strategy.
 arch/alpha/include/uapi/asm/siginfo.h         |  14 ++++
 arch/alpha/kernel/traps.c                     |   6 +-
 arch/arm64/kernel/signal32.c                  |  23 ++----
 arch/blackfin/include/uapi/asm/siginfo.h      |  30 ++++---
 arch/frv/include/uapi/asm/siginfo.h           |   2 +-
 arch/ia64/include/uapi/asm/siginfo.h          |  21 +++--
 arch/ia64/kernel/signal.c                     |  17 ++--
 arch/ia64/kernel/traps.c                      |   4 +-
 arch/mips/include/uapi/asm/siginfo.h          |  11 ++-
 arch/mips/kernel/signal32.c                   |  19 ++---
 arch/mips/kernel/traps.c                      |   2 +-
 arch/parisc/kernel/signal32.c                 |  31 ++++---
 arch/powerpc/kernel/signal_32.c               |  20 ++---
 arch/s390/kernel/compat_signal.c              |  32 ++++---
 arch/sparc/include/uapi/asm/siginfo.h         |   9 +-
 arch/sparc/kernel/signal32.c                  |  16 ++--
 arch/sparc/kernel/traps_32.c                  |   2 +-
 arch/sparc/kernel/traps_64.c                  |   2 +-
 arch/tile/include/uapi/asm/siginfo.h          |   4 +-
 arch/tile/kernel/compat_signal.c              |  18 ++--
 arch/tile/kernel/traps.c                      |   2 +-
 arch/x86/kernel/signal_compat.c               |  21 ++---
 fs/fcntl.c                                    |  13 ++-
 fs/signalfd.c                                 |  22 ++---
 include/linux/signal.h                        |  22 +++++
 include/linux/user_namespace.h                |   9 +-
 include/uapi/asm-generic/siginfo.h            | 115 +++++++++++---------------
 kernel/exit.c                                 |   4 +-
 kernel/pid_namespace.c                        |   4 +
 kernel/ptrace.c                               |   6 +-
 kernel/signal.c                               |  72 ++++++++++++----
 kernel/sys.c                                  |   8 +-
 kernel/user_namespace.c                       |  20 +++--
 security/commoncap.c                          |   7 +-
 tools/testing/selftests/x86/mpx-mini-test.c   |   3 +-
 tools/testing/selftests/x86/protection_keys.c |  13 ++-
 36 files changed, 349 insertions(+), 275 deletions(-)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
$ git merge ktest/for-next
Already up-to-date.
Merging random/dev (72e5c740f633 random: reorder READ_ONCE() in get_random_uXX)
$ git merge random/dev
Already up-to-date.
Merging aio/master (4c1d69950da4 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
$ git merge aio/master
Auto-merging fs/aio.c
Merge made by the 'recursive' strategy.
 fs/aio.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
Merging kselftest/next (5771a8c08880 Linux v4.13-rc1)
$ git merge kselftest/next
Already up-to-date.
Merging y2038/y2038 (69973b830859 Linux 4.9)
$ git merge y2038/y2038
Already up-to-date.
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
$ git merge luto-misc/next
Already up-to-date.
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge borntraeger/linux-next
Already up-to-date.
Merging livepatching/for-next (26d8d1e9bb48 Merge branch 'for-4.12/upstream-fixes' into for-next)
$ git merge livepatching/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging coresight/next (a627ed2ecdea coresight: etm4x: Adds trace return stack option programming for ETMv4.)
$ git merge coresight/next
Merge made by the 'recursive' strategy.
 drivers/hwtracing/coresight/coresight-etb10.c    | 46 ++++++++++++++++--------
 drivers/hwtracing/coresight/coresight-etm-perf.c |  4 ++-
 drivers/hwtracing/coresight/coresight-etm.h      |  1 +
 drivers/hwtracing/coresight/coresight-etm3x.c    | 20 +++++++++--
 drivers/hwtracing/coresight/coresight-etm4x.c    |  4 +++
 drivers/hwtracing/coresight/coresight-priv.h     |  2 ++
 drivers/hwtracing/coresight/coresight-tmc-etf.c  | 34 ++++++++++++++++--
 drivers/hwtracing/coresight/coresight-tmc-etr.c  | 12 +++++++
 drivers/hwtracing/coresight/coresight.c          |  8 +++++
 include/linux/coresight-pmu.h                    |  1 +
 tools/include/linux/coresight-pmu.h              |  1 +
 11 files changed, 112 insertions(+), 21 deletions(-)
Merging rtc/rtc-next (5771a8c08880 Linux v4.13-rc1)
$ git merge rtc/rtc-next
Already up-to-date.
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
$ git merge hwspinlock/for-next
Already up-to-date.
Merging nvdimm/libnvdimm-for-next (bbb3be170ac2 device-dax: fix sysfs duplicate warnings)
$ git merge nvdimm/libnvdimm-for-next
Already up-to-date.
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
$ git merge dax-misc/dax-misc
Already up-to-date.
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
$ git merge idr/idr-4.11
Already up-to-date.
Merging kspp/for-next/kspp (cb00e6b58abb Merge branch 'for-next/gcc-plugin/randstruct' into for-next/kspp)
$ git merge kspp/for-next/kspp
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging akpm-current/current (7f004d4884d4 kernel-reboot-add-devm_register_reboot_notifier-fix)
$ git merge --no-ff akpm-current/current
Auto-merging block/genhd.c
Auto-merging arch/x86/kernel/machine_kexec_64.c
Merge made by the 'recursive' strategy.
 arch/arm/include/asm/page.h        |   2 +
 arch/x86/kernel/machine_kexec_64.c |   1 +
 block/genhd.c                      |   2 +-
 fs/ocfs2/dlm/dlmmaster.c           |  66 +++++--
 fs/ocfs2/dlm/dlmrecovery.c         |  40 ++---
 fs/ocfs2/dlmglue.c                 |   2 +-
 fs/ocfs2/filecheck.c               | 357 ++++++++++++++-----------------------
 fs/ocfs2/filecheck.h               |  29 ++-
 fs/ocfs2/ocfs2.h                   |   8 +
 fs/ocfs2/stackglue.c               |   6 -
 fs/ocfs2/stackglue.h               |   3 -
 fs/ocfs2/super.c                   |  35 +++-
 fs/seq_file.c                      |  10 --
 include/linux/crash_core.h         |   2 +
 include/linux/reboot.h             |   4 +
 include/uapi/linux/sysctl.h        |   4 +
 kernel/reboot.c                    |  27 +++
 mm/memory_hotplug.c                |   4 +
 mm/page_alloc.c                    |  19 +-
 mm/page_owner.c                    |   4 +-
 mm/slub.c                          |   4 +-
 mm/vmscan.c                        |  17 +-
 22 files changed, 339 insertions(+), 307 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: sparc64: NG4 memset 32 bits overflow
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + d7980276133e...06a980df5649 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (06a980df5649 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 arch/sparc/lib/NG4memset.S | 26 ++++++++++-----------
 include/linux/crc-ccitt.h  |  7 ++++++
 lib/crc-ccitt.c            | 58 +++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 77 insertions(+), 14 deletions(-)