Next/merge.log

   1 $ date
   2 Friday 27 June  10:23:24 EST 2014
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 456febd29999 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
   7 Merging origin/master (3493860c76eb Merge branch 'for-linus' of git://git.kernel.dk/linux-block)
   8 $ git merge origin/master
   9 Updating 456febd29999..3493860c76eb
  10 Fast-forward
  11  .../devicetree/bindings/arm/samsung/exynos-adc.txt |   2 +-
  12  .../devicetree/bindings/hwmon/ntc_thermistor.txt   |  20 ++-
  13  .../devicetree/bindings/vendor-prefixes.txt        |   1 +
  14  Documentation/hwmon/ntc_thermistor                 |   8 +-
  15  Documentation/ptp/testptp.c                        |   5 +-
  16  MAINTAINERS                                        |  11 +-
  17  block/bio.c                                        |   8 +
  18  block/blk-cgroup.c                                 |   9 +-
  19  block/blk-cgroup.h                                 |  21 +--
  20  block/blk-merge.c                                  |  10 ++
  21  block/blk-mq.c                                     |   2 +-
  22  block/elevator.c                                   |   2 +-
  23  drivers/block/drbd/drbd_receiver.c                 |   5 +-
  24  drivers/block/floppy.c                             |   2 +-
  25  drivers/hwmon/Kconfig                              |   6 +-
  26  drivers/hwmon/gpio-fan.c                           |   2 +-
  27  drivers/hwmon/ntc_thermistor.c                     |  14 +-
  28  drivers/hwmon/w83l786ng.c                          |   2 +-
  29  drivers/isdn/hisax/Kconfig                         |  11 +-
  30  drivers/net/bonding/bond_main.c                    |   9 +
  31  drivers/net/can/slcan.c                            |  37 ++--
  32  drivers/net/ethernet/allwinner/sun4i-emac.c        |   1 +
  33  drivers/net/ethernet/broadcom/tg3.c                |   8 +-
  34  drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  16 +-
  35  drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |   1 +
  36  drivers/net/ethernet/dec/tulip/timer.c             |   2 +-
  37  drivers/net/ethernet/emulex/benet/be.h             |   4 +-
  38  drivers/net/ethernet/emulex/benet/be_cmds.h        |   2 +-
  39  drivers/net/ethernet/emulex/benet/be_main.c        |   4 +-
  40  drivers/net/ethernet/freescale/fec_main.c          |   8 +-
  41  drivers/net/ethernet/marvell/skge.c                |   7 +
  42  drivers/net/ethernet/mellanox/mlx4/main.c          |   3 +-
  43  drivers/net/ethernet/ti/cpsw.c                     |   7 +-
  44  drivers/net/ethernet/tile/tilegx.c                 |   1 -
  45  drivers/net/hyperv/netvsc.c                        |   2 +-
  46  drivers/net/ieee802154/at86rf230.c                 |   5 +-
  47  drivers/net/phy/at803x.c                           | 195 ++++++++++++++++-----
  48  drivers/net/phy/phy.c                              |   3 +
  49  drivers/net/slip/slip.c                            |  36 ++--
  50  drivers/net/slip/slip.h                            |   1 +
  51  drivers/net/usb/huawei_cdc_ncm.c                   |   7 +-
  52  drivers/net/vmxnet3/vmxnet3_drv.c                  |   7 +-
  53  drivers/net/vmxnet3/vmxnet3_ethtool.c              |  12 +-
  54  drivers/net/vmxnet3/vmxnet3_int.h                  |   5 +
  55  drivers/net/wireless/b43/Kconfig                   |   2 +-
  56  drivers/net/wireless/b43/main.c                    |   1 +
  57  drivers/net/wireless/b43/xmit.c                    |  10 +-
  58  drivers/net/wireless/mwifiex/pcie.c                |   4 +-
  59  drivers/net/wireless/mwifiex/util.h                |  43 +++--
  60  drivers/net/wireless/rt2x00/rt2500pci.c            |   7 +-
  61  drivers/net/wireless/rt2x00/rt2800usb.c            |  39 ++++-
  62  drivers/net/wireless/rt2x00/rt2x00.h               |   1 +
  63  drivers/net/wireless/rt2x00/rt2x00dev.c            |  24 ++-
  64  drivers/net/wireless/rt2x00/rt2x00mac.c            |   2 +
  65  drivers/net/wireless/rt2x00/rt2x00usb.h            |   1 +
  66  drivers/net/xen-netback/common.h                   |   1 +
  67  drivers/net/xen-netback/interface.c                |  49 ++----
  68  drivers/net/xen-netback/xenbus.c                   |  28 +--
  69  drivers/net/xen-netfront.c                         | 109 ++++++++----
  70  drivers/of/of_mdio.c                               |   8 +-
  71  drivers/ptp/Kconfig                                |   2 +-
  72  fs/cifs/cifs_unicode.c                             |   7 +-
  73  fs/cifs/cifsfs.c                                   |  17 +-
  74  fs/cifs/link.c                                     |   2 +-
  75  fs/nfs/inode.c                                     |  76 ++++----
  76  fs/nfs/nfs4_fs.h                                   |   2 +-
  77  fs/nfs/nfs4namespace.c                             | 102 ++++++-----
  78  fs/nfs/nfs4proc.c                                  |   2 +-
  79  fs/nfs/write.c                                     |   4 +-
  80  include/linux/bio.h                                |  13 +-
  81  include/linux/blkdev.h                             |   1 +
  82  include/linux/elevator.h                           |   2 +-
  83  include/linux/phy.h                                |   9 +
  84  include/linux/uio.h                                |  14 +-
  85  include/net/netfilter/nf_tables.h                  |   6 +-
  86  include/net/sock.h                                 |   4 +-
  87  net/8021q/vlan_core.c                              |   5 +-
  88  net/bluetooth/hci_conn.c                           |   7 +-
  89  net/bluetooth/hci_event.c                          |  17 +-
  90  net/bluetooth/l2cap_core.c                         |   8 +-
  91  net/bluetooth/l2cap_sock.c                         |   5 -
  92  net/bluetooth/mgmt.c                               | 104 ++++++-----
  93  net/bluetooth/smp.c                                |   9 +-
  94  net/core/dst.c                                     |  16 +-
  95  net/core/filter.c                                  |  10 +-
  96  net/core/skbuff.c                                  |   2 +-
  97  net/ipv4/ip_tunnel.c                               |  14 +-
  98  net/ipv4/tcp_fastopen.c                            |   2 +-
  99  net/ipv4/tcp_input.c                               |   2 +-
 100  net/netfilter/ipvs/ip_vs_ctl.c                     |   2 +-
 101  net/netfilter/nf_conntrack_netlink.c               |  20 ++-
 102  net/netfilter/nf_nat_core.c                        |  35 +++-
 103  net/netfilter/nf_tables_api.c                      |  11 +-
 104  net/netfilter/nft_compat.c                         |  18 ++
 105  net/netfilter/nft_nat.c                            |  14 +-
 106  net/sctp/sysctl.c                                  |  46 ++---
 107  net/sunrpc/auth.c                                  |   1 +
 108  97 files changed, 965 insertions(+), 499 deletions(-)
 109 Merging fixes/master (4b660a7f5c80 Linux 3.15-rc6)
 110 $ git merge fixes/master
 111 Already up-to-date.
 112 Merging kbuild-current/rc-fixes (c14105628b2e kbuild: fix a typo in a kbuild document)
 113 $ git merge kbuild-current/rc-fixes
 114 Already up-to-date.
 115 Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4)
 116 $ git merge arc-current/for-curr
 117 Already up-to-date.
 118 Merging arm-current/fixes (b8d8772e53f8 ARM: arm925: ensure assembly sets up writethrough mapping)
 119 $ git merge arm-current/fixes
 120 Already up-to-date.
 121 Merging m68k-current/for-linus (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo())
 122 $ git merge m68k-current/for-linus
 123 Already up-to-date.
 124 Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
 125 $ git merge metag-fixes/fixes
 126 Already up-to-date.
 127 Merging powerpc-merge/merge (6663a4fa6711 powerpc: Don't skip ePAPR spin-table CPUs)
 128 $ git merge powerpc-merge/merge
 129 Already up-to-date.
 130 Merging sparc/master (894e552cfaa3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
 131 $ git merge sparc/master
 132 Already up-to-date.
 133 Merging net/master (d7933ab727ed Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
 134 $ git merge net/master
 135 Already up-to-date.
 136 Merging ipsec/master (d7933ab727ed Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
 137 $ git merge ipsec/master
 138 Already up-to-date.
 139 Merging sound-current/for-linus (a07187c992be ALSA: hda - restore BCLK M/N values when resuming HSW/BDW display controller)
 140 $ git merge sound-current/for-linus
 141 Merge made by the 'recursive' strategy.
 142  Documentation/sound/alsa/HD-Audio-Models.txt |   5 +
 143  include/uapi/sound/compress_offload.h        |  14 +-
 144  include/uapi/sound/compress_params.h         |  14 +-
 145  sound/pci/hda/hda_auto_parser.c              |   1 +
 146  sound/pci/hda/hda_intel.c                    |  65 +++-
 147  sound/pci/hda/hda_local.h                    |  21 ++
 148  sound/pci/hda/patch_hdmi.c                   |   2 +-
 149  sound/pci/hda/patch_realtek.c                | 489 ++++++++++-----------------
 150  sound/pci/hda/patch_sigmatel.c               |  58 +++-
 151  sound/usb/card.c                             |  13 +-
 152  sound/usb/endpoint.c                         |  17 +-
 153  sound/usb/endpoint.h                         |   1 +
 154  12 files changed, 365 insertions(+), 335 deletions(-)
 155 Merging pci-current/for-linus (d066c946a866 PCI: Fix unaligned access in AF transaction pending test)
 156 $ git merge pci-current/for-linus
 157 Merge made by the 'recursive' strategy.
 158  drivers/pci/pci.c | 9 +++++++--
 159  1 file changed, 7 insertions(+), 2 deletions(-)
 160 Merging wireless/master (e055a6e20a91 Merge branch 'ath-current' of git://github.com/kvalo/ath)
 161 $ git merge wireless/master
 162 Merge made by the 'recursive' strategy.
 163  drivers/bluetooth/ath3k.c                     |  2 -
 164  drivers/bluetooth/btusb.c                     |  1 -
 165  drivers/bluetooth/hci_h5.c                    |  1 +
 166  drivers/net/wireless/ath/ath10k/core.c        |  6 ++-
 167  drivers/net/wireless/ath/ath10k/htt_rx.c      | 18 --------
 168  drivers/net/wireless/brcm80211/brcmfmac/usb.c |  5 ++-
 169  drivers/net/wireless/iwlwifi/iwl-fw.h         |  1 +
 170  drivers/net/wireless/iwlwifi/mvm/mac80211.c   |  7 +++
 171  drivers/net/wireless/iwlwifi/mvm/scan.c       | 65 ++++++++-------------------
 172  drivers/net/wireless/iwlwifi/pcie/drv.c       |  3 +-
 173  drivers/net/wireless/mwifiex/main.c           |  1 +
 174  net/bluetooth/hci_conn.c                      | 12 ++++-
 175  net/bluetooth/smp.c                           | 60 +++++++++++++++++++------
 176  net/mac80211/util.c                           |  5 ++-
 177  net/wireless/core.h                           |  2 +-
 178  net/wireless/nl80211.c                        | 11 +++--
 179  net/wireless/reg.c                            | 22 +++------
 180  17 files changed, 112 insertions(+), 110 deletions(-)
 181 Merging driver-core.current/driver-core-linus (206204a1162b lz4: ensure length does not wrap)
 182 $ git merge driver-core.current/driver-core-linus
 183 Already up-to-date.
 184 Merging tty.current/tty-linus (a497c3ba1d97 Linux 3.16-rc2)
 185 $ git merge tty.current/tty-linus
 186 Already up-to-date.
 187 Merging usb.current/usb-linus (d6236f6d1d88 xhci: Fix runtime suspended xhci from blocking system suspend.)
 188 $ git merge usb.current/usb-linus
 189 Merge made by the 'recursive' strategy.
 190  drivers/usb/dwc3/Kconfig            |  1 +
 191  drivers/usb/dwc3/dwc3-omap.c        | 17 ++++++++++++++---
 192  drivers/usb/dwc3/gadget.c           |  8 ++++----
 193  drivers/usb/gadget/configfs.c       | 37 +++++++++++++++++++------------------
 194  drivers/usb/gadget/configfs.h       |  1 +
 195  drivers/usb/gadget/f_fs.c           | 12 +++++++-----
 196  drivers/usb/gadget/f_rndis.c        |  6 ++++--
 197  drivers/usb/gadget/inode.c          |  7 ++++++-
 198  drivers/usb/gadget/u_ether.c        |  3 +++
 199  drivers/usb/host/xhci-hub.c         |  5 ++++-
 200  drivers/usb/host/xhci-ring.c        |  9 ++++++---
 201  drivers/usb/host/xhci.c             | 10 +++++++---
 202  drivers/usb/musb/musb_core.c        |  2 +-
 203  drivers/usb/musb/ux500.c            |  1 -
 204  drivers/usb/renesas_usbhs/fifo.c    |  8 ++++++++
 205  include/uapi/linux/usb/functionfs.h |  2 +-
 206  tools/usb/Makefile                  |  6 +++++-
 207  tools/usb/ffs-test.c                | 20 ++++++++++++++++++--
 208  18 files changed, 109 insertions(+), 46 deletions(-)
 209 Merging usb-gadget-fixes/fixes (5d881802c407 usb: musb: core: Handle Babble condition only in HOST mode)
 210 $ git merge usb-gadget-fixes/fixes
 211 Already up-to-date.
 212 Merging usb-serial-fixes/usb-linus (660856948664 MAINTAINERS: update e-mail address)
 213 $ git merge usb-serial-fixes/usb-linus
 214 Auto-merging MAINTAINERS
 215 Merge made by the 'recursive' strategy.
 216  MAINTAINERS                   | 14 +-------------
 217  drivers/usb/serial/ftdi_sio.c |  7 +++++--
 218  drivers/usb/serial/option.c   | 26 ++++++++++++++++++++------
 219  3 files changed, 26 insertions(+), 21 deletions(-)
 220 Merging staging.current/staging-linus (a497c3ba1d97 Linux 3.16-rc2)
 221 $ git merge staging.current/staging-linus
 222 Already up-to-date.
 223 Merging char-misc.current/char-misc-linus (a497c3ba1d97 Linux 3.16-rc2)
 224 $ git merge char-misc.current/char-misc-linus
 225 Already up-to-date.
 226 Merging input-current/for-linus (31972f6e517d Input: ti_am335x_tsc - warn about incorrect spelling)
 227 $ git merge input-current/for-linus
 228 Merge made by the 'recursive' strategy.
 229  drivers/input/tablet/wacom_wac.c          | 28 +++++++---------------------
 230  drivers/input/touchscreen/ti_am335x_tsc.c |  5 ++++-
 231  2 files changed, 11 insertions(+), 22 deletions(-)
 232 Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
 233 $ git merge md-current/for-linus
 234 Already up-to-date.
 235 Merging crypto-current/master (cfe82d4f45c7 crypto: sha512_ssse3 - fix byte count to bit count conversion)
 236 $ git merge crypto-current/master
 237 Merge made by the 'recursive' strategy.
 238  arch/x86/crypto/sha512_ssse3_glue.c | 2 +-
 239  1 file changed, 1 insertion(+), 1 deletion(-)
 240 Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies)
 241 $ git merge ide/master
 242 Merge made by the 'recursive' strategy.
 243  drivers/ide/Kconfig     | 5 ++++-
 244  drivers/ide/ide-probe.c | 8 +++++---
 245  2 files changed, 9 insertions(+), 4 deletions(-)
 246 Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
 247 $ git merge dwmw2/master
 248 Already up-to-date.
 249 Merging devicetree-current/devicetree/merge (4b660a7f5c80 Linux 3.15-rc6)
 250 $ git merge devicetree-current/devicetree/merge
 251 Already up-to-date.
 252 Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.)
 253 $ git merge rr-fixes/fixes
 254 Already up-to-date.
 255 Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works)
 256 $ git merge mfd-fixes/master
 257 Already up-to-date.
 258 Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
 259 $ git merge vfio-fixes/for-linus
 260 Already up-to-date.
 261 Merging drm-intel-fixes/for-linux-next-fixes (8525a235c96a drm/i915: vlv_prepare_pll is only needed in case of non DSI interfaces)
 262 $ git merge drm-intel-fixes/for-linux-next-fixes
 263 Merge made by the 'recursive' strategy.
 264  drivers/gpu/drm/i915/i915_debugfs.c     |  2 ++
 265  drivers/gpu/drm/i915/i915_drv.h         |  2 ++
 266  drivers/gpu/drm/i915/i915_gem_context.c |  8 ++++---
 267  drivers/gpu/drm/i915/intel_bios.c       |  6 +++---
 268  drivers/gpu/drm/i915/intel_display.c    | 13 ++++++------
 269  drivers/gpu/drm/i915/intel_drv.h        |  4 ++--
 270  drivers/gpu/drm/i915/intel_pm.c         | 37 +++++++++++++--------------------
 271  include/drm/i915_pciids.h               | 12 +++++++++--
 272  8 files changed, 46 insertions(+), 38 deletions(-)
 273 Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
 274 $ git merge asm-generic/master
 275 Already up-to-date.
 276 Merging arc/for-next (2328af0c9ce8 ARC: [SMP] Enable icache coherency)
 277 $ git merge arc/for-next
 278 Merge made by the 'recursive' strategy.
 279  arch/arc/include/asm/cache.h       |  4 ++--
 280  arch/arc/include/uapi/asm/ptrace.h |  1 +
 281  arch/arc/kernel/ctx_sw_asm.S       |  2 +-
 282  arch/arc/kernel/devtree.c          |  2 +-
 283  arch/arc/kernel/head.S             |  7 ++++---
 284  arch/arc/kernel/ptrace.c           |  4 ++++
 285  arch/arc/kernel/smp.c              | 15 +++++++++++++--
 286  arch/arc/kernel/vmlinux.lds.S      |  2 +-
 287  arch/arc/mm/cache_arc700.c         | 25 +++++++++++++++++++------
 288  9 files changed, 46 insertions(+), 16 deletions(-)
 289 Merging arm/for-next (8b1f8b93f8f0 Merge branches 'fixes' and 'misc' into for-next)
 290 $ git merge arm/for-next
 291 Auto-merging arch/arm/mach-exynos/mcpm-exynos.c
 292 Auto-merging arch/arm/boot/compressed/vmlinux.lds.S
 293 Merge made by the 'recursive' strategy.
 294  Documentation/devicetree/bindings/arm/l2cc.txt     |  3 ++
 295  arch/arm/boot/compressed/Makefile                  |  5 +-
 296  arch/arm/boot/compressed/head.S                    |  7 +--
 297  .../compressed/{vmlinux.lds.in => vmlinux.lds.S}   | 16 ++++++-
 298  arch/arm/include/asm/cputype.h                     | 37 ++++++++++-----
 299  arch/arm/include/asm/smp_scu.h                     |  2 +-
 300  arch/arm/kernel/perf_event_cpu.c                   | 55 +++++++++++-----------
 301  arch/arm/kvm/guest.c                               |  8 +---
 302  arch/arm/mach-exynos/mcpm-exynos.c                 |  2 +-
 303  arch/arm/mach-exynos/platsmp.c                     |  4 +-
 304  arch/arm/mach-vexpress/tc2_pm.c                    |  2 +-
 305  arch/arm/mm/cache-l2x0.c                           | 33 ++++++++++++-
 306  arch/arm/plat-omap/dma.c                           |  2 +
 307  drivers/clocksource/arm_global_timer.c             |  2 +-
 308  14 files changed, 114 insertions(+), 64 deletions(-)
 309  rename arch/arm/boot/compressed/{vmlinux.lds.in => vmlinux.lds.S} (81%)
 310 Merging arm-perf/for-next/perf (7171511eaec5 Linux 3.16-rc1)
 311 $ git merge arm-perf/for-next/perf
 312 Already up-to-date.
 313 Merging arm-soc/for-next (6c9d16178870 Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes)
 314 $ git merge arm-soc/for-next
 315 Already up-to-date.
 316 Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
 317 $ git merge bcm2835/for-next
 318 Already up-to-date.
 319 Merging berlin/berlin/for-next (251f72d06c59 Merge branch 'berlin/soc' into berlin/for-next)
 320 $ git merge berlin/berlin/for-next
 321 Auto-merging arch/arm/mach-berlin/Kconfig
 322 Merge made by the 'recursive' strategy.
 323  .../arm/cpu-enable-method/marvell,berlin-smp       | 41 +++++++++
 324  .../devicetree/bindings/arm/marvell,berlin.txt     | 16 ++++
 325  arch/arm/boot/dts/berlin2.dtsi                     |  6 ++
 326  arch/arm/boot/dts/berlin2q-marvell-dmp.dts         |  8 ++
 327  arch/arm/boot/dts/berlin2q.dtsi                    | 80 +++++++++++++++++
 328  arch/arm/mach-berlin/Kconfig                       |  3 +
 329  arch/arm/mach-berlin/Makefile                      |  3 +-
 330  arch/arm/mach-berlin/headsmp.S                     | 30 +++++++
 331  arch/arm/mach-berlin/platsmp.c                     | 99 ++++++++++++++++++++++
 332  9 files changed, 285 insertions(+), 1 deletion(-)
 333  create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/marvell,berlin-smp
 334  create mode 100644 arch/arm/mach-berlin/headsmp.S
 335  create mode 100644 arch/arm/mach-berlin/platsmp.c
 336 Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
 337 $ git merge cortex-m/for-next
 338 Already up-to-date.
 339 Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
 340 $ git merge ep93xx/ep93xx-for-next
 341 Merge made by the 'recursive' strategy.
 342 Merging imx-mxs/for-next (7b087756e28d Merge branch 'imx/dt' into for-next)
 343 $ git merge imx-mxs/for-next
 344 Resolved 'arch/arm/mach-imx/Kconfig' using previous resolution.
 345 Removing include/linux/platform_data/usb-imx_udc.h
 346 Removing arch/arm/mach-imx/mx53.h
 347 Removing arch/arm/mach-imx/mx51.h
 348 Removing arch/arm/mach-imx/mm-imx5.c
 349 Auto-merging arch/arm/mach-imx/mach-imx51.c
 350 Removing arch/arm/mach-imx/mach-imx27ipcam.c
 351 Removing arch/arm/mach-imx/iomux-mx51.h
 352 Removing arch/arm/mach-imx/ehci-imx5.c
 353 Removing arch/arm/mach-imx/devices/platform-imx_udc.c
 354 Removing arch/arm/mach-imx/devices-imx51.h
 355 Removing arch/arm/mach-imx/crm-regs-imx5.h
 356 Auto-merging arch/arm/mach-imx/Kconfig
 357 CONFLICT (content): Merge conflict in arch/arm/mach-imx/Kconfig
 358 Auto-merging arch/arm/configs/multi_v7_defconfig
 359 Auto-merging arch/arm/boot/dts/Makefile
 360 Automatic merge failed; fix conflicts and then commit the result.
 361 $ git commit -v -a
 362 [master 263e86dd7213] Merge remote-tracking branch 'imx-mxs/for-next'
 363 $ git diff -M --stat --summary HEAD^..
 364  .../devicetree/bindings/clock/imx1-clock.txt       |   26 +
 365  .../devicetree/bindings/clock/imx21-clock.txt      |   28 +
 366  .../devicetree/bindings/clock/imx6q-clock.txt      |  220 +--
 367  arch/arm/boot/dts/Makefile                         |   15 +
 368  .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts  |   73 +
 369  .../imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts  |   45 +
 370  .../imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts   |   45 +
 371  .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts  |    1 -
 372  arch/arm/boot/dts/imx25-pdk.dts                    |    1 -
 373  arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi       |  296 ++++
 374  .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts  |  273 ++++
 375  arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi    |    1 -
 376  arch/arm/boot/dts/imx28-cfa10036.dts               |   22 +
 377  .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts  |    1 -
 378  arch/arm/boot/dts/imx35.dtsi                       |    8 +
 379  arch/arm/boot/dts/imx50.dtsi                       |    8 +-
 380  arch/arm/boot/dts/imx51-babbage.dts                |    2 +-
 381  .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  |    1 -
 382  arch/arm/boot/dts/imx51.dtsi                       |    3 -
 383  arch/arm/boot/dts/imx53-m53evk.dts                 |    1 -
 384  arch/arm/boot/dts/imx53-mba53.dts                  |    1 -
 385  arch/arm/boot/dts/imx53-qsb-common.dtsi            |    1 -
 386  arch/arm/boot/dts/imx53-tx53.dtsi                  |    1 -
 387  arch/arm/boot/dts/imx53-voipac-bsb.dts             |    1 -
 388  arch/arm/boot/dts/imx53.dtsi                       |    3 -
 389  arch/arm/boot/dts/imx6dl-aristainetos_4.dts        |   85 ++
 390  arch/arm/boot/dts/imx6dl-aristainetos_7.dts        |   74 +
 391  arch/arm/boot/dts/imx6dl-gw51xx.dts                |    2 +-
 392  arch/arm/boot/dts/imx6dl-gw52xx.dts                |    2 +-
 393  arch/arm/boot/dts/imx6dl-gw53xx.dts                |    2 +-
 394  arch/arm/boot/dts/imx6dl-gw54xx.dts                |    2 +-
 395  arch/arm/boot/dts/imx6dl-riotboard.dts             |    1 -
 396  arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts          |  103 ++
 397  arch/arm/boot/dts/imx6dl-tx6u-801x.dts             |  177 +++
 398  arch/arm/boot/dts/imx6dl-tx6u-811x.dts             |  150 ++
 399  arch/arm/boot/dts/imx6dl.dtsi                      |   17 +-
 400  arch/arm/boot/dts/imx6q-cubox-i.dts                |    4 +
 401  arch/arm/boot/dts/imx6q-gw51xx.dts                 |    2 +-
 402  arch/arm/boot/dts/imx6q-gw52xx.dts                 |    2 +-
 403  arch/arm/boot/dts/imx6q-gw53xx.dts                 |    2 +-
 404  arch/arm/boot/dts/imx6q-gw5400-a.dts               |    5 +-
 405  arch/arm/boot/dts/imx6q-gw54xx.dts                 |    2 +-
 406  arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts       |  103 ++
 407  arch/arm/boot/dts/imx6q-tx6q-1010.dts              |  177 +++
 408  arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts       |  136 ++
 409  arch/arm/boot/dts/imx6q-tx6q-1020.dts              |  210 +++
 410  arch/arm/boot/dts/imx6q-tx6q-1110.dts              |  154 ++
 411  arch/arm/boot/dts/imx6q-udoo.dts                   |   32 +
 412  arch/arm/boot/dts/imx6q.dtsi                       |   35 +-
 413  arch/arm/boot/dts/imx6qdl-aristainetos.dtsi        |  418 ++++++
 414  arch/arm/boot/dts/imx6qdl-gw52xx.dtsi              |    5 +-
 415  arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              |    5 +-
 416  arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              |    6 +-
 417  arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |    1 -
 418  arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |    1 +
 419  arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           |    1 -
 420  arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |    2 +-
 421  arch/arm/boot/dts/imx6qdl-tx6.dtsi                 |  696 +++++++++
 422  arch/arm/boot/dts/imx6qdl-wandboard.dtsi           |    1 -
 423  arch/arm/boot/dts/imx6qdl.dtsi                     |  152 +-
 424  arch/arm/boot/dts/imx6sl-evk.dts                   |   17 +-
 425  arch/arm/boot/dts/imx6sl.dtsi                      |    1 +
 426  arch/arm/boot/dts/imx6sx-pinfunc.h                 | 1544 ++++++++++++++++++++
 427  arch/arm/boot/dts/imx6sx-sdb.dts                   |  407 ++++++
 428  arch/arm/boot/dts/imx6sx.dtsi                      | 1203 +++++++++++++++
 429  arch/arm/configs/imx_v4_v5_defconfig               |    2 +-
 430  arch/arm/configs/imx_v6_v7_defconfig               |    4 +-
 431  arch/arm/configs/multi_v7_defconfig                |    2 +-
 432  arch/arm/configs/mxs_defconfig                     |    1 +
 433  arch/arm/mach-imx/Kconfig                          |   34 +-
 434  arch/arm/mach-imx/Makefile                         |    5 +-
 435  arch/arm/mach-imx/clk-imx1.c                       |  157 +-
 436  arch/arm/mach-imx/clk-imx21.c                      |  301 ++--
 437  arch/arm/mach-imx/clk-imx25.c                      |   12 +-
 438  arch/arm/mach-imx/clk-imx27.c                      |   89 +-
 439  arch/arm/mach-imx/clk-imx31.c                      |    6 +-
 440  arch/arm/mach-imx/clk-imx35.c                      |    6 +-
 441  arch/arm/mach-imx/clk-imx51-imx53.c                |  251 ++--
 442  arch/arm/mach-imx/clk-imx6q.c                      |  538 ++++---
 443  arch/arm/mach-imx/clk-imx6sl.c                     |    8 +-
 444  arch/arm/mach-imx/clk-imx6sx.c                     |    7 +-
 445  arch/arm/mach-imx/clk-vf610.c                      |    2 +
 446  arch/arm/mach-imx/clk.c                            |   10 +
 447  arch/arm/mach-imx/clk.h                            |   12 +-
 448  arch/arm/mach-imx/common.h                         |   28 +-
 449  arch/arm/mach-imx/cpu-imx5.c                       |   25 +-
 450  arch/arm/mach-imx/cpuidle-imx6q.c                  |    6 +-
 451  arch/arm/mach-imx/crm-regs-imx5.h                  |  600 --------
 452  arch/arm/mach-imx/devices-imx51.h                  |   66 -
 453  arch/arm/mach-imx/devices/Kconfig                  |    6 +-
 454  arch/arm/mach-imx/devices/Makefile                 |    1 -
 455  arch/arm/mach-imx/devices/devices-common.h         |   16 -
 456  arch/arm/mach-imx/devices/platform-fec.c           |   12 -
 457  arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c  |    5 -
 458  arch/arm/mach-imx/devices/platform-imx-i2c.c       |   26 -
 459  arch/arm/mach-imx/devices/platform-imx-keypad.c    |   10 -
 460  arch/arm/mach-imx/devices/platform-imx-ssi.c       |   20 -
 461  arch/arm/mach-imx/devices/platform-imx-uart.c      |   22 -
 462  arch/arm/mach-imx/devices/platform-imx2-wdt.c      |   18 -
 463  arch/arm/mach-imx/devices/platform-imx_udc.c       |   75 -
 464  arch/arm/mach-imx/devices/platform-mxc-ehci.c      |    9 -
 465  arch/arm/mach-imx/devices/platform-mxc_nand.c      |    5 -
 466  arch/arm/mach-imx/devices/platform-pata_imx.c      |   10 -
 467  .../mach-imx/devices/platform-sdhci-esdhc-imx.c    |   24 -
 468  arch/arm/mach-imx/devices/platform-spi_imx.c       |   27 -
 469  arch/arm/mach-imx/ehci-imx25.c                     |    1 +
 470  arch/arm/mach-imx/ehci-imx27.c                     |    1 +
 471  arch/arm/mach-imx/ehci-imx31.c                     |    1 +
 472  arch/arm/mach-imx/ehci-imx35.c                     |    1 +
 473  arch/arm/mach-imx/ehci-imx5.c                      |  171 ---
 474  arch/arm/mach-imx/ehci.h                           |   43 +
 475  arch/arm/mach-imx/gpc.c                            |    5 +-
 476  arch/arm/mach-imx/hardware.h                       |    2 -
 477  arch/arm/mach-imx/imx27-dt.c                       |    6 -
 478  arch/arm/mach-imx/iomux-mx51.h                     |  827 -----------
 479  arch/arm/mach-imx/mach-armadillo5x0.c              |    1 +
 480  arch/arm/mach-imx/mach-cpuimx27.c                  |    1 +
 481  arch/arm/mach-imx/mach-cpuimx35.c                  |    1 +
 482  arch/arm/mach-imx/mach-eukrea_cpuimx25.c           |    1 +
 483  arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |    1 +
 484  arch/arm/mach-imx/mach-imx27ipcam.c                |   77 -
 485  arch/arm/mach-imx/mach-imx50.c                     |    3 +-
 486  arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c}     |   43 +-
 487  arch/arm/mach-imx/mach-imx53.c                     |   15 +-
 488  arch/arm/mach-imx/mach-imx6sx.c                    |   11 +
 489  arch/arm/mach-imx/mach-mx25_3ds.c                  |    1 +
 490  arch/arm/mach-imx/mach-mx27_3ds.c                  |    1 +
 491  arch/arm/mach-imx/mach-mx31_3ds.c                  |    1 +
 492  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
 493  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
 494  arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
 495  arch/arm/mach-imx/mach-mx35_3ds.c                  |    1 +
 496  arch/arm/mach-imx/mach-pca100.c                    |    1 +
 497  arch/arm/mach-imx/mach-pcm037.c                    |    1 +
 498  arch/arm/mach-imx/mach-pcm038.c                    |    1 +
 499  arch/arm/mach-imx/mach-pcm043.c                    |    1 +
 500  arch/arm/mach-imx/mach-vpr200.c                    |    1 +
 501  arch/arm/mach-imx/mm-imx5.c                        |  155 --
 502  arch/arm/mach-imx/mx31moboard-devboard.c           |    1 +
 503  arch/arm/mach-imx/mx31moboard-marxbot.c            |    1 +
 504  arch/arm/mach-imx/mx31moboard-smartbot.c           |    1 +
 505  arch/arm/mach-imx/mx51.h                           |  346 -----
 506  arch/arm/mach-imx/mx53.h                           |  342 -----
 507  arch/arm/mach-imx/pm-imx5.c                        |   98 +-
 508  arch/arm/mach-imx/pm-imx6.c                        |   67 +-
 509  arch/arm/mach-imx/system.c                         |   24 +-
 510  arch/arm/mach-imx/time.c                           |   42 +-
 511  arch/arm/mach-imx/tzic.c                           |    9 +-
 512  include/dt-bindings/clock/imx1-clock.h             |   40 +
 513  include/dt-bindings/clock/imx21-clock.h            |   80 +
 514  include/dt-bindings/clock/imx6qdl-clock.h          |  224 +++
 515  include/linux/platform_data/usb-ehci-mxc.h         |   46 -
 516  include/linux/platform_data/usb-imx_udc.h          |   23 -
 517  153 files changed, 8062 insertions(+), 4135 deletions(-)
 518  create mode 100644 Documentation/devicetree/bindings/clock/imx1-clock.txt
 519  create mode 100644 Documentation/devicetree/bindings/clock/imx21-clock.txt
 520  create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts
 521  create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts
 522  create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts
 523  create mode 100644 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
 524  create mode 100644 arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts
 525  create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos_4.dts
 526  create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos_7.dts
 527  create mode 100644 arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
 528  create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-801x.dts
 529  create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-811x.dts
 530  create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
 531  create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010.dts
 532  create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
 533  create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1020.dts
 534  create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1110.dts
 535  create mode 100644 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
 536  create mode 100644 arch/arm/boot/dts/imx6qdl-tx6.dtsi
 537  create mode 100755 arch/arm/boot/dts/imx6sx-pinfunc.h
 538  create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dts
 539  create mode 100644 arch/arm/boot/dts/imx6sx.dtsi
 540  delete mode 100644 arch/arm/mach-imx/crm-regs-imx5.h
 541  delete mode 100644 arch/arm/mach-imx/devices-imx51.h
 542  delete mode 100644 arch/arm/mach-imx/devices/platform-imx_udc.c
 543  delete mode 100644 arch/arm/mach-imx/ehci-imx5.c
 544  create mode 100644 arch/arm/mach-imx/ehci.h
 545  delete mode 100644 arch/arm/mach-imx/iomux-mx51.h
 546  delete mode 100644 arch/arm/mach-imx/mach-imx27ipcam.c
 547  rename arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} (54%)
 548  delete mode 100644 arch/arm/mach-imx/mm-imx5.c
 549  delete mode 100644 arch/arm/mach-imx/mx51.h
 550  delete mode 100644 arch/arm/mach-imx/mx53.h
 551  create mode 100644 include/dt-bindings/clock/imx1-clock.h
 552  create mode 100644 include/dt-bindings/clock/imx21-clock.h
 553  create mode 100644 include/dt-bindings/clock/imx6qdl-clock.h
 554  delete mode 100644 include/linux/platform_data/usb-imx_udc.h
 555 Merging ixp4xx/next (19f949f52599 Linux 3.8)
 556 $ git merge ixp4xx/next
 557 Already up-to-date.
 558 Merging keystone/next (c9eaa447e77e Linux 3.15-rc1)
 559 $ git merge keystone/next
 560 Already up-to-date.
 561 Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
 562 $ git merge msm/for-next
 563 Already up-to-date.
 564 Merging mvebu/for-next (2507b1f9c167 Merge branch 'mvebu/soc' into mvebu/for-next)
 565 $ git merge mvebu/for-next
 566 Resolved 'arch/arm/mach-mvebu/Kconfig' using previous resolution.
 567 Removing arch/arm/mach-mvebu/hotplug.c
 568 Auto-merging arch/arm/mach-mvebu/Kconfig
 569 CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/Kconfig
 570 Auto-merging arch/arm/boot/dts/Makefile
 571 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
 572 Automatic merge failed; fix conflicts and then commit the result.
 573 $ git commit -v -a
 574 [master 6e4b8bec0d53] Merge remote-tracking branch 'mvebu/for-next'
 575 $ git diff -M --stat --summary HEAD^..
 576  Documentation/arm/Marvell/README                   |   4 +-
 577  .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 578  arch/arm/boot/dts/Makefile                         |   3 +
 579  arch/arm/boot/dts/dove-cubox-es.dts                |  12 ++
 580  arch/arm/boot/dts/dove-cubox.dts                   |   3 -
 581  arch/arm/boot/dts/kirkwood-net2big.dts             |  30 ++++
 582  arch/arm/boot/dts/kirkwood-net5big.dts             |  83 +++++++++
 583  arch/arm/boot/dts/kirkwood-netxbig.dtsi            | 180 +++++++++++++++++++
 584  arch/arm/configs/multi_v5_defconfig                |   2 +
 585  arch/arm/configs/mvebu_v5_defconfig                |   2 +
 586  arch/arm/mach-mvebu/Kconfig                        |   7 +
 587  arch/arm/mach-mvebu/Makefile                       |   2 +-
 588  arch/arm/mach-mvebu/armada-370-xp.h                |   3 +
 589  arch/arm/mach-mvebu/board-v7.c                     |  42 +++--
 590  arch/arm/mach-mvebu/board.h                        |   5 +
 591  arch/arm/mach-mvebu/common.h                       |   3 +-
 592  arch/arm/mach-mvebu/cpu-reset.c                    |   2 +-
 593  arch/arm/mach-mvebu/hotplug.c                      |  31 ----
 594  arch/arm/mach-mvebu/kirkwood.c                     |   3 +
 595  arch/arm/mach-mvebu/mvebu-soc-id.c                 |  21 ++-
 596  arch/arm/mach-mvebu/netxbig.c                      | 191 +++++++++++++++++++++
 597  arch/arm/mach-mvebu/platsmp-a9.c                   |   5 +-
 598  arch/arm/mach-mvebu/platsmp.c                      |  48 ++++++
 599  arch/arm/mach-mvebu/pmsu.c                         |  17 +-
 600  arch/arm/mach-mvebu/system-controller.c            |  19 ++
 601  25 files changed, 651 insertions(+), 68 deletions(-)
 602  create mode 100644 arch/arm/boot/dts/dove-cubox-es.dts
 603  create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
 604  create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
 605  create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi
 606  delete mode 100644 arch/arm/mach-mvebu/hotplug.c
 607  create mode 100644 arch/arm/mach-mvebu/netxbig.c
 608 Merging renesas/next (1d8fd178f76d Merge branches 'heads/defconfig-for-v3.17', 'r8a7779-multiplatform-for-v3.17', 'soc-for-v3.17' and 'soc-cleanup-for-v3.17' into next)
 609 $ git merge renesas/next
 610 Auto-merging arch/arm/mach-shmobile/sh7372.h
 611 Auto-merging arch/arm/mach-shmobile/rcar-gen2.h
 612 Auto-merging arch/arm/mach-shmobile/r8a7791.h
 613 Auto-merging arch/arm/mach-shmobile/r8a7790.h
 614 Auto-merging arch/arm/mach-shmobile/r8a7779.h
 615 Auto-merging arch/arm/mach-shmobile/r8a7740.h
 616 Auto-merging arch/arm/mach-shmobile/r7s72100.h
 617 Auto-merging arch/arm/mach-shmobile/common.h
 618 Auto-merging arch/arm/mach-shmobile/Kconfig
 619 Removing arch/arm/boot/dts/r8a7779-marzen-reference.dts
 620 Auto-merging arch/arm/boot/dts/Makefile
 621 Auto-merging MAINTAINERS
 622 Merge made by the 'recursive' strategy.
 623  MAINTAINERS                                        |  14 ++
 624  arch/arm/boot/dts/Makefile                         |   4 +-
 625  arch/arm/boot/dts/emev2.dtsi                       |   2 +
 626  arch/arm/boot/dts/r7s72100.dtsi                    |   1 +
 627  .../boot/dts/r8a7740-armadillo800eva-reference.dts |  12 +-
 628  arch/arm/boot/dts/r8a7779-marzen-reference.dts     | 121 ------------
 629  arch/arm/boot/dts/r8a7779-marzen.dts               | 116 ++++++++++-
 630  arch/arm/boot/dts/r8a7779.dtsi                     | 220 +++++++++++++++++++++
 631  arch/arm/boot/dts/r8a7790-lager.dts                |  55 +++++-
 632  arch/arm/boot/dts/r8a7790.dtsi                     | 140 ++++++++++++-
 633  arch/arm/boot/dts/r8a7791-henninger.dts            |  21 ++
 634  arch/arm/boot/dts/r8a7791-koelsch.dts              |  67 +++++--
 635  arch/arm/boot/dts/r8a7791.dtsi                     | 171 +++++++++++++++-
 636  arch/arm/configs/armadillo800eva_defconfig         |   4 +
 637  arch/arm/configs/shmobile_defconfig                |  23 ++-
 638  arch/arm/mach-shmobile/Kconfig                     |  24 ++-
 639  arch/arm/mach-shmobile/Makefile                    |   4 +-
 640  arch/arm/mach-shmobile/Makefile.boot               |   1 -
 641  arch/arm/mach-shmobile/board-ape6evm-reference.c   |   6 +-
 642  arch/arm/mach-shmobile/board-ape6evm.c             |   8 +-
 643  .../board-armadillo800eva-reference.c              |  14 +-
 644  arch/arm/mach-shmobile/board-armadillo800eva.c     |  43 +++-
 645  arch/arm/mach-shmobile/board-bockw-reference.c     |   6 +-
 646  arch/arm/mach-shmobile/board-bockw.c               |   8 +-
 647  arch/arm/mach-shmobile/board-genmai-reference.c    |  10 +-
 648  arch/arm/mach-shmobile/board-genmai.c              |  10 +-
 649  arch/arm/mach-shmobile/board-koelsch-reference.c   |  28 +--
 650  arch/arm/mach-shmobile/board-koelsch.c             |  11 +-
 651  arch/arm/mach-shmobile/board-kzm9g-reference.c     |   6 +-
 652  arch/arm/mach-shmobile/board-kzm9g.c               |   8 +-
 653  arch/arm/mach-shmobile/board-lager-reference.c     |  29 +--
 654  arch/arm/mach-shmobile/board-lager.c               |  22 ++-
 655  arch/arm/mach-shmobile/board-mackerel.c            |  12 +-
 656  arch/arm/mach-shmobile/board-marzen-reference.c    |  32 ++-
 657  arch/arm/mach-shmobile/board-marzen.c              |   8 +-
 658  arch/arm/mach-shmobile/clock-r7s72100.c            |   5 +-
 659  arch/arm/mach-shmobile/clock-r8a73a4.c             |   4 +-
 660  arch/arm/mach-shmobile/clock-r8a7740.c             |   7 +-
 661  arch/arm/mach-shmobile/clock-r8a7778.c             |   4 +-
 662  arch/arm/mach-shmobile/clock-r8a7779.c             |  27 +--
 663  arch/arm/mach-shmobile/clock-r8a7790.c             |   8 +-
 664  arch/arm/mach-shmobile/clock-r8a7791.c             |   6 +-
 665  arch/arm/mach-shmobile/clock-sh7372.c              |   4 +-
 666  arch/arm/mach-shmobile/clock-sh73a0.c              |   4 +-
 667  arch/arm/mach-shmobile/clock.c                     |   6 +-
 668  arch/arm/mach-shmobile/{include/mach => }/clock.h  |   0
 669  arch/arm/mach-shmobile/{include/mach => }/common.h |   9 +
 670  arch/arm/mach-shmobile/console.c                   |   2 +-
 671  arch/arm/mach-shmobile/cpufreq.c                   |  31 +++
 672  .../{include/mach => }/dma-register.h              |   0
 673  arch/arm/mach-shmobile/include/mach/irqs.h         |  16 +-
 674  arch/arm/mach-shmobile/intc-sh7372.c               |   5 +-
 675  arch/arm/mach-shmobile/intc-sh73a0.c               |   9 +-
 676  arch/arm/mach-shmobile/{include/mach => }/intc.h   |   0
 677  arch/arm/mach-shmobile/irqs.h                      |  21 ++
 678  arch/arm/mach-shmobile/platsmp-apmu.c              |  62 +++++-
 679  arch/arm/mach-shmobile/platsmp-scu.c               |   2 +-
 680  arch/arm/mach-shmobile/platsmp.c                   |   2 +-
 681  arch/arm/mach-shmobile/pm-r8a7740.c                |   4 +-
 682  arch/arm/mach-shmobile/pm-r8a7779.c                |  19 +-
 683  arch/arm/mach-shmobile/pm-r8a7790.c                |   6 +-
 684  arch/arm/mach-shmobile/pm-r8a7791.c                |  49 +++++
 685  arch/arm/mach-shmobile/pm-rcar.c                   |   2 +-
 686  .../arm/mach-shmobile/{include/mach => }/pm-rcar.h |   0
 687  arch/arm/mach-shmobile/pm-rmobile.c                |   2 +-
 688  .../mach-shmobile/{include/mach => }/pm-rmobile.h  |   0
 689  arch/arm/mach-shmobile/pm-sh7372.c                 |   8 +-
 690  arch/arm/mach-shmobile/pm-sh73a0.c                 |   2 +-
 691  .../mach-shmobile/{include/mach => }/r7s72100.h    |   1 -
 692  .../arm/mach-shmobile/{include/mach => }/r8a73a4.h |   0
 693  .../arm/mach-shmobile/{include/mach => }/r8a7740.h |   2 -
 694  .../arm/mach-shmobile/{include/mach => }/r8a7778.h |   0
 695  .../arm/mach-shmobile/{include/mach => }/r8a7779.h |  14 +-
 696  .../arm/mach-shmobile/{include/mach => }/r8a7790.h |   3 -
 697  .../arm/mach-shmobile/{include/mach => }/r8a7791.h |   1 +
 698  .../mach-shmobile/{include/mach => }/rcar-gen2.h   |   1 +
 699  arch/arm/mach-shmobile/setup-emev2.c               |  19 +-
 700  arch/arm/mach-shmobile/setup-r7s72100.c            |  15 +-
 701  arch/arm/mach-shmobile/setup-r8a73a4.c             |  10 +-
 702  arch/arm/mach-shmobile/setup-r8a7740.c             |  12 +-
 703  arch/arm/mach-shmobile/setup-r8a7778.c             |   8 +-
 704  arch/arm/mach-shmobile/setup-r8a7779.c             |  53 ++---
 705  arch/arm/mach-shmobile/setup-r8a7790.c             |  22 +--
 706  arch/arm/mach-shmobile/setup-r8a7791.c             |  12 +-
 707  arch/arm/mach-shmobile/setup-rcar-gen2.c           |  76 ++++++-
 708  arch/arm/mach-shmobile/setup-sh7372.c              |  12 +-
 709  arch/arm/mach-shmobile/setup-sh73a0.c              |  11 +-
 710  arch/arm/mach-shmobile/{include/mach => }/sh7372.h |   4 -
 711  arch/arm/mach-shmobile/{include/mach => }/sh73a0.h |   0
 712  arch/arm/mach-shmobile/smp-emev2.c                 |   2 +-
 713  arch/arm/mach-shmobile/smp-r8a7779.c               |   8 +-
 714  arch/arm/mach-shmobile/smp-r8a7790.c               |   9 +-
 715  arch/arm/mach-shmobile/smp-r8a7791.c               |  11 +-
 716  arch/arm/mach-shmobile/smp-sh73a0.c                |   6 +-
 717  arch/arm/mach-shmobile/timer.c                     |  50 +++--
 718  include/dt-bindings/clock/r8a7790-clock.h          |  27 +++
 719  include/dt-bindings/clock/r8a7791-clock.h          |  27 +++
 720  97 files changed, 1509 insertions(+), 494 deletions(-)
 721  delete mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts
 722  rename arch/arm/mach-shmobile/{include/mach => }/clock.h (100%)
 723  rename arch/arm/mach-shmobile/{include/mach => }/common.h (88%)
 724  create mode 100644 arch/arm/mach-shmobile/cpufreq.c
 725  rename arch/arm/mach-shmobile/{include/mach => }/dma-register.h (100%)
 726  rename arch/arm/mach-shmobile/{include/mach => }/intc.h (100%)
 727  create mode 100644 arch/arm/mach-shmobile/irqs.h
 728  create mode 100644 arch/arm/mach-shmobile/pm-r8a7791.c
 729  rename arch/arm/mach-shmobile/{include/mach => }/pm-rcar.h (100%)
 730  rename arch/arm/mach-shmobile/{include/mach => }/pm-rmobile.h (100%)
 731  rename arch/arm/mach-shmobile/{include/mach => }/r7s72100.h (82%)
 732  rename arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h (100%)
 733  rename arch/arm/mach-shmobile/{include/mach => }/r8a7740.h (98%)
 734  rename arch/arm/mach-shmobile/{include/mach => }/r8a7778.h (100%)
 735  rename arch/arm/mach-shmobile/{include/mach => }/r8a7779.h (74%)
 736  rename arch/arm/mach-shmobile/{include/mach => }/r8a7790.h (93%)
 737  rename arch/arm/mach-shmobile/{include/mach => }/r8a7791.h (90%)
 738  rename arch/arm/mach-shmobile/{include/mach => }/rcar-gen2.h (85%)
 739  rename arch/arm/mach-shmobile/{include/mach => }/sh7372.h (96%)
 740  rename arch/arm/mach-shmobile/{include/mach => }/sh73a0.h (100%)
 741 Merging samsung/for-next (053341b6993a Merge branch 'v3.16-next/dt-samsung' into for-next)
 742 $ git merge samsung/for-next
 743 Merge made by the 'recursive' strategy.
 744  arch/arm/boot/dts/exynos5420-peach-pit.dts | 236 +++++++++++++++--------------
 745  arch/arm/boot/dts/exynos5800-peach-pi.dts  | 218 +++++++++++++++-----------
 746  2 files changed, 245 insertions(+), 209 deletions(-)
 747 Merging sunxi/sunxi/for-next (e4b376f6d565 Merge branches 'sunxi/dt-for-3.17' and 'sunxi/core-for-3.17' into sunxi-next)
 748 $ git merge sunxi/sunxi/for-next
 749 Auto-merging arch/arm/boot/dts/Makefile
 750 Merge made by the 'recursive' strategy.
 751  arch/arm/Kconfig.debug                      |  10 ++
 752  arch/arm/boot/dts/Makefile                  |   2 +
 753  arch/arm/boot/dts/sun7i-a20-cubieboard2.dts |   6 ++
 754  arch/arm/boot/dts/sun7i-a20-cubietruck.dts  |   6 ++
 755  arch/arm/boot/dts/sun7i-a20.dtsi            |  32 ++++++
 756  arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts |  30 ++++++
 757  arch/arm/boot/dts/sun8i-a23.dtsi            | 160 ++++++++++++++++++++++++++++
 758  arch/arm/mach-sunxi/Kconfig                 |   5 +
 759  arch/arm/mach-sunxi/sunxi.c                 |   9 ++
 760  9 files changed, 260 insertions(+)
 761  create mode 100644 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
 762  create mode 100644 arch/arm/boot/dts/sun8i-a23.dtsi
 763 Merging tegra/for-next (88a67395a38a Merge branch for-3.17/defconfig into for-next)
 764 $ git merge tegra/for-next
 765 Auto-merging drivers/misc/fuse/tegra/speedo-tegra30.c
 766 Auto-merging drivers/misc/fuse/tegra/speedo-tegra20.c
 767 Auto-merging drivers/misc/fuse/tegra/speedo-tegra114.c
 768 Removing arch/arm/mach-tegra/fuse.h
 769 Removing arch/arm/mach-tegra/fuse.c
 770 Removing arch/arm/mach-tegra/apbio.h
 771 Removing arch/arm/mach-tegra/apbio.c
 772 Auto-merging arch/arm/boot/dts/Makefile
 773 Merge made by the 'recursive' strategy.
 774  Documentation/ABI/testing/sysfs-driver-tegra-fuse  |  11 +
 775  Documentation/devicetree/bindings/arm/tegra.txt    |   2 +
 776  .../bindings/fuse/nvidia,tegra20-fuse.txt          |  40 ++
 777  .../bindings/misc/nvidia,tegra20-apbmisc.txt       |  13 +
 778  .../bindings/pci/nvidia,tegra20-pcie.txt           |  30 +-
 779  arch/arm/boot/dts/Makefile                         |   1 +
 780  arch/arm/boot/dts/cros-ec-keyboard.dtsi            | 105 ++++
 781  arch/arm/boot/dts/exynos5250-snow.dts              |  93 +--
 782  arch/arm/boot/dts/tegra114.dtsi                    |  15 +
 783  arch/arm/boot/dts/tegra124-jetson-tk1.dts          |   1 +
 784  arch/arm/boot/dts/tegra124-venice2.dts             | 122 +---
 785  arch/arm/boot/dts/tegra124.dtsi                    |  30 +
 786  arch/arm/boot/dts/tegra20-harmony.dts              |   8 +-
 787  arch/arm/boot/dts/tegra20-medcom-wide.dts          |  61 +-
 788  arch/arm/boot/dts/tegra20-plutux.dts               |  41 ++
 789  arch/arm/boot/dts/tegra20-tamonten.dtsi            |  17 +-
 790  arch/arm/boot/dts/tegra20-tec.dts                  |  41 ++
 791  arch/arm/boot/dts/tegra20-trimslice.dts            |   8 +-
 792  arch/arm/boot/dts/tegra20.dtsi                     |  15 +
 793  arch/arm/boot/dts/tegra30-apalis-eval.dts          | 260 ++++++++
 794  arch/arm/boot/dts/tegra30-apalis.dtsi              | 678 +++++++++++++++++++++
 795  arch/arm/boot/dts/tegra30-beaver.dts               |  12 +-
 796  arch/arm/boot/dts/tegra30-cardhu.dtsi              |  11 +-
 797  arch/arm/boot/dts/tegra30.dtsi                     |  15 +
 798  arch/arm/configs/tegra_defconfig                   |  16 +-
 799  arch/arm/lib/delay.c                               |  26 +-
 800  arch/arm/mach-tegra/Makefile                       |   5 -
 801  arch/arm/mach-tegra/apbio.c                        | 206 -------
 802  arch/arm/mach-tegra/apbio.h                        |  22 -
 803  arch/arm/mach-tegra/cpuidle.c                      |   2 +-
 804  arch/arm/mach-tegra/flowctrl.c                     |   2 +-
 805  arch/arm/mach-tegra/fuse.c                         | 252 --------
 806  arch/arm/mach-tegra/fuse.h                         |  79 ---
 807  arch/arm/mach-tegra/hotplug.c                      |   2 +-
 808  arch/arm/mach-tegra/platsmp.c                      |   2 +-
 809  arch/arm/mach-tegra/pm.c                           |   2 +-
 810  arch/arm/mach-tegra/pmc.c                          |  15 +-
 811  arch/arm/mach-tegra/pmc.h                          |  13 +
 812  arch/arm/mach-tegra/powergate.c                    |  42 +-
 813  arch/arm/mach-tegra/reset-handler.S                |   2 +-
 814  arch/arm/mach-tegra/reset.c                        |   2 +-
 815  arch/arm/mach-tegra/sleep-tegra30.S                |   2 +-
 816  arch/arm/mach-tegra/tegra.c                        |   7 +-
 817  drivers/clocksource/tegra20_timer.c                |  13 +
 818  drivers/misc/Makefile                              |   1 +
 819  drivers/misc/fuse/Makefile                         |   1 +
 820  drivers/misc/fuse/tegra/Makefile                   |   8 +
 821  drivers/misc/fuse/tegra/fuse-tegra.c               | 154 +++++
 822  drivers/misc/fuse/tegra/fuse-tegra20.c             | 214 +++++++
 823  drivers/misc/fuse/tegra/fuse-tegra30.c             | 223 +++++++
 824  drivers/misc/fuse/tegra/fuse.h                     |  71 +++
 825  .../misc/fuse/tegra/speedo-tegra114.c              |  53 +-
 826  drivers/misc/fuse/tegra/speedo-tegra124.c          | 167 +++++
 827  .../misc/fuse/tegra/speedo-tegra20.c               |  42 +-
 828  .../misc/fuse/tegra/speedo-tegra30.c               | 173 +++---
 829  drivers/misc/fuse/tegra/tegra-apbmisc.c            | 110 ++++
 830  drivers/pci/host/pci-tegra.c                       | 148 +++--
 831  include/linux/tegra-soc.h                          |  42 ++
 832  init/calibrate.c                                   |  11 +
 833  59 files changed, 2731 insertions(+), 1029 deletions(-)
 834  create mode 100644 Documentation/ABI/testing/sysfs-driver-tegra-fuse
 835  create mode 100644 Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt
 836  create mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt
 837  create mode 100644 arch/arm/boot/dts/cros-ec-keyboard.dtsi
 838  create mode 100644 arch/arm/boot/dts/tegra30-apalis-eval.dts
 839  create mode 100644 arch/arm/boot/dts/tegra30-apalis.dtsi
 840  delete mode 100644 arch/arm/mach-tegra/apbio.c
 841  delete mode 100644 arch/arm/mach-tegra/apbio.h
 842  delete mode 100644 arch/arm/mach-tegra/fuse.c
 843  delete mode 100644 arch/arm/mach-tegra/fuse.h
 844  create mode 100644 drivers/misc/fuse/Makefile
 845  create mode 100644 drivers/misc/fuse/tegra/Makefile
 846  create mode 100644 drivers/misc/fuse/tegra/fuse-tegra.c
 847  create mode 100644 drivers/misc/fuse/tegra/fuse-tegra20.c
 848  create mode 100644 drivers/misc/fuse/tegra/fuse-tegra30.c
 849  create mode 100644 drivers/misc/fuse/tegra/fuse.h
 850  rename arch/arm/mach-tegra/tegra114_speedo.c => drivers/misc/fuse/tegra/speedo-tegra114.c (55%)
 851  create mode 100644 drivers/misc/fuse/tegra/speedo-tegra124.c
 852  rename arch/arm/mach-tegra/tegra20_speedo.c => drivers/misc/fuse/tegra/speedo-tegra20.c (67%)
 853  rename arch/arm/mach-tegra/tegra30_speedo.c => drivers/misc/fuse/tegra/speedo-tegra30.c (52%)
 854  create mode 100644 drivers/misc/fuse/tegra/tegra-apbmisc.c
 855 Merging arm64/for-next/core (e3a920afc348 arm64: mm: remove broken &= operator from pmd_mknotpresent)
 856 $ git merge arm64/for-next/core
 857 Already up-to-date.
 858 Merging blackfin/for-linus (51fdc6bf9880 blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80))
 859 $ git merge blackfin/for-linus
 860 Already up-to-date.
 861 Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
 862 $ git merge c6x/for-linux-next
 863 Already up-to-date.
 864 Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
 865 $ git merge cris/for-next
 866 Already up-to-date.
 867 Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
 868 $ git merge hexagon/linux-next
 869 Already up-to-date.
 870 Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf)
 871 $ git merge ia64/next
 872 Already up-to-date.
 873 Merging m68k/for-next (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo())
 874 $ git merge m68k/for-next
 875 Already up-to-date.
 876 Merging m68knommu/for-next (9a1a1aea7572 m68knommu: Remove unnecessary prototype for kobjsize())
 877 $ git merge m68knommu/for-next
 878 Merge made by the 'recursive' strategy.
 879  arch/m68k/include/asm/pgtable_no.h  | 5 -----
 880  arch/m68k/include/asm/virtconvert.h | 6 +-----
 881  2 files changed, 1 insertion(+), 10 deletions(-)
 882 Merging metag/for-next (8bc613befaec metag: hugetlbpage: Remove null pointer checks that could never happen)
 883 $ git merge metag/for-next
 884 Merge made by the 'recursive' strategy.
 885  arch/metag/mm/hugetlbpage.c | 2 +-
 886  1 file changed, 1 insertion(+), 1 deletion(-)
 887 Merging microblaze/next (225fba216261 microblaze: Fix typo in head.S s/substract/subtract/)
 888 $ git merge microblaze/next
 889 Already up-to-date.
 890 Merging mips/mips-for-linux-next (763fec3290bd Merge branch '3.16-fixes' into mips-for-linux-next)
 891 $ git merge mips/mips-for-linux-next
 892 Merge made by the 'recursive' strategy.
 893  arch/mips/Kconfig                       |   1 +
 894  arch/mips/include/asm/sigcontext.h      |   2 -
 895  arch/mips/include/asm/uasm.h            |   4 +
 896  arch/mips/include/uapi/asm/inst.h       |   1 +
 897  arch/mips/include/uapi/asm/sigcontext.h |   8 -
 898  arch/mips/kernel/asm-offsets.c          |   3 -
 899  arch/mips/kernel/irq-msc01.c            |   2 +-
 900  arch/mips/kernel/pm-cps.c               |   4 +-
 901  arch/mips/kernel/r4k_fpu.S              | 213 -------------------------
 902  arch/mips/kernel/signal.c               |  79 +---------
 903  arch/mips/kernel/signal32.c             |  74 +--------
 904  arch/mips/kernel/smp-cps.c              |   2 +-
 905  arch/mips/math-emu/ieee754.c            |  23 +--
 906  arch/mips/mm/uasm-micromips.c           |   1 +
 907  arch/mips/mm/uasm-mips.c                |   3 +-
 908  arch/mips/mm/uasm.c                     |  10 +-
 909  arch/mips/net/bpf_jit.c                 | 266 ++++++++++++++++++--------------
 910  arch/mips/rb532/devices.c               |  27 +---
 911  drivers/tc/tc.c                         |  10 +-
 912  scripts/recordmcount.h                  |   4 +-
 913  20 files changed, 215 insertions(+), 522 deletions(-)
 914 Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
 915 $ git merge openrisc/for-upstream
 916 Already up-to-date.
 917 Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
 918 $ git merge parisc/for-next
 919 Already up-to-date.
 920 Merging parisc-hd/for-next (455c6fdbd219 Linux 3.14)
 921 $ git merge parisc-hd/for-next
 922 Already up-to-date.
 923 Merging powerpc/next (68986c9f0f45 Revert "offb: Add palette hack for little endian")
 924 $ git merge powerpc/next
 925 Already up-to-date.
 926 Merging fsl/next (087dfae3fe3f powerpc/8xx: Remove empty asm/mpc8xx.h)
 927 $ git merge fsl/next
 928 Removing drivers/pcmcia/m8xx_pcmcia.c
 929 Removing arch/powerpc/include/asm/mpc8xx.h
 930 Auto-merging MAINTAINERS
 931 Merge made by the 'recursive' strategy.
 932  MAINTAINERS                                      |    3 +-
 933  arch/powerpc/boot/dts/fsl/p2041si-post.dtsi      |    1 +
 934  arch/powerpc/boot/dts/fsl/t4240si-post.dtsi      |    1 +
 935  arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi       |    1 +
 936  arch/powerpc/boot/dts/t4240rdb.dts               |  186 ++++
 937  arch/powerpc/configs/corenet32_smp_defconfig     |    3 +-
 938  arch/powerpc/configs/corenet64_smp_defconfig     |    4 +
 939  arch/powerpc/configs/mpc85xx_defconfig           |    3 +
 940  arch/powerpc/configs/mpc85xx_smp_defconfig       |    3 +
 941  arch/powerpc/include/asm/fs_pd.h                 |    1 -
 942  arch/powerpc/include/asm/mpc8xx.h                |   12 -
 943  arch/powerpc/include/asm/pte-fsl-booke.h         |    2 +
 944  arch/powerpc/include/asm/reg_booke.h             |    2 +-
 945  arch/powerpc/kernel/traps.c                      |    2 +-
 946  arch/powerpc/mm/tlb_low_64e.S                    |   19 +-
 947  arch/powerpc/platforms/85xx/Kconfig              |    2 +-
 948  arch/powerpc/platforms/85xx/corenet_generic.c    |    2 +
 949  arch/powerpc/platforms/8xx/m8xx_setup.c          |    3 -
 950  arch/powerpc/platforms/8xx/mpc885ads_setup.c     |   62 --
 951  arch/powerpc/platforms/8xx/tqm8xx_setup.c        |    1 -
 952  arch/powerpc/sysdev/micropatch.c                 |    1 -
 953  drivers/net/ethernet/freescale/fs_enet/mac-fec.c |    1 -
 954  drivers/net/ethernet/freescale/fs_enet/mac-scc.c |    1 -
 955  drivers/pcmcia/Kconfig                           |   10 -
 956  drivers/pcmcia/Makefile                          |    1 -
 957  drivers/pcmcia/m8xx_pcmcia.c                     | 1168 ----------------------
 958  26 files changed, 221 insertions(+), 1274 deletions(-)
 959  create mode 100644 arch/powerpc/boot/dts/t4240rdb.dts
 960  delete mode 100644 arch/powerpc/include/asm/mpc8xx.h
 961  delete mode 100644 drivers/pcmcia/m8xx_pcmcia.c
 962 Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
 963 $ git merge mpc5xxx/next
 964 Already up-to-date.
 965 Merging s390/features (fa73eb4738fc s390/ccwgroup: use ccwgroup_ungroup wrapper)
 966 $ git merge s390/features
 967 Already up-to-date.
 968 Merging sparc-next/master (894e552cfaa3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
 969 $ git merge sparc-next/master
 970 Already up-to-date.
 971 Merging tile/master (8dfb6948f7d8 tile: use ARRAY_SIZE)
 972 $ git merge tile/master
 973 Merge made by the 'recursive' strategy.
 974  arch/tile/kernel/traps.c | 2 +-
 975  1 file changed, 1 insertion(+), 1 deletion(-)
 976 Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
 977 $ git merge uml/next
 978 Resolved 'arch/um/include/asm/Kbuild' using previous resolution.
 979 Removing arch/x86/um/shared/sysdep/skas_ptrace.h
 980 Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
 981 Removing arch/um/sys-ia64/sysdep/skas_ptrace.h
 982 Removing arch/um/include/shared/skas_ptrace.h
 983 Removing arch/um/include/shared/skas/proc_mm.h
 984 Auto-merging arch/um/include/shared/os.h
 985 Auto-merging arch/um/include/asm/Kbuild
 986 CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
 987 Automatic merge failed; fix conflicts and then commit the result.
 988 $ git commit -v -a
 989 [master 108db588befc] Merge remote-tracking branch 'uml/next'
 990 $ git diff -M --stat --summary HEAD^..
 991  arch/um/include/shared/os.h                 |   2 -
 992  arch/um/include/shared/skas/proc_mm.h       |  44 ------
 993  arch/um/include/shared/skas/skas.h          |   3 -
 994  arch/um/include/shared/skas_ptrace.h        |  14 --
 995  arch/um/kernel/ptrace.c                     |  32 ----
 996  arch/um/kernel/reboot.c                     |  35 ++---
 997  arch/um/kernel/skas/mmu.c                   |  68 +++------
 998  arch/um/kernel/skas/process.c               |  27 ----
 999  arch/um/kernel/trap.c                       |   2 +-
1000  arch/um/kernel/um_arch.c                    |  10 --
1001  arch/um/os-Linux/process.c                  |  16 --
1002  arch/um/os-Linux/skas/mem.c                 | 100 ++----------
1003  arch/um/os-Linux/skas/process.c             | 200 ++++++------------------
1004  arch/um/os-Linux/start_up.c                 | 154 -------------------
1005  arch/um/sys-ia64/sysdep/skas_ptrace.h       |  22 ---
1006  arch/um/sys-ppc/shared/sysdep/skas_ptrace.h |  22 ---
1007  arch/x86/um/ldt.c                           | 227 ++++++----------------------
1008  arch/x86/um/shared/sysdep/faultinfo_32.h    |   3 -
1009  arch/x86/um/shared/sysdep/faultinfo_64.h    |   3 -
1010  arch/x86/um/shared/sysdep/skas_ptrace.h     |  22 ---
1011  20 files changed, 148 insertions(+), 858 deletions(-)
1012  delete mode 100644 arch/um/include/shared/skas/proc_mm.h
1013  delete mode 100644 arch/um/include/shared/skas_ptrace.h
1014  delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h
1015  delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
1016  delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h
1017 Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
1018 $ git merge unicore32/unicore32
1019 Already up-to-date.
1020 Merging xtensa/for_next (55b441be5cd6 xtensa: ISS: don't depend on CONFIG_TTY)
1021 $ git merge xtensa/for_next
1022 Already up-to-date.
1023 Merging btrfs/next (c7548af69d9e Btrfs: convert smp_mb__{before,after}_clear_bit)
1024 $ git merge btrfs/next
1025 Already up-to-date.
1026 Merging ceph/master (437f2c0d0c01 rbd: fix ida/idr memory leak)
1027 $ git merge ceph/master
1028 Auto-merging fs/dcache.c
1029 Merge made by the 'recursive' strategy.
1030  fs/dcache.c | 2 +-
1031  1 file changed, 1 insertion(+), 1 deletion(-)
1032 Merging cifs/for-next (6642176bf490 cifs: replace code with free_rsp_buf())
1033 $ git merge cifs/for-next
1034 Merge made by the 'recursive' strategy.
1035  fs/cifs/cifsglob.h  |   2 +
1036  fs/cifs/cifsproto.h |   1 +
1037  fs/cifs/cifssmb.c   | 104 ++++++++++++------
1038  fs/cifs/file.c      | 311 +++++++++++++++++++++++++++++-----------------------
1039  fs/cifs/misc.c      |   9 ++
1040  fs/cifs/smb1ops.c   |   7 ++
1041  fs/cifs/smb2ops.c   |  10 ++
1042  fs/cifs/smb2pdu.c   |  10 --
1043  8 files changed, 276 insertions(+), 178 deletions(-)
1044 Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
1045 $ git merge configfs/linux-next
1046 Already up-to-date.
1047 Merging ecryptfs/next (9e78d14a9f64 Use %pd in eCryptFS)
1048 $ git merge ecryptfs/next
1049 Auto-merging fs/ecryptfs/inode.c
1050 Auto-merging fs/ecryptfs/file.c
1051 Merge made by the 'recursive' strategy.
1052  fs/ecryptfs/file.c  |  4 ++--
1053  fs/ecryptfs/inode.c | 12 ++++++------
1054  2 files changed, 8 insertions(+), 8 deletions(-)
1055 Merging ext3/for_next (19ef1229bc2e reiserfs: Fix compilation breakage with CONFIG_REISERFS_CHECK)
1056 $ git merge ext3/for_next
1057 Already up-to-date.
1058 Merging ext4/dev (14b02deff1ae [regression] fix 32-bit breakage in block device read(2))
1059 $ git merge ext4/dev
1060 Merge made by the 'recursive' strategy.
1061  fs/ext4/balloc.c   | 16 ++++++++++++++++
1062  fs/ext4/ialloc.c   | 23 +++++++++++++++++++++++
1063  fs/ext4/indirect.c | 24 +++++++++++++++++++-----
1064  fs/ext4/mballoc.c  |  8 ++++++++
1065  fs/mbcache.c       |  3 ++-
1066  5 files changed, 68 insertions(+), 6 deletions(-)
1067 Merging f2fs/dev (3a6a95d26cbb f2fs: reduce region of f2fs_lock_op covered for better concurrency)
1068 $ git merge f2fs/dev
1069 Merge made by the 'recursive' strategy.
1070  fs/f2fs/data.c    |  24 +++--
1071  fs/f2fs/dir.c     |  35 +++++++-
1072  fs/f2fs/f2fs.h    |  11 +--
1073  fs/f2fs/file.c    |  22 +++--
1074  fs/f2fs/inode.c   |   1 +
1075  fs/f2fs/namei.c   |  87 +++++++++++++-----
1076  fs/f2fs/node.c    | 265 ++++++++++++++++++++++++++++++++++++------------------
1077  fs/f2fs/node.h    |   7 ++
1078  fs/f2fs/segment.c |   4 +-
1079  fs/f2fs/super.c   |   4 +-
1080  10 files changed, 327 insertions(+), 133 deletions(-)
1081 Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
1082 $ git merge fscache/fscache
1083 Merge made by the 'recursive' strategy.
1084 Merging fuse/for-next (1560c974dcd4 fuse: add renameat2 support)
1085 $ git merge fuse/for-next
1086 Already up-to-date.
1087 Merging gfs2/master (7b596840397a GFS2: Allow caching of glocks for flock)
1088 $ git merge gfs2/master
1089 Merge made by the 'recursive' strategy.
1090  fs/gfs2/file.c     |  4 ++--
1091  fs/gfs2/glock.c    | 14 +++++++++-----
1092  fs/gfs2/lock_dlm.c |  4 ++--
1093  3 files changed, 13 insertions(+), 9 deletions(-)
1094 Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr)
1095 $ git merge jfs/jfs-next
1096 Already up-to-date.
1097 Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
1098 $ git merge logfs/master
1099 Auto-merging fs/logfs/super.c
1100 Merge made by the 'recursive' strategy.
1101  fs/logfs/dev_mtd.c | 2 +-
1102  fs/logfs/super.c   | 6 +++---
1103  2 files changed, 4 insertions(+), 4 deletions(-)
1104 Merging nfs/linux-next (f15b5041440c FS/NFS: replace count*size kzalloc by kcalloc)
1105 $ git merge nfs/linux-next
1106 Merge made by the 'recursive' strategy.
1107  fs/nfs/blocklayout/blocklayout.c  | 101 ++++++++--------
1108  fs/nfs/direct.c                   |  33 ++---
1109  fs/nfs/filelayout/filelayout.c    | 180 +++++++++++++--------------
1110  fs/nfs/filelayout/filelayoutdev.c |   2 +-
1111  fs/nfs/internal.h                 |  11 +-
1112  fs/nfs/nfs3proc.c                 |  21 ++--
1113  fs/nfs/nfs4_fs.h                  |   6 +-
1114  fs/nfs/nfs4proc.c                 | 105 ++++++++--------
1115  fs/nfs/nfs4trace.h                |  28 ++---
1116  fs/nfs/objlayout/objio_osd.c      |  24 ++--
1117  fs/nfs/objlayout/objlayout.c      |  81 ++++++-------
1118  fs/nfs/objlayout/objlayout.h      |   8 +-
1119  fs/nfs/pagelist.c                 | 247 +++++++++++++++++---------------------
1120  fs/nfs/pnfs.c                     | 161 +++++++------------------
1121  fs/nfs/pnfs.h                     |  18 ++-
1122  fs/nfs/proc.c                     |  27 +++--
1123  fs/nfs/read.c                     |  54 ++++-----
1124  fs/nfs/write.c                    |  80 +++++-------
1125  include/linux/nfs_page.h          |  15 ++-
1126  include/linux/nfs_xdr.h           |  33 ++---
1127  20 files changed, 545 insertions(+), 690 deletions(-)
1128 Merging nfsd/nfsd-next (a497c3ba1d97 Linux 3.16-rc2)
1129 $ git merge nfsd/nfsd-next
1130 Already up-to-date.
1131 Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
1132 $ git merge omfs/for-next
1133 Already up-to-date.
1134 Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
1135 $ git merge squashfs/master
1136 Already up-to-date.
1137 Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
1138 $ git merge v9fs/for-next
1139 Already up-to-date.
1140 Merging ubifs/linux-next (380347e9ca76 UBIFS: Add an assertion for clean_zn_cnt)
1141 $ git merge ubifs/linux-next
1142 Already up-to-date.
1143 Merging xfs/for-next (2451337dd043 xfs: global error sign conversion)
1144 $ git merge xfs/for-next
1145 Auto-merging fs/xfs/libxfs/xfs_symlink_remote.c
1146 Auto-merging fs/xfs/libxfs/xfs_sb.c
1147 Auto-merging fs/xfs/libxfs/xfs_inode_fork.c
1148 Auto-merging fs/xfs/libxfs/xfs_inode_buf.c
1149 Auto-merging fs/xfs/libxfs/xfs_ialloc_btree.c
1150 Auto-merging fs/xfs/libxfs/xfs_ialloc.c
1151 Auto-merging fs/xfs/libxfs/xfs_dquot_buf.c
1152 Auto-merging fs/xfs/libxfs/xfs_dir2_sf.c
1153 Auto-merging fs/xfs/libxfs/xfs_dir2_node.c
1154 Auto-merging fs/xfs/libxfs/xfs_dir2_leaf.c
1155 Auto-merging fs/xfs/libxfs/xfs_dir2_data.c
1156 Auto-merging fs/xfs/libxfs/xfs_dir2_block.c
1157 Auto-merging fs/xfs/libxfs/xfs_dir2.c
1158 Auto-merging fs/xfs/libxfs/xfs_da_btree.c
1159 Auto-merging fs/xfs/libxfs/xfs_btree.c
1160 Auto-merging fs/xfs/libxfs/xfs_bmap_btree.c
1161 Auto-merging fs/xfs/libxfs/xfs_bmap.c
1162 Auto-merging fs/xfs/libxfs/xfs_attr_remote.c
1163 Auto-merging fs/xfs/libxfs/xfs_attr_leaf.c
1164 Auto-merging fs/xfs/libxfs/xfs_attr.c
1165 Auto-merging fs/xfs/libxfs/xfs_alloc_btree.c
1166 Auto-merging fs/xfs/libxfs/xfs_alloc.c
1167 Merge made by the 'recursive' strategy.
1168  fs/xfs/Makefile                          |  70 +++++----
1169  fs/xfs/{ => libxfs}/xfs_ag.h             |   0
1170  fs/xfs/{ => libxfs}/xfs_alloc.c          |  20 +--
1171  fs/xfs/{ => libxfs}/xfs_alloc.h          |   0
1172  fs/xfs/{ => libxfs}/xfs_alloc_btree.c    |   6 +-
1173  fs/xfs/{ => libxfs}/xfs_alloc_btree.h    |   0
1174  fs/xfs/{ => libxfs}/xfs_attr.c           |  92 +++++------
1175  fs/xfs/{ => libxfs}/xfs_attr_leaf.c      |  78 +++++-----
1176  fs/xfs/{ => libxfs}/xfs_attr_leaf.h      |   0
1177  fs/xfs/{ => libxfs}/xfs_attr_remote.c    |  22 +--
1178  fs/xfs/{ => libxfs}/xfs_attr_remote.h    |   0
1179  fs/xfs/{ => libxfs}/xfs_attr_sf.h        |   0
1180  fs/xfs/{ => libxfs}/xfs_bit.h            |   0
1181  fs/xfs/{ => libxfs}/xfs_bmap.c           |  52 +++----
1182  fs/xfs/{ => libxfs}/xfs_bmap.h           |   0
1183  fs/xfs/{ => libxfs}/xfs_bmap_btree.c     |  10 +-
1184  fs/xfs/{ => libxfs}/xfs_bmap_btree.h     |   0
1185  fs/xfs/{ => libxfs}/xfs_btree.c          |  14 +-
1186  fs/xfs/{ => libxfs}/xfs_btree.h          |   0
1187  fs/xfs/{ => libxfs}/xfs_cksum.h          |   0
1188  fs/xfs/{ => libxfs}/xfs_da_btree.c       | 110 ++++++-------
1189  fs/xfs/{ => libxfs}/xfs_da_btree.h       |   0
1190  fs/xfs/{ => libxfs}/xfs_da_format.c      |   0
1191  fs/xfs/{ => libxfs}/xfs_da_format.h      |   0
1192  fs/xfs/{ => libxfs}/xfs_dinode.h         |   0
1193  fs/xfs/{ => libxfs}/xfs_dir2.c           |  24 +--
1194  fs/xfs/{ => libxfs}/xfs_dir2.h           |   0
1195  fs/xfs/{ => libxfs}/xfs_dir2_block.c     |  18 +--
1196  fs/xfs/{ => libxfs}/xfs_dir2_data.c      |  10 +-
1197  fs/xfs/{ => libxfs}/xfs_dir2_leaf.c      |  24 +--
1198  fs/xfs/{ => libxfs}/xfs_dir2_node.c      |  40 ++---
1199  fs/xfs/{ => libxfs}/xfs_dir2_priv.h      |   0
1200  fs/xfs/{ => libxfs}/xfs_dir2_sf.c        |  30 ++--
1201  fs/xfs/{ => libxfs}/xfs_dquot_buf.c      |   6 +-
1202  fs/xfs/{ => libxfs}/xfs_format.h         |   0
1203  fs/xfs/{ => libxfs}/xfs_ialloc.c         |  34 ++--
1204  fs/xfs/{ => libxfs}/xfs_ialloc.h         |   0
1205  fs/xfs/{ => libxfs}/xfs_ialloc_btree.c   |   6 +-
1206  fs/xfs/{ => libxfs}/xfs_ialloc_btree.h   |   0
1207  fs/xfs/{ => libxfs}/xfs_inode_buf.c      |  10 +-
1208  fs/xfs/{ => libxfs}/xfs_inode_buf.h      |   0
1209  fs/xfs/{ => libxfs}/xfs_inode_fork.c     |  32 ++--
1210  fs/xfs/{ => libxfs}/xfs_inode_fork.h     |   0
1211  fs/xfs/{ => libxfs}/xfs_inum.h           |   0
1212  fs/xfs/{ => libxfs}/xfs_log_format.h     |   0
1213  fs/xfs/{ => libxfs}/xfs_log_recover.h    |   0
1214  fs/xfs/{ => libxfs}/xfs_log_rlimit.c     |   0
1215  fs/xfs/{ => libxfs}/xfs_quota_defs.h     |   0
1216  fs/xfs/{ => libxfs}/xfs_rtbitmap.c       |   0
1217  fs/xfs/{ => libxfs}/xfs_sb.c             |  32 ++--
1218  fs/xfs/{ => libxfs}/xfs_sb.h             |   0
1219  fs/xfs/{ => libxfs}/xfs_shared.h         |   0
1220  fs/xfs/{ => libxfs}/xfs_symlink_remote.c |   6 +-
1221  fs/xfs/{ => libxfs}/xfs_trans_resv.c     |   0
1222  fs/xfs/{ => libxfs}/xfs_trans_resv.h     |   0
1223  fs/xfs/{ => libxfs}/xfs_trans_space.h    |   0
1224  fs/xfs/xfs_acl.c                         |   8 +-
1225  fs/xfs/xfs_aops.c                        |  18 +--
1226  fs/xfs/xfs_attr_inactive.c               |  22 +--
1227  fs/xfs/xfs_attr_list.c                   |  38 ++---
1228  fs/xfs/xfs_bmap_util.c                   |  78 +++++-----
1229  fs/xfs/xfs_buf.c                         |  26 ++--
1230  fs/xfs/xfs_buf.h                         |   2 +-
1231  fs/xfs/xfs_buf_item.c                    |   4 +-
1232  fs/xfs/xfs_dir2_readdir.c                |   4 +-
1233  fs/xfs/xfs_discard.c                     |  18 +--
1234  fs/xfs/xfs_dquot.c                       |  38 ++---
1235  fs/xfs/xfs_error.c                       |  25 +--
1236  fs/xfs/xfs_error.h                       |  13 +-
1237  fs/xfs/xfs_export.c                      |  10 +-
1238  fs/xfs/xfs_extfree_item.c                |   2 +-
1239  fs/xfs/xfs_file.c                        |  42 ++---
1240  fs/xfs/xfs_filestream.c                  |   4 +-
1241  fs/xfs/xfs_fsops.c                       |  42 ++---
1242  fs/xfs/xfs_icache.c                      |  52 +++----
1243  fs/xfs/xfs_icache.h                      |  10 +-
1244  fs/xfs/xfs_inode.c                       |  66 ++++----
1245  fs/xfs/xfs_inode_item.c                  |   2 +-
1246  fs/xfs/xfs_ioctl.c                       | 256 +++++++++++++++----------------
1247  fs/xfs/xfs_ioctl32.c                     | 106 ++++++-------
1248  fs/xfs/xfs_iomap.c                       |  34 ++--
1249  fs/xfs/xfs_iops.c                        |  68 ++++----
1250  fs/xfs/xfs_itable.c                      |  24 +--
1251  fs/xfs/xfs_linux.h                       |   2 +-
1252  fs/xfs/xfs_log.c                         |  52 +++----
1253  fs/xfs/xfs_log_cil.c                     |   6 +-
1254  fs/xfs/xfs_log_recover.c                 | 191 +++++++++++------------
1255  fs/xfs/xfs_mount.c                       |  70 ++++-----
1256  fs/xfs/xfs_mru_cache.c                   |  14 +-
1257  fs/xfs/xfs_qm.c                          |  32 ++--
1258  fs/xfs/xfs_qm_bhv.c                      |   2 +-
1259  fs/xfs/xfs_qm_syscalls.c                 |  46 +++---
1260  fs/xfs/xfs_quotaops.c                    |  18 +--
1261  fs/xfs/xfs_rtalloc.c                     |  20 +--
1262  fs/xfs/xfs_rtalloc.h                     |   2 +-
1263  fs/xfs/xfs_super.c                       |  88 +++++------
1264  fs/xfs/xfs_symlink.c                     |  30 ++--
1265  fs/xfs/xfs_trans.c                       |  10 +-
1266  fs/xfs/xfs_trans_ail.c                   |   4 +-
1267  fs/xfs/xfs_trans_buf.c                   |  37 +++--
1268  fs/xfs/xfs_trans_dquot.c                 |   4 +-
1269  fs/xfs/xfs_xattr.c                       |   6 +-
1270  102 files changed, 1180 insertions(+), 1212 deletions(-)
1271  rename fs/xfs/{ => libxfs}/xfs_ag.h (100%)
1272  rename fs/xfs/{ => libxfs}/xfs_alloc.c (99%)
1273  rename fs/xfs/{ => libxfs}/xfs_alloc.h (100%)
1274  rename fs/xfs/{ => libxfs}/xfs_alloc_btree.c (99%)
1275  rename fs/xfs/{ => libxfs}/xfs_alloc_btree.h (100%)
1276  rename fs/xfs/{ => libxfs}/xfs_attr.c (97%)
1277  rename fs/xfs/{ => libxfs}/xfs_attr_leaf.c (98%)
1278  rename fs/xfs/{ => libxfs}/xfs_attr_leaf.h (100%)
1279  rename fs/xfs/{ => libxfs}/xfs_attr_remote.c (98%)
1280  rename fs/xfs/{ => libxfs}/xfs_attr_remote.h (100%)
1281  rename fs/xfs/{ => libxfs}/xfs_attr_sf.h (100%)
1282  rename fs/xfs/{ => libxfs}/xfs_bit.h (100%)
1283  rename fs/xfs/{ => libxfs}/xfs_bmap.c (99%)
1284  rename fs/xfs/{ => libxfs}/xfs_bmap.h (100%)
1285  rename fs/xfs/{ => libxfs}/xfs_bmap_btree.c (99%)
1286  rename fs/xfs/{ => libxfs}/xfs_bmap_btree.h (100%)
1287  rename fs/xfs/{ => libxfs}/xfs_btree.c (99%)
1288  rename fs/xfs/{ => libxfs}/xfs_btree.h (100%)
1289  rename fs/xfs/{ => libxfs}/xfs_cksum.h (100%)
1290  rename fs/xfs/{ => libxfs}/xfs_da_btree.c (97%)
1291  rename fs/xfs/{ => libxfs}/xfs_da_btree.h (100%)
1292  rename fs/xfs/{ => libxfs}/xfs_da_format.c (100%)
1293  rename fs/xfs/{ => libxfs}/xfs_da_format.h (100%)
1294  rename fs/xfs/{ => libxfs}/xfs_dinode.h (100%)
1295  rename fs/xfs/{ => libxfs}/xfs_dir2.c (98%)
1296  rename fs/xfs/{ => libxfs}/xfs_dir2.h (100%)
1297  rename fs/xfs/{ => libxfs}/xfs_dir2_block.c (99%)
1298  rename fs/xfs/{ => libxfs}/xfs_dir2_data.c (99%)
1299  rename fs/xfs/{ => libxfs}/xfs_dir2_leaf.c (99%)
1300  rename fs/xfs/{ => libxfs}/xfs_dir2_node.c (98%)
1301  rename fs/xfs/{ => libxfs}/xfs_dir2_priv.h (100%)
1302  rename fs/xfs/{ => libxfs}/xfs_dir2_sf.c (98%)
1303  rename fs/xfs/{ => libxfs}/xfs_dquot_buf.c (98%)
1304  rename fs/xfs/{ => libxfs}/xfs_format.h (100%)
1305  rename fs/xfs/{ => libxfs}/xfs_ialloc.c (99%)
1306  rename fs/xfs/{ => libxfs}/xfs_ialloc.h (100%)
1307  rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.c (98%)
1308  rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.h (100%)
1309  rename fs/xfs/{ => libxfs}/xfs_inode_buf.c (98%)
1310  rename fs/xfs/{ => libxfs}/xfs_inode_buf.h (100%)
1311  rename fs/xfs/{ => libxfs}/xfs_inode_fork.c (99%)
1312  rename fs/xfs/{ => libxfs}/xfs_inode_fork.h (100%)
1313  rename fs/xfs/{ => libxfs}/xfs_inum.h (100%)
1314  rename fs/xfs/{ => libxfs}/xfs_log_format.h (100%)
1315  rename fs/xfs/{ => libxfs}/xfs_log_recover.h (100%)
1316  rename fs/xfs/{ => libxfs}/xfs_log_rlimit.c (100%)
1317  rename fs/xfs/{ => libxfs}/xfs_quota_defs.h (100%)
1318  rename fs/xfs/{ => libxfs}/xfs_rtbitmap.c (100%)
1319  rename fs/xfs/{ => libxfs}/xfs_sb.c (97%)
1320  rename fs/xfs/{ => libxfs}/xfs_sb.h (100%)
1321  rename fs/xfs/{ => libxfs}/xfs_shared.h (100%)
1322  rename fs/xfs/{ => libxfs}/xfs_symlink_remote.c (97%)
1323  rename fs/xfs/{ => libxfs}/xfs_trans_resv.c (100%)
1324  rename fs/xfs/{ => libxfs}/xfs_trans_resv.h (100%)
1325  rename fs/xfs/{ => libxfs}/xfs_trans_space.h (100%)
1326 Merging file-private-locks/linux-next (a497c3ba1d97 Linux 3.16-rc2)
1327 $ git merge file-private-locks/linux-next
1328 Already up-to-date.
1329 Merging vfs/for-next (cd67b9ac44ea switch iov_iter_get_pages() to passing maximal number of pages)
1330 $ git merge vfs/for-next
1331 Auto-merging include/linux/uio.h
1332 Merge made by the 'recursive' strategy.
1333  fs/direct-io.c      |  2 +-
1334  fs/fuse/file.c      |  4 ++--
1335  include/linux/uio.h |  2 +-
1336  mm/iov_iter.c       | 17 ++++++++---------
1337  4 files changed, 12 insertions(+), 13 deletions(-)
1338 Merging pci/next (7171511eaec5 Linux 3.16-rc1)
1339 $ git merge pci/next
1340 Already up-to-date.
1341 Merging hid/for-next (acd059277df1 Merge branch 'for-3.17/upstream' into for-next)
1342 $ git merge hid/for-next
1343 Merge made by the 'recursive' strategy.
1344  .../ABI/testing/sysfs-class-hid-driver-gt683r      |  14 +
1345  drivers/hid/Kconfig                                |  16 +-
1346  drivers/hid/Makefile                               |   1 +
1347  drivers/hid/hid-core.c                             |   1 +
1348  drivers/hid/hid-gt683r.c                           | 309 +++++++++++++++++++++
1349  drivers/hid/hid-ids.h                              |   2 +-
1350  drivers/hid/hid-roccat-lua.c                       |   2 +-
1351  drivers/hid/hid-sony.c                             | 130 ++++++---
1352  drivers/hid/usbhid/hid-core.c                      |   2 +-
1353  drivers/hid/usbhid/hid-quirks.c                    |   2 +-
1354  10 files changed, 429 insertions(+), 50 deletions(-)
1355  create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r
1356  create mode 100644 drivers/hid/hid-gt683r.c
1357 Merging i2c/i2c/for-next (f0b1f6442b50 Merge tag 'v3.16-rc1' into i2c/for-next)
1358 $ git merge i2c/i2c/for-next
1359 Already up-to-date.
1360 Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7)
1361 $ git merge jdelvare-hwmon/master
1362 Already up-to-date.
1363 Merging hwmon-staging/hwmon-next (f719604dd06f hwmon: (lm63) Fix smatch warnings)
1364 $ git merge hwmon-staging/hwmon-next
1365 Merge made by the 'recursive' strategy.
1366  .../devicetree/bindings/i2c/trivial-devices.txt    |   1 +
1367  Documentation/hwmon/powr1220                       |  45 +++
1368  Documentation/hwmon/tmp103                         |  28 ++
1369  drivers/hwmon/Kconfig                              |  23 ++
1370  drivers/hwmon/Makefile                             |   2 +
1371  drivers/hwmon/ads7828.c                            |  52 +--
1372  drivers/hwmon/atxp1.c                              |  76 ++--
1373  drivers/hwmon/fam15h_power.c                       |  51 +--
1374  drivers/hwmon/gpio-fan.c                           |  17 +-
1375  drivers/hwmon/lm63.c                               |   4 +-
1376  drivers/hwmon/powr1220.c                           | 391 +++++++++++++++++++++
1377  drivers/hwmon/tmp103.c                             | 205 +++++++++++
1378  drivers/hwmon/twl4030-madc-hwmon.c                 |  38 +-
1379  drivers/hwmon/w83l786ng.c                          | 289 +++++++--------
1380  drivers/hwmon/wm831x-hwmon.c                       |  72 +---
1381  drivers/hwmon/wm8350-hwmon.c                       |  50 +--
1382  16 files changed, 895 insertions(+), 449 deletions(-)
1383  create mode 100644 Documentation/hwmon/powr1220
1384  create mode 100644 Documentation/hwmon/tmp103
1385  create mode 100644 drivers/hwmon/powr1220.c
1386  create mode 100644 drivers/hwmon/tmp103.c
1387 Merging v4l-dvb/master (ac35b35b30aa Merge branch 'patchwork' into to_next)
1388 $ git merge v4l-dvb/master
1389 Removing drivers/media/platform/soc_camera/mx1_camera.c
1390 Merge made by the 'recursive' strategy.
1391  drivers/media/dvb-core/dvb_frontend.c          |   8 +-
1392  drivers/media/dvb-core/dvbdev.h                |   4 +
1393  drivers/media/dvb-frontends/au8522_decoder.c   | 180 +++--
1394  drivers/media/dvb-frontends/au8522_priv.h      |   2 +
1395  drivers/media/dvb-frontends/dib7000p.c         | 433 ++++++++++++-
1396  drivers/media/dvb-frontends/dib7000p.h         | 131 +---
1397  drivers/media/dvb-frontends/dib8000.c          |  88 +--
1398  drivers/media/dvb-frontends/dib8000.h          | 150 +----
1399  drivers/media/dvb-frontends/drxd.h             |   1 -
1400  drivers/media/dvb-frontends/drxd_hard.c        |   3 +-
1401  drivers/media/dvb-frontends/si2168.c           |  16 +-
1402  drivers/media/dvb-frontends/si2168_priv.h      |   2 +-
1403  drivers/media/i2c/smiapp/smiapp-core.c         |   6 +-
1404  drivers/media/pci/cx23885/cx23885-dvb.c        |   8 +-
1405  drivers/media/pci/saa7134/saa7134-empress.c    |   2 +-
1406  drivers/media/platform/davinci/vpif_capture.c  | 245 ++-----
1407  drivers/media/platform/davinci/vpif_capture.h  |  11 -
1408  drivers/media/platform/m2m-deinterlace.c       |   7 +-
1409  drivers/media/platform/soc_camera/Kconfig      |  18 +-
1410  drivers/media/platform/soc_camera/Makefile     |   1 -
1411  drivers/media/platform/soc_camera/mx1_camera.c | 866 -------------------------
1412  drivers/media/platform/soc_camera/rcar_vin.c   |  12 +-
1413  drivers/media/platform/soc_camera/soc_camera.c |  12 +-
1414  drivers/media/platform/vsp1/vsp1_video.c       |   2 -
1415  drivers/media/platform/vsp1/vsp1_video.h       |   1 -
1416  drivers/media/rc/img-ir/img-ir-core.c          |   5 +
1417  drivers/media/rc/img-ir/img-ir-hw.c            |   5 +
1418  drivers/media/rc/img-ir/img-ir-hw.h            |   5 +
1419  drivers/media/rc/img-ir/img-ir-jvc.c           |   5 +
1420  drivers/media/rc/img-ir/img-ir-nec.c           |   5 +
1421  drivers/media/rc/img-ir/img-ir-raw.c           |   5 +
1422  drivers/media/rc/img-ir/img-ir-raw.h           |   5 +
1423  drivers/media/rc/img-ir/img-ir-sanyo.c         |   5 +
1424  drivers/media/rc/img-ir/img-ir-sharp.c         |   5 +
1425  drivers/media/rc/img-ir/img-ir-sony.c          |   5 +
1426  drivers/media/rc/img-ir/img-ir.h               |   5 +
1427  drivers/media/tuners/si2157.c                  |   2 +-
1428  drivers/media/usb/au0828/Kconfig               |   1 +
1429  drivers/media/usb/au0828/au0828-video.c        |  60 +-
1430  drivers/media/usb/dvb-usb-v2/lmedm04.c         |  25 +-
1431  drivers/media/usb/dvb-usb/cxusb.c              |  39 +-
1432  drivers/media/usb/dvb-usb/dib0700_devices.c    | 464 ++++++++-----
1433  drivers/media/usb/dvb-usb/technisat-usb2.c     |   2 +-
1434  drivers/media/usb/usbtv/usbtv-core.c           |   2 +
1435  drivers/media/v4l2-core/v4l2-dv-timings.c      |   4 +-
1436  drivers/staging/media/omap4iss/Kconfig         |   2 +-
1437  46 files changed, 1160 insertions(+), 1705 deletions(-)
1438  delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c
1439 Merging kbuild/for-next (bfbf2e950ac8 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
1440 $ git merge kbuild/for-next
1441 Auto-merging lib/Kconfig.debug
1442 Auto-merging arch/x86/Kconfig
1443 Auto-merging Makefile
1444 Merge made by the 'recursive' strategy.
1445  Documentation/lto-build  | 173 +++++++++++++++++++++++++++++++++++++++++++++++
1446  Makefile                 |  19 +++++-
1447  arch/x86/Kconfig         |   2 +-
1448  init/Kconfig             |  73 ++++++++++++++++++++
1449  kernel/gcov/Kconfig      |   2 +-
1450  lib/Kconfig.debug        |   2 +-
1451  scripts/Makefile.lto     |  84 +++++++++++++++++++++++
1452  scripts/Makefile.modpost |   7 +-
1453  scripts/link-vmlinux.sh  |   2 +-
1454  9 files changed, 356 insertions(+), 8 deletions(-)
1455  create mode 100644 Documentation/lto-build
1456  create mode 100644 scripts/Makefile.lto
1457 Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
1458 $ git merge kconfig/for-next
1459 Already up-to-date.
1460 Merging libata/for-next (2e83f386e2c9 Merge branch 'for-3.16-fixes' into for-next)
1461 $ git merge libata/for-next
1462 Merge made by the 'recursive' strategy.
1463  drivers/ata/ahci_imx.c         | 35 +++++++++++++++++++++++++++++++----
1464  drivers/ata/ahci_xgene.c       | 10 ----------
1465  drivers/ata/libahci_platform.c | 20 +++++++++++++++++++-
1466  drivers/ata/sata_fsl.c         |  5 ++---
1467  4 files changed, 52 insertions(+), 18 deletions(-)
1468 Merging pm/linux-next (3d181c42eda5 Merge branch 'acpica' into linux-next)
1469 $ git merge pm/linux-next
1470 Merge made by the 'recursive' strategy.
1471  drivers/acpi/acpi_extlog.c        | 14 +++++++-------
1472  drivers/acpi/apei/apei-internal.h | 10 +++++-----
1473  drivers/acpi/apei/ghes.c          | 32 ++++++++++++++++----------------
1474  drivers/firmware/efi/cper.c       | 20 ++++++++++----------
1475  include/acpi/actbl1.h             | 14 +++++++-------
1476  include/acpi/ghes.h               |  2 +-
1477  6 files changed, 46 insertions(+), 46 deletions(-)
1478 Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release)
1479 $ git merge idle/next
1480 Already up-to-date.
1481 Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk)
1482 $ git merge apm/for-next
1483 Already up-to-date.
1484 Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
1485 $ git merge cpupowerutils/master
1486 Already up-to-date.
1487 Merging thermal/next (a497c3ba1d97 Linux 3.16-rc2)
1488 $ git merge thermal/next
1489 Already up-to-date.
1490 Merging ieee1394/for-next (165d560bb267 Merge branch 'master' into for-next)
1491 $ git merge ieee1394/for-next
1492 Already up-to-date!
1493 Merge made by the 'recursive' strategy.
1494 Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode)
1495 $ git merge dlm/next
1496 Already up-to-date.
1497 Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
1498 $ git merge swiotlb/linux-next
1499 Merge made by the 'recursive' strategy.
1500  lib/swiotlb.c | 28 ++++++++++++++++++----------
1501  1 file changed, 18 insertions(+), 10 deletions(-)
1502 Merging slave-dma/next (7171511eaec5 Linux 3.16-rc1)
1503 $ git merge slave-dma/next
1504 Already up-to-date.
1505 Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup())
1506 $ git merge dmaengine/next
1507 Auto-merging drivers/dma/mv_xor.c
1508 Merge made by the 'recursive' strategy.
1509  drivers/dma/ioat/dca.c    | 13 ++++----
1510  drivers/dma/ioat/dma.c    |  2 +-
1511  drivers/dma/ioat/dma_v3.c |  6 ++--
1512  drivers/dma/mv_xor.c      | 80 +++++++++++++++++++++++++++++++++++++----------
1513  4 files changed, 74 insertions(+), 27 deletions(-)
1514 Merging net-next/master (9b8d90b963dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
1515 $ git merge net-next/master
1516 Auto-merging MAINTAINERS
1517 Merge made by the 'recursive' strategy.
1518  .../devicetree/bindings/net/ieee802154/cc2520.txt  |   29 +
1519  MAINTAINERS                                        |    3 +-
1520  drivers/net/ethernet/broadcom/Kconfig              |    8 +-
1521  drivers/net/ethernet/broadcom/bnx2.c               |    9 +-
1522  drivers/net/ethernet/broadcom/bnx2.h               |    5 +-
1523  drivers/net/ethernet/broadcom/bnx2_fw.h            |    3 +-
1524  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c  |    3 +-
1525  drivers/net/ethernet/broadcom/cnic.c               |   10 +-
1526  drivers/net/ethernet/broadcom/cnic.h               |    3 +-
1527  drivers/net/ethernet/broadcom/cnic_defs.h          |    3 +-
1528  drivers/net/ethernet/broadcom/cnic_if.h            |    3 +-
1529  drivers/net/ethernet/chelsio/Kconfig               |   11 +
1530  drivers/net/ethernet/chelsio/cxgb4/Makefile        |    1 +
1531  drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |   13 +-
1532  drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c     |  980 ++++
1533  drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h     |  141 +
1534  drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  201 +-
1535  drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h     |    2 +-
1536  drivers/net/ethernet/chelsio/cxgb4/l2t.c           |    2 +-
1537  drivers/net/ethernet/chelsio/cxgb4/l2t.h           |    2 +-
1538  drivers/net/ethernet/chelsio/cxgb4/sge.c           |    2 +-
1539  drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |   78 +-
1540  drivers/net/ethernet/chelsio/cxgb4/t4_hw.h         |    2 +-
1541  drivers/net/ethernet/chelsio/cxgb4/t4_msg.h        |    2 +-
1542  drivers/net/ethernet/chelsio/cxgb4/t4_regs.h       |    2 +-
1543  drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h      |   97 +-
1544  drivers/net/ethernet/cisco/enic/Makefile           |    2 +-
1545  drivers/net/ethernet/cisco/enic/enic.h             |   43 +-
1546  drivers/net/ethernet/cisco/enic/enic_api.c         |    4 +-
1547  drivers/net/ethernet/cisco/enic/enic_clsf.c        |  269 ++
1548  drivers/net/ethernet/cisco/enic/enic_clsf.h        |   22 +
1549  drivers/net/ethernet/cisco/enic/enic_dev.c         |   80 +-
1550  drivers/net/ethernet/cisco/enic/enic_dev.h         |    4 +-
1551  drivers/net/ethernet/cisco/enic/enic_main.c        |  245 +-
1552  drivers/net/ethernet/cisco/enic/enic_res.c         |    1 +
1553  drivers/net/ethernet/cisco/enic/vnic_dev.c         |   65 +-
1554  drivers/net/ethernet/cisco/enic/vnic_dev.h         |    2 +
1555  drivers/net/ethernet/cisco/enic/vnic_devcmd.h      |    5 +
1556  drivers/net/ethernet/cisco/enic/vnic_enet.h        |    2 +
1557  drivers/net/ethernet/cisco/enic/vnic_rq.h          |  122 +
1558  drivers/net/ethernet/intel/i40e/i40e.h             |    5 +
1559  drivers/net/ethernet/intel/i40e/i40e_adminq.c      |   36 +-
1560  drivers/net/ethernet/intel/i40e/i40e_common.c      |   15 +-
1561  drivers/net/ethernet/intel/i40e/i40e_debugfs.c     |    2 +-
1562  drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |   31 +-
1563  drivers/net/ethernet/intel/i40e/i40e_main.c        |  332 +-
1564  drivers/net/ethernet/intel/i40e/i40e_prototype.h   |    3 +-
1565  drivers/net/ethernet/intel/i40e/i40e_register.h    | 5011 ++++++++------------
1566  drivers/net/ethernet/intel/i40e/i40e_txrx.h        |    1 -
1567  drivers/net/ethernet/intel/i40e/i40e_type.h        |    7 +-
1568  drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |    2 +
1569  drivers/net/ethernet/intel/i40evf/i40e_adminq.c    |   36 +-
1570  drivers/net/ethernet/intel/i40evf/i40e_register.h  | 5011 ++++++++------------
1571  drivers/net/ethernet/intel/i40evf/i40e_txrx.h      |    1 -
1572  drivers/net/ethernet/intel/i40evf/i40e_type.h      |    7 +-
1573  drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c |    4 +-
1574  drivers/net/ethernet/intel/i40evf/i40evf_main.c    |    2 +-
1575  drivers/net/ethernet/xilinx/ll_temac_main.c        |    2 +-
1576  drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c  |    2 +-
1577  drivers/net/ethernet/xilinx/xilinx_emaclite.c      |    2 +-
1578  drivers/net/hyperv/hyperv_net.h                    |    3 +-
1579  drivers/net/hyperv/netvsc_drv.c                    |   30 +-
1580  drivers/net/hyperv/rndis_filter.c                  |   21 +-
1581  drivers/net/ieee802154/Kconfig                     |   11 +
1582  drivers/net/ieee802154/Makefile                    |    1 +
1583  drivers/net/ieee802154/cc2520.c                    | 1039 ++++
1584  drivers/net/ieee802154/mrf24j40.c                  |  115 +-
1585  drivers/net/irda/kingsun-sir.c                     |    4 +-
1586  drivers/net/veth.c                                 |   18 +
1587  include/linux/crc32.h                              |   20 +-
1588  include/linux/kernel.h                             |    2 +-
1589  include/linux/rndis.h                              |    1 +
1590  include/linux/spi/cc2520.h                         |   26 +
1591  include/net/flow_keys.h                            |   14 +
1592  include/net/sch_generic.h                          |    2 +-
1593  include/net/tcp.h                                  |    3 +-
1594  include/uapi/linux/tipc_config.h                   |    2 +-
1595  lib/crc32.c                                        |  153 +-
1596  lib/net_utils.c                                    |   10 +-
1597  net/bridge/br_fdb.c                                |   10 +-
1598  net/core/dev.c                                     |    6 +-
1599  net/core/flow_dissector.c                          |    1 +
1600  net/core/request_sock.c                            |   43 +-
1601  net/dsa/dsa.c                                      |    3 +-
1602  net/ipv4/tcp_ipv4.c                                |    3 +-
1603  net/ipv6/tcp_ipv6.c                                |    3 +-
1604  net/irda/irlmp.c                                   |    3 +-
1605  net/sched/em_canid.c                               |    7 -
1606  88 files changed, 7747 insertions(+), 6800 deletions(-)
1607  create mode 100644 Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
1608  create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c
1609  create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h
1610  create mode 100644 drivers/net/ethernet/cisco/enic/enic_clsf.c
1611  create mode 100644 drivers/net/ethernet/cisco/enic/enic_clsf.h
1612  create mode 100644 drivers/net/ieee802154/cc2520.c
1613  create mode 100644 include/linux/spi/cc2520.h
1614 Merging ipsec-next/master (644a918d2033 enic: Make dummy rfs functions inline to fix !CONFIG_RFS_ACCEL build)
1615 $ git merge ipsec-next/master
1616 Already up-to-date.
1617 Merging wireless-next/master (c64800e772a0 wireless: mwifiex: Use the proper interfaces)
1618 $ git merge wireless-next/master
1619 Auto-merging net/wireless/nl80211.c
1620 Removing net/wireless/ethtool.h
1621 Auto-merging net/mac80211/util.c
1622 Removing net/mac80211/rc80211_pid_debugfs.c
1623 Removing net/mac80211/rc80211_pid_algo.c
1624 Removing net/mac80211/rc80211_pid.h
1625 Auto-merging drivers/net/wireless/rt2x00/rt2x00mac.c
1626 Auto-merging drivers/net/wireless/rt2x00/rt2x00dev.c
1627 Auto-merging drivers/net/wireless/mwifiex/util.h
1628 Auto-merging drivers/net/wireless/mwifiex/pcie.c
1629 Auto-merging drivers/net/wireless/mwifiex/main.c
1630 Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c
1631 Auto-merging drivers/net/wireless/iwlwifi/iwl-fw.h
1632 Auto-merging drivers/net/wireless/brcm80211/brcmfmac/usb.c
1633 Auto-merging drivers/net/wireless/b43/main.c
1634 Auto-merging drivers/net/wireless/b43/Kconfig
1635 Auto-merging MAINTAINERS
1636 Merge made by the 'recursive' strategy.
1637  MAINTAINERS                                        |  10 -
1638  drivers/bcma/driver_gpio.c                         |   1 +
1639  drivers/net/wireless/at76c50x-usb.c                |   3 +-
1640  drivers/net/wireless/ath/ath.h                     |   1 +
1641  drivers/net/wireless/ath/ath10k/mac.c              |   3 +-
1642  drivers/net/wireless/ath/ath9k/Makefile            |   3 +-
1643  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   3 +-
1644  drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  15 +-
1645  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   6 +-
1646  drivers/net/wireless/ath/ath9k/ar953x_initvals.h   | 201 ++++-
1647  drivers/net/wireless/ath/ath9k/ath9k.h             | 159 +++-
1648  drivers/net/wireless/ath/ath9k/beacon.c            |  97 ++-
1649  drivers/net/wireless/ath/ath9k/channel.c           | 685 ++++++++++++++++
1650  drivers/net/wireless/ath/ath9k/debug.c             |  28 +-
1651  drivers/net/wireless/ath/ath9k/hw.c                |  26 +-
1652  drivers/net/wireless/ath/ath9k/hw.h                |   1 +
1653  drivers/net/wireless/ath/ath9k/init.c              |  55 +-
1654  drivers/net/wireless/ath/ath9k/link.c              |   6 +-
1655  drivers/net/wireless/ath/ath9k/main.c              | 891 +++++++++++++++------
1656  drivers/net/wireless/ath/ath9k/mci.c               |   4 +-
1657  drivers/net/wireless/ath/ath9k/pci.c               |   1 +
1658  drivers/net/wireless/ath/ath9k/recv.c              |  16 +-
1659  drivers/net/wireless/ath/ath9k/reg.h               |   4 +
1660  drivers/net/wireless/ath/ath9k/tx99.c              |   2 +-
1661  drivers/net/wireless/ath/ath9k/wow.c               |   1 +
1662  drivers/net/wireless/ath/ath9k/xmit.c              | 114 ++-
1663  drivers/net/wireless/ath/wil6210/cfg80211.c        |  68 +-
1664  drivers/net/wireless/ath/wil6210/debugfs.c         | 305 ++++++-
1665  drivers/net/wireless/ath/wil6210/interrupt.c       |   3 +
1666  drivers/net/wireless/ath/wil6210/main.c            |  22 +-
1667  drivers/net/wireless/ath/wil6210/pcie_bus.c        |  31 +-
1668  drivers/net/wireless/ath/wil6210/rx_reorder.c      |   1 +
1669  drivers/net/wireless/ath/wil6210/txrx.c            |  33 +-
1670  drivers/net/wireless/ath/wil6210/wil6210.h         |  10 +-
1671  drivers/net/wireless/ath/wil6210/wmi.c             |  40 +-
1672  drivers/net/wireless/b43/Kconfig                   |   9 +
1673  drivers/net/wireless/b43/Makefile                  |   6 +-
1674  drivers/net/wireless/b43/main.c                    | 281 +++----
1675  drivers/net/wireless/b43/phy_a.c                   |   2 +-
1676  drivers/net/wireless/b43/phy_a.h                   |   4 -
1677  drivers/net/wireless/b43/phy_common.c              |  26 +-
1678  drivers/net/wireless/b43/phy_common.h              |  12 +-
1679  drivers/net/wireless/b43/phy_ht.c                  |   2 +-
1680  drivers/net/wireless/b43/phy_n.c                   | 153 ++--
1681  drivers/net/wireless/b43/tables_nphy.c             |   2 +-
1682  drivers/net/wireless/brcm80211/brcmfmac/Makefile   |   3 +-
1683  drivers/net/wireless/brcm80211/brcmfmac/btcoex.c   |  38 +-
1684  drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |  10 -
1685  .../net/wireless/brcm80211/brcmfmac/dhd_common.c   |   7 +
1686  drivers/net/wireless/brcm80211/brcmfmac/fwil.c     |   2 +-
1687  drivers/net/wireless/brcm80211/brcmfmac/p2p.c      |   2 +-
1688  drivers/net/wireless/brcm80211/brcmfmac/usb.c      | 214 +++--
1689  drivers/net/wireless/brcm80211/brcmfmac/vendor.c   | 115 +++
1690  drivers/net/wireless/brcm80211/brcmfmac/vendor.h   |  64 ++
1691  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |  81 +-
1692  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |   2 +-
1693  .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c  |   6 +-
1694  drivers/net/wireless/cw1200/scan.c                 |   3 +-
1695  drivers/net/wireless/cw1200/scan.h                 |   2 +-
1696  drivers/net/wireless/cw1200/sta.c                  |   3 +-
1697  drivers/net/wireless/iwlegacy/common.c             |   3 +-
1698  drivers/net/wireless/iwlegacy/common.h             |   2 +-
1699  drivers/net/wireless/iwlwifi/dvm/mac80211.c        |   3 +-
1700  drivers/net/wireless/iwlwifi/dvm/power.c           |   9 +
1701  drivers/net/wireless/iwlwifi/iwl-8000.c            |   5 +-
1702  drivers/net/wireless/iwlwifi/iwl-config.h          |   2 +-
1703  drivers/net/wireless/iwlwifi/iwl-drv.c             |  15 +
1704  drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c    |   1 -
1705  drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h   |  46 +-
1706  drivers/net/wireless/iwlwifi/iwl-fw-file.h         |   6 +-
1707  drivers/net/wireless/iwlwifi/iwl-fw.h              |   8 +
1708  drivers/net/wireless/iwlwifi/iwl-modparams.h       |   2 +
1709  drivers/net/wireless/iwlwifi/iwl-nvm-parse.c       |  56 +-
1710  drivers/net/wireless/iwlwifi/iwl-prph.h            |   6 +
1711  drivers/net/wireless/iwlwifi/mvm/coex.c            |  77 +-
1712  drivers/net/wireless/iwlwifi/mvm/constants.h       |   2 +
1713  drivers/net/wireless/iwlwifi/mvm/debugfs.c         |  39 +
1714  drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h     |  10 +-
1715  drivers/net/wireless/iwlwifi/mvm/fw-api-power.h    |   2 +-
1716  drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h     |  47 +-
1717  drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h      |   7 +-
1718  drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h       |  14 +
1719  drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c        |  45 +-
1720  drivers/net/wireless/iwlwifi/mvm/mac80211.c        |  20 +-
1721  drivers/net/wireless/iwlwifi/mvm/mvm.h             |  16 +-
1722  drivers/net/wireless/iwlwifi/mvm/nvm.c             |  29 +-
1723  drivers/net/wireless/iwlwifi/mvm/ops.c             |  31 +-
1724  drivers/net/wireless/iwlwifi/mvm/scan.c            |  83 +-
1725  drivers/net/wireless/iwlwifi/mvm/sta.c             |  20 +
1726  drivers/net/wireless/iwlwifi/mvm/sta.h             |   2 +
1727  drivers/net/wireless/iwlwifi/mvm/tx.c              |   8 +-
1728  drivers/net/wireless/iwlwifi/pcie/internal.h       |   7 +
1729  drivers/net/wireless/iwlwifi/pcie/trans.c          | 145 +++-
1730  drivers/net/wireless/iwlwifi/pcie/tx.c             |   1 +
1731  drivers/net/wireless/libertas/Kconfig              |   2 +-
1732  drivers/net/wireless/libertas/cmd.c                |   1 +
1733  drivers/net/wireless/mac80211_hwsim.c              |  69 +-
1734  drivers/net/wireless/mwifiex/11ac.c                |   2 +-
1735  drivers/net/wireless/mwifiex/11ac.h                |   2 +-
1736  drivers/net/wireless/mwifiex/11h.c                 |   2 +-
1737  drivers/net/wireless/mwifiex/11n.c                 |   2 +-
1738  drivers/net/wireless/mwifiex/11n.h                 |   2 +-
1739  drivers/net/wireless/mwifiex/11n_aggr.c            |   2 +-
1740  drivers/net/wireless/mwifiex/11n_aggr.h            |   2 +-
1741  drivers/net/wireless/mwifiex/11n_rxreorder.c       |   2 +-
1742  drivers/net/wireless/mwifiex/11n_rxreorder.h       |   2 +-
1743  drivers/net/wireless/mwifiex/Makefile              |   2 +-
1744  drivers/net/wireless/mwifiex/README                |  32 +-
1745  drivers/net/wireless/mwifiex/cfg80211.c            |  55 +-
1746  drivers/net/wireless/mwifiex/cfg80211.h            |   2 +-
1747  drivers/net/wireless/mwifiex/cfp.c                 |   2 +-
1748  drivers/net/wireless/mwifiex/cmdevt.c              |  30 +-
1749  drivers/net/wireless/mwifiex/debugfs.c             |  95 ++-
1750  drivers/net/wireless/mwifiex/decl.h                |   2 +-
1751  drivers/net/wireless/mwifiex/ethtool.c             |  85 +-
1752  drivers/net/wireless/mwifiex/fw.h                  |   2 +-
1753  drivers/net/wireless/mwifiex/ie.c                  |   2 +-
1754  drivers/net/wireless/mwifiex/init.c                |  15 +-
1755  drivers/net/wireless/mwifiex/ioctl.h               |   2 +-
1756  drivers/net/wireless/mwifiex/join.c                |   2 +-
1757  drivers/net/wireless/mwifiex/main.c                |   8 +-
1758  drivers/net/wireless/mwifiex/main.h                |  34 +-
1759  drivers/net/wireless/mwifiex/pcie.c                | 195 ++++-
1760  drivers/net/wireless/mwifiex/pcie.h                |  12 +-
1761  drivers/net/wireless/mwifiex/scan.c                |   2 +-
1762  drivers/net/wireless/mwifiex/sdio.c                | 240 +++++-
1763  drivers/net/wireless/mwifiex/sdio.h                |  14 +-
1764  drivers/net/wireless/mwifiex/sta_cmd.c             |   2 +-
1765  drivers/net/wireless/mwifiex/sta_cmdresp.c         |   2 +-
1766  drivers/net/wireless/mwifiex/sta_event.c           |   2 +-
1767  drivers/net/wireless/mwifiex/sta_ioctl.c           |   8 +-
1768  drivers/net/wireless/mwifiex/sta_rx.c              |   2 +-
1769  drivers/net/wireless/mwifiex/sta_tx.c              |   2 +-
1770  drivers/net/wireless/mwifiex/tdls.c                |   8 +-
1771  drivers/net/wireless/mwifiex/txrx.c                |   2 +-
1772  drivers/net/wireless/mwifiex/uap_cmd.c             |   2 +-
1773  drivers/net/wireless/mwifiex/uap_event.c           |   2 +-
1774  drivers/net/wireless/mwifiex/uap_txrx.c            |   6 +-
1775  drivers/net/wireless/mwifiex/usb.c                 |   2 +-
1776  drivers/net/wireless/mwifiex/usb.h                 |   2 +-
1777  drivers/net/wireless/mwifiex/util.c                |   2 +-
1778  drivers/net/wireless/mwifiex/util.h                |   2 +-
1779  drivers/net/wireless/mwifiex/wmm.c                 |  11 +-
1780  drivers/net/wireless/mwifiex/wmm.h                 |   2 +-
1781  drivers/net/wireless/orinoco/Kconfig               |   4 +-
1782  drivers/net/wireless/p54/p54spi.c                  |   2 +-
1783  drivers/net/wireless/rsi/rsi_91x_core.c            |  85 +-
1784  drivers/net/wireless/rsi/rsi_91x_debugfs.c         |  10 +-
1785  drivers/net/wireless/rsi/rsi_91x_mac80211.c        | 143 +++-
1786  drivers/net/wireless/rsi/rsi_91x_mgmt.c            | 239 ++++--
1787  drivers/net/wireless/rsi/rsi_91x_pkt.c             |  17 +
1788  drivers/net/wireless/rsi/rsi_91x_sdio.c            |   6 +-
1789  drivers/net/wireless/rsi/rsi_91x_sdio_ops.c        |   8 +-
1790  drivers/net/wireless/rsi/rsi_91x_usb.c             |  28 +-
1791  drivers/net/wireless/rsi/rsi_main.h                |  12 +
1792  drivers/net/wireless/rsi/rsi_mgmt.h                |  25 +-
1793  drivers/net/wireless/rsi/rsi_sdio.h                |   8 +-
1794  drivers/net/wireless/rt2x00/rt2800lib.c            |  69 +-
1795  drivers/net/wireless/rt2x00/rt2x00dev.c            |  10 +-
1796  drivers/net/wireless/rt2x00/rt2x00mac.c            |  20 +-
1797  drivers/net/wireless/rt2x00/rt2x00mmio.c           |   8 +-
1798  drivers/net/wireless/rt2x00/rt2x00queue.c          |  21 +-
1799  drivers/net/wireless/rt2x00/rt2x00queue.h          |   1 +
1800  drivers/net/wireless/rtl818x/rtl8180/dev.c         |  33 +-
1801  .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h  |   2 +-
1802  drivers/net/wireless/rtlwifi/rtl8188ee/hw.c        |   2 +-
1803  drivers/net/wireless/rtlwifi/rtl8188ee/reg.h       |   1 +
1804  drivers/net/wireless/rtlwifi/rtl8192ce/hw.c        |   2 +-
1805  drivers/net/wireless/rtlwifi/rtl8192ce/reg.h       |   1 +
1806  drivers/net/wireless/rtlwifi/rtl8192cu/hw.c        |   2 +-
1807  drivers/net/wireless/rtlwifi/rtl8192de/hw.c        |   2 +-
1808  drivers/net/wireless/rtlwifi/rtl8192de/phy.c       |   3 +-
1809  drivers/net/wireless/rtlwifi/rtl8192de/reg.h       |   1 +
1810  drivers/net/wireless/rtlwifi/rtl8723ae/hw.c        |   2 +-
1811  drivers/net/wireless/rtlwifi/rtl8723ae/reg.h       |   1 +
1812  drivers/net/wireless/rtlwifi/rtl8723be/hw.c        |   2 +-
1813  drivers/net/wireless/rtlwifi/rtl8723be/reg.h       |   1 +
1814  drivers/net/wireless/ti/wl1251/main.c              |   3 +-
1815  drivers/net/wireless/ti/wl12xx/scan.c              |  20 +-
1816  drivers/net/wireless/ti/wl12xx/scan.h              |   2 +-
1817  drivers/net/wireless/ti/wl18xx/scan.c              |  16 +-
1818  drivers/net/wireless/ti/wl18xx/scan.h              |   2 +-
1819  drivers/net/wireless/ti/wlcore/cmd.c               |  11 +-
1820  drivers/net/wireless/ti/wlcore/cmd.h               |   3 +-
1821  drivers/net/wireless/ti/wlcore/main.c              |   5 +-
1822  drivers/net/wireless/ti/wlcore/scan.h              |   2 +-
1823  drivers/net/wireless/ti/wlcore/wlcore.h            |   2 +-
1824  include/linux/ieee80211.h                          |   3 +
1825  include/net/cfg80211.h                             |  38 +-
1826  include/net/mac80211.h                             |  71 +-
1827  include/uapi/linux/nl80211.h                       |   5 +
1828  net/mac80211/Kconfig                               |  17 -
1829  net/mac80211/Makefile                              |   6 +-
1830  net/mac80211/agg-tx.c                              |   8 +-
1831  net/mac80211/cfg.c                                 | 555 +++----------
1832  net/mac80211/chan.c                                | 861 ++++++++++++++++----
1833  net/mac80211/debugfs_sta.c                         |   3 +-
1834  net/mac80211/driver-ops.h                          |  20 +-
1835  net/mac80211/ethtool.c                             | 244 ++++++
1836  net/mac80211/ibss.c                                |   2 +-
1837  net/mac80211/ieee80211_i.h                         |  88 +-
1838  net/mac80211/iface.c                               |  13 +-
1839  net/mac80211/main.c                                |  10 +-
1840  net/mac80211/mesh.c                                |   4 +-
1841  net/mac80211/mesh_plink.c                          |  30 +-
1842  net/mac80211/mlme.c                                | 134 ++--
1843  net/mac80211/offchannel.c                          |   6 +-
1844  net/mac80211/pm.c                                  |   6 +-
1845  net/mac80211/rate.h                                |  13 -
1846  net/mac80211/rc80211_pid.h                         | 278 -------
1847  net/mac80211/rc80211_pid_algo.c                    | 478 -----------
1848  net/mac80211/rc80211_pid_debugfs.c                 | 228 ------
1849  net/mac80211/rx.c                                  |   2 +
1850  net/mac80211/scan.c                                | 118 ++-
1851  net/mac80211/sta_info.c                            | 201 ++++-
1852  net/mac80211/sta_info.h                            |  13 +-
1853  net/mac80211/status.c                              |   7 +-
1854  net/mac80211/tdls.c                                | 293 ++++++-
1855  net/mac80211/trace.h                               |   7 +
1856  net/mac80211/tx.c                                  | 170 ++--
1857  net/mac80211/util.c                                | 270 +++++--
1858  net/mac80211/wep.c                                 |  20 -
1859  net/wireless/core.c                                |   3 -
1860  net/wireless/ethtool.c                             |  86 +-
1861  net/wireless/ethtool.h                             |   6 -
1862  net/wireless/nl80211.c                             |  15 +-
1863  net/wireless/rdev-ops.h                            |  54 +-
1864  net/wireless/trace.h                               |  59 +-
1865  228 files changed, 7269 insertions(+), 3662 deletions(-)
1866  create mode 100644 drivers/net/wireless/ath/ath9k/channel.c
1867  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/vendor.c
1868  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/vendor.h
1869  create mode 100644 net/mac80211/ethtool.c
1870  delete mode 100644 net/mac80211/rc80211_pid.h
1871  delete mode 100644 net/mac80211/rc80211_pid_algo.c
1872  delete mode 100644 net/mac80211/rc80211_pid_debugfs.c
1873  delete mode 100644 net/wireless/ethtool.h
1874 Merging bluetooth/master (6fd7571c3097 Bluetooth: Use macro instead of hard-coded value)
1875 $ git merge bluetooth/master
1876 Resolved 'net/bluetooth/hci_conn.c' using previous resolution.
1877 Resolved 'net/bluetooth/smp.c' using previous resolution.
1878 Auto-merging net/bluetooth/smp.c
1879 CONFLICT (content): Merge conflict in net/bluetooth/smp.c
1880 Auto-merging net/bluetooth/mgmt.c
1881 Auto-merging net/bluetooth/l2cap_sock.c
1882 Auto-merging net/bluetooth/l2cap_core.c
1883 Auto-merging net/bluetooth/hci_event.c
1884 Auto-merging net/bluetooth/hci_conn.c
1885 CONFLICT (content): Merge conflict in net/bluetooth/hci_conn.c
1886 Removing net/bluetooth/6lowpan.h
1887 Auto-merging drivers/bluetooth/hci_h5.c
1888 Auto-merging drivers/bluetooth/ath3k.c
1889 Automatic merge failed; fix conflicts and then commit the result.
1890 $ git commit -v -a
1891 [master a52590dcd26b] Merge remote-tracking branch 'bluetooth/master'
1892 $ git diff -M --stat --summary HEAD^..
1893  drivers/bluetooth/Kconfig         |  12 +-
1894  drivers/bluetooth/ath3k.c         |   4 +-
1895  drivers/bluetooth/hci_h5.c        |   4 -
1896  include/net/bluetooth/bluetooth.h |  18 +-
1897  include/net/bluetooth/hci.h       |  34 +-
1898  include/net/bluetooth/hci_core.h  |  26 +-
1899  include/net/bluetooth/l2cap.h     |  36 +-
1900  net/bluetooth/6lowpan.c           | 857 +++++++++++++++++++++++++++++---------
1901  net/bluetooth/6lowpan.h           |  47 ---
1902  net/bluetooth/Kconfig             |   6 +-
1903  net/bluetooth/Makefile            |   4 +-
1904  net/bluetooth/a2mp.c              |   8 +-
1905  net/bluetooth/hci_conn.c          |  43 +-
1906  net/bluetooth/hci_core.c          | 164 ++------
1907  net/bluetooth/hci_event.c         | 115 +++--
1908  net/bluetooth/l2cap_core.c        |  80 ++--
1909  net/bluetooth/l2cap_sock.c        |  43 +-
1910  net/bluetooth/mgmt.c              |  73 +++-
1911  net/bluetooth/smp.c               |  57 +--
1912  net/bluetooth/smp.h               |   7 +
1913  20 files changed, 1059 insertions(+), 579 deletions(-)
1914  delete mode 100644 net/bluetooth/6lowpan.h
1915 Merging infiniband/for-next (eeaddf3670d4 Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next)
1916 $ git merge infiniband/for-next
1917 Already up-to-date.
1918 Merging mtd/master (7171511eaec5 Linux 3.16-rc1)
1919 $ git merge mtd/master
1920 Already up-to-date.
1921 Merging l2-mtd/master (7171511eaec5 Linux 3.16-rc1)
1922 $ git merge l2-mtd/master
1923 Already up-to-date.
1924 Merging crypto/master (8f312d64b5ee crypto: qat - Fix error path crash when no firmware is present)
1925 $ git merge crypto/master
1926 Auto-merging MAINTAINERS
1927 Merge made by the 'recursive' strategy.
1928  .../devicetree/bindings/crypto/amd-ccp.txt         |   16 +
1929  Documentation/ioctl/ioctl-number.txt               |    1 +
1930  MAINTAINERS                                        |    6 +
1931  arch/x86/crypto/Makefile                           |    4 +-
1932  arch/x86/crypto/aes_ctrby8_avx-x86_64.S            |  546 ++++++
1933  arch/x86/crypto/aesni-intel_glue.c                 |   40 +-
1934  arch/x86/crypto/crc32c-pcl-intel-asm_64.S          |  281 ++-
1935  arch/x86/crypto/des3_ede-asm_64.S                  |  805 ++++++++
1936  arch/x86/crypto/des3_ede_glue.c                    |  509 +++++
1937  crypto/Kconfig                                     |   49 +-
1938  crypto/Makefile                                    |    1 +
1939  crypto/des_generic.c                               |   22 +-
1940  crypto/drbg.c                                      | 2007 ++++++++++++++++++++
1941  crypto/lzo.c                                       |    8 +-
1942  crypto/tcrypt.c                                    |    6 +
1943  crypto/testmgr.c                                   |  247 +++
1944  crypto/testmgr.h                                   |  892 ++++++++-
1945  drivers/crypto/Kconfig                             |    3 +-
1946  drivers/crypto/Makefile                            |    1 +
1947  drivers/crypto/amcc/crypto4xx_core.c               |    2 +-
1948  drivers/crypto/caam/caamalg.c                      |    8 +-
1949  drivers/crypto/caam/caamhash.c                     |   40 +-
1950  drivers/crypto/caam/ctrl.c                         |   65 +-
1951  drivers/crypto/caam/desc.h                         |    1 -
1952  drivers/crypto/caam/intern.h                       |    1 +
1953  drivers/crypto/caam/regs.h                         |  105 +-
1954  drivers/crypto/ccp/Makefile                        |    5 +
1955  drivers/crypto/ccp/ccp-dev.c                       |   34 +
1956  drivers/crypto/ccp/ccp-dev.h                       |   10 +-
1957  drivers/crypto/ccp/ccp-pci.c                       |   39 +-
1958  drivers/crypto/ccp/ccp-platform.c                  |  224 +++
1959  drivers/crypto/nx/nx-842.c                         |    2 +-
1960  drivers/crypto/qat/Kconfig                         |   23 +
1961  drivers/crypto/qat/Makefile                        |    2 +
1962  drivers/crypto/qat/qat_common/Makefile             |   14 +
1963  drivers/crypto/qat/qat_common/adf_accel_devices.h  |  205 ++
1964  drivers/crypto/qat/qat_common/adf_accel_engine.c   |  168 ++
1965  drivers/crypto/qat/qat_common/adf_aer.c            |  259 +++
1966  drivers/crypto/qat/qat_common/adf_cfg.c            |  362 ++++
1967  drivers/crypto/qat/qat_common/adf_cfg.h            |   87 +
1968  drivers/crypto/qat/qat_common/adf_cfg_common.h     |  100 +
1969  drivers/crypto/qat/qat_common/adf_cfg_strings.h    |   83 +
1970  drivers/crypto/qat/qat_common/adf_cfg_user.h       |   94 +
1971  drivers/crypto/qat/qat_common/adf_common_drv.h     |  192 ++
1972  drivers/crypto/qat/qat_common/adf_ctl_drv.c        |  490 +++++
1973  drivers/crypto/qat/qat_common/adf_dev_mgr.c        |  215 +++
1974  drivers/crypto/qat/qat_common/adf_init.c           |  388 ++++
1975  drivers/crypto/qat/qat_common/adf_transport.c      |  567 ++++++
1976  drivers/crypto/qat/qat_common/adf_transport.h      |   63 +
1977  .../qat/qat_common/adf_transport_access_macros.h   |  160 ++
1978  .../crypto/qat/qat_common/adf_transport_debug.c    |  304 +++
1979  .../crypto/qat/qat_common/adf_transport_internal.h |  115 ++
1980  drivers/crypto/qat/qat_common/icp_qat_fw.h         |  316 +++
1981  .../crypto/qat/qat_common/icp_qat_fw_init_admin.h  |  131 ++
1982  drivers/crypto/qat/qat_common/icp_qat_fw_la.h      |  403 ++++
1983  .../qat/qat_common/icp_qat_fw_loader_handle.h      |   78 +
1984  drivers/crypto/qat/qat_common/icp_qat_hal.h        |  125 ++
1985  drivers/crypto/qat/qat_common/icp_qat_hw.h         |  305 +++
1986  drivers/crypto/qat/qat_common/icp_qat_uclo.h       |  377 ++++
1987  drivers/crypto/qat/qat_common/qat_algs.c           | 1038 ++++++++++
1988  drivers/crypto/qat/qat_common/qat_crypto.c         |  284 +++
1989  drivers/crypto/qat/qat_common/qat_crypto.h         |   83 +
1990  drivers/crypto/qat/qat_common/qat_hal.c            | 1405 ++++++++++++++
1991  drivers/crypto/qat/qat_common/qat_uclo.c           | 1195 ++++++++++++
1992  drivers/crypto/qat/qat_dh895xcc/Makefile           |    8 +
1993  drivers/crypto/qat/qat_dh895xcc/adf_admin.c        |  144 ++
1994  .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c |  214 +++
1995  .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h |   86 +
1996  drivers/crypto/qat/qat_dh895xcc/adf_drv.c          |  449 +++++
1997  drivers/crypto/qat/qat_dh895xcc/adf_drv.h          |   67 +
1998  drivers/crypto/qat/qat_dh895xcc/adf_hw_arbiter.c   |  159 ++
1999  drivers/crypto/qat/qat_dh895xcc/adf_isr.c          |  266 +++
2000  drivers/crypto/qat/qat_dh895xcc/qat_admin.c        |  107 ++
2001  include/crypto/algapi.h                            |    6 +
2002  include/crypto/des.h                               |    3 +
2003  include/crypto/drbg.h                              |  289 +++
2004  include/crypto/internal/skcipher.h                 |    3 +-
2005  include/crypto/scatterwalk.h                       |    6 -
2006  78 files changed, 17153 insertions(+), 265 deletions(-)
2007  create mode 100644 Documentation/devicetree/bindings/crypto/amd-ccp.txt
2008  create mode 100644 arch/x86/crypto/aes_ctrby8_avx-x86_64.S
2009  create mode 100644 arch/x86/crypto/des3_ede-asm_64.S
2010  create mode 100644 arch/x86/crypto/des3_ede_glue.c
2011  create mode 100644 crypto/drbg.c
2012  create mode 100644 drivers/crypto/ccp/ccp-platform.c
2013  create mode 100644 drivers/crypto/qat/Kconfig
2014  create mode 100644 drivers/crypto/qat/Makefile
2015  create mode 100644 drivers/crypto/qat/qat_common/Makefile
2016  create mode 100644 drivers/crypto/qat/qat_common/adf_accel_devices.h
2017  create mode 100644 drivers/crypto/qat/qat_common/adf_accel_engine.c
2018  create mode 100644 drivers/crypto/qat/qat_common/adf_aer.c
2019  create mode 100644 drivers/crypto/qat/qat_common/adf_cfg.c
2020  create mode 100644 drivers/crypto/qat/qat_common/adf_cfg.h
2021  create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_common.h
2022  create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_strings.h
2023  create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_user.h
2024  create mode 100644 drivers/crypto/qat/qat_common/adf_common_drv.h
2025  create mode 100644 drivers/crypto/qat/qat_common/adf_ctl_drv.c
2026  create mode 100644 drivers/crypto/qat/qat_common/adf_dev_mgr.c
2027  create mode 100644 drivers/crypto/qat/qat_common/adf_init.c
2028  create mode 100644 drivers/crypto/qat/qat_common/adf_transport.c
2029  create mode 100644 drivers/crypto/qat/qat_common/adf_transport.h
2030  create mode 100644 drivers/crypto/qat/qat_common/adf_transport_access_macros.h
2031  create mode 100644 drivers/crypto/qat/qat_common/adf_transport_debug.c
2032  create mode 100644 drivers/crypto/qat/qat_common/adf_transport_internal.h
2033  create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw.h
2034  create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_init_admin.h
2035  create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_la.h
2036  create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_loader_handle.h
2037  create mode 100644 drivers/crypto/qat/qat_common/icp_qat_hal.h
2038  create mode 100644 drivers/crypto/qat/qat_common/icp_qat_hw.h
2039  create mode 100644 drivers/crypto/qat/qat_common/icp_qat_uclo.h
2040  create mode 100644 drivers/crypto/qat/qat_common/qat_algs.c
2041  create mode 100644 drivers/crypto/qat/qat_common/qat_crypto.c
2042  create mode 100644 drivers/crypto/qat/qat_common/qat_crypto.h
2043  create mode 100644 drivers/crypto/qat/qat_common/qat_hal.c
2044  create mode 100644 drivers/crypto/qat/qat_common/qat_uclo.c
2045  create mode 100644 drivers/crypto/qat/qat_dh895xcc/Makefile
2046  create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_admin.c
2047  create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
2048  create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
2049  create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_drv.c
2050  create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_drv.h
2051  create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_hw_arbiter.c
2052  create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_isr.c
2053  create mode 100644 drivers/crypto/qat/qat_dh895xcc/qat_admin.c
2054  create mode 100644 include/crypto/drbg.h
2055 Merging drm/drm-next (bc1dfff04a5d Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next)
2056 $ git merge drm/drm-next
2057 Already up-to-date.
2058 Merging drm-panel/drm/panel/for-next (7e40b5162b3c drm/panel: make DRM_PANEL_LD9040 depend on SPI)
2059 $ git merge drm-panel/drm/panel/for-next
2060 Merge made by the 'recursive' strategy.
2061  drivers/gpu/drm/panel/Kconfig | 7 ++-----
2062  1 file changed, 2 insertions(+), 5 deletions(-)
2063 Merging drm-intel/for-linux-next (91565c85b66d drm/i915: Don't try to look up object for non-existent fb)
2064 $ git merge drm-intel/for-linux-next
2065 Auto-merging drivers/gpu/drm/i915/intel_uncore.c
2066 Auto-merging drivers/gpu/drm/i915/intel_pm.c
2067 Auto-merging drivers/gpu/drm/i915/intel_drv.h
2068 Auto-merging drivers/gpu/drm/i915/intel_display.c
2069 Auto-merging drivers/gpu/drm/i915/i915_irq.c
2070 Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
2071 Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
2072 Auto-merging drivers/gpu/drm/i915/i915_drv.h
2073 Auto-merging drivers/gpu/drm/i915/i915_dma.c
2074 Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
2075 Merge made by the 'recursive' strategy.
2076  drivers/gpu/drm/drm_crtc.c                    | 357 +++++++---
2077  drivers/gpu/drm/i915/i915_cmd_parser.c        |   3 +
2078  drivers/gpu/drm/i915/i915_debugfs.c           |  52 +-
2079  drivers/gpu/drm/i915/i915_dma.c               |  34 +-
2080  drivers/gpu/drm/i915/i915_drv.c               |  39 +-
2081  drivers/gpu/drm/i915/i915_drv.h               |  76 ++-
2082  drivers/gpu/drm/i915/i915_gem.c               |  97 ++-
2083  drivers/gpu/drm/i915/i915_gem_context.c       |   3 +-
2084  drivers/gpu/drm/i915/i915_gem_execbuffer.c    |   8 +-
2085  drivers/gpu/drm/i915/i915_gem_gtt.c           |  54 +-
2086  drivers/gpu/drm/i915/i915_gem_gtt.h           |   5 +-
2087  drivers/gpu/drm/i915/i915_gem_render_state.c  | 161 ++---
2088  drivers/gpu/drm/i915/i915_gem_stolen.c        |  21 +-
2089  drivers/gpu/drm/i915/i915_irq.c               | 213 +++---
2090  drivers/gpu/drm/i915/i915_params.c            |   5 +
2091  drivers/gpu/drm/i915/i915_reg.h               | 442 ++++++++-----
2092  drivers/gpu/drm/i915/intel_ddi.c              |   4 +-
2093  drivers/gpu/drm/i915/intel_display.c          | 905 +++++++++++++++++++++++---
2094  drivers/gpu/drm/i915/intel_dp.c               | 249 ++++---
2095  drivers/gpu/drm/i915/intel_drv.h              |  45 +-
2096  drivers/gpu/drm/i915/intel_dsi.c              |  26 +-
2097  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c    |   8 +-
2098  drivers/gpu/drm/i915/intel_dvo.c              |   8 +
2099  drivers/gpu/drm/i915/intel_fbdev.c            |  30 +-
2100  drivers/gpu/drm/i915/intel_hdmi.c             |  65 ++
2101  drivers/gpu/drm/i915/intel_overlay.c          |  13 +-
2102  drivers/gpu/drm/i915/intel_pm.c               | 370 ++++++++---
2103  drivers/gpu/drm/i915/intel_renderstate.h      |   2 -
2104  drivers/gpu/drm/i915/intel_renderstate_gen6.c |   1 +
2105  drivers/gpu/drm/i915/intel_renderstate_gen7.c |   1 +
2106  drivers/gpu/drm/i915/intel_renderstate_gen8.c |   1 +
2107  drivers/gpu/drm/i915/intel_ringbuffer.c       |  12 +-
2108  drivers/gpu/drm/i915/intel_sprite.c           |   9 +
2109  drivers/gpu/drm/i915/intel_uncore.c           | 180 +++--
2110  include/drm/drm_crtc.h                        |   6 +-
2111  35 files changed, 2578 insertions(+), 927 deletions(-)
2112 Merging drm-tegra/drm/tegra/for-next (1f64ae7c5af0 drm/tegra: sor - Remove obsolete comment)
2113 $ git merge drm-tegra/drm/tegra/for-next
2114 Already up-to-date.
2115 Merging sound/for-next (7e9c2eb62642 Merge branch 'for-linus' into for-next)
2116 $ git merge sound/for-next
2117 Merge made by the 'recursive' strategy.
2118  sound/aoa/soundbus/i2sbus/core.c |   12 +-
2119  sound/core/seq/seq_memory.c      |    4 +-
2120  sound/oss/mpu401.c               |    2 +-
2121  sound/pci/hda/hda_codec.c        |   35 +-
2122  sound/pci/hda/hda_codec.h        |    3 +-
2123  sound/pci/hda/hda_controller.c   |    3 +-
2124  sound/pci/hda/hda_eld.c          |   46 +-
2125  sound/pci/hda/hda_generic.c      |    2 +-
2126  sound/pci/hda/hda_local.h        |    7 +-
2127  sound/pci/hda/patch_ca0132.c     |    6 +-
2128  sound/pci/hda/patch_cmedia.c     |  624 +--------
2129  sound/pci/hda/patch_conexant.c   | 2715 +-------------------------------------
2130  sound/pci/hda/patch_hdmi.c       |   11 +-
2131  sound/pci/hda/patch_realtek.c    |  114 ++
2132  sound/pci/hda/patch_sigmatel.c   |    2 +-
2133  sound/sparc/dbri.c               |    6 +-
2134  16 files changed, 245 insertions(+), 3347 deletions(-)
2135 Merging sound-asoc/for-next (6158518db522 Merge remote-tracking branches 'asoc/topic/wm8904' and 'asoc/topic/wm8985' into asoc-next)
2136 $ git merge sound-asoc/for-next
2137 Removing sound/soc/samsung/dma.c
2138 Merge made by the 'recursive' strategy.
2139  Documentation/devicetree/bindings/sound/ak5386.txt |   4 +
2140  Documentation/devicetree/bindings/sound/wm8904.txt |  33 ++
2141  drivers/misc/atmel-ssc.c                           |  13 +
2142  include/linux/atmel-ssc.h                          |  13 +
2143  include/linux/mfd/arizona/core.h                   |   6 +
2144  include/sound/soc-dai.h                            |   1 -
2145  include/sound/soc-dapm.h                           |   8 +-
2146  include/sound/soc.h                                |  49 ++-
2147  include/trace/events/asoc.h                        |   6 +-
2148  sound/arm/pxa2xx-ac97-lib.c                        |  12 +-
2149  sound/soc/atmel/atmel_ssc_dai.c                    |  34 +-
2150  sound/soc/atmel/atmel_wm8904.c                     |  50 ---
2151  sound/soc/codecs/Kconfig                           |   2 +
2152  sound/soc/codecs/ak5386.c                          |  50 +++
2153  sound/soc/codecs/arizona.c                         | 137 ++++++-
2154  sound/soc/codecs/arizona.h                         |   1 +
2155  sound/soc/codecs/cs42xx8.c                         |   2 +-
2156  sound/soc/codecs/max98090.c                        |  15 +-
2157  sound/soc/codecs/mc13783.c                         |   6 +-
2158  sound/soc/codecs/rl6231.c                          |  19 -
2159  sound/soc/codecs/rt5640.c                          |  10 +-
2160  sound/soc/codecs/rt5645.c                          |  10 +-
2161  sound/soc/codecs/rt5677.c                          | 201 ++++-----
2162  sound/soc/codecs/spdif_transmitter.c               |   2 +-
2163  sound/soc/codecs/tlv320aic31xx.c                   |  23 +-
2164  sound/soc/codecs/tlv320aic32x4.c                   |  21 +-
2165  sound/soc/codecs/tlv320dac33.c                     |   2 +-
2166  sound/soc/codecs/wm5100.c                          |   3 +-
2167  sound/soc/codecs/wm5102.c                          |  62 +++
2168  sound/soc/codecs/wm5110.c                          |   1 +
2169  sound/soc/codecs/wm8903.c                          |   3 +-
2170  sound/soc/codecs/wm8904.c                          |  11 +
2171  sound/soc/codecs/wm8985.c                          |   3 -
2172  sound/soc/codecs/wm8994.c                          |   9 +-
2173  sound/soc/codecs/wm8996.c                          |   3 +-
2174  sound/soc/davinci/Kconfig                          |   1 +
2175  sound/soc/davinci/davinci-mcasp.c                  |  71 +++-
2176  sound/soc/fsl/Kconfig                              |   6 +-
2177  sound/soc/fsl/fsl_spdif.c                          |  86 ++--
2178  sound/soc/fsl/fsl_spdif.h                          |  10 +-
2179  sound/soc/fsl/fsl_ssi.c                            |   4 +-
2180  sound/soc/generic/simple-card.c                    |  13 +-
2181  sound/soc/intel/byt-rt5640.c                       |   1 +
2182  sound/soc/intel/sst-baytrail-ipc.c                 |  30 ++
2183  sound/soc/intel/sst-mfld-dsp.h                     | 414 ++++++++++++++++++-
2184  sound/soc/intel/sst-mfld-platform-pcm.c            | 225 ++++++----
2185  sound/soc/intel/sst-mfld-platform.h                |   7 +-
2186  sound/soc/samsung/Kconfig                          |  14 +-
2187  sound/soc/samsung/Makefile                         |   2 -
2188  sound/soc/samsung/dma.c                            | 454 ---------------------
2189  sound/soc/samsung/dmaengine.c                      |   3 +
2190  sound/soc/samsung/s3c-i2s-v2.c                     |  17 +-
2191  sound/soc/samsung/s3c2412-i2s.c                    |  51 ++-
2192  sound/soc/samsung/s3c24xx-i2s.c                    |  62 ++-
2193  sound/soc/sh/fsi.c                                 |  12 +-
2194  sound/soc/sh/rcar/core.c                           |   6 +-
2195  sound/soc/sh/rcar/gen.c                            |  33 +-
2196  sound/soc/sh/rcar/rsnd.h                           |   2 +-
2197  sound/soc/soc-cache.c                              |   7 +-
2198  sound/soc/soc-compress.c                           |   8 +-
2199  sound/soc/soc-core.c                               | 315 +++++++-------
2200  sound/soc/soc-dapm.c                               | 183 +++++----
2201  sound/soc/soc-pcm.c                                |   5 +-
2202  63 files changed, 1601 insertions(+), 1266 deletions(-)
2203  create mode 100644 Documentation/devicetree/bindings/sound/wm8904.txt
2204  delete mode 100644 sound/soc/samsung/dma.c
2205 Merging modules/modules-next (4982223e51e8 module: set nx before marking module MODULE_STATE_COMING.)
2206 $ git merge modules/modules-next
2207 Already up-to-date.
2208 Merging virtio/virtio-next (c77fba9ab058 virtio_scsi: don't call virtqueue_add_sgs(... GFP_NOIO) holding spinlock.)
2209 $ git merge virtio/virtio-next
2210 Already up-to-date.
2211 Merging input/next (68807a0c2015 Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version)
2212 $ git merge input/next
2213 Already up-to-date.
2214 Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
2215 $ git merge input-mt/for-next
2216 Already up-to-date.
2217 Merging block/for-next (8e3c77637c65 Merge branch 'for-linus' into for-next)
2218 $ git merge block/for-next
2219 Already up-to-date!
2220 Merge made by the 'recursive' strategy.
2221 Merging device-mapper/for-next (1e0a66aef542 Merge branch 'for-3.16-rcX' into for-next)
2222 $ git merge device-mapper/for-next
2223 Auto-merging block/bio.c
2224 Merge made by the 'recursive' strategy.
2225  block/bio.c                  |   3 +-
2226  drivers/md/dm-cache-target.c | 124 ++++++++-----
2227  drivers/md/dm-crypt.c        | 405 ++++++++++++++++++++++---------------------
2228  drivers/md/dm-thin.c         | 179 +++++++++++++------
2229  drivers/md/dm-zero.c         |   4 +-
2230  drivers/md/dm.c              |  13 +-
2231  6 files changed, 431 insertions(+), 297 deletions(-)
2232 Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
2233 $ git merge embedded/master
2234 Already up-to-date.
2235 Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
2236 $ git merge firmware/master
2237 Already up-to-date.
2238 Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
2239 $ git merge pcmcia/master
2240 Already up-to-date.
2241 Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
2242 $ git merge mmc/mmc-next
2243 Already up-to-date.
2244 Merging mmc-uh/next (9ed6566b6c2a mmc: sdhci: Remove blank line)
2245 $ git merge mmc-uh/next
2246 Merge made by the 'recursive' strategy.
2247  Documentation/devicetree/bindings/mmc/mmc.txt      |   4 +-
2248  .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |  54 ++++
2249  drivers/mmc/core/bus.c                             |  10 +-
2250  drivers/mmc/core/quirks.c                          |   2 +-
2251  drivers/mmc/core/sd_ops.c                          |   3 +
2252  drivers/mmc/host/mmci.c                            | 127 ++++++++-
2253  drivers/mmc/host/mmci.h                            |  20 ++
2254  drivers/mmc/host/moxart-mmc.c                      |   1 -
2255  drivers/mmc/host/omap_hsmmc.c                      | 283 +++++++++++++++++++--
2256  drivers/mmc/host/sdhci.c                           | 115 ++++-----
2257  drivers/mmc/host/sh_mmcif.c                        |  83 ++----
2258  drivers/mmc/host/wmt-sdmmc.c                       |  33 ++-
2259  include/linux/mmc/sdhci.h                          |   3 -
2260  include/linux/platform_data/mmc-omap.h             |   1 +
2261  14 files changed, 548 insertions(+), 191 deletions(-)
2262 Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
2263 $ git merge kgdb/kgdb-next
2264 Merge made by the 'recursive' strategy.
2265 Merging slab/for-next (201ed0edb712 Merge branch 'slab/next' into for-next)
2266 $ git merge slab/for-next
2267 Auto-merging mm/slub.c
2268 Auto-merging mm/slab_common.c
2269 Merge made by the 'recursive' strategy.
2270  mm/slab_common.c |  2 +-
2271  mm/slub.c        | 16 +++++++++-------
2272  2 files changed, 10 insertions(+), 8 deletions(-)
2273 Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
2274 $ git merge uclinux/for-next
2275 Already up-to-date.
2276 Merging md/for-next (053f5b6525ae raid5: speedup sync_request processing)
2277 $ git merge md/for-next
2278 Already up-to-date.
2279 Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
2280 $ git merge mfd/master
2281 Already up-to-date.
2282 Merging mfd-lj/for-mfd-next (591123e5d6fd mfd: sec-core: Prepare regulators for suspend state to reduce power-consumption)
2283 $ git merge mfd-lj/for-mfd-next
2284 Auto-merging include/linux/mfd/arizona/core.h
2285 Removing drivers/mfd/max77693-irq.c
2286 Merge made by the 'recursive' strategy.
2287  Documentation/devicetree/bindings/mfd/s2mps11.txt  |  11 +-
2288  .../bindings/regulator/s5m8767-regulator.txt       |   2 +-
2289  drivers/extcon/extcon-max77693.c                   |  35 +-
2290  drivers/gpio/Kconfig                               |  13 +
2291  drivers/gpio/Makefile                              |   1 +
2292  drivers/gpio/gpio-crystalcove.c                    | 380 +++++++++++++++++++++
2293  drivers/mfd/Kconfig                                |  19 +-
2294  drivers/mfd/Makefile                               |   5 +-
2295  drivers/mfd/arizona-core.c                         |  24 +-
2296  drivers/mfd/asic3.c                                |  12 +-
2297  drivers/mfd/cros_ec_spi.c                          |  20 +-
2298  drivers/mfd/intel_soc_pmic_core.c                  | 168 +++++++++
2299  drivers/mfd/intel_soc_pmic_core.h                  |  32 ++
2300  drivers/mfd/intel_soc_pmic_crc.c                   | 158 +++++++++
2301  drivers/mfd/max77693-irq.c                         | 336 ------------------
2302  drivers/mfd/max77693.c                             | 210 ++++++++----
2303  drivers/mfd/mc13xxx-core.c                         | 310 +++--------------
2304  drivers/mfd/mc13xxx.h                              |  11 +-
2305  drivers/mfd/pm8921-core.c                          |   4 -
2306  drivers/mfd/sec-core.c                             |  81 ++++-
2307  drivers/mfd/sec-irq.c                              | 110 +++++-
2308  drivers/mfd/tc3589x.c                              |   2 +-
2309  drivers/mfd/wm8994-regmap.c                        |  64 ++++
2310  drivers/regulator/max77693.c                       |  12 +-
2311  drivers/regulator/s2mps11.c                        | 321 +++++++++++++++--
2312  include/dt-bindings/mfd/as3722.h                   |   2 +-
2313  include/linux/mfd/arizona/core.h                   |   2 +-
2314  include/linux/mfd/intel_soc_pmic.h                 |  30 ++
2315  include/linux/mfd/max77693-private.h               |  54 ++-
2316  include/linux/mfd/mc13783.h                        |   1 -
2317  include/linux/mfd/mc13xxx.h                        |  23 +-
2318  include/linux/mfd/samsung/core.h                   |   1 +
2319  include/linux/mfd/samsung/irq.h                    |  24 ++
2320  include/linux/mfd/samsung/s2mpu02.h                | 201 +++++++++++
2321  34 files changed, 1878 insertions(+), 801 deletions(-)
2322  create mode 100644 drivers/gpio/gpio-crystalcove.c
2323  create mode 100644 drivers/mfd/intel_soc_pmic_core.c
2324  create mode 100644 drivers/mfd/intel_soc_pmic_core.h
2325  create mode 100644 drivers/mfd/intel_soc_pmic_crc.c
2326  delete mode 100644 drivers/mfd/max77693-irq.c
2327  create mode 100644 include/linux/mfd/intel_soc_pmic.h
2328  create mode 100644 include/linux/mfd/samsung/s2mpu02.h
2329 Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data)
2330 $ git merge battery/master
2331 Already up-to-date.
2332 Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
2333 $ git merge fbdev/for-next
2334 Already up-to-date.
2335 Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
2336 $ git merge viafb/viafb-next
2337 Already up-to-date.
2338 Merging omap_dss2/for-next (8ca900e16b2b drivers/video/fbdev/sis: Add missing else)
2339 $ git merge omap_dss2/for-next
2340 Merge made by the 'recursive' strategy.
2341  .../bindings/video/cirrus,clps711x-fb.txt          |  47 +++
2342  drivers/video/fbdev/68328fb.c                      |   8 +-
2343  drivers/video/fbdev/Kconfig                        |  21 +-
2344  drivers/video/fbdev/Makefile                       |   3 +-
2345  drivers/video/fbdev/clps711x-fb.c                  | 397 +++++++++++++++++++++
2346  drivers/video/fbdev/da8xx-fb.c                     |   9 +-
2347  drivers/video/fbdev/mbx/mbxfb.c                    |   4 +-
2348  drivers/video/fbdev/msm/mddi_client_dummy.c        |  19 +-
2349  drivers/video/fbdev/omap2/dss/omapdss-boot-init.c  |   8 +-
2350  drivers/video/fbdev/sh_mobile_meram.c              |   2 +-
2351  drivers/video/fbdev/sis/init.c                     |   2 +-
2352  drivers/video/fbdev/sis/sis_main.c                 |   4 -
2353  drivers/video/fbdev/vt8500lcdfb.c                  |   2 -
2354  13 files changed, 478 insertions(+), 48 deletions(-)
2355  create mode 100644 Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt
2356  create mode 100644 drivers/video/fbdev/clps711x-fb.c
2357 Merging regulator/for-next (ac034a192ea0 Merge remote-tracking branches 'regulator/topic/mc13xxx', 'regulator/topic/palmas' and 'regulator/topic/tps6586x' into regulator-next)
2358 $ git merge regulator/for-next
2359 Merge made by the 'recursive' strategy.
2360  Documentation/devicetree/bindings/mfd/palmas.txt   |    2 +
2361  .../devicetree/bindings/regulator/palmas-pmic.txt  |    1 +
2362  drivers/mfd/palmas.c                               |  233 +++--
2363  drivers/regulator/88pm800.c                        |    1 -
2364  drivers/regulator/ab8500.c                         |   38 +-
2365  drivers/regulator/bcm590xx-regulator.c             |   21 +-
2366  drivers/regulator/core.c                           |    8 +-
2367  drivers/regulator/ltc3589.c                        |    2 +-
2368  drivers/regulator/mc13xxx-regulator-core.c         |   37 +-
2369  drivers/regulator/mc13xxx.h                        |    1 -
2370  drivers/regulator/palmas-regulator.c               | 1018 +++++++++++++++-----
2371  drivers/regulator/tps6586x-regulator.c             |  129 +--
2372  include/linux/mfd/palmas.h                         |  837 ++++++++++++++++
2373  include/linux/regulator/ab8500.h                   |   14 -
2374  14 files changed, 1883 insertions(+), 459 deletions(-)
2375 Merging security/next (f01387d26938 Merge commit 'v3.15' into next)
2376 $ git merge security/next
2377 Merge made by the 'recursive' strategy.
2378 Merging integrity/next (0430e49b6e7c ima: introduce ima_kernel_read())
2379 $ git merge integrity/next
2380 Already up-to-date.
2381 Merging selinux/next (f31e79945965 selinux: no recursive read_lock of policy_rwlock in security_genfs_sid())
2382 $ git merge selinux/next
2383 Merge made by the 'recursive' strategy.
2384  scripts/selinux/genheaders/Makefile |   1 -
2385  scripts/selinux/mdp/Makefile        |   2 +-
2386  security/selinux/include/security.h |   3 +-
2387  security/selinux/ss/conditional.c   |  11 +--
2388  security/selinux/ss/policydb.c      | 141 +++++++++++-------------------------
2389  security/selinux/ss/services.c      |  41 ++++++++---
2390  6 files changed, 79 insertions(+), 120 deletions(-)
2391 Merging lblnet/next (d8ec26d7f828 Linux 3.13)
2392 $ git merge lblnet/next
2393 Already up-to-date.
2394 Merging watchdog/master (7171511eaec5 Linux 3.16-rc1)
2395 $ git merge watchdog/master
2396 Already up-to-date.
2397 Merging iommu/next (d73a6d722a67 iommu/amd: Fix small race between invalidate_range_end/start)
2398 $ git merge iommu/next
2399 Merge made by the 'recursive' strategy.
2400  drivers/iommu/amd_iommu_v2.c | 18 +++++++++++++-----
2401  drivers/iommu/intel-iommu.c  |  9 +++------
2402  2 files changed, 16 insertions(+), 11 deletions(-)
2403 Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
2404 $ git merge dwmw2-iommu/master
2405 Already up-to-date.
2406 Merging vfio/next (fd49c81f080a drivers/vfio/pci: Fix wrong MSI interrupt count)
2407 $ git merge vfio/next
2408 Already up-to-date.
2409 Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6)
2410 $ git merge osd/linux-next
2411 Already up-to-date.
2412 Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
2413 $ git merge jc_docs/docs-next
2414 Already up-to-date.
2415 Merging trivial/for-next (d31e373d0778 irq-gic: remove file name from heading comment)
2416 $ git merge trivial/for-next
2417 Resolved 'arch/arm/mach-msm/Kconfig' using previous resolution.
2418 Auto-merging fs/befs/linuxvfs.c
2419 Auto-merging drivers/usb/phy/phy.c
2420 Auto-merging drivers/irqchip/irq-gic.c
2421 Auto-merging drivers/cpuidle/governors/menu.c
2422 Auto-merging arch/sh/boards/Kconfig
2423 Auto-merging arch/arm/mach-msm/Kconfig
2424 CONFLICT (content): Merge conflict in arch/arm/mach-msm/Kconfig
2425 Auto-merging Documentation/SubmittingPatches
2426 Automatic merge failed; fix conflicts and then commit the result.
2427 $ git commit -v -a
2428 [master fb63c1cd7c9c] Merge remote-tracking branch 'trivial/for-next'
2429 $ git diff -M --stat --summary HEAD^..
2430  Documentation/PCI/MSI-HOWTO.txt       |  2 +-
2431  Documentation/RCU/RTFP.txt            |  4 ++--
2432  Documentation/SubmittingDrivers       |  4 ----
2433  Documentation/SubmittingPatches       |  4 ++--
2434  Documentation/laptops/hpfall.c        |  1 +
2435  Documentation/scsi/ncr53c8xx.txt      |  2 +-
2436  Documentation/security/LSM.txt        |  2 +-
2437  Documentation/usb/hotplug.txt         |  8 ++++----
2438  Documentation/zh_CN/SubmittingDrivers |  4 ----
2439  arch/arm/mach-msm/Kconfig             |  3 ---
2440  arch/hexagon/include/asm/cache.h      |  2 +-
2441  arch/sh/boards/Kconfig                |  2 +-
2442  crypto/asymmetric_keys/Kconfig        |  1 -
2443  drivers/cpuidle/governors/menu.c      |  2 +-
2444  drivers/gpu/drm/gma500/mid_bios.c     |  1 -
2445  drivers/irqchip/irq-gic.c             |  2 --
2446  drivers/media/radio/radio-mr800.c     |  2 +-
2447  drivers/mfd/intel_msic.c              |  2 +-
2448  drivers/scsi/mvsas/mv_sas.c           | 24 ++++++++++++++----------
2449  drivers/usb/phy/phy.c                 |  2 +-
2450  fs/befs/linuxvfs.c                    |  2 --
2451  scripts/Makefile.modinst              |  2 +-
2452  22 files changed, 33 insertions(+), 45 deletions(-)
2453 Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface)
2454 $ git merge audit/master
2455 Resolved 'arch/mips/include/asm/syscall.h' using previous resolution.
2456 Resolved 'arch/mips/kernel/ptrace.c' using previous resolution.
2457 Resolved 'arch/x86/Kconfig' using previous resolution.
2458 Resolved 'kernel/audit.c' using previous resolution.
2459 Auto-merging kernel/auditsc.c
2460 Auto-merging kernel/audit.c
2461 CONFLICT (content): Merge conflict in kernel/audit.c
2462 Auto-merging include/uapi/linux/audit.h
2463 Auto-merging arch/x86/kernel/ptrace.c
2464 Auto-merging arch/x86/kernel/entry_64.S
2465 Auto-merging arch/x86/kernel/entry_32.S
2466 Auto-merging arch/x86/Kconfig
2467 CONFLICT (content): Merge conflict in arch/x86/Kconfig
2468 Auto-merging arch/um/kernel/ptrace.c
2469 Auto-merging arch/s390/kernel/ptrace.c
2470 Auto-merging arch/mips/kernel/ptrace.c
2471 CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
2472 Auto-merging arch/mips/include/asm/syscall.h
2473 CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h
2474 Automatic merge failed; fix conflicts and then commit the result.
2475 $ git commit -v -a
2476 [master 361254ad2e6f] Merge remote-tracking branch 'audit/master'
2477 $ git diff -M --stat --summary HEAD^..
2478  arch/alpha/include/asm/syscall.h        | 11 +++++++++++
2479  arch/alpha/kernel/ptrace.c              |  2 +-
2480  arch/arm/kernel/ptrace.c                |  4 ++--
2481  arch/ia64/include/asm/syscall.h         |  6 ++++++
2482  arch/ia64/kernel/ptrace.c               |  2 +-
2483  arch/microblaze/include/asm/syscall.h   |  5 +++++
2484  arch/microblaze/kernel/ptrace.c         |  3 +--
2485  arch/mips/include/asm/syscall.h         |  2 +-
2486  arch/mips/kernel/ptrace.c               |  4 +---
2487  arch/openrisc/include/asm/syscall.h     |  5 +++++
2488  arch/openrisc/kernel/ptrace.c           |  3 +--
2489  arch/parisc/include/asm/syscall.h       | 11 +++++++++++
2490  arch/parisc/kernel/ptrace.c             |  9 +++------
2491  arch/powerpc/include/asm/syscall.h      |  6 ++++++
2492  arch/powerpc/kernel/ptrace.c            |  7 ++-----
2493  arch/s390/kernel/ptrace.c               |  4 +---
2494  arch/sh/include/asm/syscall_32.h        | 10 ++++++++++
2495  arch/sh/include/asm/syscall_64.h        | 14 ++++++++++++++
2496  arch/sh/kernel/ptrace_32.c              | 14 +-------------
2497  arch/sh/kernel/ptrace_64.c              | 17 +----------------
2498  arch/sparc/include/asm/syscall.h        |  7 +++++++
2499  arch/sparc/include/asm/thread_info_32.h |  2 ++
2500  arch/sparc/include/asm/thread_info_64.h |  2 ++
2501  arch/sparc/kernel/ptrace_64.c           |  9 ++-------
2502  arch/um/kernel/ptrace.c                 |  3 +--
2503  arch/x86/ia32/ia32entry.S               | 12 ++++++------
2504  arch/x86/kernel/entry_32.S              | 11 +++++------
2505  arch/x86/kernel/entry_64.S              | 11 +++++------
2506  arch/x86/kernel/ptrace.c                |  8 ++------
2507  arch/x86/um/asm/ptrace.h                |  4 ----
2508  arch/x86/um/asm/syscall.h               | 15 +++++++++++++++
2509  arch/xtensa/kernel/ptrace.c             |  2 +-
2510  include/asm-generic/syscall.h           |  2 +-
2511  include/linux/audit.h                   | 11 ++++++-----
2512  include/uapi/linux/audit.h              | 14 +-------------
2513  kernel/auditsc.c                        | 17 +++++++----------
2514  36 files changed, 147 insertions(+), 122 deletions(-)
2515  create mode 100644 arch/alpha/include/asm/syscall.h
2516  create mode 100644 arch/x86/um/asm/syscall.h
2517 Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
2518 $ git merge fsnotify/for-next
2519 Already up-to-date.
2520 Merging devicetree/devicetree/next (c9e0fb3bb3aa tty: Update hypervisor tty drivers to use core stdout parsing code.)
2521 $ git merge devicetree/devicetree/next
2522 Auto-merging drivers/of/base.c
2523 Merge made by the 'recursive' strategy.
2524  arch/arm/boot/dts/versatile-ab.dts |  4 ++++
2525  drivers/of/base.c                  | 28 +++++++++++++++----------
2526  drivers/tty/ehv_bytechan.c         | 43 ++++----------------------------------
2527  drivers/tty/hvc/hvc_opal.c         | 15 +++----------
2528  drivers/tty/hvc/hvc_vio.c          | 29 +++++++++----------------
2529  drivers/tty/serial/serial_core.c   |  3 +++
2530  include/linux/of.h                 |  7 ++++---
2531  7 files changed, 45 insertions(+), 84 deletions(-)
2532 Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root)
2533 $ git merge dt-rh/for-next
2534 Already up-to-date.
2535 Merging spi/for-next (00f2075d987a Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/qup', 'spi/topic/rspi' and 'spi/topic/sh-msiof' into spi-next)
2536 $ git merge spi/for-next
2537 Merge made by the 'recursive' strategy.
2538  .../devicetree/bindings/spi/qcom,spi-qup.txt       |  12 +-
2539  drivers/spi/spi-adi-v3.c                           |   5 +-
2540  drivers/spi/spi-cadence.c                          |   2 +-
2541  drivers/spi/spi-clps711x.c                         |   2 -
2542  drivers/spi/spi-falcon.c                           |   2 -
2543  drivers/spi/spi-fsl-spi.c                          |   2 +-
2544  drivers/spi/spi-omap-100k.c                        |   2 -
2545  drivers/spi/spi-omap-uwire.c                       |   8 +-
2546  drivers/spi/spi-orion.c                            |  65 ++++++--
2547  drivers/spi/spi-pxa2xx.c                           |   8 +-
2548  drivers/spi/spi-qup.c                              |  80 +++++-----
2549  drivers/spi/spi-rspi.c                             |  15 +-
2550  drivers/spi/spi-sh-hspi.c                          |   2 +-
2551  drivers/spi/spi-sh-msiof.c                         | 168 +++++++++++++++------
2552  drivers/spi/spi-sh-sci.c                           |   4 +-
2553  drivers/spi/spi.c                                  |   2 -
2554  16 files changed, 246 insertions(+), 133 deletions(-)
2555 Merging tip/auto-latest (35299db412b6 Merge branch 'x86/xsave')
2556 $ git merge tip/auto-latest
2557 Auto-merging kernel/smp.c
2558 Auto-merging Documentation/kernel-parameters.txt
2559 Merge made by the 'recursive' strategy.
2560  Documentation/kernel-parameters.txt   |  15 ++
2561  arch/arc/kernel/perf_event.c          |   7 +-
2562  arch/blackfin/kernel/perf_event.c     |  15 +-
2563  arch/metag/kernel/perf/perf_event.c   |  19 +-
2564  arch/s390/kernel/perf_cpum_cf.c       |  12 +-
2565  arch/sh/kernel/perf_event.c           |  15 +-
2566  arch/x86/Makefile                     |   9 +-
2567  arch/x86/boot/code16gcc.h             |  24 +--
2568  arch/x86/include/asm/alternative.h    |  14 ++
2569  arch/x86/include/asm/apic.h           |   2 +-
2570  arch/x86/include/asm/barrier.h        |   2 +-
2571  arch/x86/include/asm/cpufeature.h     | 395 +++++++++++++++++-----------------
2572  arch/x86/include/asm/fpu-internal.h   |  11 +-
2573  arch/x86/include/asm/mwait.h          |   2 +-
2574  arch/x86/include/asm/processor.h      |   4 +-
2575  arch/x86/include/asm/qrwlock.h        |   2 +-
2576  arch/x86/include/asm/uv/uv_bau.h      |  19 +-
2577  arch/x86/include/asm/xsave.h          | 223 ++++++++++++++-----
2578  arch/x86/include/uapi/asm/msr-index.h |   2 +
2579  arch/x86/kernel/cpu/amd.c             |   2 +-
2580  arch/x86/kernel/cpu/common.c          |  17 ++
2581  arch/x86/kernel/cpu/intel.c           |   4 +-
2582  arch/x86/kernel/cpu/scattered.c       |   1 -
2583  arch/x86/kernel/i387.c                |   2 +-
2584  arch/x86/kernel/process.c             |   1 +
2585  arch/x86/kernel/xsave.c               | 118 +++++++++-
2586  arch/x86/mm/fault.c                   |   6 +
2587  arch/x86/platform/uv/tlb_uv.c         |  69 +++---
2588  include/linux/irq_work.h              |   5 +
2589  include/linux/seqlock.h               |   2 -
2590  include/linux/tick.h                  |   9 +-
2591  kernel/irq_work.c                     |  76 ++++---
2592  kernel/sched/core.c                   |  22 +-
2593  kernel/sched/fair.c                   |  26 +--
2594  kernel/sched/sched.h                  |  12 +-
2595  kernel/smp.c                          |   9 +
2596  kernel/time/tick-sched.c              |  10 +-
2597  37 files changed, 755 insertions(+), 428 deletions(-)
2598 Merging clockevents/clockevents/next (2529c3a33079 clocksource: Add Freescale FlexTimer Module (FTM) timer support)
2599 $ git merge clockevents/clockevents/next
2600 Already up-to-date.
2601 Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems)
2602 $ git merge edac/linux_next
2603 Merge made by the 'recursive' strategy.
2604  drivers/edac/Kconfig         |   4 +-
2605  drivers/edac/edac_mc_sysfs.c |   4 +-
2606  drivers/edac/sb_edac.c       | 810 +++++++++++++++++++++++++++++--------------
2607  include/linux/edac.h         |   5 +
2608  4 files changed, 551 insertions(+), 272 deletions(-)
2609 Merging edac-amd/for-next (6866b390562b EDAC, edac_module.c: Remove unnecessary test on unsigned value)
2610 $ git merge edac-amd/for-next
2611 Merge made by the 'recursive' strategy.
2612  drivers/edac/edac_module.c | 2 +-
2613  1 file changed, 1 insertion(+), 1 deletion(-)
2614 Merging irqchip/irqchip/for-next (ca446397462a Merge branch 'irqchip/urgent' into irqchip/for-next)
2615 $ git merge irqchip/irqchip/for-next
2616 Merge made by the 'recursive' strategy.
2617  .../interrupt-controller/opencores,or1k-pic.txt    |  23 +++
2618  arch/openrisc/Kconfig                              |   1 +
2619  arch/openrisc/include/asm/irq.h                    |   3 +
2620  arch/openrisc/kernel/irq.c                         | 146 ++---------------
2621  drivers/irqchip/Kconfig                            |   4 +
2622  drivers/irqchip/Makefile                           |   1 +
2623  drivers/irqchip/irq-armada-370-xp.c                |  17 +-
2624  drivers/irqchip/irq-brcmstb-l2.c                   |   2 +-
2625  drivers/irqchip/irq-nvic.c                         |  13 +-
2626  drivers/irqchip/irq-or1k-pic.c                     | 182 +++++++++++++++++++++
2627  drivers/irqchip/spear-shirq.c                      |   2 +-
2628  11 files changed, 248 insertions(+), 146 deletions(-)
2629  create mode 100644 Documentation/devicetree/bindings/interrupt-controller/opencores,or1k-pic.txt
2630  create mode 100644 drivers/irqchip/irq-or1k-pic.c
2631 Merging ftrace/for-next (4d4c9cc839a3 tracing: Add __field_struct macro for TRACE_EVENT())
2632 $ git merge ftrace/for-next
2633 Already up-to-date.
2634 Merging rcu/rcu/next (9c3d3e55d9d6 rcu: Fix a sparse warning in rcu_report_unblock_qs_rnp())
2635 $ git merge rcu/rcu/next
2636 Auto-merging kernel/time/tick-sched.c
2637 Auto-merging kernel/sched/core.c
2638 Auto-merging init/Kconfig
2639 Auto-merging include/linux/tick.h
2640 Auto-merging MAINTAINERS
2641 Auto-merging Documentation/kernel-parameters.txt
2642 Merge made by the 'recursive' strategy.
2643  Documentation/RCU/rcuref.txt                       |   9 +
2644  Documentation/kernel-parameters.txt                |   6 +
2645  Documentation/memory-barriers.txt                  |  25 ++-
2646  MAINTAINERS                                        |  14 +-
2647  include/linux/init_task.h                          |   9 +-
2648  include/linux/rcupdate.h                           |  91 ++++-----
2649  include/linux/sched.h                              |   6 -
2650  include/linux/tick.h                               |  19 ++
2651  init/Kconfig                                       |   2 +-
2652  kernel/rcu/rcu.h                                   |   8 +-
2653  kernel/rcu/srcu.c                                  |   4 +-
2654  kernel/rcu/tree.c                                  | 224 +++++++++++++++------
2655  kernel/rcu/tree.h                                  |  14 +-
2656  kernel/rcu/tree_plugin.h                           |  67 ++++--
2657  kernel/rcu/update.c                                |  25 +--
2658  kernel/sched/core.c                                |   7 +-
2659  kernel/signal.c                                    |   4 +
2660  kernel/time/tick-sched.c                           |   6 +
2661  kernel/torture.c                                   |   2 +-
2662  .../selftests/rcutorture/bin/kvm-recheck.sh        |   8 +-
2663  .../selftests/rcutorture/bin/kvm-test-1-run.sh     |   9 +-
2664  tools/testing/selftests/rcutorture/bin/kvm.sh      |  21 +-
2665  .../selftests/rcutorture/configs/rcu/TREE01        |   1 -
2666  .../selftests/rcutorture/configs/rcu/TREE02        |   1 -
2667  .../selftests/rcutorture/configs/rcu/TREE02-T      |   1 -
2668  .../selftests/rcutorture/configs/rcu/TREE03        |   1 -
2669  .../selftests/rcutorture/configs/rcu/TREE04        |   1 -
2670  .../selftests/rcutorture/configs/rcu/TREE05        |   1 -
2671  .../selftests/rcutorture/configs/rcu/TREE06        |   1 -
2672  .../selftests/rcutorture/configs/rcu/TREE07        |   1 -
2673  .../selftests/rcutorture/configs/rcu/TREE08        |   1 -
2674  .../selftests/rcutorture/configs/rcu/TREE08-T      |   1 -
2675  .../selftests/rcutorture/configs/rcu/TREE09        |   1 -
2676  33 files changed, 381 insertions(+), 210 deletions(-)
2677 Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
2678 $ git merge uprobes/for-next
2679 Already up-to-date.
2680 Merging kvm/linux-next (27e6fb5dae28 KVM: vmx: vmx instructions handling does not consider cs.l)
2681 $ git merge kvm/linux-next
2682 Auto-merging arch/x86/include/uapi/asm/msr-index.h
2683 Merge made by the 'recursive' strategy.
2684  arch/x86/include/asm/kvm_emulate.h    |   1 +
2685  arch/x86/include/asm/kvm_host.h       |   1 +
2686  arch/x86/include/asm/vmx.h            |   7 ++-
2687  arch/x86/include/uapi/asm/msr-index.h |   1 +
2688  arch/x86/kvm/emulate.c                |  82 ++++++++++++++++++--------
2689  arch/x86/kvm/pmu.c                    |   9 +++
2690  arch/x86/kvm/vmx.c                    | 105 ++++++++++++++++++++++------------
2691  arch/x86/kvm/x86.c                    |  18 ++++--
2692  arch/x86/kvm/x86.h                    |  27 +++++++++
2693  9 files changed, 184 insertions(+), 67 deletions(-)
2694 Merging kvm-arm/next (1252b3313642 arm64: KVM: Enable minimalistic support for Cortex-A53)
2695 $ git merge kvm-arm/next
2696 Already up-to-date.
2697 Merging kvm-ppc/kvm-ppc-next (5c02c392cd23 Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
2698 $ git merge kvm-ppc/kvm-ppc-next
2699 Already up-to-date.
2700 Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
2701 $ git merge oprofile/for-next
2702 Already up-to-date.
2703 Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
2704 $ git merge fw-nohz/nohz/next
2705 Already up-to-date.
2706 Merging xen-tip/linux-next (77945ca73e9a x86/xen: map foreign pfns for autotranslated guests)
2707 $ git merge xen-tip/linux-next
2708 Already up-to-date.
2709 Merging percpu/for-next (807407c0a29b workqueue: stronger test in process_one_work())
2710 $ git merge percpu/for-next
2711 Merge made by the 'recursive' strategy.
2712  arch/x86/include/asm/percpu.h |   3 +-
2713  include/asm-generic/percpu.h  | 410 +++++++++++++++++++++----
2714  include/linux/percpu-defs.h   | 380 +++++++++++++++++++++++-
2715  include/linux/percpu.h        | 673 ------------------------------------------
2716  kernel/workqueue.c            |  19 +-
2717  mm/percpu.c                   |   3 +-
2718  6 files changed, 725 insertions(+), 763 deletions(-)
2719 Merging workqueues/for-next (4a9242884da5 Merge branch 'for-3.16-fixes' into for-next)
2720 $ git merge workqueues/for-next
2721 Auto-merging kernel/workqueue.c
2722 Merge made by the 'recursive' strategy.
2723  kernel/workqueue.c | 20 +++++++-------------
2724  1 file changed, 7 insertions(+), 13 deletions(-)
2725 Merging drivers-x86/linux-next (f82bdd0d77b6 hp-wmi: Enable hotkeys on some systems)
2726 $ git merge drivers-x86/linux-next
2727 Already up-to-date.
2728 Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
2729 $ git merge chrome-platform/for-next
2730 Already up-to-date.
2731 Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
2732 $ git merge sysctl/master
2733 Already up-to-date.
2734 Merging regmap/for-next (a497c3ba1d97 Linux 3.16-rc2)
2735 $ git merge regmap/for-next
2736 Already up-to-date.
2737 Merging hsi/for-next (b357d7b58f37 hsi: omap_ssi_port: use normal module refcounting)
2738 $ git merge hsi/for-next
2739 Already up-to-date.
2740 Merging leds/for-next (a497c3ba1d97 Linux 3.16-rc2)
2741 $ git merge leds/for-next
2742 Already up-to-date.
2743 Merging driver-core/driver-core-next (c9d53c0f2d23 devres: remove devm_request_and_ioremap())
2744 $ git merge driver-core/driver-core-next
2745 Removing scripts/coccinelle/api/devm_ioremap_resource.cocci
2746 Merge made by the 'recursive' strategy.
2747  Documentation/driver-model/devres.txt              |  1 -
2748  drivers/bus/brcmstb_gisb.c                         |  6 +-
2749  drivers/gpu/drm/armada/armada_crtc.c               |  8 +-
2750  include/linux/device.h                             |  2 -
2751  lib/devres.c                                       | 28 -------
2752  scripts/coccinelle/api/devm_ioremap_resource.cocci | 90 ----------------------
2753  6 files changed, 6 insertions(+), 129 deletions(-)
2754  delete mode 100644 scripts/coccinelle/api/devm_ioremap_resource.cocci
2755 Merging tty/tty-next (a497c3ba1d97 Linux 3.16-rc2)
2756 $ git merge tty/tty-next
2757 Already up-to-date.
2758 Merging usb/usb-next (d6759133e981 usb: xhci: Correct last context entry calculation for Configure Endpoint)
2759 $ git merge usb/usb-next
2760 Auto-merging drivers/usb/host/xhci.c
2761 Merge made by the 'recursive' strategy.
2762  drivers/usb/host/xhci.c | 51 +++++++++++++++++--------------------------------
2763  1 file changed, 18 insertions(+), 33 deletions(-)
2764 Merging usb-gadget/next (7751b6fb0586 usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call.)
2765 $ git merge usb-gadget/next
2766 Already up-to-date.
2767 Merging usb-serial/usb-next (a497c3ba1d97 Linux 3.16-rc2)
2768 $ git merge usb-serial/usb-next
2769 Already up-to-date.
2770 Merging staging/staging-next (0b913529c783 staging: lustre: fix sparse warnings for static symbols)
2771 $ git merge staging/staging-next
2772 Removing drivers/staging/rtl8723au/include/rtw_ioctl_set.h
2773 Removing drivers/staging/rtl8723au/core/rtw_ioctl_set.c
2774 Removing drivers/staging/rtl8188eu/include/usb_vendor_req.h
2775 Removing drivers/staging/rtl8188eu/include/rtw_version.h
2776 Removing drivers/staging/rtl8188eu/include/rtw_io.h
2777 Removing drivers/staging/rtl8188eu/include/rtw_br_ext.h
2778 Removing drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
2779 Removing drivers/staging/rtl8188eu/include/HalPhyRf.h
2780 Removing drivers/staging/rtl8188eu/include/Hal8188EReg.h
2781 Removing drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
2782 Removing drivers/staging/rtl8188eu/hal/HalPhyRf.c
2783 Removing drivers/staging/rtl8188eu/core/rtw_io.c
2784 Removing drivers/staging/rtl8188eu/core/rtw_br_ext.c
2785 Removing drivers/staging/crystalhd/crystalhd_misc.h
2786 Removing drivers/staging/crystalhd/crystalhd_misc.c
2787 Removing drivers/staging/crystalhd/crystalhd_lnx.h
2788 Removing drivers/staging/crystalhd/crystalhd_lnx.c
2789 Removing drivers/staging/crystalhd/crystalhd_hw.h
2790 Removing drivers/staging/crystalhd/crystalhd_hw.c
2791 Removing drivers/staging/crystalhd/crystalhd_fw_if.h
2792 Removing drivers/staging/crystalhd/crystalhd_cmds.h
2793 Removing drivers/staging/crystalhd/crystalhd_cmds.c
2794 Removing drivers/staging/crystalhd/crystalhd.h
2795 Removing drivers/staging/crystalhd/bcm_70012_regs.h
2796 Removing drivers/staging/crystalhd/bc_dts_glob_lnx.h
2797 Removing drivers/staging/crystalhd/bc_dts_defs.h
2798 Removing drivers/staging/crystalhd/TODO
2799 Removing drivers/staging/crystalhd/Makefile
2800 Removing drivers/staging/crystalhd/Kconfig
2801 Auto-merging MAINTAINERS
2802 Merge made by the 'recursive' strategy.
2803  Documentation/ABI/testing/sysfs-bus-iio            |   13 +
2804  .../ABI/testing}/sysfs-bus-iio-trigger-sysfs       |    0
2805  MAINTAINERS                                        |    8 -
2806  .../cavium-octeon/executive/cvmx-helper-sgmii.c    |   12 +-
2807  drivers/iio/accel/Kconfig                          |   12 +
2808  drivers/iio/accel/Makefile                         |    1 +
2809  drivers/iio/accel/kxcjk-1013.c                     |  764 +++
2810  drivers/iio/adc/ad7298.c                           |   21 +-
2811  drivers/iio/adc/ad7476.c                           |    5 +-
2812  drivers/iio/adc/ad7887.c                           |   21 +-
2813  drivers/iio/adc/ad799x.c                           |    3 +-
2814  drivers/iio/adc/ad_sigma_delta.c                   |    2 +-
2815  drivers/iio/adc/at91_adc.c                         |    2 +-
2816  drivers/iio/adc/xilinx-xadc-core.c                 |    2 +-
2817  drivers/iio/dac/ad5504.c                           |   11 +-
2818  drivers/iio/dac/ad5791.c                           |   29 +-
2819  drivers/iio/industrialio-trigger.c                 |    8 +-
2820  drivers/iio/light/gp2ap020a00f.c                   |    2 +-
2821  drivers/iio/magnetometer/Kconfig                   |   10 +
2822  drivers/iio/magnetometer/Makefile                  |    1 +
2823  drivers/iio/magnetometer/ak09911.c                 |  326 ++
2824  drivers/iio/pressure/Kconfig                       |   10 +
2825  drivers/iio/pressure/Makefile                      |    1 +
2826  drivers/iio/pressure/t5403.c                       |  275 +
2827  drivers/iio/proximity/as3935.c                     |    2 +-
2828  drivers/iio/trigger/iio-trig-interrupt.c           |    3 +-
2829  drivers/iio/trigger/iio-trig-sysfs.c               |    2 +-
2830  drivers/staging/Kconfig                            |    6 +-
2831  drivers/staging/Makefile                           |    3 +-
2832  drivers/staging/android/Kconfig                    |    2 +-
2833  drivers/staging/android/alarm-dev.c                |    2 +-
2834  drivers/staging/android/ion/ion_chunk_heap.c       |    2 +-
2835  drivers/staging/android/ion/ion_system_heap.c      |   71 +-
2836  drivers/staging/bcm/Bcmchar.c                      |    2 +-
2837  drivers/staging/bcm/CmHost.c                       |    2 +-
2838  drivers/staging/bcm/Misc.c                         |   25 +-
2839  drivers/staging/bcm/PHSModule.c                    |    2 +-
2840  drivers/staging/bcm/Prototypes.h                   |   89 +-
2841  drivers/staging/bcm/Qos.c                          |  126 +-
2842  drivers/staging/bcm/Queue.h                        |   46 +-
2843  drivers/staging/bcm/nvm.c                          |    4 +-
2844  drivers/staging/board/Kconfig                      |    8 +
2845  drivers/staging/board/Makefile                     |    2 +
2846  drivers/staging/board/TODO                         |    2 +
2847  drivers/staging/board/board.c                      |   41 +
2848  drivers/staging/board/board.h                      |   20 +
2849  drivers/staging/board/kzm9d.c                      |   19 +
2850  drivers/staging/ced1401/userspace/use1401.c        |    9 +-
2851  drivers/staging/comedi/Kconfig                     |   16 +-
2852  drivers/staging/comedi/comedi_fops.c               |    4 +-
2853  drivers/staging/comedi/comedidev.h                 |  117 +-
2854  .../staging/comedi/drivers/addi-data/addi_common.c |   10 +-
2855  .../staging/comedi/drivers/addi-data/addi_common.h |   20 -
2856  .../comedi/drivers/addi-data/hwdrv_apci035.c       |    9 +-
2857  .../comedi/drivers/addi-data/hwdrv_apci1564.c      |   10 +-
2858  .../comedi/drivers/addi-data/hwdrv_apci3120.c      |   16 +-
2859  .../comedi/drivers/addi-data/hwdrv_apci3200.c      |  109 +-
2860  drivers/staging/comedi/drivers/addi_apci_035.c     |    2 +-
2861  drivers/staging/comedi/drivers/addi_apci_1500.c    |    2 +-
2862  drivers/staging/comedi/drivers/addi_apci_3120.c    |   11 +-
2863  drivers/staging/comedi/drivers/addi_apci_3200.c    |    8 +-
2864  drivers/staging/comedi/drivers/adl_pci9111.c       |  101 +-
2865  drivers/staging/comedi/drivers/adq12b.c            |  148 +-
2866  drivers/staging/comedi/drivers/ke_counter.c        |   57 +-
2867  drivers/staging/comedi/drivers/ni_atmio.c          |   73 +-
2868  drivers/staging/comedi/drivers/ni_daq_700.c        |   96 +-
2869  drivers/staging/comedi/drivers/ni_mio_common.c     | 5912 ++++++++++----------
2870  drivers/staging/comedi/drivers/ni_mio_cs.c         |   60 -
2871  drivers/staging/comedi/drivers/ni_pcimio.c         |  358 +-
2872  drivers/staging/comedi/drivers/ni_stc.h            |  163 +-
2873  drivers/staging/comedi/drivers/pcl724.c            |    5 +
2874  drivers/staging/comedi/drivers/pcl730.c            |   21 +-
2875  drivers/staging/cptm1217/clearpad_tm1217.c         |   15 +-
2876  drivers/staging/crystalhd/Kconfig                  |    6 -
2877  drivers/staging/crystalhd/Makefile                 |    6 -
2878  drivers/staging/crystalhd/TODO                     |   15 -
2879  drivers/staging/crystalhd/bc_dts_defs.h            |  572 --
2880  drivers/staging/crystalhd/bc_dts_glob_lnx.h        |  300 -
2881  drivers/staging/crystalhd/bcm_70012_regs.h         |  758 ---
2882  drivers/staging/crystalhd/crystalhd.h              |   13 -
2883  drivers/staging/crystalhd/crystalhd_cmds.c         | 1066 ----
2884  drivers/staging/crystalhd/crystalhd_cmds.h         |   92 -
2885  drivers/staging/crystalhd/crystalhd_fw_if.h        |  370 --
2886  drivers/staging/crystalhd/crystalhd_hw.c           | 2458 --------
2887  drivers/staging/crystalhd/crystalhd_hw.h           |  407 --
2888  drivers/staging/crystalhd/crystalhd_lnx.c          |  782 ---
2889  drivers/staging/crystalhd/crystalhd_lnx.h          |   93 -
2890  drivers/staging/crystalhd/crystalhd_misc.c         | 1044 ----
2891  drivers/staging/crystalhd/crystalhd_misc.h         |  232 -
2892  drivers/staging/cxt1e1/musycc.c                    |   54 +-
2893  drivers/staging/dgap/dgap.c                        |  281 +-
2894  drivers/staging/dgap/dgap.h                        |    1 -
2895  drivers/staging/dgnc/dgnc_driver.c                 |    3 +-
2896  drivers/staging/emxx_udc/Kconfig                   |   10 +
2897  drivers/staging/emxx_udc/Makefile                  |    1 +
2898  drivers/staging/emxx_udc/TODO                      |    4 +
2899  drivers/staging/emxx_udc/emxx_udc.c                | 3538 ++++++++++++
2900  drivers/staging/emxx_udc/emxx_udc.h                |  653 +++
2901  drivers/staging/fwserial/fwserial.c                |    6 +-
2902  drivers/staging/gdm724x/gdm_lte.c                  |    2 +
2903  drivers/staging/goldfish/goldfish_audio.c          |   10 +-
2904  drivers/staging/iio/Documentation/generic_buffer.c |    9 +-
2905  .../staging/iio/Documentation/iio_event_monitor.c  |   10 +
2906  drivers/staging/iio/Documentation/iio_utils.h      |    6 +-
2907  drivers/staging/iio/Documentation/trigger.txt      |    2 +-
2908  drivers/staging/iio/accel/lis3l02dq_ring.c         |    2 +-
2909  drivers/staging/iio/adc/mxs-lradc.c                |    2 +-
2910  drivers/staging/iio/iio_simple_dummy.c             |    2 +
2911  drivers/staging/iio/meter/ade7758_trigger.c        |    2 +-
2912  drivers/staging/iio/trigger/iio-trig-bfin-timer.c  |    2 +-
2913  .../staging/iio/trigger/iio-trig-periodic-rtc.c    |   29 +-
2914  drivers/staging/keucr/usb.c                        |    3 +-
2915  drivers/staging/line6/driver.c                     |    2 +-
2916  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c    |    5 -
2917  .../staging/lustre/lnet/klnds/socklnd/socklnd.c    |   74 +-
2918  drivers/staging/lustre/lnet/lnet/router.c          |    5 +-
2919  drivers/staging/lustre/lnet/selftest/console.c     |   10 -
2920  drivers/staging/lustre/lnet/selftest/framework.c   |    2 -
2921  drivers/staging/lustre/lustre/Kconfig              |    1 +
2922  drivers/staging/lustre/lustre/fid/lproc_fid.c      |    6 +-
2923  drivers/staging/lustre/lustre/fld/fld_request.c    |    1 -
2924  drivers/staging/lustre/lustre/fld/lproc_fld.c      |    3 +-
2925  drivers/staging/lustre/lustre/lclient/glimpse.c    |    4 +-
2926  drivers/staging/lustre/lustre/lclient/lcommon_cl.c |   15 +-
2927  .../staging/lustre/lustre/lclient/lcommon_misc.c   |    2 +-
2928  drivers/staging/lustre/lustre/ldlm/ldlm_lib.c      |   30 +-
2929  drivers/staging/lustre/lustre/ldlm/ldlm_resource.c |   13 +-
2930  .../lustre/lustre/libcfs/linux/linux-tcpip.c       |    2 -
2931  .../lustre/lustre/obdclass/linux/linux-sysctl.c    |   20 +-
2932  drivers/staging/lustre/lustre/obdecho/lproc_echo.c |    4 +-
2933  drivers/staging/lustre/lustre/osc/osc_dev.c        |   14 +-
2934  drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c   |    2 +-
2935  drivers/staging/media/lirc/lirc_sir.c              |  301 +-
2936  drivers/staging/media/sn9c102/Kconfig              |    2 +-
2937  drivers/staging/nokia_h4p/nokia_core.c             |    1 +
2938  drivers/staging/octeon/ethernet-mdio.c             |   79 +-
2939  drivers/staging/octeon/ethernet-mem.c              |   11 +-
2940  drivers/staging/octeon/ethernet-rgmii.c            |   23 +-
2941  drivers/staging/octeon/ethernet-sgmii.c            |   87 +-
2942  drivers/staging/octeon/ethernet-xaui.c             |   83 +-
2943  drivers/staging/octeon/ethernet.c                  |    2 +-
2944  drivers/staging/octeon/octeon-ethernet.h           |    4 +
2945  drivers/staging/rtl8188eu/Makefile                 |    4 -
2946  drivers/staging/rtl8188eu/core/rtw_br_ext.c        | 1191 ----
2947  drivers/staging/rtl8188eu/core/rtw_cmd.c           |    6 +-
2948  drivers/staging/rtl8188eu/core/rtw_debug.c         |   26 +-
2949  drivers/staging/rtl8188eu/core/rtw_efuse.c         | 1417 +++--
2950  drivers/staging/rtl8188eu/core/rtw_io.c            |  301 -
2951  drivers/staging/rtl8188eu/core/rtw_mlme.c          |   20 -
2952  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |    2 -
2953  drivers/staging/rtl8188eu/core/rtw_mp.c            |   48 +-
2954  drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c      |   24 +-
2955  drivers/staging/rtl8188eu/core/rtw_pwrctrl.c       |  126 +-
2956  drivers/staging/rtl8188eu/core/rtw_sreset.c        |   19 +-
2957  drivers/staging/rtl8188eu/core/rtw_xmit.c          |  135 -
2958  .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c   |   10 +-
2959  drivers/staging/rtl8188eu/hal/HalPhyRf.c           |   49 -
2960  drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c     |   88 +-
2961  drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c       |    7 +-
2962  drivers/staging/rtl8188eu/hal/hal_com.c            |   10 +-
2963  drivers/staging/rtl8188eu/hal/hal_intf.c           |   24 -
2964  drivers/staging/rtl8188eu/hal/odm.c                |   14 +-
2965  drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c |    2 +-
2966  drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c       |   38 +-
2967  drivers/staging/rtl8188eu/hal/rtl8188e_dm.c        |    4 +-
2968  drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c  | 1352 +----
2969  drivers/staging/rtl8188eu/hal/rtl8188e_mp.c        |   32 +-
2970  drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c    |   26 +-
2971  drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c    |    2 +-
2972  drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c    |   80 -
2973  drivers/staging/rtl8188eu/hal/rtl8188eu_led.c      |   15 +-
2974  drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |    4 +-
2975  drivers/staging/rtl8188eu/hal/usb_halinit.c        |  500 +-
2976  drivers/staging/rtl8188eu/hal/usb_ops_linux.c      |   59 +-
2977  drivers/staging/rtl8188eu/include/Hal8188EReg.h    |   46 -
2978  drivers/staging/rtl8188eu/include/HalPhyRf.h       |   30 -
2979  drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h |    2 +-
2980  drivers/staging/rtl8188eu/include/drv_types.h      |   67 +-
2981  drivers/staging/rtl8188eu/include/hal_intf.h       |   26 -
2982  drivers/staging/rtl8188eu/include/odm_precomp.h    |    3 +-
2983  drivers/staging/rtl8188eu/include/osdep_intf.h     |   35 -
2984  drivers/staging/rtl8188eu/include/recv_osdep.h     |    1 -
2985  drivers/staging/rtl8188eu/include/rtl8188e_hal.h   |    6 +-
2986  .../staging/rtl8188eu/include/rtl8188e_sreset.h    |   31 -
2987  drivers/staging/rtl8188eu/include/rtw_br_ext.h     |   66 -
2988  drivers/staging/rtl8188eu/include/rtw_debug.h      |    2 +-
2989  drivers/staging/rtl8188eu/include/rtw_efuse.h      |   43 +-
2990  drivers/staging/rtl8188eu/include/rtw_io.h         |  343 --
2991  drivers/staging/rtl8188eu/include/rtw_sreset.h     |    5 -
2992  drivers/staging/rtl8188eu/include/rtw_version.h    |    1 -
2993  drivers/staging/rtl8188eu/include/usb_ops.h        |    2 -
2994  drivers/staging/rtl8188eu/include/usb_ops_linux.h  |   17 +-
2995  drivers/staging/rtl8188eu/include/usb_osintf.h     |    7 -
2996  drivers/staging/rtl8188eu/include/usb_vendor_req.h |   52 -
2997  drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |  239 +-
2998  drivers/staging/rtl8188eu/os_dep/os_intfs.c        |   48 +-
2999  drivers/staging/rtl8188eu/os_dep/osdep_service.c   |    1 +
3000  drivers/staging/rtl8188eu/os_dep/recv_linux.c      |    2 +-
3001  drivers/staging/rtl8188eu/os_dep/usb_intf.c        |  228 +-
3002  drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c   |   28 +-
3003  drivers/staging/rtl8192e/dot11d.c                  |    8 +-
3004  drivers/staging/rtl8192ee/Kconfig                  |    1 -
3005  drivers/staging/rtl8192ee/base.c                   |    2 +-
3006  .../staging/rtl8192ee/btcoexist/halbtc8821a2ant.c  |    2 +-
3007  drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.h |    2 +-
3008  drivers/staging/rtl8192u/ieee80211/ieee80211.h     |   10 +-
3009  drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |    2 -
3010  drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |    8 +-
3011  drivers/staging/rtl8192u/r8192U_core.c             |  547 +-
3012  drivers/staging/rtl8192u/r8192U_wx.c               |  146 +-
3013  drivers/staging/rtl8712/drv_types.h                |    1 -
3014  drivers/staging/rtl8712/hal_init.c                 |    2 -
3015  drivers/staging/rtl8712/ieee80211.h                |    4 +-
3016  drivers/staging/rtl8712/os_intfs.c                 |    3 +-
3017  drivers/staging/rtl8712/rtl871x_cmd.c              |   94 +-
3018  drivers/staging/rtl8712/rtl871x_io.c               |    2 +-
3019  drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |    7 +-
3020  drivers/staging/rtl8712/rtl871x_mlme.c             |    8 +-
3021  drivers/staging/rtl8712/rtl871x_mp.c               |    4 +-
3022  drivers/staging/rtl8712/usb_intf.c                 |   40 +-
3023  drivers/staging/rtl8723au/Makefile                 |    4 +-
3024  drivers/staging/rtl8723au/core/rtw_ap.c            |  179 +-
3025  drivers/staging/rtl8723au/core/rtw_cmd.c           |   13 -
3026  drivers/staging/rtl8723au/core/rtw_ieee80211.c     |  346 +-
3027  drivers/staging/rtl8723au/core/rtw_ioctl_set.c     |  425 --
3028  drivers/staging/rtl8723au/core/rtw_mlme.c          |  515 +-
3029  drivers/staging/rtl8723au/core/rtw_mlme_ext.c      | 1605 +++---
3030  drivers/staging/rtl8723au/core/rtw_pwrctrl.c       |   16 -
3031  drivers/staging/rtl8723au/core/rtw_wlan_util.c     |  397 +-
3032  .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c    |    5 +-
3033  drivers/staging/rtl8723au/hal/rtl8723a_cmd.c       |   82 +-
3034  drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c  |    2 -
3035  drivers/staging/rtl8723au/hal/rtl8723a_xmit.c      |   21 -
3036  drivers/staging/rtl8723au/hal/usb_halinit.c        |    4 +-
3037  drivers/staging/rtl8723au/include/drv_types.h      |    3 -
3038  drivers/staging/rtl8723au/include/ieee80211.h      |  109 +-
3039  drivers/staging/rtl8723au/include/ioctl_cfg80211.h |    3 -
3040  drivers/staging/rtl8723au/include/rtl8723a_cmd.h   |    2 +-
3041  drivers/staging/rtl8723au/include/rtl8723a_xmit.h  |    1 -
3042  drivers/staging/rtl8723au/include/rtw_ap.h         |    3 +-
3043  drivers/staging/rtl8723au/include/rtw_debug.h      |    2 +-
3044  drivers/staging/rtl8723au/include/rtw_event.h      |    2 +-
3045  drivers/staging/rtl8723au/include/rtw_ht.h         |    4 +-
3046  drivers/staging/rtl8723au/include/rtw_ioctl_set.h  |   32 -
3047  drivers/staging/rtl8723au/include/rtw_mlme.h       |   48 +-
3048  drivers/staging/rtl8723au/include/rtw_mlme_ext.h   |   25 +-
3049  drivers/staging/rtl8723au/include/rtw_rf.h         |   11 -
3050  drivers/staging/rtl8723au/include/rtw_security.h   |    3 -
3051  drivers/staging/rtl8723au/include/wifi.h           |   71 -
3052  drivers/staging/rtl8723au/include/wlan_bssdef.h    |    6 +-
3053  drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c  | 1105 ++--
3054  drivers/staging/rtl8723au/os_dep/mlme_linux.c      |    1 -
3055  drivers/staging/rtl8723au/os_dep/os_intfs.c        |    5 -
3056  drivers/staging/rtl8723au/os_dep/usb_intf.c        |   12 +-
3057  drivers/staging/rtl8821ae/Kconfig                  |    1 -
3058  .../staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c  |   14 +-
3059  drivers/staging/rtl8821ae/ps.c                     |    6 +-
3060  drivers/staging/sep/sep_crypto.c                   |   17 +
3061  drivers/staging/serqt_usb2/serqt_usb2.c            |    1 +
3062  drivers/staging/skein/skein_iv.h                   |   26 +-
3063  drivers/staging/speakup/main.c                     |    2 +-
3064  drivers/staging/tidspbridge/core/chnl_sm.c         |    1 +
3065  drivers/staging/tidspbridge/core/io_sm.c           |    1 +
3066  drivers/staging/tidspbridge/core/tiomap3430.c      |    2 +
3067  drivers/staging/tidspbridge/core/tiomap_io.c       |    2 +
3068  drivers/staging/tidspbridge/core/wdt.c             |    1 +
3069  drivers/staging/tidspbridge/dynload/cload.c        |    7 +
3070  drivers/staging/tidspbridge/dynload/reloc.c        |    2 +
3071  .../tidspbridge/include/dspbridge/dblldefs.h       |   14 +-
3072  drivers/staging/tidspbridge/pmgr/chnl.c            |    1 +
3073  drivers/staging/tidspbridge/pmgr/dspapi.c          |   64 +-
3074  drivers/staging/tidspbridge/rmgr/dbdcd.c           |    1 +
3075  drivers/staging/tidspbridge/rmgr/drv_interface.c   |    2 +
3076  drivers/staging/tidspbridge/rmgr/nldr.c            |    1 +
3077  drivers/staging/tidspbridge/rmgr/node.c            |    2 +
3078  drivers/staging/tidspbridge/rmgr/proc.c            |    3 +
3079  drivers/staging/unisys/include/guestlinuxdebug.h   |    6 +-
3080  .../usbip/userspace/libsrc/usbip_host_driver.c     |    7 +-
3081  drivers/staging/usbip/vhci_hcd.c                   |    2 +-
3082  drivers/staging/vt6655/baseband.c                  |  300 +-
3083  drivers/staging/vt6655/card.c                      |    2 +-
3084  drivers/staging/vt6655/device.h                    |    6 +-
3085  drivers/staging/vt6655/device_main.c               |    6 +-
3086  drivers/staging/vt6655/dpc.c                       |    3 +-
3087  drivers/staging/vt6655/iwctl.c                     |    1 +
3088  drivers/staging/vt6655/iwctl.h                     |    4 +-
3089  drivers/staging/vt6655/vntwifi.c                   |    8 +-
3090  drivers/staging/vt6655/wmgr.c                      |    2 +-
3091  drivers/staging/vt6656/baseband.c                  |   16 +-
3092  drivers/staging/vt6656/baseband.h                  |    4 +-
3093  drivers/staging/vt6656/bssdb.c                     |   12 +-
3094  drivers/staging/vt6656/card.c                      |  143 +-
3095  drivers/staging/vt6656/card.h                      |   36 +-
3096  drivers/staging/vt6656/datarate.c                  |    8 +-
3097  drivers/staging/vt6656/device.h                    |    2 +
3098  drivers/staging/vt6656/firmware.c                  |   78 +-
3099  drivers/staging/vt6656/firmware.h                  |    6 +-
3100  drivers/staging/vt6656/iwctl.c                     |    8 +-
3101  drivers/staging/vt6656/key.c                       |   13 +-
3102  drivers/staging/vt6656/mac.c                       |   28 +-
3103  drivers/staging/vt6656/mac.h                       |   28 +-
3104  drivers/staging/vt6656/main_usb.c                  |   41 +-
3105  drivers/staging/vt6656/power.c                     |   90 +-
3106  drivers/staging/vt6656/power.h                     |    6 +-
3107  drivers/staging/vt6656/rxtx.c                      |  329 +-
3108  drivers/staging/vt6656/rxtx.h                      |    6 +-
3109  drivers/staging/vt6656/wcmd.c                      |   38 +-
3110  drivers/staging/vt6656/wmgr.c                      |  120 +-
3111  drivers/staging/vt6656/wpactl.c                    |    2 +-
3112  drivers/staging/wlags49_h2/wl_cs.c                 |   19 +-
3113  drivers/staging/wlags49_h2/wl_internal.h           |    4 +-
3114  drivers/staging/wlan-ng/cfg80211.c                 |    2 +
3115  drivers/staging/wlan-ng/prism2mgmt.c               |   42 +-
3116  drivers/staging/wlan-ng/prism2mib.c                |    4 +-
3117  drivers/staging/wlan-ng/prism2sta.c                |    5 +-
3118  include/linux/iio/accel/kxcjk_1013.h               |   22 +
3119  include/linux/iio/trigger.h                        |    5 +-
3120  kernel/time/alarmtimer.c                           |    2 +-
3121  318 files changed, 14806 insertions(+), 22778 deletions(-)
3122  rename {drivers/staging/iio/Documentation => Documentation/ABI/testing}/sysfs-bus-iio-trigger-sysfs (100%)
3123  create mode 100644 drivers/iio/accel/kxcjk-1013.c
3124  create mode 100644 drivers/iio/magnetometer/ak09911.c
3125  create mode 100644 drivers/iio/pressure/t5403.c
3126  create mode 100644 drivers/staging/board/Kconfig
3127  create mode 100644 drivers/staging/board/Makefile
3128  create mode 100644 drivers/staging/board/TODO
3129  create mode 100644 drivers/staging/board/board.c
3130  create mode 100644 drivers/staging/board/board.h
3131  create mode 100644 drivers/staging/board/kzm9d.c
3132  delete mode 100644 drivers/staging/crystalhd/Kconfig
3133  delete mode 100644 drivers/staging/crystalhd/Makefile
3134  delete mode 100644 drivers/staging/crystalhd/TODO
3135  delete mode 100644 drivers/staging/crystalhd/bc_dts_defs.h
3136  delete mode 100644 drivers/staging/crystalhd/bc_dts_glob_lnx.h
3137  delete mode 100644 drivers/staging/crystalhd/bcm_70012_regs.h
3138  delete mode 100644 drivers/staging/crystalhd/crystalhd.h
3139  delete mode 100644 drivers/staging/crystalhd/crystalhd_cmds.c
3140  delete mode 100644 drivers/staging/crystalhd/crystalhd_cmds.h
3141  delete mode 100644 drivers/staging/crystalhd/crystalhd_fw_if.h
3142  delete mode 100644 drivers/staging/crystalhd/crystalhd_hw.c
3143  delete mode 100644 drivers/staging/crystalhd/crystalhd_hw.h
3144  delete mode 100644 drivers/staging/crystalhd/crystalhd_lnx.c
3145  delete mode 100644 drivers/staging/crystalhd/crystalhd_lnx.h
3146  delete mode 100644 drivers/staging/crystalhd/crystalhd_misc.c
3147  delete mode 100644 drivers/staging/crystalhd/crystalhd_misc.h
3148  create mode 100644 drivers/staging/emxx_udc/Kconfig
3149  create mode 100644 drivers/staging/emxx_udc/Makefile
3150  create mode 100644 drivers/staging/emxx_udc/TODO
3151  create mode 100644 drivers/staging/emxx_udc/emxx_udc.c
3152  create mode 100644 drivers/staging/emxx_udc/emxx_udc.h
3153  delete mode 100644 drivers/staging/rtl8188eu/core/rtw_br_ext.c
3154  delete mode 100644 drivers/staging/rtl8188eu/core/rtw_io.c
3155  delete mode 100644 drivers/staging/rtl8188eu/hal/HalPhyRf.c
3156  delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
3157  delete mode 100644 drivers/staging/rtl8188eu/include/Hal8188EReg.h
3158  delete mode 100644 drivers/staging/rtl8188eu/include/HalPhyRf.h
3159  delete mode 100644 drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
3160  delete mode 100644 drivers/staging/rtl8188eu/include/rtw_br_ext.h
3161  delete mode 100644 drivers/staging/rtl8188eu/include/rtw_io.h
3162  delete mode 100644 drivers/staging/rtl8188eu/include/rtw_version.h
3163  delete mode 100644 drivers/staging/rtl8188eu/include/usb_vendor_req.h
3164  delete mode 100644 drivers/staging/rtl8723au/core/rtw_ioctl_set.c
3165  delete mode 100644 drivers/staging/rtl8723au/include/rtw_ioctl_set.h
3166  create mode 100644 include/linux/iio/accel/kxcjk_1013.h
3167 $ git am -3 ../patches/0001-staging-board-disable.patch
3168 Applying: staging: board: disable
3169 $ git reset HEAD^
3170 Unstaged changes after reset:
3171 M       drivers/staging/board/Kconfig
3172 $ git add -A .
3173 $ git commit -v -a --amend
3174 [master 47abab7005af] Merge remote-tracking branch 'staging/staging-next'
3175 Merging char-misc/char-misc-next (6b5fa7760835 w1: select crc16 library for ds2406)
3176 $ git merge char-misc/char-misc-next
3177 Resolved 'drivers/w1/masters/mxc_w1.c' using previous resolution.
3178 Auto-merging drivers/w1/masters/mxc_w1.c
3179 CONFLICT (content): Merge conflict in drivers/w1/masters/mxc_w1.c
3180 Automatic merge failed; fix conflicts and then commit the result.
3181 $ git commit -v -a
3182 [master da7ce8f1c073] Merge remote-tracking branch 'char-misc/char-misc-next'
3183 $ git diff -M --stat --summary HEAD^..
3184  Documentation/w1/slaves/w1_ds2406 |  25 ++
3185  drivers/Kconfig                   |   2 +
3186  drivers/Makefile                  |   1 +
3187  drivers/pci/pci-driver.c          |  18 +-
3188  drivers/pci/quirks.c              | 104 ++++++
3189  drivers/thunderbolt/Kconfig       |  13 +
3190  drivers/thunderbolt/Makefile      |   3 +
3191  drivers/thunderbolt/cap.c         | 116 ++++++
3192  drivers/thunderbolt/ctl.c         | 731 ++++++++++++++++++++++++++++++++++++++
3193  drivers/thunderbolt/ctl.h         |  75 ++++
3194  drivers/thunderbolt/eeprom.c      | 449 +++++++++++++++++++++++
3195  drivers/thunderbolt/nhi.c         | 677 +++++++++++++++++++++++++++++++++++
3196  drivers/thunderbolt/nhi.h         | 114 ++++++
3197  drivers/thunderbolt/nhi_regs.h    | 101 ++++++
3198  drivers/thunderbolt/path.c        | 215 +++++++++++
3199  drivers/thunderbolt/switch.c      | 507 ++++++++++++++++++++++++++
3200  drivers/thunderbolt/tb.c          | 436 +++++++++++++++++++++++
3201  drivers/thunderbolt/tb.h          | 271 ++++++++++++++
3202  drivers/thunderbolt/tb_regs.h     | 213 +++++++++++
3203  drivers/thunderbolt/tunnel_pci.c  | 232 ++++++++++++
3204  drivers/thunderbolt/tunnel_pci.h  |  30 ++
3205  drivers/w1/masters/ds1wm.c        |   2 +-
3206  drivers/w1/masters/ds2482.c       |   2 +-
3207  drivers/w1/masters/ds2490.c       |  50 +--
3208  drivers/w1/masters/mxc_w1.c       |  64 ++--
3209  drivers/w1/slaves/Kconfig         |   8 +
3210  drivers/w1/slaves/Makefile        |   1 +
3211  drivers/w1/slaves/w1_ds2406.c     | 168 +++++++++
3212  drivers/w1/slaves/w1_ds2760.c     |   3 +-
3213  drivers/w1/w1.c                   |  10 +-
3214  drivers/w1/w1_family.c            |   2 +-
3215  drivers/w1/w1_family.h            |   1 +
3216  drivers/w1/w1_int.c               |  19 +-
3217  drivers/w1/w1_log.h               |   4 +-
3218  drivers/w1/w1_netlink.c           |   3 +-
3219  include/asm-generic/vmlinux.lds.h |   3 +
3220  include/linux/pci.h               |  12 +-
3221  37 files changed, 4601 insertions(+), 84 deletions(-)
3222  create mode 100644 Documentation/w1/slaves/w1_ds2406
3223  create mode 100644 drivers/thunderbolt/Kconfig
3224  create mode 100644 drivers/thunderbolt/Makefile
3225  create mode 100644 drivers/thunderbolt/cap.c
3226  create mode 100644 drivers/thunderbolt/ctl.c
3227  create mode 100644 drivers/thunderbolt/ctl.h
3228  create mode 100644 drivers/thunderbolt/eeprom.c
3229  create mode 100644 drivers/thunderbolt/nhi.c
3230  create mode 100644 drivers/thunderbolt/nhi.h
3231  create mode 100644 drivers/thunderbolt/nhi_regs.h
3232  create mode 100644 drivers/thunderbolt/path.c
3233  create mode 100644 drivers/thunderbolt/switch.c
3234  create mode 100644 drivers/thunderbolt/tb.c
3235  create mode 100644 drivers/thunderbolt/tb.h
3236  create mode 100644 drivers/thunderbolt/tb_regs.h
3237  create mode 100644 drivers/thunderbolt/tunnel_pci.c
3238  create mode 100644 drivers/thunderbolt/tunnel_pci.h
3239  create mode 100644 drivers/w1/slaves/w1_ds2406.c
3240 Merging cgroup/for-next (391acf970d21 cpuset,mempolicy: fix sleeping function called from invalid context)
3241 $ git merge cgroup/for-next
3242 Auto-merging mm/mempolicy.c
3243 Merge made by the 'recursive' strategy.
3244  kernel/cgroup.c | 2 +-
3245  kernel/cpuset.c | 8 +++++++-
3246  mm/mempolicy.c  | 2 --
3247  3 files changed, 8 insertions(+), 4 deletions(-)
3248 Merging scsi/for-next (eed78c36555c Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next)
3249 $ git merge scsi/for-next
3250 Auto-merging MAINTAINERS
3251 Merge made by the 'recursive' strategy.
3252  Documentation/scsi/tmscsim.txt       |   2 -
3253  MAINTAINERS                          |   9 +-
3254  drivers/ata/libata-scsi.c            |   2 +-
3255  drivers/ata/libata.h                 |   2 +-
3256  drivers/message/fusion/mptbase.h     |   2 +-
3257  drivers/message/fusion/mptfc.c       |   6 +-
3258  drivers/message/fusion/mptscsih.c    |  14 +-
3259  drivers/message/fusion/mptscsih.h    |   4 +-
3260  drivers/message/i2o/i2o_scsi.c       |  11 +-
3261  drivers/s390/scsi/zfcp_dbf.c         |   3 +-
3262  drivers/s390/scsi/zfcp_unit.c        |   4 +-
3263  drivers/scsi/Kconfig                 |  14 -
3264  drivers/scsi/NCR5380.c               |  28 +-
3265  drivers/scsi/aacraid/linit.c         |   2 +-
3266  drivers/scsi/advansys.c              |   2 +-
3267  drivers/scsi/aha152x.c               |   6 +-
3268  drivers/scsi/aic7xxx/aic79xx.h       |   2 +-
3269  drivers/scsi/aic7xxx/aic79xx_osm.c   |   6 +-
3270  drivers/scsi/aic7xxx/aic79xx_proc.c  |   2 +-
3271  drivers/scsi/aic7xxx/aic7xxx_osm.c   |  11 +-
3272  drivers/scsi/aic7xxx/aic7xxx_proc.c  |   2 +-
3273  drivers/scsi/arcmsr/arcmsr_hba.c     |   8 +-
3274  drivers/scsi/be2iscsi/be_main.c      |   2 +
3275  drivers/scsi/be2iscsi/be_mgmt.c      |   4 +-
3276  drivers/scsi/bnx2fc/bnx2fc_fcoe.c    |  16 +-
3277  drivers/scsi/bnx2fc/bnx2fc_io.c      |   2 +
3278  drivers/scsi/ch.c                    |  14 +-
3279  drivers/scsi/csiostor/csio_scsi.c    |  24 +-
3280  drivers/scsi/cxgbi/libcxgbi.c        |   2 +-
3281  drivers/scsi/cxgbi/libcxgbi.h        |   2 +-
3282  drivers/scsi/dc395x.c                |  51 ++-
3283  drivers/scsi/eata.c                  |   4 +-
3284  drivers/scsi/fnic/fnic_scsi.c        |   4 +-
3285  drivers/scsi/hosts.c                 |  15 +-
3286  drivers/scsi/hpsa.c                  |   2 +-
3287  drivers/scsi/ibmvscsi/ibmvfc.c       |   4 +-
3288  drivers/scsi/ibmvscsi/ibmvscsi.c     |  13 +-
3289  drivers/scsi/libiscsi.c              |   8 +-
3290  drivers/scsi/libsas/sas_scsi_host.c  |  11 +-
3291  drivers/scsi/lpfc/lpfc_attr.c        |  10 +-
3292  drivers/scsi/lpfc/lpfc_scsi.c        |  36 +-
3293  drivers/scsi/megaraid.c              |   6 +-
3294  drivers/scsi/megaraid/mega_common.h  |   2 +-
3295  drivers/scsi/mpt3sas/mpt3sas_scsih.c |   4 +-
3296  drivers/scsi/ncr53c8xx.h             |   4 -
3297  drivers/scsi/pm8001/pm8001_init.c    |  13 +-
3298  drivers/scsi/pmcraid.c               |   2 +-
3299  drivers/scsi/qla2xxx/qla_def.h       |   6 +-
3300  drivers/scsi/qla2xxx/qla_gbl.h       |  18 +-
3301  drivers/scsi/qla2xxx/qla_iocb.c      |  11 +-
3302  drivers/scsi/qla2xxx/qla_isr.c       |   4 +-
3303  drivers/scsi/qla2xxx/qla_mbx.c       |  12 +-
3304  drivers/scsi/qla2xxx/qla_mr.c        |   8 +-
3305  drivers/scsi/qla2xxx/qla_os.c        |  48 +--
3306  drivers/scsi/qla2xxx/qla_target.c    |  17 +-
3307  drivers/scsi/qla2xxx/qla_target.h    |   4 +-
3308  drivers/scsi/qla4xxx/ql4_glbl.h      |   4 +-
3309  drivers/scsi/qla4xxx/ql4_iocb.c      |   2 +-
3310  drivers/scsi/qla4xxx/ql4_isr.c       |  22 +-
3311  drivers/scsi/qla4xxx/ql4_mbx.c       |   6 +-
3312  drivers/scsi/qla4xxx/ql4_os.c        |  20 +-
3313  drivers/scsi/scsi.c                  |  28 +-
3314  drivers/scsi/scsi_debug.c            |  21 +-
3315  drivers/scsi/scsi_error.c            | 201 ++++++-----
3316  drivers/scsi/scsi_ioctl.c            |  17 +-
3317  drivers/scsi/scsi_lib.c              |  22 +-
3318  drivers/scsi/scsi_priv.h             |   2 +-
3319  drivers/scsi/scsi_proc.c             |   2 +-
3320  drivers/scsi/scsi_scan.c             | 152 ++++----
3321  drivers/scsi/scsi_sysfs.c            |  14 +-
3322  drivers/scsi/scsi_transport_fc.c     |   5 +-
3323  drivers/scsi/scsi_transport_iscsi.c  |   4 +-
3324  drivers/scsi/scsi_transport_sas.c    |   2 +-
3325  drivers/scsi/sd.c                    |  46 ++-
3326  drivers/scsi/sd.h                    |   3 +
3327  drivers/scsi/sg.c                    | 654 ++++++++++++++++++++---------------
3328  drivers/scsi/sr.c                    |  61 ++--
3329  drivers/scsi/sr.h                    |   4 +
3330  drivers/scsi/sr_ioctl.c              |  26 +-
3331  drivers/scsi/sr_vendor.c             |  36 +-
3332  drivers/scsi/st.c                    | 605 ++++++++++++++++----------------
3333  drivers/scsi/sym53c8xx_2/sym_glue.c  |   2 +-
3334  drivers/scsi/sym53c8xx_2/sym_hipd.h  |   2 +-
3335  drivers/scsi/virtio_scsi.c           |  26 +-
3336  drivers/target/loopback/tcm_loop.c   |   2 +-
3337  drivers/target/target_core_pscsi.c   |  12 +-
3338  drivers/usb/storage/Kconfig          |   4 +-
3339  drivers/usb/storage/sddr09.c         |   4 +-
3340  drivers/usb/storage/usb.c            |  10 +-
3341  include/linux/moduleparam.h          |   5 +
3342  include/scsi/scsi.h                  |   2 +-
3343  include/scsi/scsi_cmnd.h             |   2 +-
3344  include/scsi/scsi_device.h           |  22 +-
3345  include/scsi/scsi_devinfo.h          |   2 +
3346  include/scsi/scsi_host.h             |  10 +-
3347  include/scsi/scsi_transport.h        |   2 +-
3348  include/scsi/sg.h                    |  92 ++---
3349  kernel/params.c                      |   1 +
3350  98 files changed, 1418 insertions(+), 1266 deletions(-)
3351 Merging scsi-core/core-for-3.16 (7bafc240e126 scsi: use the scsi data buffer length to extract transfer size)
3352 $ git merge scsi-core/core-for-3.16
3353 Already up-to-date.
3354 Merging scsi-drivers/drivers-for-3.16 (8faeb529b2da virtio-scsi: fix various bad behavior on aborted requests)
3355 $ git merge scsi-drivers/drivers-for-3.16
3356 Already up-to-date.
3357 Merging target-updates/for-next (0ed6e189e3f6 target: Fix NULL pointer dereference for XCOPY in target_put_sess_cmd)
3358 $ git merge target-updates/for-next
3359 Already up-to-date.
3360 Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
3361 $ git merge target-merge/for-next-merge
3362 Already up-to-date.
3363 Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
3364 $ git merge writeback/writeback-for-next
3365 Already up-to-date.
3366 Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
3367 $ git merge hwspinlock/linux-next
3368 Already up-to-date.
3369 Merging pinctrl/for-next (4aba0a02ff80 Merge branch 'devel' into for-next)
3370 $ git merge pinctrl/for-next
3371 Merge made by the 'recursive' strategy.
3372  drivers/pinctrl/Kconfig                     |   4 +-
3373  drivers/pinctrl/sh-pfc/pfc-r8a7791.c        | 250 ++++++++++++++++++++++++++++
3374  drivers/pinctrl/spear/Kconfig               |   1 +
3375  drivers/pinctrl/spear/pinctrl-plgpio.c      |  81 ++++-----
3376  drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c   |   1 +
3377  drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c  |   1 +
3378  drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c   |   1 +
3379  drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c |   1 +
3380  drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c   | 217 ++++++++++++++++--------
3381  drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c   |   1 +
3382  drivers/pinctrl/sunxi/pinctrl-sunxi.c       |  85 ++++++----
3383  drivers/pinctrl/sunxi/pinctrl-sunxi.h       |  44 ++++-
3384  12 files changed, 525 insertions(+), 162 deletions(-)
3385 Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
3386 $ git merge vhost/linux-next
3387 Resolved 'drivers/vhost/net.c' using previous resolution.
3388 Auto-merging drivers/vhost/net.c
3389 CONFLICT (content): Merge conflict in drivers/vhost/net.c
3390 Automatic merge failed; fix conflicts and then commit the result.
3391 $ git commit -v -a
3392 [master 974fc660ed2f] Merge remote-tracking branch 'vhost/linux-next'
3393 $ git diff -M --stat --summary HEAD^..
3394 Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols)
3395 $ git merge remoteproc/for-next
3396 Already up-to-date.
3397 Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
3398 $ git merge rpmsg/for-next
3399 Already up-to-date.
3400 Merging gpio/for-next (0fb394122af4 gpio: pxa: Make of_device_id array const)
3401 $ git merge gpio/for-next
3402 Auto-merging drivers/gpio/Kconfig
3403 Merge made by the 'recursive' strategy.
3404  drivers/gpio/Kconfig          |   1 +
3405  drivers/gpio/gpio-intel-mid.c |  86 ++++++++++----------------------
3406  drivers/gpio/gpio-lpc32xx.c   |   2 +-
3407  drivers/gpio/gpio-pxa.c       |   2 +-
3408  drivers/gpio/gpio-stmpe.c     | 111 ++++++++++--------------------------------
3409  5 files changed, 55 insertions(+), 147 deletions(-)
3410 Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target)
3411 $ git merge dma-mapping/dma-mapping-next
3412 Already up-to-date.
3413 Merging pwm/for-next (39fd3f99aba3 pwm: fsl-ftm: set pwm_chip can_sleep flag)
3414 $ git merge pwm/for-next
3415 Already up-to-date.
3416 Merging dma-buf/for-next (dfb945473ae8 Merge git://www.linux-watchdog.org/linux-watchdog)
3417 $ git merge dma-buf/for-next
3418 Already up-to-date.
3419 Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files)
3420 $ git merge userns/for-next
3421 Resolved 'fs/btrfs/ioctl.c' using previous resolution.
3422 Resolved 'fs/dcache.c' using previous resolution.
3423 Resolved 'fs/namei.c' using previous resolution.
3424 Resolved 'fs/namespace.c' using previous resolution.
3425 Auto-merging kernel/acct.c
3426 Auto-merging include/linux/dcache.h
3427 Auto-merging fs/proc/fd.c
3428 Auto-merging fs/proc/base.c
3429 Auto-merging fs/nfs/dir.c
3430 Auto-merging fs/namespace.c
3431 CONFLICT (content): Merge conflict in fs/namespace.c
3432 Auto-merging fs/namei.c
3433 CONFLICT (content): Merge conflict in fs/namei.c
3434 Auto-merging fs/mount.h
3435 Auto-merging fs/kernfs/dir.c
3436 Auto-merging fs/fuse/dir.c
3437 Auto-merging fs/dcache.c
3438 CONFLICT (content): Merge conflict in fs/dcache.c
3439 Auto-merging fs/ceph/dir.c
3440 Auto-merging fs/btrfs/ioctl.c
3441 CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c
3442 Automatic merge failed; fix conflicts and then commit the result.
3443 $ git commit -v -a
3444 [master e8cd7ab9081d] Merge remote-tracking branch 'userns/for-next'
3445 $ git diff -M --stat --summary HEAD^..
3446  fs/afs/dir.c           |   5 --
3447  fs/btrfs/ioctl.c       |   6 +--
3448  fs/ceph/dir.c          |   1 -
3449  fs/cifs/readdir.c      |   6 +--
3450  fs/dcache.c            | 140 ++++++++++++++++++-------------------------------
3451  fs/fuse/dir.c          |   7 +--
3452  fs/gfs2/dentry.c       |   3 --
3453  fs/kernfs/dir.c        |  11 ----
3454  fs/mount.h             |  22 ++++++++
3455  fs/namei.c             |  22 ++++----
3456  fs/namespace.c         | 130 +++++++++++++++++++++++++++++++++++++++++----
3457  fs/nfs/dir.c           |   7 +--
3458  fs/proc/base.c         |  10 +---
3459  fs/proc/fd.c           |   2 -
3460  include/linux/dcache.h |   3 +-
3461  kernel/acct.c          |  25 +++++++--
3462  16 files changed, 232 insertions(+), 168 deletions(-)
3463 Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect)
3464 $ git merge ktest/for-next
3465 Merge made by the 'recursive' strategy.
3466  tools/testing/ktest/ktest.pl    | 581 +++++++++++++++++++---------------------
3467  tools/testing/ktest/sample.conf |  65 ++---
3468  2 files changed, 297 insertions(+), 349 deletions(-)
3469 Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
3470 $ git merge signal/for-next
3471 Already up-to-date.
3472 Merging clk/clk-next (27b8d5f723e6 clk: flatten clk tree in debugfs)
3473 $ git merge clk/clk-next
3474 Merge made by the 'recursive' strategy.
3475  drivers/clk/clk.c    | 114 ++++++++++++++++-----------------------------------
3476  drivers/clk/clkdev.c |   5 ++-
3477  2 files changed, 38 insertions(+), 81 deletions(-)
3478 Merging random/dev (5458c2fecbb8 hw_random: fix sparse warning (NULL vs 0 for pointer))
3479 $ git merge random/dev
3480 Auto-merging drivers/char/random.c
3481 Merge made by the 'recursive' strategy.
3482  drivers/char/hw_random/core.c |  78 +++++++++++++-
3483  drivers/char/random.c         | 234 ++++++++++++++++++++++++++----------------
3484  include/linux/hw_random.h     |   5 +
3485  3 files changed, 225 insertions(+), 92 deletions(-)
3486 Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
3487 $ git merge lzo-update/lzo-update
3488 Auto-merging lib/lzo/lzo1x_decompress_safe.c
3489 Merge made by the 'recursive' strategy.
3490  lib/lzo/lzo1x_decompress_safe.c | 4 ++++
3491  lib/lzo/lzodefs.h               | 6 ++++++
3492  2 files changed, 10 insertions(+)
3493 Merging aio/master (855ef0dec727 aio: kill the misleading rcu read locks in ioctx_add_table() and kill_ioctx())
3494 $ git merge aio/master
3495 Merge made by the 'recursive' strategy.
3496  fs/aio.c | 56 +++++++++++++++++++-------------------------------------
3497  1 file changed, 19 insertions(+), 37 deletions(-)
3498 Merging llvmlinux/for-next (f9da455b93f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
3499 $ git merge llvmlinux/for-next
3500 Already up-to-date.
3501 Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
3502 $ git merge powernv-cpuidle/powernv-cpuidle
3503 Already up-to-date.
3504 Merging rd-docs/master (93df5e1c88f7 These days most people use git to send patches so I have added a section about that.)
3505 $ git merge rd-docs/master
3506 Auto-merging MAINTAINERS
3507 Auto-merging Documentation/email-clients.txt
3508 Merge made by the 'recursive' strategy.
3509  Documentation/email-clients.txt | 11 +++++++++++
3510  MAINTAINERS                     |  3 +++
3511  2 files changed, 14 insertions(+)
3512 Merging akpm-current/current (3e854aac314c lib/scatterlist: clean up useless architecture versions of scatterlist.h)
3513 $ git merge --no-ff akpm-current/current
3514 Auto-merging mm/slub.c
3515 Auto-merging init/Kconfig
3516 Auto-merging include/scsi/scsi.h
3517 Auto-merging include/linux/sched.h
3518 Auto-merging include/linux/kernel.h
3519 Auto-merging fs/namespace.c
3520 Auto-merging fs/cifs/smb2pdu.c
3521 Auto-merging fs/cifs/smb2ops.c
3522 Auto-merging fs/cifs/file.c
3523 Auto-merging fs/cifs/cifssmb.c
3524 Auto-merging drivers/net/ethernet/intel/i40e/i40e_ethtool.c
3525 Auto-merging block/bio.c
3526 Auto-merging arch/x86/mm/fault.c
3527 Removing arch/x86/include/asm/scatterlist.h
3528 Auto-merging arch/x86/Kconfig
3529 Removing arch/sparc/include/asm/scatterlist.h
3530 Removing arch/score/include/asm/scatterlist.h
3531 Removing arch/s390/include/asm/scatterlist.h
3532 Removing arch/powerpc/kvm/book3s_hv_cma.h
3533 Removing arch/powerpc/kvm/book3s_hv_cma.c
3534 Removing arch/powerpc/include/asm/scatterlist.h
3535 Removing arch/mn10300/include/asm/scatterlist.h
3536 Removing arch/microblaze/include/asm/scatterlist.h
3537 Removing arch/m32r/include/asm/scatterlist.h
3538 Removing arch/ia64/include/asm/scatterlist.h
3539 Removing arch/frv/include/asm/scatterlist.h
3540 Removing arch/cris/include/asm/scatterlist.h
3541 Removing arch/arm/include/asm/scatterlist.h
3542 Removing arch/alpha/include/asm/scatterlist.h
3543 Auto-merging Makefile
3544 Auto-merging MAINTAINERS
3545 Auto-merging Documentation/kernel-parameters.txt
3546 Merge made by the 'recursive' strategy.
3547  CREDITS                                          |    7 +
3548  Documentation/ABI/testing/sysfs-fs-nilfs2        |  269 ++++
3549  Documentation/RCU/whatisRCU.txt                  |    2 +-
3550  Documentation/cgroups/memcg_test.txt             |  160 +--
3551  Documentation/kernel-parameters.txt              |    8 +-
3552  Documentation/leds/leds-class.txt                |    3 -
3553  Documentation/oops-tracing.txt                   |    2 +
3554  Documentation/printk-formats.txt                 |    6 +
3555  Documentation/sysctl/kernel.txt                  |    1 +
3556  MAINTAINERS                                      |    5 +-
3557  Makefile                                         |    3 +
3558  arch/alpha/include/asm/Kbuild                    |    1 +
3559  arch/alpha/include/asm/scatterlist.h             |    6 -
3560  arch/arm/Kconfig                                 |    1 +
3561  arch/arm/include/asm/Kbuild                      |    1 +
3562  arch/arm/include/asm/scatterlist.h               |   12 -
3563  arch/arm/mm/dma-mapping.c                        |    1 +
3564  arch/arm64/Kconfig                               |    1 +
3565  arch/cris/include/asm/Kbuild                     |    1 +
3566  arch/cris/include/asm/scatterlist.h              |    6 -
3567  arch/frv/include/asm/Kbuild                      |    1 +
3568  arch/frv/include/asm/scatterlist.h               |    6 -
3569  arch/ia64/Kconfig                                |    1 +
3570  arch/ia64/include/asm/Kbuild                     |    1 +
3571  arch/ia64/include/asm/scatterlist.h              |    7 -
3572  arch/m32r/include/asm/Kbuild                     |    1 +
3573  arch/m32r/include/asm/scatterlist.h              |    6 -
3574  arch/m68k/kernel/sys_m68k.c                      |   18 +-
3575  arch/microblaze/include/asm/Kbuild               |    1 +
3576  arch/microblaze/include/asm/scatterlist.h        |    1 -
3577  arch/mn10300/include/asm/Kbuild                  |    1 +
3578  arch/mn10300/include/asm/scatterlist.h           |   16 -
3579  arch/powerpc/Kconfig                             |    1 +
3580  arch/powerpc/include/asm/Kbuild                  |    1 +
3581  arch/powerpc/include/asm/scatterlist.h           |   17 -
3582  arch/powerpc/kvm/Makefile                        |    1 -
3583  arch/powerpc/kvm/book3s_64_mmu_hv.c              |    4 +-
3584  arch/powerpc/kvm/book3s_hv_builtin.c             |   19 +-
3585  arch/powerpc/kvm/book3s_hv_cma.c                 |  240 ----
3586  arch/powerpc/kvm/book3s_hv_cma.h                 |   27 -
3587  arch/powerpc/mm/dma-noncoherent.c                |    1 +
3588  arch/powerpc/platforms/44x/warp.c                |    1 +
3589  arch/powerpc/platforms/52xx/efika.c              |    1 +
3590  arch/powerpc/platforms/amigaone/setup.c          |    1 +
3591  arch/s390/Kconfig                                |    1 +
3592  arch/s390/include/asm/Kbuild                     |    1 +
3593  arch/s390/include/asm/scatterlist.h              |    3 -
3594  arch/score/include/asm/Kbuild                    |    1 +
3595  arch/score/include/asm/scatterlist.h             |    6 -
3596  arch/sh/drivers/dma/Kconfig                      |    5 +-
3597  arch/sh/include/cpu-sh4/cpu/dma-register.h       |    1 -
3598  arch/sh/include/cpu-sh4a/cpu/dma.h               |    3 +-
3599  arch/sparc/Kconfig                               |    1 +
3600  arch/sparc/include/asm/Kbuild                    |    1 +
3601  arch/sparc/include/asm/scatterlist.h             |    8 -
3602  arch/um/include/asm/Kbuild                       |    1 +
3603  arch/x86/Kconfig                                 |    1 +
3604  arch/x86/include/asm/Kbuild                      |    3 +-
3605  arch/x86/include/asm/pgtable_64.h                |    3 +-
3606  arch/x86/include/asm/scatterlist.h               |    8 -
3607  arch/x86/mm/fault.c                              |    2 +-
3608  arch/x86/mm/init_64.c                            |   36 +-
3609  block/bio.c                                      |   48 +-
3610  block/genhd.c                                    |    2 +-
3611  crypto/zlib.c                                    |    8 +-
3612  drivers/ata/Kconfig                              |    1 +
3613  drivers/ata/libata-core.c                        |   72 +-
3614  drivers/base/Kconfig                             |   10 -
3615  drivers/base/dma-contiguous.c                    |  220 +---
3616  drivers/base/memory.c                            |   30 +-
3617  drivers/block/zram/zram_drv.h                    |    5 +-
3618  drivers/gpu/drm/drm_hashtab.c                    |    2 +-
3619  drivers/input/Kconfig                            |    9 +
3620  drivers/input/Makefile                           |    3 +
3621  drivers/input/input.c                            |    6 +
3622  drivers/input/leds.c                             |  249 ++++
3623  drivers/leds/Kconfig                             |    3 -
3624  drivers/misc/ti-st/st_core.c                     |    2 +-
3625  drivers/net/ethernet/intel/i40e/i40e_ethtool.c   |    2 +-
3626  drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c |    2 +-
3627  drivers/net/irda/donauboe.c                      |   15 +-
3628  drivers/parport/parport_ip32.c                   |    2 +-
3629  drivers/rtc/Kconfig                              |   19 +-
3630  drivers/rtc/rtc-ds1343.c                         |   75 +-
3631  drivers/rtc/rtc-ds1742.c                         |    2 +-
3632  drivers/rtc/rtc-efi.c                            |   32 +-
3633  drivers/staging/lustre/lustre/libcfs/hash.c      |    4 +-
3634  drivers/tty/Kconfig                              |    4 +
3635  drivers/tty/vt/keyboard.c                        |  110 +-
3636  drivers/video/backlight/backlight.c              |    2 -
3637  fs/adfs/dir_fplus.c                              |    4 +-
3638  fs/autofs4/inode.c                               |    2 +-
3639  fs/binfmt_elf.c                                  |   23 +-
3640  fs/cachefiles/bind.c                             |    6 +-
3641  fs/cachefiles/daemon.c                           |    6 +-
3642  fs/cifs/cifsacl.c                                |    2 +-
3643  fs/cifs/cifssmb.c                                |   20 +-
3644  fs/cifs/file.c                                   |    4 +-
3645  fs/cifs/sess.c                                   |    2 +-
3646  fs/cifs/smb2file.c                               |    4 +-
3647  fs/cifs/smb2misc.c                               |   38 +-
3648  fs/cifs/smb2ops.c                                |    2 +-
3649  fs/cifs/smb2pdu.c                                |    2 +-
3650  fs/cifs/smb2pdu.h                                |   28 +-
3651  fs/compat.c                                      |    2 +-
3652  fs/exec.c                                        |    4 -
3653  fs/exofs/ore_raid.c                              |    2 +-
3654  fs/ext4/fsync.c                                  |    5 +-
3655  fs/hfsplus/catalog.c                             |   89 +-
3656  fs/hfsplus/dir.c                                 |   11 +-
3657  fs/hfsplus/hfsplus_fs.h                          |    4 +-
3658  fs/hfsplus/super.c                               |    4 +-
3659  fs/isofs/Makefile                                |    2 +
3660  fs/isofs/compress.c                              |   10 +-
3661  fs/isofs/export.c                                |   11 +-
3662  fs/isofs/inode.c                                 |   88 +-
3663  fs/isofs/namei.c                                 |    5 +-
3664  fs/isofs/rock.c                                  |   44 +-
3665  fs/jbd/journal.c                                 |    6 +-
3666  fs/jbd/revoke.c                                  |    2 +-
3667  fs/jffs2/compr_zlib.c                            |    7 +-
3668  fs/mpage.c                                       |   23 +-
3669  fs/namespace.c                                   |    2 +-
3670  fs/nilfs2/Makefile                               |    2 +-
3671  fs/nilfs2/nilfs.h                                |    8 +
3672  fs/nilfs2/super.c                                |   11 +-
3673  fs/nilfs2/sysfs.c                                | 1137 ++++++++++++++++
3674  fs/nilfs2/sysfs.h                                |  176 +++
3675  fs/nilfs2/the_nilfs.c                            |   17 +-
3676  fs/nilfs2/the_nilfs.h                            |   20 +-
3677  fs/notify/inode_mark.c                           |    2 +-
3678  fs/notify/vfsmount_mark.c                        |    2 +-
3679  fs/ocfs2/alloc.c                                 |   15 +-
3680  fs/ocfs2/aops.c                                  |   21 +-
3681  fs/ocfs2/cluster/quorum.c                        |   13 +-
3682  fs/ocfs2/cluster/tcp.c                           |   45 +-
3683  fs/ocfs2/cluster/tcp.h                           |    1 +
3684  fs/ocfs2/dlm/dlmdomain.c                         |    5 +-
3685  fs/ocfs2/inode.c                                 |   10 +-
3686  fs/ocfs2/ioctl.c                                 |  129 +-
3687  fs/ocfs2/move_extents.c                          |    2 +-
3688  fs/ocfs2/refcounttree.c                          |    2 +-
3689  fs/ocfs2/slot_map.c                              |    2 +-
3690  fs/omfs/inode.c                                  |    2 +-
3691  fs/proc/kcore.c                                  |    2 +-
3692  fs/proc/proc_sysctl.c                            |    2 +-
3693  fs/proc/stat.c                                   |   22 +-
3694  fs/pstore/ram_core.c                             |    2 +-
3695  fs/qnx6/Makefile                                 |    1 +
3696  fs/qnx6/dir.c                                    |   26 +-
3697  fs/qnx6/inode.c                                  |   99 +-
3698  fs/qnx6/namei.c                                  |    6 +-
3699  fs/qnx6/qnx6.h                                   |   12 +-
3700  fs/qnx6/super_mmi.c                              |   22 +-
3701  fs/ramfs/file-nommu.c                            |    2 +-
3702  fs/reiserfs/dir.c                                |    2 +-
3703  fs/reiserfs/do_balan.c                           |    2 +-
3704  fs/reiserfs/file.c                               |    2 +-
3705  fs/reiserfs/ibalance.c                           |    2 +-
3706  fs/reiserfs/inode.c                              |    2 +-
3707  fs/reiserfs/ioctl.c                              |    2 +-
3708  fs/reiserfs/item_ops.c                           |    4 +-
3709  fs/reiserfs/lbalance.c                           |    2 +-
3710  fs/reiserfs/prints.c                             |    4 +-
3711  fs/reiserfs/procfs.c                             |    2 +-
3712  fs/reiserfs/stree.c                              |    2 +-
3713  fs/reiserfs/super.c                              |    9 +-
3714  fs/reiserfs/xattr.c                              |   22 +-
3715  fs/reiserfs/xattr_acl.c                          |    2 +-
3716  fs/reiserfs/xattr_security.c                     |    2 +-
3717  fs/reiserfs/xattr_trusted.c                      |    2 +-
3718  fs/reiserfs/xattr_user.c                         |    2 +-
3719  fs/romfs/super.c                                 |   23 +-
3720  fs/seq_file.c                                    |   30 +-
3721  fs/squashfs/file_direct.c                        |    2 +-
3722  fs/squashfs/super.c                              |    5 +-
3723  fs/ufs/Makefile                                  |    1 +
3724  fs/ufs/super.c                                   |  304 ++---
3725  fs/ufs/ufs.h                                     |   10 +-
3726  include/linux/cma.h                              |   27 +
3727  include/linux/crc64_ecma.h                       |   56 +
3728  include/linux/decompress/bunzip2.h               |    8 +-
3729  include/linux/decompress/generic.h               |   10 +-
3730  include/linux/decompress/inflate.h               |    8 +-
3731  include/linux/decompress/unlz4.h                 |    8 +-
3732  include/linux/decompress/unlzma.h                |    8 +-
3733  include/linux/decompress/unlzo.h                 |    8 +-
3734  include/linux/decompress/unxz.h                  |    8 +-
3735  include/linux/dma-contiguous.h                   |   11 +-
3736  include/linux/gfp.h                              |    2 +-
3737  include/linux/glob.h                             |   10 +
3738  include/linux/hugetlb.h                          |    7 -
3739  include/linux/hugetlb_inline.h                   |    7 +
3740  include/linux/input.h                            |   21 +
3741  include/linux/kernel.h                           |   38 +-
3742  include/linux/klist.h                            |    2 +-
3743  include/linux/list.h                             |   14 +-
3744  include/linux/memblock.h                         |    4 +-
3745  include/linux/memcontrol.h                       |   94 +-
3746  include/linux/memory_hotplug.h                   |    9 +-
3747  include/linux/mm_types.h                         |    1 +
3748  include/linux/mmzone.h                           |    2 +
3749  include/linux/page-flags.h                       |   21 +-
3750  include/linux/page_cgroup.h                      |   70 +-
3751  include/linux/pagemap.h                          |   28 +
3752  include/linux/rculist.h                          |    8 +-
3753  include/linux/scatterlist.h                      |    2 +-
3754  include/linux/sched.h                            |    2 +
3755  include/linux/shm.h                              |   18 +-
3756  include/linux/slab.h                             |   14 +-
3757  include/linux/string.h                           |    1 +
3758  include/linux/swap.h                             |   15 +-
3759  include/linux/sysctl.h                           |    2 -
3760  include/linux/zbud.h                             |    2 +-
3761  include/linux/zlib.h                             |    4 +-
3762  include/linux/zpool.h                            |  224 ++++
3763  include/scsi/scsi.h                              |    2 +-
3764  include/trace/events/migrate.h                   |    1 +
3765  init/Kconfig                                     |   53 +-
3766  init/do_mounts.c                                 |   12 +-
3767  init/do_mounts_rd.c                              |   10 +-
3768  init/initramfs.c                                 |   58 +-
3769  ipc/shm.c                                        |   75 +-
3770  kernel/auditfilter.c                             |    4 +-
3771  kernel/bounds.c                                  |    2 -
3772  kernel/events/uprobes.c                          |   15 +-
3773  kernel/fork.c                                    |   59 +-
3774  kernel/panic.c                                   |    1 +
3775  kernel/posix-timers.c                            |   57 +-
3776  kernel/printk/printk.c                           |   55 +-
3777  kernel/test_kprobes.c                            |   87 +-
3778  kernel/watchdog.c                                |   11 +-
3779  lib/Kconfig                                      |   47 +
3780  lib/Makefile                                     |    3 +
3781  lib/cmdline.c                                    |   15 +-
3782  lib/crc64_ecma.c                                 |  341 +++++
3783  lib/decompress.c                                 |    2 +-
3784  lib/decompress_bunzip2.c                         |   26 +-
3785  lib/decompress_inflate.c                         |   12 +-
3786  lib/decompress_unlz4.c                           |   83 +-
3787  lib/decompress_unlzma.c                          |   28 +-
3788  lib/decompress_unlzo.c                           |   12 +-
3789  lib/decompress_unxz.c                            |   10 +-
3790  lib/glob.c                                       |  287 ++++
3791  lib/idr.c                                        |   25 +-
3792  lib/klist.c                                      |    6 +-
3793  lib/list_sort.c                                  |   71 +-
3794  lib/scatterlist.c                                |    4 +-
3795  lib/string_helpers.c                             |   15 +-
3796  lib/test-kstrtox.c                               |    2 +-
3797  lib/vsprintf.c                                   |   20 +-
3798  mm/Kconfig                                       |   54 +-
3799  mm/Makefile                                      |    2 +
3800  mm/cma.c                                         |  335 +++++
3801  mm/compaction.c                                  |   17 +-
3802  mm/filemap.c                                     |   13 +-
3803  mm/huge_memory.c                                 |   65 +-
3804  mm/hugetlb.c                                     |    1 +
3805  mm/internal.h                                    |    2 +-
3806  mm/madvise.c                                     |    3 -
3807  mm/memcontrol.c                                  | 1517 ++++++++--------------
3808  mm/memory-failure.c                              |   15 +-
3809  mm/memory.c                                      |   53 +-
3810  mm/memory_hotplug.c                              |   17 +-
3811  mm/migrate.c                                     |   44 +-
3812  mm/mmap.c                                        |    6 +
3813  mm/page_alloc.c                                  |   37 +-
3814  mm/readahead.c                                   |    3 +-
3815  mm/rmap.c                                        |   30 +-
3816  mm/shmem.c                                       |   61 +-
3817  mm/slab.c                                        |  223 ++--
3818  mm/slab.h                                        |   45 +-
3819  mm/slub.c                                        |  235 ++--
3820  mm/swap.c                                        |   40 +
3821  mm/swap_state.c                                  |    8 +-
3822  mm/swapfile.c                                    |   21 +-
3823  mm/truncate.c                                    |    9 -
3824  mm/util.c                                        |   30 +
3825  mm/vmalloc.c                                     |   16 +-
3826  mm/vmscan.c                                      |  154 +--
3827  mm/zbud.c                                        |  123 +-
3828  mm/zpool.c                                       |  207 +++
3829  mm/zsmalloc.c                                    |   83 ++
3830  mm/zswap.c                                       |   82 +-
3831  net/batman-adv/fragmentation.c                   |    2 +-
3832  net/bridge/br_multicast.c                        |    2 +-
3833  net/ipv4/fib_trie.c                              |    2 +-
3834  net/ipv6/addrlabel.c                             |    2 +-
3835  net/xfrm/xfrm_policy.c                           |    4 +-
3836  scripts/checkpatch.pl                            |   83 +-
3837  tools/testing/selftests/cpu-hotplug/Makefile     |    2 +-
3838  tools/testing/selftests/memory-hotplug/Makefile  |    2 +-
3839  292 files changed, 6800 insertions(+), 3751 deletions(-)
3840  create mode 100644 Documentation/ABI/testing/sysfs-fs-nilfs2
3841  delete mode 100644 arch/alpha/include/asm/scatterlist.h
3842  delete mode 100644 arch/arm/include/asm/scatterlist.h
3843  delete mode 100644 arch/cris/include/asm/scatterlist.h
3844  delete mode 100644 arch/frv/include/asm/scatterlist.h
3845  delete mode 100644 arch/ia64/include/asm/scatterlist.h
3846  delete mode 100644 arch/m32r/include/asm/scatterlist.h
3847  delete mode 100644 arch/microblaze/include/asm/scatterlist.h
3848  delete mode 100644 arch/mn10300/include/asm/scatterlist.h
3849  delete mode 100644 arch/powerpc/include/asm/scatterlist.h
3850  delete mode 100644 arch/powerpc/kvm/book3s_hv_cma.c
3851  delete mode 100644 arch/powerpc/kvm/book3s_hv_cma.h
3852  delete mode 100644 arch/s390/include/asm/scatterlist.h
3853  delete mode 100644 arch/score/include/asm/scatterlist.h
3854  delete mode 100644 arch/sparc/include/asm/scatterlist.h
3855  delete mode 100644 arch/x86/include/asm/scatterlist.h
3856  create mode 100644 drivers/input/leds.c
3857  create mode 100644 fs/nilfs2/sysfs.c
3858  create mode 100644 fs/nilfs2/sysfs.h
3859  create mode 100644 include/linux/cma.h
3860  create mode 100644 include/linux/crc64_ecma.h
3861  create mode 100644 include/linux/glob.h
3862  create mode 100644 include/linux/zpool.h
3863  create mode 100644 lib/crc64_ecma.c
3864  create mode 100644 lib/glob.c
3865  create mode 100644 mm/cma.c
3866  create mode 100644 mm/zpool.c
3867 $ git am -3 ../patches/printk-allow-increasing-the-ring-buffer-depending-on-the-number-of-cpus-fix.patch
3868 Applying: printk-allow-increasing-the-ring-buffer-depending-on-the-number-of-cpus-fix
3869 Warning: commit message did not conform to UTF-8.
3870 You may want to amend it after fixing the message, or set the config
3871 variable i18n.commitencoding to the encoding your project uses.
3872 $ git reset HEAD^
3873 Unstaged changes after reset:
3874 M       init/Kconfig
3875 $ git add -A .
3876 $ git commit -v -a --amend
3877 [master 3c45d5624cac] Merge branch 'akpm-current/current'
3878 $ git clone -s -l -n -q . ../rebase-tmp
3879 $ cd ../rebase-tmp
3880 $ git checkout -b akpm remotes/origin/akpm/master
3881 Switched to a new branch 'akpm'
3882 $ git rebase --onto master remotes/origin/akpm/master-base
3883 First, rewinding head to replay your work on top of it...
3884 Applying: drivers/gpio/gpio-zevio.c: fix build
3885 Applying: init/main.c: code clean-up
3886 Applying: arch/arm/mach-omap2: replace strict_strto* with kstrto*
3887 Applying: arch/arm/mach-pxa: replace strict_strto call with kstrto
3888 Applying: arch/arm/mach-s3c24xx/mach-jive.c: replace strict_strto* with kstrto*
3889 Applying: arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto
3890 Applying: arch/powerpc: replace obsolete strict_strto* calls
3891 Applying: arch/x86: replace strict_strto calls
3892 Applying: drivers/scsi: replace strict_strto calls
3893 Applying: net/sunrpc: replace strict_strto calls
3894 Applying: include/linux: remove strict_strto* definitions
3895 Applying: pci-dma-compat: add pci_zalloc_consistent helper
3896 Applying: atm: use pci_zalloc_consistent
3897 Applying: block: use pci_zalloc_consistent
3898 Applying: crypto: use pci_zalloc_consistent
3899 Applying: infiniband: use pci_zalloc_consistent
3900 Applying: i810: use pci_zalloc_consistent
3901 Applying: media: use pci_zalloc_consistent
3902 Applying: amd: use pci_zalloc_consistent
3903 Applying: atl1e: use pci_zalloc_consistent
3904 Applying: enic: use pci_zalloc_consistent
3905 Applying: sky2: use pci_zalloc_consistent
3906 Applying: micrel: use pci_zalloc_consistent
3907 Applying: qlogic: use pci_zalloc_consistent
3908 Applying: irda: use pci_zalloc_consistent
3909 Applying: ipw2100: use pci_zalloc_consistent
3910 Applying: mwl8k: use pci_zalloc_consistent
3911 Applying: rtl818x: use pci_zalloc_consistent
3912 Applying: rtlwifi: use pci_zalloc_consistent
3913 Applying: scsi: use pci_zalloc_consistent
3914 Applying: staging: use pci_zalloc_consistent
3915 Applying: synclink_gt: use pci_zalloc_consistent
3916 Applying: vme: bridges: use pci_zalloc_consistent
3917 Applying: drivers/net/ethernet/amd/pcnet32.c: neaten and remove unnecessary OOM messages
3918 Applying: kernel/kprobes.c: convert printk to pr_foo()
3919 Applying: mm: replace remap_file_pages() syscall with emulation
3920 Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix
3921 Applying: mm: remap_file_pages: initialize populate before usage
3922 Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping
3923 Applying: memcg: deprecate memory.force_empty knob
3924 Applying: memcg-deprecate-memoryforce_empty-knob-fix
3925 Applying: fat: add i_disksize to represent uninitialized size
3926 Applying: fat: add fat_fallocate operation
3927 Applying: fat: zero out seek range on _fat_get_block
3928 Applying: fat: fallback to buffered write in case of fallocated region on direct IO
3929 Applying: fat: permit to return phy block number by fibmap in fallocated region
3930 Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate
3931 Applying: drivers/w1/w1_int.c: call put_device if device_register fails
3932 Applying: mm: add strictlimit knob
3933 $ cd ../next
3934 $ git fetch -f ../rebase-tmp akpm:akpm/master
3935 From ../rebase-tmp
3936  + bd499e9db1f2...eaef71b00483 akpm       -> akpm/master  (forced update)
3937 $ rm -rf ../rebase-tmp
3938 Merging akpm/master (eaef71b00483 mm: add strictlimit knob)
3939 $ git merge --no-ff akpm/master
3940 Removing mm/fremap.c
3941 Merge made by the 'recursive' strategy.
3942  Documentation/ABI/testing/sysfs-class-bdi          |   8 +
3943  Documentation/cgroups/memory.txt                   |   3 +
3944  Documentation/filesystems/vfat.txt                 |  10 +
3945  Documentation/vm/remap_file_pages.txt              |   7 +-
3946  arch/arm/mach-omap2/board-omap3touchbook.c         |   2 +-
3947  arch/arm/mach-omap2/mux.c                          |  22 +-
3948  arch/arm/mach-pxa/balloon3.c                       |   2 +-
3949  arch/arm/mach-pxa/viper.c                          |   2 +-
3950  arch/arm/mach-s3c24xx/mach-jive.c                  |   2 +-
3951  arch/arm/mach-w90x900/cpu.c                        |   3 +-
3952  arch/powerpc/kernel/setup_64.c                     |   6 +-
3953  arch/powerpc/kernel/vio.c                          |   2 +-
3954  arch/powerpc/platforms/pseries/dlpar.c             |   4 +-
3955  arch/powerpc/platforms/pseries/mobility.c          |   2 +-
3956  arch/x86/kernel/cpu/intel_cacheinfo.c              |   4 +-
3957  arch/x86/kernel/cpu/mcheck/mce.c                   |   6 +-
3958  arch/x86/kernel/cpu/mcheck/mce_amd.c               |   4 +-
3959  arch/x86/kvm/mmu_audit.c                           |   2 +-
3960  arch/x86/platform/uv/tlb_uv.c                      |   2 +-
3961  drivers/atm/he.c                                   |  31 ++-
3962  drivers/atm/idt77252.c                             |  15 +-
3963  drivers/block/DAC960.c                             |  18 +-
3964  drivers/block/cciss.c                              |  11 +-
3965  drivers/block/skd_main.c                           |  25 +-
3966  drivers/crypto/hifn_795x.c                         |   5 +-
3967  drivers/gpio/gpio-zevio.c                          |   4 +
3968  drivers/gpu/drm/i810/i810_dma.c                    |   5 +-
3969  drivers/infiniband/hw/amso1100/c2.c                |   6 +-
3970  drivers/infiniband/hw/nes/nes_hw.c                 |  12 +-
3971  drivers/infiniband/hw/nes/nes_verbs.c              |   5 +-
3972  drivers/media/common/saa7146/saa7146_core.c        |  15 +-
3973  drivers/media/common/saa7146/saa7146_fops.c        |   5 +-
3974  drivers/media/pci/bt8xx/bt878.c                    |  16 +-
3975  drivers/media/pci/ngene/ngene-core.c               |   7 +-
3976  drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c  |  11 +-
3977  drivers/media/usb/ttusb-dec/ttusb_dec.c            |  11 +-
3978  drivers/net/ethernet/amd/pcnet32.c                 |  45 ++--
3979  drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |   7 +-
3980  drivers/net/ethernet/cisco/enic/vnic_dev.c         |   8 +-
3981  drivers/net/ethernet/marvell/sky2.c                |   5 +-
3982  drivers/net/ethernet/micrel/ksz884x.c              |   7 +-
3983  .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c    |   4 +-
3984  drivers/net/ethernet/qlogic/qlge/qlge_main.c       |  11 +-
3985  drivers/net/irda/vlsi_ir.c                         |   4 +-
3986  drivers/net/wireless/ipw2x00/ipw2100.c             |  16 +-
3987  drivers/net/wireless/mwl8k.c                       |   6 +-
3988  drivers/net/wireless/rtl818x/rtl8180/dev.c         |  11 +-
3989  drivers/net/wireless/rtlwifi/pci.c                 |  17 +-
3990  drivers/scsi/3w-sas.c                              |   5 +-
3991  drivers/scsi/a100u2w.c                             |   8 +-
3992  drivers/scsi/be2iscsi/be_main.c                    |  10 +-
3993  drivers/scsi/be2iscsi/be_mgmt.c                    |   3 +-
3994  drivers/scsi/csiostor/csio_wr.c                    |   8 +-
3995  drivers/scsi/eata.c                                |   5 +-
3996  drivers/scsi/hpsa.c                                |   8 +-
3997  drivers/scsi/megaraid/megaraid_mbox.c              |  16 +-
3998  drivers/scsi/megaraid/megaraid_sas_base.c          |   8 +-
3999  drivers/scsi/mesh.c                                |   6 +-
4000  drivers/scsi/mvumi.c                               |   9 +-
4001  drivers/scsi/pm8001/pm8001_sas.c                   |   5 +-
4002  drivers/scsi/pmcraid.c                             |   4 +-
4003  drivers/scsi/scsi_sysfs.c                          |   4 +-
4004  drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |  15 +-
4005  drivers/staging/rtl8192ee/pci.c                    |  37 +--
4006  drivers/staging/rtl8821ae/pci.c                    |  36 +--
4007  drivers/staging/slicoss/slicoss.c                  |   9 +-
4008  drivers/staging/vt6655/device_main.c               |  40 +--
4009  drivers/tty/synclink_gt.c                          |   5 +-
4010  drivers/vme/bridges/vme_ca91cx42.c                 |   6 +-
4011  drivers/vme/bridges/vme_tsi148.c                   |   6 +-
4012  drivers/w1/w1_int.c                                |   3 +-
4013  fs/fat/cache.c                                     |  70 +++--
4014  fs/fat/fat.h                                       |   6 +-
4015  fs/fat/file.c                                      |  78 +++++-
4016  fs/fat/inode.c                                     |  87 ++++++-
4017  include/asm-generic/pci-dma-compat.h               |   8 +
4018  include/linux/fs.h                                 |   8 +-
4019  include/linux/kernel.h                             |   4 -
4020  init/main.c                                        |  23 +-
4021  kernel/kprobes.c                                   |  36 +--
4022  mm/Makefile                                        |   2 +-
4023  mm/backing-dev.c                                   |  35 +++
4024  mm/fremap.c                                        | 283 ---------------------
4025  mm/memcontrol.c                                    |   5 +
4026  mm/mmap.c                                          |  69 +++++
4027  mm/nommu.c                                         |   8 -
4028  net/sunrpc/addr.c                                  |  16 +-
4029  net/sunrpc/auth.c                                  |   2 +-
4030  net/sunrpc/xprtsock.c                              |   4 +-
4031  89 files changed, 657 insertions(+), 779 deletions(-)
4032  delete mode 100644 mm/fremap.c