Next/merge.log

   1 $ date -R
   2 Thu, 05 Nov 2015 09:51:45 +1100
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 316dde2fe95b Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
   7 Merging origin/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
   8 $ git merge origin/master
   9 Updating 316dde2fe95b..1b1050cdc5cd
  10 Fast-forward
  11  Documentation/DocBook/80211.tmpl                   |    5 +-
  12  Documentation/IRQ-domain.txt                       |    8 +-
  13  Documentation/RCU/stallwarn.txt                    |    7 +
  14  Documentation/RCU/torture.txt                      |   39 +-
  15  Documentation/RCU/trace.txt                        |   32 +-
  16  Documentation/RCU/whatisRCU.txt                    |    6 +-
  17  Documentation/arm/uefi.txt                         |    2 -
  18  Documentation/arm64/booting.txt                    |   11 +-
  19  Documentation/atomic_ops.txt                       |    4 +
  20  Documentation/devicetree/bindings/arm/gic.txt      |   24 +-
  21  .../bindings/interrupt-controller/renesas,irqc.txt |    1 +
  22  .../devicetree/bindings/net/apm-xgene-enet.txt     |   10 +
  23  .../devicetree/bindings/net/brcm,iproc-mdio.txt    |   23 +
  24  .../devicetree/bindings/net/can/sun4i_can.txt      |   36 +
  25  Documentation/devicetree/bindings/net/cpsw.txt     |    7 +
  26  .../devicetree/bindings/net/fsl-tsec-phy.txt       |    4 +
  27  .../bindings/net/hisilicon-hip04-net.txt           |    4 +-
  28  .../devicetree/bindings/net/hisilicon-hns-dsaf.txt |   49 +
  29  .../devicetree/bindings/net/hisilicon-hns-mdio.txt |   22 +
  30  .../devicetree/bindings/net/hisilicon-hns-nic.txt  |   47 +
  31  .../bindings/net/ieee802154/mrf24j40.txt           |   20 +
  32  .../devicetree/bindings/net/nfc/nfcmrvl.txt        |   61 +-
  33  .../devicetree/bindings/net/nfc/st-nci-i2c.txt     |    7 +
  34  .../devicetree/bindings/net/nfc/st-nci-spi.txt     |    9 +-
  35  .../devicetree/bindings/net/renesas,ravb.txt       |   69 +-
  36  Documentation/devicetree/bindings/pci/pci-msi.txt  |  220 +
  37  .../bindings/rng/samsung,exynos-rng4.txt           |   17 +
  38  Documentation/devicetree/bindings/rng/st,rng.txt   |   15 +
  39  .../devicetree/bindings/rng/st,stm32-rng.txt       |   21 +
  40  Documentation/filesystems/nfs/nfsroot.txt          |    3 +
  41  Documentation/filesystems/proc.txt                 |    5 +-
  42  Documentation/hw_random.txt                        |    8 +-
  43  Documentation/kernel-parameters.txt                |   24 +-
  44  Documentation/locking/lockstat.txt                 |    2 +-
  45  Documentation/locking/locktorture.txt              |    3 +
  46  Documentation/memory-barriers.txt                  |   65 +-
  47  Documentation/networking/ieee802154.txt            |    8 +-
  48  Documentation/networking/ip-sysctl.txt             |   23 +-
  49  Documentation/networking/ipvs-sysctl.txt           |   10 +
  50  Documentation/networking/l2tp.txt                  |    7 +-
  51  Documentation/networking/switchdev.txt             |   65 +-
  52  Documentation/networking/vrf.txt                   |  301 +-
  53  MAINTAINERS                                        |   53 +-
  54  arch/alpha/include/asm/atomic.h                    |    8 +-
  55  arch/arc/include/asm/atomic.h                      |    8 +-
  56  arch/arm/Kconfig                                   |    1 +
  57  arch/arm/boot/dts/am4372.dtsi                      |    1 +
  58  arch/arm/boot/dts/dra7.dtsi                        |    1 +
  59  arch/arm/boot/dts/stih407-family.dtsi              |   14 +
  60  arch/arm/boot/dts/stm32f429.dtsi                   |    7 +
  61  arch/arm/include/asm/arch_gicv3.h                  |  188 +
  62  arch/arm/include/asm/atomic.h                      |   12 +-
  63  arch/arm/mach-exynos/suspend.c                     |   55 +-
  64  arch/arm/mach-gemini/board-nas4220b.c              |    1 -
  65  arch/arm/mach-gemini/board-wbd111.c                |    1 -
  66  arch/arm/mach-gemini/board-wbd222.c                |    1 -
  67  arch/arm/mach-imx/gpc.c                            |   55 +-
  68  arch/arm/mach-omap2/omap-wakeupgen.c               |   55 +-
  69  arch/arm/net/bpf_jit_32.c                          |   40 +-
  70  arch/arm/net/bpf_jit_32.h                          |    5 +
  71  arch/arm64/Kconfig                                 |   27 +
  72  arch/arm64/boot/dts/apm/apm-storm.dtsi             |   28 +
  73  arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi       |  191 +
  74  arch/arm64/include/asm/acpi.h                      |    5 +
  75  arch/arm64/include/asm/arch_gicv3.h                |  170 +
  76  arch/arm64/include/asm/atomic.h                    |    2 +-
  77  arch/arm64/include/asm/cpufeature.h                |    3 +-
  78  arch/arm64/include/asm/cputype.h                   |   17 +-
  79  arch/arm64/include/asm/memory.h                    |    1 +
  80  arch/arm64/include/asm/pgtable.h                   |    2 +
  81  arch/arm64/kernel/acpi.c                           |   29 +
  82  arch/arm64/kernel/cpu_errata.c                     |    9 +
  83  arch/arm64/kernel/cpufeature.c                     |   19 +-
  84  arch/arm64/kernel/efi.c                            |   23 +-
  85  arch/arm64/kernel/head.S                           |    2 +
  86  arch/arm64/kvm/Kconfig                             |    4 +
  87  arch/arm64/mm/proc.S                               |    4 +-
  88  arch/arm64/net/bpf_jit_comp.c                      |    2 +-
  89  arch/avr32/include/asm/atomic.h                    |    4 +-
  90  arch/c6x/platforms/megamod-pic.c                   |    2 +-
  91  arch/frv/include/asm/atomic.h                      |    4 +-
  92  arch/h8300/include/asm/atomic.h                    |    4 +-
  93  arch/hexagon/include/asm/atomic.h                  |    2 +-
  94  arch/ia64/include/asm/atomic.h                     |    8 +-
  95  arch/m32r/include/asm/atomic.h                     |    4 +-
  96  arch/m68k/include/asm/atomic.h                     |    4 +-
  97  arch/m68k/mac/psc.c                                |    1 +
  98  arch/metag/include/asm/atomic_lnkget.h             |    2 +-
  99  arch/metag/include/asm/atomic_lock1.h              |    2 +-
 100  arch/mips/bcm47xx/Kconfig                          |    1 +
 101  arch/mips/cavium-octeon/octeon-irq.c               |    4 +-
 102  arch/mips/include/asm/atomic.h                     |    8 +-
 103  arch/mips/net/bpf_jit.c                            |    2 +-
 104  arch/mn10300/include/asm/atomic.h                  |    4 +-
 105  arch/parisc/include/asm/atomic.h                   |    2 +-
 106  arch/powerpc/boot/dts/fsl/p1022si-post.dtsi        |    2 +
 107  arch/powerpc/net/bpf_jit_comp.c                    |    2 +-
 108  arch/powerpc/perf/core-book3s.c                    |   36 +-
 109  arch/powerpc/perf/hv-24x7.c                        |  166 +-
 110  arch/powerpc/perf/power8-pmu.c                     |    3 +
 111  arch/powerpc/platforms/cell/axon_msi.c             |    2 +-
 112  arch/powerpc/platforms/cell/spider-pic.c           |    9 +-
 113  arch/powerpc/platforms/pasemi/msi.c                |    6 +-
 114  arch/powerpc/platforms/powernv/opal-irqchip.c      |    2 +-
 115  arch/powerpc/sysdev/ehv_pic.c                      |    3 +-
 116  arch/powerpc/sysdev/fsl_msi.c                      |    2 +-
 117  arch/powerpc/sysdev/i8259.c                        |    3 +-
 118  arch/powerpc/sysdev/ipic.c                         |    3 +-
 119  arch/powerpc/sysdev/mpic.c                         |    3 +-
 120  arch/powerpc/sysdev/mpic_msi.c                     |    2 +-
 121  arch/powerpc/sysdev/qe_lib/qe_ic.c                 |    3 +-
 122  arch/s390/crypto/sha.h                             |    2 +-
 123  arch/s390/kernel/perf_cpum_cf.c                    |   35 +-
 124  arch/s390/net/bpf_jit_comp.c                       |    2 +-
 125  arch/sh/include/asm/atomic.h                       |    4 +-
 126  arch/sparc/include/asm/atomic_64.h                 |    8 +-
 127  arch/sparc/kernel/perf_event.c                     |   32 +-
 128  arch/sparc/net/bpf_jit_comp.c                      |    2 +-
 129  arch/tile/include/asm/atomic.h                     |    2 +-
 130  arch/tile/include/asm/atomic_64.h                  |    6 +-
 131  arch/x86/Kconfig                                   |   71 +-
 132  arch/x86/Kconfig.cpu                               |   24 +-
 133  arch/x86/Kconfig.debug                             |   36 +-
 134  arch/x86/Makefile                                  |   12 +-
 135  arch/x86/boot/compressed/eboot.c                   |   28 +-
 136  arch/x86/boot/header.S                             |    2 +-
 137  arch/x86/crypto/Makefile                           |    8 +
 138  arch/x86/crypto/camellia_aesni_avx2_glue.c         |    3 +-
 139  arch/x86/crypto/camellia_aesni_avx_glue.c          |    3 +-
 140  arch/x86/crypto/cast5_avx_glue.c                   |    3 +-
 141  arch/x86/crypto/cast6_avx_glue.c                   |    3 +-
 142  arch/x86/crypto/chacha20_glue.c                    |    2 +-
 143  arch/x86/crypto/crc32c-pcl-intel-asm_64.S          |    2 +-
 144  arch/x86/crypto/poly1305_glue.c                    |    2 +-
 145  arch/x86/crypto/serpent_avx2_glue.c                |    3 +-
 146  arch/x86/crypto/serpent_avx_glue.c                 |    3 +-
 147  arch/x86/crypto/sha1_ni_asm.S                      |  302 +
 148  arch/x86/crypto/sha1_ssse3_glue.c                  |  316 +-
 149  arch/x86/crypto/sha256_ni_asm.S                    |  353 ++
 150  arch/x86/crypto/sha256_ssse3_glue.c                |  331 +-
 151  arch/x86/crypto/sha512_ssse3_glue.c                |  251 +-
 152  arch/x86/crypto/twofish_avx_glue.c                 |    2 +-
 153  arch/x86/entry/common.c                            |  264 +-
 154  arch/x86/entry/entry_32.S                          |  182 +-
 155  arch/x86/entry/entry_64.S                          |    9 +-
 156  arch/x86/entry/entry_64_compat.S                   |  547 +-
 157  arch/x86/entry/syscall_32.c                        |    9 +-
 158  arch/x86/entry/syscall_64.c                        |    4 +-
 159  arch/x86/entry/syscalls/syscall_32.tbl             |   12 +-
 160  arch/x86/entry/vdso/Makefile                       |   39 +-
 161  arch/x86/entry/vdso/vdso2c.c                       |    2 +-
 162  arch/x86/entry/vdso/vdso32-setup.c                 |   28 +-
 163  arch/x86/entry/vdso/vdso32/int80.S                 |   56 -
 164  arch/x86/entry/vdso/vdso32/syscall.S               |   75 -
 165  arch/x86/entry/vdso/vdso32/sysenter.S              |  116 -
 166  arch/x86/entry/vdso/vdso32/system_call.S           |   57 +
 167  arch/x86/entry/vdso/vdso32/vclock_gettime.c        |    2 +
 168  arch/x86/entry/vdso/vma.c                          |   13 +-
 169  arch/x86/entry/vsyscall/vsyscall_64.c              |    9 +-
 170  arch/x86/ia32/ia32_signal.c                        |   12 +-
 171  arch/x86/include/asm/acpi.h                        |   23 +
 172  arch/x86/include/asm/amd_nb.h                      |    2 +-
 173  arch/x86/include/asm/apic.h                        |  110 +-
 174  arch/x86/include/asm/atomic.h                      |    4 +-
 175  arch/x86/include/asm/atomic64_64.h                 |    4 +-
 176  arch/x86/include/asm/cpufeature.h                  |    5 +-
 177  arch/x86/include/asm/dwarf2.h                      |   84 +
 178  arch/x86/include/asm/efi.h                         |    1 +
 179  arch/x86/include/asm/elf.h                         |   10 +-
 180  arch/x86/include/asm/fpu/signal.h                  |    2 +-
 181  arch/x86/include/asm/fpu/types.h                   |  148 +-
 182  arch/x86/include/asm/fpu/xstate.h                  |   15 +-
 183  arch/x86/include/asm/hpet.h                        |    6 +-
 184  arch/x86/include/asm/ia32.h                        |    4 +-
 185  arch/x86/include/asm/kdebug.h                      |    6 -
 186  arch/x86/include/asm/mce.h                         |   34 +-
 187  arch/x86/include/asm/microcode.h                   |   26 +-
 188  arch/x86/include/asm/microcode_amd.h               |    3 +-
 189  arch/x86/include/asm/microcode_intel.h             |   10 +-
 190  arch/x86/include/asm/numachip/numachip.h           |    1 +
 191  arch/x86/include/asm/numachip/numachip_csr.h       |  153 +-
 192  arch/x86/include/asm/page_64_types.h               |    3 -
 193  arch/x86/include/asm/page_types.h                  |    3 +
 194  arch/x86/include/asm/pgtable.h                     |   25 +-
 195  arch/x86/include/asm/pgtable_types.h               |   40 +-
 196  arch/x86/include/asm/preempt.h                     |    5 +-
 197  arch/x86/include/asm/processor.h                   |    6 +-
 198  arch/x86/include/asm/sigcontext.h                  |   75 +-
 199  arch/x86/include/asm/sigframe.h                    |    8 +-
 200  arch/x86/include/asm/signal.h                      |    2 +-
 201  arch/x86/include/asm/switch_to.h                   |   12 +-
 202  arch/x86/include/asm/syscall.h                     |   14 +-
 203  arch/x86/include/asm/thread_info.h                 |    3 -
 204  arch/x86/include/asm/trace/mpx.h                   |    7 +-
 205  arch/x86/include/asm/uaccess.h                     |   14 +-
 206  arch/x86/include/asm/uv/uv_hub.h                   |    2 +-
 207  arch/x86/include/asm/vdso.h                        |   10 +-
 208  arch/x86/include/uapi/asm/mce.h                    |    2 +-
 209  arch/x86/include/uapi/asm/sigcontext.h             |  475 +-
 210  arch/x86/include/uapi/asm/sigcontext32.h           |   73 +-
 211  arch/x86/kernel/apic/apic.c                        |    8 +-
 212  arch/x86/kernel/apic/apic_numachip.c               |  220 +-
 213  arch/x86/kernel/apic/io_apic.c                     |    2 +-
 214  arch/x86/kernel/asm-offsets.c                      |   21 +-
 215  arch/x86/kernel/cpu/Makefile                       |    1 +
 216  arch/x86/kernel/cpu/common.c                       |    1 +
 217  arch/x86/kernel/cpu/intel_cacheinfo.c              |    8 +-
 218  arch/x86/kernel/cpu/mcheck/mce.c                   |   34 +-
 219  arch/x86/kernel/cpu/mcheck/therm_throt.c           |    8 -
 220  arch/x86/kernel/cpu/microcode/Makefile             |    3 -
 221  arch/x86/kernel/cpu/microcode/amd.c                |  509 +-
 222  arch/x86/kernel/cpu/microcode/amd_early.c          |  440 --
 223  arch/x86/kernel/cpu/microcode/core.c               |  232 +-
 224  arch/x86/kernel/cpu/microcode/core_early.c         |  170 -
 225  arch/x86/kernel/cpu/microcode/intel.c              |  791 ++-
 226  arch/x86/kernel/cpu/microcode/intel_early.c        |  808 ---
 227  arch/x86/kernel/cpu/microcode/intel_lib.c          |    1 -
 228  arch/x86/kernel/cpu/perf_event.c                   |   39 +-
 229  arch/x86/kernel/cpu/perf_event.h                   |    2 +-
 230  arch/x86/kernel/cpu/perf_event_intel_bts.c         |   13 +
 231  arch/x86/kernel/cpu/perf_event_intel_cstate.c      |  694 +++
 232  arch/x86/kernel/cpu/perf_event_intel_ds.c          |   40 +-
 233  arch/x86/kernel/cpu/perf_event_intel_lbr.c         |    8 +-
 234  arch/x86/kernel/cpu/perf_event_intel_pt.c          |    7 +-
 235  arch/x86/kernel/cpu/perf_event_intel_uncore.c      |   61 +-
 236  arch/x86/kernel/cpu/perf_event_intel_uncore.h      |   12 +-
 237  arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c  |   16 +-
 238  .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c |   34 +-
 239  arch/x86/kernel/crash.c                            |    3 -
 240  arch/x86/kernel/e820.c                             |    2 +-
 241  arch/x86/kernel/early-quirks.c                     |    2 +-
 242  arch/x86/kernel/early_printk.c                     |    6 +-
 243  arch/x86/kernel/fpu/init.c                         |   18 +-
 244  arch/x86/kernel/fpu/regset.c                       |    4 +-
 245  arch/x86/kernel/fpu/signal.c                       |   10 +-
 246  arch/x86/kernel/fpu/xstate.c                       |  398 +-
 247  arch/x86/kernel/head_32.S                          |    5 +-
 248  arch/x86/kernel/hpet.c                             |   29 +-
 249  arch/x86/kernel/irq_64.c                           |    2 +-
 250  arch/x86/kernel/kgdb.c                             |   17 +-
 251  arch/x86/kernel/process_32.c                       |    8 -
 252  arch/x86/kernel/process_64.c                       |   10 +-
 253  arch/x86/kernel/quirks.c                           |    2 +-
 254  arch/x86/kernel/setup.c                            |  106 +-
 255  arch/x86/kernel/signal.c                           |   10 +-
 256  arch/x86/kernel/traps.c                            |    4 +-
 257  arch/x86/kernel/tsc.c                              |   35 +-
 258  arch/x86/kvm/cpuid.c                               |    4 +-
 259  arch/x86/kvm/x86.c                                 |   27 +-
 260  arch/x86/kvm/x86.h                                 |    6 +-
 261  arch/x86/lib/x86-opcode-map.txt                    |   24 +-
 262  arch/x86/math-emu/fpu_aux.c                        |   70 +
 263  arch/x86/math-emu/fpu_emu.h                        |    2 +-
 264  arch/x86/math-emu/fpu_entry.c                      |   96 +-
 265  arch/x86/math-emu/fpu_proto.h                      |   12 +
 266  arch/x86/math-emu/load_store.c                     |   63 +-
 267  arch/x86/math-emu/reg_compare.c                    |  128 +
 268  arch/x86/mm/Makefile                               |    2 +-
 269  arch/x86/mm/dump_pagetables.c                      |   81 +-
 270  arch/x86/mm/gup.c                                  |   18 +-
 271  arch/x86/mm/init.c                                 |    2 -
 272  arch/x86/mm/init_32.c                              |    2 +
 273  arch/x86/mm/init_64.c                              |    2 +
 274  arch/x86/mm/mpx.c                                  |   15 +-
 275  arch/x86/mm/pageattr.c                             |   88 +-
 276  arch/x86/net/bpf_jit_comp.c                        |    2 +-
 277  arch/x86/platform/efi/efi-bgrt.c                   |    9 +-
 278  arch/x86/platform/efi/efi.c                        |   28 +-
 279  arch/x86/platform/intel-mid/intel-mid.c            |    2 +-
 280  arch/x86/platform/intel-mid/sfi.c                  |    3 +-
 281  arch/x86/platform/uv/uv_nmi.c                      |   53 +-
 282  arch/x86/ras/Kconfig                               |    4 +-
 283  arch/x86/ras/mce_amd_inj.c                         |  103 +-
 284  arch/x86/um/asm/syscall.h                          |    4 +
 285  arch/x86/um/sys_call_table_32.c                    |    7 +-
 286  arch/x86/um/sys_call_table_64.c                    |    7 +-
 287  arch/x86/xen/setup.c                               |   13 +-
 288  arch/xtensa/include/asm/atomic.h                   |    4 +-
 289  crypto/Kconfig                                     |   17 +-
 290  crypto/Makefile                                    |   10 +-
 291  crypto/akcipher.c                                  |    1 -
 292  crypto/asymmetric_keys/pkcs7_verify.c              |    5 +-
 293  crypto/asymmetric_keys/x509_cert_parser.c          |    6 +-
 294  crypto/asymmetric_keys/x509_public_key.c           |    5 +-
 295  crypto/jitterentropy-kcapi.c                       |    4 -
 296  crypto/keywrap.c                                   |  419 ++
 297  crypto/rsa.c                                       |   83 +-
 298  crypto/rsa_helper.c                                |   42 +-
 299  crypto/rsakey.asn1                                 |    5 -
 300  crypto/rsaprivkey.asn1                             |   11 +
 301  crypto/rsapubkey.asn1                              |    4 +
 302  crypto/skcipher.c                                  |    4 +-
 303  crypto/tcrypt.c                                    |   17 +-
 304  crypto/testmgr.c                                   |   83 +-
 305  crypto/testmgr.h                                   |   77 +-
 306  drivers/acpi/apei/ghes.c                           |   10 +-
 307  drivers/acpi/gsi.c                                 |   54 +-
 308  drivers/atm/iphase.c                               |    5 +-
 309  drivers/base/platform-msi.c                        |    6 +-
 310  drivers/bcma/main.c                                |    9 +-
 311  drivers/bluetooth/Kconfig                          |    8 +-
 312  drivers/bluetooth/ath3k.c                          |    4 +
 313  drivers/bluetooth/bfusb.c                          |   11 -
 314  drivers/bluetooth/bluecard_cs.c                    |    8 +-
 315  drivers/bluetooth/bpa10x.c                         |  186 +-
 316  drivers/bluetooth/bt3c_cs.c                        |   20 +-
 317  drivers/bluetooth/btbcm.c                          |   71 +-
 318  drivers/bluetooth/btintel.c                        |  369 ++
 319  drivers/bluetooth/btintel.h                        |   43 +-
 320  drivers/bluetooth/btmrvl_main.c                    |   33 +-
 321  drivers/bluetooth/btmrvl_sdio.c                    |   54 +-
 322  drivers/bluetooth/btsdio.c                         |   14 +-
 323  drivers/bluetooth/btuart_cs.c                      |   10 +-
 324  drivers/bluetooth/btusb.c                          |  366 +-
 325  drivers/bluetooth/btwilink.c                       |   13 -
 326  drivers/bluetooth/dtl1_cs.c                        |    5 -
 327  drivers/bluetooth/hci_ath.c                        |    1 +
 328  drivers/bluetooth/hci_bcm.c                        |  446 +-
 329  drivers/bluetooth/hci_h4.c                         |    1 +
 330  drivers/bluetooth/hci_h5.c                         |   10 +-
 331  drivers/bluetooth/hci_intel.c                      |  600 +-
 332  drivers/bluetooth/hci_ldisc.c                      |   24 +-
 333  drivers/bluetooth/hci_qca.c                        |   17 +-
 334  drivers/bluetooth/hci_uart.h                       |    2 +-
 335  drivers/bluetooth/hci_vhci.c                       |    8 -
 336  drivers/char/hw_random/Kconfig                     |   24 +-
 337  drivers/char/hw_random/Makefile                    |    2 +
 338  drivers/char/hw_random/core.c                      |    2 +-
 339  drivers/char/hw_random/exynos-rng.c                |   58 +-
 340  drivers/char/hw_random/mxc-rnga.c                  |   14 +-
 341  drivers/char/hw_random/octeon-rng.c                |   12 +-
 342  drivers/char/hw_random/pasemi-rng.c                |    1 +
 343  drivers/char/hw_random/ppc4xx-rng.c                |    1 +
 344  drivers/char/hw_random/st-rng.c                    |  151 +
 345  drivers/char/hw_random/stm32-rng.c                 |  202 +
 346  drivers/clocksource/Kconfig                        |    4 +
 347  drivers/clocksource/Makefile                       |    2 +
 348  drivers/clocksource/em_sti.c                       |    2 -
 349  drivers/clocksource/exynos_mct.c                   |   12 +-
 350  drivers/clocksource/h8300_timer16.c                |    1 -
 351  drivers/clocksource/h8300_timer8.c                 |    1 -
 352  drivers/clocksource/h8300_tpu.c                    |    1 -
 353  drivers/clocksource/mtk_timer.c                    |   26 +-
 354  drivers/clocksource/numachip.c                     |   95 +
 355  drivers/clocksource/sh_cmt.c                       |    1 -
 356  drivers/clocksource/tango_xtal.c                   |   66 +
 357  drivers/clocksource/time-armada-370-xp.c           |   14 +
 358  drivers/clocksource/timer-imx-gpt.c                |    3 +-
 359  drivers/crypto/Kconfig                             |    5 +-
 360  drivers/crypto/amcc/crypto4xx_core.c               |   23 +-
 361  drivers/crypto/atmel-aes.c                         |   44 +-
 362  drivers/crypto/atmel-sha.c                         |   33 +-
 363  drivers/crypto/atmel-tdes.c                        |   35 +-
 364  drivers/crypto/bfin_crc.c                          |   25 +-
 365  drivers/crypto/caam/caamalg.c                      |  232 +-
 366  drivers/crypto/caam/caamhash.c                     |  131 +-
 367  drivers/crypto/caam/desc.h                         |    1 -
 368  drivers/crypto/caam/sg_sw_sec4.h                   |   72 +-
 369  drivers/crypto/ccp/Kconfig                         |   13 +-
 370  drivers/crypto/ccp/ccp-crypto-aes-cmac.c           |   20 +-
 371  drivers/crypto/ccp/ccp-crypto-main.c               |    6 +-
 372  drivers/crypto/ccp/ccp-crypto-sha.c                |   13 +
 373  drivers/crypto/ccp/ccp-ops.c                       |  108 +-
 374  drivers/crypto/ccp/ccp-pci.c                       |    2 +-
 375  drivers/crypto/ccp/ccp-platform.c                  |    6 +-
 376  drivers/crypto/marvell/cesa.h                      |   55 +-
 377  drivers/crypto/marvell/cipher.c                    |   13 +-
 378  drivers/crypto/marvell/hash.c                      |  471 +-
 379  drivers/crypto/marvell/tdma.c                      |   42 +-
 380  drivers/crypto/n2_core.c                           |    2 +-
 381  drivers/crypto/nx/nx-842-powernv.c                 |    4 +-
 382  drivers/crypto/nx/nx-842-pseries.c                 |    8 +-
 383  drivers/crypto/picoxcell_crypto.c                  |    1 +
 384  drivers/crypto/qat/qat_common/Makefile             |   12 +-
 385  drivers/crypto/qat/qat_common/adf_common_drv.h     |    4 +-
 386  drivers/crypto/qat/qat_common/adf_ctl_drv.c        |    6 -
 387  drivers/crypto/qat/qat_common/adf_init.c           |    8 +-
 388  drivers/crypto/qat/qat_common/adf_sriov.c          |    7 +-
 389  drivers/crypto/qat/qat_common/qat_algs.c           |  178 +-
 390  drivers/crypto/qat/qat_common/qat_asym_algs.c      |  213 +-
 391  drivers/crypto/qat/qat_common/qat_crypto.c         |   79 +-
 392  drivers/crypto/qat/qat_common/qat_hal.c            |    5 +-
 393  drivers/crypto/qat/qat_common/qat_rsakey.asn1      |    5 -
 394  drivers/crypto/qat/qat_common/qat_rsaprivkey.asn1  |   11 +
 395  drivers/crypto/qat/qat_common/qat_rsapubkey.asn1   |    4 +
 396  drivers/crypto/qce/ablkcipher.c                    |   30 +-
 397  drivers/crypto/qce/cipher.h                        |    4 -
 398  drivers/crypto/qce/dma.c                           |   52 -
 399  drivers/crypto/qce/dma.h                           |    5 -
 400  drivers/crypto/qce/sha.c                           |   18 +-
 401  drivers/crypto/qce/sha.h                           |    2 -
 402  drivers/crypto/sahara.c                            |  108 +-
 403  drivers/crypto/talitos.c                           |  104 +-
 404  drivers/crypto/ux500/cryp/cryp_core.c              |   71 +-
 405  drivers/crypto/ux500/hash/hash_core.c              |   50 +-
 406  drivers/edac/amd64_edac.c                          |    6 +-
 407  drivers/firmware/efi/Kconfig                       |   22 +
 408  drivers/firmware/efi/Makefile                      |    1 +
 409  drivers/firmware/efi/efi-pstore.c                  |    1 +
 410  drivers/firmware/efi/efi.c                         |  107 +-
 411  drivers/firmware/efi/esrt.c                        |   19 +-
 412  drivers/firmware/efi/fake_mem.c                    |  238 +
 413  drivers/gpio/gpio-sodaville.c                      |    2 +-
 414  drivers/ide/pdc202xx_new.c                         |   10 +-
 415  drivers/infiniband/hw/nes/nes_nic.c                |    3 -
 416  drivers/irqchip/Kconfig                            |    6 +
 417  drivers/irqchip/Makefile                           |    2 +-
 418  drivers/irqchip/alphascale_asm9260-icoll.h         |  109 +
 419  drivers/irqchip/exynos-combiner.c                  |    2 +-
 420  drivers/irqchip/irq-armada-370-xp.c                |   14 +-
 421  drivers/irqchip/irq-atmel-aic-common.c             |    2 +-
 422  drivers/irqchip/irq-atmel-aic5.c                   |   62 +-
 423  drivers/irqchip/irq-crossbar.c                     |   62 +-
 424  drivers/irqchip/irq-gic-common.c                   |   11 +
 425  drivers/irqchip/irq-gic-common.h                   |    9 +
 426  drivers/irqchip/irq-gic-v2m.c                      |  163 +-
 427  drivers/irqchip/irq-gic-v3-its-pci-msi.c           |    7 +-
 428  drivers/irqchip/irq-gic-v3-its-platform-msi.c      |   21 +-
 429  drivers/irqchip/irq-gic-v3-its.c                   |   83 +-
 430  drivers/irqchip/irq-gic-v3.c                       |  161 +-
 431  drivers/irqchip/irq-gic.c                          |  110 +-
 432  drivers/irqchip/irq-hip04.c                        |    2 +-
 433  drivers/irqchip/irq-i8259.c                        |    4 +-
 434  drivers/irqchip/irq-imx-gpcv2.c                    |   64 +-
 435  drivers/irqchip/irq-mtk-sysirq.c                   |   49 +-
 436  drivers/irqchip/irq-mxs.c                          |  171 +-
 437  drivers/irqchip/irq-nvic.c                         |   18 +-
 438  drivers/irqchip/irq-renesas-intc-irqpin.c          |    6 +-
 439  drivers/irqchip/irq-renesas-irqc.c                 |   86 +-
 440  drivers/irqchip/irq-s3c24xx.c                      |    4 +-
 441  drivers/irqchip/irq-sunxi-nmi.c                    |   22 +-
 442  drivers/irqchip/irq-tegra.c                        |   55 +-
 443  drivers/irqchip/irq-vf610-mscm-ir.c                |   45 +-
 444  drivers/isdn/hisax/hfc4s8s_l1.c                    |   10 +-
 445  drivers/isdn/i4l/isdn_ppp.c                        |   12 +-
 446  drivers/isdn/mISDN/dsp_pipeline.c                  |   12 +-
 447  drivers/net/Kconfig                                |    5 +-
 448  drivers/net/arcnet/Kconfig                         |    1 +
 449  drivers/net/arcnet/arc-rawmode.c                   |  142 +-
 450  drivers/net/arcnet/arc-rimi.c                      |  145 +-
 451  {include/linux => drivers/net/arcnet}/arcdevice.h  |  167 +-
 452  drivers/net/arcnet/arcnet.c                        |  700 +--
 453  drivers/net/arcnet/capmode.c                       |  138 +-
 454  drivers/net/arcnet/com20020-isa.c                  |   54 +-
 455  drivers/net/arcnet/com20020-pci.c                  |  175 +-
 456  drivers/net/arcnet/com20020.c                      |  263 +-
 457  {include/linux => drivers/net/arcnet}/com20020.h   |   89 +-
 458  drivers/net/arcnet/com20020_cs.c                   |  325 +-
 459  drivers/net/arcnet/com9026.h                       |   17 +
 460  drivers/net/arcnet/com90io.c                       |  209 +-
 461  drivers/net/arcnet/com90xx.c                       |  323 +-
 462  drivers/net/arcnet/rfc1051.c                       |   77 +-
 463  drivers/net/arcnet/rfc1201.c                       |  238 +-
 464  drivers/net/bonding/bond_3ad.c                     |  113 +-
 465  drivers/net/bonding/bond_main.c                    |   20 +-
 466  drivers/net/can/Kconfig                            |   10 +
 467  drivers/net/can/Makefile                           |    1 +
 468  drivers/net/can/at91_can.c                         |   21 -
 469  drivers/net/can/dev.c                              |    2 +-
 470  drivers/net/can/flexcan.c                          |  197 +-
 471  drivers/net/can/sun4i_can.c                        |  857 +++
 472  drivers/net/dsa/bcm_sf2.c                          |  338 +-
 473  drivers/net/dsa/bcm_sf2.h                          |   62 +
 474  drivers/net/dsa/bcm_sf2_regs.h                     |   43 +
 475  drivers/net/dsa/mv88e6060.c                        |    4 +-
 476  drivers/net/dsa/mv88e6123_61_65.c                  |   46 +-
 477  drivers/net/dsa/mv88e6131.c                        |   34 +-
 478  drivers/net/dsa/mv88e6171.c                        |   36 +-
 479  drivers/net/dsa/mv88e6352.c                        |   57 +-
 480  drivers/net/dsa/mv88e6xxx.c                        | 1053 ++--
 481  drivers/net/dsa/mv88e6xxx.h                        |   62 +-
 482  drivers/net/dummy.c                                |    6 +-
 483  drivers/net/ethernet/8390/Kconfig                  |    2 +-
 484  drivers/net/ethernet/8390/mac8390.c                |   32 +-
 485  drivers/net/ethernet/aeroflex/greth.c              |    2 -
 486  drivers/net/ethernet/amd/7990.c                    |    1 +
 487  drivers/net/ethernet/amd/Kconfig                   |    2 +-
 488  drivers/net/ethernet/amd/au1000_eth.c              |    1 -
 489  drivers/net/ethernet/amd/xgbe/xgbe-dev.c           |   83 +-
 490  drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |   10 +-
 491  drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c       |  107 +-
 492  drivers/net/ethernet/amd/xgbe/xgbe-main.c          |    2 +-
 493  drivers/net/ethernet/amd/xgbe/xgbe-mdio.c          |   16 +-
 494  drivers/net/ethernet/amd/xgbe/xgbe.h               |   18 +-
 495  drivers/net/ethernet/apm/xgene/xgene_enet_hw.c     |   11 +-
 496  drivers/net/ethernet/apm/xgene/xgene_enet_hw.h     |    1 +
 497  drivers/net/ethernet/apm/xgene/xgene_enet_main.c   |   65 +-
 498  drivers/net/ethernet/apm/xgene/xgene_enet_main.h   |    7 +
 499  drivers/net/ethernet/apple/Kconfig                 |    2 +-
 500  drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c |    4 -
 501  drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c |    4 -
 502  drivers/net/ethernet/atheros/atlx/atl1.c           |    1 -
 503  drivers/net/ethernet/atheros/atlx/atl2.c           |    4 -
 504  drivers/net/ethernet/broadcom/Kconfig              |   19 +
 505  drivers/net/ethernet/broadcom/Makefile             |    1 +
 506  drivers/net/ethernet/broadcom/bcm63xx_enet.c       |    2 -
 507  drivers/net/ethernet/broadcom/bcmsysport.c         |    1 -
 508  drivers/net/ethernet/broadcom/bnx2.c               |   81 +-
 509  drivers/net/ethernet/broadcom/bnx2.h               |    1 +
 510  .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |    4 -
 511  drivers/net/ethernet/broadcom/bnxt/Makefile        |    3 +
 512  drivers/net/ethernet/broadcom/bnxt/bnxt.c          | 5728 +++++++++++++++++++
 513  drivers/net/ethernet/broadcom/bnxt/bnxt.h          | 1086 ++++
 514  drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c  | 1149 ++++
 515  drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h  |   17 +
 516  drivers/net/ethernet/broadcom/bnxt/bnxt_fw_hdr.h   |  104 +
 517  drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h      | 4046 +++++++++++++
 518  drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h |   59 +
 519  drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c    |  816 +++
 520  drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h    |   23 +
 521  drivers/net/ethernet/broadcom/genet/bcmgenet.c     |  154 +-
 522  drivers/net/ethernet/broadcom/genet/bcmgenet.h     |   10 +-
 523  drivers/net/ethernet/broadcom/genet/bcmmii.c       |   18 +
 524  drivers/net/ethernet/cavium/liquidio/lio_ethtool.c |    1 -
 525  drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |    4 +
 526  drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c |   21 +-
 527  drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c |  206 +-
 528  drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   39 +-
 529  drivers/net/ethernet/chelsio/cxgb4/sge.c           |   36 +-
 530  drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         | 1470 +++--
 531  drivers/net/ethernet/chelsio/cxgb4/t4_hw.h         |    5 +
 532  .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c    |    2 +-
 533  drivers/net/ethernet/cisco/enic/enic.h             |   28 +
 534  drivers/net/ethernet/cisco/enic/enic_main.c        |  122 +-
 535  drivers/net/ethernet/cisco/enic/vnic_dev.c         |    4 +-
 536  drivers/net/ethernet/cisco/enic/vnic_dev.h         |    2 +
 537  drivers/net/ethernet/dec/tulip/de2104x.c           |    1 -
 538  drivers/net/ethernet/emulex/benet/be_ethtool.c     |    3 -
 539  drivers/net/ethernet/ethoc.c                       |   14 +-
 540  drivers/net/ethernet/freescale/fec_main.c          |    5 +-
 541  drivers/net/ethernet/freescale/fec_ptp.c           |    6 +-
 542  drivers/net/ethernet/freescale/gianfar.c           |  157 +-
 543  drivers/net/ethernet/freescale/gianfar.h           |   12 +-
 544  drivers/net/ethernet/freescale/gianfar_ethtool.c   |   45 +-
 545  drivers/net/ethernet/freescale/ucc_geth_ethtool.c  |    2 -
 546  drivers/net/ethernet/hisilicon/Kconfig             |   35 +-
 547  drivers/net/ethernet/hisilicon/Makefile            |    4 +-
 548  drivers/net/ethernet/hisilicon/hip04_mdio.c        |  185 -
 549  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c      |    2 +-
 550  drivers/net/ethernet/hisilicon/hns/Makefile        |   12 +
 551  drivers/net/ethernet/hisilicon/hns/hnae.c          |  457 ++
 552  drivers/net/ethernet/hisilicon/hns/hnae.h          |  585 ++
 553  drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c  |  783 +++
 554  drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c |  704 +++
 555  drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h |   45 +
 556  drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c  |  902 +++
 557  drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h  |  456 ++
 558  drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 2474 ++++++++
 559  drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h |  428 ++
 560  drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c |  310 +
 561  drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h |   43 +
 562  drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c  |  583 ++
 563  drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h  |  105 +
 564  drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c  | 1021 ++++
 565  drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h  |  139 +
 566  drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h  |  972 ++++
 567  .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c    |  837 +++
 568  .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h    |   15 +
 569  drivers/net/ethernet/hisilicon/hns/hns_enet.c      | 1642 ++++++
 570  drivers/net/ethernet/hisilicon/hns/hns_enet.h      |   84 +
 571  drivers/net/ethernet/hisilicon/hns/hns_ethtool.c   | 1214 ++++
 572  drivers/net/ethernet/hisilicon/hns_mdio.c          |  521 ++
 573  drivers/net/ethernet/ibm/emac/core.c               |    1 -
 574  drivers/net/ethernet/ibm/emac/core.h               |    2 +-
 575  drivers/net/ethernet/intel/e1000/e1000_ethtool.c   |    2 -
 576  drivers/net/ethernet/intel/e1000/e1000_hw.c        |    8 -
 577  drivers/net/ethernet/intel/e1000/e1000_main.c      |    2 +-
 578  drivers/net/ethernet/intel/e1000e/ethtool.c        |    2 -
 579  drivers/net/ethernet/intel/e1000e/netdev.c         |    3 +-
 580  drivers/net/ethernet/intel/fm10k/fm10k.h           |   19 +
 581  drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c   |   11 +-
 582  drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c   |  220 +-
 583  drivers/net/ethernet/intel/fm10k/fm10k_iov.c       |    8 +-
 584  drivers/net/ethernet/intel/fm10k/fm10k_main.c      |   50 +-
 585  drivers/net/ethernet/intel/fm10k/fm10k_mbx.c       |   48 +-
 586  drivers/net/ethernet/intel/fm10k/fm10k_netdev.c    |   39 +-
 587  drivers/net/ethernet/intel/fm10k/fm10k_pci.c       |  198 +-
 588  drivers/net/ethernet/intel/fm10k/fm10k_pf.c        |  105 +-
 589  drivers/net/ethernet/intel/fm10k/fm10k_type.h      |    7 +-
 590  drivers/net/ethernet/intel/fm10k/fm10k_vf.c        |   14 -
 591  drivers/net/ethernet/intel/i40e/i40e.h             |   70 +-
 592  drivers/net/ethernet/intel/i40e/i40e_adminq.c      |   79 +-
 593  drivers/net/ethernet/intel/i40e/i40e_adminq.h      |    9 +-
 594  drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h  |   27 +-
 595  drivers/net/ethernet/intel/i40e/i40e_common.c      |  119 +-
 596  drivers/net/ethernet/intel/i40e/i40e_dcb.c         |  292 +-
 597  drivers/net/ethernet/intel/i40e/i40e_dcb.h         |   39 +
 598  drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c      |    9 +-
 599  drivers/net/ethernet/intel/i40e/i40e_debugfs.c     |  168 +-
 600  drivers/net/ethernet/intel/i40e/i40e_devids.h      |   55 +
 601  drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |  406 +-
 602  drivers/net/ethernet/intel/i40e/i40e_fcoe.c        |   13 +-
 603  drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c     |    3 +-
 604  drivers/net/ethernet/intel/i40e/i40e_main.c        | 1159 ++--
 605  drivers/net/ethernet/intel/i40e/i40e_nvm.c         |  430 +-
 606  drivers/net/ethernet/intel/i40e/i40e_prototype.h   |    9 +-
 607  drivers/net/ethernet/intel/i40e/i40e_ptp.c         |    7 +-
 608  drivers/net/ethernet/intel/i40e/i40e_txrx.c        |  426 +-
 609  drivers/net/ethernet/intel/i40e/i40e_txrx.h        |   57 +-
 610  drivers/net/ethernet/intel/i40e/i40e_type.h        |  124 +-
 611  drivers/net/ethernet/intel/i40e/i40e_virtchnl.h    |    2 +-
 612  drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |   91 +-
 613  drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h |    5 +-
 614  drivers/net/ethernet/intel/i40evf/i40e_adminq.c    |   57 +-
 615  drivers/net/ethernet/intel/i40evf/i40e_adminq.h    |    9 +-
 616  .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h    |    4 +-
 617  drivers/net/ethernet/intel/i40evf/i40e_common.c    |   41 +-
 618  drivers/net/ethernet/intel/i40evf/i40e_devids.h    |   55 +
 619  drivers/net/ethernet/intel/i40evf/i40e_prototype.h |    6 +-
 620  drivers/net/ethernet/intel/i40evf/i40e_txrx.c      |  293 +-
 621  drivers/net/ethernet/intel/i40evf/i40e_txrx.h      |   41 +-
 622  drivers/net/ethernet/intel/i40evf/i40e_type.h      |  116 +-
 623  drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h  |    2 +-
 624  drivers/net/ethernet/intel/i40evf/i40evf.h         |   12 +-
 625  drivers/net/ethernet/intel/i40evf/i40evf_main.c    |  195 +-
 626  .../net/ethernet/intel/i40evf/i40evf_virtchnl.c    |   64 +-
 627  drivers/net/ethernet/intel/igb/igb.h               |    4 +-
 628  drivers/net/ethernet/intel/igb/igb_ethtool.c       |    4 -
 629  drivers/net/ethernet/intel/igb/igb_main.c          |   35 +-
 630  drivers/net/ethernet/intel/igb/igb_ptp.c           |    8 +-
 631  drivers/net/ethernet/intel/igbvf/ethtool.c         |    2 -
 632  drivers/net/ethernet/intel/igbvf/netdev.c          |    3 +-
 633  drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c     |    3 -
 634  drivers/net/ethernet/intel/ixgbe/ixgbe.h           |   13 +-
 635  drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c     |  202 +-
 636  drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |  226 +-
 637  drivers/net/ethernet/intel/ixgbe/ixgbe_common.h    |    5 +
 638  drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c |    8 +-
 639  drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |    5 +-
 640  drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |    2 +-
 641  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  136 +-
 642  drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h       |    2 +
 643  drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c       |  291 +-
 644  drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h       |   35 +-
 645  drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |   96 +
 646  drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h     |    1 +
 647  drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |   13 +
 648  drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c      |  102 +-
 649  drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c      |  503 +-
 650  drivers/net/ethernet/intel/ixgbevf/ixgbevf.h       |    6 +
 651  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |   23 +-
 652  drivers/net/ethernet/intel/ixgbevf/mbx.h           |    2 +
 653  drivers/net/ethernet/intel/ixgbevf/vf.c            |   41 +
 654  drivers/net/ethernet/intel/ixgbevf/vf.h            |    1 +
 655  drivers/net/ethernet/marvell/mv643xx_eth.c         |   44 +-
 656  drivers/net/ethernet/marvell/mvneta.c              |  433 +-
 657  drivers/net/ethernet/marvell/sky2.c                |   12 +
 658  drivers/net/ethernet/mellanox/mlx4/en_ethtool.c    |    3 -
 659  drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |  167 +-
 660  drivers/net/ethernet/mellanox/mlx4/fw.c            |   16 +
 661  drivers/net/ethernet/mellanox/mlx4/main.c          |    2 +
 662  drivers/net/ethernet/mellanox/mlx4/mlx4.h          |    2 +
 663  drivers/net/ethernet/mellanox/mlx4/mr.c            |    2 +-
 664  drivers/net/ethernet/mellanox/mlx4/qp.c            |    6 +-
 665  .../net/ethernet/mellanox/mlx4/resource_tracker.c  |    4 +-
 666  drivers/net/ethernet/mellanox/mlx5/core/cmd.c      |  192 +-
 667  drivers/net/ethernet/mellanox/mlx5/core/cq.c       |    1 +
 668  drivers/net/ethernet/mellanox/mlx5/core/en.h       |    6 +
 669  .../net/ethernet/mellanox/mlx5/core/en_ethtool.c   |    5 +-
 670  drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |   24 +-
 671  drivers/net/ethernet/mellanox/mlx5/core/en_tx.c    |   26 +-
 672  drivers/net/ethernet/mellanox/mlx5/core/eq.c       |    9 +-
 673  drivers/net/ethernet/mellanox/mlx5/core/health.c   |  224 +-
 674  drivers/net/ethernet/mellanox/mlx5/core/main.c     |  571 +-
 675  .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    |   26 +-
 676  drivers/net/ethernet/mellanox/mlx5/core/mr.c       |    1 +
 677  .../net/ethernet/mellanox/mlx5/core/pagealloc.c    |   76 +-
 678  drivers/net/ethernet/mellanox/mlx5/core/port.c     |   35 +-
 679  drivers/net/ethernet/mellanox/mlx5/core/qp.c       |    1 +
 680  drivers/net/ethernet/mellanox/mlx5/core/srq.c      |    1 +
 681  drivers/net/ethernet/mellanox/mlx5/core/transobj.c |    4 +-
 682  drivers/net/ethernet/mellanox/mlxsw/Kconfig        |   11 +
 683  drivers/net/ethernet/mellanox/mlxsw/Makefile       |    3 +
 684  drivers/net/ethernet/mellanox/mlxsw/cmd.h          |   51 +-
 685  drivers/net/ethernet/mellanox/mlxsw/core.c         |    7 +-
 686  drivers/net/ethernet/mellanox/mlxsw/core.h         |    5 +
 687  drivers/net/ethernet/mellanox/mlxsw/item.h         |   50 +-
 688  drivers/net/ethernet/mellanox/mlxsw/pci.c          |   63 +-
 689  drivers/net/ethernet/mellanox/mlxsw/pci.h          |    5 +-
 690  drivers/net/ethernet/mellanox/mlxsw/reg.h          | 1263 ++++-
 691  drivers/net/ethernet/mellanox/mlxsw/spectrum.c     | 1949 +++++++
 692  drivers/net/ethernet/mellanox/mlxsw/spectrum.h     |  122 +
 693  .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c |  422 ++
 694  .../ethernet/mellanox/mlxsw/spectrum_switchdev.c   |  903 +++
 695  drivers/net/ethernet/mellanox/mlxsw/switchx2.c     |   41 +-
 696  drivers/net/ethernet/mellanox/mlxsw/txheader.h     |    1 +
 697  drivers/net/ethernet/microchip/Kconfig             |    9 +
 698  drivers/net/ethernet/microchip/Makefile            |    1 +
 699  drivers/net/ethernet/microchip/encx24j600-regmap.c |  513 ++
 700  drivers/net/ethernet/microchip/encx24j600.c        | 1129 ++++
 701  drivers/net/ethernet/microchip/encx24j600_hw.h     |  437 ++
 702  drivers/net/ethernet/neterion/s2io.c               |    2 -
 703  drivers/net/ethernet/neterion/vxge/vxge-ethtool.c  |    4 -
 704  drivers/net/ethernet/octeon/octeon_mgmt.c          |    4 -
 705  .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c    |    1 -
 706  drivers/net/ethernet/qlogic/Kconfig                |   11 +
 707  drivers/net/ethernet/qlogic/Makefile               |    2 +
 708  .../ethernet/qlogic/netxen/netxen_nic_ethtool.c    |    2 -
 709  drivers/net/ethernet/qlogic/qed/Makefile           |    4 +
 710  drivers/net/ethernet/qlogic/qed/qed.h              |  496 ++
 711  drivers/net/ethernet/qlogic/qed/qed_cxt.c          |  847 +++
 712  drivers/net/ethernet/qlogic/qed/qed_cxt.h          |  139 +
 713  drivers/net/ethernet/qlogic/qed/qed_dev.c          | 1797 ++++++
 714  drivers/net/ethernet/qlogic/qed/qed_dev_api.h      |  283 +
 715  drivers/net/ethernet/qlogic/qed/qed_hsi.h          | 5291 +++++++++++++++++
 716  drivers/net/ethernet/qlogic/qed/qed_hw.c           |  776 +++
 717  drivers/net/ethernet/qlogic/qed/qed_hw.h           |  263 +
 718  .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c    |  798 +++
 719  drivers/net/ethernet/qlogic/qed/qed_init_ops.c     |  531 ++
 720  drivers/net/ethernet/qlogic/qed/qed_init_ops.h     |  110 +
 721  drivers/net/ethernet/qlogic/qed/qed_int.c          | 1134 ++++
 722  drivers/net/ethernet/qlogic/qed/qed_int.h          |  391 ++
 723  drivers/net/ethernet/qlogic/qed/qed_l2.c           | 1704 ++++++
 724  drivers/net/ethernet/qlogic/qed/qed_main.c         | 1169 ++++
 725  drivers/net/ethernet/qlogic/qed/qed_mcp.c          |  860 +++
 726  drivers/net/ethernet/qlogic/qed/qed_mcp.h          |  369 ++
 727  drivers/net/ethernet/qlogic/qed/qed_reg_addr.h     |  366 ++
 728  drivers/net/ethernet/qlogic/qed/qed_sp.h           |  360 ++
 729  drivers/net/ethernet/qlogic/qed/qed_sp_commands.c  |  170 +
 730  drivers/net/ethernet/qlogic/qed/qed_spq.c          |  860 +++
 731  drivers/net/ethernet/qlogic/qede/Makefile          |    3 +
 732  drivers/net/ethernet/qlogic/qede/qede.h            |  285 +
 733  drivers/net/ethernet/qlogic/qede/qede_ethtool.c    |  385 ++
 734  drivers/net/ethernet/qlogic/qede/qede_main.c       | 2584 +++++++++
 735  drivers/net/ethernet/qlogic/qla3xxx.c              |    2 -
 736  drivers/net/ethernet/qlogic/qlcnic/qlcnic.h        |    2 +-
 737  .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c    |    4 +-
 738  drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c    |    7 -
 739  drivers/net/ethernet/realtek/8139cp.c              |   24 +-
 740  drivers/net/ethernet/realtek/8139too.c             |    1 -
 741  drivers/net/ethernet/renesas/ravb.h                |    7 +
 742  drivers/net/ethernet/renesas/ravb_main.c           |  105 +-
 743  drivers/net/ethernet/renesas/sh_eth.c              |   22 +-
 744  drivers/net/ethernet/renesas/sh_eth.h              |    2 +-
 745  drivers/net/ethernet/rocker/rocker.c               |  467 +-
 746  drivers/net/ethernet/sfc/ef10.c                    |   34 +-
 747  drivers/net/ethernet/sfc/efx.c                     |    4 +-
 748  drivers/net/ethernet/sfc/farch.c                   |    4 +-
 749  drivers/net/ethernet/sfc/mcdi.c                    |   15 +-
 750  drivers/net/ethernet/sfc/net_driver.h              |  132 +-
 751  drivers/net/ethernet/sfc/ptp.c                     |   30 +-
 752  drivers/net/ethernet/sfc/tx.c                      |   30 +-
 753  drivers/net/ethernet/smsc/smc91x.c                 |   29 +-
 754  drivers/net/ethernet/smsc/smc91x.h                 |   99 +-
 755  drivers/net/ethernet/smsc/smsc911x.c               |    1 +
 756  .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c   |    7 +-
 757  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |   10 +-
 758  drivers/net/ethernet/sun/cassini.c                 |    3 -
 759  drivers/net/ethernet/tehuti/tehuti.c               |    5 -
 760  drivers/net/ethernet/ti/cpmac.c                    |    1 -
 761  drivers/net/ethernet/ti/cpsw-common.c              |   64 +-
 762  drivers/net/ethernet/ti/cpsw-phy-sel.c             |   10 +-
 763  drivers/net/ethernet/ti/cpsw.c                     |   33 +-
 764  drivers/net/ethernet/ti/cpsw.h                     |    3 +-
 765  drivers/net/ethernet/ti/davinci_emac.c             |   52 +-
 766  drivers/net/ethernet/ti/tlan.c                     |    1 -
 767  drivers/net/ethernet/xilinx/ll_temac_mdio.c        |    9 +-
 768  drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |    1 -
 769  drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c  |    5 +-
 770  drivers/net/fjes/fjes_ethtool.c                    |    2 -
 771  drivers/net/geneve.c                               |  515 +-
 772  drivers/net/ieee802154/Kconfig                     |    8 +
 773  drivers/net/ieee802154/at86rf230.c                 |  369 +-
 774  drivers/net/ieee802154/at86rf230.h                 |    8 +
 775  drivers/net/ieee802154/atusb.c                     |   13 +-
 776  drivers/net/ieee802154/mrf24j40.c                  | 1424 +++--
 777  drivers/net/ipvlan/ipvlan_core.c                   |   14 +-
 778  drivers/net/irda/pxaficp_ir.c                      |  370 +-
 779  drivers/net/macvlan.c                              |    2 +-
 780  drivers/net/phy/Kconfig                            |   28 +
 781  drivers/net/phy/Makefile                           |    3 +
 782  drivers/net/phy/aquantia.c                         |   15 +-
 783  drivers/net/phy/bcm-cygnus.c                       |  158 +
 784  drivers/net/phy/bcm-phy-lib.c                      |  213 +
 785  drivers/net/phy/bcm-phy-lib.h                      |   37 +
 786  drivers/net/phy/bcm63xx.c                          |   38 +-
 787  drivers/net/phy/bcm7xxx.c                          |  136 +-
 788  drivers/net/phy/broadcom.c                         |  149 +-
 789  drivers/net/phy/dp83640.c                          |   64 +-
 790  drivers/net/phy/mdio-bcm-iproc.c                   |  213 +
 791  drivers/net/phy/mdio-gpio.c                        |    2 +-
 792  drivers/net/phy/mdio_bus.c                         |   55 +
 793  drivers/net/phy/phy_device.c                       |  133 +-
 794  drivers/net/phy/teranetics.c                       |   15 +-
 795  drivers/net/ppp/ppp_generic.c                      |    6 +-
 796  drivers/net/ppp/pptp.c                             |    7 +-
 797  drivers/net/slip/slhc.c                            |   12 +-
 798  drivers/net/slip/slip.c                            |    2 +-
 799  drivers/net/tun.c                                  |    2 +-
 800  drivers/net/usb/Kconfig                            |    4 +-
 801  drivers/net/usb/asix.h                             |    2 +-
 802  drivers/net/usb/asix_common.c                      |  115 +-
 803  drivers/net/usb/cdc-phonet.c                       |   27 +-
 804  drivers/net/usb/cdc_ether.c                        |  230 +-
 805  drivers/net/usb/cdc_mbim.c                         |    2 +-
 806  drivers/net/usb/cdc_ncm.c                          |   69 +-
 807  drivers/net/usb/dm9601.c                           |    1 -
 808  drivers/net/usb/lan78xx.c                          |  672 +--
 809  drivers/net/usb/lan78xx.h                          |  193 -
 810  drivers/net/usb/mcs7830.c                          |    1 -
 811  drivers/net/usb/qmi_wwan.c                         |   71 +-
 812  drivers/net/usb/smsc75xx.c                         |    5 -
 813  drivers/net/usb/smsc95xx.c                         |    5 -
 814  drivers/net/usb/sr9800.c                           |    4 -
 815  drivers/net/usb/usbnet.c                           |  138 +
 816  drivers/net/vmxnet3/vmxnet3_ethtool.c              |  122 +-
 817  drivers/net/vmxnet3/vmxnet3_int.h                  |    4 +-
 818  drivers/net/vrf.c                                  |  415 +-
 819  drivers/net/vxlan.c                                |  167 +-
 820  drivers/net/wireless/Kconfig                       |    7 +-
 821  drivers/net/wireless/Makefile                      |    4 +-
 822  drivers/net/wireless/airo.c                        |  139 +-
 823  drivers/net/wireless/ath/ath10k/bmi.h              |   10 +
 824  drivers/net/wireless/ath/ath10k/ce.c               |   67 +-
 825  drivers/net/wireless/ath/ath10k/ce.h               |   23 +-
 826  drivers/net/wireless/ath/ath10k/core.c             |  387 +-
 827  drivers/net/wireless/ath/ath10k/core.h             |   69 +-
 828  drivers/net/wireless/ath/ath10k/debug.c            |  516 +-
 829  drivers/net/wireless/ath/ath10k/debug.h            |   11 +
 830  drivers/net/wireless/ath/ath10k/hif.h              |   26 +-
 831  drivers/net/wireless/ath/ath10k/htc.c              |   51 +-
 832  drivers/net/wireless/ath/ath10k/htc.h              |    4 +-
 833  drivers/net/wireless/ath/ath10k/htt.h              |   10 +-
 834  drivers/net/wireless/ath/ath10k/htt_rx.c           |   48 +-
 835  drivers/net/wireless/ath/ath10k/htt_tx.c           |  112 +-
 836  drivers/net/wireless/ath/ath10k/hw.h               |   35 +-
 837  drivers/net/wireless/ath/ath10k/mac.c              |  640 ++-
 838  drivers/net/wireless/ath/ath10k/pci.c              |  333 +-
 839  drivers/net/wireless/ath/ath10k/pci.h              |   11 +-
 840  drivers/net/wireless/ath/ath10k/targaddrs.h        |    3 +
 841  drivers/net/wireless/ath/ath10k/testmode.c         |  202 +-
 842  drivers/net/wireless/ath/ath10k/thermal.c          |    2 +-
 843  drivers/net/wireless/ath/ath10k/txrx.c             |   19 +-
 844  drivers/net/wireless/ath/ath10k/wmi-ops.h          |   57 +
 845  drivers/net/wireless/ath/ath10k/wmi-tlv.c          |   15 +
 846  drivers/net/wireless/ath/ath10k/wmi.c              |  979 +++-
 847  drivers/net/wireless/ath/ath10k/wmi.h              |  195 +-
 848  drivers/net/wireless/ath/ath6kl/cfg80211.c         |  149 +-
 849  drivers/net/wireless/ath/ath6kl/core.h             |    2 +
 850  drivers/net/wireless/ath/ath6kl/debug.c            |   55 +-
 851  drivers/net/wireless/ath/ath6kl/debug.h            |    2 +
 852  drivers/net/wireless/ath/ath6kl/htc_mbox.c         |    4 +-
 853  drivers/net/wireless/ath/ath6kl/init.c             |    2 +-
 854  drivers/net/wireless/ath/ath9k/ar9002_phy.h        |    4 +-
 855  drivers/net/wireless/ath/ath9k/ar9003_calib.c      |    6 +-
 856  drivers/net/wireless/ath/ath9k/ar9003_hw.c         |   10 +-
 857  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    9 +-
 858  drivers/net/wireless/ath/ath9k/ath9k.h             |    1 +
 859  drivers/net/wireless/ath/ath9k/common-debug.c      |   14 +-
 860  drivers/net/wireless/ath/ath9k/debug.c             |    4 +-
 861  drivers/net/wireless/ath/ath9k/hif_usb.c           |  106 +-
 862  drivers/net/wireless/ath/ath9k/hif_usb.h           |   21 +-
 863  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    7 +-
 864  drivers/net/wireless/ath/ath9k/htc_drv_main.c      |    2 +-
 865  drivers/net/wireless/ath/ath9k/hw.c                |    1 +
 866  drivers/net/wireless/ath/ath9k/hw.h                |    2 +-
 867  drivers/net/wireless/ath/ath9k/init.c              |    3 +-
 868  drivers/net/wireless/ath/ath9k/mac.h               |   18 +-
 869  drivers/net/wireless/ath/ath9k/main.c              |   10 +-
 870  drivers/net/wireless/ath/ath9k/recv.c              |    2 +-
 871  drivers/net/wireless/ath/carl9170/main.c           |    2 +-
 872  drivers/net/wireless/ath/carl9170/rx.c             |    2 +-
 873  drivers/net/wireless/ath/dfs_pattern_detector.c    |   10 +-
 874  drivers/net/wireless/ath/dfs_pattern_detector.h    |    5 +
 875  drivers/net/wireless/ath/dfs_pri_detector.c        |    6 +-
 876  drivers/net/wireless/ath/wcn36xx/dxe.c             |   61 +-
 877  drivers/net/wireless/ath/wcn36xx/dxe.h             |    1 +
 878  drivers/net/wireless/ath/wcn36xx/main.c            |    2 +-
 879  drivers/net/wireless/ath/wil6210/Kconfig           |    1 +
 880  drivers/net/wireless/ath/wil6210/Makefile          |    1 +
 881  drivers/net/wireless/ath/wil6210/debugfs.c         |    6 +
 882  drivers/net/wireless/ath/wil6210/interrupt.c       |   16 +-
 883  drivers/net/wireless/ath/wil6210/main.c            |   16 +-
 884  drivers/net/wireless/ath/wil6210/pcie_bus.c        |    2 +-
 885  drivers/net/wireless/ath/wil6210/pmc.c             |    2 +-
 886  drivers/net/wireless/ath/wil6210/rx_reorder.c      |   26 +
 887  drivers/net/wireless/ath/wil6210/txrx.c            |   92 +-
 888  drivers/net/wireless/ath/wil6210/txrx.h            |    7 +
 889  drivers/net/wireless/ath/wil6210/wil6210.h         |   14 +-
 890  drivers/net/wireless/ath/wil6210/wil_crash_dump.c  |  115 +
 891  drivers/net/wireless/ath/wil6210/wmi.c             |   22 +-
 892  drivers/net/wireless/b43/Kconfig                   |   20 -
 893  drivers/net/wireless/b43/Makefile                  |    1 -
 894  drivers/net/wireless/b43/main.c                    |    9 +-
 895  drivers/net/wireless/b43/pcmcia.c                  |  145 -
 896  drivers/net/wireless/b43/pcmcia.h                  |   20 -
 897  drivers/net/wireless/brcm80211/Kconfig             |    1 +
 898  drivers/net/wireless/brcm80211/brcmfmac/bcdc.c     |   28 +-
 899  drivers/net/wireless/brcm80211/brcmfmac/btcoex.c   |    4 +-
 900  drivers/net/wireless/brcm80211/brcmfmac/bus.h      |   21 +
 901  drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c |  279 +-
 902  drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h |    6 +-
 903  drivers/net/wireless/brcm80211/brcmfmac/chip.c     |  130 +-
 904  drivers/net/wireless/brcm80211/brcmfmac/chip.h     |    1 +
 905  drivers/net/wireless/brcm80211/brcmfmac/common.h   |    3 +
 906  drivers/net/wireless/brcm80211/brcmfmac/core.c     |  179 +-
 907  drivers/net/wireless/brcm80211/brcmfmac/core.h     |   21 +-
 908  drivers/net/wireless/brcm80211/brcmfmac/debug.c    |   42 +-
 909  drivers/net/wireless/brcm80211/brcmfmac/debug.h    |   11 +-
 910  drivers/net/wireless/brcm80211/brcmfmac/feature.c  |   15 +-
 911  drivers/net/wireless/brcm80211/brcmfmac/firmware.c |    2 +-
 912  drivers/net/wireless/brcm80211/brcmfmac/flowring.c |    2 +-
 913  drivers/net/wireless/brcm80211/brcmfmac/flowring.h |    2 +-
 914  drivers/net/wireless/brcm80211/brcmfmac/fweh.c     |   42 +-
 915  drivers/net/wireless/brcm80211/brcmfmac/fweh.h     |    3 +
 916  drivers/net/wireless/brcm80211/brcmfmac/fwil.h     |    1 +
 917  .../net/wireless/brcm80211/brcmfmac/fwil_types.h   |   13 +
 918  drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c |   57 +-
 919  drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h |    3 +-
 920  drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c   |   15 +-
 921  drivers/net/wireless/brcm80211/brcmfmac/p2p.c      |  145 +-
 922  drivers/net/wireless/brcm80211/brcmfmac/p2p.h      |    5 +-
 923  drivers/net/wireless/brcm80211/brcmfmac/pcie.c     |  178 +-
 924  drivers/net/wireless/brcm80211/brcmfmac/proto.h    |   18 +-
 925  drivers/net/wireless/brcm80211/brcmfmac/sdio.c     |   55 +-
 926  drivers/net/wireless/brcm80211/brcmfmac/usb.c      |   29 +-
 927  .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |    2 +-
 928  drivers/net/wireless/brcm80211/brcmsmac/main.c     |    2 +-
 929  .../net/wireless/brcm80211/include/brcm_hw_ids.h   |   13 +
 930  drivers/net/wireless/cw1200/sta.c                  |    2 +-
 931  drivers/net/wireless/cw1200/sta.h                  |    2 +-
 932  drivers/net/wireless/ipw2x00/ipw2200.c             |    1 -
 933  drivers/net/wireless/ipw2x00/libipw_rx.c           |    2 -
 934  drivers/net/wireless/iwlegacy/4965-mac.c           |    2 +-
 935  drivers/net/wireless/iwlegacy/4965.h               |    2 +-
 936  drivers/net/wireless/iwlwifi/Kconfig               |    1 +
 937  drivers/net/wireless/iwlwifi/dvm/mac80211.c        |    2 +-
 938  drivers/net/wireless/iwlwifi/iwl-7000.c            |   13 +-
 939  drivers/net/wireless/iwlwifi/iwl-8000.c            |    6 +-
 940  drivers/net/wireless/iwlwifi/iwl-config.h          |   12 +-
 941  drivers/net/wireless/iwlwifi/iwl-drv.c             |    4 +-
 942  drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h   |   16 +
 943  drivers/net/wireless/iwlwifi/iwl-fw-file.h         |   36 +-
 944  drivers/net/wireless/iwlwifi/iwl-fw.h              |    4 +-
 945  drivers/net/wireless/iwlwifi/iwl-io.c              |   23 +
 946  drivers/net/wireless/iwlwifi/iwl-io.h              |   21 +-
 947  drivers/net/wireless/iwlwifi/iwl-nvm-parse.c       |   15 +-
 948  drivers/net/wireless/iwlwifi/iwl-nvm-parse.h       |    2 +-
 949  drivers/net/wireless/iwlwifi/iwl-op-mode.h         |   19 +-
 950  drivers/net/wireless/iwlwifi/iwl-trans.c           |    1 +
 951  drivers/net/wireless/iwlwifi/iwl-trans.h           |    7 +
 952  drivers/net/wireless/iwlwifi/mvm/constants.h       |    5 +-
 953  drivers/net/wireless/iwlwifi/mvm/d3.c              |    3 +
 954  drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c     |  100 +-
 955  drivers/net/wireless/iwlwifi/mvm/debugfs.c         |  134 +-
 956  drivers/net/wireless/iwlwifi/mvm/fw-api-power.h    |    8 +-
 957  drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h       |  238 +
 958  drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h     |    5 +-
 959  drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h    |   41 +-
 960  drivers/net/wireless/iwlwifi/mvm/fw-api.h          |  259 +-
 961  drivers/net/wireless/iwlwifi/mvm/fw.c              |   24 +-
 962  drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c        |   39 +-
 963  drivers/net/wireless/iwlwifi/mvm/mac80211.c        |   95 +-
 964  drivers/net/wireless/iwlwifi/mvm/mvm.h             |   70 +-
 965  drivers/net/wireless/iwlwifi/mvm/nvm.c             |    8 +-
 966  drivers/net/wireless/iwlwifi/mvm/ops.c             |  179 +-
 967  drivers/net/wireless/iwlwifi/mvm/power.c           |  109 +-
 968  drivers/net/wireless/iwlwifi/mvm/rs.c              |  122 +-
 969  drivers/net/wireless/iwlwifi/mvm/rx.c              |   67 +-
 970  drivers/net/wireless/iwlwifi/mvm/scan.c            |  122 +-
 971  drivers/net/wireless/iwlwifi/mvm/sta.c             |   88 +-
 972  drivers/net/wireless/iwlwifi/mvm/time-event.c      |    2 +-
 973  drivers/net/wireless/iwlwifi/mvm/tof.c             |    4 +-
 974  drivers/net/wireless/iwlwifi/mvm/tof.h             |    2 +-
 975  drivers/net/wireless/iwlwifi/mvm/tt.c              |   23 +-
 976  drivers/net/wireless/iwlwifi/mvm/tx.c              |   15 +-
 977  drivers/net/wireless/iwlwifi/mvm/utils.c           |  141 +-
 978  drivers/net/wireless/iwlwifi/pcie/trans.c          |   10 +-
 979  drivers/net/wireless/mac80211_hwsim.c              |    7 +-
 980  drivers/net/wireless/mediatek/mt7601u/main.c       |    3 +-
 981  drivers/net/wireless/mwifiex/11n_aggr.c            |   12 +-
 982  drivers/net/wireless/mwifiex/11n_rxreorder.c       |    4 +-
 983  drivers/net/wireless/mwifiex/Kconfig               |    4 +-
 984  drivers/net/wireless/mwifiex/cfg80211.c            |   22 +-
 985  drivers/net/wireless/mwifiex/debugfs.c             |   66 +-
 986  drivers/net/wireless/mwifiex/fw.h                  |   34 +
 987  drivers/net/wireless/mwifiex/init.c                |    1 +
 988  drivers/net/wireless/mwifiex/main.c                |   81 +-
 989  drivers/net/wireless/mwifiex/main.h                |   25 +-
 990  drivers/net/wireless/mwifiex/pcie.c                |    1 -
 991  drivers/net/wireless/mwifiex/scan.c                |   22 +-
 992  drivers/net/wireless/mwifiex/sdio.c                |   29 +-
 993  drivers/net/wireless/mwifiex/sta_cmd.c             |   34 +-
 994  drivers/net/wireless/mwifiex/sta_cmdresp.c         |   36 +
 995  drivers/net/wireless/mwifiex/sta_event.c           |   78 +-
 996  drivers/net/wireless/mwifiex/sta_tx.c              |    7 +-
 997  drivers/net/wireless/mwifiex/tdls.c                |   12 +
 998  drivers/net/wireless/mwifiex/txrx.c                |   19 +-
 999  drivers/net/wireless/mwifiex/uap_cmd.c             |   16 -
1000  drivers/net/wireless/mwifiex/uap_event.c           |   11 +-
1001  drivers/net/wireless/mwifiex/uap_txrx.c            |   10 +-
1002  drivers/net/wireless/mwifiex/usb.c                 |  238 +-
1003  drivers/net/wireless/mwifiex/usb.h                 |   20 +-
1004  drivers/net/wireless/mwifiex/wmm.c                 |   69 +-
1005  drivers/net/wireless/mwl8k.c                       |    2 +-
1006  drivers/net/wireless/orinoco/cfg.c                 |    6 +-
1007  drivers/net/wireless/orinoco/orinoco_usb.c         |    1 +
1008  drivers/net/wireless/realtek/Makefile              |    9 +
1009  drivers/net/wireless/{ => realtek}/rtl818x/Kconfig |    0
1010  .../net/wireless/{ => realtek}/rtl818x/Makefile    |    0
1011  .../{ => realtek}/rtl818x/rtl8180/Makefile         |    2 +-
1012  .../wireless/{ => realtek}/rtl818x/rtl8180/dev.c   |    0
1013  .../{ => realtek}/rtl818x/rtl8180/grf5101.c        |    0
1014  .../{ => realtek}/rtl818x/rtl8180/grf5101.h        |    0
1015  .../{ => realtek}/rtl818x/rtl8180/max2820.c        |    0
1016  .../{ => realtek}/rtl818x/rtl8180/max2820.h        |    0
1017  .../{ => realtek}/rtl818x/rtl8180/rtl8180.h        |    0
1018  .../{ => realtek}/rtl818x/rtl8180/rtl8225.c        |    0
1019  .../{ => realtek}/rtl818x/rtl8180/rtl8225.h        |    0
1020  .../{ => realtek}/rtl818x/rtl8180/rtl8225se.c      |    0
1021  .../{ => realtek}/rtl818x/rtl8180/rtl8225se.h      |    0
1022  .../{ => realtek}/rtl818x/rtl8180/sa2400.c         |    0
1023  .../{ => realtek}/rtl818x/rtl8180/sa2400.h         |    0
1024  .../{ => realtek}/rtl818x/rtl8187/Makefile         |    2 +-
1025  .../wireless/{ => realtek}/rtl818x/rtl8187/dev.c   |    0
1026  .../wireless/{ => realtek}/rtl818x/rtl8187/leds.c  |    0
1027  .../wireless/{ => realtek}/rtl818x/rtl8187/leds.h  |    0
1028  .../{ => realtek}/rtl818x/rtl8187/rfkill.c         |    0
1029  .../{ => realtek}/rtl818x/rtl8187/rfkill.h         |    0
1030  .../{ => realtek}/rtl818x/rtl8187/rtl8187.h        |    0
1031  .../{ => realtek}/rtl818x/rtl8187/rtl8225.c        |    0
1032  .../{ => realtek}/rtl818x/rtl8187/rtl8225.h        |    0
1033  .../net/wireless/{ => realtek}/rtl818x/rtl818x.h   |    0
1034  drivers/net/wireless/realtek/rtl8xxxu/Kconfig      |   34 +
1035  drivers/net/wireless/realtek/rtl8xxxu/Makefile     |    1 +
1036  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c   | 5993 ++++++++++++++++++++
1037  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h   |  676 +++
1038  .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h  |  981 ++++
1039  drivers/net/wireless/{ => realtek}/rtlwifi/Kconfig |    0
1040  .../net/wireless/{ => realtek}/rtlwifi/Makefile    |    0
1041  drivers/net/wireless/{ => realtek}/rtlwifi/base.c  |    0
1042  drivers/net/wireless/{ => realtek}/rtlwifi/base.h  |    0
1043  .../{ => realtek}/rtlwifi/btcoexist/Makefile       |    0
1044  .../rtlwifi/btcoexist/halbt_precomp.h              |    0
1045  .../rtlwifi/btcoexist/halbtc8192e2ant.c            |    0
1046  .../rtlwifi/btcoexist/halbtc8192e2ant.h            |    0
1047  .../rtlwifi/btcoexist/halbtc8723b1ant.c            |    0
1048  .../rtlwifi/btcoexist/halbtc8723b1ant.h            |    0
1049  .../rtlwifi/btcoexist/halbtc8723b2ant.c            |    0
1050  .../rtlwifi/btcoexist/halbtc8723b2ant.h            |    0
1051  .../rtlwifi/btcoexist/halbtc8821a1ant.c            |    0
1052  .../rtlwifi/btcoexist/halbtc8821a1ant.h            |    0
1053  .../rtlwifi/btcoexist/halbtc8821a2ant.c            |    0
1054  .../rtlwifi/btcoexist/halbtc8821a2ant.h            |    0
1055  .../{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.c |    0
1056  .../{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.h |    0
1057  .../{ => realtek}/rtlwifi/btcoexist/rtl_btc.c      |    0
1058  .../{ => realtek}/rtlwifi/btcoexist/rtl_btc.h      |    0
1059  drivers/net/wireless/{ => realtek}/rtlwifi/cam.c   |    0
1060  drivers/net/wireless/{ => realtek}/rtlwifi/cam.h   |    0
1061  drivers/net/wireless/{ => realtek}/rtlwifi/core.c  |    2 +-
1062  drivers/net/wireless/{ => realtek}/rtlwifi/core.h  |    0
1063  drivers/net/wireless/{ => realtek}/rtlwifi/debug.c |    0
1064  drivers/net/wireless/{ => realtek}/rtlwifi/debug.h |    0
1065  drivers/net/wireless/{ => realtek}/rtlwifi/efuse.c |    0
1066  drivers/net/wireless/{ => realtek}/rtlwifi/efuse.h |    0
1067  drivers/net/wireless/{ => realtek}/rtlwifi/pci.c   |    0
1068  drivers/net/wireless/{ => realtek}/rtlwifi/pci.h   |    0
1069  drivers/net/wireless/{ => realtek}/rtlwifi/ps.c    |    0
1070  drivers/net/wireless/{ => realtek}/rtlwifi/ps.h    |    0
1071  .../net/wireless/{ => realtek}/rtlwifi/pwrseqcmd.h |    0
1072  drivers/net/wireless/{ => realtek}/rtlwifi/rc.c    |    0
1073  drivers/net/wireless/{ => realtek}/rtlwifi/rc.h    |    0
1074  drivers/net/wireless/{ => realtek}/rtlwifi/regd.c  |    0
1075  drivers/net/wireless/{ => realtek}/rtlwifi/regd.h  |    0
1076  .../{ => realtek}/rtlwifi/rtl8188ee/Makefile       |    0
1077  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/def.h |    0
1078  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.c  |    0
1079  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.h  |    0
1080  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.c  |    0
1081  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.h  |    0
1082  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.c  |    0
1083  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.h  |    0
1084  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/led.c |    0
1085  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/led.h |    0
1086  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.c |    0
1087  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.h |    0
1088  .../{ => realtek}/rtlwifi/rtl8188ee/pwrseq.c       |    0
1089  .../{ => realtek}/rtlwifi/rtl8188ee/pwrseq.h       |    0
1090  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/reg.h |    0
1091  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.c  |    0
1092  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.h  |    0
1093  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.c  |    0
1094  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.h  |    0
1095  .../{ => realtek}/rtlwifi/rtl8188ee/table.c        |    0
1096  .../{ => realtek}/rtlwifi/rtl8188ee/table.h        |    0
1097  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.c |    0
1098  .../wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.h |    0
1099  .../{ => realtek}/rtlwifi/rtl8192c/Makefile        |    0
1100  .../{ => realtek}/rtlwifi/rtl8192c/dm_common.c     |    0
1101  .../{ => realtek}/rtlwifi/rtl8192c/dm_common.h     |    0
1102  .../{ => realtek}/rtlwifi/rtl8192c/fw_common.c     |    0
1103  .../{ => realtek}/rtlwifi/rtl8192c/fw_common.h     |    0
1104  .../wireless/{ => realtek}/rtlwifi/rtl8192c/main.c |    0
1105  .../{ => realtek}/rtlwifi/rtl8192c/phy_common.c    |    0
1106  .../{ => realtek}/rtlwifi/rtl8192c/phy_common.h    |    0
1107  .../{ => realtek}/rtlwifi/rtl8192ce/Makefile       |    0
1108  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/def.h |    0
1109  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.c  |    0
1110  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.h  |    0
1111  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.c  |    0
1112  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.h  |    0
1113  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/led.c |    0
1114  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/led.h |    0
1115  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.c |    0
1116  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.h |    0
1117  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/reg.h |    0
1118  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.c  |    0
1119  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.h  |    0
1120  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.c  |    0
1121  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.h  |    0
1122  .../{ => realtek}/rtlwifi/rtl8192ce/table.c        |    0
1123  .../{ => realtek}/rtlwifi/rtl8192ce/table.h        |    0
1124  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.c |    0
1125  .../wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.h |    0
1126  .../{ => realtek}/rtlwifi/rtl8192cu/Makefile       |    0
1127  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/def.h |    0
1128  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.c  |    0
1129  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.h  |    0
1130  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.c  |    8 +
1131  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.h  |    0
1132  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/led.c |    0
1133  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/led.h |    0
1134  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.c |    0
1135  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.h |    0
1136  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.c |    0
1137  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.h |    0
1138  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/reg.h |    0
1139  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.c  |    0
1140  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.h  |    0
1141  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.c  |    0
1142  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.h  |    0
1143  .../{ => realtek}/rtlwifi/rtl8192cu/table.c        |    0
1144  .../{ => realtek}/rtlwifi/rtl8192cu/table.h        |    0
1145  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.c |    0
1146  .../wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.h |    0
1147  .../{ => realtek}/rtlwifi/rtl8192de/Makefile       |    0
1148  .../wireless/{ => realtek}/rtlwifi/rtl8192de/def.h |    0
1149  .../wireless/{ => realtek}/rtlwifi/rtl8192de/dm.c  |    0
1150  .../wireless/{ => realtek}/rtlwifi/rtl8192de/dm.h  |    0
1151  .../wireless/{ => realtek}/rtlwifi/rtl8192de/fw.c  |    0
1152  .../wireless/{ => realtek}/rtlwifi/rtl8192de/fw.h  |    0
1153  .../wireless/{ => realtek}/rtlwifi/rtl8192de/hw.c  |    0
1154  .../wireless/{ => realtek}/rtlwifi/rtl8192de/hw.h  |    0
1155  .../wireless/{ => realtek}/rtlwifi/rtl8192de/led.c |    0
1156  .../wireless/{ => realtek}/rtlwifi/rtl8192de/led.h |    0
1157  .../wireless/{ => realtek}/rtlwifi/rtl8192de/phy.c |    0
1158  .../wireless/{ => realtek}/rtlwifi/rtl8192de/phy.h |    0
1159  .../wireless/{ => realtek}/rtlwifi/rtl8192de/reg.h |    0
1160  .../wireless/{ => realtek}/rtlwifi/rtl8192de/rf.c  |    0
1161  .../wireless/{ => realtek}/rtlwifi/rtl8192de/rf.h  |    0
1162  .../wireless/{ => realtek}/rtlwifi/rtl8192de/sw.c  |    0
1163  .../wireless/{ => realtek}/rtlwifi/rtl8192de/sw.h  |    0
1164  .../{ => realtek}/rtlwifi/rtl8192de/table.c        |    0
1165  .../{ => realtek}/rtlwifi/rtl8192de/table.h        |    0
1166  .../wireless/{ => realtek}/rtlwifi/rtl8192de/trx.c |    0
1167  .../wireless/{ => realtek}/rtlwifi/rtl8192de/trx.h |    0
1168  .../{ => realtek}/rtlwifi/rtl8192ee/Makefile       |    0
1169  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/def.h |    0
1170  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.c  |    0
1171  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.h  |    0
1172  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.c  |    0
1173  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.h  |    0
1174  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.c  |    0
1175  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.h  |    0
1176  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/led.c |    0
1177  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/led.h |    0
1178  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.c |    0
1179  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.h |    0
1180  .../{ => realtek}/rtlwifi/rtl8192ee/pwrseq.c       |    0
1181  .../{ => realtek}/rtlwifi/rtl8192ee/pwrseq.h       |    0
1182  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/reg.h |    0
1183  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.c  |    0
1184  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.h  |    0
1185  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.c  |    0
1186  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.h  |    0
1187  .../{ => realtek}/rtlwifi/rtl8192ee/table.c        |    0
1188  .../{ => realtek}/rtlwifi/rtl8192ee/table.h        |    0
1189  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.c |    0
1190  .../wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.h |    0
1191  .../{ => realtek}/rtlwifi/rtl8192se/Makefile       |    0
1192  .../wireless/{ => realtek}/rtlwifi/rtl8192se/def.h |    0
1193  .../wireless/{ => realtek}/rtlwifi/rtl8192se/dm.c  |    0
1194  .../wireless/{ => realtek}/rtlwifi/rtl8192se/dm.h  |    0
1195  .../wireless/{ => realtek}/rtlwifi/rtl8192se/fw.c  |    0
1196  .../wireless/{ => realtek}/rtlwifi/rtl8192se/fw.h  |    0
1197  .../wireless/{ => realtek}/rtlwifi/rtl8192se/hw.c  |    0
1198  .../wireless/{ => realtek}/rtlwifi/rtl8192se/hw.h  |    0
1199  .../wireless/{ => realtek}/rtlwifi/rtl8192se/led.c |    0
1200  .../wireless/{ => realtek}/rtlwifi/rtl8192se/led.h |    0
1201  .../wireless/{ => realtek}/rtlwifi/rtl8192se/phy.c |    0
1202  .../wireless/{ => realtek}/rtlwifi/rtl8192se/phy.h |    0
1203  .../wireless/{ => realtek}/rtlwifi/rtl8192se/reg.h |    0
1204  .../wireless/{ => realtek}/rtlwifi/rtl8192se/rf.c  |    0
1205  .../wireless/{ => realtek}/rtlwifi/rtl8192se/rf.h  |    0
1206  .../wireless/{ => realtek}/rtlwifi/rtl8192se/sw.c  |    0
1207  .../wireless/{ => realtek}/rtlwifi/rtl8192se/sw.h  |    0
1208  .../{ => realtek}/rtlwifi/rtl8192se/table.c        |    0
1209  .../{ => realtek}/rtlwifi/rtl8192se/table.h        |    0
1210  .../wireless/{ => realtek}/rtlwifi/rtl8192se/trx.c |    0
1211  .../wireless/{ => realtek}/rtlwifi/rtl8192se/trx.h |    0
1212  .../{ => realtek}/rtlwifi/rtl8723ae/Makefile       |    0
1213  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/btc.h |    0
1214  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/def.h |    0
1215  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.c  |    0
1216  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.h  |    0
1217  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.c  |    0
1218  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.h  |    0
1219  .../rtlwifi/rtl8723ae/hal_bt_coexist.c             |    0
1220  .../rtlwifi/rtl8723ae/hal_bt_coexist.h             |    0
1221  .../{ => realtek}/rtlwifi/rtl8723ae/hal_btc.c      |    0
1222  .../{ => realtek}/rtlwifi/rtl8723ae/hal_btc.h      |    0
1223  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.c  |    0
1224  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.h  |    0
1225  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/led.c |    0
1226  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/led.h |    0
1227  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.c |    0
1228  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.h |    0
1229  .../{ => realtek}/rtlwifi/rtl8723ae/pwrseq.c       |    0
1230  .../{ => realtek}/rtlwifi/rtl8723ae/pwrseq.h       |    0
1231  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/reg.h |    0
1232  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.c  |    0
1233  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.h  |    0
1234  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.c  |    0
1235  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.h  |    0
1236  .../{ => realtek}/rtlwifi/rtl8723ae/table.c        |    0
1237  .../{ => realtek}/rtlwifi/rtl8723ae/table.h        |    0
1238  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.c |    0
1239  .../wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.h |    0
1240  .../{ => realtek}/rtlwifi/rtl8723be/Makefile       |    0
1241  .../wireless/{ => realtek}/rtlwifi/rtl8723be/def.h |    0
1242  .../wireless/{ => realtek}/rtlwifi/rtl8723be/dm.c  |    0
1243  .../wireless/{ => realtek}/rtlwifi/rtl8723be/dm.h  |    0
1244  .../wireless/{ => realtek}/rtlwifi/rtl8723be/fw.c  |    0
1245  .../wireless/{ => realtek}/rtlwifi/rtl8723be/fw.h  |    0
1246  .../wireless/{ => realtek}/rtlwifi/rtl8723be/hw.c  |    0
1247  .../wireless/{ => realtek}/rtlwifi/rtl8723be/hw.h  |    0
1248  .../wireless/{ => realtek}/rtlwifi/rtl8723be/led.c |    0
1249  .../wireless/{ => realtek}/rtlwifi/rtl8723be/led.h |    0
1250  .../wireless/{ => realtek}/rtlwifi/rtl8723be/phy.c |    0
1251  .../wireless/{ => realtek}/rtlwifi/rtl8723be/phy.h |    0
1252  .../{ => realtek}/rtlwifi/rtl8723be/pwrseq.c       |    0
1253  .../{ => realtek}/rtlwifi/rtl8723be/pwrseq.h       |    0
1254  .../wireless/{ => realtek}/rtlwifi/rtl8723be/reg.h |    0
1255  .../wireless/{ => realtek}/rtlwifi/rtl8723be/rf.c  |    0
1256  .../wireless/{ => realtek}/rtlwifi/rtl8723be/rf.h  |    0
1257  .../wireless/{ => realtek}/rtlwifi/rtl8723be/sw.c  |    0
1258  .../wireless/{ => realtek}/rtlwifi/rtl8723be/sw.h  |    0
1259  .../{ => realtek}/rtlwifi/rtl8723be/table.c        |    0
1260  .../{ => realtek}/rtlwifi/rtl8723be/table.h        |    0
1261  .../wireless/{ => realtek}/rtlwifi/rtl8723be/trx.c |    0
1262  .../wireless/{ => realtek}/rtlwifi/rtl8723be/trx.h |    0
1263  .../{ => realtek}/rtlwifi/rtl8723com/Makefile      |    0
1264  .../{ => realtek}/rtlwifi/rtl8723com/dm_common.c   |    0
1265  .../{ => realtek}/rtlwifi/rtl8723com/dm_common.h   |    0
1266  .../{ => realtek}/rtlwifi/rtl8723com/fw_common.c   |    0
1267  .../{ => realtek}/rtlwifi/rtl8723com/fw_common.h   |    0
1268  .../{ => realtek}/rtlwifi/rtl8723com/main.c        |    0
1269  .../{ => realtek}/rtlwifi/rtl8723com/phy_common.c  |    0
1270  .../{ => realtek}/rtlwifi/rtl8723com/phy_common.h  |    0
1271  .../{ => realtek}/rtlwifi/rtl8821ae/Makefile       |    0
1272  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/def.h |    0
1273  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.c  |    0
1274  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.h  |    0
1275  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.c  |    0
1276  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.h  |    0
1277  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.c  |    0
1278  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.h  |    0
1279  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/led.c |    0
1280  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/led.h |    0
1281  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.c |    0
1282  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.h |    0
1283  .../{ => realtek}/rtlwifi/rtl8821ae/pwrseq.c       |    0
1284  .../{ => realtek}/rtlwifi/rtl8821ae/pwrseq.h       |    0
1285  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/reg.h |    0
1286  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.c  |    0
1287  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.h  |    0
1288  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.c  |    0
1289  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.h  |    0
1290  .../{ => realtek}/rtlwifi/rtl8821ae/table.c        |    0
1291  .../{ => realtek}/rtlwifi/rtl8821ae/table.h        |    0
1292  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.c |    0
1293  .../wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.h |    0
1294  drivers/net/wireless/{ => realtek}/rtlwifi/stats.c |    0
1295  drivers/net/wireless/{ => realtek}/rtlwifi/stats.h |    0
1296  drivers/net/wireless/{ => realtek}/rtlwifi/usb.c   |    0
1297  drivers/net/wireless/{ => realtek}/rtlwifi/usb.h   |    0
1298  drivers/net/wireless/{ => realtek}/rtlwifi/wifi.h  |    0
1299  drivers/net/wireless/rndis_wlan.c                  |    2 +-
1300  drivers/net/wireless/rsi/rsi_91x_mac80211.c        |    4 +-
1301  drivers/net/wireless/rt2x00/rt2800lib.c            |    2 +-
1302  drivers/net/wireless/rt2x00/rt2800lib.h            |    2 +-
1303  drivers/net/wireless/rt2x00/rt2x00config.c         |    2 +-
1304  drivers/net/wireless/ti/wl12xx/scan.c              |    3 +-
1305  drivers/net/wireless/ti/wl18xx/main.c              |    1 +
1306  drivers/net/wireless/ti/wl18xx/scan.c              |    8 +-
1307  drivers/net/wireless/ti/wlcore/main.c              |    2 +-
1308  drivers/net/wireless/ti/wlcore/wlcore.h            |    2 +-
1309  drivers/net/xen-netfront.c                         |   17 +-
1310  drivers/nfc/Kconfig                                |    1 +
1311  drivers/nfc/Makefile                               |    1 +
1312  drivers/nfc/fdp/Kconfig                            |   23 +
1313  drivers/nfc/fdp/Makefile                           |    9 +
1314  drivers/nfc/fdp/fdp.c                              |  817 +++
1315  drivers/nfc/fdp/fdp.h                              |   38 +
1316  drivers/nfc/fdp/i2c.c                              |  388 ++
1317  drivers/nfc/microread/Kconfig                      |   18 +-
1318  drivers/nfc/nfcmrvl/Kconfig                        |   34 +-
1319  drivers/nfc/nfcmrvl/Makefile                       |    8 +-
1320  drivers/nfc/nfcmrvl/fw_dnld.c                      |  553 ++
1321  drivers/nfc/nfcmrvl/fw_dnld.h                      |   98 +
1322  drivers/nfc/nfcmrvl/i2c.c                          |  290 +
1323  drivers/nfc/nfcmrvl/main.c                         |   75 +-
1324  drivers/nfc/nfcmrvl/nfcmrvl.h                      |   23 +-
1325  drivers/nfc/nfcmrvl/spi.c                          |  228 +
1326  drivers/nfc/nfcmrvl/uart.c                         |   26 +-
1327  drivers/nfc/nfcmrvl/usb.c                          |   10 +-
1328  drivers/nfc/nfcsim.c                               |    2 +-
1329  drivers/nfc/nfcwilink.c                            |    2 +-
1330  drivers/nfc/nxp-nci/core.c                         |    3 +-
1331  drivers/nfc/nxp-nci/i2c.c                          |    2 +-
1332  drivers/nfc/nxp-nci/nxp-nci.h                      |    5 +-
1333  drivers/nfc/pn533.c                                |    2 +-
1334  drivers/nfc/pn544/Kconfig                          |   18 +-
1335  drivers/nfc/s3fwrn5/Kconfig                        |    1 +
1336  drivers/nfc/s3fwrn5/Makefile                       |    2 -
1337  drivers/nfc/s3fwrn5/i2c.c                          |    2 +-
1338  drivers/nfc/s3fwrn5/nci.c                          |    4 +-
1339  drivers/nfc/s3fwrn5/nci.h                          |    2 +-
1340  drivers/nfc/st-nci/Makefile                        |    4 +-
1341  drivers/nfc/st-nci/core.c                          |   20 +-
1342  drivers/nfc/st-nci/i2c.c                           |   35 +-
1343  drivers/nfc/st-nci/ndlc.c                          |    7 +-
1344  drivers/nfc/st-nci/ndlc.h                          |    5 +-
1345  drivers/nfc/st-nci/{st-nci_se.c => se.c}           |  166 +-
1346  drivers/nfc/st-nci/spi.c                           |   37 +-
1347  drivers/nfc/st-nci/st-nci.h                        |  117 +-
1348  drivers/nfc/st-nci/st-nci_se.h                     |   61 -
1349  drivers/nfc/st-nci/vendor_cmds.c                   |  516 ++
1350  drivers/nfc/st21nfca/Makefile                      |    2 +-
1351  drivers/nfc/st21nfca/{st21nfca.c => core.c}        |   48 +-
1352  drivers/nfc/st21nfca/{st21nfca_dep.c => dep.c}     |    2 +-
1353  drivers/nfc/st21nfca/i2c.c                         |    1 +
1354  drivers/nfc/st21nfca/{st21nfca_se.c => se.c}       |   18 +-
1355  drivers/nfc/st21nfca/st21nfca.h                    |  148 +-
1356  drivers/nfc/st21nfca/st21nfca_dep.h                |   43 -
1357  drivers/nfc/st21nfca/st21nfca_se.h                 |   63 -
1358  drivers/nfc/st21nfca/vendor_cmds.c                 |  375 ++
1359  drivers/nfc/trf7970a.c                             |    7 +
1360  drivers/of/irq.c                                   |  185 +-
1361  drivers/pci/host/pci-xgene-msi.c                   |    2 +-
1362  drivers/pci/msi.c                                  |   63 +-
1363  drivers/pci/of.c                                   |   13 +-
1364  drivers/pci/probe.c                                |   43 +-
1365  drivers/phy/phy-rcar-gen2.c                        |    3 +-
1366  drivers/pps/kapi.c                                 |    4 +-
1367  drivers/s390/char/monreader.c                      |    4 +-
1368  drivers/s390/char/vmlogrdr.c                       |    8 +-
1369  drivers/s390/cio/qdio_main.c                       |    4 +-
1370  drivers/s390/net/netiucv.c                         |   21 +-
1371  drivers/s390/net/qeth_core.h                       |   30 +-
1372  drivers/s390/net/qeth_core_main.c                  |  241 +-
1373  drivers/s390/net/qeth_core_sys.c                   |   43 +-
1374  drivers/s390/net/qeth_l2_main.c                    |  228 +-
1375  drivers/s390/net/qeth_l2_sys.c                     |    2 +-
1376  drivers/s390/net/qeth_l3_main.c                    |  158 +-
1377  drivers/s390/net/smsgiucv.c                        |    5 +-
1378  drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |    2 +-
1379  drivers/spmi/spmi-pmic-arb.c                       |    2 +-
1380  drivers/ssb/Kconfig                                |    9 +
1381  drivers/ssb/Makefile                               |    3 +-
1382  drivers/ssb/bridge_pcmcia_80211.c                  |  128 +
1383  drivers/ssb/host_soc.c                             |  173 +
1384  drivers/ssb/main.c                                 |  173 +-
1385  drivers/ssb/pcmcia.c                               |    3 +-
1386  drivers/ssb/sdio.c                                 |    2 +-
1387  drivers/ssb/ssb_private.h                          |   34 +-
1388  drivers/staging/speakup/selection.c                |    2 +-
1389  drivers/tty/hvc/hvc_iucv.c                         |   10 +-
1390  drivers/video/fbdev/efifb.c                        |   24 +-
1391  fs/fs-writeback.c                                  |    4 +-
1392  fs/proc/array.c                                    |   16 +-
1393  fs/proc/base.c                                     |    9 +-
1394  include/asm-generic/atomic-long.h                  |   55 +-
1395  include/asm-generic/atomic.h                       |    4 +-
1396  include/asm-generic/mutex-dec.h                    |    8 +-
1397  include/asm-generic/mutex-xchg.h                   |   10 +-
1398  include/asm-generic/preempt.h                      |    2 +-
1399  include/asm-generic/qrwlock_types.h                |    4 +-
1400  include/asm-generic/rwsem.h                        |   21 +-
1401  include/crypto/akcipher.h                          |   90 +-
1402  include/crypto/hash.h                              |   14 +
1403  include/crypto/internal/rsa.h                      |    7 +-
1404  include/kvm/arm_vgic.h                             |    4 +-
1405  include/linux/acpi.h                               |    3 +
1406  include/linux/atomic.h                             |  100 +-
1407  include/linux/bcma/bcma.h                          |    2 +
1408  include/linux/bpf.h                                |   26 +-
1409  include/linux/brcmphy.h                            |   29 +-
1410  include/linux/can/dev.h                            |    9 +-
1411  include/linux/can/led.h                            |    1 +
1412  include/linux/compiler.h                           |   16 -
1413  include/linux/cpu.h                                |    2 -
1414  include/linux/dccp.h                               |    6 +-
1415  include/linux/efi.h                                |   25 +-
1416  include/linux/filter.h                             |   48 +-
1417  include/linux/fwnode.h                             |    1 +
1418  include/linux/genetlink.h                          |    2 +-
1419  include/linux/ieee80211.h                          |   85 +-
1420  include/linux/ieee802154.h                         |   47 +-
1421  include/linux/if_bridge.h                          |    6 +
1422  include/linux/if_link.h                            |    1 +
1423  include/linux/igmp.h                               |    2 +-
1424  include/linux/inetdevice.h                         |   10 +-
1425  include/linux/init_task.h                          |    3 +-
1426  include/linux/interrupt.h                          |    2 +
1427  include/linux/ipv6.h                               |    4 +-
1428  include/linux/irq.h                                |   23 +-
1429  include/linux/irqchip/arm-gic-v3.h                 |  105 +-
1430  include/linux/irqchip/arm-gic.h                    |    9 +-
1431  include/linux/irqdomain.h                          |  106 +-
1432  include/linux/irqreturn.h                          |    2 +-
1433  include/linux/leds.h                               |    7 +
1434  include/linux/list.h                               |    5 +-
1435  include/linux/list_bl.h                            |    5 +-
1436  include/linux/list_nulls.h                         |    3 +-
1437  include/linux/mlx4/device.h                        |    1 +
1438  include/linux/mlx5/device.h                        |    5 +-
1439  include/linux/mlx5/driver.h                        |   41 +-
1440  include/linux/mpi.h                                |   10 +-
1441  include/linux/msi.h                                |   16 +-
1442  include/linux/net.h                                |   21 +-
1443  include/linux/netdev_features.h                    |    9 +
1444  include/linux/netdevice.h                          |   61 +-
1445  include/linux/netfilter.h                          |  100 +-
1446  include/linux/netfilter/nfnetlink.h                |    6 +-
1447  include/linux/netfilter/x_tables.h                 |    3 +-
1448  include/linux/netfilter_arp/arp_tables.h           |    1 -
1449  include/linux/netfilter_bridge.h                   |    2 +-
1450  include/linux/netfilter_bridge/ebtables.h          |    6 +-
1451  include/linux/netfilter_ingress.h                  |    2 +-
1452  include/linux/netfilter_ipv4.h                     |    2 +-
1453  include/linux/netfilter_ipv4/ip_tables.h           |    1 -
1454  include/linux/netfilter_ipv6.h                     |    6 +-
1455  include/linux/netfilter_ipv6/ip6_tables.h          |    1 -
1456  include/linux/of_irq.h                             |   23 +
1457  include/linux/once.h                               |   57 +
1458  include/linux/percpu-rwsem.h                       |    3 +-
1459  include/linux/perf_event.h                         |  120 +-
1460  include/linux/phy.h                                |    3 +
1461  include/linux/platform_data/atmel.h                |    5 -
1462  include/linux/{ => platform_data}/mdio-gpio.h      |    0
1463  include/linux/platform_data/nfcmrvl.h              |    8 +
1464  include/linux/platform_data/st-nci.h               |    2 +
1465  include/linux/pps_kernel.h                         |   16 +-
1466  include/linux/preempt.h                            |   20 +-
1467  include/linux/ptp_classify.h                       |    7 +-
1468  include/linux/qed/common_hsi.h                     |  607 ++
1469  include/linux/qed/eth_common.h                     |  279 +
1470  include/linux/qed/qed_chain.h                      |  539 ++
1471  include/linux/qed/qed_eth_if.h                     |  165 +
1472  include/linux/qed/qed_if.h                         |  498 ++
1473  include/linux/random.h                             |    6 +
1474  include/linux/rcu_sync.h                           |   86 +
1475  include/linux/rculist.h                            |    5 +-
1476  include/linux/rcupdate.h                           |   59 +-
1477  include/linux/rcutiny.h                            |    3 +-
1478  include/linux/rcutree.h                            |    2 +-
1479  include/linux/rtnetlink.h                          |    6 +-
1480  include/linux/sched.h                              |   57 +-
1481  include/linux/sched/deadline.h                     |    5 +
1482  include/linux/seccomp.h                            |   11 +
1483  include/linux/skbuff.h                             |    9 +
1484  include/linux/smpboot.h                            |    4 -
1485  include/linux/srcu.h                               |    5 +-
1486  include/linux/stop_machine.h                       |    2 +
1487  include/linux/tcp.h                                |   41 +-
1488  include/linux/timekeeping.h                        |    4 +-
1489  include/linux/timex.h                              |    2 +-
1490  include/linux/usb/cdc.h                            |   51 +
1491  include/net/6lowpan.h                              |  360 +-
1492  include/net/addrconf.h                             |    3 +-
1493  include/net/af_ieee802154.h                        |    2 +-
1494  include/net/af_vsock.h                             |    3 +
1495  include/net/bluetooth/bluetooth.h                  |   30 +-
1496  include/net/bluetooth/hci.h                        |   14 +
1497  include/net/bluetooth/hci_core.h                   |   37 +-
1498  include/net/bluetooth/hci_mon.h                    |   10 +
1499  include/net/bond_3ad.h                             |    3 +-
1500  include/net/cfg80211.h                             |  142 +-
1501  include/net/cfg802154.h                            |  164 +
1502  include/net/dn_neigh.h                             |    6 +-
1503  include/net/dsa.h                                  |   31 +-
1504  include/net/dst.h                                  |   23 +-
1505  include/net/dst_ops.h                              |    3 +-
1506  include/net/ethoc.h                                |    1 +
1507  include/net/flow.h                                 |    2 +-
1508  include/net/genetlink.h                            |    5 +-
1509  include/net/ieee802154_netdev.h                    |   86 +-
1510  include/net/inet6_connection_sock.h                |   13 +-
1511  include/net/inet_common.h                          |    3 +-
1512  include/net/inet_connection_sock.h                 |   35 +-
1513  include/net/inet_frag.h                            |   15 +-
1514  include/net/inet_hashtables.h                      |    5 +-
1515  include/net/inet_sock.h                            |    3 +-
1516  include/net/inet_timewait_sock.h                   |    2 +-
1517  include/net/ip.h                                   |   41 +-
1518  include/net/ip6_route.h                            |    4 +-
1519  include/net/ip6_tunnel.h                           |    2 +-
1520  include/net/ip_fib.h                               |   18 +-
1521  include/net/ip_vs.h                                |  299 +-
1522  include/net/ipv6.h                                 |   13 +-
1523  include/net/iucv/iucv.h                            |   20 +-
1524  include/net/l3mdev.h                               |  222 +
1525  include/net/lwtunnel.h                             |    8 +-
1526  include/net/mac80211.h                             |   49 +-
1527  include/net/mac802154.h                            |   33 +-
1528  include/net/mpls_iptunnel.h                        |    2 +-
1529  include/net/ndisc.h                                |    6 +-
1530  include/net/netfilter/br_netfilter.h               |    8 +-
1531  include/net/netfilter/ipv4/nf_dup_ipv4.h           |    2 +-
1532  include/net/netfilter/ipv4/nf_reject.h             |    2 +-
1533  include/net/netfilter/ipv6/nf_defrag_ipv6.h        |    2 +-
1534  include/net/netfilter/ipv6/nf_dup_ipv6.h           |    2 +-
1535  include/net/netfilter/nf_conntrack.h               |    7 +-
1536  include/net/netfilter/nf_conntrack_core.h          |    1 +
1537  include/net/netfilter/nf_conntrack_l4proto.h       |    2 +-
1538  include/net/netfilter/nf_conntrack_timeout.h       |   25 +-
1539  include/net/netfilter/nf_nat_core.h                |    2 +-
1540  include/net/netfilter/nf_nat_l3proto.h             |   32 +-
1541  include/net/netfilter/nf_queue.h                   |    2 +-
1542  include/net/netfilter/nf_tables.h                  |   14 +-
1543  include/net/netfilter/nf_tables_ipv4.h             |    3 +-
1544  include/net/netfilter/nf_tables_ipv6.h             |    3 +-
1545  include/net/netfilter/nfnetlink_queue.h            |   51 -
1546  include/net/netlink.h                              |   18 +
1547  include/net/nfc/nci.h                              |    8 +
1548  include/net/nfc/nci_core.h                         |   24 +-
1549  include/net/nfc/nfc.h                              |    2 +-
1550  include/net/nl802154.h                             |  191 +
1551  include/net/request_sock.h                         |  186 +-
1552  include/net/route.h                                |   23 +-
1553  include/net/rtnetlink.h                            |    6 +-
1554  include/net/sch_generic.h                          |    3 +-
1555  include/net/sock.h                                 |   87 +-
1556  include/net/switchdev.h                            |  161 +-
1557  include/net/tc_act/tc_connmark.h                   |    1 +
1558  include/net/tcp.h                                  |   94 +-
1559  include/net/tso.h                                  |    1 +
1560  include/net/vrf.h                                  |  178 -
1561  include/net/vxlan.h                                |   14 +-
1562  include/net/xfrm.h                                 |    8 +-
1563  include/trace/events/sched.h                       |   22 +-
1564  include/uapi/linux/Kbuild                          |    1 +
1565  include/uapi/linux/atm_zatm.h                      |    6 -
1566  include/uapi/linux/bpf.h                           |   72 +-
1567  include/uapi/linux/can/bcm.h                       |    7 +-
1568  include/uapi/linux/if_arcnet.h                     |   55 +-
1569  include/uapi/linux/if_bridge.h                     |    1 +
1570  include/uapi/linux/if_link.h                       |   56 +
1571  include/uapi/linux/magic.h                         |    1 +
1572  include/uapi/linux/netfilter/nfnetlink_log.h       |    3 +
1573  include/uapi/linux/netlink.h                       |    1 +
1574  include/uapi/linux/nfc.h                           |    2 +
1575  include/uapi/linux/nl80211.h                       |   57 +-
1576  include/uapi/linux/openvswitch.h                   |    2 +
1577  include/uapi/linux/perf_event.h                    |    7 +-
1578  include/uapi/linux/pkt_cls.h                       |    4 +
1579  include/uapi/linux/ptrace.h                        |    2 +
1580  include/uapi/linux/rtnetlink.h                     |    2 +
1581  include/uapi/linux/screen_info.h                   |    5 +-
1582  include/uapi/linux/usb/cdc.h                       |    6 +-
1583  kernel/bpf/Makefile                                |    4 +-
1584  kernel/bpf/arraymap.c                              |   26 +-
1585  kernel/bpf/core.c                                  |   33 +-
1586  kernel/bpf/hashtab.c                               |   18 +-
1587  kernel/bpf/helpers.c                               |    7 +-
1588  kernel/bpf/inode.c                                 |  387 ++
1589  kernel/bpf/syscall.c                               |  174 +-
1590  kernel/bpf/verifier.c                              |  116 +-
1591  kernel/cpu.c                                       |   23 +-
1592  kernel/events/core.c                               |  239 +-
1593  kernel/events/ring_buffer.c                        |    2 +-
1594  kernel/exit.c                                      |    6 +-
1595  kernel/fork.c                                      |    2 +-
1596  kernel/futex.c                                     |   13 +-
1597  kernel/irq/Kconfig                                 |    4 +
1598  kernel/irq/Makefile                                |    1 +
1599  kernel/irq/chip.c                                  |   28 +-
1600  kernel/irq/cpuhotplug.c                            |   82 +
1601  kernel/irq/handle.c                                |    7 +-
1602  kernel/irq/internals.h                             |    4 +-
1603  kernel/irq/irqdomain.c                             |  177 +-
1604  kernel/irq/manage.c                                |  230 +-
1605  kernel/irq/msi.c                                   |    8 +-
1606  kernel/irq/proc.c                                  |    2 +-
1607  kernel/irq/settings.h                              |   12 +
1608  kernel/kexec_core.c                                |    6 +-
1609  kernel/locking/locktorture.c                       |  164 +-
1610  kernel/locking/mcs_spinlock.h                      |    4 +-
1611  kernel/locking/mutex.c                             |    9 +-
1612  kernel/locking/osq_lock.c                          |   11 +-
1613  kernel/locking/percpu-rwsem.c                      |   90 +-
1614  kernel/locking/qrwlock.c                           |    8 +-
1615  kernel/locking/qspinlock_paravirt.h                |    6 +-
1616  kernel/locking/rtmutex.c                           |   33 +-
1617  kernel/locking/rwsem-xadd.c                        |    5 +-
1618  kernel/ptrace.c                                    |    5 +
1619  kernel/rcu/Makefile                                |    2 +-
1620  kernel/rcu/rcutorture.c                            |   16 +-
1621  kernel/rcu/srcu.c                                  |    4 +-
1622  kernel/rcu/sync.c                                  |  223 +
1623  kernel/rcu/tiny.c                                  |    8 +-
1624  kernel/rcu/tree.c                                  |  512 +-
1625  kernel/rcu/tree.h                                  |   69 +-
1626  kernel/rcu/tree_plugin.h                           |  437 +-
1627  kernel/rcu/tree_trace.c                            |   10 +-
1628  kernel/rcu/update.c                                |    2 +-
1629  kernel/sched/core.c                                |  204 +-
1630  kernel/sched/cpudeadline.c                         |    5 -
1631  kernel/sched/cpudeadline.h                         |    1 +
1632  kernel/sched/fair.c                                |  419 +-
1633  kernel/sched/features.h                            |   21 +-
1634  kernel/sched/rt.c                                  |   22 +-
1635  kernel/sched/sched.h                               |   55 +-
1636  kernel/seccomp.c                                   |   78 +-
1637  kernel/smpboot.c                                   |    5 +-
1638  kernel/stop_machine.c                              |   90 +-
1639  kernel/sysctl.c                                    |   13 +
1640  kernel/time/clocksource.c                          |    7 +-
1641  kernel/time/hrtimer.c                              |    2 +-
1642  kernel/time/ntp.c                                  |   16 +-
1643  kernel/time/ntp_internal.h                         |    2 +-
1644  kernel/time/posix-cpu-timers.c                     |   63 +-
1645  kernel/time/timeconst.bc                           |    2 +-
1646  kernel/time/timekeeping.c                          |   18 +-
1647  kernel/time/timer.c                                |   13 +-
1648  kernel/torture.c                                   |    1 +
1649  kernel/trace/bpf_trace.c                           |   55 +-
1650  kernel/trace/ftrace.c                              |    2 +-
1651  kernel/trace/trace_sched_switch.c                  |    3 +-
1652  kernel/trace/trace_sched_wakeup.c                  |    2 +-
1653  lib/842/842.h                                      |    2 +
1654  lib/842/842_compress.c                             |   13 +
1655  lib/842/842_decompress.c                           |   17 +
1656  lib/Makefile                                       |    3 +-
1657  lib/mpi/mpicoder.c                                 |  199 +
1658  lib/once.c                                         |   62 +
1659  lib/random32.c                                     |   37 +-
1660  net/6lowpan/core.c                                 |    5 +
1661  net/6lowpan/iphc.c                                 |  690 ++-
1662  net/6lowpan/nhc.c                                  |   16 +-
1663  net/6lowpan/nhc.h                                  |   14 +-
1664  net/6lowpan/nhc_udp.c                              |   35 +-
1665  net/8021q/vlan_core.c                              |   10 +-
1666  net/Kconfig                                        |    1 +
1667  net/Makefile                                       |    3 +
1668  net/bluetooth/6lowpan.c                            |  162 +-
1669  net/bluetooth/af_bluetooth.c                       |    4 +-
1670  net/bluetooth/hci_conn.c                           |  167 +-
1671  net/bluetooth/hci_core.c                           |  228 +-
1672  net/bluetooth/hci_event.c                          |   28 +-
1673  net/bluetooth/hci_request.c                        |  103 +-
1674  net/bluetooth/hci_request.h                        |    4 +
1675  net/bluetooth/hci_sock.c                           |  109 +-
1676  net/bluetooth/hidp/core.c                          |   14 +
1677  net/bluetooth/l2cap_sock.c                         |   71 +-
1678  net/bluetooth/lib.c                                |   32 +
1679  net/bluetooth/mgmt.c                               |  178 +-
1680  net/bluetooth/sco.c                                |   44 +-
1681  net/bluetooth/smp.c                                |   62 +-
1682  net/bluetooth/smp.h                                |    1 +
1683  net/bridge/br_device.c                             |    4 +-
1684  net/bridge/br_fdb.c                                |  216 +-
1685  net/bridge/br_forward.c                            |   33 +-
1686  net/bridge/br_if.c                                 |    3 +
1687  net/bridge/br_input.c                              |   35 +-
1688  net/bridge/br_ioctl.c                              |    3 +-
1689  net/bridge/br_mdb.c                                |   24 +-
1690  net/bridge/br_multicast.c                          |    4 +-
1691  net/bridge/br_netfilter_hooks.c                    |  107 +-
1692  net/bridge/br_netfilter_ipv6.c                     |   21 +-
1693  net/bridge/br_netlink.c                            |  522 +-
1694  net/bridge/br_private.h                            |  208 +-
1695  net/bridge/br_stp.c                                |   41 +-
1696  net/bridge/br_stp_bpdu.c                           |   12 +-
1697  net/bridge/br_stp_if.c                             |   12 +
1698  net/bridge/br_sysfs_br.c                           |   11 +-
1699  net/bridge/br_vlan.c                               |  774 ++-
1700  net/bridge/netfilter/ebt_log.c                     |    2 +-
1701  net/bridge/netfilter/ebt_nflog.c                   |    2 +-
1702  net/bridge/netfilter/ebtable_broute.c              |    8 +-
1703  net/bridge/netfilter/ebtable_filter.c              |   13 +-
1704  net/bridge/netfilter/ebtable_nat.c                 |   13 +-
1705  net/bridge/netfilter/ebtables.c                    |   14 +-
1706  net/bridge/netfilter/nf_tables_bridge.c            |   20 +-
1707  net/bridge/netfilter/nft_reject_bridge.c           |   19 +-
1708  net/can/bcm.c                                      |   15 +-
1709  net/core/dev.c                                     |   99 +-
1710  net/core/dst.c                                     |   14 +-
1711  net/core/filter.c                                  |  135 +-
1712  net/core/lwtunnel.c                                |    4 +-
1713  net/core/neighbour.c                               |   45 +-
1714  net/core/net-sysfs.c                               |   11 +-
1715  net/core/netpoll.c                                 |   23 +-
1716  net/core/ptp_classifier.c                          |   16 +-
1717  net/core/request_sock.c                            |   88 +-
1718  net/core/rtnetlink.c                               |   38 +-
1719  net/core/sock.c                                    |   75 +-
1720  net/core/sock_diag.c                               |   14 +-
1721  net/core/tso.c                                     |   18 +-
1722  net/core/utils.c                                   |   49 -
1723  net/dcb/dcbnl.c                                    |   30 +-
1724  net/dccp/dccp.h                                    |   16 +-
1725  net/dccp/ipv4.c                                    |   94 +-
1726  net/dccp/ipv6.c                                    |  138 +-
1727  net/dccp/minisocks.c                               |   18 +-
1728  net/dccp/output.c                                  |   17 +-
1729  net/dccp/probe.c                                   |   11 +-
1730  net/decnet/dn_neigh.c                              |   23 +-
1731  net/decnet/dn_nsp_in.c                             |    7 +-
1732  net/decnet/dn_nsp_out.c                            |    4 +-
1733  net/decnet/dn_route.c                              |   38 +-
1734  net/decnet/netfilter/dn_rtmsg.c                    |    2 +-
1735  net/dsa/dsa.c                                      |    4 +-
1736  net/dsa/slave.c                                    |  184 +-
1737  net/ethernet/eth.c                                 |    2 +-
1738  net/ieee802154/6lowpan/6lowpan_i.h                 |   14 +-
1739  net/ieee802154/6lowpan/core.c                      |  126 +-
1740  net/ieee802154/6lowpan/reassembly.c                |  168 +-
1741  net/ieee802154/6lowpan/rx.c                        |  357 +-
1742  net/ieee802154/6lowpan/tx.c                        |   95 +-
1743  net/ieee802154/Kconfig                             |    5 +
1744  net/ieee802154/core.c                              |   12 +
1745  net/ieee802154/core.h                              |    1 +
1746  net/ieee802154/header_ops.c                        |   20 +-
1747  net/ieee802154/nl802154.c                          | 1321 ++++-
1748  net/ieee802154/rdev-ops.h                          |  109 +
1749  net/ieee802154/socket.c                            |    8 +-
1750  net/ipv4/Makefile                                  |    1 +
1751  net/ipv4/af_inet.c                                 |   30 +-
1752  net/ipv4/arp.c                                     |   20 +-
1753  net/ipv4/devinet.c                                 |    7 +-
1754  net/ipv4/fib_frontend.c                            |   39 +-
1755  net/ipv4/fib_semantics.c                           |  180 +-
1756  net/ipv4/icmp.c                                    |   27 +-
1757  net/ipv4/igmp.c                                    |    6 +-
1758  net/ipv4/inet_connection_sock.c                    |  271 +-
1759  net/ipv4/inet_diag.c                               |   96 +-
1760  net/ipv4/inet_fragment.c                           |    6 -
1761  net/ipv4/inet_hashtables.c                         |   53 +-
1762  net/ipv4/ip_forward.c                              |   19 +-
1763  net/ipv4/ip_fragment.c                             |   25 +-
1764  net/ipv4/ip_input.c                                |   47 +-
1765  net/ipv4/ip_output.c                               |  148 +-
1766  net/ipv4/ip_tunnel_core.c                          |    6 +-
1767  net/ipv4/ip_vti.c                                  |    2 +-
1768  net/ipv4/ipconfig.c                                |   32 +-
1769  net/ipv4/ipmr.c                                    |   15 +-
1770  net/ipv4/netfilter.c                               |    7 +-
1771  net/ipv4/netfilter/arp_tables.c                    |   15 +-
1772  net/ipv4/netfilter/arptable_filter.c               |    7 +-
1773  net/ipv4/netfilter/ip_tables.c                     |   31 +-
1774  net/ipv4/netfilter/ipt_CLUSTERIP.c                 |   12 +-
1775  net/ipv4/netfilter/ipt_REJECT.c                    |    2 +-
1776  net/ipv4/netfilter/ipt_SYNPROXY.c                  |   32 +-
1777  net/ipv4/netfilter/ipt_ah.c                        |    2 +-
1778  net/ipv4/netfilter/ipt_rpfilter.c                  |    5 +-
1779  net/ipv4/netfilter/iptable_filter.c                |    9 +-
1780  net/ipv4/netfilter/iptable_mangle.c                |   19 +-
1781  net/ipv4/netfilter/iptable_nat.c                   |   26 +-
1782  net/ipv4/netfilter/iptable_raw.c                   |    9 +-
1783  net/ipv4/netfilter/iptable_security.c              |   12 +-
1784  net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c     |   18 +-
1785  net/ipv4/netfilter/nf_conntrack_proto_icmp.c       |    4 +-
1786  net/ipv4/netfilter/nf_defrag_ipv4.c                |   13 +-
1787  net/ipv4/netfilter/nf_dup_ipv4.c                   |   25 +-
1788  net/ipv4/netfilter/nf_nat_l3proto_ipv4.c           |   44 +-
1789  net/ipv4/netfilter/nf_nat_snmp_basic.c             |    2 +-
1790  net/ipv4/netfilter/nf_reject_ipv4.c                |    6 +-
1791  net/ipv4/netfilter/nf_tables_arp.c                 |    6 +-
1792  net/ipv4/netfilter/nf_tables_ipv4.c                |   10 +-
1793  net/ipv4/netfilter/nft_chain_nat_ipv4.c            |   22 +-
1794  net/ipv4/netfilter/nft_chain_route_ipv4.c          |    8 +-
1795  net/ipv4/netfilter/nft_dup_ipv4.c                  |    2 +-
1796  net/ipv4/netfilter/nft_masq_ipv4.c                 |    2 +-
1797  net/ipv4/netfilter/nft_redir_ipv4.c                |    2 +-
1798  net/ipv4/netfilter/nft_reject_ipv4.c               |    5 +-
1799  net/ipv4/raw.c                                     |   13 +-
1800  net/ipv4/route.c                                   |  216 +-
1801  net/ipv4/syncookies.c                              |   23 +-
1802  net/ipv4/sysctl_net_ipv4.c                         |   14 +
1803  net/ipv4/tcp.c                                     |   39 +-
1804  net/ipv4/tcp_cong.c                                |   12 +-
1805  net/ipv4/tcp_fastopen.c                            |   75 +-
1806  net/ipv4/tcp_input.c                               |  280 +-
1807  net/ipv4/tcp_ipv4.c                                |  203 +-
1808  net/ipv4/tcp_minisocks.c                           |   68 +-
1809  net/ipv4/tcp_output.c                              |   84 +-
1810  net/ipv4/tcp_recovery.c                            |  109 +
1811  net/ipv4/tcp_timer.c                               |    6 +-
1812  net/ipv4/udp.c                                     |   28 +-
1813  net/ipv4/xfrm4_input.c                             |    7 +-
1814  net/ipv4/xfrm4_output.c                            |   11 +-
1815  net/ipv4/xfrm4_policy.c                            |   59 +-
1816  net/ipv6/addrconf.c                                |   76 +-
1817  net/ipv6/datagram.c                                |    2 +-
1818  net/ipv6/icmp.c                                    |   18 +-
1819  net/ipv6/ila.c                                     |    4 +-
1820  net/ipv6/inet6_connection_sock.c                   |   77 +-
1821  net/ipv6/inet6_hashtables.c                        |    2 +
1822  net/ipv6/ip6_fib.c                                 |    1 +
1823  net/ipv6/ip6_input.c                               |   15 +-
1824  net/ipv6/ip6_offload.c                             |   12 +
1825  net/ipv6/ip6_output.c                              |  164 +-
1826  net/ipv6/ip6_vti.c                                 |    2 +-
1827  net/ipv6/ip6mr.c                                   |   12 +-
1828  net/ipv6/mcast.c                                   |    9 +-
1829  net/ipv6/mip6.c                                    |   16 +-
1830  net/ipv6/ndisc.c                                   |   50 +-
1831  net/ipv6/netfilter.c                               |    7 +-
1832  net/ipv6/netfilter/ip6_tables.c                    |   33 +-
1833  net/ipv6/netfilter/ip6t_REJECT.c                   |    2 +-
1834  net/ipv6/netfilter/ip6t_SYNPROXY.c                 |   12 +-
1835  net/ipv6/netfilter/ip6t_rpfilter.c                 |    6 +-
1836  net/ipv6/netfilter/ip6table_filter.c               |    6 +-
1837  net/ipv6/netfilter/ip6table_mangle.c               |   18 +-
1838  net/ipv6/netfilter/ip6table_nat.c                  |   26 +-
1839  net/ipv6/netfilter/ip6table_raw.c                  |    6 +-
1840  net/ipv6/netfilter/ip6table_security.c             |    7 +-
1841  net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c     |   18 +-
1842  net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c     |    7 +-
1843  net/ipv6/netfilter/nf_conntrack_reasm.c            |   20 +-
1844  net/ipv6/netfilter/nf_defrag_ipv6_hooks.c          |    9 +-
1845  net/ipv6/netfilter/nf_dup_ipv6.c                   |   25 +-
1846  net/ipv6/netfilter/nf_nat_l3proto_ipv6.c           |   44 +-
1847  net/ipv6/netfilter/nf_nat_masquerade_ipv6.c        |    2 +-
1848  net/ipv6/netfilter/nf_reject_ipv6.c                |    6 +-
1849  net/ipv6/netfilter/nf_tables_ipv6.c                |   10 +-
1850  net/ipv6/netfilter/nft_chain_nat_ipv6.c            |   22 +-
1851  net/ipv6/netfilter/nft_chain_route_ipv6.c          |   14 +-
1852  net/ipv6/netfilter/nft_dup_ipv6.c                  |    2 +-
1853  net/ipv6/netfilter/nft_redir_ipv6.c                |    3 +-
1854  net/ipv6/netfilter/nft_reject_ipv6.c               |    7 +-
1855  net/ipv6/output_core.c                             |   24 +-
1856  net/ipv6/raw.c                                     |    9 +-
1857  net/ipv6/reassembly.c                              |   12 +-
1858  net/ipv6/route.c                                   |  107 +-
1859  net/ipv6/sit.c                                     |   26 +-
1860  net/ipv6/syncookies.c                              |   13 +-
1861  net/ipv6/tcp_ipv6.c                                |  205 +-
1862  net/ipv6/tunnel6.c                                 |   12 +-
1863  net/ipv6/udp.c                                     |   11 +-
1864  net/ipv6/xfrm6_input.c                             |    4 +-
1865  net/ipv6/xfrm6_output.c                            |   22 +-
1866  net/ipv6/xfrm6_policy.c                            |   10 +-
1867  net/irda/af_irda.c                                 |    3 +-
1868  net/iucv/af_iucv.c                                 |    9 +-
1869  net/iucv/iucv.c                                    |   12 +-
1870  net/l2tp/l2tp_core.h                               |    3 +
1871  net/l2tp/l2tp_eth.c                                |    1 +
1872  net/l2tp/l2tp_ip.c                                 |    1 +
1873  net/l2tp/l2tp_ip6.c                                |    1 +
1874  net/l2tp/l2tp_netlink.c                            |    7 +
1875  net/l2tp/l2tp_ppp.c                                |    1 +
1876  net/l3mdev/Kconfig                                 |   10 +
1877  net/l3mdev/Makefile                                |    5 +
1878  net/l3mdev/l3mdev.c                                |   92 +
1879  net/mac80211/Makefile                              |    1 -
1880  net/mac80211/agg-rx.c                              |    8 +-
1881  net/mac80211/agg-tx.c                              |   15 +-
1882  net/mac80211/cfg.c                                 |  107 +-
1883  net/mac80211/cfg.h                                 |    9 -
1884  net/mac80211/debugfs.c                             |    2 +
1885  net/mac80211/debugfs_key.c                         |   51 +-
1886  net/mac80211/debugfs_netdev.c                      |   41 +-
1887  net/mac80211/debugfs_sta.c                         |    8 +-
1888  net/mac80211/driver-ops.c                          |  268 +
1889  net/mac80211/driver-ops.h                          |  301 +-
1890  net/mac80211/ethtool.c                             |   29 +-
1891  net/mac80211/event.c                               |   27 -
1892  net/mac80211/ibss.c                                |   28 +-
1893  net/mac80211/ieee80211_i.h                         |   38 +-
1894  net/mac80211/iface.c                               |   14 +-
1895  net/mac80211/main.c                                |   19 +-
1896  net/mac80211/mesh.c                                |   85 +-
1897  net/mac80211/mesh.h                                |   10 +-
1898  net/mac80211/mesh_hwmp.c                           |    2 +-
1899  net/mac80211/mesh_plink.c                          |   18 +-
1900  net/mac80211/mlme.c                                |  413 +-
1901  net/mac80211/ocb.c                                 |    2 +-
1902  net/mac80211/offchannel.c                          |    6 +-
1903  net/mac80211/pm.c                                  |   14 +-
1904  net/mac80211/rate.c                                |    5 +-
1905  net/mac80211/rc80211_minstrel_debugfs.c            |   12 +-
1906  net/mac80211/rc80211_minstrel_ht_debugfs.c         |   12 +-
1907  net/mac80211/rx.c                                  |   81 +-
1908  net/mac80211/scan.c                                |   32 +-
1909  net/mac80211/sta_info.c                            |  109 +-
1910  net/mac80211/sta_info.h                            |  105 +-
1911  net/mac80211/status.c                              |  161 +-
1912  net/mac80211/tdls.c                                |   21 +-
1913  net/mac80211/trace.h                               |   52 +-
1914  net/mac80211/tx.c                                  |   42 +-
1915  net/mac80211/util.c                                |  105 +-
1916  net/mac80211/wpa.c                                 |    9 +-
1917  net/mac802154/cfg.c                                |  205 +
1918  net/mac802154/iface.c                              |  118 +-
1919  net/mac802154/llsec.c                              |   21 +-
1920  net/mac802154/rx.c                                 |    4 +
1921  net/mac802154/tx.c                                 |    7 +-
1922  net/mpls/af_mpls.c                                 |  636 ++-
1923  net/mpls/internal.h                                |   74 +-
1924  net/mpls/mpls_iptunnel.c                           |    2 +-
1925  net/netfilter/Kconfig                              |   15 +-
1926  net/netfilter/Makefile                             |    2 -
1927  net/netfilter/core.c                               |   13 +-
1928  net/netfilter/ipset/ip_set_core.c                  |    9 +-
1929  net/netfilter/ipvs/ip_vs_app.c                     |   36 +-
1930  net/netfilter/ipvs/ip_vs_conn.c                    |   91 +-
1931  net/netfilter/ipvs/ip_vs_core.c                    |  534 +-
1932  net/netfilter/ipvs/ip_vs_ctl.c                     |  291 +-
1933  net/netfilter/ipvs/ip_vs_est.c                     |   20 +-
1934  net/netfilter/ipvs/ip_vs_ftp.c                     |   27 +-
1935  net/netfilter/ipvs/ip_vs_lblc.c                    |    3 +-
1936  net/netfilter/ipvs/ip_vs_lblcr.c                   |    3 +-
1937  net/netfilter/ipvs/ip_vs_nfct.c                    |    5 +-
1938  net/netfilter/ipvs/ip_vs_pe_sip.c                  |    2 +-
1939  net/netfilter/ipvs/ip_vs_proto.c                   |   33 +-
1940  net/netfilter/ipvs/ip_vs_proto_ah_esp.c            |   32 +-
1941  net/netfilter/ipvs/ip_vs_proto_sctp.c              |   58 +-
1942  net/netfilter/ipvs/ip_vs_proto_tcp.c               |   61 +-
1943  net/netfilter/ipvs/ip_vs_proto_udp.c               |   49 +-
1944  net/netfilter/ipvs/ip_vs_sh.c                      |   45 +-
1945  net/netfilter/ipvs/ip_vs_sync.c                    |   87 +-
1946  net/netfilter/ipvs/ip_vs_xmit.c                    |   85 +-
1947  net/netfilter/nf_conntrack_core.c                  |   22 +-
1948  net/netfilter/nf_conntrack_netlink.c               |   98 +-
1949  net/netfilter/nf_conntrack_proto_dccp.c            |    2 +-
1950  net/netfilter/nf_conntrack_proto_generic.c         |    2 +-
1951  net/netfilter/nf_conntrack_proto_gre.c             |    3 +-
1952  net/netfilter/nf_conntrack_proto_sctp.c            |    2 +-
1953  net/netfilter/nf_conntrack_proto_tcp.c             |    2 +-
1954  net/netfilter/nf_conntrack_proto_udp.c             |    1 +
1955  net/netfilter/nf_conntrack_proto_udplite.c         |    1 +
1956  net/netfilter/nf_nat_core.c                        |    4 +-
1957  net/netfilter/nf_queue.c                           |   42 +-
1958  net/netfilter/nf_tables_api.c                      |    1 -
1959  net/netfilter/nf_tables_core.c                     |   10 +-
1960  net/netfilter/nf_tables_netdev.c                   |   20 +-
1961  net/netfilter/nfnetlink.c                          |    2 +-
1962  net/netfilter/nfnetlink_cttimeout.c                |   34 +
1963  net/netfilter/nfnetlink_log.c                      |   89 +-
1964  .../{nfnetlink_queue_core.c => nfnetlink_queue.c}  |   73 +-
1965  net/netfilter/nfnetlink_queue_ct.c                 |  113 -
1966  net/netfilter/nft_log.c                            |    3 +-
1967  net/netfilter/nft_meta.c                           |    4 +-
1968  net/netfilter/nft_queue.c                          |    2 +-
1969  net/netfilter/nft_reject_inet.c                    |   19 +-
1970  net/netfilter/x_tables.c                           |    1 -
1971  net/netfilter/xt_CT.c                              |    7 +-
1972  net/netfilter/xt_LOG.c                             |    2 +-
1973  net/netfilter/xt_NFLOG.c                           |    2 +-
1974  net/netfilter/xt_TCPMSS.c                          |    2 +-
1975  net/netfilter/xt_TEE.c                             |    4 +-
1976  net/netfilter/xt_TPROXY.c                          |   24 +-
1977  net/netfilter/xt_addrtype.c                        |    4 +-
1978  net/netfilter/xt_connlimit.c                       |    4 +-
1979  net/netfilter/xt_ipvs.c                            |    5 +-
1980  net/netfilter/xt_osf.c                             |    2 +-
1981  net/netfilter/xt_recent.c                          |    2 +-
1982  net/netfilter/xt_socket.c                          |   14 +-
1983  net/netlink/genetlink.c                            |   14 +-
1984  net/nfc/core.c                                     |    4 +-
1985  net/nfc/digital_core.c                             |    3 +-
1986  net/nfc/hci/core.c                                 |    3 +-
1987  net/nfc/hci/llc.c                                  |    2 +
1988  net/nfc/nci/Kconfig                                |    2 +-
1989  net/nfc/nci/Makefile                               |    3 +-
1990  net/nfc/nci/core.c                                 |  150 +-
1991  net/nfc/nci/data.c                                 |   13 +
1992  net/nfc/nci/hci.c                                  |  167 +-
1993  net/nfc/nci/ntf.c                                  |    3 +-
1994  net/nfc/nci/rsp.c                                  |    1 +
1995  net/nfc/nci/spi.c                                  |   11 +-
1996  net/nfc/netlink.c                                  |    8 +-
1997  net/nfc/nfc.h                                      |    5 +-
1998  net/nfc/rawsock.c                                  |    3 +-
1999  net/openvswitch/actions.c                          |   13 +-
2000  net/openvswitch/conntrack.c                        |    6 +-
2001  net/openvswitch/datapath.c                         |    3 +-
2002  net/openvswitch/flow.c                             |    4 +-
2003  net/openvswitch/flow.h                             |    1 +
2004  net/openvswitch/flow_netlink.c                     |  126 +-
2005  net/openvswitch/flow_table.c                       |    2 +-
2006  net/openvswitch/vport-geneve.c                     |    2 +-
2007  net/openvswitch/vport-gre.c                        |    2 +-
2008  net/openvswitch/vport-internal_dev.c               |    8 +-
2009  net/openvswitch/vport-netdev.c                     |   33 +-
2010  net/openvswitch/vport-netdev.h                     |    1 -
2011  net/openvswitch/vport-vxlan.c                      |    2 +-
2012  net/openvswitch/vport.c                            |   30 +
2013  net/openvswitch/vport.h                            |   22 +-
2014  net/packet/af_packet.c                             |   34 +-
2015  net/rds/af_rds.c                                   |   16 +-
2016  net/rds/bind.c                                     |  124 +-
2017  net/rds/connection.c                               |   22 +-
2018  net/rds/ib.c                                       |   47 +-
2019  net/rds/ib.h                                       |   78 +-
2020  net/rds/ib_cm.c                                    |  114 +-
2021  net/rds/ib_rdma.c                                  |  116 +-
2022  net/rds/ib_recv.c                                  |  136 +-
2023  net/rds/ib_send.c                                  |  110 +-
2024  net/rds/ib_stats.c                                 |   22 +-
2025  net/rds/iw_rdma.c                                  |    6 +-
2026  net/rds/rds.h                                      |   10 +-
2027  net/rds/send.c                                     |   19 +-
2028  net/rds/tcp.c                                      |   16 +-
2029  net/rds/tcp_listen.c                               |   25 +-
2030  net/rds/tcp_send.c                                 |    8 +-
2031  net/rds/threads.c                                  |    2 +
2032  net/rxrpc/ar-connection.c                          |    4 +-
2033  net/rxrpc/ar-internal.h                            |    4 +-
2034  net/rxrpc/ar-transport.c                           |    4 +-
2035  net/sched/act_bpf.c                                |    1 +
2036  net/sched/act_connmark.c                           |    5 +-
2037  net/sched/act_ipt.c                                |    1 +
2038  net/sched/cls_bpf.c                                |   82 +-
2039  net/sched/em_ipset.c                               |    1 +
2040  net/sched/sch_blackhole.c                          |   15 +-
2041  net/sched/sch_choke.c                              |   59 -
2042  net/sched/sch_dsmark.c                             |   63 +-
2043  net/sched/sch_fq.c                                 |   13 +-
2044  net/sctp/sm_make_chunk.c                           |    2 +-
2045  net/sctp/sm_statefuns.c                            |    2 +-
2046  net/switchdev/switchdev.c                          |  638 ++-
2047  net/tipc/bcast.c                                   |  988 +---
2048  net/tipc/bcast.h                                   |  122 +-
2049  net/tipc/bearer.c                                  |  102 +-
2050  net/tipc/bearer.h                                  |    9 +-
2051  net/tipc/core.c                                    |    9 +
2052  net/tipc/core.h                                    |   12 +-
2053  net/tipc/discover.c                                |   28 +-
2054  net/tipc/link.c                                    |  933 +--
2055  net/tipc/link.h                                    |   81 +-
2056  net/tipc/msg.c                                     |   51 +-
2057  net/tipc/msg.h                                     |   42 +-
2058  net/tipc/name_distr.c                              |    4 +-
2059  net/tipc/net.c                                     |    6 +-
2060  net/tipc/node.c                                    |  227 +-
2061  net/tipc/node.h                                    |   41 +-
2062  net/tipc/socket.c                                  |    4 +-
2063  net/tipc/udp_media.c                               |   18 +-
2064  net/unix/af_unix.c                                 |    5 +-
2065  net/vmw_vsock/af_vsock.c                           |   37 +-
2066  net/vmw_vsock/vmci_transport.c                     |    4 +-
2067  net/wireless/Kconfig                               |   10 +
2068  net/wireless/core.c                                |    6 +-
2069  net/wireless/core.h                                |    1 +
2070  net/wireless/nl80211.c                             |  536 +-
2071  net/wireless/reg.c                                 |  295 +-
2072  net/wireless/scan.c                                |   61 +-
2073  net/wireless/trace.h                               |   22 +-
2074  net/xfrm/xfrm_input.c                              |    4 +-
2075  net/xfrm/xfrm_output.c                             |   20 +-
2076  net/xfrm/xfrm_policy.c                             |   19 +-
2077  net/xfrm/xfrm_user.c                               |    5 +-
2078  samples/bpf/Makefile                               |   10 +
2079  samples/bpf/bpf_helpers.h                          |    6 +
2080  samples/bpf/fds_example.c                          |  183 +
2081  samples/bpf/libbpf.c                               |   19 +
2082  samples/bpf/libbpf.h                               |   11 +
2083  samples/bpf/tcbpf1_kern.c                          |   24 +-
2084  samples/bpf/test_verifier.c                        |  357 +-
2085  samples/bpf/trace_output_kern.c                    |   31 +
2086  samples/bpf/trace_output_user.c                    |  196 +
2087  security/selinux/hooks.c                           |   27 +-
2088  security/smack/smack_netfilter.c                   |    6 +-
2089  tools/build/.gitignore                             |    1 +
2090  tools/build/Build                                  |    1 +
2091  tools/build/Build.include                          |   17 +-
2092  tools/build/Documentation/Build.txt                |   52 +-
2093  tools/build/Makefile                               |   43 +
2094  tools/build/Makefile.build                         |    7 +
2095  tools/build/Makefile.feature                       |   15 +-
2096  tools/build/Makefile.include                       |   10 +
2097  tools/build/feature/Makefile                       |    4 +-
2098  tools/build/fixdep.c                               |  168 +
2099  tools/build/tests/ex/Build                         |    1 +
2100  tools/build/tests/ex/Makefile                      |   13 +-
2101  tools/build/tests/ex/ex.c                          |    2 +
2102  tools/build/tests/ex/inc.c                         |    8 +
2103  tools/build/tests/run.sh                           |   27 +
2104  tools/include/linux/compiler.h                     |   32 +-
2105  tools/include/linux/err.h                          |   49 +
2106  tools/include/linux/filter.h                       |  231 +
2107  tools/lib/api/Build                                |    1 +
2108  tools/lib/api/Makefile                             |    6 +-
2109  tools/lib/api/cpu.c                                |   18 +
2110  tools/lib/api/cpu.h                                |    6 +
2111  tools/lib/api/fs/Build                             |    4 +-
2112  tools/lib/api/fs/debugfs.c                         |  129 -
2113  tools/lib/api/fs/debugfs.h                         |   23 -
2114  tools/lib/api/fs/findfs.c                          |   63 -
2115  tools/lib/api/fs/findfs.h                          |   23 -
2116  tools/lib/api/fs/fs.c                              |  165 +-
2117  tools/lib/api/fs/fs.h                              |   30 +-
2118  tools/lib/api/fs/tracefs.c                         |   78 -
2119  tools/lib/api/fs/tracefs.h                         |   21 -
2120  tools/lib/api/fs/tracing_path.c                    |  135 +
2121  tools/lib/api/fs/tracing_path.h                    |   16 +
2122  tools/lib/bpf/Makefile                             |   11 +-
2123  tools/lib/lockdep/Makefile                         |    6 +-
2124  tools/lib/symbol/kallsyms.c                        |    6 +
2125  tools/lib/symbol/kallsyms.h                        |    4 +-
2126  tools/lib/traceevent/event-parse.c                 |   60 +-
2127  tools/lib/traceevent/event-parse.h                 |    1 +
2128  tools/lib/traceevent/plugin_kvm.c                  |   25 +-
2129  tools/net/bpf_jit_disasm.c                         |    4 +-
2130  tools/perf/Documentation/intel-pt.txt              |   44 +
2131  tools/perf/Documentation/itrace.txt                |    4 +
2132  tools/perf/Documentation/perf-bench.txt            |   54 +-
2133  tools/perf/Documentation/perf-inject.txt           |    3 +
2134  tools/perf/Documentation/perf-list.txt             |    3 +
2135  tools/perf/Documentation/perf-record.txt           |   16 +-
2136  tools/perf/Documentation/perf-report.txt           |   48 +-
2137  tools/perf/Documentation/perf-script.txt           |   17 +-
2138  tools/perf/Documentation/perf-stat.txt             |    5 +-
2139  tools/perf/Documentation/perf-top.txt              |    5 +-
2140  tools/perf/Documentation/perf.txt                  |    8 +
2141  tools/perf/MANIFEST                                |    5 +
2142  tools/perf/Makefile.perf                           |   53 +-
2143  tools/perf/arch/common.c                           |   10 +-
2144  tools/perf/arch/common.h                           |    4 +-
2145  tools/perf/arch/x86/Build                          |    2 +-
2146  tools/perf/arch/x86/Makefile                       |    1 +
2147  tools/perf/arch/x86/include/arch-tests.h           |   19 +
2148  tools/perf/arch/x86/tests/Build                    |   10 +-
2149  tools/perf/arch/x86/tests/arch-tests.c             |   34 +
2150  tools/perf/arch/x86/tests/dwarf-unwind.c           |    1 +
2151  tools/perf/arch/x86/tests/gen-insn-x86-dat.awk     |   75 +
2152  tools/perf/arch/x86/tests/gen-insn-x86-dat.sh      |   43 +
2153  tools/perf/arch/x86/tests/insn-x86-dat-32.c        |  658 +++
2154  tools/perf/arch/x86/tests/insn-x86-dat-64.c        |  768 +++
2155  tools/perf/arch/x86/tests/insn-x86-dat-src.c       |  877 +++
2156  tools/perf/arch/x86/tests/insn-x86.c               |  185 +
2157  tools/perf/arch/x86/tests/intel-cqm.c              |  124 +
2158  tools/perf/{ => arch/x86}/tests/perf-time-to-tsc.c |    4 +-
2159  tools/perf/{ => arch/x86}/tests/rdpmc.c            |    7 +-
2160  tools/perf/arch/x86/util/dwarf-regs.c              |  122 +-
2161  tools/perf/arch/x86/util/intel-pt.c                |   55 +-
2162  tools/perf/bench/Build                             |    2 +-
2163  tools/perf/bench/mem-functions.c                   |  379 ++
2164  tools/perf/bench/mem-memcpy.c                      |  434 --
2165  tools/perf/bench/numa.c                            |    4 +-
2166  tools/perf/bench/sched-messaging.c                 |   10 +-
2167  tools/perf/builtin-annotate.c                      |    2 +-
2168  tools/perf/builtin-bench.c                         |   14 +-
2169  tools/perf/builtin-evlist.c                        |    4 +-
2170  tools/perf/builtin-help.c                          |    2 +-
2171  tools/perf/builtin-inject.c                        |  127 +-
2172  tools/perf/builtin-kmem.c                          |    2 +-
2173  tools/perf/builtin-kvm.c                           |    1 -
2174  tools/perf/builtin-list.c                          |   20 +-
2175  tools/perf/builtin-probe.c                         |  147 +-
2176  tools/perf/builtin-record.c                        |   56 +-
2177  tools/perf/builtin-report.c                        |   65 +-
2178  tools/perf/builtin-sched.c                         |    4 +-
2179  tools/perf/builtin-script.c                        |  113 +-
2180  tools/perf/builtin-stat.c                          |   93 +-
2181  tools/perf/builtin-top.c                           |   59 +-
2182  tools/perf/builtin-trace.c                         |   31 +-
2183  tools/perf/config/Makefile                         |   23 +-
2184  tools/perf/perf.c                                  |   30 +-
2185  tools/perf/python/twatch.py                        |   23 +-
2186  tools/perf/scripts/python/export-to-postgresql.py  |  221 +
2187  tools/perf/tests/Build                             |    4 +-
2188  tools/perf/tests/bpf-script-example.c              |   44 +
2189  tools/perf/tests/builtin-test.c                    |   76 +-
2190  tools/perf/tests/code-reading.c                    |   76 +-
2191  tools/perf/tests/dwarf-unwind.c                    |    4 +
2192  tools/perf/tests/evsel-tp-sched.c                  |   10 +-
2193  tools/perf/tests/hists_filter.c                    |   55 +-
2194  tools/perf/tests/make                              |    4 +-
2195  tools/perf/tests/mmap-basic.c                      |    3 +-
2196  tools/perf/tests/openat-syscall-all-cpus.c         |   13 +-
2197  tools/perf/tests/openat-syscall-tp-fields.c        |    5 +-
2198  tools/perf/tests/openat-syscall.c                  |   13 +-
2199  tools/perf/tests/parse-events.c                    |   49 +-
2200  tools/perf/tests/tests.h                           |   10 +-
2201  tools/perf/tests/topology.c                        |  115 +
2202  tools/perf/tests/vmlinux-kallsyms.c                |    4 +-
2203  tools/perf/trace/strace/groups/file                |    2 +
2204  tools/perf/ui/browser.c                            |   14 +
2205  tools/perf/ui/browser.h                            |    2 +-
2206  tools/perf/ui/browsers/annotate.c                  |   14 +-
2207  tools/perf/ui/browsers/hists.c                     |  120 +-
2208  tools/perf/ui/browsers/map.c                       |    2 +-
2209  tools/perf/ui/browsers/scripts.c                   |    2 +-
2210  tools/perf/ui/hist.c                               |   16 +-
2211  tools/perf/ui/tui/setup.c                          |    8 +-
2212  tools/perf/util/Build                              |    2 +
2213  tools/perf/util/annotate.c                         |    5 +-
2214  tools/perf/util/annotate.h                         |    2 +-
2215  tools/perf/util/auxtrace.c                         |   24 +-
2216  tools/perf/util/auxtrace.h                         |    4 +
2217  tools/perf/util/bpf-loader.c                       |  352 ++
2218  tools/perf/util/bpf-loader.h                       |   85 +
2219  tools/perf/util/callchain.c                        |   42 +-
2220  tools/perf/util/callchain.h                        |   26 +
2221  tools/perf/util/cpumap.c                           |   97 +-
2222  tools/perf/util/cpumap.h                           |   10 +-
2223  tools/perf/util/env.c                              |   86 +
2224  tools/perf/util/env.h                              |   44 +
2225  tools/perf/util/event.c                            |   22 +-
2226  tools/perf/util/event.h                            |    6 +
2227  tools/perf/util/evlist.c                           |   47 +-
2228  tools/perf/util/evlist.h                           |    5 +
2229  tools/perf/util/evsel.c                            |   50 +-
2230  tools/perf/util/evsel.h                            |   10 +-
2231  tools/perf/util/header.c                           |  136 +-
2232  tools/perf/util/header.h                           |   27 +-
2233  tools/perf/util/hist.c                             |   59 +-
2234  tools/perf/util/hist.h                             |    8 +-
2235  tools/perf/util/include/dwarf-regs.h               |    8 +
2236  tools/perf/util/intel-pt-decoder/Build             |   13 +-
2237  .../perf/util/intel-pt-decoder/intel-pt-decoder.c  |    4 +-
2238  tools/perf/util/intel-pt-decoder/intel-pt-log.c    |   21 +-
2239  tools/perf/util/intel-pt-decoder/intel-pt-log.h    |   38 +-
2240  .../perf/util/intel-pt-decoder/x86-opcode-map.txt  |   24 +-
2241  tools/perf/util/intel-pt.c                         |  266 +-
2242  tools/perf/util/machine.c                          |   29 +-
2243  tools/perf/util/machine.h                          |    9 +-
2244  tools/perf/util/map.c                              |   21 +-
2245  tools/perf/util/map.h                              |    2 +
2246  tools/perf/util/parse-branch-options.c             |    1 +
2247  tools/perf/util/parse-events.c                     |  374 +-
2248  tools/perf/util/parse-events.h                     |   16 +-
2249  tools/perf/util/parse-events.l                     |   12 +-
2250  tools/perf/util/parse-events.y                     |   82 +-
2251  tools/perf/util/parse-options.c                    |  156 +-
2252  tools/perf/util/parse-options.h                    |    5 +
2253  tools/perf/util/pmu.c                              |   42 +-
2254  tools/perf/util/probe-event.c                      |  234 +-
2255  tools/perf/util/probe-event.h                      |   11 +
2256  tools/perf/util/probe-file.c                       |   56 +-
2257  tools/perf/util/probe-file.h                       |    4 +
2258  tools/perf/util/probe-finder.c                     |   58 +-
2259  tools/perf/util/python.c                           |   59 +-
2260  .../perf/util/scripting-engines/trace-event-perl.c |    1 +
2261  .../util/scripting-engines/trace-event-python.c    |    3 +-
2262  tools/perf/util/session.c                          |   37 +-
2263  tools/perf/util/session.h                          |    2 +
2264  tools/perf/util/sort.c                             |   74 +-
2265  tools/perf/util/sort.h                             |    6 +
2266  tools/perf/util/srcline.c                          |   29 +-
2267  tools/perf/util/stat.c                             |   13 +-
2268  tools/perf/util/stat.h                             |    3 +-
2269  tools/perf/util/strbuf.c                           |   22 +-
2270  tools/perf/util/strbuf.h                           |    2 +
2271  tools/perf/util/symbol-minimal.c                   |    2 +-
2272  tools/perf/util/symbol.c                           |   31 +-
2273  tools/perf/util/symbol.h                           |    1 +
2274  tools/perf/util/trace-event-info.c                 |    2 +-
2275  tools/perf/util/trace-event.c                      |   16 +-
2276  tools/perf/util/trace-event.h                      |    2 +
2277  tools/perf/util/unwind-libunwind.c                 |   19 +-
2278  tools/perf/util/usage.c                            |    5 +
2279  tools/perf/util/util.c                             |   72 +-
2280  tools/perf/util/util.h                             |   12 +-
2281  tools/testing/selftests/rcutorture/bin/kvm.sh      |    6 +-
2282  .../selftests/rcutorture/configs/lock/CFLIST       |    4 +-
2283  .../selftests/rcutorture/configs/lock/LOCK05       |    6 +
2284  .../selftests/rcutorture/configs/lock/LOCK05.boot  |    1 +
2285  .../selftests/rcutorture/configs/lock/LOCK06       |    6 +
2286  .../selftests/rcutorture/configs/lock/LOCK06.boot  |    1 +
2287  tools/testing/selftests/timers/Makefile            |    3 +-
2288  tools/testing/selftests/timers/adjtick.c           |  221 +
2289  tools/testing/selftests/x86/Makefile               |    9 +-
2290  tools/testing/selftests/x86/ptrace_syscall.c       |  294 +
2291  .../testing/selftests/x86/raw_syscall_helper_32.S  |   46 +
2292  tools/testing/selftests/x86/test_FCMOV.c           |   93 +
2293  tools/testing/selftests/x86/test_FCOMI.c           |  331 ++
2294  tools/testing/selftests/x86/test_FISTTP.c          |  137 +
2295  tools/testing/selftests/x86/test_syscall_vdso.c    |  401 ++
2296  tools/testing/selftests/x86/thunks_32.S            |   55 +
2297  tools/testing/selftests/x86/unwind_vdso.c          |  211 +
2298  tools/vm/page-types.c                              |    6 +-
2299  virt/kvm/arm/vgic.c                                |    4 +-
2300  2289 files changed, 140505 insertions(+), 33564 deletions(-)
2301  create mode 100644 Documentation/devicetree/bindings/net/brcm,iproc-mdio.txt
2302  create mode 100644 Documentation/devicetree/bindings/net/can/sun4i_can.txt
2303  create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt
2304  create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt
2305  create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt
2306  create mode 100644 Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
2307  create mode 100644 Documentation/devicetree/bindings/pci/pci-msi.txt
2308  create mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos-rng4.txt
2309  create mode 100644 Documentation/devicetree/bindings/rng/st,rng.txt
2310  create mode 100644 Documentation/devicetree/bindings/rng/st,stm32-rng.txt
2311  create mode 100644 arch/arm/include/asm/arch_gicv3.h
2312  create mode 100644 arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi
2313  create mode 100644 arch/arm64/include/asm/arch_gicv3.h
2314  create mode 100644 arch/x86/crypto/sha1_ni_asm.S
2315  create mode 100644 arch/x86/crypto/sha256_ni_asm.S
2316  delete mode 100644 arch/x86/entry/vdso/vdso32/int80.S
2317  delete mode 100644 arch/x86/entry/vdso/vdso32/syscall.S
2318  delete mode 100644 arch/x86/entry/vdso/vdso32/sysenter.S
2319  create mode 100644 arch/x86/entry/vdso/vdso32/system_call.S
2320  create mode 100644 arch/x86/include/asm/dwarf2.h
2321  delete mode 100644 arch/x86/kernel/cpu/microcode/amd_early.c
2322  delete mode 100644 arch/x86/kernel/cpu/microcode/core_early.c
2323  delete mode 100644 arch/x86/kernel/cpu/microcode/intel_early.c
2324  create mode 100644 arch/x86/kernel/cpu/perf_event_intel_cstate.c
2325  create mode 100644 crypto/keywrap.c
2326  delete mode 100644 crypto/rsakey.asn1
2327  create mode 100644 crypto/rsaprivkey.asn1
2328  create mode 100644 crypto/rsapubkey.asn1
2329  create mode 100644 drivers/char/hw_random/st-rng.c
2330  create mode 100644 drivers/char/hw_random/stm32-rng.c
2331  create mode 100644 drivers/clocksource/numachip.c
2332  create mode 100644 drivers/clocksource/tango_xtal.c
2333  delete mode 100644 drivers/crypto/qat/qat_common/qat_rsakey.asn1
2334  create mode 100644 drivers/crypto/qat/qat_common/qat_rsaprivkey.asn1
2335  create mode 100644 drivers/crypto/qat/qat_common/qat_rsapubkey.asn1
2336  create mode 100644 drivers/firmware/efi/fake_mem.c
2337  create mode 100644 drivers/irqchip/alphascale_asm9260-icoll.h
2338  rename {include/linux => drivers/net/arcnet}/arcdevice.h (75%)
2339  rename {include/linux => drivers/net/arcnet}/com20020.h (61%)
2340  create mode 100644 drivers/net/arcnet/com9026.h
2341  create mode 100644 drivers/net/can/sun4i_can.c
2342  create mode 100644 drivers/net/ethernet/broadcom/bnxt/Makefile
2343  create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt.c
2344  create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt.h
2345  create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
2346  create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
2347  create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_fw_hdr.h
2348  create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h
2349  create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h
2350  create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
2351  create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h
2352  delete mode 100644 drivers/net/ethernet/hisilicon/hip04_mdio.c
2353  create mode 100644 drivers/net/ethernet/hisilicon/hns/Makefile
2354  create mode 100644 drivers/net/ethernet/hisilicon/hns/hnae.c
2355  create mode 100644 drivers/net/ethernet/hisilicon/hns/hnae.h
2356  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
2357  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
2358  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h
2359  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
2360  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
2361  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
2362  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
2363  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
2364  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h
2365  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
2366  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h
2367  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
2368  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
2369  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
2370  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
2371  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h
2372  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_enet.c
2373  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_enet.h
2374  create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
2375  create mode 100644 drivers/net/ethernet/hisilicon/hns_mdio.c
2376  create mode 100644 drivers/net/ethernet/intel/i40e/i40e_devids.h
2377  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_devids.h
2378  create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum.c
2379  create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum.h
2380  create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
2381  create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
2382  create mode 100644 drivers/net/ethernet/microchip/encx24j600-regmap.c
2383  create mode 100644 drivers/net/ethernet/microchip/encx24j600.c
2384  create mode 100644 drivers/net/ethernet/microchip/encx24j600_hw.h
2385  create mode 100644 drivers/net/ethernet/qlogic/qed/Makefile
2386  create mode 100644 drivers/net/ethernet/qlogic/qed/qed.h
2387  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_cxt.c
2388  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_cxt.h
2389  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_dev.c
2390  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_dev_api.h
2391  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_hsi.h
2392  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_hw.c
2393  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_hw.h
2394  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c
2395  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_init_ops.c
2396  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_init_ops.h
2397  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_int.c
2398  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_int.h
2399  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_l2.c
2400  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_main.c
2401  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_mcp.c
2402  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_mcp.h
2403  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_reg_addr.h
2404  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_sp.h
2405  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
2406  create mode 100644 drivers/net/ethernet/qlogic/qed/qed_spq.c
2407  create mode 100644 drivers/net/ethernet/qlogic/qede/Makefile
2408  create mode 100644 drivers/net/ethernet/qlogic/qede/qede.h
2409  create mode 100644 drivers/net/ethernet/qlogic/qede/qede_ethtool.c
2410  create mode 100644 drivers/net/ethernet/qlogic/qede/qede_main.c
2411  create mode 100644 drivers/net/phy/bcm-cygnus.c
2412  create mode 100644 drivers/net/phy/bcm-phy-lib.c
2413  create mode 100644 drivers/net/phy/bcm-phy-lib.h
2414  create mode 100644 drivers/net/phy/mdio-bcm-iproc.c
2415  create mode 100644 drivers/net/wireless/ath/wil6210/wil_crash_dump.c
2416  delete mode 100644 drivers/net/wireless/b43/pcmcia.c
2417  delete mode 100644 drivers/net/wireless/b43/pcmcia.h
2418  create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h
2419  create mode 100644 drivers/net/wireless/realtek/Makefile
2420  rename drivers/net/wireless/{ => realtek}/rtl818x/Kconfig (100%)
2421  rename drivers/net/wireless/{ => realtek}/rtl818x/Makefile (100%)
2422  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/Makefile (69%)
2423  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/dev.c (100%)
2424  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/grf5101.c (100%)
2425  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/grf5101.h (100%)
2426  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/max2820.c (100%)
2427  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/max2820.h (100%)
2428  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8180.h (100%)
2429  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225.c (100%)
2430  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225.h (100%)
2431  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225se.c (100%)
2432  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225se.h (100%)
2433  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/sa2400.c (100%)
2434  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/sa2400.h (100%)
2435  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/Makefile (62%)
2436  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/dev.c (100%)
2437  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/leds.c (100%)
2438  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/leds.h (100%)
2439  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rfkill.c (100%)
2440  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rfkill.h (100%)
2441  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rtl8187.h (100%)
2442  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rtl8225.c (100%)
2443  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rtl8225.h (100%)
2444  rename drivers/net/wireless/{ => realtek}/rtl818x/rtl818x.h (100%)
2445  create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/Kconfig
2446  create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/Makefile
2447  create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
2448  create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
2449  create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
2450  rename drivers/net/wireless/{ => realtek}/rtlwifi/Kconfig (100%)
2451  rename drivers/net/wireless/{ => realtek}/rtlwifi/Makefile (100%)
2452  rename drivers/net/wireless/{ => realtek}/rtlwifi/base.c (100%)
2453  rename drivers/net/wireless/{ => realtek}/rtlwifi/base.h (100%)
2454  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/Makefile (100%)
2455  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbt_precomp.h (100%)
2456  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8192e2ant.c (100%)
2457  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8192e2ant.h (100%)
2458  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b1ant.c (100%)
2459  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b1ant.h (100%)
2460  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b2ant.c (100%)
2461  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b2ant.h (100%)
2462  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a1ant.c (100%)
2463  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a1ant.h (100%)
2464  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a2ant.c (100%)
2465  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a2ant.h (100%)
2466  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.c (100%)
2467  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.h (100%)
2468  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/rtl_btc.c (100%)
2469  rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/rtl_btc.h (100%)
2470  rename drivers/net/wireless/{ => realtek}/rtlwifi/cam.c (100%)
2471  rename drivers/net/wireless/{ => realtek}/rtlwifi/cam.h (100%)
2472  rename drivers/net/wireless/{ => realtek}/rtlwifi/core.c (99%)
2473  rename drivers/net/wireless/{ => realtek}/rtlwifi/core.h (100%)
2474  rename drivers/net/wireless/{ => realtek}/rtlwifi/debug.c (100%)
2475  rename drivers/net/wireless/{ => realtek}/rtlwifi/debug.h (100%)
2476  rename drivers/net/wireless/{ => realtek}/rtlwifi/efuse.c (100%)
2477  rename drivers/net/wireless/{ => realtek}/rtlwifi/efuse.h (100%)
2478  rename drivers/net/wireless/{ => realtek}/rtlwifi/pci.c (100%)
2479  rename drivers/net/wireless/{ => realtek}/rtlwifi/pci.h (100%)
2480  rename drivers/net/wireless/{ => realtek}/rtlwifi/ps.c (100%)
2481  rename drivers/net/wireless/{ => realtek}/rtlwifi/ps.h (100%)
2482  rename drivers/net/wireless/{ => realtek}/rtlwifi/pwrseqcmd.h (100%)
2483  rename drivers/net/wireless/{ => realtek}/rtlwifi/rc.c (100%)
2484  rename drivers/net/wireless/{ => realtek}/rtlwifi/rc.h (100%)
2485  rename drivers/net/wireless/{ => realtek}/rtlwifi/regd.c (100%)
2486  rename drivers/net/wireless/{ => realtek}/rtlwifi/regd.h (100%)
2487  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/Makefile (100%)
2488  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/def.h (100%)
2489  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.c (100%)
2490  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.h (100%)
2491  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.c (100%)
2492  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.h (100%)
2493  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.c (100%)
2494  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.h (100%)
2495  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/led.c (100%)
2496  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/led.h (100%)
2497  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.c (100%)
2498  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.h (100%)
2499  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/pwrseq.c (100%)
2500  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/pwrseq.h (100%)
2501  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/reg.h (100%)
2502  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.c (100%)
2503  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.h (100%)
2504  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.c (100%)
2505  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.h (100%)
2506  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/table.c (100%)
2507  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/table.h (100%)
2508  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.c (100%)
2509  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.h (100%)
2510  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/Makefile (100%)
2511  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/dm_common.c (100%)
2512  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/dm_common.h (100%)
2513  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/fw_common.c (100%)
2514  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/fw_common.h (100%)
2515  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/main.c (100%)
2516  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/phy_common.c (100%)
2517  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/phy_common.h (100%)
2518  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/Makefile (100%)
2519  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/def.h (100%)
2520  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.c (100%)
2521  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.h (100%)
2522  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.c (100%)
2523  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.h (100%)
2524  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/led.c (100%)
2525  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/led.h (100%)
2526  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.c (100%)
2527  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.h (100%)
2528  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/reg.h (100%)
2529  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.c (100%)
2530  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.h (100%)
2531  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.c (100%)
2532  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.h (100%)
2533  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/table.c (100%)
2534  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/table.h (100%)
2535  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.c (100%)
2536  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.h (100%)
2537  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/Makefile (100%)
2538  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/def.h (100%)
2539  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.c (100%)
2540  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.h (100%)
2541  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.c (99%)
2542  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.h (100%)
2543  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/led.c (100%)
2544  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/led.h (100%)
2545  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.c (100%)
2546  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.h (100%)
2547  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.c (100%)
2548  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.h (100%)
2549  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/reg.h (100%)
2550  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.c (100%)
2551  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.h (100%)
2552  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.c (100%)
2553  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.h (100%)
2554  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/table.c (100%)
2555  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/table.h (100%)
2556  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.c (100%)
2557  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.h (100%)
2558  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/Makefile (100%)
2559  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/def.h (100%)
2560  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/dm.c (100%)
2561  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/dm.h (100%)
2562  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/fw.c (100%)
2563  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/fw.h (100%)
2564  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/hw.c (100%)
2565  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/hw.h (100%)
2566  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/led.c (100%)
2567  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/led.h (100%)
2568  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/phy.c (100%)
2569  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/phy.h (100%)
2570  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/reg.h (100%)
2571  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/rf.c (100%)
2572  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/rf.h (100%)
2573  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/sw.c (100%)
2574  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/sw.h (100%)
2575  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/table.c (100%)
2576  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/table.h (100%)
2577  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/trx.c (100%)
2578  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/trx.h (100%)
2579  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/Makefile (100%)
2580  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/def.h (100%)
2581  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.c (100%)
2582  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.h (100%)
2583  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.c (100%)
2584  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.h (100%)
2585  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.c (100%)
2586  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.h (100%)
2587  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/led.c (100%)
2588  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/led.h (100%)
2589  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.c (100%)
2590  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.h (100%)
2591  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/pwrseq.c (100%)
2592  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/pwrseq.h (100%)
2593  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/reg.h (100%)
2594  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.c (100%)
2595  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.h (100%)
2596  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.c (100%)
2597  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.h (100%)
2598  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/table.c (100%)
2599  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/table.h (100%)
2600  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.c (100%)
2601  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.h (100%)
2602  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/Makefile (100%)
2603  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/def.h (100%)
2604  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/dm.c (100%)
2605  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/dm.h (100%)
2606  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/fw.c (100%)
2607  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/fw.h (100%)
2608  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/hw.c (100%)
2609  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/hw.h (100%)
2610  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/led.c (100%)
2611  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/led.h (100%)
2612  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/phy.c (100%)
2613  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/phy.h (100%)
2614  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/reg.h (100%)
2615  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/rf.c (100%)
2616  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/rf.h (100%)
2617  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/sw.c (100%)
2618  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/sw.h (100%)
2619  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/table.c (100%)
2620  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/table.h (100%)
2621  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/trx.c (100%)
2622  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/trx.h (100%)
2623  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/Makefile (100%)
2624  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/btc.h (100%)
2625  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/def.h (100%)
2626  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.c (100%)
2627  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.h (100%)
2628  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.c (100%)
2629  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.h (100%)
2630  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_bt_coexist.c (100%)
2631  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_bt_coexist.h (100%)
2632  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_btc.c (100%)
2633  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_btc.h (100%)
2634  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.c (100%)
2635  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.h (100%)
2636  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/led.c (100%)
2637  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/led.h (100%)
2638  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.c (100%)
2639  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.h (100%)
2640  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/pwrseq.c (100%)
2641  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/pwrseq.h (100%)
2642  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/reg.h (100%)
2643  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.c (100%)
2644  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.h (100%)
2645  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.c (100%)
2646  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.h (100%)
2647  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/table.c (100%)
2648  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/table.h (100%)
2649  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.c (100%)
2650  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.h (100%)
2651  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/Makefile (100%)
2652  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/def.h (100%)
2653  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/dm.c (100%)
2654  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/dm.h (100%)
2655  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/fw.c (100%)
2656  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/fw.h (100%)
2657  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/hw.c (100%)
2658  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/hw.h (100%)
2659  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/led.c (100%)
2660  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/led.h (100%)
2661  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/phy.c (100%)
2662  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/phy.h (100%)
2663  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/pwrseq.c (100%)
2664  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/pwrseq.h (100%)
2665  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/reg.h (100%)
2666  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/rf.c (100%)
2667  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/rf.h (100%)
2668  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/sw.c (100%)
2669  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/sw.h (100%)
2670  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/table.c (100%)
2671  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/table.h (100%)
2672  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/trx.c (100%)
2673  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/trx.h (100%)
2674  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/Makefile (100%)
2675  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/dm_common.c (100%)
2676  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/dm_common.h (100%)
2677  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/fw_common.c (100%)
2678  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/fw_common.h (100%)
2679  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/main.c (100%)
2680  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/phy_common.c (100%)
2681  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/phy_common.h (100%)
2682  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/Makefile (100%)
2683  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/def.h (100%)
2684  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.c (100%)
2685  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.h (100%)
2686  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.c (100%)
2687  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.h (100%)
2688  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.c (100%)
2689  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.h (100%)
2690  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/led.c (100%)
2691  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/led.h (100%)
2692  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.c (100%)
2693  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.h (100%)
2694  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/pwrseq.c (100%)
2695  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/pwrseq.h (100%)
2696  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/reg.h (100%)
2697  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.c (100%)
2698  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.h (100%)
2699  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.c (100%)
2700  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.h (100%)
2701  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/table.c (100%)
2702  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/table.h (100%)
2703  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.c (100%)
2704  rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.h (100%)
2705  rename drivers/net/wireless/{ => realtek}/rtlwifi/stats.c (100%)
2706  rename drivers/net/wireless/{ => realtek}/rtlwifi/stats.h (100%)
2707  rename drivers/net/wireless/{ => realtek}/rtlwifi/usb.c (100%)
2708  rename drivers/net/wireless/{ => realtek}/rtlwifi/usb.h (100%)
2709  rename drivers/net/wireless/{ => realtek}/rtlwifi/wifi.h (100%)
2710  create mode 100644 drivers/nfc/fdp/Kconfig
2711  create mode 100644 drivers/nfc/fdp/Makefile
2712  create mode 100644 drivers/nfc/fdp/fdp.c
2713  create mode 100644 drivers/nfc/fdp/fdp.h
2714  create mode 100644 drivers/nfc/fdp/i2c.c
2715  create mode 100644 drivers/nfc/nfcmrvl/fw_dnld.c
2716  create mode 100644 drivers/nfc/nfcmrvl/fw_dnld.h
2717  create mode 100644 drivers/nfc/nfcmrvl/i2c.c
2718  create mode 100644 drivers/nfc/nfcmrvl/spi.c
2719  rename drivers/nfc/st-nci/{st-nci_se.c => se.c} (82%)
2720  delete mode 100644 drivers/nfc/st-nci/st-nci_se.h
2721  create mode 100644 drivers/nfc/st-nci/vendor_cmds.c
2722  rename drivers/nfc/st21nfca/{st21nfca.c => core.c} (97%)
2723  rename drivers/nfc/st21nfca/{st21nfca_dep.c => dep.c} (99%)
2724  rename drivers/nfc/st21nfca/{st21nfca_se.c => se.c} (96%)
2725  delete mode 100644 drivers/nfc/st21nfca/st21nfca_dep.h
2726  delete mode 100644 drivers/nfc/st21nfca/st21nfca_se.h
2727  create mode 100644 drivers/nfc/st21nfca/vendor_cmds.c
2728  create mode 100644 drivers/ssb/bridge_pcmcia_80211.c
2729  create mode 100644 drivers/ssb/host_soc.c
2730  create mode 100644 include/linux/once.h
2731  rename include/linux/{ => platform_data}/mdio-gpio.h (100%)
2732  create mode 100644 include/linux/qed/common_hsi.h
2733  create mode 100644 include/linux/qed/eth_common.h
2734  create mode 100644 include/linux/qed/qed_chain.h
2735  create mode 100644 include/linux/qed/qed_eth_if.h
2736  create mode 100644 include/linux/qed/qed_if.h
2737  create mode 100644 include/linux/rcu_sync.h
2738  create mode 100644 include/linux/usb/cdc.h
2739  create mode 100644 include/net/l3mdev.h
2740  delete mode 100644 include/net/netfilter/nfnetlink_queue.h
2741  delete mode 100644 include/net/vrf.h
2742  create mode 100644 kernel/bpf/inode.c
2743  create mode 100644 kernel/irq/cpuhotplug.c
2744  create mode 100644 kernel/rcu/sync.c
2745  create mode 100644 lib/once.c
2746  create mode 100644 net/ipv4/tcp_recovery.c
2747  create mode 100644 net/l3mdev/Kconfig
2748  create mode 100644 net/l3mdev/Makefile
2749  create mode 100644 net/l3mdev/l3mdev.c
2750  delete mode 100644 net/mac80211/cfg.h
2751  delete mode 100644 net/mac80211/event.c
2752  rename net/netfilter/{nfnetlink_queue_core.c => nfnetlink_queue.c} (95%)
2753  delete mode 100644 net/netfilter/nfnetlink_queue_ct.c
2754  create mode 100644 samples/bpf/fds_example.c
2755  create mode 100644 samples/bpf/trace_output_kern.c
2756  create mode 100644 samples/bpf/trace_output_user.c
2757  create mode 100644 tools/build/.gitignore
2758  create mode 100644 tools/build/Build
2759  create mode 100644 tools/build/Makefile
2760  create mode 100644 tools/build/Makefile.include
2761  create mode 100644 tools/build/fixdep.c
2762  create mode 100644 tools/build/tests/ex/inc.c
2763  create mode 100644 tools/include/linux/err.h
2764  create mode 100644 tools/include/linux/filter.h
2765  create mode 100644 tools/lib/api/cpu.c
2766  create mode 100644 tools/lib/api/cpu.h
2767  delete mode 100644 tools/lib/api/fs/debugfs.c
2768  delete mode 100644 tools/lib/api/fs/debugfs.h
2769  delete mode 100644 tools/lib/api/fs/findfs.c
2770  delete mode 100644 tools/lib/api/fs/findfs.h
2771  delete mode 100644 tools/lib/api/fs/tracefs.c
2772  delete mode 100644 tools/lib/api/fs/tracefs.h
2773  create mode 100644 tools/lib/api/fs/tracing_path.c
2774  create mode 100644 tools/lib/api/fs/tracing_path.h
2775  create mode 100644 tools/perf/arch/x86/include/arch-tests.h
2776  create mode 100644 tools/perf/arch/x86/tests/arch-tests.c
2777  create mode 100644 tools/perf/arch/x86/tests/gen-insn-x86-dat.awk
2778  create mode 100755 tools/perf/arch/x86/tests/gen-insn-x86-dat.sh
2779  create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-32.c
2780  create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-64.c
2781  create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-src.c
2782  create mode 100644 tools/perf/arch/x86/tests/insn-x86.c
2783  create mode 100644 tools/perf/arch/x86/tests/intel-cqm.c
2784  rename tools/perf/{ => arch/x86}/tests/perf-time-to-tsc.c (98%)
2785  rename tools/perf/{ => arch/x86}/tests/rdpmc.c (97%)
2786  create mode 100644 tools/perf/bench/mem-functions.c
2787  delete mode 100644 tools/perf/bench/mem-memcpy.c
2788  create mode 100644 tools/perf/tests/bpf-script-example.c
2789  create mode 100644 tools/perf/tests/topology.c
2790  create mode 100644 tools/perf/util/bpf-loader.c
2791  create mode 100644 tools/perf/util/bpf-loader.h
2792  create mode 100644 tools/perf/util/env.c
2793  create mode 100644 tools/perf/util/env.h
2794  create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK05
2795  create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK05.boot
2796  create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK06
2797  create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK06.boot
2798  create mode 100644 tools/testing/selftests/timers/adjtick.c
2799  create mode 100644 tools/testing/selftests/x86/ptrace_syscall.c
2800  create mode 100644 tools/testing/selftests/x86/raw_syscall_helper_32.S
2801  create mode 100644 tools/testing/selftests/x86/test_FCMOV.c
2802  create mode 100644 tools/testing/selftests/x86/test_FCOMI.c
2803  create mode 100644 tools/testing/selftests/x86/test_FISTTP.c
2804  create mode 100644 tools/testing/selftests/x86/test_syscall_vdso.c
2805  create mode 100644 tools/testing/selftests/x86/thunks_32.S
2806  create mode 100644 tools/testing/selftests/x86/unwind_vdso.c
2807 Merging fixes/master (25cb62b76430 Linux 4.3-rc5)
2808 $ git merge fixes/master
2809 Already up-to-date.
2810 Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
2811 $ git merge kbuild-current/rc-fixes
2812 Already up-to-date.
2813 Merging arc-current/for-curr (049e6dde7e57 Linux 4.3-rc4)
2814 $ git merge arc-current/for-curr
2815 Already up-to-date.
2816 Merging arm-current/fixes (38850d786a79 ARM: 8449/1: fix bug in vdsomunge swab32 macro)
2817 $ git merge arm-current/fixes
2818 Already up-to-date.
2819 Merging m68k-current/for-linus (95bc06ef049b m68k/defconfig: Update defconfigs for v4.3-rc1)
2820 $ git merge m68k-current/for-linus
2821 Already up-to-date.
2822 Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
2823 $ git merge metag-fixes/fixes
2824 Already up-to-date.
2825 Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
2826 $ git merge mips-fixes/mips-fixes
2827 Already up-to-date.
2828 Merging powerpc-fixes/fixes (977bf062bba3 powerpc/dma: dma_set_coherent_mask() should not be GPL only)
2829 $ git merge powerpc-fixes/fixes
2830 Already up-to-date.
2831 Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
2832 $ git merge powerpc-merge-mpe/fixes
2833 Already up-to-date.
2834 Merging sparc/master (52708d690b8b sparc64: Fix numa distance values)
2835 $ git merge sparc/master
2836 Auto-merging lib/iommu-common.c
2837 Merge made by the 'recursive' strategy.
2838  arch/sparc/include/asm/topology_64.h |  3 ++
2839  arch/sparc/include/uapi/asm/asi.h    |  2 +-
2840  arch/sparc/kernel/iommu.c            | 12 +++----
2841  arch/sparc/kernel/ldc.c              |  2 +-
2842  arch/sparc/kernel/pci_sun4v.c        | 18 +++++-----
2843  arch/sparc/kernel/unaligned_64.c     | 22 ++++++++----
2844  arch/sparc/lib/VISsave.S             | 10 +++---
2845  arch/sparc/mm/init_64.c              | 70 +++++++++++++++++++++++++++++++++++-
2846  include/linux/iommu-common.h         |  1 +
2847  lib/iommu-common.c                   | 10 ++----
2848  10 files changed, 113 insertions(+), 37 deletions(-)
2849 Merging net/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
2850 $ git merge net/master
2851 Already up-to-date.
2852 Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
2853 $ git merge ipsec/master
2854 Auto-merging net/xfrm/xfrm_policy.c
2855 Auto-merging net/ipv6/xfrm6_policy.c
2856 Auto-merging net/ipv4/xfrm4_policy.c
2857 Merge made by the 'recursive' strategy.
2858  net/ipv4/xfrm4_policy.c | 46 +++++++++++++++++++++++++++++++++---------
2859  net/ipv6/xfrm6_policy.c | 53 +++++++++++++++++++++++++++++++++++--------------
2860  net/xfrm/xfrm_policy.c  | 38 -----------------------------------
2861  3 files changed, 75 insertions(+), 62 deletions(-)
2862 Merging ipvs/master (6ece90f9a13e netfilter: fix Kconfig dependencies for nf_dup_ipv{4,6})
2863 $ git merge ipvs/master
2864 Already up-to-date.
2865 Merging sound-current/for-linus (c932b98c1e47 ALSA: hda - Apply pin fixup for HP ProBook 6550b)
2866 $ git merge sound-current/for-linus
2867 Auto-merging sound/soc/sh/rcar/rcar_snd.h
2868 Removing sound/soc/codecs/hdmi.c
2869 Auto-merging sound/firewire/amdtp-stream.h
2870 Auto-merging sound/firewire/amdtp-stream.c
2871 Auto-merging MAINTAINERS
2872 Removing Documentation/sound/alsa/hda_codec.txt
2873 Merge made by the 'recursive' strategy.
2874  Documentation/DocBook/alsa-driver-api.tmpl         |    2 +
2875  Documentation/DocBook/writing-an-alsa-driver.tmpl  |   19 +-
2876  Documentation/devicetree/bindings/sound/ak4613.txt |   17 +
2877  Documentation/devicetree/bindings/sound/ak4642.txt |   22 +-
2878  .../devicetree/bindings/sound/atmel-classd.txt     |   52 +
2879  Documentation/devicetree/bindings/sound/da7213.txt |   41 +
2880  Documentation/devicetree/bindings/sound/da7219.txt |  106 ++
2881  .../devicetree/bindings/sound/fsl-asoc-card.txt    |   10 +-
2882  .../devicetree/bindings/sound/nau8825.txt          |  102 +
2883  .../devicetree/bindings/sound/renesas,rsnd.txt     |    7 +
2884  .../devicetree/bindings/sound/rockchip-i2s.txt     |    6 +-
2885  .../devicetree/bindings/sound/rockchip-spdif.txt   |   40 +
2886  Documentation/devicetree/bindings/sound/rt5640.txt |    9 +-
2887  .../devicetree/bindings/sound/sun4i-codec.txt      |   27 +
2888  .../devicetree/bindings/sound/tdm-slot.txt         |   11 +-
2889  Documentation/sound/alsa/hda_codec.txt             |  322 ----
2890  MAINTAINERS                                        |    1 +
2891  drivers/gpu/drm/i915/i915_dma.c                    |    1 +
2892  drivers/gpu/drm/i915/i915_drv.h                    |    5 +
2893  drivers/gpu/drm/i915/intel_audio.c                 |  179 +-
2894  drivers/spi/spi-atmel.c                            |   21 +-
2895  include/drm/i915_component.h                       |   17 +
2896  include/linux/mod_devicetable.h                    |    8 +
2897  include/sound/da7213.h                             |    3 -
2898  include/sound/da7219-aad.h                         |   99 +
2899  include/sound/da7219.h                             |   55 +
2900  include/sound/designware_i2s.h                     |    2 +
2901  include/sound/hda_regmap.h                         |    4 +-
2902  include/sound/hdaudio.h                            |   19 +-
2903  include/sound/hdaudio_ext.h                        |    7 +
2904  include/sound/pcm.h                                |   44 +-
2905  include/sound/pxa2xx-lib.h                         |    1 -
2906  include/sound/rt5640.h                             |    3 +-
2907  include/sound/rt5645.h                             |    2 +
2908  include/sound/simple_card.h                        |    2 +
2909  include/sound/soc-dai.h                            |   19 +-
2910  include/sound/soc-dapm.h                           |    3 +
2911  include/sound/soc.h                                |   27 +-
2912  include/uapi/sound/asoc.h                          |   76 +-
2913  include/uapi/sound/asound.h                        |    4 +-
2914  include/uapi/sound/emu10k1.h                       |   14 +-
2915  include/uapi/sound/firewire.h                      |    9 +
2916  include/uapi/sound/hdspm.h                         |   40 +-
2917  scripts/mod/devicetable-offsets.c                  |    5 +
2918  scripts/mod/file2alias.c                           |   17 +
2919  sound/arm/pxa2xx-ac97.c                            |   13 +-
2920  sound/arm/pxa2xx-pcm-lib.c                         |  201 +-
2921  sound/arm/pxa2xx-pcm.c                             |   12 +-
2922  sound/arm/pxa2xx-pcm.h                             |    2 -
2923  sound/core/Kconfig                                 |   13 +-
2924  sound/core/Makefile                                |    3 +-
2925  sound/core/oss/mixer_oss.c                         |    3 +-
2926  sound/core/pcm.c                                   |    3 -
2927  sound/core/pcm_lib.c                               |   24 +-
2928  sound/core/pcm_native.c                            |   42 +-
2929  sound/core/seq/oss/seq_oss_readq.c                 |    6 +-
2930  sound/core/seq/oss/seq_oss_writeq.c                |    4 +-
2931  sound/firewire/Kconfig                             |   27 +
2932  sound/firewire/Makefile                            |    5 +-
2933  sound/firewire/amdtp-am824.c                       |  465 +++++
2934  sound/firewire/amdtp-am824.h                       |   52 +
2935  sound/firewire/{amdtp.c => amdtp-stream.c}         |  379 +---
2936  sound/firewire/{amdtp.h => amdtp-stream.h}         |  116 +-
2937  sound/firewire/bebob/Makefile                      |    2 +-
2938  sound/firewire/bebob/bebob.c                       |    9 +-
2939  sound/firewire/bebob/bebob.h                       |   34 +-
2940  sound/firewire/bebob/bebob_focusrite.c             |   26 +-
2941  sound/firewire/bebob/bebob_maudio.c                |   34 +-
2942  sound/firewire/bebob/bebob_midi.c                  |   16 +-
2943  sound/firewire/bebob/bebob_pcm.c                   |   16 +-
2944  sound/firewire/bebob/bebob_proc.c                  |    6 +-
2945  sound/firewire/bebob/bebob_stream.c                |   40 +-
2946  sound/firewire/bebob/bebob_terratec.c              |   10 +-
2947  sound/firewire/bebob/bebob_yamaha.c                |    6 +-
2948  sound/firewire/dice/Makefile                       |    2 +-
2949  sound/firewire/dice/dice-midi.c                    |   12 +-
2950  sound/firewire/dice/dice-pcm.c                     |   12 +-
2951  sound/firewire/dice/dice-stream.c                  |   34 +-
2952  sound/firewire/dice/dice.c                         |    3 +-
2953  sound/firewire/dice/dice.h                         |    2 +-
2954  sound/firewire/digi00x/Makefile                    |    4 +
2955  sound/firewire/digi00x/amdtp-dot.c                 |  442 +++++
2956  sound/firewire/digi00x/digi00x-hwdep.c             |  200 ++
2957  sound/firewire/digi00x/digi00x-midi.c              |  223 +++
2958  sound/firewire/digi00x/digi00x-pcm.c               |  373 ++++
2959  sound/firewire/digi00x/digi00x-proc.c              |   99 +
2960  sound/firewire/digi00x/digi00x-stream.c            |  422 +++++
2961  sound/firewire/digi00x/digi00x-transaction.c       |  137 ++
2962  sound/firewire/digi00x/digi00x.c                   |  170 ++
2963  sound/firewire/digi00x/digi00x.h                   |  157 ++
2964  sound/firewire/fcp.c                               |    2 +-
2965  sound/firewire/fireworks/Makefile                  |    2 +-
2966  sound/firewire/fireworks/fireworks.c               |   12 +-
2967  sound/firewire/fireworks/fireworks.h               |    2 +-
2968  sound/firewire/fireworks/fireworks_command.c       |    2 +-
2969  sound/firewire/fireworks/fireworks_midi.c          |   12 +-
2970  sound/firewire/fireworks/fireworks_pcm.c           |   12 +-
2971  sound/firewire/fireworks/fireworks_stream.c        |    8 +-
2972  sound/firewire/lib.c                               |  142 ++
2973  sound/firewire/lib.h                               |   56 +
2974  sound/firewire/oxfw/Makefile                       |    2 +-
2975  sound/firewire/oxfw/oxfw-midi.c                    |   40 +-
2976  sound/firewire/oxfw/oxfw-pcm.c                     |   10 +-
2977  sound/firewire/oxfw/oxfw-stream.c                  |   53 +-
2978  sound/firewire/oxfw/oxfw.c                         |   46 +
2979  sound/firewire/oxfw/oxfw.h                         |    3 +-
2980  sound/firewire/tascam/Makefile                     |    4 +
2981  sound/firewire/tascam/amdtp-tascam.c               |  243 +++
2982  sound/firewire/tascam/tascam-hwdep.c               |  201 ++
2983  sound/firewire/tascam/tascam-midi.c                |  135 ++
2984  sound/firewire/tascam/tascam-pcm.c                 |  312 ++++
2985  sound/firewire/tascam/tascam-proc.c                |   88 +
2986  sound/firewire/tascam/tascam-stream.c              |  496 +++++
2987  sound/firewire/tascam/tascam-transaction.c         |  302 +++
2988  sound/firewire/tascam/tascam.c                     |  209 +++
2989  sound/firewire/tascam/tascam.h                     |  147 ++
2990  sound/hda/ext/hdac_ext_stream.c                    |    9 +-
2991  sound/hda/hda_bus_type.c                           |   13 +
2992  sound/hda/hdac_bus.c                               |   14 +
2993  sound/hda/hdac_device.c                            |  124 +-
2994  sound/hda/hdac_i915.c                              |   70 +
2995  sound/hda/hdac_regmap.c                            |   10 +
2996  sound/hda/hdac_stream.c                            |    3 +-
2997  sound/hda/hdac_sysfs.c                             |    8 +
2998  sound/pci/cs46xx/cs46xx_lib.c                      |    9 +-
2999  sound/pci/hda/hda_bind.c                           |   69 +-
3000  sound/pci/hda/hda_codec.c                          |   44 -
3001  sound/pci/hda/hda_codec.h                          |   44 +-
3002  sound/pci/hda/hda_controller.c                     |    4 +
3003  sound/pci/hda/hda_generic.c                        |    7 +-
3004  sound/pci/hda/hda_intel.c                          |    3 +
3005  sound/pci/hda/hda_local.h                          |    7 +-
3006  sound/pci/hda/hda_sysfs.c                          |    3 +-
3007  sound/pci/hda/patch_analog.c                       |   37 +-
3008  sound/pci/hda/patch_ca0110.c                       |   15 +-
3009  sound/pci/hda/patch_ca0132.c                       |   15 +-
3010  sound/pci/hda/patch_cirrus.c                       |   22 +-
3011  sound/pci/hda/patch_cmedia.c                       |   15 +-
3012  sound/pci/hda/patch_conexant.c                     |  118 +-
3013  sound/pci/hda/patch_hdmi.c                         |  220 +--
3014  sound/pci/hda/patch_realtek.c                      |  147 +-
3015  sound/pci/hda/patch_si3054.c                       |   39 +-
3016  sound/pci/hda/patch_sigmatel.c                     |  215 ++-
3017  sound/pci/hda/patch_via.c                          |  171 +-
3018  sound/pci/korg1212/korg1212.c                      |    8 +-
3019  sound/pci/lx6464es/lx6464es.c                      |    4 +-
3020  sound/pci/maestro3.c                               |   25 +-
3021  sound/pci/rme32.c                                  |    4 +-
3022  sound/pci/rme96.c                                  |    8 +-
3023  sound/pci/rme9652/hdsp.c                           |    1 +
3024  sound/pci/rme9652/hdspm.c                          |    9 +-
3025  sound/soc/Kconfig                                  |    6 +-
3026  sound/soc/Makefile                                 |    4 +-
3027  sound/soc/atmel/Kconfig                            |    9 +
3028  sound/soc/atmel/Makefile                           |    2 +
3029  sound/soc/atmel/atmel-classd.c                     |  679 +++++++
3030  sound/soc/atmel/atmel-classd.h                     |  120 ++
3031  sound/soc/atmel/atmel_wm8904.c                     |    1 +
3032  sound/soc/au1x/db1000.c                            |   10 +-
3033  sound/soc/au1x/db1200.c                            |   10 +-
3034  sound/soc/blackfin/bf5xx-ad1836.c                  |   11 +-
3035  sound/soc/blackfin/bfin-eval-adau1373.c            |   12 +-
3036  sound/soc/blackfin/bfin-eval-adau1701.c            |   12 +-
3037  sound/soc/blackfin/bfin-eval-adav80x.c             |   12 +-
3038  sound/soc/codecs/Kconfig                           |   23 +-
3039  sound/soc/codecs/Makefile                          |   10 +-
3040  sound/soc/codecs/ad193x-i2c.c                      |    8 +-
3041  sound/soc/codecs/ad193x-spi.c                      |   16 +-
3042  sound/soc/codecs/ad193x.c                          |  128 +-
3043  sound/soc/codecs/ad193x.h                          |    9 +-
3044  sound/soc/codecs/adav80x.c                         |    4 +-
3045  sound/soc/codecs/ak4613.c                          |  497 +++++
3046  sound/soc/codecs/ak4642.c                          |  153 +-
3047  sound/soc/codecs/arizona.c                         |   49 +
3048  sound/soc/codecs/arizona.h                         |   14 +-
3049  sound/soc/codecs/da7213.c                          |  190 +-
3050  sound/soc/codecs/da7213.h                          |    8 +-
3051  sound/soc/codecs/da7219-aad.c                      |  823 ++++++++
3052  sound/soc/codecs/da7219-aad.h                      |  212 +++
3053  sound/soc/codecs/da7219.c                          | 1955 ++++++++++++++++++++
3054  sound/soc/codecs/da7219.h                          |  820 ++++++++
3055  sound/soc/codecs/es8328.c                          |    2 +-
3056  sound/soc/codecs/hdmi.c                            |  109 --
3057  sound/soc/codecs/nau8825.c                         | 1309 +++++++++++++
3058  sound/soc/codecs/nau8825.h                         |  341 ++++
3059  sound/soc/codecs/rl6347a.c                         |   19 +-
3060  sound/soc/codecs/rl6347a.h                         |    2 +
3061  sound/soc/codecs/rt286.c                           |    9 +-
3062  sound/soc/codecs/rt298.c                           |   11 +-
3063  sound/soc/codecs/rt5640.c                          |   22 +-
3064  sound/soc/codecs/rt5645.c                          |  172 +-
3065  sound/soc/codecs/rt5645.h                          |   30 +-
3066  sound/soc/codecs/ssm2518.c                         |    6 -
3067  sound/soc/codecs/tlv320aic3x.c                     |   30 +-
3068  sound/soc/codecs/twl4030.c                         |   13 +-
3069  sound/soc/codecs/uda134x.c                         |    6 +-
3070  sound/soc/codecs/wl1273.c                          |    9 +-
3071  sound/soc/codecs/wm2000.c                          |    4 +-
3072  sound/soc/codecs/wm5110.c                          |  187 +-
3073  sound/soc/codecs/wm8731.c                          |    2 +-
3074  sound/soc/codecs/wm8903.c                          |    2 +-
3075  sound/soc/codecs/wm8904.c                          |    2 +-
3076  sound/soc/codecs/wm8955.c                          |    2 +-
3077  sound/soc/codecs/wm8960.c                          |    2 +-
3078  sound/soc/codecs/wm8998.c                          | 1430 ++++++++++++++
3079  sound/soc/codecs/wm8998.h                          |   23 +
3080  sound/soc/davinci/davinci-mcasp.c                  |  305 +--
3081  sound/soc/dwc/designware_i2s.c                     |  123 +-
3082  sound/soc/fsl/fsl-asoc-card.c                      |  141 +-
3083  sound/soc/fsl/fsl_esai.c                           |   88 +
3084  sound/soc/fsl/fsl_sai.c                            |   38 +-
3085  sound/soc/fsl/fsl_spdif.c                          |   73 +
3086  sound/soc/fsl/fsl_ssi.c                            |  102 +
3087  sound/soc/fsl/imx-spdif.c                          |    1 +
3088  sound/soc/generic/simple-card.c                    |    8 +-
3089  sound/soc/intel/Kconfig                            |   15 +
3090  sound/soc/intel/atom/sst-mfld-platform-pcm.c       |   19 +-
3091  sound/soc/intel/boards/Makefile                    |    2 +
3092  sound/soc/intel/boards/broadwell.c                 |    9 +-
3093  sound/soc/intel/boards/bytcr_rt5640.c              |   14 +-
3094  sound/soc/intel/boards/cht_bsw_max98090_ti.c       |   14 +-
3095  sound/soc/intel/boards/cht_bsw_rt5645.c            |   14 +-
3096  sound/soc/intel/boards/cht_bsw_rt5672.c            |   14 +-
3097  sound/soc/intel/boards/skl_rt286.c                 |  259 +++
3098  sound/soc/intel/common/Makefile                    |    6 +-
3099  sound/soc/intel/common/sst-dsp-priv.h              |    1 +
3100  sound/soc/intel/common/sst-dsp.c                   |    2 +
3101  sound/soc/intel/common/sst-dsp.h                   |    2 +
3102  sound/soc/intel/common/sst-firmware.c              |   10 +-
3103  sound/soc/intel/skylake/Makefile                   |    3 +-
3104  sound/soc/intel/skylake/skl-messages.c             |   44 +-
3105  sound/soc/intel/skylake/skl-nhlt.c                 |   10 +-
3106  sound/soc/intel/skylake/skl-pcm.c                  |  176 +-
3107  sound/soc/intel/skylake/skl-sst-dsp.c              |    7 +-
3108  sound/soc/intel/skylake/skl-sst-ipc.c              |   12 +
3109  sound/soc/intel/skylake/skl-sst-ipc.h              |    1 +
3110  sound/soc/intel/skylake/skl-sst.c                  |   56 +-
3111  sound/soc/intel/skylake/skl-topology.c             | 1252 +++++++++++++
3112  sound/soc/intel/skylake/skl-topology.h             |   36 +-
3113  sound/soc/intel/skylake/skl-tplg-interface.h       |   83 +
3114  sound/soc/intel/skylake/skl.c                      |   32 +-
3115  sound/soc/intel/skylake/skl.h                      |   17 +-
3116  sound/soc/jz4740/jz4740-i2s.c                      |    1 +
3117  sound/soc/kirkwood/armada-370-db.c                 |    1 +
3118  sound/soc/mediatek/mt8173-max98090.c               |   11 +-
3119  sound/soc/mediatek/mt8173-rt5650-rt5676.c          |   11 +-
3120  sound/soc/mxs/mxs-sgtl5000.c                       |    6 +-
3121  sound/soc/omap/n810.c                              |    3 +-
3122  sound/soc/omap/rx51.c                              |    5 +-
3123  sound/soc/pxa/brownstone.c                         |    9 +-
3124  sound/soc/pxa/corgi.c                              |   11 +-
3125  sound/soc/pxa/e740_wm9705.c                        |    5 +-
3126  sound/soc/pxa/e750_wm9705.c                        |    5 +-
3127  sound/soc/pxa/e800_wm9712.c                        |    5 +-
3128  sound/soc/pxa/hx4700.c                             |    4 +-
3129  sound/soc/pxa/imote2.c                             |   11 +-
3130  sound/soc/pxa/mioa701_wm9713.c                     |   11 +-
3131  sound/soc/pxa/palm27x.c                            |    9 +-
3132  sound/soc/pxa/poodle.c                             |   11 +-
3133  sound/soc/pxa/pxa-ssp.c                            |    1 +
3134  sound/soc/pxa/pxa2xx-ac97.c                        |   49 +-
3135  sound/soc/pxa/pxa2xx-i2s.c                         |    3 +
3136  sound/soc/pxa/pxa2xx-pcm.c                         |   33 +-
3137  sound/soc/pxa/spitz.c                              |    5 +-
3138  sound/soc/pxa/tosa.c                               |    5 +-
3139  sound/soc/pxa/ttc-dkb.c                            |   12 +-
3140  sound/soc/qcom/lpass-cpu.c                         |    3 +-
3141  sound/soc/rockchip/Kconfig                         |   12 +-
3142  sound/soc/rockchip/Makefile                        |    6 +-
3143  sound/soc/rockchip/rockchip_i2s.c                  |   48 +-
3144  sound/soc/rockchip/rockchip_i2s.h                  |   16 +
3145  sound/soc/rockchip/rockchip_spdif.c                |  405 ++++
3146  sound/soc/rockchip/rockchip_spdif.h                |   63 +
3147  sound/soc/samsung/h1940_uda1380.c                  |    5 +-
3148  sound/soc/samsung/rx1950_uda1380.c                 |    5 +-
3149  sound/soc/sh/Kconfig                               |    3 +-
3150  sound/soc/sh/rcar/adg.c                            |  306 ++-
3151  sound/soc/sh/rcar/core.c                           |   66 +-
3152  sound/soc/sh/rcar/ctu.c                            |   16 +-
3153  sound/soc/sh/rcar/dma.c                            |    2 +-
3154  sound/soc/sh/rcar/dvc.c                            |   16 +-
3155  sound/soc/sh/rcar/gen.c                            |   14 +-
3156  sound/soc/sh/rcar/mix.c                            |   16 +-
3157  {include/sound => sound/soc/sh/rcar}/rcar_snd.h    |    1 -
3158  sound/soc/sh/rcar/rsnd.h                           |   29 +-
3159  sound/soc/sh/rcar/src.c                            |   27 +-
3160  sound/soc/sh/rcar/ssi.c                            |  113 +-
3161  sound/soc/sh/siu_dai.c                             |   85 +-
3162  sound/soc/soc-compress.c                           |   12 +-
3163  sound/soc/soc-core.c                               |   29 +-
3164  sound/soc/soc-dapm.c                               |   59 +-
3165  sound/soc/soc-ops.c                                |    8 +-
3166  sound/soc/soc-pcm.c                                |   59 +-
3167  sound/soc/soc-topology.c                           |    4 +-
3168  sound/soc/sunxi/Kconfig                            |   11 +
3169  sound/soc/sunxi/Makefile                           |    2 +
3170  sound/soc/sunxi/sun4i-codec.c                      |  712 +++++++
3171  sound/soc/ux500/mop500.c                           |    1 +
3172  sound/soc/ux500/ux500_msp_dai.c                    |    5 +-
3173  sound/usb/card.h                                   |    1 +
3174  sound/usb/endpoint.c                               |   92 +-
3175  sound/usb/midi.c                                   |   11 +-
3176  sound/usb/mixer_quirks.c                           |    2 +-
3177  sound/usb/pcm.c                                    |   74 +-
3178  sound/usb/quirks-table.h                           |   23 +-
3179  sound/usb/quirks.c                                 |    3 +
3180  sound/usb/stream.c                                 |    1 +
3181  sound/usb/usbaudio.h                               |    1 +
3182  308 files changed, 21222 insertions(+), 3308 deletions(-)
3183  create mode 100644 Documentation/devicetree/bindings/sound/ak4613.txt
3184  create mode 100644 Documentation/devicetree/bindings/sound/atmel-classd.txt
3185  create mode 100644 Documentation/devicetree/bindings/sound/da7213.txt
3186  create mode 100644 Documentation/devicetree/bindings/sound/da7219.txt
3187  create mode 100644 Documentation/devicetree/bindings/sound/nau8825.txt
3188  create mode 100644 Documentation/devicetree/bindings/sound/rockchip-spdif.txt
3189  create mode 100644 Documentation/devicetree/bindings/sound/sun4i-codec.txt
3190  delete mode 100644 Documentation/sound/alsa/hda_codec.txt
3191  create mode 100644 include/sound/da7219-aad.h
3192  create mode 100644 include/sound/da7219.h
3193  create mode 100644 sound/firewire/amdtp-am824.c
3194  create mode 100644 sound/firewire/amdtp-am824.h
3195  rename sound/firewire/{amdtp.c => amdtp-stream.c} (70%)
3196  rename sound/firewire/{amdtp.h => amdtp-stream.h} (78%)
3197  create mode 100644 sound/firewire/digi00x/Makefile
3198  create mode 100644 sound/firewire/digi00x/amdtp-dot.c
3199  create mode 100644 sound/firewire/digi00x/digi00x-hwdep.c
3200  create mode 100644 sound/firewire/digi00x/digi00x-midi.c
3201  create mode 100644 sound/firewire/digi00x/digi00x-pcm.c
3202  create mode 100644 sound/firewire/digi00x/digi00x-proc.c
3203  create mode 100644 sound/firewire/digi00x/digi00x-stream.c
3204  create mode 100644 sound/firewire/digi00x/digi00x-transaction.c
3205  create mode 100644 sound/firewire/digi00x/digi00x.c
3206  create mode 100644 sound/firewire/digi00x/digi00x.h
3207  create mode 100644 sound/firewire/tascam/Makefile
3208  create mode 100644 sound/firewire/tascam/amdtp-tascam.c
3209  create mode 100644 sound/firewire/tascam/tascam-hwdep.c
3210  create mode 100644 sound/firewire/tascam/tascam-midi.c
3211  create mode 100644 sound/firewire/tascam/tascam-pcm.c
3212  create mode 100644 sound/firewire/tascam/tascam-proc.c
3213  create mode 100644 sound/firewire/tascam/tascam-stream.c
3214  create mode 100644 sound/firewire/tascam/tascam-transaction.c
3215  create mode 100644 sound/firewire/tascam/tascam.c
3216  create mode 100644 sound/firewire/tascam/tascam.h
3217  create mode 100644 sound/soc/atmel/atmel-classd.c
3218  create mode 100644 sound/soc/atmel/atmel-classd.h
3219  create mode 100644 sound/soc/codecs/ak4613.c
3220  create mode 100644 sound/soc/codecs/da7219-aad.c
3221  create mode 100644 sound/soc/codecs/da7219-aad.h
3222  create mode 100644 sound/soc/codecs/da7219.c
3223  create mode 100644 sound/soc/codecs/da7219.h
3224  delete mode 100644 sound/soc/codecs/hdmi.c
3225  create mode 100644 sound/soc/codecs/nau8825.c
3226  create mode 100644 sound/soc/codecs/nau8825.h
3227  create mode 100644 sound/soc/codecs/wm8998.c
3228  create mode 100644 sound/soc/codecs/wm8998.h
3229  create mode 100644 sound/soc/intel/boards/skl_rt286.c
3230  create mode 100644 sound/soc/intel/skylake/skl-topology.c
3231  create mode 100644 sound/soc/rockchip/rockchip_spdif.c
3232  create mode 100644 sound/soc/rockchip/rockchip_spdif.h
3233  rename {include/sound => sound/soc/sh/rcar}/rcar_snd.h (98%)
3234  create mode 100644 sound/soc/sunxi/Kconfig
3235  create mode 100644 sound/soc/sunxi/Makefile
3236  create mode 100644 sound/soc/sunxi/sun4i-codec.c
3237 Merging pci-current/for-linus (1266963170f5 PCI: Prevent out of bounds access in numa_node override)
3238 $ git merge pci-current/for-linus
3239 Already up-to-date.
3240 Merging wireless-drivers/master (de28a05ee28e Merge tag 'iwlwifi-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
3241 $ git merge wireless-drivers/master
3242 Already up-to-date.
3243 Merging driver-core.current/driver-core-linus (9ffecb102835 Linux 4.3-rc3)
3244 $ git merge driver-core.current/driver-core-linus
3245 Already up-to-date.
3246 Merging tty.current/tty-linus (f235f664a8af fbcon: initialize blink interval before calling fb_set_par)
3247 $ git merge tty.current/tty-linus
3248 Already up-to-date.
3249 Merging usb.current/usb-linus (32b88194f71d Linux 4.3-rc7)
3250 $ git merge usb.current/usb-linus
3251 Already up-to-date.
3252 Merging usb-gadget-fixes/fixes (25cb62b76430 Linux 4.3-rc5)
3253 $ git merge usb-gadget-fixes/fixes
3254 Already up-to-date.
3255 Merging usb-serial-fixes/usb-linus (32b88194f71d Linux 4.3-rc7)
3256 $ git merge usb-serial-fixes/usb-linus
3257 Already up-to-date.
3258 Merging usb-chipidea-fixes/ci-for-usb-stable (f256896afdb6 usb: chipidea: otg: gadget module load and unload support)
3259 $ git merge usb-chipidea-fixes/ci-for-usb-stable
3260 Merge made by the 'recursive' strategy.
3261  arch/arm/boot/dts/imx27.dtsi       |  16 +++--
3262  drivers/usb/chipidea/ci_hdrc_imx.c | 131 ++++++++++++++++++++++++++++++++-----
3263  drivers/usb/chipidea/debug.c       |   2 +
3264  drivers/usb/chipidea/udc.c         |  17 +++++
3265  4 files changed, 144 insertions(+), 22 deletions(-)
3266 Merging staging.current/staging-linus (32b88194f71d Linux 4.3-rc7)
3267 $ git merge staging.current/staging-linus
3268 Already up-to-date.
3269 Merging char-misc.current/char-misc-linus (25cb62b76430 Linux 4.3-rc5)
3270 $ git merge char-misc.current/char-misc-linus
3271 Already up-to-date.
3272 Merging input-current/for-linus (84a73014d86f Merge branch 'next' into for-linus)
3273 $ git merge input-current/for-linus
3274 Auto-merging include/uapi/linux/Kbuild
3275 Removing include/linux/input/edt-ft5x06.h
3276 Auto-merging MAINTAINERS
3277 Merge made by the 'recursive' strategy.
3278  .../devicetree/bindings/input/da9062-onkey.txt     |   32 +
3279  .../devicetree/bindings/input/gpio-keys-polled.txt |    9 +-
3280  .../devicetree/bindings/input/rotary-encoder.txt   |   10 +
3281  .../bindings/input/touchscreen/edt-ft5x06.txt      |    8 +-
3282  .../input/touchscreen/focaltech-ft6236.txt         |   35 +
3283  .../devicetree/bindings/vendor-prefixes.txt        |    1 +
3284  Documentation/input/rotary-encoder.txt             |    9 +-
3285  Documentation/input/userio.txt                     |   70 ++
3286  MAINTAINERS                                        |    6 +
3287  arch/arm/boot/dts/am437x-sk-evm.dts                |    2 +-
3288  arch/arm/boot/dts/imx28-tx28.dts                   |    3 +-
3289  arch/arm/boot/dts/imx53-tx53-x03x.dts              |    3 +-
3290  arch/arm/boot/dts/imx6qdl-tx6.dtsi                 |    3 +-
3291  drivers/hid/Kconfig                                |    6 +
3292  drivers/hid/Makefile                               |    1 +
3293  drivers/hid/hid-gfrm.c                             |  158 +++
3294  drivers/input/evdev.c                              |  270 ++++-
3295  drivers/input/ff-core.c                            |    9 +-
3296  drivers/input/input.c                              |   25 +-
3297  drivers/input/joydev.c                             |   22 +-
3298  drivers/input/joystick/db9.c                       |  113 +-
3299  drivers/input/joystick/gamecon.c                   |  103 +-
3300  drivers/input/joystick/turbografx.c                |  104 +-
3301  drivers/input/joystick/walkera0701.c               |   64 +-
3302  drivers/input/joystick/xpad.c                      |  534 +++++----
3303  drivers/input/keyboard/Kconfig                     |    2 +-
3304  drivers/input/keyboard/gpio_keys.c                 |    8 +-
3305  drivers/input/keyboard/gpio_keys_polled.c          |   88 +-
3306  drivers/input/keyboard/nomadik-ske-keypad.c        |    2 +-
3307  drivers/input/keyboard/snvs_pwrkey.c               |    3 +-
3308  drivers/input/keyboard/tegra-kbc.c                 |    5 +-
3309  drivers/input/misc/Kconfig                         |   12 +-
3310  drivers/input/misc/ad714x-i2c.c                    |   10 -
3311  drivers/input/misc/ad714x-spi.c                    |   10 -
3312  drivers/input/misc/ad714x.c                        |  214 ++--
3313  drivers/input/misc/ad714x.h                        |    1 -
3314  drivers/input/misc/da9063_onkey.c                  |  129 ++-
3315  drivers/input/misc/hp_sdc_rtc.c                    |   52 +-
3316  drivers/input/misc/kxtj9.c                         |    3 +-
3317  drivers/input/misc/rotary_encoder.c                |  129 ++-
3318  drivers/input/misc/xen-kbdfront.c                  |   10 +-
3319  drivers/input/serio/Kconfig                        |   14 +
3320  drivers/input/serio/Makefile                       |    1 +
3321  drivers/input/serio/parkbd.c                       |   55 +-
3322  drivers/input/serio/userio.c                       |  285 +++++
3323  drivers/input/touchscreen/Kconfig                  |   24 +
3324  drivers/input/touchscreen/Makefile                 |    2 +
3325  drivers/input/touchscreen/ads7846.c                |    4 +-
3326  drivers/input/touchscreen/auo-pixcir-ts.c          |    7 +-
3327  drivers/input/touchscreen/cyttsp4_i2c.c            |    5 +-
3328  drivers/input/touchscreen/edt-ft5x06.c             |  246 ++--
3329  drivers/input/touchscreen/ft6236.c                 |  326 ++++++
3330  drivers/input/touchscreen/pixcir_i2c_ts.c          |   12 -
3331  drivers/input/touchscreen/rohm_bu21023.c           | 1218 ++++++++++++++++++++
3332  drivers/input/touchscreen/tps6507x-ts.c            |    9 +-
3333  drivers/input/touchscreen/zforce_ts.c              |    7 +-
3334  include/dt-bindings/input/input.h                  |  510 +-------
3335  include/dt-bindings/input/linux-event-codes.h      |    1 +
3336  include/linux/input.h                              |    2 +
3337  include/linux/input/edt-ft5x06.h                   |   24 -
3338  include/linux/miscdevice.h                         |    1 +
3339  include/linux/rotary_encoder.h                     |    3 +-
3340  include/uapi/linux/Kbuild                          |    1 +
3341  include/uapi/linux/input-event-codes.h             |  805 +++++++++++++
3342  include/uapi/linux/input.h                         |  850 ++------------
3343  include/uapi/linux/userio.h                        |   44 +
3344  66 files changed, 4480 insertions(+), 2254 deletions(-)
3345  create mode 100644 Documentation/devicetree/bindings/input/da9062-onkey.txt
3346  create mode 100644 Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt
3347  create mode 100644 Documentation/input/userio.txt
3348  create mode 100644 drivers/hid/hid-gfrm.c
3349  create mode 100644 drivers/input/serio/userio.c
3350  create mode 100644 drivers/input/touchscreen/ft6236.c
3351  create mode 100644 drivers/input/touchscreen/rohm_bu21023.c
3352  create mode 120000 include/dt-bindings/input/linux-event-codes.h
3353  delete mode 100644 include/linux/input/edt-ft5x06.h
3354  create mode 100644 include/uapi/linux/input-event-codes.h
3355  create mode 100644 include/uapi/linux/userio.h
3356 Merging crypto-current/master (4afa5f961792 crypto: algif_hash - Only export and import on sockets with data)
3357 $ git merge crypto-current/master
3358 Merge made by the 'recursive' strategy.
3359  crypto/algif_hash.c | 12 ++++++++++--
3360  1 file changed, 10 insertions(+), 2 deletions(-)
3361 Merging ide/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
3362 $ git merge ide/master
3363 Already up-to-date.
3364 Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
3365 $ git merge devicetree-current/devicetree/merge
3366 Already up-to-date.
3367 Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
3368 $ git merge rr-fixes/fixes
3369 Already up-to-date.
3370 Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue)
3371 $ git merge vfio-fixes/for-linus
3372 Already up-to-date.
3373 Merging kselftest-fixes/fixes (ae7858180510 selftests: exec: revert to default emit rule)
3374 $ git merge kselftest-fixes/fixes
3375 Already up-to-date.
3376 Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
3377 $ git merge backlight-fixes/for-backlight-fixes
3378 Already up-to-date.
3379 Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
3380 $ git merge ftrace-fixes/for-next-urgent
3381 Already up-to-date.
3382 Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
3383 $ git merge mfd-fixes/for-mfd-fixes
3384 Already up-to-date.
3385 Merging drm-intel-fixes/for-linux-next-fixes (6a13feb9c828 Linux 4.3)
3386 $ git merge drm-intel-fixes/for-linux-next-fixes
3387 Already up-to-date.
3388 Merging asm-generic/master (4008cb3ad223 asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h)
3389 $ git merge asm-generic/master
3390 Auto-merging lib/mpi/mpicoder.c
3391 Auto-merging include/linux/count_zeros.h
3392 Auto-merging drivers/net/ethernet/rocker/rocker.c
3393 Auto-merging drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
3394 Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
3395 Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c
3396 Auto-merging drivers/block/nvme-core.c
3397 Merge made by the 'recursive' strategy.
3398  drivers/acpi/nfit.c                                |  2 +-
3399  drivers/acpi/osl.c                                 |  2 +-
3400  drivers/block/drbd/drbd_bitmap.c                   |  2 +-
3401  drivers/block/nvme-core.c                          |  2 +-
3402  drivers/crypto/hifn_795x.c                         |  2 --
3403  drivers/edac/i3200_edac.c                          |  2 +-
3404  drivers/edac/ie31200_edac.c                        |  2 +-
3405  drivers/edac/x38_edac.c                            |  2 +-
3406  drivers/gpio/gpio-mxc.c                            |  2 +-
3407  drivers/i2c/busses/i2c-ismt.c                      |  2 +-
3408  drivers/infiniband/hw/mlx5/main.c                  |  2 +-
3409  drivers/net/ethernet/intel/i40e/i40e_osdep.h       |  2 +-
3410  drivers/net/ethernet/intel/i40evf/i40e_osdep.h     |  2 +-
3411  drivers/net/ethernet/mellanox/mlx5/core/cmd.c      |  2 +-
3412  drivers/net/ethernet/mellanox/mlx5/core/main.c     |  2 +-
3413  .../net/ethernet/mellanox/mlx5/core/pagealloc.c    |  2 +-
3414  drivers/net/ethernet/rocker/rocker.c               |  2 +-
3415  drivers/platform/x86/ibm_rtl.c                     |  2 +-
3416  drivers/platform/x86/intel_ips.c                   |  2 +-
3417  drivers/scsi/qla4xxx/ql4_nx.c                      |  2 +-
3418  drivers/tty/n_tracerouter.c                        |  2 +-
3419  drivers/tty/n_tracesink.c                          |  2 +-
3420  include/asm-generic/cmpxchg.h                      | 11 ++++---
3421  include/asm-generic/io-64-nonatomic-hi-lo.h        | 34 ++--------------------
3422  include/asm-generic/io-64-nonatomic-lo-hi.h        | 34 ++--------------------
3423  .../{asm-generic/bitops => linux}/count_zeros.h    |  6 ++--
3424  include/linux/io-64-nonatomic-hi-lo.h              | 32 ++++++++++++++++++++
3425  include/linux/io-64-nonatomic-lo-hi.h              | 32 ++++++++++++++++++++
3426  lib/mpi/longlong.h                                 |  2 +-
3427  lib/mpi/mpicoder.c                                 |  2 +-
3428  30 files changed, 101 insertions(+), 96 deletions(-)
3429  rename include/{asm-generic/bitops => linux}/count_zeros.h (92%)
3430  create mode 100644 include/linux/io-64-nonatomic-hi-lo.h
3431  create mode 100644 include/linux/io-64-nonatomic-lo-hi.h
3432 Merging arc/for-next (cb0845a16fab ARC: [arcompact] Handle bus error from userspace as Interrupt not exception)
3433 $ git merge arc/for-next
3434 Merge made by the 'recursive' strategy.
3435  arch/arc/kernel/entry-arcv2.S   | 19 +++++++++++++++
3436  arch/arc/kernel/entry-compact.S | 29 +++++++++++++++++++----
3437  arch/arc/kernel/entry.S         | 17 --------------
3438  arch/arc/lib/memcpy-archs.S     | 52 ++++++++++++++++++++---------------------
3439  arch/arc/plat-axs10x/axs10x.c   |  1 -
3440  arch/arc/plat-sim/platform.c    |  1 -
3441  6 files changed, 70 insertions(+), 49 deletions(-)
3442 Merging arm/for-next (4f96dfc97367 Merge branches 'drm-dwhdmi-devel', 'drm-tda998x-devel2' and 'drm-armada-devel' into for-next)
3443 $ git merge arm/for-next
3444 Removing drivers/gpu/drm/armada/armada_slave.h
3445 Removing drivers/gpu/drm/armada/armada_slave.c
3446 Removing drivers/gpu/drm/armada/armada_output.h
3447 Removing drivers/gpu/drm/armada/armada_output.c
3448 Merge made by the 'recursive' strategy.
3449  drivers/gpu/drm/armada/Kconfig             |   9 -
3450  drivers/gpu/drm/armada/Makefile            |   3 +-
3451  drivers/gpu/drm/armada/armada_crtc.c       | 258 ++++++++----
3452  drivers/gpu/drm/armada/armada_crtc.h       |  34 +-
3453  drivers/gpu/drm/armada/armada_drm.h        |  16 -
3454  drivers/gpu/drm/armada/armada_drv.c        | 148 +------
3455  drivers/gpu/drm/armada/armada_output.c     | 142 -------
3456  drivers/gpu/drm/armada/armada_output.h     |  33 --
3457  drivers/gpu/drm/armada/armada_overlay.c    | 147 +++----
3458  drivers/gpu/drm/armada/armada_slave.c      | 139 ------
3459  drivers/gpu/drm/armada/armada_slave.h      |  26 --
3460  drivers/gpu/drm/bridge/Kconfig             |  12 +
3461  drivers/gpu/drm/bridge/Makefile            |   1 +
3462  drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.c | 653 +++++++++++++++++++++++++++++
3463  drivers/gpu/drm/bridge/dw_hdmi-audio.h     |  14 +
3464  drivers/gpu/drm/bridge/dw_hdmi.c           | 391 ++++++++++-------
3465  drivers/gpu/drm/bridge/dw_hdmi.h           |   3 +
3466  drivers/gpu/drm/i2c/tda998x_drv.c          | 487 ++++++++-------------
3467  drivers/gpu/ipu-v3/ipu-dc.c                |  15 +-
3468  drivers/gpu/ipu-v3/ipu-di.c                | 129 +++---
3469  20 files changed, 1482 insertions(+), 1178 deletions(-)
3470  delete mode 100644 drivers/gpu/drm/armada/armada_output.c
3471  delete mode 100644 drivers/gpu/drm/armada/armada_output.h
3472  delete mode 100644 drivers/gpu/drm/armada/armada_slave.c
3473  delete mode 100644 drivers/gpu/drm/armada/armada_slave.h
3474  create mode 100644 drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.c
3475  create mode 100644 drivers/gpu/drm/bridge/dw_hdmi-audio.h
3476 Merging arm-perf/for-next/perf (6ff33f3902c3 Linux 4.3-rc1)
3477 $ git merge arm-perf/for-next/perf
3478 Already up-to-date.
3479 Merging arm-soc/for-next (b6f3dc41232d Merge branch 'next/cleanup' into for-next)
3480 $ git merge arm-soc/for-next
3481 Resolved 'arch/arm/boot/dts/sama5d2.dtsi' using previous resolution.
3482 Auto-merging include/linux/platform_data/atmel.h
3483 Auto-merging drivers/hwmon/Makefile
3484 Auto-merging drivers/hwmon/Kconfig
3485 Auto-merging drivers/clocksource/Makefile
3486 Auto-merging drivers/clocksource/Kconfig
3487 Removing drivers/clk/clk-bcm2835.c
3488 Removing arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi
3489 Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts
3490 Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
3491 Auto-merging arch/arm/mm/Kconfig
3492 Removing arch/arm/mach-shmobile/sh-gpio.h
3493 Removing arch/arm/mach-shmobile/r8a7778.h
3494 Removing arch/arm/mach-shmobile/intc.h
3495 Removing arch/arm/mach-shmobile/console.c
3496 Removing arch/arm/mach-shmobile/clock.h
3497 Removing arch/arm/mach-shmobile/clock.c
3498 Removing arch/arm/mach-shmobile/clock-r8a7778.c
3499 Removing arch/arm/mach-shmobile/board-bockw.c
3500 Removing arch/arm/mach-shmobile/board-bockw-reference.c
3501 Removing arch/arm/mach-shmobile/Makefile.boot
3502 Removing arch/arm/mach-omap2/sram34xx.S
3503 Auto-merging arch/arm/mach-omap2/omap-wakeupgen.c
3504 Removing arch/arm/mach-omap2/devices.h
3505 Removing arch/arm/mach-omap2/clkt34xx_dpll3m2.c
3506 Removing arch/arm/mach-omap1/include/mach/board-voiceblue.h
3507 Removing arch/arm/mach-omap1/board-voiceblue.c
3508 Auto-merging arch/arm/mach-imx/gpc.c
3509 Auto-merging arch/arm/mach-exynos/suspend.c
3510 Auto-merging arch/arm/configs/lpc18xx_defconfig
3511 Auto-merging arch/arm/configs/exynos_defconfig
3512 Removing arch/arm/configs/bockw_defconfig
3513 Auto-merging arch/arm/boot/dts/stih407-family.dtsi
3514 Auto-merging arch/arm/boot/dts/sama5d2.dtsi
3515 CONFLICT (content): Merge conflict in arch/arm/boot/dts/sama5d2.dtsi
3516 Auto-merging arch/arm/boot/dts/rk3288.dtsi
3517 Auto-merging arch/arm/boot/dts/rk3288-veyron.dtsi
3518 Removing arch/arm/boot/dts/r8a7778-bockw-reference.dts
3519 Auto-merging arch/arm/boot/dts/dra7.dtsi
3520 Auto-merging arch/arm/boot/dts/am437x-sk-evm.dts
3521 Auto-merging arch/arm/Kconfig
3522 Auto-merging MAINTAINERS
3523 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
3524 Auto-merging Documentation/devicetree/bindings/power/pd-samsung.txt
3525 Auto-merging Documentation/devicetree/bindings/board/fsl-board.txt
3526 Removing Documentation/devicetree/bindings/arm/samsung-boards.txt
3527 Automatic merge failed; fix conflicts and then commit the result.
3528 $ git commit -v -a
3529 [master eb7167cecda5] Merge remote-tracking branch 'arm-soc/for-next'
3530 $ git diff -M --stat --summary HEAD^..
3531  Documentation/arm/Samsung/Bootloader-interface.txt |    5 +-
3532  Documentation/arm/keystone/knav-qmss.txt           |   56 +
3533  Documentation/arm/sunxi/README                     |    2 +-
3534  Documentation/devicetree/bindings/arm/amlogic.txt  |   10 +-
3535  Documentation/devicetree/bindings/arm/apm/scu.txt  |   17 +
3536  Documentation/devicetree/bindings/arm/arm,scpi.txt |  188 +++
3537  .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt   |  162 +-
3538  .../devicetree/bindings/arm/bcm/brcm,nsp.txt       |   34 +
3539  .../devicetree/bindings/arm/coherency-fabric.txt   |    5 +
3540  Documentation/devicetree/bindings/arm/cpus.txt     |    2 +
3541  Documentation/devicetree/bindings/arm/fsl.txt      |   16 +-
3542  .../bindings/arm/hisilicon/hisilicon.txt           |    4 +
3543  .../devicetree/bindings/arm/keystone/keystone.txt  |   20 +-
3544  .../devicetree/bindings/arm/mvebu-cpu-config.txt   |   20 +
3545  Documentation/devicetree/bindings/arm/pmu.txt      |    1 +
3546  Documentation/devicetree/bindings/arm/psci.txt     |    6 +
3547  Documentation/devicetree/bindings/arm/rockchip.txt |   11 +
3548  .../devicetree/bindings/arm/samsung-boards.txt     |   27 -
3549  .../bindings/arm/samsung/samsung-boards.txt        |   69 +
3550  Documentation/devicetree/bindings/arm/shmobile.txt |   10 +-
3551  Documentation/devicetree/bindings/arm/sunxi.txt    |    1 +
3552  .../bindings/arm/uniphier/cache-uniphier.txt       |   60 +
3553  .../{powerpc/fsl/board.txt => board/fsl-board.txt} |   14 +-
3554  .../devicetree/bindings/bus/sunxi-rsb.txt          |   47 +
3555  .../bindings/clock/brcm,bcm2835-cprman.txt         |   45 +
3556  .../devicetree/bindings/clock/qcom,gcc.txt         |    4 +
3557  .../devicetree/bindings/clock/qcom,mmcc.txt        |    4 +
3558  .../devicetree/bindings/gpio/gpio-mpc8xxx.txt      |    4 +-
3559  .../devicetree/bindings/hwmon/pwm-fan.txt          |   29 +-
3560  .../devicetree/bindings/iommu/samsung,sysmmu.txt   |    2 +-
3561  .../bindings/memory-controllers/arm,pl172.txt      |    8 +-
3562  .../renesas-memory-controllers.txt                 |    6 +-
3563  Documentation/devicetree/bindings/mfd/s2mps11.txt  |    4 +
3564  .../devicetree/bindings/pci/arm,juno-r1-pcie.txt   |   10 +
3565  .../bindings/pci/plda,xpressrich3-axi.txt          |   12 +
3566  .../power_domain.txt => power/pd-samsung.txt}      |    5 +-
3567  .../devicetree/bindings/power_supply/qcom_smbb.txt |  131 ++
3568  .../devicetree/bindings/soc/mediatek/scpsys.txt    |   10 +-
3569  .../devicetree/bindings/soc/qcom/qcom,smem.txt     |   57 +
3570  .../bindings/soc/rockchip/power_domain.txt         |   46 +
3571  .../bindings/soc/ti/keystone-navigator-qmss.txt    |    1 -
3572  .../bindings/timer/mediatek,mtk-timer.txt          |    8 +-
3573  Documentation/devicetree/bindings/usb/dwc3.txt     |    3 +-
3574  .../devicetree/bindings/vendor-prefixes.txt        |    3 +
3575  Documentation/hwmon/scpi-hwmon                     |   33 +
3576  Documentation/spi/pxa2xx                           |    6 -
3577  MAINTAINERS                                        |   44 +-
3578  arch/arm/Kconfig                                   |   26 +-
3579  arch/arm/Kconfig.debug                             |   44 +-
3580  arch/arm/arm-soc-for-next-contents.txt             |  287 ++++
3581  arch/arm/boot/dts/Makefile                         |   57 +-
3582  arch/arm/boot/dts/am335x-base0033.dts              |   48 +-
3583  arch/arm/boot/dts/am335x-bone-common.dtsi          |    3 +-
3584  arch/arm/boot/dts/am335x-bonegreen.dts             |   53 +
3585  arch/arm/boot/dts/am335x-evm.dts                   |    2 +-
3586  arch/arm/boot/dts/am335x-evmsk.dts                 |    2 +-
3587  arch/arm/boot/dts/am335x-igep0033.dtsi             |   40 +-
3588  arch/arm/boot/dts/am335x-phycore-som.dtsi          |   36 +-
3589  arch/arm/boot/dts/am335x-wega.dtsi                 |   13 +-
3590  arch/arm/boot/dts/am437x-gp-evm.dts                |   31 +-
3591  arch/arm/boot/dts/am437x-idk-evm.dts               |    2 +-
3592  arch/arm/boot/dts/am437x-sk-evm.dts                |    2 +-
3593  arch/arm/boot/dts/am43x-epos-evm.dts               |    2 +-
3594  arch/arm/boot/dts/am57xx-beagle-x15.dts            |  117 +-
3595  arch/arm/boot/dts/armada-370-db.dts                |    3 +-
3596  arch/arm/boot/dts/armada-370-dlink-dns327l.dts     |    3 +-
3597  arch/arm/boot/dts/armada-370-mirabox.dts           |    7 +-
3598  arch/arm/boot/dts/armada-370-netgear-rn102.dts     |    9 +-
3599  arch/arm/boot/dts/armada-370-netgear-rn104.dts     |    9 +-
3600  arch/arm/boot/dts/armada-370-rd.dts                |    3 +-
3601  arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts  |   36 +
3602  arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts  |  133 ++
3603  arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi |  231 +++
3604  .../dts/armada-370-seagate-personal-cloud-2bay.dts |   51 +
3605  .../boot/dts/armada-370-seagate-personal-cloud.dts |   37 +
3606  .../dts/armada-370-seagate-personal-cloud.dtsi     |  178 +++
3607  arch/arm/boot/dts/armada-370-synology-ds213j.dts   |    3 +-
3608  arch/arm/boot/dts/armada-370.dtsi                  |   37 +
3609  arch/arm/boot/dts/armada-375-db.dts                |    4 +-
3610  arch/arm/boot/dts/armada-375.dtsi                  |   33 +
3611  arch/arm/boot/dts/armada-385-db-ap.dts             |    4 +-
3612  arch/arm/boot/dts/armada-385-linksys.dtsi          |    4 +-
3613  arch/arm/boot/dts/armada-388-db.dts                |    4 +-
3614  arch/arm/boot/dts/armada-388-gp.dts                |   19 +-
3615  arch/arm/boot/dts/armada-388-rd.dts                |    4 +-
3616  arch/arm/boot/dts/armada-38x.dtsi                  |   33 +
3617  arch/arm/boot/dts/armada-xp-axpwifiap.dts          |    4 +-
3618  arch/arm/boot/dts/armada-xp-db.dts                 |    4 +-
3619  arch/arm/boot/dts/armada-xp-gp.dts                 |    4 +-
3620  arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts    |    4 +-
3621  arch/arm/boot/dts/armada-xp-linksys-mamba.dts      |    4 +-
3622  arch/arm/boot/dts/armada-xp-matrix.dts             |    4 +-
3623  arch/arm/boot/dts/armada-xp-netgear-rn2120.dts     |   90 +-
3624  arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts   |    4 +-
3625  arch/arm/boot/dts/armada-xp-synology-ds414.dts     |    4 +-
3626  arch/arm/boot/dts/armada-xp.dtsi                   |   35 +
3627  arch/arm/boot/dts/at91-sama5d2_xplained.dts        |  118 ++
3628  arch/arm/boot/dts/at91-sama5d3_xplained.dts        |    2 +-
3629  arch/arm/boot/dts/at91-sama5d4_xplained.dts        |    2 +-
3630  arch/arm/boot/dts/at91-sama5d4ek.dts               |   27 +
3631  arch/arm/boot/dts/at91rm9200.dtsi                  |    8 +-
3632  arch/arm/boot/dts/at91sam9260.dtsi                 |    2 +-
3633  arch/arm/boot/dts/at91sam9261.dtsi                 |    2 +-
3634  arch/arm/boot/dts/at91sam9263.dtsi                 |    2 +-
3635  arch/arm/boot/dts/at91sam9g45.dtsi                 |    2 +-
3636  arch/arm/boot/dts/at91sam9m10g45ek.dts             |    2 +
3637  arch/arm/boot/dts/at91sam9n12.dtsi                 |    2 +-
3638  arch/arm/boot/dts/at91sam9n12ek.dts                |    8 +-
3639  arch/arm/boot/dts/at91sam9rl.dtsi                  |    2 +-
3640  arch/arm/boot/dts/at91sam9x5.dtsi                  |    5 +-
3641  arch/arm/boot/dts/at91sam9x5ek.dtsi                |    8 +
3642  arch/arm/boot/dts/axp209.dtsi                      |    5 +
3643  arch/arm/boot/dts/axp22x.dtsi                      |  143 ++
3644  arch/arm/boot/dts/bcm-cygnus.dtsi                  |  334 +++--
3645  arch/arm/boot/dts/bcm-nsp.dtsi                     |  119 ++
3646  arch/arm/boot/dts/bcm2835-rpi-a-plus.dts           |   30 +
3647  arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts           |   23 +
3648  arch/arm/boot/dts/bcm2835-rpi-b.dts                |    8 +-
3649  arch/arm/boot/dts/bcm2835-rpi.dtsi                 |    4 +
3650  arch/arm/boot/dts/bcm2835.dtsi                     |   64 +-
3651  arch/arm/boot/dts/bcm4708-netgear-r6250.dts        |   11 +
3652  arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts        |    1 +
3653  arch/arm/boot/dts/bcm4709-netgear-r7000.dts        |  106 ++
3654  arch/arm/boot/dts/bcm7445.dtsi                     |   84 ++
3655  arch/arm/boot/dts/bcm911360_entphn.dts             |   28 +-
3656  arch/arm/boot/dts/bcm911360k.dts                   |    9 +-
3657  arch/arm/boot/dts/bcm958300k.dts                   |   44 +-
3658  arch/arm/boot/dts/bcm958305k.dts                   |   40 +-
3659  arch/arm/boot/dts/bcm958625k.dts                   |   57 +
3660  arch/arm/boot/dts/bcm9hmidc.dtsi                   |   42 +
3661  arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts         |    3 +-
3662  arch/arm/boot/dts/berlin2.dtsi                     |   23 +
3663  arch/arm/boot/dts/berlin2cd-google-chromecast.dts  |    3 +-
3664  arch/arm/boot/dts/berlin2cd.dtsi                   |   20 +
3665  arch/arm/boot/dts/berlin2q-marvell-dmp.dts         |    3 +-
3666  arch/arm/boot/dts/berlin2q.dtsi                    |   23 +
3667  arch/arm/boot/dts/cx92755.dtsi                     |    7 +
3668  arch/arm/boot/dts/cx92755_equinox.dts              |    9 +
3669  arch/arm/boot/dts/dove.dtsi                        |   17 +-
3670  arch/arm/boot/dts/dra7-evm.dts                     |  222 ++-
3671  arch/arm/boot/dts/dra7.dtsi                        |   60 +
3672  arch/arm/boot/dts/dra72-evm.dts                    |  162 +-
3673  arch/arm/boot/dts/dra72x.dtsi                      |   21 +
3674  arch/arm/boot/dts/dra74x.dtsi                      |   51 +
3675  arch/arm/boot/dts/efm32gg-dk3750.dts               |    8 +-
3676  arch/arm/boot/dts/efm32gg.dtsi                     |   32 +-
3677  arch/arm/boot/dts/exynos3250-monk.dts              |    9 +-
3678  arch/arm/boot/dts/exynos3250-rinato.dts            |   11 +-
3679  arch/arm/boot/dts/exynos3250.dtsi                  |    4 +-
3680  arch/arm/boot/dts/exynos4.dtsi                     |    8 +
3681  arch/arm/boot/dts/exynos4210-origen.dts            |   15 +-
3682  arch/arm/boot/dts/exynos4210-smdkv310.dts          |    3 +-
3683  arch/arm/boot/dts/exynos4210-trats.dts             |   31 +-
3684  arch/arm/boot/dts/exynos4210-universal_c210.dts    |   44 +-
3685  arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |   27 +-
3686  arch/arm/boot/dts/exynos4412-odroidu3.dts          |   45 +-
3687  arch/arm/boot/dts/exynos4412-odroidx.dts           |    8 +-
3688  arch/arm/boot/dts/exynos4412-origen.dts            |   15 +-
3689  arch/arm/boot/dts/exynos4412-tiny4412.dts          |    9 +-
3690  arch/arm/boot/dts/exynos4412-trats2.dts            |  140 +-
3691  arch/arm/boot/dts/exynos5250-arndale.dts           |    8 +-
3692  arch/arm/boot/dts/exynos5250-smdk5250.dts          |   16 +-
3693  arch/arm/boot/dts/exynos5250-snow-common.dtsi      |  684 +++++++++
3694  arch/arm/boot/dts/exynos5250-snow-rev5.dts         |   47 +
3695  arch/arm/boot/dts/exynos5250-snow.dts              |  671 +--------
3696  arch/arm/boot/dts/exynos5250.dtsi                  |    4 +
3697  arch/arm/boot/dts/exynos5420-arndale-octa.dts      |    3 +-
3698  arch/arm/boot/dts/exynos5420-peach-pit.dts         |    9 +-
3699  arch/arm/boot/dts/exynos5420-smdk5420.dts          |   14 +-
3700  arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi  |   61 +
3701  arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |  102 +-
3702  arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts    |   51 +
3703  arch/arm/boot/dts/exynos5422-odroidxu3.dts         |   51 +
3704  arch/arm/boot/dts/exynos5422-odroidxu4.dts         |   48 +
3705  arch/arm/boot/dts/exynos5440-ssdk5440.dts          |    5 +-
3706  arch/arm/boot/dts/exynos5800-peach-pi.dts          |    9 +-
3707  arch/arm/boot/dts/hi3620-hi4511.dts                |    3 +-
3708  arch/arm/boot/dts/hisi-x5hd2-dkb.dts               |    2 +-
3709  arch/arm/boot/dts/imx23.dtsi                       |    6 +-
3710  arch/arm/boot/dts/imx28-evk.dts                    |    2 +-
3711  arch/arm/boot/dts/imx28-m28evk.dts                 |    2 +-
3712  arch/arm/boot/dts/imx28.dtsi                       |    6 +-
3713  arch/arm/boot/dts/imx31.dtsi                       |    2 +-
3714  arch/arm/boot/dts/imx35.dtsi                       |    2 +-
3715  arch/arm/boot/dts/imx50-evk.dts                    |    2 +-
3716  arch/arm/boot/dts/imx53-smd.dts                    |    2 +-
3717  arch/arm/boot/dts/imx6dl-nit6xlite.dts             |   49 +
3718  arch/arm/boot/dts/imx6dl-nitrogen6x.dts            |   44 +-
3719  arch/arm/boot/dts/imx6dl-rex-basic.dts             |    2 +-
3720  arch/arm/boot/dts/imx6dl-sabrelite.dts             |   40 +-
3721  arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts            |    2 +-
3722  arch/arm/boot/dts/imx6q-gw5400-a.dts               |    2 +-
3723  arch/arm/boot/dts/imx6q-nitrogen6_max.dts          |   53 +
3724  arch/arm/boot/dts/imx6q-nitrogen6x.dts             |   44 +-
3725  arch/arm/boot/dts/imx6q-rex-pro.dts                |    2 +-
3726  arch/arm/boot/dts/imx6q-sabrelite.dts              |   40 +-
3727  arch/arm/boot/dts/imx6qdl-aristainetos.dtsi        |    2 +-
3728  arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi       |    2 +-
3729  arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi       |    2 +-
3730  arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi           |  630 ++++++++
3731  arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi       |  873 +++++++++++
3732  arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |  189 ++-
3733  arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |    6 +-
3734  arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           |    2 +-
3735  arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           |  118 +-
3736  arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |    2 +-
3737  arch/arm/boot/dts/imx6qdl.dtsi                     |   12 +-
3738  arch/arm/boot/dts/imx6sl-evk.dts                   |    2 +-
3739  arch/arm/boot/dts/imx6sl.dtsi                      |   21 +-
3740  arch/arm/boot/dts/imx6sx-sdb-reva.dts              |    4 +-
3741  arch/arm/boot/dts/imx6sx-sdb.dts                   |    4 +-
3742  arch/arm/boot/dts/imx6sx-sdb.dtsi                  |    2 +-
3743  arch/arm/boot/dts/imx6sx.dtsi                      |    2 +-
3744  arch/arm/boot/dts/imx6ul-14x14-evk.dts             |   22 +
3745  arch/arm/boot/dts/imx6ul.dtsi                      |   29 +
3746  arch/arm/boot/dts/imx7d-pinfunc.h                  |  122 +-
3747  arch/arm/boot/dts/imx7d-sdb.dts                    |  100 +-
3748  arch/arm/boot/dts/imx7d.dtsi                       |  165 ++
3749  arch/arm/boot/dts/k2e-evm.dts                      |    2 +-
3750  arch/arm/boot/dts/k2e-netcp.dtsi                   |   23 +
3751  arch/arm/boot/dts/k2e.dtsi                         |    3 +
3752  arch/arm/boot/dts/k2hk-evm.dts                     |    2 +-
3753  arch/arm/boot/dts/k2hk-netcp.dtsi                  |   24 +
3754  arch/arm/boot/dts/k2hk.dtsi                        |    3 +
3755  arch/arm/boot/dts/k2l-evm.dts                      |    2 +-
3756  arch/arm/boot/dts/k2l-netcp.dtsi                   |   23 +
3757  arch/arm/boot/dts/k2l.dtsi                         |    3 +
3758  arch/arm/boot/dts/keystone.dtsi                    |    7 +-
3759  arch/arm/boot/dts/kirkwood.dtsi                    |   29 +-
3760  arch/arm/boot/dts/lpc18xx.dtsi                     |  134 ++
3761  arch/arm/boot/dts/lpc4350-hitex-eval.dts           |  175 +++
3762  arch/arm/boot/dts/lpc4357-ea4357-devkit.dts        |   95 ++
3763  arch/arm/boot/dts/ls1021a-twr.dts                  |   13 +
3764  arch/arm/boot/dts/ls1021a.dtsi                     |   44 +
3765  arch/arm/boot/dts/meson8b-mxq.dts                  |   67 +
3766  arch/arm/boot/dts/meson8b-odroidc1.dts             |   67 +
3767  arch/arm/boot/dts/meson8b.dtsi                     |  186 +++
3768  arch/arm/boot/dts/mt8127.dtsi                      |   27 +
3769  arch/arm/boot/dts/mt8135-evbp1.dts                 |   23 -
3770  arch/arm/boot/dts/mt8135.dtsi                      |   27 +
3771  arch/arm/boot/dts/nspire.dtsi                      |    2 +-
3772  arch/arm/boot/dts/omap2420-n8x0-common.dtsi        |    6 +-
3773  arch/arm/boot/dts/omap3-beagle-xm.dts              |    2 +-
3774  arch/arm/boot/dts/omap3-beagle.dts                 |    2 +-
3775  arch/arm/boot/dts/omap3-cm-t3x.dtsi                |    2 +-
3776  arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi |    2 +-
3777  arch/arm/boot/dts/omap3-evm-common.dtsi            |    4 +-
3778  arch/arm/boot/dts/omap3-gta04.dtsi                 |   10 +-
3779  arch/arm/boot/dts/omap3-gta04a5.dts                |    2 +-
3780  arch/arm/boot/dts/omap3-igep.dtsi                  |   70 +-
3781  arch/arm/boot/dts/omap3-igep0020-common.dtsi       |   60 +-
3782  arch/arm/boot/dts/omap3-igep0020-rev-f.dts         |    2 +-
3783  arch/arm/boot/dts/omap3-igep0020.dts               |   11 +-
3784  arch/arm/boot/dts/omap3-igep0030-common.dtsi       |    2 +-
3785  arch/arm/boot/dts/omap3-igep0030-rev-g.dts         |    2 +-
3786  arch/arm/boot/dts/omap3-igep0030.dts               |    2 +-
3787  arch/arm/boot/dts/omap3-ldp.dts                    |    2 +-
3788  arch/arm/boot/dts/omap3-lilly-a83x.dtsi            |    4 +-
3789  arch/arm/boot/dts/omap3-lilly-dbb056.dts           |    4 +-
3790  arch/arm/boot/dts/omap3-n950-n9.dtsi               |    2 +-
3791  arch/arm/boot/dts/omap3-overo-base.dtsi            |    2 +-
3792  arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi    |    2 +-
3793  arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi    |    2 +-
3794  arch/arm/boot/dts/omap3-pandora-common.dtsi        |    4 +-
3795  arch/arm/boot/dts/omap3-tao3530.dtsi               |    4 +-
3796  arch/arm/boot/dts/omap3-zoom3.dts                  |    2 +-
3797  arch/arm/boot/dts/omap4-panda-common.dtsi          |    4 +-
3798  arch/arm/boot/dts/omap4-sdp.dts                    |    6 +-
3799  arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi     |    2 +-
3800  arch/arm/boot/dts/omap4-var-som-om44.dtsi          |    2 +-
3801  arch/arm/boot/dts/omap4460.dtsi                    |    2 +-
3802  arch/arm/boot/dts/omap5-board-common.dtsi          |  655 ++++++++
3803  arch/arm/boot/dts/omap5-cm-t54.dts                 |    2 +-
3804  arch/arm/boot/dts/omap5-igep0050.dts               |   54 +
3805  arch/arm/boot/dts/omap5-uevm.dts                   |  618 +-------
3806  arch/arm/boot/dts/orion5x.dtsi                     |   22 +-
3807  arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts        |   48 +-
3808  arch/arm/boot/dts/qcom-apq8064-ifc6410.dts         |   60 +-
3809  arch/arm/boot/dts/qcom-apq8064.dtsi                |   43 +-
3810  arch/arm/boot/dts/qcom-apq8084.dtsi                |    1 +
3811  arch/arm/boot/dts/qcom-msm8974.dtsi                |   95 +-
3812  arch/arm/boot/dts/qcom-pm8941.dtsi                 |   24 +-
3813  arch/arm/boot/dts/r8a7778-bockw-reference.dts      |  139 --
3814  arch/arm/boot/dts/r8a7778.dtsi                     |    2 +-
3815  arch/arm/boot/dts/r8a7779-marzen.dts               |    6 +-
3816  arch/arm/boot/dts/r8a7790-lager.dts                |   16 +-
3817  arch/arm/boot/dts/r8a7790.dtsi                     |    2 +-
3818  arch/arm/boot/dts/r8a7791-koelsch.dts              |    9 +-
3819  arch/arm/boot/dts/r8a7791-porter.dts               |  282 ++++
3820  arch/arm/boot/dts/r8a7791.dtsi                     |    2 +-
3821  arch/arm/boot/dts/r8a7794-silk.dts                 |  114 ++
3822  arch/arm/boot/dts/r8a7794.dtsi                     |  326 +++-
3823  arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi     |   41 +
3824  arch/arm/boot/dts/rk3066a-bqcurie2.dts             |    2 +
3825  arch/arm/boot/dts/rk3066a-marsboard.dts            |    8 +
3826  arch/arm/boot/dts/rk3066a-rayeager.dts             |    2 +
3827  arch/arm/boot/dts/rk3188-radxarock.dts             |   21 +
3828  arch/arm/boot/dts/rk3188.dtsi                      |   20 +
3829  arch/arm/boot/dts/rk3288-firefly.dtsi              |   55 +-
3830  arch/arm/boot/dts/rk3288-popmetal.dts              |   85 +-
3831  arch/arm/boot/dts/rk3288-rock2-som.dtsi            |  277 ++++
3832  arch/arm/boot/dts/rk3288-rock2-square.dts          |  167 +++
3833  arch/arm/boot/dts/rk3288-veyron-jaq.dts            |  176 +++
3834  arch/arm/boot/dts/rk3288-veyron.dtsi               |   12 -
3835  arch/arm/boot/dts/rk3288.dtsi                      |  134 +-
3836  arch/arm/boot/dts/s3c2416.dtsi                     |    2 +-
3837  arch/arm/boot/dts/s5pv210-aquila.dts               |    2 +-
3838  arch/arm/boot/dts/s5pv210-goni.dts                 |    4 +-
3839  arch/arm/boot/dts/sama5d2-pinfunc.h                |  880 +++++++++++
3840  arch/arm/boot/dts/sama5d2.dtsi                     |  154 +-
3841  arch/arm/boot/dts/sama5d3.dtsi                     |    5 +-
3842  arch/arm/boot/dts/sama5d3_mci2.dtsi                |    6 +-
3843  arch/arm/boot/dts/sama5d3xmb.dtsi                  |    2 +
3844  arch/arm/boot/dts/sama5d4.dtsi                     |   49 +-
3845  arch/arm/boot/dts/sh73a0-kzm9g.dts                 |    2 +-
3846  arch/arm/boot/dts/socfpga.dtsi                     |  135 +-
3847  arch/arm/boot/dts/socfpga_arria10.dtsi             |    8 +
3848  arch/arm/boot/dts/socfpga_arria10_socdk.dtsi       |   27 +
3849  arch/arm/boot/dts/stih407-b2120.dts                |    1 +
3850  arch/arm/boot/dts/stih407-family.dtsi              |   74 +-
3851  arch/arm/boot/dts/stih407-pinctrl.dtsi             |  390 ++++-
3852  arch/arm/boot/dts/stih407.dtsi                     |   13 -
3853  arch/arm/boot/dts/stih410-b2120.dts                |   25 +
3854  arch/arm/boot/dts/stih410.dtsi                     |   23 +-
3855  arch/arm/boot/dts/stih418-b2199.dts                |    8 +
3856  arch/arm/boot/dts/stih418-clock.dtsi               |    2 +-
3857  arch/arm/boot/dts/stih418.dtsi                     |    6 +
3858  arch/arm/boot/dts/stihxxx-b2120.dtsi               |   14 +
3859  arch/arm/boot/dts/sun4i-a10-a1000.dts              |    4 +
3860  arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts    |   12 +
3861  arch/arm/boot/dts/sun4i-a10-cubieboard.dts         |    4 +
3862  arch/arm/boot/dts/sun4i-a10-gemei-g9.dts           |   11 +-
3863  arch/arm/boot/dts/sun4i-a10-inet1.dts              |  226 +++
3864  arch/arm/boot/dts/sun4i-a10-inet97fv2.dts          |  117 +-
3865  arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts       |  227 +++
3866  arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts         |   15 +
3867  arch/arm/boot/dts/sun4i-a10-marsboard.dts          |   23 +
3868  arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts     |   12 +
3869  arch/arm/boot/dts/sun4i-a10-pcduino.dts            |   58 +-
3870  arch/arm/boot/dts/sun4i-a10-pcduino2.dts           |   78 +
3871  arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts   |  199 +++
3872  arch/arm/boot/dts/sun4i-a10.dtsi                   |   31 +
3873  arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts       |  159 ++
3874  arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts   |    2 +-
3875  arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts           |  224 +++
3876  arch/arm/boot/dts/sun5i-a10s.dtsi                  |   35 +-
3877  arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts      |  227 +++
3878  arch/arm/boot/dts/sun5i-a13-q8-tablet.dts          |   60 +
3879  arch/arm/boot/dts/sun5i-a13.dtsi                   |   10 +
3880  arch/arm/boot/dts/sun5i-q8-common.dtsi             |  180 +++
3881  arch/arm/boot/dts/sun5i-r8-chip.dts                |  218 +++
3882  arch/arm/boot/dts/sun5i-r8.dtsi                    |   59 +
3883  arch/arm/boot/dts/sun5i.dtsi                       |   52 +
3884  arch/arm/boot/dts/sun6i-a31-colombus.dts           |   36 +
3885  arch/arm/boot/dts/sun6i-a31-hummingbird.dts        |  132 +-
3886  arch/arm/boot/dts/sun6i-a31.dtsi                   |   31 +-
3887  arch/arm/boot/dts/sun6i-a31s-primo81.dts           |  255 ++++
3888  arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi     |  140 ++
3889  arch/arm/boot/dts/sun6i-a31s-sina31s.dts           |  153 ++
3890  arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts   |  194 +++
3891  .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts     |  134 ++
3892  arch/arm/boot/dts/sun7i-a20-bananapi.dts           |   74 +-
3893  arch/arm/boot/dts/sun7i-a20-cubieboard2.dts        |   23 +
3894  arch/arm/boot/dts/sun7i-a20-cubietruck.dts         |    4 +
3895  arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts     |  198 +++
3896  arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts     |   12 +
3897  arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts    |   47 +
3898  arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts    |    6 +
3899  arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts      |   29 +
3900  arch/arm/boot/dts/sun7i-a20-orangepi.dts           |   29 +
3901  arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts      |   65 +-
3902  arch/arm/boot/dts/sun7i-a20-pcduino3.dts           |   54 +-
3903  arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts     |   33 +-
3904  arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts   |  226 +++
3905  arch/arm/boot/dts/sun7i-a20.dtsi                   |   39 +
3906  arch/arm/boot/dts/sun8i-a23-a33.dtsi               |   70 +-
3907  arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts           |  145 ++
3908  arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts      |   55 +-
3909  arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts        |  137 +-
3910  arch/arm/boot/dts/sun8i-a23-q8-tablet.dts          |   65 +
3911  arch/arm/boot/dts/sun8i-a23.dtsi                   |   25 +
3912  arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts         |   89 +-
3913  arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts      |  134 +-
3914  arch/arm/boot/dts/sun8i-a33-q8-tablet.dts          |   65 +
3915  arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts     |    4 +
3916  arch/arm/boot/dts/sun8i-a33.dtsi                   |   45 +
3917  arch/arm/boot/dts/sun8i-q8-common.dtsi             |  101 ++
3918  arch/arm/boot/dts/sun9i-a80.dtsi                   |    2 +-
3919  arch/arm/boot/dts/sunxi-q8-common.dtsi             |   83 ++
3920  arch/arm/boot/dts/tegra124-nyan.dtsi               |   15 +-
3921  arch/arm/boot/dts/tegra124.dtsi                    |   20 +-
3922  arch/arm/boot/dts/tegra20.dtsi                     |    4 +-
3923  arch/arm/boot/dts/tegra30-apalis-eval.dts          |   13 +-
3924  arch/arm/boot/dts/tegra30-apalis.dtsi              |  214 +--
3925  arch/arm/boot/dts/tegra30-colibri-eval-v3.dts      |    9 +-
3926  arch/arm/boot/dts/tegra30-colibri.dtsi             |  196 ++-
3927  arch/arm/boot/dts/tegra30.dtsi                     |   10 +-
3928  arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts         |    8 +-
3929  arch/arm/boot/dts/uniphier-ph1-ld4.dtsi            |   20 +-
3930  arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts        |    8 +-
3931  arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts        |    8 +-
3932  arch/arm/boot/dts/uniphier-ph1-pro4.dtsi           |   21 +-
3933  arch/arm/boot/dts/uniphier-ph1-pro5.dtsi           |   34 +-
3934  arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts        |    8 +-
3935  arch/arm/boot/dts/uniphier-ph1-sld3.dtsi           |   21 +-
3936  arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts        |    8 +-
3937  arch/arm/boot/dts/uniphier-ph1-sld8.dtsi           |   20 +-
3938  arch/arm/boot/dts/uniphier-proxstream2-gentil.dts  |   78 +
3939  arch/arm/boot/dts/uniphier-proxstream2-vodka.dts   |   78 +
3940  arch/arm/boot/dts/uniphier-proxstream2.dtsi        |   23 +-
3941  arch/arm/boot/dts/vf-colibri.dtsi                  |   39 +
3942  arch/arm/boot/dts/vf500-colibri-eval-v3.dts        |    5 +
3943  arch/arm/boot/dts/vf500-colibri.dtsi               |   47 +
3944  arch/arm/boot/dts/vf610-twr.dts                    |   47 +
3945  arch/arm/boot/dts/vfxxx.dtsi                       |   11 +
3946  arch/arm/boot/dts/wm8750.dtsi                      |    2 +-
3947  arch/arm/configs/at91_dt_defconfig                 |   15 -
3948  arch/arm/configs/bockw_defconfig                   |  133 --
3949  arch/arm/configs/exynos_defconfig                  |   18 +-
3950  arch/arm/configs/imx_v6_v7_defconfig               |    2 +-
3951  arch/arm/configs/keystone_defconfig                |   54 +-
3952  arch/arm/configs/lpc18xx_defconfig                 |   26 +-
3953  arch/arm/configs/multi_v7_defconfig                |   48 +-
3954  arch/arm/configs/mvebu_v7_defconfig                |    9 +-
3955  arch/arm/configs/qcom_defconfig                    |    8 +-
3956  arch/arm/configs/sama5_defconfig                   |   16 +-
3957  arch/arm/configs/shmobile_defconfig                |    4 +-
3958  arch/arm/configs/socfpga_defconfig                 |    2 +
3959  arch/arm/configs/sunxi_defconfig                   |    4 +
3960  arch/arm/configs/tegra_defconfig                   |   10 +-
3961  arch/arm/include/asm/hardware/cache-uniphier.h     |   46 +
3962  arch/arm/include/debug/at91.S                      |   18 +-
3963  arch/arm/kernel/irq.c                              |    3 +
3964  arch/arm/kernel/psci_smp.c                         |    4 +-
3965  arch/arm/mach-at91/pm_suspend.S                    |    2 +
3966  arch/arm/mach-bcm/Kconfig                          |   15 +
3967  arch/arm/mach-bcm/Makefile                         |    5 +-
3968  arch/arm/mach-bcm/bcm_nsp.c                        |   25 +
3969  arch/arm/mach-bcm/brcmstb.c                        |    9 +
3970  arch/arm/mach-berlin/berlin.c                      |    6 +
3971  arch/arm/mach-berlin/platsmp.c                     |   38 +-
3972  arch/arm/mach-cns3xxx/pcie.c                       |   71 +-
3973  arch/arm/mach-davinci/board-dm644x-evm.c           |    4 +-
3974  arch/arm/mach-davinci/clock.c                      |   16 +-
3975  arch/arm/mach-digicolor/Kconfig                    |    3 +
3976  arch/arm/mach-exynos/suspend.c                     |    3 +-
3977  arch/arm/mach-imx/common.h                         |    1 +
3978  arch/arm/mach-imx/gpc.c                            |    8 +-
3979  arch/arm/mach-imx/mach-imx6ul.c                    |    9 +
3980  arch/arm/mach-imx/mach-imx7d.c                     |   74 +
3981  arch/arm/mach-imx/pm-imx6.c                        |   46 +-
3982  arch/arm/mach-imx/suspend-imx6.S                   |    3 +
3983  arch/arm/mach-keystone/keystone.c                  |    3 +
3984  arch/arm/mach-mediatek/Makefile                    |    3 +
3985  arch/arm/mach-mediatek/mediatek.c                  |   27 +
3986  arch/arm/mach-mediatek/platsmp.c                   |  141 ++
3987  arch/arm/mach-meson/Kconfig                        |    5 +
3988  arch/arm/mach-meson/meson.c                        |    1 +
3989  arch/arm/mach-mvebu/board-v7.c                     |   35 -
3990  arch/arm/mach-mvebu/coherency.c                    |   60 +
3991  arch/arm/mach-mvebu/pmsu.c                         |   33 +-
3992  arch/arm/mach-omap1/Kconfig                        |    7 -
3993  arch/arm/mach-omap1/Makefile                       |    1 -
3994  arch/arm/mach-omap1/board-voiceblue.c              |  296 ----
3995  arch/arm/mach-omap1/include/mach/board-voiceblue.h |   19 -
3996  arch/arm/mach-omap2/Kconfig                        |    1 +
3997  arch/arm/mach-omap2/Makefile                       |    3 -
3998  arch/arm/mach-omap2/board-generic.c                |   12 +-
3999  arch/arm/mach-omap2/board-ldp.c                    |    2 +-
4000  arch/arm/mach-omap2/board-rx51.c                   |    2 +-
4001  arch/arm/mach-omap2/clkt34xx_dpll3m2.c             |  122 --
4002  arch/arm/mach-omap2/common.h                       |    3 +-
4003  arch/arm/mach-omap2/devices.c                      |   53 -
4004  arch/arm/mach-omap2/devices.h                      |   19 -
4005  arch/arm/mach-omap2/id.c                           |   30 +-
4006  arch/arm/mach-omap2/omap-hotplug.c                 |    2 +-
4007  arch/arm/mach-omap2/omap-wakeupgen.c               |   10 +-
4008  .../omap_hwmod_33xx_43xx_interconnect_data.c       |   20 -
4009  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   29 -
4010  arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   10 -
4011  arch/arm/mach-omap2/omap_hwmod_54xx_data.c         |    3 +-
4012  arch/arm/mach-omap2/omap_hwmod_7xx_data.c          |   30 -
4013  arch/arm/mach-omap2/pm44xx.c                       |    2 +-
4014  arch/arm/mach-omap2/powerdomains3xxx_data.c        |    2 +-
4015  arch/arm/mach-omap2/soc.h                          |  195 +--
4016  arch/arm/mach-omap2/sram.c                         |   25 -
4017  arch/arm/mach-omap2/sram.h                         |   14 -
4018  arch/arm/mach-omap2/sram34xx.S                     |  346 -----
4019  arch/arm/mach-omap2/timer.c                        |  162 +-
4020  arch/arm/mach-omap2/vc.c                           |    4 -
4021  arch/arm/mach-orion5x/Kconfig                      |    3 +
4022  arch/arm/mach-orion5x/dns323-setup.c               |   53 +-
4023  arch/arm/mach-orion5x/tsx09-common.c               |   49 +-
4024  arch/arm/mach-prima2/hotplug.c                     |    2 +-
4025  arch/arm/mach-pxa/cm-x300.c                        |    9 +-
4026  arch/arm/mach-pxa/colibri-pxa270-income.c          |    9 +-
4027  arch/arm/mach-pxa/devices.c                        |   20 +
4028  arch/arm/mach-pxa/ezx.c                            |    9 +-
4029  arch/arm/mach-pxa/hx4700.c                         |    3 -
4030  arch/arm/mach-pxa/icontrol.c                       |    2 -
4031  arch/arm/mach-pxa/include/mach/magician.h          |   70 +-
4032  arch/arm/mach-pxa/include/mach/pxa27x.h            |    2 +-
4033  arch/arm/mach-pxa/lpd270.c                         |    9 +-
4034  arch/arm/mach-pxa/magician.c                       |  680 +++++----
4035  arch/arm/mach-pxa/mainstone.c                      |   19 +-
4036  arch/arm/mach-pxa/mioa701.c                        |   11 +-
4037  arch/arm/mach-pxa/palm27x.c                        |    9 +-
4038  arch/arm/mach-pxa/palmtc.c                         |    9 +-
4039  arch/arm/mach-pxa/palmte2.c                        |    9 +-
4040  arch/arm/mach-pxa/pcm990-baseboard.c               |    9 +-
4041  arch/arm/mach-pxa/pxa27x.c                         |    2 +-
4042  arch/arm/mach-pxa/raumfeld.c                       |   21 +-
4043  arch/arm/mach-pxa/tavorevb.c                       |   13 +-
4044  arch/arm/mach-pxa/viper.c                          |    9 +-
4045  arch/arm/mach-pxa/z2.c                             |   15 +-
4046  arch/arm/mach-pxa/zylonite.c                       |    9 +-
4047  arch/arm/mach-qcom/platsmp.c                       |    2 +-
4048  arch/arm/mach-realview/hotplug.c                   |    2 +-
4049  arch/arm/mach-s3c24xx/mach-h1940.c                 |   10 +-
4050  arch/arm/mach-s3c24xx/mach-rx1950.c                |    8 +-
4051  arch/arm/mach-s3c64xx/dev-backlight.c              |    4 -
4052  arch/arm/mach-s3c64xx/mach-crag6410.c              |    9 +-
4053  arch/arm/mach-s3c64xx/mach-hmt.c                   |    9 +-
4054  arch/arm/mach-s3c64xx/mach-smartq.c                |    9 +-
4055  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    8 +-
4056  arch/arm/mach-shmobile/Kconfig                     |   73 -
4057  arch/arm/mach-shmobile/Makefile                    |   14 +-
4058  arch/arm/mach-shmobile/Makefile.boot               |   12 -
4059  arch/arm/mach-shmobile/board-bockw-reference.c     |   86 --
4060  arch/arm/mach-shmobile/board-bockw.c               |  737 ---------
4061  arch/arm/mach-shmobile/clock-r8a7778.c             |  342 -----
4062  arch/arm/mach-shmobile/clock.c                     |   47 -
4063  arch/arm/mach-shmobile/clock.h                     |   42 -
4064  arch/arm/mach-shmobile/common.h                    |    5 -
4065  arch/arm/mach-shmobile/console.c                   |   27 -
4066  arch/arm/mach-shmobile/intc.h                      |  295 ----
4067  arch/arm/mach-shmobile/platsmp-apmu.c              |    4 +-
4068  arch/arm/mach-shmobile/pm-r8a7779.c                |   99 --
4069  arch/arm/mach-shmobile/pm-rmobile.c                |   39 +-
4070  arch/arm/mach-shmobile/pm-rmobile.h                |    9 -
4071  arch/arm/mach-shmobile/r8a7778.h                   |   78 -
4072  arch/arm/mach-shmobile/r8a7779.h                   |    8 -
4073  arch/arm/mach-shmobile/setup-r8a7778.c             |  563 +------
4074  arch/arm/mach-shmobile/sh-gpio.h                   |   29 -
4075  arch/arm/mach-shmobile/timer.c                     |   21 -
4076  arch/arm/mach-spear/hotplug.c                      |    2 +-
4077  arch/arm/mach-sunxi/sunxi.c                        |    3 +-
4078  arch/arm/mach-tegra/board-paz00.c                  |    4 +-
4079  arch/arm/mach-tegra/hotplug.c                      |    2 +-
4080  arch/arm/mach-uniphier/Makefile                    |    2 +-
4081  arch/arm/mach-uniphier/headsmp.S                   |   43 +
4082  arch/arm/mach-uniphier/platsmp.c                   |  185 ++-
4083  arch/arm/mach-ux500/hotplug.c                      |    2 +-
4084  arch/arm/mach-vexpress/hotplug.c                   |    2 +-
4085  arch/arm/mm/Kconfig                                |   10 +
4086  arch/arm/mm/Makefile                               |    1 +
4087  arch/arm/mm/cache-uniphier.c                       |  555 +++++++
4088  arch/arm64/Kconfig.platforms                       |   12 +-
4089  arch/arm64/boot/dts/Makefile                       |    1 +
4090  arch/arm64/boot/dts/altera/Makefile                |    5 +
4091  arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi  |  358 +++++
4092  .../boot/dts/altera/socfpga_stratix10_socdk.dts    |   39 +
4093  arch/arm64/boot/dts/apm/Makefile                   |    1 +
4094  arch/arm64/boot/dts/apm/apm-merlin.dts             |   72 +
4095  arch/arm64/boot/dts/apm/apm-mustang.dts            |   12 +
4096  arch/arm64/boot/dts/apm/apm-shadowcat.dtsi         |  271 ++++
4097  arch/arm64/boot/dts/apm/apm-storm.dtsi             |   17 +
4098  arch/arm64/boot/dts/arm/juno-base.dtsi             |   59 +
4099  arch/arm64/boot/dts/arm/juno-motherboard.dtsi      |   15 +
4100  arch/arm64/boot/dts/arm/juno-r1.dts                |   52 +
4101  arch/arm64/boot/dts/arm/juno.dts                   |   32 +
4102  .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts      |    2 +-
4103  arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi      |    1 +
4104  arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi    |  103 ++
4105  arch/arm64/boot/dts/exynos/exynos7.dtsi            |    7 +
4106  arch/arm64/boot/dts/freescale/Makefile             |    4 +-
4107  arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts  |  204 +++
4108  arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts  |  166 +++
4109  .../{fsl-ls2085a-simu.dts => fsl-ls2080a-simu.dts} |   25 +-
4110  arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi     |  515 +++++++
4111  arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi     |  163 --
4112  arch/arm64/boot/dts/hisilicon/Makefile             |    2 +-
4113  arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts     |    7 +-
4114  arch/arm64/boot/dts/hisilicon/hi6220.dtsi          |   43 +-
4115  arch/arm64/boot/dts/hisilicon/hip05-d02.dts        |   36 +
4116  arch/arm64/boot/dts/hisilicon/hip05.dtsi           |  271 ++++
4117  arch/arm64/boot/dts/marvell/Makefile               |    1 +
4118  arch/arm64/boot/dts/marvell/berlin4ct-stb.dts      |   66 +
4119  arch/arm64/boot/dts/marvell/berlin4ct.dtsi         |  120 ++
4120  arch/arm64/boot/dts/mediatek/mt8173-evb.dts        |   18 +
4121  arch/arm64/boot/dts/mediatek/mt8173.dtsi           |   62 +-
4122  arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi          |   30 +
4123  arch/arm64/boot/dts/qcom/msm8916-pins.dtsi         |   76 +-
4124  arch/arm64/boot/dts/qcom/msm8916.dtsi              |   47 +
4125  arch/arm64/configs/defconfig                       |   14 +-
4126  arch/arm64/kernel/psci.c                           |   14 -
4127  drivers/base/power/clock_ops.c                     |    6 +-
4128  drivers/bus/Kconfig                                |   11 +
4129  drivers/bus/Makefile                               |    1 +
4130  drivers/bus/sunxi-rsb.c                            |  783 ++++++++++
4131  drivers/clk/Kconfig                                |   10 +
4132  drivers/clk/Makefile                               |    3 +-
4133  drivers/clk/bcm/Makefile                           |    1 +
4134  drivers/clk/bcm/clk-bcm2835.c                      | 1575 ++++++++++++++++++++
4135  drivers/clk/berlin/bg2q.c                          |   14 +-
4136  drivers/clk/clk-bcm2835.c                          |   55 -
4137  drivers/clk/clk-multiplier.c                       |  181 +++
4138  drivers/clk/clk-scpi.c                             |  325 ++++
4139  drivers/clk/imx/clk-imx25.c                        |   12 +
4140  drivers/clk/imx/clk-imx27.c                        |   13 +
4141  drivers/clk/imx/clk-imx31.c                        |   35 +-
4142  drivers/clk/imx/clk-imx35.c                        |   59 +-
4143  drivers/clk/imx/clk-imx51-imx53.c                  |   16 +
4144  drivers/clk/imx/clk-imx6q.c                        |   12 +-
4145  drivers/clk/imx/clk-imx6sl.c                       |   12 +-
4146  drivers/clk/imx/clk-imx6sx.c                       |    9 +
4147  drivers/clk/imx/clk-imx6ul.c                       |   18 +
4148  drivers/clk/imx/clk-imx7d.c                        |   14 +
4149  drivers/clk/imx/clk-vf610.c                        |    1 +
4150  drivers/clk/imx/clk.c                              |   38 +
4151  drivers/clk/imx/clk.h                              |    1 +
4152  drivers/clk/samsung/clk-exynos5250.c               |   14 +-
4153  drivers/clk/shmobile/clk-mstp.c                    |    4 +
4154  drivers/clk/sunxi/Makefile                         |    3 +
4155  drivers/clk/sunxi/clk-a10-codec.c                  |   44 +
4156  drivers/clk/sunxi/clk-a10-mod1.c                   |   81 +
4157  drivers/clk/sunxi/clk-a10-pll2.c                   |  216 +++
4158  drivers/clk/sunxi/clk-simple-gates.c               |    2 +
4159  drivers/clk/sunxi/clk-sunxi.c                      |    1 +
4160  drivers/clocksource/Kconfig                        |    8 +
4161  drivers/clocksource/Makefile                       |    1 +
4162  drivers/clocksource/tcb_clksrc.c                   |   12 +-
4163  drivers/clocksource/timer-atmel-st.c               |   31 +-
4164  drivers/clocksource/timer-ti-32k.c                 |  126 ++
4165  drivers/cpufreq/Kconfig.arm                        |   10 +
4166  drivers/cpufreq/Makefile                           |    1 +
4167  drivers/cpufreq/scpi-cpufreq.c                     |  124 ++
4168  drivers/firmware/Kconfig                           |   26 +
4169  drivers/firmware/Makefile                          |    4 +-
4170  drivers/firmware/arm_scpi.c                        |  771 ++++++++++
4171  drivers/firmware/psci.c                            |  108 +-
4172  drivers/firmware/qcom_scm-32.c                     |    6 +-
4173  drivers/firmware/raspberrypi.c                     |  260 ++++
4174  drivers/hwmon/Kconfig                              |    8 +
4175  drivers/hwmon/Makefile                             |    1 +
4176  drivers/hwmon/scpi-hwmon.c                         |  288 ++++
4177  drivers/memory/pl172.c                             |   26 +-
4178  drivers/misc/atmel_tclib.c                         |    4 +
4179  drivers/pwm/pwm-atmel-tcb.c                        |   26 +-
4180  drivers/soc/Kconfig                                |    2 +
4181  drivers/soc/Makefile                               |    2 +
4182  drivers/soc/brcmstb/Kconfig                        |    9 +
4183  drivers/soc/brcmstb/Makefile                       |    1 +
4184  drivers/soc/brcmstb/biuctrl.c                      |  116 ++
4185  drivers/soc/brcmstb/common.c                       |   33 +
4186  drivers/soc/mediatek/mtk-pmic-wrap.c               |   10 +-
4187  drivers/soc/mediatek/mtk-scpsys.c                  |   83 +-
4188  drivers/soc/qcom/Kconfig                           |   17 +-
4189  drivers/soc/qcom/smd-rpm.c                         |   68 +-
4190  drivers/soc/qcom/smd.c                             |  296 ++--
4191  drivers/soc/qcom/smem.c                            |  368 ++---
4192  drivers/soc/rockchip/Kconfig                       |   18 +
4193  drivers/soc/rockchip/Makefile                      |    4 +
4194  drivers/soc/rockchip/pm_domains.c                  |  490 ++++++
4195  drivers/soc/ti/knav_qmss.h                         |    3 +-
4196  drivers/soc/ti/knav_qmss_acc.c                     |   14 +-
4197  drivers/soc/ti/knav_qmss_queue.c                   |   67 +-
4198  include/dt-bindings/clock/bcm2835.h                |   47 +
4199  include/dt-bindings/clock/berlin2q.h               |    1 +
4200  include/dt-bindings/clock/exynos5250.h             |    4 +-
4201  include/dt-bindings/clock/imx6qdl-clock.h          |    3 +-
4202  include/dt-bindings/clock/imx6sl-clock.h           |    3 +-
4203  include/dt-bindings/clock/imx6sx-clock.h           |    3 +-
4204  include/dt-bindings/clock/imx7d-clock.h            |    3 +-
4205  include/dt-bindings/clock/sun4i-a10-pll2.h         |   53 +
4206  include/dt-bindings/clock/vf610-clock.h            |    3 +-
4207  include/dt-bindings/power/rk3288-power.h           |   31 +
4208  include/linux/atmel_tc.h                           |    1 +
4209  include/linux/clk-provider.h                       |   42 +
4210  include/linux/mfd/syscon/imx7-iomuxc-gpr.h         |   47 +
4211  include/linux/platform_data/atmel.h                |    8 -
4212  include/linux/psci.h                               |    2 +
4213  include/linux/qcom_scm.h                           |    2 +
4214  include/linux/scpi_protocol.h                      |   78 +
4215  include/linux/soc/brcmstb/brcmstb.h                |   10 +
4216  include/linux/soc/qcom/smd.h                       |   11 +
4217  include/linux/soc/qcom/smem.h                      |    2 +-
4218  include/linux/spi/pxa2xx_spi.h                     |    1 -
4219  include/linux/sunxi-rsb.h                          |  105 ++
4220  include/soc/bcm2835/raspberrypi-firmware.h         |  120 ++
4221  include/soc/brcmstb/common.h                       |   15 +
4222  include/uapi/linux/psci.h                          |   18 +
4223  692 files changed, 31260 insertions(+), 8762 deletions(-)
4224  create mode 100644 Documentation/arm/keystone/knav-qmss.txt
4225  create mode 100644 Documentation/devicetree/bindings/arm/apm/scu.txt
4226  create mode 100644 Documentation/devicetree/bindings/arm/arm,scpi.txt
4227  create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt
4228  create mode 100644 Documentation/devicetree/bindings/arm/mvebu-cpu-config.txt
4229  delete mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt
4230  create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
4231  create mode 100644 Documentation/devicetree/bindings/arm/uniphier/cache-uniphier.txt
4232  rename Documentation/devicetree/bindings/{powerpc/fsl/board.txt => board/fsl-board.txt} (90%)
4233  create mode 100644 Documentation/devicetree/bindings/bus/sunxi-rsb.txt
4234  create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt
4235  create mode 100644 Documentation/devicetree/bindings/pci/arm,juno-r1-pcie.txt
4236  create mode 100644 Documentation/devicetree/bindings/pci/plda,xpressrich3-axi.txt
4237  rename Documentation/devicetree/bindings/{arm/exynos/power_domain.txt => power/pd-samsung.txt} (93%)
4238  create mode 100644 Documentation/devicetree/bindings/power_supply/qcom_smbb.txt
4239  create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt
4240  create mode 100644 Documentation/devicetree/bindings/soc/rockchip/power_domain.txt
4241  create mode 100644 Documentation/hwmon/scpi-hwmon
4242  create mode 100644 arch/arm/arm-soc-for-next-contents.txt
4243  create mode 100644 arch/arm/boot/dts/am335x-bonegreen.dts
4244  create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts
4245  create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
4246  create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
4247  create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud-2bay.dts
4248  create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud.dts
4249  create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
4250  create mode 100644 arch/arm/boot/dts/axp22x.dtsi
4251  create mode 100644 arch/arm/boot/dts/bcm-nsp.dtsi
4252  create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
4253  create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
4254  create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r7000.dts
4255  create mode 100644 arch/arm/boot/dts/bcm958625k.dts
4256  create mode 100644 arch/arm/boot/dts/bcm9hmidc.dtsi
4257  create mode 100644 arch/arm/boot/dts/exynos5250-snow-common.dtsi
4258  create mode 100644 arch/arm/boot/dts/exynos5250-snow-rev5.dts
4259  create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
4260  create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu4.dts
4261  create mode 100644 arch/arm/boot/dts/imx6dl-nit6xlite.dts
4262  create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_max.dts
4263  create mode 100644 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
4264  create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
4265  create mode 100644 arch/arm/boot/dts/meson8b-mxq.dts
4266  create mode 100644 arch/arm/boot/dts/meson8b-odroidc1.dts
4267  create mode 100644 arch/arm/boot/dts/meson8b.dtsi
4268  create mode 100644 arch/arm/boot/dts/omap5-board-common.dtsi
4269  create mode 100644 arch/arm/boot/dts/omap5-igep0050.dts
4270  delete mode 100644 arch/arm/boot/dts/r8a7778-bockw-reference.dts
4271  create mode 100644 arch/arm/boot/dts/r8a7791-porter.dts
4272  create mode 100644 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi
4273  create mode 100644 arch/arm/boot/dts/rk3288-rock2-som.dtsi
4274  create mode 100644 arch/arm/boot/dts/rk3288-rock2-square.dts
4275  create mode 100644 arch/arm/boot/dts/rk3288-veyron-jaq.dts
4276  create mode 100644 arch/arm/boot/dts/sama5d2-pinfunc.h
4277  create mode 100644 arch/arm/boot/dts/sun4i-a10-inet1.dts
4278  create mode 100644 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
4279  create mode 100644 arch/arm/boot/dts/sun4i-a10-pcduino2.dts
4280  create mode 100644 arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
4281  create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
4282  create mode 100644 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
4283  create mode 100644 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts
4284  create mode 100644 arch/arm/boot/dts/sun5i-a13-q8-tablet.dts
4285  create mode 100644 arch/arm/boot/dts/sun5i-q8-common.dtsi
4286  create mode 100644 arch/arm/boot/dts/sun5i-r8-chip.dts
4287  create mode 100644 arch/arm/boot/dts/sun5i-r8.dtsi
4288  create mode 100644 arch/arm/boot/dts/sun6i-a31s-primo81.dts
4289  create mode 100644 arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
4290  create mode 100644 arch/arm/boot/dts/sun6i-a31s-sina31s.dts
4291  create mode 100644 arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
4292  create mode 100644 arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
4293  create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
4294  create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
4295  create mode 100644 arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
4296  mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts
4297  mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
4298  create mode 100644 arch/arm/boot/dts/sun8i-a23-q8-tablet.dts
4299  mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts
4300  mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts
4301  create mode 100644 arch/arm/boot/dts/sun8i-a33-q8-tablet.dts
4302  create mode 100644 arch/arm/boot/dts/sun8i-q8-common.dtsi
4303  create mode 100644 arch/arm/boot/dts/sunxi-q8-common.dtsi
4304  create mode 100644 arch/arm/boot/dts/uniphier-proxstream2-gentil.dts
4305  create mode 100644 arch/arm/boot/dts/uniphier-proxstream2-vodka.dts
4306  delete mode 100644 arch/arm/configs/bockw_defconfig
4307  create mode 100644 arch/arm/include/asm/hardware/cache-uniphier.h
4308  create mode 100644 arch/arm/mach-bcm/bcm_nsp.c
4309  create mode 100644 arch/arm/mach-mediatek/platsmp.c
4310  delete mode 100644 arch/arm/mach-omap1/board-voiceblue.c
4311  delete mode 100644 arch/arm/mach-omap1/include/mach/board-voiceblue.h
4312  delete mode 100644 arch/arm/mach-omap2/clkt34xx_dpll3m2.c
4313  delete mode 100644 arch/arm/mach-omap2/devices.h
4314  delete mode 100644 arch/arm/mach-omap2/sram34xx.S
4315  delete mode 100644 arch/arm/mach-shmobile/Makefile.boot
4316  delete mode 100644 arch/arm/mach-shmobile/board-bockw-reference.c
4317  delete mode 100644 arch/arm/mach-shmobile/board-bockw.c
4318  delete mode 100644 arch/arm/mach-shmobile/clock-r8a7778.c
4319  delete mode 100644 arch/arm/mach-shmobile/clock.c
4320  delete mode 100644 arch/arm/mach-shmobile/clock.h
4321  delete mode 100644 arch/arm/mach-shmobile/console.c
4322  delete mode 100644 arch/arm/mach-shmobile/intc.h
4323  delete mode 100644 arch/arm/mach-shmobile/r8a7778.h
4324  delete mode 100644 arch/arm/mach-shmobile/sh-gpio.h
4325  create mode 100644 arch/arm/mach-uniphier/headsmp.S
4326  create mode 100644 arch/arm/mm/cache-uniphier.c
4327  create mode 100644 arch/arm64/boot/dts/altera/Makefile
4328  create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
4329  create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
4330  create mode 100644 arch/arm64/boot/dts/apm/apm-merlin.dts
4331  create mode 100644 arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
4332  create mode 120000 arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
4333  create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts
4334  create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts
4335  rename arch/arm64/boot/dts/freescale/{fsl-ls2085a-simu.dts => fsl-ls2080a-simu.dts} (81%)
4336  create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
4337  delete mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi
4338  create mode 100644 arch/arm64/boot/dts/hisilicon/hip05-d02.dts
4339  create mode 100644 arch/arm64/boot/dts/hisilicon/hip05.dtsi
4340  create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts
4341  create mode 100644 drivers/bus/sunxi-rsb.c
4342  create mode 100644 drivers/clk/bcm/clk-bcm2835.c
4343  delete mode 100644 drivers/clk/clk-bcm2835.c
4344  create mode 100644 drivers/clk/clk-multiplier.c
4345  create mode 100644 drivers/clk/clk-scpi.c
4346  create mode 100644 drivers/clk/sunxi/clk-a10-codec.c
4347  create mode 100644 drivers/clk/sunxi/clk-a10-mod1.c
4348  create mode 100644 drivers/clk/sunxi/clk-a10-pll2.c
4349  create mode 100644 drivers/clocksource/timer-ti-32k.c
4350  create mode 100644 drivers/cpufreq/scpi-cpufreq.c
4351  create mode 100644 drivers/firmware/arm_scpi.c
4352  create mode 100644 drivers/firmware/raspberrypi.c
4353  create mode 100644 drivers/hwmon/scpi-hwmon.c
4354  create mode 100644 drivers/soc/brcmstb/Kconfig
4355  create mode 100644 drivers/soc/brcmstb/Makefile
4356  create mode 100644 drivers/soc/brcmstb/biuctrl.c
4357  create mode 100644 drivers/soc/brcmstb/common.c
4358  create mode 100644 drivers/soc/rockchip/Kconfig
4359  create mode 100644 drivers/soc/rockchip/Makefile
4360  create mode 100644 drivers/soc/rockchip/pm_domains.c
4361  create mode 100644 include/dt-bindings/clock/bcm2835.h
4362  create mode 100644 include/dt-bindings/clock/sun4i-a10-pll2.h
4363  create mode 100644 include/dt-bindings/power/rk3288-power.h
4364  create mode 100644 include/linux/mfd/syscon/imx7-iomuxc-gpr.h
4365  create mode 100644 include/linux/scpi_protocol.h
4366  create mode 100644 include/linux/soc/brcmstb/brcmstb.h
4367  create mode 100644 include/linux/sunxi-rsb.h
4368  create mode 100644 include/soc/bcm2835/raspberrypi-firmware.h
4369  create mode 100644 include/soc/brcmstb/common.h
4370 Merging at91/at91-next (c544ee640869 Merge tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
4371 $ git merge at91/at91-next
4372 Merge made by the 'recursive' strategy.
4373  arch/arm/mach-at91/Kconfig | 1 +
4374  1 file changed, 1 insertion(+)
4375 Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
4376 $ git merge bcm2835/for-next
4377 Already up-to-date.
4378 Merging berlin/berlin/for-next (27527ea5f2fd Merge branch 'berlin/soc' into berlin/for-next)
4379 $ git merge berlin/berlin/for-next
4380 Merge made by the 'recursive' strategy.
4381  arch/arm/mach-berlin/Kconfig               |  3 ---
4382  arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 22 ++++++++++++++++++++++
4383  2 files changed, 22 insertions(+), 3 deletions(-)
4384 Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
4385 $ git merge cortex-m/for-next
4386 Already up-to-date.
4387 Merging imx-mxs/for-next (f843df81257a Merge branch 'imx/defconfig' into for-next)
4388 $ git merge imx-mxs/for-next
4389 Already up-to-date!
4390 Merge made by the 'recursive' strategy.
4391 Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next)
4392 $ git merge keystone/next
4393 Merge made by the 'recursive' strategy.
4394  drivers/soc/ti/knav_qmss_queue.c | 6 +++---
4395  1 file changed, 3 insertions(+), 3 deletions(-)
4396 Merging mvebu/for-next (2a9e275d2fbf Merge branch 'mvebu/config' into mvebu/for-next)
4397 $ git merge mvebu/for-next
4398 Already up-to-date!
4399 Merge made by the 'recursive' strategy.
4400 Merging omap/for-next (f2a148747f11 Merge branch 'omap-for-v4.3/fixes' into for-next)
4401 $ git merge omap/for-next
4402 Already up-to-date!
4403 Merge made by the 'recursive' strategy.
4404 Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
4405 $ git merge omap-pending/for-next
4406 Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution.
4407 Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution.
4408 Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c
4409 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
4410 Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c
4411 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
4412 Automatic merge failed; fix conflicts and then commit the result.
4413 $ git commit -v -a
4414 [master 4fa0f437a376] Merge remote-tracking branch 'omap-pending/for-next'
4415 $ git diff -M --stat --summary HEAD^..
4416 Merging qcom/qcom/for-next (fcbba086b456 ARM: dts: msm8974: Add SCM firmware node)
4417 $ git merge qcom/qcom/for-next
4418 Resolved 'drivers/soc/qcom/Kconfig' using previous resolution.
4419 Resolved 'drivers/soc/qcom/smd-rpm.c' using previous resolution.
4420 Auto-merging include/linux/qcom_scm.h
4421 Auto-merging drivers/soc/qcom/smd-rpm.c
4422 CONFLICT (content): Merge conflict in drivers/soc/qcom/smd-rpm.c
4423 Auto-merging drivers/soc/qcom/Kconfig
4424 CONFLICT (content): Merge conflict in drivers/soc/qcom/Kconfig
4425 Auto-merging drivers/firmware/qcom_scm-32.c
4426 Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi
4427 Automatic merge failed; fix conflicts and then commit the result.
4428 $ git commit -v -a
4429 [master d40a93dfd7dc] Merge remote-tracking branch 'qcom/qcom/for-next'
4430 $ git diff -M --stat --summary HEAD^..
4431  .../devicetree/bindings/firmware/qcom,scm.txt      |  25 ++
4432  arch/arm/boot/dts/qcom-msm8974.dtsi                |  11 +
4433  drivers/firmware/qcom_scm-32.c                     |  82 +++++++
4434  drivers/firmware/qcom_scm-64.c                     |  25 ++
4435  drivers/firmware/qcom_scm.c                        | 271 ++++++++++++++++++++-
4436  drivers/firmware/qcom_scm.h                        |  12 +
4437  include/linux/qcom_scm.h                           |   6 +
4438  7 files changed, 424 insertions(+), 8 deletions(-)
4439  create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt
4440 Merging renesas/next (c7aba848d39f Merge branches 'heads/defconfig-for-v4.4' and 'heads/dt-for-v4.4' into next)
4441 $ git merge renesas/next
4442 Already up-to-date!
4443 Merge made by the 'recursive' strategy.
4444 Merging rockchip/for-next (55e899c44d10 Merge branch 'v4.4-armsoc/drivers' into for-next)
4445 $ git merge rockchip/for-next
4446 Already up-to-date!
4447 Merge made by the 'recursive' strategy.
4448 Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
4449 $ git merge rpi/for-rpi-next
4450 Already up-to-date.
4451 Merging samsung/for-next (4ccfae394061 Merge branch 'v4.4-samsung-defconfig' into for-next)
4452 $ git merge samsung/for-next
4453 Resolved 'drivers/soc/Kconfig' using previous resolution.
4454 Resolved 'drivers/soc/Makefile' using previous resolution.
4455 Auto-merging drivers/soc/Makefile
4456 CONFLICT (content): Merge conflict in drivers/soc/Makefile
4457 Auto-merging drivers/soc/Kconfig
4458 CONFLICT (content): Merge conflict in drivers/soc/Kconfig
4459 Auto-merging arch/arm/mach-exynos/suspend.c
4460 Removing arch/arm/mach-exynos/regs-srom.h
4461 Auto-merging MAINTAINERS
4462 Automatic merge failed; fix conflicts and then commit the result.
4463 $ git commit -v -a
4464 [master d0c922f553d6] Merge remote-tracking branch 'samsung/for-next'
4465 $ git diff -M --stat --summary HEAD^..
4466  .../bindings/arm/samsung/exynos-srom.txt           |  12 ++
4467  MAINTAINERS                                        |   1 +
4468  arch/arm/boot/dts/exynos4.dtsi                     |   5 +
4469  arch/arm/boot/dts/exynos5.dtsi                     |   5 +
4470  arch/arm/mach-exynos/Kconfig                       |   2 +
4471  arch/arm/mach-exynos/exynos.c                      |  22 ---
4472  arch/arm/mach-exynos/include/mach/map.h            |   8 -
4473  arch/arm/mach-exynos/regs-srom.h                   |  53 -------
4474  arch/arm/mach-exynos/suspend.c                     |  20 +--
4475  arch/arm/plat-samsung/include/plat/map-s5p.h       |   1 -
4476  drivers/cpufreq/s5pv210-cpufreq.c                  |   2 -
4477  drivers/soc/Kconfig                                |   1 +
4478  drivers/soc/Makefile                               |   1 +
4479  drivers/soc/samsung/Kconfig                        |  13 ++
4480  drivers/soc/samsung/Makefile                       |   1 +
4481  drivers/soc/samsung/exynos-srom.c                  | 175 +++++++++++++++++++++
4482  drivers/soc/samsung/exynos-srom.h                  |  51 ++++++
4483  17 files changed, 269 insertions(+), 104 deletions(-)
4484  create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-srom.txt
4485  delete mode 100644 arch/arm/mach-exynos/regs-srom.h
4486  create mode 100644 drivers/soc/samsung/Kconfig
4487  create mode 100644 drivers/soc/samsung/Makefile
4488  create mode 100644 drivers/soc/samsung/exynos-srom.c
4489  create mode 100644 drivers/soc/samsung/exynos-srom.h
4490 Merging samsung-krzk/for-next (6ff33f3902c3 Linux 4.3-rc1)
4491 $ git merge samsung-krzk/for-next
4492 Already up-to-date.
4493 Merging sunxi/sunxi/for-next (7022e5f74246 Merge branch 'sunxi/dt-for-4.4' into sunxi/for-next)
4494 $ git merge sunxi/sunxi/for-next
4495 Already up-to-date!
4496 Merge made by the 'recursive' strategy.
4497 Merging tegra/for-next (2d37df587e3c Merge branch for-4.4/defconfig into for-next)
4498 $ git merge tegra/for-next
4499 Auto-merging drivers/clk/tegra/clk-dfll.c
4500 Merge made by the 'recursive' strategy.
4501  drivers/clk/tegra/clk-dfll.c        | 114 ++++++++++++++++++------------------
4502  drivers/clk/tegra/clk-tegra-audio.c |  25 +++++---
4503  drivers/clk/tegra/clk-tegra114.c    |   8 ++-
4504  drivers/clk/tegra/clk-tegra124.c    |   8 ++-
4505  drivers/clk/tegra/clk-tegra30.c     |   8 ++-
4506  drivers/clk/tegra/clk.h             | 106 +++++++++++++++++++++------------
4507  drivers/clk/tegra/cvb.c             |   7 ---
4508  7 files changed, 163 insertions(+), 113 deletions(-)
4509 Merging arm64/for-next/core (f8f8bdc48851 arm64/efi: fix libstub build under CONFIG_MODVERSIONS)
4510 $ git merge arm64/for-next/core
4511 Resolved 'Documentation/arm/uefi.txt' using previous resolution.
4512 Resolved 'arch/arm64/include/asm/atomic.h' using previous resolution.
4513 Resolved 'arch/arm64/kernel/cpufeature.c' using previous resolution.
4514 Resolved 'arch/arm64/kernel/suspend.c' using previous resolution.
4515 Auto-merging drivers/firmware/efi/Makefile
4516 Auto-merging arch/arm64/mm/proc.S
4517 Auto-merging arch/arm64/mm/fault.c
4518 Auto-merging arch/arm64/kvm/Kconfig
4519 Auto-merging arch/arm64/kernel/suspend.c
4520 CONFLICT (content): Merge conflict in arch/arm64/kernel/suspend.c
4521 Auto-merging arch/arm64/kernel/setup.c
4522 Auto-merging arch/arm64/kernel/head.S
4523 Auto-merging arch/arm64/kernel/efi.c
4524 Auto-merging arch/arm64/kernel/debug-monitors.c
4525 Auto-merging arch/arm64/kernel/cpufeature.c
4526 CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
4527 Auto-merging arch/arm64/kernel/cpu_errata.c
4528 Removing arch/arm64/include/asm/pmu.h
4529 Auto-merging arch/arm64/include/asm/pgtable.h
4530 Auto-merging arch/arm64/include/asm/memory.h
4531 Auto-merging arch/arm64/include/asm/cputype.h
4532 Auto-merging arch/arm64/include/asm/cpufeature.h
4533 Auto-merging arch/arm64/include/asm/atomic.h
4534 CONFLICT (content): Merge conflict in arch/arm64/include/asm/atomic.h
4535 Auto-merging arch/arm64/configs/defconfig
4536 Auto-merging arch/arm64/boot/dts/arm/juno.dts
4537 Auto-merging arch/arm64/boot/dts/arm/juno-r1.dts
4538 Auto-merging arch/arm64/Makefile
4539 Auto-merging arch/arm64/Kconfig
4540 Auto-merging MAINTAINERS
4541 Auto-merging Documentation/devicetree/bindings/arm/pmu.txt
4542 Auto-merging Documentation/arm64/booting.txt
4543 Auto-merging Documentation/arm/uefi.txt
4544 CONFLICT (content): Merge conflict in Documentation/arm/uefi.txt
4545 Automatic merge failed; fix conflicts and then commit the result.
4546 $ git commit -v -a
4547 [master c2a75885ff15] Merge remote-tracking branch 'arm64/for-next/core'
4548 $ git diff -M --stat --summary HEAD^..
4549  Documentation/arm/uefi.txt                         |    2 -
4550  Documentation/arm64/booting.txt                    |    7 +-
4551  Documentation/devicetree/bindings/arm/pmu.txt      |    2 +
4552  .../features/debug/KASAN/arch-support.txt          |    2 +-
4553  MAINTAINERS                                        |    9 +-
4554  arch/arm64/Kconfig                                 |   69 +-
4555  arch/arm64/Kconfig.debug                           |    2 +-
4556  arch/arm64/Makefile                                |    7 +
4557  arch/arm64/boot/dts/arm/juno-r1.dts                |   18 +-
4558  arch/arm64/boot/dts/arm/juno.dts                   |   18 +-
4559  arch/arm64/configs/defconfig                       |    9 +
4560  arch/arm64/include/asm/assembler.h                 |   11 +
4561  arch/arm64/include/asm/atomic.h                    |   63 +-
4562  arch/arm64/include/asm/atomic_ll_sc.h              |   98 +-
4563  arch/arm64/include/asm/atomic_lse.h                |  193 ++--
4564  arch/arm64/include/asm/cache.h                     |    2 +-
4565  arch/arm64/include/asm/cacheflush.h                |    7 +
4566  arch/arm64/include/asm/cachetype.h                 |    4 +-
4567  arch/arm64/include/asm/cmpxchg.h                   |  279 +++--
4568  arch/arm64/include/asm/cpu.h                       |    4 +
4569  arch/arm64/include/asm/cpufeature.h                |   91 +-
4570  arch/arm64/include/asm/cputype.h                   |   15 -
4571  arch/arm64/include/asm/fixmap.h                    |    7 +-
4572  arch/arm64/include/asm/hw_breakpoint.h             |    9 +-
4573  arch/arm64/include/asm/hwcap.h                     |    8 +
4574  arch/arm64/include/asm/irq.h                       |    1 -
4575  arch/arm64/include/asm/kasan.h                     |   38 +
4576  arch/arm64/include/asm/kernel-pgtable.h            |   83 ++
4577  arch/arm64/include/asm/memory.h                    |    6 +-
4578  arch/arm64/include/asm/mmu.h                       |   15 +-
4579  arch/arm64/include/asm/mmu_context.h               |  113 +--
4580  arch/arm64/include/asm/page.h                      |   27 +-
4581  arch/arm64/include/asm/pgalloc.h                   |    1 +
4582  arch/arm64/include/asm/pgtable-hwdef.h             |   48 +-
4583  arch/arm64/include/asm/pgtable.h                   |   30 +-
4584  arch/arm64/include/asm/pmu.h                       |   83 --
4585  arch/arm64/include/asm/processor.h                 |    2 +-
4586  arch/arm64/include/asm/ptrace.h                    |   16 +-
4587  arch/arm64/include/asm/string.h                    |   16 +
4588  arch/arm64/include/asm/sysreg.h                    |  157 ++-
4589  arch/arm64/include/asm/thread_info.h               |    5 +-
4590  arch/arm64/include/asm/tlb.h                       |   26 +-
4591  arch/arm64/include/asm/tlbflush.h                  |   18 +-
4592  arch/arm64/kernel/Makefile                         |   11 +-
4593  arch/arm64/kernel/arm64ksyms.c                     |    3 +
4594  arch/arm64/kernel/asm-offsets.c                    |    2 +-
4595  arch/arm64/kernel/cpu_errata.c                     |    2 +-
4596  arch/arm64/kernel/cpufeature.c                     |  854 +++++++++++++++-
4597  arch/arm64/kernel/cpuinfo.c                        |  254 +++--
4598  arch/arm64/kernel/debug-monitors.c                 |    6 +-
4599  arch/arm64/kernel/efi-entry.S                      |   10 +-
4600  arch/arm64/kernel/efi.c                            |    5 +-
4601  arch/arm64/kernel/entry.S                          |    2 +
4602  arch/arm64/kernel/fpsimd.c                         |   16 +-
4603  arch/arm64/kernel/head.S                           |   76 +-
4604  arch/arm64/kernel/hw_breakpoint.c                  |   19 +-
4605  arch/arm64/kernel/image.h                          |   38 +-
4606  arch/arm64/kernel/irq.c                            |   62 --
4607  arch/arm64/kernel/module.c                         |   16 +-
4608  arch/arm64/kernel/perf_event.c                     | 1066 ++++----------------
4609  arch/arm64/kernel/process.c                        |    3 +
4610  arch/arm64/kernel/setup.c                          |  245 +----
4611  arch/arm64/kernel/smp.c                            |   22 +-
4612  arch/arm64/kernel/suspend.c                        |    2 +-
4613  arch/arm64/kernel/traps.c                          |   15 +-
4614  arch/arm64/kernel/vmlinux.lds.S                    |    6 +-
4615  arch/arm64/kvm/Kconfig                             |    3 +
4616  arch/arm64/kvm/reset.c                             |    2 +-
4617  arch/arm64/kvm/sys_regs.c                          |   12 +-
4618  arch/arm64/lib/copy_from_user.S                    |   78 +-
4619  arch/arm64/lib/copy_in_user.S                      |   67 +-
4620  arch/arm64/lib/copy_template.S                     |  193 ++++
4621  arch/arm64/lib/copy_to_user.S                      |   67 +-
4622  arch/arm64/lib/memchr.S                            |    2 +-
4623  arch/arm64/lib/memcmp.S                            |    2 +-
4624  arch/arm64/lib/memcpy.S                            |  184 +---
4625  arch/arm64/lib/memmove.S                           |    9 +-
4626  arch/arm64/lib/memset.S                            |    5 +-
4627  arch/arm64/lib/strcmp.S                            |    2 +-
4628  arch/arm64/lib/strlen.S                            |    2 +-
4629  arch/arm64/lib/strncmp.S                           |    2 +-
4630  arch/arm64/mm/Makefile                             |    3 +
4631  arch/arm64/mm/cache.S                              |   10 +-
4632  arch/arm64/mm/context.c                            |  236 +++--
4633  arch/arm64/mm/dump.c                               |   18 +-
4634  arch/arm64/mm/fault.c                              |    2 +-
4635  arch/arm64/mm/init.c                               |   19 +-
4636  arch/arm64/mm/kasan_init.c                         |  165 +++
4637  arch/arm64/mm/mmu.c                                |  145 ++-
4638  arch/arm64/mm/pageattr.c                           |    2 +-
4639  arch/arm64/mm/pgd.c                                |    2 -
4640  arch/arm64/mm/proc.S                               |   10 +-
4641  drivers/firmware/efi/Makefile                      |    8 +
4642  drivers/firmware/efi/libstub/Makefile              |   42 +-
4643  .../firmware/efi/libstub/arm64-stub.c              |    0
4644  drivers/firmware/efi/libstub/fdt.c                 |    9 -
4645  drivers/firmware/efi/libstub/string.c              |   57 ++
4646  drivers/perf/Kconfig                               |    2 +-
4647  kernel/irq/cpuhotplug.c                            |    2 +-
4648  scripts/Makefile.kasan                             |    4 +-
4649  100 files changed, 3298 insertions(+), 2424 deletions(-)
4650  create mode 100644 arch/arm64/include/asm/kasan.h
4651  create mode 100644 arch/arm64/include/asm/kernel-pgtable.h
4652  delete mode 100644 arch/arm64/include/asm/pmu.h
4653  create mode 100644 arch/arm64/lib/copy_template.S
4654  create mode 100644 arch/arm64/mm/kasan_init.c
4655  rename arch/arm64/kernel/efi-stub.c => drivers/firmware/efi/libstub/arm64-stub.c (100%)
4656  create mode 100644 drivers/firmware/efi/libstub/string.c
4657 Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
4658 $ git merge blackfin/for-linus
4659 Already up-to-date.
4660 Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
4661 $ git merge c6x/for-linux-next
4662 Removing arch/c6x/include/asm/clkdev.h
4663 Auto-merging arch/c6x/include/asm/Kbuild
4664 Merge made by the 'recursive' strategy.
4665  arch/c6x/include/asm/Kbuild   |  1 +
4666  arch/c6x/include/asm/clkdev.h | 22 ----------------------
4667  2 files changed, 1 insertion(+), 22 deletions(-)
4668  delete mode 100644 arch/c6x/include/asm/clkdev.h
4669 Merging cris/for-next (918fc2ee791e cris: Drop reference to get_cmos_time())
4670 $ git merge cris/for-next
4671 Merge made by the 'recursive' strategy.
4672 Merging h8300/h8300-next (6829bca19fa4 h8300: Don't set CROSS_COMPILE unconditionally)
4673 $ git merge h8300/h8300-next
4674 Auto-merging drivers/clocksource/h8300_timer8.c
4675 Merge made by the 'recursive' strategy.
4676  arch/h8300/Makefile                    |  2 ++
4677  arch/h8300/boot/compressed/Makefile    |  5 +++--
4678  arch/h8300/boot/compressed/head.S      |  4 ++--
4679  arch/h8300/boot/compressed/misc.c      |  7 +------
4680  arch/h8300/boot/compressed/vmlinux.lds |  2 +-
4681  arch/h8300/boot/dts/edosk2674.dts      |  6 +++---
4682  arch/h8300/include/asm/io.h            | 12 ++++++------
4683  arch/h8300/include/asm/thread_info.h   | 14 ++++++--------
4684  arch/h8300/kernel/vmlinux.lds.S        |  4 ++--
4685  drivers/clk/h8300/clk-div.c            |  6 +++++-
4686  drivers/clocksource/h8300_timer8.c     |  5 +++--
4687  include/asm-generic/uaccess.h          | 10 ++++++----
4688  12 files changed, 40 insertions(+), 37 deletions(-)
4689 Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
4690 $ git merge hexagon/linux-next
4691 Already up-to-date.
4692 Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
4693 $ git merge ia64/next
4694 Merge made by the 'recursive' strategy.
4695  fs/pstore/Kconfig      |  2 +-
4696  fs/pstore/Makefile     |  6 +++---
4697  fs/pstore/ftrace.c     | 25 +++++++++++++++++++------
4698  fs/pstore/inode.c      | 11 ++++++++++-
4699  fs/pstore/internal.h   |  6 +++++-
4700  fs/pstore/platform.c   | 42 +++++++++++++++++++++++++++++++++++++++++-
4701  fs/pstore/pmsg.c       |  9 +++++++++
4702  fs/pstore/ram.c        | 19 ++++++++-----------
4703  include/linux/pstore.h | 14 +-------------
4704  kernel/printk/printk.c |  1 +
4705  10 files changed, 98 insertions(+), 37 deletions(-)
4706 Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address)
4707 $ git merge m68k/for-next
4708 Already up-to-date.
4709 Merging m68knommu/for-next (4ac313111018 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU)
4710 $ git merge m68knommu/for-next
4711 Merge made by the 'recursive' strategy.
4712  fs/binfmt_elf_fdpic.c | 7 +------
4713  1 file changed, 1 insertion(+), 6 deletions(-)
4714 Merging metag/for-next (3dce23eb8878 metag: Turn irq_ctx_* macros into static inlines)
4715 $ git merge metag/for-next
4716 Merge made by the 'recursive' strategy.
4717  arch/metag/include/asm/irq.h | 8 ++++++--
4718  arch/metag/kernel/smp.c      | 2 ++
4719  2 files changed, 8 insertions(+), 2 deletions(-)
4720 Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
4721 $ git merge microblaze/next
4722 Already up-to-date.
4723 Merging mips/mips-for-linux-next (4deb27263d5f Merge branch '4.3-fixes' into mips-for-linux-next)
4724 $ git merge mips/mips-for-linux-next
4725 Auto-merging arch/mips/include/asm/atomic.h
4726 Merge made by the 'recursive' strategy.
4727  arch/mips/Kbuild                                   |   1 +
4728  arch/mips/Kconfig                                  |  30 ++-
4729  arch/mips/Kconfig.debug                            |  72 +++++
4730  arch/mips/Makefile                                 |   4 +
4731  arch/mips/bcm47xx/setup.c                          |  19 +-
4732  arch/mips/bcm47xx/sprom.c                          |  46 ++--
4733  arch/mips/boot/dts/mti/malta.dts                   |   4 +
4734  arch/mips/configs/bigsur_defconfig                 |  12 +-
4735  arch/mips/configs/capcella_defconfig               |   6 +-
4736  arch/mips/configs/e55_defconfig                    |   6 +-
4737  arch/mips/configs/fuloong2e_defconfig              |  14 +-
4738  arch/mips/configs/lasat_defconfig                  |  10 +-
4739  arch/mips/configs/lemote2f_defconfig               |  11 +-
4740  arch/mips/configs/malta_defconfig                  |   6 +-
4741  arch/mips/configs/malta_kvm_defconfig              |  16 +-
4742  arch/mips/configs/malta_kvm_guest_defconfig        |  16 +-
4743  arch/mips/configs/malta_qemu_32r6_defconfig        |  11 +-
4744  arch/mips/configs/maltaaprp_defconfig              |  11 +-
4745  arch/mips/configs/maltasmvp_eva_defconfig          |  11 +-
4746  arch/mips/configs/maltaup_defconfig                |  11 +-
4747  arch/mips/configs/maltaup_xpa_defconfig            |  16 +-
4748  arch/mips/configs/mpc30x_defconfig                 |   6 +-
4749  arch/mips/include/asm/abi.h                        |   5 +-
4750  arch/mips/include/asm/atomic.h                     |   2 +-
4751  arch/mips/include/asm/bcache.h                     |  27 ++
4752  arch/mips/include/asm/clocksource.h                |  29 ++
4753  arch/mips/include/asm/cpu-features.h               |   6 +-
4754  arch/mips/include/asm/debug.h                      |  22 ++
4755  arch/mips/include/asm/elf.h                        |   7 +
4756  arch/mips/include/asm/fw/fw.h                      |  16 --
4757  arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |   5 -
4758  .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h |  14 +
4759  arch/mips/include/asm/mach-malta/malta-dtshim.h    |  29 ++
4760  arch/mips/include/asm/mips-cm.h                    |  78 +++++-
4761  arch/mips/include/asm/mips-cpc.h                   |   3 +-
4762  arch/mips/include/asm/mipsregs.h                   |  15 +-
4763  arch/mips/include/asm/processor.h                  |   8 +-
4764  arch/mips/include/asm/vdso.h                       | 139 ++++++++--
4765  arch/mips/include/uapi/asm/Kbuild                  |   2 +-
4766  arch/mips/include/uapi/asm/auxvec.h                |  17 ++
4767  arch/mips/jz4740/board-qi_lb60.c                   |  13 +-
4768  arch/mips/kernel/Makefile                          |   1 +
4769  arch/mips/kernel/cps-vec-ns16550.S                 | 202 ++++++++++++++
4770  arch/mips/kernel/cps-vec.S                         |  44 +++-
4771  arch/mips/kernel/cpu-probe.c                       |   3 +-
4772  arch/mips/kernel/csrc-r4k.c                        |  44 ++++
4773  arch/mips/kernel/idle.c                            |  11 +-
4774  arch/mips/kernel/mips-cm.c                         | 114 +++++---
4775  arch/mips/kernel/mips-cpc.c                        |   6 +
4776  arch/mips/kernel/mips-r2-to-r6-emul.c              |   2 +-
4777  arch/mips/kernel/segment.c                         |   2 +-
4778  arch/mips/kernel/setup.c                           |   1 +
4779  arch/mips/kernel/signal.c                          |  12 +-
4780  arch/mips/kernel/signal32.c                        |   7 +-
4781  arch/mips/kernel/signal_n32.c                      |   5 +-
4782  arch/mips/kernel/smp-cps.c                         |  35 ++-
4783  arch/mips/kernel/smp-gic.c                         |   2 +
4784  arch/mips/kernel/spinlock_test.c                   |   4 +-
4785  arch/mips/kernel/stacktrace.c                      |  27 +-
4786  arch/mips/kernel/traps.c                           |   9 +-
4787  arch/mips/kernel/unaligned.c                       |   2 +-
4788  arch/mips/kernel/vdso.c                            | 207 +++++++++------
4789  arch/mips/lantiq/clk.c                             |  17 ++
4790  arch/mips/lantiq/clk.h                             |  13 +
4791  arch/mips/lantiq/irq.c                             |   8 +-
4792  arch/mips/lantiq/xway/clk.c                        | 175 +++++++++++-
4793  arch/mips/lantiq/xway/prom.c                       |  35 ++-
4794  arch/mips/lantiq/xway/reset.c                      | 114 ++++++--
4795  arch/mips/lantiq/xway/sysctrl.c                    | 260 +++++++++++++++---
4796  arch/mips/lib/Makefile                             |   2 +-
4797  arch/mips/lib/bswapdi.c                            |  15 ++
4798  arch/mips/lib/bswapsi.c                            |  11 +
4799  arch/mips/math-emu/me-debugfs.c                    |   2 +-
4800  arch/mips/mm/Makefile                              |   1 +
4801  arch/mips/mm/sc-debugfs.c                          |  81 ++++++
4802  arch/mips/mm/sc-mips.c                             |  65 ++++-
4803  arch/mips/mm/tlbex.c                               |  97 ++++---
4804  arch/mips/mti-malta/Makefile                       |  15 +-
4805  arch/mips/mti-malta/malta-dtshim.c                 | 162 ++++++++++++
4806  arch/mips/mti-malta/malta-init.c                   |   1 +
4807  arch/mips/mti-malta/malta-memory.c                 | 131 +--------
4808  arch/mips/mti-malta/malta-setup.c                  |   5 +-
4809  arch/mips/pci/pci-rt3883.c                         |   6 +-
4810  arch/mips/vdso/.gitignore                          |   4 +
4811  arch/mips/vdso/Makefile                            | 160 +++++++++++
4812  arch/mips/vdso/elf.S                               |  68 +++++
4813  arch/mips/vdso/genvdso.c                           | 293 +++++++++++++++++++++
4814  arch/mips/vdso/genvdso.h                           | 187 +++++++++++++
4815  arch/mips/vdso/gettimeofday.c                      | 232 ++++++++++++++++
4816  arch/mips/vdso/sigreturn.S                         |  49 ++++
4817  arch/mips/vdso/vdso.h                              |  89 +++++++
4818  arch/mips/vdso/vdso.lds.S                          | 105 ++++++++
4819  drivers/clocksource/mips-gic-timer.c               |   7 +-
4820  drivers/irqchip/irq-mips-gic.c                     |  14 +
4821  include/linux/irqchip/mips-gic.h                   |  17 ++
4822  95 files changed, 3350 insertions(+), 607 deletions(-)
4823  create mode 100644 arch/mips/include/asm/clocksource.h
4824  create mode 100644 arch/mips/include/asm/debug.h
4825  create mode 100644 arch/mips/include/asm/mach-malta/malta-dtshim.h
4826  create mode 100644 arch/mips/include/uapi/asm/auxvec.h
4827  create mode 100644 arch/mips/kernel/cps-vec-ns16550.S
4828  create mode 100644 arch/mips/lib/bswapdi.c
4829  create mode 100644 arch/mips/lib/bswapsi.c
4830  create mode 100644 arch/mips/mm/sc-debugfs.c
4831  create mode 100644 arch/mips/mti-malta/malta-dtshim.c
4832  create mode 100644 arch/mips/vdso/.gitignore
4833  create mode 100644 arch/mips/vdso/Makefile
4834  create mode 100644 arch/mips/vdso/elf.S
4835  create mode 100644 arch/mips/vdso/genvdso.c
4836  create mode 100644 arch/mips/vdso/genvdso.h
4837  create mode 100644 arch/mips/vdso/gettimeofday.c
4838  create mode 100644 arch/mips/vdso/sigreturn.S
4839  create mode 100644 arch/mips/vdso/vdso.h
4840  create mode 100644 arch/mips/vdso/vdso.lds.S
4841 Merging nios2/for-next (8840da98bfec nios2: Switch to generic __xchg())
4842 $ git merge nios2/for-next
4843 Merge made by the 'recursive' strategy.
4844  arch/nios2/include/asm/cmpxchg.h | 47 ----------------------------------------
4845  arch/nios2/kernel/setup.c        |  2 +-
4846  2 files changed, 1 insertion(+), 48 deletions(-)
4847 Merging parisc-hd/for-next (a01fece2e418 parisc: Change L1_CACHE_BYTES to 16)
4848 $ git merge parisc-hd/for-next
4849 Auto-merging include/linux/netdevice.h
4850 Merge made by the 'recursive' strategy.
4851  arch/parisc/include/asm/cache.h       | 18 +++++-------------
4852  arch/parisc/include/uapi/asm/unistd.h |  4 +++-
4853  arch/parisc/kernel/syscall_table.S    |  2 ++
4854  drivers/parisc/lba_pci.c              | 12 ++++++------
4855  drivers/tty/serial/mux.c              |  9 ++-------
4856  include/linux/netdevice.h             |  4 ++--
4857  6 files changed, 20 insertions(+), 29 deletions(-)
4858 Merging powerpc/next (3b0e21ec3b22 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
4859 $ git merge powerpc/next
4860 Auto-merging include/linux/fsl/guts.h
4861 Auto-merging drivers/clk/Kconfig
4862 Auto-merging arch/powerpc/sysdev/mpic.c
4863 Removing arch/powerpc/boot/prpmc2800.c
4864 Removing arch/powerpc/boot/dts/prpmc2800.dts
4865 Auto-merging arch/powerpc/boot/dts/fsl/t4240rdb.dts
4866 Auto-merging arch/powerpc/boot/dts/fsl/t4240qds.dts
4867 Auto-merging arch/powerpc/boot/dts/fsl/t2081qds.dts
4868 Auto-merging arch/powerpc/boot/dts/fsl/t2080rdb.dts
4869 Auto-merging arch/powerpc/boot/dts/fsl/t2080qds.dts
4870 Auto-merging arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi
4871 Auto-merging arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts
4872 Auto-merging arch/powerpc/boot/dts/fsl/t1042rdb.dts
4873 Auto-merging arch/powerpc/boot/dts/fsl/t1042qds.dts
4874 Auto-merging arch/powerpc/boot/dts/fsl/t1042d4rdb.dts
4875 Auto-merging arch/powerpc/boot/dts/fsl/t1040rdb.dts
4876 Auto-merging arch/powerpc/boot/dts/fsl/t1040qds.dts
4877 Auto-merging arch/powerpc/boot/dts/fsl/t1040d4rdb.dts
4878 Auto-merging arch/powerpc/boot/dts/fsl/t1024rdb.dts
4879 Auto-merging arch/powerpc/boot/dts/fsl/t1024qds.dts
4880 Auto-merging arch/powerpc/boot/dts/fsl/t1023rdb.dts
4881 Auto-merging arch/powerpc/boot/dts/fsl/ppa8548.dts
4882 Auto-merging arch/powerpc/boot/dts/fsl/p5040ds.dts
4883 Auto-merging arch/powerpc/boot/dts/fsl/p5020ds.dts
4884 Auto-merging arch/powerpc/boot/dts/fsl/p4080ds.dts
4885 Auto-merging arch/powerpc/boot/dts/fsl/p3041ds.dts
4886 Auto-merging arch/powerpc/boot/dts/fsl/p2041rdb.dts
4887 Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb.dts
4888 Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb-pc_36b.dts
4889 Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb-pc_32b.dts
4890 Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi
4891 Auto-merging arch/powerpc/boot/dts/fsl/p2020ds.dts
4892 Auto-merging arch/powerpc/boot/dts/fsl/p1025twr.dtsi
4893 Auto-merging arch/powerpc/boot/dts/fsl/p1025twr.dts
4894 Auto-merging arch/powerpc/boot/dts/fsl/p1025rdb_36b.dts
4895 Auto-merging arch/powerpc/boot/dts/fsl/p1025rdb_32b.dts
4896 Auto-merging arch/powerpc/boot/dts/fsl/p1024rdb_36b.dts
4897 Auto-merging arch/powerpc/boot/dts/fsl/p1024rdb_32b.dts
4898 Auto-merging arch/powerpc/boot/dts/fsl/p1023rdb.dts
4899 Auto-merging arch/powerpc/boot/dts/fsl/p1022rdk.dts
4900 Auto-merging arch/powerpc/boot/dts/fsl/p1022ds_36b.dts
4901 Auto-merging arch/powerpc/boot/dts/fsl/p1022ds_32b.dts
4902 Auto-merging arch/powerpc/boot/dts/fsl/p1022ds.dtsi
4903 Auto-merging arch/powerpc/boot/dts/fsl/p1021rdb-pc_36b.dts
4904 Auto-merging arch/powerpc/boot/dts/fsl/p1021rdb-pc_32b.dts
4905 Auto-merging arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi
4906 Auto-merging arch/powerpc/boot/dts/fsl/p1021mds.dts
4907 Auto-merging arch/powerpc/boot/dts/fsl/p1020utm-pc_36b.dts
4908 Auto-merging arch/powerpc/boot/dts/fsl/p1020utm-pc_32b.dts
4909 Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb_36b.dts
4910 Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb.dts
4911 Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts
4912 Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb-pc_36b.dts
4913 Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb-pc_32b.dts
4914 Auto-merging arch/powerpc/boot/dts/fsl/p1020mbg-pc_36b.dts
4915 Auto-merging arch/powerpc/boot/dts/fsl/p1020mbg-pc_32b.dts
4916 Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
4917 Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pb_36b.dts
4918 Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pb.dts
4919 Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pa_36b.dts
4920 Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pa.dts
4921 Auto-merging arch/powerpc/boot/dts/fsl/oca4080.dts
4922 Auto-merging arch/powerpc/boot/dts/fsl/mvme2500.dts
4923 Auto-merging arch/powerpc/boot/dts/fsl/mpc8572ds_36b.dts
4924 Auto-merging arch/powerpc/boot/dts/fsl/mpc8572ds.dts
4925 Auto-merging arch/powerpc/boot/dts/fsl/mpc8569mds.dts
4926 Auto-merging arch/powerpc/boot/dts/fsl/mpc8568mds.dts
4927 Auto-merging arch/powerpc/boot/dts/fsl/mpc8560ads.dts
4928 Auto-merging arch/powerpc/boot/dts/fsl/mpc8555cds.dts
4929 Auto-merging arch/powerpc/boot/dts/fsl/mpc8548cds_36b.dts
4930 Auto-merging arch/powerpc/boot/dts/fsl/mpc8548cds_32b.dts
4931 Auto-merging arch/powerpc/boot/dts/fsl/mpc8544ds.dts
4932 Auto-merging arch/powerpc/boot/dts/fsl/mpc8541cds.dts
4933 Auto-merging arch/powerpc/boot/dts/fsl/mpc8540ads.dts
4934 Auto-merging arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts
4935 Auto-merging arch/powerpc/boot/dts/fsl/mpc8536ds.dts
4936 Auto-merging arch/powerpc/boot/dts/fsl/kmcoge4.dts
4937 Auto-merging arch/powerpc/boot/dts/fsl/ge_imp3a.dts
4938 Auto-merging arch/powerpc/boot/dts/fsl/c293pcie.dts
4939 Auto-merging arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi
4940 Auto-merging arch/powerpc/boot/dts/fsl/bsc9132qds.dts
4941 Auto-merging arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi
4942 Auto-merging arch/powerpc/boot/dts/fsl/bsc9131rdb.dts
4943 Auto-merging arch/powerpc/boot/dts/fsl/b4qds.dtsi
4944 Auto-merging arch/powerpc/boot/dts/fsl/b4860qds.dts
4945 Auto-merging arch/powerpc/boot/dts/fsl/b4420qds.dts
4946 Merge made by the 'recursive' strategy.
4947  Documentation/devicetree/bindings/chosen.txt       |    8 +
4948  .../devicetree/bindings/clock/qoriq-clock.txt      |   61 +-
4949  .../devicetree/bindings/net/maxim,ds26522.txt      |   13 +
4950  arch/powerpc/Kconfig                               |    2 +-
4951  arch/powerpc/Makefile                              |    6 +-
4952  arch/powerpc/boot/Makefile                         |    3 +
4953  arch/powerpc/boot/dts/{ => fsl}/b4420qds.dts       |    4 +-
4954  arch/powerpc/boot/dts/fsl/b4420si-post.dtsi        |    4 +-
4955  arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi         |   13 +-
4956  arch/powerpc/boot/dts/{ => fsl}/b4860qds.dts       |    4 +-
4957  arch/powerpc/boot/dts/fsl/b4860si-post.dtsi        |   26 +-
4958  arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi         |   20 +-
4959  arch/powerpc/boot/dts/{ => fsl}/b4qds.dtsi         |    2 +-
4960  arch/powerpc/boot/dts/fsl/b4si-post.dtsi           |   33 +-
4961  arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dts     |    4 +-
4962  arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dtsi    |   12 +
4963  arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dts     |    4 +-
4964  arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dtsi    |   12 +
4965  arch/powerpc/boot/dts/{ => fsl}/c293pcie.dts       |    4 +-
4966  arch/powerpc/boot/dts/fsl/cyrus_p5020.dts          |  155 +++
4967  arch/powerpc/boot/dts/{ => fsl}/ge_imp3a.dts       |    4 +-
4968  arch/powerpc/boot/dts/{ => fsl}/kmcoge4.dts        |    4 +-
4969  arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dts      |    4 +-
4970  arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dtsi     |    0
4971  arch/powerpc/boot/dts/{ => fsl}/mpc8536ds_36b.dts  |    4 +-
4972  arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi      |    2 +-
4973  arch/powerpc/boot/dts/{ => fsl}/mpc8540ads.dts     |    2 +-
4974  arch/powerpc/boot/dts/{ => fsl}/mpc8541cds.dts     |    2 +-
4975  arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dts      |    4 +-
4976  arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dtsi     |    0
4977  arch/powerpc/boot/dts/{ => fsl}/mpc8548cds.dtsi    |    0
4978  arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_32b.dts |    4 +-
4979  arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_36b.dts |    4 +-
4980  arch/powerpc/boot/dts/{ => fsl}/mpc8555cds.dts     |    2 +-
4981  arch/powerpc/boot/dts/{ => fsl}/mpc8560ads.dts     |    2 +-
4982  arch/powerpc/boot/dts/{ => fsl}/mpc8568mds.dts     |    4 +-
4983  arch/powerpc/boot/dts/{ => fsl}/mpc8569mds.dts     |    4 +-
4984  arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dts      |    4 +-
4985  arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dtsi     |    0
4986  arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_36b.dts  |    4 +-
4987  .../boot/dts/{ => fsl}/mpc8572ds_camp_core0.dts    |    0
4988  .../boot/dts/{ => fsl}/mpc8572ds_camp_core1.dts    |    0
4989  arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi      |    2 +-
4990  arch/powerpc/boot/dts/{ => fsl}/mvme2500.dts       |    4 +-
4991  arch/powerpc/boot/dts/{ => fsl}/oca4080.dts        |    4 +-
4992  arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dts    |    4 +-
4993  arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dtsi   |    0
4994  .../powerpc/boot/dts/{ => fsl}/p1010rdb-pa_36b.dts |    4 +-
4995  arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb.dts    |    4 +-
4996  .../powerpc/boot/dts/{ => fsl}/p1010rdb-pb_36b.dts |    4 +-
4997  arch/powerpc/boot/dts/{ => fsl}/p1010rdb.dtsi      |   12 +
4998  arch/powerpc/boot/dts/{ => fsl}/p1010rdb_32b.dtsi  |    0
4999  arch/powerpc/boot/dts/{ => fsl}/p1010rdb_36b.dtsi  |    0
5000  arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc.dtsi   |    0
5001  .../powerpc/boot/dts/{ => fsl}/p1020mbg-pc_32b.dts |    4 +-
5002  .../powerpc/boot/dts/{ => fsl}/p1020mbg-pc_36b.dts |    4 +-
5003  arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc.dtsi   |    0
5004  .../powerpc/boot/dts/{ => fsl}/p1020rdb-pc_32b.dts |    4 +-
5005  .../powerpc/boot/dts/{ => fsl}/p1020rdb-pc_36b.dts |    4 +-
5006  .../boot/dts/{ => fsl}/p1020rdb-pc_camp_core0.dts  |    0
5007  .../boot/dts/{ => fsl}/p1020rdb-pc_camp_core1.dts  |    0
5008  arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pd.dts    |   16 +-
5009  arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dts       |    4 +-
5010  arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dtsi      |    0
5011  arch/powerpc/boot/dts/{ => fsl}/p1020rdb_36b.dts   |    4 +-
5012  arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc.dtsi   |    0
5013  .../powerpc/boot/dts/{ => fsl}/p1020utm-pc_32b.dts |    4 +-
5014  .../powerpc/boot/dts/{ => fsl}/p1020utm-pc_36b.dts |    4 +-
5015  arch/powerpc/boot/dts/{ => fsl}/p1021mds.dts       |    4 +-
5016  arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc.dtsi   |   12 +
5017  .../powerpc/boot/dts/{ => fsl}/p1021rdb-pc_32b.dts |    4 +-
5018  .../powerpc/boot/dts/{ => fsl}/p1021rdb-pc_36b.dts |    4 +-
5019  arch/powerpc/boot/dts/{ => fsl}/p1022ds.dtsi       |   12 +
5020  arch/powerpc/boot/dts/{ => fsl}/p1022ds_32b.dts    |    4 +-
5021  arch/powerpc/boot/dts/{ => fsl}/p1022ds_36b.dts    |    4 +-
5022  arch/powerpc/boot/dts/{ => fsl}/p1022rdk.dts       |    4 +-
5023  arch/powerpc/boot/dts/{ => fsl}/p1023rdb.dts       |    4 +-
5024  arch/powerpc/boot/dts/{ => fsl}/p1024rdb.dtsi      |    0
5025  arch/powerpc/boot/dts/{ => fsl}/p1024rdb_32b.dts   |    4 +-
5026  arch/powerpc/boot/dts/{ => fsl}/p1024rdb_36b.dts   |    4 +-
5027  arch/powerpc/boot/dts/{ => fsl}/p1025rdb.dtsi      |    0
5028  arch/powerpc/boot/dts/{ => fsl}/p1025rdb_32b.dts   |    4 +-
5029  arch/powerpc/boot/dts/{ => fsl}/p1025rdb_36b.dts   |    4 +-
5030  arch/powerpc/boot/dts/{ => fsl}/p1025twr.dts       |    4 +-
5031  arch/powerpc/boot/dts/{ => fsl}/p1025twr.dtsi      |   12 +
5032  arch/powerpc/boot/dts/{ => fsl}/p2020ds.dts        |    4 +-
5033  arch/powerpc/boot/dts/{ => fsl}/p2020ds.dtsi       |    0
5034  arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc.dtsi   |   12 +-
5035  .../powerpc/boot/dts/{ => fsl}/p2020rdb-pc_32b.dts |    4 +-
5036  .../powerpc/boot/dts/{ => fsl}/p2020rdb-pc_36b.dts |    4 +-
5037  arch/powerpc/boot/dts/{ => fsl}/p2020rdb.dts       |    4 +-
5038  arch/powerpc/boot/dts/{ => fsl}/p2041rdb.dts       |    4 +-
5039  arch/powerpc/boot/dts/fsl/p2041si-post.dtsi        |   29 +-
5040  arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi         |   10 +-
5041  arch/powerpc/boot/dts/{ => fsl}/p3041ds.dts        |    4 +-
5042  arch/powerpc/boot/dts/fsl/p3041si-post.dtsi        |   29 +-
5043  arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi         |   10 +-
5044  arch/powerpc/boot/dts/{ => fsl}/p4080ds.dts        |    4 +-
5045  arch/powerpc/boot/dts/fsl/p4080si-post.dtsi        |   48 +-
5046  arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi         |   15 +-
5047  arch/powerpc/boot/dts/{ => fsl}/p5020ds.dts        |    4 +-
5048  arch/powerpc/boot/dts/fsl/p5020si-post.dtsi        |   29 +-
5049  arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi         |   10 +-
5050  arch/powerpc/boot/dts/{ => fsl}/p5040ds.dts        |    4 +-
5051  arch/powerpc/boot/dts/fsl/p5040si-post.dtsi        |   56 +-
5052  arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi         |   17 +-
5053  arch/powerpc/boot/dts/{ => fsl}/ppa8548.dts        |    4 +-
5054  arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi     |    3 +-
5055  arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi     |    3 +-
5056  arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi  |   62 +
5057  arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi   |   69 +
5058  arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi   |   68 +
5059  arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi   |   68 +
5060  arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi   |   68 +
5061  arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi   |   68 +
5062  arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi        |  101 ++
5063  arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi  |   61 +
5064  arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi   |   68 +
5065  arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi   |   68 +
5066  arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi   |   68 +
5067  arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi   |   68 +
5068  arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi   |   68 +
5069  arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi        |  101 ++
5070  .../dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi   |   66 +
5071  arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi |   63 +
5072  .../dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi   |   66 +
5073  arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi |   63 +
5074  arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi  |   62 +
5075  arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi  |   62 +
5076  arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi  |   62 +
5077  arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi  |   62 +
5078  arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi  |   62 +
5079  arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi  |   62 +
5080  arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi       |  106 ++
5081  arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi |   63 +
5082  arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi |   63 +
5083  arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi  |   62 +
5084  arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi  |   62 +
5085  arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi  |   62 +
5086  arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi  |   62 +
5087  arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi  |   62 +
5088  arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi  |   62 +
5089  arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi       |  106 ++
5090  arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi      |   94 ++
5091  arch/powerpc/boot/dts/{ => fsl}/t1023rdb.dts       |    4 +-
5092  arch/powerpc/boot/dts/fsl/t1023si-post.dtsi        |   19 +
5093  arch/powerpc/boot/dts/{ => fsl}/t1024qds.dts       |    4 +-
5094  arch/powerpc/boot/dts/{ => fsl}/t1024rdb.dts       |    4 +-
5095  arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi         |    6 +
5096  arch/powerpc/boot/dts/{ => fsl}/t1040d4rdb.dts     |    4 +-
5097  arch/powerpc/boot/dts/{ => fsl}/t1040qds.dts       |    4 +-
5098  arch/powerpc/boot/dts/{ => fsl}/t1040rdb.dts       |    4 +-
5099  arch/powerpc/boot/dts/fsl/t1040si-post.dtsi        |   31 +
5100  arch/powerpc/boot/dts/{ => fsl}/t1042d4rdb.dts     |    4 +-
5101  arch/powerpc/boot/dts/{ => fsl}/t1042qds.dts       |    4 +-
5102  arch/powerpc/boot/dts/{ => fsl}/t1042rdb.dts       |    4 +-
5103  arch/powerpc/boot/dts/{ => fsl}/t1042rdb_pi.dts    |    4 +-
5104  arch/powerpc/boot/dts/{ => fsl}/t104xd4rdb.dtsi    |   10 +
5105  arch/powerpc/boot/dts/{ => fsl}/t104xqds.dtsi      |    0
5106  arch/powerpc/boot/dts/{ => fsl}/t104xrdb.dtsi      |    0
5107  arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi         |    9 +-
5108  arch/powerpc/boot/dts/{ => fsl}/t2080qds.dts       |    4 +-
5109  arch/powerpc/boot/dts/{ => fsl}/t2080rdb.dts       |    4 +-
5110  arch/powerpc/boot/dts/{ => fsl}/t2081qds.dts       |    4 +-
5111  arch/powerpc/boot/dts/fsl/t2081si-post.dtsi        |   43 +
5112  arch/powerpc/boot/dts/{ => fsl}/t208xqds.dtsi      |    0
5113  arch/powerpc/boot/dts/{ => fsl}/t208xrdb.dtsi      |    0
5114  arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi         |   11 +
5115  arch/powerpc/boot/dts/{ => fsl}/t4240qds.dts       |    4 +-
5116  arch/powerpc/boot/dts/{ => fsl}/t4240rdb.dts       |    4 +-
5117  arch/powerpc/boot/dts/fsl/t4240si-post.dtsi        |   88 +-
5118  arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi         |   22 +-
5119  arch/powerpc/boot/dts/prpmc2800.dts                |  297 -----
5120  arch/powerpc/boot/page.h                           |    4 +-
5121  arch/powerpc/boot/prpmc2800.c                      |  571 ---------
5122  arch/powerpc/boot/wrapper                          |   25 +-
5123  arch/powerpc/configs/cell_defconfig                |    2 +-
5124  arch/powerpc/configs/ps3_defconfig                 |    7 +-
5125  arch/powerpc/include/asm/exception-64e.h           |   15 +-
5126  arch/powerpc/include/asm/mmu-hash64.h              |    1 +
5127  arch/powerpc/include/asm/msi_bitmap.h              |    1 +
5128  arch/powerpc/include/asm/page.h                    |   32 +-
5129  arch/powerpc/include/asm/pgtable-ppc64.h           |   10 +-
5130  arch/powerpc/include/asm/pgtable.h                 |    6 +-
5131  arch/powerpc/include/asm/systbl.h                  |   12 +
5132  arch/powerpc/include/asm/unistd.h                  |    2 +-
5133  arch/powerpc/include/uapi/asm/unistd.h             |   12 +
5134  arch/powerpc/kernel/crash.c                        |    6 +-
5135  arch/powerpc/kernel/eeh.c                          |    8 +-
5136  arch/powerpc/kernel/eeh_driver.c                   |   27 +-
5137  arch/powerpc/kernel/exceptions-64e.S               |   17 +-
5138  arch/powerpc/kernel/head_64.S                      |   43 +-
5139  arch/powerpc/kernel/io-workarounds.c               |    2 +-
5140  arch/powerpc/kernel/machine_kexec_64.c             |   18 +
5141  arch/powerpc/kernel/misc_64.S                      |   60 +-
5142  arch/powerpc/kernel/nvram_64.c                     |   15 +-
5143  arch/powerpc/kernel/paca.c                         |    9 +-
5144  arch/powerpc/kernel/pci-common.c                   |    1 +
5145  arch/powerpc/kernel/prom.c                         |   18 +-
5146  arch/powerpc/kernel/setup_64.c                     |   25 +-
5147  arch/powerpc/kernel/vdso32/Makefile                |    2 +-
5148  arch/powerpc/kernel/vdso32/datapage.S              |   12 +-
5149  arch/powerpc/kernel/vdso64/Makefile                |    2 +-
5150  arch/powerpc/kernel/vdso64/datapage.S              |   12 +-
5151  arch/powerpc/kernel/vmlinux.lds.S                  |    6 +
5152  arch/powerpc/kvm/book3s_64_mmu_hv.c                |    2 +-
5153  arch/powerpc/kvm/book3s_hv_rm_mmu.c                |    8 +-
5154  arch/powerpc/kvm/e500_mmu_host.c                   |    2 +-
5155  arch/powerpc/mm/fsl_booke_mmu.c                    |   26 +-
5156  arch/powerpc/mm/hash_utils_64.c                    |    7 +-
5157  arch/powerpc/mm/hugetlbpage.c                      |   40 +-
5158  arch/powerpc/mm/mmu_decl.h                         |    4 +-
5159  arch/powerpc/mm/numa.c                             |    5 +-
5160  arch/powerpc/mm/slb.c                              |   49 +-
5161  arch/powerpc/mm/tlb_hash64.c                       |    9 +-
5162  arch/powerpc/mm/tlb_low_64e.S                      |   25 +-
5163  arch/powerpc/mm/tlb_nohash.c                       |   41 +-
5164  arch/powerpc/mm/tlb_nohash_low.S                   |   63 +
5165  arch/powerpc/perf/callchain.c                      |    2 +-
5166  arch/powerpc/platforms/85xx/corenet_generic.c      |   11 +
5167  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    2 +-
5168  arch/powerpc/platforms/85xx/mpc85xx_rdb.c          |    2 +-
5169  arch/powerpc/platforms/85xx/p1022_ds.c             |    2 +-
5170  arch/powerpc/platforms/85xx/p1022_rdk.c            |    2 +-
5171  arch/powerpc/platforms/85xx/smp.c                  |   88 +-
5172  arch/powerpc/platforms/85xx/twr_p102x.c            |    2 +-
5173  arch/powerpc/platforms/86xx/mpc8610_hpcd.c         |    2 +-
5174  arch/powerpc/platforms/Kconfig.cputype             |   11 -
5175  arch/powerpc/platforms/cell/Kconfig                |    4 +-
5176  arch/powerpc/platforms/maple/Kconfig               |    2 +-
5177  arch/powerpc/platforms/pasemi/Kconfig              |    2 +-
5178  arch/powerpc/platforms/powermac/Kconfig            |    2 +-
5179  arch/powerpc/platforms/powernv/eeh-powernv.c       |   86 +-
5180  arch/powerpc/platforms/powernv/setup.c             |   21 +-
5181  arch/powerpc/platforms/ps3/Kconfig                 |    2 +-
5182  arch/powerpc/platforms/pseries/Kconfig             |    7 +-
5183  arch/powerpc/platforms/pseries/Makefile            |    7 +-
5184  arch/powerpc/platforms/pseries/dlpar.c             |   31 +-
5185  arch/powerpc/platforms/pseries/eeh_pseries.c       |   60 +-
5186  arch/powerpc/platforms/pseries/hvcserver.c         |    2 +-
5187  arch/powerpc/platforms/pseries/iommu.c             |   10 -
5188  arch/powerpc/platforms/pseries/of_helpers.c        |   38 +
5189  arch/powerpc/platforms/pseries/of_helpers.h        |    8 +
5190  arch/powerpc/platforms/pseries/reconfig.c          |   34 +-
5191  arch/powerpc/platforms/pseries/setup.c             |    4 -
5192  arch/powerpc/sysdev/cpm_common.c                   |    3 +-
5193  arch/powerpc/sysdev/fsl_pci.c                      |   86 +-
5194  arch/powerpc/sysdev/mpc5xxx_clocks.c               |    5 +-
5195  arch/powerpc/sysdev/mpc8xx_pic.c                   |    2 +-
5196  arch/powerpc/sysdev/mpic.c                         |   23 +-
5197  arch/powerpc/sysdev/msi_bitmap.c                   |   18 +-
5198  arch/powerpc/xmon/nonstdio.c                       |   64 +-
5199  arch/powerpc/xmon/nonstdio.h                       |    3 +
5200  arch/powerpc/xmon/xmon.c                           |   79 +-
5201  drivers/char/agp/uninorth-agp.c                    |   16 +-
5202  drivers/clk/Kconfig                                |    2 +-
5203  drivers/clk/clk-qoriq.c                            | 1354 ++++++++++++++++----
5204  drivers/iommu/fsl_pamu.c                           |    2 +-
5205  drivers/macintosh/Kconfig                          |    5 +-
5206  drivers/misc/cxl/vphb.c                            |    2 +
5207  drivers/ps3/ps3-lpm.c                              |    2 +-
5208  drivers/ps3/ps3-vuart.c                            |    3 +-
5209  .../asm/fsl_guts.h => include/linux/fsl/guts.h     |    8 +-
5210  scripts/kconfig/Makefile                           |    5 +-
5211  sound/soc/fsl/mpc8610_hpcd.c                       |    2 +-
5212  sound/soc/fsl/p1022_ds.c                           |    2 +-
5213  sound/soc/fsl/p1022_rdk.c                          |    2 +-
5214  tools/testing/selftests/powerpc/Makefile           |   12 +-
5215  .../selftests/powerpc/benchmarks/.gitignore        |    1 +
5216  .../testing/selftests/powerpc/benchmarks/Makefile  |   12 +
5217  .../selftests/powerpc/benchmarks/gettimeofday.c    |   31 +
5218  .../powerpc/pmu/ebb/back_to_back_ebbs_test.c       |    2 +
5219  .../powerpc/pmu/ebb/close_clears_pmcc_test.c       |    2 +
5220  .../powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c |    2 +
5221  .../powerpc/pmu/ebb/cpu_event_vs_ebb_test.c        |    2 +
5222  .../selftests/powerpc/pmu/ebb/cycles_test.c        |    2 +
5223  .../powerpc/pmu/ebb/cycles_with_freeze_test.c      |    2 +
5224  .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c       |    2 +
5225  tools/testing/selftests/powerpc/pmu/ebb/ebb.c      |   11 +
5226  tools/testing/selftests/powerpc/pmu/ebb/ebb.h      |    1 +
5227  .../selftests/powerpc/pmu/ebb/ebb_on_child_test.c  |    2 +
5228  .../powerpc/pmu/ebb/ebb_on_willing_child_test.c    |    2 +
5229  .../powerpc/pmu/ebb/ebb_vs_cpu_event_test.c        |    2 +
5230  .../powerpc/pmu/ebb/event_attributes_test.c        |    2 +
5231  .../selftests/powerpc/pmu/ebb/fork_cleanup_test.c  |    2 +
5232  .../powerpc/pmu/ebb/instruction_count_test.c       |    2 +
5233  .../powerpc/pmu/ebb/lost_exception_test.c          |    2 +
5234  .../selftests/powerpc/pmu/ebb/multi_counter_test.c |    2 +
5235  .../powerpc/pmu/ebb/multi_ebb_procs_test.c         |    2 +
5236  .../selftests/powerpc/pmu/ebb/no_handler_test.c    |    2 +
5237  .../selftests/powerpc/pmu/ebb/pmae_handling_test.c |    2 +
5238  .../powerpc/pmu/ebb/pmc56_overflow_test.c          |    2 +
5239  .../selftests/powerpc/pmu/ebb/reg_access_test.c    |    2 +
5240  .../pmu/ebb/task_event_pinned_vs_ebb_test.c        |    2 +
5241  .../powerpc/pmu/ebb/task_event_vs_ebb_test.c       |    2 +
5242  .../testing/selftests/powerpc/syscalls/.gitignore  |    1 +
5243  tools/testing/selftests/powerpc/syscalls/Makefile  |   12 +
5244  tools/testing/selftests/powerpc/syscalls/ipc.h     |   47 +
5245  .../selftests/powerpc/syscalls/ipc_unmuxed.c       |   61 +
5246  tools/testing/selftests/powerpc/tm/tm-syscall.c    |   14 +-
5247  300 files changed, 5872 insertions(+), 1732 deletions(-)
5248  create mode 100644 Documentation/devicetree/bindings/net/maxim,ds26522.txt
5249  rename arch/powerpc/boot/dts/{ => fsl}/b4420qds.dts (96%)
5250  rename arch/powerpc/boot/dts/{ => fsl}/b4860qds.dts (97%)
5251  rename arch/powerpc/boot/dts/{ => fsl}/b4qds.dtsi (99%)
5252  rename arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dts (91%)
5253  rename arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dtsi (90%)
5254  rename arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dts (91%)
5255  rename arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dtsi (91%)
5256  rename arch/powerpc/boot/dts/{ => fsl}/c293pcie.dts (98%)
5257  create mode 100644 arch/powerpc/boot/dts/fsl/cyrus_p5020.dts
5258  rename arch/powerpc/boot/dts/{ => fsl}/ge_imp3a.dts (98%)
5259  rename arch/powerpc/boot/dts/{ => fsl}/kmcoge4.dts (98%)
5260  rename arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dts (97%)
5261  rename arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dtsi (100%)
5262  rename arch/powerpc/boot/dts/{ => fsl}/mpc8536ds_36b.dts (97%)
5263  rename arch/powerpc/boot/dts/{ => fsl}/mpc8540ads.dts (99%)
5264  rename arch/powerpc/boot/dts/{ => fsl}/mpc8541cds.dts (99%)
5265  rename arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dts (97%)
5266  rename arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dtsi (100%)
5267  rename arch/powerpc/boot/dts/{ => fsl}/mpc8548cds.dtsi (100%)
5268  rename arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_32b.dts (96%)
5269  rename arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_36b.dts (96%)
5270  rename arch/powerpc/boot/dts/{ => fsl}/mpc8555cds.dts (99%)
5271  rename arch/powerpc/boot/dts/{ => fsl}/mpc8560ads.dts (99%)
5272  rename arch/powerpc/boot/dts/{ => fsl}/mpc8568mds.dts (99%)
5273  rename arch/powerpc/boot/dts/{ => fsl}/mpc8569mds.dts (99%)
5274  rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dts (96%)
5275  rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dtsi (100%)
5276  rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_36b.dts (96%)
5277  rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_camp_core0.dts (100%)
5278  rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_camp_core1.dts (100%)
5279  rename arch/powerpc/boot/dts/{ => fsl}/mvme2500.dts (98%)
5280  rename arch/powerpc/boot/dts/{ => fsl}/oca4080.dts (98%)
5281  rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dts (88%)
5282  rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dtsi (100%)
5283  rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa_36b.dts (96%)
5284  rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb.dts (89%)
5285  rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb_36b.dts (96%)
5286  rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb.dtsi (94%)
5287  rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb_32b.dtsi (100%)
5288  rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb_36b.dtsi (100%)
5289  rename arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc.dtsi (100%)
5290  rename arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc_32b.dts (97%)
5291  rename arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc_36b.dts (97%)
5292  rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc.dtsi (100%)
5293  rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_32b.dts (97%)
5294  rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_36b.dts (97%)
5295  rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_camp_core0.dts (100%)
5296  rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_camp_core1.dts (100%)
5297  rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pd.dts (95%)
5298  rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dts (95%)
5299  rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dtsi (100%)
5300  rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb_36b.dts (95%)
5301  rename arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc.dtsi (100%)
5302  rename arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc_32b.dts (97%)
5303  rename arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc_36b.dts (97%)
5304  rename arch/powerpc/boot/dts/{ => fsl}/p1021mds.dts (99%)
5305  rename arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc.dtsi (95%)
5306  rename arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc_32b.dts (97%)
5307  rename arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc_36b.dts (97%)
5308  rename arch/powerpc/boot/dts/{ => fsl}/p1022ds.dtsi (94%)
5309  rename arch/powerpc/boot/dts/{ => fsl}/p1022ds_32b.dts (98%)
5310  rename arch/powerpc/boot/dts/{ => fsl}/p1022ds_36b.dts (98%)
5311  rename arch/powerpc/boot/dts/{ => fsl}/p1022rdk.dts (98%)
5312  rename arch/powerpc/boot/dts/{ => fsl}/p1023rdb.dts (99%)
5313  rename arch/powerpc/boot/dts/{ => fsl}/p1024rdb.dtsi (100%)
5314  rename arch/powerpc/boot/dts/{ => fsl}/p1024rdb_32b.dts (97%)
5315  rename arch/powerpc/boot/dts/{ => fsl}/p1024rdb_36b.dts (97%)
5316  rename arch/powerpc/boot/dts/{ => fsl}/p1025rdb.dtsi (100%)
5317  rename arch/powerpc/boot/dts/{ => fsl}/p1025rdb_32b.dts (98%)
5318  rename arch/powerpc/boot/dts/{ => fsl}/p1025rdb_36b.dts (97%)
5319  rename arch/powerpc/boot/dts/{ => fsl}/p1025twr.dts (97%)
5320  rename arch/powerpc/boot/dts/{ => fsl}/p1025twr.dtsi (96%)
5321  rename arch/powerpc/boot/dts/{ => fsl}/p2020ds.dts (96%)
5322  rename arch/powerpc/boot/dts/{ => fsl}/p2020ds.dtsi (100%)
5323  rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc.dtsi (97%)
5324  rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc_32b.dts (97%)
5325  rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc_36b.dts (97%)
5326  rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb.dts (98%)
5327  rename arch/powerpc/boot/dts/{ => fsl}/p2041rdb.dts (98%)
5328  rename arch/powerpc/boot/dts/{ => fsl}/p3041ds.dts (99%)
5329  rename arch/powerpc/boot/dts/{ => fsl}/p4080ds.dts (98%)
5330  rename arch/powerpc/boot/dts/{ => fsl}/p5020ds.dts (99%)
5331  rename arch/powerpc/boot/dts/{ => fsl}/p5040ds.dts (98%)
5332  rename arch/powerpc/boot/dts/{ => fsl}/ppa8548.dts (97%)
5333  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi
5334  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi
5335  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi
5336  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi
5337  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi
5338  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi
5339  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi
5340  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi
5341  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi
5342  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi
5343  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi
5344  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi
5345  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi
5346  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi
5347  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi
5348  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi
5349  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi
5350  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi
5351  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi
5352  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi
5353  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi
5354  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi
5355  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi
5356  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi
5357  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi
5358  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi
5359  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi
5360  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi
5361  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi
5362  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi
5363  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi
5364  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi
5365  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi
5366  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi
5367  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi
5368  rename arch/powerpc/boot/dts/{ => fsl}/t1023rdb.dts (98%)
5369  rename arch/powerpc/boot/dts/{ => fsl}/t1024qds.dts (98%)
5370  rename arch/powerpc/boot/dts/{ => fsl}/t1024rdb.dts (98%)
5371  rename arch/powerpc/boot/dts/{ => fsl}/t1040d4rdb.dts (96%)
5372  rename arch/powerpc/boot/dts/{ => fsl}/t1040qds.dts (96%)
5373  rename arch/powerpc/boot/dts/{ => fsl}/t1040rdb.dts (96%)
5374  rename arch/powerpc/boot/dts/{ => fsl}/t1042d4rdb.dts (96%)
5375  rename arch/powerpc/boot/dts/{ => fsl}/t1042qds.dts (96%)
5376  rename arch/powerpc/boot/dts/{ => fsl}/t1042rdb.dts (96%)
5377  rename arch/powerpc/boot/dts/{ => fsl}/t1042rdb_pi.dts (96%)
5378  rename arch/powerpc/boot/dts/{ => fsl}/t104xd4rdb.dtsi (95%)
5379  rename arch/powerpc/boot/dts/{ => fsl}/t104xqds.dtsi (100%)
5380  rename arch/powerpc/boot/dts/{ => fsl}/t104xrdb.dtsi (100%)
5381  rename arch/powerpc/boot/dts/{ => fsl}/t2080qds.dts (96%)
5382  rename arch/powerpc/boot/dts/{ => fsl}/t2080rdb.dts (97%)
5383  rename arch/powerpc/boot/dts/{ => fsl}/t2081qds.dts (96%)
5384  rename arch/powerpc/boot/dts/{ => fsl}/t208xqds.dtsi (100%)
5385  rename arch/powerpc/boot/dts/{ => fsl}/t208xrdb.dtsi (100%)
5386  rename arch/powerpc/boot/dts/{ => fsl}/t4240qds.dts (99%)
5387  rename arch/powerpc/boot/dts/{ => fsl}/t4240rdb.dts (98%)
5388  delete mode 100644 arch/powerpc/boot/dts/prpmc2800.dts
5389  delete mode 100644 arch/powerpc/boot/prpmc2800.c
5390  create mode 100644 arch/powerpc/platforms/pseries/of_helpers.c
5391  create mode 100644 arch/powerpc/platforms/pseries/of_helpers.h
5392  rename arch/powerpc/include/asm/fsl_guts.h => include/linux/fsl/guts.h (98%)
5393  create mode 100644 tools/testing/selftests/powerpc/benchmarks/.gitignore
5394  create mode 100644 tools/testing/selftests/powerpc/benchmarks/Makefile
5395  create mode 100644 tools/testing/selftests/powerpc/benchmarks/gettimeofday.c
5396  create mode 100644 tools/testing/selftests/powerpc/syscalls/.gitignore
5397  create mode 100644 tools/testing/selftests/powerpc/syscalls/Makefile
5398  create mode 100644 tools/testing/selftests/powerpc/syscalls/ipc.h
5399  create mode 100644 tools/testing/selftests/powerpc/syscalls/ipc_unmuxed.c
5400 Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
5401 $ git merge powerpc-mpe/next
5402 Already up-to-date.
5403 Merging fsl/next (e1f580e8ced5 powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry)
5404 $ git merge fsl/next
5405 Already up-to-date.
5406 Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
5407 $ git merge mpc5xxx/next
5408 Merge made by the 'recursive' strategy.
5409  .../bindings/powerpc/fsl/mpc512x_lpbfifo.txt       |  21 +
5410  arch/powerpc/boot/dts/mpc5121.dtsi                 |  11 +-
5411  arch/powerpc/boot/dts/mpc5125twr.dts               |  11 +-
5412  arch/powerpc/configs/mpc512x_defconfig             |   1 +
5413  arch/powerpc/include/asm/mpc5121.h                 |  59 +++
5414  arch/powerpc/include/asm/mpc52xx_psc.h             |   2 -
5415  arch/powerpc/platforms/512x/Kconfig                |   6 +
5416  arch/powerpc/platforms/512x/Makefile               |   1 +
5417  arch/powerpc/platforms/512x/mpc512x_lpbfifo.c      | 540 +++++++++++++++++++++
5418  arch/powerpc/platforms/52xx/mpc52xx_gpt.c          |   6 +-
5419  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |   1 +
5420  11 files changed, 650 insertions(+), 9 deletions(-)
5421  create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/mpc512x_lpbfifo.txt
5422  create mode 100644 arch/powerpc/platforms/512x/mpc512x_lpbfifo.c
5423 Merging s390/features (b38feccd663b s390: remove runtime instrumentation interrupts)
5424 $ git merge s390/features
5425 Auto-merging include/linux/compiler.h
5426 Auto-merging include/asm-generic/pgtable.h
5427 Removing drivers/s390/crypto/zcrypt_pcicc.h
5428 Removing drivers/s390/crypto/zcrypt_pcicc.c
5429 Removing drivers/s390/crypto/zcrypt_pcica.h
5430 Removing drivers/s390/crypto/zcrypt_pcica.c
5431 Auto-merging arch/x86/include/asm/pgtable.h
5432 Auto-merging arch/s390/include/asm/fpu/internal.h
5433 Merge made by the 'recursive' strategy.
5434  arch/s390/Kconfig                                  |    2 +
5435  arch/s390/hypfs/hypfs_diag.c                       |   10 +-
5436  arch/s390/hypfs/hypfs_diag0c.c                     |    2 +
5437  arch/s390/hypfs/hypfs_sprp.c                       |    9 +-
5438  arch/s390/hypfs/hypfs_vm.c                         |    2 +
5439  arch/s390/include/asm/appldata.h                   |    2 +
5440  arch/s390/include/asm/atomic.h                     |    2 -
5441  arch/s390/include/asm/barrier.h                    |    8 +-
5442  arch/s390/include/asm/bitops.h                     |   55 +-
5443  arch/s390/include/asm/cio.h                        |   10 +
5444  arch/s390/include/asm/cmb.h                        |    1 +
5445  arch/s390/include/asm/cmpxchg.h                    |   30 +-
5446  arch/s390/include/asm/cpu_mf.h                     |    5 -
5447  arch/s390/include/asm/ctl_reg.h                    |    2 -
5448  arch/s390/include/asm/diag.h                       |   29 +
5449  arch/s390/include/asm/etr.h                        |   10 +-
5450  arch/s390/include/asm/fpu/api.h                    |   30 +
5451  .../include/asm/{fpu-internal.h => fpu/internal.h} |   51 +-
5452  arch/s390/include/asm/fpu/types.h                  |   25 +
5453  arch/s390/include/asm/idle.h                       |    2 +
5454  arch/s390/include/asm/irq.h                        |   14 +-
5455  arch/s390/include/asm/kvm_host.h                   |    2 +-
5456  arch/s390/include/asm/kvm_para.h                   |   67 +-
5457  arch/s390/include/asm/lowcore.h                    |   11 +-
5458  arch/s390/include/asm/nmi.h                        |   98 +-
5459  arch/s390/include/asm/pgtable.h                    |   66 +-
5460  arch/s390/include/asm/processor.h                  |   99 +-
5461  arch/s390/include/asm/ptrace.h                     |   11 +-
5462  arch/s390/include/asm/setup.h                      |   50 +-
5463  arch/s390/include/asm/spinlock.h                   |    3 -
5464  arch/s390/include/asm/switch_to.h                  |    2 +-
5465  arch/s390/include/asm/thread_info.h                |   22 +-
5466  arch/s390/include/asm/trace/diag.h                 |   43 +
5467  arch/s390/kernel/Makefile                          |    2 +
5468  arch/s390/kernel/asm-offsets.c                     |  290 +--
5469  arch/s390/kernel/compat_signal.c                   |    7 +-
5470  arch/s390/kernel/cpcmd.c                           |    2 +
5471  arch/s390/kernel/crash_dump.c                      |   16 +-
5472  arch/s390/kernel/diag.c                            |  134 +-
5473  arch/s390/kernel/early.c                           |   15 +-
5474  arch/s390/kernel/entry.S                           |  230 +--
5475  arch/s390/kernel/entry.h                           |    3 -
5476  arch/s390/kernel/head64.S                          |    7 +-
5477  arch/s390/kernel/ipl.c                             |    9 +-
5478  arch/s390/kernel/irq.c                             |    1 -
5479  arch/s390/kernel/nmi.c                             |  120 +-
5480  arch/s390/kernel/perf_cpum_sf.c                    |   10 +-
5481  arch/s390/kernel/process.c                         |   37 +-
5482  arch/s390/kernel/processor.c                       |    5 +-
5483  arch/s390/kernel/ptrace.c                          |   52 +-
5484  arch/s390/kernel/runtime_instr.c                   |   64 +-
5485  arch/s390/kernel/s390_ksyms.c                      |    3 +-
5486  arch/s390/kernel/signal.c                          |    7 +-
5487  arch/s390/kernel/smp.c                             |   10 +-
5488  arch/s390/kernel/time.c                            |   31 +-
5489  arch/s390/kernel/topology.c                        |   28 +-
5490  arch/s390/kernel/trace.c                           |   29 +
5491  arch/s390/kernel/traps.c                           |   41 +-
5492  arch/s390/kernel/vdso.c                            |    2 +-
5493  arch/s390/kvm/kvm-s390.c                           |    6 -
5494  arch/s390/lib/delay.c                              |   30 +-
5495  arch/s390/lib/find.c                               |    4 +-
5496  arch/s390/lib/spinlock.c                           |    4 +-
5497  arch/s390/mm/extmem.c                              |    3 +
5498  arch/s390/mm/fault.c                               |    7 +-
5499  arch/s390/mm/hugetlbpage.c                         |    2 +
5500  arch/s390/numa/mode_emu.c                          |   10 +-
5501  arch/s390/pci/pci_insn.c                           |    6 +-
5502  arch/x86/include/asm/pgtable.h                     |   10 +
5503  drivers/s390/block/dasd.c                          |    1 +
5504  drivers/s390/block/dasd_alias.c                    |    5 +-
5505  drivers/s390/block/dasd_diag.c                     |    2 +
5506  drivers/s390/block/dasd_eckd.c                     |   73 +-
5507  drivers/s390/char/diag_ftp.c                       |    2 +
5508  drivers/s390/char/sclp_rw.c                        |  136 +-
5509  drivers/s390/char/sclp_rw.h                        |   17 +-
5510  drivers/s390/char/sclp_tty.c                       |    8 +-
5511  drivers/s390/cio/cio.c                             |   33 +-
5512  drivers/s390/cio/cmf.c                             |  220 ++-
5513  drivers/s390/cio/css.c                             |    2 +-
5514  drivers/s390/cio/device.c                          |    4 +-
5515  drivers/s390/cio/device.h                          |    6 +-
5516  drivers/s390/cio/device_fsm.c                      |   38 +
5517  drivers/s390/cio/device_ops.c                      |  107 --
5518  drivers/s390/cio/device_pgid.c                     |   70 +-
5519  drivers/s390/crypto/Makefile                       |    4 +-
5520  drivers/s390/crypto/ap_bus.c                       | 1850 +++++++++-----------
5521  drivers/s390/crypto/ap_bus.h                       |   67 +-
5522  drivers/s390/crypto/zcrypt_api.c                   |    3 +-
5523  drivers/s390/crypto/zcrypt_cca_key.h               |    2 +-
5524  drivers/s390/crypto/zcrypt_msgtype50.c             |   28 +-
5525  drivers/s390/crypto/zcrypt_msgtype6.c              |   59 +-
5526  drivers/s390/crypto/zcrypt_pcica.c                 |  420 -----
5527  drivers/s390/crypto/zcrypt_pcica.h                 |  115 --
5528  drivers/s390/crypto/zcrypt_pcicc.c                 |  627 -------
5529  drivers/s390/crypto/zcrypt_pcicc.h                 |  174 --
5530  drivers/s390/virtio/virtio_ccw.c                   |   15 +-
5531  drivers/watchdog/diag288_wdt.c                     |    4 +
5532  fs/proc/task_mmu.c                                 |    4 +-
5533  include/asm-generic/pgtable.h                      |   10 +
5534  include/linux/compiler.h                           |    2 +-
5535  101 files changed, 2432 insertions(+), 3688 deletions(-)
5536  create mode 100644 arch/s390/include/asm/fpu/api.h
5537  rename arch/s390/include/asm/{fpu-internal.h => fpu/internal.h} (59%)
5538  create mode 100644 arch/s390/include/asm/fpu/types.h
5539  create mode 100644 arch/s390/include/asm/trace/diag.h
5540  create mode 100644 arch/s390/kernel/trace.c
5541  delete mode 100644 drivers/s390/crypto/zcrypt_pcica.c
5542  delete mode 100644 drivers/s390/crypto/zcrypt_pcica.h
5543  delete mode 100644 drivers/s390/crypto/zcrypt_pcicc.c
5544  delete mode 100644 drivers/s390/crypto/zcrypt_pcicc.h
5545 Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
5546 $ git merge sparc-next/master
5547 Already up-to-date.
5548 Merging tile/master (09745f38a74e arch/tile: turn off timer tick for oneshot_stopped state)
5549 $ git merge tile/master
5550 Merge made by the 'recursive' strategy.
5551  arch/tile/Kconfig                   |  1 +
5552  arch/tile/include/asm/insn.h        | 59 +++++++++++++++++++++++++++
5553  arch/tile/include/asm/jump_label.h  | 58 +++++++++++++++++++++++++++
5554  arch/tile/include/asm/page.h        | 10 +++++
5555  arch/tile/include/asm/processor.h   |  2 +-
5556  arch/tile/include/asm/thread_info.h |  8 +++-
5557  arch/tile/kernel/Makefile           |  1 +
5558  arch/tile/kernel/ftrace.c           | 13 +-----
5559  arch/tile/kernel/intvec_32.S        | 46 +++++++--------------
5560  arch/tile/kernel/intvec_64.S        | 49 +++++++----------------
5561  arch/tile/kernel/jump_label.c       | 64 ++++++++++++++++++++++++++++++
5562  arch/tile/kernel/kgdb.c             |  2 +-
5563  arch/tile/kernel/kprobes.c          |  4 +-
5564  arch/tile/kernel/process.c          | 79 +++++++++++++++++++------------------
5565  arch/tile/kernel/time.c             |  1 +
5566  15 files changed, 276 insertions(+), 121 deletions(-)
5567  create mode 100644 arch/tile/include/asm/insn.h
5568  create mode 100644 arch/tile/include/asm/jump_label.h
5569  create mode 100644 arch/tile/kernel/jump_label.c
5570 Merging uml/linux-next (56b88a3bf97a um: Fix kernel mode fault condition)
5571 $ git merge uml/linux-next
5572 Already up-to-date.
5573 Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
5574 $ git merge unicore32/unicore32
5575 Already up-to-date.
5576 Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing)
5577 $ git merge xtensa/for_next
5578 Already up-to-date.
5579 Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled)
5580 $ git merge btrfs/next
5581 Already up-to-date.
5582 Merging ceph/master (8dbd263de1cb ceph: improve readahead for file holes)
5583 $ git merge ceph/master
5584 Merge made by the 'recursive' strategy.
5585 Merging cifs/for-next (592fafe644bf Add resilienthandles mount parm)
5586 $ git merge cifs/for-next
5587 Merge made by the 'recursive' strategy.
5588  fs/cifs/cifsfs.c   |   4 ++
5589  fs/cifs/cifsglob.h |   8 +++-
5590  fs/cifs/connect.c  |  78 +++++++++++++++++++++++++++++++++
5591  fs/cifs/smb2file.c |  19 +++++++++
5592  fs/cifs/smb2ops.c  |  10 ++---
5593  fs/cifs/smb2pdu.c  | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
5594  fs/cifs/smb2pdu.h  |  45 ++++++++++++++++++++
5595  fs/cifs/smbfsctl.h |   2 +-
5596  8 files changed, 279 insertions(+), 10 deletions(-)
5597 Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
5598 $ git merge ecryptfs/next
5599 Merge made by the 'recursive' strategy.
5600  fs/ecryptfs/main.c | 3 +--
5601  1 file changed, 1 insertion(+), 2 deletions(-)
5602 Merging ext3/for_next (d4eb6dee4712 ext4: Update EXT4_USE_FOR_EXT2 description)
5603 $ git merge ext3/for_next
5604 Already up-to-date.
5605 Merging ext4/dev (ff8d13457399 fs/ext4: remove unnecessary new_valid_dev check)
5606 $ git merge ext4/dev
5607 Auto-merging fs/ext4/readpage.c
5608 Merge made by the 'recursive' strategy.
5609  fs/Makefile              |   7 +-
5610  fs/ext4/Makefile         |   2 +-
5611  fs/ext4/balloc.c         |  92 ++++---
5612  fs/ext4/block_validity.c |   2 +-
5613  fs/ext4/crypto.c         |  52 ++--
5614  fs/ext4/crypto_fname.c   |   2 -
5615  fs/ext4/crypto_key.c     |  16 +-
5616  fs/ext4/crypto_policy.c  |   3 +-
5617  fs/ext4/dir.c            |   7 +-
5618  fs/ext4/ext4.h           | 177 ++++++++++--
5619  fs/ext4/ext4_jbd2.c      |   6 +-
5620  fs/ext4/ext4_jbd2.h      |  10 +-
5621  fs/ext4/extents.c        |  82 +++---
5622  fs/ext4/extents_status.c |  60 +---
5623  fs/ext4/extents_status.h |   2 +
5624  fs/ext4/ialloc.c         | 113 +++++---
5625  fs/ext4/indirect.c       |   5 +-
5626  fs/ext4/inline.c         |   3 +-
5627  fs/ext4/inode.c          |  83 ++++--
5628  fs/ext4/ioctl.c          |  15 +-
5629  fs/ext4/mballoc.c        |  88 +++---
5630  fs/ext4/migrate.c        |   9 +-
5631  fs/ext4/mmp.c            |   8 +-
5632  fs/ext4/namei.c          |  39 ++-
5633  fs/ext4/page-io.c        |   5 +-
5634  fs/ext4/readpage.c       |   2 +-
5635  fs/ext4/resize.c         |  34 +--
5636  fs/ext4/super.c          | 695 ++++++++++-------------------------------------
5637  fs/ext4/symlink.c        |   2 +-
5638  fs/ext4/sysfs.c          | 448 ++++++++++++++++++++++++++++++
5639  fs/ext4/xattr.c          |  32 +--
5640  fs/jbd2/checkpoint.c     |   8 +-
5641  fs/jbd2/commit.c         |  22 +-
5642  fs/jbd2/journal.c        |  27 +-
5643  fs/jbd2/recovery.c       |  26 +-
5644  fs/jbd2/revoke.c         |   4 +-
5645  include/linux/jbd2.h     |  84 +++++-
5646  include/uapi/linux/fs.h  |   1 +
5647  38 files changed, 1276 insertions(+), 997 deletions(-)
5648  create mode 100644 fs/ext4/sysfs.c
5649 Merging f2fs/dev (beaa57dd986d f2fs: fix to skip shrinking extent nodes)
5650 $ git merge f2fs/dev
5651 Merge made by the 'recursive' strategy.
5652  Documentation/ABI/testing/sysfs-fs-f2fs |  12 ++
5653  Documentation/filesystems/f2fs.txt      |   3 +-
5654  fs/f2fs/checkpoint.c                    |  49 ++++-
5655  fs/f2fs/data.c                          | 176 ++++++++++-------
5656  fs/f2fs/debug.c                         |  36 ++--
5657  fs/f2fs/dir.c                           |  19 +-
5658  fs/f2fs/extent_cache.c                  | 195 ++++++++-----------
5659  fs/f2fs/f2fs.h                          |  86 +++++++--
5660  fs/f2fs/file.c                          | 327 ++++++++++++++++----------------
5661  fs/f2fs/gc.c                            |  77 +++++---
5662  fs/f2fs/gc.h                            |   6 -
5663  fs/f2fs/inline.c                        |  42 +++-
5664  fs/f2fs/inode.c                         |   8 +-
5665  fs/f2fs/namei.c                         |  19 +-
5666  fs/f2fs/node.c                          |  26 ++-
5667  fs/f2fs/node.h                          |   4 +-
5668  fs/f2fs/recovery.c                      |  15 +-
5669  fs/f2fs/segment.c                       | 206 ++++++++++++--------
5670  fs/f2fs/segment.h                       |   4 +-
5671  fs/f2fs/super.c                         |  37 +++-
5672  include/trace/events/f2fs.h             |  69 ++++++-
5673  21 files changed, 869 insertions(+), 547 deletions(-)
5674 Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
5675 $ git merge fscache/fscache
5676 Merge made by the 'recursive' strategy.
5677  fs/fscache/netfs.c | 38 ++++++++++++++++++--------------------
5678  1 file changed, 18 insertions(+), 20 deletions(-)
5679 Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry)
5680 $ git merge fuse/for-next
5681 Already up-to-date.
5682 Merging gfs2/for-next (c36b97e9430d GFS2: Protect freeing directory hash table with i_lock spin_lock)
5683 $ git merge gfs2/for-next
5684 Merge made by the 'recursive' strategy.
5685  Documentation/filesystems/gfs2-glocks.txt |  6 +--
5686  fs/gfs2/dir.c                             |  7 ++-
5687  fs/gfs2/file.c                            |  2 +-
5688  fs/gfs2/glock.c                           | 84 +++++++++++++++----------------
5689  fs/gfs2/glock.h                           |  4 +-
5690  fs/gfs2/glops.c                           | 10 ++--
5691  fs/gfs2/incore.h                          |  3 +-
5692  fs/gfs2/main.c                            |  2 +-
5693  fs/gfs2/ops_fstype.c                      |  4 +-
5694  fs/gfs2/rgrp.c                            |  4 +-
5695  fs/gfs2/trans.c                           |  4 ++
5696  11 files changed, 70 insertions(+), 60 deletions(-)
5697 Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
5698 $ git merge jfs/jfs-next
5699 Already up-to-date.
5700 Merging nfs/linux-next (941c3ff3102c Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug)
5701 $ git merge nfs/linux-next
5702 Merge made by the 'recursive' strategy.
5703  fs/nfs/blocklayout/blocklayout.c         |   7 +-
5704  fs/nfs/callback.c                        |  40 +--
5705  fs/nfs/callback.h                        |  12 -
5706  fs/nfs/callback_proc.c                   |   2 -
5707  fs/nfs/callback_xdr.c                    |  39 ++-
5708  fs/nfs/client.c                          |   1 +
5709  fs/nfs/delegation.c                      |   6 +-
5710  fs/nfs/dir.c                             |   3 -
5711  fs/nfs/flexfilelayout/flexfilelayout.c   |  40 ++-
5712  fs/nfs/flexfilelayout/flexfilelayout.h   |   7 +
5713  fs/nfs/mount_clnt.c                      |   4 +-
5714  fs/nfs/nfs42.h                           |   1 +
5715  fs/nfs/nfs42proc.c                       |  71 +++++
5716  fs/nfs/nfs42xdr.c                        |  97 ++++++-
5717  fs/nfs/nfs4_fs.h                         |   6 +-
5718  fs/nfs/nfs4file.c                        | 136 +++++++++
5719  fs/nfs/nfs4proc.c                        | 182 ++++++------
5720  fs/nfs/nfs4xdr.c                         |  53 +++-
5721  fs/nfs/nfsroot.c                         |   2 +-
5722  fs/nfs/pnfs.c                            |  12 +-
5723  fs/nfs/read.c                            |   9 +-
5724  fs/nfs/super.c                           |   2 -
5725  fs/nfs/write.c                           |   7 +
5726  include/linux/nfs4.h                     |   3 +
5727  include/linux/nfs_fs_sb.h                |   2 +
5728  include/linux/nfs_xdr.h                  |  28 +-
5729  include/linux/sunrpc/bc_xprt.h           |   5 +
5730  include/linux/sunrpc/svc_rdma.h          |   6 +-
5731  include/linux/sunrpc/xprt.h              |   9 +
5732  include/linux/sunrpc/xprtsock.h          |   2 +
5733  include/uapi/linux/nfs.h                 |  13 +
5734  net/sunrpc/backchannel_rqst.c            |  24 +-
5735  net/sunrpc/svc.c                         |   5 -
5736  net/sunrpc/sysctl.c                      |  23 +-
5737  net/sunrpc/xprtrdma/Makefile             |   1 +
5738  net/sunrpc/xprtrdma/backchannel.c        | 394 +++++++++++++++++++++++++
5739  net/sunrpc/xprtrdma/frwr_ops.c           |   7 +-
5740  net/sunrpc/xprtrdma/rpc_rdma.c           | 148 +++++++---
5741  net/sunrpc/xprtrdma/svc_rdma.c           |   6 +
5742  net/sunrpc/xprtrdma/svc_rdma_transport.c |  58 ++++
5743  net/sunrpc/xprtrdma/transport.c          |  18 +-
5744  net/sunrpc/xprtrdma/verbs.c              | 479 ++++++++++++++++---------------
5745  net/sunrpc/xprtrdma/xprt_rdma.h          |  54 +++-
5746  net/sunrpc/xprtsock.c                    | 260 ++++++++++++-----
5747  44 files changed, 1687 insertions(+), 597 deletions(-)
5748  create mode 100644 net/sunrpc/xprtrdma/backchannel.c
5749 Merging nfsd/nfsd-next (1bc483f959c8 SUNRPC: drop stale comment in svc_setup_socket())
5750 $ git merge nfsd/nfsd-next
5751 Auto-merging fs/namei.c
5752 Merge made by the 'recursive' strategy.
5753  fs/file_table.c                  |  94 ++++--
5754  fs/lockd/host.c                  |   8 +-
5755  fs/lockd/mon.c                   | 125 ++-----
5756  fs/lockd/netns.h                 |   4 +-
5757  fs/lockd/svc.c                   |   2 +-
5758  fs/lockd/svc4proc.c              |   2 +-
5759  fs/lockd/svcproc.c               |   2 +-
5760  fs/locks.c                       |  37 ++
5761  fs/namei.c                       |  74 ++++
5762  fs/nfsd/Kconfig                  |   2 +
5763  fs/nfsd/Makefile                 |   3 +-
5764  fs/nfsd/export.c                 |  14 +
5765  fs/nfsd/filecache.c              | 712 +++++++++++++++++++++++++++++++++++++++
5766  fs/nfsd/filecache.h              |  44 +++
5767  fs/nfsd/nfs3proc.c               |   2 +-
5768  fs/nfsd/nfs3xdr.c                |   6 +-
5769  fs/nfsd/nfs4layouts.c            |  46 ++-
5770  fs/nfsd/nfs4proc.c               |  36 +-
5771  fs/nfsd/nfs4state.c              | 267 ++++++++-------
5772  fs/nfsd/nfs4xdr.c                |  24 +-
5773  fs/nfsd/nfscache.c               |   6 +-
5774  fs/nfsd/nfsctl.c                 |  10 +
5775  fs/nfsd/nfsfh.c                  |   5 +-
5776  fs/nfsd/nfsfh.h                  |  20 +-
5777  fs/nfsd/nfsproc.c                |   2 +-
5778  fs/nfsd/nfssvc.c                 |  16 +-
5779  fs/nfsd/state.h                  |  53 ++-
5780  fs/nfsd/trace.c                  |   2 -
5781  fs/nfsd/trace.h                  | 137 ++++++++
5782  fs/nfsd/vfs.c                    | 296 +++++-----------
5783  fs/nfsd/vfs.h                    |  15 +-
5784  fs/nfsd/xdr4.h                   |  17 +-
5785  fs/notify/group.c                |   2 +
5786  fs/notify/inode_mark.c           |   1 +
5787  fs/notify/mark.c                 |  70 +---
5788  include/linux/file.h             |   3 +-
5789  include/linux/fs.h               |   1 +
5790  include/linux/fsnotify_backend.h |   5 +-
5791  include/linux/lockd/lockd.h      |  10 +-
5792  include/linux/namei.h            |   1 +
5793  include/linux/sunrpc/cache.h     |  17 +-
5794  init/main.c                      |   2 +-
5795  net/sunrpc/auth_gss/auth_gss.c   |  13 +-
5796  net/sunrpc/cache.c               |  56 ++-
5797  net/sunrpc/svcsock.c             |  40 ++-
5798  45 files changed, 1629 insertions(+), 675 deletions(-)
5799  create mode 100644 fs/nfsd/filecache.c
5800  create mode 100644 fs/nfsd/filecache.h
5801 Merging orangefs/for-next (548049495cb4 Orangefs: fix some checkpatch.pl complaints that had creeped in.)
5802 $ git merge orangefs/for-next
5803 Auto-merging fs/Makefile
5804 Merge made by the 'recursive' strategy.
5805  Documentation/ABI/stable/sysfs-fs-orangefs |   87 ++
5806  Documentation/filesystems/orangefs.txt     |  137 +++
5807  fs/Kconfig                                 |    1 +
5808  fs/Makefile                                |    1 +
5809  fs/orangefs/Kconfig                        |    6 +
5810  fs/orangefs/Makefile                       |   10 +
5811  fs/orangefs/acl.c                          |  175 +++
5812  fs/orangefs/dcache.c                       |  142 +++
5813  fs/orangefs/devpvfs2-req.c                 | 1004 ++++++++++++++++
5814  fs/orangefs/dir.c                          |  345 ++++++
5815  fs/orangefs/downcall.h                     |  138 +++
5816  fs/orangefs/file.c                         | 1002 ++++++++++++++++
5817  fs/orangefs/inode.c                        |  469 ++++++++
5818  fs/orangefs/namei.c                        |  469 ++++++++
5819  fs/orangefs/protocol.h                     |  443 +++++++
5820  fs/orangefs/pvfs2-bufmap.c                 |  566 +++++++++
5821  fs/orangefs/pvfs2-bufmap.h                 |   61 +
5822  fs/orangefs/pvfs2-cache.c                  |  260 ++++
5823  fs/orangefs/pvfs2-debug.h                  |  292 +++++
5824  fs/orangefs/pvfs2-debugfs.c                |  458 +++++++
5825  fs/orangefs/pvfs2-debugfs.h                |    3 +
5826  fs/orangefs/pvfs2-dev-proto.h              |  102 ++
5827  fs/orangefs/pvfs2-kernel.h                 |  861 ++++++++++++++
5828  fs/orangefs/pvfs2-mod.c                    |  315 +++++
5829  fs/orangefs/pvfs2-sysfs.c                  | 1787 ++++++++++++++++++++++++++++
5830  fs/orangefs/pvfs2-sysfs.h                  |    2 +
5831  fs/orangefs/pvfs2-utils.c                  | 1165 ++++++++++++++++++
5832  fs/orangefs/super.c                        |  553 +++++++++
5833  fs/orangefs/symlink.c                      |   31 +
5834  fs/orangefs/upcall.h                       |  255 ++++
5835  fs/orangefs/waitqueue.c                    |  529 ++++++++
5836  fs/orangefs/xattr.c                        |  530 +++++++++
5837  32 files changed, 12199 insertions(+)
5838  create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs
5839  create mode 100644 Documentation/filesystems/orangefs.txt
5840  create mode 100644 fs/orangefs/Kconfig
5841  create mode 100644 fs/orangefs/Makefile
5842  create mode 100644 fs/orangefs/acl.c
5843  create mode 100644 fs/orangefs/dcache.c
5844  create mode 100644 fs/orangefs/devpvfs2-req.c
5845  create mode 100644 fs/orangefs/dir.c
5846  create mode 100644 fs/orangefs/downcall.h
5847  create mode 100644 fs/orangefs/file.c
5848  create mode 100644 fs/orangefs/inode.c
5849  create mode 100644 fs/orangefs/namei.c
5850  create mode 100644 fs/orangefs/protocol.h
5851  create mode 100644 fs/orangefs/pvfs2-bufmap.c
5852  create mode 100644 fs/orangefs/pvfs2-bufmap.h
5853  create mode 100644 fs/orangefs/pvfs2-cache.c
5854  create mode 100644 fs/orangefs/pvfs2-debug.h
5855  create mode 100644 fs/orangefs/pvfs2-debugfs.c
5856  create mode 100644 fs/orangefs/pvfs2-debugfs.h
5857  create mode 100644 fs/orangefs/pvfs2-dev-proto.h
5858  create mode 100644 fs/orangefs/pvfs2-kernel.h
5859  create mode 100644 fs/orangefs/pvfs2-mod.c
5860  create mode 100644 fs/orangefs/pvfs2-sysfs.c
5861  create mode 100644 fs/orangefs/pvfs2-sysfs.h
5862  create mode 100644 fs/orangefs/pvfs2-utils.c
5863  create mode 100644 fs/orangefs/super.c
5864  create mode 100644 fs/orangefs/symlink.c
5865  create mode 100644 fs/orangefs/upcall.h
5866  create mode 100644 fs/orangefs/waitqueue.c
5867  create mode 100644 fs/orangefs/xattr.c
5868 Merging overlayfs/overlayfs-next (8d3095f4ad47 ovl: default permissions)
5869 $ git merge overlayfs/overlayfs-next
5870 Auto-merging fs/overlayfs/super.c
5871 Merge made by the 'recursive' strategy.
5872  fs/overlayfs/inode.c     | 23 +++++++++++++++++++++++
5873  fs/overlayfs/overlayfs.h |  3 +++
5874  fs/overlayfs/super.c     | 28 ++++++++++++++++++++++++++++
5875  3 files changed, 54 insertions(+)
5876 Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
5877 $ git merge squashfs/master
5878 Already up-to-date.
5879 Merging v9fs/for-next (46cfbe8e037a 9p: trans_fd, bail out if recv fcall if missing)
5880 $ git merge v9fs/for-next
5881 Merge made by the 'recursive' strategy.
5882  net/9p/trans_fd.c     | 88 +++++++++++++++++++++++++++------------------------
5883  net/9p/trans_virtio.c |  2 +-
5884  2 files changed, 47 insertions(+), 43 deletions(-)
5885 Merging ubifs/linux-next (1cb8f9776c7d ubi: fastmap: Implement produce_free_peb())
5886 $ git merge ubifs/linux-next
5887 Merge made by the 'recursive' strategy.
5888  drivers/mtd/ubi/attach.c     |  4 +---
5889  drivers/mtd/ubi/eba.c        |  2 +-
5890  drivers/mtd/ubi/fastmap-wl.c | 29 +++++++++++++++++++++++++++++
5891  drivers/mtd/ubi/fastmap.c    |  2 +-
5892  drivers/mtd/ubi/gluebi.c     |  4 ++--
5893  drivers/mtd/ubi/ubi-media.h  |  2 +-
5894  fs/ubifs/debug.c             |  8 ++++----
5895  fs/ubifs/lpt.c               |  6 ++----
5896  fs/ubifs/recovery.c          |  2 +-
5897  fs/ubifs/tnc.c               |  3 +--
5898  fs/ubifs/ubifs.h             |  4 ++--
5899  11 files changed, 45 insertions(+), 21 deletions(-)
5900 Merging xfs/for-next (264e89ad3412 Merge branch 'xfs-dax-updates' into for-next)
5901 $ git merge xfs/for-next
5902 Auto-merging fs/dax.c
5903 Merge made by the 'recursive' strategy.
5904  fs/dax.c                           |   5 +
5905  fs/xfs/Makefile                    |   2 +-
5906  fs/xfs/kmem.c                      |  10 +-
5907  fs/xfs/libxfs/xfs_alloc.c          |  30 ++++--
5908  fs/xfs/libxfs/xfs_alloc.h          |   8 +-
5909  fs/xfs/libxfs/xfs_attr.c           |   6 +-
5910  fs/xfs/libxfs/xfs_attr_leaf.c      |   3 +
5911  fs/xfs/libxfs/xfs_attr_remote.c    |   2 +-
5912  fs/xfs/libxfs/xfs_bmap.c           |  65 +++++++++----
5913  fs/xfs/libxfs/xfs_bmap.h           |  13 ++-
5914  fs/xfs/libxfs/xfs_btree.c          |  21 ++++-
5915  fs/xfs/libxfs/xfs_btree.h          |  39 ++++----
5916  fs/xfs/libxfs/xfs_da_btree.c       |   4 +
5917  fs/xfs/libxfs/xfs_dir2.c           |   6 +-
5918  fs/xfs/libxfs/xfs_dir2_block.c     |   3 +
5919  fs/xfs/libxfs/xfs_dir2_data.c      |   3 +
5920  fs/xfs/libxfs/xfs_dir2_leaf.c      |   3 +
5921  fs/xfs/libxfs/xfs_dir2_node.c      |   3 +
5922  fs/xfs/libxfs/xfs_format.h         |  18 +++-
5923  fs/xfs/libxfs/xfs_fs.h             |  10 ++
5924  fs/xfs/libxfs/xfs_ialloc.c         |  10 +-
5925  fs/xfs/libxfs/xfs_sb.c             |  10 ++
5926  fs/xfs/libxfs/xfs_symlink_remote.c |   7 ++
5927  fs/xfs/xfs_acl.c                   |  13 ++-
5928  fs/xfs/xfs_acl.h                   |   3 +
5929  fs/xfs/xfs_aops.c                  | 119 +++++++++++++-----------
5930  fs/xfs/xfs_aops.h                  |   3 +-
5931  fs/xfs/xfs_attr_list.c             |   2 +-
5932  fs/xfs/xfs_bmap_util.c             |  38 +++++++-
5933  fs/xfs/xfs_buf.c                   |  21 +++--
5934  fs/xfs/xfs_dir2_readdir.c          |   2 +-
5935  fs/xfs/xfs_dquot.c                 |  14 +--
5936  fs/xfs/xfs_file.c                  | 114 +++++++++++++++++------
5937  fs/xfs/xfs_icache.c                |  18 ++--
5938  fs/xfs/xfs_inode.c                 |   8 +-
5939  fs/xfs/xfs_inode_item.c            |   1 +
5940  fs/xfs/xfs_inode_item.h            |   1 +
5941  fs/xfs/xfs_ioctl.c                 |  23 +++--
5942  fs/xfs/xfs_ioctl32.c               |   2 +-
5943  fs/xfs/xfs_iomap.c                 |  70 ++++++++++----
5944  fs/xfs/xfs_iops.c                  |   4 +-
5945  fs/xfs/xfs_linux.h                 |   7 ++
5946  fs/xfs/xfs_log.c                   |  93 +++++++++++++++----
5947  fs/xfs/xfs_log.h                   |   1 +
5948  fs/xfs/xfs_log_priv.h              |  51 ++++++++++
5949  fs/xfs/xfs_log_recover.c           |  12 ++-
5950  fs/xfs/xfs_message.c               |   7 ++
5951  fs/xfs/xfs_mount.c                 |  21 ++++-
5952  fs/xfs/xfs_mount.h                 |   5 +
5953  fs/xfs/xfs_pnfs.c                  |   5 +
5954  fs/xfs/xfs_qm.c                    |  14 +--
5955  fs/xfs/xfs_stats.c                 |  93 +++++++++----------
5956  fs/xfs/xfs_stats.h                 |  36 +++++---
5957  fs/xfs/xfs_super.c                 |  50 ++++++++--
5958  fs/xfs/xfs_sysctl.c                |  15 +--
5959  fs/xfs/xfs_sysfs.c                 | 185 ++++++++++++++++++++++---------------
5960  fs/xfs/xfs_sysfs.h                 |   1 +
5961  fs/xfs/xfs_trace.h                 |   2 +
5962  fs/xfs/xfs_trans.c                 |   6 +-
5963  fs/xfs/xfs_trans_ail.c             |  13 +--
5964  fs/xfs/xfs_trans_inode.c           |   9 ++
5965  fs/xfs/xfs_xattr.c                 |  31 ++++++-
5966  62 files changed, 988 insertions(+), 406 deletions(-)
5967 Merging file-locks/linux-next (616fb38fa7a9 locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait)
5968 $ git merge file-locks/linux-next
5969 Auto-merging include/linux/fs.h
5970 Auto-merging fs/nfs/nfs4proc.c
5971 Auto-merging fs/locks.c
5972 Auto-merging fs/gfs2/file.c
5973 Auto-merging fs/cifs/file.c
5974 Merge made by the 'recursive' strategy.
5975  drivers/staging/lustre/lustre/llite/file.c |   8 +--
5976  fs/9p/vfs_file.c                           |   4 +-
5977  fs/ceph/locks.c                            |   4 +-
5978  fs/cifs/file.c                             |   2 +-
5979  fs/dlm/plock.c                             |   4 +-
5980  fs/fuse/file.c                             |   2 +-
5981  fs/gfs2/file.c                             |   8 +--
5982  fs/lockd/clntproc.c                        |  13 +---
5983  fs/locks.c                                 | 106 ++++++++++++++++++-----------
5984  fs/nfs/file.c                              |  13 +---
5985  fs/nfs/nfs4proc.c                          |  13 +---
5986  fs/ocfs2/locks.c                           |   8 +--
5987  include/linux/fs.h                         |  21 ++----
5988  include/trace/events/filelock.h            |  38 ++++++++++-
5989  14 files changed, 127 insertions(+), 117 deletions(-)
5990 Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root)
5991 $ git merge vfs/for-next
5992 Already up-to-date.
5993 Merging pci/next (7225107e1582 Merge branch 'pci/host-layerscape' into next)
5994 $ git merge pci/next
5995 Auto-merging include/linux/msi.h
5996 Auto-merging drivers/pci/quirks.c
5997 Auto-merging drivers/pci/probe.c
5998 Auto-merging drivers/pci/pci-driver.c
5999 Auto-merging drivers/pci/msi.c
6000 Auto-merging arch/x86/pci/common.c
6001 Auto-merging arch/powerpc/platforms/pseries/setup.c
6002 Auto-merging MAINTAINERS
6003 Auto-merging Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
6004 Merge made by the 'recursive' strategy.
6005  .../bindings/arm/hisilicon/hisilicon.txt           |  17 +
6006  .../devicetree/bindings/pci/altera-pcie-msi.txt    |  28 +
6007  .../devicetree/bindings/pci/altera-pcie.txt        |  49 ++
6008  .../devicetree/bindings/pci/brcm,iproc-pcie.txt    |  20 +
6009  .../devicetree/bindings/pci/designware-pcie.txt    |  12 +-
6010  .../devicetree/bindings/pci/hisilicon-pcie.txt     |  44 ++
6011  .../devicetree/bindings/pci/host-generic-pci.txt   |   5 +-
6012  .../devicetree/bindings/pci/layerscape-pci.txt     |  14 +-
6013  MAINTAINERS                                        |  23 +
6014  arch/arm/include/asm/Kbuild                        |   1 +
6015  arch/arm/include/asm/mach/pci.h                    |   6 -
6016  arch/arm/kernel/bios32.c                           |  12 +-
6017  arch/arm64/boot/dts/amd/amd-overdrive.dts          |   1 -
6018  arch/powerpc/platforms/pseries/setup.c             |  14 +-
6019  arch/sparc/kernel/pci.c                            |   7 +-
6020  arch/sparc/kernel/pci_common.c                     |  17 +-
6021  arch/sparc/kernel/pci_impl.h                       |   1 +
6022  arch/x86/pci/common.c                              |   8 +
6023  arch/x86/pci/legacy.c                              |   2 +-
6024  drivers/of/of_pci.c                                |  26 +
6025  drivers/pci/host/Kconfig                           |  33 +-
6026  drivers/pci/host/Makefile                          |   3 +
6027  drivers/pci/host/pci-dra7xx.c                      |   7 +
6028  drivers/pci/host/pci-exynos.c                      |   5 +-
6029  drivers/pci/host/pci-host-generic.c                |  41 +-
6030  drivers/pci/host/pci-imx6.c                        |   5 +-
6031  drivers/pci/host/pci-keystone-dw.c                 |   8 +-
6032  drivers/pci/host/pci-keystone.h                    |   2 +-
6033  drivers/pci/host/pci-layerscape.c                  | 199 +++++--
6034  drivers/pci/host/pci-mvebu.c                       | 473 ++++++++++++-----
6035  drivers/pci/host/pci-tegra.c                       |   4 +-
6036  drivers/pci/host/pci-xgene.c                       |  22 -
6037  drivers/pci/host/pcie-altera-msi.c                 | 312 +++++++++++
6038  drivers/pci/host/pcie-altera.c                     | 579 +++++++++++++++++++++
6039  drivers/pci/host/pcie-designware.c                 | 375 ++++++-------
6040  drivers/pci/host/pcie-designware.h                 |  20 +-
6041  drivers/pci/host/pcie-hisi.c                       | 198 +++++++
6042  drivers/pci/host/pcie-iproc-platform.c             |  27 +
6043  drivers/pci/host/pcie-iproc.c                      | 163 +++++-
6044  drivers/pci/host/pcie-iproc.h                      |  20 +-
6045  drivers/pci/host/pcie-rcar.c                       |  86 +--
6046  drivers/pci/host/pcie-spear13xx.c                  |  24 +-
6047  drivers/pci/hotplug/pciehp_ctrl.c                  |  75 +--
6048  drivers/pci/iov.c                                  | 101 ++--
6049  drivers/pci/msi.c                                  |  34 +-
6050  drivers/pci/pci-driver.c                           |   8 +-
6051  drivers/pci/pci.c                                  | 225 +++++++-
6052  drivers/pci/pci.h                                  |   1 +
6053  drivers/pci/pcie/aer/aerdrv_core.c                 |  28 +
6054  drivers/pci/probe.c                                |   6 +
6055  drivers/pci/quirks.c                               |  58 +++
6056  drivers/pci/setup-bus.c                            |  50 +-
6057  drivers/pci/setup-res.c                            |   7 +
6058  include/linux/aer.h                                |   5 +
6059  include/linux/msi.h                                |   2 +
6060  include/linux/of_pci.h                             |   3 +
6061  include/linux/pci.h                                |  12 +
6062  include/uapi/linux/pci_regs.h                      |  43 +-
6063  58 files changed, 2894 insertions(+), 677 deletions(-)
6064  create mode 100644 Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
6065  create mode 100644 Documentation/devicetree/bindings/pci/altera-pcie.txt
6066  create mode 100644 Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
6067  create mode 100644 drivers/pci/host/pcie-altera-msi.c
6068  create mode 100644 drivers/pci/host/pcie-altera.c
6069  create mode 100644 drivers/pci/host/pcie-hisi.c
6070 Merging hid/for-next (a88707048ff5 Merge branch 'for-4.4/wacom' into for-next)
6071 $ git merge hid/for-next
6072 Auto-merging drivers/hid/hid-core.c
6073 Auto-merging drivers/hid/Makefile
6074 Auto-merging drivers/hid/Kconfig
6075 Removing Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra
6076 Removing Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus
6077 Removing Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
6078 Merge made by the 'recursive' strategy.
6079  .../sysfs-driver-hid-roccat-arvo                   |   0
6080  .../sysfs-driver-hid-roccat-isku                   |   0
6081  .../ABI/obsolete/sysfs-driver-hid-roccat-koneplus  |  99 ++-
6082  .../sysfs-driver-hid-roccat-konepure               |   0
6083  .../ABI/obsolete/sysfs-driver-hid-roccat-kovaplus  |  50 ++
6084  .../sysfs-driver-hid-roccat-lua                    |   0
6085  .../ABI/obsolete/sysfs-driver-hid-roccat-pyra      |  50 ++
6086  .../sysfs-driver-hid-roccat-ryos                   |   0
6087  .../sysfs-driver-hid-roccat-savu                   |   0
6088  Documentation/ABI/testing/sysfs-driver-hid-corsair |  15 +
6089  .../ABI/testing/sysfs-driver-hid-roccat-koneplus   |  96 ---
6090  .../ABI/testing/sysfs-driver-hid-roccat-kovaplus   |  49 --
6091  .../ABI/testing/sysfs-driver-hid-roccat-pyra       |  49 --
6092  drivers/hid/Kconfig                                |  15 +-
6093  drivers/hid/Makefile                               |   1 +
6094  drivers/hid/hid-appleir.c                          |   4 +-
6095  drivers/hid/hid-aureal.c                           |   3 +-
6096  drivers/hid/hid-core.c                             |   9 +-
6097  drivers/hid/hid-corsair.c                          | 673 +++++++++++++++++++++
6098  drivers/hid/hid-dr.c                               |  58 ++
6099  drivers/hid/hid-elecom.c                           |   2 +-
6100  drivers/hid/hid-elo.c                              |   4 +-
6101  drivers/hid/hid-ids.h                              |   7 +
6102  drivers/hid/hid-input.c                            |  10 +-
6103  drivers/hid/hid-lenovo.c                           |   4 +-
6104  drivers/hid/hid-logitech-hidpp.c                   | 163 ++++-
6105  drivers/hid/hid-magicmouse.c                       |   8 +-
6106  drivers/hid/hid-microsoft.c                        |   2 +
6107  drivers/hid/hid-multitouch.c                       |  68 ++-
6108  drivers/hid/hid-ntrig.c                            |   6 +-
6109  drivers/hid/hid-prodikeys.c                        |   4 +-
6110  drivers/hid/hid-rmi.c                              |  11 +-
6111  drivers/hid/hid-saitek.c                           |   2 +
6112  drivers/hid/hid-sensor-hub.c                       |  25 +-
6113  drivers/hid/hid-sony.c                             |  13 +-
6114  drivers/hid/hid-uclogic.c                          |   6 +-
6115  drivers/hid/i2c-hid/i2c-hid.c                      |   1 +
6116  drivers/hid/usbhid/hid-quirks.c                    |   2 +
6117  drivers/hid/wacom_sys.c                            |  64 +-
6118  drivers/hid/wacom_wac.c                            | 191 ++++--
6119  drivers/hid/wacom_wac.h                            |  10 +-
6120  include/linux/hid.h                                |   4 +-
6121  42 files changed, 1470 insertions(+), 308 deletions(-)
6122  rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-arvo (100%)
6123  rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-isku (100%)
6124  rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-konepure (100%)
6125  rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-lua (100%)
6126  rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-ryos (100%)
6127  rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-savu (100%)
6128  create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-corsair
6129  delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
6130  delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus
6131  delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra
6132  create mode 100644 drivers/hid/hid-corsair.c
6133 Merging i2c/i2c/for-next (121c7794864c Merge branch 'i2c/for-4.4' into i2c/for-next)
6134 $ git merge i2c/i2c/for-next
6135 Resolved 'MAINTAINERS' using previous resolution.
6136 Removing include/linux/i2c/i2c-rcar.h
6137 Auto-merging include/linux/acpi.h
6138 Auto-merging drivers/i2c/busses/i2c-ismt.c
6139 Auto-merging MAINTAINERS
6140 CONFLICT (content): Merge conflict in MAINTAINERS
6141 Automatic merge failed; fix conflicts and then commit the result.
6142 $ git commit -v -a
6143 [master c193419a9a45] Merge remote-tracking branch 'i2c/i2c/for-next'
6144 $ git diff -M --stat --summary HEAD^..
6145  Documentation/acpi/enumeration.txt                 |  11 +-
6146  Documentation/acpi/i2c-muxes.txt                   |  58 ++
6147  .../devicetree/bindings/i2c/i2c-davinci.txt        |   6 +-
6148  Documentation/devicetree/bindings/i2c/i2c-imx.txt  |   9 +
6149  Documentation/devicetree/bindings/i2c/i2c-rcar.txt |   1 +
6150  .../devicetree/bindings/i2c/i2c-sh_mobile.txt      |   1 +
6151  .../devicetree/bindings/i2c/i2c-uniphier-f.txt     |  25 +
6152  .../devicetree/bindings/i2c/i2c-uniphier.txt       |  25 +
6153  Documentation/i2c/busses/i2c-i801                  |   2 +
6154  MAINTAINERS                                        |   8 +-
6155  drivers/i2c/busses/Kconfig                         |  24 +-
6156  drivers/i2c/busses/Makefile                        |   2 +
6157  drivers/i2c/busses/i2c-at91.c                      |  82 ++-
6158  drivers/i2c/busses/i2c-au1550.c                    |  60 +--
6159  drivers/i2c/busses/i2c-davinci.c                   |   8 +
6160  drivers/i2c/busses/i2c-designware-core.c           |  74 ++-
6161  drivers/i2c/busses/i2c-designware-core.h           |  10 +-
6162  drivers/i2c/busses/i2c-designware-pcidrv.c         |  33 +-
6163  drivers/i2c/busses/i2c-designware-platdrv.c        |  81 +--
6164  drivers/i2c/busses/i2c-i801.c                      |  16 +-
6165  drivers/i2c/busses/i2c-ibm_iic.c                   |   1 +
6166  drivers/i2c/busses/i2c-img-scb.c                   |  73 +--
6167  drivers/i2c/busses/i2c-imx.c                       |  73 ++-
6168  drivers/i2c/busses/i2c-ismt.c                      |  80 +--
6169  drivers/i2c/busses/i2c-meson.c                     |   1 +
6170  drivers/i2c/busses/i2c-mt65xx.c                    |  16 +
6171  drivers/i2c/busses/i2c-ocores.c                    |  31 +-
6172  drivers/i2c/busses/i2c-pnx.c                       |   7 +-
6173  drivers/i2c/busses/i2c-pxa.c                       |  41 +-
6174  drivers/i2c/busses/i2c-rcar.c                      |  24 +-
6175  drivers/i2c/busses/i2c-rk3x.c                      |   1 +
6176  drivers/i2c/busses/i2c-sh_mobile.c                 |   1 +
6177  drivers/i2c/busses/i2c-sirf.c                      |  26 +-
6178  drivers/i2c/busses/i2c-stu300.c                    |   1 +
6179  drivers/i2c/busses/i2c-tegra.c                     |   1 -
6180  drivers/i2c/busses/i2c-uniphier-f.c                | 584 +++++++++++++++++++++
6181  drivers/i2c/busses/i2c-uniphier.c                  | 441 ++++++++++++++++
6182  drivers/i2c/i2c-core.c                             |  82 ++-
6183  drivers/i2c/i2c-dev.c                              |  23 +-
6184  drivers/i2c/i2c-mux.c                              |   8 +
6185  drivers/mfd/intel_quark_i2c_gpio.c                 |  33 +-
6186  drivers/mfd/mfd-core.c                             |  52 +-
6187  drivers/misc/eeprom/at24.c                         |  22 +-
6188  fs/compat_ioctl.c                                  |   2 +-
6189  include/linux/acpi.h                               |   5 +
6190  include/linux/i2c-ocores.h                         |   1 +
6191  include/linux/i2c/i2c-rcar.h                       |  10 -
6192  include/linux/mfd/core.h                           |  10 +-
6193  include/uapi/linux/i2c-dev.h                       |   4 +-
6194  49 files changed, 1777 insertions(+), 413 deletions(-)
6195  create mode 100644 Documentation/acpi/i2c-muxes.txt
6196  create mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier-f.txt
6197  create mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier.txt
6198  create mode 100644 drivers/i2c/busses/i2c-uniphier-f.c
6199  create mode 100644 drivers/i2c/busses/i2c-uniphier.c
6200  delete mode 100644 include/linux/i2c/i2c-rcar.h
6201 Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define)
6202 $ git merge jdelvare-hwmon/master
6203 Merge made by the 'recursive' strategy.
6204  drivers/hwmon/k10temp.c | 1 -
6205  1 file changed, 1 deletion(-)
6206 Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
6207 $ git merge dmi/master
6208 Already up-to-date.
6209 Merging hwmon-staging/hwmon-next (3b5ea47dbff0 hwmon: (fam15h_power) Add max compute unit accumulated power)
6210 $ git merge hwmon-staging/hwmon-next
6211 Already up-to-date.
6212 Merging v4l-dvb/master (8132ccfb864a Merge branch 'v4l_for_linus' into to_next)
6213 $ git merge v4l-dvb/master
6214 Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.c
6215 Auto-merging drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
6216 Auto-merging drivers/media/platform/soc_camera/atmel-isi.h
6217 Auto-merging drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
6218 Auto-merging MAINTAINERS
6219 Removing Documentation/DocBook/media/dvb/kdapi.xml
6220 Merge made by the 'recursive' strategy.
6221  Documentation/DocBook/device-drivers.tmpl          |   81 +-
6222  Documentation/DocBook/media/dvb/dvbapi.xml         |    3 -
6223  Documentation/DocBook/media/dvb/kdapi.xml          | 2309 --------------------
6224  Documentation/DocBook/media/v4l/biblio.xml         |   18 +
6225  Documentation/DocBook/media/v4l/compat.xml         |   20 +
6226  Documentation/DocBook/media/v4l/controls.xml       |   14 +
6227  Documentation/DocBook/media/v4l/dev-sdr.xml        |   32 +-
6228  Documentation/DocBook/media/v4l/io.xml             |   10 +-
6229  Documentation/DocBook/media/v4l/pixfmt.xml         |  111 +-
6230  Documentation/DocBook/media/v4l/v4l2.xml           |   13 +-
6231  .../DocBook/media/v4l/vidioc-encoder-cmd.xml       |    2 +-
6232  .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml       |    7 +
6233  Documentation/DocBook/media/v4l/vidioc-g-fmt.xml   |    2 +-
6234  .../DocBook/media/v4l/vidioc-g-modulator.xml       |   14 +-
6235  Documentation/DocBook/media/v4l/vidioc-g-tuner.xml |   16 +
6236  .../DocBook/media/v4l/vidioc-querycap.xml          |    6 +
6237  .../DocBook/media/v4l/vidioc-queryctrl.xml         |   21 +-
6238  Documentation/DocBook/media_api.tmpl               |    2 +-
6239  .../bindings/media/exynos-jpeg-codec.txt           |    3 +-
6240  Documentation/video4linux/CARDLIST.saa7134         |    1 +
6241  Documentation/video4linux/v4l2-pci-skeleton.c      |    4 +-
6242  MAINTAINERS                                        |    8 +
6243  drivers/input/touchscreen/sur40.c                  |   20 +-
6244  drivers/media/dvb-core/demux.h                     |  619 ++++--
6245  drivers/media/dvb-core/dmxdev.c                    |   10 +-
6246  drivers/media/dvb-core/dvb-usb-ids.h               |    1 +
6247  drivers/media/dvb-core/dvb_ca_en50221.h            |   99 +-
6248  drivers/media/dvb-core/dvb_demux.c                 |   11 +-
6249  drivers/media/dvb-core/dvb_net.c                   |    5 +-
6250  drivers/media/dvb-core/dvbdev.h                    |    4 -
6251  drivers/media/dvb-frontends/drxd_hard.c            |    3 +-
6252  drivers/media/dvb-frontends/rtl2832_sdr.c          |   23 +-
6253  drivers/media/i2c/ml86v7667.c                      |   11 +-
6254  drivers/media/i2c/s5c73m3/s5c73m3-core.c           |    2 +-
6255  drivers/media/i2c/s5c73m3/s5c73m3-spi.c            |    1 +
6256  drivers/media/i2c/smiapp/smiapp-core.c             |    1 +
6257  drivers/media/i2c/tvp5150.c                        |   14 +-
6258  drivers/media/media-entity.c                       |    4 +-
6259  drivers/media/pci/bt8xx/bttv-driver.c              |    5 +-
6260  drivers/media/pci/cobalt/Kconfig                   |    2 +-
6261  drivers/media/pci/cobalt/cobalt-cpld.c             |    8 +-
6262  drivers/media/pci/cobalt/cobalt-driver.h           |    6 +-
6263  drivers/media/pci/cobalt/cobalt-irq.c              |    7 +-
6264  drivers/media/pci/cobalt/cobalt-v4l2.c             |   24 +-
6265  drivers/media/pci/cx18/cx18-mailbox.c              |    2 +-
6266  drivers/media/pci/cx23885/cx23885-417.c            |   13 +-
6267  drivers/media/pci/cx23885/cx23885-core.c           |   24 +-
6268  drivers/media/pci/cx23885/cx23885-dvb.c            |   11 +-
6269  drivers/media/pci/cx23885/cx23885-vbi.c            |   18 +-
6270  drivers/media/pci/cx23885/cx23885-video.c          |   29 +-
6271  drivers/media/pci/cx23885/cx23885.h                |    2 +-
6272  drivers/media/pci/cx25821/cx25821-alsa.c           |    2 +-
6273  drivers/media/pci/cx25821/cx25821-video.c          |   24 +-
6274  drivers/media/pci/cx25821/cx25821.h                |    3 +-
6275  drivers/media/pci/cx88/cx88-alsa.c                 |    2 +-
6276  drivers/media/pci/cx88/cx88-blackbird.c            |   15 +-
6277  drivers/media/pci/cx88/cx88-core.c                 |    8 +-
6278  drivers/media/pci/cx88/cx88-dvb.c                  |   13 +-
6279  drivers/media/pci/cx88/cx88-mpeg.c                 |   14 +-
6280  drivers/media/pci/cx88/cx88-vbi.c                  |   19 +-
6281  drivers/media/pci/cx88/cx88-video.c                |   21 +-
6282  drivers/media/pci/cx88/cx88.h                      |    2 +-
6283  drivers/media/pci/dt3155/dt3155.c                  |   20 +-
6284  drivers/media/pci/dt3155/dt3155.h                  |    3 +-
6285  drivers/media/pci/ivtv/ivtv-alsa-main.c            |   14 +-
6286  drivers/media/pci/ivtv/ivtv-yuv.c                  |   12 +-
6287  drivers/media/pci/netup_unidvb/netup_unidvb.h      |    4 +-
6288  drivers/media/pci/netup_unidvb/netup_unidvb_ci.c   |   10 +-
6289  drivers/media/pci/netup_unidvb/netup_unidvb_core.c |   35 +-
6290  drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c  |    2 +-
6291  drivers/media/pci/netup_unidvb/netup_unidvb_spi.c  |    4 +-
6292  drivers/media/pci/saa7134/saa7134-cards.c          |   43 +
6293  drivers/media/pci/saa7134/saa7134-core.c           |   14 +-
6294  drivers/media/pci/saa7134/saa7134-input.c          |    7 +
6295  drivers/media/pci/saa7134/saa7134-ts.c             |   16 +-
6296  drivers/media/pci/saa7134/saa7134-vbi.c            |   12 +-
6297  drivers/media/pci/saa7134/saa7134-video.c          |   23 +-
6298  drivers/media/pci/saa7134/saa7134.h                |    5 +-
6299  drivers/media/pci/saa7164/Kconfig                  |    1 -
6300  drivers/media/pci/saa7164/saa7164-encoder.c        |  653 ++----
6301  drivers/media/pci/saa7164/saa7164-vbi.c            |  629 +-----
6302  drivers/media/pci/saa7164/saa7164.h                |   26 +-
6303  drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c     |   48 +-
6304  drivers/media/pci/solo6x10/solo6x10-v4l2.c         |   21 +-
6305  drivers/media/pci/solo6x10/solo6x10.h              |    4 +-
6306  drivers/media/pci/sta2x11/sta2x11_vip.c            |   28 +-
6307  drivers/media/pci/ttpci/av7110.c                   |    9 +-
6308  drivers/media/pci/ttpci/av7110_av.c                |    6 +-
6309  drivers/media/pci/tw68/tw68-video.c                |   22 +-
6310  drivers/media/pci/tw68/tw68.h                      |    3 +-
6311  drivers/media/platform/Kconfig                     |    2 +-
6312  drivers/media/platform/am437x/am437x-vpfe.c        |   43 +-
6313  drivers/media/platform/am437x/am437x-vpfe.h        |    3 +-
6314  drivers/media/platform/blackfin/bfin_capture.c     |   37 +-
6315  drivers/media/platform/coda/coda-bit.c             |  135 +-
6316  drivers/media/platform/coda/coda-common.c          |   26 +-
6317  drivers/media/platform/coda/coda-jpeg.c            |    6 +-
6318  drivers/media/platform/coda/coda.h                 |    8 +-
6319  drivers/media/platform/coda/trace.h                |   18 +-
6320  drivers/media/platform/davinci/vpbe_display.c      |   34 +-
6321  drivers/media/platform/davinci/vpif_capture.c      |   33 +-
6322  drivers/media/platform/davinci/vpif_capture.h      |    2 +-
6323  drivers/media/platform/davinci/vpif_display.c      |   42 +-
6324  drivers/media/platform/davinci/vpif_display.h      |    2 +-
6325  drivers/media/platform/exynos-gsc/gsc-core.h       |    4 +-
6326  drivers/media/platform/exynos-gsc/gsc-m2m.c        |   25 +-
6327  drivers/media/platform/exynos4-is/fimc-capture.c   |   33 +-
6328  drivers/media/platform/exynos4-is/fimc-core.c      |    2 +-
6329  drivers/media/platform/exynos4-is/fimc-core.h      |    4 +-
6330  drivers/media/platform/exynos4-is/fimc-is.h        |    2 +-
6331  drivers/media/platform/exynos4-is/fimc-isp-video.c |   18 +-
6332  drivers/media/platform/exynos4-is/fimc-isp-video.h |    2 +-
6333  drivers/media/platform/exynos4-is/fimc-isp.h       |    4 +-
6334  drivers/media/platform/exynos4-is/fimc-lite.c      |   25 +-
6335  drivers/media/platform/exynos4-is/fimc-lite.h      |    4 +-
6336  drivers/media/platform/exynos4-is/fimc-m2m.c       |   23 +-
6337  drivers/media/platform/exynos4-is/mipi-csis.c      |    3 +-
6338  drivers/media/platform/m2m-deinterlace.c           |   25 +-
6339  drivers/media/platform/marvell-ccic/mcam-core.c    |   46 +-
6340  drivers/media/platform/marvell-ccic/mcam-core.h    |    2 +-
6341  drivers/media/platform/mx2_emmaprp.c               |   17 +-
6342  drivers/media/platform/omap3isp/ispstat.c          |    5 +-
6343  drivers/media/platform/omap3isp/ispstat.h          |    2 +-
6344  drivers/media/platform/omap3isp/ispvideo.c         |   27 +-
6345  drivers/media/platform/omap3isp/ispvideo.h         |    4 +-
6346  drivers/media/platform/rcar_jpu.c                  |   68 +-
6347  drivers/media/platform/s3c-camif/camif-capture.c   |   26 +-
6348  drivers/media/platform/s3c-camif/camif-core.c      |    2 +-
6349  drivers/media/platform/s3c-camif/camif-core.h      |    4 +-
6350  drivers/media/platform/s5p-g2d/g2d.c               |   19 +-
6351  drivers/media/platform/s5p-jpeg/jpeg-core.c        |  475 +++-
6352  drivers/media/platform/s5p-jpeg/jpeg-core.h        |   41 +-
6353  drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c  |   80 +-
6354  drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h  |   11 +-
6355  drivers/media/platform/s5p-jpeg/jpeg-regs.h        |   85 +-
6356  drivers/media/platform/s5p-mfc/s5p_mfc.c           |  106 +-
6357  drivers/media/platform/s5p-mfc/s5p_mfc_common.h    |    4 +-
6358  drivers/media/platform/s5p-mfc/s5p_mfc_dec.c       |   40 +-
6359  drivers/media/platform/s5p-mfc/s5p_mfc_enc.c       |   75 +-
6360  drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c    |   46 +-
6361  drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c    |   68 +-
6362  drivers/media/platform/s5p-tv/mixer.h              |    4 +-
6363  drivers/media/platform/s5p-tv/mixer_grp_layer.c    |    2 +-
6364  drivers/media/platform/s5p-tv/mixer_reg.c          |    2 +-
6365  drivers/media/platform/s5p-tv/mixer_video.c        |   13 +-
6366  drivers/media/platform/s5p-tv/mixer_vp_layer.c     |    5 +-
6367  drivers/media/platform/sh_veu.c                    |   22 +-
6368  drivers/media/platform/sh_vou.c                    |   29 +-
6369  drivers/media/platform/soc_camera/atmel-isi.c      |  153 +-
6370  .../media/platform/soc_camera}/atmel-isi.h         |    7 +-
6371  drivers/media/platform/soc_camera/mx2_camera.c     |   24 +-
6372  drivers/media/platform/soc_camera/mx3_camera.c     |   30 +-
6373  drivers/media/platform/soc_camera/rcar_vin.c       |   64 +-
6374  .../platform/soc_camera/sh_mobile_ceu_camera.c     |   63 +-
6375  drivers/media/platform/soc_camera/soc_camera.c     |    4 +-
6376  drivers/media/platform/sti/bdisp/bdisp-v4l2.c      |   26 +-
6377  drivers/media/platform/sti/c8sectpfe/Kconfig       |    1 -
6378  .../media/platform/sti/c8sectpfe/c8sectpfe-core.c  |    4 +-
6379  drivers/media/platform/ti-vpe/vpe.c                |   44 +-
6380  drivers/media/platform/vim2m.c                     |   57 +-
6381  drivers/media/platform/vivid/Kconfig               |    8 +
6382  drivers/media/platform/vivid/vivid-core.c          |    7 +-
6383  drivers/media/platform/vivid/vivid-core.h          |    6 +-
6384  drivers/media/platform/vivid/vivid-ctrls.c         |   55 +-
6385  drivers/media/platform/vivid/vivid-kthread-cap.c   |   73 +-
6386  drivers/media/platform/vivid/vivid-kthread-out.c   |   34 +-
6387  drivers/media/platform/vivid/vivid-osd.c           |    1 +
6388  drivers/media/platform/vivid/vivid-sdr-cap.c       |   83 +-
6389  drivers/media/platform/vivid/vivid-tpg-colors.c    |  328 ++-
6390  drivers/media/platform/vivid/vivid-tpg-colors.h    |    4 +-
6391  drivers/media/platform/vivid/vivid-tpg.c           |   91 +
6392  drivers/media/platform/vivid/vivid-vbi-cap.c       |   40 +-
6393  drivers/media/platform/vivid/vivid-vbi-out.c       |   20 +-
6394  drivers/media/platform/vivid/vivid-vid-cap.c       |   18 +-
6395  drivers/media/platform/vivid/vivid-vid-common.c    |   56 +
6396  drivers/media/platform/vivid/vivid-vid-out.c       |   18 +-
6397  drivers/media/platform/vsp1/vsp1_rpf.c             |    4 +-
6398  drivers/media/platform/vsp1/vsp1_video.c           |   23 +-
6399  drivers/media/platform/vsp1/vsp1_video.h           |    8 +-
6400  drivers/media/platform/vsp1/vsp1_wpf.c             |    4 +-
6401  drivers/media/platform/xilinx/xilinx-dma.c         |   29 +-
6402  drivers/media/platform/xilinx/xilinx-dma.h         |    2 +-
6403  drivers/media/usb/airspy/airspy.c                  |   26 +-
6404  drivers/media/usb/au0828/au0828-vbi.c              |   10 +-
6405  drivers/media/usb/au0828/au0828-video.c            |   48 +-
6406  drivers/media/usb/au0828/au0828.h                  |    3 +-
6407  drivers/media/usb/cx231xx/cx231xx-video.c          |    3 +-
6408  drivers/media/usb/dvb-usb-v2/dvbsky.c              |    4 +
6409  drivers/media/usb/dvb-usb-v2/rtl28xxu.c            |    2 +
6410  drivers/media/usb/em28xx/em28xx-vbi.c              |   10 +-
6411  drivers/media/usb/em28xx/em28xx-video.c            |   37 +-
6412  drivers/media/usb/em28xx/em28xx.h                  |    3 +-
6413  drivers/media/usb/go7007/go7007-driver.c           |   29 +-
6414  drivers/media/usb/go7007/go7007-fw.c               |    6 +-
6415  drivers/media/usb/go7007/go7007-priv.h             |    4 +-
6416  drivers/media/usb/go7007/go7007-v4l2.c             |   22 +-
6417  drivers/media/usb/gspca/gspca.c                    |    4 +-
6418  drivers/media/usb/hackrf/hackrf.c                  | 1086 ++++++---
6419  drivers/media/usb/msi2500/msi2500.c                |   19 +-
6420  drivers/media/usb/pwc/pwc-if.c                     |   35 +-
6421  drivers/media/usb/pwc/pwc-uncompress.c             |    6 +-
6422  drivers/media/usb/pwc/pwc.h                        |    4 +-
6423  drivers/media/usb/s2255/s2255drv.c                 |   29 +-
6424  drivers/media/usb/stk1160/stk1160-v4l.c            |   17 +-
6425  drivers/media/usb/stk1160/stk1160-video.c          |   12 +-
6426  drivers/media/usb/stk1160/stk1160.h                |    4 +-
6427  drivers/media/usb/tm6000/tm6000-alsa.c             |    2 +-
6428  drivers/media/usb/ttusb-dec/ttusb_dec.c            |   12 +-
6429  drivers/media/usb/usbtv/usbtv-video.c              |   24 +-
6430  drivers/media/usb/usbtv/usbtv.h                    |    3 +-
6431  drivers/media/usb/uvc/uvc_driver.c                 |    3 +
6432  drivers/media/usb/uvc/uvc_queue.c                  |   29 +-
6433  drivers/media/usb/uvc/uvc_video.c                  |   23 +-
6434  drivers/media/usb/uvc/uvcvideo.h                   |    7 +-
6435  drivers/media/v4l2-core/Makefile                   |    4 +-
6436  drivers/media/v4l2-core/v4l2-compat-ioctl32.c      |   51 +-
6437  drivers/media/v4l2-core/v4l2-ctrls.c               |   14 +-
6438  drivers/media/v4l2-core/v4l2-dev.c                 |   14 +-
6439  drivers/media/v4l2-core/v4l2-ioctl.c               |   51 +-
6440  drivers/media/v4l2-core/v4l2-mem2mem.c             |   33 +-
6441  drivers/media/v4l2-core/v4l2-trace.c               |   10 +-
6442  drivers/media/v4l2-core/vb2-trace.c                |    9 +
6443  drivers/media/v4l2-core/videobuf-core.c            |    4 +-
6444  drivers/media/v4l2-core/videobuf2-core.c           | 2038 +++--------------
6445  drivers/media/v4l2-core/videobuf2-dma-contig.c     |    7 +-
6446  drivers/media/v4l2-core/videobuf2-dma-sg.c         |    7 +-
6447  drivers/media/v4l2-core/videobuf2-internal.h       |  161 ++
6448  drivers/media/v4l2-core/videobuf2-memops.c         |    2 +-
6449  drivers/media/v4l2-core/videobuf2-v4l2.c           | 1661 ++++++++++++++
6450  drivers/media/v4l2-core/videobuf2-vmalloc.c        |    2 +-
6451  drivers/staging/media/bcm2048/radio-bcm2048.c      |   20 +-
6452  drivers/staging/media/davinci_vpfe/vpfe_video.c    |   45 +-
6453  drivers/staging/media/davinci_vpfe/vpfe_video.h    |    3 +-
6454  drivers/staging/media/lirc/lirc_sasem.c            |    2 +-
6455  drivers/staging/media/lirc/lirc_serial.c           |   32 +-
6456  drivers/staging/media/omap4iss/iss.c               |    5 +-
6457  drivers/staging/media/omap4iss/iss_video.c         |   26 +-
6458  drivers/staging/media/omap4iss/iss_video.h         |    6 +-
6459  drivers/usb/gadget/function/uvc_queue.c            |   28 +-
6460  drivers/usb/gadget/function/uvc_queue.h            |    4 +-
6461  include/media/davinci/vpbe_display.h               |    3 +-
6462  include/media/lirc_dev.h                           |  120 +-
6463  include/media/media-entity.h                       |    7 +
6464  include/media/soc_camera.h                         |    2 +-
6465  include/media/tuner-types.h                        |  182 +-
6466  include/media/tuner.h                              |  152 +-
6467  include/media/tveeprom.h                           |   83 +-
6468  include/media/v4l2-dv-timings.h                    |   34 +-
6469  include/media/v4l2-ioctl.h                         |    8 +
6470  include/media/v4l2-mem2mem.h                       |   11 +-
6471  include/media/videobuf2-core.h                     |  235 +-
6472  include/media/videobuf2-dma-contig.h               |    2 +-
6473  include/media/videobuf2-dma-sg.h                   |    2 +-
6474  include/media/videobuf2-dvb.h                      |    8 +-
6475  include/media/videobuf2-memops.h                   |    2 +-
6476  include/media/videobuf2-v4l2.h                     |  149 ++
6477  include/media/videobuf2-vmalloc.h                  |    2 +-
6478  include/trace/events/v4l2.h                        |   63 +-
6479  include/trace/events/vb2.h                         |   65 +
6480  include/uapi/linux/v4l2-controls.h                 |    1 +
6481  include/uapi/linux/videodev2.h                     |   34 +-
6482  scripts/kernel-doc                                 |   25 +
6483  262 files changed, 7846 insertions(+), 7866 deletions(-)
6484  delete mode 100644 Documentation/DocBook/media/dvb/kdapi.xml
6485  rename {include/media => drivers/media/platform/soc_camera}/atmel-isi.h (95%)
6486  create mode 100644 drivers/media/v4l2-core/vb2-trace.c
6487  create mode 100644 drivers/media/v4l2-core/videobuf2-internal.h
6488  create mode 100644 drivers/media/v4l2-core/videobuf2-v4l2.c
6489  create mode 100644 include/media/videobuf2-v4l2.h
6490  create mode 100644 include/trace/events/vb2.h
6491 Merging kbuild/for-next (674327f76bb1 Merge branch 'kbuild/kconfig' into kbuild/for-next)
6492 $ git merge kbuild/for-next
6493 Auto-merging scripts/package/builddeb
6494 Auto-merging scripts/kconfig/Makefile
6495 Removing scripts/coccinelle/misc/simple_return.cocci
6496 Auto-merging lib/Kconfig.debug
6497 Auto-merging arch/x86/Kconfig
6498 Auto-merging Makefile
6499 Merge made by the 'recursive' strategy.
6500  Documentation/kbuild/Kconfig.recursion-issue-01    |  57 ++
6501  Documentation/kbuild/Kconfig.recursion-issue-02    |  63 ++
6502  Documentation/kbuild/Kconfig.select-break          |  33 +
6503  Documentation/kbuild/kconfig-language.txt          | 161 +++++
6504  Documentation/lto-build                            | 173 ++++++
6505  Makefile                                           |  23 +-
6506  arch/x86/Kconfig                                   |   2 +-
6507  init/Kconfig                                       |  73 +++
6508  kernel/gcov/Kconfig                                |   2 +-
6509  lib/Kconfig.debug                                  |   2 +-
6510  scripts/Makefile.lto                               |  84 +++
6511  scripts/Makefile.modpost                           |   7 +-
6512  scripts/coccicheck                                 |   2 +-
6513  scripts/coccinelle/free/ifnullfree.cocci           |  26 +-
6514  .../iterators/device_node_continue.cocci           | 100 +++
6515  scripts/coccinelle/misc/compare_const_fl.cocci     | 171 +++++
6516  scripts/coccinelle/misc/of_table.cocci             |  33 +-
6517  scripts/coccinelle/misc/simple_return.cocci        | 180 ------
6518  scripts/coccinelle/null/deref_null.cocci           |   4 +-
6519  scripts/coccinelle/tests/odd_ptr_err.cocci         | 120 +++-
6520  scripts/kconfig/Makefile                           |  56 +-
6521  scripts/kconfig/expr.c                             |   2 +-
6522  scripts/kconfig/merge_config.sh                    |  18 +-
6523  scripts/kconfig/qconf.cc                           | 688 ++++++++++++---------
6524  scripts/kconfig/qconf.h                            | 150 +++--
6525  scripts/kconfig/symbol.c                           |   2 +
6526  scripts/link-vmlinux.sh                            |   2 +-
6527  scripts/package/builddeb                           |  11 +-
6528  scripts/tags.sh                                    |   2 +
6529  29 files changed, 1569 insertions(+), 678 deletions(-)
6530  create mode 100644 Documentation/kbuild/Kconfig.recursion-issue-01
6531  create mode 100644 Documentation/kbuild/Kconfig.recursion-issue-02
6532  create mode 100644 Documentation/kbuild/Kconfig.select-break
6533  create mode 100644 Documentation/lto-build
6534  create mode 100644 scripts/Makefile.lto
6535  create mode 100644 scripts/coccinelle/iterators/device_node_continue.cocci
6536  create mode 100644 scripts/coccinelle/misc/compare_const_fl.cocci
6537  delete mode 100644 scripts/coccinelle/misc/simple_return.cocci
6538 Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
6539 $ git merge kconfig/for-next
6540 Already up-to-date.
6541 Merging libata/for-next (fca9051bec79 Merge branch 'for-4.4' into for-next)
6542 $ git merge libata/for-next
6543 Merge made by the 'recursive' strategy.
6544  .../devicetree/bindings/ata/ahci-fsl-qoriq.txt     |  21 ++
6545  .../devicetree/bindings/ata/ahci-platform.txt      |   2 -
6546  drivers/ata/Kconfig                                |   9 +
6547  drivers/ata/Makefile                               |   1 +
6548  drivers/ata/ahci.c                                 |  12 +
6549  drivers/ata/ahci.h                                 |   2 +
6550  drivers/ata/ahci_platform.c                        |   1 -
6551  drivers/ata/ahci_qoriq.c                           | 279 +++++++++++++++++++++
6552  drivers/ata/libahci.c                              |  30 +--
6553  drivers/ata/libata-scsi.c                          |  59 +++--
6554  drivers/ata/pata_it821x.c                          |   6 +-
6555  drivers/ata/pata_macio.c                           |   1 +
6556  drivers/ata/pata_pxa.c                             | 171 +++++--------
6557  drivers/ata/pata_samsung_cf.c                      |   2 +-
6558  include/linux/libata.h                             |   1 +
6559  15 files changed, 433 insertions(+), 164 deletions(-)
6560  create mode 100644 Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
6561  create mode 100644 drivers/ata/ahci_qoriq.c
6562 Merging pm/linux-next (1ab68460b1d0 Merge branches 'pm-avs', 'pm-clk' and 'powercap')
6563 $ git merge pm/linux-next
6564 Resolved 'arch/arm/mach-omap2/timer.c' using previous resolution.
6565 Resolved 'arch/arm64/kernel/acpi.c' using previous resolution.
6566 Removing include/linux/irqchip/arm-gic-acpi.h
6567 Auto-merging include/linux/fwnode.h
6568 Removing include/linux/acpi_irq.h
6569 Auto-merging include/linux/acpi.h
6570 Auto-merging drivers/pci/pci.h
6571 Auto-merging drivers/pci/pci.c
6572 Auto-merging drivers/pci/pci-driver.c
6573 Auto-merging drivers/irqchip/irq-gic.c
6574 Auto-merging drivers/gpio/gpiolib.h
6575 Auto-merging drivers/gpio/gpiolib.c
6576 Auto-merging drivers/gpio/gpiolib-acpi.c
6577 Removing drivers/cpufreq/cpufreq_opp.c
6578 Auto-merging drivers/cpufreq/Makefile
6579 Auto-merging drivers/cpufreq/Kconfig.arm
6580 Auto-merging drivers/clocksource/clksrc-probe.c
6581 Auto-merging drivers/clocksource/Makefile
6582 Auto-merging drivers/clocksource/Kconfig
6583 Auto-merging drivers/base/power/opp/core.c
6584 Auto-merging drivers/base/power/clock_ops.c
6585 Auto-merging drivers/acpi/osl.c
6586 Auto-merging drivers/acpi/nfit.c
6587 Auto-merging arch/arm64/kernel/acpi.c
6588 CONFLICT (content): Merge conflict in arch/arm64/kernel/acpi.c
6589 Auto-merging arch/arm64/include/asm/irq.h
6590 Auto-merging arch/arm64/include/asm/acpi.h
6591 Auto-merging arch/arm/mach-sunxi/sunxi.c
6592 Auto-merging arch/arm/mach-omap2/timer.c
6593 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/timer.c
6594 Auto-merging Documentation/kernel-parameters.txt
6595 Automatic merge failed; fix conflicts and then commit the result.
6596 $ git commit -v -a
6597 [master 0cff43390e44] Merge remote-tracking branch 'pm/linux-next'
6598 $ git diff -M --stat --summary HEAD^..
6599  Documentation/ABI/testing/sysfs-power              |   12 +
6600  Documentation/kernel-parameters.txt                |    6 +-
6601  arch/arm/kernel/time.c                             |    2 +-
6602  arch/arm/mach-imx/mach-imx6q.c                     |    2 +-
6603  arch/arm/mach-omap2/timer.c                        |    6 +-
6604  arch/arm/mach-rockchip/rockchip.c                  |    2 +-
6605  arch/arm/mach-shmobile/setup-r8a7779.c             |    2 +-
6606  arch/arm/mach-shmobile/setup-rcar-gen2.c           |    2 +-
6607  arch/arm/mach-spear/spear13xx.c                    |    2 +-
6608  arch/arm/mach-sunxi/sunxi.c                        |    2 +-
6609  arch/arm/mach-u300/core.c                          |    2 +-
6610  arch/arm/mach-ux500/timer.c                        |    2 +-
6611  arch/arm/mach-zynq/common.c                        |    2 +-
6612  arch/arm64/include/asm/acpi.h                      |    1 -
6613  arch/arm64/include/asm/irq.h                       |   13 -
6614  arch/arm64/kernel/acpi.c                           |   25 -
6615  arch/arm64/kernel/time.c                           |    8 +-
6616  arch/ia64/include/asm/pci.h                        |    5 -
6617  arch/ia64/pci/pci.c                                |  368 ++----
6618  arch/microblaze/kernel/setup.c                     |    2 +-
6619  arch/mips/pistachio/time.c                         |    2 +-
6620  arch/mips/ralink/clk.c                             |    2 +-
6621  arch/nios2/kernel/time.c                           |    2 +-
6622  arch/x86/include/asm/msr-index.h                   |    7 +
6623  arch/x86/kernel/acpi/boot.c                        |   22 +-
6624  arch/x86/pci/acpi.c                                |  296 ++---
6625  arch/xtensa/kernel/time.c                          |    2 +-
6626  drivers/acpi/Kconfig                               |   29 +-
6627  drivers/acpi/Makefile                              |    1 +
6628  drivers/acpi/acpi_lpss.c                           |    2 +-
6629  drivers/acpi/acpi_pad.c                            |    2 -
6630  drivers/acpi/acpi_pnp.c                            |    4 +-
6631  drivers/acpi/acpi_processor.c                      |   18 +
6632  drivers/acpi/acpica/Makefile                       |   18 +-
6633  drivers/acpi/acpica/acapps.h                       |    2 +-
6634  drivers/acpi/acpica/acdebug.h                      |    6 +
6635  drivers/acpi/acpica/acglobal.h                     |    7 +-
6636  drivers/acpi/acpica/acinterp.h                     |    2 -
6637  drivers/acpi/acpica/aclocal.h                      |   22 +-
6638  drivers/acpi/acpica/acnamesp.h                     |    4 -
6639  drivers/acpi/acpica/acopcode.h                     |    4 +-
6640  drivers/acpi/acpica/acparser.h                     |    4 -
6641  drivers/acpi/acpica/acutils.h                      |    2 -
6642  drivers/acpi/acpica/amlcode.h                      |   11 +-
6643  drivers/acpi/acpica/dbcmds.c                       | 1187 ++++++++++++++++++
6644  drivers/acpi/acpica/dbconvert.c                    |  484 ++++++++
6645  drivers/acpi/acpica/dbdisply.c                     | 1108 +++++++++++++++++
6646  drivers/acpi/acpica/dbexec.c                       |  764 ++++++++++++
6647  drivers/acpi/acpica/dbfileio.c                     |  256 ++++
6648  drivers/acpi/acpica/dbhistry.c                     |  239 ++++
6649  drivers/acpi/acpica/dbinput.c                      | 1267 ++++++++++++++++++++
6650  drivers/acpi/acpica/dbmethod.c                     |  369 ++++++
6651  drivers/acpi/acpica/dbnames.c                      |  947 +++++++++++++++
6652  drivers/acpi/acpica/dbobject.c                     |  533 ++++++++
6653  drivers/acpi/acpica/dbstats.c                      |  546 +++++++++
6654  drivers/acpi/acpica/dbtest.c                       | 1057 ++++++++++++++++
6655  drivers/acpi/acpica/dbutils.c                      |  457 +++++++
6656  drivers/acpi/acpica/dbxface.c                      |  513 ++++++++
6657  drivers/acpi/acpica/evxface.c                      |    2 +-
6658  drivers/acpi/acpica/exconvrt.c                     |    1 +
6659  drivers/acpi/acpica/exresolv.c                     |    1 -
6660  drivers/acpi/acpica/exresop.c                      |    2 +
6661  drivers/acpi/acpica/exstore.c                      |  120 +-
6662  drivers/acpi/acpica/exstoren.c                     |    5 +-
6663  drivers/acpi/acpica/nsdump.c                       |    6 -
6664  drivers/acpi/acpica/nspredef.c                     |    2 +-
6665  drivers/acpi/acpica/pstree.c                       |    2 -
6666  drivers/acpi/acpica/psutils.c                      |    2 -
6667  drivers/acpi/acpica/rsdump.c                       |    3 -
6668  drivers/acpi/acpica/rsutils.c                      |    2 -
6669  drivers/acpi/acpica/rsxface.c                      |    4 +-
6670  drivers/acpi/acpica/utdecode.c                     |   21 +-
6671  drivers/acpi/acpica/utfileio.c                     |    6 +
6672  drivers/acpi/acpica/utinit.c                       |   15 +-
6673  drivers/acpi/acpica/utmutex.c                      |   21 +
6674  drivers/acpi/acpica/utxface.c                      |   19 +-
6675  drivers/acpi/cppc_acpi.c                           |  733 +++++++++++
6676  drivers/acpi/device_pm.c                           |   19 +-
6677  drivers/acpi/device_sysfs.c                        |  120 +-
6678  drivers/acpi/ec.c                                  |  115 +-
6679  drivers/acpi/glue.c                                |    5 +-
6680  drivers/acpi/internal.h                            |    6 +-
6681  drivers/acpi/nfit.c                                |    6 +-
6682  drivers/acpi/nfit.h                                |    2 +-
6683  drivers/acpi/osl.c                                 |   24 +-
6684  drivers/acpi/pci_root.c                            |  204 ++++
6685  drivers/acpi/proc.c                                |    4 +-
6686  drivers/acpi/processor_driver.c                    |    6 +
6687  drivers/acpi/property.c                            |  427 +++++--
6688  drivers/acpi/resource.c                            |    9 +-
6689  drivers/acpi/scan.c                                |   67 +-
6690  drivers/acpi/sleep.c                               |    9 +-
6691  drivers/acpi/sysfs.c                               |    3 +
6692  drivers/acpi/tables.c                              |   94 +-
6693  drivers/acpi/video_detect.c                        |    9 +
6694  drivers/base/power/Makefile                        |    2 +-
6695  drivers/base/power/clock_ops.c                     |    6 +-
6696  drivers/base/power/domain.c                        |  368 ++----
6697  drivers/base/power/domain_governor.c               |    6 +-
6698  drivers/base/power/generic_ops.c                   |   23 +-
6699  drivers/base/power/opp/Makefile                    |    2 +
6700  drivers/base/power/{opp.c => opp/core.c}           |  363 +-----
6701  drivers/base/power/opp/cpu.c                       |  267 +++++
6702  drivers/base/power/opp/opp.h                       |  143 +++
6703  drivers/base/power/wakeup.c                        |   16 +-
6704  drivers/base/property.c                            |   88 +-
6705  drivers/clocksource/Kconfig                        |    9 +
6706  drivers/clocksource/Makefile                       |    2 +-
6707  drivers/clocksource/arm_arch_timer.c               |   10 +-
6708  .../clocksource/{clksrc-of.c => clksrc-probe.c}    |    6 +-
6709  drivers/cpufreq/Kconfig.arm                        |   17 +
6710  drivers/cpufreq/Kconfig.x86                        |    1 +
6711  drivers/cpufreq/Makefile                           |    3 +-
6712  drivers/cpufreq/arm_big_little.h                   |    2 +-
6713  drivers/cpufreq/arm_big_little_dt.c                |    4 +-
6714  drivers/cpufreq/cppc_cpufreq.c                     |  176 +++
6715  drivers/cpufreq/cpufreq-dt.c                       |   10 +-
6716  drivers/cpufreq/cpufreq.c                          |  112 +-
6717  drivers/cpufreq/cpufreq_conservative.c             |   31 +-
6718  drivers/cpufreq/cpufreq_governor.c                 |   32 +-
6719  drivers/cpufreq/cpufreq_governor.h                 |    1 -
6720  drivers/cpufreq/cpufreq_ondemand.c                 |   10 +-
6721  drivers/cpufreq/cpufreq_opp.c                      |  114 --
6722  drivers/cpufreq/exynos5440-cpufreq.c               |    6 +-
6723  drivers/cpufreq/imx6q-cpufreq.c                    |   56 +-
6724  drivers/cpufreq/integrator-cpufreq.c               |    2 +
6725  drivers/cpufreq/intel_pstate.c                     |  390 +++++-
6726  drivers/cpufreq/mt8173-cpufreq.c                   |    6 +-
6727  drivers/cpufreq/powernv-cpufreq.c                  |   10 +-
6728  drivers/cpufreq/tegra20-cpufreq.c                  |    2 -
6729  drivers/cpuidle/cpuidle-mvebu-v7.c                 |   46 +-
6730  drivers/dma/acpi-dma.c                             |   25 +-
6731  drivers/gpio/gpiolib-acpi.c                        |  153 ++-
6732  drivers/gpio/gpiolib.c                             |    3 +-
6733  drivers/gpio/gpiolib.h                             |   10 +-
6734  drivers/input/serio/i8042.c                        |   32 +-
6735  drivers/irqchip/irq-gic.c                          |   69 +-
6736  drivers/irqchip/irqchip.c                          |    5 +-
6737  drivers/pci/pci-driver.c                           |    7 +
6738  drivers/pci/pci.c                                  |   70 +-
6739  drivers/pci/pci.h                                  |    1 +
6740  drivers/pnp/pnpacpi/core.c                         |    4 +-
6741  drivers/power/avs/rockchip-io-domain.c             |    1 +
6742  drivers/powercap/intel_rapl.c                      |    1 +
6743  drivers/soc/dove/pmu.c                             |    1 -
6744  include/acpi/acexcep.h                             |    7 +-
6745  include/acpi/acpi_bus.h                            |   37 +-
6746  include/acpi/acpiosxf.h                            |    3 +-
6747  include/acpi/acpixf.h                              |   14 +-
6748  include/acpi/actbl1.h                              |    2 +-
6749  include/acpi/cppc_acpi.h                           |  138 +++
6750  include/acpi/platform/acenv.h                      |    8 +-
6751  include/acpi/platform/aclinux.h                    |    7 +-
6752  include/acpi/platform/aclinuxex.h                  |    5 +
6753  include/acpi/processor.h                           |   14 +
6754  include/asm-generic/vmlinux.lds.h                  |   12 +
6755  include/linux/acpi.h                               |  159 ++-
6756  include/linux/acpi_irq.h                           |   10 -
6757  include/linux/clocksource.h                        |   13 +-
6758  include/linux/cpufreq.h                            |    5 -
6759  include/linux/fwnode.h                             |    1 +
6760  include/linux/ioport.h                             |    1 +
6761  include/linux/irqchip.h                            |   17 +
6762  include/linux/irqchip/arm-gic-acpi.h               |   31 -
6763  include/linux/pci-acpi.h                           |   24 +
6764  include/linux/pm.h                                 |    1 +
6765  include/linux/pm_domain.h                          |   70 +-
6766  include/linux/pm_opp.h                             |   24 +-
6767  include/linux/property.h                           |    4 +
6768  include/linux/suspend.h                            |   39 +
6769  kernel/irq/pm.c                                    |    2 +-
6770  kernel/power/hibernate.c                           |    2 +-
6771  kernel/power/main.c                                |   17 +
6772  kernel/power/suspend.c                             |    4 +
6773  tools/power/acpi/tools/acpidump/apfiles.c          |    2 +-
6774  175 files changed, 13960 insertions(+), 2197 deletions(-)
6775  create mode 100644 drivers/acpi/acpica/dbcmds.c
6776  create mode 100644 drivers/acpi/acpica/dbconvert.c
6777  create mode 100644 drivers/acpi/acpica/dbdisply.c
6778  create mode 100644 drivers/acpi/acpica/dbexec.c
6779  create mode 100644 drivers/acpi/acpica/dbfileio.c
6780  create mode 100644 drivers/acpi/acpica/dbhistry.c
6781  create mode 100644 drivers/acpi/acpica/dbinput.c
6782  create mode 100644 drivers/acpi/acpica/dbmethod.c
6783  create mode 100644 drivers/acpi/acpica/dbnames.c
6784  create mode 100644 drivers/acpi/acpica/dbobject.c
6785  create mode 100644 drivers/acpi/acpica/dbstats.c
6786  create mode 100644 drivers/acpi/acpica/dbtest.c
6787  create mode 100644 drivers/acpi/acpica/dbutils.c
6788  create mode 100644 drivers/acpi/acpica/dbxface.c
6789  create mode 100644 drivers/acpi/cppc_acpi.c
6790  create mode 100644 drivers/base/power/opp/Makefile
6791  rename drivers/base/power/{opp.c => opp/core.c} (79%)
6792  create mode 100644 drivers/base/power/opp/cpu.c
6793  create mode 100644 drivers/base/power/opp/opp.h
6794  rename drivers/clocksource/{clksrc-of.c => clksrc-probe.c} (91%)
6795  create mode 100644 drivers/cpufreq/cppc_cpufreq.c
6796  delete mode 100644 drivers/cpufreq/cpufreq_opp.c
6797  create mode 100644 include/acpi/cppc_acpi.h
6798  delete mode 100644 include/linux/acpi_irq.h
6799  delete mode 100644 include/linux/irqchip/arm-gic-acpi.h
6800 $ git am -3 ../patches/0001-ARM-mediatek-fixup-for-clocksource_of_init-API-chang.patch
6801 Applying: ARM: mediatek: fixup for clocksource_of_init API change
6802 $ git reset HEAD^
6803 Unstaged changes after reset:
6804 M       arch/arm/mach-mediatek/mediatek.c
6805 $ git add -A .
6806 $ git commit -v -a --amend
6807 [master 0bc827714b9a] Merge remote-tracking branch 'pm/linux-next'
6808  Date: Thu Nov 5 11:43:41 2015 +1100
6809 Merging idle/next (f05bd12f0e9c Merge branch 'cpuidle' into release)
6810 $ git merge idle/next
6811 Already up-to-date!
6812 Merge made by the 'recursive' strategy.
6813 Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
6814 $ git merge apm/for-next
6815 Already up-to-date.
6816 Merging thermal/next (3ce79ae29210 Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next)
6817 $ git merge thermal/next
6818 Auto-merging drivers/base/power/opp/core.c
6819 Merge made by the 'recursive' strategy.
6820  .../devicetree/bindings/thermal/ti_soc_thermal.txt |  14 +
6821  drivers/acpi/thermal.c                             |  12 +-
6822  drivers/base/power/opp/core.c                      |   4 +-
6823  drivers/platform/x86/asus-wmi.c                    |   2 +-
6824  drivers/platform/x86/intel_menlow.c                |   8 +-
6825  drivers/thermal/Kconfig                            |  17 +
6826  drivers/thermal/Makefile                           |   3 +
6827  drivers/thermal/armada_thermal.c                   |   6 +-
6828  drivers/thermal/cpu_cooling.c                      |   8 +-
6829  drivers/thermal/devfreq_cooling.c                  | 569 +++++++++++++++++++++
6830  drivers/thermal/imx_thermal.c                      |  21 +-
6831  drivers/thermal/rockchip_thermal.c                 |  38 +-
6832  drivers/thermal/ti-soc-thermal/Kconfig             |  15 +
6833  drivers/thermal/ti-soc-thermal/Makefile            |   1 +
6834  .../thermal/ti-soc-thermal/omap3-thermal-data.c    | 176 +++++++
6835  drivers/thermal/ti-soc-thermal/ti-bandgap.c        |  14 +
6836  drivers/thermal/ti-soc-thermal/ti-bandgap.h        |  11 +
6837  include/linux/devfreq_cooling.h                    |  81 +++
6838  include/linux/thermal.h                            |   8 +-
6839  include/trace/events/thermal.h                     |  53 ++
6840  tools/thermal/tmon/Makefile                        |   3 +
6841  21 files changed, 1010 insertions(+), 54 deletions(-)
6842  create mode 100644 drivers/thermal/devfreq_cooling.c
6843  create mode 100644 drivers/thermal/ti-soc-thermal/omap3-thermal-data.c
6844  create mode 100644 include/linux/devfreq_cooling.h
6845 Merging thermal-soc/next (7e38a5b1daa1 thermal: rockchip: support the sleep pinctrl state to avoid glitches in s2r)
6846 $ git merge thermal-soc/next
6847 Merge made by the 'recursive' strategy.
6848  .../devicetree/bindings/thermal/rockchip-thermal.txt   | 11 +++++++++--
6849  drivers/thermal/devfreq_cooling.c                      | 18 +++++++++++-------
6850  drivers/thermal/rockchip_thermal.c                     |  4 ++++
6851  include/linux/devfreq_cooling.h                        | 16 ++++++++--------
6852  4 files changed, 32 insertions(+), 17 deletions(-)
6853 Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
6854 $ git merge ieee1394/for-next
6855 Already up-to-date.
6856 Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
6857 $ git merge dlm/next
6858 Auto-merging fs/dlm/plock.c
6859 Merge made by the 'recursive' strategy.
6860  fs/dlm/plock.c | 2 +-
6861  1 file changed, 1 insertion(+), 1 deletion(-)
6862 Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE)
6863 $ git merge swiotlb/linux-next
6864 Already up-to-date.
6865 Merging slave-dma/next (fa3cd2a2b840 Merge branch 'for-linus' into next)
6866 $ git merge slave-dma/next
6867 Auto-merging drivers/dma/acpi-dma.c
6868 Auto-merging arch/arm/mach-omap2/Kconfig
6869 Removing arch/arm/common/edma.c
6870 Auto-merging arch/arm/Kconfig
6871 Merge made by the 'recursive' strategy.
6872  .../devicetree/bindings/dma/ti-dma-crossbar.txt    |   15 +-
6873  Documentation/devicetree/bindings/dma/ti-edma.txt  |  117 +-
6874  arch/arm/Kconfig                                   |    1 -
6875  arch/arm/common/Kconfig                            |    3 -
6876  arch/arm/common/Makefile                           |    1 -
6877  arch/arm/common/edma.c                             | 1876 --------------------
6878  arch/arm/mach-davinci/devices-da8xx.c              |  122 +-
6879  arch/arm/mach-davinci/dm355.c                      |   40 +-
6880  arch/arm/mach-davinci/dm365.c                      |   25 +-
6881  arch/arm/mach-davinci/dm644x.c                     |   40 +-
6882  arch/arm/mach-davinci/dm646x.c                     |   44 +-
6883  arch/arm/mach-omap2/Kconfig                        |    1 -
6884  arch/avr32/mach-at32ap/at32ap700x.c                |    9 +-
6885  drivers/dma/Kconfig                                |    4 +-
6886  drivers/dma/Makefile                               |    2 +-
6887  drivers/dma/acpi-dma.c                             |   11 +-
6888  drivers/dma/at_hdmac.c                             |  168 +-
6889  drivers/dma/at_hdmac_regs.h                        |    2 +-
6890  drivers/dma/at_xdmac.c                             |  106 +-
6891  drivers/dma/dmaengine.c                            |    6 +-
6892  drivers/dma/dw/core.c                              |   75 +-
6893  drivers/dma/dw/pci.c                               |   20 +-
6894  drivers/dma/dw/platform.c                          |   17 +-
6895  drivers/dma/edma.c                                 | 1858 ++++++++++++++++---
6896  drivers/dma/fsldma.c                               |    1 +
6897  drivers/dma/idma64.c                               |   22 +-
6898  drivers/dma/idma64.h                               |   14 +-
6899  drivers/dma/imx-sdma.c                             |    5 +-
6900  drivers/dma/ioat/dma.c                             |    3 +-
6901  drivers/dma/ioat/dma.h                             |    6 +-
6902  drivers/dma/ioat/init.c                            |  114 +-
6903  drivers/dma/ioat/prep.c                            |   34 +
6904  drivers/dma/moxart-dma.c                           |    1 +
6905  drivers/dma/mpc512x_dma.c                          |    1 +
6906  drivers/dma/omap-dma.c                             |    6 +-
6907  drivers/dma/sh/usb-dmac.c                          |   11 +-
6908  drivers/dma/sirf-dma.c                             |    1 +
6909  drivers/dma/ste_dma40.c                            |    2 +-
6910  drivers/dma/sun6i-dma.c                            |    1 +
6911  drivers/dma/ti-dma-crossbar.c                      |  251 ++-
6912  drivers/dma/virt-dma.h                             |   18 +-
6913  drivers/dma/xgene-dma.c                            |   63 +-
6914  drivers/dma/xilinx/xilinx_vdma.c                   |    1 +
6915  drivers/dma/zx296702_dma.c                         |    2 +-
6916  include/linux/of_dma.h                             |    2 +-
6917  include/linux/platform_data/dma-dw.h               |    2 +
6918  include/linux/platform_data/edma.h                 |  104 +-
6919  47 files changed, 2541 insertions(+), 2687 deletions(-)
6920  delete mode 100644 arch/arm/common/edma.c
6921 Merging net-next/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
6922 $ git merge net-next/master
6923 Already up-to-date.
6924 Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
6925 $ git merge ipsec-next/master
6926 Already up-to-date.
6927 Merging ipvs-next/master (92240e8dc0d1 ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup})
6928 $ git merge ipvs-next/master
6929 Already up-to-date.
6930 Merging wireless-drivers-next/master (8aaa878de83a Merge ath-next from ath.git)
6931 $ git merge wireless-drivers-next/master
6932 Already up-to-date.
6933 Merging bluetooth/master (bb8afa484bbe Bluetooth: Make LE only events conditional on supported commands)
6934 $ git merge bluetooth/master
6935 Merge made by the 'recursive' strategy.
6936  drivers/bluetooth/btusb.c     |  6 ++--
6937  include/net/bluetooth/l2cap.h |  2 ++
6938  net/bluetooth/hci_core.c      | 83 ++++++++++++++++++++++++++++++++++---------
6939  net/bluetooth/l2cap_core.c    | 20 +++++++++--
6940  4 files changed, 90 insertions(+), 21 deletions(-)
6941 Merging rdma/for-next (39bfc271bd68 IB/core: Remove old fast registration API)
6942 $ git merge rdma/for-next
6943 Resolved 'net/sunrpc/xprtrdma/svc_rdma_recvfrom.c' using previous resolution.
6944 Auto-merging net/sunrpc/xprtrdma/xprt_rdma.h
6945 Auto-merging net/sunrpc/xprtrdma/verbs.c
6946 Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c
6947 Auto-merging net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
6948 CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
6949 Auto-merging net/sunrpc/xprtrdma/frwr_ops.c
6950 Auto-merging net/rds/iw_rdma.c
6951 Auto-merging net/rds/ib_send.c
6952 Auto-merging net/rds/ib_cm.c
6953 Auto-merging net/rds/ib.h
6954 Auto-merging net/rds/ib.c
6955 Auto-merging include/linux/sunrpc/svc_rdma.h
6956 Auto-merging include/linux/mlx4/device.h
6957 Auto-merging drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
6958 Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
6959 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
6960 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
6961 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
6962 Auto-merging drivers/infiniband/hw/mlx5/main.c
6963 Auto-merging MAINTAINERS
6964 Automatic merge failed; fix conflicts and then commit the result.
6965 $ git commit -v -a
6966 [master 3242dbf9e389] Merge remote-tracking branch 'rdma/for-next'
6967 $ git diff -M --stat --summary HEAD^..
6968  MAINTAINERS                                        |   5 +-
6969  drivers/infiniband/core/addr.c                     |  20 +-
6970  drivers/infiniband/core/agent.c                    |   2 +-
6971  drivers/infiniband/core/cache.c                    | 112 +++++-
6972  drivers/infiniband/core/cm.c                       |  40 +-
6973  drivers/infiniband/core/cma.c                      | 171 ++++++---
6974  drivers/infiniband/core/core_priv.h                |   9 +-
6975  drivers/infiniband/core/device.c                   |  19 +-
6976  drivers/infiniband/core/mad.c                      |  42 +--
6977  drivers/infiniband/core/mad_priv.h                 |   2 +-
6978  drivers/infiniband/core/multicast.c                |   3 +-
6979  drivers/infiniband/core/sa_query.c                 |  19 +-
6980  drivers/infiniband/core/sysfs.c                    |   2 +-
6981  drivers/infiniband/core/ucma.c                     |   5 +-
6982  drivers/infiniband/core/uverbs.h                   |   1 +
6983  drivers/infiniband/core/uverbs_cmd.c               | 402 ++++++++++++++-------
6984  drivers/infiniband/core/uverbs_main.c              |   1 +
6985  drivers/infiniband/core/uverbs_marshall.c          |   4 +-
6986  drivers/infiniband/core/verbs.c                    | 291 ++++++++++-----
6987  drivers/infiniband/hw/cxgb3/iwch_cq.c              |   2 +-
6988  drivers/infiniband/hw/cxgb3/iwch_provider.c        |  39 +-
6989  drivers/infiniband/hw/cxgb3/iwch_provider.h        |   2 +
6990  drivers/infiniband/hw/cxgb3/iwch_qp.c              |  43 +--
6991  drivers/infiniband/hw/cxgb4/cm.c                   | 331 ++++++++++-------
6992  drivers/infiniband/hw/cxgb4/cq.c                   |   2 +-
6993  drivers/infiniband/hw/cxgb4/device.c               |  10 +-
6994  drivers/infiniband/hw/cxgb4/iw_cxgb4.h             |  25 +-
6995  drivers/infiniband/hw/cxgb4/mem.c                  |  63 ++--
6996  drivers/infiniband/hw/cxgb4/provider.c             |   5 +-
6997  drivers/infiniband/hw/cxgb4/qp.c                   |  73 ++--
6998  drivers/infiniband/hw/cxgb4/t4.h                   |   5 +-
6999  drivers/infiniband/hw/mlx4/ah.c                    |  17 +-
7000  drivers/infiniband/hw/mlx4/cq.c                    |   2 +-
7001  drivers/infiniband/hw/mlx4/mad.c                   |  91 +++--
7002  drivers/infiniband/hw/mlx4/main.c                  |  75 +++-
7003  drivers/infiniband/hw/mlx4/mcg.c                   |   2 +-
7004  drivers/infiniband/hw/mlx4/mlx4_ib.h               |  37 +-
7005  drivers/infiniband/hw/mlx4/mr.c                    | 169 +++++----
7006  drivers/infiniband/hw/mlx4/qp.c                    | 330 +++++++++++------
7007  drivers/infiniband/hw/mlx5/cq.c                    |   4 +-
7008  drivers/infiniband/hw/mlx5/main.c                  |   3 +-
7009  drivers/infiniband/hw/mlx5/mlx5_ib.h               |  54 +--
7010  drivers/infiniband/hw/mlx5/mr.c                    | 187 ++++++----
7011  drivers/infiniband/hw/mlx5/qp.c                    | 227 ++++++------
7012  drivers/infiniband/hw/mthca/mthca_av.c             |   2 +-
7013  drivers/infiniband/hw/mthca/mthca_qp.c             |  84 ++---
7014  drivers/infiniband/hw/nes/nes_hw.h                 |   6 -
7015  drivers/infiniband/hw/nes/nes_verbs.c              | 170 ++++-----
7016  drivers/infiniband/hw/nes/nes_verbs.h              |   4 +
7017  drivers/infiniband/hw/ocrdma/ocrdma.h              |   5 +-
7018  drivers/infiniband/hw/ocrdma/ocrdma_ah.c           |  22 +-
7019  drivers/infiniband/hw/ocrdma/ocrdma_hw.c           |  60 ++-
7020  drivers/infiniband/hw/ocrdma/ocrdma_main.c         |  19 +-
7021  drivers/infiniband/hw/ocrdma/ocrdma_stats.c        |   2 +-
7022  drivers/infiniband/hw/ocrdma/ocrdma_verbs.c        | 184 +++++-----
7023  drivers/infiniband/hw/ocrdma/ocrdma_verbs.h        |   7 +-
7024  drivers/infiniband/hw/qib/qib_keys.c               |  41 ++-
7025  drivers/infiniband/hw/qib/qib_mr.c                 |  46 +--
7026  drivers/infiniband/hw/qib/qib_qp.c                 |   2 +-
7027  drivers/infiniband/hw/qib/qib_rc.c                 |  38 +-
7028  drivers/infiniband/hw/qib/qib_ruc.c                |  20 +-
7029  drivers/infiniband/hw/qib/qib_uc.c                 |   4 +-
7030  drivers/infiniband/hw/qib/qib_ud.c                 |  20 +-
7031  drivers/infiniband/hw/qib/qib_verbs.c              |  29 +-
7032  drivers/infiniband/hw/qib/qib_verbs.h              |  19 +-
7033  drivers/infiniband/hw/usnic/usnic_ib_main.c        |   9 +-
7034  drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c      |   8 +-
7035  drivers/infiniband/ulp/ipoib/ipoib.h               |   4 +-
7036  drivers/infiniband/ulp/ipoib/ipoib_cm.c            |   4 +-
7037  drivers/infiniband/ulp/ipoib/ipoib_ib.c            |  22 +-
7038  drivers/infiniband/ulp/ipoib/ipoib_main.c          |   4 +-
7039  drivers/infiniband/ulp/ipoib/ipoib_multicast.c     |   4 +-
7040  drivers/infiniband/ulp/ipoib/ipoib_verbs.c         |   6 +-
7041  drivers/infiniband/ulp/iser/iscsi_iser.c           |  20 +-
7042  drivers/infiniband/ulp/iser/iscsi_iser.h           |  25 +-
7043  drivers/infiniband/ulp/iser/iser_initiator.c       |  51 +--
7044  drivers/infiniband/ulp/iser/iser_memory.c          | 370 +++----------------
7045  drivers/infiniband/ulp/iser/iser_verbs.c           |  20 +-
7046  drivers/infiniband/ulp/isert/ib_isert.c            | 269 +++++---------
7047  drivers/infiniband/ulp/isert/ib_isert.h            |   8 +-
7048  drivers/infiniband/ulp/srp/ib_srp.c                | 262 ++++++++------
7049  drivers/infiniband/ulp/srp/ib_srp.h                |  11 +-
7050  drivers/infiniband/ulp/srpt/ib_srpt.c              |  35 +-
7051  drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |  41 +--
7052  drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  22 ++
7053  drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h     |   2 +
7054  drivers/net/ethernet/chelsio/cxgb4/t4_chip_type.h  |  85 +++++
7055  drivers/net/ethernet/chelsio/cxgb4/t4_msg.h        |  48 +++
7056  drivers/net/ethernet/mellanox/mlx4/en_main.c       |  22 ++
7057  drivers/net/ethernet/mellanox/mlx4/en_resources.c  |  25 ++
7058  drivers/net/ethernet/mellanox/mlx4/fw.c            |   6 +
7059  drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |   3 +-
7060  drivers/net/ethernet/mellanox/mlx4/qp.c            |  19 +-
7061  .../net/ethernet/mellanox/mlx4/resource_tracker.c  |  30 +-
7062  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |   6 +-
7063  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |  35 +-
7064  drivers/staging/rdma/amso1100/c2_qp.c              |   8 +-
7065  drivers/staging/rdma/ehca/ehca_reqs.c              |  53 +--
7066  drivers/staging/rdma/hfi1/keys.c                   |  55 ---
7067  drivers/staging/rdma/hfi1/mr.c                     |  33 +-
7068  drivers/staging/rdma/hfi1/qp.c                     |   2 +-
7069  drivers/staging/rdma/hfi1/rc.c                     |  24 +-
7070  drivers/staging/rdma/hfi1/ruc.c                    |  18 +-
7071  drivers/staging/rdma/hfi1/uc.c                     |   4 +-
7072  drivers/staging/rdma/hfi1/ud.c                     |  20 +-
7073  drivers/staging/rdma/hfi1/verbs.c                  |  26 +-
7074  drivers/staging/rdma/hfi1/verbs.h                  |  14 +-
7075  drivers/staging/rdma/ipath/ipath_rc.c              |  24 +-
7076  drivers/staging/rdma/ipath/ipath_ruc.c             |  16 +-
7077  drivers/staging/rdma/ipath/ipath_uc.c              |   4 +-
7078  drivers/staging/rdma/ipath/ipath_ud.c              |  26 +-
7079  drivers/staging/rdma/ipath/ipath_verbs.c           |  17 +-
7080  drivers/staging/rdma/ipath/ipath_verbs.h           |   8 +-
7081  include/linux/mlx4/device.h                        |   2 +
7082  include/linux/mlx4/qp.h                            |  24 +-
7083  include/linux/sunrpc/svc_rdma.h                    |   6 +-
7084  include/rdma/ib_addr.h                             |  18 +-
7085  include/rdma/ib_cache.h                            |  40 +-
7086  include/rdma/ib_pack.h                             |   2 +-
7087  include/rdma/ib_sa.h                               |  12 +-
7088  include/rdma/ib_verbs.h                            | 218 ++++++-----
7089  include/rdma/rdma_cm.h                             |   6 +-
7090  include/uapi/rdma/ib_user_verbs.h                  |  26 ++
7091  net/9p/trans_rdma.c                                |   4 +-
7092  net/rds/ib.c                                       |   2 +-
7093  net/rds/ib.h                                       |   6 +-
7094  net/rds/ib_cm.c                                    |   2 +-
7095  net/rds/ib_send.c                                  |  71 ++--
7096  net/rds/iw.c                                       |   2 +-
7097  net/rds/iw.h                                       |   9 +-
7098  net/rds/iw_cm.c                                    |   2 +-
7099  net/rds/iw_rdma.c                                  | 129 +++----
7100  net/rds/iw_send.c                                  | 154 ++++----
7101  net/rds/rdma_transport.c                           |   4 +-
7102  net/sunrpc/xprtrdma/frwr_ops.c                     | 119 +++---
7103  net/sunrpc/xprtrdma/svc_rdma_recvfrom.c            | 123 ++++---
7104  net/sunrpc/xprtrdma/svc_rdma_sendto.c              |  18 +-
7105  net/sunrpc/xprtrdma/svc_rdma_transport.c           |  38 +-
7106  net/sunrpc/xprtrdma/verbs.c                        |   3 +-
7107  net/sunrpc/xprtrdma/xprt_rdma.h                    |   3 +-
7108  140 files changed, 3594 insertions(+), 3009 deletions(-)
7109  create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4_chip_type.h
7110 Merging mtd/master (e5a5d92d9dc3 mxc_nand: fix copy_spare)
7111 $ git merge mtd/master
7112 Already up-to-date.
7113 Merging l2-mtd/master (28ec8a864f4b mtd: nand: sunxi: avoid retrieving data before ECC pass)
7114 $ git merge l2-mtd/master
7115 Auto-merging MAINTAINERS
7116 Merge made by the 'recursive' strategy.
7117  .../devicetree/bindings/mtd/fsmc-nand.txt          |   6 +
7118  .../devicetree/bindings/mtd/partition.txt          |  71 +-
7119  .../devicetree/bindings/mtd/vf610-nfc.txt          |  59 ++
7120  MAINTAINERS                                        |   6 +
7121  arch/sh/boards/mach-rsk/setup.c                    |   3 -
7122  drivers/mtd/cmdlinepart.c                          |  28 +-
7123  drivers/mtd/devices/bcm47xxsflash.c                |   7 +-
7124  drivers/mtd/devices/docg3.c                        |  24 +-
7125  drivers/mtd/devices/m25p80.c                       |  15 +-
7126  drivers/mtd/devices/mtd_dataflash.c                |   1 -
7127  drivers/mtd/devices/mtdram.c                       |  21 +
7128  drivers/mtd/devices/spear_smi.c                    |   1 +
7129  drivers/mtd/devices/sst25l.c                       |   3 +-
7130  drivers/mtd/lpddr/lpddr2_nvm.c                     |   1 +
7131  drivers/mtd/maps/gpio-addr-flash.c                 |   2 +-
7132  drivers/mtd/maps/intel_vr_nor.c                    |   2 +-
7133  drivers/mtd/maps/ixp4xx.c                          |   2 +-
7134  drivers/mtd/maps/lantiq-flash.c                    |   2 +-
7135  drivers/mtd/maps/latch-addr-flash.c                |   2 +-
7136  drivers/mtd/maps/pcmciamtd.c                       |   1 +
7137  drivers/mtd/maps/physmap.c                         |   1 -
7138  drivers/mtd/maps/physmap_of.c                      |   1 -
7139  drivers/mtd/maps/plat-ram.c                        |   1 -
7140  drivers/mtd/maps/pxa2xx-flash.c                    |   8 +-
7141  drivers/mtd/maps/rbtx4939-flash.c                  |   2 +-
7142  drivers/mtd/maps/sa1100-flash.c                    |   2 +-
7143  drivers/mtd/mtd_blkdevs.c                          |  12 +-
7144  drivers/mtd/mtdchar.c                              |  42 +-
7145  drivers/mtd/mtdcore.c                              |  34 +-
7146  drivers/mtd/mtdpart.c                              |  23 +-
7147  drivers/mtd/nand/Kconfig                           |  13 +-
7148  drivers/mtd/nand/Makefile                          |   1 +
7149  drivers/mtd/nand/atmel_nand.c                      |   8 +-
7150  drivers/mtd/nand/au1550nd.c                        |   2 +-
7151  drivers/mtd/nand/bcm47xxnflash/main.c              |   2 +-
7152  drivers/mtd/nand/bf5xx_nand.c                      |   5 +-
7153  drivers/mtd/nand/brcmnand/bcm63138_nand.c          |  18 +-
7154  drivers/mtd/nand/brcmnand/brcmnand.c               |  61 +-
7155  drivers/mtd/nand/brcmnand/brcmnand.h               |   2 -
7156  drivers/mtd/nand/brcmnand/iproc_nand.c             |  22 +-
7157  drivers/mtd/nand/cafe_nand.c                       |   4 +-
7158  drivers/mtd/nand/davinci_nand.c                    |   3 -
7159  drivers/mtd/nand/denali.c                          |  19 +-
7160  drivers/mtd/nand/denali.h                          |   2 +
7161  drivers/mtd/nand/docg4.c                           |   8 +-
7162  drivers/mtd/nand/fsl_elbc_nand.c                   |   7 +-
7163  drivers/mtd/nand/fsl_ifc_nand.c                    |   5 +-
7164  drivers/mtd/nand/fsl_upm.c                         |   2 +-
7165  drivers/mtd/nand/fsmc_nand.c                       |  67 +-
7166  drivers/mtd/nand/gpio.c                            |   2 +-
7167  drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |  10 +-
7168  drivers/mtd/nand/hisi504_nand.c                    |   4 +-
7169  drivers/mtd/nand/jz4740_nand.c                     |   2 +-
7170  drivers/mtd/nand/lpc32xx_mlc.c                     |  14 +-
7171  drivers/mtd/nand/lpc32xx_slc.c                     |  42 +-
7172  drivers/mtd/nand/mpc5121_nfc.c                     |   2 +
7173  drivers/mtd/nand/mxc_nand.c                        |   2 +-
7174  drivers/mtd/nand/nand_base.c                       | 201 ++++-
7175  drivers/mtd/nand/nand_bbt.c                        |   2 +-
7176  drivers/mtd/nand/nandsim.c                         |   3 +-
7177  drivers/mtd/nand/ndfc.c                            |   2 +-
7178  drivers/mtd/nand/nuc900_nand.c                     |   2 +-
7179  drivers/mtd/nand/omap2.c                           |   6 +-
7180  drivers/mtd/nand/orion_nand.c                      |   3 +-
7181  drivers/mtd/nand/pasemi_nand.c                     |   2 +-
7182  drivers/mtd/nand/plat_nand.c                       |   3 +-
7183  drivers/mtd/nand/pxa3xx_nand.c                     | 570 +++++++------
7184  drivers/mtd/nand/r852.c                            |   1 -
7185  drivers/mtd/nand/s3c2410.c                         |   2 +-
7186  drivers/mtd/nand/sh_flctl.c                        |   4 +-
7187  drivers/mtd/nand/sharpsl.c                         |   2 +-
7188  drivers/mtd/nand/socrates_nand.c                   |   1 -
7189  drivers/mtd/nand/sunxi_nand.c                      | 540 +++++++------
7190  drivers/mtd/nand/tmio_nand.c                       |   1 +
7191  drivers/mtd/nand/txx9ndfmc.c                       |   2 +-
7192  drivers/mtd/nand/vf610_nfc.c                       | 878 +++++++++++++++++++++
7193  drivers/mtd/ofpart.c                               |  63 +-
7194  drivers/mtd/onenand/generic.c                      |   3 +-
7195  drivers/mtd/onenand/omap2.c                        |   2 -
7196  drivers/mtd/onenand/samsung.c                      |   1 -
7197  drivers/mtd/spi-nor/Kconfig                        |   3 +-
7198  drivers/mtd/spi-nor/fsl-quadspi.c                  |  46 +-
7199  drivers/mtd/spi-nor/nxp-spifi.c                    |  11 +-
7200  drivers/mtd/spi-nor/spi-nor.c                      | 319 ++++++--
7201  drivers/mtd/tests/speedtest.c                      |  10 +-
7202  drivers/mtd/tests/torturetest.c                    |  10 +-
7203  drivers/staging/mt29f_spinand/mt29f_spinand.c      |   6 +-
7204  fs/jffs2/dir.c                                     |   3 -
7205  fs/jffs2/malloc.c                                  |  27 +-
7206  fs/jffs2/readinode.c                               |   6 +-
7207  fs/jffs2/wbuf.c                                    |   1 -
7208  include/linux/blkpg.h                              |  21 +
7209  include/linux/mtd/nand.h                           |  21 +-
7210  include/linux/mtd/spi-nor.h                        |  88 +--
7211  include/linux/platform_data/mtd-nand-pxa3xx.h      |  27 -
7212  include/uapi/linux/blkpg.h                         |   6 +-
7213  include/uapi/mtd/mtd-user.h                        |   2 -
7214  97 files changed, 2566 insertions(+), 1047 deletions(-)
7215  create mode 100644 Documentation/devicetree/bindings/mtd/vf610-nfc.txt
7216  create mode 100644 drivers/mtd/nand/vf610_nfc.c
7217  create mode 100644 include/linux/blkpg.h
7218 Merging crypto/master (271817a3e92c crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params())
7219 $ git merge crypto/master
7220 Already up-to-date.
7221 Merging drm/drm-next (bf248ca1f5c7 drm/i915: Fix locking around GuC firmware load)
7222 $ git merge drm/drm-next
7223 Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v10_0.c' using previous resolution.
7224 Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v11_0.c' using previous resolution.
7225 Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v8_0.c' using previous resolution.
7226 Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution.
7227 Auto-merging sound/pci/hda/hda_intel.c
7228 Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
7229 Auto-merging drivers/gpu/drm/virtio/virtgpu_fence.c
7230 Auto-merging drivers/gpu/drm/radeon/radeon_pm.c
7231 Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv46.c
7232 Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c
7233 Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
7234 Auto-merging drivers/gpu/drm/i915/intel_lrc.c
7235 Auto-merging drivers/gpu/drm/i915/intel_display.c
7236 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
7237 Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c
7238 Auto-merging drivers/gpu/drm/i915/i915_gem_shrinker.c
7239 Removing drivers/gpu/drm/exynos/exynos_mixer.h
7240 Auto-merging drivers/gpu/drm/drm_crtc.c
7241 Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
7242 CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
7243 Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
7244 CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
7245 Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
7246 CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
7247 Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
7248 Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
7249 Auto-merging arch/arm/configs/exynos_defconfig
7250 Auto-merging MAINTAINERS
7251 Auto-merging Documentation/kernel-parameters.txt
7252 Auto-merging Documentation/DocBook/gpu.tmpl
7253 Automatic merge failed; fix conflicts and then commit the result.
7254 $ git commit -v -a
7255 [master 5ae95032be3a] Merge remote-tracking branch 'drm/drm-next'
7256 $ git diff -M --stat --summary HEAD^..
7257  Documentation/DocBook/Makefile                     |   2 +-
7258  Documentation/DocBook/{drm.tmpl => gpu.tmpl}       | 209 +++--
7259  .../devicetree/bindings/display/brcm,bcm-vc4.txt   |  65 ++
7260  Documentation/devicetree/bindings/drm/msm/hdmi.txt |   3 +
7261  Documentation/devicetree/bindings/drm/msm/mdp.txt  |   3 +-
7262  .../devicetree/bindings/video/renesas,du.txt       |  14 +-
7263  Documentation/kernel-parameters.txt                |  15 +-
7264  MAINTAINERS                                        |   1 +
7265  arch/arm/configs/exynos_defconfig                  |   1 +
7266  drivers/gpu/drm/Kconfig                            |   2 +
7267  drivers/gpu/drm/Makefile                           |   6 +-
7268  drivers/gpu/drm/amd/amdgpu/amdgpu.h                |  48 +-
7269  drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c           |   1 -
7270  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c  |   4 +-
7271  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c  |   4 +-
7272  drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c   |   4 +-
7273  drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c           |   1 -
7274  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |  42 +-
7275  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |  47 +-
7276  drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |  25 +-
7277  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |  22 +-
7278  drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |  64 +-
7279  drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |  29 +-
7280  drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c             |   1 -
7281  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |  72 +-
7282  drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |  12 +-
7283  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |   2 +
7284  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c           |  47 +-
7285  drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c             |   2 +-
7286  drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h          |  12 +-
7287  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |   5 +
7288  drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c            |   5 +
7289  drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c            |   5 +
7290  drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  47 +-
7291  drivers/gpu/drm/amd/amdgpu/atom.c                  |  53 +-
7292  drivers/gpu/drm/amd/amdgpu/atom.h                  |   2 +-
7293  drivers/gpu/drm/amd/amdgpu/cik_sdma.c              | 149 ++--
7294  drivers/gpu/drm/amd/amdgpu/cz_dpm.c                |  21 +-
7295  drivers/gpu/drm/amd/amdgpu/cz_smc.c                |  60 +-
7296  drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             | 235 +++--
7297  drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             | 256 +++---
7298  drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              | 235 +++--
7299  drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c              |  20 -
7300  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              | 861 ++++++++++++------
7301  drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c              |  40 +-
7302  drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c              |  48 +
7303  drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c             | 175 ++--
7304  drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c             | 213 ++---
7305  drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c              |   1 -
7306  drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c              |   1 -
7307  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c              |   1 -
7308  drivers/gpu/drm/amd/amdgpu/vce_v2_0.c              |   1 -
7309  drivers/gpu/drm/amd/amdgpu/vce_v3_0.c              |   6 +-
7310  drivers/gpu/drm/amd/amdgpu/vi.c                    |  36 +-
7311  drivers/gpu/drm/amd/include/amd_shared.h           |   1 +
7312  drivers/gpu/drm/amd/include/atombios.h             |   2 +-
7313  drivers/gpu/drm/amd/scheduler/gpu_scheduler.c      |  43 +-
7314  drivers/gpu/drm/amd/scheduler/gpu_scheduler.h      |   7 +-
7315  drivers/gpu/drm/armada/armada_drv.c                |  87 +-
7316  drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c       |   8 +-
7317  drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |   6 +-
7318  drivers/gpu/drm/drm_agpsupport.c                   |   4 -
7319  drivers/gpu/drm/drm_atomic.c                       |  28 +-
7320  drivers/gpu/drm/drm_atomic_helper.c                | 325 +++++--
7321  drivers/gpu/drm/drm_bufs.c                         |   6 +-
7322  drivers/gpu/drm/drm_crtc.c                         | 148 ++--
7323  drivers/gpu/drm/drm_dp_helper.c                    |  44 +-
7324  drivers/gpu/drm/drm_drv.c                          |  67 +-
7325  drivers/gpu/drm/drm_edid.c                         |  60 +-
7326  drivers/gpu/drm/drm_edid_load.c                    |  43 +-
7327  drivers/gpu/drm/drm_fb_helper.c                    | 212 ++++-
7328  drivers/gpu/drm/drm_gem.c                          |  47 +-
7329  drivers/gpu/drm/drm_gem_cma_helper.c               |   2 -
7330  drivers/gpu/drm/drm_internal.h                     |   2 +-
7331  drivers/gpu/drm/drm_ioc32.c                        |   6 +-
7332  drivers/gpu/drm/drm_ioctl.c                        |  93 +-
7333  drivers/gpu/drm/drm_irq.c                          | 367 ++++----
7334  drivers/gpu/drm/drm_memory.c                       |   6 +-
7335  drivers/gpu/drm/drm_mm.c                           |   6 +-
7336  drivers/gpu/drm/drm_modeset_lock.c                 |   2 +
7337  drivers/gpu/drm/drm_of.c                           |  88 ++
7338  drivers/gpu/drm/drm_pci.c                          |  11 +
7339  drivers/gpu/drm/drm_plane_helper.c                 |   6 +-
7340  drivers/gpu/drm/drm_platform.c                     |   3 +
7341  drivers/gpu/drm/drm_rect.c                         |   4 +-
7342  drivers/gpu/drm/drm_sysfs.c                        |  49 +-
7343  drivers/gpu/drm/drm_vm.c                           |   8 +-
7344  drivers/gpu/drm/drm_vma_manager.c                  |  40 +-
7345  drivers/gpu/drm/exynos/Kconfig                     |  75 +-
7346  drivers/gpu/drm/exynos/Makefile                    |   3 +-
7347  drivers/gpu/drm/exynos/exynos5433_drm_decon.c      | 324 ++++---
7348  drivers/gpu/drm/exynos/exynos7_drm_decon.c         |   7 +-
7349  drivers/gpu/drm/exynos/exynos_drm_crtc.c           |  16 +-
7350  drivers/gpu/drm/exynos/exynos_drm_crtc.h           |   4 +-
7351  drivers/gpu/drm/exynos/exynos_drm_drv.c            |  28 +-
7352  drivers/gpu/drm/exynos/exynos_drm_drv.h            |   5 +
7353  drivers/gpu/drm/exynos/exynos_drm_fb.c             |  45 +-
7354  drivers/gpu/drm/exynos/exynos_drm_fb.h             |   5 +-
7355  drivers/gpu/drm/exynos/exynos_drm_fbdev.c          |  53 +-
7356  drivers/gpu/drm/exynos/exynos_drm_fimc.c           |  16 +-
7357  drivers/gpu/drm/exynos/exynos_drm_fimd.c           |   7 +-
7358  drivers/gpu/drm/exynos/exynos_drm_gem.c            | 275 +++---
7359  drivers/gpu/drm/exynos/exynos_drm_gem.h            |  15 +-
7360  drivers/gpu/drm/exynos/exynos_drm_gsc.c            |  12 +-
7361  drivers/gpu/drm/exynos/exynos_drm_iommu.c          |   3 +-
7362  drivers/gpu/drm/exynos/exynos_drm_plane.c          |  20 +-
7363  drivers/gpu/drm/exynos/exynos_drm_plane.h          |   2 +
7364  drivers/gpu/drm/exynos/exynos_drm_vidi.c           |   8 +-
7365  drivers/gpu/drm/exynos/exynos_hdmi.c               | 496 ++++-------
7366  drivers/gpu/drm/exynos/exynos_mixer.c              |  17 +-
7367  drivers/gpu/drm/exynos/exynos_mixer.h              |  20 -
7368  drivers/gpu/drm/exynos/regs-hdmi.h                 |  33 +-
7369  drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c          |   7 +-
7370  drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c        |   2 -
7371  drivers/gpu/drm/gma500/cdv_intel_dp.c              |   1 -
7372  drivers/gpu/drm/gma500/psb_drv.h                   |   6 +-
7373  drivers/gpu/drm/gma500/psb_irq.c                   |   8 +-
7374  drivers/gpu/drm/gma500/psb_irq.h                   |   6 +-
7375  drivers/gpu/drm/i2c/ch7006_drv.c                   |   6 +-
7376  drivers/gpu/drm/i2c/ch7006_mode.c                  |  26 +-
7377  drivers/gpu/drm/i2c/ch7006_priv.h                  |  12 +-
7378  drivers/gpu/drm/i915/Makefile                      |   4 +
7379  drivers/gpu/drm/i915/dvo.h                         |   4 +-
7380  drivers/gpu/drm/i915/dvo_ch7017.c                  |   4 +-
7381  drivers/gpu/drm/i915/dvo_ch7xxx.c                  |   4 +-
7382  drivers/gpu/drm/i915/dvo_ivch.c                    |  12 +-
7383  drivers/gpu/drm/i915/dvo_ns2501.c                  |   4 +-
7384  drivers/gpu/drm/i915/dvo_sil164.c                  |   4 +-
7385  drivers/gpu/drm/i915/dvo_tfp410.c                  |   4 +-
7386  drivers/gpu/drm/i915/i915_cmd_parser.c             |  17 +-
7387  drivers/gpu/drm/i915/i915_debugfs.c                | 264 +++++-
7388  drivers/gpu/drm/i915/i915_dma.c                    | 245 ++++--
7389  drivers/gpu/drm/i915/i915_drv.c                    |  83 +-
7390  drivers/gpu/drm/i915/i915_drv.h                    | 149 ++--
7391  drivers/gpu/drm/i915/i915_gem.c                    | 272 ++++--
7392  drivers/gpu/drm/i915/i915_gem_context.c            |  31 +
7393  drivers/gpu/drm/i915/i915_gem_evict.c              |  45 -
7394  drivers/gpu/drm/i915/i915_gem_execbuffer.c         | 167 +---
7395  drivers/gpu/drm/i915/i915_gem_fence.c              |  47 +-
7396  drivers/gpu/drm/i915/i915_gem_gtt.c                | 878 +++++++++++++++----
7397  drivers/gpu/drm/i915/i915_gem_gtt.h                |  77 +-
7398  drivers/gpu/drm/i915/i915_gem_shrinker.c           |  19 +-
7399  drivers/gpu/drm/i915/i915_gem_stolen.c             | 181 +++-
7400  drivers/gpu/drm/i915/i915_gem_userptr.c            | 333 +++----
7401  drivers/gpu/drm/i915/i915_gpu_error.c              |  78 +-
7402  drivers/gpu/drm/i915/i915_guc_reg.h                |  21 +-
7403  drivers/gpu/drm/i915/i915_guc_submission.c         | 975 +++++++++++++++++++++
7404  drivers/gpu/drm/i915/i915_irq.c                    | 683 ++++++++++-----
7405  drivers/gpu/drm/i915/i915_params.c                 |  38 +-
7406  drivers/gpu/drm/i915/i915_reg.h                    | 593 ++++++++-----
7407  drivers/gpu/drm/i915/i915_suspend.c                |  45 +-
7408  drivers/gpu/drm/i915/i915_sysfs.c                  |  34 +-
7409  drivers/gpu/drm/i915/i915_trace.h                  |  78 +-
7410  drivers/gpu/drm/i915/i915_vgpu.h                   |  34 +-
7411  drivers/gpu/drm/i915/intel_acpi.c                  |   3 +-
7412  drivers/gpu/drm/i915/intel_atomic.c                |  13 +-
7413  drivers/gpu/drm/i915/intel_atomic_plane.c          |   6 +-
7414  drivers/gpu/drm/i915/intel_audio.c                 |  47 +-
7415  drivers/gpu/drm/i915/intel_bios.c                  |  43 +-
7416  drivers/gpu/drm/i915/intel_bios.h                  |   3 -
7417  drivers/gpu/drm/i915/intel_crt.c                   |  15 +-
7418  drivers/gpu/drm/i915/intel_csr.c                   |  41 +-
7419  drivers/gpu/drm/i915/intel_ddi.c                   | 182 ++--
7420  drivers/gpu/drm/i915/intel_display.c               | 890 ++++++++++---------
7421  drivers/gpu/drm/i915/intel_dp.c                    | 838 +++++++++++-------
7422  drivers/gpu/drm/i915/intel_dp_mst.c                |  26 +-
7423  drivers/gpu/drm/i915/intel_drv.h                   | 101 ++-
7424  drivers/gpu/drm/i915/intel_dsi.c                   | 323 ++++---
7425  drivers/gpu/drm/i915/intel_dsi.h                   |   7 +-
7426  drivers/gpu/drm/i915/intel_dsi_pll.c               | 243 ++++-
7427  drivers/gpu/drm/i915/intel_dvo.c                   |  64 +-
7428  drivers/gpu/drm/i915/intel_fbc.c                   | 264 +++++-
7429  drivers/gpu/drm/i915/intel_fbdev.c                 |  23 +-
7430  drivers/gpu/drm/i915/intel_guc.h                   | 124 +++
7431  drivers/gpu/drm/i915/intel_guc_fwif.h              |  31 +-
7432  drivers/gpu/drm/i915/intel_guc_loader.c            | 608 +++++++++++++
7433  drivers/gpu/drm/i915/intel_hdmi.c                  | 306 ++++---
7434  drivers/gpu/drm/i915/intel_i2c.c                   |  54 +-
7435  drivers/gpu/drm/i915/intel_lrc.c                   | 427 +++++----
7436  drivers/gpu/drm/i915/intel_lrc.h                   |  18 +-
7437  drivers/gpu/drm/i915/intel_lvds.c                  |  50 +-
7438  drivers/gpu/drm/i915/intel_modes.c                 |   9 +
7439  drivers/gpu/drm/i915/intel_opregion.c              |  92 +-
7440  drivers/gpu/drm/i915/intel_panel.c                 | 511 ++++++++---
7441  drivers/gpu/drm/i915/intel_pm.c                    | 562 ++++++------
7442  drivers/gpu/drm/i915/intel_psr.c                   |  18 +-
7443  drivers/gpu/drm/i915/intel_ringbuffer.c            | 262 +++---
7444  drivers/gpu/drm/i915/intel_ringbuffer.h            |  15 +-
7445  drivers/gpu/drm/i915/intel_runtime_pm.c            | 474 ++++++++--
7446  drivers/gpu/drm/i915/intel_sdvo.c                  |  51 +-
7447  drivers/gpu/drm/i915/intel_sprite.c                |  59 +-
7448  drivers/gpu/drm/i915/intel_tv.c                    |  14 +-
7449  drivers/gpu/drm/i915/intel_uncore.c                |  38 +-
7450  drivers/gpu/drm/imx/imx-drm-core.c                 |  65 +-
7451  drivers/gpu/drm/mga/mga_dma.c                      |   4 +-
7452  drivers/gpu/drm/mga/mga_drv.h                      |   6 +-
7453  drivers/gpu/drm/mga/mga_irq.c                      |  20 +-
7454  drivers/gpu/drm/msm/Kconfig                        |  14 -
7455  drivers/gpu/drm/msm/Makefile                       |   2 +-
7456  drivers/gpu/drm/msm/adreno/a2xx.xml.h              |   9 +-
7457  drivers/gpu/drm/msm/adreno/a3xx.xml.h              |  27 +-
7458  drivers/gpu/drm/msm/adreno/a4xx.xml.h              |  15 +-
7459  drivers/gpu/drm/msm/adreno/adreno_common.xml.h     |  13 +-
7460  drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h        |   9 +-
7461  drivers/gpu/drm/msm/dsi/dsi.xml.h                  | 238 +++--
7462  drivers/gpu/drm/msm/dsi/dsi_host.c                 |   2 +-
7463  drivers/gpu/drm/msm/dsi/mmss_cc.xml.h              |   8 +-
7464  drivers/gpu/drm/msm/dsi/phy/dsi_phy.c              |   2 +-
7465  drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c         |   6 +-
7466  drivers/gpu/drm/msm/dsi/sfpb.xml.h                 |  21 +-
7467  drivers/gpu/drm/msm/edp/edp.xml.h                  |   8 +-
7468  drivers/gpu/drm/msm/hdmi/hdmi.c                    |  17 +-
7469  drivers/gpu/drm/msm/hdmi/hdmi.xml.h                |   8 +-
7470  drivers/gpu/drm/msm/hdmi/qfprom.xml.h              |   8 +-
7471  drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h            |   8 +-
7472  drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c          |  10 +-
7473  drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h            |  86 +-
7474  drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c            |  95 +-
7475  drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h            |  11 +-
7476  drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c            |  46 +-
7477  drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h            |   2 +
7478  drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c          | 211 +++--
7479  drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c            |   8 +-
7480  drivers/gpu/drm/msm/mdp/mdp_common.xml.h           |  15 +-
7481  drivers/gpu/drm/msm/mdp/mdp_kms.h                  |   6 +
7482  drivers/gpu/drm/msm/msm_atomic.c                   |   2 +-
7483  drivers/gpu/drm/msm/msm_drv.c                      |  36 +-
7484  drivers/gpu/drm/msm/msm_fbdev.c                    |   5 -
7485  drivers/gpu/drm/msm/msm_gem_prime.c                |   2 -
7486  drivers/gpu/drm/msm/msm_gpu.c                      |   8 +
7487  drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c     |   2 +-
7488  drivers/gpu/drm/nouveau/dispnv04/tvnv17.h          |   2 +-
7489  drivers/gpu/drm/nouveau/include/nvif/os.h          |   1 +
7490  drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h  |  13 +-
7491  .../drm/nouveau/include/nvkm/subdev/bios/gpio.h    |   1 +
7492  .../gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h |   2 -
7493  .../drm/nouveau/include/nvkm/subdev/bios/ramcfg.h  |   2 +-
7494  .../drm/nouveau/include/nvkm/subdev/bios/volt.h    |  15 +-
7495  drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h  |   1 +
7496  drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h |   1 +
7497  drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h  |   4 +
7498  drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h  |   5 +-
7499  .../gpu/drm/nouveau/include/nvkm/subdev/timer.h    |  10 +
7500  drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h |   1 +
7501  drivers/gpu/drm/nouveau/nouveau_abi16.c            |  84 +-
7502  drivers/gpu/drm/nouveau/nouveau_abi16.h            |   4 +-
7503  drivers/gpu/drm/nouveau/nouveau_acpi.c             |   2 +-
7504  drivers/gpu/drm/nouveau/nouveau_bo.c               |   8 +-
7505  drivers/gpu/drm/nouveau/nouveau_chan.c             |  30 +-
7506  drivers/gpu/drm/nouveau/nouveau_chan.h             |   3 +-
7507  drivers/gpu/drm/nouveau/nouveau_display.c          |  32 +-
7508  drivers/gpu/drm/nouveau/nouveau_display.h          |  11 +-
7509  drivers/gpu/drm/nouveau/nouveau_drm.c              |  41 +-
7510  drivers/gpu/drm/nouveau/nouveau_drm.h              |  14 +-
7511  drivers/gpu/drm/nouveau/nouveau_gem.c              |   8 +-
7512  drivers/gpu/drm/nouveau/nouveau_platform.c         |  19 +-
7513  drivers/gpu/drm/nouveau/nouveau_sysfs.c            |   5 +-
7514  drivers/gpu/drm/nouveau/nouveau_ttm.c              |  31 +-
7515  drivers/gpu/drm/nouveau/nouveau_usif.c             |  15 +-
7516  drivers/gpu/drm/nouveau/nv50_display.c             |   7 +-
7517  drivers/gpu/drm/nouveau/nvkm/engine/device/base.c  |  83 +-
7518  drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c   |   9 +-
7519  drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c |  13 +-
7520  .../gpu/drm/nouveau/nvkm/engine/disp/rootnv04.c    |   2 +-
7521  drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c     |   1 +
7522  drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c     |   1 +
7523  drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c     |   1 +
7524  drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c     |   1 +
7525  drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c      |   2 +-
7526  drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c     |  13 -
7527  drivers/gpu/drm/nouveau/nvkm/subdev/bios/rammap.c  |   4 +-
7528  drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c    |  17 +-
7529  drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.c     |  32 +
7530  drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h     |   6 +
7531  drivers/gpu/drm/nouveau/nvkm/subdev/clk/g84.c      |   2 +-
7532  drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c     |  10 +-
7533  drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr5.c     |   3 +-
7534  drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c  | 141 ++-
7535  drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c  | 123 +--
7536  drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c   | 121 ++-
7537  drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h    |   1 +
7538  drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr2.c     |   6 +
7539  drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr3.c     |   4 +-
7540  drivers/gpu/drm/nouveau/nvkm/subdev/gpio/nv50.c    |   2 +-
7541  drivers/gpu/drm/nouveau/nvkm/subdev/ibus/Kbuild    |   1 +
7542  drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c   |  17 +-
7543  drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf117.c   |  51 ++
7544  drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h    |   7 +
7545  .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c    | 371 +++++---
7546  drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c     |  14 +
7547  drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c    |  32 +
7548  drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gk104.c    |   2 +
7549  drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c    |   2 +
7550  drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h     |   5 +
7551  drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild     |   4 +-
7552  drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c     |  11 +
7553  drivers/gpu/drm/nouveau/nvkm/subdev/pci/g84.c      |  64 ++
7554  drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c      |  39 +
7555  drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf100.c    |   1 +
7556  drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv40.c     |   2 +-
7557  .../drm/nouveau/nvkm/subdev/pci/{nv50.c => nv46.c} |  14 +-
7558  drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h     |   6 +
7559  drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c     |   2 +-
7560  drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c    |   4 +
7561  drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild    |   1 +
7562  drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c    |  11 +-
7563  drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c   | 119 +++
7564  drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h    |   6 +
7565  drivers/gpu/drm/omapdrm/omap_crtc.c                |   3 -
7566  drivers/gpu/drm/omapdrm/omap_drv.c                 |  18 +-
7567  drivers/gpu/drm/omapdrm/omap_drv.h                 |   4 +-
7568  drivers/gpu/drm/omapdrm/omap_fb.c                  |   4 +-
7569  drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c          |   3 -
7570  drivers/gpu/drm/omapdrm/omap_irq.c                 |  16 +-
7571  drivers/gpu/drm/omapdrm/omap_plane.c               |  12 +-
7572  drivers/gpu/drm/qxl/qxl_drv.c                      |   7 +-
7573  drivers/gpu/drm/qxl/qxl_ioctl.c                    |  14 +-
7574  drivers/gpu/drm/r128/r128_cce.c                    |  12 +-
7575  drivers/gpu/drm/r128/r128_drv.h                    |   6 +-
7576  drivers/gpu/drm/r128/r128_irq.c                    |  16 +-
7577  drivers/gpu/drm/radeon/atombios_dp.c               |   1 +
7578  drivers/gpu/drm/radeon/cayman_blit_shaders.c       |   2 +-
7579  drivers/gpu/drm/radeon/evergreen_blit_shaders.c    |   2 +-
7580  drivers/gpu/drm/radeon/evergreen_cs.c              | 104 +--
7581  drivers/gpu/drm/radeon/r600_blit_shaders.c         |   2 +-
7582  drivers/gpu/drm/radeon/r600_cp.c                   |  14 +-
7583  drivers/gpu/drm/radeon/radeon_acpi.c               |   1 -
7584  drivers/gpu/drm/radeon/radeon_agp.c                |   8 +-
7585  drivers/gpu/drm/radeon/radeon_asic.c               |   1 -
7586  drivers/gpu/drm/radeon/radeon_atpx_handler.c       |   4 +-
7587  drivers/gpu/drm/radeon/radeon_bios.c               |   1 -
7588  drivers/gpu/drm/radeon/radeon_cp.c                 |  16 +-
7589  drivers/gpu/drm/radeon/radeon_device.c             |   2 +-
7590  drivers/gpu/drm/radeon/radeon_display.c            |  37 +-
7591  drivers/gpu/drm/radeon/radeon_drv.c                |  16 +-
7592  drivers/gpu/drm/radeon/radeon_drv.h                |   6 +-
7593  drivers/gpu/drm/radeon/radeon_irq.c                |  38 +-
7594  drivers/gpu/drm/radeon/radeon_kms.c                | 138 ++-
7595  drivers/gpu/drm/radeon/radeon_mode.h               |   8 +-
7596  drivers/gpu/drm/radeon/radeon_pm.c                 |   4 +-
7597  drivers/gpu/drm/radeon/radeon_ttm.c                |  10 +-
7598  drivers/gpu/drm/rcar-du/Kconfig                    |   2 +-
7599  drivers/gpu/drm/rcar-du/rcar_du_drv.c              |  48 +-
7600  drivers/gpu/drm/rcar-du/rcar_du_group.c            |   5 +-
7601  drivers/gpu/drm/rcar-du/rcar_du_kms.c              |   2 +-
7602  drivers/gpu/drm/rcar-du/rcar_du_plane.c            |  45 +-
7603  drivers/gpu/drm/rockchip/rockchip_drm_drv.c        |  89 +-
7604  drivers/gpu/drm/rockchip/rockchip_drm_gem.c        |   3 -
7605  drivers/gpu/drm/shmobile/shmob_drm_drv.c           |   6 +-
7606  drivers/gpu/drm/sis/sis_drv.h                      |   4 +
7607  drivers/gpu/drm/sti/sti_crtc.c                     |  16 +-
7608  drivers/gpu/drm/sti/sti_crtc.h                     |   4 +-
7609  drivers/gpu/drm/sti/sti_drv.c                      |   4 +-
7610  drivers/gpu/drm/tegra/dc.c                         |   2 -
7611  drivers/gpu/drm/tegra/dpaux.c                      |   3 +-
7612  drivers/gpu/drm/tegra/drm.c                        |  37 +-
7613  drivers/gpu/drm/tilcdc/tilcdc_drv.c                |   6 +-
7614  drivers/gpu/drm/vc4/Kconfig                        |  13 +
7615  drivers/gpu/drm/vc4/Makefile                       |  17 +
7616  drivers/gpu/drm/vc4/vc4_bo.c                       |  52 ++
7617  drivers/gpu/drm/vc4/vc4_crtc.c                     | 672 ++++++++++++++
7618  drivers/gpu/drm/vc4/vc4_debugfs.c                  |  39 +
7619  drivers/gpu/drm/vc4/vc4_drv.c                      | 298 +++++++
7620  drivers/gpu/drm/vc4/vc4_drv.h                      | 145 +++
7621  drivers/gpu/drm/vc4/vc4_hdmi.c                     | 590 +++++++++++++
7622  drivers/gpu/drm/vc4/vc4_hvs.c                      | 163 ++++
7623  drivers/gpu/drm/vc4/vc4_kms.c                      |  67 ++
7624  drivers/gpu/drm/vc4/vc4_plane.c                    | 320 +++++++
7625  drivers/gpu/drm/vc4/vc4_regs.h                     | 570 ++++++++++++
7626  drivers/gpu/drm/vgem/vgem_drv.c                    |  55 +-
7627  drivers/gpu/drm/via/via_drv.h                      |  10 +-
7628  drivers/gpu/drm/via/via_irq.c                      |  17 +-
7629  drivers/gpu/drm/virtio/Makefile                    |   3 +-
7630  drivers/gpu/drm/virtio/virtgpu_display.c           |  57 +-
7631  drivers/gpu/drm/virtio/virtgpu_drv.c               |  28 +-
7632  drivers/gpu/drm/virtio/virtgpu_drv.h               |  72 ++
7633  drivers/gpu/drm/virtio/virtgpu_fence.c             |   2 +-
7634  drivers/gpu/drm/virtio/virtgpu_gem.c               |  41 +
7635  drivers/gpu/drm/virtio/virtgpu_ioctl.c             | 573 ++++++++++++
7636  drivers/gpu/drm/virtio/virtgpu_kms.c               | 133 ++-
7637  drivers/gpu/drm/virtio/virtgpu_object.c            |  11 +-
7638  drivers/gpu/drm/virtio/virtgpu_prime.c             |  71 ++
7639  drivers/gpu/drm/virtio/virtgpu_ttm.c               |   1 +
7640  drivers/gpu/drm/virtio/virtgpu_vq.c                | 322 ++++++-
7641  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |  70 +-
7642  drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |  34 +-
7643  drivers/gpu/drm/vmwgfx/vmwgfx_fence.c              |  24 +-
7644  drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c               | 109 ++-
7645  drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c              |  38 +-
7646  drivers/gpu/drm/vmwgfx/vmwgfx_irq.c                |   9 +-
7647  drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |  29 +-
7648  drivers/gpu/drm/vmwgfx/vmwgfx_surface.c            |   2 +
7649  drivers/gpu/vga/vga_switcheroo.c                   | 384 ++++++--
7650  drivers/gpu/vga/vgaarb.c                           |   4 +-
7651  drivers/platform/x86/apple-gmux.c                  |   2 +-
7652  include/drm/drmP.h                                 |  48 +-
7653  include/drm/drm_agpsupport.h                       |  57 +-
7654  include/drm/drm_atomic_helper.h                    |  12 +-
7655  include/drm/drm_crtc.h                             |  18 +-
7656  include/drm/drm_dp_helper.h                        |   9 +-
7657  include/drm/drm_edid.h                             |   5 +-
7658  include/drm/drm_fb_helper.h                        |  31 +-
7659  include/drm/drm_gem.h                              |   5 +-
7660  include/drm/drm_modeset_lock.h                     |  10 +-
7661  include/drm/drm_of.h                               |  13 +
7662  include/drm/drm_plane_helper.h                     |   2 -
7663  include/drm/drm_vma_manager.h                      |  24 +-
7664  include/drm/i915_component.h                       |  65 +-
7665  include/linux/fb.h                                 |   2 +-
7666  include/linux/vga_switcheroo.h                     | 103 ++-
7667  include/uapi/drm/Kbuild                            |   1 +
7668  include/uapi/drm/amdgpu_drm.h                      |   2 +-
7669  include/uapi/drm/drm_mode.h                        |  42 +-
7670  include/uapi/drm/i810_drm.h                        |   2 +
7671  include/uapi/drm/i915_drm.h                        |   3 +-
7672  include/uapi/drm/nouveau_drm.h                     |   8 -
7673  include/uapi/drm/r128_drm.h                        |   2 +
7674  include/uapi/drm/savage_drm.h                      |   2 +
7675  include/uapi/drm/sis_drm.h                         |   4 -
7676  include/uapi/drm/via_drm.h                         |   4 -
7677  include/uapi/drm/virtgpu_drm.h                     | 167 ++++
7678  include/uapi/linux/virtio_gpu.h                    | 112 ++-
7679  include/video/exynos5433_decon.h                   |  29 +
7680  sound/pci/hda/hda_controller.h                     |   2 +-
7681  sound/pci/hda/hda_intel.c                          |  15 +-
7682  sound/pci/hda/hda_intel.h                          |   2 +-
7683  426 files changed, 20297 insertions(+), 8080 deletions(-)
7684  rename Documentation/DocBook/{drm.tmpl => gpu.tmpl} (97%)
7685  create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
7686  delete mode 100644 drivers/gpu/drm/exynos/exynos_mixer.h
7687  create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.c
7688  create mode 100644 drivers/gpu/drm/i915/intel_guc.h
7689  create mode 100644 drivers/gpu/drm/i915/intel_guc_loader.c
7690  create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf117.c
7691  create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h
7692  create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pci/g84.c
7693  create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c
7694  rename drivers/gpu/drm/nouveau/nvkm/subdev/pci/{nv50.c => nv46.c} (83%)
7695  create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c
7696  create mode 100644 drivers/gpu/drm/vc4/Kconfig
7697  create mode 100644 drivers/gpu/drm/vc4/Makefile
7698  create mode 100644 drivers/gpu/drm/vc4/vc4_bo.c
7699  create mode 100644 drivers/gpu/drm/vc4/vc4_crtc.c
7700  create mode 100644 drivers/gpu/drm/vc4/vc4_debugfs.c
7701  create mode 100644 drivers/gpu/drm/vc4/vc4_drv.c
7702  create mode 100644 drivers/gpu/drm/vc4/vc4_drv.h
7703  create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi.c
7704  create mode 100644 drivers/gpu/drm/vc4/vc4_hvs.c
7705  create mode 100644 drivers/gpu/drm/vc4/vc4_kms.c
7706  create mode 100644 drivers/gpu/drm/vc4/vc4_plane.c
7707  create mode 100644 drivers/gpu/drm/vc4/vc4_regs.h
7708  create mode 100644 drivers/gpu/drm/virtio/virtgpu_ioctl.c
7709  create mode 100644 drivers/gpu/drm/virtio/virtgpu_prime.c
7710  create mode 100644 include/uapi/drm/virtgpu_drm.h
7711 Merging drm-panel/drm/panel/for-next (f1811a8a6413 drm/bridge: ptn3460: Fix coccinelle warnings)
7712 $ git merge drm-panel/drm/panel/for-next
7713 Merge made by the 'recursive' strategy.
7714  drivers/gpu/drm/bridge/nxp-ptn3460.c   | 1 -
7715  drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
7716  2 files changed, 2 deletions(-)
7717 Merging drm-intel/for-linux-next (9be64eee3a87 drm/i915: add quirk to enable backlight on Dell Chromebook 11 (2015))
7718 $ git merge drm-intel/for-linux-next
7719 Auto-merging drivers/gpu/drm/i915/intel_display.c
7720 Auto-merging drivers/gpu/drm/i915/i915_irq.c
7721 Merge made by the 'recursive' strategy.
7722  drivers/gpu/drm/i915/i915_irq.c      |  7 ++++---
7723  drivers/gpu/drm/i915/intel_display.c |  3 +++
7724  drivers/gpu/drm/i915/intel_panel.c   | 14 ++++++++++++++
7725  drivers/gpu/drm/i915/intel_pm.c      |  7 ++++++-
7726  4 files changed, 27 insertions(+), 4 deletions(-)
7727 Merging drm-tegra/drm/tegra/for-next (2bcdcbfae289 drm/tegra: dc: Request/free syncpoint at init/exit)
7728 $ git merge drm-tegra/drm/tegra/for-next
7729 Auto-merging drivers/gpu/drm/tegra/dc.c
7730 Merge made by the 'recursive' strategy.
7731  drivers/gpu/drm/tegra/dc.c               | 14 +++++++-------
7732  drivers/gpu/drm/tegra/fb.c               |  1 -
7733  drivers/gpu/host1x/hw/debug_hw.c         |  2 +-
7734  drivers/gpu/host1x/hw/hw_host1x01_sync.h |  8 ++++----
7735  drivers/gpu/host1x/hw/hw_host1x02_sync.h |  8 ++++----
7736  drivers/gpu/host1x/hw/hw_host1x04_sync.h |  8 ++++----
7737  6 files changed, 20 insertions(+), 21 deletions(-)
7738 Merging drm-misc/topic/drm-misc (364b19868ecd drm/dp: add eDP DPCD backlight control bit definitions)
7739 $ git merge drm-misc/topic/drm-misc
7740 Auto-merging drivers/gpu/drm/tegra/fb.c
7741 Merge made by the 'recursive' strategy.
7742  Documentation/DocBook/gpu.tmpl     |  48 +++++------------
7743  drivers/gpu/drm/drm_gem.c          |  35 ++++++++++--
7744  drivers/gpu/drm/imx/Kconfig        |   9 ----
7745  drivers/gpu/drm/imx/imx-drm-core.c |  12 ++---
7746  drivers/gpu/drm/sti/Kconfig        |   6 ---
7747  drivers/gpu/drm/sti/sti_drv.c      |   2 +-
7748  drivers/gpu/drm/tegra/Kconfig      |  12 -----
7749  drivers/gpu/drm/tegra/drm.c        |   4 +-
7750  drivers/gpu/drm/tegra/drm.h        |   6 +--
7751  drivers/gpu/drm/tegra/fb.c         |  12 ++---
7752  include/drm/drm_dp_helper.h        |  36 +++++++++++++
7753  include/drm/drm_gem.h              | 106 ++++++++++++++++++++++++++++++++-----
7754  12 files changed, 187 insertions(+), 101 deletions(-)
7755 Merging drm-exynos/exynos-drm/for-next (7d9071a09502 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
7756 $ git merge drm-exynos/exynos-drm/for-next
7757 Already up-to-date.
7758 Merging drm-msm/msm-next (a9ee34b70e07 drm/msm: Remove local fbdev emulation Kconfig option)
7759 $ git merge drm-msm/msm-next
7760 Already up-to-date.
7761 Merging sound/for-next (c932b98c1e47 ALSA: hda - Apply pin fixup for HP ProBook 6550b)
7762 $ git merge sound/for-next
7763 Already up-to-date.
7764 Merging sound-asoc/for-next (3417bda8def3 Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl-sai' and 'asoc/fix/wm8960' into asoc-linus)
7765 $ git merge sound-asoc/for-next
7766 Merge made by the 'recursive' strategy.
7767  sound/soc/codecs/arizona.c | 16 +++++-----------
7768  sound/soc/codecs/wm8960.c  |  2 +-
7769  sound/soc/fsl/fsl_sai.c    |  3 ++-
7770  3 files changed, 8 insertions(+), 13 deletions(-)
7771 Merging modules/modules-next (d1189c63ea5e scripts: [modpost] add new sections to white list)
7772 $ git merge modules/modules-next
7773 Resolved 'scripts/Makefile.modpost' using previous resolution.
7774 Auto-merging scripts/Makefile.modpost
7775 CONFLICT (content): Merge conflict in scripts/Makefile.modpost
7776 Auto-merging lib/Kconfig.debug
7777 Automatic merge failed; fix conflicts and then commit the result.
7778 $ git commit -v -a
7779 [master a3847d63e907] Merge remote-tracking branch 'modules/modules-next'
7780 $ git diff -M --stat --summary HEAD^..
7781  kernel/params.c          | 17 +++++++++--------
7782  lib/Kconfig.debug        |  9 +++++++++
7783  scripts/Makefile.modpost |  1 +
7784  scripts/mod/modpost.c    | 37 ++++++++++++++++++++++++++++++-------
7785  4 files changed, 49 insertions(+), 15 deletions(-)
7786 Merging input/next (a748941c95d2 Input: tsc2004 - add support for tsc2004)
7787 $ git merge input/next
7788 Auto-merging drivers/input/touchscreen/Kconfig
7789 Merge made by the 'recursive' strategy.
7790  .../bindings/input/touchscreen/tsc2005.txt         |  34 +-
7791  drivers/input/touchscreen/Kconfig                  |  17 +
7792  drivers/input/touchscreen/Makefile                 |   2 +
7793  drivers/input/touchscreen/tsc2004.c                |  83 +++
7794  drivers/input/touchscreen/tsc2005.c                | 714 +--------------------
7795  drivers/input/touchscreen/tsc200x-core.c           | 665 +++++++++++++++++++
7796  drivers/input/touchscreen/tsc200x-core.h           |  78 +++
7797  7 files changed, 891 insertions(+), 702 deletions(-)
7798  create mode 100644 drivers/input/touchscreen/tsc2004.c
7799  create mode 100644 drivers/input/touchscreen/tsc200x-core.c
7800  create mode 100644 drivers/input/touchscreen/tsc200x-core.h
7801 Merging block/for-next (3387dbebe45f Merge branch 'for-4.4/lightnvm' into for-next)
7802 $ git merge block/for-next
7803 Resolved 'drivers/nvme/host/pci.c' using previous resolution.
7804 Removing include/uapi/linux/nvme.h
7805 Auto-merging fs/mpage.c
7806 Auto-merging drivers/nvme/host/scsi.c
7807 Auto-merging drivers/nvme/host/pci.c
7808 CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
7809 Auto-merging drivers/md/raid10.c
7810 Auto-merging drivers/md/raid1.c
7811 Auto-merging drivers/md/md.c
7812 Auto-merging drivers/md/dm.c
7813 Auto-merging block/blk-sysfs.c
7814 Auto-merging block/blk-mq.c
7815 Auto-merging block/blk-mq-tag.c
7816 Auto-merging block/blk-core.c
7817 Auto-merging MAINTAINERS
7818 Automatic merge failed; fix conflicts and then commit the result.
7819 $ git commit -v -a
7820 [master ac87668f97db] Merge remote-tracking branch 'block/for-next'
7821 $ git diff -M --stat --summary HEAD^..
7822  Documentation/ABI/testing/sysfs-block           |    7 +
7823  Documentation/block/pr.txt                      |  119 ++
7824  Documentation/ioctl/ioctl-number.txt            |    1 +
7825  MAINTAINERS                                     |   16 +-
7826  block/bio-integrity.c                           |   17 +-
7827  block/blk-core.c                                |  106 +-
7828  block/blk-integrity.c                           |  192 ++--
7829  block/blk-merge.c                               |   32 +-
7830  block/blk-mq-sysfs.c                            |    6 -
7831  block/blk-mq-tag.c                              |    4 +
7832  block/blk-mq.c                                  |  169 +--
7833  block/blk-mq.h                                  |    2 -
7834  block/blk-sysfs.c                               |    3 +-
7835  block/blk.h                                     |   23 +
7836  block/elevator.c                                |    2 +-
7837  block/genhd.c                                   |    2 +
7838  block/ioctl.c                                   |  330 ++++--
7839  block/partition-generic.c                       |    1 +
7840  block/t10-pi.c                                  |   16 +-
7841  drivers/Kconfig                                 |    4 +
7842  drivers/Makefile                                |    2 +
7843  drivers/block/Kconfig                           |   11 -
7844  drivers/block/Makefile                          |    2 -
7845  drivers/block/loop.c                            |  274 ++++-
7846  drivers/block/loop.h                            |   13 +-
7847  drivers/cdrom/cdrom.c                           |    1 +
7848  drivers/lightnvm/Kconfig                        |   42 +
7849  drivers/lightnvm/Makefile                       |    7 +
7850  drivers/lightnvm/core.c                         |  826 ++++++++++++++
7851  drivers/lightnvm/gennvm.c                       |  485 +++++++++
7852  drivers/lightnvm/gennvm.h                       |   46 +
7853  drivers/lightnvm/rrpc.c                         | 1323 +++++++++++++++++++++++
7854  drivers/lightnvm/rrpc.h                         |  239 ++++
7855  drivers/md/dm-table.c                           |   88 +-
7856  drivers/md/dm.c                                 |    2 -
7857  drivers/md/md.c                                 |   11 +-
7858  drivers/md/multipath.c                          |    2 +
7859  drivers/md/raid1.c                              |    2 +
7860  drivers/md/raid10.c                             |    2 +
7861  drivers/nvdimm/btt.c                            |    1 -
7862  drivers/nvdimm/core.c                           |   21 +-
7863  drivers/nvme/Kconfig                            |    1 +
7864  drivers/nvme/Makefile                           |    2 +
7865  drivers/nvme/host/Kconfig                       |   10 +
7866  drivers/nvme/host/Makefile                      |    4 +
7867  drivers/nvme/host/lightnvm.c                    |  526 +++++++++
7868  drivers/nvme/host/nvme.h                        |  143 +++
7869  drivers/{block/nvme-core.c => nvme/host/pci.c}  |  379 ++++---
7870  drivers/{block/nvme-scsi.c => nvme/host/scsi.c} |    2 +-
7871  drivers/scsi/sd.c                               |   97 +-
7872  drivers/scsi/sd_dif.c                           |   31 +-
7873  drivers/target/target_core_iblock.c             |   10 +-
7874  fs/block_dev.c                                  |    2 +-
7875  fs/direct-io.c                                  |    9 +-
7876  fs/mpage.c                                      |   23 +-
7877  include/linux/blk-mq.h                          |    1 -
7878  include/linux/blkdev.h                          |   50 +-
7879  include/linux/genhd.h                           |   26 +-
7880  include/linux/lightnvm.h                        |  522 +++++++++
7881  include/linux/nvme.h                            |  624 +++++++++--
7882  include/linux/pr.h                              |   18 +
7883  include/linux/t10-pi.h                          |    8 +-
7884  include/uapi/linux/lightnvm.h                   |  130 +++
7885  include/uapi/linux/loop.h                       |    2 +
7886  include/uapi/linux/nvme.h                       |  589 ----------
7887  include/uapi/linux/nvme_ioctl.h                 |   65 ++
7888  include/uapi/linux/pr.h                         |   48 +
7889  kernel/trace/blktrace.c                         |   16 +-
7890  68 files changed, 6375 insertions(+), 1415 deletions(-)
7891  create mode 100644 Documentation/block/pr.txt
7892  create mode 100644 drivers/lightnvm/Kconfig
7893  create mode 100644 drivers/lightnvm/Makefile
7894  create mode 100644 drivers/lightnvm/core.c
7895  create mode 100644 drivers/lightnvm/gennvm.c
7896  create mode 100644 drivers/lightnvm/gennvm.h
7897  create mode 100644 drivers/lightnvm/rrpc.c
7898  create mode 100644 drivers/lightnvm/rrpc.h
7899  create mode 100644 drivers/nvme/Kconfig
7900  create mode 100644 drivers/nvme/Makefile
7901  create mode 100644 drivers/nvme/host/Kconfig
7902  create mode 100644 drivers/nvme/host/Makefile
7903  create mode 100644 drivers/nvme/host/lightnvm.c
7904  create mode 100644 drivers/nvme/host/nvme.h
7905  rename drivers/{block/nvme-core.c => nvme/host/pci.c} (93%)
7906  rename drivers/{block/nvme-scsi.c => nvme/host/scsi.c} (99%)
7907  create mode 100644 include/linux/lightnvm.h
7908  create mode 100644 include/linux/pr.h
7909  create mode 100644 include/uapi/linux/lightnvm.h
7910  delete mode 100644 include/uapi/linux/nvme.h
7911  create mode 100644 include/uapi/linux/nvme_ioctl.h
7912  create mode 100644 include/uapi/linux/pr.h
7913 Merging device-mapper/for-next (aad9ae455075 dm switch: simplify conditional in alloc_region_table())
7914 $ git merge device-mapper/for-next
7915 Auto-merging drivers/md/persistent-data/dm-btree.c
7916 Auto-merging drivers/md/persistent-data/dm-btree-remove.c
7917 Auto-merging drivers/md/dm.c
7918 Auto-merging drivers/md/dm-snap-persistent.c
7919 Auto-merging drivers/md/dm-exception-store.c
7920 Auto-merging drivers/md/dm-cache-policy-cleaner.c
7921 Auto-merging drivers/md/dm-cache-metadata.c
7922 Merge made by the 'recursive' strategy.
7923  Documentation/device-mapper/delay.txt              |   1 +
7924  drivers/md/dm-bufio.c                              |  18 +-
7925  drivers/md/dm-cache-metadata.c                     |   8 +-
7926  drivers/md/dm-cache-policy-cleaner.c               |   2 +-
7927  drivers/md/dm-cache-policy-mq.c                    |   2 +-
7928  drivers/md/dm-cache-policy-smq.c                   |   2 +-
7929  drivers/md/dm-cache-target.c                       |   3 +-
7930  drivers/md/dm-crypt.c                              |   6 +-
7931  drivers/md/dm-delay.c                              |   7 +-
7932  drivers/md/dm-era-target.c                         |  15 +-
7933  drivers/md/dm-exception-store.c                    |   2 +-
7934  drivers/md/dm-flakey.c                             |  16 +-
7935  drivers/md/dm-io.c                                 |   3 +-
7936  drivers/md/dm-linear.c                             |  20 +-
7937  drivers/md/dm-log-userspace-base.c                 |   3 +-
7938  drivers/md/dm-log-writes.c                         |  13 +-
7939  drivers/md/dm-mpath.c                              |  34 ++--
7940  drivers/md/dm-region-hash.c                        |   6 +-
7941  drivers/md/dm-snap-persistent.c                    |   2 +-
7942  drivers/md/dm-switch.c                             |  25 ++-
7943  drivers/md/dm-thin-metadata.c                      |  16 +-
7944  drivers/md/dm-verity.c                             |  15 +-
7945  drivers/md/dm.c                                    | 209 ++++++++++++++++++---
7946  drivers/md/persistent-data/dm-array.c              |   4 +-
7947  drivers/md/persistent-data/dm-block-manager.c      |   4 +-
7948  drivers/md/persistent-data/dm-block-manager.h      |   2 +-
7949  drivers/md/persistent-data/dm-btree-internal.h     |   2 +-
7950  drivers/md/persistent-data/dm-btree-remove.c       |  36 +---
7951  drivers/md/persistent-data/dm-btree-spine.c        |  20 +-
7952  drivers/md/persistent-data/dm-btree.c              |   4 +-
7953  drivers/md/persistent-data/dm-space-map-common.c   |  32 ++--
7954  .../md/persistent-data/dm-transaction-manager.c    |   4 +-
7955  .../md/persistent-data/dm-transaction-manager.h    |   2 +-
7956  include/linux/device-mapper.h                      |   6 +-
7957  include/uapi/linux/dm-ioctl.h                      |   4 +-
7958  35 files changed, 333 insertions(+), 215 deletions(-)
7959 Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
7960 $ git merge pcmcia/master
7961 Already up-to-date.
7962 Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
7963 $ git merge mmc/mmc-next
7964 Already up-to-date.
7965 Merging mmc-uh/next (7cc8d580228c mmc: dw_mmc: fix the wrong setting for UHS-DDR50 mode)
7966 $ git merge mmc-uh/next
7967 Already up-to-date.
7968 Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
7969 $ git merge kgdb/kgdb-next
7970 Merge made by the 'recursive' strategy.
7971  kernel/debug/kdb/kdb_io.c | 2 +-
7972  1 file changed, 1 insertion(+), 1 deletion(-)
7973 Merging md/for-next (339421def582 MD: when RAID journal is missing/faulty, block RESTART_ARRAY_RW)
7974 $ git merge md/for-next
7975 Auto-merging drivers/md/raid5.c
7976 Auto-merging drivers/md/raid10.c
7977 Auto-merging drivers/md/raid1.c
7978 Auto-merging drivers/md/md.c
7979 Merge made by the 'recursive' strategy.
7980  drivers/md/Makefile            |    2 +-
7981  drivers/md/bitmap.c            |   14 +-
7982  drivers/md/bitmap.h            |    4 +-
7983  drivers/md/md-cluster.c        |  228 ++++----
7984  drivers/md/md-cluster.h        |   12 +-
7985  drivers/md/md.c                |  495 ++++++++++++-----
7986  drivers/md/md.h                |   17 +-
7987  drivers/md/raid1.c             |   41 +-
7988  drivers/md/raid1.h             |    7 +
7989  drivers/md/raid10.c            |    2 +-
7990  drivers/md/raid5-cache.c       | 1191 ++++++++++++++++++++++++++++++++++++++++
7991  drivers/md/raid5.c             |  189 +++++--
7992  drivers/md/raid5.h             |   24 +
7993  include/uapi/linux/raid/md_p.h |   73 ++-
7994  14 files changed, 1989 insertions(+), 310 deletions(-)
7995  create mode 100644 drivers/md/raid5-cache.c
7996 Merging mfd/for-mfd-next (0b8431c65b01 mfd: sec-core: Remove unused s2mpu02-rtc and s2mpu02-clk children)
7997 $ git merge mfd/for-mfd-next
7998 Resolved 'Documentation/devicetree/bindings/mfd/s2mps11.txt' using previous resolution.
7999 Auto-merging MAINTAINERS
8000 Auto-merging Documentation/devicetree/bindings/mfd/s2mps11.txt
8001 CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/s2mps11.txt
8002 Automatic merge failed; fix conflicts and then commit the result.
8003 $ git commit -v -a
8004 [master 722fb30f8c80] Merge remote-tracking branch 'mfd/for-mfd-next'
8005 $ git diff -M --stat --summary HEAD^..
8006  .../devicetree/bindings/extcon/extcon-arizona.txt  |  15 +
8007  Documentation/devicetree/bindings/mfd/arizona.txt  |  15 +-
8008  .../devicetree/bindings/mfd/atmel-flexcom.txt      |  63 +++
8009  Documentation/devicetree/bindings/mfd/cros-ec.txt  |   4 +
8010  Documentation/devicetree/bindings/mfd/da9150.txt   |  33 +-
8011  Documentation/devicetree/bindings/mfd/s2mps11.txt  |   3 +
8012  .../devicetree/bindings/power/da9150-fg.txt        |  23 +
8013  MAINTAINERS                                        |   4 +-
8014  drivers/extcon/extcon-arizona.c                    | 106 +++-
8015  drivers/mfd/88pm80x.c                              |   2 +
8016  drivers/mfd/Kconfig                                |  21 +-
8017  drivers/mfd/Makefile                               |   2 +
8018  drivers/mfd/arizona-core.c                         | 300 ++++++-----
8019  drivers/mfd/arizona-i2c.c                          |  33 +-
8020  drivers/mfd/arizona-irq.c                          |   2 +-
8021  drivers/mfd/arizona-spi.c                          |  23 +-
8022  drivers/mfd/atmel-flexcom.c                        | 104 ++++
8023  drivers/mfd/atmel-hlcdc.c                          |   1 +
8024  drivers/mfd/axp20x.c                               |  20 +
8025  drivers/mfd/bcm590xx.c                             |   1 -
8026  drivers/mfd/cros_ec_i2c.c                          |   7 +
8027  drivers/mfd/da903x.c                               |   6 +-
8028  drivers/mfd/da9052-core.c                          |   6 +
8029  drivers/mfd/da9052-i2c.c                           |   6 +-
8030  drivers/mfd/da9052-spi.c                           |   6 +-
8031  drivers/mfd/da9062-core.c                          |   4 +-
8032  drivers/mfd/da9150-core.c                          | 191 +++++--
8033  drivers/mfd/hi6421-pmic-core.c                     |   1 +
8034  drivers/mfd/htc-i2cpld.c                           |   3 +-
8035  drivers/mfd/intel-lpss-acpi.c                      |  16 +
8036  drivers/mfd/intel-lpss-pci.c                       |  45 ++
8037  drivers/mfd/intel-lpss.c                           |  12 +-
8038  drivers/mfd/intel_soc_pmic_bxtwc.c                 | 477 +++++++++++++++++
8039  drivers/mfd/kempld-core.c                          |  14 +-
8040  drivers/mfd/lm3533-core.c                          |  13 +-
8041  drivers/mfd/lpc_ich.c                              |  42 +-
8042  drivers/mfd/max8997.c                              |   1 +
8043  drivers/mfd/pcf50633-irq.c                         |   4 +-
8044  drivers/mfd/qcom_rpm.c                             |   2 +-
8045  drivers/mfd/rt5033.c                               |   4 +-
8046  drivers/mfd/rts5209.c                              |   6 +-
8047  drivers/mfd/rts5227.c                              |  83 ++-
8048  drivers/mfd/rts5229.c                              |   6 +-
8049  drivers/mfd/rts5249.c                              |   6 +-
8050  drivers/mfd/rtsx_pcr.c                             |  11 +-
8051  drivers/mfd/rtsx_pcr.h                             |   3 +
8052  drivers/mfd/sec-core.c                             |  73 ++-
8053  drivers/mfd/sm501.c                                |   1 +
8054  drivers/mfd/stmpe.c                                |   1 +
8055  drivers/mfd/tps6105x.c                             | 150 ++----
8056  drivers/mfd/tps65217.c                             |   4 +
8057  drivers/mfd/twl6040.c                              |   2 +
8058  drivers/mfd/wm5110-tables.c                        | 194 ++++++-
8059  drivers/mfd/wm831x-core.c                          |   4 +-
8060  drivers/mfd/wm8998-tables.c                        |  10 +-
8061  drivers/platform/x86/Kconfig                       |   1 +
8062  drivers/power/Kconfig                              |  10 +
8063  drivers/power/Makefile                             |   1 +
8064  drivers/power/da9150-fg.c                          | 579 +++++++++++++++++++++
8065  drivers/regulator/tps6105x-regulator.c             |  16 +-
8066  include/dt-bindings/mfd/arizona.h                  |   2 +
8067  include/dt-bindings/mfd/atmel-flexcom.h            |  26 +
8068  include/linux/mfd/88pm80x.h                        |   1 +
8069  include/linux/mfd/arizona/pdata.h                  |   6 +
8070  include/linux/mfd/arizona/registers.h              |  84 ++-
8071  include/linux/mfd/da9052/reg.h                     |   3 +
8072  include/linux/mfd/da9150/core.h                    |  19 +-
8073  include/linux/mfd/intel_bxtwc.h                    |  69 +++
8074  include/linux/mfd/intel_soc_pmic.h                 |   2 +
8075  include/linux/mfd/rtsx_pci.h                       |   6 +
8076  include/linux/mfd/samsung/core.h                   |   4 +
8077  include/linux/mfd/samsung/s2mps11.h                |   1 +
8078  include/linux/mfd/samsung/s2mps13.h                |   1 +
8079  include/linux/mfd/tps6105x.h                       |  10 +-
8080  74 files changed, 2560 insertions(+), 470 deletions(-)
8081  create mode 100644 Documentation/devicetree/bindings/extcon/extcon-arizona.txt
8082  create mode 100644 Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
8083  create mode 100644 Documentation/devicetree/bindings/power/da9150-fg.txt
8084  create mode 100644 drivers/mfd/atmel-flexcom.c
8085  create mode 100644 drivers/mfd/intel_soc_pmic_bxtwc.c
8086  create mode 100644 drivers/power/da9150-fg.c
8087  create mode 100644 include/dt-bindings/mfd/atmel-flexcom.h
8088  create mode 100644 include/linux/mfd/intel_bxtwc.h
8089 Merging backlight/for-backlight-next (9d6c243502b7 backlight: pm8941-wled: Add default-brightness property)
8090 $ git merge backlight/for-backlight-next
8091 Merge made by the 'recursive' strategy.
8092  .../bindings/video/backlight/pm8941-wled.txt          |  2 ++
8093  drivers/video/backlight/88pm860x_bl.c                 |  1 +
8094  drivers/video/backlight/adp8860_bl.c                  |  1 -
8095  drivers/video/backlight/adp8870_bl.c                  |  1 -
8096  drivers/video/backlight/lp855x_bl.c                   |  1 +
8097  drivers/video/backlight/pm8941-wled.c                 | 13 +++++++++----
8098  drivers/video/backlight/pwm_bl.c                      | 19 +++++++++----------
8099  7 files changed, 22 insertions(+), 16 deletions(-)
8100 Merging battery/master (6bd03ce3c12a power: bq27xxx_battery: Remove unneeded dependency in Kconfig)
8101 $ git merge battery/master
8102 Removing include/linux/power/bq27x00_battery.h
8103 Removing drivers/power/bq27x00_battery.c
8104 Auto-merging drivers/power/Makefile
8105 Auto-merging drivers/power/Kconfig
8106 Auto-merging arch/arm/configs/omap2plus_defconfig
8107 Auto-merging MAINTAINERS
8108 Merge made by the 'recursive' strategy.
8109  Documentation/ABI/testing/sysfs-class-power        |   58 +
8110  .../devicetree/bindings/power/bq24257.txt          |   53 +-
8111  .../bindings/power_supply/axp20x_usb_power.txt     |   34 +
8112  .../bindings/power_supply/tps65217_charger.txt     |   12 +
8113  MAINTAINERS                                        |    4 +-
8114  arch/arm/boot/dts/twl4030.dtsi                     |    2 +
8115  arch/arm/configs/omap2plus_defconfig               |    2 +-
8116  arch/unicore32/Kconfig                             |    2 +-
8117  drivers/power/88pm860x_battery.c                   |   37 +-
8118  drivers/power/Kconfig                              |   56 +-
8119  drivers/power/Makefile                             |    5 +-
8120  drivers/power/axp20x_usb_power.c                   |  248 ++++
8121  drivers/power/bq2415x_charger.c                    |    2 +-
8122  drivers/power/bq24190_charger.c                    |    1 -
8123  drivers/power/bq24257_charger.c                    |  492 +++++--
8124  drivers/power/bq27x00_battery.c                    | 1129 ----------------
8125  drivers/power/bq27xxx_battery.c                    | 1375 ++++++++++++++++++++
8126  drivers/power/charger-manager.c                    |    4 +-
8127  drivers/power/lp8727_charger.c                     |   31 +-
8128  drivers/power/max17042_battery.c                   |   26 +-
8129  drivers/power/max8903_charger.c                    |   93 +-
8130  drivers/power/max8998_charger.c                    |   29 +-
8131  drivers/power/pm2301_charger.c                     |    1 -
8132  drivers/power/qcom_smbb.c                          |  951 ++++++++++++++
8133  drivers/power/reset/Kconfig                        |    4 +-
8134  drivers/power/reset/at91-poweroff.c                |   33 +-
8135  drivers/power/reset/at91-reset.c                   |   69 +-
8136  drivers/power/rt9455_charger.c                     |    1 -
8137  drivers/power/smb347-charger.c                     |    1 -
8138  drivers/power/tps65090-charger.c                   |    1 +
8139  drivers/power/tps65217_charger.c                   |  264 ++++
8140  drivers/power/twl4030_charger.c                    |   39 +-
8141  drivers/power/wm831x_power.c                       |   15 +-
8142  drivers/w1/slaves/w1_bq27000.c                     |    5 +-
8143  include/linux/mfd/axp20x.h                         |   24 +
8144  include/linux/power/bq27x00_battery.h              |   19 -
8145  include/linux/power/bq27xxx_battery.h              |   31 +
8146  include/linux/power/charger-manager.h              |    8 +-
8147  38 files changed, 3687 insertions(+), 1474 deletions(-)
8148  create mode 100644 Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt
8149  create mode 100644 Documentation/devicetree/bindings/power_supply/tps65217_charger.txt
8150  create mode 100644 drivers/power/axp20x_usb_power.c
8151  delete mode 100644 drivers/power/bq27x00_battery.c
8152  create mode 100644 drivers/power/bq27xxx_battery.c
8153  create mode 100644 drivers/power/qcom_smbb.c
8154  create mode 100644 drivers/power/tps65217_charger.c
8155  delete mode 100644 include/linux/power/bq27x00_battery.h
8156  create mode 100644 include/linux/power/bq27xxx_battery.h
8157 $ git reset --hard HEAD^
8158 HEAD is now at 8d53fd5b3345 Merge remote-tracking branch 'backlight/for-backlight-next'
8159 Merging next-20150925 version of battery
8160 $ git merge -m next-20150925/battery 3636859b280ca595da4556274a509223f47e9a39
8161 Removing include/linux/power/bq27x00_battery.h
8162 Removing drivers/power/bq27x00_battery.c
8163 Auto-merging drivers/power/Makefile
8164 Auto-merging drivers/power/Kconfig
8165 Auto-merging arch/arm/configs/omap2plus_defconfig
8166 Auto-merging MAINTAINERS
8167 Merge made by the 'recursive' strategy.
8168  .../bindings/power_supply/axp20x_usb_power.txt     |   34 +
8169  .../bindings/power_supply/tps65217_charger.txt     |   12 +
8170  MAINTAINERS                                        |    4 +-
8171  arch/arm/configs/omap2plus_defconfig               |    2 +-
8172  arch/unicore32/Kconfig                             |    2 +-
8173  drivers/power/88pm860x_battery.c                   |   37 +-
8174  drivers/power/Kconfig                              |   48 +-
8175  drivers/power/Makefile                             |    5 +-
8176  drivers/power/axp20x_usb_power.c                   |  248 ++++
8177  drivers/power/bq2415x_charger.c                    |    2 +-
8178  drivers/power/bq24190_charger.c                    |    1 -
8179  drivers/power/bq27x00_battery.c                    | 1129 ----------------
8180  drivers/power/bq27xxx_battery.c                    | 1374 ++++++++++++++++++++
8181  drivers/power/lp8727_charger.c                     |   31 +-
8182  drivers/power/max17042_battery.c                   |   26 +-
8183  drivers/power/max8903_charger.c                    |   93 +-
8184  drivers/power/max8998_charger.c                    |   29 +-
8185  drivers/power/pm2301_charger.c                     |    1 -
8186  drivers/power/qcom_smbb.c                          |  951 ++++++++++++++
8187  drivers/power/reset/Kconfig                        |    4 +-
8188  drivers/power/reset/at91-poweroff.c                |   33 +-
8189  drivers/power/reset/at91-reset.c                   |   69 +-
8190  drivers/power/rt9455_charger.c                     |    1 -
8191  drivers/power/smb347-charger.c                     |    1 -
8192  drivers/power/tps65090-charger.c                   |    1 +
8193  drivers/power/tps65217_charger.c                   |  264 ++++
8194  drivers/power/wm831x_power.c                       |    9 +-
8195  drivers/w1/slaves/w1_bq27000.c                     |    5 +-
8196  include/linux/mfd/axp20x.h                         |   24 +
8197  include/linux/power/bq27x00_battery.h              |   19 -
8198  include/linux/power/bq27xxx_battery.h              |   31 +
8199  include/linux/power/charger-manager.h              |    8 +-
8200  32 files changed, 3126 insertions(+), 1372 deletions(-)
8201  create mode 100644 Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt
8202  create mode 100644 Documentation/devicetree/bindings/power_supply/tps65217_charger.txt
8203  create mode 100644 drivers/power/axp20x_usb_power.c
8204  delete mode 100644 drivers/power/bq27x00_battery.c
8205  create mode 100644 drivers/power/bq27xxx_battery.c
8206  create mode 100644 drivers/power/qcom_smbb.c
8207  create mode 100644 drivers/power/tps65217_charger.c
8208  delete mode 100644 include/linux/power/bq27x00_battery.h
8209  create mode 100644 include/linux/power/bq27xxx_battery.h
8210 Merging omap_dss2/for-next (08bfb453f045 radeonfb: Deinline large functions)
8211 $ git merge omap_dss2/for-next
8212 Auto-merging drivers/video/fbdev/tridentfb.c
8213 Merge made by the 'recursive' strategy.
8214  .../devicetree/bindings/video/ssd1307fb.txt        |   3 +-
8215  drivers/video/fbdev/Kconfig                        |   7 +-
8216  drivers/video/fbdev/aty/radeon_base.c              | 133 ++++++++++++++-
8217  drivers/video/fbdev/aty/radeonfb.h                 | 144 ++--------------
8218  drivers/video/fbdev/core/fb_ddc.c                  |  28 ++--
8219  drivers/video/fbdev/gxt4500.c                      |  25 ++-
8220  drivers/video/fbdev/omap/omapfb_main.c             |   5 -
8221  drivers/video/fbdev/omap2/dss/hdmi.h               |   9 +-
8222  drivers/video/fbdev/omap2/dss/hdmi4.c              |  66 ++++++--
8223  drivers/video/fbdev/omap2/dss/hdmi5.c              |  75 +++++++--
8224  drivers/video/fbdev/ssd1307fb.c                    |  21 ++-
8225  drivers/video/fbdev/tridentfb.c                    | 182 ++++++++++++++++++++-
8226  12 files changed, 506 insertions(+), 192 deletions(-)
8227 Merging regulator/for-next (62e544b983a0 Merge remote-tracking branches 'regulator/topic/supply', 'regulator/topic/tps6105x' and 'regulator/topic/tps65023' into regulator-next)
8228 $ git merge regulator/for-next
8229 Merge made by the 'recursive' strategy.
8230  Documentation/devicetree/bindings/mfd/axp20x.txt   |   4 +-
8231  .../bindings/regulator/act8865-regulator.txt       |   3 +
8232  .../bindings/regulator/anatop-regulator.txt        |   1 +
8233  .../bindings/regulator/arizona-regulator.txt       |  17 +
8234  .../devicetree/bindings/regulator/max77802.txt     |  25 +-
8235  .../devicetree/bindings/regulator/regulator.txt    |   1 +
8236  .../devicetree/bindings/regulator/tps65023.txt     |  60 +++
8237  drivers/regulator/Kconfig                          |   2 +-
8238  drivers/regulator/act8865-regulator.c              |  24 +-
8239  drivers/regulator/anatop-regulator.c               |   3 +
8240  drivers/regulator/arizona-ldo1.c                   |  20 +-
8241  drivers/regulator/axp20x-regulator.c               |  54 ++-
8242  drivers/regulator/bcm590xx-regulator.c             |   2 +-
8243  drivers/regulator/core.c                           | 512 ++++++++++++++-------
8244  drivers/regulator/da9052-regulator.c               |   1 +
8245  drivers/regulator/da9063-regulator.c               |   2 +-
8246  drivers/regulator/of_regulator.c                   |   3 +
8247  drivers/regulator/pwm-regulator.c                  |  35 +-
8248  drivers/regulator/qcom_smd-regulator.c             |  28 +-
8249  drivers/regulator/tps65023-regulator.c             | 282 +++++-------
8250  include/linux/regulator/driver.h                   |   2 +
8251  21 files changed, 705 insertions(+), 376 deletions(-)
8252  create mode 100644 Documentation/devicetree/bindings/regulator/arizona-regulator.txt
8253  create mode 100644 Documentation/devicetree/bindings/regulator/tps65023.txt
8254 Merging security/next (ba94c3ff20c9 Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
8255 $ git merge security/next
8256 Resolved 'fs/ext4/crypto_key.c' using previous resolution.
8257 Auto-merging security/selinux/hooks.c
8258 Auto-merging security/keys/request_key.c
8259 Auto-merging fs/ext4/crypto_key.c
8260 CONFLICT (content): Merge conflict in fs/ext4/crypto_key.c
8261 Auto-merging fs/cifs/smb2pdu.c
8262 Auto-merging fs/cifs/connect.c
8263 Auto-merging crypto/asymmetric_keys/x509_public_key.c
8264 Auto-merging MAINTAINERS
8265 Automatic merge failed; fix conflicts and then commit the result.
8266 $ git commit -v -a
8267 [master 0c5184e576e1] Merge remote-tracking branch 'security/next'
8268 $ git diff -M --stat --summary HEAD^..
8269  Documentation/ABI/testing/sysfs-driver-ppi       |  19 +-
8270  Documentation/crypto/asymmetric-keys.txt         |  27 +--
8271  Documentation/security/Smack.txt                 |  10 +
8272  Documentation/security/keys.txt                  |  41 ++--
8273  MAINTAINERS                                      |   1 +
8274  arch/powerpc/kernel/prom_init.c                  |  40 +++-
8275  certs/.gitignore                                 |   4 +
8276  crypto/asymmetric_keys/asymmetric_keys.h         |   5 -
8277  crypto/asymmetric_keys/asymmetric_type.c         |  44 ++--
8278  crypto/asymmetric_keys/public_key.c              |   4 +-
8279  crypto/asymmetric_keys/signature.c               |   2 +-
8280  crypto/asymmetric_keys/x509_parser.h             |   1 +
8281  crypto/asymmetric_keys/x509_public_key.c         |   9 +-
8282  drivers/char/tpm/st33zp24/Kconfig                |   2 +-
8283  drivers/char/tpm/st33zp24/i2c.c                  |   1 -
8284  drivers/char/tpm/tpm-chip.c                      |  24 ++-
8285  drivers/char/tpm/tpm-interface.c                 |  76 +++++++
8286  drivers/char/tpm/tpm.h                           | 134 +++++++++++-
8287  drivers/char/tpm/tpm2-cmd.c                      | 250 ++++++++++++++++++++++-
8288  drivers/char/tpm/tpm_crb.c                       |  39 ++--
8289  drivers/char/tpm/tpm_eventlog.c                  |  78 +++++--
8290  drivers/char/tpm/tpm_eventlog.h                  |   6 +
8291  drivers/char/tpm/tpm_i2c_atmel.c                 |   1 -
8292  drivers/char/tpm/tpm_i2c_infineon.c              |   1 -
8293  drivers/char/tpm/tpm_i2c_nuvoton.c               |   1 -
8294  drivers/char/tpm/tpm_ibmvtpm.c                   |   2 +-
8295  drivers/char/tpm/tpm_of.c                        |   6 +-
8296  drivers/char/tpm/tpm_ppi.c                       |  34 +--
8297  drivers/char/tpm/tpm_tis.c                       | 192 ++++++++++++++---
8298  fs/cifs/cifs_spnego.c                            |   6 +-
8299  fs/cifs/cifsacl.c                                |  25 ++-
8300  fs/cifs/connect.c                                |   9 +-
8301  fs/cifs/sess.c                                   |   2 +-
8302  fs/cifs/smb2pdu.c                                |   2 +-
8303  fs/ecryptfs/ecryptfs_kernel.h                    |   5 +-
8304  fs/ext4/crypto_key.c                             |   4 +-
8305  fs/f2fs/crypto_key.c                             |   4 +-
8306  fs/fscache/object-list.c                         |   4 +-
8307  fs/nfs/nfs4idmap.c                               |   4 +-
8308  fs/sysfs/group.c                                 |  44 ++++
8309  include/crypto/public_key.h                      |   1 -
8310  include/keys/asymmetric-subtype.h                |   2 +-
8311  include/keys/asymmetric-type.h                   |  15 ++
8312  include/keys/trusted-type.h                      |  14 +-
8313  include/keys/user-type.h                         |   8 +
8314  include/linux/key-type.h                         |   3 +-
8315  include/linux/key.h                              |  33 ++-
8316  include/linux/sysfs.h                            |  11 +
8317  include/linux/tpm.h                              |  26 +++
8318  kernel/.gitignore                                |   1 -
8319  kernel/module_signing.c                          |   1 +
8320  lib/digsig.c                                     |   7 +-
8321  net/ceph/ceph_common.c                           |   2 +-
8322  net/ceph/crypto.c                                |   6 +-
8323  net/dns_resolver/dns_key.c                       |  20 +-
8324  net/dns_resolver/dns_query.c                     |   7 +-
8325  net/dns_resolver/internal.h                      |   8 +
8326  net/rxrpc/af_rxrpc.c                             |   2 +-
8327  net/rxrpc/ar-key.c                               |  32 +--
8328  net/rxrpc/ar-output.c                            |   2 +-
8329  net/rxrpc/ar-security.c                          |   4 +-
8330  net/rxrpc/rxkad.c                                |  16 +-
8331  scripts/extract-module-sig.pl                    | 136 ++++++++++++
8332  scripts/extract-sys-certs.pl                     | 144 +++++++++++++
8333  security/apparmor/Kconfig                        |   2 +-
8334  security/integrity/digsig.c                      |   2 +-
8335  security/integrity/evm/evm_crypto.c              |   2 +-
8336  security/keys/big_key.c                          |  47 +++--
8337  security/keys/encrypted-keys/encrypted.c         |  18 +-
8338  security/keys/encrypted-keys/encrypted.h         |   4 +-
8339  security/keys/encrypted-keys/masterkey_trusted.c |   4 +-
8340  security/keys/key.c                              |  20 +-
8341  security/keys/keyctl.c                           |  12 +-
8342  security/keys/keyring.c                          |  12 +-
8343  security/keys/process_keys.c                     |   4 +-
8344  security/keys/request_key.c                      |   4 +-
8345  security/keys/request_key_auth.c                 |  12 +-
8346  security/keys/trusted.c                          |  42 +++-
8347  security/keys/trusted.h                          |  11 -
8348  security/keys/user_defined.c                     |  14 +-
8349  security/selinux/Kconfig                         |   4 +-
8350  security/selinux/hooks.c                         |  27 +--
8351  security/selinux/include/security.h              |   2 +
8352  security/selinux/selinuxfs.c                     |  26 +--
8353  security/selinux/ss/services.c                   |  22 +-
8354  security/smack/smack.h                           |   4 +-
8355  security/smack/smack_access.c                    |   6 +-
8356  security/smack/smack_lsm.c                       |  67 +++++-
8357  security/smack/smackfs.c                         | 208 +++++++++++++++----
8358  89 files changed, 1748 insertions(+), 492 deletions(-)
8359  create mode 100644 certs/.gitignore
8360  create mode 100755 scripts/extract-module-sig.pl
8361  create mode 100755 scripts/extract-sys-certs.pl
8362 Merging integrity/next (72e1eed8abb1 integrity: prevent loading untrusted certificates on the IMA trusted keyring)
8363 $ git merge integrity/next
8364 Already up-to-date.
8365 Merging selinux/next (63205654c0e0 selinux: Use a kmem_cache for allocation struct file_security_struct)
8366 $ git merge selinux/next
8367 Already up-to-date.
8368 Merging lblnet/next (b2776bf7149b Linux 3.18)
8369 $ git merge lblnet/next
8370 Already up-to-date.
8371 Merging watchdog/master (760d280084f8 watchdog: include: add units for timeout values in kerneldoc)
8372 $ git merge watchdog/master
8373 Merge made by the 'recursive' strategy.
8374  .../bindings/watchdog/brcm,bcm7038-wdt.txt         |  19 ++
8375  drivers/watchdog/Kconfig                           |   8 +
8376  drivers/watchdog/Makefile                          |   1 +
8377  drivers/watchdog/bcm7038_wdt.c                     | 237 +++++++++++++++++++++
8378  drivers/watchdog/imx2_wdt.c                        |   6 +-
8379  drivers/watchdog/intel-mid_wdt.c                   |   2 +-
8380  drivers/watchdog/watchdog_core.c                   |  15 +-
8381  drivers/watchdog/watchdog_dev.c                    | 163 +++++++-------
8382  include/linux/watchdog.h                           |  23 +-
8383  9 files changed, 380 insertions(+), 94 deletions(-)
8384  create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt
8385  create mode 100644 drivers/watchdog/bcm7038_wdt.c
8386 Merging iommu/next (b67ad2f7c751 Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next)
8387 $ git merge iommu/next
8388 Auto-merging arch/s390/Kconfig
8389 Auto-merging arch/arm64/Kconfig
8390 Auto-merging MAINTAINERS
8391 Merge made by the 'recursive' strategy.
8392  .../devicetree/bindings/iommu/arm,smmu-v3.txt      |  19 +
8393  .../devicetree/bindings/iommu/ti,omap-iommu.txt    |  27 ++
8394  MAINTAINERS                                        |   7 +
8395  arch/arm64/Kconfig                                 |   1 +
8396  arch/arm64/include/asm/dma-mapping.h               |  15 +-
8397  arch/arm64/mm/dma-mapping.c                        | 457 ++++++++++++++++++
8398  arch/s390/Kconfig                                  |   1 +
8399  arch/s390/include/asm/pci.h                        |   4 +
8400  arch/s390/include/asm/pci_dma.h                    |   5 +-
8401  arch/s390/pci/pci_dma.c                            |  37 +-
8402  drivers/iommu/Kconfig                              |  15 +
8403  drivers/iommu/Makefile                             |   2 +
8404  drivers/iommu/amd_iommu.c                          | 173 ++-----
8405  drivers/iommu/amd_iommu_init.c                     | 120 ++---
8406  drivers/iommu/amd_iommu_types.h                    |  13 +-
8407  drivers/iommu/arm-smmu-v3.c                        | 155 ++++--
8408  drivers/iommu/arm-smmu.c                           | 132 +++---
8409  drivers/iommu/dma-iommu.c                          | 524 +++++++++++++++++++++
8410  drivers/iommu/fsl_pamu_domain.c                    |  41 +-
8411  drivers/iommu/intel-iommu.c                        |  83 ++--
8412  drivers/iommu/intel_irq_remapping.c                |  64 ++-
8413  drivers/iommu/iommu.c                              |  46 +-
8414  drivers/iommu/omap-iommu.c                         |  58 +++
8415  drivers/iommu/omap-iommu.h                         |   9 +
8416  drivers/iommu/s390-iommu.c                         | 337 +++++++++++++
8417  include/linux/dma-iommu.h                          |  85 ++++
8418  include/linux/iommu.h                              |   8 +-
8419  27 files changed, 1995 insertions(+), 443 deletions(-)
8420  create mode 100644 drivers/iommu/dma-iommu.c
8421  create mode 100644 drivers/iommu/s390-iommu.c
8422  create mode 100644 include/linux/dma-iommu.h
8423 Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback)
8424 $ git merge dwmw2-iommu/master
8425 Auto-merging drivers/iommu/intel-iommu.c
8426 Auto-merging drivers/iommu/Makefile
8427 Auto-merging drivers/iommu/Kconfig
8428 Merge made by the 'recursive' strategy.
8429  drivers/iommu/Kconfig         |  10 +
8430  drivers/iommu/Makefile        |   1 +
8431  drivers/iommu/dmar.c          |  42 ++-
8432  drivers/iommu/intel-iommu.c   | 303 +++++++++++++++++----
8433  drivers/iommu/intel-svm.c     | 602 ++++++++++++++++++++++++++++++++++++++++++
8434  include/linux/dma_remapping.h |   8 +
8435  include/linux/intel-iommu.h   | 139 ++++++++--
8436  include/linux/intel-svm.h     | 121 +++++++++
8437  8 files changed, 1152 insertions(+), 74 deletions(-)
8438  create mode 100644 drivers/iommu/intel-svm.c
8439  create mode 100644 include/linux/intel-svm.h
8440 Merging vfio/next (f54e0bcf65bf vfio: Include No-IOMMU mode)
8441 $ git merge vfio/next
8442 Merge made by the 'recursive' strategy.
8443  drivers/vfio/Kconfig                               |  15 ++
8444  drivers/vfio/pci/vfio_pci.c                        |   8 +-
8445  drivers/vfio/pci/vfio_pci_config.c                 |  70 ++++++-
8446  drivers/vfio/platform/Makefile                     |   6 +-
8447  drivers/vfio/platform/reset/Kconfig                |   8 +
8448  drivers/vfio/platform/reset/Makefile               |   2 +
8449  .../vfio/platform/reset/vfio_platform_amdxgbe.c    | 127 ++++++++++++
8450  .../platform/reset/vfio_platform_calxedaxgmac.c    |  19 +-
8451  drivers/vfio/platform/vfio_amba.c                  |   1 +
8452  drivers/vfio/platform/vfio_platform.c              |   1 +
8453  drivers/vfio/platform/vfio_platform_common.c       | 155 ++++++++++-----
8454  drivers/vfio/platform/vfio_platform_irq.c          |   1 +
8455  drivers/vfio/platform/vfio_platform_private.h      |  40 +++-
8456  drivers/vfio/vfio.c                                | 217 +++++++++++++++++++--
8457  drivers/vfio/vfio_iommu_type1.c                    |  15 +-
8458  include/linux/vfio.h                               |   3 +
8459  include/uapi/linux/vfio.h                          |   7 +
8460  17 files changed, 610 insertions(+), 85 deletions(-)
8461  create mode 100644 drivers/vfio/platform/reset/vfio_platform_amdxgbe.c
8462 Merging jc_docs/docs-next (3ce96239d482 Documentation: add new description of path-name lookup.)
8463 $ git merge jc_docs/docs-next
8464 Resolved 'Documentation/Changes' using previous resolution.
8465 Auto-merging scripts/kernel-doc
8466 Auto-merging Makefile
8467 Auto-merging MAINTAINERS
8468 Auto-merging Documentation/kernel-parameters.txt
8469 Auto-merging Documentation/DocBook/Makefile
8470 Auto-merging Documentation/Changes
8471 CONFLICT (content): Merge conflict in Documentation/Changes
8472 Automatic merge failed; fix conflicts and then commit the result.
8473 $ git commit -v -a
8474 [master 37f32c0d21aa] Merge remote-tracking branch 'jc_docs/docs-next'
8475 $ git diff -M --stat --summary HEAD^..
8476  Documentation/ABI/stable/sysfs-class-tpm          |    4 +-
8477  Documentation/ABI/stable/sysfs-firmware-opal-elog |    2 +-
8478  Documentation/Changes                             |    1 +
8479  Documentation/DMA-API-HOWTO.txt                   |    5 +
8480  Documentation/DMA-API.txt                         |    6 +-
8481  Documentation/DocBook/.gitignore                  |    2 +
8482  Documentation/DocBook/Makefile                    |    6 +
8483  Documentation/SubmittingPatches                   |    8 +-
8484  Documentation/blockdev/zram.txt                   |   44 +-
8485  Documentation/cgroups/blkio-controller.txt        |    2 +-
8486  Documentation/cgroups/freezer-subsystem.txt       |    2 +-
8487  Documentation/cgroups/unified-hierarchy.txt       |    2 +-
8488  Documentation/email-clients.txt                   |    2 +-
8489  Documentation/filesystems/path-lookup.md          | 1297 +++++++++++++++++++++
8490  Documentation/filesystems/path-lookup.txt         |    2 +-
8491  Documentation/filesystems/sysfs-tagging.txt       |   14 +-
8492  Documentation/filesystems/sysfs.txt               |    9 +-
8493  Documentation/gpio/board.txt                      |   10 +-
8494  Documentation/gpio/sysfs.txt                      |    6 +-
8495  Documentation/kernel-docs.txt                     |   14 +-
8496  Documentation/kernel-parameters.txt               |   17 +-
8497  Documentation/kselftest.txt                       |   16 +
8498  Documentation/misc-devices/apds990x.txt           |    2 +-
8499  Documentation/misc-devices/isl29003               |    2 +-
8500  Documentation/misc-devices/max6875                |    2 +-
8501  Documentation/networking/can.txt                  |   97 +-
8502  Documentation/rbtree.txt                          |    2 +-
8503  Documentation/virtual/kvm/api.txt                 |    4 +-
8504  Documentation/virtual/kvm/devices/vm.txt          |    2 +-
8505  Documentation/virtual/kvm/ppc-pv.txt              |    2 +-
8506  Documentation/vm/slub.txt                         |   59 +
8507  Documentation/zh_CN/filesystems/sysfs.txt         |    2 +-
8508  MAINTAINERS                                       |    4 +-
8509  Makefile                                          |    2 +-
8510  README                                            |    2 +-
8511  scripts/.gitignore                                |    1 +
8512  scripts/Makefile                                  |    7 +-
8513  scripts/check-lc_ctype.c                          |   11 +
8514  scripts/kernel-doc                                |  119 +-
8515  39 files changed, 1658 insertions(+), 133 deletions(-)
8516  create mode 100644 Documentation/filesystems/path-lookup.md
8517  create mode 100644 scripts/check-lc_ctype.c
8518 Merging trivial/for-next (0c6cac7ab444 hwmon: applesmc: fix comment typos)
8519 $ git merge trivial/for-next
8520 Auto-merging net/openvswitch/datapath.c
8521 Auto-merging mm/huge_memory.c
8522 Auto-merging fs/namei.c
8523 Auto-merging fs/ext4/namei.c
8524 Auto-merging fs/ext4/extents.c
8525 Auto-merging drivers/scsi/Kconfig
8526 Auto-merging drivers/net/ethernet/ti/netcp_core.c
8527 Auto-merging drivers/block/pktcdvd.c
8528 Merge made by the 'recursive' strategy.
8529  drivers/base/class.c                 | 2 +-
8530  drivers/block/pktcdvd.c              | 3 +--
8531  drivers/hwmon/applesmc.c             | 4 ++--
8532  drivers/misc/c2port/core.c           | 2 +-
8533  drivers/net/ethernet/ti/netcp_core.c | 4 ++--
8534  drivers/scsi/Kconfig                 | 7 -------
8535  fs/cifs/readdir.c                    | 2 +-
8536  fs/debugfs/inode.c                   | 6 ++++--
8537  fs/ecryptfs/inode.c                  | 2 +-
8538  fs/ext4/extents.c                    | 6 +++---
8539  fs/ext4/namei.c                      | 2 +-
8540  fs/namei.c                           | 4 ++--
8541  fs/ncpfs/dir.c                       | 2 +-
8542  fs/nfs/objlayout/objio_osd.c         | 2 +-
8543  fs/proc/proc_sysctl.c                | 2 +-
8544  mm/huge_memory.c                     | 2 +-
8545  net/openvswitch/datapath.c           | 2 +-
8546  net/sctp/socket.c                    | 2 +-
8547  net/socket.c                         | 6 +++---
8548  19 files changed, 28 insertions(+), 34 deletions(-)
8549 Merging audit/next (a4416687e957 audit: make audit_log_common_recv_msg() a void function)
8550 $ git merge audit/next
8551 Auto-merging kernel/audit_tree.c
8552 Auto-merging kernel/audit.h
8553 Auto-merging kernel/audit.c
8554 Merge made by the 'recursive' strategy.
8555  include/linux/audit.h |  8 ++++----
8556  kernel/audit.c        | 42 ++++++++++++++++++++++++++++--------------
8557  kernel/audit.h        |  2 +-
8558  kernel/audit_tree.c   |  6 +++---
8559  kernel/auditfilter.c  | 14 +++++++-------
8560  5 files changed, 43 insertions(+), 29 deletions(-)
8561 Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
8562 $ git merge devicetree/devicetree/next
8563 Already up-to-date.
8564 Merging dt-rh/for-next (61dd90224c13 devicetree: add Sigma Designs vendor prefix)
8565 $ git merge dt-rh/for-next
8566 Resolved 'include/linux/of_irq.h' using previous resolution.
8567 Auto-merging include/linux/of_irq.h
8568 CONFLICT (content): Merge conflict in include/linux/of_irq.h
8569 Auto-merging drivers/of/of_pci.c
8570 Auto-merging drivers/of/irq.c
8571 Auto-merging arch/arm64/boot/dts/Makefile
8572 Auto-merging arch/arm/boot/dts/Makefile
8573 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
8574 Removing Documentation/devicetree/bindings/usb/samsung-usbphy.txt
8575 Auto-merging Documentation/devicetree/bindings/mmc/mmc.txt
8576 Auto-merging Documentation/devicetree/bindings/input/gpio-keys-polled.txt
8577 Removing Documentation/devicetree/bindings/hwmon/ina209.txt
8578 Auto-merging Documentation/devicetree/bindings/display/tilcdc/panel.txt
8579 Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap5-dss.txt
8580 Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap4-dss.txt
8581 Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt
8582 Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap2-dss.txt
8583 Auto-merging Documentation/devicetree/bindings/display/ti/ti,dra7-dss.txt
8584 Auto-merging Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
8585 Auto-merging Documentation/devicetree/bindings/display/st,stih4xx.txt
8586 Auto-merging Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt
8587 Auto-merging Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt
8588 Auto-merging Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt
8589 Auto-merging Documentation/devicetree/bindings/display/panel/panel-dpi.txt
8590 Auto-merging Documentation/devicetree/bindings/display/msm/dsi.txt
8591 Auto-merging Documentation/devicetree/bindings/display/imx/ldb.txt
8592 Auto-merging Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt
8593 Auto-merging Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt
8594 Auto-merging Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt
8595 Auto-merging Documentation/devicetree/bindings/display/exynos/exynos_dp.txt
8596 Auto-merging Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt
8597 Auto-merging Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt
8598 Auto-merging Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt
8599 Automatic merge failed; fix conflicts and then commit the result.
8600 $ git commit -v -a
8601 [master 65480703bdaa] Merge remote-tracking branch 'dt-rh/for-next'
8602 $ git diff -M --stat --summary HEAD^..
8603  .../bindings/{nvec => arm/tegra}/nvidia,nvec.txt   |   0
8604  .../devicetree/bindings/crypto/fsl-sec4.txt        |   4 +-
8605  .../bindings/{video => display}/arm,pl11x.txt      |   0
8606  .../{drm => display}/armada/marvell,dove-lcd.txt   |   0
8607  .../bindings/{video => display}/atmel,lcdc.txt     |   0
8608  .../bindings/{drm => display}/atmel/hlcdc-dc.txt   |   0
8609  .../{video => display/bridge}/adi,adv7123.txt      |   0
8610  .../{video => display/bridge}/adi,adv7511.txt      |   0
8611  .../bindings/{drm => display}/bridge/dw_hdmi.txt   |   4 +-
8612  .../bindings/{video => display}/bridge/ps8622.txt  |   0
8613  .../bindings/{video => display}/bridge/ptn3460.txt |   0
8614  .../{drm/i2c => display/bridge}/tda998x.txt        |   0
8615  .../bridge/thine,thc63lvdm83d.txt}                 |   0
8616  .../{video => display}/cirrus,clps711x-fb.txt      |   2 +-
8617  .../connector}/analog-tv-connector.txt             |   0
8618  .../{video => display/connector}/dvi-connector.txt |   0
8619  .../connector}/hdmi-connector.txt                  |   0
8620  .../{video => display/connector}/vga-connector.txt |   0
8621  .../{video => display/exynos}/exynos-mic.txt       |   0
8622  .../{video => display/exynos}/exynos5433-decon.txt |   0
8623  .../{video => display/exynos}/exynos7-decon.txt    |   2 +-
8624  .../{video => display/exynos}/exynos_dp.txt        |   2 +-
8625  .../{video => display/exynos}/exynos_dsim.txt      |   2 +-
8626  .../{video => display/exynos}/exynos_hdmi.txt      |   0
8627  .../{video => display/exynos}/exynos_hdmiddc.txt   |   0
8628  .../{video => display/exynos}/exynos_hdmiphy.txt   |   0
8629  .../{video => display/exynos}/exynos_mixer.txt     |   0
8630  .../{video => display/exynos}/samsung-fimd.txt     |   2 +-
8631  .../bindings/{video => display}/fsl,dcu.txt        |   0
8632  .../bindings/{video => display/imx}/fsl,imx-fb.txt |   2 +-
8633  .../bindings/{drm => display}/imx/fsl-imx-drm.txt  |   0
8634  .../bindings/{drm => display}/imx/hdmi.txt         |   0
8635  .../bindings/{drm => display}/imx/ldb.txt          |   2 +-
8636  .../bindings/display/marvell,pxa2xx-lcdc.txt       |  34 ++++++
8637  .../{mipi/dsi => display}/mipi-dsi-bus.txt         |   0
8638  .../bindings/{drm => display}/msm/dsi.txt          |   2 +-
8639  .../bindings/{drm => display}/msm/edp.txt          |   0
8640  .../bindings/{drm => display}/msm/gpu.txt          |   0
8641  .../bindings/{drm => display}/msm/hdmi.txt         |   0
8642  .../bindings/{drm => display}/msm/mdp.txt          |   0
8643  .../devicetree/bindings/{fb => display}/mxsfb.txt  |   0
8644  .../panel/ampire,am800480r3tmqwa1h.txt             |   0
8645  .../bindings/{ => display}/panel/auo,b080uan01.txt |   0
8646  .../bindings/{ => display}/panel/auo,b101aw03.txt  |   0
8647  .../bindings/{ => display}/panel/auo,b101ean01.txt |   0
8648  .../bindings/{ => display}/panel/auo,b101xtn01.txt |   0
8649  .../bindings/{ => display}/panel/auo,b116xw03.txt  |   0
8650  .../bindings/{ => display}/panel/auo,b133htn01.txt |   0
8651  .../bindings/{ => display}/panel/auo,b133xtn01.txt |   0
8652  .../{ => display}/panel/avic,tm070ddh03.txt        |   0
8653  .../{ => display}/panel/chunghwa,claa101wa01a.txt  |   0
8654  .../{ => display}/panel/chunghwa,claa101wb03.txt   |   0
8655  .../{video => display/panel}/display-timing.txt    |   0
8656  .../{ => display}/panel/edt,et057090dhu.txt        |   0
8657  .../{ => display}/panel/edt,et070080dh6.txt        |   0
8658  .../{ => display}/panel/edt,etm0700g0dh6.txt       |   0
8659  .../{ => display}/panel/foxlink,fl500wvr00-a0t.txt |   0
8660  .../{ => display}/panel/giantplus,gpg482739qs5.txt |   0
8661  .../{ => display}/panel/hannstar,hsd070pww1.txt    |   0
8662  .../{ => display}/panel/hannstar,hsd100pxn1.txt    |   0
8663  .../{ => display}/panel/hit,tx23d38vm0caa.txt      |   0
8664  .../{ => display}/panel/innolux,at043tn24.txt      |   0
8665  .../{ => display}/panel/innolux,g121i1-l01.txt     |   0
8666  .../{ => display}/panel/innolux,n116bge.txt        |   0
8667  .../{ => display}/panel/innolux,n156bge-l21.txt    |   0
8668  .../{ => display}/panel/innolux,zj070na-01p.txt    |   0
8669  .../bindings/{ => display}/panel/lg,lb070wv8.txt   |   0
8670  .../{ => display}/panel/lg,ld070wx3-sl01.txt       |   0
8671  .../bindings/{ => display}/panel/lg,lg4573.txt     |   0
8672  .../{ => display}/panel/lg,lh500wx1-sd03.txt       |   0
8673  .../bindings/{ => display}/panel/lg,lp129qe.txt    |   0
8674  .../panel}/lgphilips,lb035q02.txt                  |   0
8675  .../{ => display}/panel/nec,nl4827hc19-05b.txt     |   0
8676  .../{ => display}/panel/okaya,rs800480t-7x0gp.txt  |   0
8677  .../panel/ortustech,com43h4m85ulc.txt              |   0
8678  .../{ => display}/panel/panasonic,vvx10f004b00.txt |   0
8679  .../{video => display/panel}/panel-dpi.txt         |   2 +-
8680  .../{video => display/panel}/panel-dsi-cm.txt      |   0
8681  .../{ => display}/panel/samsung,ld9040.txt         |   2 +-
8682  .../{ => display}/panel/samsung,ltn101nt05.txt     |   0
8683  .../{ => display}/panel/samsung,ltn140at29-301.txt |   0
8684  .../{ => display}/panel/samsung,s6e8aa0.txt        |   2 +-
8685  .../{ => display}/panel/sharp,lq101r1sx01.txt      |   0
8686  .../{video => display/panel}/sharp,ls037v7dw01.txt |   0
8687  .../panel/shelly,sca07010-bfn-lnn.txt              |   0
8688  .../bindings/{ => display}/panel/simple-panel.txt  |   0
8689  .../{video => display/panel}/sony,acx565akm.txt    |   0
8690  .../panel}/toppoly,td028ttec1.txt                  |   0
8691  .../{video => display/panel}/tpo,td043mtea1.txt    |   0
8692  .../bindings/{video => display}/renesas,du.txt     |   0
8693  .../rockchip}/dw_hdmi-rockchip.txt                 |   0
8694  .../{video => display/rockchip}/rockchip-drm.txt   |   2 +-
8695  .../{video => display/rockchip}/rockchip-vop.txt   |   0
8696  .../simple-framebuffer-sunxi.txt                   |   0
8697  .../{video => display}/simple-framebuffer.txt      |   0
8698  .../bindings/{fb => display}/sm501fb.txt           |   0
8699  .../bindings/{video => display}/ssd1289fb.txt      |   0
8700  .../bindings/{video => display}/ssd1307fb.txt      |   0
8701  .../bindings/{gpu => display}/st,stih4xx.txt       |   4 +-
8702  .../tegra}/nvidia,tegra114-mipi.txt                |   0
8703  .../tegra}/nvidia,tegra20-host1x.txt               |   2 +-
8704  .../bindings/{video => display/ti}/ti,dra7-dss.txt |   2 +-
8705  .../bindings/{video => display/ti}/ti,omap-dss.txt |   0
8706  .../{video => display/ti}/ti,omap2-dss.txt         |   2 +-
8707  .../{video => display/ti}/ti,omap3-dss.txt         |   2 +-
8708  .../{video => display/ti}/ti,omap4-dss.txt         |   2 +-
8709  .../{video => display/ti}/ti,omap5-dss.txt         |   2 +-
8710  .../bindings/{video => display/ti}/ti,opa362.txt   |   0
8711  .../bindings/{video => display/ti}/ti,tfp410.txt   |   0
8712  .../{video => display/ti}/ti,tpd12s015.txt         |   0
8713  .../bindings/{drm => display}/tilcdc/panel.txt     |   2 +-
8714  .../bindings/{drm => display}/tilcdc/tfp410.txt    |   0
8715  .../bindings/{drm => display}/tilcdc/tilcdc.txt    |   0
8716  .../bindings/{video => display}/via,vt8500-fb.txt  |   0
8717  .../{video => display}/wm,prizm-ge-rops.txt        |   0
8718  .../bindings/{video => display}/wm,wm8505-fb.txt   |   0
8719  .../devicetree/bindings/{misc => eeprom}/at25.txt  |   0
8720  .../devicetree/bindings/{ => eeprom}/eeprom.txt    |   0
8721  .../bindings/fpga/altera-socfpga-fpga-mgr.txt      |   2 +-
8722  Documentation/devicetree/bindings/hwmon/ina209.txt |  18 ----
8723  Documentation/devicetree/bindings/hwmon/ina2xx.txt |   1 +
8724  .../bindings/{misc => iio/accel}/lis302.txt        |   0
8725  .../bindings/{misc => iio/dac}/ti,dac7512.txt      |   0
8726  .../bindings/{misc => iio/pressure}/bmp085.txt     |   0
8727  .../devicetree/bindings/input/ads7846.txt          |   3 +-
8728  .../devicetree/bindings/input/gpio-keys-polled.txt |   1 +
8729  .../devicetree/bindings/input/gpio-keys.txt        |   1 +
8730  .../bindings/input/gpio-matrix-keypad.txt          |   1 +
8731  .../bindings/{hid => input}/hid-over-i2c.txt       |   0
8732  .../bindings/input/nvidia,tegra20-kbc.txt          |   3 +-
8733  .../bindings/input/qcom,pm8xxx-keypad.txt          |   1 +
8734  .../devicetree/bindings/input/samsung-keypad.txt   |   3 +-
8735  .../arm,gic-v3.txt}                                |   0
8736  .../gic.txt => interrupt-controller/arm,gic.txt}   |   0
8737  .../arm,versatile-fpga-irq.txt}                    |   0
8738  .../vic.txt => interrupt-controller/arm,vic.txt}   |   0
8739  .../axis,crisv32-intc.txt}                         |   0
8740  .../img,meta-intc.txt}                             |   0
8741  .../img,pdc-intc.txt}                              |   0
8742  .../intel,ce4100-ioapic.txt}                       |   0
8743  .../mediatek,sysirq.txt                            |   0
8744  .../mrvl,intc.txt}                                 |   0
8745  .../nxp,lpc3220-mic.txt}                           |   0
8746  .../{ => interrupt-controller}/open-pic.txt        |   0
8747  .../samsung,exynos4210-combiner.txt}               |   0
8748  .../snps,arc700-intc.txt}                          |   0
8749  .../snps,archs-idu-intc.txt}                       |   0
8750  .../snps,archs-intc.txt}                           |   0
8751  .../st,spear3xx-shirq.txt}                         |   0
8752  .../ti,c64x+megamod-pic.txt}                       |   0
8753  .../ti,cp-intc.txt}                                |   0
8754  .../ti,omap2-intc.txt}                             |   0
8755  .../via,vt8500-intc.txt                            |   0
8756  .../{video => leds}/backlight/88pm860x.txt         |   0
8757  .../{video => leds}/backlight/gpio-backlight.txt   |   0
8758  .../bindings/{video => leds}/backlight/lp855x.txt  |   0
8759  .../backlight/max8925-backlight.txt                |   0
8760  .../{video => leds}/backlight/pm8941-wled.txt      |   0
8761  .../{video => leds}/backlight/pwm-backlight.txt    |   0
8762  .../backlight/sky81452-backlight.txt               |   0
8763  .../backlight/tps65217-backlight.txt               |   0
8764  .../calxeda-ddr-ctrlr.txt}                         |   0
8765  .../devicetree/bindings/mfd/atmel-hlcdc.txt        |   2 +-
8766  Documentation/devicetree/bindings/mfd/sky81452.txt |   2 +-
8767  Documentation/devicetree/bindings/mfd/tc3589x.txt  |   1 +
8768  Documentation/devicetree/bindings/mmc/mmc.txt      |   5 +-
8769  Documentation/devicetree/bindings/pci/pci.txt      |   4 +-
8770  .../combophy.txt => phy/calxeda-combophy.txt}      |   0
8771  .../keystone-phy.txt => phy/keystone-usb-phy.txt}  |   0
8772  .../{usb/mxs-phy.txt => phy/mxs-usb-phy.txt}       |   0
8773  .../{usb => phy}/nvidia,tegra20-usb-phy.txt        |   0
8774  .../bindings/{usb => phy}/qcom,usb-8x16-phy.txt    |   0
8775  .../devicetree/bindings/power/wakeup-source.txt    |  71 +++++++++++++
8776  .../bindings/{hwrng => rng}/atmel-trng.txt         |   0
8777  .../bindings/{hwrng => rng}/brcm,iproc-rng200.txt  |   0
8778  .../bindings/{hwrng => rng}/omap_rng.txt           |   0
8779  .../bindings/{hwrng => rng}/timeriomem_rng.txt     |   0
8780  .../devicetree/bindings/rtc/isil,isl12057.txt      |  10 +-
8781  Documentation/devicetree/bindings/rtc/rtc-opal.txt |   5 +-
8782  .../devicetree/bindings/serial/mrvl,pxa-ssp.txt    |   1 -
8783  Documentation/devicetree/bindings/serial/pl011.txt |   2 +-
8784  .../devicetree/bindings/usb/samsung-usbphy.txt     | 117 ---------------------
8785  .../devicetree/bindings/vendor-prefixes.txt        |   2 +
8786  arch/arc/Makefile                                  |   2 +-
8787  arch/arc/boot/dts/Makefile                         |   6 +-
8788  arch/arm/boot/dts/Makefile                         |   3 +
8789  arch/arm64/boot/dts/Makefile                       |   6 ++
8790  arch/h8300/boot/dts/Makefile                       |   3 +
8791  arch/metag/Makefile                                |   2 +-
8792  arch/metag/boot/dts/Makefile                       |   7 +-
8793  arch/mips/boot/dts/Makefile                        |   3 +
8794  arch/xtensa/Makefile                               |   4 +
8795  arch/xtensa/boot/dts/Makefile                      |   7 +-
8796  drivers/base/core.c                                |   2 +-
8797  drivers/of/Kconfig                                 |  10 ++
8798  drivers/of/address.c                               |   6 ++
8799  drivers/of/base.c                                  |   5 +-
8800  drivers/of/device.c                                |  11 +-
8801  drivers/of/fdt.c                                   |  12 ++-
8802  drivers/of/irq.c                                   |   9 +-
8803  drivers/of/of_pci.c                                |   6 +-
8804  drivers/of/of_reserved_mem.c                       |  43 +++++++-
8805  drivers/of/overlay.c                               |   5 +-
8806  drivers/of/platform.c                              |   8 +-
8807  drivers/of/unittest.c                              |   8 +-
8808  include/linux/of_irq.h                             |  15 ++-
8809  206 files changed, 301 insertions(+), 222 deletions(-)
8810  rename Documentation/devicetree/bindings/{nvec => arm/tegra}/nvidia,nvec.txt (100%)
8811  rename Documentation/devicetree/bindings/{video => display}/arm,pl11x.txt (100%)
8812  rename Documentation/devicetree/bindings/{drm => display}/armada/marvell,dove-lcd.txt (100%)
8813  rename Documentation/devicetree/bindings/{video => display}/atmel,lcdc.txt (100%)
8814  rename Documentation/devicetree/bindings/{drm => display}/atmel/hlcdc-dc.txt (100%)
8815  rename Documentation/devicetree/bindings/{video => display/bridge}/adi,adv7123.txt (100%)
8816  rename Documentation/devicetree/bindings/{video => display/bridge}/adi,adv7511.txt (100%)
8817  rename Documentation/devicetree/bindings/{drm => display}/bridge/dw_hdmi.txt (91%)
8818  rename Documentation/devicetree/bindings/{video => display}/bridge/ps8622.txt (100%)
8819  rename Documentation/devicetree/bindings/{video => display}/bridge/ptn3460.txt (100%)
8820  rename Documentation/devicetree/bindings/{drm/i2c => display/bridge}/tda998x.txt (100%)
8821  rename Documentation/devicetree/bindings/{video/thine,thc63lvdm83d => display/bridge/thine,thc63lvdm83d.txt} (100%)
8822  rename Documentation/devicetree/bindings/{video => display}/cirrus,clps711x-fb.txt (94%)
8823  rename Documentation/devicetree/bindings/{video => display/connector}/analog-tv-connector.txt (100%)
8824  rename Documentation/devicetree/bindings/{video => display/connector}/dvi-connector.txt (100%)
8825  rename Documentation/devicetree/bindings/{video => display/connector}/hdmi-connector.txt (100%)
8826  rename Documentation/devicetree/bindings/{video => display/connector}/vga-connector.txt (100%)
8827  rename Documentation/devicetree/bindings/{video => display/exynos}/exynos-mic.txt (100%)
8828  rename Documentation/devicetree/bindings/{video => display/exynos}/exynos5433-decon.txt (100%)
8829  rename Documentation/devicetree/bindings/{video => display/exynos}/exynos7-decon.txt (97%)
8830  rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_dp.txt (98%)
8831  rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_dsim.txt (98%)
8832  rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmi.txt (100%)
8833  rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmiddc.txt (100%)
8834  rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmiphy.txt (100%)
8835  rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_mixer.txt (100%)
8836  rename Documentation/devicetree/bindings/{video => display/exynos}/samsung-fimd.txt (98%)
8837  rename Documentation/devicetree/bindings/{video => display}/fsl,dcu.txt (100%)
8838  rename Documentation/devicetree/bindings/{video => display/imx}/fsl,imx-fb.txt (96%)
8839  rename Documentation/devicetree/bindings/{drm => display}/imx/fsl-imx-drm.txt (100%)
8840  rename Documentation/devicetree/bindings/{drm => display}/imx/hdmi.txt (100%)
8841  rename Documentation/devicetree/bindings/{drm => display}/imx/ldb.txt (98%)
8842  create mode 100644 Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt
8843  rename Documentation/devicetree/bindings/{mipi/dsi => display}/mipi-dsi-bus.txt (100%)
8844  rename Documentation/devicetree/bindings/{drm => display}/msm/dsi.txt (98%)
8845  rename Documentation/devicetree/bindings/{drm => display}/msm/edp.txt (100%)
8846  rename Documentation/devicetree/bindings/{drm => display}/msm/gpu.txt (100%)
8847  rename Documentation/devicetree/bindings/{drm => display}/msm/hdmi.txt (100%)
8848  rename Documentation/devicetree/bindings/{drm => display}/msm/mdp.txt (100%)
8849  rename Documentation/devicetree/bindings/{fb => display}/mxsfb.txt (100%)
8850  rename Documentation/devicetree/bindings/{ => display}/panel/ampire,am800480r3tmqwa1h.txt (100%)
8851  rename Documentation/devicetree/bindings/{ => display}/panel/auo,b080uan01.txt (100%)
8852  rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101aw03.txt (100%)
8853  rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101ean01.txt (100%)
8854  rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101xtn01.txt (100%)
8855  rename Documentation/devicetree/bindings/{ => display}/panel/auo,b116xw03.txt (100%)
8856  rename Documentation/devicetree/bindings/{ => display}/panel/auo,b133htn01.txt (100%)
8857  rename Documentation/devicetree/bindings/{ => display}/panel/auo,b133xtn01.txt (100%)
8858  rename Documentation/devicetree/bindings/{ => display}/panel/avic,tm070ddh03.txt (100%)
8859  rename Documentation/devicetree/bindings/{ => display}/panel/chunghwa,claa101wa01a.txt (100%)
8860  rename Documentation/devicetree/bindings/{ => display}/panel/chunghwa,claa101wb03.txt (100%)
8861  rename Documentation/devicetree/bindings/{video => display/panel}/display-timing.txt (100%)
8862  rename Documentation/devicetree/bindings/{ => display}/panel/edt,et057090dhu.txt (100%)
8863  rename Documentation/devicetree/bindings/{ => display}/panel/edt,et070080dh6.txt (100%)
8864  rename Documentation/devicetree/bindings/{ => display}/panel/edt,etm0700g0dh6.txt (100%)
8865  rename Documentation/devicetree/bindings/{ => display}/panel/foxlink,fl500wvr00-a0t.txt (100%)
8866  rename Documentation/devicetree/bindings/{ => display}/panel/giantplus,gpg482739qs5.txt (100%)
8867  rename Documentation/devicetree/bindings/{ => display}/panel/hannstar,hsd070pww1.txt (100%)
8868  rename Documentation/devicetree/bindings/{ => display}/panel/hannstar,hsd100pxn1.txt (100%)
8869  rename Documentation/devicetree/bindings/{ => display}/panel/hit,tx23d38vm0caa.txt (100%)
8870  rename Documentation/devicetree/bindings/{ => display}/panel/innolux,at043tn24.txt (100%)
8871  rename Documentation/devicetree/bindings/{ => display}/panel/innolux,g121i1-l01.txt (100%)
8872  rename Documentation/devicetree/bindings/{ => display}/panel/innolux,n116bge.txt (100%)
8873  rename Documentation/devicetree/bindings/{ => display}/panel/innolux,n156bge-l21.txt (100%)
8874  rename Documentation/devicetree/bindings/{ => display}/panel/innolux,zj070na-01p.txt (100%)
8875  rename Documentation/devicetree/bindings/{ => display}/panel/lg,lb070wv8.txt (100%)
8876  rename Documentation/devicetree/bindings/{ => display}/panel/lg,ld070wx3-sl01.txt (100%)
8877  rename Documentation/devicetree/bindings/{ => display}/panel/lg,lg4573.txt (100%)
8878  rename Documentation/devicetree/bindings/{ => display}/panel/lg,lh500wx1-sd03.txt (100%)
8879  rename Documentation/devicetree/bindings/{ => display}/panel/lg,lp129qe.txt (100%)
8880  rename Documentation/devicetree/bindings/{video => display/panel}/lgphilips,lb035q02.txt (100%)
8881  rename Documentation/devicetree/bindings/{ => display}/panel/nec,nl4827hc19-05b.txt (100%)
8882  rename Documentation/devicetree/bindings/{ => display}/panel/okaya,rs800480t-7x0gp.txt (100%)
8883  rename Documentation/devicetree/bindings/{ => display}/panel/ortustech,com43h4m85ulc.txt (100%)
8884  rename Documentation/devicetree/bindings/{ => display}/panel/panasonic,vvx10f004b00.txt (100%)
8885  rename Documentation/devicetree/bindings/{video => display/panel}/panel-dpi.txt (94%)
8886  rename Documentation/devicetree/bindings/{video => display/panel}/panel-dsi-cm.txt (100%)
8887  rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ld9040.txt (96%)
8888  rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ltn101nt05.txt (100%)
8889  rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ltn140at29-301.txt (100%)
8890  rename Documentation/devicetree/bindings/{ => display}/panel/samsung,s6e8aa0.txt (95%)
8891  rename Documentation/devicetree/bindings/{ => display}/panel/sharp,lq101r1sx01.txt (100%)
8892  rename Documentation/devicetree/bindings/{video => display/panel}/sharp,ls037v7dw01.txt (100%)
8893  rename Documentation/devicetree/bindings/{ => display}/panel/shelly,sca07010-bfn-lnn.txt (100%)
8894  rename Documentation/devicetree/bindings/{ => display}/panel/simple-panel.txt (100%)
8895  rename Documentation/devicetree/bindings/{video => display/panel}/sony,acx565akm.txt (100%)
8896  rename Documentation/devicetree/bindings/{video => display/panel}/toppoly,td028ttec1.txt (100%)
8897  rename Documentation/devicetree/bindings/{video => display/panel}/tpo,td043mtea1.txt (100%)
8898  rename Documentation/devicetree/bindings/{video => display}/renesas,du.txt (100%)
8899  rename Documentation/devicetree/bindings/{video => display/rockchip}/dw_hdmi-rockchip.txt (100%)
8900  rename Documentation/devicetree/bindings/{video => display/rockchip}/rockchip-drm.txt (88%)
8901  rename Documentation/devicetree/bindings/{video => display/rockchip}/rockchip-vop.txt (100%)
8902  rename Documentation/devicetree/bindings/{video => display}/simple-framebuffer-sunxi.txt (100%)
8903  rename Documentation/devicetree/bindings/{video => display}/simple-framebuffer.txt (100%)
8904  rename Documentation/devicetree/bindings/{fb => display}/sm501fb.txt (100%)
8905  rename Documentation/devicetree/bindings/{video => display}/ssd1289fb.txt (100%)
8906  rename Documentation/devicetree/bindings/{video => display}/ssd1307fb.txt (100%)
8907  rename Documentation/devicetree/bindings/{gpu => display}/st,stih4xx.txt (98%)
8908  rename Documentation/devicetree/bindings/{mipi => display/tegra}/nvidia,tegra114-mipi.txt (100%)
8909  rename Documentation/devicetree/bindings/{gpu => display/tegra}/nvidia,tegra20-host1x.txt (99%)
8910  rename Documentation/devicetree/bindings/{video => display/ti}/ti,dra7-dss.txt (95%)
8911  rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap-dss.txt (100%)
8912  rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap2-dss.txt (93%)
8913  rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap3-dss.txt (95%)
8914  rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap4-dss.txt (97%)
8915  rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap5-dss.txt (96%)
8916  rename Documentation/devicetree/bindings/{video => display/ti}/ti,opa362.txt (100%)
8917  rename Documentation/devicetree/bindings/{video => display/ti}/ti,tfp410.txt (100%)
8918  rename Documentation/devicetree/bindings/{video => display/ti}/ti,tpd12s015.txt (100%)
8919  rename Documentation/devicetree/bindings/{drm => display}/tilcdc/panel.txt (96%)
8920  rename Documentation/devicetree/bindings/{drm => display}/tilcdc/tfp410.txt (100%)
8921  rename Documentation/devicetree/bindings/{drm => display}/tilcdc/tilcdc.txt (100%)
8922  rename Documentation/devicetree/bindings/{video => display}/via,vt8500-fb.txt (100%)
8923  rename Documentation/devicetree/bindings/{video => display}/wm,prizm-ge-rops.txt (100%)
8924  rename Documentation/devicetree/bindings/{video => display}/wm,wm8505-fb.txt (100%)
8925  rename Documentation/devicetree/bindings/{misc => eeprom}/at25.txt (100%)
8926  rename Documentation/devicetree/bindings/{ => eeprom}/eeprom.txt (100%)
8927  delete mode 100644 Documentation/devicetree/bindings/hwmon/ina209.txt
8928  rename Documentation/devicetree/bindings/{misc => iio/accel}/lis302.txt (100%)
8929  rename Documentation/devicetree/bindings/{misc => iio/dac}/ti,dac7512.txt (100%)
8930  rename Documentation/devicetree/bindings/{misc => iio/pressure}/bmp085.txt (100%)
8931  rename Documentation/devicetree/bindings/{hid => input}/hid-over-i2c.txt (100%)
8932  rename Documentation/devicetree/bindings/{arm/gic-v3.txt => interrupt-controller/arm,gic-v3.txt} (100%)
8933  rename Documentation/devicetree/bindings/{arm/gic.txt => interrupt-controller/arm,gic.txt} (100%)
8934  rename Documentation/devicetree/bindings/{arm/versatile-fpga-irq.txt => interrupt-controller/arm,versatile-fpga-irq.txt} (100%)
8935  rename Documentation/devicetree/bindings/{arm/vic.txt => interrupt-controller/arm,vic.txt} (100%)
8936  rename Documentation/devicetree/bindings/{cris/interrupts.txt => interrupt-controller/axis,crisv32-intc.txt} (100%)
8937  rename Documentation/devicetree/bindings/{metag/meta-intc.txt => interrupt-controller/img,meta-intc.txt} (100%)
8938  rename Documentation/devicetree/bindings/{metag/pdc-intc.txt => interrupt-controller/img,pdc-intc.txt} (100%)
8939  rename Documentation/devicetree/bindings/{x86/interrupt.txt => interrupt-controller/intel,ce4100-ioapic.txt} (100%)
8940  rename Documentation/devicetree/bindings/{arm/mediatek => interrupt-controller}/mediatek,sysirq.txt (100%)
8941  rename Documentation/devicetree/bindings/{arm/mrvl/intc.txt => interrupt-controller/mrvl,intc.txt} (100%)
8942  rename Documentation/devicetree/bindings/{arm/lpc32xx-mic.txt => interrupt-controller/nxp,lpc3220-mic.txt} (100%)
8943  rename Documentation/devicetree/bindings/{ => interrupt-controller}/open-pic.txt (100%)
8944  rename Documentation/devicetree/bindings/{arm/samsung/interrupt-combiner.txt => interrupt-controller/samsung,exynos4210-combiner.txt} (100%)
8945  rename Documentation/devicetree/bindings/{arc/interrupts.txt => interrupt-controller/snps,arc700-intc.txt} (100%)
8946  rename Documentation/devicetree/bindings/{arc/archs-idu-intc.txt => interrupt-controller/snps,archs-idu-intc.txt} (100%)
8947  rename Documentation/devicetree/bindings/{arc/archs-intc.txt => interrupt-controller/snps,archs-intc.txt} (100%)
8948  rename Documentation/devicetree/bindings/{arm/spear/shirq.txt => interrupt-controller/st,spear3xx-shirq.txt} (100%)
8949  rename Documentation/devicetree/bindings/{c6x/interrupt.txt => interrupt-controller/ti,c64x+megamod-pic.txt} (100%)
8950  rename Documentation/devicetree/bindings/{arm/davinci/cp-intc.txt => interrupt-controller/ti,cp-intc.txt} (100%)
8951  rename Documentation/devicetree/bindings/{arm/omap/intc.txt => interrupt-controller/ti,omap2-intc.txt} (100%)
8952  rename Documentation/devicetree/bindings/{arm/vt8500 => interrupt-controller}/via,vt8500-intc.txt (100%)
8953  rename Documentation/devicetree/bindings/{video => leds}/backlight/88pm860x.txt (100%)
8954  rename Documentation/devicetree/bindings/{video => leds}/backlight/gpio-backlight.txt (100%)
8955  rename Documentation/devicetree/bindings/{video => leds}/backlight/lp855x.txt (100%)
8956  rename Documentation/devicetree/bindings/{video => leds}/backlight/max8925-backlight.txt (100%)
8957  rename Documentation/devicetree/bindings/{video => leds}/backlight/pm8941-wled.txt (100%)
8958  rename Documentation/devicetree/bindings/{video => leds}/backlight/pwm-backlight.txt (100%)
8959  rename Documentation/devicetree/bindings/{video => leds}/backlight/sky81452-backlight.txt (100%)
8960  rename Documentation/devicetree/bindings/{video => leds}/backlight/tps65217-backlight.txt (100%)
8961  rename Documentation/devicetree/bindings/{arm/calxeda/mem-ctrlr.txt => memory-controllers/calxeda-ddr-ctrlr.txt} (100%)
8962  rename Documentation/devicetree/bindings/{arm/calxeda/combophy.txt => phy/calxeda-combophy.txt} (100%)
8963  rename Documentation/devicetree/bindings/{usb/keystone-phy.txt => phy/keystone-usb-phy.txt} (100%)
8964  rename Documentation/devicetree/bindings/{usb/mxs-phy.txt => phy/mxs-usb-phy.txt} (100%)
8965  rename Documentation/devicetree/bindings/{usb => phy}/nvidia,tegra20-usb-phy.txt (100%)
8966  rename Documentation/devicetree/bindings/{usb => phy}/qcom,usb-8x16-phy.txt (100%)
8967  create mode 100644 Documentation/devicetree/bindings/power/wakeup-source.txt
8968  rename Documentation/devicetree/bindings/{hwrng => rng}/atmel-trng.txt (100%)
8969  rename Documentation/devicetree/bindings/{hwrng => rng}/brcm,iproc-rng200.txt (100%)
8970  rename Documentation/devicetree/bindings/{hwrng => rng}/omap_rng.txt (100%)
8971  rename Documentation/devicetree/bindings/{hwrng => rng}/timeriomem_rng.txt (100%)
8972  delete mode 100644 Documentation/devicetree/bindings/usb/samsung-usbphy.txt
8973 Merging mailbox/mailbox-for-next (cb1ca0b3bb66 mailbox: mailbox-test: avoid reading iomem twice)
8974 $ git merge mailbox/mailbox-for-next
8975 Merge made by the 'recursive' strategy.
8976  .../devicetree/bindings/mailbox/omap-mailbox.txt   |   8 +
8977  .../devicetree/bindings/mailbox/sti-mailbox.txt    |  51 ++
8978  drivers/mailbox/Kconfig                            |  14 +
8979  drivers/mailbox/Makefile                           |   4 +
8980  drivers/mailbox/mailbox-sti.c                      | 513 +++++++++++++++++++++
8981  drivers/mailbox/mailbox-test.c                     | 361 +++++++++++++++
8982  drivers/mailbox/omap-mailbox.c                     |  49 +-
8983  drivers/mailbox/pcc.c                              |   2 +-
8984  8 files changed, 997 insertions(+), 5 deletions(-)
8985  create mode 100644 Documentation/devicetree/bindings/mailbox/sti-mailbox.txt
8986  create mode 100644 drivers/mailbox/mailbox-sti.c
8987  create mode 100644 drivers/mailbox/mailbox-test.c
8988 Merging spi/for-next (c70efb851531 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/ti-qspi' and 'spi/topic/txx9' into spi-next)
8989 $ git merge spi/for-next
8990 Recorded preimage for 'drivers/input/touchscreen/tsc2005.c'
8991 Resolved 'drivers/nfc/trf7970a.c' using previous resolution.
8992 Auto-merging sound/soc/codecs/wm8731.c
8993 Auto-merging sound/soc/codecs/ad193x-spi.c
8994 Auto-merging drivers/staging/mt29f_spinand/mt29f_spinand.c
8995 Auto-merging drivers/spi/spi-atmel.c
8996 Auto-merging drivers/nfc/trf7970a.c
8997 CONFLICT (content): Merge conflict in drivers/nfc/trf7970a.c
8998 Auto-merging drivers/nfc/st-nci/spi.c
8999 Auto-merging drivers/net/ieee802154/mrf24j40.c
9000 Auto-merging drivers/net/ieee802154/at86rf230.c
9001 Auto-merging drivers/mtd/devices/sst25l.c
9002 Auto-merging drivers/mtd/devices/mtd_dataflash.c
9003 Auto-merging drivers/mtd/devices/m25p80.c
9004 Auto-merging drivers/mmc/host/mmc_spi.c
9005 Auto-merging drivers/mfd/da9052-spi.c
9006 Auto-merging drivers/mfd/arizona-spi.c
9007 Auto-merging drivers/media/i2c/s5c73m3/s5c73m3-spi.c
9008 Auto-merging drivers/input/touchscreen/tsc2005.c
9009 CONFLICT (content): Merge conflict in drivers/input/touchscreen/tsc2005.c
9010 Auto-merging drivers/input/touchscreen/ads7846.c
9011 Auto-merging drivers/input/misc/ad714x-spi.c
9012 Automatic merge failed; fix conflicts and then commit the result.
9013 $ git commit -v -a
9014 Recorded resolution for 'drivers/input/touchscreen/tsc2005.c'.
9015 [master 445c9a9ed069] Merge remote-tracking branch 'spi/for-next'
9016 $ git diff -M --stat --summary HEAD^..
9017  .../bindings/spi/brcm,bcm2835-aux-spi.txt          |  38 ++
9018  .../devicetree/bindings/spi/spi-mt65xx.txt         |   9 +-
9019  arch/arm/mach-u300/dummyspichip.c                  |   1 -
9020  arch/mips/bcm63xx/dev-spi.c                        |  42 +-
9021  .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h     |  44 --
9022  arch/mips/txx9/generic/spi_eeprom.c                |   1 -
9023  drivers/char/tpm/st33zp24/spi.c                    |   1 -
9024  drivers/gpio/gpio-74x164.c                         |   1 -
9025  drivers/gpio/gpio-max7301.c                        |   1 -
9026  drivers/gpio/gpio-mc33880.c                        |   1 -
9027  drivers/gpio/gpio-mcp23s08.c                       |   2 -
9028  drivers/gpu/drm/panel/panel-lg-lg4573.c            |   1 -
9029  drivers/gpu/drm/panel/panel-samsung-ld9040.c       |   1 -
9030  drivers/hwmon/ad7314.c                             |   1 -
9031  drivers/hwmon/adcxx.c                              |   1 -
9032  drivers/hwmon/ads7871.c                            |   1 -
9033  drivers/hwmon/adt7310.c                            |   1 -
9034  drivers/hwmon/lm70.c                               |   1 -
9035  drivers/hwmon/max1111.c                            |   1 -
9036  drivers/iio/accel/kxsd9.c                          |   1 -
9037  drivers/iio/accel/st_accel_spi.c                   |   1 -
9038  drivers/iio/adc/ad7266.c                           |   1 -
9039  drivers/iio/adc/ad7298.c                           |   1 -
9040  drivers/iio/adc/ad7476.c                           |   1 -
9041  drivers/iio/adc/ad7791.c                           |   1 -
9042  drivers/iio/adc/ad7793.c                           |   1 -
9043  drivers/iio/adc/ad7887.c                           |   1 -
9044  drivers/iio/adc/ad7923.c                           |   1 -
9045  drivers/iio/adc/max1027.c                          |   1 -
9046  drivers/iio/adc/mcp320x.c                          |   1 -
9047  drivers/iio/adc/ti-adc128s052.c                    |   1 -
9048  drivers/iio/amplifiers/ad8366.c                    |   1 -
9049  drivers/iio/common/ssp_sensors/ssp_dev.c           |   1 -
9050  drivers/iio/dac/ad5064.c                           |   1 -
9051  drivers/iio/dac/ad5360.c                           |   1 -
9052  drivers/iio/dac/ad5380.c                           |   1 -
9053  drivers/iio/dac/ad5421.c                           |   1 -
9054  drivers/iio/dac/ad5446.c                           |   1 -
9055  drivers/iio/dac/ad5449.c                           |   1 -
9056  drivers/iio/dac/ad5504.c                           |   1 -
9057  drivers/iio/dac/ad5624r_spi.c                      |   1 -
9058  drivers/iio/dac/ad5686.c                           |   1 -
9059  drivers/iio/dac/ad5755.c                           |   1 -
9060  drivers/iio/dac/ad5764.c                           |   1 -
9061  drivers/iio/dac/ad5791.c                           |   1 -
9062  drivers/iio/dac/ad7303.c                           |   1 -
9063  drivers/iio/dac/mcp4922.c                          |   1 -
9064  drivers/iio/frequency/ad9523.c                     |   1 -
9065  drivers/iio/frequency/adf4350.c                    |   1 -
9066  drivers/iio/gyro/adis16080.c                       |   1 -
9067  drivers/iio/gyro/adis16130.c                       |   1 -
9068  drivers/iio/gyro/adis16136.c                       |   1 -
9069  drivers/iio/gyro/adis16260.c                       |   1 -
9070  drivers/iio/gyro/adxrs450.c                        |   1 -
9071  drivers/iio/gyro/st_gyro_spi.c                     |   1 -
9072  drivers/iio/imu/adis16400_core.c                   |   1 -
9073  drivers/iio/imu/adis16480.c                        |   1 -
9074  drivers/iio/magnetometer/st_magn_spi.c             |   1 -
9075  drivers/iio/pressure/ms5611_spi.c                  |   1 -
9076  drivers/iio/pressure/st_pressure_spi.c             |   1 -
9077  drivers/iio/proximity/as3935.c                     |   1 -
9078  drivers/input/misc/ad714x-spi.c                    |   1 -
9079  drivers/input/misc/adxl34x-spi.c                   |   1 -
9080  drivers/input/touchscreen/ad7877.c                 |   1 -
9081  drivers/input/touchscreen/ad7879-spi.c             |   1 -
9082  drivers/input/touchscreen/ads7846.c                |   1 -
9083  drivers/input/touchscreen/cyttsp4_spi.c            |   1 -
9084  drivers/input/touchscreen/cyttsp_spi.c             |   1 -
9085  drivers/input/touchscreen/tsc2005.c                |   1 -
9086  drivers/leds/leds-dac124s085.c                     |   1 -
9087  drivers/media/i2c/s5c73m3/s5c73m3-spi.c            |   1 -
9088  drivers/media/tuners/msi001.c                      |   1 -
9089  drivers/mfd/arizona-spi.c                          |   1 -
9090  drivers/mfd/cros_ec_spi.c                          |   1 -
9091  drivers/mfd/da9052-spi.c                           |   1 -
9092  drivers/mfd/ezx-pcap.c                             |   1 -
9093  drivers/mfd/mc13xxx-spi.c                          |   1 -
9094  drivers/mfd/stmpe-spi.c                            |   1 -
9095  drivers/mfd/tps65912-spi.c                         |   1 -
9096  drivers/mfd/wm831x-spi.c                           |   1 -
9097  drivers/misc/ad525x_dpot-spi.c                     |   1 -
9098  drivers/misc/bmp085-spi.c                          |   1 -
9099  drivers/misc/eeprom/at25.c                         |   1 -
9100  drivers/misc/eeprom/eeprom_93xx46.c                |   1 -
9101  drivers/misc/lattice-ecp3-config.c                 |   1 -
9102  drivers/misc/lis3lv02d/lis3lv02d_spi.c             |   1 -
9103  drivers/misc/ti_dac7512.c                          |   1 -
9104  drivers/mmc/host/mmc_spi.c                         |   1 -
9105  drivers/mtd/devices/m25p80.c                       |   1 -
9106  drivers/mtd/devices/mtd_dataflash.c                |   1 -
9107  drivers/mtd/devices/sst25l.c                       |   1 -
9108  drivers/net/can/spi/mcp251x.c                      |   1 -
9109  drivers/net/ethernet/micrel/ks8851.c               |   1 -
9110  drivers/net/ethernet/microchip/enc28j60.c          |   1 -
9111  drivers/net/ethernet/qualcomm/qca_spi.c            |   1 -
9112  drivers/net/ieee802154/at86rf230.c                 |   1 -
9113  drivers/net/ieee802154/cc2520.c                    |   1 -
9114  drivers/net/ieee802154/mrf24j40.c                  |   1 -
9115  drivers/net/phy/spi_ks8995.c                       |   1 -
9116  drivers/net/wireless/cw1200/cw1200_spi.c           |   1 -
9117  drivers/net/wireless/libertas/if_spi.c             |   1 -
9118  drivers/net/wireless/p54/p54spi.c                  |   1 -
9119  drivers/net/wireless/ti/wl1251/spi.c               |   1 -
9120  drivers/net/wireless/ti/wlcore/spi.c               |   1 -
9121  drivers/nfc/st-nci/spi.c                           |   1 -
9122  drivers/nfc/trf7970a.c                             |   1 -
9123  drivers/regulator/tps6524x-regulator.c             |   1 -
9124  drivers/rtc/rtc-ds1305.c                           |   1 -
9125  drivers/rtc/rtc-ds1343.c                           |   1 -
9126  drivers/rtc/rtc-ds1347.c                           |   1 -
9127  drivers/rtc/rtc-ds1390.c                           |   1 -
9128  drivers/rtc/rtc-ds3234.c                           |   1 -
9129  drivers/rtc/rtc-m41t93.c                           |   1 -
9130  drivers/rtc/rtc-m41t94.c                           |   1 -
9131  drivers/rtc/rtc-max6902.c                          |   1 -
9132  drivers/rtc/rtc-mcp795.c                           |   1 -
9133  drivers/rtc/rtc-pcf2123.c                          |   1 -
9134  drivers/rtc/rtc-r9701.c                            |   1 -
9135  drivers/rtc/rtc-rs5c348.c                          |   1 -
9136  drivers/rtc/rtc-rx4581.c                           |   1 -
9137  drivers/spi/Kconfig                                |  15 +-
9138  drivers/spi/Makefile                               |   1 +
9139  drivers/spi/spi-ath79.c                            |  11 +-
9140  drivers/spi/spi-atmel.c                            |   3 +-
9141  drivers/spi/spi-au1550.c                           |  11 +-
9142  drivers/spi/spi-bcm2835.c                          |  14 +-
9143  drivers/spi/spi-bcm2835aux.c                       | 512 +++++++++++++++++++++
9144  drivers/spi/spi-bcm53xx.c                          |  13 +-
9145  drivers/spi/spi-bcm63xx.c                          | 210 ++++++++-
9146  drivers/spi/spi-bfin-sport.c                       |   5 +-
9147  drivers/spi/spi-bfin5xx.c                          |   6 +-
9148  drivers/spi/spi-bitbang.c                          | 152 ++----
9149  drivers/spi/spi-coldfire-qspi.c                    |   3 +-
9150  drivers/spi/spi-davinci.c                          |  15 +-
9151  drivers/spi/spi-dw-mmio.c                          |   7 +-
9152  drivers/spi/spi-dw-pci.c                           |  29 +-
9153  drivers/spi/spi-dw.c                               | 108 ++---
9154  drivers/spi/spi-dw.h                               |   6 +
9155  drivers/spi/spi-fsl-dspi.c                         |   3 -
9156  drivers/spi/spi-imx.c                              |   7 +
9157  drivers/spi/spi-mpc512x-psc.c                      |   8 +-
9158  drivers/spi/spi-mt65xx.c                           | 129 ++++--
9159  drivers/spi/spi-oc-tiny.c                          |  14 +-
9160  drivers/spi/spi-octeon.c                           |   2 +-
9161  drivers/spi/spi-omap-100k.c                        |  26 +-
9162  drivers/spi/spi-omap-uwire.c                       |   7 +-
9163  drivers/spi/spi-omap2-mcspi.c                      |  28 ++
9164  drivers/spi/spi-ppc4xx.c                           |   4 +-
9165  drivers/spi/spi-pxa2xx-dma.c                       |   4 -
9166  drivers/spi/spi-pxa2xx.c                           | 257 +++++++----
9167  drivers/spi/spi-pxa2xx.h                           |   9 -
9168  drivers/spi/spi-s3c24xx.c                          |   4 +-
9169  drivers/spi/spi-s3c64xx.c                          |  46 +-
9170  drivers/spi/spi-ti-qspi.c                          |  88 +---
9171  drivers/spi/spi-tle62x0.c                          |   1 -
9172  drivers/spi/spi-txx9.c                             |   2 +-
9173  drivers/spi/spi-xilinx.c                           |  38 +-
9174  drivers/spi/spi.c                                  | 136 +++++-
9175  drivers/spi/spidev.c                               |   1 -
9176  drivers/staging/fbtft/fbtft.h                      |   1 -
9177  drivers/staging/fbtft/flexfb.c                     |   1 -
9178  drivers/staging/iio/accel/adis16201_core.c         |   1 -
9179  drivers/staging/iio/accel/adis16203_core.c         |   1 -
9180  drivers/staging/iio/accel/adis16204_core.c         |   1 -
9181  drivers/staging/iio/accel/adis16209_core.c         |   1 -
9182  drivers/staging/iio/accel/adis16220_core.c         |   1 -
9183  drivers/staging/iio/accel/adis16240_core.c         |   1 -
9184  drivers/staging/iio/accel/lis3l02dq_core.c         |   1 -
9185  drivers/staging/iio/accel/sca3000_core.c           |   1 -
9186  drivers/staging/iio/adc/ad7192.c                   |   1 -
9187  drivers/staging/iio/adc/ad7280a.c                  |   1 -
9188  drivers/staging/iio/adc/ad7606_spi.c               |   1 -
9189  drivers/staging/iio/adc/ad7780.c                   |   1 -
9190  drivers/staging/iio/adc/ad7816.c                   |   1 -
9191  drivers/staging/iio/addac/adt7316-spi.c            |   1 -
9192  drivers/staging/iio/frequency/ad9832.c             |   1 -
9193  drivers/staging/iio/frequency/ad9834.c             |   1 -
9194  drivers/staging/iio/gyro/adis16060_core.c          |   2 -
9195  drivers/staging/iio/magnetometer/hmc5843_spi.c     |   1 -
9196  drivers/staging/iio/meter/ade7753.c                |   1 -
9197  drivers/staging/iio/meter/ade7754.c                |   1 -
9198  drivers/staging/iio/meter/ade7758_core.c           |   1 -
9199  drivers/staging/iio/meter/ade7759.c                |   1 -
9200  drivers/staging/iio/meter/ade7854-spi.c            |   1 -
9201  drivers/staging/iio/resolver/ad2s1200.c            |   1 -
9202  drivers/staging/iio/resolver/ad2s1210.c            |   1 -
9203  drivers/staging/iio/resolver/ad2s90.c              |   1 -
9204  drivers/staging/mt29f_spinand/mt29f_spinand.c      |   1 -
9205  drivers/tty/serial/ifx6x60.c                       |   2 +-
9206  drivers/tty/serial/max3100.c                       |   1 -
9207  drivers/tty/serial/max310x.c                       |   1 -
9208  drivers/tty/serial/sc16is7xx.c                     |   1 -
9209  drivers/usb/host/max3421-hcd.c                     |   1 -
9210  drivers/video/backlight/ams369fg06.c               |   1 -
9211  drivers/video/backlight/corgi_lcd.c                |   1 -
9212  drivers/video/backlight/ili922x.c                  |   1 -
9213  drivers/video/backlight/l4f00242t03.c              |   1 -
9214  drivers/video/backlight/ld9040.c                   |   1 -
9215  drivers/video/backlight/lms283gf05.c               |   1 -
9216  drivers/video/backlight/lms501kf03.c               |   1 -
9217  drivers/video/backlight/ltv350qv.c                 |   1 -
9218  drivers/video/backlight/s6e63m0.c                  |   1 -
9219  drivers/video/backlight/tdo24m.c                   |   1 -
9220  drivers/video/backlight/tosa_lcd.c                 |   1 -
9221  drivers/video/backlight/vgg2432a4.c                |   1 -
9222  drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c    |   1 -
9223  drivers/video/fbdev/omap/lcd_mipid.c               |   1 -
9224  .../omap2/displays-new/panel-lgphilips-lb035q02.c  |   1 -
9225  .../omap2/displays-new/panel-nec-nl8048hl11.c      |   1 -
9226  .../omap2/displays-new/panel-sony-acx565akm.c      |   1 -
9227  .../omap2/displays-new/panel-tpo-td028ttec1.c      |   1 -
9228  .../omap2/displays-new/panel-tpo-td043mtea1.c      |   1 -
9229  include/linux/pxa2xx_ssp.h                         |   1 +
9230  include/linux/spi/spi.h                            |  44 +-
9231  include/linux/spi/spi_bitbang.h                    |   2 +-
9232  sound/soc/codecs/ad1836.c                          |   1 -
9233  sound/soc/codecs/ad193x-spi.c                      |   1 -
9234  sound/soc/codecs/adau1761-spi.c                    |   1 -
9235  sound/soc/codecs/adau1781-spi.c                    |   1 -
9236  sound/soc/codecs/adau1977-spi.c                    |   1 -
9237  sound/soc/codecs/adav801.c                         |   1 -
9238  sound/soc/codecs/ak4104.c                          |   1 -
9239  sound/soc/codecs/cs4271-spi.c                      |   1 -
9240  sound/soc/codecs/da7210.c                          |   1 -
9241  sound/soc/codecs/pcm1792a.c                        |   1 -
9242  sound/soc/codecs/pcm512x-spi.c                     |   1 -
9243  sound/soc/codecs/rt5677-spi.c                      |   1 -
9244  sound/soc/codecs/ssm2602-spi.c                     |   1 -
9245  sound/soc/codecs/tlv320aic23-spi.c                 |   1 -
9246  sound/soc/codecs/tlv320aic26.c                     |   1 -
9247  sound/soc/codecs/wm0010.c                          |   1 -
9248  sound/soc/codecs/wm8510.c                          |   1 -
9249  sound/soc/codecs/wm8711.c                          |   1 -
9250  sound/soc/codecs/wm8728.c                          |   1 -
9251  sound/soc/codecs/wm8731.c                          |   1 -
9252  sound/soc/codecs/wm8737.c                          |   1 -
9253  sound/soc/codecs/wm8741.c                          |   1 -
9254  sound/soc/codecs/wm8750.c                          |   1 -
9255  sound/soc/codecs/wm8753.c                          |   1 -
9256  sound/soc/codecs/wm8770.c                          |   1 -
9257  sound/soc/codecs/wm8776.c                          |   1 -
9258  sound/soc/codecs/wm8804-spi.c                      |   1 -
9259  sound/soc/codecs/wm8900.c                          |   1 -
9260  sound/soc/codecs/wm8983.c                          |   1 -
9261  sound/soc/codecs/wm8985.c                          |   1 -
9262  sound/soc/codecs/wm8988.c                          |   1 -
9263  sound/soc/codecs/wm8995.c                          |   1 -
9264  247 files changed, 1403 insertions(+), 916 deletions(-)
9265  create mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm2835-aux-spi.txt
9266  create mode 100644 drivers/spi/spi-bcm2835aux.c
9267 Merging tip/auto-latest (ab441fc80aa8 Merge branch 'x86/urgent')
9268 $ git merge tip/auto-latest
9269 Merge made by the 'recursive' strategy.
9270  arch/x86/kernel/cpu/intel.c | 1 +
9271  1 file changed, 1 insertion(+)
9272 Merging clockevents/clockevents/next (0e4baaa9a11b clocksource/drivers/exynos_mct: Use container_of() instead of this_cpu_ptr())
9273 $ git merge clockevents/clockevents/next
9274 Merge made by the 'recursive' strategy.
9275 Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
9276 $ git merge edac/linux_next
9277 Already up-to-date.
9278 Merging edac-amd/for-next (990995bad13c EDAC: Fix PAGES_TO_MiB macro misuse)
9279 $ git merge edac-amd/for-next
9280 Already up-to-date.
9281 Merging irqchip/irqchip/for-next (29bade08fb07 irqchip: armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN)
9282 $ git merge irqchip/irqchip/for-next
9283 Merge made by the 'recursive' strategy.
9284 Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
9285 $ git merge tiny/tiny/next
9286 Already up-to-date.
9287 Merging ftrace/for-next (43ed384339ae tracing: Put back comma for empty fields in boot string parsing)
9288 $ git merge ftrace/for-next
9289 Recorded preimage for 'kernel/trace/trace_stack.c'
9290 Auto-merging kernel/trace/trace_stack.c
9291 CONFLICT (content): Merge conflict in kernel/trace/trace_stack.c
9292 Auto-merging kernel/trace/trace_sched_wakeup.c
9293 Auto-merging kernel/trace/ftrace.c
9294 Auto-merging kernel/trace/blktrace.c
9295 Automatic merge failed; fix conflicts and then commit the result.
9296 $ git commit -v -a
9297 Recorded resolution for 'kernel/trace/trace_stack.c'.
9298 [master 58d323c7b7d5] Merge remote-tracking branch 'ftrace/for-next'
9299 $ git diff -M --stat --summary HEAD^..
9300  Documentation/trace/events.txt             |  18 +
9301  Documentation/trace/ftrace.txt             |  23 ++
9302  arch/x86/kernel/ftrace.c                   |   4 +
9303  include/linux/ftrace.h                     |  11 +
9304  include/linux/ring_buffer.h                |   4 +-
9305  include/linux/trace_events.h               |  20 +-
9306  include/linux/tracepoint.h                 |  39 ++-
9307  include/trace/define_trace.h               |   2 +-
9308  include/trace/events/gpio.h                |   4 +
9309  include/trace/perf.h                       | 258 ---------------
9310  include/trace/trace_events.h               | 258 +++++++++++++++
9311  kernel/trace/Kconfig                       |   7 +
9312  kernel/trace/blktrace.c                    |  11 +-
9313  kernel/trace/ftrace.c                      | 197 +++++------
9314  kernel/trace/ring_buffer.c                 |  20 +-
9315  kernel/trace/ring_buffer_benchmark.c       |  79 +++--
9316  kernel/trace/trace.c                       | 454 ++++++++++++++++----------
9317  kernel/trace/trace.h                       | 168 +++++++---
9318  kernel/trace/trace_benchmark.c             |   2 +-
9319  kernel/trace/trace_branch.c                |  15 +-
9320  kernel/trace/trace_events.c                | 506 +++++++++++++++++++++++++++--
9321  kernel/trace/trace_events_filter.c         |   8 +-
9322  kernel/trace/trace_export.c                |   2 +-
9323  kernel/trace/trace_functions_graph.c       |  63 ++--
9324  kernel/trace/trace_irqsoff.c               | 106 +++---
9325  kernel/trace/trace_kdb.c                   |   8 +-
9326  kernel/trace/trace_mmiotrace.c             |   4 +-
9327  kernel/trace/trace_output.c                |  97 +++---
9328  kernel/trace/trace_output.h                |   4 -
9329  kernel/trace/trace_printk.c                |  14 +-
9330  kernel/trace/trace_probe.h                 |   8 +-
9331  kernel/trace/trace_sched_wakeup.c          | 120 ++++---
9332  kernel/trace/trace_stack.c                 |  92 +++---
9333  kernel/trace/trace_syscalls.c              |   3 +-
9334  kernel/tracepoint.c                        |  61 +++-
9335  samples/trace_events/trace-events-sample.h |   6 +-
9336  scripts/recordmcount.c                     |  26 +-
9337  scripts/recordmcount.h                     |   2 +-
9338  38 files changed, 1782 insertions(+), 942 deletions(-)
9339 $ git am -3 ../patches/trace-fixup.patch
9340 Applying: Add missing 'bool preempt' argument as required by sched_switch's trace event proto
9341 $ git reset HEAD^
9342 Unstaged changes after reset:
9343 M       kernel/trace/trace_events.c
9344 $ git add -A .
9345 $ git commit -v -a --amend
9346 [master e14477cb27be] Merge remote-tracking branch 'ftrace/for-next'
9347  Date: Thu Nov 5 13:50:20 2015 +1100
9348 Merging rcu/rcu/next (39cd2dd39a8b Merge branches 'doc.2015.10.06a', 'percpu-rwsem.2015.10.06a' and 'torture.2015.10.06a' into HEAD)
9349 $ git merge rcu/rcu/next
9350 Already up-to-date.
9351 Merging kvm/linux-next (197a4f4b063e Merge tag 'kvm-arm-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
9352 $ git merge kvm/linux-next
9353 Auto-merging virt/kvm/arm/vgic.c
9354 Auto-merging include/kvm/arm_vgic.h
9355 Auto-merging drivers/vfio/Kconfig
9356 Auto-merging arch/x86/kvm/x86.c
9357 Auto-merging arch/x86/kvm/cpuid.c
9358 Auto-merging arch/s390/kvm/kvm-s390.c
9359 Auto-merging arch/s390/include/asm/kvm_host.h
9360 Auto-merging arch/powerpc/kvm/e500_mmu_host.c
9361 Auto-merging arch/powerpc/kvm/book3s_hv_rm_mmu.c
9362 Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c
9363 Auto-merging arch/powerpc/include/asm/kvm_host.h
9364 Auto-merging arch/arm64/kvm/Kconfig
9365 Auto-merging Makefile
9366 Auto-merging MAINTAINERS
9367 Auto-merging Documentation/virtual/kvm/api.txt
9368 Auto-merging Documentation/kernel-parameters.txt
9369 Merge made by the 'recursive' strategy.
9370  Documentation/kernel-parameters.txt                |   1 +
9371  Documentation/virtual/kvm/api.txt                  |  52 +-
9372  Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt | 187 ++++++
9373  Documentation/virtual/kvm/devices/arm-vgic.txt     |  18 +-
9374  Documentation/virtual/kvm/locking.txt              |  12 +
9375  MAINTAINERS                                        |   7 +
9376  Makefile                                           |  10 +-
9377  arch/arm/include/asm/kvm_arm.h                     |  20 +
9378  arch/arm/include/asm/kvm_host.h                    |   5 +-
9379  arch/arm/kvm/Kconfig                               |   2 +
9380  arch/arm/kvm/arm.c                                 |  76 ++-
9381  arch/arm/kvm/psci.c                                |  10 +-
9382  arch/arm/kvm/trace.h                               |  10 +-
9383  arch/arm64/include/asm/kvm_arm.h                   |  16 +
9384  arch/arm64/include/asm/kvm_host.h                  |   5 +-
9385  arch/arm64/kvm/Kconfig                             |   2 +
9386  arch/arm64/kvm/hyp.S                               |   8 +
9387  arch/mips/include/asm/kvm_host.h                   |   2 +
9388  arch/powerpc/include/asm/disassemble.h             |   5 +
9389  arch/powerpc/include/asm/kvm_host.h                |   2 +
9390  arch/powerpc/include/asm/reg_booke.h               |   6 +
9391  arch/powerpc/kvm/book3s_64_mmu_hv.c                |   3 +-
9392  arch/powerpc/kvm/book3s_hv_rm_mmu.c                |   2 +
9393  arch/powerpc/kvm/book3s_hv_rmhandlers.S            |  29 +-
9394  arch/powerpc/kvm/e500.c                            |   3 +-
9395  arch/powerpc/kvm/e500_emulate.c                    |  19 +
9396  arch/powerpc/kvm/e500_mmu_host.c                   |   4 +-
9397  arch/powerpc/kvm/powerpc.c                         |   3 +
9398  arch/s390/include/asm/kvm_host.h                   |   2 +
9399  arch/s390/kvm/intercept.c                          |  42 +-
9400  arch/s390/kvm/interrupt.c                          | 116 ++--
9401  arch/s390/kvm/kvm-s390.c                           |  58 +-
9402  arch/s390/kvm/kvm-s390.h                           |  35 +-
9403  arch/s390/kvm/priv.c                               |  19 +-
9404  arch/x86/include/asm/irq_remapping.h               |  10 +-
9405  arch/x86/include/asm/kvm_host.h                    |  38 +-
9406  arch/x86/include/asm/vmx.h                         |   3 +-
9407  arch/x86/include/uapi/asm/hyperv.h                 |   6 +
9408  arch/x86/include/uapi/asm/vmx.h                    |   4 +-
9409  arch/x86/kernel/kvmclock.c                         |  46 +-
9410  arch/x86/kvm/Kconfig                               |   2 +
9411  arch/x86/kvm/cpuid.c                               |   2 +-
9412  arch/x86/kvm/cpuid.h                               |  37 ++
9413  arch/x86/kvm/hyperv.c                              |  31 +-
9414  arch/x86/kvm/i8254.c                               |   4 +-
9415  arch/x86/kvm/ioapic.c                              |  29 +-
9416  arch/x86/kvm/ioapic.h                              |  15 +-
9417  arch/x86/kvm/irq.c                                 |  40 +-
9418  arch/x86/kvm/irq.h                                 |  27 +-
9419  arch/x86/kvm/irq_comm.c                            |  85 ++-
9420  arch/x86/kvm/lapic.c                               | 125 +++-
9421  arch/x86/kvm/lapic.h                               |   7 +-
9422  arch/x86/kvm/mmu.c                                 |  91 +--
9423  arch/x86/kvm/paging_tmpl.h                         |  19 +-
9424  arch/x86/kvm/svm.c                                 |  43 +-
9425  arch/x86/kvm/trace.h                               |  51 ++
9426  arch/x86/kvm/vmx.c                                 | 711 +++++++++++++++++----
9427  arch/x86/kvm/x86.c                                 | 226 +++++--
9428  drivers/iommu/irq_remapping.c                      |  12 +-
9429  drivers/vfio/Kconfig                               |   1 +
9430  drivers/vfio/pci/Kconfig                           |   1 +
9431  drivers/vfio/pci/vfio_pci_intrs.c                  |   9 +
9432  drivers/vfio/pci/vfio_pci_private.h                |   2 +
9433  include/kvm/arm_arch_timer.h                       |   4 +-
9434  include/kvm/arm_vgic.h                             |  16 +-
9435  include/linux/irqbypass.h                          |  90 +++
9436  include/linux/kvm_host.h                           |  42 +-
9437  include/linux/kvm_irqfd.h                          |  71 ++
9438  include/uapi/linux/kvm.h                           |   7 +
9439  kernel/sched/cputime.c                             |   2 +
9440  virt/Makefile                                      |   1 +
9441  virt/kvm/Kconfig                                   |   3 +
9442  virt/kvm/arm/arch_timer.c                          | 173 +++--
9443  virt/kvm/arm/trace.h                               |  63 ++
9444  virt/kvm/arm/vgic-v2.c                             |   6 +-
9445  virt/kvm/arm/vgic-v3.c                             |   6 +-
9446  virt/kvm/arm/vgic.c                                | 308 ++++-----
9447  virt/kvm/async_pf.c                                |   4 +
9448  virt/kvm/eventfd.c                                 | 187 +++---
9449  virt/kvm/irqchip.c                                 |  18 +-
9450  virt/kvm/kvm_main.c                                |  11 +-
9451  virt/lib/Kconfig                                   |   2 +
9452  virt/lib/Makefile                                  |   1 +
9453  virt/lib/irqbypass.c                               | 257 ++++++++
9454  84 files changed, 2824 insertions(+), 916 deletions(-)
9455  create mode 100644 Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt
9456  create mode 100644 include/linux/irqbypass.h
9457  create mode 100644 include/linux/kvm_irqfd.h
9458  create mode 100644 virt/Makefile
9459  create mode 100644 virt/kvm/arm/trace.h
9460  create mode 100644 virt/lib/Kconfig
9461  create mode 100644 virt/lib/Makefile
9462  create mode 100644 virt/lib/irqbypass.c
9463 Merging kvm-arm/next (26caea7693cb KVM: arm/arm64: Merge vgic_set_lr() and vgic_sync_lr_elrsr())
9464 $ git merge kvm-arm/next
9465 Already up-to-date.
9466 Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
9467 $ git merge kvm-ppc/kvm-ppc-next
9468 Already up-to-date.
9469 Merging kvm-ppc-paulus/kvm-ppc-next (70aa3961a196 KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path)
9470 $ git merge kvm-ppc-paulus/kvm-ppc-next
9471 Already up-to-date.
9472 Merging kvms390/next (46b708ea875f KVM: s390: use simple switch statement as multiplexer)
9473 $ git merge kvms390/next
9474 Already up-to-date.
9475 Merging xen-tip/linux-next (abed7d0710e8 xen: fix the check of e_pfn in xen_find_pfn_range)
9476 $ git merge xen-tip/linux-next
9477 Auto-merging drivers/net/xen-netfront.c
9478 Auto-merging drivers/block/xen-blkfront.c
9479 Auto-merging arch/x86/xen/setup.c
9480 Merge made by the 'recursive' strategy.
9481  arch/arm/include/asm/xen/hypervisor.h    |  10 +
9482  arch/arm/include/asm/xen/page-coherent.h |  26 +-
9483  arch/arm/include/asm/xen/page.h          |  22 +-
9484  arch/arm/xen/enlighten.c                 |  20 +-
9485  arch/arm/xen/mm.c                        |  39 ++-
9486  arch/arm/xen/p2m.c                       |   6 +-
9487  arch/x86/include/asm/xen/hypervisor.h    |   5 +
9488  arch/x86/include/asm/xen/page.h          |   8 +-
9489  arch/x86/xen/enlighten.c                 |  15 +
9490  arch/x86/xen/grant-table.c               |   2 +-
9491  arch/x86/xen/mmu.c                       |   1 +
9492  arch/x86/xen/p2m.c                       |  19 +-
9493  arch/x86/xen/setup.c                     |   9 +-
9494  drivers/block/xen-blkback/blkback.c      |  13 +-
9495  drivers/block/xen-blkback/common.h       |  17 +-
9496  drivers/block/xen-blkback/xenbus.c       |  11 +-
9497  drivers/block/xen-blkfront.c             | 560 ++++++++++++++++++++-----------
9498  drivers/net/xen-netback/common.h         |  16 +-
9499  drivers/net/xen-netback/netback.c        | 167 +++++----
9500  drivers/net/xen-netfront.c               | 122 +++++--
9501  drivers/tty/hvc/hvc_xen.c                |   4 +-
9502  drivers/xen/Makefile                     |   2 -
9503  drivers/xen/balloon.c                    | 341 ++++++++++++-------
9504  drivers/xen/biomerge.c                   |   8 +
9505  drivers/xen/cpu_hotplug.c                |  14 +-
9506  drivers/xen/events/events_base.c         |   2 +-
9507  drivers/xen/events/events_fifo.c         |   2 +-
9508  drivers/xen/grant-table.c                |  56 +++-
9509  drivers/xen/privcmd.c                    |  10 +-
9510  drivers/xen/swiotlb-xen.c                |  43 ++-
9511  drivers/xen/xenbus/xenbus_client.c       | 128 ++++---
9512  drivers/xen/xenbus/xenbus_probe.c        |   3 +-
9513  drivers/xen/xlate_mmu.c                  | 124 ++++---
9514  include/linux/memory_hotplug.h           |   2 +
9515  include/uapi/xen/gntalloc.h              |  22 +-
9516  include/uapi/xen/gntdev.h                |  34 +-
9517  include/xen/balloon.h                    |  12 +-
9518  include/xen/grant_table.h                |  57 ++++
9519  include/xen/page.h                       |  27 +-
9520  include/xen/xenbus.h                     |   4 +-
9521  mm/memory_hotplug.c                      |  29 +-
9522  41 files changed, 1365 insertions(+), 647 deletions(-)
9523 Merging percpu/for-next (5a928541585b kernel: Remove unneeded return from void function)
9524 $ git merge percpu/for-next
9525 Merge made by the 'recursive' strategy.
9526  include/linux/percpu-refcount.h | 2 +-
9527  1 file changed, 1 insertion(+), 1 deletion(-)
9528 Merging workqueues/for-next (4fcfc3013144 Merge branch 'for-4.4' into for-next)
9529 $ git merge workqueues/for-next
9530 Merge made by the 'recursive' strategy.
9531  kernel/workqueue.c | 26 ++++++++++++++------------
9532  1 file changed, 14 insertions(+), 12 deletions(-)
9533 Merging drivers-x86/for-next (9d1d459bf52b intel_scu_ipc: Protect dev member assignment on ->remove())
9534 $ git merge drivers-x86/for-next
9535 Auto-merging drivers/platform/x86/asus-wmi.c
9536 Auto-merging drivers/platform/x86/Kconfig
9537 Auto-merging MAINTAINERS
9538 Merge made by the 'recursive' strategy.
9539  MAINTAINERS                               |   7 ++
9540  drivers/platform/olpc/olpc-ec.c           |  13 +-
9541  drivers/platform/x86/Kconfig              |  22 +++-
9542  drivers/platform/x86/Makefile             |   1 +
9543  drivers/platform/x86/acer-wmi.c           |  92 ---------------
9544  drivers/platform/x86/asus-wmi.c           |  19 ++-
9545  drivers/platform/x86/compal-laptop.c      |  43 ++++++-
9546  drivers/platform/x86/intel_mid_powerbtn.c |  10 +-
9547  drivers/platform/x86/intel_scu_ipc.c      | 189 ++++++++++++++----------------
9548  drivers/platform/x86/sony-laptop.c        |  13 +-
9549  drivers/platform/x86/toshiba-wmi.c        | 138 ++++++++++++++++++++++
9550  drivers/platform/x86/toshiba_acpi.c       |  62 ++++------
9551  12 files changed, 357 insertions(+), 252 deletions(-)
9552  create mode 100644 drivers/platform/x86/toshiba-wmi.c
9553 Merging chrome-platform/for-next (18800fc7a04e platform/chrome: Support reading/writing the vboot context)
9554 $ git merge chrome-platform/for-next
9555 Auto-merging include/linux/sysfs.h
9556 Auto-merging fs/sysfs/group.c
9557 Merge made by the 'recursive' strategy.
9558  drivers/platform/chrome/Kconfig            |   5 +-
9559  drivers/platform/chrome/Makefile           |   3 +-
9560  drivers/platform/chrome/cros_ec_dev.c      |   7 ++
9561  drivers/platform/chrome/cros_ec_lightbar.c |  31 ++++---
9562  drivers/platform/chrome/cros_ec_lpc.c      |  21 ++---
9563  drivers/platform/chrome/cros_ec_vbc.c      | 137 +++++++++++++++++++++++++++++
9564  fs/sysfs/group.c                           |  17 +++-
9565  include/linux/mfd/cros_ec.h                |   1 +
9566  include/linux/sysfs.h                      |  18 +++-
9567  9 files changed, 205 insertions(+), 35 deletions(-)
9568  create mode 100644 drivers/platform/chrome/cros_ec_vbc.c
9569 Merging regmap/for-next (231e7cb81625 Merge remote-tracking branches 'regmap/topic/rbtree' and 'regmap/topic/update-offload' into regmap-next)
9570 $ git merge regmap/for-next
9571 Merge made by the 'recursive' strategy.
9572  arch/mips/boot/dts/brcm/bcm6328.dtsi  |  1 -
9573  arch/mips/boot/dts/brcm/bcm7125.dtsi  |  1 -
9574  arch/mips/boot/dts/brcm/bcm7346.dtsi  |  1 -
9575  arch/mips/boot/dts/brcm/bcm7358.dtsi  |  1 -
9576  arch/mips/boot/dts/brcm/bcm7360.dtsi  |  1 -
9577  arch/mips/boot/dts/brcm/bcm7362.dtsi  |  1 -
9578  arch/mips/boot/dts/brcm/bcm7420.dtsi  |  1 -
9579  arch/mips/boot/dts/brcm/bcm7425.dtsi  |  1 -
9580  arch/mips/boot/dts/brcm/bcm7435.dtsi  |  1 -
9581  drivers/base/regmap/regcache-rbtree.c |  9 +++++++--
9582  drivers/base/regmap/regmap-mmio.c     | 16 ++++++++--------
9583  11 files changed, 15 insertions(+), 19 deletions(-)
9584 Merging hsi/for-next (16bd5865cdb3 hsi: controllers:remove redundant code)
9585 $ git merge hsi/for-next
9586 Merge made by the 'recursive' strategy.
9587  drivers/hsi/clients/ssi_protocol.c      |  2 +-
9588  drivers/hsi/controllers/omap_ssi.c      | 21 ++++-----------------
9589  drivers/hsi/controllers/omap_ssi_port.c |  2 +-
9590  drivers/hsi/hsi.c                       | 13 +++++++++++--
9591  4 files changed, 17 insertions(+), 21 deletions(-)
9592 Merging leds/for-next (ffdc307d038f leds: 88pm860x: add missing of_node_put)
9593 $ git merge leds/for-next
9594 Already up-to-date.
9595 Merging ipmi/for-next (d503e2fbbfea char: ipmi: ipmi_ssif: Replace timeval with timespec64)
9596 $ git merge ipmi/for-next
9597 Merge made by the 'recursive' strategy.
9598  Documentation/IPMI.txt            |  7 +++-
9599  drivers/char/ipmi/ipmi_si_intf.c  | 82 +++++++++++++++++++++++++--------------
9600  drivers/char/ipmi/ipmi_ssif.c     |  9 +++--
9601  drivers/char/ipmi/ipmi_watchdog.c |  8 +++-
9602  4 files changed, 69 insertions(+), 37 deletions(-)
9603 Merging driver-core/driver-core-next (c23fe83138ed debugfs: Add debugfs_create_ulong())
9604 $ git merge driver-core/driver-core-next
9605 Auto-merging kernel/futex.c
9606 Auto-merging include/linux/edac.h
9607 Auto-merging drivers/net/wireless/iwlwifi/mvm/mvm.h
9608 Auto-merging drivers/net/wireless/ath/ath9k/hw.h
9609 Auto-merging drivers/net/wireless/ath/ath9k/hw.c
9610 Auto-merging drivers/net/wireless/ath/ath10k/core.h
9611 Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
9612 Auto-merging drivers/iommu/amd_iommu_types.h
9613 Auto-merging drivers/iommu/amd_iommu_init.c
9614 Auto-merging drivers/bluetooth/hci_qca.c
9615 Auto-merging drivers/base/regmap/internal.h
9616 Auto-merging drivers/base/dma-contiguous.c
9617 Auto-merging drivers/acpi/internal.h
9618 Auto-merging arch/arm64/kernel/debug-monitors.c
9619 Merge made by the 'recursive' strategy.
9620  Documentation/driver-model/platform.txt    |  14 +++
9621  Documentation/filesystems/debugfs.txt      |   2 +-
9622  arch/arm64/kernel/debug-monitors.c         |   4 +-
9623  drivers/acpi/ec_sys.c                      |   2 +-
9624  drivers/acpi/internal.h                    |   2 +-
9625  drivers/base/dma-contiguous.c              |   2 +-
9626  drivers/base/platform.c                    |  80 +++++++++++--
9627  drivers/base/regmap/internal.h             |   6 +-
9628  drivers/base/regmap/regcache-lzo.c         |   4 +-
9629  drivers/base/regmap/regcache.c             |  24 ++--
9630  drivers/base/soc.c                         |  21 +---
9631  drivers/bluetooth/hci_qca.c                |   4 +-
9632  drivers/iommu/amd_iommu_init.c             |   2 +-
9633  drivers/iommu/amd_iommu_types.h            |   2 +-
9634  drivers/misc/mei/mei_dev.h                 |   2 +-
9635  drivers/net/ethernet/chelsio/cxgb4/cxgb4.h |   4 +-
9636  drivers/net/wireless/ath/ath10k/core.h     |   2 +-
9637  drivers/net/wireless/ath/ath5k/ath5k.h     |   2 +-
9638  drivers/net/wireless/ath/ath9k/hw.c        |   2 +-
9639  drivers/net/wireless/ath/ath9k/hw.h        |   4 +-
9640  drivers/net/wireless/b43/debugfs.c         |  18 +--
9641  drivers/net/wireless/b43/debugfs.h         |   2 +-
9642  drivers/net/wireless/b43legacy/debugfs.c   |  10 +-
9643  drivers/net/wireless/b43legacy/debugfs.h   |   2 +-
9644  drivers/net/wireless/iwlegacy/common.h     |   6 +-
9645  drivers/net/wireless/iwlwifi/mvm/mvm.h     |   6 +-
9646  drivers/scsi/snic/snic_trc.c               |   4 +-
9647  drivers/scsi/snic/snic_trc.h               |   2 +-
9648  drivers/uwb/uwb-debug.c                    |   2 +-
9649  fs/debugfs/file.c                          | 177 +++++++++++++++++------------
9650  fs/sysfs/file.c                            |   4 +-
9651  include/linux/debugfs.h                    |   6 +-
9652  include/linux/edac.h                       |   2 +-
9653  include/linux/fault-inject.h               |   2 +-
9654  include/linux/kobject.h                    |   2 +-
9655  include/linux/platform_device.h            |   8 ++
9656  kernel/futex.c                             |   4 +-
9657  lib/devres.c                               |   2 +-
9658  lib/dma-debug.c                            |   2 +-
9659  lib/kobject.c                              |  12 +-
9660  mm/failslab.c                              |   8 +-
9661  mm/page_alloc.c                            |   8 +-
9662  sound/soc/codecs/wm_adsp.h                 |   2 +-
9663  43 files changed, 291 insertions(+), 185 deletions(-)
9664 Merging tty/tty-next (e052c6d15c61 tty: Use unbound workqueue for all input workers)
9665 $ git merge tty/tty-next
9666 Auto-merging include/linux/platform_data/atmel.h
9667 Auto-merging drivers/tty/serial/sc16is7xx.c
9668 Auto-merging drivers/tty/serial/8250/8250_dma.c
9669 Auto-merging Documentation/kernel-parameters.txt
9670 Merge made by the 'recursive' strategy.
9671  .../devicetree/bindings/serial/ingenic,uart.txt    |    3 +-
9672  .../devicetree/bindings/serial/qcom,msm-uartdm.txt |    6 +
9673  .../bindings/serial/renesas,sci-serial.txt         |    2 +
9674  .../bindings/serial/snps-dw-apb-uart.txt           |    3 +
9675  Documentation/kernel-parameters.txt                |    7 +
9676  Documentation/serial/driver                        |   10 +-
9677  Documentation/serial/tty.txt                       |   60 +-
9678  arch/arm64/include/asm/dcc.h                       |   55 +
9679  drivers/char/pcmcia/synclink_cs.c                  |    9 -
9680  drivers/dma/hsu/Kconfig                            |    9 +-
9681  drivers/dma/hsu/hsu.c                              |   24 +-
9682  drivers/dma/hsu/hsu.h                              |    1 +
9683  drivers/dma/hsu/pci.c                              |    2 +-
9684  drivers/isdn/i4l/isdn_tty.c                        |    2 +-
9685  drivers/tty/cyclades.c                             |    9 -
9686  drivers/tty/hvc/Kconfig                            |    2 +-
9687  drivers/tty/hvc/hvc_console.c                      |   20 +-
9688  drivers/tty/hvc/hvc_dcc.c                          |   15 +-
9689  drivers/tty/hvc/hvcs.c                             |    2 +-
9690  drivers/tty/mips_ejtag_fdc.c                       |   39 +-
9691  drivers/tty/n_r3964.c                              |   28 +-
9692  drivers/tty/n_tty.c                                |   32 +-
9693  drivers/tty/pty.c                                  |    7 +-
9694  drivers/tty/rocket.c                               |   13 -
9695  drivers/tty/serial/68328serial.c                   |    5 +-
9696  drivers/tty/serial/8250/8250_core.c                |   26 +-
9697  drivers/tty/serial/8250/8250_dma.c                 |    6 -
9698  drivers/tty/serial/8250/8250_dw.c                  |  288 ++--
9699  drivers/tty/serial/8250/8250_early.c               |    4 +
9700  drivers/tty/serial/8250/8250_ingenic.c             |   88 +-
9701  drivers/tty/serial/8250/8250_mid.c                 |  326 +++++
9702  drivers/tty/serial/8250/8250_omap.c                |    8 +-
9703  drivers/tty/serial/8250/8250_pci.c                 |  229 +--
9704  drivers/tty/serial/8250/8250_port.c                |   86 +-
9705  drivers/tty/serial/8250/Kconfig                    |   25 +-
9706  drivers/tty/serial/8250/Makefile                   |    1 +
9707  drivers/tty/serial/Kconfig                         |   12 +-
9708  drivers/tty/serial/altera_uart.c                   |   26 +-
9709  drivers/tty/serial/amba-pl011.c                    |    4 +-
9710  drivers/tty/serial/apbuart.c                       |    1 +
9711  drivers/tty/serial/atmel_serial.c                  |   27 +-
9712  drivers/tty/serial/clps711x.c                      |    2 +-
9713  drivers/tty/serial/cpm_uart/cpm_uart_core.c        |    1 +
9714  drivers/tty/serial/crisv10.c                       |   34 +-
9715  drivers/tty/serial/fsl_lpuart.c                    |   39 +
9716  drivers/tty/serial/imx.c                           |  175 ++-
9717  drivers/tty/serial/lpc32xx_hs.c                    |    7 +-
9718  drivers/tty/serial/men_z135_uart.c                 |   23 +-
9719  drivers/tty/serial/mpc52xx_uart.c                  |    7 +
9720  drivers/tty/serial/mpsc.c                          |   41 +-
9721  drivers/tty/serial/msm_serial.c                    |  622 ++++++++-
9722  drivers/tty/serial/msm_serial.h                    |   53 +-
9723  drivers/tty/serial/mxs-auart.c                     |    2 +-
9724  drivers/tty/serial/of_serial.c                     |   10 +
9725  drivers/tty/serial/omap-serial.c                   |    2 +
9726  drivers/tty/serial/samsung.c                       |   66 +-
9727  drivers/tty/serial/sc16is7xx.c                     |    7 +-
9728  drivers/tty/serial/serial-tegra.c                  |   94 +-
9729  drivers/tty/serial/serial_core.c                   |    9 +-
9730  drivers/tty/serial/serial_mctrl_gpio.c             |  133 +-
9731  drivers/tty/serial/serial_mctrl_gpio.h             |   40 +-
9732  drivers/tty/serial/sh-sci.c                        | 1460 ++++++++++----------
9733  drivers/tty/serial/sh-sci.h                        |   49 +-
9734  drivers/tty/serial/sprd_serial.c                   |    1 +
9735  drivers/tty/serial/st-asc.c                        |    2 +-
9736  drivers/tty/serial/stm32-usart.c                   |    3 +-
9737  drivers/tty/synclink.c                             |   20 +-
9738  drivers/tty/synclink_gt.c                          |   14 +-
9739  drivers/tty/synclinkmp.c                           |   14 +-
9740  drivers/tty/sysrq.c                                |    6 +-
9741  drivers/tty/tty_buffer.c                           |   12 +-
9742  drivers/tty/tty_io.c                               |   59 +-
9743  drivers/tty/tty_ldisc.c                            |    2 +-
9744  drivers/tty/tty_port.c                             |   28 +-
9745  drivers/usb/gadget/function/u_serial.c             |    6 +-
9746  include/linux/dma/hsu.h                            |   11 +-
9747  include/linux/n_r3964.h                            |    8 +-
9748  include/linux/platform_data/atmel.h                |    6 -
9749  include/linux/platform_data/dma-hsu.h              |    4 -
9750  include/linux/tty.h                                |   48 +-
9751  net/irda/ircomm/ircomm_tty.c                       |   31 +-
9752  81 files changed, 2733 insertions(+), 1940 deletions(-)
9753  create mode 100644 arch/arm64/include/asm/dcc.h
9754  create mode 100644 drivers/tty/serial/8250/8250_mid.c
9755 Merging usb/usb-next (0bbc367e21bf Merge 4.3-rc7 into usb-next)
9756 $ git merge usb/usb-next
9757 Auto-merging include/linux/platform_data/atmel.h
9758 Removing drivers/usb/host/fusbh200.h
9759 Removing drivers/usb/host/fusbh200-hcd.c
9760 Auto-merging drivers/usb/gadget/function/u_serial.c
9761 Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
9762 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
9763 Auto-merging arch/arm/mach-s3c64xx/mach-smartq.c
9764 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
9765 Auto-merging MAINTAINERS
9766 Auto-merging Documentation/devicetree/bindings/usb/dwc3.txt
9767 Merge made by the 'recursive' strategy.
9768  Documentation/ABI/testing/sysfs-bus-usb            |   20 +
9769  .../bindings/phy/brcm,cygnus-pcie-phy.txt          |   47 +
9770  .../devicetree/bindings/phy/phy-mt65xx-usb.txt     |   68 +
9771  .../devicetree/bindings/phy/samsung-phy.txt        |    3 +
9772  .../devicetree/bindings/usb/ci-hdrc-usb2.txt       |   27 +-
9773  Documentation/devicetree/bindings/usb/dwc3.txt     |    5 +
9774  Documentation/usb/authorization.txt                |   31 +
9775  MAINTAINERS                                        |    7 +
9776  arch/arm/mach-s3c64xx/mach-crag6410.c              |    4 +-
9777  arch/arm/mach-s3c64xx/mach-smartq.c                |    4 +-
9778  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    4 +-
9779  arch/arm/plat-samsung/devs.c                       |    6 +-
9780  drivers/phy/Kconfig                                |   18 +
9781  drivers/phy/Makefile                               |    2 +
9782  drivers/phy/phy-bcm-cygnus-pcie.c                  |  213 +
9783  drivers/phy/phy-mt65xx-usb3.c                      |  506 ++
9784  drivers/phy/phy-samsung-usb2.c                     |   25 +-
9785  drivers/phy/phy-samsung-usb2.h                     |    2 +
9786  drivers/phy/phy-sun4i-usb.c                        |   22 +-
9787  drivers/usb/Makefile                               |    1 -
9788  drivers/usb/chipidea/Kconfig                       |    1 +
9789  drivers/usb/chipidea/ci_hdrc_imx.c                 |   11 +
9790  drivers/usb/chipidea/ci_hdrc_pci.c                 |    6 +-
9791  drivers/usb/chipidea/core.c                        |  136 +-
9792  drivers/usb/chipidea/otg.c                         |   48 +-
9793  drivers/usb/chipidea/usbmisc_imx.c                 |   66 +
9794  drivers/usb/common/common.c                        |   59 +-
9795  drivers/usb/core/config.c                          |    4 +
9796  drivers/usb/core/driver.c                          |   14 +-
9797  drivers/usb/core/hcd.c                             |  110 +-
9798  drivers/usb/core/hub.c                             |   87 +-
9799  drivers/usb/core/message.c                         |   41 +-
9800  drivers/usb/core/sysfs.c                           |   36 +
9801  drivers/usb/core/urb.c                             |    3 +-
9802  drivers/usb/core/usb.c                             |    2 +-
9803  drivers/usb/core/usb.h                             |    2 +
9804  drivers/usb/dwc2/core.c                            |  478 +-
9805  drivers/usb/dwc2/core.h                            |  107 +-
9806  drivers/usb/dwc2/core_intr.c                       |  106 +-
9807  drivers/usb/dwc2/debugfs.c                         |   72 +-
9808  drivers/usb/dwc2/gadget.c                          | 1422 +++--
9809  drivers/usb/dwc2/hcd.c                             |  346 +-
9810  drivers/usb/dwc2/hcd.h                             |   15 +-
9811  drivers/usb/dwc2/hcd_ddma.c                        |   10 +-
9812  drivers/usb/dwc2/hcd_intr.c                        |  152 +-
9813  drivers/usb/dwc2/hcd_queue.c                       |   21 +-
9814  drivers/usb/dwc2/hw.h                              |    1 +
9815  drivers/usb/dwc2/platform.c                        |  236 +-
9816  drivers/usb/dwc3/core.c                            |  104 +-
9817  drivers/usb/dwc3/core.h                            |   27 +
9818  drivers/usb/dwc3/dwc3-pci.c                        |   39 +-
9819  drivers/usb/dwc3/dwc3-st.c                         |   12 +-
9820  drivers/usb/dwc3/gadget.c                          |  100 +-
9821  drivers/usb/dwc3/platform_data.h                   |    3 +
9822  drivers/usb/gadget/Kconfig                         |    2 +-
9823  drivers/usb/gadget/composite.c                     |    6 +-
9824  drivers/usb/gadget/epautoconf.c                    |   25 +-
9825  drivers/usb/gadget/function/f_acm.c                |   23 +-
9826  drivers/usb/gadget/function/f_ecm.c                |   31 +-
9827  drivers/usb/gadget/function/f_eem.c                |   16 +-
9828  drivers/usb/gadget/function/f_hid.c                |   12 +-
9829  drivers/usb/gadget/function/f_loopback.c           |  162 +-
9830  drivers/usb/gadget/function/f_mass_storage.c       |   10 +-
9831  drivers/usb/gadget/function/f_midi.c               |   26 +-
9832  drivers/usb/gadget/function/f_ncm.c                |   29 +-
9833  drivers/usb/gadget/function/f_obex.c               |   10 +-
9834  drivers/usb/gadget/function/f_phonet.c             |    8 +-
9835  drivers/usb/gadget/function/f_printer.c            |    2 -
9836  drivers/usb/gadget/function/f_rndis.c              |   24 +-
9837  drivers/usb/gadget/function/f_serial.c             |   10 +-
9838  drivers/usb/gadget/function/f_sourcesink.c         |  167 +-
9839  drivers/usb/gadget/function/f_subset.c             |   10 +-
9840  drivers/usb/gadget/function/f_uac1.c               |    4 -
9841  drivers/usb/gadget/function/f_uac2.c               |   11 -
9842  drivers/usb/gadget/function/f_uvc.c                |   42 +-
9843  drivers/usb/gadget/function/u_ether.c              |   11 +-
9844  drivers/usb/gadget/function/u_serial.c             |    5 -
9845  drivers/usb/gadget/legacy/dbgp.c                   |   18 +-
9846  drivers/usb/gadget/legacy/tcm_usb_gadget.c         |   18 -
9847  drivers/usb/gadget/udc/Kconfig                     |    2 +-
9848  drivers/usb/gadget/udc/amd5536udc.c                |  609 +-
9849  drivers/usb/gadget/udc/amd5536udc.h                |    5 +-
9850  drivers/usb/gadget/udc/at91_udc.h                  |    8 +
9851  drivers/usb/gadget/udc/dummy_hcd.c                 |    6 +-
9852  drivers/usb/gadget/udc/net2280.c                   |    2 +-
9853  drivers/usb/gadget/udc/pch_udc.c                   |   10 +-
9854  drivers/usb/host/Kconfig                           |   10 -
9855  drivers/usb/host/Makefile                          |    6 +-
9856  drivers/usb/host/ehci-msm.c                        |    6 +-
9857  drivers/usb/host/ehci-orion.c                      |    3 +-
9858  drivers/usb/host/ehci-platform.c                   |   12 +-
9859  drivers/usb/host/ehci-spear.c                      |    1 +
9860  drivers/usb/host/fotg210-hcd.c                     | 1960 +++----
9861  drivers/usb/host/fotg210.h                         |   36 +-
9862  drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
9863  drivers/usb/host/fusbh200-hcd.c                    | 5894 --------------------
9864  drivers/usb/host/fusbh200.h                        |  675 ---
9865  drivers/usb/host/ohci-nxp.c                        |   18 +-
9866  drivers/usb/host/ohci-spear.c                      |    1 +
9867  drivers/usb/host/u132-hcd.c                        |    3 +-
9868  drivers/usb/host/uhci-platform.c                   |    1 +
9869  drivers/usb/host/whci/init.c                       |    3 +-
9870  drivers/usb/host/xhci-dbg.c                        |   17 +-
9871  drivers/usb/host/xhci-hub.c                        |  185 +-
9872  drivers/usb/host/xhci-mem.c                        |   50 +-
9873  drivers/usb/host/xhci-pci.c                        |    6 +-
9874  drivers/usb/host/xhci-plat.c                       |   29 +-
9875  drivers/usb/host/xhci-ring.c                       |  122 +-
9876  drivers/usb/host/xhci.c                            |   27 +-
9877  drivers/usb/host/xhci.h                            |   72 +-
9878  drivers/usb/misc/usb3503.c                         |    2 +-
9879  drivers/usb/misc/usbtest.c                         |  156 +-
9880  drivers/usb/musb/musb_core.c                       |   29 +-
9881  drivers/usb/musb/musb_core.h                       |    2 +-
9882  drivers/usb/musb/musb_dsps.c                       |   15 +-
9883  drivers/usb/musb/sunxi.c                           |   14 +-
9884  drivers/usb/phy/phy-msm-usb.c                      |    2 +-
9885  drivers/usb/phy/phy-qcom-8x16-usb.c                |   21 +-
9886  drivers/usb/phy/phy-tegra-usb.c                    |    2 +-
9887  drivers/usb/serial/io_ti.c                         |  530 +-
9888  drivers/usb/serial/option.c                        |   64 +-
9889  drivers/usb/serial/qcserial.c                      |   15 +
9890  drivers/usb/serial/usb-wwan.h                      |    2 +-
9891  drivers/usb/serial/usb_wwan.c                      |   42 +-
9892  drivers/usb/storage/isd200.c                       |   30 +-
9893  drivers/usb/storage/uas.c                          |   16 +-
9894  drivers/usb/usbip/vhci_hcd.c                       |    8 +-
9895  drivers/uwb/drp.c                                  |    4 +-
9896  drivers/uwb/neh.c                                  |    4 +-
9897  drivers/uwb/rsv.c                                  |    9 +-
9898  include/linux/platform_data/atmel.h                |    9 -
9899  include/linux/platform_data/s3c-hsotg.h            |   10 +-
9900  include/linux/usb.h                                |    4 +
9901  include/linux/usb/ch9.h                            |   11 +-
9902  include/linux/usb/chipidea.h                       |   24 +
9903  include/linux/usb/gadget.h                         |   29 +-
9904  include/linux/usb/hcd.h                            |   26 +-
9905  include/linux/usb/musb.h                           |    2 +-
9906  include/linux/usb/of.h                             |   12 -
9907  include/linux/usb/otg.h                            |    9 +
9908  include/linux/usb/phy.h                            |    8 +-
9909  include/uapi/linux/usb/ch9.h                       |   29 +
9910  tools/usb/testusb.c                                |   10 +-
9911  tools/usb/usbip/src/usbip_detach.c                 |    4 +-
9912  144 files changed, 5964 insertions(+), 10544 deletions(-)
9913  create mode 100644 Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt
9914  create mode 100644 Documentation/devicetree/bindings/phy/phy-mt65xx-usb.txt
9915  create mode 100644 drivers/phy/phy-bcm-cygnus-pcie.c
9916  create mode 100644 drivers/phy/phy-mt65xx-usb3.c
9917  delete mode 100644 drivers/usb/host/fusbh200-hcd.c
9918  delete mode 100644 drivers/usb/host/fusbh200.h
9919 Merging usb-gadget/next (81e9d14a53eb usb: gadget: net2280: restore ep_cfg after defect7374 workaround)
9920 $ git merge usb-gadget/next
9921 Already up-to-date.
9922 Merging usb-serial/usb-next (92944c4520ed USB: qcserial: update comment for Sierra Wireless MC7304/MC7354)
9923 $ git merge usb-serial/usb-next
9924 Already up-to-date.
9925 Merging usb-chipidea-next/ci-for-usb-next (2fb2884ed856 usb: chipidea: delete static debug support)
9926 $ git merge usb-chipidea-next/ci-for-usb-next
9927 Auto-merging drivers/usb/chipidea/udc.c
9928 Removing drivers/usb/chipidea/debug.h
9929 Auto-merging drivers/usb/chipidea/debug.c
9930 Merge made by the 'recursive' strategy.
9931  drivers/usb/chipidea/Kconfig  |  5 -----
9932  drivers/usb/chipidea/Makefile |  5 +----
9933  drivers/usb/chipidea/ci.h     |  3 +++
9934  drivers/usb/chipidea/core.c   |  1 -
9935  drivers/usb/chipidea/debug.c  |  1 -
9936  drivers/usb/chipidea/debug.h  | 30 ------------------------------
9937  drivers/usb/chipidea/udc.c    | 28 ++++++++++++++++++++--------
9938  7 files changed, 24 insertions(+), 49 deletions(-)
9939  delete mode 100644 drivers/usb/chipidea/debug.h
9940 Merging staging/staging-next (e3cc3136df33 Staging: rtl8192u: ieee80211: added missing blank lines)
9941 $ git merge staging/staging-next
9942 Resolved 'drivers/iio/adc/max1027.c' using previous resolution.
9943 Resolved 'drivers/iio/adc/mcp320x.c' using previous resolution.
9944 Resolved 'drivers/iio/adc/ti-adc128s052.c' using previous resolution.
9945 Resolved 'drivers/iio/dac/ad7303.c' using previous resolution.
9946 Resolved 'drivers/iio/frequency/adf4350.c' using previous resolution.
9947 Resolved 'drivers/iio/proximity/as3935.c' using previous resolution.
9948 Resolved 'drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h' using previous resolution.
9949 Resolved 'drivers/staging/mt29f_spinand/mt29f_spinand.c' using previous resolution.
9950 Auto-merging include/linux/fb.h
9951 Removing drivers/staging/wlan-ng/p80211meta.h
9952 Removing drivers/staging/wilc1000/wilc_platform.h
9953 Removing drivers/staging/wilc1000/wilc_oswrapper.h
9954 Removing drivers/staging/wilc1000/wilc_memory.h
9955 Removing drivers/staging/wilc1000/wilc_memory.c
9956 Removing drivers/staging/wilc1000/wilc_exported_buf.c
9957 Removing drivers/staging/wilc1000/wilc_errorsupport.h
9958 Removing drivers/staging/sm750fb/sm750_hw.h
9959 Auto-merging drivers/staging/rdma/ipath/ipath_verbs.c
9960 Auto-merging drivers/staging/rdma/ipath/ipath_ud.c
9961 Auto-merging drivers/staging/rdma/ipath/ipath_ruc.c
9962 Auto-merging drivers/staging/rdma/hfi1/verbs.h
9963 Auto-merging drivers/staging/rdma/hfi1/verbs.c
9964 Auto-merging drivers/staging/rdma/hfi1/ruc.c
9965 Auto-merging drivers/staging/rdma/hfi1/rc.c
9966 Auto-merging drivers/staging/rdma/hfi1/mr.c
9967 Auto-merging drivers/staging/rdma/amso1100/c2_qp.c
9968 Removing drivers/staging/octeon/ethernet-xaui.c
9969 Auto-merging drivers/staging/mt29f_spinand/mt29f_spinand.c
9970 CONFLICT (content): Merge conflict in drivers/staging/mt29f_spinand/mt29f_spinand.c
9971 Auto-merging drivers/staging/media/omap4iss/iss_video.c
9972 Auto-merging drivers/staging/media/omap4iss/iss.c
9973 Auto-merging drivers/staging/media/lirc/lirc_sasem.c
9974 Removing drivers/staging/lustre/lustre/obdclass/dt_object.c
9975 Removing drivers/staging/lustre/lustre/obdclass/capa.c
9976 Removing drivers/staging/lustre/lustre/llite/llite_capa.c
9977 Auto-merging drivers/staging/lustre/lustre/llite/file.c
9978 Removing drivers/staging/lustre/lustre/libcfs/nidstrings.c
9979 Removing drivers/staging/lustre/lustre/include/obd_cache.h
9980 Removing drivers/staging/lustre/lustre/include/lustre_capa.h
9981 Removing drivers/staging/lustre/lustre/include/lustre/lustre_lfsck_user.h
9982 Removing drivers/staging/lustre/lustre/include/lustre/libiam.h
9983 Removing drivers/staging/lustre/lustre/include/dt_object.h
9984 Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
9985 Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
9986 CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
9987 Auto-merging drivers/staging/iio/resolver/ad2s90.c
9988 Auto-merging drivers/staging/iio/resolver/ad2s1210.c
9989 Auto-merging drivers/staging/iio/meter/ade7854-spi.c
9990 Auto-merging drivers/staging/iio/meter/ade7759.c
9991 Auto-merging drivers/staging/iio/meter/ade7758_core.c
9992 Auto-merging drivers/staging/iio/meter/ade7754.c
9993 Auto-merging drivers/staging/iio/meter/ade7753.c
9994 Auto-merging drivers/staging/iio/magnetometer/hmc5843_spi.c
9995 Auto-merging drivers/staging/iio/gyro/adis16060_core.c
9996 Auto-merging drivers/staging/iio/frequency/ad9834.c
9997 Auto-merging drivers/staging/iio/adc/ad7816.c
9998 Auto-merging drivers/staging/iio/adc/ad7780.c
9999 Auto-merging drivers/staging/iio/adc/ad7606_spi.c
10000 Auto-merging drivers/staging/iio/adc/ad7280a.c
10001 Auto-merging drivers/staging/iio/adc/ad7192.c
10002 Auto-merging drivers/staging/iio/accel/sca3000_core.c
10003 Auto-merging drivers/staging/iio/accel/lis3l02dq_core.c
10004 Removing drivers/staging/ft1000/ft1000.h
10005 Removing drivers/staging/ft1000/ft1000-usb/ft3000.img
10006 Removing drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
10007 Removing drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
10008 Removing drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h
10009 Removing drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
10010 Removing drivers/staging/ft1000/ft1000-usb/ft1000_download.c
10011 Removing drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
10012 Removing drivers/staging/ft1000/ft1000-usb/Makefile
10013 Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
10014 Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
10015 Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
10016 Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000.img
10017 Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
10018 Removing drivers/staging/ft1000/ft1000-pcmcia/boot.h
10019 Removing drivers/staging/ft1000/ft1000-pcmcia/Makefile
10020 Removing drivers/staging/ft1000/TODO
10021 Removing drivers/staging/ft1000/Makefile
10022 Removing drivers/staging/ft1000/Kconfig
10023 Auto-merging drivers/staging/fbtft/flexfb.c
10024 Auto-merging drivers/staging/fbtft/fbtft.h
10025 Removing drivers/staging/comedi/drivers/unioxx5.c
10026 Auto-merging drivers/iio/proximity/as3935.c
10027 CONFLICT (content): Merge conflict in drivers/iio/proximity/as3935.c
10028 Auto-merging drivers/iio/gyro/bmg160_core.c
10029 Auto-merging drivers/iio/frequency/adf4350.c
10030 CONFLICT (content): Merge conflict in drivers/iio/frequency/adf4350.c
10031 Auto-merging drivers/iio/dac/ad7303.c
10032 CONFLICT (content): Merge conflict in drivers/iio/dac/ad7303.c
10033 Auto-merging drivers/iio/dac/ad5504.c
10034 Auto-merging drivers/iio/buffer/industrialio-buffer-cb.c
10035 Auto-merging drivers/iio/amplifiers/ad8366.c
10036 Auto-merging drivers/iio/adc/ti-adc128s052.c
10037 CONFLICT (content): Merge conflict in drivers/iio/adc/ti-adc128s052.c
10038 Auto-merging drivers/iio/adc/mcp320x.c
10039 CONFLICT (content): Merge conflict in drivers/iio/adc/mcp320x.c
10040 Auto-merging drivers/iio/adc/max1027.c
10041 CONFLICT (content): Merge conflict in drivers/iio/adc/max1027.c
10042 Auto-merging drivers/iio/accel/bmc150-accel-core.c
10043 Auto-merging MAINTAINERS
10044 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
10045 Automatic merge failed; fix conflicts and then commit the result.
10046 $ git commit -v -a
10047 [master 25912ee10d64] Merge remote-tracking branch 'staging/staging-next'
10048 $ git diff -M --stat --summary HEAD^..
10049  Documentation/ABI/testing/sysfs-bus-iio            |   32 +
10050  Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435 |   43 +
10051  .../ABI/testing/sysfs-bus-iio-chemical-vz89x       |    7 +
10052  .../ABI/testing/sysfs-bus-iio-humidity-hdc100x     |    9 +
10053  Documentation/ABI/testing/sysfs-bus-iio-meas-spec  |    8 +
10054  .../ABI/testing/sysfs-bus-iio-trigger-sysfs        |   22 +
10055  Documentation/DocBook/iio.tmpl                     |    2 +-
10056  .../devicetree/bindings/i2c/trivial-devices.txt    |    3 +-
10057  .../devicetree/bindings/iio/accel/mma8452.txt      |   24 +
10058  .../devicetree/bindings/iio/adc/hi8435.txt         |   21 +
10059  .../devicetree/bindings/iio/light/apds9960.txt     |   22 +
10060  .../devicetree/bindings/iio/light/us5182d.txt      |   34 +
10061  .../devicetree/bindings/vendor-prefixes.txt        |    4 +
10062  MAINTAINERS                                        |   19 +-
10063  drivers/iio/Kconfig                                |   30 +-
10064  drivers/iio/Makefile                               |    7 +-
10065  drivers/iio/accel/Kconfig                          |   33 +-
10066  drivers/iio/accel/Makefile                         |    6 +-
10067  .../accel/{bmc150-accel.c => bmc150-accel-core.c}  |  407 +-
10068  drivers/iio/accel/bmc150-accel-i2c.c               |  102 +
10069  drivers/iio/accel/bmc150-accel-spi.c               |   91 +
10070  drivers/iio/accel/bmc150-accel.h                   |   20 +
10071  drivers/iio/accel/kxcjk-1013.c                     |   34 +-
10072  drivers/iio/accel/mma8452.c                        |  356 +-
10073  drivers/iio/accel/mma9553.c                        |   29 -
10074  drivers/iio/accel/mxc4005.c                        |  567 ++
10075  drivers/iio/accel/st_accel_core.c                  |    1 +
10076  drivers/iio/accel/stk8312.c                        |   30 +-
10077  drivers/iio/accel/stk8ba50.c                       |   30 +-
10078  drivers/iio/adc/Kconfig                            |   35 +-
10079  drivers/iio/adc/Makefile                           |    3 +-
10080  drivers/iio/adc/ad799x.c                           |    1 -
10081  drivers/iio/adc/berlin2-adc.c                      |   91 +-
10082  drivers/iio/adc/hi8435.c                           |  534 ++
10083  drivers/iio/adc/max1027.c                          |    1 +
10084  drivers/iio/adc/max1363.c                          |    1 -
10085  drivers/iio/adc/mcp320x.c                          |    1 +
10086  drivers/iio/adc/ti-adc128s052.c                    |    8 +
10087  drivers/iio/adc/twl6030-gpadc.c                    |    1 +
10088  drivers/iio/adc/vf610_adc.c                        |  101 +-
10089  drivers/iio/adc/xilinx-xadc-core.c                 |   37 +-
10090  drivers/iio/adc/xilinx-xadc.h                      |    2 -
10091  drivers/iio/amplifiers/ad8366.c                    |    1 +
10092  drivers/iio/buffer/Kconfig                         |   24 +
10093  drivers/iio/buffer/Makefile                        |    8 +
10094  .../industrialio-buffer-cb.c}                      |   12 +
10095  .../{ => buffer}/industrialio-triggered-buffer.c   |    0
10096  drivers/iio/{ => buffer}/kfifo_buf.c               |    0
10097  drivers/iio/chemical/Kconfig                       |   15 +
10098  drivers/iio/chemical/Makefile                      |    6 +
10099  drivers/iio/chemical/vz89x.c                       |  256 +
10100  drivers/iio/common/Kconfig                         |    1 +
10101  drivers/iio/common/Makefile                        |    1 +
10102  drivers/iio/common/ms_sensors/Kconfig              |    6 +
10103  drivers/iio/common/ms_sensors/Makefile             |    5 +
10104  drivers/iio/common/ms_sensors/ms_sensors_i2c.c     |  652 ++
10105  drivers/iio/common/ms_sensors/ms_sensors_i2c.h     |   66 +
10106  drivers/iio/common/st_sensors/st_sensors_core.c    |   22 +
10107  drivers/iio/dac/ad5504.c                           |    1 -
10108  drivers/iio/dac/ad7303.c                           |    7 +
10109  drivers/iio/dac/m62332.c                           |   63 +-
10110  drivers/iio/dac/max5821.c                          |    1 +
10111  drivers/iio/frequency/adf4350.c                    |    9 +
10112  drivers/iio/gyro/Kconfig                           |   19 +-
10113  drivers/iio/gyro/Makefile                          |    4 +-
10114  drivers/iio/gyro/bmg160.h                          |   10 +
10115  drivers/iio/gyro/{bmg160.c => bmg160_core.c}       |  361 +-
10116  drivers/iio/gyro/bmg160_i2c.c                      |   71 +
10117  drivers/iio/gyro/bmg160_spi.c                      |   57 +
10118  drivers/iio/gyro/st_gyro_core.c                    |    1 +
10119  drivers/iio/humidity/Kconfig                       |   23 +
10120  drivers/iio/humidity/Makefile                      |    2 +
10121  drivers/iio/humidity/hdc100x.c                     |  320 +
10122  drivers/iio/humidity/htu21.c                       |  253 +
10123  drivers/iio/humidity/si7020.c                      |    6 +-
10124  drivers/iio/imu/kmx61.c                            |   28 -
10125  drivers/iio/industrialio-core.c                    |   10 +-
10126  drivers/iio/industrialio-trigger.c                 |   12 +-
10127  drivers/iio/industrialio-triggered-event.c         |   68 +
10128  drivers/iio/light/Kconfig                          |   23 +
10129  drivers/iio/light/Makefile                         |    2 +
10130  drivers/iio/light/apds9960.c                       | 1130 +++
10131  drivers/iio/light/opt3001.c                        |    1 -
10132  drivers/iio/light/stk3310.c                        |   98 +-
10133  drivers/iio/light/tsl4531.c                        |    9 +-
10134  drivers/iio/light/us5182d.c                        |  507 ++
10135  drivers/iio/magnetometer/Kconfig                   |   33 +-
10136  drivers/iio/magnetometer/Makefile                  |    3 +-
10137  drivers/iio/magnetometer/bmc150_magn.c             |   29 -
10138  drivers/iio/magnetometer/st_magn_core.c            |    1 +
10139  drivers/iio/potentiometer/Kconfig                  |   20 +
10140  drivers/iio/potentiometer/Makefile                 |    6 +
10141  drivers/iio/potentiometer/mcp4531.c                |  231 +
10142  drivers/iio/pressure/Kconfig                       |   13 +
10143  drivers/iio/pressure/Makefile                      |    1 +
10144  drivers/iio/pressure/ms5637.c                      |  190 +
10145  drivers/iio/pressure/st_pressure_core.c            |    1 +
10146  drivers/iio/proximity/Kconfig                      |   12 +
10147  drivers/iio/proximity/Makefile                     |    1 +
10148  drivers/iio/proximity/as3935.c                     |    7 +
10149  drivers/iio/proximity/pulsedlight-lidar-lite-v2.c  |  289 +
10150  drivers/iio/proximity/sx9500.c                     |    9 -
10151  drivers/iio/temperature/Kconfig                    |   22 +
10152  drivers/iio/temperature/Makefile                   |    2 +
10153  drivers/iio/temperature/mlx90614.c                 |   92 +-
10154  drivers/iio/temperature/tsys01.c                   |  230 +
10155  drivers/iio/temperature/tsys02d.c                  |  191 +
10156  drivers/staging/Kconfig                            |    2 -
10157  drivers/staging/Makefile                           |    1 -
10158  drivers/staging/android/Kconfig                    |    2 +-
10159  drivers/staging/android/ashmem.c                   |   44 +-
10160  drivers/staging/android/ion/compat_ion.h           |    1 -
10161  drivers/staging/android/ion/ion.c                  |   49 +-
10162  drivers/staging/android/ion/ion.h                  |   10 +-
10163  drivers/staging/android/ion/ion_cma_heap.c         |    6 +-
10164  drivers/staging/android/ion/ion_heap.c             |    4 +-
10165  drivers/staging/android/ion/ion_page_pool.c        |   10 +-
10166  drivers/staging/android/ion/ion_priv.h             |    3 +-
10167  drivers/staging/android/ion/ion_system_heap.c      |    7 +-
10168  drivers/staging/android/ion/tegra/Makefile         |    2 +-
10169  drivers/staging/android/lowmemorykiller.c          |   30 +-
10170  drivers/staging/android/sw_sync.c                  |   17 +-
10171  drivers/staging/android/timed_output.c             |   16 +-
10172  drivers/staging/android/uapi/ion.h                 |   25 +-
10173  drivers/staging/board/board.c                      |    6 +-
10174  drivers/staging/comedi/Kconfig                     |   10 +-
10175  drivers/staging/comedi/comedi_buf.c                |  125 +-
10176  drivers/staging/comedi/comedi_fops.c               |  180 +-
10177  drivers/staging/comedi/comedi_internal.h           |    1 +
10178  drivers/staging/comedi/comedi_pci.c                |  108 +-
10179  drivers/staging/comedi/comedi_pcmcia.c             |  104 +-
10180  drivers/staging/comedi/comedi_usb.c                |   75 +-
10181  drivers/staging/comedi/comedidev.h                 |  635 +-
10182  drivers/staging/comedi/drivers.c                   |  407 +-
10183  drivers/staging/comedi/drivers/8255.h              |   12 +-
10184  drivers/staging/comedi/drivers/8255_pci.c          |    4 +-
10185  drivers/staging/comedi/drivers/Makefile            |    1 -
10186  drivers/staging/comedi/drivers/addi_apci_1032.c    |    7 +-
10187  drivers/staging/comedi/drivers/addi_apci_2032.c    |   16 +-
10188  drivers/staging/comedi/drivers/addi_apci_3120.c    |   59 +-
10189  drivers/staging/comedi/drivers/addi_apci_3xxx.c    |    6 +-
10190  drivers/staging/comedi/drivers/adl_pci6208.c       |    2 +-
10191  drivers/staging/comedi/drivers/adl_pci9111.c       |  171 +-
10192  drivers/staging/comedi/drivers/adl_pci9118.c       |  289 +-
10193  drivers/staging/comedi/drivers/adq12b.c            |  136 +-
10194  drivers/staging/comedi/drivers/adv_pci1710.c       |  304 +-
10195  drivers/staging/comedi/drivers/adv_pci1723.c       |   33 +-
10196  drivers/staging/comedi/drivers/adv_pci1724.c       |   15 +-
10197  drivers/staging/comedi/drivers/aio_aio12_8.c       |  201 +-
10198  drivers/staging/comedi/drivers/amplc_pci230.c      |    2 +-
10199  drivers/staging/comedi/drivers/cb_das16_cs.c       |  284 +-
10200  drivers/staging/comedi/drivers/cb_pcidas.c         | 1175 ++-
10201  drivers/staging/comedi/drivers/comedi_test.c       |  565 +-
10202  drivers/staging/comedi/drivers/daqboard2000.c      |    8 +-
10203  drivers/staging/comedi/drivers/dt3000.c            |  466 +-
10204  drivers/staging/comedi/drivers/dt9812.c            |   66 +-
10205  drivers/staging/comedi/drivers/fl512.c             |    2 +-
10206  drivers/staging/comedi/drivers/gsc_hpdi.c          |   28 +-
10207  drivers/staging/comedi/drivers/icp_multi.c         |  517 +-
10208  drivers/staging/comedi/drivers/ii_pci20kc.c        |   84 +-
10209  drivers/staging/comedi/drivers/ke_counter.c        |    7 +-
10210  drivers/staging/comedi/drivers/me_daq.c            |  315 +-
10211  drivers/staging/comedi/drivers/mf6x4.c             |  137 +-
10212  drivers/staging/comedi/drivers/mpc624.c            |  411 +-
10213  drivers/staging/comedi/drivers/multiq3.c           |  358 +-
10214  drivers/staging/comedi/drivers/ni_tio.c            |    6 +-
10215  drivers/staging/comedi/drivers/ni_tiocmd.c         |    6 -
10216  drivers/staging/comedi/drivers/ni_usb6501.c        |   16 +-
10217  drivers/staging/comedi/drivers/pcl711.c            |   19 +-
10218  drivers/staging/comedi/drivers/pcl812.c            |  186 +-
10219  drivers/staging/comedi/drivers/pcl816.c            |  109 +-
10220  drivers/staging/comedi/drivers/pcl818.c            |   40 +-
10221  drivers/staging/comedi/drivers/pcm3724.c           |  112 +-
10222  drivers/staging/comedi/drivers/quatech_daqp_cs.c   |  684 +-
10223  drivers/staging/comedi/drivers/rtd520.c            |  369 +-
10224  drivers/staging/comedi/drivers/rti800.c            |   28 +-
10225  drivers/staging/comedi/drivers/s526.c              |  560 +-
10226  drivers/staging/comedi/drivers/serial2002.c        |   51 +-
10227  drivers/staging/comedi/drivers/ssv_dnp.c           |   57 +-
10228  drivers/staging/comedi/drivers/unioxx5.c           |  506 --
10229  drivers/staging/comedi/drivers/usbdux.c            |  164 +-
10230  drivers/staging/comedi/drivers/usbduxfast.c        |  310 +-
10231  drivers/staging/comedi/drivers/usbduxsigma.c       |  142 +-
10232  drivers/staging/comedi/drivers/vmk80xx.c           |  127 +-
10233  .../staging/comedi/kcomedilib/kcomedilib_main.c    |   32 +-
10234  drivers/staging/dgap/dgap.c                        |  532 +-
10235  drivers/staging/dgap/dgap.h                        |    4 -
10236  drivers/staging/dgnc/dgnc_cls.c                    |   50 +-
10237  drivers/staging/dgnc/dgnc_driver.c                 |   52 +-
10238  drivers/staging/dgnc/dgnc_driver.h                 |   59 +-
10239  drivers/staging/dgnc/dgnc_mgmt.c                   |   15 +-
10240  drivers/staging/dgnc/dgnc_neo.c                    |   65 +-
10241  drivers/staging/dgnc/dgnc_sysfs.c                  |   95 +-
10242  drivers/staging/dgnc/dgnc_tty.c                    |  324 +-
10243  drivers/staging/emxx_udc/emxx_udc.c                |  183 +-
10244  drivers/staging/emxx_udc/emxx_udc.h                |   30 -
10245  drivers/staging/fbtft/Kconfig                      |   10 +
10246  drivers/staging/fbtft/Makefile                     |    1 +
10247  drivers/staging/fbtft/fb_agm1264k-fl.c             |   17 +-
10248  drivers/staging/fbtft/fb_bd663474.c                |   11 +-
10249  drivers/staging/fbtft/fb_hx8340bn.c                |   16 +-
10250  drivers/staging/fbtft/fb_hx8347d.c                 |   16 +-
10251  drivers/staging/fbtft/fb_hx8353d.c                 |   21 +-
10252  drivers/staging/fbtft/fb_hx8357d.c                 |   12 +-
10253  drivers/staging/fbtft/fb_ili9163.c                 |   13 +-
10254  drivers/staging/fbtft/fb_ili9320.c                 |   21 +-
10255  drivers/staging/fbtft/fb_ili9325.c                 |   20 +-
10256  drivers/staging/fbtft/fb_ili9340.c                 |   14 +-
10257  drivers/staging/fbtft/fb_ili9341.c                 |   20 +-
10258  drivers/staging/fbtft/fb_ili9481.c                 |   10 +-
10259  drivers/staging/fbtft/fb_ili9486.c                 |   12 +-
10260  drivers/staging/fbtft/fb_pcd8544.c                 |   25 +-
10261  drivers/staging/fbtft/fb_ra8875.c                  |   40 +-
10262  drivers/staging/fbtft/fb_s6d02a1.c                 |   16 +-
10263  drivers/staging/fbtft/fb_s6d1121.c                 |   18 +-
10264  drivers/staging/fbtft/fb_ssd1289.c                 |   20 +-
10265  drivers/staging/fbtft/fb_ssd1306.c                 |   25 +-
10266  drivers/staging/fbtft/fb_ssd1331.c                 |   11 +-
10267  drivers/staging/fbtft/fb_ssd1351.c                 |   67 +-
10268  drivers/staging/fbtft/fb_st7735r.c                 |   22 +-
10269  drivers/staging/fbtft/fb_st7789v.c                 |  265 +
10270  drivers/staging/fbtft/fb_tinylcd.c                 |   14 +-
10271  drivers/staging/fbtft/fb_tls8204.c                 |   24 +-
10272  drivers/staging/fbtft/fb_uc1611.c                  |   12 +-
10273  drivers/staging/fbtft/fb_uc1701.c                  |   25 +-
10274  drivers/staging/fbtft/fb_upd161704.c               |   11 +-
10275  drivers/staging/fbtft/fb_watterott.c               |   38 +-
10276  drivers/staging/fbtft/fbtft-bus.c                  |   27 +-
10277  drivers/staging/fbtft/fbtft-core.c                 |  135 +-
10278  drivers/staging/fbtft/fbtft-sysfs.c                |    6 +-
10279  drivers/staging/fbtft/fbtft.h                      |   11 +-
10280  drivers/staging/fbtft/fbtft_device.c               |  171 +-
10281  drivers/staging/fbtft/flexfb.c                     |   10 -
10282  drivers/staging/fsl-mc/bus/dpbp.c                  |  356 +-
10283  drivers/staging/fsl-mc/bus/dpmcp-cmd.h             |   81 +-
10284  drivers/staging/fsl-mc/bus/dpmcp.c                 |  316 +-
10285  drivers/staging/fsl-mc/bus/dpmcp.h                 |  220 +-
10286  drivers/staging/fsl-mc/bus/dpmng.c                 |   31 +-
10287  drivers/staging/fsl-mc/bus/dprc-cmd.h              |    7 +-
10288  drivers/staging/fsl-mc/bus/dprc-driver.c           |   12 +-
10289  drivers/staging/fsl-mc/bus/dprc.c                  |  955 ++-
10290  drivers/staging/fsl-mc/bus/mc-allocator.c          |   98 +-
10291  drivers/staging/fsl-mc/bus/mc-bus.c                |  136 +-
10292  drivers/staging/fsl-mc/bus/mc-sys.c                |  208 +-
10293  drivers/staging/fsl-mc/include/dpbp-cmd.h          |    2 +-
10294  drivers/staging/fsl-mc/include/dpbp.h              |  303 +-
10295  drivers/staging/fsl-mc/include/dpcon-cmd.h         |   62 +-
10296  drivers/staging/fsl-mc/include/dpmng.h             |   33 +-
10297  drivers/staging/fsl-mc/include/dprc.h              |  638 +-
10298  drivers/staging/fsl-mc/include/mc-cmd.h            |   52 +-
10299  drivers/staging/fsl-mc/include/mc-private.h        |   19 +-
10300  drivers/staging/fsl-mc/include/mc-sys.h            |   55 +-
10301  drivers/staging/fsl-mc/include/mc.h                |   18 +-
10302  drivers/staging/ft1000/Kconfig                     |   22 -
10303  drivers/staging/ft1000/Makefile                    |    3 -
10304  drivers/staging/ft1000/TODO                        |    9 -
10305  drivers/staging/ft1000/ft1000-pcmcia/Makefile      |    2 -
10306  drivers/staging/ft1000/ft1000-pcmcia/boot.h        |  158 -
10307  drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   70 -
10308  drivers/staging/ft1000/ft1000-pcmcia/ft1000.img    |  Bin 305770 -> 0 bytes
10309  drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c   |  158 -
10310  drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |  769 --
10311  drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   | 2068 -----
10312  drivers/staging/ft1000/ft1000-usb/Makefile         |    3 -
10313  drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   |  789 --
10314  .../staging/ft1000/ft1000-usb/ft1000_download.c    | 1058 ---
10315  drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      | 1586 ----
10316  drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h   |  123 -
10317  drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |  252 -
10318  drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |  150 -
10319  drivers/staging/ft1000/ft1000-usb/ft3000.img       |  Bin 280414 -> 0 bytes
10320  drivers/staging/ft1000/ft1000.h                    |  366 -
10321  drivers/staging/gdm724x/gdm_lte.c                  |   54 +-
10322  drivers/staging/gdm724x/gdm_mux.c                  |   28 +-
10323  drivers/staging/gdm724x/gdm_tty.c                  |    8 +-
10324  drivers/staging/gdm724x/gdm_usb.c                  |   56 +-
10325  drivers/staging/gdm724x/netlink_k.c                |   10 +-
10326  drivers/staging/gdm72xx/gdm_qos.c                  |    4 +-
10327  drivers/staging/gdm72xx/gdm_sdio.c                 |   20 +-
10328  drivers/staging/gdm72xx/gdm_usb.c                  |   16 +-
10329  drivers/staging/gdm72xx/gdm_wimax.c                |   22 +-
10330  drivers/staging/gdm72xx/sdio_boot.c                |    4 +-
10331  drivers/staging/gdm72xx/usb_boot.c                 |    8 +-
10332  drivers/staging/goldfish/goldfish_nand.c           |    4 +-
10333  drivers/staging/goldfish/goldfish_nand_reg.h       |   10 +-
10334  drivers/staging/iio/accel/lis3l02dq_core.c         |   10 +-
10335  drivers/staging/iio/accel/lis3l02dq_ring.c         |   30 +-
10336  drivers/staging/iio/accel/sca3000_core.c           |   65 +-
10337  drivers/staging/iio/accel/sca3000_ring.c           |   19 +-
10338  drivers/staging/iio/adc/ad7192.c                   |   64 +-
10339  drivers/staging/iio/adc/ad7192.h                   |    2 +-
10340  drivers/staging/iio/adc/ad7280a.c                  |  180 +-
10341  drivers/staging/iio/adc/ad7606_core.c              |   23 +-
10342  drivers/staging/iio/adc/ad7606_par.c               |   15 +-
10343  drivers/staging/iio/adc/ad7606_spi.c               |    5 +-
10344  drivers/staging/iio/adc/ad7780.c                   |   13 +-
10345  drivers/staging/iio/adc/ad7816.c                   |   58 +-
10346  drivers/staging/iio/adc/lpc32xx_adc.c              |   18 +-
10347  drivers/staging/iio/adc/mxs-lradc.c                |  185 +-
10348  drivers/staging/iio/adc/spear_adc.c                |    4 +-
10349  drivers/staging/iio/addac/adt7316.c                |   16 +-
10350  drivers/staging/iio/cdc/ad7150.c                   |   19 +-
10351  drivers/staging/iio/cdc/ad7152.c                   |   14 +-
10352  drivers/staging/iio/cdc/ad7746.c                   |   49 +-
10353  drivers/staging/iio/frequency/ad9834.c             |    2 +-
10354  drivers/staging/iio/gyro/adis16060_core.c          |   16 +-
10355  drivers/staging/iio/iio_dummy_evgen.c              |   26 +-
10356  drivers/staging/iio/iio_simple_dummy.c             |   11 +-
10357  drivers/staging/iio/iio_simple_dummy.h             |   17 +-
10358  drivers/staging/iio/iio_simple_dummy_buffer.c      |    8 +-
10359  drivers/staging/iio/iio_simple_dummy_events.c      |   19 +-
10360  drivers/staging/iio/impedance-analyzer/ad5933.c    |   11 +-
10361  drivers/staging/iio/light/isl29018.c               |    6 +-
10362  drivers/staging/iio/light/isl29028.c               |   11 +-
10363  drivers/staging/iio/light/tsl2583.c                |   16 +-
10364  drivers/staging/iio/light/tsl2x7x_core.c           |   14 +-
10365  drivers/staging/iio/magnetometer/hmc5843.h         |    2 +-
10366  drivers/staging/iio/magnetometer/hmc5843_core.c    |    6 +-
10367  drivers/staging/iio/magnetometer/hmc5843_i2c.c     |    2 +-
10368  drivers/staging/iio/magnetometer/hmc5843_spi.c     |    4 +-
10369  drivers/staging/iio/meter/ade7753.c                |   10 +-
10370  drivers/staging/iio/meter/ade7754.c                |    8 +-
10371  drivers/staging/iio/meter/ade7758_core.c           |    6 +-
10372  drivers/staging/iio/meter/ade7759.c                |   10 +-
10373  drivers/staging/iio/meter/ade7854-spi.c            |    2 +-
10374  drivers/staging/iio/meter/ade7854.c                |    6 +-
10375  drivers/staging/iio/resolver/ad2s1210.c            |    2 +-
10376  drivers/staging/iio/resolver/ad2s90.c              |   10 +-
10377  drivers/staging/iio/trigger/iio-trig-bfin-timer.c  |    4 +-
10378  .../staging/iio/trigger/iio-trig-periodic-rtc.c    |    2 +-
10379  .../staging/lustre/include/linux/libcfs/libcfs.h   |   13 +-
10380  .../lustre/include/linux/libcfs/libcfs_debug.h     |    1 +
10381  .../lustre/include/linux/libcfs/libcfs_hash.h      |  189 +-
10382  .../lustre/include/linux/libcfs/libcfs_prim.h      |   13 -
10383  .../lustre/include/linux/libcfs/libcfs_private.h   |    2 +-
10384  .../lustre/include/linux/libcfs/libcfs_string.h    |    5 +-
10385  .../lustre/include/linux/libcfs/libcfs_time.h      |   49 -
10386  .../lustre/include/linux/libcfs/linux/libcfs.h     |    3 -
10387  .../lustre/include/linux/libcfs/linux/linux-time.h |   35 +-
10388  .../staging/lustre/include/linux/lnet/lib-lnet.h   |    6 +-
10389  .../staging/lustre/include/linux/lnet/lib-types.h  |    2 +-
10390  drivers/staging/lustre/include/linux/lnet/nidstr.h |   47 +-
10391  drivers/staging/lustre/include/linux/lnet/types.h  |    2 +-
10392  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c    |   44 +-
10393  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |  289 +-
10394  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |   65 +-
10395  .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c  |    1 -
10396  .../staging/lustre/lnet/klnds/socklnd/socklnd.c    |   61 +-
10397  .../staging/lustre/lnet/klnds/socklnd/socklnd.h    |    6 +-
10398  .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |   21 +-
10399  .../lustre/lnet/klnds/socklnd/socklnd_lib.c        |    6 +-
10400  .../lustre/lnet/klnds/socklnd/socklnd_modparams.c  |    1 -
10401  drivers/staging/lustre/lnet/lnet/Makefile          |    2 +-
10402  drivers/staging/lustre/lnet/lnet/acceptor.c        |    2 -
10403  drivers/staging/lustre/lnet/lnet/api-ni.c          |   18 +-
10404  drivers/staging/lustre/lnet/lnet/config.c          |    4 +-
10405  drivers/staging/lustre/lnet/lnet/lib-eq.c          |   12 +-
10406  drivers/staging/lustre/lnet/lnet/lib-move.c        |    7 +-
10407  drivers/staging/lustre/lnet/lnet/lib-ptl.c         |    4 +-
10408  drivers/staging/lustre/lnet/lnet/nidstrings.c      | 1260 +++
10409  drivers/staging/lustre/lnet/lnet/router.c          |   15 +-
10410  drivers/staging/lustre/lnet/lnet/router_proc.c     |   45 +-
10411  drivers/staging/lustre/lnet/selftest/brw_test.c    |    6 +-
10412  drivers/staging/lustre/lnet/selftest/conctl.c      |    4 +-
10413  drivers/staging/lustre/lnet/selftest/conrpc.c      |   18 +-
10414  drivers/staging/lustre/lnet/selftest/conrpc.h      |    5 +-
10415  drivers/staging/lustre/lnet/selftest/console.c     |   20 +-
10416  drivers/staging/lustre/lnet/selftest/console.h     |    3 +-
10417  drivers/staging/lustre/lnet/selftest/framework.c   |   12 +-
10418  drivers/staging/lustre/lnet/selftest/module.c      |    1 -
10419  drivers/staging/lustre/lnet/selftest/ping_test.c   |   16 +-
10420  drivers/staging/lustre/lnet/selftest/rpc.c         |   11 +-
10421  drivers/staging/lustre/lnet/selftest/rpc.h         |    1 -
10422  drivers/staging/lustre/lnet/selftest/selftest.h    |   27 +-
10423  drivers/staging/lustre/lnet/selftest/timer.c       |   17 +-
10424  drivers/staging/lustre/lnet/selftest/timer.h       |    2 +-
10425  drivers/staging/lustre/lustre/fid/fid_request.c    |  132 +-
10426  drivers/staging/lustre/lustre/fid/lproc_fid.c      |    3 -
10427  drivers/staging/lustre/lustre/fld/fld_cache.c      |    3 +-
10428  drivers/staging/lustre/lustre/fld/fld_internal.h   |    3 -
10429  drivers/staging/lustre/lustre/fld/fld_request.c    |    1 -
10430  drivers/staging/lustre/lustre/fld/lproc_fld.c      |    1 -
10431  drivers/staging/lustre/lustre/include/cl_object.h  |   59 +-
10432  drivers/staging/lustre/lustre/include/dt_object.h  | 1496 ----
10433  .../staging/lustre/lustre/include/interval_tree.h  |   36 -
10434  drivers/staging/lustre/lustre/include/lclient.h    |   28 +-
10435  .../lustre/lustre/include/linux/lustre_compat25.h  |    1 -
10436  .../lustre/lustre/include/linux/lustre_lite.h      |    4 +-
10437  .../lustre/include/linux/lustre_patchless_compat.h |    1 -
10438  drivers/staging/lustre/lustre/include/linux/obd.h  |    2 +-
10439  .../staging/lustre/lustre/include/lprocfs_status.h |   61 +-
10440  drivers/staging/lustre/lustre/include/lu_object.h  |   61 +-
10441  drivers/staging/lustre/lustre/include/lu_ref.h     |    1 -
10442  .../staging/lustre/lustre/include/lustre/libiam.h  |  145 -
10443  .../lustre/lustre/include/lustre/ll_fiemap.h       |    3 -
10444  .../lustre/lustre/include/lustre/lustre_idl.h      |   98 +-
10445  .../lustre/include/lustre/lustre_lfsck_user.h      |   95 -
10446  .../lustre/lustre/include/lustre/lustre_user.h     |   40 +-
10447  .../staging/lustre/lustre/include/lustre_capa.h    |  305 -
10448  drivers/staging/lustre/lustre/include/lustre_cfg.h |   10 +-
10449  .../staging/lustre/lustre/include/lustre_debug.h   |    1 -
10450  .../staging/lustre/lustre/include/lustre_disk.h    |  159 +-
10451  drivers/staging/lustre/lustre/include/lustre_dlm.h |  117 +-
10452  .../lustre/lustre/include/lustre_dlm_flags.h       |  228 +-
10453  .../staging/lustre/lustre/include/lustre_eacl.h    |    5 -
10454  .../staging/lustre/lustre/include/lustre_export.h  |   37 +-
10455  drivers/staging/lustre/lustre/include/lustre_fid.h |   96 +-
10456  drivers/staging/lustre/lustre/include/lustre_fld.h |    5 -
10457  drivers/staging/lustre/lustre/include/lustre_ha.h  |    1 -
10458  .../staging/lustre/lustre/include/lustre_handles.h |    3 +-
10459  .../staging/lustre/lustre/include/lustre_import.h  |   22 +-
10460  drivers/staging/lustre/lustre/include/lustre_lib.h |   19 +-
10461  .../staging/lustre/lustre/include/lustre_lite.h    |    1 -
10462  drivers/staging/lustre/lustre/include/lustre_log.h |  167 +-
10463  drivers/staging/lustre/lustre/include/lustre_mdc.h |    1 -
10464  drivers/staging/lustre/lustre/include/lustre_mds.h |    5 -
10465  drivers/staging/lustre/lustre/include/lustre_net.h |  152 +-
10466  .../staging/lustre/lustre/include/lustre_param.h   |   12 -
10467  .../lustre/lustre/include/lustre_req_layout.h      |   11 -
10468  drivers/staging/lustre/lustre/include/lustre_sec.h |   48 +-
10469  drivers/staging/lustre/lustre/include/obd.h        |  188 +-
10470  drivers/staging/lustre/lustre/include/obd_cache.h  |   39 -
10471  drivers/staging/lustre/lustre/include/obd_cksum.h  |    1 -
10472  drivers/staging/lustre/lustre/include/obd_class.h  |  236 +-
10473  .../staging/lustre/lustre/include/obd_support.h    |  284 +-
10474  drivers/staging/lustre/lustre/lclient/glimpse.c    |    6 +-
10475  drivers/staging/lustre/lustre/lclient/lcommon_cl.c |  102 +-
10476  .../staging/lustre/lustre/lclient/lcommon_misc.c   |    1 -
10477  drivers/staging/lustre/lustre/ldlm/interval_tree.c |  274 +-
10478  drivers/staging/lustre/lustre/ldlm/l_lock.c        |    7 +-
10479  drivers/staging/lustre/lustre/ldlm/ldlm_extent.c   |   27 +-
10480  drivers/staging/lustre/lustre/ldlm/ldlm_flock.c    |  278 +-
10481  .../staging/lustre/lustre/ldlm/ldlm_inodebits.c    |    1 -
10482  drivers/staging/lustre/lustre/ldlm/ldlm_internal.h |   36 +-
10483  drivers/staging/lustre/lustre/ldlm/ldlm_lib.c      |   38 -
10484  drivers/staging/lustre/lustre/ldlm/ldlm_lock.c     |  391 +-
10485  drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c    |  132 +-
10486  drivers/staging/lustre/lustre/ldlm/ldlm_plain.c    |    1 -
10487  drivers/staging/lustre/lustre/ldlm/ldlm_pool.c     |  441 +-
10488  drivers/staging/lustre/lustre/ldlm/ldlm_request.c  |  380 +-
10489  drivers/staging/lustre/lustre/ldlm/ldlm_resource.c |  209 +-
10490  drivers/staging/lustre/lustre/libcfs/Makefile      |    2 +-
10491  drivers/staging/lustre/lustre/libcfs/debug.c       |    5 +-
10492  drivers/staging/lustre/lustre/libcfs/fail.c        |    4 +-
10493  drivers/staging/lustre/lustre/libcfs/hash.c        |  131 +-
10494  .../lustre/lustre/libcfs/kernel_user_comm.c        |    1 +
10495  drivers/staging/lustre/lustre/libcfs/libcfs_lock.c |    8 +-
10496  drivers/staging/lustre/lustre/libcfs/libcfs_mem.c  |   10 +-
10497  .../staging/lustre/lustre/libcfs/libcfs_string.c   |  144 +-
10498  .../staging/lustre/lustre/libcfs/linux/linux-cpu.c |    3 +-
10499  .../lustre/libcfs/linux/linux-crypto-adler.c       |    3 +-
10500  .../lustre/lustre/libcfs/linux/linux-crypto.c      |    9 +-
10501  .../lustre/lustre/libcfs/linux/linux-curproc.c     |    1 +
10502  .../lustre/lustre/libcfs/linux/linux-debug.c       |    2 +-
10503  .../lustre/lustre/libcfs/linux/linux-module.c      |    1 -
10504  .../lustre/lustre/libcfs/linux/linux-prim.c        |   70 -
10505  .../lustre/lustre/libcfs/linux/linux-tracefile.c   |   32 +-
10506  drivers/staging/lustre/lustre/libcfs/module.c      |  185 +-
10507  drivers/staging/lustre/lustre/libcfs/nidstrings.c  |  842 --
10508  drivers/staging/lustre/lustre/libcfs/tracefile.c   |    6 +-
10509  drivers/staging/lustre/lustre/libcfs/tracefile.h   |    3 -
10510  drivers/staging/lustre/lustre/libcfs/workitem.c    |   16 +-
10511  drivers/staging/lustre/lustre/llite/Makefile       |    2 +-
10512  drivers/staging/lustre/lustre/llite/dcache.c       |    1 -
10513  drivers/staging/lustre/lustre/llite/dir.c          |   15 +-
10514  drivers/staging/lustre/lustre/llite/file.c         |   81 +-
10515  drivers/staging/lustre/lustre/llite/llite_capa.c   |  661 --
10516  drivers/staging/lustre/lustre/llite/llite_close.c  |    9 +-
10517  .../staging/lustre/lustre/llite/llite_internal.h   |   49 +-
10518  drivers/staging/lustre/lustre/llite/llite_lib.c    |  179 +-
10519  drivers/staging/lustre/lustre/llite/llite_mmap.c   |    2 -
10520  drivers/staging/lustre/lustre/llite/llite_nfs.c    |    9 +-
10521  drivers/staging/lustre/lustre/llite/llite_rmtacl.c |    1 -
10522  drivers/staging/lustre/lustre/llite/lloop.c        |    5 +-
10523  drivers/staging/lustre/lustre/llite/lproc_llite.c  |   38 +-
10524  drivers/staging/lustre/lustre/llite/namei.c        |   58 +-
10525  drivers/staging/lustre/lustre/llite/remote_perm.c  |   16 +-
10526  drivers/staging/lustre/lustre/llite/rw.c           |   42 +-
10527  drivers/staging/lustre/lustre/llite/rw26.c         |    1 +
10528  drivers/staging/lustre/lustre/llite/statahead.c    |   40 +-
10529  drivers/staging/lustre/lustre/llite/super25.c      |   42 +-
10530  drivers/staging/lustre/lustre/llite/vvp_dev.c      |   11 +-
10531  drivers/staging/lustre/lustre/llite/vvp_internal.h |    1 -
10532  drivers/staging/lustre/lustre/llite/vvp_io.c       |   10 +-
10533  drivers/staging/lustre/lustre/llite/vvp_lock.c     |    1 -
10534  drivers/staging/lustre/lustre/llite/vvp_object.c   |   13 +-
10535  drivers/staging/lustre/lustre/llite/vvp_page.c     |    1 -
10536  drivers/staging/lustre/lustre/llite/xattr.c        |   19 +-
10537  drivers/staging/lustre/lustre/llite/xattr_cache.c  |   24 +-
10538  drivers/staging/lustre/lustre/lmv/lmv_obd.c        |   78 +-
10539  drivers/staging/lustre/lustre/lmv/lproc_lmv.c      |    2 +
10540  .../staging/lustre/lustre/lov/lov_cl_internal.h    |    5 -
10541  drivers/staging/lustre/lustre/lov/lov_dev.c        |   15 +-
10542  drivers/staging/lustre/lustre/lov/lov_ea.c         |    7 +-
10543  drivers/staging/lustre/lustre/lov/lov_internal.h   |    5 +-
10544  drivers/staging/lustre/lustre/lov/lov_io.c         |    9 +-
10545  drivers/staging/lustre/lustre/lov/lov_lock.c       |   21 +-
10546  drivers/staging/lustre/lustre/lov/lov_obd.c        |   52 +-
10547  drivers/staging/lustre/lustre/lov/lov_object.c     |   18 +-
10548  drivers/staging/lustre/lustre/lov/lov_pack.c       |   22 -
10549  drivers/staging/lustre/lustre/lov/lov_page.c       |    2 -
10550  drivers/staging/lustre/lustre/lov/lov_pool.c       |   32 +-
10551  drivers/staging/lustre/lustre/lov/lov_request.c    |   17 +-
10552  drivers/staging/lustre/lustre/lov/lovsub_dev.c     |    5 +-
10553  drivers/staging/lustre/lustre/lov/lovsub_lock.c    |    4 +-
10554  drivers/staging/lustre/lustre/lov/lovsub_object.c  |    6 +-
10555  drivers/staging/lustre/lustre/lov/lproc_lov.c      |    5 +
10556  drivers/staging/lustre/lustre/mdc/mdc_internal.h   |   18 +-
10557  drivers/staging/lustre/lustre/mdc/mdc_lib.c        |   50 +-
10558  drivers/staging/lustre/lustre/mdc/mdc_locks.c      |   47 +-
10559  drivers/staging/lustre/lustre/mdc/mdc_reint.c      |   24 +-
10560  drivers/staging/lustre/lustre/mdc/mdc_request.c    |  258 +-
10561  drivers/staging/lustre/lustre/mgc/lproc_mgc.c      |    1 +
10562  drivers/staging/lustre/lustre/mgc/mgc_request.c    |   63 +-
10563  drivers/staging/lustre/lustre/obdclass/Makefile    |    2 +-
10564  drivers/staging/lustre/lustre/obdclass/acl.c       |  120 -
10565  drivers/staging/lustre/lustre/obdclass/capa.c      |  421 -
10566  drivers/staging/lustre/lustre/obdclass/cl_io.c     |  106 +-
10567  drivers/staging/lustre/lustre/obdclass/cl_lock.c   |   49 +-
10568  drivers/staging/lustre/lustre/obdclass/cl_object.c |   68 +-
10569  drivers/staging/lustre/lustre/obdclass/cl_page.c   |    5 +-
10570  drivers/staging/lustre/lustre/obdclass/class_obd.c |  119 +-
10571  drivers/staging/lustre/lustre/obdclass/debug.c     |   10 -
10572  drivers/staging/lustre/lustre/obdclass/dt_object.c | 1054 ---
10573  drivers/staging/lustre/lustre/obdclass/genops.c    |  600 +-
10574  .../lustre/lustre/obdclass/linux/linux-module.c    |    3 -
10575  .../lustre/lustre/obdclass/linux/linux-obdo.c      |  137 -
10576  .../lustre/lustre/obdclass/linux/linux-sysctl.c    |    4 -
10577  drivers/staging/lustre/lustre/obdclass/llog.c      |  549 +-
10578  drivers/staging/lustre/lustre/obdclass/llog_cat.c  |  590 +-
10579  .../staging/lustre/lustre/obdclass/llog_internal.h |   21 -
10580  drivers/staging/lustre/lustre/obdclass/llog_obd.c  |   31 -
10581  drivers/staging/lustre/lustre/obdclass/llog_swab.c |    7 +-
10582  .../lustre/lustre/obdclass/lprocfs_counters.c      |    9 -
10583  .../lustre/lustre/obdclass/lprocfs_status.c        |  440 +-
10584  drivers/staging/lustre/lustre/obdclass/lu_object.c |  383 +-
10585  .../lustre/lustre/obdclass/lustre_handles.c        |   22 +-
10586  .../staging/lustre/lustre/obdclass/obd_config.c    |  468 +-
10587  drivers/staging/lustre/lustre/obdclass/obd_mount.c |  162 +-
10588  drivers/staging/lustre/lustre/obdclass/obdo.c      |  173 +-
10589  .../staging/lustre/lustre/obdclass/statfs_pack.c   |   14 -
10590  .../staging/lustre/lustre/obdecho/echo_client.c    |   45 +-
10591  .../staging/lustre/lustre/obdecho/echo_internal.h  |    1 -
10592  drivers/staging/lustre/lustre/osc/lproc_osc.c      |   46 +-
10593  drivers/staging/lustre/lustre/osc/osc_cache.c      |   44 +-
10594  .../staging/lustre/lustre/osc/osc_cl_internal.h    |    3 +-
10595  drivers/staging/lustre/lustre/osc/osc_dev.c        |    8 +-
10596  drivers/staging/lustre/lustre/osc/osc_internal.h   |    7 +-
10597  drivers/staging/lustre/lustre/osc/osc_io.c         |   14 +-
10598  drivers/staging/lustre/lustre/osc/osc_lock.c       |    4 +-
10599  drivers/staging/lustre/lustre/osc/osc_object.c     |    6 +-
10600  drivers/staging/lustre/lustre/osc/osc_page.c       |    9 +-
10601  drivers/staging/lustre/lustre/osc/osc_quota.c      |   11 +-
10602  drivers/staging/lustre/lustre/osc/osc_request.c    |  238 +-
10603  drivers/staging/lustre/lustre/ptlrpc/client.c      |  512 +-
10604  drivers/staging/lustre/lustre/ptlrpc/connection.c  |   10 +-
10605  drivers/staging/lustre/lustre/ptlrpc/events.c      |   12 +-
10606  drivers/staging/lustre/lustre/ptlrpc/import.c      |   70 +-
10607  drivers/staging/lustre/lustre/ptlrpc/layout.c      |  144 +-
10608  drivers/staging/lustre/lustre/ptlrpc/llog_client.c |   37 +-
10609  .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |  134 +-
10610  drivers/staging/lustre/lustre/ptlrpc/niobuf.c      |   22 +-
10611  drivers/staging/lustre/lustre/ptlrpc/nrs.c         |  129 +-
10612  .../staging/lustre/lustre/ptlrpc/pack_generic.c    |  362 +-
10613  drivers/staging/lustre/lustre/ptlrpc/pers.c        |    1 -
10614  drivers/staging/lustre/lustre/ptlrpc/pinger.c      |  170 +-
10615  .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h |   19 +-
10616  .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c   |    6 +-
10617  drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c     |  740 +-
10618  drivers/staging/lustre/lustre/ptlrpc/sec.c         |  165 +-
10619  drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c    |  358 +-
10620  drivers/staging/lustre/lustre/ptlrpc/sec_config.c  |   78 +-
10621  drivers/staging/lustre/lustre/ptlrpc/sec_gc.c      |   25 +-
10622  drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c   |    6 +-
10623  drivers/staging/lustre/lustre/ptlrpc/sec_null.c    |    4 +-
10624  drivers/staging/lustre/lustre/ptlrpc/sec_plain.c   |    2 +-
10625  drivers/staging/lustre/lustre/ptlrpc/service.c     |  526 +-
10626  drivers/staging/lustre/lustre/ptlrpc/wiretest.c    |    6 +-
10627  drivers/staging/media/davinci_vpfe/dm365_ipipe.c   |   60 +-
10628  .../staging/media/davinci_vpfe/vpfe_mc_capture.c   |    2 +-
10629  drivers/staging/media/lirc/lirc_sasem.c            |   12 +-
10630  drivers/staging/media/omap4iss/iss.c               |   40 +-
10631  drivers/staging/media/omap4iss/iss_csi2.c          |    6 +-
10632  drivers/staging/media/omap4iss/iss_csi2.h          |    4 +-
10633  drivers/staging/media/omap4iss/iss_ipipe.c         |   26 +-
10634  drivers/staging/media/omap4iss/iss_ipipe.h         |    4 +-
10635  drivers/staging/media/omap4iss/iss_ipipeif.c       |   24 +-
10636  drivers/staging/media/omap4iss/iss_ipipeif.h       |    8 +-
10637  drivers/staging/media/omap4iss/iss_regs.h          |  316 +-
10638  drivers/staging/media/omap4iss/iss_resizer.c       |   28 +-
10639  drivers/staging/media/omap4iss/iss_resizer.h       |    6 +-
10640  drivers/staging/media/omap4iss/iss_video.c         |   19 +-
10641  .../most/Documentation/ABI/sysfs-class-most.txt    |    2 +-
10642  drivers/staging/most/aim-cdev/cdev.c               |   68 +-
10643  drivers/staging/most/aim-network/networking.c      |   53 +-
10644  drivers/staging/most/aim-sound/sound.c             |  114 +-
10645  drivers/staging/most/aim-v4l2/Makefile             |    1 -
10646  drivers/staging/most/aim-v4l2/video.c              |   50 +-
10647  drivers/staging/most/hdm-dim2/Kconfig              |    2 +-
10648  drivers/staging/most/hdm-dim2/dim2_hal.c           |   62 +-
10649  drivers/staging/most/hdm-dim2/dim2_hal.h           |    5 -
10650  drivers/staging/most/hdm-dim2/dim2_hdm.c           |   79 +-
10651  drivers/staging/most/hdm-dim2/dim2_hdm.h           |    3 +-
10652  drivers/staging/most/hdm-dim2/dim2_sysfs.c         |    3 +-
10653  drivers/staging/most/hdm-i2c/hdm_i2c.c             |   45 +-
10654  drivers/staging/most/hdm-usb/hdm_usb.c             |  162 +-
10655  drivers/staging/most/mostcore/core.c               |  230 +-
10656  drivers/staging/most/mostcore/mostcore.h           |   13 +-
10657  drivers/staging/mt29f_spinand/mt29f_spinand.c      |   67 +-
10658  drivers/staging/mt29f_spinand/mt29f_spinand.h      |   18 +-
10659  drivers/staging/netlogic/platform_net.c            |    1 -
10660  drivers/staging/netlogic/xlr_net.h                 |    3 +-
10661  drivers/staging/nvec/nvec.c                        |    1 -
10662  drivers/staging/octeon-usb/octeon-hcd.c            |    7 +-
10663  drivers/staging/octeon/Makefile                    |    2 -
10664  drivers/staging/octeon/ethernet-defines.h          |    5 +-
10665  drivers/staging/octeon/ethernet-rgmii.c            |    2 +-
10666  drivers/staging/octeon/ethernet-rx.c               |   10 +-
10667  drivers/staging/octeon/ethernet-sgmii.c            |    2 +-
10668  drivers/staging/octeon/ethernet-tx.c               |    8 +-
10669  drivers/staging/octeon/ethernet-xaui.c             |   42 -
10670  drivers/staging/octeon/ethernet.c                  |   42 +-
10671  drivers/staging/octeon/octeon-ethernet.h           |    6 +-
10672  drivers/staging/olpc_dcon/olpc_dcon.c              |   36 +-
10673  drivers/staging/olpc_dcon/olpc_dcon.h              |    4 +-
10674  drivers/staging/panel/panel.c                      |  138 +-
10675  drivers/staging/rdma/Kconfig                       |    2 +-
10676  drivers/staging/rdma/amso1100/c2.c                 |    6 +-
10677  drivers/staging/rdma/amso1100/c2_ae.c              |    6 +-
10678  drivers/staging/rdma/amso1100/c2_alloc.c           |    2 +-
10679  drivers/staging/rdma/amso1100/c2_cm.c              |    3 -
10680  drivers/staging/rdma/amso1100/c2_cq.c              |   12 +-
10681  drivers/staging/rdma/amso1100/c2_intr.c            |    2 +-
10682  drivers/staging/rdma/amso1100/c2_mm.c              |   10 +-
10683  drivers/staging/rdma/amso1100/c2_mq.c              |    1 +
10684  drivers/staging/rdma/amso1100/c2_provider.c        |   10 +-
10685  drivers/staging/rdma/amso1100/c2_qp.c              |   20 +-
10686  drivers/staging/rdma/amso1100/c2_rnic.c            |   28 +-
10687  drivers/staging/rdma/ehca/ehca_cq.c                |   13 +-
10688  drivers/staging/rdma/hfi1/chip.c                   |  196 +-
10689  drivers/staging/rdma/hfi1/chip.h                   |    2 +
10690  drivers/staging/rdma/hfi1/common.h                 |    4 +-
10691  drivers/staging/rdma/hfi1/device.c                 |    2 +-
10692  drivers/staging/rdma/hfi1/diag.c                   |    9 +-
10693  drivers/staging/rdma/hfi1/driver.c                 |   83 +-
10694  drivers/staging/rdma/hfi1/file_ops.c               |   18 +-
10695  drivers/staging/rdma/hfi1/firmware.c               |   37 +-
10696  drivers/staging/rdma/hfi1/hfi.h                    |   22 +-
10697  drivers/staging/rdma/hfi1/init.c                   |   30 +-
10698  drivers/staging/rdma/hfi1/mad.c                    |   20 +-
10699  drivers/staging/rdma/hfi1/mr.c                     |   28 +-
10700  drivers/staging/rdma/hfi1/pcie.c                   |   15 +-
10701  drivers/staging/rdma/hfi1/pio.c                    |   21 +-
10702  drivers/staging/rdma/hfi1/qp.h                     |   15 +
10703  drivers/staging/rdma/hfi1/qsfp.c                   |   13 +-
10704  drivers/staging/rdma/hfi1/rc.c                     |   25 +-
10705  drivers/staging/rdma/hfi1/ruc.c                    |   25 +-
10706  drivers/staging/rdma/hfi1/sdma.c                   |  168 +-
10707  drivers/staging/rdma/hfi1/sdma.h                   |   74 +-
10708  drivers/staging/rdma/hfi1/sysfs.c                  |    2 +-
10709  drivers/staging/rdma/hfi1/trace.c                  |    4 +-
10710  drivers/staging/rdma/hfi1/trace.h                  |   48 +-
10711  drivers/staging/rdma/hfi1/user_sdma.c              |  124 +-
10712  drivers/staging/rdma/hfi1/verbs.c                  |   19 +-
10713  drivers/staging/rdma/hfi1/verbs.h                  |    3 +-
10714  drivers/staging/rdma/ipath/ipath_driver.c          |   27 +-
10715  drivers/staging/rdma/ipath/ipath_eeprom.c          |    2 +-
10716  drivers/staging/rdma/ipath/ipath_file_ops.c        |   15 +-
10717  drivers/staging/rdma/ipath/ipath_fs.c              |   13 +-
10718  drivers/staging/rdma/ipath/ipath_iba6110.c         |    7 +-
10719  drivers/staging/rdma/ipath/ipath_init_chip.c       |   32 +-
10720  drivers/staging/rdma/ipath/ipath_intr.c            |    8 +-
10721  drivers/staging/rdma/ipath/ipath_kernel.h          |    3 +-
10722  drivers/staging/rdma/ipath/ipath_qp.c              |    3 +-
10723  drivers/staging/rdma/ipath/ipath_ruc.c             |    1 -
10724  drivers/staging/rdma/ipath/ipath_sdma.c            |    6 +-
10725  drivers/staging/rdma/ipath/ipath_sysfs.c           |    7 +-
10726  drivers/staging/rdma/ipath/ipath_ud.c              |    1 -
10727  drivers/staging/rdma/ipath/ipath_user_pages.c      |    1 -
10728  drivers/staging/rdma/ipath/ipath_user_sdma.c       |    5 +-
10729  drivers/staging/rdma/ipath/ipath_verbs.c           |   15 +-
10730  drivers/staging/rdma/ipath/ipath_verbs_mcast.c     |    1 -
10731  drivers/staging/rtl8188eu/Kconfig                  |    2 +-
10732  drivers/staging/rtl8188eu/Makefile                 |    1 +
10733  drivers/staging/rtl8188eu/core/rtw_ap.c            |    2 +-
10734  drivers/staging/rtl8188eu/core/rtw_cmd.c           |    8 +-
10735  drivers/staging/rtl8188eu/core/rtw_debug.c         |    3 +-
10736  drivers/staging/rtl8188eu/core/rtw_efuse.c         |   50 +-
10737  drivers/staging/rtl8188eu/core/rtw_ieee80211.c     |   14 +-
10738  drivers/staging/rtl8188eu/core/rtw_mlme.c          |    5 +-
10739  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |   96 +-
10740  drivers/staging/rtl8188eu/core/rtw_recv.c          |   20 +-
10741  drivers/staging/rtl8188eu/core/rtw_rf.c            |    2 +-
10742  drivers/staging/rtl8188eu/core/rtw_sta_mgt.c       |   15 +-
10743  drivers/staging/rtl8188eu/core/rtw_wlan_util.c     |   10 +-
10744  drivers/staging/rtl8188eu/core/rtw_xmit.c          |    4 +
10745  .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c   |   14 +-
10746  drivers/staging/rtl8188eu/hal/bb_cfg.c             |   93 +-
10747  drivers/staging/rtl8188eu/hal/fw.c                 |    5 +-
10748  drivers/staging/rtl8188eu/hal/mac_cfg.c            |    4 +-
10749  drivers/staging/rtl8188eu/hal/odm.c                |   33 +-
10750  drivers/staging/rtl8188eu/hal/odm_HWConfig.c       |    6 +-
10751  drivers/staging/rtl8188eu/hal/odm_RTL8188E.c       |  122 +-
10752  drivers/staging/rtl8188eu/hal/phy.c                |   32 +-
10753  drivers/staging/rtl8188eu/hal/rf_cfg.c             |    6 +-
10754  drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c       |   26 +-
10755  drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c  |   27 +-
10756  drivers/staging/rtl8188eu/hal/rtl8188eu_led.c      |    6 +-
10757  drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c     |    2 +-
10758  drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |    6 +-
10759  drivers/staging/rtl8188eu/hal/usb_halinit.c        |   56 +-
10760  drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h |   14 +-
10761  drivers/staging/rtl8188eu/include/basic_types.h    |    6 -
10762  drivers/staging/rtl8188eu/include/drv_types.h      |    2 +
10763  drivers/staging/rtl8188eu/include/hal_intf.h       |   16 +-
10764  drivers/staging/rtl8188eu/include/ieee80211.h      |    4 +-
10765  drivers/staging/rtl8188eu/include/mon.h            |   36 +
10766  drivers/staging/rtl8188eu/include/odm.h            |   90 +-
10767  drivers/staging/rtl8188eu/include/odm_debug.h      |   42 +-
10768  drivers/staging/rtl8188eu/include/odm_reg.h        |    2 +-
10769  drivers/staging/rtl8188eu/include/osdep_service.h  |   48 -
10770  drivers/staging/rtl8188eu/include/pwrseq.h         |   84 +-
10771  drivers/staging/rtl8188eu/include/rtl8188e_spec.h  |  415 +-
10772  drivers/staging/rtl8188eu/include/rtw_security.h   |    3 -
10773  drivers/staging/rtl8188eu/include/rtw_sreset.h     |   14 +-
10774  drivers/staging/rtl8188eu/include/wifi.h           |   12 -
10775  drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |   28 +-
10776  drivers/staging/rtl8188eu/os_dep/mlme_linux.c      |    9 +-
10777  drivers/staging/rtl8188eu/os_dep/mon.c             |  195 +
10778  drivers/staging/rtl8188eu/os_dep/os_intfs.c        |    8 +-
10779  drivers/staging/rtl8188eu/os_dep/osdep_service.c   |    2 +-
10780  drivers/staging/rtl8188eu/os_dep/recv_linux.c      |    2 +-
10781  drivers/staging/rtl8188eu/os_dep/usb_intf.c        |   10 +
10782  drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c   |    5 +-
10783  drivers/staging/rtl8188eu/os_dep/xmit_linux.c      |    2 +-
10784  drivers/staging/rtl8192e/dot11d.c                  |    4 -
10785  drivers/staging/rtl8192e/dot11d.h                  |    4 -
10786  drivers/staging/rtl8192e/rtl8192e/r8190P_def.h     |    4 -
10787  drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c |    8 +-
10788  drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h |    4 -
10789  drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c  |   62 +-
10790  drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h  |    8 +-
10791  drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c     |  103 +-
10792  drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h     |    4 -
10793  .../staging/rtl8192e/rtl8192e/r8192E_firmware.c    |  278 +-
10794  .../staging/rtl8192e/rtl8192e/r8192E_firmware.h    |   23 +-
10795  drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h      |    4 -
10796  drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c   |    4 -
10797  drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h   |    4 -
10798  drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c     |  240 +-
10799  drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h     |    4 -
10800  drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h  |    4 -
10801  drivers/staging/rtl8192e/rtl8192e/rtl_cam.c        |    8 +-
10802  drivers/staging/rtl8192e/rtl8192e/rtl_cam.h        |    4 -
10803  drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |  358 +-
10804  drivers/staging/rtl8192e/rtl8192e/rtl_core.h       |    6 +-
10805  drivers/staging/rtl8192e/rtl8192e/rtl_dm.c         |  311 +-
10806  drivers/staging/rtl8192e/rtl8192e/rtl_dm.h         |    4 -
10807  drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c     |    4 -
10808  drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h     |    4 -
10809  drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c    |   14 +-
10810  drivers/staging/rtl8192e/rtl8192e/rtl_pci.c        |    8 +-
10811  drivers/staging/rtl8192e/rtl8192e/rtl_pci.h        |    4 -
10812  drivers/staging/rtl8192e/rtl8192e/rtl_pm.c         |    4 -
10813  drivers/staging/rtl8192e/rtl8192e/rtl_pm.h         |    4 -
10814  drivers/staging/rtl8192e/rtl8192e/rtl_ps.c         |   31 +-
10815  drivers/staging/rtl8192e/rtl8192e/rtl_ps.h         |    4 -
10816  drivers/staging/rtl8192e/rtl8192e/rtl_wx.c         |  349 +-
10817  drivers/staging/rtl8192e/rtl8192e/rtl_wx.h         |    4 -
10818  drivers/staging/rtl8192e/rtl819x_BA.h              |    4 -
10819  drivers/staging/rtl8192e/rtl819x_BAProc.c          |    8 +-
10820  drivers/staging/rtl8192e/rtl819x_HT.h              |    4 -
10821  drivers/staging/rtl8192e/rtl819x_HTProc.c          |    4 -
10822  drivers/staging/rtl8192e/rtl819x_Qos.h             |    4 -
10823  drivers/staging/rtl8192e/rtl819x_TS.h              |    4 -
10824  drivers/staging/rtl8192e/rtl819x_TSProc.c          |    4 -
10825  drivers/staging/rtl8192e/rtllib_debug.h            |    4 -
10826  drivers/staging/rtl8192e/rtllib_module.c           |    9 +-
10827  drivers/staging/rtl8192e/rtllib_rx.c               |   14 +-
10828  drivers/staging/rtl8192e/rtllib_softmac.c          |   20 +-
10829  drivers/staging/rtl8192e/rtllib_tx.c               |   12 +-
10830  drivers/staging/rtl8192e/rtllib_wx.c               |    4 -
10831  drivers/staging/rtl8192u/ieee80211/ieee80211.h     |   10 +-
10832  .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c      |   47 +-
10833  .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c      |   76 +-
10834  .../staging/rtl8192u/ieee80211/ieee80211_module.c  |    2 +-
10835  drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |   19 +-
10836  .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |   19 +-
10837  .../rtl8192u/ieee80211/ieee80211_softmac_wx.c      |  102 +-
10838  drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |    2 +-
10839  drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c  |    8 -
10840  drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h   |   49 +-
10841  drivers/staging/rtl8192u/r8192U.h                  |   99 +-
10842  drivers/staging/rtl8192u/r8192U_core.c             | 1980 +++--
10843  drivers/staging/rtl8192u/r8192U_dm.c               |   17 +-
10844  drivers/staging/rtl8192u/r8192U_hw.h               |  145 +-
10845  drivers/staging/rtl8192u/r8192U_wx.c               |    4 +-
10846  drivers/staging/rtl8192u/r819xU_cmdpkt.h           |    6 +-
10847  drivers/staging/rtl8192u/r819xU_phy.c              |    4 +-
10848  drivers/staging/rtl8712/drv_types.h                |   11 +-
10849  drivers/staging/rtl8712/hal_init.c                 |   57 +-
10850  drivers/staging/rtl8712/ieee80211.c                |   43 +-
10851  drivers/staging/rtl8712/ieee80211.h                |   48 +-
10852  drivers/staging/rtl8712/mlme_linux.c               |    5 +-
10853  drivers/staging/rtl8712/os_intfs.c                 |   11 +-
10854  drivers/staging/rtl8712/osdep_service.h            |    4 -
10855  drivers/staging/rtl8712/recv_linux.c               |    3 +-
10856  drivers/staging/rtl8712/rtl8712_cmd.c              |   42 +-
10857  drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h   |    3 +-
10858  drivers/staging/rtl8712/rtl8712_efuse.c            |  138 +-
10859  drivers/staging/rtl8712/rtl8712_gp_bitdef.h        |    3 +-
10860  drivers/staging/rtl8712/rtl8712_hal.h              |   14 +-
10861  drivers/staging/rtl8712/rtl8712_io.c               |   28 +-
10862  drivers/staging/rtl8712/rtl8712_led.c              |  187 +-
10863  drivers/staging/rtl8712/rtl8712_recv.c             |   55 +-
10864  drivers/staging/rtl8712/rtl8712_xmit.c             |   86 +-
10865  drivers/staging/rtl8712/rtl871x_cmd.c              |   25 +-
10866  drivers/staging/rtl8712/rtl871x_eeprom.c           |   22 +-
10867  drivers/staging/rtl8712/rtl871x_io.c               |    2 +-
10868  drivers/staging/rtl8712/rtl871x_io.h               |    8 -
10869  drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |  234 +-
10870  drivers/staging/rtl8712/rtl871x_ioctl_rtl.c        |   53 +-
10871  drivers/staging/rtl8712/rtl871x_ioctl_set.c        |   33 +-
10872  drivers/staging/rtl8712/rtl871x_mlme.c             |  150 +-
10873  drivers/staging/rtl8712/rtl871x_mlme.h             |    2 +-
10874  drivers/staging/rtl8712/rtl871x_mp.c               |   39 +-
10875  drivers/staging/rtl8712/rtl871x_mp.h               |    1 -
10876  drivers/staging/rtl8712/rtl871x_mp_ioctl.c         |   38 +-
10877  drivers/staging/rtl8712/rtl871x_pwrctrl.c          |    6 +-
10878  drivers/staging/rtl8712/rtl871x_recv.c             |   70 +-
10879  drivers/staging/rtl8712/rtl871x_security.c         |  133 +-
10880  drivers/staging/rtl8712/rtl871x_sta_mgt.c          |   10 +-
10881  drivers/staging/rtl8712/rtl871x_xmit.c             |   95 +-
10882  drivers/staging/rtl8712/usb_halinit.c              |   13 +-
10883  drivers/staging/rtl8712/usb_intf.c                 |   21 +-
10884  drivers/staging/rtl8712/usb_ops.c                  |   20 +-
10885  drivers/staging/rtl8712/usb_ops_linux.c            |   28 +-
10886  drivers/staging/rtl8712/wifi.h                     |    9 -
10887  drivers/staging/rtl8712/xmit_linux.c               |    4 +-
10888  drivers/staging/rtl8723au/core/rtw_ap.c            |  210 +-
10889  drivers/staging/rtl8723au/core/rtw_cmd.c           |   16 +-
10890  drivers/staging/rtl8723au/core/rtw_efuse.c         |  320 +-
10891  drivers/staging/rtl8723au/core/rtw_ieee80211.c     |    9 +-
10892  drivers/staging/rtl8723au/core/rtw_mlme_ext.c      |    9 +-
10893  drivers/staging/rtl8723au/core/rtw_recv.c          |    6 +-
10894  drivers/staging/rtl8723au/core/rtw_security.c      |   17 +-
10895  drivers/staging/rtl8723au/core/rtw_wlan_util.c     |    4 +-
10896  .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c    |   88 +-
10897  drivers/staging/rtl8723au/hal/rtl8723a_cmd.c       |    3 +-
10898  drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c  |   46 +-
10899  drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c    |   55 +-
10900  drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c    |   48 +-
10901  drivers/staging/rtl8723au/hal/usb_halinit.c        |    5 +-
10902  drivers/staging/rtl8723au/include/rtw_cmd.h        |    2 -
10903  drivers/staging/rts5208/rtsx.c                     |    6 +-
10904  drivers/staging/rts5208/rtsx_chip.c                |   28 +-
10905  drivers/staging/skein/skein_api.c                  |   57 +-
10906  drivers/staging/skein/skein_api.h                  |   48 +-
10907  drivers/staging/skein/skein_base.c                 |   24 +-
10908  drivers/staging/skein/skein_block.c                |  380 +-
10909  drivers/staging/skein/skein_generic.c              |    3 +-
10910  drivers/staging/slicoss/slic.h                     |   23 +-
10911  drivers/staging/slicoss/slichw.h                   |   38 +-
10912  drivers/staging/slicoss/slicoss.c                  |  211 +-
10913  drivers/staging/sm750fb/ddk750_chip.c              |  323 +-
10914  drivers/staging/sm750fb/ddk750_chip.h              |    9 -
10915  drivers/staging/sm750fb/ddk750_display.c           |   50 +-
10916  drivers/staging/sm750fb/ddk750_display.h           |   69 +-
10917  drivers/staging/sm750fb/ddk750_help.h              |   13 +-
10918  drivers/staging/sm750fb/ddk750_hwi2c.c             |  109 +-
10919  drivers/staging/sm750fb/ddk750_hwi2c.h             |    9 +-
10920  drivers/staging/sm750fb/ddk750_mode.c              |    3 +-
10921  drivers/staging/sm750fb/ddk750_power.c             |   71 +-
10922  drivers/staging/sm750fb/ddk750_power.h             |   17 -
10923  drivers/staging/sm750fb/ddk750_reg.h               |  244 -
10924  drivers/staging/sm750fb/ddk750_sii164.c            |    8 +-
10925  drivers/staging/sm750fb/ddk750_swi2c.c             |  296 +-
10926  drivers/staging/sm750fb/ddk750_swi2c.h             |   47 +-
10927  drivers/staging/sm750fb/sm750.c                    |  439 +-
10928  drivers/staging/sm750fb/sm750.h                    |  134 +-
10929  drivers/staging/sm750fb/sm750_accel.c              |   51 +-
10930  drivers/staging/sm750fb/sm750_cursor.c             |   74 +-
10931  drivers/staging/sm750fb/sm750_help.h               |   37 +-
10932  drivers/staging/sm750fb/sm750_hw.c                 |  209 +-
10933  drivers/staging/sm750fb/sm750_hw.h                 |  101 -
10934  drivers/staging/speakup/buffers.c                  |    3 +-
10935  drivers/staging/speakup/devsynth.c                 |    4 +-
10936  drivers/staging/speakup/i18n.c                     |    2 +-
10937  drivers/staging/speakup/kobjects.c                 |   16 +-
10938  drivers/staging/speakup/serialio.c                 |    4 +-
10939  drivers/staging/speakup/speakup_audptr.c           |    2 +-
10940  drivers/staging/speakup/speakup_dectlk.c           |    3 +-
10941  drivers/staging/speakup/speakup_soft.c             |    3 +-
10942  drivers/staging/speakup/spk_priv.h                 |   42 +-
10943  drivers/staging/speakup/spk_priv_keyinfo.h         |   44 +-
10944  drivers/staging/speakup/varhandlers.c              |   20 +-
10945  drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 -
10946  .../Documentation/ABI/sysfs-platform-visorchipset  |    2 +
10947  drivers/staging/unisys/Documentation/overview.txt  |  458 +-
10948  drivers/staging/unisys/Kconfig                     |    2 +
10949  drivers/staging/unisys/Makefile                    |    2 +
10950  drivers/staging/unisys/TODO                        |   25 +-
10951  drivers/staging/unisys/include/channel.h           |   19 +-
10952  drivers/staging/unisys/include/diagchannel.h       |    5 -
10953  drivers/staging/unisys/include/iochannel.h         |   26 +-
10954  drivers/staging/unisys/include/periodic_work.h     |   12 +-
10955  drivers/staging/unisys/visorbus/periodic_work.c    |    8 +-
10956  drivers/staging/unisys/visorbus/visorchannel.c     |    8 +-
10957  drivers/staging/unisys/visorbus/visorchipset.c     |    2 +-
10958  drivers/staging/unisys/visorbus/vmcallinterface.h  |   54 +-
10959  drivers/staging/unisys/visorhba/Kconfig            |   14 +
10960  drivers/staging/unisys/visorhba/Makefile           |   10 +
10961  drivers/staging/unisys/visorhba/visorhba_main.c    | 1241 +++
10962  drivers/staging/unisys/visorinput/Kconfig          |   10 +
10963  drivers/staging/unisys/visorinput/Makefile         |    7 +
10964  .../staging/unisys/visorinput/ultrainputreport.h   |   74 +
10965  drivers/staging/unisys/visorinput/visorinput.c     |  715 ++
10966  drivers/staging/unisys/visornic/visornic_main.c    |   70 +-
10967  drivers/staging/vt6655/baseband.c                  |   14 +-
10968  drivers/staging/vt6655/card.c                      |  398 +-
10969  drivers/staging/vt6655/desc.h                      |   58 +-
10970  drivers/staging/vt6655/device.h                    |  149 +-
10971  drivers/staging/vt6655/device_main.c               |  866 +-
10972  drivers/staging/vt6655/dpc.c                       |    8 +-
10973  drivers/staging/vt6655/dpc.h                       |    2 +-
10974  drivers/staging/vt6655/mac.c                       |    3 +-
10975  drivers/staging/vt6655/rf.c                        |   12 +-
10976  drivers/staging/vt6655/rf.h                        |    4 +-
10977  drivers/staging/vt6655/rxtx.c                      |    6 +-
10978  drivers/staging/vt6656/baseband.c                  |    2 -
10979  drivers/staging/vt6656/card.c                      |    7 +-
10980  drivers/staging/vt6656/device.h                    |    2 +
10981  drivers/staging/vt6656/int.c                       |   14 +-
10982  drivers/staging/vt6656/main_usb.c                  |   28 +-
10983  drivers/staging/vt6656/power.c                     |   10 +-
10984  drivers/staging/vt6656/rxtx.c                      |    5 +-
10985  drivers/staging/vt6656/usbpipe.c                   |    6 -
10986  drivers/staging/wilc1000/Kconfig                   |   24 +-
10987  drivers/staging/wilc1000/Makefile                  |   14 +-
10988  drivers/staging/wilc1000/coreconfigurator.c        | 1620 +---
10989  drivers/staging/wilc1000/coreconfigurator.h        |   80 +-
10990  drivers/staging/wilc1000/host_interface.c          | 8313 +++++++-------------
10991  drivers/staging/wilc1000/host_interface.h          |  594 +-
10992  drivers/staging/wilc1000/linux_mon.c               |  218 +-
10993  drivers/staging/wilc1000/linux_wlan.c              | 1625 +---
10994  drivers/staging/wilc1000/linux_wlan_common.h       |   22 +-
10995  drivers/staging/wilc1000/linux_wlan_sdio.c         |   51 +-
10996  drivers/staging/wilc1000/linux_wlan_spi.c          |  116 +-
10997  drivers/staging/wilc1000/linux_wlan_spi.h          |    6 +-
10998  drivers/staging/wilc1000/wilc_errorsupport.h       |   67 -
10999  drivers/staging/wilc1000/wilc_exported_buf.c       |   71 -
11000  drivers/staging/wilc1000/wilc_memory.c             |   16 -
11001  drivers/staging/wilc1000/wilc_memory.h             |   66 -
11002  drivers/staging/wilc1000/wilc_msgqueue.c           |  160 +-
11003  drivers/staging/wilc1000/wilc_msgqueue.h           |   27 +-
11004  drivers/staging/wilc1000/wilc_oswrapper.h          |   29 -
11005  drivers/staging/wilc1000/wilc_platform.h           |   48 -
11006  drivers/staging/wilc1000/wilc_sdio.c               |  154 +-
11007  drivers/staging/wilc1000/wilc_spi.c                |  383 +-
11008  drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  | 1387 ++--
11009  drivers/staging/wilc1000/wilc_wfi_cfgoperations.h  |   94 +-
11010  drivers/staging/wilc1000/wilc_wfi_netdevice.h      |  121 +-
11011  drivers/staging/wilc1000/wilc_wlan.c               |  951 +--
11012  drivers/staging/wilc1000/wilc_wlan.h               |   99 +-
11013  drivers/staging/wilc1000/wilc_wlan_cfg.c           |  189 +-
11014  drivers/staging/wilc1000/wilc_wlan_cfg.h           |   22 +-
11015  drivers/staging/wilc1000/wilc_wlan_if.h            | 1455 ++--
11016  drivers/staging/wlan-ng/cfg80211.c                 |   15 -
11017  drivers/staging/wlan-ng/hfa384x_usb.c              |    2 +-
11018  drivers/staging/wlan-ng/p80211conv.c               |   50 +-
11019  drivers/staging/wlan-ng/p80211conv.h               |    7 +-
11020  drivers/staging/wlan-ng/p80211meta.h               |   90 -
11021  drivers/staging/wlan-ng/prism2fw.c                 |   13 +-
11022  drivers/staging/wlan-ng/prism2sta.c                | 1027 +--
11023  drivers/staging/wlan-ng/prism2usb.c                |    8 +-
11024  drivers/staging/xgifb/XGI_main_26.c                |    6 +-
11025  drivers/staging/xgifb/vb_init.c                    |  103 +-
11026  drivers/staging/xgifb/vb_util.h                    |    4 +-
11027  drivers/vme/bridges/vme_ca91cx42.c                 |    5 +-
11028  drivers/vme/bridges/vme_tsi148.c                   |  172 +-
11029  drivers/vme/vme.c                                  |   90 +
11030  drivers/vme/vme_bridge.h                           |   21 +-
11031  include/linux/fb.h                                 |    5 +-
11032  include/linux/iio/common/st_sensors.h              |    4 +
11033  include/linux/iio/iio.h                            |    3 +
11034  include/linux/iio/triggered_event.h                |   11 +
11035  include/uapi/linux/iio/types.h                     |    4 +
11036  include/uapi/rdma/hfi/hfi1_user.h                  |    4 +-
11037  tools/iio/generic_buffer.c                         |    9 +
11038  tools/iio/iio_event_monitor.c                      |    6 +-
11039  990 files changed, 38366 insertions(+), 57692 deletions(-)
11040  create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435
11041  create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x
11042  create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc100x
11043  create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-meas-spec
11044  create mode 100644 Documentation/devicetree/bindings/iio/accel/mma8452.txt
11045  create mode 100644 Documentation/devicetree/bindings/iio/adc/hi8435.txt
11046  create mode 100644 Documentation/devicetree/bindings/iio/light/apds9960.txt
11047  create mode 100644 Documentation/devicetree/bindings/iio/light/us5182d.txt
11048  rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (81%)
11049  create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
11050  create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
11051  create mode 100644 drivers/iio/accel/bmc150-accel.h
11052  create mode 100644 drivers/iio/accel/mxc4005.c
11053  create mode 100644 drivers/iio/adc/hi8435.c
11054  create mode 100644 drivers/iio/buffer/Kconfig
11055  create mode 100644 drivers/iio/buffer/Makefile
11056  rename drivers/iio/{buffer_cb.c => buffer/industrialio-buffer-cb.c} (89%)
11057  rename drivers/iio/{ => buffer}/industrialio-triggered-buffer.c (100%)
11058  rename drivers/iio/{ => buffer}/kfifo_buf.c (100%)
11059  create mode 100644 drivers/iio/chemical/Kconfig
11060  create mode 100644 drivers/iio/chemical/Makefile
11061  create mode 100644 drivers/iio/chemical/vz89x.c
11062  create mode 100644 drivers/iio/common/ms_sensors/Kconfig
11063  create mode 100644 drivers/iio/common/ms_sensors/Makefile
11064  create mode 100644 drivers/iio/common/ms_sensors/ms_sensors_i2c.c
11065  create mode 100644 drivers/iio/common/ms_sensors/ms_sensors_i2c.h
11066  create mode 100644 drivers/iio/gyro/bmg160.h
11067  rename drivers/iio/gyro/{bmg160.c => bmg160_core.c} (75%)
11068  create mode 100644 drivers/iio/gyro/bmg160_i2c.c
11069  create mode 100644 drivers/iio/gyro/bmg160_spi.c
11070  create mode 100644 drivers/iio/humidity/hdc100x.c
11071  create mode 100644 drivers/iio/humidity/htu21.c
11072  create mode 100644 drivers/iio/industrialio-triggered-event.c
11073  create mode 100644 drivers/iio/light/apds9960.c
11074  create mode 100644 drivers/iio/light/us5182d.c
11075  create mode 100644 drivers/iio/potentiometer/Kconfig
11076  create mode 100644 drivers/iio/potentiometer/Makefile
11077  create mode 100644 drivers/iio/potentiometer/mcp4531.c
11078  create mode 100644 drivers/iio/pressure/ms5637.c
11079  create mode 100644 drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
11080  create mode 100644 drivers/iio/temperature/tsys01.c
11081  create mode 100644 drivers/iio/temperature/tsys02d.c
11082  delete mode 100644 drivers/staging/comedi/drivers/unioxx5.c
11083  create mode 100644 drivers/staging/fbtft/fb_st7789v.c
11084  delete mode 100644 drivers/staging/ft1000/Kconfig
11085  delete mode 100644 drivers/staging/ft1000/Makefile
11086  delete mode 100644 drivers/staging/ft1000/TODO
11087  delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/Makefile
11088  delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/boot.h
11089  delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
11090  delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000.img
11091  delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
11092  delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
11093  delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
11094  delete mode 100644 drivers/staging/ft1000/ft1000-usb/Makefile
11095  delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
11096  delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_download.c
11097  delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
11098  delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h
11099  delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
11100  delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
11101  delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft3000.img
11102  delete mode 100644 drivers/staging/ft1000/ft1000.h
11103  create mode 100644 drivers/staging/lustre/lnet/lnet/nidstrings.c
11104  delete mode 100644 drivers/staging/lustre/lustre/include/dt_object.h
11105  delete mode 100644 drivers/staging/lustre/lustre/include/lustre/libiam.h
11106  delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_lfsck_user.h
11107  delete mode 100644 drivers/staging/lustre/lustre/include/lustre_capa.h
11108  delete mode 100644 drivers/staging/lustre/lustre/include/obd_cache.h
11109  delete mode 100644 drivers/staging/lustre/lustre/libcfs/nidstrings.c
11110  delete mode 100644 drivers/staging/lustre/lustre/llite/llite_capa.c
11111  delete mode 100644 drivers/staging/lustre/lustre/obdclass/capa.c
11112  delete mode 100644 drivers/staging/lustre/lustre/obdclass/dt_object.c
11113  delete mode 100644 drivers/staging/octeon/ethernet-xaui.c
11114  create mode 100644 drivers/staging/rtl8188eu/include/mon.h
11115  create mode 100644 drivers/staging/rtl8188eu/os_dep/mon.c
11116  delete mode 100644 drivers/staging/sm750fb/sm750_hw.h
11117  create mode 100644 drivers/staging/unisys/visorhba/Kconfig
11118  create mode 100644 drivers/staging/unisys/visorhba/Makefile
11119  create mode 100644 drivers/staging/unisys/visorhba/visorhba_main.c
11120  create mode 100644 drivers/staging/unisys/visorinput/Kconfig
11121  create mode 100644 drivers/staging/unisys/visorinput/Makefile
11122  create mode 100644 drivers/staging/unisys/visorinput/ultrainputreport.h
11123  create mode 100644 drivers/staging/unisys/visorinput/visorinput.c
11124  delete mode 100644 drivers/staging/wilc1000/wilc_errorsupport.h
11125  delete mode 100644 drivers/staging/wilc1000/wilc_exported_buf.c
11126  delete mode 100644 drivers/staging/wilc1000/wilc_memory.c
11127  delete mode 100644 drivers/staging/wilc1000/wilc_memory.h
11128  delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h
11129  delete mode 100644 drivers/staging/wilc1000/wilc_platform.h
11130  delete mode 100644 drivers/staging/wlan-ng/p80211meta.h
11131  create mode 100644 include/linux/iio/triggered_event.h
11132 Merging char-misc/char-misc-next (e2d8680741ed fpga: socfpga: Fix check of return value of devm_request_irq)
11133 $ git merge char-misc/char-misc-next
11134 Auto-merging scripts/mod/file2alias.c
11135 Auto-merging scripts/mod/devicetable-offsets.c
11136 Removing include/linux/msm_mdp.h
11137 Auto-merging include/linux/mod_devicetable.h
11138 Auto-merging drivers/vme/vme_bridge.h
11139 Auto-merging drivers/spmi/spmi-pmic-arb.c
11140 Removing drivers/misc/mic/host/mic_sysfs.c
11141 Auto-merging drivers/misc/mei/mei_dev.h
11142 Auto-merging drivers/Makefile
11143 Auto-merging drivers/Kconfig
11144 Auto-merging MAINTAINERS
11145 Auto-merging Documentation/ioctl/ioctl-number.txt
11146 Merge made by the 'recursive' strategy.
11147  Documentation/ABI/testing/configfs-stp-policy      |   48 +
11148  .../ABI/testing/sysfs-bus-coresight-devices-etm3x  |   83 +-
11149  .../ABI/testing/sysfs-bus-intel_th-devices-gth     |   49 +
11150  .../ABI/testing/sysfs-bus-intel_th-devices-msc     |   33 +
11151  .../ABI/testing/sysfs-bus-intel_th-devices-pti     |   24 +
11152  .../ABI/testing/sysfs-bus-intel_th-output-devices  |   13 +
11153  Documentation/ABI/testing/sysfs-bus-mei            |    7 +
11154  Documentation/ABI/testing/sysfs-class-fpga-manager |   37 +
11155  Documentation/ABI/testing/sysfs-class-mic.txt      |   29 +-
11156  Documentation/ABI/testing/sysfs-class-stm          |   14 +
11157  Documentation/ABI/testing/sysfs-class-stm_source   |   11 +
11158  .../bindings/fpga/xilinx-zynq-fpga-mgr.txt         |   19 +
11159  Documentation/devicetree/bindings/misc/sram.txt    |   16 +
11160  .../devicetree/bindings/nvmem/imx-ocotp.txt        |   20 +
11161  .../devicetree/bindings/nvmem/mxs-ocotp.txt        |   25 +
11162  .../devicetree/bindings/nvmem/rockchip-efuse.txt   |   38 +
11163  .../devicetree/bindings/nvmem/vf610-ocotp.txt      |   19 +
11164  Documentation/devicetree/bindings/w1/omap-hdq.txt  |    7 +-
11165  Documentation/fpga/fpga-mgr.txt                    |  171 ++
11166  Documentation/ioctl/ioctl-number.txt               |    3 +
11167  Documentation/mic/mic_overview.txt                 |   31 +-
11168  Documentation/mic/mpssd/mpss                       |    4 +-
11169  Documentation/mic/mpssd/mpssd.c                    |  362 ++--
11170  Documentation/mic/mpssd/mpssd.h                    |    1 +
11171  Documentation/trace/intel_th.txt                   |   99 +
11172  Documentation/trace/stm.txt                        |   80 +
11173  Documentation/w1/masters/omap-hdq                  |    6 +
11174  MAINTAINERS                                        |   37 +
11175  arch/arm/boot/dts/zynq-7000.dtsi                   |    5 +
11176  drivers/Kconfig                                    |    6 +
11177  drivers/Makefile                                   |    3 +
11178  drivers/char/efirtc.c                              |   13 +-
11179  drivers/char/hpet.c                                |   25 +-
11180  drivers/char/snsc.c                                |    5 +-
11181  drivers/dma/mic_x100_dma.c                         |   39 +-
11182  drivers/extcon/extcon-arizona.c                    |   58 +-
11183  drivers/extcon/extcon-axp288.c                     |   35 +-
11184  drivers/extcon/extcon-gpio.c                       |  130 +-
11185  drivers/extcon/extcon-max14577.c                   |   17 +-
11186  drivers/extcon/extcon-max77693.c                   |   32 +-
11187  drivers/extcon/extcon-max77843.c                   |   27 +-
11188  drivers/extcon/extcon-max8997.c                    |   21 +-
11189  drivers/extcon/extcon-rt8973a.c                    |    7 +-
11190  drivers/extcon/extcon-sm5502.c                     |    7 +-
11191  drivers/extcon/extcon.c                            |   61 +-
11192  drivers/fpga/Kconfig                               |   29 +
11193  drivers/fpga/Makefile                              |   10 +
11194  drivers/fpga/fpga-mgr.c                            |  380 ++++
11195  drivers/fpga/socfpga.c                             |  616 ++++++
11196  drivers/fpga/zynq-fpga.c                           |  514 +++++
11197  drivers/hwtracing/coresight/coresight-etm3x.c      |  107 +-
11198  drivers/hwtracing/coresight/coresight-etm4x.c      |   22 +-
11199  drivers/hwtracing/coresight/coresight.c            |    5 +
11200  drivers/hwtracing/intel_th/Kconfig                 |   72 +
11201  drivers/hwtracing/intel_th/Makefile                |   18 +
11202  drivers/hwtracing/intel_th/core.c                  |  692 +++++++
11203  drivers/hwtracing/intel_th/debug.c                 |   36 +
11204  drivers/hwtracing/intel_th/debug.h                 |   34 +
11205  drivers/hwtracing/intel_th/gth.c                   |  706 +++++++
11206  drivers/hwtracing/intel_th/gth.h                   |   66 +
11207  drivers/hwtracing/intel_th/intel_th.h              |  244 +++
11208  drivers/hwtracing/intel_th/msu.c                   | 1509 +++++++++++++++
11209  drivers/hwtracing/intel_th/msu.h                   |  116 ++
11210  drivers/hwtracing/intel_th/pci.c                   |   86 +
11211  drivers/hwtracing/intel_th/pti.c                   |  252 +++
11212  drivers/hwtracing/intel_th/pti.h                   |   29 +
11213  drivers/hwtracing/intel_th/sth.c                   |  259 +++
11214  drivers/hwtracing/intel_th/sth.h                   |   42 +
11215  drivers/hwtracing/stm/Kconfig                      |   26 +
11216  drivers/hwtracing/stm/Makefile                     |    9 +
11217  drivers/hwtracing/stm/console.c                    |   80 +
11218  drivers/hwtracing/stm/core.c                       | 1032 ++++++++++
11219  drivers/hwtracing/stm/dummy_stm.c                  |   66 +
11220  drivers/hwtracing/stm/policy.c                     |  529 ++++++
11221  drivers/hwtracing/stm/stm.h                        |   87 +
11222  drivers/mcb/mcb-core.c                             |    1 +
11223  drivers/mcb/mcb-pci.c                              |    1 +
11224  drivers/memory/fsl-corenet-cf.c                    |    1 +
11225  drivers/memory/ti-aemif.c                          |    1 +
11226  drivers/misc/Kconfig                               |    2 +-
11227  drivers/misc/ad525x_dpot-i2c.c                     |    1 -
11228  drivers/misc/genwqe/card_base.h                    |    2 +-
11229  drivers/misc/genwqe/card_ddcb.c                    |    2 +-
11230  drivers/misc/genwqe/card_dev.c                     |    4 +-
11231  drivers/misc/genwqe/card_utils.c                   |    5 +-
11232  drivers/misc/hpilo.c                               |    6 +-
11233  drivers/misc/kgdbts.c                              |   10 +-
11234  drivers/misc/lkdtm.c                               |    8 +-
11235  drivers/misc/mei/amthif.c                          |    2 +-
11236  drivers/misc/mei/bus-fixup.c                       |    4 +-
11237  drivers/misc/mei/bus.c                             |  218 ++-
11238  drivers/misc/mei/client.h                          |   12 +
11239  drivers/misc/mei/debugfs.c                         |    2 +-
11240  drivers/misc/mei/hbm.c                             |    6 +-
11241  drivers/misc/mei/hw-me.c                           |    4 +-
11242  drivers/misc/mei/init.c                            |    4 +-
11243  drivers/misc/mei/interrupt.c                       |    4 +
11244  drivers/misc/mei/mei_dev.h                         |   19 +-
11245  drivers/misc/mic/Kconfig                           |   25 +-
11246  drivers/misc/mic/Makefile                          |    2 +
11247  drivers/misc/mic/bus/Makefile                      |    1 +
11248  drivers/misc/mic/bus/cosm_bus.c                    |  141 ++
11249  drivers/misc/mic/bus/cosm_bus.h                    |  134 ++
11250  drivers/misc/mic/bus/mic_bus.c                     |   24 +-
11251  drivers/misc/mic/bus/scif_bus.c                    |    9 +-
11252  drivers/misc/mic/bus/scif_bus.h                    |    6 +-
11253  drivers/misc/mic/card/mic_device.c                 |   88 +-
11254  drivers/misc/mic/card/mic_x100.c                   |    2 +-
11255  drivers/misc/mic/common/mic_dev.h                  |   13 +
11256  drivers/misc/mic/cosm/Makefile                     |   10 +
11257  drivers/misc/mic/cosm/cosm_debugfs.c               |  156 ++
11258  drivers/misc/mic/cosm/cosm_main.c                  |  388 ++++
11259  drivers/misc/mic/cosm/cosm_main.h                  |   70 +
11260  drivers/misc/mic/cosm/cosm_scif_server.c           |  405 ++++
11261  drivers/misc/mic/cosm/cosm_sysfs.c                 |  461 +++++
11262  drivers/misc/mic/cosm_client/Makefile              |    7 +
11263  drivers/misc/mic/cosm_client/cosm_scif_client.c    |  275 +++
11264  drivers/misc/mic/host/Makefile                     |    1 -
11265  drivers/misc/mic/host/mic_boot.c                   |  317 +---
11266  drivers/misc/mic/host/mic_debugfs.c                |  114 +-
11267  drivers/misc/mic/host/mic_device.h                 |   88 +-
11268  drivers/misc/mic/host/mic_fops.c                   |    4 +-
11269  drivers/misc/mic/host/mic_intr.c                   |   46 +-
11270  drivers/misc/mic/host/mic_main.c                   |  223 +--
11271  drivers/misc/mic/host/mic_smpt.c                   |   30 +-
11272  drivers/misc/mic/host/mic_sysfs.c                  |  459 -----
11273  drivers/misc/mic/host/mic_virtio.c                 |   17 +-
11274  drivers/misc/mic/host/mic_virtio.h                 |    2 +-
11275  drivers/misc/mic/host/mic_x100.c                   |   46 +-
11276  drivers/misc/mic/scif/Makefile                     |    5 +
11277  drivers/misc/mic/scif/scif_api.c                   |  234 ++-
11278  drivers/misc/mic/scif/scif_debugfs.c               |   85 +-
11279  drivers/misc/mic/scif/scif_dma.c                   | 1979 ++++++++++++++++++++
11280  drivers/misc/mic/scif/scif_epd.c                   |   26 +-
11281  drivers/misc/mic/scif/scif_epd.h                   |   50 +
11282  drivers/misc/mic/scif/scif_fd.c                    |  178 +-
11283  drivers/misc/mic/scif/scif_fence.c                 |  771 ++++++++
11284  drivers/misc/mic/scif/scif_main.c                  |  111 +-
11285  drivers/misc/mic/scif/scif_main.h                  |   37 +-
11286  drivers/misc/mic/scif/scif_map.h                   |   25 +-
11287  drivers/misc/mic/scif/scif_mmap.c                  |  699 +++++++
11288  drivers/misc/mic/scif/scif_nm.c                    |   20 +-
11289  drivers/misc/mic/scif/scif_nodeqp.c                |  149 +-
11290  drivers/misc/mic/scif/scif_nodeqp.h                |   42 +-
11291  drivers/misc/mic/scif/scif_peer_bus.c              |  179 +-
11292  drivers/misc/mic/scif/scif_peer_bus.h              |   42 +-
11293  drivers/misc/mic/scif/scif_rma.c                   | 1775 ++++++++++++++++++
11294  drivers/misc/mic/scif/scif_rma.h                   |  464 +++++
11295  drivers/misc/mic/scif/scif_rma_list.c              |  291 +++
11296  drivers/misc/mic/scif/scif_rma_list.h              |   57 +
11297  drivers/misc/sgi-gru/gruhandles.c                  |    6 -
11298  drivers/misc/sgi-gru/gruhandles.h                  |    1 -
11299  drivers/misc/sgi-gru/grukdump.c                    |   16 +-
11300  drivers/misc/sgi-gru/grukservices.c                |   15 +-
11301  drivers/misc/sgi-gru/grumain.c                     |    4 +-
11302  drivers/misc/sgi-gru/grutlbpurge.c                 |   25 +-
11303  drivers/misc/sram.c                                |  196 +-
11304  drivers/misc/ti-st/st_core.c                       |   18 +-
11305  drivers/misc/vmw_balloon.c                         |  843 +++++++--
11306  drivers/misc/vmw_vmci/vmci_datagram.c              |    3 +-
11307  drivers/nfc/mei_phy.c                              |   31 +-
11308  drivers/nfc/mei_phy.h                              |    4 +-
11309  drivers/nfc/microread/mei.c                        |   14 +-
11310  drivers/nfc/pn544/mei.c                            |   14 +-
11311  drivers/nvmem/Kconfig                              |   42 +
11312  drivers/nvmem/Makefile                             |    8 +
11313  drivers/nvmem/imx-ocotp.c                          |  154 ++
11314  drivers/nvmem/mxs-ocotp.c                          |  257 +++
11315  drivers/nvmem/rockchip-efuse.c                     |  186 ++
11316  drivers/nvmem/vf610-ocotp.c                        |  302 +++
11317  drivers/pcmcia/ds.c                                |    4 +-
11318  drivers/spmi/spmi-pmic-arb.c                       |   11 +-
11319  drivers/spmi/spmi.c                                |    5 +-
11320  drivers/uio/uio.c                                  |    1 +
11321  drivers/uio/uio_fsl_elbc_gpcm.c                    |    1 +
11322  drivers/vme/vme_bridge.h                           |    4 +-
11323  drivers/w1/masters/omap_hdq.c                      |  224 ++-
11324  drivers/w1/masters/w1-gpio.c                       |   20 +-
11325  drivers/w1/w1_int.c                                |    3 +-
11326  include/linux/coresight.h                          |    2 +-
11327  include/linux/dmaengine.h                          |    4 +
11328  include/linux/extcon.h                             |   62 +-
11329  include/linux/extcon/extcon-gpio.h                 |   24 +-
11330  include/linux/fpga/fpga-mgr.h                      |  127 ++
11331  include/linux/mei_cl_bus.h                         |   40 +-
11332  include/linux/mic_bus.h                            |    3 +-
11333  include/linux/mod_devicetable.h                    |    7 +-
11334  include/linux/msm_mdp.h                            |   79 -
11335  include/linux/scif.h                               |  366 +++-
11336  include/linux/spmi.h                               |    4 +-
11337  include/linux/stm.h                                |  126 ++
11338  include/linux/ti_wilink_st.h                       |    1 +
11339  include/linux/vme.h                                |    3 +
11340  include/uapi/linux/mic_common.h                    |   16 +-
11341  include/uapi/linux/scif_ioctl.h                    |   85 +
11342  include/uapi/linux/stm.h                           |   50 +
11343  scripts/mod/devicetable-offsets.c                  |    1 +
11344  scripts/mod/file2alias.c                           |   12 +-
11345  scripts/ver_linux                                  |  223 ++-
11346  199 files changed, 21579 insertions(+), 2620 deletions(-)
11347  create mode 100644 Documentation/ABI/testing/configfs-stp-policy
11348  create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-gth
11349  create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc
11350  create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-pti
11351  create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-output-devices
11352  create mode 100644 Documentation/ABI/testing/sysfs-class-fpga-manager
11353  create mode 100644 Documentation/ABI/testing/sysfs-class-stm
11354  create mode 100644 Documentation/ABI/testing/sysfs-class-stm_source
11355  create mode 100644 Documentation/devicetree/bindings/fpga/xilinx-zynq-fpga-mgr.txt
11356  create mode 100644 Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
11357  create mode 100644 Documentation/devicetree/bindings/nvmem/mxs-ocotp.txt
11358  create mode 100644 Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt
11359  create mode 100644 Documentation/devicetree/bindings/nvmem/vf610-ocotp.txt
11360  create mode 100644 Documentation/fpga/fpga-mgr.txt
11361  create mode 100644 Documentation/trace/intel_th.txt
11362  create mode 100644 Documentation/trace/stm.txt
11363  create mode 100644 drivers/fpga/Kconfig
11364  create mode 100644 drivers/fpga/Makefile
11365  create mode 100644 drivers/fpga/fpga-mgr.c
11366  create mode 100644 drivers/fpga/socfpga.c
11367  create mode 100644 drivers/fpga/zynq-fpga.c
11368  create mode 100644 drivers/hwtracing/intel_th/Kconfig
11369  create mode 100644 drivers/hwtracing/intel_th/Makefile
11370  create mode 100644 drivers/hwtracing/intel_th/core.c
11371  create mode 100644 drivers/hwtracing/intel_th/debug.c
11372  create mode 100644 drivers/hwtracing/intel_th/debug.h
11373  create mode 100644 drivers/hwtracing/intel_th/gth.c
11374  create mode 100644 drivers/hwtracing/intel_th/gth.h
11375  create mode 100644 drivers/hwtracing/intel_th/intel_th.h
11376  create mode 100644 drivers/hwtracing/intel_th/msu.c
11377  create mode 100644 drivers/hwtracing/intel_th/msu.h
11378  create mode 100644 drivers/hwtracing/intel_th/pci.c
11379  create mode 100644 drivers/hwtracing/intel_th/pti.c
11380  create mode 100644 drivers/hwtracing/intel_th/pti.h
11381  create mode 100644 drivers/hwtracing/intel_th/sth.c
11382  create mode 100644 drivers/hwtracing/intel_th/sth.h
11383  create mode 100644 drivers/hwtracing/stm/Kconfig
11384  create mode 100644 drivers/hwtracing/stm/Makefile
11385  create mode 100644 drivers/hwtracing/stm/console.c
11386  create mode 100644 drivers/hwtracing/stm/core.c
11387  create mode 100644 drivers/hwtracing/stm/dummy_stm.c
11388  create mode 100644 drivers/hwtracing/stm/policy.c
11389  create mode 100644 drivers/hwtracing/stm/stm.h
11390  create mode 100644 drivers/misc/mic/bus/cosm_bus.c
11391  create mode 100644 drivers/misc/mic/bus/cosm_bus.h
11392  create mode 100644 drivers/misc/mic/cosm/Makefile
11393  create mode 100644 drivers/misc/mic/cosm/cosm_debugfs.c
11394  create mode 100644 drivers/misc/mic/cosm/cosm_main.c
11395  create mode 100644 drivers/misc/mic/cosm/cosm_main.h
11396  create mode 100644 drivers/misc/mic/cosm/cosm_scif_server.c
11397  create mode 100644 drivers/misc/mic/cosm/cosm_sysfs.c
11398  create mode 100644 drivers/misc/mic/cosm_client/Makefile
11399  create mode 100644 drivers/misc/mic/cosm_client/cosm_scif_client.c
11400  delete mode 100644 drivers/misc/mic/host/mic_sysfs.c
11401  create mode 100644 drivers/misc/mic/scif/scif_dma.c
11402  create mode 100644 drivers/misc/mic/scif/scif_fence.c
11403  create mode 100644 drivers/misc/mic/scif/scif_mmap.c
11404  create mode 100644 drivers/misc/mic/scif/scif_rma.c
11405  create mode 100644 drivers/misc/mic/scif/scif_rma.h
11406  create mode 100644 drivers/misc/mic/scif/scif_rma_list.c
11407  create mode 100644 drivers/misc/mic/scif/scif_rma_list.h
11408  create mode 100644 drivers/nvmem/imx-ocotp.c
11409  create mode 100644 drivers/nvmem/mxs-ocotp.c
11410  create mode 100644 drivers/nvmem/rockchip-efuse.c
11411  create mode 100644 drivers/nvmem/vf610-ocotp.c
11412  create mode 100644 include/linux/fpga/fpga-mgr.h
11413  delete mode 100644 include/linux/msm_mdp.h
11414  create mode 100644 include/linux/stm.h
11415  create mode 100644 include/uapi/linux/stm.h
11416 Merging extcon/extcon-next (11eecf910bd8 extcon: Modify the id and name of external connector)
11417 $ git merge extcon/extcon-next
11418 Already up-to-date.
11419 Merging cgroup/for-next (d57456753787 cgroup: fix race condition around termination check in css_task_iter_next())
11420 $ git merge cgroup/for-next
11421 Resolved 'kernel/events/core.c' using previous resolution.
11422 Resolved 'kernel/sched/core.c' using previous resolution.
11423 Auto-merging mm/memcontrol.c
11424 Auto-merging kernel/sched/core.c
11425 CONFLICT (content): Merge conflict in kernel/sched/core.c
11426 Auto-merging kernel/fork.c
11427 Auto-merging kernel/events/core.c
11428 CONFLICT (content): Merge conflict in kernel/events/core.c
11429 Auto-merging include/linux/sched.h
11430 Auto-merging include/linux/memcontrol.h
11431 Auto-merging include/linux/jump_label.h
11432 Auto-merging include/linux/init_task.h
11433 Auto-merging include/linux/backing-dev.h
11434 Auto-merging block/blk-cgroup.c
11435 Auto-merging Documentation/cgroups/unified-hierarchy.txt
11436 Automatic merge failed; fix conflicts and then commit the result.
11437 $ git commit -v -a
11438 [master bb81691e9c54] Merge remote-tracking branch 'cgroup/for-next'
11439 $ git diff -M --stat --summary HEAD^..
11440  Documentation/cgroups/cgroups.txt           |    4 +
11441  Documentation/cgroups/unified-hierarchy.txt |   25 +-
11442  block/blk-cgroup.c                          |    1 +
11443  block/blk-throttle.c                        |    2 +-
11444  block/cfq-iosched.c                         |    4 +-
11445  include/linux/backing-dev.h                 |    5 +-
11446  include/linux/cgroup-defs.h                 |   76 +-
11447  include/linux/cgroup.h                      |  129 +--
11448  include/linux/hugetlb_cgroup.h              |    4 +-
11449  include/linux/init_task.h                   |    8 -
11450  include/linux/jump_label.h                  |   18 +-
11451  include/linux/memcontrol.h                  |    8 +-
11452  include/linux/sched.h                       |   12 -
11453  kernel/cgroup.c                             | 1297 +++++++++++++++------------
11454  kernel/cgroup_pids.c                        |    8 +-
11455  kernel/cpuset.c                             |   72 +-
11456  kernel/events/core.c                        |    8 -
11457  kernel/fork.c                               |    5 +-
11458  kernel/sched/core.c                         |    8 -
11459  mm/memcontrol.c                             |   27 +-
11460  20 files changed, 951 insertions(+), 770 deletions(-)
11461 $ git am -3 ../patches/vmscan-build-fix.patch
11462 Applying: vmscan build fix
11463 $ git reset HEAD^
11464 Unstaged changes after reset:
11465 M       mm/vmscan.c
11466 $ git add -A .
11467 $ git commit -v -a --amend
11468 [master 575fab4d3554] Merge remote-tracking branch 'cgroup/for-next'
11469  Date: Thu Nov 5 15:03:01 2015 +1100
11470 Merging scsi/for-next (5575a6ea316b Merge branch 'fixes' into for-next)
11471 $ git merge scsi/for-next
11472 Auto-merging MAINTAINERS
11473 Merge made by the 'recursive' strategy.
11474  MAINTAINERS                        |   4 +-
11475  drivers/scsi/be2iscsi/Kconfig      |   4 +-
11476  drivers/scsi/be2iscsi/Makefile     |   2 +-
11477  drivers/scsi/be2iscsi/be.h         |   4 +-
11478  drivers/scsi/be2iscsi/be_cmds.c    |   4 +-
11479  drivers/scsi/be2iscsi/be_cmds.h    |   4 +-
11480  drivers/scsi/be2iscsi/be_iscsi.c   |   4 +-
11481  drivers/scsi/be2iscsi/be_main.c    |   8 +-
11482  drivers/scsi/be2iscsi/be_main.h    |   6 +-
11483  drivers/scsi/be2iscsi/be_mgmt.c    |   4 +-
11484  drivers/scsi/be2iscsi/be_mgmt.h    |   4 +-
11485  drivers/scsi/bnx2fc/bnx2fc_fcoe.c  |   1 -
11486  drivers/scsi/fnic/fnic_fcs.c       |  46 ++++++++--
11487  drivers/scsi/fnic/fnic_scsi.c      |  16 ++++
11488  drivers/scsi/lpfc/lpfc.h           |   8 +-
11489  drivers/scsi/lpfc/lpfc_attr.c      |  23 +++--
11490  drivers/scsi/lpfc/lpfc_bsg.c       |  20 ----
11491  drivers/scsi/lpfc/lpfc_ct.c        |  11 ++-
11492  drivers/scsi/lpfc/lpfc_els.c       | 100 ++++++--------------
11493  drivers/scsi/lpfc/lpfc_hbadisc.c   |  27 ++++--
11494  drivers/scsi/lpfc/lpfc_hw.h        |   6 +-
11495  drivers/scsi/lpfc/lpfc_init.c      |  36 +++++---
11496  drivers/scsi/lpfc/lpfc_mbox.c      |  19 ++--
11497  drivers/scsi/lpfc/lpfc_nportdisc.c |   2 -
11498  drivers/scsi/lpfc/lpfc_scsi.c      |  14 +--
11499  drivers/scsi/lpfc/lpfc_sli.c       |  10 +-
11500  drivers/scsi/lpfc/lpfc_sli4.h      |   1 -
11501  drivers/scsi/lpfc/lpfc_version.h   |   2 +-
11502  drivers/scsi/scsi_devinfo.c        | 181 ++++++++++++++++---------------------
11503  29 files changed, 267 insertions(+), 304 deletions(-)
11504 Merging target-updates/for-next (517982229f78 configfs: remove old API)
11505 $ git merge target-updates/for-next
11506 Auto-merging samples/configfs/configfs_sample.c
11507 Removing include/target/target_core_fabric_configfs.h
11508 Auto-merging include/target/target_core_base.h
11509 Removing include/target/configfs_macros.h
11510 Auto-merging drivers/vhost/scsi.c
11511 Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c
11512 Auto-merging drivers/usb/gadget/function/f_uac2.c
11513 Auto-merging drivers/usb/gadget/function/f_uac1.c
11514 Auto-merging drivers/usb/gadget/function/f_subset.c
11515 Auto-merging drivers/usb/gadget/function/f_sourcesink.c
11516 Auto-merging drivers/usb/gadget/function/f_serial.c
11517 Auto-merging drivers/usb/gadget/function/f_rndis.c
11518 Auto-merging drivers/usb/gadget/function/f_printer.c
11519 Auto-merging drivers/usb/gadget/function/f_phonet.c
11520 Auto-merging drivers/usb/gadget/function/f_obex.c
11521 Auto-merging drivers/usb/gadget/function/f_ncm.c
11522 Auto-merging drivers/usb/gadget/function/f_midi.c
11523 Auto-merging drivers/usb/gadget/function/f_mass_storage.c
11524 Auto-merging drivers/usb/gadget/function/f_loopback.c
11525 Auto-merging drivers/usb/gadget/function/f_hid.c
11526 Auto-merging drivers/usb/gadget/function/f_eem.c
11527 Auto-merging drivers/usb/gadget/function/f_ecm.c
11528 Auto-merging drivers/usb/gadget/function/f_acm.c
11529 Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c
11530 Removing Documentation/filesystems/configfs/configfs_example_explicit.c
11531 Removing Documentation/filesystems/configfs/Makefile
11532 Merge made by the 'recursive' strategy.
11533  Documentation/filesystems/Makefile                 |    2 -
11534  Documentation/filesystems/configfs/Makefile        |    3 -
11535  Documentation/filesystems/configfs/configfs.txt    |   38 +-
11536  .../configfs/configfs_example_explicit.c           |  483 --------
11537  Documentation/target/tcm_mod_builder.py            |   17 -
11538  drivers/infiniband/ulp/srpt/ib_srpt.c              |   78 +-
11539  drivers/misc/spear13xx_pcie_gadget.c               |  216 ++--
11540  drivers/net/netconsole.c                           |  271 +++--
11541  drivers/scsi/qla2xxx/tcm_qla2xxx.c                 |  153 +--
11542  drivers/target/iscsi/iscsi_target_configfs.c       |  791 +++++--------
11543  drivers/target/iscsi/iscsi_target_stat.c           |  666 +++++------
11544  drivers/target/loopback/tcm_loop.c                 |   60 +-
11545  drivers/target/sbp/sbp_target.c                    |   87 +-
11546  drivers/target/target_core_configfs.c              | 1209 +++++++-------------
11547  drivers/target/target_core_fabric_configfs.c       |  275 ++---
11548  drivers/target/target_core_internal.h              |    3 +
11549  drivers/target/target_core_stat.c                  |  918 ++++++---------
11550  drivers/target/tcm_fc/tfc_cmd.c                    |    1 -
11551  drivers/target/tcm_fc/tfc_conf.c                   |   44 +-
11552  drivers/target/tcm_fc/tfc_io.c                     |    1 -
11553  drivers/target/tcm_fc/tfc_sess.c                   |    1 -
11554  drivers/usb/gadget/configfs.c                      |  295 ++---
11555  drivers/usb/gadget/function/f_acm.c                |   26 +-
11556  drivers/usb/gadget/function/f_ecm.c                |    8 +-
11557  drivers/usb/gadget/function/f_eem.c                |    8 +-
11558  drivers/usb/gadget/function/f_hid.c                |   34 +-
11559  drivers/usb/gadget/function/f_loopback.c           |   31 +-
11560  drivers/usb/gadget/function/f_mass_storage.c       |  119 +-
11561  drivers/usb/gadget/function/f_midi.c               |   37 +-
11562  drivers/usb/gadget/function/f_ncm.c                |    8 +-
11563  drivers/usb/gadget/function/f_obex.c               |   26 +-
11564  drivers/usb/gadget/function/f_phonet.c             |   25 +-
11565  drivers/usb/gadget/function/f_printer.c            |   30 +-
11566  drivers/usb/gadget/function/f_rndis.c              |    8 +-
11567  drivers/usb/gadget/function/f_serial.c             |   26 +-
11568  drivers/usb/gadget/function/f_sourcesink.c         |   83 +-
11569  drivers/usb/gadget/function/f_subset.c             |    8 +-
11570  drivers/usb/gadget/function/f_uac1.c               |   39 +-
11571  drivers/usb/gadget/function/f_uac2.c               |   28 +-
11572  drivers/usb/gadget/function/u_ether_configfs.h     |   44 +-
11573  drivers/usb/gadget/function/uvc_configfs.c         |  387 +++----
11574  drivers/usb/gadget/legacy/tcm_usb_gadget.c         |   44 +-
11575  drivers/vhost/scsi.c                               |   41 +-
11576  drivers/xen/xen-scsiback.c                         |   32 +-
11577  fs/configfs/file.c                                 |   12 +-
11578  fs/dlm/config.c                                    |  288 ++---
11579  fs/ocfs2/cluster/heartbeat.c                       |  205 +---
11580  fs/ocfs2/cluster/nodemanager.c                     |  281 ++---
11581  include/linux/configfs.h                           |   97 +-
11582  include/linux/usb/gadget_configfs.h                |   19 +-
11583  include/target/configfs_macros.h                   |  147 ---
11584  include/target/target_core_base.h                  |   60 +
11585  include/target/target_core_fabric_configfs.h       |  122 --
11586  samples/Kconfig                                    |    6 +
11587  samples/Makefile                                   |    3 +-
11588  samples/configfs/Makefile                          |    2 +
11589  .../configfs/configfs_sample.c                     |  140 +--
11590  57 files changed, 2652 insertions(+), 5434 deletions(-)
11591  delete mode 100644 Documentation/filesystems/configfs/Makefile
11592  delete mode 100644 Documentation/filesystems/configfs/configfs_example_explicit.c
11593  delete mode 100644 include/target/configfs_macros.h
11594  delete mode 100644 include/target/target_core_fabric_configfs.h
11595  create mode 100644 samples/configfs/Makefile
11596  rename Documentation/filesystems/configfs/configfs_example_macros.c => samples/configfs/configfs_sample.c (74%)
11597 $ git am -3 ../patches/stm-class--Use-per-attribute-show-and-store-methods-in-configfs-policy,patch
11598 Applying: stm class: Use per-attribute show and store methods in configfs policy
11599 $ git reset HEAD^
11600 Unstaged changes after reset:
11601 M       drivers/hwtracing/stm/policy.c
11602 $ git add -A .
11603 $ git commit -v -a --amend
11604 [master 0705670191eb] Merge remote-tracking branch 'target-updates/for-next'
11605  Date: Thu Nov 5 15:14:30 2015 +1100
11606 Merging target-merge/for-next-merge (8edb1554f7c2 mpt3sas: Fix unprotected list lookup in v4.3-rc0 changes)
11607 $ git merge target-merge/for-next-merge
11608 Merge made by the 'recursive' strategy.
11609  drivers/scsi/mpt3sas/mpt3sas_base.h      |  25 +-
11610  drivers/scsi/mpt3sas/mpt3sas_scsih.c     | 595 ++++++++++++++++++++++---------
11611  drivers/scsi/mpt3sas/mpt3sas_transport.c |  18 +-
11612  3 files changed, 458 insertions(+), 180 deletions(-)
11613 Merging pinctrl/for-next (d99c8053fc24 pinctrl: pinconf: remove needless loop)
11614 $ git merge pinctrl/for-next
11615 Already up-to-date.
11616 Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache)
11617 $ git merge vhost/linux-next
11618 Merge made by the 'recursive' strategy.
11619  drivers/virtio/virtio_ring.c | 11 ++++++++++-
11620  1 file changed, 10 insertions(+), 1 deletion(-)
11621 Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage)
11622 $ git merge remoteproc/for-next
11623 Already up-to-date.
11624 Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
11625 $ git merge rpmsg/for-next
11626 Already up-to-date.
11627 Merging gpio/for-next (0963670aeaec gpio: fix up SPI submenu)
11628 $ git merge gpio/for-next
11629 Already up-to-date.
11630 Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
11631 $ git merge dma-mapping/dma-mapping-next
11632 Already up-to-date.
11633 Merging pwm/for-next (7e3b7dc76c41 pwm: Add MediaTek display PWM driver support)
11634 $ git merge pwm/for-next
11635 Merge made by the 'recursive' strategy.
11636  .../devicetree/bindings/pwm/brcm,bcm7038-pwm.txt   |  20 ++
11637  .../devicetree/bindings/pwm/pwm-berlin.txt         |  17 +
11638  .../devicetree/bindings/pwm/pwm-mtk-disp.txt       |  42 +++
11639  .../devicetree/bindings/pwm/renesas,pwm-rcar.txt   |  27 ++
11640  drivers/pwm/Kconfig                                |  47 ++-
11641  drivers/pwm/Makefile                               |   4 +
11642  drivers/pwm/pwm-atmel-hlcdc.c                      |   4 +
11643  drivers/pwm/pwm-berlin.c                           | 219 +++++++++++++
11644  drivers/pwm/pwm-brcmstb.c                          | 343 +++++++++++++++++++++
11645  drivers/pwm/pwm-mtk-disp.c                         | 243 +++++++++++++++
11646  drivers/pwm/pwm-rcar.c                             | 274 ++++++++++++++++
11647  11 files changed, 1237 insertions(+), 3 deletions(-)
11648  create mode 100644 Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.txt
11649  create mode 100644 Documentation/devicetree/bindings/pwm/pwm-berlin.txt
11650  create mode 100644 Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt
11651  create mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt
11652  create mode 100644 drivers/pwm/pwm-berlin.c
11653  create mode 100644 drivers/pwm/pwm-brcmstb.c
11654  create mode 100644 drivers/pwm/pwm-mtk-disp.c
11655  create mode 100644 drivers/pwm/pwm-rcar.c
11656 Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
11657 $ git merge dma-buf/for-next
11658 Already up-to-date.
11659 Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
11660 $ git merge userns/for-next
11661 Auto-merging fs/namei.c
11662 Merge made by the 'recursive' strategy.
11663  fs/namei.c | 7 ++-----
11664  1 file changed, 2 insertions(+), 5 deletions(-)
11665 Merging ktest/for-next (b953c0d234bc Linux 4.1)
11666 $ git merge ktest/for-next
11667 Already up-to-date.
11668 Merging clk/clk-next (e5bf1991ea62 clk: qcom: msm8960: Fix dsi1/2 halt bits)
11669 $ git merge clk/clk-next
11670 Resolved 'drivers/clk/Kconfig' using previous resolution.
11671 Auto-merging drivers/tty/serial/8250/8250_dw.c
11672 Auto-merging drivers/clk/shmobile/clk-mstp.c
11673 Auto-merging drivers/clk/rockchip/clk-mmc-phase.c
11674 Auto-merging drivers/clk/berlin/bg2q.c
11675 Auto-merging drivers/clk/Makefile
11676 Auto-merging drivers/clk/Kconfig
11677 CONFLICT (content): Merge conflict in drivers/clk/Kconfig
11678 Auto-merging drivers/base/power/domain.c
11679 Auto-merging arch/arm/mach-bcm/Kconfig
11680 Auto-merging arch/arm/mach-at91/Kconfig
11681 Automatic merge failed; fix conflicts and then commit the result.
11682 $ git commit -v -a
11683 [master 2c91072aab3b] Merge remote-tracking branch 'clk/clk-next'
11684 $ git diff -M --stat --summary HEAD^..
11685  .../bindings/arm/mediatek/mediatek,imgsys.txt      |  22 +
11686  .../bindings/arm/mediatek/mediatek,mmsys.txt       |  22 +
11687  .../bindings/arm/mediatek/mediatek,vdecsys.txt     |  22 +
11688  .../bindings/arm/mediatek/mediatek,vencltsys.txt   |  22 +
11689  .../bindings/arm/mediatek/mediatek,vencsys.txt     |  22 +
11690  .../devicetree/bindings/clock/at91-clock.txt       |  35 ++
11691  .../bindings/clock/brcm,iproc-clocks.txt           |  78 +++
11692  .../bindings/clock/renesas,cpg-div6-clocks.txt     |   2 +-
11693  .../devicetree/bindings/clock/renesas,cpg-mssr.txt |  69 +++
11694  .../devicetree/bindings/clock/silabs,si514.txt     |  24 +
11695  .../devicetree/bindings/clock/st/st,clkgen-pll.txt |   1 +
11696  arch/arm/mach-at91/Kconfig                         |   3 +
11697  arch/arm/mach-bcm/Kconfig                          |   2 +-
11698  drivers/base/power/domain.c                        |   2 +
11699  drivers/clk/Kconfig                                |  19 +-
11700  drivers/clk/Makefile                               |   3 +-
11701  drivers/clk/at91/Makefile                          |   1 +
11702  drivers/clk/at91/clk-generated.c                   | 306 +++++++++++
11703  drivers/clk/at91/clk-peripheral.c                  |  24 +-
11704  drivers/clk/at91/clk-system.c                      |   3 +-
11705  drivers/clk/at91/clk-utmi.c                        |   4 +-
11706  drivers/clk/at91/pmc.c                             |  21 +
11707  drivers/clk/at91/pmc.h                             |   3 +
11708  drivers/clk/bcm/Kconfig                            |   6 +-
11709  drivers/clk/bcm/Makefile                           |   3 +
11710  drivers/clk/bcm/clk-cygnus.c                       | 155 +++---
11711  drivers/clk/bcm/clk-iproc-pll.c                    | 196 +++----
11712  drivers/clk/bcm/clk-iproc.h                        |  22 +-
11713  drivers/clk/bcm/clk-ns2.c                          | 288 +++++++++++
11714  drivers/clk/bcm/clk-nsp.c                          | 139 +++++
11715  drivers/clk/berlin/bg2.c                           |   4 +-
11716  drivers/clk/berlin/bg2q.c                          |   2 +-
11717  drivers/clk/clk-divider.c                          |  20 +-
11718  drivers/clk/clk-fractional-divider.c               |  53 +-
11719  drivers/clk/clk-max77802.c                         |   2 +-
11720  drivers/clk/clk-multiplier.c                       |  51 --
11721  drivers/clk/clk-si514.c                            | 379 ++++++++++++++
11722  drivers/clk/clk-si5351.c                           |  17 +-
11723  drivers/clk/clk-xgene.c                            |   1 -
11724  drivers/clk/clk.c                                  |  38 +-
11725  drivers/clk/hisilicon/clk-hi6220-stub.c            |   2 +-
11726  drivers/clk/imx/clk-imx27.c                        |   4 +-
11727  drivers/clk/imx/clk-imx31.c                        |   4 +-
11728  drivers/clk/imx/clk-pllv2.c                        |  12 +-
11729  drivers/clk/keystone/pll.c                         |   2 +-
11730  drivers/clk/mediatek/Makefile                      |   2 +-
11731  drivers/clk/mediatek/clk-apmixed.c                 | 107 ++++
11732  drivers/clk/mediatek/clk-gate.c                    |   2 +-
11733  drivers/clk/mediatek/clk-mt8173.c                  | 347 ++++++++++++-
11734  drivers/clk/mediatek/clk-mtk.c                     |  36 +-
11735  drivers/clk/mediatek/clk-mtk.h                     |  24 +-
11736  drivers/clk/mediatek/clk-pll.c                     |   7 +-
11737  drivers/clk/mvebu/clk-cpu.c                        |   4 +-
11738  drivers/clk/mvebu/common.c                         |   2 +-
11739  drivers/clk/mxs/clk-frac.c                         |  12 +-
11740  drivers/clk/nxp/clk-lpc18xx-ccu.c                  |  17 +-
11741  drivers/clk/nxp/clk-lpc18xx-cgu.c                  |  42 +-
11742  drivers/clk/qcom/Kconfig                           |   9 +
11743  drivers/clk/qcom/Makefile                          |   1 +
11744  drivers/clk/qcom/clk-rcg.c                         | 230 +++++++++
11745  drivers/clk/qcom/clk-rcg.h                         |   8 +-
11746  drivers/clk/qcom/clk-rcg2.c                        | 170 +++++-
11747  drivers/clk/qcom/common.c                          |  42 +-
11748  drivers/clk/qcom/common.h                          |   4 +-
11749  drivers/clk/qcom/gcc-apq8084.c                     |  49 +-
11750  drivers/clk/qcom/gcc-ipq806x.c                     |   7 -
11751  drivers/clk/qcom/gcc-msm8660.c                     |   7 -
11752  drivers/clk/qcom/gcc-msm8916.c                     | 569 ++++++++++++++++++++-
11753  drivers/clk/qcom/gcc-msm8960.c                     |  20 +-
11754  drivers/clk/qcom/gcc-msm8974.c                     |  22 +-
11755  drivers/clk/qcom/gdsc.c                            | 237 +++++++++
11756  drivers/clk/qcom/gdsc.h                            |  68 +++
11757  drivers/clk/qcom/lcc-ipq806x.c                     |   7 -
11758  drivers/clk/qcom/lcc-msm8960.c                     |   7 -
11759  drivers/clk/qcom/mmcc-apq8084.c                    | 111 +++-
11760  drivers/clk/qcom/mmcc-msm8960.c                    | 411 ++++++++++++++-
11761  drivers/clk/qcom/mmcc-msm8974.c                    |  92 +++-
11762  drivers/clk/rockchip/clk-mmc-phase.c               |  11 +
11763  drivers/clk/rockchip/clk-pll.c                     | 135 ++---
11764  drivers/clk/rockchip/clk.c                         |   6 +-
11765  drivers/clk/samsung/clk-exynos7.c                  | 467 +++++++++++------
11766  drivers/clk/shmobile/clk-mstp.c                    |   2 +-
11767  drivers/clk/shmobile/clk-r8a7778.c                 |   8 +-
11768  drivers/clk/sirf/clk-atlas7.c                      | 358 +++++++------
11769  drivers/clk/st/clk-flexgen.c                       |   7 +-
11770  drivers/clk/st/clkgen-mux.c                        |   3 +
11771  drivers/clk/st/clkgen-pll.c                        | 469 ++++++++++++++++-
11772  drivers/clk/st/clkgen.h                            |   2 +
11773  drivers/clk/sunxi/clk-sun6i-apb0-gates.c           |   1 +
11774  drivers/clk/sunxi/clk-sun6i-apb0.c                 |   1 +
11775  drivers/clk/sunxi/clk-sun6i-ar100.c                |   1 +
11776  drivers/clk/sunxi/clk-sun8i-apb0.c                 |   1 +
11777  drivers/clk/sunxi/clk-sun9i-mmc.c                  |   1 +
11778  drivers/clk/tegra/clk-emc.c                        |   4 +-
11779  drivers/clk/versatile/Kconfig                      |   2 +-
11780  drivers/clk/versatile/clk-icst.c                   |   4 +-
11781  drivers/tty/serial/8250/8250_dw.c                  |   4 -
11782  include/dt-bindings/clock/at91.h                   |   1 +
11783  include/dt-bindings/clock/bcm-ns2.h                |  72 +++
11784  include/dt-bindings/clock/bcm-nsp.h                |  51 ++
11785  include/dt-bindings/clock/exynos7-clk.h            |  43 +-
11786  include/dt-bindings/clock/mt8173-clk.h             | 104 +++-
11787  include/dt-bindings/clock/qcom,gcc-apq8084.h       |   6 +
11788  include/dt-bindings/clock/qcom,gcc-msm8916.h       |  30 ++
11789  include/dt-bindings/clock/qcom,gcc-msm8974.h       |   3 +
11790  include/dt-bindings/clock/qcom,mmcc-apq8084.h      |  10 +
11791  include/dt-bindings/clock/qcom,mmcc-msm8974.h      |   8 +
11792  include/dt-bindings/clock/r8a7795-cpg-mssr.h       |  63 +++
11793  include/dt-bindings/clock/renesas-cpg-mssr.h       |  15 +
11794  include/linux/clk-provider.h                       |  22 +-
11795  include/linux/clk/at91_pmc.h                       |  22 +-
11796  111 files changed, 5837 insertions(+), 883 deletions(-)
11797  create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,imgsys.txt
11798  create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
11799  create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vdecsys.txt
11800  create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vencltsys.txt
11801  create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vencsys.txt
11802  create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
11803  create mode 100644 Documentation/devicetree/bindings/clock/silabs,si514.txt
11804  create mode 100644 drivers/clk/at91/clk-generated.c
11805  create mode 100644 drivers/clk/bcm/clk-ns2.c
11806  create mode 100644 drivers/clk/bcm/clk-nsp.c
11807  create mode 100644 drivers/clk/clk-si514.c
11808  create mode 100644 drivers/clk/mediatek/clk-apmixed.c
11809  create mode 100644 drivers/clk/qcom/gdsc.c
11810  create mode 100644 drivers/clk/qcom/gdsc.h
11811  create mode 100644 include/dt-bindings/clock/bcm-ns2.h
11812  create mode 100644 include/dt-bindings/clock/bcm-nsp.h
11813  create mode 100644 include/dt-bindings/clock/r8a7795-cpg-mssr.h
11814  create mode 100644 include/dt-bindings/clock/renesas-cpg-mssr.h
11815 Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
11816 $ git merge random/dev
11817 Already up-to-date.
11818 Merging aio/master (6ff33f3902c3 Linux 4.3-rc1)
11819 $ git merge aio/master
11820 Already up-to-date.
11821 Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
11822 $ git merge llvmlinux/for-next
11823 Merge made by the 'recursive' strategy.
11824 Merging kselftest/next (3b5bab390181 selftests: breakpoint: Actually build it)
11825 $ git merge kselftest/next
11826 Merge made by the 'recursive' strategy.
11827  tools/testing/selftests/Makefile                   |   4 +
11828  tools/testing/selftests/breakpoints/Makefile       |   2 +-
11829  tools/testing/selftests/efivarfs/.gitignore        |   2 +
11830  .../ftrace/test.d/kprobe/add_and_remove.tc         |   2 +-
11831  .../selftests/ftrace/test.d/kprobe/busy_check.tc   |   2 +-
11832  .../selftests/ftrace/test.d/kprobe/kprobe_args.tc  |   2 +-
11833  .../ftrace/test.d/kprobe/kprobe_ftrace.tc          |  14 +--
11834  .../ftrace/test.d/kprobe/kretprobe_args.tc         |   2 +-
11835  tools/testing/selftests/memfd/Makefile             |  12 +--
11836  tools/testing/selftests/memfd/memfd_test.c         |   3 +-
11837  tools/testing/selftests/memfd/run_fuse_test.sh     |   0
11838  tools/testing/selftests/mqueue/mq_open_tests.c     |   1 +
11839  tools/testing/selftests/mqueue/mq_perf_tests.c     |   1 +
11840  tools/testing/selftests/pstore/Makefile            |  15 +++
11841  tools/testing/selftests/pstore/common_tests        |  83 +++++++++++++++
11842  tools/testing/selftests/pstore/pstore_crash_test   |  30 ++++++
11843  .../selftests/pstore/pstore_post_reboot_tests      |  77 ++++++++++++++
11844  tools/testing/selftests/pstore/pstore_tests        |  30 ++++++
11845  tools/testing/selftests/seccomp/seccomp_bpf.c      | 117 +++++++++++++++------
11846  .../selftests/static_keys/test_static_keys.sh      |   0
11847  tools/testing/selftests/timers/nanosleep.c         |   1 +
11848  tools/testing/selftests/vm/run_vmtests             |  15 ++-
11849  22 files changed, 362 insertions(+), 53 deletions(-)
11850  create mode 100644 tools/testing/selftests/efivarfs/.gitignore
11851  mode change 100644 => 100755 tools/testing/selftests/memfd/run_fuse_test.sh
11852  create mode 100644 tools/testing/selftests/pstore/Makefile
11853  create mode 100755 tools/testing/selftests/pstore/common_tests
11854  create mode 100755 tools/testing/selftests/pstore/pstore_crash_test
11855  create mode 100755 tools/testing/selftests/pstore/pstore_post_reboot_tests
11856  create mode 100755 tools/testing/selftests/pstore/pstore_tests
11857  mode change 100644 => 100755 tools/testing/selftests/static_keys/test_static_keys.sh
11858 Merging y2038/y2038 (8750343a6505 coredump: Use 64bit time for unix time of coredump)
11859 $ git merge y2038/y2038
11860 Auto-merging kernel/cpuset.c
11861 Auto-merging drivers/staging/media/lirc/lirc_serial.c
11862 Auto-merging drivers/staging/media/lirc/lirc_sasem.c
11863 Auto-merging drivers/staging/gdm72xx/gdm_sdio.c
11864 Merge made by the 'recursive' strategy.
11865  drivers/staging/gdm72xx/gdm_sdio.c         | 13 ++++----
11866  drivers/staging/gdm72xx/gdm_sdio.h         |  4 +--
11867  drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++++------------
11868  drivers/staging/media/lirc/lirc_sasem.c    | 20 ++++++------
11869  drivers/staging/media/lirc/lirc_serial.c   | 50 ++++++++++--------------------
11870  fs/coredump.c                              |  8 +++--
11871  kernel/cpuset.c                            | 12 ++++---
11872  7 files changed, 62 insertions(+), 80 deletions(-)
11873 Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
11874 $ git merge luto-misc/next
11875 Already up-to-date.
11876 Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic)
11877 $ git merge access_once/linux-next
11878 Recorded preimage for 'include/linux/compiler.h'
11879 Auto-merging include/linux/compiler.h
11880 CONFLICT (content): Merge conflict in include/linux/compiler.h
11881 Automatic merge failed; fix conflicts and then commit the result.
11882 $ git commit -v -a
11883 Recorded resolution for 'include/linux/compiler.h'.
11884 [master 60888d63b3bd] Merge remote-tracking branch 'access_once/linux-next'
11885 $ git diff -M --stat --summary HEAD^..
11886 Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next)
11887 $ git merge livepatching/for-next
11888 Already up-to-date!
11889 Merge made by the 'recursive' strategy.
11890 Merging coresight/next (c0d90ad7604a coresight: checking for NULL string in coresight_name_match())
11891 $ git merge coresight/next
11892 Auto-merging drivers/hwtracing/coresight/coresight.c
11893 Merge made by the 'recursive' strategy.
11894  drivers/hwtracing/coresight/coresight.c | 2 +-
11895  1 file changed, 1 insertion(+), 1 deletion(-)
11896 Merging rtc/rtc-next (55e213095fb3 rtc: Add a driver for Micro Crystal RV8803)
11897 $ git merge rtc/rtc-next
11898 Auto-merging drivers/rtc/rtc-ds1390.c
11899 Auto-merging drivers/rtc/rtc-ds1343.c
11900 Merge made by the 'recursive' strategy.
11901  .../devicetree/bindings/rtc/dallas,ds1390.txt      |  18 +
11902  Documentation/devicetree/bindings/rtc/pcf8563.txt  |  25 +
11903  drivers/rtc/Kconfig                                |  13 +-
11904  drivers/rtc/Makefile                               |   1 +
11905  drivers/rtc/rtc-ab8500.c                           |   6 +-
11906  drivers/rtc/rtc-at91rm9200.c                       |   2 +
11907  drivers/rtc/rtc-da9063.c                           |  18 +-
11908  drivers/rtc/rtc-davinci.c                          |   1 -
11909  drivers/rtc/rtc-ds1307.c                           |   4 +-
11910  drivers/rtc/rtc-ds1343.c                           |   9 +-
11911  drivers/rtc/rtc-ds1390.c                           |  65 ++-
11912  drivers/rtc/rtc-isl12057.c                         |  10 +-
11913  drivers/rtc/rtc-isl1208.c                          |   2 +-
11914  drivers/rtc/rtc-opal.c                             |   9 +-
11915  drivers/rtc/rtc-pcf2127.c                          |  47 +-
11916  drivers/rtc/rtc-pcf85063.c                         |   8 +-
11917  drivers/rtc/rtc-pcf8563.c                          | 170 ++++++-
11918  drivers/rtc/rtc-pl031.c                            |  13 +-
11919  drivers/rtc/rtc-rv8803.c                           | 522 +++++++++++++++++++++
11920  drivers/rtc/rtc-rx8025.c                           |   4 +-
11921  drivers/rtc/rtc-s3c.c                              |  16 +
11922  drivers/rtc/rtc-stmp3xxx.c                         |  27 +-
11923  tools/testing/selftests/timers/rtctest.c           |   2 +-
11924  23 files changed, 909 insertions(+), 83 deletions(-)
11925  create mode 100644 Documentation/devicetree/bindings/rtc/dallas,ds1390.txt
11926  create mode 100644 Documentation/devicetree/bindings/rtc/pcf8563.txt
11927  create mode 100644 drivers/rtc/rtc-rv8803.c
11928 Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
11929 $ git merge hwspinlock/for-next
11930 Already up-to-date.
11931 Merging nvdimm/libnvdimm-for-next (538ea4aa4473 pmem, memremap: convert to numa aware allocations)
11932 $ git merge nvdimm/libnvdimm-for-next
11933 Auto-merging kernel/memremap.c
11934 Auto-merging arch/x86/mm/init_64.c
11935 Auto-merging arch/x86/mm/init.c
11936 Merge made by the 'recursive' strategy.
11937  arch/x86/mm/init.c     |  4 ++--
11938  arch/x86/mm/init_64.c  |  4 ++--
11939  drivers/base/devres.c  | 19 ++++++++++---------
11940  drivers/nvdimm/pmem.c  | 28 +++++++++++++---------------
11941  include/linux/device.h | 16 ++++++++++++----
11942  include/linux/pmem.h   | 26 +-------------------------
11943  kernel/memremap.c      | 16 ++++++++--------
11944  7 files changed, 48 insertions(+), 65 deletions(-)
11945 $ git am -3 ../patches/0001-Revert-thermal-rockchip-support-the-sleep-pinctrl-st.patch
11946 Applying: Revert "thermal: rockchip: support the sleep pinctrl state to avoid glitches in s2r"
11947 Merging akpm-current/current (f1e1fabe6b48 ipc/msg.c: use freezable blocking call)
11948 $ git merge --no-ff akpm-current/current
11949 Resolved 'arch/arc/mm/cache.c' using previous resolution.
11950 Resolved 'arch/s390/include/asm/pgtable.h' using previous resolution.
11951 Resolved 'block/blk-mq.c' using previous resolution.
11952 Resolved 'drivers/usb/host/u132-hcd.c' using previous resolution.
11953 Resolved 'fs/9p/vfs_file.c' using previous resolution.
11954 Resolved 'fs/proc/task_mmu.c' using previous resolution.
11955 Resolved 'mm/failslab.c' using previous resolution.
11956 Resolved 'mm/huge_memory.c' using previous resolution.
11957 Resolved 'mm/page_alloc.c' using previous resolution.
11958 Resolved 'mm/pgtable-generic.c' using previous resolution.
11959 Auto-merging tools/testing/selftests/vm/run_vmtests
11960 Auto-merging tools/testing/selftests/Makefile
11961 Auto-merging net/rxrpc/ar-connection.c
11962 Auto-merging net/rds/ib_recv.c
11963 Auto-merging net/openvswitch/flow.c
11964 Auto-merging net/netlink/af_netlink.c
11965 Auto-merging net/core/sock.c
11966 Auto-merging mm/vmscan.c
11967 Auto-merging mm/vmalloc.c
11968 Auto-merging mm/pgtable-generic.c
11969 CONFLICT (content): Merge conflict in mm/pgtable-generic.c
11970 Auto-merging mm/page_alloc.c
11971 CONFLICT (content): Merge conflict in mm/page_alloc.c
11972 Auto-merging mm/memory_hotplug.c
11973 Auto-merging mm/memcontrol.c
11974 Auto-merging mm/huge_memory.c
11975 CONFLICT (content): Merge conflict in mm/huge_memory.c
11976 Auto-merging mm/filemap.c
11977 Auto-merging mm/failslab.c
11978 CONFLICT (content): Merge conflict in mm/failslab.c
11979 Auto-merging mm/cma.c
11980 Auto-merging mm/backing-dev.c
11981 Auto-merging lib/kobject.c
11982 Auto-merging lib/dma-debug.c
11983 Auto-merging lib/Makefile
11984 Auto-merging lib/Kconfig.debug
11985 Auto-merging kernel/sysctl.c
11986 Auto-merging kernel/params.c
11987 Auto-merging kernel/kexec_core.c
11988 Auto-merging kernel/futex.c
11989 Auto-merging kernel/fork.c
11990 Auto-merging kernel/cpuset.c
11991 Auto-merging kernel/cgroup.c
11992 Auto-merging kernel/audit.c
11993 Auto-merging include/net/sock.h
11994 Auto-merging include/linux/skbuff.h
11995 Auto-merging include/linux/sched.h
11996 Auto-merging include/linux/memcontrol.h
11997 Auto-merging include/linux/hugetlb_cgroup.h
11998 Auto-merging include/linux/fs.h
11999 Auto-merging include/linux/compiler.h
12000 Auto-merging include/linux/compiler-gcc.h
12001 Auto-merging include/drm/drmP.h
12002 Auto-merging include/asm-generic/pgtable.h
12003 Auto-merging fs/xfs/xfs_qm.c
12004 Auto-merging fs/proc/task_mmu.c
12005 CONFLICT (content): Merge conflict in fs/proc/task_mmu.c
12006 Auto-merging fs/proc/array.c
12007 Auto-merging fs/ocfs2/dlm/dlmrecovery.c
12008 Auto-merging fs/ocfs2/cluster/heartbeat.c
12009 Auto-merging fs/nfs/file.c
12010 Auto-merging fs/namei.c
12011 Auto-merging fs/mpage.c
12012 Auto-merging fs/jffs2/wbuf.c
12013 Auto-merging fs/fs-writeback.c
12014 Auto-merging fs/ext4/super.c
12015 Auto-merging fs/ext4/readpage.c
12016 Auto-merging fs/ext4/inode.c
12017 Auto-merging fs/direct-io.c
12018 Auto-merging fs/coredump.c
12019 Auto-merging fs/cifs/file.c
12020 Auto-merging fs/9p/vfs_file.c
12021 CONFLICT (content): Merge conflict in fs/9p/vfs_file.c
12022 Auto-merging drivers/usb/host/u132-hcd.c
12023 CONFLICT (content): Merge conflict in drivers/usb/host/u132-hcd.c
12024 Auto-merging drivers/usb/gadget/function/f_mass_storage.c
12025 Auto-merging drivers/staging/rdma/ipath/ipath_file_ops.c
12026 Auto-merging drivers/staging/rdma/hfi1/init.c
12027 Auto-merging drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
12028 Auto-merging drivers/staging/android/ion/ion_system_heap.c
12029 Auto-merging drivers/nvme/host/pci.c
12030 Auto-merging drivers/mtd/mtdcore.c
12031 Auto-merging drivers/misc/vmw_balloon.c
12032 Auto-merging drivers/media/pci/tw68/tw68-video.c
12033 Auto-merging drivers/media/pci/solo6x10/solo6x10-v4l2.c
12034 Auto-merging drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
12035 Auto-merging drivers/md/dm-crypt.c
12036 Auto-merging drivers/iommu/intel-iommu.c
12037 Auto-merging drivers/iommu/amd_iommu.c
12038 Auto-merging drivers/infiniband/core/sa_query.c
12039 Auto-merging drivers/gpu/drm/i915/i915_gem.c
12040 Auto-merging drivers/gpu/drm/drm_gem.c
12041 Auto-merging drivers/block/pktcdvd.c
12042 Auto-merging drivers/block/nbd.c
12043 Auto-merging drivers/block/drbd/drbd_bitmap.c
12044 Auto-merging block/genhd.c
12045 Auto-merging block/blk-mq.c
12046 CONFLICT (content): Merge conflict in block/blk-mq.c
12047 Auto-merging block/blk-mq-tag.c
12048 Auto-merging block/blk-core.c
12049 Auto-merging arch/x86/mm/gup.c
12050 Auto-merging arch/x86/kernel/smpboot.c
12051 Auto-merging arch/x86/kernel/pci-dma.c
12052 Auto-merging arch/x86/kernel/acpi/boot.c
12053 Auto-merging arch/x86/include/asm/pgtable_types.h
12054 Auto-merging arch/x86/include/asm/pgtable.h
12055 Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
12056 Auto-merging arch/x86/Kconfig
12057 Auto-merging arch/s390/include/asm/pgtable.h
12058 CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h
12059 Auto-merging arch/powerpc/sysdev/fsl_pci.c
12060 Auto-merging arch/powerpc/mm/numa.c
12061 Auto-merging arch/powerpc/mm/hugetlbpage.c
12062 Auto-merging arch/powerpc/include/asm/pgtable-ppc64.h
12063 Auto-merging arch/mips/mm/tlbex.c
12064 Auto-merging arch/arm64/mm/dma-mapping.c
12065 Auto-merging arch/arm64/include/asm/pgtable.h
12066 Auto-merging arch/arm/xen/mm.c
12067 Auto-merging arch/arm/mm/dma-mapping.c
12068 Auto-merging arch/arc/mm/cache.c
12069 CONFLICT (content): Merge conflict in arch/arc/mm/cache.c
12070 Auto-merging MAINTAINERS
12071 Auto-merging Documentation/kernel-parameters.txt
12072 Auto-merging Documentation/filesystems/proc.txt
12073 Removing Documentation/features/vm/pmdp_splitting_flush/arch-support.txt
12074 Automatic merge failed; fix conflicts and then commit the result.
12075 $ git commit -v -a
12076 [master 9d6e9591f56d] Merge branch 'akpm-current/current'
12077 $ git diff -M --stat --summary HEAD^..
12078  .../vm/pmdp_splitting_flush/arch-support.txt       |   40 -
12079  Documentation/filesystems/proc.txt                 |   11 +-
12080  Documentation/filesystems/vfat.txt                 |   10 +
12081  Documentation/kasan.txt                            |   46 +-
12082  Documentation/kernel-parameters.txt                |    5 +
12083  Documentation/lockup-watchdogs.txt                 |    5 +-
12084  Documentation/printk-formats.txt                   |   29 +
12085  Documentation/sysctl/kernel.txt                    |   12 +
12086  Documentation/vm/balance                           |   14 +-
12087  Documentation/vm/page_migration                    |   27 +-
12088  Documentation/vm/split_page_table_lock             |    4 +-
12089  Documentation/vm/transhuge.txt                     |  161 ++-
12090  Documentation/vm/unevictable-lru.txt               |  120 +-
12091  MAINTAINERS                                        |    1 +
12092  arch/alpha/include/uapi/asm/mman.h                 |    4 +
12093  arch/arc/mm/cache.c                                |    4 +-
12094  arch/arm/include/asm/pgtable-3level.h              |   10 +-
12095  arch/arm/lib/uaccess_with_memcpy.c                 |    5 +-
12096  arch/arm/mm/alignment.c                            |    2 +-
12097  arch/arm/mm/dma-mapping.c                          |    6 +-
12098  arch/arm/mm/flush.c                                |   17 +-
12099  arch/arm/xen/mm.c                                  |    2 +-
12100  arch/arm64/include/asm/pgtable.h                   |   10 +-
12101  arch/arm64/mm/dma-mapping.c                        |    4 +-
12102  arch/arm64/mm/flush.c                              |   16 -
12103  arch/mips/include/asm/pgtable-bits.h               |   10 +-
12104  arch/mips/include/asm/pgtable.h                    |   18 -
12105  arch/mips/include/uapi/asm/mman.h                  |    7 +
12106  arch/mips/mm/c-r4k.c                               |    3 +-
12107  arch/mips/mm/cache.c                               |    2 +-
12108  arch/mips/mm/gup.c                                 |   17 +-
12109  arch/mips/mm/init.c                                |    6 +-
12110  arch/mips/mm/pgtable-64.c                          |   14 -
12111  arch/mips/mm/tlbex.c                               |    1 -
12112  arch/parisc/include/uapi/asm/mman.h                |    4 +
12113  arch/powerpc/include/asm/pgtable-ppc64.h           |   29 +-
12114  arch/powerpc/include/uapi/asm/mman.h               |    1 +
12115  arch/powerpc/mm/hugepage-hash64.c                  |    3 -
12116  arch/powerpc/mm/hugetlbpage.c                      |   17 +-
12117  arch/powerpc/mm/numa.c                             |    2 +-
12118  arch/powerpc/mm/pgtable_64.c                       |   49 -
12119  arch/powerpc/mm/subpage-prot.c                     |    2 +-
12120  arch/powerpc/sysdev/fsl_pci.c                      |    2 +-
12121  arch/s390/include/asm/pgtable.h                    |   16 +-
12122  arch/s390/mm/gup.c                                 |   24 +-
12123  arch/s390/mm/pgtable.c                             |   16 -
12124  arch/sh/kernel/cpu/sh5/unwind.c                    |    2 +-
12125  arch/sh/kernel/traps_64.c                          |    2 +-
12126  arch/sh/mm/cache-sh4.c                             |    2 +-
12127  arch/sh/mm/cache.c                                 |    8 +-
12128  arch/sparc/include/asm/pgtable_64.h                |   19 +-
12129  arch/sparc/include/uapi/asm/mman.h                 |    1 +
12130  arch/sparc/mm/fault_64.c                           |    3 -
12131  arch/sparc/mm/gup.c                                |   16 +-
12132  arch/tile/include/asm/pgtable.h                    |   10 -
12133  arch/tile/include/uapi/asm/mman.h                  |    1 +
12134  arch/x86/Kconfig                                   |    3 +
12135  arch/x86/boot/Makefile                             |    4 +-
12136  arch/x86/entry/syscalls/syscall_32.tbl             |    1 +
12137  arch/x86/entry/syscalls/syscall_64.tbl             |    1 +
12138  arch/x86/include/asm/pgtable.h                     |   14 +-
12139  arch/x86/include/asm/pgtable_types.h               |    2 -
12140  arch/x86/kernel/acpi/boot.c                        |    9 +-
12141  arch/x86/kernel/cpu/perf_event_msr.c               |    7 +-
12142  arch/x86/kernel/machine_kexec_64.c                 |    1 +
12143  arch/x86/kernel/pci-dma.c                          |    2 +-
12144  arch/x86/kernel/smpboot.c                          |    2 +
12145  arch/x86/kernel/vm86_32.c                          |    6 +-
12146  arch/x86/mm/gup.c                                  |   17 +-
12147  arch/x86/mm/kasan_init_64.c                        |    2 +-
12148  arch/x86/mm/numa.c                                 |   59 +-
12149  arch/x86/mm/pgtable.c                              |   14 -
12150  arch/xtensa/configs/iss_defconfig                  |    1 -
12151  arch/xtensa/include/uapi/asm/mman.h                |    7 +
12152  arch/xtensa/mm/tlb.c                               |    2 +-
12153  block/bio.c                                        |   26 +-
12154  block/blk-core.c                                   |   16 +-
12155  block/blk-ioc.c                                    |    2 +-
12156  block/blk-mq-tag.c                                 |    2 +-
12157  block/blk-mq.c                                     |    6 +-
12158  block/genhd.c                                      |    2 +-
12159  block/ioprio.c                                     |    6 +-
12160  block/scsi_ioctl.c                                 |    6 +-
12161  drivers/block/drbd/drbd_bitmap.c                   |    2 +-
12162  drivers/block/drbd/drbd_receiver.c                 |    3 +-
12163  drivers/block/mtip32xx/mtip32xx.c                  |    2 +-
12164  drivers/block/nbd.c                                |    9 +-
12165  drivers/block/osdblk.c                             |    2 +-
12166  drivers/block/paride/pd.c                          |    2 +-
12167  drivers/block/pktcdvd.c                            |    4 +-
12168  drivers/block/zram/zram_drv.c                      |   28 +-
12169  drivers/connector/connector.c                      |    3 +-
12170  drivers/firewire/core-cdev.c                       |    2 +-
12171  drivers/gpu/drm/drm_gem.c                          |    2 +-
12172  drivers/gpu/drm/drm_lock.c                         |   41 -
12173  drivers/gpu/drm/i915/i915_gem.c                    |    5 +-
12174  drivers/ide/ide-atapi.c                            |    2 +-
12175  drivers/ide/ide-cd.c                               |    2 +-
12176  drivers/ide/ide-cd_ioctl.c                         |    2 +-
12177  drivers/ide/ide-devsets.c                          |    2 +-
12178  drivers/ide/ide-disk.c                             |    2 +-
12179  drivers/ide/ide-ioctls.c                           |    4 +-
12180  drivers/ide/ide-park.c                             |    2 +-
12181  drivers/ide/ide-pm.c                               |    4 +-
12182  drivers/ide/ide-tape.c                             |    4 +-
12183  drivers/ide/ide-taskfile.c                         |    4 +-
12184  drivers/infiniband/core/sa_query.c                 |    2 +-
12185  drivers/infiniband/hw/qib/qib_init.c               |    2 +-
12186  drivers/iommu/amd_iommu.c                          |    2 +-
12187  drivers/iommu/intel-iommu.c                        |    2 +-
12188  drivers/md/dm-crypt.c                              |    6 +-
12189  drivers/md/dm-kcopyd.c                             |    2 +-
12190  drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c     |    2 +-
12191  drivers/media/pci/solo6x10/solo6x10-v4l2.c         |    2 +-
12192  drivers/media/pci/tw68/tw68-video.c                |    2 +-
12193  drivers/misc/sgi-xp/xpc_uv.c                       |    2 +-
12194  drivers/misc/vmw_balloon.c                         |    2 +-
12195  drivers/mtd/mtdcore.c                              |    3 +-
12196  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |    2 +-
12197  drivers/nvme/host/pci.c                            |    4 +-
12198  drivers/scsi/scsi_error.c                          |    2 +-
12199  drivers/scsi/scsi_lib.c                            |    4 +-
12200  drivers/staging/android/ion/ion_system_heap.c      |    2 +-
12201  .../lustre/include/linux/libcfs/libcfs_private.h   |    2 +-
12202  drivers/staging/rdma/hfi1/init.c                   |    2 +-
12203  drivers/staging/rdma/ipath/ipath_file_ops.c        |    2 +-
12204  drivers/usb/gadget/function/f_mass_storage.c       |    4 +-
12205  drivers/usb/host/u132-hcd.c                        |    2 +-
12206  drivers/video/fbdev/vermilion/vermilion.c          |    2 +-
12207  fs/9p/vfs_file.c                                   |    3 +-
12208  fs/btrfs/compression.c                             |    7 +-
12209  fs/btrfs/ctree.h                                   |    2 +-
12210  fs/btrfs/disk-io.c                                 |    2 +-
12211  fs/btrfs/extent_io.c                               |   14 +-
12212  fs/btrfs/free-space-cache.c                        |    4 +-
12213  fs/btrfs/volumes.c                                 |    4 +-
12214  fs/buffer.c                                        |    2 +-
12215  fs/cachefiles/internal.h                           |    2 +-
12216  fs/ceph/addr.c                                     |    7 +-
12217  fs/cifs/file.c                                     |   10 +-
12218  fs/coredump.c                                      |   35 +-
12219  fs/direct-io.c                                     |    2 +-
12220  fs/ext4/fsync.c                                    |    5 +-
12221  fs/ext4/inode.c                                    |    2 +-
12222  fs/ext4/readpage.c                                 |    2 +-
12223  fs/ext4/super.c                                    |    2 +-
12224  fs/fat/cache.c                                     |   79 +-
12225  fs/fat/dir.c                                       |    2 +-
12226  fs/fat/fat.h                                       |    6 +-
12227  fs/fat/file.c                                      |   61 +
12228  fs/fat/inode.c                                     |   75 +-
12229  fs/fs-writeback.c                                  |    7 +-
12230  fs/fscache/cookie.c                                |    2 +-
12231  fs/fscache/page.c                                  |    6 +-
12232  fs/hugetlbfs/inode.c                               |  155 ++-
12233  fs/jbd2/transaction.c                              |    4 +-
12234  fs/jffs2/background.c                              |    7 +-
12235  fs/jffs2/wbuf.c                                    |    2 +-
12236  fs/logfs/dev_bdev.c                                |    4 +-
12237  fs/logfs/segment.c                                 |    2 +-
12238  fs/mpage.c                                         |    4 +-
12239  fs/namei.c                                         |    2 +-
12240  fs/nfs/file.c                                      |    6 +-
12241  fs/nilfs2/alloc.c                                  |  308 +++--
12242  fs/nilfs2/alloc.h                                  |    1 +
12243  fs/nilfs2/btree.c                                  |    7 +-
12244  fs/nilfs2/dat.c                                    |    2 -
12245  fs/nilfs2/inode.c                                  |    4 +-
12246  fs/nilfs2/mdt.c                                    |    6 +
12247  fs/nilfs2/mdt.h                                    |    2 +-
12248  fs/nilfs2/recovery.c                               |    4 +-
12249  fs/nilfs2/segment.c                                |  107 +-
12250  fs/nilfs2/segment.h                                |    3 +-
12251  fs/nilfs2/sufile.c                                 |   11 +-
12252  fs/nilfs2/super.c                                  |   17 +-
12253  fs/notify/fdinfo.c                                 |    9 +-
12254  fs/notify/inotify/inotify_user.c                   |   14 +-
12255  fs/ntfs/file.c                                     |    4 +-
12256  fs/ocfs2/alloc.c                                   |  105 +-
12257  fs/ocfs2/aops.c                                    | 1118 ++++++++--------
12258  fs/ocfs2/aops.h                                    |   11 +-
12259  fs/ocfs2/cluster/heartbeat.c                       |   19 +-
12260  fs/ocfs2/dlm/dlmconvert.c                          |   24 +-
12261  fs/ocfs2/dlm/dlmrecovery.c                         |    1 -
12262  fs/ocfs2/file.c                                    |  138 +-
12263  fs/ocfs2/inode.c                                   |    3 +
12264  fs/ocfs2/inode.h                                   |    5 +
12265  fs/ocfs2/journal.c                                 |  109 +-
12266  fs/ocfs2/localalloc.c                              |    4 +-
12267  fs/ocfs2/mmap.c                                    |    4 +-
12268  fs/ocfs2/namei.c                                   |   13 +-
12269  fs/ocfs2/namei.h                                   |    3 +
12270  fs/ocfs2/ocfs2.h                                   |    8 +
12271  fs/ocfs2/ocfs2_trace.h                             |   16 +-
12272  fs/ocfs2/quota_global.c                            |    2 +-
12273  fs/ocfs2/resize.c                                  |    2 +-
12274  fs/ocfs2/suballoc.c                                |    5 +-
12275  fs/ocfs2/super.c                                   |   38 +-
12276  fs/ocfs2/super.h                                   |    2 -
12277  fs/proc/array.c                                    |   10 +-
12278  fs/proc/page.c                                     |    4 +-
12279  fs/proc/task_mmu.c                                 |  115 +-
12280  fs/seq_file.c                                      |   51 +-
12281  fs/splice.c                                        |    2 +-
12282  fs/sync.c                                          |    7 +-
12283  fs/xfs/xfs_qm.c                                    |    2 +-
12284  include/asm-generic/dma-mapping-common.h           |    2 +-
12285  include/asm-generic/pgtable.h                      |    9 -
12286  include/drm/drmP.h                                 |    1 -
12287  include/linux/bitops.h                             |   13 +
12288  include/linux/compaction.h                         |    3 +-
12289  include/linux/compiler-gcc.h                       |   22 +-
12290  include/linux/compiler.h                           |    8 +
12291  include/linux/cpuset.h                             |   10 +-
12292  include/linux/crc64_ecma.h                         |   56 +
12293  include/linux/dma-debug.h                          |    6 +-
12294  include/linux/dma-mapping.h                        |   18 +-
12295  include/linux/fs.h                                 |    1 +
12296  include/linux/gfp.h                                |  287 ++--
12297  include/linux/huge_mm.h                            |   60 +-
12298  include/linux/hugetlb.h                            |   29 +
12299  include/linux/hugetlb_cgroup.h                     |    4 +-
12300  include/linux/kernel.h                             |    2 +
12301  include/linux/kexec.h                              |    2 +
12302  include/linux/memblock.h                           |    4 -
12303  include/linux/memcontrol.h                         |  163 +--
12304  include/linux/mm.h                                 |  207 ++-
12305  include/linux/mm_types.h                           |   63 +-
12306  include/linux/mmdebug.h                            |    6 +
12307  include/linux/mmzone.h                             |  104 +-
12308  include/linux/moduleparam.h                        |    1 +
12309  include/linux/nmi.h                                |    1 +
12310  include/linux/page-flags.h                         |  343 ++---
12311  include/linux/pageblock-flags.h                    |    2 +-
12312  include/linux/pagemap.h                            |   45 +-
12313  include/linux/poison.h                             |    9 +-
12314  include/linux/rbtree.h                             |   12 +-
12315  include/linux/rmap.h                               |   17 +-
12316  include/linux/sched.h                              |   45 +-
12317  include/linux/skbuff.h                             |    6 +-
12318  include/linux/slab.h                               |   45 +-
12319  include/linux/string.h                             |    1 +
12320  include/linux/swap.h                               |    6 +-
12321  include/linux/syscalls.h                           |    2 +
12322  include/linux/tracehook.h                          |    3 +
12323  include/linux/types.h                              |   16 +-
12324  include/linux/uaccess.h                            |   40 +-
12325  include/linux/vm_event_item.h                      |    9 +-
12326  include/linux/vmstat.h                             |   24 +-
12327  include/linux/zpool.h                              |    8 +-
12328  include/linux/zsmalloc.h                           |    2 +-
12329  include/linux/zutil.h                              |    4 +-
12330  include/net/sock.h                                 |    2 +-
12331  include/trace/events/compaction.h                  |   72 +-
12332  include/trace/events/gfpflags.h                    |    5 +-
12333  include/trace/events/huge_memory.h                 |  166 +++
12334  include/trace/events/nilfs2.h                      |  224 ++++
12335  include/uapi/asm-generic/mman-common.h             |    6 +
12336  include/uapi/asm-generic/mman.h                    |    1 +
12337  include/uapi/asm-generic/unistd.h                  |    4 +-
12338  ipc/msg.c                                          |    5 +-
12339  ipc/msgutil.c                                      |    1 -
12340  kernel/audit.c                                     |    6 +-
12341  kernel/cgroup.c                                    |    2 +-
12342  kernel/cpuset.c                                    |   14 +-
12343  kernel/events/uprobes.c                            |   11 +-
12344  kernel/fork.c                                      |    3 +-
12345  kernel/futex.c                                     |   61 +-
12346  kernel/kexec.c                                     |    2 +
12347  kernel/kexec_core.c                                |    4 +-
12348  kernel/kexec_file.c                                |    2 +
12349  kernel/locking/lockdep.c                           |    2 +-
12350  kernel/panic.c                                     |   10 +
12351  kernel/params.c                                    |    3 +-
12352  kernel/power/snapshot.c                            |    2 +-
12353  kernel/power/swap.c                                |   16 +-
12354  kernel/profile.c                                   |    2 +-
12355  kernel/signal.c                                    |   53 +-
12356  kernel/smp.c                                       |    2 +-
12357  kernel/sys.c                                       |    4 +-
12358  kernel/sys_ni.c                                    |    1 +
12359  kernel/sysctl.c                                    |   20 +
12360  kernel/watchdog.c                                  |  101 +-
12361  lib/Kconfig                                        |    7 +
12362  lib/Kconfig.debug                                  |   21 +
12363  lib/Kconfig.kasan                                  |    3 +-
12364  lib/Makefile                                       |    2 +
12365  lib/crc64_ecma.c                                   |  341 +++++
12366  lib/dma-debug.c                                    |   14 +-
12367  lib/dynamic_debug.c                                |    8 +-
12368  lib/halfmd4.c                                      |    3 +-
12369  lib/idr.c                                          |    4 +-
12370  lib/is_single_threaded.c                           |    5 +-
12371  lib/kasprintf.c                                    |   16 +
12372  lib/kobject.c                                      |   30 +-
12373  lib/llist.c                                        |    4 +-
12374  lib/percpu_ida.c                                   |    2 +-
12375  lib/radix-tree.c                                   |   10 +-
12376  lib/test-string_helpers.c                          |   36 +
12377  lib/test_kasan.c                                   |   69 +
12378  lib/test_printf.c                                  |  362 +++++
12379  lib/vsprintf.c                                     |   80 +-
12380  mm/Kconfig                                         |   12 -
12381  mm/backing-dev.c                                   |    2 +-
12382  mm/balloon_compaction.c                            |   10 +-
12383  mm/cma.c                                           |    6 +-
12384  mm/compaction.c                                    |   46 +-
12385  mm/debug.c                                         |   14 +-
12386  mm/dmapool.c                                       |    2 +-
12387  mm/early_ioremap.c                                 |    6 +-
12388  mm/failslab.c                                      |    8 +-
12389  mm/filemap.c                                       |  108 +-
12390  mm/frame_vector.c                                  |    2 +-
12391  mm/gup.c                                           |  122 +-
12392  mm/huge_memory.c                                   | 1412 ++++++++++++--------
12393  mm/hugetlb.c                                       |  220 ++-
12394  mm/hugetlb_cgroup.c                                |    2 +-
12395  mm/internal.h                                      |  107 +-
12396  mm/kasan/kasan.c                                   |   38 +-
12397  mm/kasan/kasan.h                                   |    5 +-
12398  mm/kasan/report.c                                  |  113 +-
12399  mm/kmemleak.c                                      |    2 +-
12400  mm/ksm.c                                           |  172 ++-
12401  mm/list_lru.c                                      |   44 +-
12402  mm/maccess.c                                       |    7 +-
12403  mm/madvise.c                                       |  173 +++
12404  mm/memblock.c                                      |    2 +-
12405  mm/memcontrol.c                                    |  371 ++---
12406  mm/memory-failure.c                                |   51 +-
12407  mm/memory.c                                        |   77 +-
12408  mm/memory_hotplug.c                                |    4 +-
12409  mm/mempolicy.c                                     |   40 +-
12410  mm/mempool.c                                       |   10 +-
12411  mm/migrate.c                                       |  272 ++--
12412  mm/mincore.c                                       |    4 +-
12413  mm/mlock.c                                         |  112 +-
12414  mm/mmap.c                                          |   61 +-
12415  mm/mprotect.c                                      |    2 +-
12416  mm/mremap.c                                        |   27 +-
12417  mm/msync.c                                         |    2 +-
12418  mm/nommu.c                                         |   18 +-
12419  mm/oom_kill.c                                      |   76 +-
12420  mm/page_alloc.c                                    |  786 +++++------
12421  mm/page_idle.c                                     |    3 +-
12422  mm/pagewalk.c                                      |    2 +-
12423  mm/percpu.c                                        |   10 +-
12424  mm/pgtable-generic.c                               |   12 -
12425  mm/readahead.c                                     |   18 +-
12426  mm/rmap.c                                          |  279 ++--
12427  mm/shmem.c                                         |   29 +-
12428  mm/slab.c                                          |  134 +-
12429  mm/slab.h                                          |   30 +-
12430  mm/slab_common.c                                   |  142 +-
12431  mm/slub.c                                          |  304 +++--
12432  mm/swap.c                                          |  318 +----
12433  mm/swap_state.c                                    |    9 +-
12434  mm/swapfile.c                                      |   16 +-
12435  mm/userfaultfd.c                                   |    8 +-
12436  mm/util.c                                          |   42 +-
12437  mm/vmacache.c                                      |    2 +-
12438  mm/vmalloc.c                                       |   16 +-
12439  mm/vmpressure.c                                    |    2 +-
12440  mm/vmscan.c                                        |   50 +-
12441  mm/vmstat.c                                        |   29 +-
12442  mm/zbud.c                                          |    2 +-
12443  mm/zpool.c                                         |   18 +-
12444  mm/zsmalloc.c                                      |   49 +-
12445  mm/zswap.c                                         |   87 +-
12446  net/core/skbuff.c                                  |    8 +-
12447  net/core/sock.c                                    |    6 +-
12448  net/netlink/af_netlink.c                           |    2 +-
12449  net/openvswitch/flow.c                             |    2 +-
12450  net/rds/ib_recv.c                                  |    4 +-
12451  net/rxrpc/ar-connection.c                          |    2 +-
12452  net/sctp/associola.c                               |    2 +-
12453  scripts/checkpatch.pl                              |   51 +-
12454  security/integrity/ima/ima_crypto.c                |    2 +-
12455  tools/testing/selftests/Makefile                   |    1 +
12456  tools/testing/selftests/lib/Makefile               |    8 +
12457  tools/testing/selftests/lib/printf.sh              |   10 +
12458  tools/testing/selftests/vm/Makefile                |    2 +
12459  tools/testing/selftests/vm/mlock2-tests.c          |  737 ++++++++++
12460  tools/testing/selftests/vm/on-fault-limit.c        |   47 +
12461  tools/testing/selftests/vm/run_vmtests             |   22 +
12462  tools/vm/slabinfo-gnuplot.sh                       |  275 ++++
12463  tools/vm/slabinfo.c                                |  255 ++--
12464  386 files changed, 9377 insertions(+), 5894 deletions(-)
12465  delete mode 100644 Documentation/features/vm/pmdp_splitting_flush/arch-support.txt
12466  create mode 100644 include/linux/crc64_ecma.h
12467  create mode 100644 include/trace/events/huge_memory.h
12468  create mode 100644 include/trace/events/nilfs2.h
12469  create mode 100644 lib/crc64_ecma.c
12470  create mode 100644 lib/test_printf.c
12471  create mode 100644 tools/testing/selftests/lib/Makefile
12472  create mode 100644 tools/testing/selftests/lib/printf.sh
12473  create mode 100644 tools/testing/selftests/vm/mlock2-tests.c
12474  create mode 100644 tools/testing/selftests/vm/on-fault-limit.c
12475  create mode 100644 tools/vm/slabinfo-gnuplot.sh
12476 $ git am -3 ../patches/mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix.patch
12477 Applying: mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix
12478 $ git reset HEAD^
12479 Unstaged changes after reset:
12480 M       arch/arm64/mm/dma-mapping.c
12481 $ git add -A .
12482 $ git commit -v -a --amend
12483 [master 35f25a224289] Merge branch 'akpm-current/current'
12484  Date: Thu Nov 5 16:01:31 2015 +1100
12485 $ git am -3 ../patches/mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix-fix.patch
12486 Applying: mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix-fix
12487 $ git reset HEAD^
12488 Unstaged changes after reset:
12489 M       arch/arm64/mm/dma-mapping.c
12490 $ git add -A .
12491 $ git commit -v -a --amend
12492 [master 2e029215338c] Merge branch 'akpm-current/current'
12493  Date: Thu Nov 5 16:01:31 2015 +1100
12494 $ git am -3 ../patches/0001-block-fixes-for-__GPF_WAIT-changes.patch
12495 Applying: block: fixes for __GPF_WAIT changes
12496 $ git reset HEAD^
12497 Unstaged changes after reset:
12498 M       block/blk-core.c
12499 $ git add -A .
12500 $ git commit -v -a --amend
12501 [master 2981d6f479ff] Merge branch 'akpm-current/current'
12502  Date: Thu Nov 5 16:01:31 2015 +1100
12503 $ git am -3 ../patches/0001-ndb-fix-up-for-dequeue_signal_lock-API-change.patch
12504 Applying: ndb: fix up for dequeue_signal_lock API change
12505 $ git reset HEAD^
12506 Unstaged changes after reset:
12507 M       drivers/block/nbd.c
12508 $ git add -A .
12509 $ git commit -v -a --amend
12510 [master ccf27814a63f] Merge branch 'akpm-current/current'
12511  Date: Thu Nov 5 16:01:31 2015 +1100
12512 $ git clone -s -l -n -q . ../rebase-tmp
12513 $ cd ../rebase-tmp
12514 $ git checkout -b akpm remotes/origin/akpm/master
12515 Switched to a new branch 'akpm'
12516 $ git rebase --onto master remotes/origin/akpm/master-base
12517 First, rewinding head to replay your work on top of it...
12518 Applying: net/ipv4/route.c: prevent oops
12519 Applying: mips: add entry for new mlock2 syscall
12520 Applying: sparc/sparc64: allocate sys_membarrier system call number
12521 Applying: kernel.h: make abs() work with 64-bit types
12522 Applying: Remove abs64()
12523 Applying: remove-abs64-fix
12524 Applying: remove-abs64-fix-fix
12525 Applying: remove-abs64-fix-fix-fix
12526 Applying: Documentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory
12527 Applying: pcnet32: use pci_set_dma_mask insted of pci_dma_supported
12528 Applying: tw68-core: use pci_set_dma_mask insted of pci_dma_supported
12529 Applying: saa7164: use pci_set_dma_mask insted of pci_dma_supported
12530 Applying: saa7134: use pci_set_dma_mask insted of pci_dma_supported
12531 Applying: cx88: use pci_set_dma_mask insted of pci_dma_supported
12532 Applying: cx25821: use pci_set_dma_mask insted of pci_dma_supported
12533 Applying: cx23885: use pci_set_dma_mask insted of pci_dma_supported
12534 Applying: netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported
12535 Applying: nouveau: don't call pci_dma_supported
12536 Applying: sfc: don't call dma_supported
12537 Applying: kaweth: remove ifdefed out call to dma_supported
12538 Applying: usbnet: remove ifdefed out call to dma_supported
12539 Applying: pci: remove pci_dma_supported
12540 Applying: dma: remove external references to dma_supported
12541 Applying: drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS
12542 Applying: kmap_atomic_to_page() has no users, remove it
12543 Applying: include/linux/kdev_t.h: remove unused huge_valid_dev()
12544 Applying: include/linux/kdev_t.h: old/new_valid_dev() can return bool
12545 Applying: fs/9p: remove unnecessary new_valid_dev() checks
12546 Applying: fs/btrfs/inode.c: remove unnecessary new_valid_dev() check
12547 Applying: fs/exofs/namei.c: remove unnecessary new_valid_dev() check
12548 Applying: fs/ext2/namei.c: remove unnecessary new_valid_dev() check
12549 Applying: fs/f2fs/namei.c: remove unnecessary new_valid_dev() check
12550 Applying: fs/hpfs/namei.c: remove unnecessary new_valid_dev() check
12551 Applying: fs/jfs: remove unnecessary new_valid_dev() checks
12552 Applying: fs/ncpfs/dir.c: remove unnecessary new_valid_dev() check
12553 Applying: fs/nilfs2/namei.c: remove unnecessary new_valid_dev() check
12554 Applying: fs/reiserfs/namei.c: remove unnecessary new_valid_dev() check
12555 Applying: fs/stat.c: remove unnecessary new_valid_dev() check
12556 Applying: fs/ubifs/: remove unnecessary new_valid_dev() checks
12557 Applying: fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries
12558 $ cd ../next
12559 $ git fetch -f ../rebase-tmp akpm:akpm/master
12560 From ../rebase-tmp
12561  + 054a5ab32fed...89656ce70320 akpm       -> akpm/master  (forced update)
12562 $ rm -rf ../rebase-tmp
12563 Merging akpm/master (89656ce70320 fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries)
12564 $ git merge --no-ff akpm/master
12565 Merge made by the 'recursive' strategy.
12566  Documentation/DMA-API.txt                          | 13 ------
12567  Documentation/sysctl/vm.txt                        |  2 +-
12568  arch/arm/include/asm/highmem.h                     |  1 -
12569  arch/arm/mm/highmem.c                              | 10 -----
12570  arch/frv/include/asm/highmem.h                     |  2 -
12571  arch/frv/mm/highmem.c                              |  5 ---
12572  arch/metag/include/asm/highmem.h                   |  1 -
12573  arch/metag/mm/highmem.c                            | 14 -------
12574  arch/microblaze/include/asm/highmem.h              | 13 ------
12575  arch/mips/include/asm/highmem.h                    |  1 -
12576  arch/mips/include/uapi/asm/unistd.h                | 15 ++++---
12577  arch/mips/kernel/scall32-o32.S                     |  1 +
12578  arch/mips/kernel/scall64-64.S                      |  1 +
12579  arch/mips/kernel/scall64-n32.S                     |  1 +
12580  arch/mips/kernel/scall64-o32.S                     |  1 +
12581  arch/mips/mm/highmem.c                             | 13 ------
12582  arch/parisc/include/asm/cacheflush.h               |  1 -
12583  arch/powerpc/include/asm/highmem.h                 | 13 ------
12584  arch/sparc/include/uapi/asm/unistd.h               |  3 +-
12585  arch/sparc/kernel/systbls_32.S                     |  2 +-
12586  arch/sparc/kernel/systbls_64.S                     |  4 +-
12587  arch/tile/include/asm/highmem.h                    |  1 -
12588  arch/tile/mm/highmem.c                             | 12 ------
12589  arch/x86/include/asm/highmem.h                     |  1 -
12590  arch/x86/mm/highmem_32.c                           | 14 -------
12591  drivers/gpu/drm/nouveau/nouveau_ttm.c              |  7 +++-
12592  drivers/gpu/drm/tegra/sor.c                        |  4 +-
12593  drivers/input/joystick/walkera0701.c               |  4 +-
12594  drivers/media/i2c/ov9650.c                         |  2 +-
12595  drivers/media/pci/cx23885/cx23885-core.c           |  2 +-
12596  drivers/media/pci/cx25821/cx25821-core.c           |  2 +-
12597  drivers/media/pci/cx88/cx88-alsa.c                 |  2 +-
12598  drivers/media/pci/cx88/cx88-mpeg.c                 |  2 +-
12599  drivers/media/pci/cx88/cx88-video.c                |  2 +-
12600  drivers/media/pci/netup_unidvb/netup_unidvb_core.c |  2 +-
12601  drivers/media/pci/saa7134/saa7134-core.c           |  2 +-
12602  drivers/media/pci/saa7164/saa7164-core.c           |  2 +-
12603  drivers/media/pci/tw68/tw68-core.c                 |  2 +-
12604  drivers/net/ethernet/amd/pcnet32.c                 |  2 +-
12605  drivers/net/ethernet/sfc/efx.c                     |  8 ++--
12606  drivers/net/usb/kaweth.c                           |  6 ---
12607  drivers/net/usb/usbnet.c                           |  6 ---
12608  drivers/net/wireless/mac80211_hwsim.c              |  2 +-
12609  drivers/parisc/ccio-dma.c                          |  2 -
12610  drivers/scsi/cxgbi/cxgb3i/Kbuild                   |  2 +-
12611  drivers/scsi/cxgbi/cxgb4i/Kbuild                   |  2 +-
12612  drivers/thermal/power_allocator.c                  |  2 +-
12613  drivers/usb/host/ehci-hcd.c                        |  2 +-
12614  drivers/usb/host/fotg210-hcd.c                     |  2 +-
12615  drivers/usb/host/oxu210hp-hcd.c                    |  2 +-
12616  fs/9p/vfs_inode.c                                  |  3 --
12617  fs/9p/vfs_inode_dotl.c                             |  3 --
12618  fs/binfmt_elf_fdpic.c                              | 46 ++++++++++++++++++----
12619  fs/btrfs/inode.c                                   |  3 --
12620  fs/exofs/namei.c                                   |  3 --
12621  fs/ext2/namei.c                                    |  3 --
12622  fs/ext4/mballoc.c                                  |  4 +-
12623  fs/f2fs/namei.c                                    |  3 --
12624  fs/gfs2/lock_dlm.c                                 |  2 +-
12625  fs/hpfs/namei.c                                    |  2 -
12626  fs/jfs/namei.c                                     |  3 --
12627  fs/jfs/super.c                                     |  3 --
12628  fs/ncpfs/dir.c                                     |  2 -
12629  fs/nilfs2/namei.c                                  |  3 --
12630  fs/reiserfs/namei.c                                |  3 --
12631  fs/stat.c                                          |  2 -
12632  fs/ubifs/dir.c                                     |  3 --
12633  fs/ubifs/misc.h                                    |  9 +----
12634  include/asm-generic/pci-dma-compat.h               |  6 ---
12635  include/linux/highmem.h                            |  1 -
12636  include/linux/kdev_t.h                             |  9 +----
12637  include/linux/kernel.h                             | 42 ++++++++++----------
12638  kernel/time/clocksource.c                          |  2 +-
12639  kernel/time/timekeeping.c                          |  2 +-
12640  lib/div64.c                                        |  2 +-
12641  net/ipv4/route.c                                   |  2 +
12642  net/sctp/transport.c                               |  2 +-
12643  77 files changed, 121 insertions(+), 265 deletions(-)