path: root/Next/merge.log

$ date -R
Tue, 29 Sep 2015 09:27:39 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at cc8b8faea417 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Merging origin/master (3225031fbeb1 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile)
$ git merge origin/master
Updating cc8b8faea417..3225031fbeb1
Fast-forward
 Documentation/devicetree/bindings/arm/gic-v3.txt   |   5 +
 .../devicetree/bindings/arm/idle-states.txt        |   2 +-
 Documentation/devicetree/bindings/gpio/gpio.txt    |   4 +-
 .../devicetree/bindings/iio/accel/bma180.txt       |   8 +-
 .../interrupt-controller/qca,ath79-misc-intc.txt   |  20 +-
 .../devicetree/bindings/pci/pci-rcar-gen2.txt      |   3 +-
 .../devicetree/bindings/thermal/thermal.txt        |  27 +-
 .../devicetree/bindings/usb/ci-hdrc-usb2.txt       |   1 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 Documentation/networking/vrf.txt                   |  96 +++++
 Documentation/sysctl/net.txt                       |  16 +-
 Documentation/thermal/power_allocator.txt          |   2 +-
 MAINTAINERS                                        |  38 +-
 Makefile                                           |   2 +-
 arch/alpha/kernel/pci.c                            |   7 +-
 arch/arm/boot/dts/am335x-phycore-som.dtsi          |   4 +-
 arch/arm/boot/dts/am57xx-beagle-x15.dts            |  46 ++-
 arch/arm/boot/dts/dm8148-evm.dts                   |   4 +-
 arch/arm/boot/dts/dm8148-t410.dts                  |   6 +-
 arch/arm/boot/dts/dm814x.dtsi                      |   8 +-
 arch/arm/boot/dts/dra7.dtsi                        |   5 +-
 arch/arm/boot/dts/omap2430.dtsi                    |   3 +-
 arch/arm/boot/dts/omap3-beagle.dts                 |   2 +-
 arch/arm/boot/dts/omap3-igep.dtsi                  |   6 -
 arch/arm/boot/dts/omap3-igep0020-common.dtsi       |   6 +
 arch/arm/boot/dts/omap3.dtsi                       |  25 +-
 arch/arm/boot/dts/omap4.dtsi                       |   3 +-
 arch/arm/boot/dts/omap5-uevm.dts                   |   4 +-
 arch/arm/boot/dts/omap5.dtsi                       |   3 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi               |   1 +
 arch/arm/boot/dts/stih407.dtsi                     |  82 ++--
 arch/arm/boot/dts/stih410.dtsi                     |  82 ++--
 arch/arm/configs/omap2plus_defconfig               |   5 +-
 arch/arm/include/asm/kvm_host.h                    |   1 +
 arch/arm/include/asm/unistd.h                      |   2 +-
 arch/arm/include/uapi/asm/unistd.h                 |   2 +
 arch/arm/kernel/calls.S                            |   2 +
 arch/arm/mach-omap2/Kconfig                        |   6 +-
 arch/arm/mach-omap2/board-generic.c                |   7 -
 arch/arm/mach-omap2/id.c                           |   8 +-
 arch/arm/mach-omap2/io.c                           |   1 +
 arch/arm/mach-omap2/omap_device.c                  |   3 +-
 arch/arm/mach-omap2/pm.h                           |   3 +-
 arch/arm/mach-omap2/soc.h                          |   2 +
 arch/arm/mach-omap2/timer.c                        |   8 +-
 arch/arm/mach-omap2/vc.c                           |   2 +-
 arch/arm/mach-pxa/balloon3.c                       |   2 +-
 arch/arm/mach-pxa/include/mach/addr-map.h          |   7 +
 arch/arm/mach-pxa/pxa3xx.c                         |  21 +-
 arch/arm/mm/alignment.c                            |  30 +-
 arch/arm/plat-pxa/ssp.c                            |   1 -
 arch/arm64/boot/dts/mediatek/mt8173.dtsi           |   2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi           |   2 +-
 arch/arm64/include/asm/kvm_host.h                  |   1 +
 arch/frv/mb93090-mb00/pci-vdk.c                    |   2 +
 arch/ia64/pci/pci.c                                |   5 +-
 arch/microblaze/pci/pci-common.c                   |   9 +-
 arch/mips/ath79/irq.c                              |  22 +-
 arch/mips/include/asm/cpu-features.h               |   3 +
 arch/mips/include/asm/cpu.h                        |   1 +
 arch/mips/include/asm/kvm_host.h                   |   1 +
 arch/mips/include/asm/maar.h                       |   9 +
 arch/mips/include/asm/mips-cm.h                    |  39 ++
 arch/mips/include/asm/mipsregs.h                   |   2 +
 arch/mips/kernel/cpu-probe.c                       |  21 +-
 arch/mips/kernel/setup.c                           |  10 +-
 arch/mips/kernel/smp.c                             |   2 +
 arch/mips/loongson64/common/env.c                  |   3 +
 arch/mips/mm/init.c                                | 177 ++++++---
 arch/mips/net/bpf_jit_asm.S                        |  50 ++-
 arch/mips/pci/pci.c                                |   6 +
 arch/mn10300/unit-asb2305/pci.c                    |   1 +
 arch/powerpc/include/asm/kvm_host.h                |   1 +
 arch/powerpc/include/asm/systbl.h                  |   1 +
 arch/powerpc/include/asm/unistd.h                  |   2 +-
 arch/powerpc/include/uapi/asm/unistd.h             |   1 +
 arch/powerpc/kernel/pci-common.c                   |   8 +-
 arch/powerpc/kvm/book3s.c                          |   6 +
 arch/powerpc/kvm/book3s_hv.c                       |   6 +-
 arch/powerpc/kvm/book3s_hv_rmhandlers.S            |   1 +
 arch/s390/include/asm/kvm_host.h                   |   1 +
 arch/tile/kernel/usb.c                             |   1 +
 arch/x86/entry/entry_64.S                          |  16 +-
 arch/x86/include/asm/kvm_host.h                    |   1 +
 arch/x86/include/asm/msr-index.h                   |   3 +
 arch/x86/kernel/cpu/perf_event.h                   |   1 +
 arch/x86/kernel/cpu/perf_event_intel.c             |  17 +-
 arch/x86/kernel/cpu/perf_event_msr.c               |   4 +-
 arch/x86/kernel/paravirt.c                         |  16 +-
 arch/x86/kvm/mmu.c                                 |  25 +-
 arch/x86/kvm/svm.c                                 |   4 +-
 arch/x86/kvm/x86.c                                 |   2 +
 arch/x86/pci/common.c                              |   1 +
 arch/xtensa/kernel/pci.c                           |   4 +
 drivers/atm/he.c                                   |   7 +-
 drivers/atm/solos-pci.c                            |  12 +-
 drivers/base/cacheinfo.c                           |  10 +-
 drivers/char/hw_random/xgene-rng.c                 |   7 +-
 drivers/crypto/marvell/cesa.h                      |  27 ++
 drivers/crypto/marvell/cipher.c                    |   7 +-
 drivers/crypto/marvell/hash.c                      |   8 +-
 drivers/crypto/qat/qat_common/adf_aer.c            |   3 +
 drivers/extcon/extcon.c                            |   2 +-
 drivers/firmware/Kconfig                           |   8 +
 drivers/firmware/Makefile                          |   3 +-
 drivers/firmware/qcom_scm-64.c                     |  63 +++
 drivers/hv/channel_mgmt.c                          |  17 +
 drivers/infiniband/ulp/isert/ib_isert.c            | 293 +++++++++-----
 drivers/infiniband/ulp/isert/ib_isert.h            |  21 +-
 drivers/irqchip/irq-atmel-aic5.c                   |  24 +-
 drivers/irqchip/irq-mips-gic.c                     |  12 +-
 drivers/misc/cxl/sysfs.c                           |   2 +
 drivers/misc/mei/debugfs.c                         |   3 +-
 drivers/net/arcnet/arcnet.c                        |   2 +-
 drivers/net/dsa/mv88e6xxx.c                        |   1 +
 drivers/net/ethernet/apm/xgene/xgene_enet_hw.c     |  24 +-
 drivers/net/ethernet/arc/emac_arc.c                |   1 +
 drivers/net/ethernet/broadcom/bcmsysport.c         |   1 +
 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |   1 +
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  20 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |  12 +-
 drivers/net/ethernet/broadcom/genet/bcmgenet.c     |   1 +
 drivers/net/ethernet/brocade/bna/bna_tx_rx.c       |   2 +
 drivers/net/ethernet/brocade/bna/bna_types.h       |   1 +
 drivers/net/ethernet/brocade/bna/bnad.c            |  29 +-
 drivers/net/ethernet/brocade/bna/bnad.h            |   2 +
 drivers/net/ethernet/brocade/bna/bnad_ethtool.c    |   4 +
 drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h |   5 +
 drivers/net/ethernet/emulex/benet/be.h             |   1 +
 drivers/net/ethernet/emulex/benet/be_main.c        |  10 +
 drivers/net/ethernet/freescale/gianfar.c           |  15 +-
 drivers/net/ethernet/freescale/gianfar_ptp.c       |   1 +
 drivers/net/ethernet/freescale/ucc_geth.c          |   8 +-
 drivers/net/ethernet/marvell/mvneta.c              |   6 +-
 drivers/net/ethernet/mellanox/mlx4/en_rx.c         |   2 -
 drivers/net/ethernet/micrel/ks8851.c               |   1 +
 drivers/net/ethernet/moxa/moxart_ether.c           |   1 +
 drivers/net/ethernet/qlogic/qlcnic/qlcnic.h        |   1 +
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c   |  18 +-
 drivers/net/ethernet/realtek/8139cp.c              | 111 +++---
 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c  |  11 +-
 drivers/net/ethernet/sun/sunvnet.c                 |  17 +-
 drivers/net/ethernet/ti/netcp_core.c               |  74 ++--
 drivers/net/ethernet/ti/netcp_ethss.c              |  47 +--
 drivers/net/ethernet/via/Kconfig                   |   2 +-
 drivers/net/ethernet/xilinx/xilinx_emaclite.c      |   2 +
 drivers/net/fjes/fjes_hw.c                         |   8 +-
 drivers/net/geneve.c                               |  32 +-
 drivers/net/irda/ali-ircc.c                        |   6 -
 drivers/net/macvtap.c                              |   4 +-
 drivers/net/phy/fixed_phy.c                        |   2 +-
 drivers/net/phy/marvell.c                          |   9 +
 drivers/net/phy/mdio-bcm-unimac.c                  |   1 +
 drivers/net/phy/mdio-gpio.c                        |   1 +
 drivers/net/phy/mdio-mux.c                         |  19 +-
 drivers/net/phy/mdio_bus.c                         |  31 +-
 drivers/net/phy/phy_device.c                       |  62 ++-
 drivers/net/phy/vitesse.c                          |  14 -
 drivers/net/ppp/ppp_generic.c                      |   4 +-
 drivers/net/usb/Kconfig                            |  11 +
 drivers/net/usb/Makefile                           |   2 +-
 drivers/net/usb/ch9200.c                           | 432 +++++++++++++++++++++
 drivers/net/vrf.c                                  |   3 +-
 drivers/net/vxlan.c                                |  15 +-
 drivers/of/of_mdio.c                               |  27 +-
 drivers/of/of_pci_irq.c                            |  22 +-
 drivers/parisc/dino.c                              |   3 +
 drivers/parisc/lba_pci.c                           |   1 +
 drivers/pci/access.c                               |  27 +-
 drivers/pci/bus.c                                  |   2 +
 drivers/pci/host/pci-rcar-gen2.c                   |   1 +
 drivers/pci/probe.c                                |  23 +-
 drivers/pci/quirks.c                               |  20 +-
 drivers/staging/android/TODO                       |  20 +
 drivers/staging/android/ion/ion.c                  |   6 +-
 drivers/staging/fbtft/fb_uc1611.c                  |   2 +-
 drivers/staging/fbtft/fb_watterott.c               |   4 +-
 drivers/staging/fbtft/fbtft-core.c                 |  10 +-
 drivers/staging/fbtft/flexfb.c                     |  11 +-
 drivers/staging/lustre/README.txt                  |  16 +-
 drivers/staging/most/Kconfig                       |   1 +
 drivers/staging/most/hdm-dim2/Kconfig              |   1 +
 drivers/staging/most/hdm-usb/Kconfig               |   2 +-
 drivers/staging/most/mostcore/Kconfig              |   1 +
 drivers/staging/unisys/visorbus/Makefile           |   1 -
 drivers/staging/unisys/visorbus/visorbus_main.c    |  13 +-
 drivers/staging/unisys/visornic/visornic_main.c    |  18 +-
 drivers/target/iscsi/iscsi_target_parameters.c     |   5 +-
 drivers/target/target_core_device.c                |  45 ++-
 drivers/target/target_core_hba.c                   |   2 +-
 drivers/target/target_core_iblock.c                |   2 +
 drivers/target/target_core_pr.c                    |  91 +++--
 drivers/target/target_core_tpg.c                   |   5 +-
 drivers/thermal/Kconfig                            |  17 +-
 drivers/thermal/cpu_cooling.c                      |  52 ++-
 drivers/thermal/db8500_cpufreq_cooling.c           |   1 +
 drivers/thermal/power_allocator.c                  | 243 +++++++++---
 drivers/thermal/thermal_core.c                     |  28 ++
 drivers/thermal/ti-soc-thermal/Kconfig             |   8 +-
 drivers/thunderbolt/nhi.c                          |   2 +-
 drivers/tty/serial/8250/8250_port.c                |   2 +
 drivers/usb/chipidea/ci_hdrc_imx.c                 |   2 +-
 drivers/usb/chipidea/ci_hdrc_usb2.c                |  25 +-
 drivers/usb/chipidea/udc.c                         |  84 ++--
 drivers/usb/core/config.c                          |   5 +-
 drivers/usb/dwc3/dwc3-omap.c                       |   4 +-
 drivers/usb/dwc3/gadget.c                          |   4 -
 drivers/usb/gadget/epautoconf.c                    |   1 +
 drivers/usb/gadget/udc/amd5536udc.c                |  43 +-
 drivers/usb/gadget/udc/atmel_usba_udc.c            |  11 +
 drivers/usb/gadget/udc/bdc/bdc_core.c              |   3 +-
 drivers/usb/gadget/udc/dummy_hcd.c                 |  46 ++-
 drivers/usb/gadget/udc/gr_udc.c                    |   3 +-
 drivers/usb/gadget/udc/mv_u3d_core.c               |   3 +-
 drivers/usb/gadget/udc/mv_udc_core.c               |   3 +-
 drivers/usb/host/xhci-mem.c                        |  17 +-
 drivers/usb/host/xhci-pci.c                        |  90 ++---
 drivers/usb/host/xhci-ring.c                       |  13 +-
 drivers/usb/host/xhci.c                            |  24 +-
 drivers/usb/musb/musb_core.c                       |   7 +
 drivers/usb/musb/musb_cppi41.c                     |   3 +
 drivers/usb/musb/musb_dsps.c                       |   7 +-
 drivers/usb/musb/ux500.c                           |   2 +
 drivers/usb/phy/Kconfig                            |   2 +-
 drivers/usb/phy/phy-generic.c                      |   3 +-
 drivers/usb/phy/phy-isp1301.c                      |   1 +
 drivers/usb/serial/option.c                        |  24 ++
 drivers/usb/serial/whiteheat.c                     |  31 ++
 fs/btrfs/btrfs_inode.h                             |   2 -
 fs/btrfs/disk-io.c                                 |   2 -
 fs/btrfs/extent-tree.c                             |   7 +-
 fs/btrfs/extent_io.c                               |  65 +++-
 fs/btrfs/inode.c                                   |  45 +--
 fs/btrfs/super.c                                   |   2 -
 fs/btrfs/transaction.c                             |  32 ++
 fs/btrfs/transaction.h                             |   5 +-
 fs/cifs/cifsencrypt.c                              |  53 ++-
 fs/cifs/smb2ops.c                                  |   8 +-
 fs/cifs/smb2pdu.c                                  |  84 +++-
 fs/nfs/delegation.c                                |   8 +-
 fs/nfs/delegation.h                                |   2 +-
 fs/nfs/direct.c                                    |   7 +-
 fs/nfs/filelayout/filelayout.c                     |  31 +-
 fs/nfs/nfs42proc.c                                 |   4 +-
 fs/nfs/nfs4proc.c                                  | 127 +++---
 fs/nfs/nfs4state.c                                 |   2 +-
 fs/nfs/pagelist.c                                  |   2 +-
 fs/nfs/pnfs.c                                      |  35 +-
 fs/nfs/pnfs.h                                      |   7 +
 fs/nfs/read.c                                      |   3 +
 fs/nfs/write.c                                     |   3 +
 include/linux/backing-dev.h                        |  11 +-
 include/linux/netdevice.h                          |   1 +
 include/linux/phy.h                                |   6 +-
 include/linux/skbuff.h                             |   9 +-
 include/linux/sunrpc/xprtsock.h                    |   3 +
 include/linux/thermal.h                            |   8 +-
 include/net/flow.h                                 |   1 +
 include/net/inet_timewait_sock.h                   |  14 +-
 include/net/ip6_fib.h                              |   3 +-
 include/net/ip6_tunnel.h                           |  17 +-
 include/net/ip_fib.h                               |  30 +-
 include/net/ip_tunnels.h                           |   2 +
 include/net/route.h                                |   2 +-
 include/target/target_core_base.h                  |   1 +
 include/uapi/linux/lwtunnel.h                      |   4 -
 kernel/events/core.c                               | 114 ++++--
 kernel/locking/lockdep.c                           |  10 +-
 kernel/sched/core.c                                |  14 +-
 lib/rhashtable.c                                   |   5 +-
 net/atm/clip.c                                     |   3 +
 net/bluetooth/smp.c                                |  12 +-
 net/bridge/br_multicast.c                          |   4 +-
 net/core/dev.c                                     |   2 +
 net/core/fib_rules.c                               |  14 +-
 net/core/filter.c                                  |   2 +-
 net/core/net-sysfs.c                               |   9 +
 net/core/netpoll.c                                 |  10 +-
 net/core/rtnetlink.c                               |  26 +-
 net/core/sock.c                                    |  12 +-
 net/dccp/ackvec.c                                  |  12 +-
 net/dccp/ccid.c                                    |   3 +-
 net/dccp/minisocks.c                               |   4 +-
 net/dsa/dsa.c                                      |  41 +-
 net/dsa/tag_trailer.c                              |   2 +-
 net/ipv4/arp.c                                     |  39 +-
 net/ipv4/fib_trie.c                                |   2 +-
 net/ipv4/icmp.c                                    |   4 +-
 net/ipv4/inet_connection_sock.c                    |   8 +-
 net/ipv4/inet_timewait_sock.c                      |  16 +-
 net/ipv4/ip_tunnel_core.c                          |  54 +--
 net/ipv4/route.c                                   |   6 +-
 net/ipv4/tcp_cubic.c                               |  10 +-
 net/ipv4/tcp_minisocks.c                           |  13 +-
 net/ipv4/tcp_output.c                              |   1 +
 net/ipv4/udp.c                                     |   3 +-
 net/ipv4/xfrm4_policy.c                            |   2 +
 net/ipv6/addrconf.c                                |   7 +-
 net/ipv6/ip6_fib.c                                 |  26 +-
 net/ipv6/ip6_gre.c                                 |  93 +++--
 net/ipv6/ip6_output.c                              |  14 +-
 net/ipv6/ip6_tunnel.c                              | 147 +++++--
 net/ipv6/route.c                                   |  16 +-
 net/mac80211/cfg.c                                 |  13 +-
 net/netfilter/nf_log.c                             |   9 +-
 net/netfilter/nft_compat.c                         |  24 +-
 net/netlink/af_netlink.c                           |  63 ++-
 net/netlink/af_netlink.h                           |  10 +
 net/openvswitch/Kconfig                            |   3 +-
 net/openvswitch/conntrack.c                        |   8 +-
 net/openvswitch/datapath.c                         |   4 +-
 net/openvswitch/flow_netlink.c                     |  82 ++--
 net/openvswitch/flow_table.c                       |  23 +-
 net/openvswitch/flow_table.h                       |   2 +-
 net/packet/af_packet.c                             |  32 +-
 net/sched/cls_fw.c                                 |  30 +-
 net/sctp/protocol.c                                |  64 +--
 net/sunrpc/sched.c                                 |  12 +-
 net/sunrpc/xprt.c                                  |   6 +
 net/sunrpc/xprtsock.c                              |  15 +-
 net/tipc/msg.c                                     |   1 +
 sound/arm/Kconfig                                  |  15 +-
 sound/pci/hda/hda_tegra.c                          |  30 +-
 sound/pci/hda/patch_realtek.c                      |  31 +-
 sound/soc/au1x/psc-i2s.c                           |   1 -
 sound/soc/codecs/rt5645.c                          |  22 +-
 sound/soc/codecs/wm0010.c                          |  23 +-
 sound/soc/codecs/wm8960.c                          |  26 +-
 sound/soc/codecs/wm8962.c                          |   3 +-
 sound/soc/davinci/davinci-mcasp.c                  |  14 +-
 sound/soc/fsl/fsl-asoc-card.c                      |   3 +-
 sound/soc/fsl/fsl_ssi.c                            |   5 +-
 sound/soc/intel/haswell/sst-haswell-ipc.c          |  20 +-
 sound/soc/mediatek/mtk-afe-pcm.c                   |  17 +
 sound/soc/pxa/Kconfig                              |   2 -
 sound/soc/pxa/pxa2xx-ac97.c                        |   4 +-
 sound/soc/soc-dapm.c                               |   2 +-
 sound/soc/soc-utils.c                              |   9 +
 sound/soc/spear/Kconfig                            |   2 +-
 sound/soc/sti/uniperif_player.c                    |  14 +-
 sound/soc/sti/uniperif_reader.c                    |   6 +-
 tools/build/Makefile.feature                       |   8 +-
 tools/build/feature/Makefile                       |  10 +-
 tools/build/feature/test-all.c                     |  10 +
 tools/build/feature/test-get_cpuid.c               |   7 +
 tools/build/feature/test-numa_num_possible_cpus.c  |   6 +
 tools/lib/traceevent/event-parse.c                 |  23 +-
 tools/perf/Documentation/intel-pt.txt              |  15 -
 tools/perf/config/Makefile                         |  20 +-
 tools/perf/util/probe-event.c                      |  13 +-
 tools/perf/util/session.c                          |   5 +-
 tools/perf/util/stat.c                             |  16 +-
 tools/perf/util/symbol-elf.c                       |  37 +-
 tools/perf/util/util.c                             |   2 +-
 virt/kvm/kvm_main.c                                |   4 +-
 355 files changed, 4329 insertions(+), 1845 deletions(-)
 create mode 100644 Documentation/networking/vrf.txt
 create mode 100644 drivers/firmware/qcom_scm-64.c
 create mode 100644 drivers/net/usb/ch9200.c
 create mode 100644 tools/build/feature/test-get_cpuid.c
 create mode 100644 tools/build/feature/test-numa_num_possible_cpus.c
Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (274e91b81ed2 ARM: alignment: fix alignment handling for uaccess changes)
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (95bc06ef049b m68k/defconfig: Update defconfigs for v4.3-rc1)
$ git merge m68k-current/for-linus
Merge made by the 'recursive' strategy.
 arch/m68k/configs/amiga_defconfig    |  9 ++++++++-
 arch/m68k/configs/apollo_defconfig   |  9 ++++++++-
 arch/m68k/configs/atari_defconfig    |  9 ++++++++-
 arch/m68k/configs/bvme6000_defconfig |  9 ++++++++-
 arch/m68k/configs/hp300_defconfig    |  9 ++++++++-
 arch/m68k/configs/mac_defconfig      |  9 ++++++++-
 arch/m68k/configs/multi_defconfig    |  9 ++++++++-
 arch/m68k/configs/mvme147_defconfig  |  9 ++++++++-
 arch/m68k/configs/mvme16x_defconfig  |  9 ++++++++-
 arch/m68k/configs/q40_defconfig      |  9 ++++++++-
 arch/m68k/configs/sun3_defconfig     |  9 ++++++++-
 arch/m68k/configs/sun3x_defconfig    |  9 ++++++++-
 arch/m68k/include/asm/linkage.h      | 30 ++++++++++++++++++++++++++++++
 arch/m68k/include/asm/unistd.h       |  2 +-
 arch/m68k/include/uapi/asm/unistd.h  | 19 +++++++++++++++++++
 arch/m68k/kernel/syscalltable.S      | 20 +++++++++++++++++++-
 16 files changed, 165 insertions(+), 14 deletions(-)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
$ git merge mips-fixes/mips-fixes
Already up-to-date.
Merging powerpc-fixes/fixes (d6eb71a6d2ed cxl: Fix lockdep warning while creating afu_err_buff attribute)
$ git merge powerpc-fixes/fixes
Already up-to-date.
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
$ git merge powerpc-merge-mpe/fixes
Already up-to-date.
Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
$ git merge sparc/master
Merge made by the 'recursive' strategy.
 arch/sparc/include/uapi/asm/asi.h |  2 +-
 arch/sparc/lib/VISsave.S          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
Merging net/master (72521ea07c0a r8169: fix handling rtl_readphy result)
$ git merge net/master
Merge made by the 'recursive' strategy.
 drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +-
 drivers/net/ethernet/realtek/r8169.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Merging ipsec/master (04a6b8bfee06 xfrm6: Fix ICMPv6 and MH header checks in _decode_session6)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
 net/ipv6/xfrm6_output.c | 17 +++++++++++------
 net/ipv6/xfrm6_policy.c |  6 ++++--
 2 files changed, 15 insertions(+), 8 deletions(-)
Merging sound-current/for-linus (7f57d803ee03 ALSA: hda - Disable power_save_node for Thinkpads)
$ git merge sound-current/for-linus
Already up-to-date.
Merging pci-current/for-linus (de24c18c0fac PCI: rcar: Add R8A7794 support)
$ git merge pci-current/for-linus
Already up-to-date.
Merging wireless-drivers/master (76d164f58215 ath10k: fix DMA related firmware crashes on multiple devices)
$ git merge wireless-drivers/master
Merge made by the 'recursive' strategy.
 drivers/net/wireless/ath/ath10k/hw.h    | 4 ++--
 drivers/net/wireless/ath/ath9k/init.c   | 1 +
 drivers/net/wireless/b43/main.c         | 1 +
 drivers/net/wireless/rt2x00/rt2800usb.c | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)
Merging driver-core.current/driver-core-linus (2110d70c5e58 cpu/cacheinfo: Fix teardown path)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (f7a7651fcd40 tty: serial: Add missing module license for 8250_base.ko)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (b4731977243c MAINTAINERS: remove amd5536udc USB gadget driver maintainer)
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (9ffecb102835 Linux 4.3-rc3)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (19ab6bc5674a USB: option: add ZTE PIDs)
$ git merge usb-serial-fixes/usb-linus
Already up-to-date.
Merging staging.current/staging-linus (74c600e36455 MAINTAINERS: Update email address for Martyn Welch)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (9ffecb102835 Linux 4.3-rc3)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (d79bdc7f0044 Input: omap4-keypad - fix memory leak)
$ git merge input-current/for-linus
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/input/cypress,cyapa.txt    |  2 +-
 Documentation/input/multi-touch-protocol.txt       |  2 +-
 drivers/input/joystick/walkera0701.c               |  4 +--
 drivers/input/keyboard/omap4-keypad.c              |  2 +-
 drivers/input/misc/pm8941-pwrkey.c                 |  2 +-
 drivers/input/misc/uinput.c                        |  2 +-
 drivers/input/mouse/elan_i2c.h                     |  2 +-
 drivers/input/mouse/elan_i2c_core.c                | 17 ++++++-----
 drivers/input/mouse/elan_i2c_i2c.c                 |  4 +--
 drivers/input/mouse/elan_i2c_smbus.c               |  4 +--
 drivers/input/serio/parkbd.c                       |  1 +
 drivers/input/touchscreen/imx6ul_tsc.c             | 34 ++++++++++++++--------
 drivers/input/touchscreen/mms114.c                 |  4 +--
 13 files changed, 47 insertions(+), 33 deletions(-)
Merging crypto-current/master (09185e2756a8 hwrng: xgene - fix handling platform_get_irq)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
$ git merge ide/master
Already up-to-date.
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
$ git merge devicetree-current/devicetree/merge
Already up-to-date.
Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
$ git merge rr-fixes/fixes
Merge made by the 'recursive' strategy.
 kernel/module.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (ae7858180510 selftests: exec: revert to default emit rule)
$ 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 mfd-fixes/for-mfd-fixes (fb9caeedafe6 mfd: Remove MFD_CROS_EC_SPI depends on OF)
$ git merge mfd-fixes/for-mfd-fixes
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (bc5f2ab11ca6 drm/i915/skl: Don't call intel_prepare_ddi when encoder list isn't yet initialized.)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/intel_runtime_pm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge arc/for-next
Already up-to-date.
Merging arm/for-next (22b7c00506d1 Merge branches 'fixes' and 'misc' into for-next)
$ git merge arm/for-next
Merge made by the 'recursive' strategy.
 Documentation/arm/memory.txt     |  2 +-
 arch/arm/include/asm/irqflags.h  | 10 ++++++++
 arch/arm/include/asm/mach/arch.h |  2 +-
 arch/arm/include/asm/memory.h    |  2 ++
 arch/arm/include/asm/pgtable.h   |  2 +-
 arch/arm/include/asm/smp.h       |  4 ++--
 arch/arm/include/asm/unistd.h    |  7 ------
 arch/arm/kernel/entry-armv.S     | 33 +++----------------------
 arch/arm/kernel/hw_breakpoint.c  |  1 -
 arch/arm/kernel/kgdb.c           | 31 ++++++++++--------------
 arch/arm/kernel/smp.c            |  3 ++-
 arch/arm/kernel/smp_twd.c        |  4 ----
 arch/arm/kernel/traps.c          | 52 ----------------------------------------
 arch/arm/lib/clear_user.S        |  4 ++++
 arch/arm/mm/Kconfig              | 12 ----------
 arch/arm/mm/dma-mapping.c        |  7 ++++++
 arch/arm/mm/mmu.c                |  3 +++
 17 files changed, 48 insertions(+), 131 deletions(-)
Merging arm-perf/for-next/perf (6ff33f3902c3 Linux 4.3-rc1)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (25c6651aa40f Merge branch 'fixes' into for-next)
$ git merge arm-soc/for-next
Merge made by the 'recursive' strategy.
 arch/arm/arm-soc-for-next-contents.txt | 303 +++++++++++++++++++++++++++++++++
 1 file changed, 303 insertions(+)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging at91/at91-next (5ccea17e1ab3 Merge branch 'at91-4.4-defconfig' into at91-next)
$ git merge at91/at91-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                 |   2 +-
 arch/arm/Kconfig.debug                      |  41 +-
 arch/arm/boot/dts/at91-sama5d2_xplained.dts |  61 ++
 arch/arm/boot/dts/at91-sama5d3_xplained.dts |   2 +-
 arch/arm/boot/dts/at91-sama5d4_xplained.dts |   2 +-
 arch/arm/boot/dts/at91-sama5d4ek.dts        |  27 +
 arch/arm/boot/dts/at91sam9m10g45ek.dts      |   2 +
 arch/arm/boot/dts/at91sam9n12ek.dts         |   8 +-
 arch/arm/boot/dts/at91sam9x5.dtsi           |   3 +-
 arch/arm/boot/dts/at91sam9x5ek.dtsi         |   8 +
 arch/arm/boot/dts/sama5d2-pinfunc.h         | 880 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/sama5d3.dtsi              |   3 +-
 arch/arm/boot/dts/sama5d3xmb.dtsi           |   2 +
 arch/arm/boot/dts/sama5d4.dtsi              |  17 +-
 arch/arm/include/debug/at91.S               |  18 +-
 arch/arm/mach-at91/Kconfig                  |   1 +
 include/linux/platform_data/atmel.h         |   8 -
 17 files changed, 1018 insertions(+), 67 deletions(-)
 create mode 100644 arch/arm/boot/dts/sama5d2-pinfunc.h
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
$ git merge bcm2835/for-next
Already up-to-date.
Merging berlin/berlin/for-next (db614c0f0e33 Merge branch 'berlin64/soc' into berlin/for-next)
$ git merge berlin/berlin/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts        |   3 +-
 arch/arm/boot/dts/berlin2.dtsi                    |  16 +++
 arch/arm/boot/dts/berlin2cd-google-chromecast.dts |   3 +-
 arch/arm/boot/dts/berlin2cd.dtsi                  |  13 +++
 arch/arm/boot/dts/berlin2q-marvell-dmp.dts        |   3 +-
 arch/arm/boot/dts/berlin2q.dtsi                   |  16 +++
 arch/arm/mach-berlin/berlin.c                     |   6 ++
 arch/arm64/Kconfig.platforms                      |   1 +
 arch/arm64/boot/dts/marvell/Makefile              |   1 +
 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts     |  66 ++++++++++++
 arch/arm64/boot/dts/marvell/berlin4ct.dtsi        | 120 ++++++++++++++++++++++
 drivers/clk/berlin/bg2.c                          |   1 -
 drivers/clk/berlin/bg2q.c                         |  13 ++-
 include/dt-bindings/clock/berlin2.h               |   2 +
 include/dt-bindings/clock/berlin2q.h              |   3 +
 15 files changed, 256 insertions(+), 11 deletions(-)
 create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
$ git merge cortex-m/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/efm32gg-dk3750.dts |  8 ++++----
 arch/arm/boot/dts/efm32gg.dtsi       | 32 ++++++++++++++++----------------
 2 files changed, 20 insertions(+), 20 deletions(-)
Merging imx-mxs/for-next (6f5c63262020 Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/imx23.dtsi                 |   6 +-
 arch/arm/boot/dts/imx28-evk.dts              |   2 +-
 arch/arm/boot/dts/imx28-m28evk.dts           |   2 +-
 arch/arm/boot/dts/imx28.dtsi                 |   6 +-
 arch/arm/boot/dts/imx31.dtsi                 |   2 +-
 arch/arm/boot/dts/imx35.dtsi                 |   2 +-
 arch/arm/boot/dts/imx50-evk.dts              |   2 +-
 arch/arm/boot/dts/imx53-qsrb.dts             |   2 +-
 arch/arm/boot/dts/imx53-smd.dts              |   2 +-
 arch/arm/boot/dts/imx53.dtsi                 |   1 +
 arch/arm/boot/dts/imx6dl-rex-basic.dts       |   2 +-
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts      |   2 +-
 arch/arm/boot/dts/imx6q-gw5400-a.dts         |   2 +-
 arch/arm/boot/dts/imx6q-rex-pro.dts          |   2 +-
 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi  |   2 +-
 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi |   2 +-
 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi |   2 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi    |   2 +-
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi |   2 +-
 arch/arm/boot/dts/imx6qdl-rex.dtsi           |   2 -
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi     |   2 +-
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi     |   2 +-
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi       |   2 +-
 arch/arm/boot/dts/imx6sl-evk.dts             |   2 +-
 arch/arm/boot/dts/imx6sl.dtsi                |   5 +-
 arch/arm/boot/dts/imx6sx-sdb-reva.dts        |   4 +-
 arch/arm/boot/dts/imx6sx-sdb.dts             |   4 +-
 arch/arm/boot/dts/imx6ul-14x14-evk.dts       |  22 ++++
 arch/arm/boot/dts/imx6ul.dtsi                |  29 +++++
 arch/arm/boot/dts/imx7d-pinfunc.h            | 122 +++++++++++++++++++-
 arch/arm/boot/dts/imx7d-sdb.dts              | 100 +++++++++++++++-
 arch/arm/boot/dts/imx7d.dtsi                 | 165 +++++++++++++++++++++++++++
 arch/arm/boot/dts/ls1021a-twr.dts            |  13 +++
 arch/arm/boot/dts/ls1021a.dtsi               |  43 +++++++
 arch/arm/configs/imx_v6_v7_defconfig         |   2 +-
 arch/arm/mach-imx/common.h                   |   1 +
 arch/arm/mach-imx/mach-imx6ul.c              |   2 +
 arch/arm/mach-imx/mach-imx7d.c               |  74 ++++++++++++
 arch/arm/mach-imx/pm-imx6.c                  |  46 +++++++-
 arch/arm/mach-imx/suspend-imx6.S             |   3 +
 drivers/clk/imx/clk-imx25.c                  |  12 ++
 drivers/clk/imx/clk-imx27.c                  |  13 +++
 drivers/clk/imx/clk-imx31.c                  |  12 ++
 drivers/clk/imx/clk-imx35.c                  |  59 ++++++----
 drivers/clk/imx/clk-imx51-imx53.c            |  16 +++
 drivers/clk/imx/clk-imx6q.c                  |   8 ++
 drivers/clk/imx/clk-imx6sl.c                 |   8 ++
 drivers/clk/imx/clk-imx6sx.c                 |   8 ++
 drivers/clk/imx/clk-imx6ul.c                 |  18 +++
 drivers/clk/imx/clk-imx7d.c                  |  13 +++
 drivers/clk/imx/clk-vf610.c                  |   1 +
 drivers/clk/imx/clk.c                        |  38 ++++++
 drivers/clk/imx/clk.h                        |   1 +
 include/dt-bindings/clock/vf610-clock.h      |   3 +-
 include/linux/mfd/syscon/imx7-iomuxc-gpr.h   |  47 ++++++++
 55 files changed, 882 insertions(+), 65 deletions(-)
 create mode 100644 include/linux/mfd/syscon/imx7-iomuxc-gpr.h
Merging keystone/next (6fc43b806999 Merge branch 'for_4.4/config' into next)
$ git merge keystone/next
Merge made by the 'recursive' strategy.
 .../bindings/soc/ti/keystone-navigator-qmss.txt    | 20 +++++++-
 arch/arm/boot/dts/keystone.dtsi                    |  6 +--
 arch/arm/configs/keystone_defconfig                | 54 +++++++++++-----------
 drivers/soc/ti/knav_qmss_acc.c                     |  4 ++
 drivers/soc/ti/knav_qmss_queue.c                   |  3 ++
 5 files changed, 56 insertions(+), 31 deletions(-)
Merging mvebu/for-next (adfc8c76d84a Merge branch 'mvebu/config' into mvebu/for-next)
$ git merge mvebu/for-next
Merge made by the 'recursive' strategy.
Merging omap/for-next (9a5e3f27d1b8 ARM: dts: fix omap2+ address translation for pbias)
$ git merge omap/for-next
Already up-to-date.
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
$ git merge omap-pending/for-next
Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution.
Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution.
Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3e5cdb394017] Merge remote-tracking branch 'omap-pending/for-next'
$ git diff -M --stat --summary HEAD^..
Merging qcom/qcom/for-next (0eac5ea05ecd Merge branch 'dts-for-4.3-rc2' into base-4.3-rc1)
$ git merge qcom/qcom/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/soc/qcom/qcom,smem.txt     |  51 ++++
 arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts        |  48 +++-
 arch/arm/boot/dts/qcom-apq8064-ifc6410.dts         |  60 ++++-
 arch/arm/boot/dts/qcom-apq8064.dtsi                |  50 +++-
 arch/arm/boot/dts/qcom-ipq4019.dtsi                |  72 +++++
 .../boot/dts/qcom-msm8974-sony-xperia-honami.dts   | 199 ++++++++++++++
 arch/arm/boot/dts/qcom-msm8974.dtsi                |  74 ++++++
 arch/arm/boot/dts/qcom-pm8941.dtsi                 |   3 +-
 arch/arm/configs/qcom_defconfig                    |   8 +-
 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi          |   1 +
 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi         |  31 ++-
 arch/arm64/boot/dts/qcom/msm8916.dtsi              |  20 ++
 drivers/soc/qcom/Kconfig                           |  16 +-
 drivers/soc/qcom/smd-rpm.c                         |  68 ++---
 drivers/soc/qcom/smd.c                             | 284 ++++++++++++--------
 drivers/soc/qcom/smem.c                            | 295 ++++++++++++---------
 include/linux/soc/qcom/smd.h                       |  11 +
 include/linux/soc/qcom/smem.h                      |   2 +-
 18 files changed, 995 insertions(+), 298 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt
 create mode 100644 arch/arm/boot/dts/qcom-ipq4019.dtsi
Merging renesas/next (ab3ecbc2626a Merge branches 'heads/sh-drivers-for-v4.3', 'heads/defconfig-for-v4.4', 'heads/dt-for-v4.4' and 'heads/soc-for-v4.4' into next)
$ git merge renesas/next
Removing arch/arm/mach-shmobile/sh-gpio.h
Removing arch/arm/mach-shmobile/r8a7778.h
Removing arch/arm/mach-shmobile/intc.h
Removing arch/arm/mach-shmobile/console.c
Removing arch/arm/mach-shmobile/clock.h
Removing arch/arm/mach-shmobile/clock.c
Removing arch/arm/mach-shmobile/clock-r8a7778.c
Removing arch/arm/mach-shmobile/board-bockw.c
Removing arch/arm/mach-shmobile/board-bockw-reference.c
Removing arch/arm/mach-shmobile/Makefile.boot
Removing arch/arm/configs/bockw_defconfig
Removing arch/arm/boot/dts/r8a7778-bockw-reference.dts
Auto-merging arch/arm/Kconfig.debug
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/shmobile.txt |   8 +-
 MAINTAINERS                                        |   2 -
 arch/arm/Kconfig                                   |  26 +-
 arch/arm/Kconfig.debug                             |   3 +-
 arch/arm/boot/dts/Makefile                         |   3 -
 arch/arm/boot/dts/r8a7778-bockw-reference.dts      | 139 ----
 arch/arm/boot/dts/r8a7778.dtsi                     |   2 +-
 arch/arm/boot/dts/r8a7779-marzen.dts               |   6 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |  16 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |   3 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |   9 +-
 arch/arm/boot/dts/r8a7791.dtsi                     |   3 +-
 arch/arm/boot/dts/r8a7794-silk.dts                 |  88 +++
 arch/arm/boot/dts/r8a7794.dtsi                     | 224 ++++++-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |   2 +-
 arch/arm/configs/bockw_defconfig                   | 133 ----
 arch/arm/configs/multi_v7_defconfig                |   1 -
 arch/arm/configs/shmobile_defconfig                |   1 -
 arch/arm/mach-shmobile/Kconfig                     |  73 --
 arch/arm/mach-shmobile/Makefile                    |  14 +-
 arch/arm/mach-shmobile/Makefile.boot               |  12 -
 arch/arm/mach-shmobile/board-bockw-reference.c     |  86 ---
 arch/arm/mach-shmobile/board-bockw.c               | 737 ---------------------
 arch/arm/mach-shmobile/clock-r8a7778.c             | 342 ----------
 arch/arm/mach-shmobile/clock.c                     |  47 --
 arch/arm/mach-shmobile/clock.h                     |  42 --
 arch/arm/mach-shmobile/common.h                    |   5 -
 arch/arm/mach-shmobile/console.c                   |  27 -
 arch/arm/mach-shmobile/intc.h                      | 295 ---------
 arch/arm/mach-shmobile/pm-rmobile.c                |  35 +-
 arch/arm/mach-shmobile/pm-rmobile.h                |   9 -
 arch/arm/mach-shmobile/r8a7778.h                   |  78 ---
 arch/arm/mach-shmobile/r8a7779.h                   |   2 -
 arch/arm/mach-shmobile/setup-r8a7778.c             | 560 +---------------
 arch/arm/mach-shmobile/sh-gpio.h                   |  29 -
 arch/arm/mach-shmobile/timer.c                     |  21 -
 drivers/clk/shmobile/clk-mstp.c                    |   4 +
 37 files changed, 349 insertions(+), 2738 deletions(-)
 delete mode 100644 arch/arm/boot/dts/r8a7778-bockw-reference.dts
 delete mode 100644 arch/arm/configs/bockw_defconfig
 delete mode 100644 arch/arm/mach-shmobile/Makefile.boot
 delete mode 100644 arch/arm/mach-shmobile/board-bockw-reference.c
 delete mode 100644 arch/arm/mach-shmobile/board-bockw.c
 delete mode 100644 arch/arm/mach-shmobile/clock-r8a7778.c
 delete mode 100644 arch/arm/mach-shmobile/clock.c
 delete mode 100644 arch/arm/mach-shmobile/clock.h
 delete mode 100644 arch/arm/mach-shmobile/console.c
 delete mode 100644 arch/arm/mach-shmobile/intc.h
 delete mode 100644 arch/arm/mach-shmobile/r8a7778.h
 delete mode 100644 arch/arm/mach-shmobile/sh-gpio.h
Merging rockchip/for-next (6ba6d4146d13 Merge branch 'v4.4-armsoc/dts32' into for-next)
$ git merge rockchip/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/rockchip.txt |  11 +
 arch/arm/boot/dts/Makefile                         |   2 +
 arch/arm/boot/dts/rk3066a-bqcurie2.dts             |   2 +
 arch/arm/boot/dts/rk3066a-marsboard.dts            |   8 +
 arch/arm/boot/dts/rk3066a-rayeager.dts             |   2 +
 arch/arm/boot/dts/rk3188-radxarock.dts             |   2 +
 arch/arm/boot/dts/rk3288-rock2-som.dtsi            | 277 +++++++++++++++++++++
 arch/arm/boot/dts/rk3288-rock2-square.dts          | 149 +++++++++++
 arch/arm/boot/dts/rk3288-veyron-jaq.dts            | 176 +++++++++++++
 arch/arm/boot/dts/rk3288-veyron.dtsi               |  12 -
 arch/arm/boot/dts/rk3288.dtsi                      |  15 +-
 11 files changed, 640 insertions(+), 16 deletions(-)
 create mode 100644 arch/arm/boot/dts/rk3288-rock2-som.dtsi
 create mode 100644 arch/arm/boot/dts/rk3288-rock2-square.dts
 create mode 100644 arch/arm/boot/dts/rk3288-veyron-jaq.dts
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
$ git merge rpi/for-rpi-next
Already up-to-date.
Merging samsung/for-next (6d205db6e706 Merge branch 'v4.4-next/cpufreq-samsung' into for-next)
$ git merge samsung/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/hwmon/pwm-fan.txt          | 29 ++++++-
 Documentation/devicetree/bindings/mfd/s2mps11.txt  |  4 +
 arch/arm/boot/dts/Makefile                         |  1 +
 arch/arm/boot/dts/exynos4412-odroidu3.dts          | 43 ++++++++++
 arch/arm/boot/dts/exynos4412.dtsi                  |  1 +
 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi  | 61 +++++++++++++
 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 99 +---------------------
 arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts    | 51 +++++++++++
 arch/arm/boot/dts/exynos5422-odroidxu3.dts         | 51 +++++++++++
 arch/arm/boot/dts/exynos5422-odroidxu4.dts         | 48 +++++++++++
 arch/arm/configs/exynos_defconfig                  |  4 +
 drivers/cpufreq/s5pv210-cpufreq.c                  |  2 -
 12 files changed, 293 insertions(+), 101 deletions(-)
 create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
 create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu4.dts
Merging samsung-krzk/for-next (b58ebcbed86d Merge branch 'defconfig-for-next' into for-next)
$ git merge samsung-krzk/for-next
Auto-merging arch/arm/configs/multi_v7_defconfig
Auto-merging arch/arm/configs/exynos_defconfig
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/exynos4.dtsi                  |   8 ++
 arch/arm/boot/dts/exynos5250-smdk5250.dts       |   1 +
 arch/arm/configs/exynos_defconfig               |   9 ++-
 arch/arm/configs/multi_v7_defconfig             |   2 +
 arch/arm/mach-exynos/mcpm-exynos.c              |  27 ++++++-
 arch/arm/mach-exynos/regs-pmu.h                 |   6 ++
 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 103 ++++++++++++++++++++++++
 arch/arm64/boot/dts/exynos/exynos7.dtsi         |   7 ++
 8 files changed, 161 insertions(+), 2 deletions(-)
Merging sunxi/sunxi/for-next (1ca27e079283 Merge branches 'sunxi/clocks-for-4.4', 'sunxi/core-for-4.4', 'sunxi/defconfig-for-4.4' and 'sunxi/dt-for-4.4' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Auto-merging arch/arm/configs/multi_v7_defconfig
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |   2 +-
 arch/arm/boot/dts/Makefile                         |  12 +-
 arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts    |  12 ++
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts           |  11 +-
 arch/arm/boot/dts/sun4i-a10-inet1.dts              | 226 ++++++++++++++++++++
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts          | 117 ++++++++++-
 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts       | 227 +++++++++++++++++++++
 arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts         |  15 ++
 arch/arm/boot/dts/sun4i-a10-marsboard.dts          |  19 ++
 arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts     |  12 ++
 arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts       | 159 +++++++++++++++
 arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts   |   2 +-
 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts           | 224 ++++++++++++++++++++
 arch/arm/boot/dts/sun5i-a10s.dtsi                  |  20 ++
 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts      | 227 +++++++++++++++++++++
 arch/arm/boot/dts/sun5i-a13-q8-tablet.dts          |  60 ++++++
 arch/arm/boot/dts/sun5i-q8-common.dtsi             | 170 +++++++++++++++
 arch/arm/boot/dts/sun6i-a31-colombus.dts           |  24 +++
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts        |   9 +-
 arch/arm/boot/dts/sun6i-a31.dtsi                   |  17 ++
 .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts     | 134 ++++++++++++
 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts        |  19 ++
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts     |  12 ++
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts    |  47 +++++
 arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts    |   6 +
 arch/arm/boot/dts/sun7i-a20-pcduino3.dts           |  54 ++++-
 arch/arm/boot/dts/sun7i-a20.dtsi                   |  10 +-
 arch/arm/boot/dts/sun8i-a23-a33.dtsi               |  40 ++--
 arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts           | 145 +++++++++++++
 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts        |  76 +------
 arch/arm/boot/dts/sun8i-a23.dtsi                   |  25 +++
 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts      |  70 +------
 arch/arm/boot/dts/sun8i-a33.dtsi                   |  45 ++++
 arch/arm/boot/dts/sun8i-q8-common.dtsi             |  97 +++++++++
 arch/arm/boot/dts/sunxi-q8-common.dtsi             |  77 +++++++
 arch/arm/configs/multi_v7_defconfig                |   1 +
 arch/arm/configs/sunxi_defconfig                   |   4 +
 drivers/clk/sunxi/clk-simple-gates.c               |   2 +
 38 files changed, 2239 insertions(+), 190 deletions(-)
 create mode 100644 arch/arm/boot/dts/sun4i-a10-inet1.dts
 create mode 100644 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
 create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
 create mode 100644 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
 create mode 100644 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts
 create mode 100644 arch/arm/boot/dts/sun5i-a13-q8-tablet.dts
 create mode 100644 arch/arm/boot/dts/sun5i-q8-common.dtsi
 create mode 100644 arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
 create mode 100644 arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
 create mode 100644 arch/arm/boot/dts/sun8i-q8-common.dtsi
 create mode 100644 arch/arm/boot/dts/sunxi-q8-common.dtsi
Merging tegra/for-next (d27eb50227d8 Merge branch for-4.4/defconfig into for-next)
$ git merge tegra/for-next
Auto-merging drivers/clk/tegra/clk-dfll.c
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/tegra124-nyan.dtsi          |  15 +-
 arch/arm/boot/dts/tegra124.dtsi               |   2 +-
 arch/arm/boot/dts/tegra20.dtsi                |   4 +-
 arch/arm/boot/dts/tegra30-apalis-eval.dts     |  13 +-
 arch/arm/boot/dts/tegra30-apalis.dtsi         | 214 ++++++++++++++++----------
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts |   9 +-
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 196 ++++++++++++++++-------
 arch/arm/boot/dts/tegra30.dtsi                |  10 +-
 arch/arm/configs/tegra_defconfig              |  10 +-
 drivers/clk/tegra/clk-dfll.c                  |  15 +-
 drivers/clk/tegra/cvb.c                       |   7 -
 11 files changed, 324 insertions(+), 171 deletions(-)
Merging arm64/for-next/core (6ff33f3902c3 Linux 4.3-rc1)
$ git merge arm64/for-next/core
Already up-to-date.
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
$ git merge blackfin/for-linus
Already up-to-date.
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
$ git merge c6x/for-linux-next
Removing arch/c6x/include/asm/clkdev.h
Merge made by the 'recursive' strategy.
 arch/c6x/include/asm/Kbuild   |  1 +
 arch/c6x/include/asm/clkdev.h | 22 ----------------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 arch/c6x/include/asm/clkdev.h
Merging cris/for-next (254a0f413548 CRISv10: delete unused lib/dmacopy.c)
$ git merge cris/for-next
Already up-to-date.
Merging h8300/h8300-next (99bcfda85f66 Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time")
$ git merge h8300/h8300-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next)
$ git merge ia64/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address)
$ git merge m68k/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/sun3/idprom.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Merging m68knommu/for-next (a509af1245d8 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
 fs/binfmt_elf_fdpic.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
Merging metag/for-next (3fe6942f0486 Documentation/features/vm: Meta2 is capable of THP)
$ git merge metag/for-next
Merge made by the 'recursive' strategy.
Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (c2659c5e37f9 Merge branch '4.3-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Recorded preimage for 'arch/mips/include/asm/mips-cm.h'
Recorded preimage for 'arch/mips/mm/init.c'
Auto-merging arch/mips/mm/init.c
CONFLICT (content): Merge conflict in arch/mips/mm/init.c
Auto-merging arch/mips/include/asm/mips-cm.h
CONFLICT (content): Merge conflict in arch/mips/include/asm/mips-cm.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'arch/mips/include/asm/mips-cm.h'.
Recorded resolution for 'arch/mips/mm/init.c'.
[master 030d4677cd18] Merge remote-tracking branch 'mips/mips-for-linux-next'
$ git diff -M --stat --summary HEAD^..
 arch/mips/Kconfig.debug               | 46 ++++++++++++++++++++
 arch/mips/Makefile                    |  4 ++
 arch/mips/include/asm/bcache.h        | 27 ++++++++++++
 arch/mips/include/asm/debug.h         | 22 ++++++++++
 arch/mips/include/asm/mips-cm.h       | 17 ++++++++
 arch/mips/kernel/mips-r2-to-r6-emul.c |  2 +-
 arch/mips/kernel/segment.c            |  2 +-
 arch/mips/kernel/setup.c              |  1 +
 arch/mips/kernel/spinlock_test.c      |  4 +-
 arch/mips/kernel/unaligned.c          |  2 +-
 arch/mips/math-emu/me-debugfs.c       |  2 +-
 arch/mips/mm/Makefile                 |  1 +
 arch/mips/mm/sc-debugfs.c             | 81 +++++++++++++++++++++++++++++++++++
 arch/mips/mm/sc-mips.c                | 65 ++++++++++++++++++++++++++--
 14 files changed, 266 insertions(+), 10 deletions(-)
 create mode 100644 arch/mips/include/asm/debug.h
 create mode 100644 arch/mips/mm/sc-debugfs.c
Merging nios2/for-next (08441d462ebd nios2: add Max10 defconfig)
$ git merge nios2/for-next
Already up-to-date.
Merging parisc-hd/for-next (64291f7db5bd Linux 4.2)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (1f93e4a96c91 Linux 4.3-rc2)
$ git merge powerpc/next
Already up-to-date.
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
$ git merge powerpc-mpe/next
Already up-to-date.
Merging fsl/next (4524cd093fa8 powerpc/t1023rdb/dts: set ifc nand chip select from 2 to 1)
$ git merge fsl/next
Already up-to-date.
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (ec2934ec55e9 s390/diag: add tracepoint for diagnose calls)
$ git merge s390/features
Merge made by the 'recursive' strategy.
 arch/s390/Kconfig                      |   1 +
 arch/s390/hypfs/hypfs_diag.c           |  10 +-
 arch/s390/hypfs/hypfs_diag0c.c         |   2 +
 arch/s390/hypfs/hypfs_sprp.c           |   9 +-
 arch/s390/hypfs/hypfs_vm.c             |   2 +
 arch/s390/include/asm/appldata.h       |   2 +
 arch/s390/include/asm/barrier.h        |   8 +-
 arch/s390/include/asm/bitops.h         |  23 +++-
 arch/s390/include/asm/cio.h            |  10 ++
 arch/s390/include/asm/cmb.h            |   1 +
 arch/s390/include/asm/diag.h           |  29 +++++
 arch/s390/include/asm/kvm_para.h       |  67 ++++++++--
 arch/s390/include/asm/pgtable.h        |  59 ++++++++-
 arch/s390/include/asm/trace/diag.h     |  43 +++++++
 arch/s390/kernel/Makefile              |   2 +
 arch/s390/kernel/cpcmd.c               |   2 +
 arch/s390/kernel/crash_dump.c          |  16 +--
 arch/s390/kernel/diag.c                | 134 +++++++++++++++++++-
 arch/s390/kernel/early.c               |   3 +
 arch/s390/kernel/ipl.c                 |   9 +-
 arch/s390/kernel/processor.c           |   5 +-
 arch/s390/kernel/smp.c                 |   8 +-
 arch/s390/kernel/trace.c               |  29 +++++
 arch/s390/kernel/vdso.c                |   2 +-
 arch/s390/lib/spinlock.c               |   4 +-
 arch/s390/mm/extmem.c                  |   3 +
 arch/s390/mm/fault.c                   |   3 +
 arch/s390/mm/hugetlbpage.c             |   2 +
 arch/s390/numa/mode_emu.c              |  10 +-
 arch/x86/include/asm/pgtable.h         |  10 ++
 drivers/s390/block/dasd.c              |   1 +
 drivers/s390/block/dasd_diag.c         |   2 +
 drivers/s390/block/dasd_eckd.c         |  11 +-
 drivers/s390/char/diag_ftp.c           |   2 +
 drivers/s390/cio/cmf.c                 | 220 ++++++++++++++++++++-------------
 drivers/s390/cio/css.c                 |   1 +
 drivers/s390/cio/device.c              |   4 +-
 drivers/s390/cio/device.h              |   1 +
 drivers/s390/cio/device_pgid.c         |   4 +-
 drivers/s390/crypto/zcrypt_api.c       |   3 +-
 drivers/s390/crypto/zcrypt_cca_key.h   |   2 +-
 drivers/s390/crypto/zcrypt_msgtype50.c |   2 +-
 drivers/s390/crypto/zcrypt_pcica.c     |   2 +-
 drivers/s390/virtio/virtio_ccw.c       |  15 ++-
 drivers/watchdog/diag288_wdt.c         |   4 +
 fs/proc/task_mmu.c                     |   4 +-
 include/asm-generic/pgtable.h          |  10 ++
 47 files changed, 645 insertions(+), 151 deletions(-)
 create mode 100644 arch/s390/include/asm/trace/diag.h
 create mode 100644 arch/s390/kernel/trace.c
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (6ff33f3902c3 Linux 4.3-rc1)
$ git merge tile/master
Already up-to-date.
Merging uml/linux-next (bdbac7d0e2b3 um: Fix kernel mode fault condition)
$ git merge uml/linux-next
Auto-merging arch/um/kernel/trap.c
Merge made by the 'recursive' strategy.
 arch/um/Makefile          | 4 ++--
 arch/um/kernel/trap.c     | 2 +-
 arch/um/os-Linux/helper.c | 6 +++---
 arch/x86/um/ldt.c         | 5 ++++-
 4 files changed, 10 insertions(+), 7 deletions(-)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing)
$ git merge xtensa/for_next
Already up-to-date.
Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled)
$ git merge btrfs/next
Already up-to-date.
Merging ceph/master (8dbd263de1cb ceph: improve readahead for file holes)
$ git merge ceph/master
Merge made by the 'recursive' strategy.
Merging cifs/for-next (ff9f84b7d79d [SMB3] Missing null tcon check)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 fs/cifs/smb2pdu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
$ git merge ecryptfs/next
Merge made by the 'recursive' strategy.
 fs/ecryptfs/main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Merging ext3/for_next (9181f8bf5abf udf: Don't modify filesystem for read-only mounts)
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (bdfe0cbd746a Revert "ext4: remove block_device_ejected")
$ git merge ext4/dev
Already up-to-date.
Merging f2fs/dev (45c3aaea8057 f2fs: should get a victim from retrials)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
 fs/f2fs/checkpoint.c        |   5 ++
 fs/f2fs/data.c              | 123 ++++++++++++++++------------
 fs/f2fs/debug.c             |  14 ++--
 fs/f2fs/dir.c               |  13 ++-
 fs/f2fs/extent_cache.c      | 193 +++++++++++++++++---------------------------
 fs/f2fs/f2fs.h              |  20 ++++-
 fs/f2fs/file.c              |  58 ++++++-------
 fs/f2fs/gc.c                |  25 ++++--
 fs/f2fs/inline.c            |   6 +-
 fs/f2fs/inode.c             |   8 +-
 fs/f2fs/namei.c             |  10 ++-
 fs/f2fs/node.c              |  20 ++---
 fs/f2fs/node.h              |   1 -
 fs/f2fs/recovery.c          |   9 +--
 fs/f2fs/segment.c           |   9 +--
 fs/f2fs/segment.h           |   4 +-
 fs/f2fs/super.c             |   9 +++
 include/trace/events/f2fs.h |  15 ++--
 18 files changed, 284 insertions(+), 258 deletions(-)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
$ git merge fscache/fscache
Merge made by the 'recursive' strategy.
 fs/fscache/netfs.c | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)
Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry)
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/for-next (6de20eb0dee4 GFS2: Set s_mode before parsing mount options)
$ git merge gfs2/for-next
Merge made by the 'recursive' strategy.
 fs/gfs2/file.c       | 2 +-
 fs/gfs2/ops_fstype.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
$ git merge jfs/jfs-next
Already up-to-date.
Merging nfs/linux-next (e3be4266d348 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
$ git merge nfs/linux-next
Already up-to-date.
Merging nfsd/nfsd-next (a909e9f9d73a nfsd: don't hold i_mutex over userspace upcalls)
$ git merge nfsd/nfsd-next
Auto-merging fs/namei.c
Merge made by the 'recursive' strategy.
 fs/namei.c            | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++
 fs/nfsd/nfs3xdr.c     |  2 +-
 fs/nfsd/nfs4xdr.c     |  8 +++---
 fs/nfsd/vfs.c         | 23 +++++++---------
 include/linux/namei.h |  1 +
 5 files changed, 89 insertions(+), 19 deletions(-)
Merging orangefs/for-next (600896a3b8b0 Orangefs: Swap order of include files)
$ git merge orangefs/for-next
Auto-merging fs/Makefile
Auto-merging fs/Kconfig
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-fs-orangefs |   87 ++
 Documentation/filesystems/orangefs.txt     |  137 +++
 fs/Kconfig                                 |    1 +
 fs/Makefile                                |    1 +
 fs/orangefs/Kconfig                        |    6 +
 fs/orangefs/Makefile                       |   10 +
 fs/orangefs/acl.c                          |  175 +++
 fs/orangefs/dcache.c                       |  142 +++
 fs/orangefs/devpvfs2-req.c                 | 1004 ++++++++++++++++
 fs/orangefs/dir.c                          |  378 ++++++
 fs/orangefs/downcall.h                     |  138 +++
 fs/orangefs/file.c                         | 1016 ++++++++++++++++
 fs/orangefs/inode.c                        |  469 ++++++++
 fs/orangefs/namei.c                        |  473 ++++++++
 fs/orangefs/protocol.h                     |  672 +++++++++++
 fs/orangefs/pvfs2-bufmap.c                 |  974 +++++++++++++++
 fs/orangefs/pvfs2-bufmap.h                 |   76 ++
 fs/orangefs/pvfs2-cache.c                  |  260 ++++
 fs/orangefs/pvfs2-debug.h                  |  290 +++++
 fs/orangefs/pvfs2-debugfs.c                |  458 +++++++
 fs/orangefs/pvfs2-debugfs.h                |    3 +
 fs/orangefs/pvfs2-dev-proto.h              |  102 ++
 fs/orangefs/pvfs2-kernel.h                 |  864 ++++++++++++++
 fs/orangefs/pvfs2-mod.c                    |  315 +++++
 fs/orangefs/pvfs2-sysfs.c                  | 1787 ++++++++++++++++++++++++++++
 fs/orangefs/pvfs2-sysfs.h                  |    2 +
 fs/orangefs/pvfs2-utils.c                  | 1129 ++++++++++++++++++
 fs/orangefs/super.c                        |  558 +++++++++
 fs/orangefs/symlink.c                      |   31 +
 fs/orangefs/upcall.h                       |  255 ++++
 fs/orangefs/waitqueue.c                    |  529 ++++++++
 fs/orangefs/xattr.c                        |  530 +++++++++
 32 files changed, 12872 insertions(+)
 create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs
 create mode 100644 Documentation/filesystems/orangefs.txt
 create mode 100644 fs/orangefs/Kconfig
 create mode 100644 fs/orangefs/Makefile
 create mode 100644 fs/orangefs/acl.c
 create mode 100644 fs/orangefs/dcache.c
 create mode 100644 fs/orangefs/devpvfs2-req.c
 create mode 100644 fs/orangefs/dir.c
 create mode 100644 fs/orangefs/downcall.h
 create mode 100644 fs/orangefs/file.c
 create mode 100644 fs/orangefs/inode.c
 create mode 100644 fs/orangefs/namei.c
 create mode 100644 fs/orangefs/protocol.h
 create mode 100644 fs/orangefs/pvfs2-bufmap.c
 create mode 100644 fs/orangefs/pvfs2-bufmap.h
 create mode 100644 fs/orangefs/pvfs2-cache.c
 create mode 100644 fs/orangefs/pvfs2-debug.h
 create mode 100644 fs/orangefs/pvfs2-debugfs.c
 create mode 100644 fs/orangefs/pvfs2-debugfs.h
 create mode 100644 fs/orangefs/pvfs2-dev-proto.h
 create mode 100644 fs/orangefs/pvfs2-kernel.h
 create mode 100644 fs/orangefs/pvfs2-mod.c
 create mode 100644 fs/orangefs/pvfs2-sysfs.c
 create mode 100644 fs/orangefs/pvfs2-sysfs.h
 create mode 100644 fs/orangefs/pvfs2-utils.c
 create mode 100644 fs/orangefs/super.c
 create mode 100644 fs/orangefs/symlink.c
 create mode 100644 fs/orangefs/upcall.h
 create mode 100644 fs/orangefs/waitqueue.c
 create mode 100644 fs/orangefs/xattr.c
Merging overlayfs/overlayfs-next (d9aa4e0bfb63 ovl: default permissions)
$ git merge overlayfs/overlayfs-next
Auto-merging fs/overlayfs/super.c
Merge made by the 'recursive' strategy.
 fs/overlayfs/copy_up.c   | 11 +++++++----
 fs/overlayfs/inode.c     | 23 +++++++++++++++++++++++
 fs/overlayfs/overlayfs.h |  3 +++
 fs/overlayfs/super.c     | 28 ++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 4 deletions(-)
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
$ git merge squashfs/master
Already up-to-date.
Merging v9fs/for-next (46cfbe8e037a 9p: trans_fd, bail out if recv fcall if missing)
$ git merge v9fs/for-next
Merge made by the 'recursive' strategy.
 net/9p/trans_fd.c     | 88 +++++++++++++++++++++++++++------------------------
 net/9p/trans_virtio.c |  2 +-
 2 files changed, 47 insertions(+), 43 deletions(-)
Merging ubifs/linux-next (a4e2d5a00ede UBI: Validate data_size)
$ git merge ubifs/linux-next
Merge made by the 'recursive' strategy.
 drivers/mtd/ubi/io.c | 5 +++++
 fs/ubifs/xattr.c     | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
Merging xfs/for-next (1f93e4a96c91 Linux 4.3-rc2)
$ git merge xfs/for-next
Already up-to-date.
Merging file-locks/linux-next (128a37852234 fs: fix data races on inode->i_flctx)
$ git merge file-locks/linux-next
Merge made by the 'recursive' strategy.
 fs/locks.c                      | 63 +++++++++++++++++++++++------------------
 include/trace/events/filelock.h | 38 +++++++++++++++++++++++--
 2 files changed, 71 insertions(+), 30 deletions(-)
Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root)
$ git merge vfs/for-next
Already up-to-date.
Merging pci/next (ebfc4df6bfc8 Merge branches 'pci/host-designware', 'pci/host-generic', 'pci/host-imx6', 'pci/host-rcar' and 'pci/host-tegra' into next)
$ git merge pci/next
Auto-merging drivers/pci/quirks.c
Auto-merging drivers/pci/probe.c
Auto-merging arch/powerpc/platforms/pseries/setup.c
Merge made by the 'recursive' strategy.
 arch/arm64/boot/dts/amd/amd-overdrive.dts |  1 -
 arch/powerpc/platforms/pseries/setup.c    | 14 +-----
 drivers/of/of_pci.c                       | 26 +++++++++++
 drivers/pci/host/Kconfig                  |  6 ++-
 drivers/pci/host/pci-host-generic.c       |  9 +---
 drivers/pci/host/pci-imx6.c               |  8 ++--
 drivers/pci/host/pci-keystone-dw.c        |  2 +-
 drivers/pci/host/pci-keystone.h           |  2 +-
 drivers/pci/host/pci-tegra.c              |  4 +-
 drivers/pci/host/pcie-designware.c        | 72 +++++++++++++++++++++++++------
 drivers/pci/host/pcie-designware.h        |  2 +-
 drivers/pci/msi.c                         |  3 ++
 drivers/pci/pci-driver.c                  |  8 ++--
 drivers/pci/pci.c                         |  9 +++-
 drivers/pci/pcie/aer/aerdrv_core.c        | 28 ++++++++++++
 drivers/pci/probe.c                       |  3 ++
 drivers/pci/quirks.c                      |  1 +
 drivers/pci/setup-res.c                   |  7 +++
 include/linux/aer.h                       |  5 +++
 include/linux/msi.h                       |  2 +
 include/linux/of_pci.h                    |  3 ++
 21 files changed, 164 insertions(+), 51 deletions(-)
Merging hid/for-next (7db4c819041a Merge branch 'for-4.4/wacom' into for-next)
$ git merge hid/for-next
Auto-merging drivers/hid/hid-core.c
Merge made by the 'recursive' strategy.
 drivers/hid/Kconfig              |   5 +-
 drivers/hid/hid-core.c           |  17 ++++-
 drivers/hid/hid-debug.c          |  34 ++++++++-
 drivers/hid/hid-dr.c             |  58 ++++++++++++++
 drivers/hid/hid-ids.h            |   2 +
 drivers/hid/hid-logitech-hidpp.c | 159 ++++++++++++++++++++++++++++++++++++---
 drivers/hid/hid-microsoft.c      |   2 +
 drivers/hid/hid-saitek.c         |   2 +
 drivers/hid/hid-sensor-hub.c     |  14 ++++
 drivers/hid/usbhid/hid-quirks.c  |   1 +
 drivers/hid/wacom_sys.c          |  60 ++++++++++-----
 drivers/hid/wacom_wac.c          | 128 +++++++++++++++++++++----------
 drivers/hid/wacom_wac.h          |   6 +-
 13 files changed, 413 insertions(+), 75 deletions(-)
Merging i2c/i2c/for-next (f5956abbe430 Merge branch 'i2c/for-4.3' into i2c/for-next)
$ git merge i2c/i2c/for-next
Merge made by the 'recursive' strategy.
 drivers/i2c/busses/i2c-imx.c | 76 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 65 insertions(+), 11 deletions(-)
Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define)
$ git merge jdelvare-hwmon/master
Merge made by the 'recursive' strategy.
 drivers/hwmon/k10temp.c | 1 -
 1 file changed, 1 deletion(-)
Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge dmi/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (91cec9604f54 hwmon: (abx500) drop the use of IRQF_NO_SUSPEND)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
 Documentation/hwmon/max31790 |  37 +++
 drivers/hwmon/Kconfig        |  10 +
 drivers/hwmon/Makefile       |   1 +
 drivers/hwmon/abx500.c       |   3 +-
 drivers/hwmon/gpio-fan.c     |   1 +
 drivers/hwmon/max31790.c     | 603 +++++++++++++++++++++++++++++++++++++++++++
 drivers/hwmon/pwm-fan.c      |   1 +
 7 files changed, 655 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/hwmon/max31790
 create mode 100644 drivers/hwmon/max31790.c
Merging v4l-dvb/master (41a8f406dacd Merge branch 'missed' into to_next)
$ git merge v4l-dvb/master
Resolved 'mm/Makefile' using previous resolution.
Auto-merging mm/Makefile
CONFLICT (content): Merge conflict in mm/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3cc3f22d4e25] Merge remote-tracking branch 'v4l-dvb/master'
$ git diff -M --stat --summary HEAD^..
Merging kbuild/for-next (a8503631df45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
$ git merge kbuild/for-next
Auto-merging lib/Kconfig.debug
Auto-merging init/Kconfig
Auto-merging arch/x86/Kconfig
Auto-merging Makefile
Merge made by the 'recursive' strategy.
 Documentation/lto-build  | 173 +++++++++++++++++++++++++++++++++++++++++++++++
 Makefile                 |  19 +++++-
 arch/x86/Kconfig         |   2 +-
 init/Kconfig             |  73 ++++++++++++++++++++
 kernel/gcov/Kconfig      |   2 +-
 lib/Kconfig.debug        |   2 +-
 scripts/Makefile.lto     |  84 +++++++++++++++++++++++
 scripts/Makefile.modpost |   7 +-
 scripts/link-vmlinux.sh  |   2 +-
 9 files changed, 356 insertions(+), 8 deletions(-)
 create mode 100644 Documentation/lto-build
 create mode 100644 scripts/Makefile.lto
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
$ git merge kconfig/for-next
Already up-to-date.
Merging libata/for-next (0c0aa14964df Merge branch 'for-4.4' into for-next)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/ata/ahci-fsl-qoriq.txt     |  21 ++
 .../devicetree/bindings/ata/ahci-platform.txt      |   2 -
 drivers/ata/Kconfig                                |   9 +
 drivers/ata/Makefile                               |   1 +
 drivers/ata/ahci_platform.c                        |   1 -
 drivers/ata/ahci_qoriq.c                           | 272 +++++++++++++++++++++
 drivers/ata/pata_macio.c                           |   1 +
 drivers/ata/pata_pxa.c                             | 171 +++++--------
 drivers/ata/pata_samsung_cf.c                      |   2 +-
 9 files changed, 364 insertions(+), 116 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
 create mode 100644 drivers/ata/ahci_qoriq.c
Merging pm/linux-next (5d95ac8b1761 Merge branch 'pm-tools' into linux-next)
$ git merge pm/linux-next
Auto-merging drivers/pci/pci-driver.c
Removing drivers/cpufreq/cpufreq_opp.c
Auto-merging drivers/base/power/opp/core.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-power    |  12 +
 Documentation/power/pci.txt              |  51 +++-
 arch/arm/mach-imx/mach-imx6q.c           |   2 +-
 arch/x86/kernel/acpi/boot.c              |  22 +-
 drivers/acpi/acpi_pnp.c                  |   4 +-
 drivers/acpi/device_sysfs.c              | 120 ++++++++-
 drivers/acpi/ec.c                        | 113 ++++++---
 drivers/acpi/glue.c                      |   5 +-
 drivers/acpi/internal.h                  |   6 +-
 drivers/acpi/pci_irq.c                   |   1 +
 drivers/acpi/pci_link.c                  |  16 +-
 drivers/acpi/proc.c                      |   4 +-
 drivers/acpi/property.c                  | 420 ++++++++++++++++++++++++++-----
 drivers/acpi/scan.c                      |  28 +--
 drivers/acpi/tables.c                    |  94 +++++--
 drivers/base/power/Makefile              |   2 +-
 drivers/base/power/domain.c              | 226 -----------------
 drivers/base/power/opp/Makefile          |   3 +
 drivers/base/power/{opp.c => opp/core.c} | 395 +++++------------------------
 drivers/base/power/opp/cpu.c             | 267 ++++++++++++++++++++
 drivers/base/power/opp/debugfs.c         | 217 ++++++++++++++++
 drivers/base/power/opp/opp.h             | 186 ++++++++++++++
 drivers/base/power/wakeup.c              |  16 +-
 drivers/base/property.c                  |  88 ++++++-
 drivers/cpufreq/Makefile                 |   1 -
 drivers/cpufreq/arm_big_little.h         |   2 +-
 drivers/cpufreq/arm_big_little_dt.c      |   4 +-
 drivers/cpufreq/cpufreq-dt.c             |  10 +-
 drivers/cpufreq/cpufreq_conservative.c   |  31 ++-
 drivers/cpufreq/cpufreq_governor.c       |  12 +-
 drivers/cpufreq/cpufreq_governor.h       |   1 -
 drivers/cpufreq/cpufreq_opp.c            | 114 ---------
 drivers/cpufreq/exynos5440-cpufreq.c     |   6 +-
 drivers/cpufreq/imx6q-cpufreq.c          |  56 ++++-
 drivers/cpufreq/integrator-cpufreq.c     |   2 +
 drivers/cpufreq/mt8173-cpufreq.c         |   6 +-
 drivers/cpufreq/powernv-cpufreq.c        |  10 +-
 drivers/cpufreq/tegra20-cpufreq.c        |   2 -
 drivers/dma/acpi-dma.c                   |  25 +-
 drivers/gpio/gpiolib-acpi.c              | 153 +++++++----
 drivers/gpio/gpiolib.c                   |   3 +-
 drivers/gpio/gpiolib.h                   |  10 +-
 drivers/idle/intel_idle.c                |  12 +-
 drivers/pci/pci-driver.c                 |   7 +-
 drivers/pnp/pnpacpi/core.c               |   4 +-
 include/acpi/acpi_bus.h                  |  37 ++-
 include/linux/acpi.h                     |  90 +++++--
 include/linux/fwnode.h                   |   1 +
 include/linux/pm_domain.h                |  55 ----
 include/linux/pm_opp.h                   |  24 +-
 include/linux/property.h                 |   4 +
 include/linux/suspend.h                  |   3 +
 kernel/irq/pm.c                          |   2 +-
 kernel/power/main.c                      |  17 ++
 tools/power/x86/turbostat/turbostat.c    |  39 ++-
 55 files changed, 1937 insertions(+), 1104 deletions(-)
 create mode 100644 drivers/base/power/opp/Makefile
 rename drivers/base/power/{opp.c => opp/core.c} (79%)
 create mode 100644 drivers/base/power/opp/cpu.c
 create mode 100644 drivers/base/power/opp/debugfs.c
 create mode 100644 drivers/base/power/opp/opp.h
 delete mode 100644 drivers/cpufreq/cpufreq_opp.c
Merging idle/next (f05bd12f0e9c Merge branch 'cpuidle' into release)
$ git merge idle/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
$ git merge apm/for-next
Already up-to-date.
Merging thermal/next (97584d1838b7 thermal: power_allocator: exit early if there are no cooling devices)
$ git merge thermal/next
Already up-to-date.
Merging thermal-soc/next (0b547eff7460 thermal: power_allocator: exit early if there are no cooling devices)
$ git merge thermal-soc/next
Merge made by the 'recursive' strategy.
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
$ git merge ieee1394/for-next
Already up-to-date.
Merging dlm/next (b3a5bbfd780d dlm: print error from kernel_sendpage)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (80b7525c3713 Merge branch 'topic/ioatdma' into next)
$ git merge slave-dma/next
Merge made by the 'recursive' strategy.
 drivers/dma/Kconfig     |   2 +-
 drivers/dma/Makefile    |   2 +-
 drivers/dma/dmaengine.c |   6 +--
 drivers/dma/idma64.c    |  38 ++++++++--------
 drivers/dma/idma64.h    |  14 +++---
 drivers/dma/ioat/dma.c  |   3 +-
 drivers/dma/ioat/dma.h  |   6 ++-
 drivers/dma/ioat/init.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++-
 drivers/dma/ioat/prep.c |  34 +++++++++++++++
 drivers/dma/pxa_dma.c   |   1 +
 drivers/dma/xgene-dma.c |  13 +++---
 11 files changed, 189 insertions(+), 44 deletions(-)
Merging net-next/master (34c2d9fb0498 bridge: Allow forward delay to be cfgd when STP enabled)
$ git merge net-next/master
Auto-merging net/ipv6/xfrm6_output.c
Removing drivers/net/ethernet/hisilicon/hip04_mdio.c
Auto-merging drivers/net/arcnet/com20020.h
Auto-merging drivers/net/arcnet/arcdevice.h
Auto-merging arch/arm/boot/dts/dra7.dtsi
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/net/can/sun4i_can.txt      |   36 +
 Documentation/devicetree/bindings/net/cpsw.txt     |    7 +
 .../bindings/net/hisilicon-hip04-net.txt           |    4 +-
 .../devicetree/bindings/net/hisilicon-hns-dsaf.txt |   49 +
 .../devicetree/bindings/net/hisilicon-hns-mdio.txt |   22 +
 .../devicetree/bindings/net/hisilicon-hns-nic.txt  |   47 +
 Documentation/networking/ieee802154.txt            |    8 +-
 Documentation/networking/ipvs-sysctl.txt           |   10 +
 Documentation/networking/l2tp.txt                  |    7 +-
 Documentation/networking/switchdev.txt             |   43 +-
 MAINTAINERS                                        |    1 -
 arch/arm/boot/dts/am4372.dtsi                      |    1 +
 arch/arm/boot/dts/dra7.dtsi                        |    1 +
 arch/arm64/boot/dts/apm/apm-storm.dtsi             |   28 +
 arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi       |  193 ++
 drivers/bluetooth/bt3c_cs.c                        |   12 +-
 drivers/bluetooth/btintel.c                        |   46 +
 drivers/bluetooth/btintel.h                        |   10 +-
 drivers/bluetooth/btmrvl_main.c                    |   14 -
 drivers/bluetooth/btusb.c                          |   51 +-
 drivers/bluetooth/hci_bcm.c                        |  222 +-
 drivers/bluetooth/hci_intel.c                      |  590 ++++-
 drivers/bluetooth/hci_qca.c                        |   12 +-
 drivers/isdn/hisax/hfc4s8s_l1.c                    |   10 +-
 drivers/net/arcnet/arc-rawmode.c                   |  142 +-
 drivers/net/arcnet/arc-rimi.c                      |  145 +-
 {include/linux => drivers/net/arcnet}/arcdevice.h  |  152 +-
 drivers/net/arcnet/arcnet.c                        |  601 +++--
 drivers/net/arcnet/capmode.c                       |  138 +-
 drivers/net/arcnet/com20020-isa.c                  |   54 +-
 drivers/net/arcnet/com20020-pci.c                  |   70 +-
 drivers/net/arcnet/com20020.c                      |  234 +-
 {include/linux => drivers/net/arcnet}/com20020.h   |   75 +-
 drivers/net/arcnet/com20020_cs.c                   |  325 ++-
 drivers/net/arcnet/com9026.h                       |   17 +
 drivers/net/arcnet/com90io.c                       |  209 +-
 drivers/net/arcnet/com90xx.c                       |  323 +--
 drivers/net/arcnet/rfc1051.c                       |   77 +-
 drivers/net/arcnet/rfc1201.c                       |  238 +-
 drivers/net/bonding/bond_main.c                    |    4 +
 drivers/net/can/Kconfig                            |   10 +
 drivers/net/can/Makefile                           |    1 +
 drivers/net/can/flexcan.c                          |  197 +-
 drivers/net/can/sun4i_can.c                        |  857 +++++++
 drivers/net/dsa/mv88e6xxx.c                        |  151 +-
 drivers/net/dsa/mv88e6xxx.h                        |    8 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_hw.c     |    3 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c   |   16 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_main.h   |    5 +
 drivers/net/ethernet/broadcom/genet/bcmgenet.c     |  149 ++
 drivers/net/ethernet/broadcom/genet/bcmgenet.h     |    9 +-
 drivers/net/ethernet/ethoc.c                       |   14 +-
 drivers/net/ethernet/hisilicon/Kconfig             |   34 +-
 drivers/net/ethernet/hisilicon/Makefile            |    4 +-
 drivers/net/ethernet/hisilicon/hip04_mdio.c        |  185 --
 drivers/net/ethernet/hisilicon/hns/Makefile        |   12 +
 drivers/net/ethernet/hisilicon/hns/hnae.c          |  507 ++++
 drivers/net/ethernet/hisilicon/hns/hnae.h          |  583 +++++
 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c  |  777 +++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c |  704 ++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h |   45 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c  |  900 +++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h  |  456 ++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 2445 ++++++++++++++++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h |  427 ++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c |  317 +++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h |   43 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c  |  583 +++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h  |  105 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c  | 1023 ++++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h  |  137 ++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h  |  972 ++++++++
 .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c    |  836 +++++++
 .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h    |   15 +
 drivers/net/ethernet/hisilicon/hns/hns_enet.c      | 1646 +++++++++++++
 drivers/net/ethernet/hisilicon/hns/hns_enet.h      |   84 +
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c   | 1230 ++++++++++
 drivers/net/ethernet/hisilicon/hns_mdio.c          |  520 +++++
 drivers/net/ethernet/ibm/emac/core.h               |    2 +-
 drivers/net/ethernet/intel/e1000/e1000_hw.c        |    8 -
 drivers/net/ethernet/intel/e1000e/netdev.c         |    1 +
 drivers/net/ethernet/intel/fm10k/fm10k.h           |   19 +
 drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c   |    5 +-
 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c   |  216 +-
 drivers/net/ethernet/intel/fm10k/fm10k_iov.c       |    8 +-
 drivers/net/ethernet/intel/fm10k/fm10k_main.c      |   27 +-
 drivers/net/ethernet/intel/fm10k/fm10k_mbx.c       |   48 +-
 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c    |   39 +-
 drivers/net/ethernet/intel/fm10k/fm10k_pci.c       |  198 +-
 drivers/net/ethernet/intel/fm10k/fm10k_pf.c        |  105 +-
 drivers/net/ethernet/intel/fm10k/fm10k_type.h      |    7 +-
 drivers/net/ethernet/intel/fm10k/fm10k_vf.c        |   14 -
 drivers/net/ethernet/intel/i40e/i40e_adminq.c      |   20 +
 drivers/net/ethernet/intel/i40e/i40e_adminq.h      |    1 +
 drivers/net/ethernet/intel/i40e/i40e_main.c        |    2 +-
 drivers/net/ethernet/intel/i40e/i40e_nvm.c         |  386 ++-
 drivers/net/ethernet/intel/i40e/i40e_type.h        |   10 +-
 drivers/net/ethernet/intel/i40evf/i40e_adminq.c    |    7 +
 drivers/net/ethernet/intel/i40evf/i40e_adminq.h    |    1 +
 drivers/net/ethernet/intel/i40evf/i40e_type.h      |   10 +-
 drivers/net/ethernet/intel/i40evf/i40evf_main.c    |    2 +-
 drivers/net/ethernet/intel/igbvf/netdev.c          |    1 +
 drivers/net/ethernet/intel/ixgbe/ixgbe.h           |    5 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c     |  202 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |  226 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.h    |    5 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c |    8 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |    2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |    2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  103 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c       |  291 ++-
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h       |   35 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |    9 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c      |  102 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c      |  492 +++-
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |    1 +
 drivers/net/ethernet/marvell/mv643xx_eth.c         |   43 +-
 drivers/net/ethernet/realtek/8139cp.c              |   24 +-
 drivers/net/ethernet/rocker/rocker.c               |  374 +--
 drivers/net/ethernet/smsc/smc91x.c                 |   29 +-
 drivers/net/ethernet/smsc/smc91x.h                 |   99 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |    2 +-
 drivers/net/ethernet/ti/cpsw-common.c              |   64 +-
 drivers/net/ethernet/ti/cpsw.c                     |   20 +-
 drivers/net/ethernet/ti/cpsw.h                     |    3 +-
 drivers/net/ethernet/ti/davinci_emac.c             |   52 +-
 drivers/net/ethernet/xilinx/ll_temac_mdio.c        |    9 +-
 drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c  |    5 +-
 drivers/net/ieee802154/Kconfig                     |    7 +
 drivers/net/ieee802154/at86rf230.c                 |  180 +-
 drivers/net/ieee802154/at86rf230.h                 |    8 +
 drivers/net/ieee802154/atusb.c                     |   13 +-
 drivers/net/usb/Kconfig                            |    4 +-
 drivers/net/usb/cdc-phonet.c                       |   27 +-
 drivers/net/usb/cdc_ether.c                        |  230 +-
 drivers/net/usb/cdc_mbim.c                         |    2 +-
 drivers/net/usb/cdc_ncm.c                          |   69 +-
 drivers/net/usb/lan78xx.c                          |  670 +++---
 drivers/net/usb/lan78xx.h                          |  193 --
 drivers/net/usb/qmi_wwan.c                         |   66 +-
 drivers/net/usb/smsc75xx.c                         |    5 -
 drivers/net/usb/smsc95xx.c                         |    5 -
 drivers/net/usb/usbnet.c                           |  138 ++
 drivers/net/vmxnet3/vmxnet3_ethtool.c              |  118 +-
 drivers/net/vmxnet3/vmxnet3_int.h                  |    4 +-
 drivers/net/vrf.c                                  |   11 +-
 drivers/net/vxlan.c                                |  167 +-
 drivers/net/wireless/brcm80211/brcmsmac/main.c     |    2 +-
 drivers/net/wireless/mac80211_hwsim.c              |    5 +-
 drivers/net/wireless/mwifiex/11n_rxreorder.c       |    4 +-
 drivers/net/wireless/orinoco/cfg.c                 |    6 +-
 drivers/net/wireless/rndis_wlan.c                  |    2 +-
 drivers/net/xen-netfront.c                         |   17 +-
 drivers/s390/char/monreader.c                      |    4 +-
 drivers/s390/char/vmlogrdr.c                       |    8 +-
 drivers/s390/net/netiucv.c                         |   21 +-
 drivers/s390/net/qeth_core.h                       |   11 +-
 drivers/s390/net/qeth_core_main.c                  |  241 +-
 drivers/s390/net/qeth_core_sys.c                   |   43 +-
 drivers/s390/net/qeth_l2_main.c                    |   89 +-
 drivers/s390/net/qeth_l2_sys.c                     |    2 +-
 drivers/s390/net/qeth_l3_main.c                    |  158 +-
 drivers/s390/net/smsgiucv.c                        |    5 +-
 drivers/tty/hvc/hvc_iucv.c                         |   10 +-
 include/linux/can/dev.h                            |    3 +-
 include/linux/can/led.h                            |    1 +
 include/linux/ieee802154.h                         |   25 +
 include/linux/if_bridge.h                          |    6 +
 include/linux/netdevice.h                          |   14 +-
 include/linux/netfilter.h                          |   70 +-
 include/linux/netfilter/x_tables.h                 |    3 +-
 include/linux/netfilter_arp/arp_tables.h           |    1 -
 include/linux/netfilter_bridge.h                   |    2 +-
 include/linux/netfilter_bridge/ebtables.h          |    6 +-
 include/linux/netfilter_ingress.h                  |    2 +-
 include/linux/netfilter_ipv4/ip_tables.h           |    1 -
 include/linux/netfilter_ipv6/ip6_tables.h          |    1 -
 include/linux/tcp.h                                |    3 +-
 include/linux/usb/cdc.h                            |   51 +
 include/net/6lowpan.h                              |  144 +-
 include/net/addrconf.h                             |    3 +-
 include/net/af_ieee802154.h                        |    2 +-
 include/net/bluetooth/bluetooth.h                  |   11 +
 include/net/bluetooth/hci_core.h                   |    1 +
 include/net/dn_neigh.h                             |    6 +-
 include/net/dst.h                                  |   15 +-
 include/net/ethoc.h                                |    1 +
 include/net/genetlink.h                            |    5 +-
 include/net/inet6_connection_sock.h                |    2 +-
 include/net/inet_connection_sock.h                 |    2 +-
 include/net/ip.h                                   |   10 +-
 include/net/ip_vs.h                                |  120 +-
 include/net/ipv6.h                                 |    6 +-
 include/net/iucv/iucv.h                            |   20 +-
 include/net/mac802154.h                            |   15 +
 include/net/ndisc.h                                |    6 +-
 include/net/netfilter/br_netfilter.h               |    4 +-
 include/net/netfilter/ipv4/nf_dup_ipv4.h           |    2 +-
 include/net/netfilter/ipv6/nf_dup_ipv6.h           |    2 +-
 include/net/netfilter/nf_conntrack.h               |    3 +-
 include/net/netfilter/nf_conntrack_core.h          |    1 +
 include/net/netfilter/nf_conntrack_l4proto.h       |    2 +-
 include/net/netfilter/nf_nat_core.h                |    2 +-
 include/net/netfilter/nf_nat_l3proto.h             |   32 +-
 include/net/netfilter/nf_tables.h                  |   14 +-
 include/net/netfilter/nf_tables_ipv4.h             |    3 +-
 include/net/netfilter/nf_tables_ipv6.h             |    3 +-
 include/net/request_sock.h                         |    4 +-
 include/net/route.h                                |    4 +-
 include/net/rtnetlink.h                            |    3 +-
 include/net/sch_generic.h                          |    3 +-
 include/net/sock.h                                 |   12 +-
 include/net/switchdev.h                            |   40 +-
 include/net/tc_act/tc_connmark.h                   |    1 +
 include/net/tcp.h                                  |   23 +-
 include/net/vxlan.h                                |   14 +-
 include/net/xfrm.h                                 |    2 -
 include/uapi/linux/bpf.h                           |    9 +
 include/uapi/linux/if_arcnet.h                     |   55 +-
 include/uapi/linux/pkt_cls.h                       |    4 +
 include/uapi/linux/rtnetlink.h                     |    2 +
 include/uapi/linux/usb/cdc.h                       |    6 +-
 net/6lowpan/iphc.c                                 |   13 +-
 net/6lowpan/nhc_udp.c                              |   13 +-
 net/bluetooth/hci_core.c                           |    5 +-
 net/bluetooth/hci_event.c                          |   21 +
 net/bluetooth/hci_sock.c                           |   11 +-
 net/bluetooth/lib.c                                |   16 +
 net/bluetooth/smp.c                                |    2 +-
 net/bridge/br_device.c                             |    2 +-
 net/bridge/br_fdb.c                                |    2 +
 net/bridge/br_forward.c                            |   16 +-
 net/bridge/br_input.c                              |   25 +-
 net/bridge/br_multicast.c                          |    4 +-
 net/bridge/br_netfilter_hooks.c                    |   68 +-
 net/bridge/br_netfilter_ipv6.c                     |   10 +-
 net/bridge/br_private.h                            |    6 +-
 net/bridge/br_stp.c                                |   13 +-
 net/bridge/br_stp_bpdu.c                           |   12 +-
 net/bridge/netfilter/ebt_log.c                     |    2 +-
 net/bridge/netfilter/ebt_nflog.c                   |    2 +-
 net/bridge/netfilter/ebtable_broute.c              |    8 +-
 net/bridge/netfilter/ebtable_filter.c              |   10 +-
 net/bridge/netfilter/ebtable_nat.c                 |   10 +-
 net/bridge/netfilter/ebtables.c                    |   14 +-
 net/bridge/netfilter/nf_tables_bridge.c            |   20 +-
 net/bridge/netfilter/nft_reject_bridge.c           |   19 +-
 net/core/dev.c                                     |   35 +-
 net/core/filter.c                                  |   61 +-
 net/core/net-sysfs.c                               |    9 +-
 net/core/rtnetlink.c                               |    2 +-
 net/dccp/dccp.h                                    |    2 +-
 net/dccp/ipv4.c                                    |    2 +-
 net/dccp/ipv6.c                                    |    2 +-
 net/dccp/output.c                                  |   17 +-
 net/decnet/dn_neigh.c                              |   23 +-
 net/decnet/dn_nsp_in.c                             |    7 +-
 net/decnet/dn_nsp_out.c                            |    4 +-
 net/decnet/dn_route.c                              |   30 +-
 net/decnet/netfilter/dn_rtmsg.c                    |    2 +-
 net/dsa/slave.c                                    |   36 +-
 net/ieee802154/6lowpan/6lowpan_i.h                 |   14 +-
 net/ieee802154/6lowpan/core.c                      |  116 +-
 net/ieee802154/6lowpan/reassembly.c                |  157 +-
 net/ieee802154/6lowpan/rx.c                        |  352 ++-
 net/ieee802154/6lowpan/tx.c                        |   51 +-
 net/ipv4/af_inet.c                                 |   16 +-
 net/ipv4/arp.c                                     |   20 +-
 net/ipv4/devinet.c                                 |    3 +-
 net/ipv4/inet_connection_sock.c                    |    4 +-
 net/ipv4/ip_forward.c                              |   19 +-
 net/ipv4/ip_input.c                                |   39 +-
 net/ipv4/ip_output.c                               |   72 +-
 net/ipv4/ip_vti.c                                  |    2 +-
 net/ipv4/ipmr.c                                    |   15 +-
 net/ipv4/netfilter/arp_tables.c                    |    3 +-
 net/ipv4/netfilter/arptable_filter.c               |    7 +-
 net/ipv4/netfilter/ip_tables.c                     |   11 +-
 net/ipv4/netfilter/ipt_CLUSTERIP.c                 |    4 +-
 net/ipv4/netfilter/ipt_SYNPROXY.c                  |    6 +-
 net/ipv4/netfilter/ipt_rpfilter.c                  |    5 +-
 net/ipv4/netfilter/iptable_filter.c                |    9 +-
 net/ipv4/netfilter/iptable_mangle.c                |   17 +-
 net/ipv4/netfilter/iptable_nat.c                   |   22 +-
 net/ipv4/netfilter/iptable_raw.c                   |    9 +-
 net/ipv4/netfilter/iptable_security.c              |   10 +-
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c     |   12 +-
 net/ipv4/netfilter/nf_conntrack_proto_icmp.c       |    4 +-
 net/ipv4/netfilter/nf_defrag_ipv4.c                |    4 +-
 net/ipv4/netfilter/nf_dup_ipv4.c                   |   23 +-
 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c           |   42 +-
 net/ipv4/netfilter/nf_tables_arp.c                 |    6 +-
 net/ipv4/netfilter/nf_tables_ipv4.c                |   10 +-
 net/ipv4/netfilter/nft_chain_nat_ipv4.c            |   22 +-
 net/ipv4/netfilter/nft_chain_route_ipv4.c          |    6 +-
 net/ipv4/netfilter/nft_dup_ipv4.c                  |    2 +-
 net/ipv4/netfilter/nft_masq_ipv4.c                 |    2 +-
 net/ipv4/netfilter/nft_redir_ipv4.c                |    2 +-
 net/ipv4/netfilter/nft_reject_ipv4.c               |    5 +-
 net/ipv4/raw.c                                     |    5 +-
 net/ipv4/route.c                                   |  109 +-
 net/ipv4/syncookies.c                              |    2 +-
 net/ipv4/tcp_cong.c                                |   12 +-
 net/ipv4/tcp_input.c                               |   30 +-
 net/ipv4/tcp_ipv4.c                                |   12 +-
 net/ipv4/tcp_minisocks.c                           |   32 +-
 net/ipv4/tcp_output.c                              |   62 +-
 net/ipv4/xfrm4_input.c                             |    7 +-
 net/ipv4/xfrm4_output.c                            |   11 +-
 net/ipv4/xfrm4_policy.c                            |    1 +
 net/ipv6/addrconf.c                                |   15 +-
 net/ipv6/datagram.c                                |    2 +-
 net/ipv6/inet6_connection_sock.c                   |    2 +-
 net/ipv6/ip6_input.c                               |   15 +-
 net/ipv6/ip6_output.c                              |   66 +-
 net/ipv6/ip6_vti.c                                 |    2 +-
 net/ipv6/ip6mr.c                                   |   12 +-
 net/ipv6/mcast.c                                   |    9 +-
 net/ipv6/ndisc.c                                   |   23 +-
 net/ipv6/netfilter/ip6_tables.c                    |   11 +-
 net/ipv6/netfilter/ip6t_REJECT.c                   |    2 +-
 net/ipv6/netfilter/ip6t_SYNPROXY.c                 |    6 +-
 net/ipv6/netfilter/ip6t_rpfilter.c                 |    6 +-
 net/ipv6/netfilter/ip6table_filter.c               |    6 +-
 net/ipv6/netfilter/ip6table_mangle.c               |   16 +-
 net/ipv6/netfilter/ip6table_nat.c                  |   22 +-
 net/ipv6/netfilter/ip6table_raw.c                  |    6 +-
 net/ipv6/netfilter/ip6table_security.c             |    7 +-
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c     |   12 +-
 net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c     |    3 +-
 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c          |    6 +-
 net/ipv6/netfilter/nf_dup_ipv6.c                   |   23 +-
 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c           |   42 +-
 net/ipv6/netfilter/nf_nat_masquerade_ipv6.c        |    2 +-
 net/ipv6/netfilter/nf_tables_ipv6.c                |   10 +-
 net/ipv6/netfilter/nft_chain_nat_ipv6.c            |   22 +-
 net/ipv6/netfilter/nft_chain_route_ipv6.c          |    6 +-
 net/ipv6/netfilter/nft_dup_ipv6.c                  |    2 +-
 net/ipv6/netfilter/nft_redir_ipv6.c                |    3 +-
 net/ipv6/netfilter/nft_reject_ipv6.c               |    7 +-
 net/ipv6/output_core.c                             |    8 +-
 net/ipv6/raw.c                                     |    9 +-
 net/ipv6/route.c                                   |   28 +-
 net/ipv6/syncookies.c                              |    2 +-
 net/ipv6/tcp_ipv6.c                                |   17 +-
 net/ipv6/xfrm6_input.c                             |    4 +-
 net/ipv6/xfrm6_output.c                            |   11 +-
 net/iucv/af_iucv.c                                 |    9 +-
 net/iucv/iucv.c                                    |   12 +-
 net/l2tp/l2tp_core.h                               |    3 +
 net/l2tp/l2tp_eth.c                                |    1 +
 net/l2tp/l2tp_ip.c                                 |    1 +
 net/l2tp/l2tp_ip6.c                                |    1 +
 net/l2tp/l2tp_netlink.c                            |    7 +
 net/l2tp/l2tp_ppp.c                                |    1 +
 net/netfilter/core.c                               |    2 +-
 net/netfilter/ipset/ip_set_core.c                  |    9 +-
 net/netfilter/ipvs/ip_vs_conn.c                    |   12 +-
 net/netfilter/ipvs/ip_vs_core.c                    |  339 +--
 net/netfilter/ipvs/ip_vs_ctl.c                     |   15 +-
 net/netfilter/ipvs/ip_vs_pe_sip.c                  |    2 +-
 net/netfilter/ipvs/ip_vs_proto_ah_esp.c            |   17 +-
 net/netfilter/ipvs/ip_vs_proto_sctp.c              |   34 +-
 net/netfilter/ipvs/ip_vs_proto_tcp.c               |   38 +-
 net/netfilter/ipvs/ip_vs_proto_udp.c               |   25 +-
 net/netfilter/ipvs/ip_vs_sh.c                      |   45 +-
 net/netfilter/ipvs/ip_vs_xmit.c                    |   32 +-
 net/netfilter/nf_conntrack_core.c                  |   10 +-
 net/netfilter/nf_conntrack_proto_dccp.c            |    2 +-
 net/netfilter/nf_conntrack_proto_generic.c         |    2 +-
 net/netfilter/nf_conntrack_proto_gre.c             |    3 +-
 net/netfilter/nf_conntrack_proto_sctp.c            |    2 +-
 net/netfilter/nf_conntrack_proto_tcp.c             |    2 +-
 net/netfilter/nf_conntrack_proto_udp.c             |    1 +
 net/netfilter/nf_conntrack_proto_udplite.c         |    1 +
 net/netfilter/nf_nat_core.c                        |    4 +-
 net/netfilter/nf_queue.c                           |    2 +-
 net/netfilter/nf_tables_core.c                     |   10 +-
 net/netfilter/nf_tables_netdev.c                   |   20 +-
 net/netfilter/nfnetlink_queue_core.c               |    3 +-
 net/netfilter/nft_log.c                            |    3 +-
 net/netfilter/nft_meta.c                           |    4 +-
 net/netfilter/nft_queue.c                          |    2 +-
 net/netfilter/nft_reject_inet.c                    |   19 +-
 net/netfilter/xt_LOG.c                             |    2 +-
 net/netfilter/xt_NFLOG.c                           |    2 +-
 net/netfilter/xt_TCPMSS.c                          |    2 +-
 net/netfilter/xt_TEE.c                             |    4 +-
 net/netfilter/xt_TPROXY.c                          |   24 +-
 net/netfilter/xt_addrtype.c                        |    4 +-
 net/netfilter/xt_connlimit.c                       |    4 +-
 net/netfilter/xt_ipvs.c                            |    4 +-
 net/netfilter/xt_osf.c                             |    2 +-
 net/netfilter/xt_recent.c                          |    2 +-
 net/netfilter/xt_socket.c                          |   14 +-
 net/netlink/genetlink.c                            |   12 +-
 net/openvswitch/conntrack.c                        |    2 +-
 net/openvswitch/datapath.c                         |    3 +-
 net/openvswitch/vport-vxlan.c                      |    3 +-
 net/rxrpc/ar-connection.c                          |    4 +-
 net/rxrpc/ar-internal.h                            |    4 +-
 net/rxrpc/ar-transport.c                           |    4 +-
 net/sched/act_bpf.c                                |    1 +
 net/sched/act_connmark.c                           |    5 +-
 net/sched/act_ipt.c                                |    1 +
 net/sched/cls_bpf.c                                |   78 +-
 net/sched/em_ipset.c                               |    1 +
 net/sched/sch_dsmark.c                             |   63 +-
 net/switchdev/switchdev.c                          |  125 +-
 net/xfrm/xfrm_output.c                             |   18 +-
 net/xfrm/xfrm_policy.c                             |   10 +-
 samples/bpf/bpf_helpers.h                          |    4 +
 samples/bpf/tcbpf1_kern.c                          |   24 +-
 security/selinux/hooks.c                           |   10 +-
 security/smack/smack_netfilter.c                   |    4 +-
 415 files changed, 24531 insertions(+), 5946 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/can/sun4i_can.txt
 create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt
 create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt
 create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt
 create mode 100644 arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi
 rename {include/linux => drivers/net/arcnet}/arcdevice.h (79%)
 rename {include/linux => drivers/net/arcnet}/com20020.h (61%)
 create mode 100644 drivers/net/arcnet/com9026.h
 create mode 100644 drivers/net/can/sun4i_can.c
 delete mode 100644 drivers/net/ethernet/hisilicon/hip04_mdio.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/Makefile
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hnae.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hnae.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_enet.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_enet.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns_mdio.c
 create mode 100644 include/linux/usb/cdc.h
Merging ipsec-next/master (e69948a0a530 net: Document xfrm4_gc_thresh and xfrm6_gc_thresh)
$ git merge ipsec-next/master
Already up-to-date.
Merging wireless-drivers-next/master (8f6c5b079cb3 Merge tag 'iwlwifi-next-for-kalle-2015-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
$ git merge wireless-drivers-next/master
Merge made by the 'recursive' strategy.
 drivers/net/wireless/ath/ath9k/hif_usb.c        | 106 ++++++++---
 drivers/net/wireless/ath/ath9k/hif_usb.h        |  21 ++-
 drivers/net/wireless/ath/ath9k/htc_drv_init.c   |   4 +
 drivers/net/wireless/iwlwifi/iwl-7000.c         |   6 +-
 drivers/net/wireless/iwlwifi/iwl-8000.c         |   6 +-
 drivers/net/wireless/iwlwifi/iwl-fw-file.h      |  13 --
 drivers/net/wireless/iwlwifi/iwl-io.c           |  23 +++
 drivers/net/wireless/iwlwifi/iwl-io.h           |  21 +--
 drivers/net/wireless/iwlwifi/mvm/d3.c           |   3 +
 drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c  |   3 +-
 drivers/net/wireless/iwlwifi/mvm/debugfs.c      | 129 ++-----------
 drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h    | 238 ++++++++++++++++++++++++
 drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h |  41 +---
 drivers/net/wireless/iwlwifi/mvm/fw-api.h       | 186 +-----------------
 drivers/net/wireless/iwlwifi/mvm/fw.c           |  16 --
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c     |  21 ++-
 drivers/net/wireless/iwlwifi/mvm/mac80211.c     |  26 +--
 drivers/net/wireless/iwlwifi/mvm/mvm.h          |  21 ++-
 drivers/net/wireless/iwlwifi/mvm/ops.c          |  23 ++-
 drivers/net/wireless/iwlwifi/mvm/rx.c           |  63 ++-----
 drivers/net/wireless/iwlwifi/mvm/scan.c         |   2 -
 drivers/net/wireless/iwlwifi/mvm/sta.c          |   5 +
 drivers/net/wireless/iwlwifi/mvm/tof.c          |   3 +-
 drivers/net/wireless/iwlwifi/mvm/utils.c        |  11 --
 24 files changed, 474 insertions(+), 517 deletions(-)
 create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h
Merging bluetooth/master (a913718812d5 Bluetooth: hci_qca: Changed unsigned long to bool)
$ git merge bluetooth/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/net/ieee802154/mrf24j40.txt           |   20 +
 MAINTAINERS                                        |    1 +
 drivers/bluetooth/Kconfig                          |    4 +-
 drivers/bluetooth/bluecard_cs.c                    |    2 +-
 drivers/bluetooth/bt3c_cs.c                        |    2 +-
 drivers/bluetooth/btmrvl_main.c                    |    2 +-
 drivers/bluetooth/btmrvl_sdio.c                    |   54 +-
 drivers/bluetooth/btuart_cs.c                      |    2 +-
 drivers/bluetooth/hci_bcm.c                        |  171 ++-
 drivers/bluetooth/hci_ldisc.c                      |    8 +-
 drivers/bluetooth/hci_qca.c                        |    4 +-
 drivers/bluetooth/hci_uart.h                       |    1 -
 drivers/net/ieee802154/Kconfig                     |    1 +
 drivers/net/ieee802154/at86rf230.c                 |  211 ++-
 drivers/net/ieee802154/mrf24j40.c                  | 1424 ++++++++++++++------
 include/linux/ieee802154.h                         |   22 +-
 include/net/6lowpan.h                              |    8 +
 include/net/bluetooth/bluetooth.h                  |    5 +
 include/net/cfg802154.h                            |   33 +
 include/net/ieee802154_netdev.h                    |   11 +-
 include/net/mac802154.h                            |    8 -
 net/6lowpan/nhc.h                                  |    2 -
 net/bluetooth/lib.c                                |   16 +
 net/ieee802154/6lowpan/core.c                      |   14 +-
 net/ieee802154/6lowpan/tx.c                        |   20 +-
 net/ieee802154/header_ops.c                        |   20 +-
 net/ieee802154/socket.c                            |    4 +-
 net/mac802154/iface.c                              |  106 +-
 net/mac802154/llsec.c                              |    1 +
 net/mac802154/tx.c                                 |   14 +-
 30 files changed, 1531 insertions(+), 660 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
Merging rdma/for-next (64291f7db5bd Linux 4.2)
$ git merge rdma/for-next
Already up-to-date.
Merging mtd/master (e5a5d92d9dc3 mxc_nand: fix copy_spare)
$ git merge mtd/master
Merge made by the 'recursive' strategy.
 drivers/mtd/nand/mxc_nand.c   |  2 +-
 drivers/mtd/nand/sunxi_nand.c | 27 ++++++++++-----------------
 2 files changed, 11 insertions(+), 18 deletions(-)
Merging l2-mtd/master (1bc81eeeba99 jffs2: remove unnecessary new_valid_dev check)
$ git merge l2-mtd/master
Auto-merging drivers/mtd/nand/sunxi_nand.c
Merge made by the 'recursive' strategy.
 drivers/mtd/devices/m25p80.c                  |  15 +-
 drivers/mtd/nand/brcmnand/brcmnand.c          |   5 +-
 drivers/mtd/nand/nand_base.c                  | 132 ++++++++++++-
 drivers/mtd/nand/nandsim.c                    |   3 +-
 drivers/mtd/nand/pxa3xx_nand.c                | 255 ++++++++++++++------------
 drivers/mtd/nand/sunxi_nand.c                 |  39 ++--
 drivers/mtd/spi-nor/fsl-quadspi.c             |  23 +--
 drivers/mtd/spi-nor/nxp-spifi.c               |  11 +-
 drivers/mtd/spi-nor/spi-nor.c                 |  30 +--
 fs/jffs2/dir.c                                |   3 -
 fs/jffs2/malloc.c                             |  27 +--
 include/linux/mtd/nand.h                      |   9 +-
 include/linux/mtd/spi-nor.h                   |  44 +----
 include/linux/platform_data/mtd-nand-pxa3xx.h |  27 ---
 14 files changed, 342 insertions(+), 281 deletions(-)
Merging crypto/master (97bce7e0b58d crypto: crc32c-pclmul - use .rodata instead of .rotata)
$ git merge crypto/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/rng/st,rng.txt |  15 +
 Documentation/hw_random.txt                      |   8 +-
 MAINTAINERS                                      |   1 +
 arch/arm/boot/dts/stih407-family.dtsi            |  14 +
 arch/x86/Makefile                                |   6 +-
 arch/x86/crypto/Makefile                         |   8 +
 arch/x86/crypto/crc32c-pcl-intel-asm_64.S        |   2 +-
 arch/x86/crypto/sha1_ni_asm.S                    | 302 +++++++++++++++++++
 arch/x86/crypto/sha1_ssse3_glue.c                | 314 ++++++++++++++++----
 arch/x86/crypto/sha256_ni_asm.S                  | 353 +++++++++++++++++++++++
 arch/x86/crypto/sha256_ssse3_glue.c              | 329 ++++++++++++++++++---
 arch/x86/crypto/sha512_ssse3_glue.c              | 249 +++++++++++++---
 crypto/Kconfig                                   |  10 +-
 crypto/asymmetric_keys/x509_cert_parser.c        |   6 +-
 crypto/tcrypt.c                                  |  17 +-
 drivers/char/hw_random/Kconfig                   |  12 +-
 drivers/char/hw_random/Makefile                  |   1 +
 drivers/char/hw_random/core.c                    |   2 +-
 drivers/char/hw_random/mxc-rnga.c                |  14 +-
 drivers/char/hw_random/octeon-rng.c              |  12 +-
 drivers/char/hw_random/pasemi-rng.c              |   1 +
 drivers/char/hw_random/ppc4xx-rng.c              |   1 +
 drivers/char/hw_random/st-rng.c                  | 144 +++++++++
 drivers/crypto/Kconfig                           |   2 +-
 drivers/crypto/amcc/crypto4xx_core.c             |  23 +-
 drivers/crypto/bfin_crc.c                        |  25 +-
 drivers/crypto/caam/desc.h                       |   1 -
 drivers/crypto/picoxcell_crypto.c                |   1 +
 drivers/crypto/qat/qat_common/adf_sriov.c        |   7 +-
 drivers/crypto/qat/qat_common/qat_crypto.c       |  61 ++--
 drivers/crypto/sahara.c                          |  30 +-
 drivers/crypto/ux500/cryp/cryp_core.c            |   1 +
 drivers/crypto/ux500/hash/hash_core.c            |   1 +
 33 files changed, 1673 insertions(+), 300 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rng/st,rng.txt
 create mode 100644 arch/x86/crypto/sha1_ni_asm.S
 create mode 100644 arch/x86/crypto/sha256_ni_asm.S
 create mode 100644 drivers/char/hw_random/st-rng.c
Merging drm/drm-next (73bf1b7be7aa Merge branch 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-next)
$ git merge drm/drm-next
Already up-to-date.
Merging drm-panel/drm/panel/for-next (a33ee95f8f45 drm/bridge: Put Kconfig entries in a separate menu)
$ git merge drm-panel/drm/panel/for-next
Already up-to-date.
Merging drm-intel/for-linux-next (590d5b04c315 drm/i915/gen8: Move WaHdcDisableFetchWhenMasked to common init fn)
$ git merge drm-intel/for-linux-next
Recorded preimage for 'drivers/gpu/drm/i915/intel_audio.c'
Recorded preimage for 'drivers/gpu/drm/i915/intel_display.c'
Resolved 'drivers/gpu/drm/i915/i915_irq.c' using previous resolution.
Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_dsi.c
Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_csr.c
Auto-merging drivers/gpu/drm/i915/intel_bios.c
Auto-merging drivers/gpu/drm/i915/intel_audio.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_audio.c
Auto-merging drivers/gpu/drm/i915/i915_irq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c
Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'drivers/gpu/drm/i915/intel_audio.c'.
Recorded resolution for 'drivers/gpu/drm/i915/intel_display.c'.
[master 8417e05cd7ba] Merge remote-tracking branch 'drm-intel/for-linux-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/DocBook/drm.tmpl             |  14 +
 drivers/gpu/drm/i915/Makefile              |   4 +
 drivers/gpu/drm/i915/dvo.h                 |   4 +-
 drivers/gpu/drm/i915/dvo_ch7017.c          |   4 +-
 drivers/gpu/drm/i915/dvo_ch7xxx.c          |   4 +-
 drivers/gpu/drm/i915/dvo_ivch.c            |  12 +-
 drivers/gpu/drm/i915/dvo_ns2501.c          |   4 +-
 drivers/gpu/drm/i915/dvo_sil164.c          |   4 +-
 drivers/gpu/drm/i915/dvo_tfp410.c          |   4 +-
 drivers/gpu/drm/i915/i915_cmd_parser.c     |  13 +-
 drivers/gpu/drm/i915/i915_debugfs.c        | 219 +++++--
 drivers/gpu/drm/i915/i915_dma.c            |  50 +-
 drivers/gpu/drm/i915/i915_drv.c            |  75 ++-
 drivers/gpu/drm/i915/i915_drv.h            |  93 ++-
 drivers/gpu/drm/i915/i915_gem.c            | 110 ++--
 drivers/gpu/drm/i915/i915_gem_context.c    |   7 +
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |   2 +-
 drivers/gpu/drm/i915/i915_gem_fence.c      |  45 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c        | 832 +++++++++++++++++++++-----
 drivers/gpu/drm/i915/i915_gem_gtt.h        |  71 ++-
 drivers/gpu/drm/i915/i915_gem_stolen.c     |  89 ++-
 drivers/gpu/drm/i915/i915_gem_userptr.c    |   4 -
 drivers/gpu/drm/i915/i915_gpu_error.c      |  68 +--
 drivers/gpu/drm/i915/i915_guc_reg.h        |  21 +-
 drivers/gpu/drm/i915/i915_guc_submission.c | 916 +++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_irq.c            | 577 ++++++++++++------
 drivers/gpu/drm/i915/i915_params.c         |  38 +-
 drivers/gpu/drm/i915/i915_reg.h            | 275 ++++++---
 drivers/gpu/drm/i915/i915_trace.h          |  58 +-
 drivers/gpu/drm/i915/i915_vgpu.h           |  34 +-
 drivers/gpu/drm/i915/intel_acpi.c          |   2 +-
 drivers/gpu/drm/i915/intel_atomic.c        |  13 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c  |   6 +-
 drivers/gpu/drm/i915/intel_audio.c         |  26 +-
 drivers/gpu/drm/i915/intel_bios.c          |  18 -
 drivers/gpu/drm/i915/intel_bios.h          |   3 -
 drivers/gpu/drm/i915/intel_crt.c           |  13 +-
 drivers/gpu/drm/i915/intel_csr.c           |  41 +-
 drivers/gpu/drm/i915/intel_ddi.c           |  91 ++-
 drivers/gpu/drm/i915/intel_display.c       | 676 +++++++++++----------
 drivers/gpu/drm/i915/intel_dp.c            | 775 +++++++++++++++---------
 drivers/gpu/drm/i915/intel_dp_mst.c        |  25 +-
 drivers/gpu/drm/i915/intel_drv.h           |  79 ++-
 drivers/gpu/drm/i915/intel_dsi.c           | 113 +++-
 drivers/gpu/drm/i915/intel_dsi.h           |   4 +-
 drivers/gpu/drm/i915/intel_dsi_pll.c       | 127 +++-
 drivers/gpu/drm/i915/intel_dvo.c           |  64 +-
 drivers/gpu/drm/i915/intel_fbc.c           | 201 +++++--
 drivers/gpu/drm/i915/intel_fbdev.c         |  11 +-
 drivers/gpu/drm/i915/intel_guc.h           | 122 ++++
 drivers/gpu/drm/i915/intel_guc_fwif.h      |  20 +-
 drivers/gpu/drm/i915/intel_guc_loader.c    | 614 +++++++++++++++++++
 drivers/gpu/drm/i915/intel_hdmi.c          | 275 +++++----
 drivers/gpu/drm/i915/intel_lrc.c           | 412 +++++++------
 drivers/gpu/drm/i915/intel_lrc.h           |  18 +-
 drivers/gpu/drm/i915/intel_lvds.c          |  20 +-
 drivers/gpu/drm/i915/intel_modes.c         |   9 +
 drivers/gpu/drm/i915/intel_panel.c         | 340 ++++++++---
 drivers/gpu/drm/i915/intel_pm.c            | 157 +++--
 drivers/gpu/drm/i915/intel_ringbuffer.c    | 215 +++----
 drivers/gpu/drm/i915/intel_ringbuffer.h    |  15 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c    | 430 +++++++++++---
 drivers/gpu/drm/i915/intel_sdvo.c          |  51 +-
 drivers/gpu/drm/i915/intel_sprite.c        |  56 +-
 drivers/gpu/drm/i915/intel_tv.c            |  10 +-
 drivers/gpu/drm/i915/intel_uncore.c        |  22 +-
 include/drm/drm_dp_helper.h                |   7 +
 67 files changed, 6526 insertions(+), 2206 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.c
 create mode 100644 drivers/gpu/drm/i915/intel_guc.h
 create mode 100644 drivers/gpu/drm/i915/intel_guc_loader.c
Merging drm-tegra/drm/tegra/for-next (459cc2c6800b drm/tegra: sor: Add HDMI support)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging drm-misc/topic/drm-misc (cf6483050e9b drm/irq: Add drm_crtc_vblank_count_and_time())
$ git merge drm-misc/topic/drm-misc
Recorded preimage for 'drivers/gpu/drm/i915/intel_audio.c'
Auto-merging include/drm/drm_dp_helper.h
Auto-merging drivers/gpu/drm/i915/intel_tv.c
Auto-merging drivers/gpu/drm/i915/intel_fbdev.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_audio.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_audio.c
Auto-merging drivers/gpu/drm/i915/i915_irq.c
Auto-merging drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Auto-merging Documentation/DocBook/drm.tmpl
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'drivers/gpu/drm/i915/intel_audio.c'.
[master 247e0ef85d21] Merge remote-tracking branch 'drm-misc/topic/drm-misc'
$ git diff -M --stat --summary HEAD^..
 Documentation/DocBook/drm.tmpl                  |   2 +-
 Documentation/kernel-parameters.txt             |  15 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c     |  11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c         |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h        |   3 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c |   4 +-
 drivers/gpu/drm/drm_atomic.c                    |  28 +-
 drivers/gpu/drm/drm_atomic_helper.c             | 316 ++++++++++++++++------
 drivers/gpu/drm/drm_crtc.c                      |  34 +--
 drivers/gpu/drm/drm_dp_helper.c                 |  44 +++-
 drivers/gpu/drm/drm_drv.c                       |   8 +-
 drivers/gpu/drm/drm_edid.c                      |   8 +-
 drivers/gpu/drm/drm_edid_load.c                 |  43 ++-
 drivers/gpu/drm/drm_fb_helper.c                 | 191 +++++++++++++-
 drivers/gpu/drm/drm_internal.h                  |   2 +-
 drivers/gpu/drm/drm_irq.c                       | 331 ++++++++++++------------
 drivers/gpu/drm/drm_mm.c                        |   6 +-
 drivers/gpu/drm/drm_modeset_lock.c              |   2 +
 drivers/gpu/drm/drm_plane_helper.c              |   6 +-
 drivers/gpu/drm/drm_sysfs.c                     |  49 ++--
 drivers/gpu/drm/exynos/exynos_drm_drv.c         |   2 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c     |   2 -
 drivers/gpu/drm/gma500/cdv_intel_dp.c           |   1 -
 drivers/gpu/drm/i2c/ch7006_drv.c                |   6 +-
 drivers/gpu/drm/i2c/ch7006_mode.c               |  26 +-
 drivers/gpu/drm/i2c/ch7006_priv.h               |  12 +-
 drivers/gpu/drm/i915/i915_irq.c                 |   5 +-
 drivers/gpu/drm/i915/intel_audio.c              |   2 +-
 drivers/gpu/drm/i915/intel_display.c            |   9 +-
 drivers/gpu/drm/i915/intel_dp.c                 |   1 +
 drivers/gpu/drm/i915/intel_drv.h                |   6 +-
 drivers/gpu/drm/i915/intel_fbdev.c              |   2 +
 drivers/gpu/drm/i915/intel_tv.c                 |   4 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c       |  10 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c       |  10 +-
 drivers/gpu/drm/msm/msm_atomic.c                |   2 +-
 drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c  |   2 +-
 drivers/gpu/drm/nouveau/dispnv04/tvnv17.h       |   2 +-
 drivers/gpu/drm/nouveau/nouveau_display.c       |   8 +-
 drivers/gpu/drm/nouveau/nouveau_display.h       |   3 +-
 drivers/gpu/drm/omapdrm/omap_drv.c              |   4 +-
 drivers/gpu/drm/omapdrm/omap_plane.c            |  10 +-
 drivers/gpu/drm/radeon/atombios_dp.c            |   1 +
 drivers/gpu/drm/radeon/radeon_display.c         |  14 +-
 drivers/gpu/drm/radeon/radeon_drv.c             |   5 +-
 drivers/gpu/drm/radeon/radeon_kms.c             |   2 +-
 drivers/gpu/drm/radeon/radeon_mode.h            |   5 +-
 drivers/gpu/drm/radeon/radeon_pm.c              |   4 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c           |   2 +-
 drivers/gpu/drm/sti/sti_drv.c                   |   2 +-
 drivers/gpu/drm/tegra/dc.c                      |   2 -
 drivers/gpu/drm/tegra/dpaux.c                   |   3 +-
 drivers/gpu/drm/tegra/drm.c                     |   2 +-
 drivers/gpu/vga/vga_switcheroo.c                | 304 ++++++++++++++++++++--
 include/drm/drmP.h                              |  11 +-
 include/drm/drm_atomic_helper.h                 |  12 +-
 include/drm/drm_crtc.h                          |  11 +-
 include/drm/drm_dp_helper.h                     |   2 +-
 include/drm/drm_edid.h                          |   5 +-
 include/drm/drm_fb_helper.h                     |  31 ++-
 include/drm/drm_modeset_lock.h                  |  10 +-
 include/drm/drm_plane_helper.h                  |   2 -
 include/linux/fb.h                              |   2 +-
 include/linux/vga_switcheroo.h                  |  89 ++++++-
 include/uapi/drm/drm_mode.h                     |  42 ++-
 sound/pci/hda/hda_intel.c                       |   3 +-
 66 files changed, 1303 insertions(+), 497 deletions(-)
Merging drm-exynos/exynos-drm/for-next (7d9071a09502 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge drm-exynos/exynos-drm/for-next
Already up-to-date.
Merging drm-msm/msm-next (d248b61f6114 drm/msm/dsi: Introduce DSI configuration module)
$ git merge drm-msm/msm-next
Already up-to-date.
Merging sound/for-next (0b2c8c12f929 Merge tag 'asoc-v4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next)
$ git merge sound/for-next
Removing sound/soc/codecs/hdmi.c
Auto-merging drivers/spi/spi-atmel.c
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/sound/ak4613.txt |  17 +
 Documentation/devicetree/bindings/sound/ak4642.txt |  22 +-
 .../devicetree/bindings/sound/renesas,rsnd.txt     |   7 +
 .../devicetree/bindings/sound/sun4i-codec.txt      |  33 +
 .../devicetree/bindings/sound/tdm-slot.txt         |  11 +-
 drivers/spi/spi-atmel.c                            |  21 +-
 include/sound/pcm.h                                |   6 -
 include/sound/rcar_snd.h                           |   1 -
 include/sound/rt5645.h                             |   2 +
 include/sound/simple_card.h                        |   2 +
 include/sound/soc.h                                |  14 +
 sound/core/pcm.c                                   |   3 -
 sound/core/pcm_native.c                            |   3 +-
 sound/firewire/oxfw/oxfw-stream.c                  |   5 +-
 sound/firewire/oxfw/oxfw.c                         |  29 +
 sound/firewire/oxfw/oxfw.h                         |   1 +
 sound/pci/rme9652/hdsp.c                           |   1 +
 sound/soc/Kconfig                                  |   1 +
 sound/soc/Makefile                                 |   1 +
 sound/soc/atmel/atmel_wm8904.c                     |   1 +
 sound/soc/au1x/db1000.c                            |  10 +-
 sound/soc/au1x/db1200.c                            |  10 +-
 sound/soc/blackfin/bf5xx-ad1836.c                  |  11 +-
 sound/soc/blackfin/bfin-eval-adau1373.c            |  12 +-
 sound/soc/blackfin/bfin-eval-adau1701.c            |  12 +-
 sound/soc/blackfin/bfin-eval-adav80x.c             |  12 +-
 sound/soc/codecs/Kconfig                           |   9 +-
 sound/soc/codecs/Makefile                          |   4 +-
 sound/soc/codecs/ak4613.c                          | 497 ++++++++++++++
 sound/soc/codecs/ak4642.c                          | 153 +++--
 sound/soc/codecs/arizona.c                         |  16 +
 sound/soc/codecs/arizona.h                         |   2 +
 sound/soc/codecs/hdmi.c                            | 109 ----
 sound/soc/codecs/rt5645.c                          |  35 +-
 sound/soc/codecs/rt5645.h                          |   6 +-
 sound/soc/codecs/tlv320aic3x.c                     |  30 +-
 sound/soc/codecs/wm5110.c                          | 187 +++++-
 sound/soc/davinci/davinci-mcasp.c                  | 305 ++++++---
 sound/soc/fsl/fsl-asoc-card.c                      |   1 +
 sound/soc/fsl/fsl_sai.c                            |   1 +
 sound/soc/generic/simple-card.c                    |   8 +-
 sound/soc/intel/atom/sst-mfld-platform-pcm.c       |  17 -
 sound/soc/intel/boards/broadwell.c                 |   9 +-
 sound/soc/intel/skylake/skl-pcm.c                  |  33 -
 sound/soc/jz4740/jz4740-i2s.c                      |   1 +
 sound/soc/kirkwood/armada-370-db.c                 |   1 +
 sound/soc/mediatek/mt8173-max98090.c               |  11 +-
 sound/soc/mediatek/mt8173-rt5650-rt5676.c          |  11 +-
 sound/soc/mxs/mxs-sgtl5000.c                       |   6 +-
 sound/soc/pxa/brownstone.c                         |   9 +-
 sound/soc/pxa/corgi.c                              |  11 +-
 sound/soc/pxa/e740_wm9705.c                        |   5 +-
 sound/soc/pxa/e750_wm9705.c                        |   5 +-
 sound/soc/pxa/e800_wm9712.c                        |   5 +-
 sound/soc/pxa/hx4700.c                             |   4 +-
 sound/soc/pxa/imote2.c                             |  11 +-
 sound/soc/pxa/mioa701_wm9713.c                     |  11 +-
 sound/soc/pxa/palm27x.c                            |   9 +-
 sound/soc/pxa/poodle.c                             |  11 +-
 sound/soc/pxa/pxa-ssp.c                            |   1 +
 sound/soc/pxa/pxa2xx-pcm.c                         |   1 +
 sound/soc/pxa/spitz.c                              |   5 +-
 sound/soc/pxa/tosa.c                               |   5 +-
 sound/soc/pxa/ttc-dkb.c                            |  12 +-
 sound/soc/qcom/lpass-cpu.c                         |   3 +-
 sound/soc/rockchip/Kconfig                         |   4 +-
 sound/soc/sh/Kconfig                               |   1 +
 sound/soc/sh/rcar/adg.c                            | 303 +++++++--
 sound/soc/sh/rcar/core.c                           |  12 +
 sound/soc/sh/rcar/ctu.c                            |   6 +-
 sound/soc/sh/rcar/dvc.c                            |   6 +-
 sound/soc/sh/rcar/mix.c                            |   6 +-
 sound/soc/sh/rcar/rsnd.h                           |  15 +-
 sound/soc/sh/rcar/src.c                            |  17 +-
 sound/soc/sh/rcar/ssi.c                            |  98 +--
 sound/soc/sh/siu_dai.c                             |  85 +--
 sound/soc/soc-core.c                               |  25 +
 sound/soc/soc-pcm.c                                |  49 ++
 sound/soc/sunxi/Kconfig                            |  11 +
 sound/soc/sunxi/Makefile                           |   2 +
 sound/soc/sunxi/sun4i-codec.c                      | 719 +++++++++++++++++++++
 sound/soc/ux500/mop500.c                           |   1 +
 sound/soc/ux500/ux500_msp_dai.c                    |   1 +
 83 files changed, 2399 insertions(+), 770 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/ak4613.txt
 create mode 100644 Documentation/devicetree/bindings/sound/sun4i-codec.txt
 create mode 100644 sound/soc/codecs/ak4613.c
 delete mode 100644 sound/soc/codecs/hdmi.c
 create mode 100644 sound/soc/sunxi/Kconfig
 create mode 100644 sound/soc/sunxi/Makefile
 create mode 100644 sound/soc/sunxi/sun4i-codec.c
Merging sound-asoc/for-next (a4bbc568cb2b Merge remote-tracking branch 'asoc/topic/rl6347a' into asoc-next)
$ git merge sound-asoc/for-next
Merge made by the 'recursive' strategy.
 sound/soc/au1x/db1200.c    |  4 ++++
 sound/soc/codecs/rl6347a.c | 19 +------------------
 sound/soc/codecs/rl6347a.h |  2 ++
 sound/soc/codecs/rt286.c   |  1 -
 sound/soc/codecs/rt298.c   |  1 -
 5 files changed, 7 insertions(+), 20 deletions(-)
Merging modules/modules-next (5cfb203a304d modpost: abort if a module symbol is too long)
$ git merge modules/modules-next
Merge made by the 'recursive' strategy.
 scripts/mod/modpost.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
Merging input/next (2260c419b52b Input: db9 - use parallel port device model)
$ git merge input/next
Removing include/linux/input/edt-ft5x06.h
Auto-merging arch/arm/boot/dts/imx6qdl-tx6.dtsi
Auto-merging arch/arm/boot/dts/am437x-sk-evm.dts
Merge made by the 'recursive' strategy.
 .../bindings/input/touchscreen/edt-ft5x06.txt      |   6 +-
 arch/arm/boot/dts/am437x-sk-evm.dts                |   2 +-
 arch/arm/boot/dts/imx28-tx28.dts                   |   3 +-
 arch/arm/boot/dts/imx53-tx53-x03x.dts              |   3 +-
 arch/arm/boot/dts/imx6qdl-tx6.dtsi                 |   3 +-
 drivers/input/joystick/db9.c                       | 110 +++++------
 drivers/input/misc/ad714x-i2c.c                    |  10 -
 drivers/input/misc/ad714x-spi.c                    |  10 -
 drivers/input/misc/ad714x.c                        | 214 ++++++++-------------
 drivers/input/misc/ad714x.h                        |   1 -
 drivers/input/touchscreen/edt-ft5x06.c             | 190 +++++-------------
 include/linux/input/edt-ft5x06.h                   |  24 ---
 12 files changed, 200 insertions(+), 376 deletions(-)
 delete mode 100644 include/linux/input/edt-ft5x06.h
Merging block/for-next (f7e7868b4743 cdrom: Random writing support for BD-RE media)
$ git merge block/for-next
Merge made by the 'recursive' strategy.
 block/blk-mq.c            |  11 ++
 drivers/block/loop.c      | 275 ++++++++++++++++++++++++++++++++++++----------
 drivers/block/loop.h      |  13 ++-
 drivers/cdrom/cdrom.c     |   1 +
 fs/direct-io.c            |   9 +-
 fs/mpage.c                |  23 ++--
 include/uapi/linux/loop.h |   2 +
 7 files changed, 261 insertions(+), 73 deletions(-)
Merging device-mapper/for-next (586b286b110e dm crypt: constrain crypt device's max_segment_size to PAGE_SIZE)
$ git merge device-mapper/for-next
Already up-to-date.
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
$ git merge pcmcia/master
Already up-to-date.
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
$ git merge mmc/mmc-next
Already up-to-date.
Merging mmc-uh/next (b809d56d4962 mmc: sunxi: Add card busy detection)
$ git merge mmc-uh/next
Merge made by the 'recursive' strategy.
 drivers/mmc/card/block.c          | 206 ++++++++++++++++++++++++++++----------
 drivers/mmc/core/core.c           |  23 +++++
 drivers/mmc/core/debugfs.c        |  19 ++++
 drivers/mmc/core/host.c           |   4 +-
 drivers/mmc/core/mmc_ops.c        |   1 -
 drivers/mmc/core/mmc_ops.h        |   3 +
 drivers/mmc/core/pwrseq_emmc.c    |   2 +-
 drivers/mmc/core/pwrseq_simple.c  |  45 +++------
 drivers/mmc/core/sd.c             |   2 -
 drivers/mmc/core/sdio.c           |  20 +++-
 drivers/mmc/core/sdio_ops.h       |   7 ++
 drivers/mmc/host/mmc_spi.c        |   1 +
 drivers/mmc/host/moxart-mmc.c     |   1 +
 drivers/mmc/host/mtk-sd.c         |   2 +-
 drivers/mmc/host/omap.c           |   1 +
 drivers/mmc/host/sdhci-acpi.c     |   1 +
 drivers/mmc/host/sdhci-bcm-kona.c |   2 +-
 drivers/mmc/host/sdhci-of-at91.c  |   1 -
 drivers/mmc/host/sdhci-of-esdhc.c |   3 +-
 drivers/mmc/host/sdhci-pltfm.c    |   6 +-
 drivers/mmc/host/sdhci.c          |  22 ++--
 drivers/mmc/host/sunxi-mmc.c      |  61 ++++++++---
 drivers/mmc/host/vub300.c         |   6 +-
 drivers/mmc/host/wbsd.c           |   2 +-
 include/linux/mmc/core.h          |   2 -
 include/uapi/linux/mmc/ioctl.h    |  19 +++-
 26 files changed, 325 insertions(+), 137 deletions(-)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
 kernel/debug/kdb/kdb_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (4c34b5a1b2fd md/raid1: Avoid raid1 resync getting stuck)
$ git merge md/for-next
Merge made by the 'recursive' strategy.
 drivers/md/bitmap.c            | 14 ++++++------
 drivers/md/bitmap.h            |  4 +++-
 drivers/md/md-cluster.c        | 48 +++++++++---------------------------------
 drivers/md/md-cluster.h        |  4 +---
 drivers/md/md.c                | 16 +++++++-------
 drivers/md/multipath.c         |  3 +--
 drivers/md/raid0.c             | 12 +++++------
 drivers/md/raid1.c             | 37 +++++++++++++++++++++++++-------
 drivers/md/raid1.h             |  7 ++++++
 drivers/md/raid10.c            | 11 ++++------
 drivers/md/raid5.c             | 13 +++++++-----
 include/uapi/linux/raid/md_p.h |  2 ++
 12 files changed, 85 insertions(+), 86 deletions(-)
Merging mfd/for-mfd-next (760212e1ca76 mfd: lpc_ich: Separate device cells for clarity)
$ git merge mfd/for-mfd-next
Merge made by the 'recursive' strategy.
 drivers/mfd/88pm80x.c                 |   2 +
 drivers/mfd/Makefile                  |   1 +
 drivers/mfd/arizona-irq.c             |   2 +-
 drivers/mfd/atmel-hlcdc.c             |   1 +
 drivers/mfd/bcm590xx.c                |   1 -
 drivers/mfd/cros_ec_i2c.c             |   7 +
 drivers/mfd/hi6421-pmic-core.c        |   1 +
 drivers/mfd/intel-lpss.c              |  12 +-
 drivers/mfd/intel_soc_pmic_bxtwc.c    | 478 ++++++++++++++++++++++++++++++++++
 drivers/mfd/lpc_ich.c                 |  42 ++-
 drivers/mfd/max8997.c                 |   1 +
 drivers/mfd/rt5033.c                  |   1 -
 drivers/mfd/sec-core.c                |  30 +++
 drivers/mfd/sm501.c                   |   1 +
 drivers/mfd/stmpe.c                   |   1 +
 drivers/mfd/tps65217.c                |   4 +
 drivers/mfd/twl6040.c                 |   2 +
 drivers/mfd/wm5110-tables.c           | 188 ++++++++++++-
 drivers/mfd/wm831x-core.c             |   4 +-
 drivers/mfd/wm8998-tables.c           |  10 +-
 include/linux/mfd/88pm80x.h           |   1 +
 include/linux/mfd/arizona/registers.h |  70 +++++
 include/linux/mfd/intel_bxtwc.h       |  69 +++++
 include/linux/mfd/intel_soc_pmic.h    |   2 +
 include/linux/mfd/samsung/core.h      |   2 +
 include/linux/mfd/samsung/s2mps11.h   |   1 +
 include/linux/regmap.h                |   3 +
 27 files changed, 891 insertions(+), 46 deletions(-)
 create mode 100644 drivers/mfd/intel_soc_pmic_bxtwc.c
 create mode 100644 include/linux/mfd/intel_bxtwc.h
Merging backlight/for-backlight-next (13d20b3b618a backlight: tosa: Export I2C module alias information)
$ git merge backlight/for-backlight-next
Already up-to-date.
Merging battery/master (9b1cf1e44d91 power: bq24257: Streamline input current limit setup)
$ git merge battery/master
Removing include/linux/power/bq27x00_battery.h
Removing drivers/power/bq27x00_battery.c
Auto-merging arch/arm/configs/omap2plus_defconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/power_supply/axp20x_usb_power.txt     |   34 +
 .../devicetree/bindings/power_supply/qcom_smbb.txt |  131 ++
 .../bindings/power_supply/tps65217_charger.txt     |   12 +
 MAINTAINERS                                        |    4 +-
 arch/arm/boot/dts/twl4030.dtsi                     |    2 +
 arch/arm/configs/omap2plus_defconfig               |    2 +-
 arch/unicore32/Kconfig                             |    2 +-
 drivers/power/88pm860x_battery.c                   |   37 +-
 drivers/power/Kconfig                              |   48 +-
 drivers/power/Makefile                             |    5 +-
 drivers/power/axp20x_usb_power.c                   |  248 ++++
 drivers/power/bq2415x_charger.c                    |    2 +-
 drivers/power/bq24190_charger.c                    |    1 -
 drivers/power/bq24257_charger.c                    |   57 +-
 drivers/power/bq27x00_battery.c                    | 1129 ----------------
 drivers/power/bq27xxx_battery.c                    | 1374 ++++++++++++++++++++
 drivers/power/lp8727_charger.c                     |   31 +-
 drivers/power/max17042_battery.c                   |   26 +-
 drivers/power/max8903_charger.c                    |   93 +-
 drivers/power/max8998_charger.c                    |   29 +-
 drivers/power/pm2301_charger.c                     |    1 -
 drivers/power/qcom_smbb.c                          |  951 ++++++++++++++
 drivers/power/reset/Kconfig                        |    4 +-
 drivers/power/reset/at91-poweroff.c                |   33 +-
 drivers/power/reset/at91-reset.c                   |   69 +-
 drivers/power/rt9455_charger.c                     |    1 -
 drivers/power/smb347-charger.c                     |    1 -
 drivers/power/tps65090-charger.c                   |    1 +
 drivers/power/tps65217_charger.c                   |  264 ++++
 drivers/power/twl4030_charger.c                    |   39 +-
 drivers/power/wm831x_power.c                       |   15 +-
 drivers/w1/slaves/w1_bq27000.c                     |    5 +-
 include/linux/mfd/axp20x.h                         |   24 +
 include/linux/power/bq27x00_battery.h              |   19 -
 include/linux/power/bq27xxx_battery.h              |   31 +
 include/linux/power/charger-manager.h              |    8 +-
 36 files changed, 3304 insertions(+), 1429 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt
 create mode 100644 Documentation/devicetree/bindings/power_supply/qcom_smbb.txt
 create mode 100644 Documentation/devicetree/bindings/power_supply/tps65217_charger.txt
 create mode 100644 drivers/power/axp20x_usb_power.c
 delete mode 100644 drivers/power/bq27x00_battery.c
 create mode 100644 drivers/power/bq27xxx_battery.c
 create mode 100644 drivers/power/qcom_smbb.c
 create mode 100644 drivers/power/tps65217_charger.c
 delete mode 100644 include/linux/power/bq27x00_battery.h
 create mode 100644 include/linux/power/bq27xxx_battery.h
$ git reset --hard HEAD^
HEAD is now at bf83b6437b32 Merge remote-tracking branch 'mfd/for-mfd-next'
Merging next-20150925 version of battery
$ git merge -m next-20150925/battery 3636859b280ca595da4556274a509223f47e9a39
Removing include/linux/power/bq27x00_battery.h
Removing drivers/power/bq27x00_battery.c
Auto-merging arch/arm/configs/omap2plus_defconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/power_supply/axp20x_usb_power.txt     |   34 +
 .../devicetree/bindings/power_supply/qcom_smbb.txt |  131 ++
 .../bindings/power_supply/tps65217_charger.txt     |   12 +
 MAINTAINERS                                        |    4 +-
 arch/arm/configs/omap2plus_defconfig               |    2 +-
 arch/unicore32/Kconfig                             |    2 +-
 drivers/power/88pm860x_battery.c                   |   37 +-
 drivers/power/Kconfig                              |   48 +-
 drivers/power/Makefile                             |    5 +-
 drivers/power/axp20x_usb_power.c                   |  248 ++++
 drivers/power/bq2415x_charger.c                    |    2 +-
 drivers/power/bq24190_charger.c                    |    1 -
 drivers/power/bq27x00_battery.c                    | 1129 ----------------
 drivers/power/bq27xxx_battery.c                    | 1374 ++++++++++++++++++++
 drivers/power/lp8727_charger.c                     |   31 +-
 drivers/power/max17042_battery.c                   |   26 +-
 drivers/power/max8903_charger.c                    |   93 +-
 drivers/power/max8998_charger.c                    |   29 +-
 drivers/power/pm2301_charger.c                     |    1 -
 drivers/power/qcom_smbb.c                          |  951 ++++++++++++++
 drivers/power/reset/Kconfig                        |    4 +-
 drivers/power/reset/at91-poweroff.c                |   33 +-
 drivers/power/reset/at91-reset.c                   |   69 +-
 drivers/power/rt9455_charger.c                     |    1 -
 drivers/power/smb347-charger.c                     |    1 -
 drivers/power/tps65090-charger.c                   |    1 +
 drivers/power/tps65217_charger.c                   |  264 ++++
 drivers/power/wm831x_power.c                       |    9 +-
 drivers/w1/slaves/w1_bq27000.c                     |    5 +-
 include/linux/mfd/axp20x.h                         |   24 +
 include/linux/power/bq27x00_battery.h              |   19 -
 include/linux/power/bq27xxx_battery.h              |   31 +
 include/linux/power/charger-manager.h              |    8 +-
 33 files changed, 3257 insertions(+), 1372 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt
 create mode 100644 Documentation/devicetree/bindings/power_supply/qcom_smbb.txt
 create mode 100644 Documentation/devicetree/bindings/power_supply/tps65217_charger.txt
 create mode 100644 drivers/power/axp20x_usb_power.c
 delete mode 100644 drivers/power/bq27x00_battery.c
 create mode 100644 drivers/power/bq27xxx_battery.c
 create mode 100644 drivers/power/qcom_smbb.c
 create mode 100644 drivers/power/tps65217_charger.c
 delete mode 100644 include/linux/power/bq27x00_battery.h
 create mode 100644 include/linux/power/bq27xxx_battery.h
Merging omap_dss2/for-next (7b554088d56e video: fbdev: pxa168fb: Use devm_clk_get)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (8f81f50a9c8b Merge remote-tracking branches 'regulator/topic/pwm', 'regulator/topic/qcom-smd' and 'regulator/topic/tps65023' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/regulator/regulator.txt    |   1 +
 .../devicetree/bindings/regulator/tps65023.txt     |  60 +++++
 drivers/regulator/bcm590xx-regulator.c             |   2 +-
 drivers/regulator/core.c                           | 263 ++++++++++++-------
 drivers/regulator/da9063-regulator.c               |   2 +-
 drivers/regulator/of_regulator.c                   |   3 +
 drivers/regulator/pwm-regulator.c                  |  35 ++-
 drivers/regulator/qcom_smd-regulator.c             |  28 +-
 drivers/regulator/tps65023-regulator.c             | 282 ++++++++-------------
 9 files changed, 385 insertions(+), 291 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/regulator/tps65023.txt
Merging security/next (07f081fb5057 PKCS#7: Add OIDs for sha224, sha284 and sha512 hash algos and use them)
$ git merge security/next
Already up-to-date.
Merging integrity/next (24fd03c87695 ima: update builtin policies)
$ git merge integrity/next
Already up-to-date.
Merging selinux/next (b21800f30439 selinux: do not check open perm on ftruncate call)
$ git merge selinux/next
Auto-merging security/selinux/hooks.c
Merge made by the 'recursive' strategy.
 security/selinux/Kconfig | 4 ++--
 security/selinux/hooks.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
Merging lblnet/next (b2776bf7149b Linux 3.18)
$ git merge lblnet/next
Already up-to-date.
Merging watchdog/master (55f1dfb398d9 watchdog: iTCO: Fix dependencies on I2C)
$ git merge watchdog/master
Merge made by the 'recursive' strategy.
 drivers/watchdog/Kconfig       |  3 ++-
 drivers/watchdog/bcm2835_wdt.c | 10 ++++++++--
 drivers/watchdog/gef_wdt.c     |  1 +
 drivers/watchdog/mena21_wdt.c  |  1 +
 drivers/watchdog/moxart_wdt.c  |  1 +
 5 files changed, 13 insertions(+), 3 deletions(-)
Merging iommu/next (4ad79562577a Merge branches 'arm/omap', 'arm/msm', 'arm/smmu', 'arm/tegra', 'x86/vt-d', 'x86/amd', 'ppc/pamu' and 'core' into next)
$ git merge iommu/next
Already up-to-date.
Merging dwmw2-iommu/master (5dbaf90a6780 iommu/vt-d: Add initial shell of SVM support)
$ git merge dwmw2-iommu/master
Auto-merging include/linux/intel-iommu.h
Auto-merging drivers/iommu/intel-iommu.c
Auto-merging drivers/iommu/Kconfig
Merge made by the 'recursive' strategy.
 drivers/iommu/Kconfig       |  10 +++-
 drivers/iommu/Makefile      |   1 +
 drivers/iommu/intel-iommu.c |  19 +++++--
 drivers/iommu/intel-svm.c   |  71 ++++++++++++++++++++++++++
 drivers/iommu/iova.c        | 120 +++++++++++++++++++++++++-------------------
 include/linux/intel-iommu.h |  15 ++++++
 include/linux/iova.h        |   4 +-
 7 files changed, 183 insertions(+), 57 deletions(-)
 create mode 100644 drivers/iommu/intel-svm.c
Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer)
$ git merge vfio/next
Already up-to-date.
Merging jc_docs/docs-next (b479bfd00e46 DocBook: Use a fixed encoding for output)
$ git merge jc_docs/docs-next
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/DMA-API-HOWTO.txt             |   5 ++
 Documentation/DMA-API.txt                   |   6 +-
 Documentation/DocBook/.gitignore            |   2 +
 Documentation/DocBook/Makefile              |   6 ++
 Documentation/SubmittingPatches             |   8 +-
 Documentation/blockdev/zram.txt             |  44 ++++++++++-
 Documentation/cgroups/blkio-controller.txt  |   2 +-
 Documentation/cgroups/freezer-subsystem.txt |   2 +-
 Documentation/cgroups/unified-hierarchy.txt |   2 +-
 Documentation/filesystems/sysfs-tagging.txt |  14 ++--
 Documentation/filesystems/sysfs.txt         |   9 ++-
 Documentation/gpio/board.txt                |  10 ++-
 Documentation/kernel-parameters.txt         |  10 ++-
 Documentation/kselftest.txt                 |  16 ++++
 Documentation/locking/lockstat.txt          |   2 +-
 Documentation/misc-devices/apds990x.txt     |   2 +-
 Documentation/misc-devices/isl29003         |   2 +-
 Documentation/misc-devices/max6875          |   2 +-
 Documentation/networking/can.txt            |  97 ++++++++++++++++++-----
 Documentation/rbtree.txt                    |   2 +-
 Documentation/zh_CN/filesystems/sysfs.txt   |   2 +-
 MAINTAINERS                                 |   4 +-
 Makefile                                    |   2 +-
 README                                      |   2 +-
 scripts/.gitignore                          |   1 +
 scripts/Makefile                            |   7 +-
 scripts/check-lc_ctype.c                    |  11 +++
 scripts/kernel-doc                          | 115 ++++++++++++++++------------
 28 files changed, 277 insertions(+), 110 deletions(-)
 create mode 100644 scripts/check-lc_ctype.c
Merging trivial/for-next (e5f6450c3f40 MAINTAINERS: update my e-mail address)
$ git merge trivial/for-next
Already up-to-date.
Merging audit/next (e7d9764a515e audit: try harder to send to auditd upon netlink failure)
$ git merge audit/next
Auto-merging kernel/audit.c
Merge made by the 'recursive' strategy.
 kernel/audit.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
$ git merge devicetree/devicetree/next
Already up-to-date.
Merging dt-rh/for-next (a13f18f59d26 Documentation: arm: Fix typo in the idle-states bindings examples)
$ git merge dt-rh/for-next
Already up-to-date.
Merging mailbox/mailbox-for-next (86e488adaab7 mailbox: arm_mhu: reduce txpoll_period from 10ms to 1 ms)
$ git merge mailbox/mailbox-for-next
Already up-to-date.
Merging spi/for-next (3d75415c550b Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/stats' and 'spi/topic/txx9' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 drivers/spi/spi-au1550.c        |  11 ++--
 drivers/spi/spi-bcm53xx.c       |  13 +----
 drivers/spi/spi-bcm63xx.c       |  24 ++++++---
 drivers/spi/spi-bfin-sport.c    |   5 +-
 drivers/spi/spi-bfin5xx.c       |   6 +--
 drivers/spi/spi-bitbang.c       |  17 +++----
 drivers/spi/spi-davinci.c       |   7 +--
 drivers/spi/spi-dw.c            |  46 +++++++----------
 drivers/spi/spi-fsl-dspi.c      |   3 --
 drivers/spi/spi-mpc512x-psc.c   |   8 ++-
 drivers/spi/spi-oc-tiny.c       |  14 ++---
 drivers/spi/spi-octeon.c        |   2 +-
 drivers/spi/spi-omap-100k.c     |  26 +++-------
 drivers/spi/spi-omap-uwire.c    |   7 +--
 drivers/spi/spi-ppc4xx.c        |   4 +-
 drivers/spi/spi-pxa2xx.c        | 110 ++++++++++++++++++----------------------
 drivers/spi/spi-pxa2xx.h        |   6 ---
 drivers/spi/spi-s3c24xx.c       |   4 +-
 drivers/spi/spi-s3c64xx.c       |  46 +++++++++++------
 drivers/spi/spi-txx9.c          |   2 +-
 drivers/spi/spi.c               |  61 ++++++++++++++++++++++
 include/linux/spi/spi.h         |   4 ++
 include/linux/spi/spi_bitbang.h |   2 +-
 23 files changed, 227 insertions(+), 201 deletions(-)
Merging tip/auto-latest (4da60d8fd6ff Merge branch 'x86/urgent')
$ git merge tip/auto-latest
Auto-merging tools/perf/util/probe-event.c
Removing tools/lib/api/fs/tracefs.h
Removing tools/lib/api/fs/tracefs.c
Removing tools/lib/api/fs/findfs.h
Removing tools/lib/api/fs/findfs.c
Removing tools/lib/api/fs/debugfs.h
Removing tools/lib/api/fs/debugfs.c
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/include/asm/pgtable.h
Auto-merging arch/x86/crypto/sha512_ssse3_glue.c
Auto-merging arch/x86/crypto/sha256_ssse3_glue.c
Auto-merging arch/x86/crypto/sha1_ssse3_glue.c
Auto-merging arch/x86/Kconfig
Merge made by the 'recursive' strategy.
 Documentation/atomic_ops.txt                       |   4 +
 Documentation/devicetree/bindings/arm/gic.txt      |  24 +-
 Documentation/memory-barriers.txt                  |  17 +-
 arch/alpha/include/asm/atomic.h                    |   8 +-
 arch/arc/include/asm/atomic.h                      |   8 +-
 arch/arm/include/asm/atomic.h                      |   4 +-
 arch/arm64/include/asm/acpi.h                      |   5 +
 arch/arm64/include/asm/atomic.h                    |   2 +-
 arch/arm64/include/asm/memory.h                    |   1 +
 arch/arm64/include/asm/pgtable.h                   |   2 +
 arch/arm64/kernel/acpi.c                           |  29 +
 arch/arm64/mm/proc.S                               |   4 +-
 arch/avr32/include/asm/atomic.h                    |   4 +-
 arch/frv/include/asm/atomic.h                      |   4 +-
 arch/h8300/include/asm/atomic.h                    |   4 +-
 arch/hexagon/include/asm/atomic.h                  |   2 +-
 arch/ia64/include/asm/atomic.h                     |   8 +-
 arch/m32r/include/asm/atomic.h                     |   4 +-
 arch/m68k/include/asm/atomic.h                     |   4 +-
 arch/metag/include/asm/atomic_lnkget.h             |   2 +-
 arch/metag/include/asm/atomic_lock1.h              |   2 +-
 arch/mips/include/asm/atomic.h                     |   8 +-
 arch/mn10300/include/asm/atomic.h                  |   4 +-
 arch/parisc/include/asm/atomic.h                   |   2 +-
 arch/powerpc/perf/core-book3s.c                    |  36 +-
 arch/powerpc/perf/hv-24x7.c                        | 166 +++-
 arch/s390/kernel/perf_cpum_cf.c                    |  35 +-
 arch/sh/include/asm/atomic.h                       |   4 +-
 arch/sparc/include/asm/atomic_64.h                 |   8 +-
 arch/sparc/kernel/perf_event.c                     |  32 +-
 arch/tile/include/asm/atomic.h                     |   2 +-
 arch/tile/include/asm/atomic_64.h                  |   6 +-
 arch/x86/Kconfig                                   |  49 ++
 arch/x86/boot/header.S                             |   2 +-
 arch/x86/crypto/camellia_aesni_avx2_glue.c         |   3 +-
 arch/x86/crypto/camellia_aesni_avx_glue.c          |   3 +-
 arch/x86/crypto/cast5_avx_glue.c                   |   3 +-
 arch/x86/crypto/cast6_avx_glue.c                   |   3 +-
 arch/x86/crypto/chacha20_glue.c                    |   2 +-
 arch/x86/crypto/poly1305_glue.c                    |   2 +-
 arch/x86/crypto/serpent_avx2_glue.c                |   3 +-
 arch/x86/crypto/serpent_avx_glue.c                 |   3 +-
 arch/x86/crypto/sha1_ssse3_glue.c                  |   2 +-
 arch/x86/crypto/sha256_ssse3_glue.c                |   2 +-
 arch/x86/crypto/sha512_ssse3_glue.c                |   2 +-
 arch/x86/crypto/twofish_avx_glue.c                 |   2 +-
 arch/x86/entry/vdso/vdso32/vclock_gettime.c        |   2 +
 arch/x86/entry/vsyscall/vsyscall_64.c              |   9 +-
 arch/x86/ia32/ia32_signal.c                        |   8 +-
 arch/x86/include/asm/acpi.h                        |  23 +
 arch/x86/include/asm/atomic.h                      |   4 +-
 arch/x86/include/asm/atomic64_64.h                 |   4 +-
 arch/x86/include/asm/cpufeature.h                  |   2 +-
 arch/x86/include/asm/fpu/signal.h                  |   2 +-
 arch/x86/include/asm/fpu/types.h                   | 148 ++--
 arch/x86/include/asm/fpu/xstate.h                  |  15 +-
 arch/x86/include/asm/ia32.h                        |   4 +-
 arch/x86/include/asm/numachip/numachip.h           |   1 +
 arch/x86/include/asm/numachip/numachip_csr.h       | 153 +---
 arch/x86/include/asm/page_64_types.h               |   3 -
 arch/x86/include/asm/page_types.h                  |   3 +
 arch/x86/include/asm/pgtable.h                     |  18 +-
 arch/x86/include/asm/pgtable_types.h               |  40 +-
 arch/x86/include/asm/processor.h                   |   2 +-
 arch/x86/include/asm/sigcontext.h                  |  75 +-
 arch/x86/include/asm/sigframe.h                    |   8 +-
 arch/x86/include/asm/signal.h                      |   2 +-
 arch/x86/include/asm/trace/mpx.h                   |   7 +-
 arch/x86/include/asm/uv/uv_hub.h                   |   2 +-
 arch/x86/include/uapi/asm/sigcontext.h             | 475 +++++++----
 arch/x86/include/uapi/asm/sigcontext32.h           |  73 +-
 arch/x86/kernel/apic/apic_numachip.c               | 220 ++++--
 arch/x86/kernel/asm-offsets.c                      |  18 +-
 arch/x86/kernel/cpu/perf_event.c                   |  39 +-
 arch/x86/kernel/cpu/perf_event.h                   |   2 +-
 arch/x86/kernel/cpu/perf_event_intel_bts.c         |  13 +
 arch/x86/kernel/cpu/perf_event_intel_ds.c          |  40 +-
 arch/x86/kernel/cpu/perf_event_intel_lbr.c         |   4 +-
 arch/x86/kernel/cpu/perf_event_intel_pt.c          |   7 +-
 arch/x86/kernel/cpu/scattered.c                    |   2 +-
 arch/x86/kernel/fpu/init.c                         |  18 +-
 arch/x86/kernel/fpu/regset.c                       |   4 +-
 arch/x86/kernel/fpu/signal.c                       |  10 +-
 arch/x86/kernel/fpu/xstate.c                       | 398 ++++++++--
 arch/x86/kernel/signal.c                           |   4 +-
 arch/x86/kernel/traps.c                            |   4 +-
 arch/x86/kernel/tsc.c                              |  24 +-
 arch/x86/kvm/cpuid.c                               |   4 +-
 arch/x86/kvm/x86.c                                 |  27 +-
 arch/x86/kvm/x86.h                                 |   6 +-
 arch/x86/lib/x86-opcode-map.txt                    |  24 +-
 arch/x86/math-emu/fpu_aux.c                        |  70 ++
 arch/x86/math-emu/fpu_emu.h                        |   2 +-
 arch/x86/math-emu/fpu_entry.c                      |  96 +--
 arch/x86/math-emu/fpu_proto.h                      |  12 +
 arch/x86/math-emu/load_store.c                     |  63 +-
 arch/x86/math-emu/reg_compare.c                    | 128 +++
 arch/x86/mm/dump_pagetables.c                      |  39 +-
 arch/x86/mm/gup.c                                  |  18 +-
 arch/x86/mm/mpx.c                                  |  15 +-
 arch/x86/mm/pageattr.c                             |  79 +-
 arch/x86/platform/efi/efi-bgrt.c                   |   9 +-
 arch/x86/platform/efi/efi.c                        |  18 -
 arch/x86/platform/intel-mid/sfi.c                  |   3 +-
 arch/x86/platform/uv/uv_nmi.c                      |  53 +-
 arch/xtensa/include/asm/atomic.h                   |   4 +-
 drivers/acpi/apei/ghes.c                           |  10 +-
 drivers/clocksource/Makefile                       |   1 +
 drivers/clocksource/numachip.c                     |  95 +++
 drivers/firmware/efi/efi.c                         |  39 +-
 drivers/irqchip/irq-atmel-aic5.c                   |  62 +-
 drivers/irqchip/irq-gic.c                          |   1 +
 drivers/net/ethernet/sfc/mcdi.c                    |   2 +-
 drivers/phy/phy-rcar-gen2.c                        |   3 +-
 drivers/staging/speakup/selection.c                |   2 +-
 include/asm-generic/atomic-long.h                  |  27 +-
 include/asm-generic/atomic.h                       |   4 +-
 include/asm-generic/qrwlock_types.h                |   4 +-
 include/linux/atomic.h                             |  21 +-
 include/linux/efi.h                                |   1 +
 include/linux/interrupt.h                          |   2 +
 include/linux/perf_event.h                         | 120 ++-
 include/linux/sched.h                              |  10 +-
 include/linux/sched/deadline.h                     |   5 +
 kernel/cpu.c                                       |   8 +-
 kernel/events/core.c                               | 218 +++--
 kernel/futex.c                                     |  13 +-
 kernel/irq/chip.c                                  |   2 +-
 kernel/irq/handle.c                                |   7 +-
 kernel/irq/internals.h                             |   2 +-
 kernel/irq/manage.c                                | 158 +++-
 kernel/locking/osq_lock.c                          |  11 +-
 kernel/locking/qrwlock.c                           |   8 +-
 kernel/locking/qspinlock_paravirt.h                |   6 +-
 kernel/locking/rtmutex.c                           |   3 +-
 kernel/sched/core.c                                |  44 +-
 kernel/sched/cpudeadline.c                         |   5 -
 kernel/sched/cpudeadline.h                         |   1 +
 kernel/sched/fair.c                                | 419 +++++-----
 kernel/sched/features.h                            |  21 +-
 kernel/sched/rt.c                                  |  22 +-
 kernel/sched/sched.h                               |  39 +-
 kernel/time/clocksource.c                          |   2 +-
 kernel/time/hrtimer.c                              |   2 +-
 kernel/time/timekeeping.c                          |   4 +-
 kernel/time/timer.c                                |  11 +-
 tools/build/Makefile.feature                       |   9 +-
 tools/include/linux/err.h                          |  49 ++
 tools/include/linux/filter.h                       | 231 ++++++
 tools/lib/api/Build                                |   1 +
 tools/lib/api/cpu.c                                |  18 +
 tools/lib/api/cpu.h                                |   6 +
 tools/lib/api/fs/Build                             |   4 +-
 tools/lib/api/fs/debugfs.c                         | 129 ---
 tools/lib/api/fs/debugfs.h                         |  23 -
 tools/lib/api/fs/findfs.c                          |  63 --
 tools/lib/api/fs/findfs.h                          |  23 -
 tools/lib/api/fs/fs.c                              | 163 +++-
 tools/lib/api/fs/fs.h                              |  30 +-
 tools/lib/api/fs/tracefs.c                         |  78 --
 tools/lib/api/fs/tracefs.h                         |  21 -
 tools/lib/api/fs/tracing_path.c                    | 142 ++++
 tools/lib/api/fs/tracing_path.h                    |  16 +
 tools/lib/bpf/Makefile                             |   5 +-
 tools/lib/traceevent/event-parse.c                 |  56 +-
 tools/lib/traceevent/event-parse.h                 |   1 +
 tools/perf/Documentation/perf-report.txt           |   6 +-
 tools/perf/MANIFEST                                |   2 +
 tools/perf/Makefile.perf                           |   2 +-
 tools/perf/arch/common.c                           |  10 +-
 tools/perf/arch/common.h                           |   4 +-
 tools/perf/arch/x86/Makefile                       |   1 +
 tools/perf/arch/x86/util/dwarf-regs.c              | 122 ++-
 tools/perf/arch/x86/util/intel-pt.c                |  55 +-
 tools/perf/builtin-annotate.c                      |   2 +-
 tools/perf/builtin-kvm.c                           |   1 -
 tools/perf/builtin-probe.c                         | 119 ++-
 tools/perf/builtin-record.c                        |  15 +-
 tools/perf/builtin-report.c                        |  11 +
 tools/perf/builtin-stat.c                          |   2 +-
 tools/perf/builtin-top.c                           |  17 +-
 tools/perf/builtin-trace.c                         |  24 +-
 tools/perf/config/Makefile                         |   4 +
 tools/perf/perf.c                                  |  14 +-
 tools/perf/tests/Build                             |   4 +
 tools/perf/tests/builtin-test.c                    |  44 +-
 tools/perf/tests/code-reading.c                    |  74 +-
 tools/perf/tests/evsel-tp-sched.c                  |  10 +-
 tools/perf/tests/gen-insn-x86-dat.awk              |  75 ++
 tools/perf/tests/gen-insn-x86-dat.sh               |  43 +
 tools/perf/tests/hists_filter.c                    |  55 +-
 tools/perf/tests/insn-x86-dat-32.c                 | 658 ++++++++++++++++
 tools/perf/tests/insn-x86-dat-64.c                 | 768 ++++++++++++++++++
 tools/perf/tests/insn-x86-dat-src.c                | 877 +++++++++++++++++++++
 tools/perf/tests/insn-x86.c                        | 184 +++++
 tools/perf/tests/mmap-basic.c                      |   3 +-
 tools/perf/tests/openat-syscall-all-cpus.c         |  13 +-
 tools/perf/tests/openat-syscall-tp-fields.c        |   3 +-
 tools/perf/tests/openat-syscall.c                  |  13 +-
 tools/perf/tests/parse-events.c                    |  19 +-
 tools/perf/tests/tests.h                           |   2 +
 tools/perf/tests/topology.c                        | 115 +++
 tools/perf/trace/strace/groups/file                |   2 +
 tools/perf/ui/browsers/hists.c                     |  61 +-
 tools/perf/util/Build                              |   1 +
 tools/perf/util/cpumap.c                           |  63 +-
 tools/perf/util/cpumap.h                           |   2 +
 tools/perf/util/env.c                              |  86 ++
 tools/perf/util/env.h                              |  44 ++
 tools/perf/util/event.c                            |  10 +-
 tools/perf/util/event.h                            |   5 +
 tools/perf/util/evlist.c                           |   3 +-
 tools/perf/util/evsel.c                            |  18 +-
 tools/perf/util/evsel.h                            |   4 +-
 tools/perf/util/header.c                           | 136 +++-
 tools/perf/util/header.h                           |  27 +-
 tools/perf/util/hist.c                             |  38 +
 tools/perf/util/hist.h                             |   6 +-
 tools/perf/util/include/dwarf-regs.h               |   8 +
 tools/perf/util/intel-pt-decoder/Build             |  13 +-
 .../perf/util/intel-pt-decoder/x86-opcode-map.txt  |  24 +-
 tools/perf/util/intel-pt.c                         | 129 ++-
 tools/perf/util/machine.c                          |   1 +
 tools/perf/util/machine.h                          |   1 +
 tools/perf/util/parse-events.c                     |  84 +-
 tools/perf/util/parse-events.h                     |   3 +-
 tools/perf/util/parse-events.y                     |  16 +-
 tools/perf/util/parse-options.c                    |   2 +-
 tools/perf/util/probe-event.c                      | 130 ++-
 tools/perf/util/probe-event.h                      |  11 +
 tools/perf/util/probe-file.c                       |  56 +-
 tools/perf/util/probe-file.h                       |   4 +
 .../perf/util/scripting-engines/trace-event-perl.c |   1 +
 .../util/scripting-engines/trace-event-python.c    |   1 +
 tools/perf/util/session.c                          |  23 +-
 tools/perf/util/sort.c                             |  29 +-
 tools/perf/util/sort.h                             |   3 +
 tools/perf/util/srcline.c                          |  29 +-
 tools/perf/util/symbol.h                           |   1 +
 tools/perf/util/trace-event-info.c                 |   2 +-
 tools/perf/util/trace-event.c                      |  16 +-
 tools/perf/util/util.c                             |  70 --
 tools/perf/util/util.h                             |  11 +-
 tools/testing/selftests/x86/Makefile               |   6 +-
 tools/testing/selftests/x86/test_FCMOV.c           |  93 +++
 tools/testing/selftests/x86/test_FCOMI.c           | 331 ++++++++
 tools/testing/selftests/x86/test_FISTTP.c          | 137 ++++
 tools/testing/selftests/x86/test_syscall_vdso.c    | 401 ++++++++++
 tools/testing/selftests/x86/thunks_32.S            |  55 ++
 tools/vm/page-types.c                              |   6 +-
 250 files changed, 8766 insertions(+), 2377 deletions(-)
 create mode 100644 drivers/clocksource/numachip.c
 create mode 100644 tools/include/linux/err.h
 create mode 100644 tools/include/linux/filter.h
 create mode 100644 tools/lib/api/cpu.c
 create mode 100644 tools/lib/api/cpu.h
 delete mode 100644 tools/lib/api/fs/debugfs.c
 delete mode 100644 tools/lib/api/fs/debugfs.h
 delete mode 100644 tools/lib/api/fs/findfs.c
 delete mode 100644 tools/lib/api/fs/findfs.h
 delete mode 100644 tools/lib/api/fs/tracefs.c
 delete mode 100644 tools/lib/api/fs/tracefs.h
 create mode 100644 tools/lib/api/fs/tracing_path.c
 create mode 100644 tools/lib/api/fs/tracing_path.h
 create mode 100644 tools/perf/tests/gen-insn-x86-dat.awk
 create mode 100755 tools/perf/tests/gen-insn-x86-dat.sh
 create mode 100644 tools/perf/tests/insn-x86-dat-32.c
 create mode 100644 tools/perf/tests/insn-x86-dat-64.c
 create mode 100644 tools/perf/tests/insn-x86-dat-src.c
 create mode 100644 tools/perf/tests/insn-x86.c
 create mode 100644 tools/perf/tests/topology.c
 create mode 100644 tools/perf/util/env.c
 create mode 100644 tools/perf/util/env.h
 create mode 100644 tools/testing/selftests/x86/test_FCMOV.c
 create mode 100644 tools/testing/selftests/x86/test_FCOMI.c
 create mode 100644 tools/testing/selftests/x86/test_FISTTP.c
 create mode 100644 tools/testing/selftests/x86/test_syscall_vdso.c
 create mode 100644 tools/testing/selftests/x86/thunks_32.S
Merging clockevents/clockevents/next (0e4baaa9a11b clocksource/drivers/exynos_mct: Use container_of() instead of this_cpu_ptr())
$ git merge clockevents/clockevents/next
Auto-merging drivers/clocksource/sh_cmt.c
Merge made by the 'recursive' strategy.
 drivers/clocksource/em_sti.c        |  2 --
 drivers/clocksource/exynos_mct.c    | 12 ++++++++----
 drivers/clocksource/h8300_timer16.c |  1 -
 drivers/clocksource/h8300_timer8.c  |  1 -
 drivers/clocksource/h8300_tpu.c     |  1 -
 drivers/clocksource/mtk_timer.c     | 26 ++++++++++++++++----------
 drivers/clocksource/sh_cmt.c        |  1 -
 7 files changed, 24 insertions(+), 20 deletions(-)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (4bd57fad4c2b Merge branch 'ras-for-4.4' into for-next)
$ git merge edac-amd/for-next
Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/edac/apm-xgene-edac.txt    |   23 +
 arch/arm64/boot/dts/apm/apm-storm.dtsi             |   10 +
 arch/x86/kernel/cpu/mcheck/mce.c                   |   30 +-
 arch/x86/ras/mce_amd_inj.c                         |  101 +-
 drivers/edac/Makefile                              |    2 +
 drivers/edac/altera_edac.c                         |   20 +-
 drivers/edac/altera_edac.h                         |    2 -
 drivers/edac/debugfs.c                             |  163 +++
 drivers/edac/edac_core.h                           |    2 +
 drivers/edac/edac_mc_sysfs.c                       |  148 +--
 drivers/edac/edac_module.h                         |   34 +-
 drivers/edac/ghes_edac.c                           |   22 +-
 drivers/edac/i5100_edac.c                          |   37 +-
 drivers/edac/sb_edac.c                             |    8 +-
 drivers/edac/xgene_edac.c                          | 1193 ++++++++++++++++----
 include/linux/edac.h                               |    2 -
 16 files changed, 1387 insertions(+), 410 deletions(-)
 create mode 100644 drivers/edac/debugfs.c
Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next)
$ git merge irqchip/irqchip/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
$ git merge tiny/tiny/next
Already up-to-date.
Merging ftrace/for-next (b7dc42fd7939 ring-buffer: Revert "ring-buffer: Get timestamp after event is allocated")
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (19a5ecde086a rcu: Suppress lockdep false positive for rcp->exp_funnel_mutex)
$ git merge rcu/rcu/next
Merge made by the 'recursive' strategy.
 include/linux/rcupdate.h | 11 +++++------
 kernel/rcu/tree.c        |  5 +++++
 2 files changed, 10 insertions(+), 6 deletions(-)
Merging kvm/linux-next (9bac175d8ed0 Revert "KVM: x86: zero kvmclock_offset when vcpu0 initializes kvmclock system MSR")
$ git merge kvm/linux-next
Auto-merging arch/x86/kvm/x86.c
Merge made by the 'recursive' strategy.
 arch/x86/include/asm/pvclock-abi.h | 1 +
 arch/x86/kvm/x86.c                 | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)
Merging kvm-arm/next (1f93e4a96c91 Linux 4.3-rc2)
$ git merge kvm-arm/next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvm-ppc-paulus/kvm-ppc-next (3eb4ee682542 KVM: PPC: Book3S: Take the kvm->srcu lock in kvmppc_h_logical_ci_load/store())
$ git merge kvm-ppc-paulus/kvm-ppc-next
Already up-to-date.
Merging kvms390/next (152b28392a8d KVM: s390: Fix assumption that kvm_set_irq_routing is always run successfully)
$ git merge kvms390/next
Already up-to-date.
Merging xen-tip/linux-next (3e64472c1c74 xen: switch extra memory accounting to use pfns)
$ git merge xen-tip/linux-next
Resolved 'arch/x86/include/asm/xen/page.h' using previous resolution.
Auto-merging arch/x86/include/asm/xen/page.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/xen/page.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7ae63730e09d] Merge remote-tracking branch 'xen-tip/linux-next'
$ git diff -M --stat --summary HEAD^..
Merging percpu/for-next (5a928541585b kernel: Remove unneeded return from void function)
$ git merge percpu/for-next
Merge made by the 'recursive' strategy.
 include/linux/percpu-refcount.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging workqueues/for-next (355c06633e23 workqueue: fix some docbook warnings)
$ git merge workqueues/for-next
Already up-to-date.
Merging drivers-x86/for-next (8a1513b49321 hp-wmi: limit hotkey enable)
$ git merge drivers-x86/for-next
Already up-to-date.
Merging chrome-platform/for-next (1d95e6f10fd8 platform/chrome: cros_ec: Fix possible leak in led_rgb_store())
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
 drivers/platform/chrome/Kconfig            |  5 +++--
 drivers/platform/chrome/cros_ec_dev.c      |  6 ++++++
 drivers/platform/chrome/cros_ec_lightbar.c | 31 ++++++++++++++++--------------
 drivers/platform/chrome/cros_ec_lpc.c      | 21 +++++++++-----------
 4 files changed, 35 insertions(+), 28 deletions(-)
Merging regmap/for-next (ee3d36ab7b94 Merge remote-tracking branches 'regmap/topic/atomic', 'regmap/topic/debugfs', 'regmap/topic/irq' and 'regmap/topic/irq-hdr' into regmap-next)
$ git merge regmap/for-next
Auto-merging include/linux/regmap.h
Merge made by the 'recursive' strategy.
 drivers/base/regmap/internal.h       |  1 +
 drivers/base/regmap/regmap-debugfs.c | 12 +++++-----
 drivers/base/regmap/regmap-irq.c     | 43 +++++++++++++++++++++++++++++++-----
 drivers/base/regmap/regmap.c         | 12 +++++++++-
 include/linux/regmap.h               |  5 +++++
 5 files changed, 60 insertions(+), 13 deletions(-)
Merging hsi/for-next (c616ac28a5b3 HSI: Fix a typo)
$ git merge hsi/for-next
Merge made by the 'recursive' strategy.
 drivers/hsi/clients/ssi_protocol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging leds/for-next (18ce230f96e1 LED/MIPS: Move SEAD3 LED driver to where it belongs.)
$ git merge leds/for-next
Auto-merging drivers/leds/leds-sead3.c
Merge made by the 'recursive' strategy.
 arch/mips/mti-sead3/Makefile                       |  2 --
 drivers/leds/Kconfig                               | 10 ++++++++
 drivers/leds/Makefile                              |  1 +
 drivers/leds/leds-cobalt-qube.c                    | 23 +-----------------
 drivers/leds/leds-hp6xx.c                          | 17 ++------------
 drivers/leds/leds-ipaq-micro.c                     | 27 ++++++++--------------
 drivers/leds/leds-ot200.c                          | 21 ++---------------
 {arch/mips/mti-sead3 => drivers/leds}/leds-sead3.c |  1 +
 8 files changed, 27 insertions(+), 75 deletions(-)
 rename {arch/mips/mti-sead3 => drivers/leds}/leds-sead3.c (99%)
Merging ipmi/for-next (f22b7d0682d3 char: ipmi: Move MODULE_DEVICE_TABLE() to follow struct)
$ git merge ipmi/for-next
Merge made by the 'recursive' strategy.
 drivers/char/ipmi/ipmi_si_intf.c | 82 +++++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 30 deletions(-)
Merging driver-core/driver-core-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge driver-core/driver-core-next
Already up-to-date.
Merging tty/tty-next (1f93e4a96c91 Linux 4.3-rc2)
$ git merge tty/tty-next
Already up-to-date.
Merging usb/usb-next (1f93e4a96c91 Linux 4.3-rc2)
$ git merge usb/usb-next
Already up-to-date.
Merging usb-gadget/next (9ffecb102835 Linux 4.3-rc3)
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging staging/staging-next (60d6a21b1ec2 Staging: rts5208: Coding style warnings fix for block comments)
$ git merge staging/staging-next
Removing drivers/staging/wilc1000/wilc_memory.h
Removing drivers/staging/wilc1000/wilc_memory.c
Removing drivers/staging/wilc1000/wilc_exported_buf.c
Removing drivers/staging/wilc1000/wilc_errorsupport.h
Auto-merging drivers/staging/fbtft/flexfb.c
Auto-merging drivers/staging/fbtft/fbtft-core.c
Auto-merging drivers/staging/fbtft/fb_watterott.c
Auto-merging drivers/staging/fbtft/fb_uc1611.c
Removing drivers/staging/comedi/drivers/unioxx5.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |    4 +-
 drivers/staging/android/Kconfig                    |    2 +-
 drivers/staging/android/ashmem.c                   |   18 +-
 drivers/staging/android/sw_sync.c                  |    6 +-
 drivers/staging/comedi/Kconfig                     |    8 -
 drivers/staging/comedi/comedi_fops.c               |   12 +-
 drivers/staging/comedi/drivers.c                   |   32 +-
 drivers/staging/comedi/drivers/Makefile            |    1 -
 drivers/staging/comedi/drivers/addi_apci_3120.c    |    5 -
 drivers/staging/comedi/drivers/mpc624.c            |   30 +-
 drivers/staging/comedi/drivers/s526.c              |  560 ++--
 drivers/staging/comedi/drivers/serial2002.c        |   51 +-
 drivers/staging/comedi/drivers/ssv_dnp.c           |   57 +-
 drivers/staging/comedi/drivers/unioxx5.c           |  506 ----
 drivers/staging/comedi/drivers/usbdux.c            |  100 +-
 drivers/staging/comedi/drivers/usbduxfast.c        |  274 +-
 drivers/staging/comedi/drivers/usbduxsigma.c       |   72 +-
 drivers/staging/comedi/drivers/vmk80xx.c           |  127 +-
 .../staging/comedi/kcomedilib/kcomedilib_main.c    |   32 +-
 drivers/staging/dgap/dgap.c                        |   32 +-
 drivers/staging/dgnc/dgnc_mgmt.c                   |    3 +-
 drivers/staging/emxx_udc/emxx_udc.c                |   96 +-
 drivers/staging/emxx_udc/emxx_udc.h                |   30 -
 drivers/staging/fbtft/fb_agm1264k-fl.c             |   11 +-
 drivers/staging/fbtft/fb_bd663474.c                |   11 +-
 drivers/staging/fbtft/fb_hx8340bn.c                |   16 +-
 drivers/staging/fbtft/fb_hx8347d.c                 |   16 +-
 drivers/staging/fbtft/fb_hx8353d.c                 |   21 +-
 drivers/staging/fbtft/fb_hx8357d.c                 |   12 +-
 drivers/staging/fbtft/fb_ili9163.c                 |   13 +-
 drivers/staging/fbtft/fb_ili9320.c                 |   21 +-
 drivers/staging/fbtft/fb_ili9325.c                 |   20 +-
 drivers/staging/fbtft/fb_ili9340.c                 |   14 +-
 drivers/staging/fbtft/fb_ili9341.c                 |   20 +-
 drivers/staging/fbtft/fb_ili9481.c                 |   10 +-
 drivers/staging/fbtft/fb_ili9486.c                 |   12 +-
 drivers/staging/fbtft/fb_pcd8544.c                 |   21 +-
 drivers/staging/fbtft/fb_ra8875.c                  |   36 +-
 drivers/staging/fbtft/fb_s6d02a1.c                 |   16 +-
 drivers/staging/fbtft/fb_s6d1121.c                 |   18 +-
 drivers/staging/fbtft/fb_ssd1289.c                 |   20 +-
 drivers/staging/fbtft/fb_ssd1306.c                 |   21 +-
 drivers/staging/fbtft/fb_ssd1331.c                 |    9 -
 drivers/staging/fbtft/fb_ssd1351.c                 |   25 +-
 drivers/staging/fbtft/fb_st7735r.c                 |   22 +-
 drivers/staging/fbtft/fb_tinylcd.c                 |   14 +-
 drivers/staging/fbtft/fb_tls8204.c                 |   20 +-
 drivers/staging/fbtft/fb_uc1611.c                  |    8 -
 drivers/staging/fbtft/fb_uc1701.c                  |   21 +-
 drivers/staging/fbtft/fb_upd161704.c               |   11 +-
 drivers/staging/fbtft/fb_watterott.c               |   28 +-
 drivers/staging/fbtft/fbtft-bus.c                  |   13 +-
 drivers/staging/fbtft/fbtft-core.c                 |   95 +-
 drivers/staging/fbtft/fbtft-sysfs.c                |    6 +-
 drivers/staging/fbtft/fbtft.h                      |    9 -
 drivers/staging/fbtft/fbtft_device.c               |   96 +-
 drivers/staging/fbtft/flexfb.c                     |   10 -
 drivers/staging/fsl-mc/bus/mc-bus.c                |    6 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |   19 +-
 .../staging/ft1000/ft1000-usb/ft1000_download.c    |    8 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |    2 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |    8 +-
 drivers/staging/gdm72xx/gdm_qos.c                  |    2 +-
 drivers/staging/gdm72xx/gdm_sdio.c                 |   20 +-
 drivers/staging/gdm72xx/gdm_usb.c                  |   16 +-
 drivers/staging/gdm72xx/gdm_wimax.c                |    4 +-
 drivers/staging/gdm72xx/sdio_boot.c                |    4 +-
 drivers/staging/gdm72xx/usb_boot.c                 |    8 +-
 drivers/staging/goldfish/goldfish_nand.c           |    4 +-
 drivers/staging/goldfish/goldfish_nand_reg.h       |   10 +-
 drivers/staging/iio/addac/adt7316.c                |   14 +-
 drivers/staging/iio/cdc/ad7746.c                   |    8 +-
 drivers/staging/iio/meter/ade7753.c                |    8 +-
 drivers/staging/iio/meter/ade7754.c                |    6 +-
 drivers/staging/iio/meter/ade7758_core.c           |    6 +-
 drivers/staging/iio/meter/ade7759.c                |    8 +-
 drivers/staging/iio/meter/ade7854.c                |    6 +-
 .../staging/lustre/include/linux/libcfs/libcfs.h   |    8 +
 .../lustre/include/linux/libcfs/libcfs_prim.h      |    1 -
 .../lustre/include/linux/libcfs/libcfs_private.h   |    2 +-
 .../staging/lustre/include/linux/lnet/lib-lnet.h   |    4 +-
 drivers/staging/lustre/include/linux/lnet/types.h  |    2 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c    |    9 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |  287 +--
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |   60 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd.c    |   51 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |    8 +-
 .../lustre/lnet/klnds/socklnd/socklnd_lib.c        |    6 +-
 drivers/staging/lustre/lnet/lnet/api-ni.c          |    4 +-
 drivers/staging/lustre/lnet/lnet/lib-ptl.c         |    4 +-
 drivers/staging/lustre/lnet/lnet/router.c          |    2 +-
 drivers/staging/lustre/lnet/lnet/router_proc.c     |   43 +-
 drivers/staging/lustre/lnet/selftest/conrpc.h      |    4 +-
 drivers/staging/lustre/lnet/selftest/console.c     |   16 +-
 drivers/staging/lustre/lnet/selftest/selftest.h    |   22 +-
 drivers/staging/lustre/lustre/fld/fld_cache.c      |    2 +-
 drivers/staging/lustre/lustre/include/cl_object.h  |   14 +-
 .../lustre/lustre/include/linux/lustre_lite.h      |    2 +-
 .../staging/lustre/lustre/include/lprocfs_status.h |    3 +-
 drivers/staging/lustre/lustre/include/lu_object.h  |   25 +-
 .../lustre/lustre/include/lustre/lustre_idl.h      |   39 +-
 .../lustre/lustre/include/lustre/lustre_user.h     |    7 +-
 .../staging/lustre/lustre/include/lustre_capa.h    |    2 +-
 drivers/staging/lustre/lustre/include/lustre_cfg.h |    6 +-
 .../staging/lustre/lustre/include/lustre_disk.h    |  144 +-
 drivers/staging/lustre/lustre/include/lustre_dlm.h |    6 +-
 .../lustre/lustre/include/lustre_dlm_flags.h       |  152 +-
 .../staging/lustre/lustre/include/lustre_import.h  |    2 -
 drivers/staging/lustre/lustre/include/lustre_lib.h |   10 +-
 drivers/staging/lustre/lustre/include/lustre_net.h |   67 +-
 drivers/staging/lustre/lustre/include/obd.h        |   14 +-
 drivers/staging/lustre/lustre/include/obd_class.h  |    4 -
 .../staging/lustre/lustre/include/obd_support.h    |  204 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c    |    8 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_request.c  |    8 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c |    4 +-
 drivers/staging/lustre/lustre/libcfs/fail.c        |    4 +-
 drivers/staging/lustre/lustre/libcfs/hash.c        |   18 +-
 drivers/staging/lustre/lustre/libcfs/libcfs_lock.c |    6 +-
 drivers/staging/lustre/lustre/libcfs/libcfs_mem.c  |   10 +-
 .../staging/lustre/lustre/libcfs/linux/linux-cpu.c |    3 +-
 .../lustre/lustre/libcfs/linux/linux-crypto.c      |    5 +-
 .../lustre/lustre/libcfs/linux/linux-debug.c       |    2 +-
 .../lustre/lustre/libcfs/linux/linux-prim.c        |    6 -
 .../lustre/lustre/libcfs/linux/linux-tracefile.c   |   22 +-
 drivers/staging/lustre/lustre/libcfs/module.c      |  188 +-
 drivers/staging/lustre/lustre/libcfs/tracefile.c   |    4 +-
 drivers/staging/lustre/lustre/libcfs/workitem.c    |   12 +-
 drivers/staging/lustre/lustre/llite/dir.c          |   13 +-
 drivers/staging/lustre/lustre/llite/file.c         |   25 +-
 drivers/staging/lustre/lustre/llite/llite_close.c  |    5 +-
 .../staging/lustre/lustre/llite/llite_internal.h   |   13 +-
 drivers/staging/lustre/lustre/llite/llite_lib.c    |   55 +-
 drivers/staging/lustre/lustre/llite/llite_nfs.c    |    5 +-
 drivers/staging/lustre/lustre/llite/lproc_llite.c  |    5 +-
 drivers/staging/lustre/lustre/llite/namei.c        |   14 +-
 drivers/staging/lustre/lustre/llite/rw.c           |    6 +-
 drivers/staging/lustre/lustre/llite/statahead.c    |    4 +-
 drivers/staging/lustre/lustre/llite/super25.c      |   16 +-
 drivers/staging/lustre/lustre/llite/vvp_io.c       |    2 +-
 drivers/staging/lustre/lustre/lmv/lmv_obd.c        |   13 +-
 drivers/staging/lustre/lustre/lov/lov_dev.c        |    2 +
 drivers/staging/lustre/lustre/lov/lov_io.c         |    2 +
 drivers/staging/lustre/lustre/lov/lov_obd.c        |    6 +-
 drivers/staging/lustre/lustre/mdc/mdc_locks.c      |    4 +-
 drivers/staging/lustre/lustre/mdc/mdc_request.c    |    2 +-
 drivers/staging/lustre/lustre/mgc/mgc_request.c    |   46 +-
 drivers/staging/lustre/lustre/obdclass/capa.c      |    2 +-
 drivers/staging/lustre/lustre/obdclass/cl_io.c     |   10 +-
 drivers/staging/lustre/lustre/obdclass/cl_lock.c   |    6 +-
 drivers/staging/lustre/lustre/obdclass/cl_object.c |   11 +-
 drivers/staging/lustre/lustre/obdclass/cl_page.c   |    3 +-
 drivers/staging/lustre/lustre/obdclass/class_obd.c |  107 +-
 drivers/staging/lustre/lustre/obdclass/dt_object.c |    5 +-
 drivers/staging/lustre/lustre/obdclass/genops.c    |   96 +-
 .../lustre/lustre/obdclass/linux/linux-module.c    |    2 -
 drivers/staging/lustre/lustre/obdclass/llog.c      |    4 +-
 .../staging/lustre/lustre/obdclass/llog_internal.h |    8 -
 .../lustre/lustre/obdclass/lprocfs_counters.c      |    9 -
 .../lustre/lustre/obdclass/lprocfs_status.c        |    2 +-
 drivers/staging/lustre/lustre/obdclass/lu_object.c |  119 +-
 .../staging/lustre/lustre/obdclass/obd_config.c    |   43 +-
 drivers/staging/lustre/lustre/obdclass/obd_mount.c |   97 +-
 drivers/staging/lustre/lustre/osc/lproc_osc.c      |   17 +-
 drivers/staging/lustre/lustre/osc/osc_cache.c      |   28 +-
 .../staging/lustre/lustre/osc/osc_cl_internal.h    |    2 +-
 drivers/staging/lustre/lustre/osc/osc_internal.h   |    6 +-
 drivers/staging/lustre/lustre/osc/osc_page.c       |    5 +-
 drivers/staging/lustre/lustre/osc/osc_request.c    |  136 +-
 drivers/staging/lustre/lustre/ptlrpc/client.c      |   39 +-
 drivers/staging/lustre/lustre/ptlrpc/import.c      |   38 +-
 drivers/staging/lustre/lustre/ptlrpc/layout.c      |    6 +-
 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |    4 +-
 drivers/staging/lustre/lustre/ptlrpc/niobuf.c      |    3 +-
 .../staging/lustre/lustre/ptlrpc/pack_generic.c    |   98 +-
 drivers/staging/lustre/lustre/ptlrpc/pinger.c      |    4 +-
 .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h |    4 +-
 .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c   |    3 +-
 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c     |  702 +++--
 drivers/staging/lustre/lustre/ptlrpc/sec_plain.c   |    1 +
 drivers/staging/lustre/lustre/ptlrpc/service.c     |    6 +-
 drivers/staging/lustre/lustre/ptlrpc/wiretest.c    |    4 -
 drivers/staging/most/aim-cdev/cdev.c               |   22 +-
 drivers/staging/most/aim-network/networking.c      |   12 +-
 drivers/staging/most/aim-sound/sound.c             |    5 +-
 drivers/staging/most/aim-v4l2/Makefile             |    1 -
 drivers/staging/most/aim-v4l2/video.c              |    2 +-
 drivers/staging/most/hdm-dim2/dim2_hal.c           |    5 -
 drivers/staging/most/hdm-dim2/dim2_hal.h           |    5 -
 drivers/staging/most/hdm-dim2/dim2_hdm.c           |   19 +-
 drivers/staging/most/hdm-usb/hdm_usb.c             |   13 +-
 drivers/staging/most/mostcore/core.c               |   10 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c      |    1 +
 drivers/staging/octeon-usb/octeon-hcd.c            |    1 +
 drivers/staging/panel/panel.c                      |   63 +-
 drivers/staging/rdma/hfi1/user_sdma.c              |    3 +-
 drivers/staging/rtl8188eu/Makefile                 |    1 +
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |   12 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c          |   14 +
 drivers/staging/rtl8188eu/core/rtw_sta_mgt.c       |    6 +-
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c     |    6 +-
 drivers/staging/rtl8188eu/core/rtw_xmit.c          |    4 +
 .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c   |   14 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c       |    4 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c     |    2 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |    6 +-
 drivers/staging/rtl8188eu/include/drv_types.h      |    2 +
 drivers/staging/rtl8188eu/include/mon.h            |   36 +
 drivers/staging/rtl8188eu/include/rtl8188e_spec.h  |    4 -
 drivers/staging/rtl8188eu/include/wifi.h           |   12 -
 drivers/staging/rtl8188eu/os_dep/mlme_linux.c      |    4 +-
 drivers/staging/rtl8188eu/os_dep/mon.c             |  194 ++
 drivers/staging/rtl8188eu/os_dep/os_intfs.c        |    5 +
 drivers/staging/rtl8188eu/os_dep/osdep_service.c   |    2 +-
 drivers/staging/rtl8188eu/os_dep/recv_linux.c      |    2 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c        |   10 +
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c     |    3 -
 .../staging/rtl8192e/rtl8192e/r8192E_firmware.c    |    1 +
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c         |    3 +-
 .../staging/rtl8192u/ieee80211/ieee80211_module.c  |    2 +-
 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |    3 +-
 .../rtl8192u/ieee80211/ieee80211_softmac_wx.c      |   79 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |    2 +-
 drivers/staging/rtl8192u/r8192U.h                  |    4 +-
 drivers/staging/rtl8192u/r8192U_core.c             | 1918 ++++++++------
 drivers/staging/rtl8712/mlme_linux.c               |    3 +-
 drivers/staging/rtl8712/osdep_service.h            |    4 -
 drivers/staging/rtl8712/usb_ops_linux.c            |    2 +-
 drivers/staging/rtl8712/wifi.h                     |    9 -
 drivers/staging/rtl8723au/core/rtw_mlme_ext.c      |    7 +-
 drivers/staging/rtl8723au/core/rtw_security.c      |   17 +-
 drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c  |   42 +-
 drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c    |   55 +-
 drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c    |   48 +-
 drivers/staging/rtl8723au/hal/usb_halinit.c        |    5 +-
 drivers/staging/rtl8723au/include/rtw_cmd.h        |    2 -
 drivers/staging/rts5208/rtsx_chip.c                |   28 +-
 drivers/staging/skein/skein_api.h                  |   48 +-
 drivers/staging/slicoss/slicoss.c                  |   28 +-
 drivers/staging/sm750fb/ddk750_hwi2c.c             |  109 +-
 drivers/staging/sm750fb/ddk750_hwi2c.h             |    9 +-
 drivers/staging/sm750fb/ddk750_sii164.c            |    8 +-
 drivers/staging/sm750fb/ddk750_swi2c.c             |  291 ++-
 drivers/staging/sm750fb/ddk750_swi2c.h             |   47 +-
 drivers/staging/sm750fb/sm750_hw.c                 |   10 +-
 drivers/staging/speakup/devsynth.c                 |    4 +-
 drivers/staging/speakup/kobjects.c                 |   16 +-
 drivers/staging/speakup/serialio.c                 |    4 +-
 drivers/staging/speakup/speakup_dectlk.c           |    3 +-
 drivers/staging/speakup/varhandlers.c              |   18 +-
 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 -
 .../Documentation/ABI/sysfs-platform-visorchipset  |    2 +
 drivers/staging/unisys/Documentation/overview.txt  |  458 +++-
 drivers/staging/unisys/Kconfig                     |    1 +
 drivers/staging/unisys/Makefile                    |    1 +
 drivers/staging/unisys/TODO                        |   25 +-
 drivers/staging/unisys/visorhid/Kconfig            |   10 +
 drivers/staging/unisys/visorhid/Makefile           |    7 +
 drivers/staging/unisys/visorhid/keyboardchannel.h  |   32 +
 drivers/staging/unisys/visorhid/mousechannel.h     |   33 +
 drivers/staging/unisys/visorhid/ultrainputreport.h |   74 +
 drivers/staging/unisys/visorhid/visorhid.c         |  668 +++++
 drivers/staging/vt6655/card.c                      |   14 +-
 drivers/staging/vt6655/desc.h                      |   58 +-
 drivers/staging/vt6655/device.h                    |   26 +-
 drivers/staging/vt6655/device_main.c               |  236 +-
 drivers/staging/vt6655/dpc.c                       |    8 +-
 drivers/staging/vt6655/dpc.h                       |    2 +-
 drivers/staging/wilc1000/Kconfig                   |    1 -
 drivers/staging/wilc1000/Makefile                  |    9 +-
 drivers/staging/wilc1000/coreconfigurator.c        | 1295 +---------
 drivers/staging/wilc1000/coreconfigurator.h        |    8 -
 drivers/staging/wilc1000/host_interface.c          | 2710 +++++++++-----------
 drivers/staging/wilc1000/host_interface.h          |  212 +-
 drivers/staging/wilc1000/linux_mon.c               |  187 +-
 drivers/staging/wilc1000/linux_wlan.c              |  813 +-----
 drivers/staging/wilc1000/linux_wlan_common.h       |   14 +-
 drivers/staging/wilc1000/linux_wlan_sdio.c         |   10 +-
 drivers/staging/wilc1000/linux_wlan_spi.c          |  103 +-
 drivers/staging/wilc1000/linux_wlan_spi.h          |    4 +-
 drivers/staging/wilc1000/wilc_errorsupport.h       |   67 -
 drivers/staging/wilc1000/wilc_exported_buf.c       |   71 -
 drivers/staging/wilc1000/wilc_memory.c             |   16 -
 drivers/staging/wilc1000/wilc_memory.h             |   66 -
 drivers/staging/wilc1000/wilc_msgqueue.c           |  160 +-
 drivers/staging/wilc1000/wilc_msgqueue.h           |   10 +-
 drivers/staging/wilc1000/wilc_oswrapper.h          |    7 -
 drivers/staging/wilc1000/wilc_platform.h           |    6 -
 drivers/staging/wilc1000/wilc_sdio.c               |   89 +-
 drivers/staging/wilc1000/wilc_spi.c                |  233 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  |  897 +++----
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.h  |   93 +-
 drivers/staging/wilc1000/wilc_wfi_netdevice.h      |   52 +-
 drivers/staging/wilc1000/wilc_wlan.c               |  561 ++--
 drivers/staging/wilc1000/wilc_wlan.h               |   62 +-
 drivers/staging/wilc1000/wilc_wlan_cfg.c           |  176 +-
 drivers/staging/wilc1000/wilc_wlan_cfg.h           |   16 +-
 drivers/staging/wilc1000/wilc_wlan_if.h            |  114 +-
 drivers/staging/wlan-ng/p80211conv.c               |   50 +-
 drivers/staging/wlan-ng/p80211conv.h               |    7 +-
 301 files changed, 8033 insertions(+), 11425 deletions(-)
 delete mode 100644 drivers/staging/comedi/drivers/unioxx5.c
 create mode 100644 drivers/staging/rtl8188eu/include/mon.h
 create mode 100644 drivers/staging/rtl8188eu/os_dep/mon.c
 create mode 100644 drivers/staging/unisys/visorhid/Kconfig
 create mode 100644 drivers/staging/unisys/visorhid/Makefile
 create mode 100644 drivers/staging/unisys/visorhid/keyboardchannel.h
 create mode 100644 drivers/staging/unisys/visorhid/mousechannel.h
 create mode 100644 drivers/staging/unisys/visorhid/ultrainputreport.h
 create mode 100644 drivers/staging/unisys/visorhid/visorhid.c
 delete mode 100644 drivers/staging/wilc1000/wilc_errorsupport.h
 delete mode 100644 drivers/staging/wilc1000/wilc_exported_buf.c
 delete mode 100644 drivers/staging/wilc1000/wilc_memory.c
 delete mode 100644 drivers/staging/wilc1000/wilc_memory.h
Merging char-misc/char-misc-next (c566f365434e Merge 4.3-rc3 into char-misc-next)
$ git merge char-misc/char-misc-next
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-bus-mei |   7 ++
 drivers/char/efirtc.c                   |  13 +--
 drivers/char/hpet.c                     |  25 +----
 drivers/char/snsc.c                     |   5 +-
 drivers/misc/ad525x_dpot-i2c.c          |   1 -
 drivers/misc/kgdbts.c                   |  10 +-
 drivers/misc/mei/bus-fixup.c            |   4 +-
 drivers/misc/mei/bus.c                  | 184 ++++++++++++++++++++++----------
 drivers/misc/mei/client.h               |  12 +++
 drivers/misc/mei/hw-me.c                |   4 +-
 drivers/misc/mei/mei_dev.h              |   2 +-
 drivers/misc/sgi-gru/grukdump.c         |  16 ++-
 drivers/misc/sgi-gru/grukservices.c     |  15 +--
 drivers/misc/sgi-gru/grutlbpurge.c      |   5 +-
 drivers/misc/ti-st/st_core.c            |  18 +++-
 drivers/misc/vmw_vmci/vmci_datagram.c   |   3 +-
 drivers/nfc/mei_phy.c                   |  31 +++---
 drivers/nfc/mei_phy.h                   |   4 +-
 drivers/nfc/microread/mei.c             |  14 +--
 drivers/nfc/pn544/mei.c                 |  14 +--
 drivers/spmi/spmi.c                     |   5 +-
 include/linux/mei_cl_bus.h              |  40 +++----
 include/linux/mod_devicetable.h         |   7 +-
 include/linux/spmi.h                    |   4 +-
 include/linux/ti_wilink_st.h            |   1 +
 scripts/mod/devicetable-offsets.c       |   1 +
 scripts/mod/file2alias.c                |  12 ++-
 27 files changed, 273 insertions(+), 184 deletions(-)
Merging extcon/extcon-next (c02423f18c76 extcon: sm5502: fix handling regmap_irq_get_virq result)
$ git merge extcon/extcon-next
Merge made by the 'recursive' strategy.
 drivers/extcon/extcon-axp288.c  | 23 +++++------------------
 drivers/extcon/extcon-rt8973a.c |  3 ++-
 drivers/extcon/extcon-sm5502.c  |  3 ++-
 3 files changed, 9 insertions(+), 20 deletions(-)
Merging kdbus/kdbus (a36324913ff2 kdbus: selftests: add more name registry tests)
$ git merge kdbus/kdbus
Resolved 'tools/testing/selftests/Makefile' using previous resolution.
Auto-merging tools/testing/selftests/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile
Auto-merging init/Kconfig
Auto-merging include/uapi/linux/Kbuild
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/ioctl/ioctl-number.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c54ef5bc8c54] Merge remote-tracking branch 'kdbus/kdbus'
$ git diff -M --stat --summary HEAD^..
 Documentation/Makefile                           |    2 +-
 Documentation/ioctl/ioctl-number.txt             |    1 +
 Documentation/kdbus/.gitignore                   |    2 +
 Documentation/kdbus/Makefile                     |   44 +
 Documentation/kdbus/kdbus.bus.xml                |  344 ++++
 Documentation/kdbus/kdbus.connection.xml         | 1244 ++++++++++++
 Documentation/kdbus/kdbus.endpoint.xml           |  429 +++++
 Documentation/kdbus/kdbus.fs.xml                 |  124 ++
 Documentation/kdbus/kdbus.item.xml               |  839 ++++++++
 Documentation/kdbus/kdbus.match.xml              |  555 ++++++
 Documentation/kdbus/kdbus.message.xml            | 1276 +++++++++++++
 Documentation/kdbus/kdbus.name.xml               |  711 +++++++
 Documentation/kdbus/kdbus.policy.xml             |  406 ++++
 Documentation/kdbus/kdbus.pool.xml               |  326 ++++
 Documentation/kdbus/kdbus.xml                    | 1012 ++++++++++
 Documentation/kdbus/stylesheet.xsl               |   16 +
 MAINTAINERS                                      |   13 +
 Makefile                                         |    1 +
 include/uapi/linux/Kbuild                        |    1 +
 include/uapi/linux/kdbus.h                       |  984 ++++++++++
 include/uapi/linux/magic.h                       |    2 +
 init/Kconfig                                     |   13 +
 ipc/Makefile                                     |    2 +-
 ipc/kdbus/Makefile                               |   33 +
 ipc/kdbus/bus.c                                  |  514 +++++
 ipc/kdbus/bus.h                                  |  101 +
 ipc/kdbus/connection.c                           | 2227 ++++++++++++++++++++++
 ipc/kdbus/connection.h                           |  260 +++
 ipc/kdbus/domain.c                               |  296 +++
 ipc/kdbus/domain.h                               |   77 +
 ipc/kdbus/endpoint.c                             |  303 +++
 ipc/kdbus/endpoint.h                             |   70 +
 ipc/kdbus/fs.c                                   |  508 +++++
 ipc/kdbus/fs.h                                   |   28 +
 ipc/kdbus/handle.c                               |  691 +++++++
 ipc/kdbus/handle.h                               |  103 +
 ipc/kdbus/item.c                                 |  293 +++
 ipc/kdbus/item.h                                 |   61 +
 ipc/kdbus/limits.h                               |   61 +
 ipc/kdbus/main.c                                 |  114 ++
 ipc/kdbus/match.c                                |  546 ++++++
 ipc/kdbus/match.h                                |   35 +
 ipc/kdbus/message.c                              | 1040 ++++++++++
 ipc/kdbus/message.h                              |  120 ++
 ipc/kdbus/metadata.c                             | 1347 +++++++++++++
 ipc/kdbus/metadata.h                             |   86 +
 ipc/kdbus/names.c                                |  854 +++++++++
 ipc/kdbus/names.h                                |  105 +
 ipc/kdbus/node.c                                 |  897 +++++++++
 ipc/kdbus/node.h                                 |   86 +
 ipc/kdbus/notify.c                               |  204 ++
 ipc/kdbus/notify.h                               |   30 +
 ipc/kdbus/policy.c                               |  489 +++++
 ipc/kdbus/policy.h                               |   51 +
 ipc/kdbus/pool.c                                 |  728 +++++++
 ipc/kdbus/pool.h                                 |   46 +
 ipc/kdbus/queue.c                                |  363 ++++
 ipc/kdbus/queue.h                                |   84 +
 ipc/kdbus/reply.c                                |  252 +++
 ipc/kdbus/reply.h                                |   68 +
 ipc/kdbus/util.c                                 |  156 ++
 ipc/kdbus/util.h                                 |   73 +
 samples/Kconfig                                  |    7 +
 samples/Makefile                                 |    3 +-
 samples/kdbus/.gitignore                         |    1 +
 samples/kdbus/Makefile                           |    9 +
 samples/kdbus/kdbus-api.h                        |  114 ++
 samples/kdbus/kdbus-workers.c                    | 1346 +++++++++++++
 tools/testing/selftests/Makefile                 |    1 +
 tools/testing/selftests/kdbus/.gitignore         |    1 +
 tools/testing/selftests/kdbus/Makefile           |   49 +
 tools/testing/selftests/kdbus/kdbus-enum.c       |   94 +
 tools/testing/selftests/kdbus/kdbus-enum.h       |   15 +
 tools/testing/selftests/kdbus/kdbus-test.c       |  905 +++++++++
 tools/testing/selftests/kdbus/kdbus-test.h       |   84 +
 tools/testing/selftests/kdbus/kdbus-util.c       | 1612 ++++++++++++++++
 tools/testing/selftests/kdbus/kdbus-util.h       |  218 +++
 tools/testing/selftests/kdbus/test-activator.c   |  318 +++
 tools/testing/selftests/kdbus/test-benchmark.c   |  451 +++++
 tools/testing/selftests/kdbus/test-bus.c         |  175 ++
 tools/testing/selftests/kdbus/test-chat.c        |  124 ++
 tools/testing/selftests/kdbus/test-connection.c  |  597 ++++++
 tools/testing/selftests/kdbus/test-daemon.c      |   65 +
 tools/testing/selftests/kdbus/test-endpoint.c    |  352 ++++
 tools/testing/selftests/kdbus/test-fd.c          |  789 ++++++++
 tools/testing/selftests/kdbus/test-free.c        |   64 +
 tools/testing/selftests/kdbus/test-match.c       |  441 +++++
 tools/testing/selftests/kdbus/test-message.c     |  734 +++++++
 tools/testing/selftests/kdbus/test-metadata-ns.c |  500 +++++
 tools/testing/selftests/kdbus/test-monitor.c     |  176 ++
 tools/testing/selftests/kdbus/test-names.c       |  272 +++
 tools/testing/selftests/kdbus/test-policy-ns.c   |  632 ++++++
 tools/testing/selftests/kdbus/test-policy-priv.c | 1285 +++++++++++++
 tools/testing/selftests/kdbus/test-policy.c      |   80 +
 tools/testing/selftests/kdbus/test-sync.c        |  369 ++++
 tools/testing/selftests/kdbus/test-timeout.c     |   99 +
 96 files changed, 33726 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/kdbus/.gitignore
 create mode 100644 Documentation/kdbus/Makefile
 create mode 100644 Documentation/kdbus/kdbus.bus.xml
 create mode 100644 Documentation/kdbus/kdbus.connection.xml
 create mode 100644 Documentation/kdbus/kdbus.endpoint.xml
 create mode 100644 Documentation/kdbus/kdbus.fs.xml
 create mode 100644 Documentation/kdbus/kdbus.item.xml
 create mode 100644 Documentation/kdbus/kdbus.match.xml
 create mode 100644 Documentation/kdbus/kdbus.message.xml
 create mode 100644 Documentation/kdbus/kdbus.name.xml
 create mode 100644 Documentation/kdbus/kdbus.policy.xml
 create mode 100644 Documentation/kdbus/kdbus.pool.xml
 create mode 100644 Documentation/kdbus/kdbus.xml
 create mode 100644 Documentation/kdbus/stylesheet.xsl
 create mode 100644 include/uapi/linux/kdbus.h
 create mode 100644 ipc/kdbus/Makefile
 create mode 100644 ipc/kdbus/bus.c
 create mode 100644 ipc/kdbus/bus.h
 create mode 100644 ipc/kdbus/connection.c
 create mode 100644 ipc/kdbus/connection.h
 create mode 100644 ipc/kdbus/domain.c
 create mode 100644 ipc/kdbus/domain.h
 create mode 100644 ipc/kdbus/endpoint.c
 create mode 100644 ipc/kdbus/endpoint.h
 create mode 100644 ipc/kdbus/fs.c
 create mode 100644 ipc/kdbus/fs.h
 create mode 100644 ipc/kdbus/handle.c
 create mode 100644 ipc/kdbus/handle.h
 create mode 100644 ipc/kdbus/item.c
 create mode 100644 ipc/kdbus/item.h
 create mode 100644 ipc/kdbus/limits.h
 create mode 100644 ipc/kdbus/main.c
 create mode 100644 ipc/kdbus/match.c
 create mode 100644 ipc/kdbus/match.h
 create mode 100644 ipc/kdbus/message.c
 create mode 100644 ipc/kdbus/message.h
 create mode 100644 ipc/kdbus/metadata.c
 create mode 100644 ipc/kdbus/metadata.h
 create mode 100644 ipc/kdbus/names.c
 create mode 100644 ipc/kdbus/names.h
 create mode 100644 ipc/kdbus/node.c
 create mode 100644 ipc/kdbus/node.h
 create mode 100644 ipc/kdbus/notify.c
 create mode 100644 ipc/kdbus/notify.h
 create mode 100644 ipc/kdbus/policy.c
 create mode 100644 ipc/kdbus/policy.h
 create mode 100644 ipc/kdbus/pool.c
 create mode 100644 ipc/kdbus/pool.h
 create mode 100644 ipc/kdbus/queue.c
 create mode 100644 ipc/kdbus/queue.h
 create mode 100644 ipc/kdbus/reply.c
 create mode 100644 ipc/kdbus/reply.h
 create mode 100644 ipc/kdbus/util.c
 create mode 100644 ipc/kdbus/util.h
 create mode 100644 samples/kdbus/.gitignore
 create mode 100644 samples/kdbus/Makefile
 create mode 100644 samples/kdbus/kdbus-api.h
 create mode 100644 samples/kdbus/kdbus-workers.c
 create mode 100644 tools/testing/selftests/kdbus/.gitignore
 create mode 100644 tools/testing/selftests/kdbus/Makefile
 create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c
 create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h
 create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c
 create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h
 create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c
 create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h
 create mode 100644 tools/testing/selftests/kdbus/test-activator.c
 create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c
 create mode 100644 tools/testing/selftests/kdbus/test-bus.c
 create mode 100644 tools/testing/selftests/kdbus/test-chat.c
 create mode 100644 tools/testing/selftests/kdbus/test-connection.c
 create mode 100644 tools/testing/selftests/kdbus/test-daemon.c
 create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c
 create mode 100644 tools/testing/selftests/kdbus/test-fd.c
 create mode 100644 tools/testing/selftests/kdbus/test-free.c
 create mode 100644 tools/testing/selftests/kdbus/test-match.c
 create mode 100644 tools/testing/selftests/kdbus/test-message.c
 create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c
 create mode 100644 tools/testing/selftests/kdbus/test-monitor.c
 create mode 100644 tools/testing/selftests/kdbus/test-names.c
 create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c
 create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c
 create mode 100644 tools/testing/selftests/kdbus/test-policy.c
 create mode 100644 tools/testing/selftests/kdbus/test-sync.c
 create mode 100644 tools/testing/selftests/kdbus/test-timeout.c
Merging cgroup/for-next (a3e72739b7a7 cgroup: fix too early usage of static_branch_disable())
$ git merge cgroup/for-next
Auto-merging include/linux/sched.h
Auto-merging include/linux/jump_label.h
Auto-merging Documentation/cgroups/unified-hierarchy.txt
Merge made by the 'recursive' strategy.
 Documentation/cgroups/unified-hierarchy.txt |  15 +-
 block/blk-throttle.c                        |   2 +-
 block/cfq-iosched.c                         |   4 +-
 include/linux/backing-dev.h                 |   5 +-
 include/linux/cgroup-defs.h                 |  60 ++-
 include/linux/cgroup.h                      | 114 ++--
 include/linux/hugetlb_cgroup.h              |   4 +-
 include/linux/init_task.h                   |   8 -
 include/linux/jump_label.h                  |  18 +-
 include/linux/memcontrol.h                  |   8 +-
 include/linux/sched.h                       |  12 -
 kernel/cgroup.c                             | 775 +++++++++++++++-------------
 kernel/cpuset.c                             |  70 +--
 kernel/fork.c                               |   4 -
 mm/memcontrol.c                             |  25 +-
 15 files changed, 608 insertions(+), 516 deletions(-)
$ git am -3 ../patches/vmscan-build-fix.patch
Applying: vmscan build fix
$ git reset HEAD^
Unstaged changes after reset:
M	mm/vmscan.c
$ git add -A .
$ git commit -v -a --amend
[master f1fc5d19c40e] Merge remote-tracking branch 'cgroup/for-next'
 Date: Tue Sep 29 13:24:25 2015 +1000
Merging scsi/for-next (294ab783ad98 scsi_dh: fix randconfig build error)
$ git merge scsi/for-next
Already up-to-date.
Merging target-updates/for-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge target-updates/for-next
Already up-to-date.
Merging target-merge/for-next-merge (8edb1554f7c2 mpt3sas: Fix unprotected list lookup in v4.3-rc0 changes)
$ git merge target-merge/for-next-merge
Merge made by the 'recursive' strategy.
 drivers/scsi/mpt3sas/mpt3sas_base.h      |  25 +-
 drivers/scsi/mpt3sas/mpt3sas_scsih.c     | 595 ++++++++++++++++++++++---------
 drivers/scsi/mpt3sas/mpt3sas_transport.c |  18 +-
 3 files changed, 458 insertions(+), 180 deletions(-)
Merging pinctrl/for-next (f6c804b08ca5 ARM: at91/dt: sama5d2: add pio controller node)
$ git merge pinctrl/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/pinctrl/atmel,at91-pio4-pinctrl.txt   |   90 ++
 MAINTAINERS                                        |    7 +
 arch/arm/boot/dts/sama5d2.dtsi                     |   14 +
 drivers/pinctrl/Kconfig                            |   13 +
 drivers/pinctrl/Makefile                           |    1 +
 drivers/pinctrl/pinctrl-at91-pio4.c                | 1017 ++++++++++++++++++++
 6 files changed, 1142 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pio4-pinctrl.txt
 create mode 100644 drivers/pinctrl/pinctrl-at91-pio4.c
$ git reset --hard HEAD^
HEAD is now at 9042c92bdf98 Merge remote-tracking branch 'target-merge/for-next-merge'
Merging next-20150924 version of pinctrl
$ git merge -m next-20150924/pinctrl fa84b52cb681b27e6b5e003457562e25a239b9c4
Already up-to-date.
Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache)
$ git merge vhost/linux-next
Merge made by the 'recursive' strategy.
 drivers/virtio/virtio_ring.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage)
$ git merge remoteproc/for-next
Already up-to-date.
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
$ git merge rpmsg/for-next
Already up-to-date.
Merging gpio/for-next (46d4f7c25e1b gpio: omap: Fix GPIO numbering for deferred probe)
$ git merge gpio/for-next
Already up-to-date.
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (a83a6a82250f pwm: atmel-hlcdc: Fix module autoload for OF platform driver)
$ git merge pwm/for-next
Merge made by the 'recursive' strategy.
 drivers/pwm/pwm-atmel-hlcdc.c | 1 +
 1 file changed, 1 insertion(+)
Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
$ git merge dma-buf/for-next
Already up-to-date.
Merging userns/for-next (4b75de861505 fs: Set the size of empty dirs to 0.)
$ git merge userns/for-next
Already up-to-date.
Merging ktest/for-next (b953c0d234bc Linux 4.1)
$ git merge ktest/for-next
Already up-to-date.
Merging clk/clk-next (6f83d30a3708 Merge branch 'clk-fixes' into clk-next)
$ git merge clk/clk-next
Merge made by the 'recursive' strategy.
 drivers/clk/at91/clk-system.c                 |   3 +-
 drivers/clk/at91/clk-utmi.c                   |   4 +-
 drivers/clk/clk-divider.c                     |  20 +-
 drivers/clk/clk.c                             |   2 +-
 drivers/clk/hisilicon/clk-hi6220-stub.c       |   2 +-
 drivers/clk/mvebu/common.c                    |   2 +-
 drivers/clk/qcom/Kconfig                      |   9 +
 drivers/clk/qcom/Makefile                     |   1 +
 drivers/clk/qcom/clk-rcg.h                    |   5 +-
 drivers/clk/qcom/clk-rcg2.c                   | 170 +++++++-
 drivers/clk/qcom/common.c                     |  16 +-
 drivers/clk/qcom/common.h                     |   2 +
 drivers/clk/qcom/gcc-apq8084.c                |  42 ++
 drivers/clk/qcom/gcc-msm8916.c                | 562 +++++++++++++++++++++++++-
 drivers/clk/qcom/gcc-msm8974.c                |  15 +
 drivers/clk/qcom/gdsc.c                       | 237 +++++++++++
 drivers/clk/qcom/gdsc.h                       |  68 ++++
 drivers/clk/qcom/mmcc-apq8084.c               | 104 ++++-
 drivers/clk/qcom/mmcc-msm8974.c               |  83 +++-
 drivers/clk/samsung/clk-cpu.c                 |  10 +-
 drivers/clk/sunxi/clk-sun6i-apb0-gates.c      |   1 +
 drivers/clk/sunxi/clk-sun6i-apb0.c            |   1 +
 drivers/clk/sunxi/clk-sun6i-ar100.c           |   1 +
 drivers/clk/sunxi/clk-sun8i-apb0.c            |   1 +
 drivers/clk/sunxi/clk-sun9i-mmc.c             |   1 +
 include/dt-bindings/clock/qcom,gcc-apq8084.h  |   6 +
 include/dt-bindings/clock/qcom,gcc-msm8916.h  |  30 ++
 include/dt-bindings/clock/qcom,gcc-msm8974.h  |   3 +
 include/dt-bindings/clock/qcom,mmcc-apq8084.h |  10 +
 include/dt-bindings/clock/qcom,mmcc-msm8974.h |   8 +
 30 files changed, 1349 insertions(+), 70 deletions(-)
 create mode 100644 drivers/clk/qcom/gdsc.c
 create mode 100644 drivers/clk/qcom/gdsc.h
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
$ git merge random/dev
Already up-to-date.
Merging aio/master (6ff33f3902c3 Linux 4.3-rc1)
$ git merge aio/master
Already up-to-date.
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
$ git merge llvmlinux/for-next
Merge made by the 'recursive' strategy.
Merging kselftest/next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge kselftest/next
Already up-to-date.
Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
$ git merge y2038/y2038
Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution.
Auto-merging kernel/cpuset.c
Auto-merging fs/coredump.c
Auto-merging drivers/staging/media/lirc/lirc_serial.c
Auto-merging drivers/staging/media/lirc/lirc_sasem.c
Auto-merging drivers/staging/media/lirc/lirc_parallel.c
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
Auto-merging drivers/staging/gdm72xx/gdm_sdio.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c1981098f1e3] Merge remote-tracking branch 'y2038/y2038'
$ git diff -M --stat --summary HEAD^..
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c |  4 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c |  4 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c    |  4 +-
 drivers/staging/ft1000/ft1000.h                  |  4 +-
 drivers/staging/gdm72xx/gdm_sdio.c               | 13 +++---
 drivers/staging/gdm72xx/gdm_sdio.h               |  4 +-
 drivers/staging/media/lirc/lirc_parallel.c       | 35 +++++++----------
 drivers/staging/media/lirc/lirc_sasem.c          | 20 +++++-----
 drivers/staging/media/lirc/lirc_serial.c         | 50 ++++++++----------------
 fs/coredump.c                                    |  8 ++--
 kernel/cpuset.c                                  | 12 ++++--
 11 files changed, 68 insertions(+), 90 deletions(-)
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
$ git merge luto-misc/next
Already up-to-date.
Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic)
$ git merge access_once/linux-next
Merge made by the 'recursive' strategy.
Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next)
$ git merge livepatching/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging coresight/next (ce9478fdb6e0 coresight: etm3x: making error message unambiguous)
$ git merge coresight/next
Merge made by the 'recursive' strategy.
 .../ABI/testing/sysfs-bus-coresight-devices-etm3x  |  77 +++++++++++++--
 drivers/hwtracing/coresight/coresight-etm3x.c      | 107 ++++++++++++---------
 drivers/hwtracing/coresight/coresight-etm4x.c      |  22 +++--
 drivers/hwtracing/coresight/coresight.c            |   5 +
 include/linux/coresight.h                          |   2 +-
 5 files changed, 154 insertions(+), 59 deletions(-)
Merging rtc/rtc-next (ec7fe80d5f9e rtc: pcf2127: make module license match the file header)
$ git merge rtc/rtc-next
Merge made by the 'recursive' strategy.
 drivers/rtc/rtc-pcf2127.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
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 (ae4f97696889 mm: fix type cast in __pfn_to_phys())
$ git merge nvdimm/libnvdimm-for-next
Already up-to-date.
Merging akpm-current/current (a9614b88e7d0 ipc/msg.c: use freezable blocking call)
$ git merge --no-ff akpm-current/current
Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution.
Resolved 'mm/vmscan.c' using previous resolution.
Auto-merging tools/testing/selftests/vm/Makefile
Auto-merging mm/vmscan.c
CONFLICT (content): Merge conflict in mm/vmscan.c
Auto-merging mm/mmap.c
Auto-merging mm/migrate.c
Auto-merging mm/memcontrol.c
Auto-merging kernel/fork.c
Auto-merging include/uapi/asm-generic/unistd.h
CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/memcontrol.h
Auto-merging include/linux/hugetlb_cgroup.h
Auto-merging include/drm/drmP.h
Auto-merging fs/proc/task_mmu.c
Auto-merging fs/ocfs2/dlm/dlmrecovery.c
Auto-merging arch/x86/kernel/acpi/boot.c
Auto-merging arch/x86/include/asm/pgtable.h
Auto-merging arch/x86/Kconfig
Auto-merging arch/arm64/include/asm/pgtable.h
Auto-merging arch/arm/mm/alignment.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 2005a783a0c2] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
 Documentation/devicetree/bindings/w1/omap-hdq.txt |    7 +-
 Documentation/filesystems/proc.txt                |   10 +
 Documentation/filesystems/vfat.txt                |   10 +
 Documentation/kasan.txt                           |   43 +-
 Documentation/printk-formats.txt                  |    8 +
 Documentation/vm/split_page_table_lock            |    4 +-
 Documentation/vm/transhuge.txt                    |   10 +
 Documentation/w1/masters/omap-hdq                 |    6 +
 arch/alpha/include/uapi/asm/mman.h                |    4 +
 arch/arm/include/asm/pgtable-3level.h             |    1 +
 arch/arm/mm/alignment.c                           |    2 +-
 arch/arm64/include/asm/pgtable.h                  |    2 +
 arch/mips/include/uapi/asm/mman.h                 |    7 +
 arch/mips/include/uapi/asm/unistd.h               |   15 +-
 arch/mips/kernel/scall32-o32.S                    |    1 +
 arch/mips/kernel/scall64-64.S                     |    1 +
 arch/mips/kernel/scall64-n32.S                    |    1 +
 arch/mips/kernel/scall64-o32.S                    |    1 +
 arch/parisc/include/uapi/asm/mman.h               |    4 +
 arch/powerpc/include/asm/pgtable-ppc64.h          |    2 +
 arch/powerpc/include/uapi/asm/mman.h              |    1 +
 arch/powerpc/mm/numa.c                            |    2 +-
 arch/powerpc/sysdev/fsl_pci.c                     |    2 +-
 arch/sparc/include/asm/pgtable_64.h               |    9 +
 arch/sparc/include/uapi/asm/mman.h                |    1 +
 arch/tile/include/uapi/asm/mman.h                 |    1 +
 arch/x86/Kconfig                                  |    3 +
 arch/x86/boot/Makefile                            |    4 +-
 arch/x86/entry/syscalls/syscall_32.tbl            |    1 +
 arch/x86/entry/syscalls/syscall_64.tbl            |    1 +
 arch/x86/include/asm/pgtable.h                    |    5 +
 arch/x86/kernel/acpi/boot.c                       |    9 +-
 arch/x86/kernel/machine_kexec_64.c                |    1 +
 arch/x86/kernel/smpboot.c                         |    2 +
 arch/x86/mm/kasan_init_64.c                       |    2 +-
 arch/x86/mm/numa.c                                |   59 +-
 arch/xtensa/configs/iss_defconfig                 |    1 -
 arch/xtensa/include/uapi/asm/mman.h               |    7 +
 block/genhd.c                                     |    2 +-
 drivers/block/zram/zram_drv.c                     |    6 +-
 drivers/gpu/drm/drm_lock.c                        |   41 -
 drivers/misc/sgi-xp/xpc_uv.c                      |    2 +-
 drivers/net/ethernet/intel/i40e/i40e_txrx.c       |    2 +-
 drivers/net/ethernet/intel/i40evf/i40e_txrx.c     |    2 +-
 drivers/w1/masters/omap_hdq.c                     |  224 ++++-
 fs/9p/vfs_file.c                                  |    3 +-
 fs/cifs/file.c                                    |    8 +-
 fs/dax.c                                          |   13 +-
 fs/ext4/fsync.c                                   |    5 +-
 fs/fat/cache.c                                    |   79 +-
 fs/fat/dir.c                                      |    2 +-
 fs/fat/fat.h                                      |    6 +-
 fs/fat/file.c                                     |   61 ++
 fs/fat/inode.c                                    |   75 +-
 fs/fs-writeback.c                                 |    7 +-
 fs/nilfs2/alloc.c                                 |  305 ++++--
 fs/nilfs2/alloc.h                                 |    1 +
 fs/nilfs2/super.c                                 |   12 +-
 fs/notify/fdinfo.c                                |    9 +-
 fs/notify/inotify/inotify_user.c                  |   14 +-
 fs/ocfs2/alloc.c                                  |  101 +-
 fs/ocfs2/aops.c                                   | 1118 ++++++++++-----------
 fs/ocfs2/aops.h                                   |   11 +-
 fs/ocfs2/dlm/dlmcommon.h                          |    1 -
 fs/ocfs2/dlm/dlmconvert.c                         |    2 -
 fs/ocfs2/dlm/dlmdebug.c                           |    7 +-
 fs/ocfs2/dlm/dlmlock.c                            |    1 -
 fs/ocfs2/dlm/dlmrecovery.c                        |   10 +-
 fs/ocfs2/file.c                                   |  138 +--
 fs/ocfs2/inode.c                                  |    3 +
 fs/ocfs2/inode.h                                  |    3 +
 fs/ocfs2/mmap.c                                   |    4 +-
 fs/ocfs2/ocfs2_trace.h                            |   16 +-
 fs/ocfs2/suballoc.c                               |    5 +-
 fs/ocfs2/super.c                                  |    1 +
 fs/proc/array.c                                   |   10 +-
 fs/proc/task_mmu.c                                |   39 +
 fs/seq_file.c                                     |   40 +-
 fs/sync.c                                         |    7 +-
 include/drm/drmP.h                                |    1 -
 include/linux/compaction.h                        |    3 +-
 include/linux/compiler-gcc.h                      |    5 +-
 include/linux/crc64_ecma.h                        |   56 ++
 include/linux/fs.h                                |    1 +
 include/linux/huge_mm.h                           |    4 +
 include/linux/hugetlb.h                           |   19 +
 include/linux/hugetlb_cgroup.h                    |    4 +-
 include/linux/kernel.h                            |    2 +
 include/linux/kexec.h                             |    2 +
 include/linux/memblock.h                          |    4 -
 include/linux/memcontrol.h                        |   64 +-
 include/linux/mm.h                                |  110 +-
 include/linux/mm_types.h                          |   43 +-
 include/linux/mmzone.h                            |    3 +-
 include/linux/moduleparam.h                       |    1 +
 include/linux/page-flags.h                        |  280 +++---
 include/linux/pageblock-flags.h                   |    2 +-
 include/linux/pagemap.h                           |   25 +-
 include/linux/poison.h                            |    6 +-
 include/linux/rmap.h                              |    9 +-
 include/linux/sched.h                             |   23 +-
 include/linux/slab.h                              |    2 +-
 include/linux/string.h                            |    1 +
 include/linux/swap.h                              |    3 +-
 include/linux/syscalls.h                          |    2 +
 include/linux/tracehook.h                         |    3 +
 include/linux/uaccess.h                           |   40 +-
 include/linux/vm_event_item.h                     |    1 +
 include/linux/zpool.h                             |    8 +-
 include/linux/zsmalloc.h                          |    2 +-
 include/linux/zutil.h                             |    4 +-
 include/trace/events/compaction.h                 |   72 +-
 include/trace/events/huge_memory.h                |  165 +++
 include/uapi/asm-generic/mman-common.h            |    6 +
 include/uapi/asm-generic/mman.h                   |    1 +
 include/uapi/asm-generic/unistd.h                 |    4 +-
 include/uapi/linux/userfaultfd.h                  |    2 -
 ipc/msg.c                                         |    5 +-
 kernel/fork.c                                     |    3 +-
 kernel/params.c                                   |    3 +-
 kernel/profile.c                                  |    2 +-
 kernel/signal.c                                   |   51 +-
 kernel/sys_ni.c                                   |    1 +
 kernel/watchdog.c                                 |    6 +-
 lib/Kconfig                                       |    7 +
 lib/Makefile                                      |    1 +
 lib/crc64_ecma.c                                  |  341 +++++++
 lib/dynamic_debug.c                               |    8 +-
 lib/halfmd4.c                                     |    3 +-
 lib/kasprintf.c                                   |   16 +
 lib/kobject.c                                     |   30 +-
 lib/llist.c                                       |    4 +-
 lib/test-string_helpers.c                         |   36 +
 lib/test_kasan.c                                  |   69 ++
 lib/vsprintf.c                                    |   20 +-
 mm/Kconfig                                        |   12 -
 mm/compaction.c                                   |   46 +-
 mm/debug.c                                        |    6 +-
 mm/early_ioremap.c                                |    6 +-
 mm/filemap.c                                      |   90 +-
 mm/frame_vector.c                                 |    2 +-
 mm/gup.c                                          |   10 +-
 mm/huge_memory.c                                  |  286 +++++-
 mm/hugetlb.c                                      |   56 +-
 mm/hugetlb_cgroup.c                               |    2 +-
 mm/internal.h                                     |   12 +-
 mm/kasan/kasan.c                                  |   38 +-
 mm/kasan/kasan.h                                  |    5 +-
 mm/kasan/report.c                                 |  112 ++-
 mm/kmemleak.c                                     |    2 +-
 mm/ksm.c                                          |    2 +-
 mm/list_lru.c                                     |   34 +-
 mm/maccess.c                                      |    5 +
 mm/madvise.c                                      |  176 ++++
 mm/memblock.c                                     |    2 +-
 mm/memcontrol.c                                   |  165 +--
 mm/memory-failure.c                               |   43 +-
 mm/memory.c                                       |    4 +-
 mm/memory_hotplug.c                               |    4 +-
 mm/migrate.c                                      |   17 +-
 mm/mincore.c                                      |    2 +-
 mm/mlock.c                                        |  100 +-
 mm/mmap.c                                         |   15 +-
 mm/mremap.c                                       |   12 +-
 mm/msync.c                                        |    2 +-
 mm/nommu.c                                        |    8 +-
 mm/oom_kill.c                                     |   32 +-
 mm/page_alloc.c                                   |  106 +-
 mm/percpu.c                                       |   10 +-
 mm/readahead.c                                    |   14 +-
 mm/rmap.c                                         |   50 +-
 mm/shmem.c                                        |    4 +-
 mm/slab.c                                         |   30 +-
 mm/slab_common.c                                  |    2 +-
 mm/slub.c                                         |   75 +-
 mm/swap.c                                         |   48 +-
 mm/swap_state.c                                   |    4 +-
 mm/util.c                                         |   42 +-
 mm/vmalloc.c                                      |   12 +-
 mm/vmscan.c                                       |  137 ++-
 mm/vmstat.c                                       |    1 +
 mm/zbud.c                                         |    2 +-
 mm/zpool.c                                        |   18 +-
 mm/zsmalloc.c                                     |   21 +-
 mm/zswap.c                                        |   82 +-
 net/openvswitch/flow.c                            |    2 +-
 tools/testing/selftests/vm/Makefile               |    2 +
 tools/testing/selftests/vm/mlock2-tests.c         |  737 ++++++++++++++
 tools/testing/selftests/vm/on-fault-limit.c       |   47 +
 tools/testing/selftests/vm/run_vmtests            |   22 +
 190 files changed, 4872 insertions(+), 2139 deletions(-)
 create mode 100644 include/linux/crc64_ecma.h
 create mode 100644 include/trace/events/huge_memory.h
 create mode 100644 lib/crc64_ecma.c
 create mode 100644 tools/testing/selftests/vm/mlock2-tests.c
 create mode 100644 tools/testing/selftests/vm/on-fault-limit.c
$ 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: net/ipv4/route.c: prevent oops
Applying: kernel.h: make abs() work with 64-bit types
Applying: Remove abs64()
Applying: remove-abs64-fix
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + e60b43dd5219...79fb77307846 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (79fb77307846 drivers/w1/w1_int.c: call put_device if device_register fails)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/tegra/sor.c           |  4 ++--
 drivers/input/joystick/walkera0701.c  |  4 ++--
 drivers/media/i2c/ov9650.c            |  2 +-
 drivers/net/wireless/mac80211_hwsim.c |  2 +-
 drivers/thermal/power_allocator.c     |  2 +-
 drivers/w1/w1_int.c                   |  3 +--
 fs/gfs2/lock_dlm.c                    |  2 +-
 include/linux/kernel.h                | 42 +++++++++++++++++------------------
 kernel/time/timekeeping.c             |  2 +-
 lib/div64.c                           |  2 +-
 net/ipv4/route.c                      |  2 ++
 net/sctp/transport.c                  |  2 +-
 12 files changed, 35 insertions(+), 34 deletions(-)