Next/merge.log

   1 $ date
   2 Wednesday 10 October  10:02:45 EST 2012
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at f5a246e Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
   7 Merging origin/master (547b1e8 Fix staging driver use of VM_RESERVED)
   8 $ git merge origin/master
   9 Updating f5a246e..547b1e8
  10 Fast-forward
  11  Documentation/00-INDEX                             |    2 -
  12  Documentation/ABI/obsolete/proc-pid-oom_adj        |   22 -
  13  Documentation/cgroups/memory.txt                   |   90 +-
  14  .../bindings/pinctrl/lantiq,falcon-pinumx.txt      |   83 +
  15  .../bindings/pinctrl/lantiq,xway-pinumx.txt        |   97 +
  16  .../devicetree/bindings/spi/spi-octeon.txt         |   33 +
  17  Documentation/filesystems/proc.txt                 |   22 +-
  18  Documentation/memory.txt                           |   33 -
  19  Documentation/prio_tree.txt                        |  107 -
  20  Documentation/rbtree.txt                           |  209 +-
  21  Documentation/vm/unevictable-lru.txt               |   14 +-
  22  MAINTAINERS                                        |   10 +
  23  arch/Kconfig                                       |    3 +
  24  arch/alpha/include/asm/Kbuild                      |    2 +
  25  arch/alpha/kernel/pci-sysfs.c                      |    2 +-
  26  arch/arm/Kconfig                                   |    2 +
  27  arch/arm/mm/fault-armv.c                           |    3 +-
  28  arch/arm/mm/fault.c                                |    1 +
  29  arch/arm/mm/flush.c                                |    3 +-
  30  arch/arm64/Kconfig                                 |    4 +
  31  arch/avr32/include/asm/Kbuild                      |    2 +
  32  arch/avr32/mm/fault.c                              |    1 +
  33  arch/blackfin/Kconfig                              |    3 +-
  34  arch/blackfin/configs/BF533-EZKIT_defconfig        |    7 +-
  35  arch/blackfin/configs/BF609-EZKIT_defconfig        |   16 +-
  36  arch/blackfin/kernel/bfin_gpio.c                   |    4 +-
  37  arch/blackfin/kernel/reboot.c                      |    1 -
  38  arch/blackfin/mach-bf537/boards/cm_bf537e.c        |  130 +-
  39  arch/blackfin/mach-bf537/boards/stamp.c            |    2 +-
  40  arch/blackfin/mach-bf609/include/mach/defBF609.h   |  271 +
  41  arch/blackfin/mach-common/cpufreq.c                |    9 +-
  42  arch/blackfin/mach-common/ints-priority.c          |    1 -
  43  arch/blackfin/mach-common/smp.c                    |    4 +-
  44  arch/cris/Kconfig                                  |    1 +
  45  arch/cris/include/asm/Kbuild                       |    2 +
  46  arch/cris/mm/fault.c                               |    1 +
  47  arch/frv/Kconfig                                   |    2 +
  48  arch/frv/include/asm/Kbuild                        |    1 +
  49  arch/h8300/Kconfig                                 |    1 +
  50  arch/h8300/include/asm/Kbuild                      |    2 +
  51  arch/hexagon/include/asm/Kbuild                    |    1 +
  52  arch/hexagon/mm/vm_fault.c                         |    1 +
  53  arch/ia64/include/asm/Kbuild                       |    1 +
  54  arch/ia64/include/asm/hugetlb.h                    |    4 +
  55  arch/ia64/kernel/perfmon.c                         |    2 +-
  56  arch/ia64/mm/fault.c                               |    1 +
  57  arch/ia64/mm/init.c                                |    4 +-
  58  arch/m32r/Kconfig                                  |    1 +
  59  arch/m32r/include/asm/Kbuild                       |    2 +
  60  arch/m68k/Kconfig                                  |    2 +
  61  arch/m68k/include/asm/Kbuild                       |    1 +
  62  arch/m68k/mm/fault.c                               |    1 +
  63  arch/microblaze/Kconfig                            |    1 +
  64  arch/microblaze/include/asm/Kbuild                 |    1 +
  65  arch/microblaze/include/asm/atomic.h               |    1 +
  66  arch/microblaze/mm/fault.c                         |    1 +
  67  arch/mips/Kbuild.platforms                         |    2 +-
  68  arch/mips/Kconfig                                  |   47 +-
  69  arch/mips/ath79/clock.c                            |  109 +-
  70  arch/mips/ath79/dev-usb.c                          |   92 +-
  71  arch/mips/ath79/mach-db120.c                       |    2 +
  72  arch/mips/bcm63xx/Makefile                         |    2 +-
  73  arch/mips/bcm63xx/boards/board_bcm963xx.c          |   26 +-
  74  arch/mips/bcm63xx/clk.c                            |   21 +-
  75  arch/mips/bcm63xx/dev-usb-usbd.c                   |   65 +
  76  arch/mips/bcm63xx/irq.c                            |   22 +-
  77  arch/mips/bcm63xx/setup.c                          |    6 +
  78  arch/mips/cavium-octeon/csrc-octeon.c              |   93 +-
  79  .../cavium-octeon/executive/cvmx-interrupt-rsl.c   |    2 +-
  80  arch/mips/cavium-octeon/octeon-irq.c               |  842 +-
  81  arch/mips/cavium-octeon/setup.c                    |    3 +-
  82  ...um-octeon_defconfig => cavium_octeon_defconfig} |    0
  83  arch/mips/configs/mipssim_defconfig                |   64 -
  84  arch/mips/configs/nlm_xlp_defconfig                |  133 +-
  85  ...5-stb225_defconfig => pnx8335_stb225_defconfig} |    0
  86  ...pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} |    0
  87  ...0-stb810_defconfig => pnx8550_stb810_defconfig} |    0
  88  ...1250-swarm_defconfig => sb1250_swarm_defconfig} |    0
  89  arch/mips/configs/sead3_defconfig                  |  124 +
  90  arch/mips/include/asm/cpu-features.h               |    4 +-
  91  arch/mips/include/asm/cpu.h                        |    2 +
  92  arch/mips/include/asm/gic.h                        |   49 +-
  93  arch/mips/include/asm/hugetlb.h                    |    4 +
  94  arch/mips/include/asm/mach-ath79/ar71xx_regs.h     |   30 +
  95  arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h   |   93 +-
  96  .../asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h        |   17 +
  97  arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h |   38 +
  98  arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |  168 +-
  99  .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h |    5 +
 100  .../asm/mach-cavium-octeon/cpu-feature-overrides.h |    2 +-
 101  arch/mips/include/asm/mach-cavium-octeon/irq.h     |    7 +-
 102  .../include/asm/mach-lantiq/falcon/falcon_irq.h    |    2 +
 103  .../include/asm/mach-lantiq/falcon/lantiq_soc.h    |    4 +
 104  arch/mips/include/asm/mach-lantiq/gpio.h           |    5 +-
 105  .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h |    2 +
 106  .../cpu-feature-overrides.h                        |   15 +-
 107  arch/mips/include/asm/mach-sead3/irq.h             |    9 +
 108  .../include/asm/mach-sead3/kernel-entry-init.h     |   52 +
 109  .../include/asm/{mach-mipssim => mach-sead3}/war.h |   12 +-
 110  arch/mips/include/asm/mips-boards/maltaint.h       |   55 +-
 111  arch/mips/include/asm/mips-boards/sead3int.h       |   19 +
 112  arch/mips/include/asm/mips-boards/simint.h         |   31 -
 113  arch/mips/include/asm/mipsregs.h                   |    3 +
 114  arch/mips/include/asm/octeon/cvmx-agl-defs.h       | 1014 +-
 115  arch/mips/include/asm/octeon/cvmx-asxx-defs.h      |  300 +-
 116  arch/mips/include/asm/octeon/cvmx-ciu-defs.h       |11333 ++++++++++++++++----
 117  arch/mips/include/asm/octeon/cvmx-ciu2-defs.h      | 7108 ++++++++++++
 118  arch/mips/include/asm/octeon/cvmx-dbg-defs.h       |   39 +-
 119  arch/mips/include/asm/octeon/cvmx-dpi-defs.h       |  411 +-
 120  arch/mips/include/asm/octeon/cvmx-fpa-defs.h       | 1321 ++-
 121  arch/mips/include/asm/octeon/cvmx-gmxx-defs.h      | 4966 ++++++++-
 122  arch/mips/include/asm/octeon/cvmx-gpio-defs.h      |  282 +-
 123  arch/mips/include/asm/octeon/cvmx-iob-defs.h       |  722 +-
 124  arch/mips/include/asm/octeon/cvmx-ipd-defs.h       | 1111 +-
 125  arch/mips/include/asm/octeon/cvmx-l2c-defs.h       | 1726 ++-
 126  arch/mips/include/asm/octeon/cvmx-l2d-defs.h       |  171 +-
 127  arch/mips/include/asm/octeon/cvmx-l2t-defs.h       |  105 +-
 128  arch/mips/include/asm/octeon/cvmx-led-defs.h       |   67 +-
 129  arch/mips/include/asm/octeon/cvmx-mio-defs.h       | 1909 +++-
 130  arch/mips/include/asm/octeon/cvmx-mixx-defs.h      |  234 +-
 131  arch/mips/include/asm/octeon/cvmx-mpi-defs.h       |  328 +
 132  arch/mips/include/asm/octeon/cvmx-npei-defs.h      | 1743 ++-
 133  arch/mips/include/asm/octeon/cvmx-npi-defs.h       | 1260 ++-
 134  arch/mips/include/asm/octeon/cvmx-pci-defs.h       |  909 +-
 135  arch/mips/include/asm/octeon/cvmx-pciercx-defs.h   | 1292 ++-
 136  arch/mips/include/asm/octeon/cvmx-pcsx-defs.h      |  729 +-
 137  arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h     |  574 +-
 138  arch/mips/include/asm/octeon/cvmx-pemx-defs.h      |  288 +-
 139  arch/mips/include/asm/octeon/cvmx-pescx-defs.h     |  246 +-
 140  arch/mips/include/asm/octeon/cvmx-pexp-defs.h      |    2 +-
 141  arch/mips/include/asm/octeon/cvmx-pip-defs.h       | 2431 ++++-
 142  arch/mips/include/asm/octeon/cvmx-pko-defs.h       | 1993 +++-
 143  arch/mips/include/asm/octeon/cvmx-pow-defs.h       |  530 +-
 144  arch/mips/include/asm/octeon/cvmx-rnm-defs.h       |  107 +-
 145  arch/mips/include/asm/octeon/cvmx-sli-defs.h       | 1351 ++-
 146  arch/mips/include/asm/octeon/cvmx-smix-defs.h      |  202 +-
 147  arch/mips/include/asm/octeon/cvmx-spxx-defs.h      |  225 +-
 148  arch/mips/include/asm/octeon/cvmx-sriox-defs.h     |  703 +-
 149  arch/mips/include/asm/octeon/cvmx-srxx-defs.h      |   62 +-
 150  arch/mips/include/asm/octeon/cvmx-stxx-defs.h      |  166 +-
 151  arch/mips/include/asm/octeon/cvmx-uctlx-defs.h     |  268 +-
 152  arch/mips/include/asm/octeon/octeon-model.h        |   18 +
 153  arch/mips/include/asm/octeon/octeon.h              |    4 +
 154  arch/mips/include/asm/pgtable-bits.h               |   18 +-
 155  arch/mips/include/asm/pgtable.h                    |   12 +-
 156  arch/mips/include/asm/thread_info.h                |    6 +-
 157  arch/mips/include/asm/uasm.h                       |    2 +
 158  arch/mips/include/asm/unistd.h                     |   15 +-
 159  arch/mips/kernel/Makefile                          |   19 +-
 160  arch/mips/kernel/cevt-r4k.c                        |    5 +
 161  arch/mips/kernel/cpu-probe.c                       |   10 +-
 162  arch/mips/kernel/entry.S                           |   15 +-
 163  arch/mips/kernel/irq-gic.c                         |  162 +-
 164  arch/mips/kernel/scall32-o32.S                     |   14 +-
 165  arch/mips/kernel/scall64-64.S                      |   14 +-
 166  arch/mips/kernel/scall64-n32.S                     |   14 +-
 167  arch/mips/kernel/scall64-o32.S                     |   14 +-
 168  arch/mips/kernel/signal.c                          |    8 -
 169  arch/mips/kernel/smp-mt.c                          |    2 +
 170  arch/mips/lantiq/Kconfig                           |    2 +
 171  arch/mips/lantiq/falcon/prom.c                     |    5 +
 172  arch/mips/lantiq/falcon/sysctrl.c                  |    1 +
 173  arch/mips/lantiq/irq.c                             |   82 +-
 174  arch/mips/lantiq/xway/Makefile                     |    2 +-
 175  arch/mips/lantiq/xway/gpio.c                       |  183 -
 176  arch/mips/lantiq/xway/gptu.c                       |  214 +
 177  arch/mips/lantiq/xway/sysctrl.c                    |    5 +-
 178  arch/mips/lib/Makefile                             |   21 +-
 179  arch/mips/mipssim/Makefile                         |   23 -
 180  arch/mips/mipssim/Platform                         |    6 -
 181  arch/mips/mipssim/sim_console.c                    |   40 -
 182  arch/mips/mipssim/sim_int.c                        |   87 -
 183  arch/mips/mipssim/sim_mem.c                        |  115 -
 184  arch/mips/mipssim/sim_platform.c                   |   35 -
 185  arch/mips/mipssim/sim_setup.c                      |   99 -
 186  arch/mips/mipssim/sim_smtc.c                       |  116 -
 187  arch/mips/mipssim/sim_time.c                       |  117 -
 188  arch/mips/mm/Makefile                              |   17 +-
 189  arch/mips/mm/c-r4k.c                               |   21 +
 190  arch/mips/mm/cache.c                               |    2 +-
 191  arch/mips/mm/fault.c                               |    3 +-
 192  arch/mips/mm/tlb-r4k.c                             |    2 +-
 193  arch/mips/mm/tlbex.c                               |   44 +-
 194  arch/mips/mm/uasm.c                                |   23 +-
 195  arch/mips/mti-malta/malta-int.c                    |   34 +
 196  arch/mips/mti-sead3/Makefile                       |   19 +
 197  arch/mips/mti-sead3/Platform                       |    7 +
 198  arch/mips/mti-sead3/leds-sead3.c                   |  128 +
 199  arch/mips/mti-sead3/sead3-cmdline.c                |   46 +
 200  arch/mips/mti-sead3/sead3-console.c                |   46 +
 201  arch/mips/mti-sead3/sead3-display.c                |   78 +
 202  arch/mips/mti-sead3/sead3-ehci.c                   |   47 +
 203  arch/mips/mti-sead3/sead3-i2c-dev.c                |   33 +
 204  arch/mips/mti-sead3/sead3-i2c-drv.c                |  405 +
 205  arch/mips/mti-sead3/sead3-i2c.c                    |   37 +
 206  arch/mips/mti-sead3/sead3-init.c                   |   91 +
 207  arch/mips/mti-sead3/sead3-int.c                    |  158 +
 208  arch/mips/mti-sead3/sead3-lcd.c                    |   43 +
 209  arch/mips/mti-sead3/sead3-leds.c                   |   83 +
 210  arch/mips/mti-sead3/sead3-memory.c                 |  138 +
 211  arch/mips/mti-sead3/sead3-mtd.c                    |   54 +
 212  arch/mips/mti-sead3/sead3-net.c                    |   51 +
 213  arch/mips/mti-sead3/sead3-pic32-bus.c              |  103 +
 214  arch/mips/mti-sead3/sead3-pic32-i2c-drv.c          |  435 +
 215  arch/mips/mti-sead3/sead3-platform.c               |   45 +
 216  arch/mips/mti-sead3/sead3-reset.c                  |   39 +
 217  arch/mips/mti-sead3/sead3-serial.c                 |   45 +
 218  arch/mips/mti-sead3/sead3-setup.c                  |   20 +
 219  arch/mips/mti-sead3/sead3-time.c                   |  117 +
 220  arch/mips/netlogic/Kconfig                         |   15 +
 221  arch/mips/netlogic/Makefile                        |    1 +
 222  arch/mips/netlogic/dts/Makefile                    |    4 +
 223  arch/mips/netlogic/dts/xlp_evp.dts                 |  124 +
 224  arch/mips/netlogic/xlp/Makefile                    |    3 +-
 225  arch/mips/netlogic/xlp/of.c                        |   34 -
 226  arch/mips/netlogic/xlp/platform.c                  |  108 -
 227  arch/mips/netlogic/xlp/setup.c                     |   32 +-
 228  arch/mn10300/include/asm/Kbuild                    |    2 +
 229  arch/openrisc/include/asm/Kbuild                   |    1 +
 230  arch/openrisc/mm/fault.c                           |    1 +
 231  arch/parisc/include/asm/Kbuild                     |    1 +
 232  arch/parisc/kernel/cache.c                         |    3 +-
 233  arch/powerpc/Kconfig                               |    2 +
 234  arch/powerpc/include/asm/Kbuild                    |    1 +
 235  arch/powerpc/include/asm/atomic.h                  |    1 +
 236  arch/powerpc/include/asm/hugetlb.h                 |    4 +
 237  arch/powerpc/kvm/book3s_hv.c                       |    2 +-
 238  arch/powerpc/mm/fault.c                            |    1 +
 239  arch/powerpc/oprofile/cell/spu_task_sync.c         |   15 +-
 240  arch/powerpc/platforms/pseries/hotplug-memory.c    |   13 +-
 241  arch/s390/Kconfig                                  |    3 +
 242  arch/s390/include/asm/Kbuild                       |    2 +
 243  arch/s390/include/asm/hugetlb.h                    |   19 +-
 244  arch/s390/include/asm/pgtable.h                    |  210 +
 245  arch/s390/include/asm/setup.h                      |    5 +-
 246  arch/s390/include/asm/tlb.h                        |    1 +
 247  arch/s390/kernel/early.c                           |    2 +
 248  arch/s390/mm/fault.c                               |    1 +
 249  arch/s390/mm/gup.c                                 |   11 +-
 250  arch/s390/mm/pgtable.c                             |  108 +
 251  arch/score/include/asm/Kbuild                      |    2 +
 252  arch/sh/Kconfig                                    |    3 +
 253  arch/sh/include/asm/hugetlb.h                      |    6 +
 254  arch/sh/mm/fault.c                                 |    1 +
 255  arch/sparc/Kconfig                                 |   41 +-
 256  arch/sparc/include/asm/Kbuild                      |    1 +
 257  arch/sparc/include/asm/hugetlb.h                   |    9 +-
 258  arch/sparc/include/asm/mmu_64.h                    |   19 +-
 259  arch/sparc/include/asm/mmu_context_64.h            |    2 +-
 260  arch/sparc/include/asm/page_64.h                   |   21 +-
 261  arch/sparc/include/asm/pgalloc_64.h                |   56 +-
 262  arch/sparc/include/asm/pgtable_64.h                |  253 +-
 263  arch/sparc/include/asm/tsb.h                       |  106 +-
 264  arch/sparc/kernel/pci.c                            |    2 +-
 265  arch/sparc/kernel/sun4v_tlb_miss.S                 |    2 +-
 266  arch/sparc/kernel/tsb.S                            |    9 +-
 267  arch/sparc/mm/fault_32.c                           |    1 +
 268  arch/sparc/mm/fault_64.c                           |    5 +-
 269  arch/sparc/mm/hugetlbpage.c                        |   50 -
 270  arch/sparc/mm/init_64.c                            |  314 +-
 271  arch/sparc/mm/tlb.c                                |  118 +-
 272  arch/sparc/mm/tsb.c                                |   40 +-
 273  arch/tile/Kconfig                                  |    3 +
 274  arch/tile/include/asm/Kbuild                       |    1 +
 275  arch/tile/include/asm/hugetlb.h                    |    4 +
 276  arch/tile/mm/elf.c                                 |   19 +-
 277  arch/tile/mm/fault.c                               |    1 +
 278  arch/um/Kconfig.common                             |    1 +
 279  arch/um/include/asm/Kbuild                         |    2 +-
 280  arch/um/kernel/trap.c                              |    1 +
 281  arch/unicore32/include/asm/Kbuild                  |    1 +
 282  arch/unicore32/kernel/process.c                    |    2 +-
 283  arch/x86/Kconfig                                   |    5 +
 284  arch/x86/include/asm/Kbuild                        |    6 +
 285  arch/x86/include/asm/atomic.h                      |   24 -
 286  arch/x86/include/asm/hugetlb.h                     |    4 +
 287  arch/x86/include/asm/pgtable.h                     |   11 +-
 288  arch/x86/include/asm/pgtable_32.h                  |    1 +
 289  arch/x86/include/asm/pgtable_64.h                  |    1 +
 290  arch/x86/mm/fault.c                                |    1 +
 291  arch/x86/mm/hugetlbpage.c                          |    3 +-
 292  arch/x86/mm/pat.c                                  |   87 +-
 293  arch/x86/mm/pat_rbtree.c                           |   34 +-
 294  arch/x86/xen/mmu.c                                 |    3 +-
 295  arch/xtensa/Kconfig                                |   23 +-
 296  arch/xtensa/Makefile                               |   34 +-
 297  arch/xtensa/boot/Makefile                          |    2 +-
 298  arch/xtensa/boot/boot-elf/Makefile                 |   24 +-
 299  arch/xtensa/boot/boot-elf/boot.lds.S               |    7 -
 300  arch/xtensa/boot/boot-redboot/Makefile             |   12 +-
 301  arch/xtensa/boot/boot-redboot/boot.ld              |    7 -
 302  arch/xtensa/boot/boot-redboot/bootstrap.S          |   10 -
 303  arch/xtensa/boot/ramdisk/Makefile                  |   23 -
 304  arch/xtensa/configs/s6105_defconfig                |    5 -
 305  arch/xtensa/include/asm/Kbuild                     |    2 +
 306  arch/xtensa/include/asm/io.h                       |  172 +-
 307  arch/xtensa/include/asm/ioctls.h                   |    4 +-
 308  arch/xtensa/include/asm/regs.h                     |    2 +-
 309  arch/xtensa/kernel/Makefile                        |    3 +-
 310  arch/xtensa/kernel/io.c                            |   75 -
 311  arch/xtensa/kernel/irq.c                           |    4 +-
 312  arch/xtensa/kernel/pci-dma.c                       |    4 +
 313  arch/xtensa/kernel/pci.c                           |    2 +-
 314  arch/xtensa/kernel/platform.c                      |    4 +-
 315  arch/xtensa/kernel/setup.c                         |   12 -
 316  arch/xtensa/kernel/vmlinux.lds.S                   |    5 -
 317  arch/xtensa/kernel/xtensa_ksyms.c                  |   25 +
 318  arch/xtensa/mm/fault.c                             |    1 +
 319  arch/xtensa/platforms/iss/Makefile                 |    4 +-
 320  arch/xtensa/platforms/iss/console.c                |   15 +-
 321  .../platforms/iss/include/platform/simcall.h       |   53 +
 322  arch/xtensa/platforms/iss/io.c                     |   32 -
 323  arch/xtensa/platforms/iss/network.c                |   49 -
 324  arch/xtensa/platforms/iss/setup.c                  |   14 +-
 325  drivers/base/memory.c                              |   40 +-
 326  drivers/char/mbcs.c                                |    2 +-
 327  drivers/char/mem.c                                 |    2 +-
 328  drivers/char/mspec.c                               |    2 +-
 329  drivers/gpio/gpio-stp-xway.c                       |    2 +-
 330  drivers/gpu/drm/drm_gem.c                          |    2 +-
 331  drivers/gpu/drm/drm_vm.c                           |   10 +-
 332  drivers/gpu/drm/exynos/exynos_drm_gem.c            |    2 +-
 333  drivers/gpu/drm/gma500/framebuffer.c               |    3 +-
 334  drivers/gpu/drm/ttm/ttm_bo_vm.c                    |    4 +-
 335  drivers/gpu/drm/udl/udl_fb.c                       |    2 +-
 336  drivers/infiniband/hw/ehca/ehca_uverbs.c           |    4 +-
 337  drivers/infiniband/hw/ipath/ipath_file_ops.c       |    2 +-
 338  drivers/infiniband/hw/qib/qib_file_ops.c           |    2 +-
 339  drivers/isdn/hisax/Kconfig                         |   10 +-
 340  drivers/media/pci/meye/meye.c                      |    2 +-
 341  drivers/media/platform/omap/omap_vout.c            |    2 +-
 342  drivers/media/platform/vino.c                      |    2 +-
 343  drivers/media/usb/sn9c102/sn9c102_core.c           |    3 +-
 344  drivers/media/usb/usbvision/usbvision-video.c      |    3 +-
 345  drivers/media/v4l2-core/videobuf-dma-sg.c          |    2 +-
 346  drivers/media/v4l2-core/videobuf-vmalloc.c         |    2 +-
 347  drivers/media/v4l2-core/videobuf2-memops.c         |    2 +-
 348  drivers/misc/carma/carma-fpga.c                    |    2 -
 349  drivers/misc/sgi-gru/grufile.c                     |    5 +-
 350  drivers/mtd/mtdchar.c                              |    2 +-
 351  drivers/mtd/mtdcore.c                              |    6 +-
 352  drivers/net/ethernet/broadcom/bcm63xx_enet.h       |   30 +-
 353  drivers/net/ethernet/octeon/octeon_mgmt.c          |  550 +-
 354  drivers/oprofile/buffer_sync.c                     |   17 +-
 355  drivers/parport/Kconfig                            |    2 +-
 356  drivers/pinctrl/Kconfig                            |   16 +
 357  drivers/pinctrl/Makefile                           |    3 +
 358  drivers/pinctrl/pinctrl-falcon.c                   |  468 +
 359  drivers/pinctrl/pinctrl-lantiq.c                   |  342 +
 360  drivers/pinctrl/pinctrl-lantiq.h                   |  194 +
 361  drivers/pinctrl/pinctrl-xway.c                     |  781 ++
 362  drivers/scsi/sg.c                                  |    2 +-
 363  drivers/spi/Kconfig                                |    7 +
 364  drivers/spi/Makefile                               |    1 +
 365  drivers/spi/spi-octeon.c                           |  362 +
 366  drivers/staging/android/ashmem.c                   |    1 -
 367  drivers/staging/omapdrm/omap_gem_dmabuf.c          |    2 +-
 368  drivers/staging/tidspbridge/rmgr/drv_interface.c   |    2 +-
 369  drivers/uio/uio.c                                  |    4 +-
 370  drivers/usb/mon/mon_bin.c                          |    2 +-
 371  drivers/usb/musb/musb_io.h                         |    3 +-
 372  drivers/vfio/pci/vfio_pci.c                        |    2 +-
 373  drivers/video/68328fb.c                            |    2 +-
 374  drivers/video/aty/atyfb_base.c                     |    3 +-
 375  drivers/video/fb-puv3.c                            |    3 +-
 376  drivers/video/fb_defio.c                           |    2 +-
 377  drivers/video/fbmem.c                              |    3 +-
 378  drivers/video/gbefb.c                              |    2 +-
 379  drivers/video/omap2/omapfb/omapfb-main.c           |    2 +-
 380  drivers/video/sbuslib.c                            |    5 +-
 381  drivers/video/smscufx.c                            |    1 -
 382  drivers/video/udlfb.c                              |    1 -
 383  drivers/video/vermilion/vermilion.c                |    1 -
 384  drivers/video/vfb.c                                |    1 -
 385  drivers/xen/gntalloc.c                             |    2 +-
 386  drivers/xen/gntdev.c                               |    2 +-
 387  drivers/xen/privcmd.c                              |    3 +-
 388  fs/9p/vfs_file.c                                   |    1 +
 389  fs/binfmt_elf.c                                    |    4 +-
 390  fs/binfmt_elf_fdpic.c                              |    2 +-
 391  fs/btrfs/file.c                                    |    2 +-
 392  fs/ceph/addr.c                                     |    2 +-
 393  fs/cifs/file.c                                     |    1 +
 394  fs/exec.c                                          |    2 +-
 395  fs/exofs/ore_raid.c                                |    2 +-
 396  fs/exofs/sys.c                                     |    7 +-
 397  fs/ext4/file.c                                     |    2 +-
 398  fs/fcntl.c                                         |    2 +-
 399  fs/fs-writeback.c                                  |    7 +-
 400  fs/fuse/file.c                                     |    1 +
 401  fs/gfs2/file.c                                     |    2 +-
 402  fs/hugetlbfs/inode.c                               |   11 +-
 403  fs/inode.c                                         |    2 +-
 404  fs/jffs2/readinode.c                               |   13 +-
 405  fs/nfs/file.c                                      |    1 +
 406  fs/nilfs2/file.c                                   |    2 +-
 407  fs/ocfs2/mmap.c                                    |    2 +-
 408  fs/proc/base.c                                     |  117 +-
 409  fs/proc/page.c                                     |    8 +-
 410  fs/proc/proc_sysctl.c                              |    5 +-
 411  fs/proc/task_mmu.c                                 |    2 +-
 412  fs/ubifs/file.c                                    |    1 +
 413  fs/xfs/xfs_file.c                                  |    2 +-
 414  include/asm-generic/Kbuild                         |   35 -
 415  include/asm-generic/bitsperlong.h                  |   13 +-
 416  include/asm-generic/clkdev.h                       |   28 +
 417  include/asm-generic/int-l64.h                      |   26 +-
 418  include/asm-generic/int-ll64.h                     |   31 +-
 419  include/asm-generic/ioctl.h                        |   95 +-
 420  include/asm-generic/kvm_para.h                     |    5 +-
 421  include/asm-generic/param.h                        |   17 +-
 422  include/asm-generic/pgtable.h                      |   72 +-
 423  include/asm-generic/resource.h                     |   66 +-
 424  include/asm-generic/siginfo.h                      |  297 +-
 425  include/asm-generic/signal.h                       |  117 +-
 426  include/asm-generic/statfs.h                       |   81 +-
 427  include/asm-generic/termios.h                      |   49 +-
 428  include/asm-generic/unistd.h                       |  907 +-
 429  include/asm-generic/xor.h                          |    4 +-
 430  include/linux/atomic.h                             |   25 +
 431  include/linux/compaction.h                         |   19 +-
 432  include/linux/fs.h                                 |    8 +-
 433  include/linux/gfp.h                                |    9 +-
 434  include/linux/huge_mm.h                            |    3 +-
 435  include/linux/interval_tree.h                      |   27 +
 436  include/linux/interval_tree_generic.h              |  191 +
 437  include/linux/memblock.h                           |    3 +-
 438  include/linux/memcontrol.h                         |   14 +-
 439  include/linux/memory_hotplug.h                     |    3 +
 440  include/linux/mempolicy.h                          |    4 +-
 441  include/linux/mm.h                                 |  140 +-
 442  include/linux/mm_types.h                           |   16 +-
 443  include/linux/mman.h                               |    1 -
 444  include/linux/mmu_notifier.h                       |   60 +-
 445  include/linux/mmzone.h                             |   10 +-
 446  include/linux/oom.h                                |   11 -
 447  include/linux/page-isolation.h                     |    7 +-
 448  include/linux/pageblock-flags.h                    |   19 +-
 449  include/linux/pnfs_osd_xdr.h                       |    1 -
 450  include/linux/prio_tree.h                          |  120 -
 451  include/linux/rbtree.h                             |  119 +-
 452  include/linux/rbtree_augmented.h                   |  223 +
 453  include/linux/rmap.h                               |   36 +-
 454  include/linux/sched.h                              |    1 -
 455  include/linux/swap.h                               |    2 +-
 456  include/linux/timerqueue.h                         |    2 +-
 457  include/linux/vm_event_item.h                      |    1 -
 458  include/linux/vmstat.h                             |   12 +
 459  include/trace/events/gfpflags.h                    |    1 -
 460  include/uapi/asm-generic/Kbuild                    |   35 +
 461  include/{ => uapi}/asm-generic/auxvec.h            |    0
 462  include/uapi/asm-generic/bitsperlong.h             |   15 +
 463  include/{ => uapi}/asm-generic/errno-base.h        |    0
 464  include/{ => uapi}/asm-generic/errno.h             |    0
 465  include/{ => uapi}/asm-generic/fcntl.h             |    0
 466  include/uapi/asm-generic/int-l64.h                 |   34 +
 467  include/uapi/asm-generic/int-ll64.h                |   39 +
 468  include/uapi/asm-generic/ioctl.h                   |   98 +
 469  include/{ => uapi}/asm-generic/ioctls.h            |    0
 470  include/{ => uapi}/asm-generic/ipcbuf.h            |    0
 471  include/{ => uapi}/asm-generic/mman-common.h       |    0
 472  include/{ => uapi}/asm-generic/mman.h              |    0
 473  include/{ => uapi}/asm-generic/msgbuf.h            |    0
 474  include/uapi/asm-generic/param.h                   |   19 +
 475  include/{ => uapi}/asm-generic/poll.h              |    0
 476  include/{ => uapi}/asm-generic/posix_types.h       |    0
 477  include/uapi/asm-generic/resource.h                |   68 +
 478  include/{ => uapi}/asm-generic/sembuf.h            |    0
 479  include/{ => uapi}/asm-generic/setup.h             |    0
 480  include/{ => uapi}/asm-generic/shmbuf.h            |    0
 481  include/{ => uapi}/asm-generic/shmparam.h          |    0
 482  include/uapi/asm-generic/siginfo.h                 |  298 +
 483  include/{ => uapi}/asm-generic/signal-defs.h       |    0
 484  include/uapi/asm-generic/signal.h                  |  123 +
 485  include/{ => uapi}/asm-generic/socket.h            |    0
 486  include/{ => uapi}/asm-generic/sockios.h           |    0
 487  include/{ => uapi}/asm-generic/stat.h              |    0
 488  include/uapi/asm-generic/statfs.h                  |   83 +
 489  include/{ => uapi}/asm-generic/swab.h              |    0
 490  include/{ => uapi}/asm-generic/termbits.h          |    0
 491  include/uapi/asm-generic/termios.h                 |   50 +
 492  include/{ => uapi}/asm-generic/types.h             |    0
 493  include/{ => uapi}/asm-generic/ucontext.h          |    0
 494  include/uapi/asm-generic/unistd.h                  |  902 ++
 495  init/Kconfig                                       |   11 +-
 496  init/main.c                                        |    2 -
 497  ipc/mqueue.c                                       |    3 -
 498  kernel/auditsc.c                                   |   13 +-
 499  kernel/cpu.c                                       |    4 +
 500  kernel/events/core.c                               |    2 +-
 501  kernel/events/uprobes.c                            |    8 +-
 502  kernel/fork.c                                      |   32 +-
 503  kernel/sysctl.c                                    |    3 +-
 504  lib/Kconfig.debug                                  |   38 +-
 505  lib/Makefile                                       |    7 +-
 506  lib/interval_tree.c                                |   10 +
 507  lib/interval_tree_test_main.c                      |  105 +
 508  lib/prio_tree.c                                    |  466 -
 509  lib/rbtree.c                                       |  656 +-
 510  lib/rbtree_test.c                                  |  234 +
 511  mm/Kconfig                                         |    3 +-
 512  mm/Makefile                                        |    4 +-
 513  mm/bootmem.c                                       |   10 +-
 514  mm/compaction.c                                    |  562 +-
 515  mm/filemap.c                                       |    6 +-
 516  mm/filemap_xip.c                                   |   10 +-
 517  mm/fremap.c                                        |   16 +-
 518  mm/huge_memory.c                                   |  440 +-
 519  mm/hugetlb.c                                       |   34 +-
 520  mm/internal.h                                      |   52 +-
 521  mm/interval_tree.c                                 |  112 +
 522  mm/kmemleak.c                                      |  100 +-
 523  mm/ksm.c                                           |   40 +-
 524  mm/madvise.c                                       |    8 +-
 525  mm/memblock.c                                      |    5 +-
 526  mm/memcontrol.c                                    |   22 +-
 527  mm/memory-failure.c                                |    8 +-
 528  mm/memory.c                                        |  115 +-
 529  mm/memory_hotplug.c                                |   77 +-
 530  mm/mempolicy.c                                     |  148 +-
 531  mm/mlock.c                                         |   27 +-
 532  mm/mmap.c                                          |  207 +-
 533  mm/mmu_notifier.c                                  |  103 +-
 534  mm/mremap.c                                        |   73 +-
 535  mm/nobootmem.c                                     |    5 +-
 536  mm/nommu.c                                         |   33 +-
 537  mm/oom_kill.c                                      |    4 +-
 538  mm/page_alloc.c                                    |  317 +-
 539  mm/page_isolation.c                                |   43 +-
 540  mm/pgtable-generic.c                               |   50 +
 541  mm/prio_tree.c                                     |  208 -
 542  mm/rmap.c                                          |  159 +-
 543  mm/shmem.c                                         |    3 +-
 544  mm/swap.c                                          |   13 +-
 545  mm/truncate.c                                      |    3 -
 546  mm/vmalloc.c                                       |    5 +-
 547  mm/vmscan.c                                        |  111 +-
 548  mm/vmstat.c                                        |   14 +-
 549  net/ceph/osd_client.c                              |    1 -
 550  scripts/mod/modpost.c                              |    2 +
 551  security/apparmor/Makefile                         |    2 +-
 552  security/selinux/selinuxfs.c                       |    2 +-
 553  security/tomoyo/util.c                             |    9 +-
 554  sound/core/pcm_native.c                            |    6 +-
 555  sound/usb/usx2y/us122l.c                           |    2 +-
 556  sound/usb/usx2y/usX2Yhwdep.c                       |    2 +-
 557  sound/usb/usx2y/usx2yhwdeppcm.c                    |    2 +-
 558  tools/perf/util/include/linux/rbtree.h             |    1 +
 559  548 files changed, 60236 insertions(+), 10674 deletions(-)
 560  delete mode 100644 Documentation/ABI/obsolete/proc-pid-oom_adj
 561  create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt
 562  create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt
 563  create mode 100644 Documentation/devicetree/bindings/spi/spi-octeon.txt
 564  delete mode 100644 Documentation/memory.txt
 565  delete mode 100644 Documentation/prio_tree.txt
 566  create mode 100644 arch/mips/bcm63xx/dev-usb-usbd.c
 567  rename arch/mips/configs/{cavium-octeon_defconfig => cavium_octeon_defconfig} (100%)
 568  delete mode 100644 arch/mips/configs/mipssim_defconfig
 569  rename arch/mips/configs/{pnx8335-stb225_defconfig => pnx8335_stb225_defconfig} (100%)
 570  rename arch/mips/configs/{pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} (100%)
 571  rename arch/mips/configs/{pnx8550-stb810_defconfig => pnx8550_stb810_defconfig} (100%)
 572  rename arch/mips/configs/{sb1250-swarm_defconfig => sb1250_swarm_defconfig} (100%)
 573  create mode 100644 arch/mips/configs/sead3_defconfig
 574  create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
 575  create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h
 576  rename arch/mips/include/asm/{mach-mipssim => mach-sead3}/cpu-feature-overrides.h (83%)
 577  create mode 100644 arch/mips/include/asm/mach-sead3/irq.h
 578  create mode 100644 arch/mips/include/asm/mach-sead3/kernel-entry-init.h
 579  rename arch/mips/include/asm/{mach-mipssim => mach-sead3}/war.h (72%)
 580  create mode 100644 arch/mips/include/asm/mips-boards/sead3int.h
 581  delete mode 100644 arch/mips/include/asm/mips-boards/simint.h
 582  create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu2-defs.h
 583  create mode 100644 arch/mips/include/asm/octeon/cvmx-mpi-defs.h
 584  delete mode 100644 arch/mips/lantiq/xway/gpio.c
 585  create mode 100644 arch/mips/lantiq/xway/gptu.c
 586  delete mode 100644 arch/mips/mipssim/Makefile
 587  delete mode 100644 arch/mips/mipssim/Platform
 588  delete mode 100644 arch/mips/mipssim/sim_console.c
 589  delete mode 100644 arch/mips/mipssim/sim_int.c
 590  delete mode 100644 arch/mips/mipssim/sim_mem.c
 591  delete mode 100644 arch/mips/mipssim/sim_platform.c
 592  delete mode 100644 arch/mips/mipssim/sim_setup.c
 593  delete mode 100644 arch/mips/mipssim/sim_smtc.c
 594  delete mode 100644 arch/mips/mipssim/sim_time.c
 595  create mode 100644 arch/mips/mti-sead3/Makefile
 596  create mode 100644 arch/mips/mti-sead3/Platform
 597  create mode 100644 arch/mips/mti-sead3/leds-sead3.c
 598  create mode 100644 arch/mips/mti-sead3/sead3-cmdline.c
 599  create mode 100644 arch/mips/mti-sead3/sead3-console.c
 600  create mode 100644 arch/mips/mti-sead3/sead3-display.c
 601  create mode 100644 arch/mips/mti-sead3/sead3-ehci.c
 602  create mode 100644 arch/mips/mti-sead3/sead3-i2c-dev.c
 603  create mode 100644 arch/mips/mti-sead3/sead3-i2c-drv.c
 604  create mode 100644 arch/mips/mti-sead3/sead3-i2c.c
 605  create mode 100644 arch/mips/mti-sead3/sead3-init.c
 606  create mode 100644 arch/mips/mti-sead3/sead3-int.c
 607  create mode 100644 arch/mips/mti-sead3/sead3-lcd.c
 608  create mode 100644 arch/mips/mti-sead3/sead3-leds.c
 609  create mode 100644 arch/mips/mti-sead3/sead3-memory.c
 610  create mode 100644 arch/mips/mti-sead3/sead3-mtd.c
 611  create mode 100644 arch/mips/mti-sead3/sead3-net.c
 612  create mode 100644 arch/mips/mti-sead3/sead3-pic32-bus.c
 613  create mode 100644 arch/mips/mti-sead3/sead3-pic32-i2c-drv.c
 614  create mode 100644 arch/mips/mti-sead3/sead3-platform.c
 615  create mode 100644 arch/mips/mti-sead3/sead3-reset.c
 616  create mode 100644 arch/mips/mti-sead3/sead3-serial.c
 617  create mode 100644 arch/mips/mti-sead3/sead3-setup.c
 618  create mode 100644 arch/mips/mti-sead3/sead3-time.c
 619  create mode 100644 arch/mips/netlogic/dts/Makefile
 620  create mode 100644 arch/mips/netlogic/dts/xlp_evp.dts
 621  delete mode 100644 arch/mips/netlogic/xlp/of.c
 622  delete mode 100644 arch/mips/netlogic/xlp/platform.c
 623  delete mode 100644 arch/xtensa/boot/ramdisk/Makefile
 624  delete mode 100644 arch/xtensa/kernel/io.c
 625  create mode 100644 arch/xtensa/platforms/iss/include/platform/serial.h
 626  delete mode 100644 arch/xtensa/platforms/iss/io.c
 627  create mode 100644 drivers/pinctrl/pinctrl-falcon.c
 628  create mode 100644 drivers/pinctrl/pinctrl-lantiq.c
 629  create mode 100644 drivers/pinctrl/pinctrl-lantiq.h
 630  create mode 100644 drivers/pinctrl/pinctrl-xway.c
 631  create mode 100644 drivers/spi/spi-octeon.c
 632  create mode 100644 include/asm-generic/clkdev.h
 633  create mode 100644 include/linux/interval_tree.h
 634  create mode 100644 include/linux/interval_tree_generic.h
 635  delete mode 100644 include/linux/prio_tree.h
 636  create mode 100644 include/linux/rbtree_augmented.h
 637  rename include/{ => uapi}/asm-generic/auxvec.h (100%)
 638  create mode 100644 include/uapi/asm-generic/bitsperlong.h
 639  rename include/{ => uapi}/asm-generic/errno-base.h (100%)
 640  rename include/{ => uapi}/asm-generic/errno.h (100%)
 641  rename include/{ => uapi}/asm-generic/fcntl.h (100%)
 642  create mode 100644 include/uapi/asm-generic/int-l64.h
 643  create mode 100644 include/uapi/asm-generic/int-ll64.h
 644  create mode 100644 include/uapi/asm-generic/ioctl.h
 645  rename include/{ => uapi}/asm-generic/ioctls.h (100%)
 646  rename include/{ => uapi}/asm-generic/ipcbuf.h (100%)
 647  create mode 100644 include/uapi/asm-generic/kvm_para.h
 648  rename include/{ => uapi}/asm-generic/mman-common.h (100%)
 649  rename include/{ => uapi}/asm-generic/mman.h (100%)
 650  rename include/{ => uapi}/asm-generic/msgbuf.h (100%)
 651  create mode 100644 include/uapi/asm-generic/param.h
 652  rename include/{ => uapi}/asm-generic/poll.h (100%)
 653  rename include/{ => uapi}/asm-generic/posix_types.h (100%)
 654  create mode 100644 include/uapi/asm-generic/resource.h
 655  rename include/{ => uapi}/asm-generic/sembuf.h (100%)
 656  rename include/{ => uapi}/asm-generic/setup.h (100%)
 657  rename include/{ => uapi}/asm-generic/shmbuf.h (100%)
 658  rename include/{ => uapi}/asm-generic/shmparam.h (100%)
 659  create mode 100644 include/uapi/asm-generic/siginfo.h
 660  rename include/{ => uapi}/asm-generic/signal-defs.h (100%)
 661  create mode 100644 include/uapi/asm-generic/signal.h
 662  rename include/{ => uapi}/asm-generic/socket.h (100%)
 663  rename include/{ => uapi}/asm-generic/sockios.h (100%)
 664  rename include/{ => uapi}/asm-generic/stat.h (100%)
 665  create mode 100644 include/uapi/asm-generic/statfs.h
 666  rename include/{ => uapi}/asm-generic/swab.h (100%)
 667  rename include/{ => uapi}/asm-generic/termbits.h (100%)
 668  create mode 100644 include/uapi/asm-generic/termios.h
 669  rename include/{ => uapi}/asm-generic/types.h (100%)
 670  rename include/{ => uapi}/asm-generic/ucontext.h (100%)
 671  create mode 100644 include/uapi/asm-generic/unistd.h
 672  create mode 100644 lib/interval_tree.c
 673  create mode 100644 lib/interval_tree_test_main.c
 674  delete mode 100644 lib/prio_tree.c
 675  create mode 100644 lib/rbtree_test.c
 676  create mode 100644 mm/interval_tree.c
 677  delete mode 100644 mm/prio_tree.c
 678 Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
 679 $ git merge fixes/master
 680 Already up-to-date.
 681 $ git revert d760afd4d257
 682 [master 92fbc9f] Revert "memory-hotplug: suppress "Trying to free nonexistent resource <XXXXXXXXXXXXXXXX-YYYYYYYYYYYYYYYY>" warning"
 683  2 files changed, 6 insertions(+), 11 deletions(-)
 684 Merging kbuild-current/rc-fixes (b1e0d8b kbuild: Fix gcc -x syntax)
 685 $ git merge kbuild-current/rc-fixes
 686 Already up-to-date.
 687 Merging arm-current/fixes (846a136 ARM: vfp: fix saving d16-d31 vfp registers on v6+ kernels)
 688 $ git merge arm-current/fixes
 689 Merge made by the 'recursive' strategy.
 690  arch/arm/include/asm/vfpmacros.h |    4 ++--
 691  1 file changed, 2 insertions(+), 2 deletions(-)
 692 Merging m68k-current/for-linus (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
 693 $ git merge m68k-current/for-linus
 694 Already up-to-date.
 695 Merging powerpc-merge/merge (636802e powerpc: Don't use __put_user() in patch_instruction)
 696 $ git merge powerpc-merge/merge
 697 Already up-to-date.
 698 Merging sparc/master (9836d34 Merge tag 'disintegrate-sparc-20121009' of git://git.infradead.org/users/dhowells/linux-headers)
 699 $ git merge sparc/master
 700 Merge made by the 'recursive' strategy.
 701  arch/sparc/include/asm/Kbuild                   |   16 -
 702  arch/sparc/include/asm/fbio.h                   |  260 +-------------
 703  arch/sparc/include/asm/ioctls.h                 |  129 +------
 704  arch/sparc/include/asm/mman.h                   |   25 +-
 705  arch/sparc/include/asm/psr.h                    |   36 +-
 706  arch/sparc/include/asm/ptrace.h                 |  347 +------------------
 707  arch/sparc/include/asm/setup.h                  |   10 +-
 708  arch/sparc/include/asm/sigcontext.h             |    4 +-
 709  arch/sparc/include/asm/siginfo.h                |   23 +-
 710  arch/sparc/include/asm/signal.h                 |  185 +---------
 711  arch/sparc/include/asm/termbits.h               |  260 +-------------
 712  arch/sparc/include/asm/termios.h                |   41 +--
 713  arch/sparc/include/asm/traps.h                  |  111 +-----
 714  arch/sparc/include/asm/unistd.h                 |  412 +---------------------
 715  arch/sparc/include/uapi/asm/Kbuild              |   46 +++
 716  arch/sparc/include/{ => uapi}/asm/apc.h         |    0
 717  arch/sparc/include/{ => uapi}/asm/asi.h         |    0
 718  arch/sparc/include/{ => uapi}/asm/auxvec.h      |    0
 719  arch/sparc/include/{ => uapi}/asm/bitsperlong.h |    0
 720  arch/sparc/include/{ => uapi}/asm/byteorder.h   |    0
 721  arch/sparc/include/{ => uapi}/asm/display7seg.h |    0
 722  arch/sparc/include/{ => uapi}/asm/envctrl.h     |    0
 723  arch/sparc/include/{ => uapi}/asm/errno.h       |    0
 724  arch/sparc/include/uapi/asm/fbio.h              |  259 ++++++++++++++
 725  arch/sparc/include/{ => uapi}/asm/fcntl.h       |    0
 726  arch/sparc/include/{ => uapi}/asm/ioctl.h       |    0
 727  arch/sparc/include/uapi/asm/ioctls.h            |  131 +++++++
 728  arch/sparc/include/{ => uapi}/asm/ipcbuf.h      |    0
 729  arch/sparc/include/{ => uapi}/asm/jsflash.h     |    0
 730  arch/sparc/include/{ => uapi}/asm/kvm_para.h    |    0
 731  arch/sparc/include/uapi/asm/mman.h              |   27 ++
 732  arch/sparc/include/{ => uapi}/asm/msgbuf.h      |    0
 733  arch/sparc/include/{ => uapi}/asm/openpromio.h  |    0
 734  arch/sparc/include/{ => uapi}/asm/param.h       |    0
 735  arch/sparc/include/{ => uapi}/asm/perfctr.h     |    0
 736  arch/sparc/include/{ => uapi}/asm/poll.h        |    0
 737  arch/sparc/include/{ => uapi}/asm/posix_types.h |    0
 738  arch/sparc/include/uapi/asm/psr.h               |   47 +++
 739  arch/sparc/include/{ => uapi}/asm/psrcompat.h   |    0
 740  arch/sparc/include/{ => uapi}/asm/pstate.h      |    0
 741  arch/sparc/include/uapi/asm/ptrace.h            |  352 +++++++++++++++++++
 742  arch/sparc/include/{ => uapi}/asm/resource.h    |    0
 743  arch/sparc/include/{ => uapi}/asm/sembuf.h      |    0
 744  arch/sparc/include/uapi/asm/setup.h             |   15 +
 745  arch/sparc/include/{ => uapi}/asm/shmbuf.h      |    0
 746  arch/sparc/include/uapi/asm/siginfo.h           |   25 ++
 747  arch/sparc/include/uapi/asm/signal.h            |  185 ++++++++++
 748  arch/sparc/include/{ => uapi}/asm/socket.h      |    0
 749  arch/sparc/include/{ => uapi}/asm/sockios.h     |    0
 750  arch/sparc/include/{ => uapi}/asm/stat.h        |    0
 751  arch/sparc/include/{ => uapi}/asm/statfs.h      |    0
 752  arch/sparc/include/{ => uapi}/asm/swab.h        |    0
 753  arch/sparc/include/uapi/asm/termbits.h          |  263 ++++++++++++++
 754  arch/sparc/include/uapi/asm/termios.h           |   43 +++
 755  arch/sparc/include/uapi/asm/traps.h             |  120 +++++++
 756  arch/sparc/include/{ => uapi}/asm/types.h       |    0
 757  arch/sparc/include/{ => uapi}/asm/uctx.h        |    0
 758  arch/sparc/include/uapi/asm/unistd.h            |  422 +++++++++++++++++++++++
 759  arch/sparc/include/{ => uapi}/asm/utrap.h       |    0
 760  arch/sparc/include/{ => uapi}/asm/watchdog.h    |    0
 761  60 files changed, 1951 insertions(+), 1843 deletions(-)
 762  rename arch/sparc/include/{ => uapi}/asm/apc.h (100%)
 763  rename arch/sparc/include/{ => uapi}/asm/asi.h (100%)
 764  rename arch/sparc/include/{ => uapi}/asm/auxvec.h (100%)
 765  rename arch/sparc/include/{ => uapi}/asm/bitsperlong.h (100%)
 766  rename arch/sparc/include/{ => uapi}/asm/byteorder.h (100%)
 767  rename arch/sparc/include/{ => uapi}/asm/display7seg.h (100%)
 768  rename arch/sparc/include/{ => uapi}/asm/envctrl.h (100%)
 769  rename arch/sparc/include/{ => uapi}/asm/errno.h (100%)
 770  create mode 100644 arch/sparc/include/uapi/asm/fbio.h
 771  rename arch/sparc/include/{ => uapi}/asm/fcntl.h (100%)
 772  rename arch/sparc/include/{ => uapi}/asm/ioctl.h (100%)
 773  create mode 100644 arch/sparc/include/uapi/asm/ioctls.h
 774  rename arch/sparc/include/{ => uapi}/asm/ipcbuf.h (100%)
 775  rename arch/sparc/include/{ => uapi}/asm/jsflash.h (100%)
 776  rename arch/sparc/include/{ => uapi}/asm/kvm_para.h (100%)
 777  create mode 100644 arch/sparc/include/uapi/asm/mman.h
 778  rename arch/sparc/include/{ => uapi}/asm/msgbuf.h (100%)
 779  rename arch/sparc/include/{ => uapi}/asm/openpromio.h (100%)
 780  rename arch/sparc/include/{ => uapi}/asm/param.h (100%)
 781  rename arch/sparc/include/{ => uapi}/asm/perfctr.h (100%)
 782  rename arch/sparc/include/{ => uapi}/asm/poll.h (100%)
 783  rename arch/sparc/include/{ => uapi}/asm/posix_types.h (100%)
 784  create mode 100644 arch/sparc/include/uapi/asm/psr.h
 785  rename arch/sparc/include/{ => uapi}/asm/psrcompat.h (100%)
 786  rename arch/sparc/include/{ => uapi}/asm/pstate.h (100%)
 787  create mode 100644 arch/sparc/include/uapi/asm/ptrace.h
 788  rename arch/sparc/include/{ => uapi}/asm/resource.h (100%)
 789  rename arch/sparc/include/{ => uapi}/asm/sembuf.h (100%)
 790  create mode 100644 arch/sparc/include/uapi/asm/setup.h
 791  rename arch/sparc/include/{ => uapi}/asm/shmbuf.h (100%)
 792  create mode 100644 arch/sparc/include/uapi/asm/sigcontext.h
 793  create mode 100644 arch/sparc/include/uapi/asm/siginfo.h
 794  create mode 100644 arch/sparc/include/uapi/asm/signal.h
 795  rename arch/sparc/include/{ => uapi}/asm/socket.h (100%)
 796  rename arch/sparc/include/{ => uapi}/asm/sockios.h (100%)
 797  rename arch/sparc/include/{ => uapi}/asm/stat.h (100%)
 798  rename arch/sparc/include/{ => uapi}/asm/statfs.h (100%)
 799  rename arch/sparc/include/{ => uapi}/asm/swab.h (100%)
 800  create mode 100644 arch/sparc/include/uapi/asm/termbits.h
 801  create mode 100644 arch/sparc/include/uapi/asm/termios.h
 802  create mode 100644 arch/sparc/include/uapi/asm/traps.h
 803  rename arch/sparc/include/{ => uapi}/asm/types.h (100%)
 804  rename arch/sparc/include/{ => uapi}/asm/uctx.h (100%)
 805  create mode 100644 arch/sparc/include/uapi/asm/unistd.h
 806  rename arch/sparc/include/{ => uapi}/asm/utrap.h (100%)
 807  rename arch/sparc/include/{ => uapi}/asm/watchdog.h (100%)
 808 Merging net/master (5175a5e RDS: fix rds-ping spinlock recursion)
 809 $ git merge net/master
 810 Merge made by the 'recursive' strategy.
 811  drivers/infiniband/core/cma.c                      |    3 +-
 812  drivers/infiniband/core/netlink.c                  |    1 +
 813  drivers/net/ethernet/amd/amd8111e.c                |    2 +
 814  drivers/net/ethernet/amd/au1000_eth.c              |   10 +-
 815  drivers/net/ethernet/calxeda/xgmac.c               |   19 +-
 816  drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |    1 +
 817  drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   54 ++--
 818  drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |   15 +-
 819  drivers/net/ethernet/dec/tulip/dmfe.c              |   12 +-
 820  drivers/net/ethernet/emulex/benet/be_main.c        |    7 +-
 821  drivers/net/ethernet/freescale/gianfar.c           |   27 +-
 822  drivers/net/ethernet/freescale/gianfar.h           |    2 -
 823  drivers/net/ethernet/freescale/ucc_geth.c          |   29 +--
 824  drivers/net/ethernet/freescale/ucc_geth.h          |    2 -
 825  drivers/net/ethernet/intel/e1000e/hw.h             |    2 +
 826  drivers/net/ethernet/intel/e1000e/netdev.c         |    2 +
 827  drivers/net/ethernet/intel/ixgbe/ixgbe.h           |    2 +-
 828  drivers/net/ethernet/intel/ixgbevf/ixgbevf.h       |    2 +-
 829  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |    7 +
 830  drivers/net/ethernet/marvell/mv643xx_eth.c         |   18 +-
 831  drivers/net/ethernet/marvell/skge.c                |   13 +-
 832  drivers/net/ethernet/marvell/sky2.c                |    5 +-
 833  drivers/net/ethernet/natsemi/natsemi.c             |    4 +-
 834  drivers/net/ethernet/natsemi/xtsonic.c             |    1 +
 835  drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |    3 +
 836  drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c   |    3 +-
 837  drivers/net/ethernet/realtek/8139cp.c              |    2 +-
 838  drivers/net/ethernet/renesas/sh_eth.c              |    1 +
 839  drivers/net/ethernet/sfc/ptp.c                     |    9 +-
 840  drivers/net/ethernet/sis/sis900.c                  |    4 +-
 841  drivers/net/ethernet/stmicro/stmmac/stmmac.h       |    1 -
 842  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |   20 +-
 843  drivers/net/ethernet/sun/niu.c                     |    1 +
 844  drivers/net/ethernet/sun/sungem.c                  |    3 +-
 845  drivers/net/irda/irtty-sir.c                       |    4 +-
 846  drivers/net/irda/mcs7780.c                         |    4 +-
 847  drivers/net/irda/pxaficp_ir.c                      |    4 +-
 848  drivers/net/irda/sa1100_ir.c                       |    4 +-
 849  drivers/net/irda/sh_irda.c                         |    4 +-
 850  drivers/net/irda/sh_sir.c                          |    5 +-
 851  drivers/net/phy/mdio_bus.c                         |    1 +
 852  drivers/net/vxlan.c                                |    5 +-
 853  drivers/net/wan/farsync.c                          |    2 +-
 854  include/linux/caif/Kbuild                          |    2 -
 855  include/linux/if_vlan.h                            |    8 +-
 856  include/linux/isdn/Kbuild                          |    1 -
 857  include/linux/netdevice.h                          |   19 +-
 858  include/linux/netfilter/Kbuild                     |   77 ------
 859  include/linux/netfilter/ipset/Kbuild               |    4 -
 860  include/linux/netfilter/ipset/ip_set.h             |  225 +---------------
 861  include/linux/netfilter/ipset/ip_set_bitmap.h      |   11 +-
 862  include/linux/netfilter/ipset/ip_set_hash.h        |   19 +-
 863  include/linux/netfilter/ipset/ip_set_list.h        |   19 +-
 864  include/linux/netfilter/nf_conntrack_common.h      |  115 +--------
 865  include/linux/netfilter/nf_conntrack_ftp.h         |   16 +-
 866  include/linux/netfilter/nf_conntrack_tcp.h         |   49 +---
 867  include/linux/netfilter/nfnetlink.h                |   55 +---
 868  include/linux/netfilter/nfnetlink_acct.h           |   25 +-
 869  include/linux/netfilter/x_tables.h                 |  186 +-------------
 870  include/linux/netfilter/xt_hashlimit.h             |   71 +-----
 871  include/linux/netfilter/xt_physdev.h               |   21 +-
 872  include/linux/netfilter_arp/Kbuild                 |    2 -
 873  include/linux/netfilter_arp/arp_tables.h           |  200 +--------------
 874  include/linux/netfilter_bridge/Kbuild              |   18 --
 875  include/linux/netfilter_bridge/ebt_802_3.h         |   61 +----
 876  include/linux/netfilter_bridge/ebtables.h          |  255 +------------------
 877  include/linux/netfilter_ipv4/Kbuild                |   10 -
 878  include/linux/netfilter_ipv4/ip_tables.h           |  218 +---------------
 879  include/linux/netfilter_ipv6/Kbuild                |   12 -
 880  include/linux/netfilter_ipv6/ip6_tables.h          |  256 +------------------
 881  include/linux/netlink.h                            |   20 +-
 882  include/linux/skbuff.h                             |   24 --
 883  include/linux/tc_act/Kbuild                        |    7 -
 884  include/linux/tc_ematch/Kbuild                     |    4 -
 885  include/net/flow.h                                 |    1 +
 886  include/net/route.h                                |    3 +-
 887  include/rdma/rdma_netlink.h                        |    1 +
 888  include/uapi/linux/caif/Kbuild                     |    2 +
 889  include/{ => uapi}/linux/caif/caif_socket.h        |    0
 890  include/{ => uapi}/linux/caif/if_caif.h            |    0
 891  include/uapi/linux/isdn/Kbuild                     |    1 +
 892  include/{ => uapi}/linux/isdn/capicmd.h            |    0
 893  include/uapi/linux/netfilter/Kbuild                |   76 ++++++
 894  include/uapi/linux/netfilter/ipset/Kbuild          |    4 +
 895  include/uapi/linux/netfilter/ipset/ip_set.h        |  231 +++++++++++++++++
 896  include/uapi/linux/netfilter/ipset/ip_set_bitmap.h |   13 +
 897  include/uapi/linux/netfilter/ipset/ip_set_hash.h   |   21 ++
 898  include/uapi/linux/netfilter/ipset/ip_set_list.h   |   21 ++
 899  include/uapi/linux/netfilter/nf_conntrack_common.h |  117 +++++++++
 900  include/uapi/linux/netfilter/nf_conntrack_ftp.h    |   18 ++
 901  .../{ => uapi}/linux/netfilter/nf_conntrack_sctp.h |    0
 902  include/uapi/linux/netfilter/nf_conntrack_tcp.h    |   51 ++++
 903  .../linux/netfilter/nf_conntrack_tuple_common.h    |    0
 904  include/{ => uapi}/linux/netfilter/nf_nat.h        |    0
 905  include/uapi/linux/netfilter/nfnetlink.h           |   56 ++++
 906  include/uapi/linux/netfilter/nfnetlink_acct.h      |   27 ++
 907  .../{ => uapi}/linux/netfilter/nfnetlink_compat.h  |    0
 908  .../linux/netfilter/nfnetlink_conntrack.h          |    0
 909  .../linux/netfilter/nfnetlink_cthelper.h           |    0
 910  .../linux/netfilter/nfnetlink_cttimeout.h          |    0
 911  include/{ => uapi}/linux/netfilter/nfnetlink_log.h |    0
 912  .../{ => uapi}/linux/netfilter/nfnetlink_queue.h   |    0
 913  include/uapi/linux/netfilter/x_tables.h            |  187 ++++++++++++++
 914  include/{ => uapi}/linux/netfilter/xt_AUDIT.h      |    0
 915  include/{ => uapi}/linux/netfilter/xt_CHECKSUM.h   |    0
 916  include/{ => uapi}/linux/netfilter/xt_CLASSIFY.h   |    0
 917  include/{ => uapi}/linux/netfilter/xt_CONNMARK.h   |    0
 918  .../{ => uapi}/linux/netfilter/xt_CONNSECMARK.h    |    0
 919  include/{ => uapi}/linux/netfilter/xt_CT.h         |    0
 920  include/{ => uapi}/linux/netfilter/xt_DSCP.h       |    0
 921  include/{ => uapi}/linux/netfilter/xt_IDLETIMER.h  |    0
 922  include/{ => uapi}/linux/netfilter/xt_LED.h        |    0
 923  include/{ => uapi}/linux/netfilter/xt_LOG.h        |    0
 924  include/{ => uapi}/linux/netfilter/xt_MARK.h       |    0
 925  include/{ => uapi}/linux/netfilter/xt_NFLOG.h      |    0
 926  include/{ => uapi}/linux/netfilter/xt_NFQUEUE.h    |    0
 927  include/{ => uapi}/linux/netfilter/xt_RATEEST.h    |    0
 928  include/{ => uapi}/linux/netfilter/xt_SECMARK.h    |    0
 929  include/{ => uapi}/linux/netfilter/xt_TCPMSS.h     |    0
 930  .../{ => uapi}/linux/netfilter/xt_TCPOPTSTRIP.h    |    0
 931  include/{ => uapi}/linux/netfilter/xt_TEE.h        |    0
 932  include/{ => uapi}/linux/netfilter/xt_TPROXY.h     |    0
 933  include/{ => uapi}/linux/netfilter/xt_addrtype.h   |    0
 934  include/{ => uapi}/linux/netfilter/xt_cluster.h    |    0
 935  include/{ => uapi}/linux/netfilter/xt_comment.h    |    0
 936  include/{ => uapi}/linux/netfilter/xt_connbytes.h  |    0
 937  include/{ => uapi}/linux/netfilter/xt_connlimit.h  |    0
 938  include/{ => uapi}/linux/netfilter/xt_connmark.h   |    0
 939  include/{ => uapi}/linux/netfilter/xt_conntrack.h  |    0
 940  include/{ => uapi}/linux/netfilter/xt_cpu.h        |    0
 941  include/{ => uapi}/linux/netfilter/xt_dccp.h       |    0
 942  include/{ => uapi}/linux/netfilter/xt_devgroup.h   |    0
 943  include/{ => uapi}/linux/netfilter/xt_dscp.h       |    0
 944  include/{ => uapi}/linux/netfilter/xt_ecn.h        |    0
 945  include/{ => uapi}/linux/netfilter/xt_esp.h        |    0
 946  include/uapi/linux/netfilter/xt_hashlimit.h        |   73 ++++++
 947  include/{ => uapi}/linux/netfilter/xt_helper.h     |    0
 948  include/{ => uapi}/linux/netfilter/xt_iprange.h    |    0
 949  include/{ => uapi}/linux/netfilter/xt_ipvs.h       |    0
 950  include/{ => uapi}/linux/netfilter/xt_length.h     |    0
 951  include/{ => uapi}/linux/netfilter/xt_limit.h      |    0
 952  include/{ => uapi}/linux/netfilter/xt_mac.h        |    0
 953  include/{ => uapi}/linux/netfilter/xt_mark.h       |    0
 954  include/{ => uapi}/linux/netfilter/xt_multiport.h  |    0
 955  include/{ => uapi}/linux/netfilter/xt_nfacct.h     |    0
 956  include/{ => uapi}/linux/netfilter/xt_osf.h        |    0
 957  include/{ => uapi}/linux/netfilter/xt_owner.h      |    0
 958  include/uapi/linux/netfilter/xt_physdev.h          |   23 ++
 959  include/{ => uapi}/linux/netfilter/xt_pkttype.h    |    0
 960  include/{ => uapi}/linux/netfilter/xt_policy.h     |    0
 961  include/{ => uapi}/linux/netfilter/xt_quota.h      |    0
 962  include/{ => uapi}/linux/netfilter/xt_rateest.h    |    0
 963  include/{ => uapi}/linux/netfilter/xt_realm.h      |    0
 964  include/{ => uapi}/linux/netfilter/xt_recent.h     |    0
 965  include/{ => uapi}/linux/netfilter/xt_sctp.h       |    0
 966  include/{ => uapi}/linux/netfilter/xt_set.h        |    0
 967  include/{ => uapi}/linux/netfilter/xt_socket.h     |    0
 968  include/{ => uapi}/linux/netfilter/xt_state.h      |    0
 969  include/{ => uapi}/linux/netfilter/xt_statistic.h  |    0
 970  include/{ => uapi}/linux/netfilter/xt_string.h     |    0
 971  include/{ => uapi}/linux/netfilter/xt_tcpmss.h     |    0
 972  include/{ => uapi}/linux/netfilter/xt_tcpudp.h     |    0
 973  include/{ => uapi}/linux/netfilter/xt_time.h       |    0
 974  include/{ => uapi}/linux/netfilter/xt_u32.h        |    0
 975  include/uapi/linux/netfilter_arp/Kbuild            |    2 +
 976  include/uapi/linux/netfilter_arp/arp_tables.h      |  206 +++++++++++++++
 977  .../{ => uapi}/linux/netfilter_arp/arpt_mangle.h   |    0
 978  include/uapi/linux/netfilter_bridge/Kbuild         |   18 ++
 979  include/uapi/linux/netfilter_bridge/ebt_802_3.h    |   62 +++++
 980  .../{ => uapi}/linux/netfilter_bridge/ebt_among.h  |    0
 981  .../{ => uapi}/linux/netfilter_bridge/ebt_arp.h    |    0
 982  .../linux/netfilter_bridge/ebt_arpreply.h          |    0
 983  include/{ => uapi}/linux/netfilter_bridge/ebt_ip.h |    0
 984  .../{ => uapi}/linux/netfilter_bridge/ebt_ip6.h    |    0
 985  .../{ => uapi}/linux/netfilter_bridge/ebt_limit.h  |    0
 986  .../{ => uapi}/linux/netfilter_bridge/ebt_log.h    |    0
 987  .../{ => uapi}/linux/netfilter_bridge/ebt_mark_m.h |    0
 988  .../{ => uapi}/linux/netfilter_bridge/ebt_mark_t.h |    0
 989  .../{ => uapi}/linux/netfilter_bridge/ebt_nat.h    |    0
 990  .../{ => uapi}/linux/netfilter_bridge/ebt_nflog.h  |    0
 991  .../linux/netfilter_bridge/ebt_pkttype.h           |    0
 992  .../linux/netfilter_bridge/ebt_redirect.h          |    0
 993  .../{ => uapi}/linux/netfilter_bridge/ebt_stp.h    |    0
 994  .../{ => uapi}/linux/netfilter_bridge/ebt_ulog.h   |    0
 995  .../{ => uapi}/linux/netfilter_bridge/ebt_vlan.h   |    0
 996  include/uapi/linux/netfilter_bridge/ebtables.h     |  268 ++++++++++++++++++++
 997  include/uapi/linux/netfilter_ipv4/Kbuild           |   10 +
 998  include/uapi/linux/netfilter_ipv4/ip_tables.h      |  229 +++++++++++++++++
 999  .../linux/netfilter_ipv4/ipt_CLUSTERIP.h           |    0
1000  include/{ => uapi}/linux/netfilter_ipv4/ipt_ECN.h  |    0
1001  include/{ => uapi}/linux/netfilter_ipv4/ipt_LOG.h  |    0
1002  .../{ => uapi}/linux/netfilter_ipv4/ipt_REJECT.h   |    0
1003  include/{ => uapi}/linux/netfilter_ipv4/ipt_TTL.h  |    0
1004  include/{ => uapi}/linux/netfilter_ipv4/ipt_ULOG.h |    0
1005  include/{ => uapi}/linux/netfilter_ipv4/ipt_ah.h   |    0
1006  include/{ => uapi}/linux/netfilter_ipv4/ipt_ecn.h  |    0
1007  include/{ => uapi}/linux/netfilter_ipv4/ipt_ttl.h  |    0
1008  include/uapi/linux/netfilter_ipv6/Kbuild           |   12 +
1009  include/uapi/linux/netfilter_ipv6/ip6_tables.h     |  267 +++++++++++++++++++
1010  include/{ => uapi}/linux/netfilter_ipv6/ip6t_HL.h  |    0
1011  include/{ => uapi}/linux/netfilter_ipv6/ip6t_LOG.h |    0
1012  include/{ => uapi}/linux/netfilter_ipv6/ip6t_NPT.h |    0
1013  .../{ => uapi}/linux/netfilter_ipv6/ip6t_REJECT.h  |    0
1014  include/{ => uapi}/linux/netfilter_ipv6/ip6t_ah.h  |    0
1015  .../{ => uapi}/linux/netfilter_ipv6/ip6t_frag.h    |    0
1016  include/{ => uapi}/linux/netfilter_ipv6/ip6t_hl.h  |    0
1017  .../linux/netfilter_ipv6/ip6t_ipv6header.h         |    0
1018  include/{ => uapi}/linux/netfilter_ipv6/ip6t_mh.h  |    0
1019  .../{ => uapi}/linux/netfilter_ipv6/ip6t_opts.h    |    0
1020  include/{ => uapi}/linux/netfilter_ipv6/ip6t_rt.h  |    0
1021  include/uapi/linux/tc_act/Kbuild                   |    7 +
1022  include/{ => uapi}/linux/tc_act/tc_csum.h          |    0
1023  include/{ => uapi}/linux/tc_act/tc_gact.h          |    0
1024  include/{ => uapi}/linux/tc_act/tc_ipt.h           |    0
1025  include/{ => uapi}/linux/tc_act/tc_mirred.h        |    0
1026  include/{ => uapi}/linux/tc_act/tc_nat.h           |    0
1027  include/{ => uapi}/linux/tc_act/tc_pedit.h         |    0
1028  include/{ => uapi}/linux/tc_act/tc_skbedit.h       |    0
1029  include/uapi/linux/tc_ematch/Kbuild                |    4 +
1030  include/{ => uapi}/linux/tc_ematch/tc_em_cmp.h     |    0
1031  include/{ => uapi}/linux/tc_ematch/tc_em_meta.h    |    0
1032  include/{ => uapi}/linux/tc_ematch/tc_em_nbyte.h   |    0
1033  include/{ => uapi}/linux/tc_ematch/tc_em_text.h    |    0
1034  net/8021q/vlan_core.c                              |   10 +-
1035  net/core/dev.c                                     |   59 +++--
1036  net/core/neighbour.c                               |    6 +-
1037  net/core/skbuff.c                                  |   47 ----
1038  net/ipv4/fib_frontend.c                            |    3 +-
1039  net/ipv4/fib_semantics.c                           |    2 +
1040  net/ipv4/inet_connection_sock.c                    |    4 +-
1041  net/ipv4/ip_forward.c                              |    2 +-
1042  net/ipv4/ip_output.c                               |    4 +-
1043  net/ipv4/route.c                                   |  146 ++++++-----
1044  net/ipv4/xfrm4_policy.c                            |    1 +
1045  net/ipv6/af_inet6.c                                |   22 +-
1046  net/netfilter/ipvs/ip_vs_xmit.c                    |    6 +-
1047  net/netlink/af_netlink.c                           |   29 ++-
1048  net/rds/send.c                                     |    2 +-
1049  238 files changed, 2392 insertions(+), 2292 deletions(-)
1050  rename include/{ => uapi}/linux/caif/caif_socket.h (100%)
1051  rename include/{ => uapi}/linux/caif/if_caif.h (100%)
1052  rename include/{ => uapi}/linux/isdn/capicmd.h (100%)
1053  create mode 100644 include/uapi/linux/netfilter/ipset/ip_set.h
1054  create mode 100644 include/uapi/linux/netfilter/ipset/ip_set_bitmap.h
1055  create mode 100644 include/uapi/linux/netfilter/ipset/ip_set_hash.h
1056  create mode 100644 include/uapi/linux/netfilter/ipset/ip_set_list.h
1057  create mode 100644 include/uapi/linux/netfilter/nf_conntrack_common.h
1058  create mode 100644 include/uapi/linux/netfilter/nf_conntrack_ftp.h
1059  rename include/{ => uapi}/linux/netfilter/nf_conntrack_sctp.h (100%)
1060  create mode 100644 include/uapi/linux/netfilter/nf_conntrack_tcp.h
1061  rename include/{ => uapi}/linux/netfilter/nf_conntrack_tuple_common.h (100%)
1062  rename include/{ => uapi}/linux/netfilter/nf_nat.h (100%)
1063  create mode 100644 include/uapi/linux/netfilter/nfnetlink.h
1064  create mode 100644 include/uapi/linux/netfilter/nfnetlink_acct.h
1065  rename include/{ => uapi}/linux/netfilter/nfnetlink_compat.h (100%)
1066  rename include/{ => uapi}/linux/netfilter/nfnetlink_conntrack.h (100%)
1067  rename include/{ => uapi}/linux/netfilter/nfnetlink_cthelper.h (100%)
1068  rename include/{ => uapi}/linux/netfilter/nfnetlink_cttimeout.h (100%)
1069  rename include/{ => uapi}/linux/netfilter/nfnetlink_log.h (100%)
1070  rename include/{ => uapi}/linux/netfilter/nfnetlink_queue.h (100%)
1071  create mode 100644 include/uapi/linux/netfilter/x_tables.h
1072  rename include/{ => uapi}/linux/netfilter/xt_AUDIT.h (100%)
1073  rename include/{ => uapi}/linux/netfilter/xt_CHECKSUM.h (100%)
1074  rename include/{ => uapi}/linux/netfilter/xt_CLASSIFY.h (100%)
1075  rename include/{ => uapi}/linux/netfilter/xt_CONNMARK.h (100%)
1076  rename include/{ => uapi}/linux/netfilter/xt_CONNSECMARK.h (100%)
1077  rename include/{ => uapi}/linux/netfilter/xt_CT.h (100%)
1078  rename include/{ => uapi}/linux/netfilter/xt_DSCP.h (100%)
1079  rename include/{ => uapi}/linux/netfilter/xt_IDLETIMER.h (100%)
1080  rename include/{ => uapi}/linux/netfilter/xt_LED.h (100%)
1081  rename include/{ => uapi}/linux/netfilter/xt_LOG.h (100%)
1082  rename include/{ => uapi}/linux/netfilter/xt_MARK.h (100%)
1083  rename include/{ => uapi}/linux/netfilter/xt_NFLOG.h (100%)
1084  rename include/{ => uapi}/linux/netfilter/xt_NFQUEUE.h (100%)
1085  rename include/{ => uapi}/linux/netfilter/xt_RATEEST.h (100%)
1086  rename include/{ => uapi}/linux/netfilter/xt_SECMARK.h (100%)
1087  rename include/{ => uapi}/linux/netfilter/xt_TCPMSS.h (100%)
1088  rename include/{ => uapi}/linux/netfilter/xt_TCPOPTSTRIP.h (100%)
1089  rename include/{ => uapi}/linux/netfilter/xt_TEE.h (100%)
1090  rename include/{ => uapi}/linux/netfilter/xt_TPROXY.h (100%)
1091  rename include/{ => uapi}/linux/netfilter/xt_addrtype.h (100%)
1092  rename include/{ => uapi}/linux/netfilter/xt_cluster.h (100%)
1093  rename include/{ => uapi}/linux/netfilter/xt_comment.h (100%)
1094  rename include/{ => uapi}/linux/netfilter/xt_connbytes.h (100%)
1095  rename include/{ => uapi}/linux/netfilter/xt_connlimit.h (100%)
1096  rename include/{ => uapi}/linux/netfilter/xt_connmark.h (100%)
1097  rename include/{ => uapi}/linux/netfilter/xt_conntrack.h (100%)
1098  rename include/{ => uapi}/linux/netfilter/xt_cpu.h (100%)
1099  rename include/{ => uapi}/linux/netfilter/xt_dccp.h (100%)
1100  rename include/{ => uapi}/linux/netfilter/xt_devgroup.h (100%)
1101  rename include/{ => uapi}/linux/netfilter/xt_dscp.h (100%)
1102  rename include/{ => uapi}/linux/netfilter/xt_ecn.h (100%)
1103  rename include/{ => uapi}/linux/netfilter/xt_esp.h (100%)
1104  create mode 100644 include/uapi/linux/netfilter/xt_hashlimit.h
1105  rename include/{ => uapi}/linux/netfilter/xt_helper.h (100%)
1106  rename include/{ => uapi}/linux/netfilter/xt_iprange.h (100%)
1107  rename include/{ => uapi}/linux/netfilter/xt_ipvs.h (100%)
1108  rename include/{ => uapi}/linux/netfilter/xt_length.h (100%)
1109  rename include/{ => uapi}/linux/netfilter/xt_limit.h (100%)
1110  rename include/{ => uapi}/linux/netfilter/xt_mac.h (100%)
1111  rename include/{ => uapi}/linux/netfilter/xt_mark.h (100%)
1112  rename include/{ => uapi}/linux/netfilter/xt_multiport.h (100%)
1113  rename include/{ => uapi}/linux/netfilter/xt_nfacct.h (100%)
1114  rename include/{ => uapi}/linux/netfilter/xt_osf.h (100%)
1115  rename include/{ => uapi}/linux/netfilter/xt_owner.h (100%)
1116  create mode 100644 include/uapi/linux/netfilter/xt_physdev.h
1117  rename include/{ => uapi}/linux/netfilter/xt_pkttype.h (100%)
1118  rename include/{ => uapi}/linux/netfilter/xt_policy.h (100%)
1119  rename include/{ => uapi}/linux/netfilter/xt_quota.h (100%)
1120  rename include/{ => uapi}/linux/netfilter/xt_rateest.h (100%)
1121  rename include/{ => uapi}/linux/netfilter/xt_realm.h (100%)
1122  rename include/{ => uapi}/linux/netfilter/xt_recent.h (100%)
1123  rename include/{ => uapi}/linux/netfilter/xt_sctp.h (100%)
1124  rename include/{ => uapi}/linux/netfilter/xt_set.h (100%)
1125  rename include/{ => uapi}/linux/netfilter/xt_socket.h (100%)
1126  rename include/{ => uapi}/linux/netfilter/xt_state.h (100%)
1127  rename include/{ => uapi}/linux/netfilter/xt_statistic.h (100%)
1128  rename include/{ => uapi}/linux/netfilter/xt_string.h (100%)
1129  rename include/{ => uapi}/linux/netfilter/xt_tcpmss.h (100%)
1130  rename include/{ => uapi}/linux/netfilter/xt_tcpudp.h (100%)
1131  rename include/{ => uapi}/linux/netfilter/xt_time.h (100%)
1132  rename include/{ => uapi}/linux/netfilter/xt_u32.h (100%)
1133  create mode 100644 include/uapi/linux/netfilter_arp/arp_tables.h
1134  rename include/{ => uapi}/linux/netfilter_arp/arpt_mangle.h (100%)
1135  create mode 100644 include/uapi/linux/netfilter_bridge/ebt_802_3.h
1136  rename include/{ => uapi}/linux/netfilter_bridge/ebt_among.h (100%)
1137  rename include/{ => uapi}/linux/netfilter_bridge/ebt_arp.h (100%)
1138  rename include/{ => uapi}/linux/netfilter_bridge/ebt_arpreply.h (100%)
1139  rename include/{ => uapi}/linux/netfilter_bridge/ebt_ip.h (100%)
1140  rename include/{ => uapi}/linux/netfilter_bridge/ebt_ip6.h (100%)
1141  rename include/{ => uapi}/linux/netfilter_bridge/ebt_limit.h (100%)
1142  rename include/{ => uapi}/linux/netfilter_bridge/ebt_log.h (100%)
1143  rename include/{ => uapi}/linux/netfilter_bridge/ebt_mark_m.h (100%)
1144  rename include/{ => uapi}/linux/netfilter_bridge/ebt_mark_t.h (100%)
1145  rename include/{ => uapi}/linux/netfilter_bridge/ebt_nat.h (100%)
1146  rename include/{ => uapi}/linux/netfilter_bridge/ebt_nflog.h (100%)
1147  rename include/{ => uapi}/linux/netfilter_bridge/ebt_pkttype.h (100%)
1148  rename include/{ => uapi}/linux/netfilter_bridge/ebt_redirect.h (100%)
1149  rename include/{ => uapi}/linux/netfilter_bridge/ebt_stp.h (100%)
1150  rename include/{ => uapi}/linux/netfilter_bridge/ebt_ulog.h (100%)
1151  rename include/{ => uapi}/linux/netfilter_bridge/ebt_vlan.h (100%)
1152  create mode 100644 include/uapi/linux/netfilter_bridge/ebtables.h
1153  create mode 100644 include/uapi/linux/netfilter_ipv4/ip_tables.h
1154  rename include/{ => uapi}/linux/netfilter_ipv4/ipt_CLUSTERIP.h (100%)
1155  rename include/{ => uapi}/linux/netfilter_ipv4/ipt_ECN.h (100%)
1156  rename include/{ => uapi}/linux/netfilter_ipv4/ipt_LOG.h (100%)
1157  rename include/{ => uapi}/linux/netfilter_ipv4/ipt_REJECT.h (100%)
1158  rename include/{ => uapi}/linux/netfilter_ipv4/ipt_TTL.h (100%)
1159  rename include/{ => uapi}/linux/netfilter_ipv4/ipt_ULOG.h (100%)
1160  rename include/{ => uapi}/linux/netfilter_ipv4/ipt_ah.h (100%)
1161  rename include/{ => uapi}/linux/netfilter_ipv4/ipt_ecn.h (100%)
1162  rename include/{ => uapi}/linux/netfilter_ipv4/ipt_ttl.h (100%)
1163  create mode 100644 include/uapi/linux/netfilter_ipv6/ip6_tables.h
1164  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_HL.h (100%)
1165  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_LOG.h (100%)
1166  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_NPT.h (100%)
1167  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_REJECT.h (100%)
1168  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_ah.h (100%)
1169  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_frag.h (100%)
1170  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_hl.h (100%)
1171  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_ipv6header.h (100%)
1172  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_mh.h (100%)
1173  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_opts.h (100%)
1174  rename include/{ => uapi}/linux/netfilter_ipv6/ip6t_rt.h (100%)
1175  rename include/{ => uapi}/linux/tc_act/tc_csum.h (100%)
1176  rename include/{ => uapi}/linux/tc_act/tc_gact.h (100%)
1177  rename include/{ => uapi}/linux/tc_act/tc_ipt.h (100%)
1178  rename include/{ => uapi}/linux/tc_act/tc_mirred.h (100%)
1179  rename include/{ => uapi}/linux/tc_act/tc_nat.h (100%)
1180  rename include/{ => uapi}/linux/tc_act/tc_pedit.h (100%)
1181  rename include/{ => uapi}/linux/tc_act/tc_skbedit.h (100%)
1182  rename include/{ => uapi}/linux/tc_ematch/tc_em_cmp.h (100%)
1183  rename include/{ => uapi}/linux/tc_ematch/tc_em_meta.h (100%)
1184  rename include/{ => uapi}/linux/tc_ematch/tc_em_nbyte.h (100%)
1185  rename include/{ => uapi}/linux/tc_ematch/tc_em_text.h (100%)
1186 Merging sound-current/for-linus (5d037f9 Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
1187 $ git merge sound-current/for-linus
1188 Already up-to-date.
1189 Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
1190 $ git merge pci-current/for-linus
1191 Already up-to-date.
1192 Merging wireless/master (c3e7724 mac80211: use ieee80211_free_txskb to fix possible skb leaks)
1193 $ git merge wireless/master
1194 Merge made by the 'recursive' strategy.
1195  drivers/net/wireless/ath/ath5k/base.c        |    3 +-
1196  drivers/net/wireless/ath/ath9k/beacon.c      |    2 +-
1197  drivers/net/wireless/ath/ath9k/hw.c          |    5 +++
1198  drivers/net/wireless/ath/ath9k/hw.h          |    1 +
1199  drivers/net/wireless/ath/ath9k/main.c        |   15 +++-----
1200  drivers/net/wireless/ath/ath9k/pci.c         |    7 ++++
1201  drivers/net/wireless/ath/ath9k/xmit.c        |   53 ++++++++++++++------------
1202  drivers/net/wireless/ath/carl9170/carl9170.h |    1 +
1203  drivers/net/wireless/ath/carl9170/main.c     |   29 +++++++-------
1204  drivers/net/wireless/mwifiex/cfg80211.c      |   27 ++++++++++---
1205  drivers/net/wireless/mwifiex/join.c          |    6 ++-
1206  drivers/net/wireless/mwifiex/main.h          |    2 +-
1207  drivers/net/wireless/mwifiex/scan.c          |   38 +++++++++---------
1208  drivers/net/wireless/mwifiex/sta_cmdresp.c   |    4 +-
1209  drivers/net/wireless/mwifiex/sta_event.c     |   31 +++++++++------
1210  drivers/net/wireless/rt2x00/rt2800lib.c      |    4 +-
1211  net/mac80211/mesh_sync.c                     |    3 +-
1212  net/mac80211/status.c                        |    4 +-
1213  net/mac80211/tx.c                            |   22 ++++++-----
1214  19 files changed, 151 insertions(+), 106 deletions(-)
1215 Merging driver-core.current/driver-core-linus (5698bd7 Linux 3.6-rc6)
1216 $ git merge driver-core.current/driver-core-linus
1217 Already up-to-date.
1218 Merging tty.current/tty-linus (b70936d tty: serial: sccnxp: Fix bug with unterminated platform_id list)
1219 $ git merge tty.current/tty-linus
1220 Merge made by the 'recursive' strategy.
1221  drivers/staging/dgrp/dgrp_mon_ops.c  |    1 +
1222  drivers/staging/dgrp/dgrp_specproc.c |    1 +
1223  drivers/staging/dgrp/dgrp_tty.c      |    1 +
1224  drivers/tty/serial/Kconfig           |    4 ++--
1225  drivers/tty/serial/sccnxp.c          |    1 +
1226  include/linux/ratelimit.h            |   27 +++++++++------------------
1227  net/irda/ircomm/ircomm_tty.c         |    2 ++
1228  7 files changed, 17 insertions(+), 20 deletions(-)
1229 Merging usb.current/usb-linus (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
1230 $ git merge usb.current/usb-linus
1231 Already up-to-date.
1232 Merging staging.current/staging-linus (5698bd7 Linux 3.6-rc6)
1233 $ git merge staging.current/staging-linus
1234 Already up-to-date.
1235 Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3)
1236 $ git merge char-misc.current/char-misc-linus
1237 Already up-to-date.
1238 Merging input-current/for-linus (dde3ada Merge branch 'next' into for-linus)
1239 $ git merge input-current/for-linus
1240 Already up-to-date.
1241 Merging md-current/for-linus (80b4812 md/raid10: fix "enough" function for detecting if array is failed.)
1242 $ git merge md-current/for-linus
1243 Already up-to-date.
1244 Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
1245 $ git merge audit-current/for-linus
1246 Already up-to-date.
1247 Merging crypto-current/master (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
1248 $ git merge crypto-current/master
1249 Already up-to-date.
1250 Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
1251 $ git merge ide/master
1252 Already up-to-date.
1253 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
1254 $ git merge dwmw2/master
1255 Already up-to-date.
1256 Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
1257 $ git merge sh-current/sh-fixes-for-linus
1258 Already up-to-date.
1259 Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
1260 $ git merge irqdomain-current/irqdomain/merge
1261 Already up-to-date.
1262 Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
1263 $ git merge devicetree-current/devicetree/merge
1264 Auto-merging drivers/of/base.c
1265 Merge made by the 'recursive' strategy.
1266  drivers/of/base.c |    2 ++
1267  1 file changed, 2 insertions(+)
1268 Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
1269 $ git merge spi-current/spi/merge
1270 Auto-merging drivers/spi/spi.c
1271 Auto-merging drivers/spi/spi-s3c64xx.c
1272 Auto-merging drivers/spi/spi-bcm63xx.c
1273 Merge made by the 'recursive' strategy.
1274  drivers/spi/spi-bcm63xx.c |   16 ++++++----------
1275  drivers/spi/spi-s3c64xx.c |   10 ++++------
1276  drivers/spi/spi.c         |    5 ++++-
1277  3 files changed, 14 insertions(+), 17 deletions(-)
1278 Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
1279 $ git merge gpio-current/gpio/merge
1280 Already up-to-date.
1281 Merging asm-generic/master (c37d615 Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic)
1282 $ git merge asm-generic/master
1283 Already up-to-date.
1284 Merging arm/for-next (4231a1e Merge branch 'devel-stable' into for-next)
1285 $ git merge arm/for-next
1286 Merge made by the 'recursive' strategy.
1287  Documentation/arm/Booting           |   22 +++-
1288  arch/arm/boot/compressed/.gitignore |    1 +
1289  arch/arm/boot/compressed/Makefile   |    9 +-
1290  arch/arm/boot/compressed/head.S     |   71 +++++++++--
1291  arch/arm/include/asm/assembler.h    |   29 +++++
1292  arch/arm/include/asm/cacheflush.h   |   15 +++
1293  arch/arm/include/asm/glue-cache.h   |    1 +
1294  arch/arm/include/asm/opcodes-virt.h |   10 ++
1295  arch/arm/include/asm/ptrace.h       |    1 +
1296  arch/arm/include/asm/virt.h         |   69 +++++++++++
1297  arch/arm/kernel/Makefile            |    2 +
1298  arch/arm/kernel/head.S              |   14 ++-
1299  arch/arm/kernel/hyp-stub.S          |  223 +++++++++++++++++++++++++++++++++++
1300  arch/arm/kernel/setup.c             |   20 ++++
1301  arch/arm/kernel/smp.c               |    8 +-
1302  arch/arm/kernel/suspend.c           |   17 ++-
1303  arch/arm/mm/Kconfig                 |   17 +++
1304  arch/arm/mm/cache-fa.S              |    3 +
1305  arch/arm/mm/cache-v3.S              |    3 +
1306  arch/arm/mm/cache-v4.S              |    3 +
1307  arch/arm/mm/cache-v4wb.S            |    3 +
1308  arch/arm/mm/cache-v4wt.S            |    3 +
1309  arch/arm/mm/cache-v6.S              |    3 +
1310  arch/arm/mm/cache-v7.S              |   48 +++++++-
1311  arch/arm/mm/proc-arm1020.S          |    3 +
1312  arch/arm/mm/proc-arm1020e.S         |    3 +
1313  arch/arm/mm/proc-arm1022.S          |    3 +
1314  arch/arm/mm/proc-arm1026.S          |    3 +
1315  arch/arm/mm/proc-arm920.S           |    3 +
1316  arch/arm/mm/proc-arm922.S           |    3 +
1317  arch/arm/mm/proc-arm925.S           |    3 +
1318  arch/arm/mm/proc-arm926.S           |    3 +
1319  arch/arm/mm/proc-arm940.S           |    3 +
1320  arch/arm/mm/proc-arm946.S           |    3 +
1321  arch/arm/mm/proc-feroceon.S         |    4 +
1322  arch/arm/mm/proc-macros.S           |    1 +
1323  arch/arm/mm/proc-mohawk.S           |    3 +
1324  arch/arm/mm/proc-v7.S               |    2 +-
1325  arch/arm/mm/proc-xsc3.S             |    3 +
1326  arch/arm/mm/proc-xscale.S           |    4 +
1327  40 files changed, 621 insertions(+), 21 deletions(-)
1328  create mode 100644 arch/arm/include/asm/virt.h
1329  create mode 100644 arch/arm/kernel/hyp-stub.S
1330 Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf)
1331 $ git merge arm-perf/for-next/perf
1332 Resolved 'arch/arm/kernel/hw_breakpoint.c' using previous resolution.
1333 Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution.
1334 Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution.
1335 Auto-merging arch/arm/mach-ux500/cpu-db8500.c
1336 CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
1337 CONFLICT (modify/delete): arch/arm/mach-tegra/devices.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-tegra/devices.c left in tree.
1338 Auto-merging arch/arm/mach-omap2/devices.c
1339 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
1340 CONFLICT (modify/delete): arch/arm/mach-bcmring/arch.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-bcmring/arch.c left in tree.
1341 Auto-merging arch/arm/kernel/hw_breakpoint.c
1342 CONFLICT (content): Merge conflict in arch/arm/kernel/hw_breakpoint.c
1343 Automatic merge failed; fix conflicts and then commit the result.
1344 $ git rm -f arch/arm/mach-tegra/devices.c arch/arm/mach-bcmring/arch.c
1345 arch/arm/mach-bcmring/arch.c: needs merge
1346 arch/arm/mach-tegra/devices.c: needs merge
1347 rm 'arch/arm/mach-bcmring/arch.c'
1348 rm 'arch/arm/mach-tegra/devices.c'
1349 $ git commit -v -a
1350 [master 756337c] Merge remote-tracking branch 'arm-perf/for-next/perf'
1351 $ git diff -M --stat --summary HEAD^..
1352 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
1353 $ git merge davinci/davinci-next
1354 Already up-to-date.
1355 Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
1356 $ git merge xilinx/arm-next
1357 Already up-to-date.
1358 Merging arm64/upstream (6916fd0 arm64: Enable interrupts before calling do_notify_resume())
1359 $ git merge arm64/upstream
1360 Already up-to-date.
1361 Merging blackfin/for-linus (9f57151 Merge tag 'disintegrate-blackfin-20121009' into for-linus)
1362 $ git merge blackfin/for-linus
1363 Merge made by the 'recursive' strategy.
1364  arch/blackfin/include/asm/Kbuild                   |    5 -
1365  arch/blackfin/include/asm/bfin_sport.h             |  128 +-----
1366  arch/blackfin/include/asm/fixed_code.h             |   30 +-
1367  arch/blackfin/include/asm/ptrace.h                 |  161 +-------
1368  arch/blackfin/include/asm/unistd.h                 |  430 +------------------
1369  arch/blackfin/include/uapi/asm/Kbuild              |   16 +
1370  arch/blackfin/include/uapi/asm/bfin_sport.h        |  136 ++++++
1371  arch/blackfin/include/{ => uapi}/asm/byteorder.h   |    0
1372  arch/blackfin/include/{ => uapi}/asm/cachectl.h    |    0
1373  arch/blackfin/include/{ => uapi}/asm/fcntl.h       |    0
1374  arch/blackfin/include/uapi/asm/fixed_code.h        |   38 ++
1375  arch/blackfin/include/{ => uapi}/asm/ioctls.h      |    0
1376  arch/blackfin/include/{ => uapi}/asm/kvm_para.h    |    0
1377  arch/blackfin/include/{ => uapi}/asm/poll.h        |    0
1378  arch/blackfin/include/{ => uapi}/asm/posix_types.h |    0
1379  arch/blackfin/include/uapi/asm/ptrace.h            |  170 ++++++++
1380  arch/blackfin/include/{ => uapi}/asm/sigcontext.h  |    0
1381  arch/blackfin/include/{ => uapi}/asm/siginfo.h     |    0
1382  arch/blackfin/include/{ => uapi}/asm/signal.h      |    0
1383  arch/blackfin/include/{ => uapi}/asm/stat.h        |    0
1384  arch/blackfin/include/{ => uapi}/asm/swab.h        |    0
1385  arch/blackfin/include/uapi/asm/unistd.h            |  437 ++++++++++++++++++++
1386  22 files changed, 802 insertions(+), 749 deletions(-)
1387  create mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h
1388  rename arch/blackfin/include/{ => uapi}/asm/byteorder.h (100%)
1389  rename arch/blackfin/include/{ => uapi}/asm/cachectl.h (100%)
1390  rename arch/blackfin/include/{ => uapi}/asm/fcntl.h (100%)
1391  create mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h
1392  rename arch/blackfin/include/{ => uapi}/asm/ioctls.h (100%)
1393  rename arch/blackfin/include/{ => uapi}/asm/kvm_para.h (100%)
1394  rename arch/blackfin/include/{ => uapi}/asm/poll.h (100%)
1395  rename arch/blackfin/include/{ => uapi}/asm/posix_types.h (100%)
1396  create mode 100644 arch/blackfin/include/uapi/asm/ptrace.h
1397  rename arch/blackfin/include/{ => uapi}/asm/sigcontext.h (100%)
1398  rename arch/blackfin/include/{ => uapi}/asm/siginfo.h (100%)
1399  rename arch/blackfin/include/{ => uapi}/asm/signal.h (100%)
1400  rename arch/blackfin/include/{ => uapi}/asm/stat.h (100%)
1401  rename arch/blackfin/include/{ => uapi}/asm/swab.h (100%)
1402  create mode 100644 arch/blackfin/include/uapi/asm/unistd.h
1403 Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
1404 $ git merge c6x/for-linux-next
1405 Merge made by the 'recursive' strategy.
1406  arch/c6x/include/asm/Kbuild                  |    1 -
1407  arch/c6x/include/asm/ptrace.h                |  146 +----------------------
1408  arch/c6x/include/uapi/asm/Kbuild             |    7 ++
1409  arch/c6x/include/{ => uapi}/asm/byteorder.h  |    0
1410  arch/c6x/include/{ => uapi}/asm/kvm_para.h   |    0
1411  arch/c6x/include/uapi/asm/ptrace.h           |  163 ++++++++++++++++++++++++++
1412  arch/c6x/include/{ => uapi}/asm/setup.h      |    0
1413  arch/c6x/include/{ => uapi}/asm/sigcontext.h |    0
1414  arch/c6x/include/{ => uapi}/asm/swab.h       |    0
1415  arch/c6x/include/{ => uapi}/asm/unistd.h     |    0
1416  10 files changed, 171 insertions(+), 146 deletions(-)
1417  rename arch/c6x/include/{ => uapi}/asm/byteorder.h (100%)
1418  rename arch/c6x/include/{ => uapi}/asm/kvm_para.h (100%)
1419  create mode 100644 arch/c6x/include/uapi/asm/ptrace.h
1420  rename arch/c6x/include/{ => uapi}/asm/setup.h (100%)
1421  rename arch/c6x/include/{ => uapi}/asm/sigcontext.h (100%)
1422  rename arch/c6x/include/{ => uapi}/asm/swab.h (100%)
1423  rename arch/c6x/include/{ => uapi}/asm/unistd.h (100%)
1424 Merging cris/for-next (d75d806 CRIS: Remove VCS simulator specific code)
1425 $ git merge cris/for-next
1426 Already up-to-date.
1427 Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
1428 $ git merge hexagon/linux-next
1429 Already up-to-date.
1430 Merging ia64/next (f68301f UAPI: (Scripted) Disintegrate arch/ia64/include/asm)
1431 $ git merge ia64/next
1432 Resolved 'arch/ia64/include/asm/Kbuild' using previous resolution.
1433 Auto-merging arch/ia64/include/asm/Kbuild
1434 CONFLICT (content): Merge conflict in arch/ia64/include/asm/Kbuild
1435 Automatic merge failed; fix conflicts and then commit the result.
1436 $ git commit -v -a
1437 [master e54f659] Merge remote-tracking branch 'ia64/next'
1438 $ git diff -M --stat --summary HEAD^..
1439  arch/ia64/include/asm/Kbuild                       |   15 -
1440  arch/ia64/include/asm/gcc_intrin.h                 |  615 +------------------
1441  arch/ia64/include/asm/intrinsics.h                 |  120 +---
1442  arch/ia64/include/asm/kvm_para.h                   |   10 +-
1443  arch/ia64/include/asm/mman.h                       |   12 +-
1444  arch/ia64/include/asm/param.h                      |   22 +-
1445  arch/ia64/include/asm/perfmon.h                    |  171 +-----
1446  arch/ia64/include/asm/ptrace.h                     |  236 +-------
1447  arch/ia64/include/asm/siginfo.h                    |  118 +---
1448  arch/ia64/include/asm/signal.h                     |  122 +---
1449  arch/ia64/include/asm/termios.h                    |   46 +-
1450  arch/ia64/include/asm/types.h                      |   19 +-
1451  arch/ia64/include/asm/unistd.h                     |  324 +---------
1452  arch/ia64/include/asm/ustack.h                     |   11 +-
1453  arch/ia64/include/uapi/asm/Kbuild                  |   45 ++
1454  arch/ia64/include/{ => uapi}/asm/auxvec.h          |    0
1455  arch/ia64/include/{ => uapi}/asm/bitsperlong.h     |    0
1456  arch/ia64/include/{ => uapi}/asm/break.h           |    0
1457  arch/ia64/include/{ => uapi}/asm/byteorder.h       |    0
1458  arch/ia64/include/{ => uapi}/asm/cmpxchg.h         |    0
1459  arch/ia64/include/{ => uapi}/asm/errno.h           |    0
1460  arch/ia64/include/{ => uapi}/asm/fcntl.h           |    0
1461  arch/ia64/include/{ => uapi}/asm/fpu.h             |    0
1462  arch/ia64/include/uapi/asm/gcc_intrin.h            |  618 ++++++++++++++++++++
1463  arch/ia64/include/{ => uapi}/asm/ia64regs.h        |    0
1464  arch/ia64/include/{ => uapi}/asm/intel_intrin.h    |    0
1465  arch/ia64/include/uapi/asm/intrinsics.h            |  124 ++++
1466  arch/ia64/include/{ => uapi}/asm/ioctl.h           |    0
1467  arch/ia64/include/{ => uapi}/asm/ioctls.h          |    0
1468  arch/ia64/include/{ => uapi}/asm/ipcbuf.h          |    0
1469  arch/ia64/include/{ => uapi}/asm/kvm.h             |    0
1470  arch/ia64/include/uapi/asm/mman.h                  |   16 +
1471  arch/ia64/include/{ => uapi}/asm/msgbuf.h          |    0
1472  arch/ia64/include/uapi/asm/param.h                 |   29 +
1473  arch/ia64/include/uapi/asm/perfmon.h               |  177 ++++++
1474  .../include/{ => uapi}/asm/perfmon_default_smpl.h  |    0
1475  arch/ia64/include/{ => uapi}/asm/poll.h            |    0
1476  arch/ia64/include/{ => uapi}/asm/posix_types.h     |    0
1477  arch/ia64/include/uapi/asm/ptrace.h                |  247 ++++++++
1478  arch/ia64/include/{ => uapi}/asm/ptrace_offsets.h  |    0
1479  arch/ia64/include/{ => uapi}/asm/resource.h        |    0
1480  arch/ia64/include/{ => uapi}/asm/rse.h             |    0
1481  arch/ia64/include/{ => uapi}/asm/sembuf.h          |    0
1482  arch/ia64/include/{ => uapi}/asm/setup.h           |    0
1483  arch/ia64/include/{ => uapi}/asm/shmbuf.h          |    0
1484  arch/ia64/include/{ => uapi}/asm/sigcontext.h      |    0
1485  arch/ia64/include/uapi/asm/siginfo.h               |  121 ++++
1486  arch/ia64/include/uapi/asm/signal.h                |  127 ++++
1487  arch/ia64/include/{ => uapi}/asm/socket.h          |    0
1488  arch/ia64/include/{ => uapi}/asm/sockios.h         |    0
1489  arch/ia64/include/{ => uapi}/asm/stat.h            |    0
1490  arch/ia64/include/{ => uapi}/asm/statfs.h          |    0
1491  arch/ia64/include/{ => uapi}/asm/swab.h            |    0
1492  arch/ia64/include/{ => uapi}/asm/termbits.h        |    0
1493  arch/ia64/include/uapi/asm/termios.h               |   50 ++
1494  arch/ia64/include/uapi/asm/types.h                 |   31 +
1495  arch/ia64/include/{ => uapi}/asm/ucontext.h        |    0
1496  arch/ia64/include/uapi/asm/unistd.h                |  328 +++++++++++
1497  arch/ia64/include/uapi/asm/ustack.h                |   12 +
1498  59 files changed, 1961 insertions(+), 1805 deletions(-)
1499  rename arch/ia64/include/{ => uapi}/asm/auxvec.h (100%)
1500  rename arch/ia64/include/{ => uapi}/asm/bitsperlong.h (100%)
1501  rename arch/ia64/include/{ => uapi}/asm/break.h (100%)
1502  rename arch/ia64/include/{ => uapi}/asm/byteorder.h (100%)
1503  rename arch/ia64/include/{ => uapi}/asm/cmpxchg.h (100%)
1504  rename arch/ia64/include/{ => uapi}/asm/errno.h (100%)
1505  rename arch/ia64/include/{ => uapi}/asm/fcntl.h (100%)
1506  rename arch/ia64/include/{ => uapi}/asm/fpu.h (100%)
1507  create mode 100644 arch/ia64/include/uapi/asm/gcc_intrin.h
1508  rename arch/ia64/include/{ => uapi}/asm/ia64regs.h (100%)
1509  rename arch/ia64/include/{ => uapi}/asm/intel_intrin.h (100%)
1510  create mode 100644 arch/ia64/include/uapi/asm/intrinsics.h
1511  rename arch/ia64/include/{ => uapi}/asm/ioctl.h (100%)
1512  rename arch/ia64/include/{ => uapi}/asm/ioctls.h (100%)
1513  rename arch/ia64/include/{ => uapi}/asm/ipcbuf.h (100%)
1514  rename arch/ia64/include/{ => uapi}/asm/kvm.h (100%)
1515  create mode 100644 arch/ia64/include/uapi/asm/kvm_para.h
1516  create mode 100644 arch/ia64/include/uapi/asm/mman.h
1517  rename arch/ia64/include/{ => uapi}/asm/msgbuf.h (100%)
1518  create mode 100644 arch/ia64/include/uapi/asm/param.h
1519  create mode 100644 arch/ia64/include/uapi/asm/perfmon.h
1520  rename arch/ia64/include/{ => uapi}/asm/perfmon_default_smpl.h (100%)
1521  rename arch/ia64/include/{ => uapi}/asm/poll.h (100%)
1522  rename arch/ia64/include/{ => uapi}/asm/posix_types.h (100%)
1523  create mode 100644 arch/ia64/include/uapi/asm/ptrace.h
1524  rename arch/ia64/include/{ => uapi}/asm/ptrace_offsets.h (100%)
1525  rename arch/ia64/include/{ => uapi}/asm/resource.h (100%)
1526  rename arch/ia64/include/{ => uapi}/asm/rse.h (100%)
1527  rename arch/ia64/include/{ => uapi}/asm/sembuf.h (100%)
1528  rename arch/ia64/include/{ => uapi}/asm/setup.h (100%)
1529  rename arch/ia64/include/{ => uapi}/asm/shmbuf.h (100%)
1530  rename arch/ia64/include/{ => uapi}/asm/sigcontext.h (100%)
1531  create mode 100644 arch/ia64/include/uapi/asm/siginfo.h
1532  create mode 100644 arch/ia64/include/uapi/asm/signal.h
1533  rename arch/ia64/include/{ => uapi}/asm/socket.h (100%)
1534  rename arch/ia64/include/{ => uapi}/asm/sockios.h (100%)
1535  rename arch/ia64/include/{ => uapi}/asm/stat.h (100%)
1536  rename arch/ia64/include/{ => uapi}/asm/statfs.h (100%)
1537  rename arch/ia64/include/{ => uapi}/asm/swab.h (100%)
1538  rename arch/ia64/include/{ => uapi}/asm/termbits.h (100%)
1539  create mode 100644 arch/ia64/include/uapi/asm/termios.h
1540  create mode 100644 arch/ia64/include/uapi/asm/types.h
1541  rename arch/ia64/include/{ => uapi}/asm/ucontext.h (100%)
1542  create mode 100644 arch/ia64/include/uapi/asm/unistd.h
1543  create mode 100644 arch/ia64/include/uapi/asm/ustack.h
1544 Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
1545 $ git merge m68k/for-next
1546 Already up-to-date.
1547 Merging m68knommu/for-next (a255172 m68knommu: fix inconsistent formating in ColdFire 5407 definitions)
1548 $ git merge m68knommu/for-next
1549 Already up-to-date.
1550 Merging microblaze/next (1883baa UAPI: (Scripted) Disintegrate arch/microblaze/include/asm)
1551 $ git merge microblaze/next
1552 Merge made by the 'recursive' strategy.
1553  arch/microblaze/include/asm/Kbuild                 |    2 -
1554  arch/microblaze/include/asm/elf.h                  |   97 +----
1555  arch/microblaze/include/asm/ptrace.h               |   62 +--
1556  arch/microblaze/include/asm/setup.h                |    6 +-
1557  arch/microblaze/include/asm/unistd.h               |  390 +------------------
1558  arch/microblaze/include/uapi/asm/Kbuild            |   32 ++
1559  arch/microblaze/include/{ => uapi}/asm/auxvec.h    |    0
1560  .../include/{ => uapi}/asm/bitsperlong.h           |    0
1561  arch/microblaze/include/{ => uapi}/asm/byteorder.h |    0
1562  arch/microblaze/include/uapi/asm/elf.h             |  121 ++++++
1563  arch/microblaze/include/{ => uapi}/asm/errno.h     |    0
1564  arch/microblaze/include/{ => uapi}/asm/fcntl.h     |    0
1565  arch/microblaze/include/{ => uapi}/asm/ioctl.h     |    0
1566  arch/microblaze/include/{ => uapi}/asm/ioctls.h    |    0
1567  arch/microblaze/include/{ => uapi}/asm/ipcbuf.h    |    0
1568  arch/microblaze/include/{ => uapi}/asm/kvm_para.h  |    0
1569  arch/microblaze/include/{ => uapi}/asm/mman.h      |    0
1570  arch/microblaze/include/{ => uapi}/asm/msgbuf.h    |    0
1571  arch/microblaze/include/{ => uapi}/asm/param.h     |    0
1572  arch/microblaze/include/{ => uapi}/asm/poll.h      |    0
1573  .../include/{ => uapi}/asm/posix_types.h           |    0
1574  arch/microblaze/include/uapi/asm/ptrace.h          |   72 ++++
1575  arch/microblaze/include/{ => uapi}/asm/resource.h  |    0
1576  arch/microblaze/include/{ => uapi}/asm/sembuf.h    |    0
1577  arch/microblaze/include/uapi/asm/setup.h           |   19 +
1578  arch/microblaze/include/{ => uapi}/asm/shmbuf.h    |    0
1579  .../microblaze/include/{ => uapi}/asm/sigcontext.h |    0
1580  arch/microblaze/include/{ => uapi}/asm/siginfo.h   |    0
1581  arch/microblaze/include/{ => uapi}/asm/signal.h    |    0
1582  arch/microblaze/include/{ => uapi}/asm/socket.h    |    0
1583  arch/microblaze/include/{ => uapi}/asm/sockios.h   |    0
1584  arch/microblaze/include/{ => uapi}/asm/stat.h      |    0
1585  arch/microblaze/include/{ => uapi}/asm/statfs.h    |    0
1586  arch/microblaze/include/{ => uapi}/asm/swab.h      |    0
1587  arch/microblaze/include/{ => uapi}/asm/termbits.h  |    0
1588  arch/microblaze/include/{ => uapi}/asm/termios.h   |    0
1589  arch/microblaze/include/{ => uapi}/asm/types.h     |    0
1590  arch/microblaze/include/uapi/asm/unistd.h          |  400 ++++++++++++++++++++
1591  38 files changed, 649 insertions(+), 552 deletions(-)
1592  rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%)
1593  rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%)
1594  rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%)
1595  create mode 100644 arch/microblaze/include/uapi/asm/elf.h
1596  rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%)
1597  rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%)
1598  rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%)
1599  rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%)
1600  rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%)
1601  rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%)
1602  rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%)
1603  rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%)
1604  rename arch/microblaze/include/{ => uapi}/asm/param.h (100%)
1605  rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%)
1606  rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%)
1607  create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h
1608  rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%)
1609  rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%)
1610  create mode 100644 arch/microblaze/include/uapi/asm/setup.h
1611  rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%)
1612  rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%)
1613  rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%)
1614  rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%)
1615  rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%)
1616  rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%)
1617  rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%)
1618  rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%)
1619  rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%)
1620  rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%)
1621  rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%)
1622  rename arch/microblaze/include/{ => uapi}/asm/types.h (100%)
1623  create mode 100644 arch/microblaze/include/uapi/asm/unistd.h
1624 Merging mips/mips-for-linux-next (0f96572 Merge tag 'disintegrate-mips-20121009' of git://git.infradead.org/users/dhowells/linux-headers into mips-for-linux-next)
1625 $ git merge mips/mips-for-linux-next
1626 Removing arch/mips/configs/pb1550_defconfig
1627 Removing arch/mips/configs/pb1500_defconfig
1628 Removing arch/mips/configs/pb1100_defconfig
1629 Removing arch/mips/configs/db1550_defconfig
1630 Removing arch/mips/configs/db1300_defconfig
1631 Removing arch/mips/configs/db1200_defconfig
1632 Removing arch/mips/alchemy/devboards/pb1550.c
1633 Removing arch/mips/alchemy/devboards/pb1500.c
1634 Removing arch/mips/alchemy/devboards/pb1100.c
1635 Merge made by the 'recursive' strategy.
1636  arch/mips/Kconfig                                  |    4 +
1637  arch/mips/alchemy/Kconfig                          |   50 +-
1638  arch/mips/alchemy/Platform                         |   22 +-
1639  arch/mips/alchemy/devboards/Makefile               |    7 +-
1640  arch/mips/alchemy/devboards/db1000.c               |  120 ++-
1641  arch/mips/alchemy/devboards/db1200.c               |   37 +-
1642  arch/mips/alchemy/devboards/db1235.c               |   94 ++
1643  arch/mips/alchemy/devboards/db1300.c               |   12 +-
1644  arch/mips/alchemy/devboards/db1550.c               |  192 +++-
1645  arch/mips/alchemy/devboards/pb1100.c               |  167 ----
1646  arch/mips/alchemy/devboards/pb1500.c               |  198 ----
1647  arch/mips/alchemy/devboards/pb1550.c               |  244 -----
1648  arch/mips/alchemy/devboards/platform.c             |    9 +-
1649  arch/mips/boot/compressed/uart-alchemy.c           |    4 -
1650  arch/mips/configs/db1200_defconfig                 |  170 ----
1651  arch/mips/configs/db1235_defconfig                 |  434 ++++++++
1652  arch/mips/configs/db1300_defconfig                 |  391 --------
1653  arch/mips/configs/db1550_defconfig                 |  285 ------
1654  arch/mips/configs/pb1100_defconfig                 |  124 ---
1655  arch/mips/configs/pb1500_defconfig                 |  141 ---
1656  arch/mips/configs/pb1550_defconfig                 |  145 ---
1657  arch/mips/include/asm/Kbuild                       |    5 -
1658  arch/mips/include/asm/atomic.h                     |   64 +-
1659  arch/mips/include/asm/cpu-features.h               |    8 +
1660  arch/mips/include/asm/cpu.h                        |    4 +-
1661  arch/mips/include/asm/errno.h                      |  120 +--
1662  .../include/asm/mach-ath79/cpu-feature-overrides.h |    2 +
1663  .../asm/mach-au1x00/cpu-feature-overrides.h        |    1 +
1664  .../asm/mach-bcm63xx/cpu-feature-overrides.h       |    1 +
1665  .../asm/mach-cavium-octeon/cpu-feature-overrides.h |    1 +
1666  .../asm/mach-cobalt/cpu-feature-overrides.h        |    1 +
1667  arch/mips/include/asm/mach-db1x00/bcsr.h           |    2 +
1668  .../include/asm/mach-ip22/cpu-feature-overrides.h  |    1 +
1669  .../include/asm/mach-ip27/cpu-feature-overrides.h  |    1 +
1670  .../include/asm/mach-ip28/cpu-feature-overrides.h  |    1 +
1671  .../include/asm/mach-ip32/cpu-feature-overrides.h  |    1 +
1672  .../asm/mach-jz4740/cpu-feature-overrides.h        |    1 +
1673  .../asm/mach-loongson/cpu-feature-overrides.h      |    1 +
1674  .../asm/mach-netlogic/cpu-feature-overrides.h      |    1 +
1675  .../asm/mach-powertv/cpu-feature-overrides.h       |    1 +
1676  .../asm/mach-rc32434/cpu-feature-overrides.h       |    1 +
1677  .../include/asm/mach-rm/cpu-feature-overrides.h    |    1 +
1678  .../asm/mach-sibyte/cpu-feature-overrides.h        |    1 +
1679  .../asm/mach-tx49xx/cpu-feature-overrides.h        |    1 +
1680  .../asm/mach-yosemite/cpu-feature-overrides.h      |    1 +
1681  arch/mips/include/asm/mipsregs.h                   |    3 +
1682  .../asm/pmc-sierra/msp71xx/cpu-feature-overrides.h |    1 +
1683  arch/mips/include/asm/ptrace.h                     |  107 +-
1684  arch/mips/include/asm/setup.h                      |    5 +-
1685  arch/mips/include/asm/sigcontext.h                 |   66 +-
1686  arch/mips/include/asm/siginfo.h                    |  104 +-
1687  arch/mips/include/asm/signal.h                     |  115 +--
1688  arch/mips/include/asm/socket.h                     |   83 +-
1689  arch/mips/include/asm/termios.h                    |   73 +-
1690  arch/mips/include/asm/types.h                      |   16 +-
1691  arch/mips/include/asm/unistd.h                     | 1022 +------------------
1692  arch/mips/include/uapi/asm/Kbuild                  |   34 +
1693  arch/mips/include/{ => uapi}/asm/auxvec.h          |    0
1694  arch/mips/include/{ => uapi}/asm/bitsperlong.h     |    0
1695  arch/mips/include/{ => uapi}/asm/byteorder.h       |    0
1696  arch/mips/include/{ => uapi}/asm/cachectl.h        |    0
1697  arch/mips/include/uapi/asm/errno.h                 |  129 +++
1698  arch/mips/include/{ => uapi}/asm/fcntl.h           |    0
1699  arch/mips/include/{ => uapi}/asm/ioctl.h           |    0
1700  arch/mips/include/{ => uapi}/asm/ioctls.h          |    0
1701  arch/mips/include/{ => uapi}/asm/ipcbuf.h          |    0
1702  arch/mips/include/{ => uapi}/asm/kvm_para.h        |    0
1703  arch/mips/include/{ => uapi}/asm/mman.h            |    0
1704  arch/mips/include/{ => uapi}/asm/msgbuf.h          |    0
1705  arch/mips/include/{ => uapi}/asm/param.h           |    0
1706  arch/mips/include/{ => uapi}/asm/poll.h            |    0
1707  arch/mips/include/{ => uapi}/asm/posix_types.h     |    0
1708  arch/mips/include/uapi/asm/ptrace.h                |  116 +++
1709  arch/mips/include/{ => uapi}/asm/resource.h        |    0
1710  arch/mips/include/{ => uapi}/asm/sembuf.h          |    0
1711  arch/mips/include/uapi/asm/setup.h                 |    7 +
1712  arch/mips/include/{ => uapi}/asm/sgidefs.h         |    0
1713  arch/mips/include/{ => uapi}/asm/shmbuf.h          |    0
1714  arch/mips/include/uapi/asm/sigcontext.h            |   78 ++
1715  arch/mips/include/uapi/asm/siginfo.h               |  114 +++
1716  arch/mips/include/uapi/asm/signal.h                |  123 +++
1717  arch/mips/include/uapi/asm/socket.h                |   93 ++
1718  arch/mips/include/{ => uapi}/asm/sockios.h         |    0
1719  arch/mips/include/{ => uapi}/asm/stat.h            |    0
1720  arch/mips/include/{ => uapi}/asm/statfs.h          |    0
1721  arch/mips/include/{ => uapi}/asm/swab.h            |    0
1722  arch/mips/include/{ => uapi}/asm/sysmips.h         |    0
1723  arch/mips/include/{ => uapi}/asm/termbits.h        |    0
1724  arch/mips/include/uapi/asm/termios.h               |   80 ++
1725  arch/mips/include/uapi/asm/types.h                 |   27 +
1726  arch/mips/include/uapi/asm/unistd.h                | 1035 ++++++++++++++++++++
1727  arch/mips/kernel/asm-offsets.c                     |   10 -
1728  arch/mips/kernel/cpu-probe.c                       |   11 +-
1729  arch/mips/kernel/perf_event_mipsxx.c               |  262 ++---
1730  arch/mips/kernel/proc.c                            |   19 +-
1731  arch/mips/kernel/vmlinux.lds.S                     |   21 +-
1732  arch/mips/mm/init.c                                |   17 +-
1733  arch/mips/mm/pgtable-64.c                          |   20 +-
1734  arch/mips/mm/tlbex.c                               |   23 +-
1735  arch/mips/pci/fixup-malta.c                        |    3 +-
1736  include/asm-generic/vmlinux.lds.h                  |    9 +
1737  101 files changed, 2892 insertions(+), 4006 deletions(-)
1738  create mode 100644 arch/mips/alchemy/devboards/db1235.c
1739  delete mode 100644 arch/mips/alchemy/devboards/pb1100.c
1740  delete mode 100644 arch/mips/alchemy/devboards/pb1500.c
1741  delete mode 100644 arch/mips/alchemy/devboards/pb1550.c
1742  delete mode 100644 arch/mips/configs/db1200_defconfig
1743  create mode 100644 arch/mips/configs/db1235_defconfig
1744  delete mode 100644 arch/mips/configs/db1300_defconfig
1745  delete mode 100644 arch/mips/configs/db1550_defconfig
1746  delete mode 100644 arch/mips/configs/pb1100_defconfig
1747  delete mode 100644 arch/mips/configs/pb1500_defconfig
1748  delete mode 100644 arch/mips/configs/pb1550_defconfig
1749  rename arch/mips/include/{ => uapi}/asm/auxvec.h (100%)
1750  rename arch/mips/include/{ => uapi}/asm/bitsperlong.h (100%)
1751  rename arch/mips/include/{ => uapi}/asm/byteorder.h (100%)
1752  rename arch/mips/include/{ => uapi}/asm/cachectl.h (100%)
1753  create mode 100644 arch/mips/include/uapi/asm/errno.h
1754  rename arch/mips/include/{ => uapi}/asm/fcntl.h (100%)
1755  rename arch/mips/include/{ => uapi}/asm/ioctl.h (100%)
1756  rename arch/mips/include/{ => uapi}/asm/ioctls.h (100%)
1757  rename arch/mips/include/{ => uapi}/asm/ipcbuf.h (100%)
1758  rename arch/mips/include/{ => uapi}/asm/kvm_para.h (100%)
1759  rename arch/mips/include/{ => uapi}/asm/mman.h (100%)
1760  rename arch/mips/include/{ => uapi}/asm/msgbuf.h (100%)
1761  rename arch/mips/include/{ => uapi}/asm/param.h (100%)
1762  rename arch/mips/include/{ => uapi}/asm/poll.h (100%)
1763  rename arch/mips/include/{ => uapi}/asm/posix_types.h (100%)
1764  create mode 100644 arch/mips/include/uapi/asm/ptrace.h
1765  rename arch/mips/include/{ => uapi}/asm/resource.h (100%)
1766  rename arch/mips/include/{ => uapi}/asm/sembuf.h (100%)
1767  create mode 100644 arch/mips/include/uapi/asm/setup.h
1768  rename arch/mips/include/{ => uapi}/asm/sgidefs.h (100%)
1769  rename arch/mips/include/{ => uapi}/asm/shmbuf.h (100%)
1770  create mode 100644 arch/mips/include/uapi/asm/sigcontext.h
1771  create mode 100644 arch/mips/include/uapi/asm/siginfo.h
1772  create mode 100644 arch/mips/include/uapi/asm/signal.h
1773  create mode 100644 arch/mips/include/uapi/asm/socket.h
1774  rename arch/mips/include/{ => uapi}/asm/sockios.h (100%)
1775  rename arch/mips/include/{ => uapi}/asm/stat.h (100%)
1776  rename arch/mips/include/{ => uapi}/asm/statfs.h (100%)
1777  rename arch/mips/include/{ => uapi}/asm/swab.h (100%)
1778  rename arch/mips/include/{ => uapi}/asm/sysmips.h (100%)
1779  rename arch/mips/include/{ => uapi}/asm/termbits.h (100%)
1780  create mode 100644 arch/mips/include/uapi/asm/termios.h
1781  create mode 100644 arch/mips/include/uapi/asm/types.h
1782  create mode 100644 arch/mips/include/uapi/asm/unistd.h
1783 Merging openrisc/for-upstream (4c8faa4 openrisc: mask interrupts in irq_mask_ack function)
1784 $ git merge openrisc/for-upstream
1785 Auto-merging include/linux/audit.h
1786 Merge made by the 'recursive' strategy.
1787  arch/openrisc/include/asm/processor.h |    2 +-
1788  arch/openrisc/kernel/irq.c            |   20 +++++++++++---------
1789  arch/openrisc/kernel/ptrace.c         |    2 +-
1790  arch/openrisc/lib/delay.c             |    6 +++---
1791  include/linux/audit.h                 |    1 +
1792  5 files changed, 17 insertions(+), 14 deletions(-)
1793 Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
1794 $ git merge parisc/for-next
1795 Already up-to-date.
1796 Merging s390/features (ab08ff3 Merge tag 'disintegrate-s390-20121009' of git://git.infradead.org/users/dhowells/linux-headers)
1797 $ git merge s390/features
1798 Auto-merging arch/s390/include/uapi/asm/chsc.h
1799 Merge made by the 'recursive' strategy.
1800  arch/s390/Kconfig.debug                        |   12 +
1801  arch/s390/include/asm/Kbuild                   |   14 -
1802  arch/s390/include/asm/chpid.h                  |   19 +-
1803  arch/s390/include/asm/cmb.h                    |   51 +--
1804  arch/s390/include/asm/css_chars.h              |    3 -
1805  arch/s390/include/asm/debug.h                  |   28 +-
1806  arch/s390/include/asm/kvm_para.h               |   14 +-
1807  arch/s390/include/asm/mman.h                   |    6 +-
1808  arch/s390/include/asm/page.h                   |   14 +-
1809  arch/s390/include/asm/pgtable.h                |   30 +-
1810  arch/s390/include/asm/ptrace.h                 |  462 +----------------------
1811  arch/s390/include/asm/schid.h                  |   15 +-
1812  arch/s390/include/asm/setup.h                  |   21 +-
1813  arch/s390/include/asm/signal.h                 |  128 +------
1814  arch/s390/include/asm/termios.h                |   42 +--
1815  arch/s390/include/asm/types.h                  |   15 +-
1816  arch/s390/include/asm/unistd.h                 |  367 +-----------------
1817  arch/s390/include/uapi/asm/Kbuild              |   45 +++
1818  arch/s390/include/{ => uapi}/asm/auxvec.h      |    0
1819  arch/s390/include/{ => uapi}/asm/bitsperlong.h |    0
1820  arch/s390/include/{ => uapi}/asm/byteorder.h   |    0
1821  arch/s390/include/uapi/asm/chpid.h             |   22 ++
1822  arch/s390/include/{ => uapi}/asm/chsc.h        |   10 +-
1823  arch/s390/include/uapi/asm/cmb.h               |   53 +++
1824  arch/s390/include/{ => uapi}/asm/dasd.h        |    0
1825  arch/s390/include/uapi/asm/debug.h             |   34 ++
1826  arch/s390/include/{ => uapi}/asm/errno.h       |    0
1827  arch/s390/include/{ => uapi}/asm/fcntl.h       |    0
1828  arch/s390/include/{ => uapi}/asm/ioctl.h       |    0
1829  arch/s390/include/{ => uapi}/asm/ioctls.h      |    0
1830  arch/s390/include/{ => uapi}/asm/ipcbuf.h      |    0
1831  arch/s390/include/{ => uapi}/asm/kvm.h         |    0
1832  arch/s390/include/{ => uapi}/asm/kvm_virtio.h  |    0
1833  arch/s390/include/uapi/asm/mman.h              |    6 +
1834  arch/s390/include/{ => uapi}/asm/monwriter.h   |    0
1835  arch/s390/include/{ => uapi}/asm/msgbuf.h      |    0
1836  arch/s390/include/{ => uapi}/asm/param.h       |    0
1837  arch/s390/include/{ => uapi}/asm/poll.h        |    0
1838  arch/s390/include/{ => uapi}/asm/posix_types.h |    0
1839  arch/s390/include/uapi/asm/ptrace.h            |  472 ++++++++++++++++++++++++
1840  arch/s390/include/{ => uapi}/asm/qeth.h        |    0
1841  arch/s390/include/{ => uapi}/asm/resource.h    |    0
1842  arch/s390/include/uapi/asm/schid.h             |   16 +
1843  arch/s390/include/{ => uapi}/asm/sembuf.h      |    0
1844  arch/s390/include/uapi/asm/setup.h             |   13 +
1845  arch/s390/include/{ => uapi}/asm/shmbuf.h      |    0
1846  arch/s390/include/{ => uapi}/asm/sigcontext.h  |    0
1847  arch/s390/include/{ => uapi}/asm/siginfo.h     |    0
1848  arch/s390/include/uapi/asm/signal.h            |  135 +++++++
1849  arch/s390/include/{ => uapi}/asm/socket.h      |    0
1850  arch/s390/include/{ => uapi}/asm/sockios.h     |    0
1851  arch/s390/include/{ => uapi}/asm/stat.h        |    0
1852  arch/s390/include/{ => uapi}/asm/statfs.h      |    0
1853  arch/s390/include/{ => uapi}/asm/swab.h        |    0
1854  arch/s390/include/{ => uapi}/asm/tape390.h     |    0
1855  arch/s390/include/{ => uapi}/asm/termbits.h    |    0
1856  arch/s390/include/uapi/asm/termios.h           |   49 +++
1857  arch/s390/include/uapi/asm/types.h             |   22 ++
1858  arch/s390/include/{ => uapi}/asm/ucontext.h    |    0
1859  arch/s390/include/uapi/asm/unistd.h            |  374 +++++++++++++++++++
1860  arch/s390/include/{ => uapi}/asm/vtoc.h        |    0
1861  arch/s390/include/{ => uapi}/asm/zcrypt.h      |    0
1862  arch/s390/kernel/early.c                       |   17 +-
1863  arch/s390/kernel/entry64.S                     |    2 +-
1864  arch/s390/kernel/head.S                        |  101 +++--
1865  arch/s390/kernel/head31.S                      |    3 -
1866  arch/s390/kernel/head64.S                      |    3 -
1867  arch/s390/kernel/module.c                      |   11 +
1868  arch/s390/kernel/setup.c                       |   51 ++-
1869  arch/s390/mm/Makefile                          |    1 +
1870  arch/s390/mm/dump_pagetables.c                 |  226 ++++++++++++
1871  arch/s390/mm/pageattr.c                        |   40 +-
1872  arch/s390/mm/vmem.c                            |   45 ++-
1873  drivers/s390/block/dcssblk.c                   |   52 ++-
1874  drivers/s390/crypto/zcrypt_pcixcc.c            |    1 -
1875  75 files changed, 1755 insertions(+), 1290 deletions(-)
1876  rename arch/s390/include/{ => uapi}/asm/auxvec.h (100%)
1877  rename arch/s390/include/{ => uapi}/asm/bitsperlong.h (100%)
1878  rename arch/s390/include/{ => uapi}/asm/byteorder.h (100%)
1879  create mode 100644 arch/s390/include/uapi/asm/chpid.h
1880  rename arch/s390/include/{ => uapi}/asm/chsc.h (92%)
1881  create mode 100644 arch/s390/include/uapi/asm/cmb.h
1882  rename arch/s390/include/{ => uapi}/asm/dasd.h (100%)
1883  create mode 100644 arch/s390/include/uapi/asm/debug.h
1884  rename arch/s390/include/{ => uapi}/asm/errno.h (100%)
1885  rename arch/s390/include/{ => uapi}/asm/fcntl.h (100%)
1886  rename arch/s390/include/{ => uapi}/asm/ioctl.h (100%)
1887  rename arch/s390/include/{ => uapi}/asm/ioctls.h (100%)
1888  rename arch/s390/include/{ => uapi}/asm/ipcbuf.h (100%)
1889  rename arch/s390/include/{ => uapi}/asm/kvm.h (100%)
1890  create mode 100644 arch/s390/include/uapi/asm/kvm_para.h
1891  rename arch/s390/include/{ => uapi}/asm/kvm_virtio.h (100%)
1892  create mode 100644 arch/s390/include/uapi/asm/mman.h
1893  rename arch/s390/include/{ => uapi}/asm/monwriter.h (100%)
1894  rename arch/s390/include/{ => uapi}/asm/msgbuf.h (100%)
1895  rename arch/s390/include/{ => uapi}/asm/param.h (100%)
1896  rename arch/s390/include/{ => uapi}/asm/poll.h (100%)
1897  rename arch/s390/include/{ => uapi}/asm/posix_types.h (100%)
1898  create mode 100644 arch/s390/include/uapi/asm/ptrace.h
1899  rename arch/s390/include/{ => uapi}/asm/qeth.h (100%)
1900  rename arch/s390/include/{ => uapi}/asm/resource.h (100%)
1901  create mode 100644 arch/s390/include/uapi/asm/schid.h
1902  rename arch/s390/include/{ => uapi}/asm/sembuf.h (100%)
1903  create mode 100644 arch/s390/include/uapi/asm/setup.h
1904  rename arch/s390/include/{ => uapi}/asm/shmbuf.h (100%)
1905  rename arch/s390/include/{ => uapi}/asm/sigcontext.h (100%)
1906  rename arch/s390/include/{ => uapi}/asm/siginfo.h (100%)
1907  create mode 100644 arch/s390/include/uapi/asm/signal.h
1908  rename arch/s390/include/{ => uapi}/asm/socket.h (100%)
1909  rename arch/s390/include/{ => uapi}/asm/sockios.h (100%)
1910  rename arch/s390/include/{ => uapi}/asm/stat.h (100%)
1911  rename arch/s390/include/{ => uapi}/asm/statfs.h (100%)
1912  rename arch/s390/include/{ => uapi}/asm/swab.h (100%)
1913  rename arch/s390/include/{ => uapi}/asm/tape390.h (100%)
1914  rename arch/s390/include/{ => uapi}/asm/termbits.h (100%)
1915  create mode 100644 arch/s390/include/uapi/asm/termios.h
1916  create mode 100644 arch/s390/include/uapi/asm/types.h
1917  rename arch/s390/include/{ => uapi}/asm/ucontext.h (100%)
1918  create mode 100644 arch/s390/include/uapi/asm/unistd.h
1919  rename arch/s390/include/{ => uapi}/asm/vtoc.h (100%)
1920  rename arch/s390/include/{ => uapi}/asm/zcrypt.h (100%)
1921  create mode 100644 arch/s390/mm/dump_pagetables.c
1922 Merging sh/sh-latest (16d74eb sh: pfc: Fix up GPIO mux type reconfig case.)
1923 $ git merge sh/sh-latest
1924 Already up-to-date.
1925 Merging sparc-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
1926 $ git merge sparc-next/master
1927 Already up-to-date.
1928 Merging tile/master (e70cf54 tile: gxio iorpc numbering change for TRIO interface)
1929 $ git merge tile/master
1930 Already up-to-date.
1931 Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
1932 $ git merge unicore32/unicore32
1933 Auto-merging arch/unicore32/Kconfig
1934 Merge made by the 'recursive' strategy.
1935  arch/unicore32/Kconfig               |    3 +++
1936  arch/unicore32/include/asm/bug.h     |    5 -----
1937  arch/unicore32/include/asm/cmpxchg.h |    2 +-
1938  arch/unicore32/kernel/setup.h        |    6 ++++++
1939  arch/unicore32/mm/fault.c            |   37 +++++++++++++++++++++++++---------
1940  5 files changed, 37 insertions(+), 16 deletions(-)
1941 Merging xtensa/for_next (ded389d xtensa: Add missing RCU idle APIs on idle loop)
1942 $ git merge xtensa/for_next
1943 Recorded preimage for 'arch/xtensa/boot/boot-elf/Makefile'
1944 Recorded preimage for 'scripts/mod/modpost.c'
1945 Auto-merging scripts/mod/modpost.c
1946 CONFLICT (content): Merge conflict in scripts/mod/modpost.c
1947 Auto-merging arch/xtensa/boot/boot-elf/Makefile
1948 CONFLICT (content): Merge conflict in arch/xtensa/boot/boot-elf/Makefile
1949 Automatic merge failed; fix conflicts and then commit the result.
1950 $ git commit -v -a
1951 Recorded resolution for 'arch/xtensa/boot/boot-elf/Makefile'.
1952 Recorded resolution for 'scripts/mod/modpost.c'.
1953 [master 8ad6f16] Merge remote-tracking branch 'xtensa/for_next'
1954 $ git diff -M --stat --summary HEAD^..
1955 Merging btrfs/next (f46dbe3 btrfs: init ref_index to zero in add_inode_ref)
1956 $ git merge btrfs/next
1957 Auto-merging fs/btrfs/ioctl.c
1958 Auto-merging fs/btrfs/inode.c
1959 Auto-merging fs/btrfs/file.c
1960 Auto-merging fs/btrfs/extent_io.c
1961 Auto-merging fs/btrfs/delayed-inode.c
1962 Auto-merging fs/btrfs/ctree.h
1963 Merge made by the 'recursive' strategy.
1964  fs/btrfs/backref.c           |  299 +++++++++++---
1965  fs/btrfs/backref.h           |   10 +-
1966  fs/btrfs/btrfs_inode.h       |   15 +-
1967  fs/btrfs/check-integrity.c   |   16 +-
1968  fs/btrfs/compression.c       |   13 +-
1969  fs/btrfs/ctree.c             |  148 +------
1970  fs/btrfs/ctree.h             |  109 ++++-
1971  fs/btrfs/delayed-inode.c     |    6 +-
1972  fs/btrfs/disk-io.c           |  230 ++++++-----
1973  fs/btrfs/disk-io.h           |    2 +
1974  fs/btrfs/extent-tree.c       |  376 +++++++++--------
1975  fs/btrfs/extent_io.c         |  128 ++++--
1976  fs/btrfs/extent_io.h         |   23 +-
1977  fs/btrfs/extent_map.c        |   55 ++-
1978  fs/btrfs/extent_map.h        |    8 +-
1979  fs/btrfs/file-item.c         |    5 +-
1980  fs/btrfs/file.c              |  447 +++++++++++++++++++--
1981  fs/btrfs/free-space-cache.c  |   10 +-
1982  fs/btrfs/hash.h              |   10 +
1983  fs/btrfs/inode-item.c        |  285 ++++++++++++-
1984  fs/btrfs/inode.c             |  386 ++++++++++++------
1985  fs/btrfs/ioctl.c             |  100 +++--
1986  fs/btrfs/ordered-data.c      |   97 ++---
1987  fs/btrfs/ordered-data.h      |   12 +-
1988  fs/btrfs/qgroup.c            |   40 +-
1989  fs/btrfs/relocation.c        |   11 +-
1990  fs/btrfs/root-tree.c         |   29 +-
1991  fs/btrfs/scrub.c             |   30 +-
1992  fs/btrfs/send.c              |  915 +++++++++++++++++++++++-------------------
1993  fs/btrfs/send.h              |    1 +
1994  fs/btrfs/super.c             |   74 ++--
1995  fs/btrfs/transaction.c       |  283 +++++++++----
1996  fs/btrfs/transaction.h       |   20 +-
1997  fs/btrfs/tree-log.c          |  889 ++++++++++++++++++++++++++++++++--------
1998  fs/btrfs/ulist.c             |    7 +-
1999  fs/btrfs/ulist.h             |    9 +-
2000  fs/btrfs/volumes.c           |   73 +++-
2001  fs/btrfs/zlib.c              |    8 +-
2002  include/trace/events/btrfs.h |   14 +-
2003  39 files changed, 3574 insertions(+), 1619 deletions(-)
2004 Merging ceph/master (6285bc2 ceph: avoid 32-bit page index overflow)
2005 $ git merge ceph/master
2006 Already up-to-date.
2007 Merging cifs/for-next (72bd481 cifs: reinstate the forcegid option)
2008 $ git merge cifs/for-next
2009 Merge made by the 'recursive' strategy.
2010  fs/cifs/cifs_unicode.c |   22 ++++++++++++++++++++++
2011  fs/cifs/connect.c      |    9 +++++++++
2012  fs/cifs/transport.c    |    6 ++++++
2013  3 files changed, 37 insertions(+)
2014 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
2015 $ git merge configfs/linux-next
2016 Already up-to-date.
2017 Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
2018 $ git merge ecryptfs/next
2019 Already up-to-date.
2020 Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
2021 $ git merge ext3/for_next
2022 Merge made by the 'recursive' strategy.
2023  fs/ext2/super.c  |    4 ++--
2024  fs/ext3/namei.c  |   40 +++++++++++++++++++++-------------------
2025  fs/ext3/namei.h  |   19 +++++++++++++++++++
2026  fs/ext3/super.c  |    4 ++--
2027  fs/quota/dquot.c |    2 ++
2028  5 files changed, 46 insertions(+), 23 deletions(-)
2029 Merging ext4/dev (c278531 ext4: fix ext4_flush_completed_IO wait semantics)
2030 $ git merge ext4/dev
2031 Already up-to-date.
2032 Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
2033 $ git merge fuse/for-next
2034 Auto-merging fs/fuse/inode.c
2035 Auto-merging fs/fuse/dev.c
2036 Merge made by the 'recursive' strategy.
2037  fs/Kconfig           |   10 ----
2038  fs/fuse/Kconfig      |   16 ++++-
2039  fs/fuse/dev.c        |   19 ++++++
2040  fs/fuse/dir.c        |  160 ++++++++++++++++++++++++++++++++++++++++++++++++--
2041  fs/fuse/fuse_i.h     |    6 ++
2042  fs/fuse/inode.c      |    5 +-
2043  include/linux/fuse.h |   12 ++++
2044  7 files changed, 211 insertions(+), 17 deletions(-)
2045 Merging gfs2/master (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
2046 $ git merge gfs2/master
2047 Already up-to-date.
2048 Merging jfs/jfs-next (84f4141 jfs: Fix do_div precision in commit b40c2e66)
2049 $ git merge jfs/jfs-next
2050 Already up-to-date.
2051 Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
2052 $ git merge logfs/master
2053 Merge made by the 'recursive' strategy.
2054  fs/logfs/dev_mtd.c |    2 +-
2055  1 file changed, 1 insertion(+), 1 deletion(-)
2056 Merging nfs/linux-next (af28388 pnfsblock: cleanup nfs4_blkdev_get)
2057 $ git merge nfs/linux-next
2058 Auto-merging fs/nfs/super.c
2059 Auto-merging fs/nfs/inode.c
2060 Auto-merging fs/nfs/file.c
2061 Auto-merging Documentation/kernel-parameters.txt
2062 Merge made by the 'recursive' strategy.
2063  Documentation/filesystems/nfs/nfs.txt |   44 +++-
2064  Documentation/kernel-parameters.txt   |    5 +
2065  fs/lockd/mon.c                        |   86 +++++--
2066  fs/lockd/netns.h                      |    4 +
2067  fs/lockd/svc.c                        |    1 +
2068  fs/nfs/Kconfig                        |    4 +-
2069  fs/nfs/blocklayout/blocklayout.c      |  306 +++++++++++++++++++++---
2070  fs/nfs/blocklayout/blocklayout.h      |    2 +-
2071  fs/nfs/blocklayout/blocklayoutdev.c   |   25 +-
2072  fs/nfs/blocklayout/extents.c          |    3 +-
2073  fs/nfs/callback.c                     |  321 ++++++++++++++++---------
2074  fs/nfs/callback.h                     |    3 +-
2075  fs/nfs/callback_proc.c                |   31 ++-
2076  fs/nfs/client.c                       |   23 +-
2077  fs/nfs/dir.c                          |   16 +-
2078  fs/nfs/direct.c                       |   32 ++-
2079  fs/nfs/file.c                         |   41 +++-
2080  fs/nfs/getroot.c                      |    2 +
2081  fs/nfs/idmap.c                        |  114 +++++----
2082  fs/nfs/inode.c                        |   10 +-
2083  fs/nfs/internal.h                     |   15 +-
2084  fs/nfs/netns.h                        |    4 +
2085  fs/nfs/nfs4_fs.h                      |   19 +-
2086  fs/nfs/nfs4client.c                   |  256 +++++++++++++++++++-
2087  fs/nfs/nfs4file.c                     |   29 ++-
2088  fs/nfs/nfs4filelayout.c               |   41 ++--
2089  fs/nfs/nfs4filelayout.h               |   16 +-
2090  fs/nfs/nfs4filelayoutdev.c            |   17 +-
2091  fs/nfs/nfs4namespace.c                |   16 +-
2092  fs/nfs/nfs4proc.c                     |  342 ++++++++++++++++++++-------
2093  fs/nfs/nfs4state.c                    |  228 ++++++++++++++++--
2094  fs/nfs/nfs4sysctl.c                   |    1 +
2095  fs/nfs/nfs4xdr.c                      |   31 ++-
2096  fs/nfs/objlayout/objio_osd.c          |    9 +-
2097  fs/nfs/pagelist.c                     |   12 +-
2098  fs/nfs/pnfs.c                         |  417 +++++++++++++++++++--------------
2099  fs/nfs/pnfs.h                         |   57 ++---
2100  fs/nfs/pnfs_dev.c                     |   27 +++
2101  fs/nfs/super.c                        |   31 ++-
2102  fs/nfs/write.c                        |   11 +-
2103  include/linux/nfs_fs.h                |   11 +-
2104  include/linux/nfs_fs_sb.h             |    3 +
2105  include/linux/nfs_xdr.h               |    5 +-
2106  include/linux/sunrpc/clnt.h           |    2 +
2107  include/linux/sunrpc/xprt.h           |    3 +-
2108  net/sunrpc/auth_gss/auth_gss.c        |   58 ++---
2109  net/sunrpc/clnt.c                     |  105 +++++----
2110  net/sunrpc/rpc_pipe.c                 |    8 +-
2111  net/sunrpc/sched.c                    |    2 +-
2112  net/sunrpc/xdr.c                      |   21 +-
2113  net/sunrpc/xprt.c                     |    8 +-
2114  net/sunrpc/xprtrdma/transport.c       |   22 +-
2115  net/sunrpc/xprtsock.c                 |   40 ++--
2116  53 files changed, 2126 insertions(+), 814 deletions(-)
2117 Merging nfsd/nfsd-next (0d22f68 nfsd4: don't allow reclaims of expired clients)
2118 $ git merge nfsd/nfsd-next
2119 Auto-merging fs/nfsd/vfs.c
2120 Auto-merging fs/nfsd/nfs4state.c
2121 Auto-merging fs/nfs/callback.c
2122 Auto-merging fs/locks.c
2123 Auto-merging fs/lockd/svc.c
2124 Merge made by the 'recursive' strategy.
2125  .../filesystems/nfs/nfsd-admin-interfaces.txt      |   41 +++
2126  fs/lockd/svc.c                                     |   17 +-
2127  fs/locks.c                                         |    6 +-
2128  fs/nfs/callback.c                                  |   16 +-
2129  fs/nfsd/nfs2acl.c                                  |    3 +-
2130  fs/nfsd/nfs3proc.c                                 |    2 +-
2131  fs/nfsd/nfs4callback.c                             |    1 -
2132  fs/nfsd/nfs4idmap.c                                |    4 +-
2133  fs/nfsd/nfs4proc.c                                 |    6 +-
2134  fs/nfsd/nfs4state.c                                |  351 +++++++++++---------
2135  fs/nfsd/nfs4xdr.c                                  |    2 +-
2136  fs/nfsd/nfsctl.c                                   |   84 +----
2137  fs/nfsd/nfsd.h                                     |    4 +-
2138  fs/nfsd/nfssvc.c                                   |   26 +-
2139  fs/nfsd/state.h                                    |    8 +-
2140  fs/nfsd/vfs.c                                      |    2 +-
2141  include/linux/sunrpc/svc_xprt.h                    |    5 +-
2142  include/linux/sunrpc/svcsock.h                     |    3 -
2143  net/sunrpc/svc_xprt.c                              |  233 +++++++------
2144  net/sunrpc/svcsock.c                               |  157 +++------
2145  net/sunrpc/xprtrdma/svc_rdma_transport.c           |    4 -
2146  21 files changed, 460 insertions(+), 515 deletions(-)
2147  create mode 100644 Documentation/filesystems/nfs/nfsd-admin-interfaces.txt
2148 Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
2149 $ git merge ocfs2/linux-next
2150 Auto-merging fs/ocfs2/cluster/heartbeat.c
2151 Merge made by the 'recursive' strategy.
2152  fs/ocfs2/cluster/heartbeat.c |   40 +++++++++-------------------------------
2153  fs/ocfs2/cluster/masklog.h   |    3 ++-
2154  fs/ocfs2/dlm/dlmmaster.c     |   10 ++++++++--
2155  fs/ocfs2/dlm/dlmrecovery.c   |    7 +++++++
2156  fs/ocfs2/symlink.c           |    2 +-
2157  5 files changed, 27 insertions(+), 35 deletions(-)
2158 Merging omfs/for-next (976d167 Linux 3.1-rc9)
2159 $ git merge omfs/for-next
2160 Already up-to-date.
2161 Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
2162 $ git merge squashfs/master
2163 Already up-to-date.
2164 Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
2165 $ git merge v9fs/for-next
2166 Auto-merging net/9p/trans_fd.c
2167 Auto-merging fs/9p/v9fs.c
2168 Merge made by the 'recursive' strategy.
2169  fs/9p/v9fs.c      |   30 +++++++++++++++++++-----------
2170  fs/9p/vfs_inode.c |    8 ++++----
2171  net/9p/client.c   |   18 ++++++++++++++++--
2172  net/9p/trans_fd.c |   38 ++++++++++++++++++++------------------
2173  4 files changed, 59 insertions(+), 35 deletions(-)
2174 Merging ubifs/linux-next (3668b70 UBIFS: print less)
2175 $ git merge ubifs/linux-next
2176 Already up-to-date.
2177 Merging xfs/for-next (2ea0392 xfs: Make inode32 a remountable option)
2178 $ git merge xfs/for-next
2179 Already up-to-date.
2180 Merging vfs/for-next (2bd2c19 MAX_LFS_FILESIZE should be a loff_t)
2181 $ git merge vfs/for-next
2182 Already up-to-date.
2183 Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next)
2184 $ git merge pci/next
2185 Already up-to-date.
2186 Merging powerpc/next (d900bd7 powerpc/iommu: Fix multiple issues with IOMMU pools code)
2187 $ git merge powerpc/next
2188 Already up-to-date.
2189 Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
2190 $ git merge 4xx/next
2191 Already up-to-date.
2192 Merging mpc5xxx/next (f3ac712 powerpc/pcm030: add pcm030-audio-fabric to dts)
2193 $ git merge mpc5xxx/next
2194 Merge made by the 'recursive' strategy.
2195  arch/powerpc/boot/dts/pcm030.dts |    7 ++++++-
2196  1 file changed, 6 insertions(+), 1 deletion(-)
2197 Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
2198 $ git merge galak/next
2199 Already up-to-date.
2200 Merging hid/for-next (0b82411 Merge branch 'hidraw' into for-next)
2201 $ git merge hid/for-next
2202 Resolved 'drivers/hid/hid-multitouch.c' using previous resolution.
2203 Auto-merging drivers/hid/hid-multitouch.c
2204 CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c
2205 Automatic merge failed; fix conflicts and then commit the result.
2206 $ git commit -v -a
2207 [master 64a2c19] Merge remote-tracking branch 'hid/for-next'
2208 $ git diff -M --stat --summary HEAD^..
2209 Merging quilt/i2c (d43b716 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild)
2210 $ git merge quilt/i2c
2211 Already up-to-date.
2212 Merging i2c-embedded/i2c-embedded/for-next (62885f5 MXS: Implement DMA support into mxs-i2c)
2213 $ git merge i2c-embedded/i2c-embedded/for-next
2214 Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution.
2215 Auto-merging drivers/i2c/busses/i2c-s3c2410.c
2216 Auto-merging drivers/i2c/busses/i2c-omap.c
2217 CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
2218 Auto-merging drivers/i2c/busses/i2c-mpc.c
2219 Auto-merging drivers/i2c/busses/i2c-imx.c
2220 Auto-merging drivers/i2c/busses/i2c-davinci.c
2221 Auto-merging drivers/i2c/busses/Kconfig
2222 Auto-merging arch/arm/plat-omap/i2c.c
2223 Removing arch/arm/mach-at91/include/mach/at91_twi.h
2224 Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
2225 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
2226 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
2227 Auto-merging arch/arm/mach-at91/at91sam9263.c
2228 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
2229 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
2230 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
2231 Auto-merging arch/arm/boot/dts/imx28.dtsi
2232 Automatic merge failed; fix conflicts and then commit the result.
2233 $ git commit -v -a
2234 [master b7bf318] Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
2235 $ git diff -M --stat --summary HEAD^..
2236  .../devicetree/bindings/i2c/atmel-i2c.txt          |   30 +
2237  Documentation/devicetree/bindings/i2c/davinci.txt  |   28 +
2238  Documentation/devicetree/bindings/i2c/i2c-mxs.txt  |    2 +
2239  Documentation/devicetree/bindings/i2c/nomadik.txt  |   23 +
2240  arch/arm/boot/dts/at91sam9260.dtsi                 |   10 +
2241  arch/arm/boot/dts/at91sam9263.dtsi                 |   10 +
2242  arch/arm/boot/dts/at91sam9g20.dtsi                 |    4 +
2243  arch/arm/boot/dts/at91sam9g25ek.dts                |   12 +
2244  arch/arm/boot/dts/at91sam9g45.dtsi                 |   20 +
2245  arch/arm/boot/dts/at91sam9m10g45ek.dts             |    8 +
2246  arch/arm/boot/dts/at91sam9n12.dtsi                 |   20 +
2247  arch/arm/boot/dts/at91sam9n12ek.dts                |    8 +
2248  arch/arm/boot/dts/at91sam9x5.dtsi                  |   30 +
2249  arch/arm/boot/dts/imx28.dtsi                       |    2 +
2250  arch/arm/mach-at91/at91rm9200.c                    |    1 +
2251  arch/arm/mach-at91/at91rm9200_devices.c            |    2 +-
2252  arch/arm/mach-at91/at91sam9260.c                   |    3 +
2253  arch/arm/mach-at91/at91sam9260_devices.c           |    8 +-
2254  arch/arm/mach-at91/at91sam9261.c                   |    2 +
2255  arch/arm/mach-at91/at91sam9261_devices.c           |   14 +-
2256  arch/arm/mach-at91/at91sam9263.c                   |    2 +
2257  arch/arm/mach-at91/at91sam9263_devices.c           |    2 +-
2258  arch/arm/mach-at91/at91sam9g45.c                   |    4 +
2259  arch/arm/mach-at91/at91sam9g45_devices.c           |   10 +-
2260  arch/arm/mach-at91/at91sam9n12.c                   |    2 +
2261  arch/arm/mach-at91/at91sam9rl.c                    |    2 +
2262  arch/arm/mach-at91/at91sam9rl_devices.c            |    2 +-
2263  arch/arm/mach-at91/at91sam9x5.c                    |    3 +
2264  arch/arm/mach-at91/include/mach/at91_twi.h         |   68 --
2265  arch/arm/plat-omap/i2c.c                           |   21 -
2266  drivers/i2c/algos/i2c-algo-pca.c                   |   27 +-
2267  drivers/i2c/busses/Kconfig                         |   27 +-
2268  drivers/i2c/busses/Makefile                        |    1 +
2269  drivers/i2c/busses/i2c-at91.c                      |  667 ++++++++++++------
2270  drivers/i2c/busses/i2c-davinci.c                   |   58 +-
2271  drivers/i2c/busses/i2c-imx.c                       |    6 +-
2272  drivers/i2c/busses/i2c-mpc.c                       |   18 +-
2273  drivers/i2c/busses/i2c-mxs.c                       |  269 +++++++-
2274  drivers/i2c/busses/i2c-nomadik.c                   |   52 +-
2275  drivers/i2c/busses/i2c-omap.c                      |  474 ++++++++-----
2276  drivers/i2c/busses/i2c-rcar.c                      |  709 ++++++++++++++++++++
2277  drivers/i2c/busses/i2c-s3c2410.c                   |   18 +-
2278  include/linux/i2c-algo-pca.h                       |    1 +
2279  include/linux/i2c-omap.h                           |    1 -
2280  include/linux/i2c/i2c-rcar.h                       |   10 +
2281  include/linux/platform_data/i2c-nomadik.h          |    2 +-
2282  46 files changed, 2096 insertions(+), 597 deletions(-)
2283  create mode 100644 Documentation/devicetree/bindings/i2c/atmel-i2c.txt
2284  create mode 100644 Documentation/devicetree/bindings/i2c/davinci.txt
2285  create mode 100644 Documentation/devicetree/bindings/i2c/nomadik.txt
2286  delete mode 100644 arch/arm/mach-at91/include/mach/at91_twi.h
2287  create mode 100644 drivers/i2c/busses/i2c-rcar.c
2288  create mode 100644 include/linux/i2c/i2c-rcar.h
2289 Merging quilt/jdelvare-hwmon (e086be6 hwmon: Drop needless includes of <linux/delay.h>)
2290 $ git merge quilt/jdelvare-hwmon
2291 Merge made by the 'recursive' strategy.
2292  Documentation/hwmon/da9052             |    2 +-
2293  Documentation/hwmon/max1619            |    2 +-
2294  Documentation/hwmon/twl4030-madc-hwmon |    2 +-
2295  drivers/hwmon/adm9240.c                |    1 +
2296  drivers/hwmon/adt7411.c                |    1 -
2297  drivers/hwmon/adt7462.c                |    1 -
2298  drivers/hwmon/adt7475.c                |    1 +
2299  drivers/hwmon/asus_atk0110.c           |    1 +
2300  drivers/hwmon/da9052-hwmon.c           |    1 -
2301  drivers/hwmon/emc1403.c                |    1 +
2302  drivers/hwmon/emc6w201.c               |    1 -
2303  drivers/hwmon/hih6130.c                |    1 +
2304  drivers/hwmon/i5k_amb.c                |    2 --
2305  drivers/hwmon/ina2xx.c                 |    1 +
2306  drivers/hwmon/k8temp.c                 |    1 -
2307  drivers/hwmon/lineage-pem.c            |    1 +
2308  drivers/hwmon/lm92.c                   |    1 +
2309  drivers/hwmon/lm93.c                   |    1 +
2310  drivers/hwmon/ltc4151.c                |    1 +
2311  drivers/hwmon/ltc4215.c                |    1 +
2312  drivers/hwmon/ltc4245.c                |    1 +
2313  drivers/hwmon/ltc4261.c                |    1 +
2314  drivers/hwmon/max16065.c               |    1 -
2315  drivers/hwmon/max1619.c                |    4 ++--
2316  drivers/hwmon/max6642.c                |    2 +-
2317  drivers/hwmon/pmbus/pmbus_core.c       |    2 +-
2318  drivers/hwmon/s3c-hwmon.c              |    1 -
2319  drivers/hwmon/sht21.c                  |    1 +
2320  drivers/hwmon/smm665.c                 |    1 +
2321  drivers/hwmon/thmc50.c                 |    1 +
2322  drivers/hwmon/tmp102.c                 |    1 +
2323  drivers/hwmon/w83791d.c                |    1 +
2324  drivers/hwmon/w83792d.c                |    1 +
2325  drivers/hwmon/w83793.c                 |    1 +
2326  drivers/hwmon/w83795.c                 |    2 +-
2327  drivers/hwmon/w83l786ng.c              |    1 +
2328  36 files changed, 29 insertions(+), 17 deletions(-)
2329 Merging hwmon-staging/hwmon-next (967d7fe hwmon: (ads7828) driver cleanup)
2330 $ git merge hwmon-staging/hwmon-next
2331 Merge made by the 'recursive' strategy.
2332  drivers/hwmon/ads7828.c |   91 ++++++++++++++++++++++-------------------------
2333  1 file changed, 43 insertions(+), 48 deletions(-)
2334 Merging v4l-dvb/master (7da79d8 Merge /home/v4l/v4l/patchwork)
2335 $ git merge v4l-dvb/master
2336 Resolved 'arch/arm/mach-davinci/include/mach/da8xx.h' using previous resolution.
2337 Removing drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
2338 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h
2339 Auto-merging drivers/media/platform/s5p-fimc/fimc-capture.c
2340 Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
2341 Auto-merging arch/arm/mach-exynos/mach-origen.c
2342 Auto-merging arch/arm/mach-exynos/mach-nuri.c
2343 Auto-merging arch/arm/mach-davinci/include/mach/da8xx.h
2344 CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/da8xx.h
2345 Auto-merging arch/arm/mach-davinci/dm644x.c
2346 Auto-merging arch/arm/mach-davinci/da850.c
2347 Automatic merge failed; fix conflicts and then commit the result.
2348 $ git commit -v -a
2349 [master 9121304] Merge remote-tracking branch 'v4l-dvb/master'
2350 $ git diff -M --stat --summary HEAD^..
2351  Documentation/DocBook/media/v4l/compat.xml         |    4 +
2352  Documentation/DocBook/media/v4l/controls.xml       |  278 ++-
2353  Documentation/DocBook/media/v4l/io.xml             |    6 +-
2354  Documentation/DocBook/media/v4l/pixfmt-nv12m.xml   |   17 +-
2355  Documentation/DocBook/media/v4l/pixfmt.xml         |   38 +
2356  Documentation/DocBook/media/v4l/subdev-formats.xml |   44 +
2357  Documentation/DocBook/media/v4l/vidioc-qbuf.xml    |    3 +-
2358  .../DocBook/media/v4l/vidioc-querybuf.xml          |   11 +-
2359  Documentation/video4linux/v4l2-controls.txt        |   24 +
2360  arch/arm/mach-davinci/Kconfig                      |    7 +
2361  arch/arm/mach-davinci/board-da850-evm.c            |  179 ++
2362  arch/arm/mach-davinci/board-dm644x-evm.c           |   15 +-
2363  arch/arm/mach-davinci/board-dm646x-evm.c           |   80 +-
2364  arch/arm/mach-davinci/da850.c                      |  152 ++
2365  arch/arm/mach-davinci/dm644x.c                     |   17 +-
2366  arch/arm/mach-davinci/include/mach/da8xx.h         |   11 +
2367  arch/arm/mach-davinci/include/mach/mux.h           |   42 +
2368  arch/arm/mach-davinci/include/mach/psc.h           |    1 +
2369  arch/arm/mach-exynos/mach-nuri.c                   |    7 +-
2370  arch/arm/mach-exynos/mach-origen.c                 |    4 +-
2371  arch/arm/mach-exynos/mach-universal_c210.c         |    7 +-
2372  arch/arm/plat-samsung/setup-mipiphy.c              |   20 +-
2373  drivers/media/dvb-frontends/af9033.c               |   16 +-
2374  drivers/media/dvb-frontends/cxd2820r_core.c        |    3 +-
2375  drivers/media/i2c/m5mols/m5mols.h                  |    9 +
2376  drivers/media/i2c/m5mols/m5mols_capture.c          |    3 +
2377  drivers/media/i2c/m5mols/m5mols_core.c             |   47 +
2378  drivers/media/i2c/m5mols/m5mols_reg.h              |    1 +
2379  drivers/media/i2c/mt9p031.c                        |   19 +-
2380  drivers/media/i2c/mt9t001.c                        |   22 +-
2381  drivers/media/i2c/mt9v032.c                        |   54 +-
2382  drivers/media/i2c/ths7303.c                        |  106 +-
2383  drivers/media/i2c/tvp514x.c                        |   77 +-
2384  drivers/media/platform/Kconfig                     |    4 +-
2385  drivers/media/platform/davinci/vpbe.c              |  110 +-
2386  drivers/media/platform/davinci/vpbe_display.c      |   80 +-
2387  drivers/media/platform/davinci/vpbe_venc.c         |   25 +-
2388  drivers/media/platform/davinci/vpfe_capture.c      |   17 +-
2389  drivers/media/platform/davinci/vpif_capture.c      |  370 ++--
2390  drivers/media/platform/davinci/vpif_capture.h      |   16 +-
2391  drivers/media/platform/davinci/vpif_display.c      |  275 ++-
2392  drivers/media/platform/davinci/vpif_display.h      |   18 +-
2393  drivers/media/platform/fsl-viu.c                   |    2 +-
2394  drivers/media/platform/s5p-fimc/fimc-capture.c     |  135 +-
2395  drivers/media/platform/s5p-fimc/fimc-core.c        |   19 +-
2396  drivers/media/platform/s5p-fimc/fimc-core.h        |   28 +-
2397  drivers/media/platform/s5p-fimc/fimc-m2m.c         |   25 +-
2398  drivers/media/platform/s5p-fimc/fimc-reg.c         |   23 +-
2399  drivers/media/platform/s5p-fimc/fimc-reg.h         |    3 +-
2400  drivers/media/platform/s5p-fimc/mipi-csis.c        |   75 +-
2401  drivers/media/platform/s5p-g2d/g2d.c               |    2 +-
2402  drivers/media/platform/s5p-jpeg/jpeg-core.c        |    6 +-
2403  drivers/media/platform/s5p-mfc/Makefile            |    7 +-
2404  drivers/media/platform/s5p-mfc/regs-mfc-v6.h       |  408 ++++
2405  drivers/media/platform/s5p-mfc/regs-mfc.h          |   41 +
2406  drivers/media/platform/s5p-mfc/s5p_mfc.c           |  294 ++-
2407  drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c       |  111 +-
2408  drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h       |   17 +-
2409  drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c    |  166 ++
2410  drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h    |   20 +
2411  drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c    |  156 ++
2412  drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h    |   20 +
2413  drivers/media/platform/s5p-mfc/s5p_mfc_common.h    |  191 +-
2414  drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c      |  202 +-
2415  drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h      |    1 +
2416  drivers/media/platform/s5p-mfc/s5p_mfc_dec.c       |  258 ++-
2417  drivers/media/platform/s5p-mfc/s5p_mfc_dec.h       |    1 +
2418  drivers/media/platform/s5p-mfc/s5p_mfc_enc.c       |  236 ++-
2419  drivers/media/platform/s5p-mfc/s5p_mfc_enc.h       |    1 +
2420  drivers/media/platform/s5p-mfc/s5p_mfc_intr.c      |   11 +-
2421  drivers/media/platform/s5p-mfc/s5p_mfc_opr.c       | 1418 +-------------
2422  drivers/media/platform/s5p-mfc/s5p_mfc_opr.h       |  137 +-
2423  drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c    | 1794 ++++++++++++++++++
2424  .../s5p-mfc/{s5p_mfc_shm.h => s5p_mfc_opr_v5.h}    |   41 +-
2425  drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c    | 1956 ++++++++++++++++++++
2426  drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h    |   50 +
2427  drivers/media/platform/s5p-mfc/s5p_mfc_pm.c        |    3 +-
2428  drivers/media/platform/s5p-mfc/s5p_mfc_shm.c       |   47 -
2429  drivers/media/usb/dvb-usb/technisat-usb2.c         |    1 +
2430  drivers/media/v4l2-core/v4l2-ctrls.c               |   74 +
2431  drivers/media/v4l2-core/v4l2-ioctl.c               |    1 +
2432  drivers/media/v4l2-core/videobuf2-core.c           |   79 +-
2433  include/linux/platform_data/mipi-csis.h            |   30 +-
2434  include/linux/v4l2-controls.h                      |   42 +
2435  include/linux/v4l2-mediabus.h                      |    5 +
2436  include/linux/videodev2.h                          |    5 +
2437  include/media/davinci/vpbe.h                       |   14 +-
2438  include/media/davinci/vpbe_types.h                 |    8 +-
2439  include/media/davinci/vpbe_venc.h                  |    2 +-
2440  include/media/davinci/vpif_types.h                 |   26 +-
2441  include/media/s5p_fimc.h                           |    2 -
2442  include/media/v4l2-ctrls.h                         |   23 +
2443  include/media/v4l2-subdev.h                        |   48 +
2444  93 files changed, 7653 insertions(+), 2851 deletions(-)
2445  create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v6.h
2446  create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
2447  create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h
2448  create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
2449  create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h
2450  create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
2451  rename drivers/media/platform/s5p-mfc/{s5p_mfc_shm.h => s5p_mfc_opr_v5.h} (76%)
2452  create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
2453  create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
2454  delete mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
2455 Merging kbuild/for-next (f1748a9 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
2456 $ git merge kbuild/for-next
2457 Auto-merging tools/testing/ktest/ktest.pl
2458 Auto-merging scripts/kernel-doc
2459 Auto-merging Makefile
2460 Auto-merging MAINTAINERS
2461 Merge made by the 'recursive' strategy.
2462  MAINTAINERS                          |    5 -
2463  Makefile                             |   19 +--
2464  scripts/Makefile.modinst             |    2 +-
2465  scripts/Makefile.modpost             |    2 +-
2466  scripts/coccinelle/api/ptr_ret.cocci |   26 ++++
2467  scripts/kconfig/Makefile             |   12 +-
2468  scripts/kconfig/conf.c               |   25 ++--
2469  scripts/kconfig/expr.h               |   11 ++
2470  scripts/kconfig/lkc_proto.h          |    6 +-
2471  scripts/kconfig/lxdialog/dialog.h    |    9 +-
2472  scripts/kconfig/lxdialog/textbox.c   |  171 +++++++++++----------
2473  scripts/kconfig/lxdialog/util.c      |    7 +
2474  scripts/kconfig/mconf.c              |  123 +++++++++++----
2475  scripts/kconfig/menu.c               |   53 +++++--
2476  scripts/kconfig/nconf.c              |    2 +-
2477  scripts/kernel-doc                   |  273 +++++++++++++++++++++++++++++++++-
2478  scripts/package/buildtar             |    6 +-
2479  scripts/tags.sh                      |    8 +-
2480  tools/testing/ktest/ktest.pl         |   15 +-
2481  19 files changed, 602 insertions(+), 173 deletions(-)
2482 Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
2483 $ git merge kconfig/for-next
2484 Already up-to-date.
2485 Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
2486 $ git merge libata/NEXT
2487 Already up-to-date.
2488 Merging infiniband/for-next (56040f0 Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next)
2489 $ git merge infiniband/for-next
2490 Already up-to-date.
2491 Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
2492 $ git merge pstore/master
2493 Already up-to-date.
2494 Merging acpi/next (d1d4a81 Merge branches 'fixes-for-37', 'ec' and 'thermal' into release)
2495 $ git merge acpi/next
2496 Auto-merging include/linux/platform_data/exynos_thermal.h
2497 Removing drivers/hwmon/exynos4_tmu.c
2498 Auto-merging Documentation/thermal/exynos_thermal
2499 Merge made by the 'recursive' strategy.
2500  Documentation/thermal/cpu-cooling-api.txt          |   32 +
2501  .../{hwmon/exynos4_tmu => thermal/exynos_thermal}  |   35 +-
2502  Documentation/thermal/sysfs-api.txt                |    9 +-
2503  drivers/acpi/ec.c                                  |   30 +-
2504  drivers/acpi/processor_idle.c                      |    3 +-
2505  drivers/acpi/thermal.c                             |   93 +-
2506  drivers/cpuidle/cpuidle.c                          |    2 +-
2507  drivers/hwmon/Kconfig                              |   10 -
2508  drivers/hwmon/Makefile                             |    1 -
2509  drivers/hwmon/exynos4_tmu.c                        |  518 ----------
2510  drivers/platform/x86/acerhdf.c                     |    5 +-
2511  drivers/platform/x86/intel_mid_thermal.c           |    2 +-
2512  drivers/power/power_supply_core.c                  |    2 +-
2513  drivers/staging/omap-thermal/omap-thermal-common.c |    5 +-
2514  drivers/thermal/Kconfig                            |   26 +
2515  drivers/thermal/Makefile                           |    5 +-
2516  drivers/thermal/cpu_cooling.c                      |  449 +++++++++
2517  drivers/thermal/exynos_thermal.c                   |  997 ++++++++++++++++++++
2518  drivers/thermal/rcar_thermal.c                     |  260 +++++
2519  drivers/thermal/spear_thermal.c                    |    2 +-
2520  drivers/thermal/thermal_sys.c                      |  321 ++++---
2521  include/linux/cpu_cooling.h                        |   58 ++
2522  .../{exynos4_tmu.h => exynos_thermal.h}            |   47 +-
2523  include/linux/thermal.h                            |   28 +-
2524  tools/power/acpi/acpidump.c                        |    1 -
2525  25 files changed, 2205 insertions(+), 736 deletions(-)
2526  create mode 100644 Documentation/thermal/cpu-cooling-api.txt
2527  rename Documentation/{hwmon/exynos4_tmu => thermal/exynos_thermal} (71%)
2528  delete mode 100644 drivers/hwmon/exynos4_tmu.c
2529  create mode 100644 drivers/thermal/cpu_cooling.c
2530  create mode 100644 drivers/thermal/exynos_thermal.c
2531  create mode 100644 drivers/thermal/rcar_thermal.c
2532  create mode 100644 include/linux/cpu_cooling.h
2533  rename include/linux/platform_data/{exynos4_tmu.h => exynos_thermal.h} (64%)
2534 Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
2535 $ git merge cpuidle/cpuidle-next
2536 Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
2537 Resolved 'include/linux/cpuidle.h' using previous resolution.
2538 Auto-merging include/linux/cpuidle.h
2539 CONFLICT (content): Merge conflict in include/linux/cpuidle.h
2540 Auto-merging drivers/cpuidle/coupled.c
2541 CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
2542 Automatic merge failed; fix conflicts and then commit the result.
2543 $ git commit -v -a
2544 [master c7f6d08] Merge remote-tracking branch 'cpuidle/cpuidle-next'
2545 $ git diff -M --stat --summary HEAD^..
2546 Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
2547 $ git merge cpupowerutils/master
2548 Already up-to-date.
2549 Merging thermal/next (f5a246e Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
2550 $ git merge thermal/next
2551 Already up-to-date.
2552 $ git am -3 ../patches/0001-termal-for-for-MAX_ID_MASK-to-MAX_IDR_MASK-rename.patch
2553 Applying: thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK rename
2554 Using index info to reconstruct a base tree...
2555 M       drivers/thermal/cpu_cooling.c
2556 Falling back to patching base and 3-way merge...
2557 No changes -- Patch already applied.
2558 Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
2559 $ git merge ieee1394/for-next
2560 Merge made by the 'recursive' strategy.
2561  drivers/firewire/core-cdev.c |    4 ++--
2562  1 file changed, 2 insertions(+), 2 deletions(-)
2563 Merging ubi/linux-next (76ac66e UBI: Wire-up fastmap)
2564 $ git merge ubi/linux-next
2565 Already up-to-date.
2566 Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
2567 $ git merge dlm/next
2568 Already up-to-date.
2569 Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
2570 $ git merge scsi/for-next
2571 Merge made by the 'recursive' strategy.
2572  Documentation/ABI/testing/sysfs-bus-fcoe    |   12 +-
2573  Documentation/scsi/ChangeLog.megaraid_sas   |   13 +
2574  drivers/scsi/bfa/bfa_core.c                 |   85 ++-
2575  drivers/scsi/bfa/bfa_defs.h                 |   61 +-
2576  drivers/scsi/bfa/bfa_defs_svc.h             |  119 ++-
2577  drivers/scsi/bfa/bfa_fc.h                   |    5 +
2578  drivers/scsi/bfa/bfa_fcbuild.c              |    4 +
2579  drivers/scsi/bfa/bfa_fcpim.c                |  123 ++-
2580  drivers/scsi/bfa/bfa_fcpim.h                |   13 +-
2581  drivers/scsi/bfa/bfa_fcs.c                  |   64 +-
2582  drivers/scsi/bfa/bfa_fcs.h                  |   23 +-
2583  drivers/scsi/bfa/bfa_fcs_lport.c            |  155 +++-
2584  drivers/scsi/bfa/bfa_fcs_rport.c            |  288 ++++++-
2585  drivers/scsi/bfa/bfa_ioc.c                  |  494 +++++++++++-
2586  drivers/scsi/bfa/bfa_ioc.h                  |   63 +-
2587  drivers/scsi/bfa/bfa_ioc_ct.c               |  236 +++---
2588  drivers/scsi/bfa/bfa_modules.h              |    1 +
2589  drivers/scsi/bfa/bfa_port.c                 |   32 +
2590  drivers/scsi/bfa/bfa_port.h                 |    3 +
2591  drivers/scsi/bfa/bfa_svc.c                  |  732 +++++++++++++++++-
2592  drivers/scsi/bfa/bfa_svc.h                  |   30 +-
2593  drivers/scsi/bfa/bfad.c                     |    6 +-
2594  drivers/scsi/bfa/bfad_bsg.c                 |  375 +++++++--
2595  drivers/scsi/bfa/bfad_bsg.h                 |   63 +-
2596  drivers/scsi/bfa/bfad_drv.h                 |    2 +-
2597  drivers/scsi/bfa/bfi.h                      |   72 +-
2598  drivers/scsi/bfa/bfi_ms.h                   |   14 +
2599  drivers/scsi/bfa/bfi_reg.h                  |    3 +
2600  drivers/scsi/fcoe/fcoe.c                    |   14 +-
2601  drivers/scsi/fcoe/fcoe.h                    |    2 +
2602  drivers/scsi/libfc/fc_fcp.c                 |    3 +-
2603  drivers/scsi/lpfc/lpfc.h                    |    2 +
2604  drivers/scsi/lpfc/lpfc_attr.c               |    8 +-
2605  drivers/scsi/lpfc/lpfc_crtn.h               |    1 +
2606  drivers/scsi/lpfc/lpfc_els.c                |    7 +-
2607  drivers/scsi/lpfc/lpfc_hbadisc.c            |   11 +-
2608  drivers/scsi/lpfc/lpfc_hw4.h                |   20 +-
2609  drivers/scsi/lpfc/lpfc_init.c               |  256 +++++--
2610  drivers/scsi/lpfc/lpfc_scsi.c               |   39 +-
2611  drivers/scsi/lpfc/lpfc_sli.c                |   96 ++-
2612  drivers/scsi/lpfc/lpfc_sli4.h               |    8 +-
2613  drivers/scsi/lpfc/lpfc_version.h            |    2 +-
2614  drivers/scsi/megaraid/megaraid_sas.h        |    8 +-
2615  drivers/scsi/megaraid/megaraid_sas_base.c   |   13 +-
2616  drivers/scsi/megaraid/megaraid_sas_fp.c     |    2 +-
2617  drivers/scsi/megaraid/megaraid_sas_fusion.c |   27 +-
2618  drivers/scsi/megaraid/megaraid_sas_fusion.h |    2 +-
2619  drivers/scsi/mvumi.c                        | 1093 ++++++++++++++++++++++-----
2620  drivers/scsi/mvumi.h                        |  235 ++++--
2621  drivers/scsi/qla2xxx/qla_init.c             |    5 +-
2622  drivers/scsi/scsi_debug.c                   |    2 +-
2623  drivers/scsi/scsi_error.c                   |    8 +-
2624  drivers/scsi/storvsc_drv.c                  |    5 +
2625  drivers/scsi/virtio_scsi.c                  |   39 +-
2626  include/linux/virtio_scsi.h                 |    2 +
2627  include/scsi/fc/fc_fcp.h                    |    6 +
2628  include/scsi/libfcoe.h                      |    2 -
2629  include/scsi/scsi_cmnd.h                    |   12 +-
2630  58 files changed, 4274 insertions(+), 747 deletions(-)
2631 Merging target-updates/for-next (cf0eb28 iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values)
2632 $ git merge target-updates/for-next
2633 Auto-merging drivers/usb/gadget/tcm_usb_gadget.c
2634 Auto-merging drivers/target/iscsi/iscsi_target_parameters.c
2635 Auto-merging drivers/scsi/qla2xxx/qla_target.c
2636 Merge made by the 'recursive' strategy.
2637  Documentation/target/tcm_mod_builder.py          |   16 --
2638  drivers/infiniband/ulp/srpt/ib_srpt.c            |   12 -
2639  drivers/scsi/qla2xxx/qla_target.c                |    2 +-
2640  drivers/scsi/qla2xxx/tcm_qla2xxx.c               |   15 --
2641  drivers/target/iscsi/iscsi_target.c              |  196 ++++++++--------
2642  drivers/target/iscsi/iscsi_target.h              |    5 +
2643  drivers/target/iscsi/iscsi_target_configfs.c     |   42 +---
2644  drivers/target/iscsi/iscsi_target_core.h         |   15 +-
2645  drivers/target/iscsi/iscsi_target_erl0.c         |   94 ++++----
2646  drivers/target/iscsi/iscsi_target_erl1.c         |    4 +-
2647  drivers/target/iscsi/iscsi_target_erl1.h         |    4 +-
2648  drivers/target/iscsi/iscsi_target_erl2.c         |    9 +-
2649  drivers/target/iscsi/iscsi_target_erl2.h         |    2 +-
2650  drivers/target/iscsi/iscsi_target_login.c        |   20 +-
2651  drivers/target/iscsi/iscsi_target_nego.c         |   31 +--
2652  drivers/target/iscsi/iscsi_target_parameters.c   |   71 +++++-
2653  drivers/target/iscsi/iscsi_target_parameters.h   |    7 +-
2654  drivers/target/iscsi/iscsi_target_seq_pdu_list.c |   61 ++---
2655  drivers/target/iscsi/iscsi_target_tmr.c          |   31 +--
2656  drivers/target/iscsi/iscsi_target_tpg.c          |   12 +
2657  drivers/target/iscsi/iscsi_target_tq.c           |    6 +-
2658  drivers/target/iscsi/iscsi_target_tq.h           |    1 -
2659  drivers/target/iscsi/iscsi_target_util.c         |   16 +-
2660  drivers/target/iscsi/iscsi_target_util.h         |    8 +-
2661  drivers/target/loopback/tcm_loop.c               |   74 +-----
2662  drivers/target/sbp/sbp_target.c                  |   27 +--
2663  drivers/target/target_core_alua.c                |    2 +-
2664  drivers/target/target_core_configfs.c            |   18 +-
2665  drivers/target/target_core_device.c              |   16 +-
2666  drivers/target/target_core_fabric_configfs.c     |    1 -
2667  drivers/target/target_core_fabric_lib.c          |    8 +-
2668  drivers/target/target_core_file.c                |   43 +++-
2669  drivers/target/target_core_file.h                |    1 +
2670  drivers/target/target_core_iblock.c              |   17 +-
2671  drivers/target/target_core_pr.c                  |   14 +-
2672  drivers/target/target_core_pscsi.c               |    2 +-
2673  drivers/target/target_core_sbc.c                 |   23 +-
2674  drivers/target/target_core_spc.c                 |   48 ++--
2675  drivers/target/target_core_stat.c                |    1 -
2676  drivers/target/target_core_tpg.c                 |    2 +-
2677  drivers/target/target_core_transport.c           |  268 ++++++++++++----------
2678  drivers/target/tcm_fc/tfc_cmd.c                  |    1 -
2679  drivers/target/tcm_fc/tfc_conf.c                 |   12 -
2680  drivers/target/tcm_fc/tfc_io.c                   |    4 +-
2681  drivers/target/tcm_fc/tfc_sess.c                 |    1 -
2682  drivers/usb/gadget/tcm_usb_gadget.c              |   15 +-
2683  drivers/vhost/tcm_vhost.c                        |   81 ++-----
2684  drivers/vhost/tcm_vhost.h                        |    8 +
2685  include/target/target_core_backend.h             |    3 -
2686  include/target/target_core_fabric.h              |    5 +-
2687  50 files changed, 640 insertions(+), 735 deletions(-)
2688 Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2)
2689 $ git merge target-merge/for-next-merge
2690 Already up-to-date.
2691 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
2692 $ git merge ibft/linux-next
2693 Already up-to-date.
2694 Merging isci/all (6734092 isci: add a couple __iomem annotations)
2695 $ git merge isci/all
2696 Already up-to-date.
2697 Merging slave-dma/next (d0fc905 dma: tegra: fix interrupt name issue with apb dma.)
2698 $ git merge slave-dma/next
2699 Resolved 'drivers/dma/mmp_tdma.c' using previous resolution.
2700 Resolved 'drivers/mmc/host/davinci_mmc.c' using previous resolution.
2701 Resolved 'drivers/spi/spi-davinci.c' using previous resolution.
2702 Auto-merging drivers/spi/spi-davinci.c
2703 CONFLICT (content): Merge conflict in drivers/spi/spi-davinci.c
2704 Auto-merging drivers/spi/Kconfig
2705 Auto-merging drivers/mmc/host/davinci_mmc.c
2706 CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
2707 Auto-merging drivers/dma/tegra20-apb-dma.c
2708 Auto-merging drivers/dma/ste_dma40.c
2709 Auto-merging drivers/dma/sirf-dma.c
2710 Auto-merging drivers/dma/pl330.c
2711 Auto-merging drivers/dma/mxs-dma.c
2712 Auto-merging drivers/dma/mmp_tdma.c
2713 CONFLICT (content): Merge conflict in drivers/dma/mmp_tdma.c
2714 Auto-merging arch/arm/mach-spear13xx/spear13xx.c
2715 Automatic merge failed; fix conflicts and then commit the result.
2716 $ git commit -v -a
2717 [master 0608da4] Merge remote-tracking branch 'slave-dma/next'
2718 $ git diff -M --stat --summary HEAD^..
2719  arch/arm/mach-exynos/dma.c            |    2 +
2720  arch/arm/mach-spear13xx/spear13xx.c   |    3 +
2721  arch/avr32/mach-at32ap/at32ap700x.c   |    3 +
2722  drivers/dma/Kconfig                   |   17 +
2723  drivers/dma/Makefile                  |    2 +
2724  drivers/dma/amba-pl08x.c              |    2 +
2725  drivers/dma/dw_dmac.c                 |  258 +++++++---
2726  drivers/dma/dw_dmac_regs.h            |   48 +-
2727  drivers/dma/edma.c                    |  671 +++++++++++++++++++++++++
2728  drivers/dma/ioat/dma_v2.c             |    3 +-
2729  drivers/dma/ioat/pci.c                |   22 +
2730  drivers/dma/mmp_pdma.c                |  875 +++++++++++++++++++++++++++++++++
2731  drivers/dma/mmp_tdma.c                |   51 +-
2732  drivers/dma/mxs-dma.c                 |   14 +-
2733  drivers/dma/pl330.c                   |   76 +--
2734  drivers/dma/sirf-dma.c                |   23 +-
2735  drivers/dma/ste_dma40.c               |   14 +-
2736  drivers/dma/tegra20-apb-dma.c         |   12 +-
2737  drivers/mmc/host/davinci_mmc.c        |  271 +++-------
2738  drivers/spi/Kconfig                   |    1 +
2739  drivers/spi/spi-davinci.c             |  292 +++++------
2740  include/linux/dw_dmac.h               |    7 +
2741  include/linux/edma.h                  |   29 ++
2742  include/linux/platform_data/mmp_dma.h |   19 +
2743  24 files changed, 2166 insertions(+), 549 deletions(-)
2744  create mode 100644 drivers/dma/edma.c
2745  create mode 100644 drivers/dma/mmp_pdma.c
2746  create mode 100644 include/linux/edma.h
2747  create mode 100644 include/linux/platform_data/mmp_dma.h
2748 $ git am -3 ../patches/DMA__PL330__Fix_build_error_on_linux-next-20120924.patch
2749 Applying: DMA: PL330: Fix build error (on linux-next-20120924)
2750 $ git reset HEAD^
2751 Unstaged changes after reset:
2752 M       drivers/dma/pl330.c
2753 $ git add .
2754 $ git commit -v -a --amend
2755 [master b3fb3ac] Merge remote-tracking branch 'slave-dma/next'
2756 Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
2757 $ git merge dmaengine/next
2758 Already up-to-date.
2759 Merging net-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
2760 $ git merge net-next/master
2761 Already up-to-date.
2762 Merging wireless-next/master (5160b46 ath9k: Fix BTCOEX weight initialization)
2763 $ git merge wireless-next/master
2764 Already up-to-date.
2765 Merging bluetooth/master (23d3a86 Bluetooth: don't attempt to free a channel that wasn't created)
2766 $ git merge bluetooth/master
2767 Auto-merging net/bluetooth/rfcomm/tty.c
2768 Auto-merging net/bluetooth/rfcomm/sock.c
2769 Auto-merging net/bluetooth/mgmt.c
2770 Auto-merging net/bluetooth/l2cap_sock.c
2771 Auto-merging net/bluetooth/l2cap_core.c
2772 Auto-merging net/bluetooth/hci_core.c
2773 Merge made by the 'recursive' strategy.
2774  drivers/bluetooth/btmrvl_sdio.c   |   24 +-
2775  include/net/bluetooth/a2mp.h      |   22 ++
2776  include/net/bluetooth/amp.h       |   50 ++++
2777  include/net/bluetooth/bluetooth.h |    1 -
2778  include/net/bluetooth/hci.h       |   39 +++-
2779  include/net/bluetooth/hci_core.h  |   13 +-
2780  include/net/bluetooth/l2cap.h     |    9 +-
2781  net/bluetooth/Kconfig             |    1 +
2782  net/bluetooth/Makefile            |    2 +-
2783  net/bluetooth/a2mp.c              |  454 ++++++++++++++++++++++++++++++++++---
2784  net/bluetooth/af_bluetooth.c      |   10 +-
2785  net/bluetooth/amp.c               |  374 ++++++++++++++++++++++++++++++
2786  net/bluetooth/bnep/core.c         |    3 +-
2787  net/bluetooth/cmtp/core.c         |    2 +-
2788  net/bluetooth/hci_conn.c          |    6 +-
2789  net/bluetooth/hci_core.c          |   30 +--
2790  net/bluetooth/hci_event.c         |  141 +++++++++++-
2791  net/bluetooth/hci_sysfs.c         |   10 +-
2792  net/bluetooth/hidp/core.c         |    8 +-
2793  net/bluetooth/l2cap_core.c        |  108 ++++++---
2794  net/bluetooth/l2cap_sock.c        |   14 +-
2795  net/bluetooth/lib.c               |   14 --
2796  net/bluetooth/mgmt.c              |    5 +-
2797  net/bluetooth/rfcomm/core.c       |   15 +-
2798  net/bluetooth/rfcomm/sock.c       |    9 +-
2799  net/bluetooth/rfcomm/tty.c        |    6 +-
2800  net/bluetooth/sco.c               |   12 +-
2801  27 files changed, 1217 insertions(+), 165 deletions(-)
2802  create mode 100644 include/net/bluetooth/amp.h
2803  create mode 100644 net/bluetooth/amp.c
2804 Merging mtd/master (f5cf8f0 mtd: Disable mtdchar mmap on MMU systems)
2805 $ git merge mtd/master
2806 Removing drivers/mtd/nand/nand_bcm_umi.h
2807 Removing drivers/mtd/nand/nand_bcm_umi.c
2808 Removing drivers/mtd/nand/bcm_umi_nand.c
2809 Removing drivers/mtd/nand/bcm_umi_bch.c
2810 Removing drivers/mtd/maps/wr_sbc82xx_flash.c
2811 Merge made by the 'recursive' strategy.
2812  Documentation/DocBook/mtdnand.tmpl                 |    2 -
2813  .../devicetree/bindings/arm/davinci/nand.txt       |   51 +
2814  .../devicetree/bindings/mtd/atmel-nand.txt         |   40 +-
2815  .../devicetree/bindings/mtd/gpmi-nand.txt          |    4 +
2816  .../devicetree/bindings/mtd/lpc32xx-mlc.txt        |   50 +
2817  .../devicetree/bindings/mtd/lpc32xx-slc.txt        |   52 +
2818  .../devicetree/bindings/mtd/mtd-physmap.txt        |    7 +
2819  arch/arm/boot/dts/imx51.dtsi                       |    7 +
2820  arch/arm/boot/dts/imx53.dtsi                       |    7 +
2821  arch/arm/configs/cam60_defconfig                   |    1 -
2822  arch/arm/configs/corgi_defconfig                   |    1 -
2823  arch/arm/configs/ep93xx_defconfig                  |    1 -
2824  arch/arm/configs/mini2440_defconfig                |    1 -
2825  arch/arm/configs/mv78xx0_defconfig                 |    1 -
2826  arch/arm/configs/nhk8815_defconfig                 |    1 -
2827  arch/arm/configs/orion5x_defconfig                 |    1 -
2828  arch/arm/configs/pxa3xx_defconfig                  |    1 -
2829  arch/arm/configs/spitz_defconfig                   |    1 -
2830  arch/arm/mach-clps711x/autcpu12.c                  |   19 +
2831  arch/arm/mach-imx/clk-imx51-imx53.c                |    2 +
2832  arch/arm/plat-mxc/devices/platform-mxc_nand.c      |   11 +-
2833  arch/blackfin/configs/BF561-ACVILON_defconfig      |    1 -
2834  arch/mips/configs/rb532_defconfig                  |    1 -
2835  arch/powerpc/configs/83xx/mpc8313_rdb_defconfig    |    1 -
2836  arch/powerpc/configs/83xx/mpc8315_rdb_defconfig    |    1 -
2837  arch/powerpc/configs/mpc83xx_defconfig             |    1 -
2838  drivers/mtd/Kconfig                                |    7 +
2839  drivers/mtd/Makefile                               |    1 +
2840  drivers/mtd/bcm47xxpart.c                          |  202 ++++
2841  drivers/mtd/chips/Kconfig                          |   11 +-
2842  drivers/mtd/chips/cfi_cmdset_0001.c                |   14 +-
2843  drivers/mtd/chips/cfi_cmdset_0002.c                |   67 ++
2844  drivers/mtd/cmdlinepart.c                          |  183 ++--
2845  drivers/mtd/devices/Kconfig                        |   10 +-
2846  drivers/mtd/devices/Makefile                       |    1 +
2847  drivers/mtd/devices/bcm47xxsflash.c                |  105 ++
2848  drivers/mtd/devices/doc2001plus.c                  |   14 +-
2849  drivers/mtd/devices/docg3.c                        |   12 +-
2850  drivers/mtd/devices/m25p80.c                       |   24 +-
2851  drivers/mtd/devices/spear_smi.c                    |  141 +--
2852  drivers/mtd/maps/Kconfig                           |   16 +-
2853  drivers/mtd/maps/Makefile                          |    1 -
2854  drivers/mtd/maps/autcpu12-nvram.c                  |  153 +--
2855  drivers/mtd/maps/pci.c                             |   23 -
2856  drivers/mtd/maps/physmap_of.c                      |   14 +
2857  drivers/mtd/maps/rbtx4939-flash.c                  |    2 -
2858  drivers/mtd/maps/uclinux.c                         |   15 +-
2859  drivers/mtd/maps/wr_sbc82xx_flash.c                |  174 ----
2860  drivers/mtd/mtdchar.c                              |    6 +-
2861  drivers/mtd/mtdcore.c                              |   21 +
2862  drivers/mtd/mtdoops.c                              |   14 +-
2863  drivers/mtd/mtdpart.c                              |    5 +-
2864  drivers/mtd/nand/Kconfig                           |   63 +-
2865  drivers/mtd/nand/Makefile                          |    4 +-
2866  drivers/mtd/nand/ams-delta.c                       |   13 -
2867  drivers/mtd/nand/atmel_nand.c                      |  987 +++++++++++++++++--
2868  drivers/mtd/nand/atmel_nand_ecc.h                  |  114 ++-
2869  drivers/mtd/nand/au1550nd.c                        |   46 -
2870  drivers/mtd/nand/bcm_umi_bch.c                     |  217 ----
2871  drivers/mtd/nand/bcm_umi_nand.c                    |  555 -----------
2872  drivers/mtd/nand/bf5xx_nand.c                      |    6 +-
2873  drivers/mtd/nand/cafe_nand.c                       |   20 +-
2874  drivers/mtd/nand/cmx270_nand.c                     |   13 -
2875  drivers/mtd/nand/davinci_nand.c                    |   78 +-
2876  drivers/mtd/nand/denali.c                          |   12 +-
2877  drivers/mtd/nand/diskonchip.c                      |   63 --
2878  drivers/mtd/nand/docg4.c                           |   43 +-
2879  drivers/mtd/nand/fsl_elbc_nand.c                   |   51 +-
2880  drivers/mtd/nand/fsl_ifc_nand.c                    |   52 +-
2881  drivers/mtd/nand/gpio.c                            |   54 +-
2882  drivers/mtd/nand/gpmi-nand/gpmi-lib.c              |  322 +++++-
2883  drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |  152 ++-
2884  drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |   26 +-
2885  drivers/mtd/nand/gpmi-nand/gpmi-regs.h             |   12 +
2886  drivers/mtd/nand/lpc32xx_mlc.c                     |  924 +++++++++++++++++
2887  drivers/mtd/nand/lpc32xx_slc.c                     | 1039 ++++++++++++++++++++
2888  drivers/mtd/nand/mpc5121_nfc.c                     |   22 -
2889  drivers/mtd/nand/mxc_nand.c                        |  168 ++--
2890  drivers/mtd/nand/nand_base.c                       |  529 ++++++----
2891  drivers/mtd/nand/nand_bbt.c                        |  148 +--
2892  drivers/mtd/nand/nand_bcm_umi.c                    |  149 ---
2893  drivers/mtd/nand/nand_bcm_umi.h                    |  336 -------
2894  drivers/mtd/nand/nand_ids.c                        |    7 +-
2895  drivers/mtd/nand/nandsim.c                         |   17 +-
2896  drivers/mtd/nand/ndfc.c                            |   13 -
2897  drivers/mtd/nand/nuc900_nand.c                     |   17 -
2898  drivers/mtd/nand/omap2.c                           |   36 +-
2899  drivers/mtd/nand/orion_nand.c                      |    1 -
2900  drivers/mtd/nand/plat_nand.c                       |    5 +
2901  drivers/mtd/nand/pxa3xx_nand.c                     |   12 +-
2902  drivers/mtd/nand/r852.c                            |   22 -
2903  drivers/mtd/nand/s3c2410.c                         |  191 ++--
2904  drivers/mtd/nand/sh_flctl.c                        |  327 +++---
2905  drivers/mtd/nand/socrates_nand.c                   |   19 -
2906  drivers/mtd/nand/tmio_nand.c                       |   13 -
2907  drivers/mtd/nand/txx9ndfmc.c                       |   13 -
2908  drivers/mtd/nand/xway_nand.c                       |  201 ++++
2909  drivers/mtd/sm_ftl.c                               |    1 -
2910  drivers/mtd/tests/Makefile                         |    1 +
2911  drivers/mtd/tests/mtd_nandbiterrs.c                |  460 +++++++++
2912  drivers/mtd/tests/mtd_nandecctest.c                |  294 +++++-
2913  drivers/mtd/tests/mtd_speedtest.c                  |   16 +-
2914  drivers/mtd/tests/mtd_stresstest.c                 |   39 +-
2915  fs/jffs2/super.c                                   |    4 +
2916  fs/jffs2/wbuf.c                                    |    8 +-
2917  include/linux/bcma/bcma_driver_chipcommon.h        |    2 +
2918  include/linux/mtd/bbm.h                            |    7 +-
2919  include/linux/mtd/lpc32xx_mlc.h                    |   20 +
2920  include/linux/mtd/lpc32xx_slc.h                    |   20 +
2921  include/linux/mtd/mtd.h                            |    9 +-
2922  include/linux/mtd/nand.h                           |   72 +-
2923  include/linux/mtd/sh_flctl.h                       |   23 +-
2924  include/mtd/Kbuild                                 |    5 -
2925  include/uapi/mtd/Kbuild                            |    5 +
2926  include/{ => uapi}/mtd/inftl-user.h                |    0
2927  include/{ => uapi}/mtd/mtd-abi.h                   |    0
2928  include/{ => uapi}/mtd/mtd-user.h                  |    0
2929  include/{ => uapi}/mtd/nftl-user.h                 |    0
2930  include/{ => uapi}/mtd/ubi-user.h                  |    0
2931  119 files changed, 6361 insertions(+), 3239 deletions(-)
2932  create mode 100644 Documentation/devicetree/bindings/arm/davinci/nand.txt
2933  create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt
2934  create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt
2935  create mode 100644 drivers/mtd/bcm47xxpart.c
2936  create mode 100644 drivers/mtd/devices/bcm47xxsflash.c
2937  delete mode 100644 drivers/mtd/maps/wr_sbc82xx_flash.c
2938  delete mode 100644 drivers/mtd/nand/bcm_umi_bch.c
2939  delete mode 100644 drivers/mtd/nand/bcm_umi_nand.c
2940  create mode 100644 drivers/mtd/nand/lpc32xx_mlc.c
2941  create mode 100644 drivers/mtd/nand/lpc32xx_slc.c
2942  delete mode 100644 drivers/mtd/nand/nand_bcm_umi.c
2943  delete mode 100644 drivers/mtd/nand/nand_bcm_umi.h
2944  create mode 100644 drivers/mtd/nand/xway_nand.c
2945  create mode 100644 drivers/mtd/tests/mtd_nandbiterrs.c
2946  create mode 100644 include/linux/mtd/lpc32xx_mlc.h
2947  create mode 100644 include/linux/mtd/lpc32xx_slc.h
2948  rename include/{ => uapi}/mtd/inftl-user.h (100%)
2949  rename include/{ => uapi}/mtd/mtd-abi.h (100%)
2950  rename include/{ => uapi}/mtd/mtd-user.h (100%)
2951  rename include/{ => uapi}/mtd/nftl-user.h (100%)
2952  rename include/{ => uapi}/mtd/ubi-user.h (100%)
2953 Merging l2-mtd/master (35c241d mtd: onenand: Make flexonenand_set_boundary static)
2954 $ git merge l2-mtd/master
2955 Merge made by the 'recursive' strategy.
2956  drivers/mtd/devices/slram.c        |    2 +-
2957  drivers/mtd/onenand/onenand_base.c |    2 +-
2958  2 files changed, 2 insertions(+), 2 deletions(-)
2959 Merging crypto/master (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
2960 $ git merge crypto/master
2961 Already up-to-date.
2962 Merging drm/drm-next (1f31c69 Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next)
2963 $ git merge drm/drm-next
2964 Already up-to-date.
2965 Merging sound/for-next (8d032a8 ALSA: hda - remove "Mic Jack Mode" for headset jacks (Latitude Exx30))
2966 $ git merge sound/for-next
2967 Merge made by the 'recursive' strategy.
2968  sound/pci/hda/patch_cirrus.c   |   48 +++++---------------
2969  sound/pci/hda/patch_sigmatel.c |   27 ++++++++++++
2970  sound/pci/hda/patch_via.c      |   94 ++++++++++------------------------------
2971  sound/usb/quirks-table.h       |   46 ++++++++++++++++++++
2972  4 files changed, 106 insertions(+), 109 deletions(-)
2973 Merging sound-asoc/for-next (961a7ae ASoC: dmaengine: Correct Makefile when sound is built as module)
2974 $ git merge sound-asoc/for-next
2975 Auto-merging sound/soc/omap/omap-mcpdm.c
2976 Auto-merging sound/soc/omap/omap-abe-twl6040.c
2977 Auto-merging sound/soc/omap/ams-delta.c
2978 Auto-merging arch/arm/mach-omap1/board-ams-delta.c
2979 Merge made by the 'recursive' strategy.
2980  arch/arm/mach-omap1/board-ams-delta.c |   12 +++++++
2981  sound/soc/Makefile                    |    5 +--
2982  sound/soc/codecs/twl6040.c            |    8 ++---
2983  sound/soc/codecs/wm2200.c             |    3 +-
2984  sound/soc/omap/ams-delta.c            |   63 ++++++++++++++++-----------------
2985  sound/soc/omap/omap-abe-twl6040.c     |    2 +-
2986  sound/soc/omap/omap-mcpdm.c           |    9 ++---
2987  sound/soc/pxa/mmp-pcm.c               |    2 +-
2988  sound/soc/samsung/bells.c             |    2 +-
2989  sound/soc/sh/fsi.c                    |   15 ++++----
2990  sound/soc/soc-jack.c                  |    7 ++--
2991  11 files changed, 68 insertions(+), 60 deletions(-)
2992 Merging modules/modules-next (3a7989c X.509: Fix indefinite length element skip error handling)
2993 $ git merge modules/modules-next
2994 Recorded preimage for 'arch/Kconfig'
2995 Recorded preimage for 'lib/Makefile'
2996 Resolved 'Makefile' using previous resolution.
2997 Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
2998 Resolved 'arch/h8300/include/asm/Kbuild' using previous resolution.
2999 Resolved 'arch/m32r/include/asm/Kbuild' using previous resolution.
3000 Resolved 'arch/x86/Kconfig' using previous resolution.
3001 Resolved 'arch/x86/um/Kconfig' using previous resolution.
3002 Resolved 'arch/xtensa/Kconfig' using previous resolution.
3003 Resolved 'init/Kconfig' using previous resolution.
3004 Auto-merging security/keys/trusted.c
3005 Auto-merging security/keys/keyring.c
3006 Auto-merging security/keys/keyctl.c
3007 Auto-merging security/keys/key.c
3008 Auto-merging scripts/Makefile.modpost
3009 Auto-merging net/rxrpc/ar-key.c
3010 Auto-merging net/dns_resolver/dns_key.c
3011 Auto-merging lib/Makefile
3012 CONFLICT (content): Merge conflict in lib/Makefile
3013 Auto-merging kernel/Makefile
3014 Auto-merging init/Kconfig
3015 CONFLICT (content): Merge conflict in init/Kconfig
3016 Auto-merging fs/cifs/cifsacl.c
3017 Auto-merging crypto/Makefile
3018 Auto-merging crypto/Kconfig
3019 Auto-merging arch/xtensa/Kconfig
3020 CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
3021 Auto-merging arch/x86/um/Kconfig
3022 CONFLICT (content): Merge conflict in arch/x86/um/Kconfig
3023 Auto-merging arch/x86/Kconfig
3024 CONFLICT (content): Merge conflict in arch/x86/Kconfig
3025 Auto-merging arch/unicore32/Kconfig
3026 Auto-merging arch/tile/Kconfig
3027 Removing arch/sparc/include/asm/module.h
3028 Auto-merging arch/sparc/include/asm/Kbuild
3029 Auto-merging arch/sparc/Kconfig
3030 Auto-merging arch/sh/Kconfig
3031 Auto-merging arch/score/Kconfig
3032 Auto-merging arch/s390/Kconfig
3033 Auto-merging arch/powerpc/Kconfig
3034 Auto-merging arch/parisc/Kconfig
3035 Auto-merging arch/mips/kernel/Makefile
3036 Auto-merging arch/mips/Kconfig
3037 Auto-merging arch/microblaze/Kconfig
3038 Auto-merging arch/m68k/Kconfig
3039 Removing arch/m32r/include/asm/module.h
3040 Auto-merging arch/m32r/include/asm/Kbuild
3041 CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
3042 Auto-merging arch/m32r/Kconfig
3043 Auto-merging arch/ia64/Kconfig
3044 Removing arch/h8300/include/asm/module.h
3045 Auto-merging arch/h8300/include/asm/Kbuild
3046 CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
3047 Auto-merging arch/h8300/Kconfig
3048 Removing arch/cris/include/asm/module.h
3049 Auto-merging arch/cris/include/asm/Kbuild
3050 CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
3051 Auto-merging arch/cris/Kconfig
3052 Auto-merging arch/blackfin/Kconfig
3053 Auto-merging arch/arm/Kconfig
3054 Auto-merging arch/Kconfig
3055 CONFLICT (content): Merge conflict in arch/Kconfig
3056 Auto-merging Makefile
3057 CONFLICT (content): Merge conflict in Makefile
3058 Auto-merging Documentation/kernel-parameters.txt
3059 Automatic merge failed; fix conflicts and then commit the result.
3060 $ git commit -v -a
3061 Recorded resolution for 'arch/Kconfig'.
3062 Recorded resolution for 'lib/Makefile'.
3063 [master ad572fa] Merge remote-tracking branch 'modules/modules-next'
3064 $ git diff -M --stat --summary HEAD^..
3065  .gitignore                                |   14 +
3066  Documentation/crypto/asymmetric-keys.txt  |  312 ++++++
3067  Documentation/kernel-parameters.txt       |    6 +
3068  Documentation/security/keys.txt           |   50 +-
3069  Makefile                                  |    6 +-
3070  arch/Kconfig                              |   19 +
3071  arch/alpha/Kconfig                        |    2 +
3072  arch/alpha/include/asm/module.h           |   10 +-
3073  arch/arm/Kconfig                          |    2 +
3074  arch/arm/include/asm/module.h             |    8 +-
3075  arch/avr32/Kconfig                        |    2 +
3076  arch/avr32/include/asm/module.h           |    6 +-
3077  arch/blackfin/Kconfig                     |    2 +
3078  arch/blackfin/include/asm/module.h        |    4 +-
3079  arch/c6x/Kconfig                          |    1 +
3080  arch/c6x/include/asm/module.h             |   12 +-
3081  arch/cris/Kconfig                         |    1 +
3082  arch/cris/include/asm/Kbuild              |    1 +
3083  arch/cris/include/asm/module.h            |    9 -
3084  arch/frv/include/asm/module.h             |    8 +-
3085  arch/h8300/Kconfig                        |    1 +
3086  arch/h8300/include/asm/Kbuild             |    1 +
3087  arch/h8300/include/asm/module.h           |   11 -
3088  arch/hexagon/Kconfig                      |    1 +
3089  arch/ia64/Kconfig                         |    2 +
3090  arch/ia64/include/asm/module.h            |    6 +-
3091  arch/m32r/Kconfig                         |    1 +
3092  arch/m32r/include/asm/Kbuild              |    1 +
3093  arch/m32r/include/asm/module.h            |   10 -
3094  arch/m32r/kernel/module.c                 |   15 -
3095  arch/m68k/Kconfig                         |    3 +
3096  arch/m68k/include/asm/module.h            |    6 +-
3097  arch/microblaze/Kconfig                   |    1 +
3098  arch/mips/Kconfig                         |    3 +
3099  arch/mips/include/asm/module.h            |   10 +-
3100  arch/mips/kernel/Makefile                 |    1 +
3101  arch/mips/kernel/module-rela.c            |  145 +++
3102  arch/mips/kernel/module.c                 |  121 +--
3103  arch/mn10300/Kconfig                      |    1 +
3104  arch/mn10300/include/asm/module.h         |    7 +-
3105  arch/openrisc/Kconfig                     |    1 +
3106  arch/parisc/Kconfig                       |    2 +
3107  arch/parisc/include/asm/module.h          |   16 +-
3108  arch/powerpc/Kconfig                      |    2 +
3109  arch/powerpc/include/asm/module.h         |    7 +-
3110  arch/s390/Kconfig                         |    2 +
3111  arch/s390/include/asm/module.h            |   18 +-
3112  arch/score/Kconfig                        |    2 +
3113  arch/score/include/asm/module.h           |    6 +-
3114  arch/score/kernel/module.c                |   10 -
3115  arch/sh/Kconfig                           |    2 +
3116  arch/sh/include/asm/module.h              |   14 +-
3117  arch/sparc/Kconfig                        |    1 +
3118  arch/sparc/include/asm/Kbuild             |    1 +
3119  arch/sparc/include/asm/module.h           |   24 -
3120  arch/tile/Kconfig                         |    1 +
3121  arch/unicore32/Kconfig                    |    1 +
3122  arch/x86/Kconfig                          |    2 +
3123  arch/x86/um/Kconfig                       |    2 +
3124  arch/xtensa/include/asm/module.h          |    9 +-
3125  crypto/Kconfig                            |    1 +
3126  crypto/Makefile                           |    1 +
3127  crypto/asymmetric_keys/.gitignore         |    1 +
3128  crypto/asymmetric_keys/Kconfig            |   38 +
3129  crypto/asymmetric_keys/Makefile           |   27 +
3130  crypto/asymmetric_keys/asymmetric_keys.h  |   15 +
3131  crypto/asymmetric_keys/asymmetric_type.c  |  274 +++++
3132  crypto/asymmetric_keys/public_key.c       |  108 ++
3133  crypto/asymmetric_keys/public_key.h       |   30 +
3134  crypto/asymmetric_keys/rsa.c              |  277 ++++++
3135  crypto/asymmetric_keys/signature.c        |   49 +
3136  crypto/asymmetric_keys/x509.asn1          |   60 ++
3137  crypto/asymmetric_keys/x509_cert_parser.c |  496 +++++++++
3138  crypto/asymmetric_keys/x509_parser.h      |   36 +
3139  crypto/asymmetric_keys/x509_public_key.c  |  239 +++++
3140  crypto/asymmetric_keys/x509_rsakey.asn1   |    4 +
3141  fs/cifs/cifs_spnego.c                     |    6 +-
3142  fs/cifs/cifsacl.c                         |    8 +-
3143  include/asm-generic/bitops/count_zeros.h  |   57 ++
3144  include/asm-generic/module.h              |   40 +-
3145  include/crypto/public_key.h               |  108 ++
3146  include/keys/asymmetric-parser.h          |   37 +
3147  include/keys/asymmetric-subtype.h         |   55 +
3148  include/keys/asymmetric-type.h            |   25 +
3149  include/keys/user-type.h                  |    6 +-
3150  include/linux/asn1.h                      |   67 ++
3151  include/linux/asn1_ber_bytecode.h         |   87 ++
3152  include/linux/asn1_decoder.h              |   24 +
3153  include/linux/key-type.h                  |   35 +-
3154  include/linux/module.h                    |    8 +
3155  include/linux/moduleloader.h              |   36 +-
3156  include/linux/mpi.h                       |    1 +
3157  include/linux/oid_registry.h              |   92 ++
3158  init/Kconfig                              |   68 ++
3159  kernel/Makefile                           |   77 ++
3160  kernel/modsign_pubkey.c                   |  113 +++
3161  kernel/module-internal.h                  |   15 +
3162  kernel/module.c                           |  157 ++-
3163  kernel/module_signing.c                   |  243 +++++
3164  lib/.gitignore                            |    2 +-
3165  lib/Kconfig                               |    5 +
3166  lib/Makefile                              |   18 +
3167  lib/asn1_decoder.c                        |  487 +++++++++
3168  lib/build_OID_registry                    |  209 ++++
3169  lib/mpi/Makefile                          |    1 +
3170  lib/mpi/longlong.h                        |  138 +--
3171  lib/mpi/mpi-bit.c                         |    2 +-
3172  lib/mpi/mpi-cmp.c                         |   70 ++
3173  lib/mpi/mpi-pow.c                         |    4 +-
3174  lib/mpi/mpicoder.c                        |   55 +
3175  lib/oid_registry.c                        |  170 ++++
3176  net/ceph/crypto.c                         |    9 +-
3177  net/dns_resolver/dns_key.c                |    6 +-
3178  net/rxrpc/ar-key.c                        |   40 +-
3179  scripts/.gitignore                        |    1 +
3180  scripts/Makefile                          |    2 +
3181  scripts/Makefile.build                    |   11 +
3182  scripts/Makefile.modpost                  |   77 +-
3183  scripts/asn1_compiler.c                   | 1545 +++++++++++++++++++++++++++++
3184  scripts/sign-file                         |  115 +++
3185  scripts/x509keyid                         |  268 +++++
3186  security/keys/encrypted-keys/encrypted.c  |   16 +-
3187  security/keys/key.c                       |  114 ++-
3188  security/keys/keyctl.c                    |   18 +-
3189  security/keys/keyring.c                   |    6 +-
3190  security/keys/request_key_auth.c          |    8 +-
3191  security/keys/trusted.c                   |   16 +-
3192  security/keys/user_defined.c              |   14 +-
3193  128 files changed, 6799 insertions(+), 594 deletions(-)
3194  create mode 100644 Documentation/crypto/asymmetric-keys.txt
3195  delete mode 100644 arch/cris/include/asm/module.h
3196  delete mode 100644 arch/h8300/include/asm/module.h
3197  delete mode 100644 arch/m32r/include/asm/module.h
3198  create mode 100644 arch/mips/kernel/module-rela.c
3199  delete mode 100644 arch/sparc/include/asm/module.h
3200  create mode 100644 crypto/asymmetric_keys/.gitignore
3201  create mode 100644 crypto/asymmetric_keys/Kconfig
3202  create mode 100644 crypto/asymmetric_keys/Makefile
3203  create mode 100644 crypto/asymmetric_keys/asymmetric_keys.h
3204  create mode 100644 crypto/asymmetric_keys/asymmetric_type.c
3205  create mode 100644 crypto/asymmetric_keys/public_key.c
3206  create mode 100644 crypto/asymmetric_keys/public_key.h
3207  create mode 100644 crypto/asymmetric_keys/rsa.c
3208  create mode 100644 crypto/asymmetric_keys/signature.c
3209  create mode 100644 crypto/asymmetric_keys/x509.asn1
3210  create mode 100644 crypto/asymmetric_keys/x509_cert_parser.c
3211  create mode 100644 crypto/asymmetric_keys/x509_parser.h
3212  create mode 100644 crypto/asymmetric_keys/x509_public_key.c
3213  create mode 100644 crypto/asymmetric_keys/x509_rsakey.asn1
3214  create mode 100644 include/asm-generic/bitops/count_zeros.h
3215  create mode 100644 include/crypto/public_key.h
3216  create mode 100644 include/keys/asymmetric-parser.h
3217  create mode 100644 include/keys/asymmetric-subtype.h
3218  create mode 100644 include/keys/asymmetric-type.h
3219  create mode 100644 include/linux/asn1.h
3220  create mode 100644 include/linux/asn1_ber_bytecode.h
3221  create mode 100644 include/linux/asn1_decoder.h
3222  create mode 100644 include/linux/oid_registry.h
3223  create mode 100644 kernel/modsign_pubkey.c
3224  create mode 100644 kernel/module-internal.h
3225  create mode 100644 kernel/module_signing.c
3226  create mode 100644 lib/asn1_decoder.c
3227  create mode 100755 lib/build_OID_registry
3228  create mode 100644 lib/mpi/mpi-cmp.c
3229  create mode 100644 lib/oid_registry.c
3230  create mode 100644 scripts/asn1_compiler.c
3231  create mode 100644 scripts/sign-file
3232  create mode 100755 scripts/x509keyid
3233 Merging virtio/virtio-next (d43b716 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild)
3234 $ git merge virtio/virtio-next
3235 Already up-to-date.
3236 Merging input/next (7f8d4ca Input: extend the number of event (and other) devices)
3237 $ git merge input/next
3238 Auto-merging drivers/input/tablet/wacom_wac.c
3239 Merge made by the 'recursive' strategy.
3240  drivers/input/evdev.c                    |   99 +++++--------
3241  drivers/input/input.c                    |  114 +++++++--------
3242  drivers/input/joydev.c                   |   88 +++++-------
3243  drivers/input/keyboard/samsung-keypad.c  |   11 +-
3244  drivers/input/mousedev.c                 |  224 +++++++++++++++---------------
3245  drivers/input/tablet/wacom_sys.c         |  145 +++++++++++++------
3246  drivers/input/tablet/wacom_wac.c         |   30 +++-
3247  drivers/input/touchscreen/atmel_mxt_ts.c |    6 +-
3248  include/linux/input.h                    |   10 +-
3249  9 files changed, 382 insertions(+), 345 deletions(-)
3250 Merging input-mt/for-next (51c80b7 Input: bcm5974 - Convert to MT-B)
3251 $ git merge input-mt/for-next
3252 Already up-to-date.
3253 Merging cgroup/for-next (c0a93e2 Merge branch 'for-3.7-hierarchy' into for-next)
3254 $ git merge cgroup/for-next
3255 Already up-to-date!
3256 Merge made by the 'recursive' strategy.
3257 Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
3258 $ git merge block/for-next
3259 Resolved 'init/Kconfig' using previous resolution.
3260 Auto-merging lib/scatterlist.c
3261 Auto-merging init/Kconfig
3262 CONFLICT (content): Merge conflict in init/Kconfig
3263 Auto-merging include/linux/fs.h
3264 Auto-merging drivers/target/target_core_iblock.c
3265 Auto-merging drivers/md/md.c
3266 Auto-merging drivers/md/dm.c
3267 Auto-merging drivers/block/mtip32xx/mtip32xx.h
3268 Auto-merging drivers/block/mtip32xx/mtip32xx.c
3269 Auto-merging drivers/block/loop.c
3270 Auto-merging drivers/block/floppy.c
3271 Auto-merging drivers/block/Kconfig
3272 Auto-merging block/ioctl.c
3273 Auto-merging block/genhd.c
3274 Auto-merging block/blk-core.c
3275 Auto-merging MAINTAINERS
3276 Automatic merge failed; fix conflicts and then commit the result.
3277 $ git commit -v -a
3278 [master a90762b] Merge remote-tracking branch 'block/for-next'
3279 $ git diff -M --stat --summary HEAD^..
3280  Documentation/ABI/testing/sysfs-block |   14 +
3281  Documentation/block/biodoc.txt        |    5 -
3282  Documentation/percpu-rw-semaphore.txt |   27 +
3283  MAINTAINERS                           |    7 +-
3284  block/blk-core.c                      |   51 +-
3285  block/blk-lib.c                       |  104 +-
3286  block/blk-merge.c                     |   53 +-
3287  block/blk-settings.c                  |   16 +
3288  block/blk-sysfs.c                     |   44 +-
3289  block/blk-tag.c                       |    6 +-
3290  block/blk.h                           |    5 +-
3291  block/elevator.c                      |    6 +-
3292  block/genhd.c                         |    6 +-
3293  block/ioctl.c                         |   27 +
3294  drivers/block/Kconfig                 |    1 +
3295  drivers/block/cciss.c                 |    1 -
3296  drivers/block/drbd/drbd_main.c        |   13 +-
3297  drivers/block/floppy.c                |   97 +-
3298  drivers/block/loop.c                  |   17 +-
3299  drivers/block/mtip32xx/mtip32xx.c     |   19 +-
3300  drivers/block/mtip32xx/mtip32xx.h     |    3 +
3301  drivers/block/osdblk.c                |    3 +-
3302  drivers/block/pktcdvd.c               |   52 +-
3303  drivers/block/xen-blkback/common.h    |    4 +-
3304  drivers/block/xen-blkback/xenbus.c    |    9 +-
3305  drivers/char/raw.c                    |    2 +-
3306  drivers/md/dm-crypt.c                 |   16 +-
3307  drivers/md/dm-io.c                    |   11 -
3308  drivers/md/dm.c                       |   74 +-
3309  drivers/md/md.c                       |   44 +-
3310  drivers/md/raid0.c                    |    1 +
3311  drivers/memstick/core/Kconfig         |   12 +
3312  drivers/memstick/core/Makefile        |    2 +-
3313  drivers/memstick/core/ms_block.c      | 2395 +++++++++++++++++++++++++++++++++
3314  drivers/memstick/core/ms_block.h      |  293 ++++
3315  drivers/target/target_core_iblock.c   |    9 -
3316  fs/bio-integrity.c                    |   44 +-
3317  fs/bio.c                              |  231 ++--
3318  fs/block_dev.c                        |   69 +-
3319  fs/exofs/ore.c                        |    5 +-
3320  include/linux/bio.h                   |   70 +-
3321  include/linux/blk_types.h             |   36 +-
3322  include/linux/blkdev.h                |   82 +-
3323  include/linux/fs.h                    |    6 +
3324  include/linux/percpu-rwsem.h          |   89 ++
3325  include/linux/scatterlist.h           |    1 +
3326  lib/scatterlist.c                     |   19 +
3327  47 files changed, 3568 insertions(+), 533 deletions(-)
3328  create mode 100644 Documentation/percpu-rw-semaphore.txt
3329  create mode 100644 drivers/memstick/core/ms_block.c
3330  create mode 100644 drivers/memstick/core/ms_block.h
3331  create mode 100644 include/linux/percpu-rwsem.h
3332 $ git am -3 ../patches/fs-block_devc-set_blocksize-use-mapping_mapped.patch
3333 Applying: fs/block_dev.c:set_blocksize(): use mapping_mapped()
3334 $ git reset HEAD^
3335 Unstaged changes after reset:
3336 M       fs/block_dev.c
3337 $ git add .
3338 $ git commit -v -a --amend
3339 [master 41a0865] Merge remote-tracking branch 'block/for-next'
3340 Merging quilt/device-mapper (24d047b Use the recently-added bio front_pad field to allocate struct dm_target_io.)
3341 $ git merge quilt/device-mapper
3342 Resolved 'drivers/md/dm-thin.c' using previous resolution.
3343 Resolved 'drivers/md/dm.c' using previous resolution.
3344 Auto-merging drivers/md/dm.c
3345 CONFLICT (content): Merge conflict in drivers/md/dm.c
3346 Auto-merging drivers/md/dm-verity.c
3347 Auto-merging drivers/md/dm-thin.c
3348 CONFLICT (content): Merge conflict in drivers/md/dm-thin.c
3349 Auto-merging drivers/md/dm-mpath.c
3350 Automatic merge failed; fix conflicts and then commit the result.
3351 $ git commit -v -a
3352 [master b628f2d] Merge branch 'quilt/device-mapper'
3353 $ git diff -M --stat --summary HEAD^..
3354  drivers/md/Kconfig                               |    7 +
3355  drivers/md/Makefile                              |    1 +
3356  drivers/md/dm-bio-prison.c                       |  415 +++++++++++++++++
3357  drivers/md/dm-bio-prison.h                       |   72 +++
3358  drivers/md/dm-bufio.c                            |   13 +-
3359  drivers/md/dm-mpath.c                            |    3 +-
3360  drivers/md/dm-thin.c                             |  520 ++++------------------
3361  drivers/md/dm-verity.c                           |    2 +-
3362  drivers/md/dm.c                                  |   80 ++--
3363  drivers/md/persistent-data/dm-space-map-common.c |    4 +-
3364  10 files changed, 624 insertions(+), 493 deletions(-)
3365  create mode 100644 drivers/md/dm-bio-prison.c
3366  create mode 100644 drivers/md/dm-bio-prison.h
3367 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
3368 $ git merge embedded/master
3369 Already up-to-date.
3370 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
3371 $ git merge firmware/master
3372 Already up-to-date.
3373 Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
3374 $ git merge pcmcia/master
3375 Already up-to-date.
3376 Merging mmc/mmc-next (a1487fb mmc: rtsx_pci_sdmmc: Add realtek pcie sdmmc host driver)
3377 $ git merge mmc/mmc-next
3378 Resolved 'drivers/mmc/host/davinci_mmc.c' using previous resolution.
3379 Resolved 'drivers/mmc/host/omap.c' using previous resolution.
3380 Auto-merging drivers/mmc/host/vub300.c
3381 Auto-merging drivers/mmc/host/sdhci-tegra.c
3382 Auto-merging drivers/mmc/host/sdhci-pci.c
3383 Auto-merging drivers/mmc/host/pxamci.c
3384 Auto-merging drivers/mmc/host/omap_hsmmc.c
3385 Auto-merging drivers/mmc/host/omap.c
3386 CONFLICT (content): Merge conflict in drivers/mmc/host/omap.c
3387 Auto-merging drivers/mmc/host/mxcmmc.c
3388 Auto-merging drivers/mmc/host/davinci_mmc.c
3389 CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
3390 Auto-merging drivers/mmc/host/atmel-mci.c
3391 Auto-merging MAINTAINERS
3392 Automatic merge failed; fix conflicts and then commit the result.
3393 $ git commit -v -a
3394 [master 8ec0ef6] Merge remote-tracking branch 'mmc/mmc-next'
3395 $ git diff -M --stat --summary HEAD^..
3396  .../devicetree/bindings/mmc/atmel-hsmci.txt        |   68 +
3397  .../devicetree/bindings/mmc/exynos-dw-mshc.txt     |   87 ++
3398  Documentation/devicetree/bindings/mmc/mmc.txt      |    9 +-
3399  Documentation/devicetree/bindings/mmc/pxa-mmc.txt  |   25 +
3400  .../devicetree/bindings/mmc/samsung-sdhci.txt      |   53 +
3401  .../devicetree/bindings/mmc/sdhci-dove.txt         |   14 +
3402  .../devicetree/bindings/mmc/sdhci-spear.txt        |   18 +
3403  .../devicetree/bindings/mmc/synposis-dw-mshc.txt   |   79 ++
3404  MAINTAINERS                                        |    6 +-
3405  arch/arm/boot/dts/spear300-evb.dts                 |    3 +-
3406  arch/arm/boot/dts/spear320-evb.dts                 |    2 -
3407  drivers/mmc/core/core.c                            |  240 ++--
3408  drivers/mmc/core/debugfs.c                         |    2 +-
3409  drivers/mmc/core/mmc.c                             |   57 +-
3410  drivers/mmc/core/mmc_ops.c                         |   84 +-
3411  drivers/mmc/core/sdio_bus.c                        |    7 -
3412  drivers/mmc/core/slot-gpio.c                       |    8 +-
3413  drivers/mmc/host/Kconfig                           |   16 +
3414  drivers/mmc/host/Makefile                          |    2 +
3415  drivers/mmc/host/atmel-mci-regs.h                  |    7 +
3416  drivers/mmc/host/atmel-mci.c                       |  113 +-
3417  drivers/mmc/host/bfin_sdh.c                        |  210 +--
3418  drivers/mmc/host/dw_mmc-exynos.c                   |  253 ++++
3419  drivers/mmc/host/dw_mmc-pci.c                      |   15 +-
3420  drivers/mmc/host/dw_mmc-pltfm.c                    |   62 +-
3421  drivers/mmc/host/dw_mmc-pltfm.h                    |   20 +
3422  drivers/mmc/host/dw_mmc.c                          |  326 ++++-
3423  drivers/mmc/host/dw_mmc.h                          |   24 +
3424  drivers/mmc/host/mmc_spi.c                         |   15 +-
3425  drivers/mmc/host/mmci.c                            |   13 +-
3426  drivers/mmc/host/mxcmmc.c                          |   76 +-
3427  drivers/mmc/host/omap.c                            |   37 +-
3428  drivers/mmc/host/omap_hsmmc.c                      |  125 +-
3429  drivers/mmc/host/pxamci.c                          |   52 +
3430  drivers/mmc/host/rtsx_pci_sdmmc.c                  | 1332 ++++++++++++++++++++
3431  drivers/mmc/host/sdhci-dove.c                      |    8 +
3432  drivers/mmc/host/sdhci-of-esdhc.c                  |   36 +-
3433  drivers/mmc/host/sdhci-pci.c                       |   19 +-
3434  drivers/mmc/host/sdhci-pltfm.c                     |    3 +
3435  drivers/mmc/host/sdhci-pxav2.c                     |    6 +-
3436  drivers/mmc/host/sdhci-pxav3.c                     |   35 +-
3437  drivers/mmc/host/sdhci-s3c.c                       |  216 +++-
3438  drivers/mmc/host/sdhci-spear.c                     |   67 +-
3439  drivers/mmc/host/sdhci-tegra.c                     |    7 +-
3440  drivers/mmc/host/sdhci.c                           |  205 +--
3441  drivers/mmc/host/sh_mmcif.c                        |    8 +-
3442  drivers/mmc/host/via-sdmmc.c                       |   16 +-
3443  drivers/mmc/host/vub300.c                          |    4 +-
3444  include/linux/mmc/card.h                           |   18 +-
3445  include/linux/mmc/core.h                           |    4 +
3446  include/linux/mmc/dw_mmc.h                         |   15 +-
3447  include/linux/mmc/host.h                           |    5 +-
3448  include/linux/mmc/mmc.h                            |   19 +
3449  include/linux/mmc/sdhci.h                          |    3 +-
3450  include/linux/platform_data/pxa_sdhci.h            |    1 +
3451  55 files changed, 3535 insertions(+), 620 deletions(-)
3452  create mode 100644 Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
3453  create mode 100644 Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
3454  create mode 100644 Documentation/devicetree/bindings/mmc/pxa-mmc.txt
3455  create mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt
3456  create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt
3457  create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-spear.txt
3458  create mode 100644 Documentation/devicetree/bindings/mmc/synposis-dw-mshc.txt
3459  create mode 100644 drivers/mmc/host/dw_mmc-exynos.c
3460  create mode 100644 drivers/mmc/host/dw_mmc-pltfm.h
3461  create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
3462 Merging kgdb/kgdb-next (08f9553 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
3463 $ git merge kgdb/kgdb-next
3464 Auto-merging drivers/tty/serial/kgdboc.c
3465 Merge made by the 'recursive' strategy.
3466  arch/mips/kernel/kgdb.c     |    9 +++++++++
3467  arch/x86/kernel/kgdb.c      |    2 ++
3468  drivers/tty/serial/kgdboc.c |    3 ++-
3469  include/linux/console.h     |   10 ++++++++--
3470  4 files changed, 21 insertions(+), 3 deletions(-)
3471 Merging slab/for-next (e2087be Merge branch 'slab/tracing' into slab/for-linus)
3472 $ git merge slab/for-next
3473 Already up-to-date.
3474 Merging uclinux/for-next (a0d271c Linux 3.6)
3475 $ git merge uclinux/for-next
3476 Already up-to-date.
3477 Merging md/for-next (c0c6d3f md: writing to sync_action should clear the read-auto state.)
3478 $ git merge md/for-next
3479 Resolved 'drivers/md/raid0.c' using previous resolution.
3480 Resolved 'fs/bio.c' using previous resolution.
3481 Auto-merging fs/bio.c
3482 CONFLICT (content): Merge conflict in fs/bio.c
3483 Auto-merging drivers/md/raid0.c
3484 CONFLICT (content): Merge conflict in drivers/md/raid0.c
3485 Auto-merging drivers/md/md.c
3486 Auto-merging block/blk-core.c
3487 Automatic merge failed; fix conflicts and then commit the result.
3488 $ git commit -v -a
3489 [master b36c39b] Merge remote-tracking branch 'md/for-next'
3490 $ git diff -M --stat --summary HEAD^..
3491  Documentation/device-mapper/dm-raid.txt |    9 +
3492  block/blk-core.c                        |    1 +
3493  crypto/xor.c                            |    4 +-
3494  drivers/md/bitmap.c                     |   17 +-
3495  drivers/md/dm-raid.c                    |  124 ++++--
3496  drivers/md/linear.c                     |   25 +-
3497  drivers/md/md.c                         |  148 +++++--
3498  drivers/md/md.h                         |   17 +-
3499  drivers/md/multipath.c                  |    3 +-
3500  drivers/md/raid0.c                      |   19 +-
3501  drivers/md/raid1.c                      |   34 +-
3502  drivers/md/raid10.c                     |   91 ++++-
3503  drivers/md/raid5.c                      |  664 ++++++++++++++++++++++++++++---
3504  drivers/md/raid5.h                      |   20 +
3505  14 files changed, 1022 insertions(+), 154 deletions(-)
3506 Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic)
3507 $ git merge mfd/for-next
3508 Already up-to-date.
3509 Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
3510 $ git merge battery/master
3511 Already up-to-date.
3512 Merging fbdev/fbdev-next (ebe9f7b video: exynos_mipi_dsi: Remove unnecessary NULL check)
3513 $ git merge fbdev/fbdev-next
3514 Resolved 'arch/arm/mach-s3c64xx/mach-mini6410.c' using previous resolution.
3515 Resolved 'arch/arm/mach-s3c64xx/mach-real6410.c' using previous resolution.
3516 Resolved 'drivers/video/msm/mddi.c' using previous resolution.
3517 Resolved 'drivers/video/msm/mdp.c' using previous resolution.
3518 Auto-merging include/video/samsung_fimd.h
3519 Auto-merging drivers/video/vermilion/vermilion.c
3520 Auto-merging drivers/video/ps3fb.c
3521 Removing drivers/video/pnx4008/sdum.h
3522 Removing drivers/video/pnx4008/sdum.c
3523 Removing drivers/video/pnx4008/pnxrgbfb.c
3524 Removing drivers/video/pnx4008/fbcommon.h
3525 Removing drivers/video/pnx4008/dum.h
3526 Removing drivers/video/pnx4008/Makefile
3527 Auto-merging drivers/video/msm/mdp_hw.h
3528 CONFLICT (content): Merge conflict in drivers/video/msm/mdp_hw.h
3529 Auto-merging drivers/video/msm/mdp.c
3530 CONFLICT (content): Merge conflict in drivers/video/msm/mdp.c
3531 Auto-merging drivers/video/msm/mddi_client_nt35399.c
3532 Auto-merging drivers/video/msm/mddi.c
3533 CONFLICT (content): Merge conflict in drivers/video/msm/mddi.c
3534 Auto-merging drivers/video/jz4740_fb.c
3535 Auto-merging drivers/video/imxfb.c
3536 Auto-merging drivers/video/gbefb.c
3537 Auto-merging drivers/video/exynos/exynos_mipi_dsi.c
3538 CONFLICT (modify/delete): drivers/video/epson1355fb.c deleted in HEAD and modified in fbdev/fbdev-next. Version fbdev/fbdev-next of drivers/video/epson1355fb.c left in tree.
3539 Auto-merging drivers/video/ep93xx-fb.c
3540 Auto-merging drivers/video/da8xx-fb.c
3541 Auto-merging drivers/video/Makefile
3542 Auto-merging drivers/video/Kconfig
3543 Auto-merging drivers/gpu/drm/exynos/exynos_drm_fimd.c
3544 Removing arch/arm/plat-samsung/include/plat/regs-fb-v4.h
3545 Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c
3546 Auto-merging arch/arm/mach-s5pv210/mach-goni.c
3547 Auto-merging arch/arm/mach-s5pc100/mach-smdkc100.c
3548 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
3549 Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
3550 Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
3551 Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
3552 CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-real6410.c
3553 Auto-merging arch/arm/mach-s3c64xx/mach-ncp.c
3554 Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
3555 CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-mini6410.c
3556 Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c
3557 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
3558 Auto-merging arch/arm/mach-s3c64xx/mach-anw6410.c
3559 Auto-merging arch/arm/mach-s3c24xx/mach-smdk2416.c
3560 Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
3561 Auto-merging arch/arm/mach-exynos/mach-smdkv310.c
3562 Auto-merging arch/arm/mach-exynos/mach-smdk4x12.c
3563 Auto-merging arch/arm/mach-exynos/mach-origen.c
3564 Auto-merging arch/arm/mach-exynos/mach-nuri.c
3565 Automatic merge failed; fix conflicts and then commit the result.
3566 $ git rm -f drivers/video/epson1355fb.c
3567 drivers/video/epson1355fb.c: needs merge
3568 rm 'drivers/video/epson1355fb.c'
3569 $ git commit -v -a
3570 Recorded resolution for 'drivers/video/msm/mdp_hw.h'.
3571 [master fb0c57c] Merge remote-tracking branch 'fbdev/fbdev-next'
3572 $ git diff -M --stat --summary HEAD^..
3573  arch/arm/mach-exynos/mach-nuri.c                   |    2 +-
3574  arch/arm/mach-exynos/mach-origen.c                 |    2 +-
3575  arch/arm/mach-exynos/mach-smdk4x12.c               |    2 +-
3576  arch/arm/mach-exynos/mach-smdkv310.c               |    2 +-
3577  arch/arm/mach-exynos/mach-universal_c210.c         |    2 +-
3578  arch/arm/mach-exynos/setup-fimd0.c                 |    2 +-
3579  arch/arm/mach-s3c24xx/mach-smdk2416.c              |    2 +-
3580  arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
3581  arch/arm/mach-s3c64xx/mach-crag6410.c              |    2 +-
3582  arch/arm/mach-s3c64xx/mach-hmt.c                   |    2 +-
3583  arch/arm/mach-s3c64xx/mach-mini6410.c              |    2 +-
3584  arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
3585  arch/arm/mach-s3c64xx/mach-real6410.c              |    2 +-
3586  arch/arm/mach-s3c64xx/mach-smartq5.c               |    2 +-
3587  arch/arm/mach-s3c64xx/mach-smartq7.c               |    2 +-
3588  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    2 +-
3589  arch/arm/mach-s5p64x0/mach-smdk6440.c              |    2 +-
3590  arch/arm/mach-s5p64x0/mach-smdk6450.c              |    2 +-
3591  arch/arm/mach-s5pc100/mach-smdkc100.c              |    2 +-
3592  arch/arm/mach-s5pv210/mach-aquila.c                |    2 +-
3593  arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
3594  arch/arm/mach-s5pv210/mach-smdkv210.c              |    2 +-
3595  arch/arm/plat-samsung/include/plat/regs-fb-v4.h    |  159 ----
3596  drivers/gpu/drm/exynos/exynos_drm_fimd.c           |    2 +-
3597  drivers/video/Kconfig                              |   15 -
3598  drivers/video/Makefile                             |    2 -
3599  drivers/video/amifb.c                              |    2 -
3600  drivers/video/arcfb.c                              |    1 +
3601  drivers/video/atmel_lcdfb.c                        |    5 +-
3602  drivers/video/bf537-lq035.c                        |   12 +-
3603  drivers/video/bf54x-lq043fb.c                      |    9 +-
3604  drivers/video/bfin-lq035q1-fb.c                    |   13 +-
3605  drivers/video/bfin-t350mcqb-fb.c                   |    1 +
3606  drivers/video/bw2.c                                |    4 +-
3607  drivers/video/cg3.c                                |    3 +-
3608  drivers/video/cobalt_lcdfb.c                       |    5 +-
3609  drivers/video/console/font_mini_4x6.c              |    2 +-
3610  drivers/video/console/font_sun8x16.c               |    2 +-
3611  drivers/video/cyber2000fb.c                        |    4 +-
3612  drivers/video/da8xx-fb.c                           |  191 +++--
3613  drivers/video/ep93xx-fb.c                          |   17 +-
3614  drivers/video/exynos/exynos_dp_core.c              |  314 ++++---
3615  drivers/video/exynos/exynos_dp_core.h              |    6 +-
3616  drivers/video/exynos/exynos_dp_reg.c               |   58 +-
3617  drivers/video/exynos/exynos_dp_reg.h               |    3 +-
3618  drivers/video/exynos/exynos_mipi_dsi.c             |    6 +-
3619  drivers/video/exynos/exynos_mipi_dsi_common.c      |    8 -
3620  drivers/video/fsl-diu-fb.c                         |   10 +-
3621  drivers/video/gbefb.c                              |   15 +-
3622  drivers/video/hpfb.c                               |   28 +-
3623  drivers/video/imxfb.c                              |    1 +
3624  drivers/video/jz4740_fb.c                          |   44 +-
3625  drivers/video/mb862xx/mb862xxfbdrv.c               |   10 +-
3626  drivers/video/mbx/mbxfb.c                          |   25 +-
3627  drivers/video/msm/mddi.c                           |    3 -
3628  drivers/video/msm/mddi_client_nt35399.c            |    6 +-
3629  drivers/video/msm/mdp.c                            |    1 -
3630  drivers/video/msm/mdp_hw.h                         |    1 -
3631  drivers/video/pnx4008/Makefile                     |    7 -
3632  drivers/video/pnx4008/dum.h                        |  211 -----
3633  drivers/video/pnx4008/fbcommon.h                   |   43 -
3634  drivers/video/pnx4008/pnxrgbfb.c                   |  198 -----
3635  drivers/video/pnx4008/sdum.c                       |  861 --------------------
3636  drivers/video/pnx4008/sdum.h                       |  136 ----
3637  drivers/video/ps3fb.c                              |    7 +-
3638  drivers/video/s3c-fb.c                             |   26 +-
3639  drivers/video/s3c2410fb.c                          |   34 +-
3640  drivers/video/sis/initextlfb.c                     |    2 +-
3641  drivers/video/sunxvr1000.c                         |    4 +-
3642  drivers/video/sunxvr2500.c                         |    4 +-
3643  drivers/video/sunxvr500.c                          |    8 +-
3644  drivers/video/uvesafb.c                            |    2 +
3645  drivers/video/vermilion/vermilion.c                |    3 +-
3646  drivers/video/via/via_clock.c                      |   19 +
3647  .../plat/regs-fb.h => include/video/samsung_fimd.h |  152 +++-
3648  75 files changed, 665 insertions(+), 2084 deletions(-)
3649  delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb-v4.h
3650  delete mode 100644 drivers/video/pnx4008/Makefile
3651  delete mode 100644 drivers/video/pnx4008/dum.h
3652  delete mode 100644 drivers/video/pnx4008/fbcommon.h
3653  delete mode 100644 drivers/video/pnx4008/pnxrgbfb.c
3654  delete mode 100644 drivers/video/pnx4008/sdum.c
3655  delete mode 100644 drivers/video/pnx4008/sdum.h
3656  rename arch/arm/plat-samsung/include/plat/regs-fb.h => include/video/samsung_fimd.h (73%)
3657 Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
3658 $ git merge viafb/viafb-next
3659 Already up-to-date.
3660 Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
3661 $ git merge omap_dss2/for-next
3662 Resolved 'drivers/video/omap/lcd_ams_delta.c' using previous resolution.
3663 Resolved 'drivers/video/omap2/displays/panel-taal.c' using previous resolution.
3664 Resolved 'drivers/video/omap2/dss/dispc.c' using previous resolution.
3665 Auto-merging drivers/video/omap2/omapfb/omapfb-main.c
3666 Auto-merging drivers/video/omap2/dss/dsi.c
3667 Auto-merging drivers/video/omap2/dss/dispc.c
3668 CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c
3669 Auto-merging drivers/video/omap2/displays/panel-taal.c
3670 CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-taal.c
3671 Auto-merging drivers/video/omap/lcd_ams_delta.c
3672 CONFLICT (content): Merge conflict in drivers/video/omap/lcd_ams_delta.c
3673 Auto-merging drivers/staging/omapdrm/omap_drv.c
3674 Auto-merging drivers/media/platform/omap/omap_vout.c
3675 Auto-merging arch/arm/mach-omap2/twl-common.c
3676 Auto-merging arch/arm/mach-omap2/display.c
3677 Auto-merging arch/arm/mach-omap2/board-omap4panda.c
3678 Auto-merging arch/arm/mach-omap2/board-4430sdp.c
3679 Automatic merge failed; fix conflicts and then commit the result.
3680 $ git commit -v -a
3681 [master e9c9db9] Merge remote-tracking branch 'omap_dss2/for-next'
3682 $ git diff -M --stat --summary HEAD^..
3683  arch/arm/mach-omap2/board-4430sdp.c                |   73 +-
3684  arch/arm/mach-omap2/board-omap4panda.c             |   27 +-
3685  arch/arm/mach-omap2/display.c                      |    1 -
3686  arch/arm/mach-omap2/twl-common.c                   |    6 +
3687  drivers/media/platform/omap/omap_vout.c            |   75 +-
3688  drivers/staging/omapdrm/omap_drv.c                 |    5 +-
3689  drivers/video/omap/hwa742.c                        |    1 -
3690  drivers/video/omap/lcd_palmte.c                    |    1 -
3691  drivers/video/omap/omapfb_main.c                   |    9 -
3692  drivers/video/omap2/displays/panel-acx565akm.c     |   14 +-
3693  drivers/video/omap2/displays/panel-generic-dpi.c   |   76 +-
3694  .../omap2/displays/panel-lgphilips-lb035q02.c      |    3 +
3695  drivers/video/omap2/displays/panel-n8x0.c          |   31 +-
3696  .../omap2/displays/panel-nec-nl8048hl11-01b.c      |    3 +
3697  drivers/video/omap2/displays/panel-picodlp.c       |    4 +
3698  .../video/omap2/displays/panel-sharp-ls037v7dw01.c |    3 +
3699  drivers/video/omap2/displays/panel-taal.c          |  239 ++---
3700  drivers/video/omap2/displays/panel-tfp410.c        |   20 +-
3701  .../video/omap2/displays/panel-tpo-td043mtea1.c    |    7 +-
3702  drivers/video/omap2/dss/Kconfig                    |    2 +-
3703  drivers/video/omap2/dss/Makefile                   |    4 +-
3704  drivers/video/omap2/dss/apply.c                    |  330 ++-----
3705  drivers/video/omap2/dss/core.c                     |   91 +-
3706  drivers/video/omap2/dss/dispc.c                    | 1018 ++++++++++++++------
3707  drivers/video/omap2/dss/dispc.h                    |   37 +
3708  drivers/video/omap2/dss/display.c                  |  108 ++-
3709  drivers/video/omap2/dss/dpi.c                      |  181 +++-
3710  drivers/video/omap2/dss/dsi.c                      |  675 ++++++++++---
3711  drivers/video/omap2/dss/dss.c                      |  257 +++--
3712  drivers/video/omap2/dss/dss.h                      |   79 +-
3713  drivers/video/omap2/dss/dss_features.c             |  278 +++++-
3714  drivers/video/omap2/dss/dss_features.h             |    7 +
3715  drivers/video/omap2/dss/hdmi.c                     |  247 +++--
3716  drivers/video/omap2/dss/hdmi_panel.c               |   31 +-
3717  drivers/video/omap2/dss/manager-sysfs.c            |  512 ++++++++++
3718  drivers/video/omap2/dss/manager.c                  |  473 +--------
3719  drivers/video/omap2/dss/output.c                   |  148 +++
3720  drivers/video/omap2/dss/overlay-sysfs.c            |  456 +++++++++
3721  drivers/video/omap2/dss/overlay.c                  |  492 +---------
3722  drivers/video/omap2/dss/rfbi.c                     |  222 +++--
3723  drivers/video/omap2/dss/sdi.c                      |  126 ++-
3724  drivers/video/omap2/dss/venc.c                     |  337 +++----
3725  drivers/video/omap2/dss/venc_panel.c               |  251 +++++
3726  drivers/video/omap2/omapfb/omapfb-ioctl.c          |    7 +-
3727  drivers/video/omap2/omapfb/omapfb-main.c           |   32 +-
3728  drivers/video/omap2/omapfb/omapfb.h                |    5 +-
3729  drivers/video/omap2/vram.c                         |   56 --
3730  include/video/omapdss.h                            |  112 ++-
3731  48 files changed, 4575 insertions(+), 2597 deletions(-)
3732  create mode 100644 drivers/video/omap2/dss/manager-sysfs.c
3733  create mode 100644 drivers/video/omap2/dss/output.c
3734  create mode 100644 drivers/video/omap2/dss/overlay-sysfs.c
3735  create mode 100644 drivers/video/omap2/dss/venc_panel.c
3736 Merging regulator/for-next (6a2027a Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next)
3737 $ git merge regulator/for-next
3738 Already up-to-date.
3739 Merging security/next (bf53083 Merge tag 'v3.6-rc7' into next)
3740 $ git merge security/next
3741 Already up-to-date.
3742 Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
3743 $ git merge selinux/master
3744 Already up-to-date!
3745 Merge made by the 'recursive' strategy.
3746 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
3747 $ git merge lblnet/master
3748 Already up-to-date.
3749 Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
3750 $ git merge watchdog/master
3751 Merge made by the 'recursive' strategy.
3752  drivers/watchdog/davinci_wdt.c |    4 ++--
3753  1 file changed, 2 insertions(+), 2 deletions(-)
3754 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
3755 $ git merge dwmw2-iommu/master
3756 Already up-to-date.
3757 Merging iommu/next (0094872 Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next)
3758 $ git merge iommu/next
3759 Already up-to-date.
3760 Merging vfio/next (f448d31 vfio: Fix PCI INTx disable consistency)
3761 $ git merge vfio/next
3762 Merge made by the 'recursive' strategy.
3763  drivers/vfio/pci/vfio_pci_intrs.c |   18 +++++++++++++++---
3764  1 file changed, 15 insertions(+), 3 deletions(-)
3765 Merging osd/linux-next (7f8d145 pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h)
3766 $ git merge osd/linux-next
3767 Already up-to-date.
3768 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
3769 $ git merge jc_docs/docs-next
3770 Already up-to-date.
3771 Merging trivial/for-next (9c33c51 doc: fix old config name of kprobetrace)
3772 $ git merge trivial/for-next
3773 Already up-to-date.
3774 Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
3775 $ git merge audit/for-next
3776 Already up-to-date.
3777 Merging pm/linux-next (df5a2a1 Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394)
3778 $ git merge pm/linux-next
3779 Already up-to-date.
3780 Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
3781 $ git merge apm/for-next
3782 Already up-to-date.
3783 Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
3784 $ git merge fsnotify/for-next
3785 Resolved 'kernel/audit_tree.c' using previous resolution.
3786 Auto-merging kernel/audit_watch.c
3787 Auto-merging kernel/audit_tree.c
3788 CONFLICT (content): Merge conflict in kernel/audit_tree.c
3789 Auto-merging include/linux/fsnotify_backend.h
3790 Auto-merging fs/notify/notification.c
3791 Auto-merging fs/notify/inotify/inotify_user.c
3792 Auto-merging fs/notify/fanotify/fanotify_user.c
3793 Automatic merge failed; fix conflicts and then commit the result.
3794 $ git commit -v -a
3795 [master 55bb79c] Merge remote-tracking branch 'fsnotify/for-next'
3796 $ git diff -M --stat --summary HEAD^..
3797  fs/notify/dnotify/dnotify.c          |    4 +-
3798  fs/notify/fanotify/fanotify.c        |    6 +++
3799  fs/notify/fanotify/fanotify_user.c   |   37 +++++++++-----
3800  fs/notify/group.c                    |   47 ++++++++++--------
3801  fs/notify/inode_mark.c               |   14 ++++--
3802  fs/notify/inotify/inotify_fsnotify.c |    4 +-
3803  fs/notify/inotify/inotify_user.c     |   34 ++++++-------
3804  fs/notify/mark.c                     |   91 +++++++++++++++++++---------------
3805  fs/notify/notification.c             |    1 +
3806  fs/notify/vfsmount_mark.c            |   14 ++++--
3807  include/linux/fsnotify_backend.h     |   31 ++++++++----
3808  kernel/audit_tree.c                  |   10 ++--
3809  kernel/audit_watch.c                 |    4 +-
3810  13 files changed, 178 insertions(+), 119 deletions(-)
3811 Merging edac/linux_next (cfe5031 edac: edac_mc no longer deals with kobjects directly)
3812 $ git merge edac/linux_next
3813 Auto-merging drivers/edac/edac_mc.c
3814 Merge made by the 'recursive' strategy.
3815  drivers/edac/edac_mc.c |    7 -------
3816  include/linux/edac.h   |    1 -
3817  2 files changed, 8 deletions(-)
3818 Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
3819 $ git merge edac-amd/for-next
3820 Resolved 'Documentation/edac.txt' using previous resolution.
3821 Resolved 'drivers/edac/amd64_edac.c' using previous resolution.
3822 Auto-merging drivers/edac/amd64_edac.c
3823 CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
3824 Auto-merging Documentation/edac.txt
3825 CONFLICT (content): Merge conflict in Documentation/edac.txt
3826 Automatic merge failed; fix conflicts and then commit the result.
3827 $ git commit -v -a
3828 [master 153664a] Merge remote-tracking branch 'edac-amd/for-next'
3829 $ git diff -M --stat --summary HEAD^..
3830 Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
3831 $ git merge devicetree/devicetree/next
3832 Already up-to-date.
3833 Merging dt-rh/for-next (36165f5 MAINTAINERS: add scripts/dtc under Devicetree maintainers)
3834 $ git merge dt-rh/for-next
3835 Already up-to-date.
3836 Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
3837 $ git merge spi/spi/next
3838 Already up-to-date.
3839 Merging spi-mb/spi-next (43e37b0 spi: tsc2005: delete soon-obsolete e-mail address)
3840 $ git merge spi-mb/spi-next
3841 Merge made by the 'recursive' strategy.
3842  drivers/spi/spi-rspi.c      |   56 ++++++++++++++++++++++++++-----------------
3843  include/linux/spi/tsc2005.h |    2 --
3844  2 files changed, 34 insertions(+), 24 deletions(-)
3845 Merging tip/auto-latest (6b90cb2 Merge branch 'sched/urgent')
3846 $ git merge tip/auto-latest
3847 Recorded preimage for 'mm/huge_memory.c'
3848 Recorded preimage for 'mm/mempolicy.c'
3849 Auto-merging tools/perf/Makefile
3850 Auto-merging scripts/kconfig/Makefile
3851 Auto-merging mm/vmstat.c
3852 Auto-merging mm/mempolicy.c
3853 CONFLICT (content): Merge conflict in mm/mempolicy.c
3854 Auto-merging mm/memory.c
3855 Auto-merging mm/huge_memory.c
3856 CONFLICT (content): Merge conflict in mm/huge_memory.c
3857 Auto-merging lib/Makefile
3858 Auto-merging kernel/sysctl.c
3859 Auto-merging kernel/events/core.c
3860 Auto-merging init/Kconfig
3861 Auto-merging include/linux/sched.h
3862 Auto-merging include/linux/mmzone.h
3863 Auto-merging include/linux/mm_types.h
3864 Auto-merging include/linux/mm.h
3865 Auto-merging include/linux/mempolicy.h
3866 Auto-merging include/linux/init_task.h
3867 Auto-merging include/linux/huge_mm.h
3868 Auto-merging include/linux/acpi.h
3869 Auto-merging arch/x86/kernel/setup.c
3870 Auto-merging arch/x86/include/asm/pgtable.h
3871 Auto-merging arch/x86/include/asm/msr-index.h
3872 Auto-merging arch/x86/Kconfig
3873 Auto-merging MAINTAINERS
3874 Automatic merge failed; fix conflicts and then commit the result.
3875 $ git commit -v -a
3876 Recorded resolution for 'mm/huge_memory.c'.
3877 Recorded resolution for 'mm/mempolicy.c'.
3878 [master fe59c61] Merge remote-tracking branch 'tip/auto-latest'
3879 $ git diff -M --stat --summary HEAD^..
3880  Documentation/acpi/initrd_table_override.txt |   94 ++
3881  MAINTAINERS                                  |    8 +
3882  arch/sh/mm/Kconfig                           |    1 +
3883  arch/x86/Kconfig                             |   31 +
3884  arch/x86/include/asm/msr-index.h             |    5 +
3885  arch/x86/include/asm/pgtable.h               |    1 +
3886  arch/x86/kernel/acpi/boot.c                  |    6 +
3887  arch/x86/kernel/cpu/Makefile                 |    2 +-
3888  arch/x86/kernel/cpu/intel_cacheinfo.c        |    2 +-
3889  arch/x86/kernel/cpu/perf_event.h             |    2 +
3890  arch/x86/kernel/cpu/perf_event_amd_ibs.c     |   61 +-
3891  arch/x86/kernel/cpu/perf_event_intel.c       |    2 +
3892  arch/x86/kernel/cpu/perf_event_knc.c         |  248 +++++
3893  arch/x86/kernel/cpu/perfctr-watchdog.c       |    4 +
3894  arch/x86/kernel/reboot.c                     |    8 -
3895  arch/x86/kernel/setup.c                      |    4 +
3896  arch/x86/realmode/rm/wakeup_asm.S            |   15 +-
3897  drivers/acpi/Kconfig                         |    9 +
3898  drivers/acpi/osl.c                           |  202 +++-
3899  drivers/base/node.c                          |    2 +-
3900  include/linux/acpi.h                         |   16 +
3901  include/linux/earlycpio.h                    |   17 +
3902  include/linux/huge_mm.h                      |   19 +
3903  include/linux/init_task.h                    |    9 +
3904  include/linux/mempolicy.h                    |   30 +-
3905  include/linux/migrate.h                      |    7 +
3906  include/linux/migrate_mode.h                 |    3 +
3907  include/linux/mm.h                           |  115 +-
3908  include/linux/mm_types.h                     |   34 +
3909  include/linux/mmzone.h                       |   15 +-
3910  include/linux/page-flags-layout.h            |   83 ++
3911  include/linux/perf_event.h                   |    2 +-
3912  include/linux/sched.h                        |   27 +-
3913  init/Kconfig                                 |   11 +
3914  kernel/events/core.c                         |   21 +-
3915  kernel/sched/core.c                          |  142 ++-
3916  kernel/sched/debug.c                         |    3 +
3917  kernel/sched/fair.c                          |  545 ++++++++-
3918  kernel/sched/features.h                      |   10 +
3919  kernel/sched/sched.h                         |   37 +
3920  kernel/sysctl.c                              |   13 +-
3921  kernel/time/tick-sched.c                     |    2 +-
3922  lib/Makefile                                 |    2 +-
3923  lib/earlycpio.c                              |  145 +++
3924  mm/huge_memory.c                             |  172 ++-
3925  mm/memory.c                                  |  105 +-
3926  mm/mempolicy.c                               |  298 +++--
3927  mm/migrate.c                                 |   85 +-
3928  mm/mprotect.c                                |   31 +-
3929  mm/vmstat.c                                  |    1 -
3930  scripts/kconfig/Makefile                     |    7 +-
3931  tools/kvm/.gitignore                         |   12 +
3932  tools/kvm/CREDITS-Git                        |   30 +
3933  tools/kvm/Documentation/kernel-debugging.txt |   15 +
3934  tools/kvm/Documentation/kvm-balloon.txt      |   24 +
3935  tools/kvm/Documentation/kvm-debug.txt        |   16 +
3936  tools/kvm/Documentation/kvm-list.txt         |   16 +
3937  tools/kvm/Documentation/kvm-pause.txt        |   16 +
3938  tools/kvm/Documentation/kvm-resume.txt       |   16 +
3939  tools/kvm/Documentation/kvm-run.txt          |   62 ++
3940  tools/kvm/Documentation/kvm-sandbox.txt      |   16 +
3941  tools/kvm/Documentation/kvm-setup.txt        |   15 +
3942  tools/kvm/Documentation/kvm-stat.txt         |   19 +
3943  tools/kvm/Documentation/kvm-stop.txt         |   16 +
3944  tools/kvm/Documentation/kvm-version.txt      |   21 +
3945  tools/kvm/Documentation/virtio-console.txt   |   41 +
3946  tools/kvm/Makefile                           |  457 ++++++++
3947  tools/kvm/README                             |  112 ++
3948  tools/kvm/builtin-balloon.c                  |   80 ++
3949  tools/kvm/builtin-debug.c                    |  110 ++
3950  tools/kvm/builtin-help.c                     |   63 ++
3951  tools/kvm/builtin-list.c                     |  149 +++
3952  tools/kvm/builtin-pause.c                    |   88 ++
3953  tools/kvm/builtin-resume.c                   |   88 ++
3954  tools/kvm/builtin-run.c                      |  697 ++++++++++++
3955  tools/kvm/builtin-sandbox.c                  |    9 +
3956  tools/kvm/builtin-setup.c                    |  262 +++++
3957  tools/kvm/builtin-stat.c                     |  127 +++
3958  tools/kvm/builtin-stop.c                     |   70 ++
3959  tools/kvm/builtin-version.c                  |   15 +
3960  tools/kvm/code16gcc.h                        |   15 +
3961  tools/kvm/command-list.txt                   |   15 +
3962  tools/kvm/config/feature-tests.mak           |  177 +++
3963  tools/kvm/config/utilities.mak               |  196 ++++
3964  tools/kvm/disk/blk.c                         |   76 ++
3965  tools/kvm/disk/core.c                        |  354 ++++++
3966  tools/kvm/disk/qcow.c                        | 1529 ++++++++++++++++++++++++++
3967  tools/kvm/disk/raw.c                         |  141 +++
3968  tools/kvm/framebuffer.c                      |   80 ++
3969  tools/kvm/guest/init.c                       |   72 ++
3970  tools/kvm/guest_compat.c                     |   99 ++
3971  tools/kvm/hw/i8042.c                         |  355 ++++++
3972  tools/kvm/hw/pci-shmem.c                     |  405 +++++++
3973  tools/kvm/hw/rtc.c                           |  139 +++
3974  tools/kvm/hw/serial.c                        |  452 ++++++++
3975  tools/kvm/hw/vesa.c                          |   89 ++
3976  tools/kvm/include/asm/hweight.h              |    8 +
3977  tools/kvm/include/bios/memcpy.h              |    9 +
3978  tools/kvm/include/kvm/8250-serial.h          |   11 +
3979  tools/kvm/include/kvm/apic.h                 |   17 +
3980  tools/kvm/include/kvm/brlock.h               |   41 +
3981  tools/kvm/include/kvm/builtin-balloon.h      |    9 +
3982  tools/kvm/include/kvm/builtin-debug.h        |   20 +
3983  tools/kvm/include/kvm/builtin-help.h         |    6 +
3984  tools/kvm/include/kvm/builtin-list.h         |   10 +
3985  tools/kvm/include/kvm/builtin-pause.h        |    9 +
3986  tools/kvm/include/kvm/builtin-resume.h       |    9 +
3987  tools/kvm/include/kvm/builtin-run.h          |   11 +
3988  tools/kvm/include/kvm/builtin-sandbox.h      |    6 +
3989  tools/kvm/include/kvm/builtin-setup.h        |   11 +
3990  tools/kvm/include/kvm/builtin-stat.h         |    9 +
3991  tools/kvm/include/kvm/builtin-stop.h         |    9 +
3992  tools/kvm/include/kvm/builtin-version.h      |    6 +
3993  tools/kvm/include/kvm/compiler.h             |   10 +
3994  tools/kvm/include/kvm/disk-image.h           |   96 ++
3995  tools/kvm/include/kvm/e820.h                 |   13 +
3996  tools/kvm/include/kvm/framebuffer.h          |   36 +
3997  tools/kvm/include/kvm/guest_compat.h         |    9 +
3998  tools/kvm/include/kvm/i8042.h                |   12 +
3999  tools/kvm/include/kvm/ioeventfd.h            |   28 +
4000  tools/kvm/include/kvm/ioport.h               |   70 ++
4001  tools/kvm/include/kvm/irq.h                  |   33 +
4002  tools/kvm/include/kvm/kvm-cmd.h              |   17 +
4003  tools/kvm/include/kvm/kvm-config.h           |   60 +
4004  tools/kvm/include/kvm/kvm-cpu.h              |   26 +
4005  tools/kvm/include/kvm/kvm-ipc.h              |   26 +
4006  tools/kvm/include/kvm/kvm.h                  |  121 ++
4007  tools/kvm/include/kvm/msi.h                  |   10 +
4008  tools/kvm/include/kvm/mutex.h                |   33 +
4009  tools/kvm/include/kvm/parse-options.h        |  218 ++++
4010  tools/kvm/include/kvm/pci-shmem.h            |   32 +
4011  tools/kvm/include/kvm/pci.h                  |   95 ++
4012  tools/kvm/include/kvm/qcow.h                 |  133 +++
4013  tools/kvm/include/kvm/rbtree-interval.h      |   28 +
4014  tools/kvm/include/kvm/read-write.h           |   43 +
4015  tools/kvm/include/kvm/rtc.h                  |    9 +
4016  tools/kvm/include/kvm/rwsem.h                |   39 +
4017  tools/kvm/include/kvm/sdl.h                  |   28 +
4018  tools/kvm/include/kvm/segment.h              |   21 +
4019  tools/kvm/include/kvm/strbuf.h               |   20 +
4020  tools/kvm/include/kvm/symbol.h               |   30 +
4021  tools/kvm/include/kvm/term.h                 |   24 +
4022  tools/kvm/include/kvm/threadpool.h           |   38 +
4023  tools/kvm/include/kvm/types.h                |    7 +
4024  tools/kvm/include/kvm/uip.h                  |  360 ++++++
4025  tools/kvm/include/kvm/util-init.h            |   51 +
4026  tools/kvm/include/kvm/util.h                 |   97 ++
4027  tools/kvm/include/kvm/vesa.h                 |   18 +
4028  tools/kvm/include/kvm/virtio-9p.h            |   76 ++
4029  tools/kvm/include/kvm/virtio-balloon.h       |    9 +
4030  tools/kvm/include/kvm/virtio-blk.h           |   12 +
4031  tools/kvm/include/kvm/virtio-console.h       |   10 +
4032  tools/kvm/include/kvm/virtio-mmio.h          |   58 +
4033  tools/kvm/include/kvm/virtio-net.h           |   30 +
4034  tools/kvm/include/kvm/virtio-pci-dev.h       |   38 +
4035  tools/kvm/include/kvm/virtio-pci.h           |   49 +
4036  tools/kvm/include/kvm/virtio-rng.h           |    9 +
4037  tools/kvm/include/kvm/virtio-scsi.h          |   26 +
4038  tools/kvm/include/kvm/virtio.h               |  102 ++
4039  tools/kvm/include/kvm/vnc.h                  |   22 +
4040  tools/kvm/include/linux/bitops.h             |   33 +
4041  tools/kvm/include/linux/byteorder.h          |    7 +
4042  tools/kvm/include/linux/compiler.h           |   20 +
4043  tools/kvm/include/linux/kernel.h             |   39 +
4044  tools/kvm/include/linux/module.h             |    6 +
4045  tools/kvm/include/linux/prefetch.h           |    6 +
4046  tools/kvm/include/linux/stddef.h             |   16 +
4047  tools/kvm/include/linux/types.h              |   51 +
4048  tools/kvm/ioeventfd.c                        |  216 ++++
4049  tools/kvm/ioport.c                           |  198 ++++
4050  tools/kvm/kvm-cmd.c                          |   91 ++
4051  tools/kvm/kvm-cpu.c                          |  242 ++++
4052  tools/kvm/kvm-ipc.c                          |  498 +++++++++
4053  tools/kvm/kvm.c                              |  458 ++++++++
4054  tools/kvm/main.c                             |   19 +
4055  tools/kvm/mmio.c                             |  139 +++
4056  tools/kvm/net/uip/arp.c                      |   30 +
4057  tools/kvm/net/uip/buf.c                      |  114 ++
4058  tools/kvm/net/uip/core.c                     |  190 ++++
4059  tools/kvm/net/uip/csum.c                     |   92 ++
4060  tools/kvm/net/uip/dhcp.c                     |  202 ++++
4061  tools/kvm/net/uip/icmp.c                     |   29 +
4062  tools/kvm/net/uip/ipv4.c                     |   29 +
4063  tools/kvm/net/uip/tcp.c                      |  345 ++++++
4064  tools/kvm/net/uip/udp.c                      |  236 ++++
4065  tools/kvm/pci.c                              |  215 ++++
4066  tools/kvm/powerpc/boot.c                     |    8 +
4067  tools/kvm/powerpc/cpu_info.c                 |  195 ++++
4068  tools/kvm/powerpc/cpu_info.h                 |   42 +
4069  tools/kvm/powerpc/include/kvm/barrier.h      |    6 +
4070  tools/kvm/powerpc/include/kvm/kvm-arch.h     |   68 ++
4071  tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h |   76 ++
4072  tools/kvm/powerpc/ioport.c                   |   18 +
4073  tools/kvm/powerpc/irq.c                      |   75 ++
4074  tools/kvm/powerpc/kvm-cpu.c                  |  293 +++++
4075  tools/kvm/powerpc/kvm.c                      |  529 +++++++++
4076  tools/kvm/powerpc/spapr.h                    |   93 ++
4077  tools/kvm/powerpc/spapr_hcall.c              |  134 +++
4078  tools/kvm/powerpc/spapr_hvcons.c             |  108 ++
4079  tools/kvm/powerpc/spapr_hvcons.h             |   19 +
4080  tools/kvm/powerpc/spapr_pci.c                |  423 +++++++
4081  tools/kvm/powerpc/spapr_pci.h                |   57 +
4082  tools/kvm/powerpc/spapr_rtas.c               |  229 ++++
4083  tools/kvm/powerpc/xics.c                     |  514 +++++++++
4084  tools/kvm/powerpc/xics.h                     |   23 +
4085  tools/kvm/symbol.c                           |  133 +++
4086  tools/kvm/term.c                             |  171 +++
4087  tools/kvm/tests/Makefile                     |   19 +
4088  tools/kvm/tests/boot/Makefile                |   13 +
4089  tools/kvm/tests/boot/init.c                  |   11 +
4090  tools/kvm/tests/kernel/.gitignore            |    2 +
4091  tools/kvm/tests/kernel/Makefile              |   20 +
4092  tools/kvm/tests/kernel/README                |   16 +
4093  tools/kvm/tests/kernel/kernel.S              |    8 +
4094  tools/kvm/tests/pit/.gitignore               |    2 +
4095  tools/kvm/tests/pit/Makefile                 |   20 +
4096  tools/kvm/tests/pit/README                   |   16 +
4097  tools/kvm/tests/pit/tick.S                   |  101 ++
4098  tools/kvm/ui/sdl.c                           |  321 ++++++
4099  tools/kvm/ui/vnc.c                           |  248 +++++
4100  tools/kvm/util/KVMTOOLS-VERSION-GEN          |   40 +
4101  tools/kvm/util/generate-cmdlist.sh           |   23 +
4102  tools/kvm/util/init.c                        |   69 ++
4103  tools/kvm/util/kvm-ifup-vbr0                 |    6 +
4104  tools/kvm/util/parse-options.c               |  577 ++++++++++
4105  tools/kvm/util/rbtree-interval.c             |   89 ++
4106  tools/kvm/util/read-write.c                  |  354 ++++++
4107  tools/kvm/util/set_private_br.sh             |   51 +
4108  tools/kvm/util/strbuf.c                      |   62 ++
4109  tools/kvm/util/threadpool.c                  |  173 +++
4110  tools/kvm/util/util.c                        |  133 +++
4111  tools/kvm/virtio/9p-pdu.c                    |  287 +++++
4112  tools/kvm/virtio/9p.c                        | 1448 ++++++++++++++++++++++++
4113  tools/kvm/virtio/balloon.c                   |  270 +++++
4114  tools/kvm/virtio/blk.c                       |  315 ++++++
4115  tools/kvm/virtio/console.c                   |  203 ++++
4116  tools/kvm/virtio/core.c                      |  233 ++++
4117  tools/kvm/virtio/mmio.c                      |  264 +++++
4118  tools/kvm/virtio/net.c                       |  670 +++++++++++
4119  tools/kvm/virtio/pci.c                       |  398 +++++++
4120  tools/kvm/virtio/rng.c                       |  193 ++++
4121  tools/kvm/virtio/scsi.c                      |  309 ++++++
4122  tools/kvm/x86/bios.c                         |  174 +++
4123  tools/kvm/x86/bios/.gitignore                |    3 +
4124  tools/kvm/x86/bios/bios-rom.S                |   12 +
4125  tools/kvm/x86/bios/e820.c                    |   72 ++
4126  tools/kvm/x86/bios/entry.S                   |   92 ++
4127  tools/kvm/x86/bios/gen-offsets.sh            |   14 +
4128  tools/kvm/x86/bios/int10.c                   |  110 ++
4129  tools/kvm/x86/bios/int15.c                   |   18 +
4130  tools/kvm/x86/bios/local.S                   |    7 +
4131  tools/kvm/x86/bios/macro.S                   |   25 +
4132  tools/kvm/x86/bios/memcpy.c                  |   23 +
4133  tools/kvm/x86/bios/rom.ld.S                  |   16 +
4134  tools/kvm/x86/boot.c                         |   41 +
4135  tools/kvm/x86/cpuid.c                        |   60 +
4136  tools/kvm/x86/include/kvm/assembly.h         |   24 +
4137  tools/kvm/x86/include/kvm/barrier.h          |   20 +
4138  tools/kvm/x86/include/kvm/bios-export.h      |   13 +
4139  tools/kvm/x86/include/kvm/bios.h             |   93 ++
4140  tools/kvm/x86/include/kvm/boot-protocol.h    |   16 +
4141  tools/kvm/x86/include/kvm/cpufeature.h       |   41 +
4142  tools/kvm/x86/include/kvm/interrupt.h        |   26 +
4143  tools/kvm/x86/include/kvm/kvm-arch.h         |   43 +
4144  tools/kvm/x86/include/kvm/kvm-cpu-arch.h     |   49 +
4145  tools/kvm/x86/include/kvm/mptable.h          |    9 +
4146  tools/kvm/x86/interrupt.c                    |   28 +
4147  tools/kvm/x86/ioport.c                       |   77 ++
4148  tools/kvm/x86/irq.c                          |  224 ++++
4149  tools/kvm/x86/kvm-cpu.c                      |  425 +++++++
4150  tools/kvm/x86/kvm.c                          |  362 ++++++
4151  tools/kvm/x86/mptable.c                      |  289 +++++
4152  tools/perf/Makefile                          |   83 +-
4153  tools/perf/bash_completion                   |   50 +-
4154  tools/perf/builtin-buildid-cache.c           |   58 +-
4155  tools/perf/builtin-buildid-list.c            |   55 +-
4156  tools/perf/builtin-diff.c                    |   68 +-
4157  tools/perf/builtin-evlist.c                  |   21 +-
4158  tools/perf/builtin-help.c                    |   40 +-
4159  tools/perf/builtin-inject.c                  |   88 +-
4160  tools/perf/builtin-kmem.c                    |   66 +-
4161  tools/perf/builtin-kvm.c                     |  460 ++++----
4162  tools/perf/builtin-lock.c                    |   90 +-
4163  tools/perf/builtin-probe.c                   |   26 +-
4164  tools/perf/builtin-record.c                  |   27 +-
4165  tools/perf/builtin-report.c                  |    4 +-
4166  tools/perf/builtin-sched.c                   |    2 +-
4167  tools/perf/builtin-script.c                  |   90 +-
4168  tools/perf/builtin-stat.c                    |  328 +++---
4169  tools/perf/builtin-timechart.c               |  100 +-
4170  tools/perf/builtin-top.c                     |   11 +-
4171  tools/perf/builtin-trace.c                   |  134 ++-
4172  tools/perf/perf.c                            |    4 +-
4173  tools/perf/ui/browsers/hists.c               |   12 +-
4174  tools/perf/ui/gtk/browser.c                  |    6 +-
4175  tools/perf/ui/gtk/util.c                     |    2 +-
4176  tools/perf/ui/helpline.h                     |   18 +-
4177  tools/perf/ui/hist.c                         |  145 ++-
4178  tools/perf/ui/setup.c                        |    2 +-
4179  tools/perf/ui/stdio/hist.c                   |   45 +-
4180  tools/perf/util/annotate.h                   |    8 +-
4181  tools/perf/util/cache.h                      |   38 +-
4182  tools/perf/util/debug.c                      |    2 +-
4183  tools/perf/util/debug.h                      |   17 +-
4184  tools/perf/util/evlist.c                     |   88 +-
4185  tools/perf/util/evlist.h                     |   18 +-
4186  tools/perf/util/generate-cmdlist.sh          |    4 +-
4187  tools/perf/util/hist.c                       |   66 +-
4188  tools/perf/util/hist.h                       |   38 +-
4189  tools/perf/util/map.c                        |    2 +-
4190  tools/perf/util/parse-options.c              |    8 +
4191  tools/perf/util/parse-options.h              |    1 +
4192  tools/perf/util/path.c                       |    2 +-
4193  tools/perf/util/perf_regs.h                  |    4 +-
4194  tools/perf/util/sort.h                       |   19 +-
4195  tools/perf/util/symbol.h                     |   10 +-
4196  tools/perf/util/unwind.h                     |    4 +-
4197  tools/perf/util/util.c                       |    4 +-
4198  318 files changed, 29097 insertions(+), 1479 deletions(-)
4199  create mode 100644 Documentation/acpi/initrd_table_override.txt
4200  create mode 100644 arch/x86/kernel/cpu/perf_event_knc.c
4201  create mode 100644 include/linux/earlycpio.h
4202  create mode 100644 include/linux/page-flags-layout.h
4203  create mode 100644 lib/earlycpio.c
4204  create mode 100644 tools/kvm/.gitignore
4205  create mode 100644 tools/kvm/CREDITS-Git
4206  create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
4207  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
4208  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
4209  create mode 100644 tools/kvm/Documentation/kvm-list.txt
4210  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
4211  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
4212  create mode 100644 tools/kvm/Documentation/kvm-run.txt
4213  create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
4214  create mode 100644 tools/kvm/Documentation/kvm-setup.txt
4215  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
4216  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
4217  create mode 100644 tools/kvm/Documentation/kvm-version.txt
4218  create mode 100644 tools/kvm/Documentation/virtio-console.txt
4219  create mode 100644 tools/kvm/Makefile
4220  create mode 100644 tools/kvm/README
4221  create mode 100644 tools/kvm/builtin-balloon.c
4222  create mode 100644 tools/kvm/builtin-debug.c
4223  create mode 100644 tools/kvm/builtin-help.c
4224  create mode 100644 tools/kvm/builtin-list.c
4225  create mode 100644 tools/kvm/builtin-pause.c
4226  create mode 100644 tools/kvm/builtin-resume.c
4227  create mode 100644 tools/kvm/builtin-run.c
4228  create mode 100644 tools/kvm/builtin-sandbox.c
4229  create mode 100644 tools/kvm/builtin-setup.c
4230  create mode 100644 tools/kvm/builtin-stat.c
4231  create mode 100644 tools/kvm/builtin-stop.c
4232  create mode 100644 tools/kvm/builtin-version.c
4233  create mode 100644 tools/kvm/code16gcc.h
4234  create mode 100644 tools/kvm/command-list.txt
4235  create mode 100644 tools/kvm/config/feature-tests.mak
4236  create mode 100644 tools/kvm/config/utilities.mak
4237  create mode 100644 tools/kvm/disk/blk.c
4238  create mode 100644 tools/kvm/disk/core.c
4239  create mode 100644 tools/kvm/disk/qcow.c
4240  create mode 100644 tools/kvm/disk/raw.c
4241  create mode 100644 tools/kvm/framebuffer.c
4242  create mode 100644 tools/kvm/guest/init.c
4243  create mode 100644 tools/kvm/guest_compat.c
4244  create mode 100644 tools/kvm/hw/i8042.c
4245  create mode 100644 tools/kvm/hw/pci-shmem.c
4246  create mode 100644 tools/kvm/hw/rtc.c
4247  create mode 100644 tools/kvm/hw/serial.c
4248  create mode 100644 tools/kvm/hw/vesa.c
4249  create mode 100644 tools/kvm/include/asm/hweight.h
4250  create mode 100644 tools/kvm/include/bios/memcpy.h
4251  create mode 100644 tools/kvm/include/kvm/8250-serial.h
4252  create mode 100644 tools/kvm/include/kvm/apic.h
4253  create mode 100644 tools/kvm/include/kvm/brlock.h
4254  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
4255  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
4256  create mode 100644 tools/kvm/include/kvm/builtin-help.h
4257  create mode 100644 tools/kvm/include/kvm/builtin-list.h
4258  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
4259  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
4260  create mode 100644 tools/kvm/include/kvm/builtin-run.h
4261  create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
4262  create mode 100644 tools/kvm/include/kvm/builtin-setup.h
4263  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
4264  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
4265  create mode 100644 tools/kvm/include/kvm/builtin-version.h
4266  create mode 100644 tools/kvm/include/kvm/compiler.h
4267  create mode 100644 tools/kvm/include/kvm/disk-image.h
4268  create mode 100644 tools/kvm/include/kvm/e820.h
4269  create mode 100644 tools/kvm/include/kvm/framebuffer.h
4270  create mode 100644 tools/kvm/include/kvm/guest_compat.h
4271  create mode 100644 tools/kvm/include/kvm/i8042.h
4272  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
4273  create mode 100644 tools/kvm/include/kvm/ioport.h
4274  create mode 100644 tools/kvm/include/kvm/irq.h
4275  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
4276  create mode 100644 tools/kvm/include/kvm/kvm-config.h
4277  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
4278  create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
4279  create mode 100644 tools/kvm/include/kvm/kvm.h
4280  create mode 100644 tools/kvm/include/kvm/msi.h
4281  create mode 100644 tools/kvm/include/kvm/mutex.h
4282  create mode 100644 tools/kvm/include/kvm/parse-options.h
4283  create mode 100644 tools/kvm/include/kvm/pci-shmem.h
4284  create mode 100644 tools/kvm/include/kvm/pci.h
4285  create mode 100644 tools/kvm/include/kvm/qcow.h
4286  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
4287  create mode 100644 tools/kvm/include/kvm/read-write.h
4288  create mode 100644 tools/kvm/include/kvm/rtc.h
4289  create mode 100644 tools/kvm/include/kvm/rwsem.h
4290  create mode 100644 tools/kvm/include/kvm/sdl.h
4291  create mode 100644 tools/kvm/include/kvm/segment.h
4292  create mode 100644 tools/kvm/include/kvm/strbuf.h
4293  create mode 100644 tools/kvm/include/kvm/symbol.h
4294  create mode 100644 tools/kvm/include/kvm/term.h
4295  create mode 100644 tools/kvm/include/kvm/threadpool.h
4296  create mode 100644 tools/kvm/include/kvm/types.h
4297  create mode 100644 tools/kvm/include/kvm/uip.h
4298  create mode 100644 tools/kvm/include/kvm/util-init.h
4299  create mode 100644 tools/kvm/include/kvm/util.h
4300  create mode 100644 tools/kvm/include/kvm/vesa.h
4301  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
4302  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
4303  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
4304  create mode 100644 tools/kvm/include/kvm/virtio-console.h
4305  create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
4306  create mode 100644 tools/kvm/include/kvm/virtio-net.h
4307  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
4308  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
4309  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
4310  create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
4311  create mode 100644 tools/kvm/include/kvm/virtio.h
4312  create mode 100644 tools/kvm/include/kvm/vnc.h
4313  create mode 100644 tools/kvm/include/linux/bitops.h
4314  create mode 100644 tools/kvm/include/linux/byteorder.h
4315  create mode 100644 tools/kvm/include/linux/compiler.h
4316  create mode 100644 tools/kvm/include/linux/kernel.h
4317  create mode 100644 tools/kvm/include/linux/module.h
4318  create mode 100644 tools/kvm/include/linux/prefetch.h
4319  create mode 100644 tools/kvm/include/linux/stddef.h
4320  create mode 100644 tools/kvm/include/linux/types.h
4321  create mode 100644 tools/kvm/ioeventfd.c
4322  create mode 100644 tools/kvm/ioport.c
4323  create mode 100644 tools/kvm/kvm-cmd.c
4324  create mode 100644 tools/kvm/kvm-cpu.c
4325  create mode 100644 tools/kvm/kvm-ipc.c
4326  create mode 100644 tools/kvm/kvm.c
4327  create mode 100644 tools/kvm/main.c
4328  create mode 100644 tools/kvm/mmio.c
4329  create mode 100644 tools/kvm/net/uip/arp.c
4330  create mode 100644 tools/kvm/net/uip/buf.c
4331  create mode 100644 tools/kvm/net/uip/core.c
4332  create mode 100644 tools/kvm/net/uip/csum.c
4333  create mode 100644 tools/kvm/net/uip/dhcp.c
4334  create mode 100644 tools/kvm/net/uip/icmp.c
4335  create mode 100644 tools/kvm/net/uip/ipv4.c
4336  create mode 100644 tools/kvm/net/uip/tcp.c
4337  create mode 100644 tools/kvm/net/uip/udp.c
4338  create mode 100644 tools/kvm/pci.c
4339  create mode 100644 tools/kvm/powerpc/boot.c
4340  create mode 100644 tools/kvm/powerpc/cpu_info.c
4341  create mode 100644 tools/kvm/powerpc/cpu_info.h
4342  create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
4343  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
4344  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
4345  create mode 100644 tools/kvm/powerpc/ioport.c
4346  create mode 100644 tools/kvm/powerpc/irq.c
4347  create mode 100644 tools/kvm/powerpc/kvm-cpu.c
4348  create mode 100644 tools/kvm/powerpc/kvm.c
4349  create mode 100644 tools/kvm/powerpc/spapr.h
4350  create mode 100644 tools/kvm/powerpc/spapr_hcall.c
4351  create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
4352  create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
4353  create mode 100644 tools/kvm/powerpc/spapr_pci.c
4354  create mode 100644 tools/kvm/powerpc/spapr_pci.h
4355  create mode 100644 tools/kvm/powerpc/spapr_rtas.c
4356  create mode 100644 tools/kvm/powerpc/xics.c
4357  create mode 100644 tools/kvm/powerpc/xics.h
4358  create mode 100644 tools/kvm/symbol.c
4359  create mode 100644 tools/kvm/term.c
4360  create mode 100644 tools/kvm/tests/Makefile
4361  create mode 100644 tools/kvm/tests/boot/Makefile
4362  create mode 100644 tools/kvm/tests/boot/init.c
4363  create mode 100644 tools/kvm/tests/kernel/.gitignore
4364  create mode 100644 tools/kvm/tests/kernel/Makefile
4365  create mode 100644 tools/kvm/tests/kernel/README
4366  create mode 100644 tools/kvm/tests/kernel/kernel.S
4367  create mode 100644 tools/kvm/tests/pit/.gitignore
4368  create mode 100644 tools/kvm/tests/pit/Makefile
4369  create mode 100644 tools/kvm/tests/pit/README
4370  create mode 100644 tools/kvm/tests/pit/tick.S
4371  create mode 100644 tools/kvm/ui/sdl.c
4372  create mode 100644 tools/kvm/ui/vnc.c
4373  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
4374  create mode 100755 tools/kvm/util/generate-cmdlist.sh
4375  create mode 100644 tools/kvm/util/init.c
4376  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
4377  create mode 100644 tools/kvm/util/parse-options.c
4378  create mode 100644 tools/kvm/util/rbtree-interval.c
4379  create mode 100644 tools/kvm/util/read-write.c
4380  create mode 100755 tools/kvm/util/set_private_br.sh
4381  create mode 100644 tools/kvm/util/strbuf.c
4382  create mode 100644 tools/kvm/util/threadpool.c
4383  create mode 100644 tools/kvm/util/util.c
4384  create mode 100644 tools/kvm/virtio/9p-pdu.c
4385  create mode 100644 tools/kvm/virtio/9p.c
4386  create mode 100644 tools/kvm/virtio/balloon.c
4387  create mode 100644 tools/kvm/virtio/blk.c
4388  create mode 100644 tools/kvm/virtio/console.c
4389  create mode 100644 tools/kvm/virtio/core.c
4390  create mode 100644 tools/kvm/virtio/mmio.c
4391  create mode 100644 tools/kvm/virtio/net.c
4392  create mode 100644 tools/kvm/virtio/pci.c
4393  create mode 100644 tools/kvm/virtio/rng.c
4394  create mode 100644 tools/kvm/virtio/scsi.c
4395  create mode 100644 tools/kvm/x86/bios.c
4396  create mode 100644 tools/kvm/x86/bios/.gitignore
4397  create mode 100644 tools/kvm/x86/bios/bios-rom.S
4398  create mode 100644 tools/kvm/x86/bios/e820.c
4399  create mode 100644 tools/kvm/x86/bios/entry.S
4400  create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
4401  create mode 100644 tools/kvm/x86/bios/int10.c
4402  create mode 100644 tools/kvm/x86/bios/int15.c
4403  create mode 100644 tools/kvm/x86/bios/local.S
4404  create mode 100644 tools/kvm/x86/bios/macro.S
4405  create mode 100644 tools/kvm/x86/bios/memcpy.c
4406  create mode 100644 tools/kvm/x86/bios/rom.ld.S
4407  create mode 100644 tools/kvm/x86/boot.c
4408  create mode 100644 tools/kvm/x86/cpuid.c
4409  create mode 100644 tools/kvm/x86/include/kvm/assembly.h
4410  create mode 100644 tools/kvm/x86/include/kvm/barrier.h
4411  create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
4412  create mode 100644 tools/kvm/x86/include/kvm/bios.h
4413  create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
4414  create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
4415  create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
4416  create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
4417  create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
4418  create mode 100644 tools/kvm/x86/include/kvm/mptable.h
4419  create mode 100644 tools/kvm/x86/interrupt.c
4420  create mode 100644 tools/kvm/x86/ioport.c
4421  create mode 100644 tools/kvm/x86/irq.c
4422  create mode 100644 tools/kvm/x86/kvm-cpu.c
4423  create mode 100644 tools/kvm/x86/kvm.c
4424  create mode 100644 tools/kvm/x86/mptable.c
4425 Merging rcu/rcu/next (a4fbe35 rcu: Grace-period initialization excludes only RCU notifier)
4426 $ git merge rcu/rcu/next
4427 Merge made by the 'recursive' strategy.
4428  kernel/rcutree.c |   21 ++++++++++-----------
4429  kernel/rcutree.h |    6 ++++++
4430  2 files changed, 16 insertions(+), 11 deletions(-)
4431 Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
4432 $ git merge cputime/cputime
4433 Already up-to-date.
4434 Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
4435 $ git merge uprobes/for-next
4436 Already up-to-date.
4437 Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
4438 $ git merge kmemleak/kmemleak
4439 Recorded preimage for 'mm/kmemleak.c'
4440 Auto-merging mm/kmemleak.c
4441 CONFLICT (content): Merge conflict in mm/kmemleak.c
4442 Automatic merge failed; fix conflicts and then commit the result.
4443 $ git commit -v -a
4444 Recorded resolution for 'mm/kmemleak.c'.
4445 [master 3775d54] Merge remote-tracking branch 'kmemleak/kmemleak'
4446 $ git diff -M --stat --summary HEAD^..
4447 Merging kvm/linux-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
4448 $ git merge kvm/linux-next
4449 Already up-to-date.
4450 Merging kvm-ppc/kvm-ppc-next (2c4eb8b KVM: PPC: Move mtspr/mfspr emulation into own functions)
4451 $ git merge kvm-ppc/kvm-ppc-next
4452 Auto-merging include/linux/kvm_host.h
4453 Auto-merging drivers/tty/Kconfig
4454 Auto-merging arch/powerpc/sysdev/fsl_msi.c
4455 Auto-merging arch/powerpc/kvm/trace.h
4456 Auto-merging arch/powerpc/kvm/book3s_hv.c
4457 Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c
4458 Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c
4459 Auto-merging arch/powerpc/include/asm/kvm_book3s.h
4460 Auto-merging arch/powerpc/include/asm/Kbuild
4461 Merge made by the 'recursive' strategy.
4462  Documentation/virtual/kvm/api.txt           |   52 ++++-
4463  arch/powerpc/include/asm/Kbuild             |    1 +
4464  arch/powerpc/include/asm/epapr_hcalls.h     |   36 +--
4465  arch/powerpc/include/asm/fsl_hcalls.h       |   36 +--
4466  arch/powerpc/include/asm/kvm.h              |   59 +++++
4467  arch/powerpc/include/asm/kvm_book3s.h       |    2 +-
4468  arch/powerpc/include/asm/kvm_booke_hv_asm.h |    4 +-
4469  arch/powerpc/include/asm/kvm_host.h         |   38 ++-
4470  arch/powerpc/include/asm/kvm_para.h         |   21 +-
4471  arch/powerpc/include/asm/kvm_ppc.h          |   64 ++++-
4472  arch/powerpc/include/asm/reg_booke.h        |    7 +
4473  arch/powerpc/kernel/epapr_hcalls.S          |   28 +++
4474  arch/powerpc/kernel/epapr_paravirt.c        |   11 +-
4475  arch/powerpc/kernel/kvm.c                   |    2 +-
4476  arch/powerpc/kernel/ppc_ksyms.c             |    5 +
4477  arch/powerpc/kvm/44x.c                      |    1 +
4478  arch/powerpc/kvm/44x_emulate.c              |  112 +++++----
4479  arch/powerpc/kvm/Kconfig                    |    3 +
4480  arch/powerpc/kvm/book3s.c                   |  125 ++++++++++
4481  arch/powerpc/kvm/book3s_32_mmu_host.c       |    1 +
4482  arch/powerpc/kvm/book3s_64_mmu_host.c       |    1 +
4483  arch/powerpc/kvm/book3s_64_mmu_hv.c         |   65 ++++--
4484  arch/powerpc/kvm/book3s_hv.c                |  337 +++++++++++++++++++++------
4485  arch/powerpc/kvm/book3s_hv_builtin.c        |    4 +-
4486  arch/powerpc/kvm/book3s_hv_rm_mmu.c         |    4 +-
4487  arch/powerpc/kvm/book3s_mmu_hpte.c          |    5 -
4488  arch/powerpc/kvm/book3s_pr.c                |  180 ++++++++++----
4489  arch/powerpc/kvm/book3s_rmhandlers.S        |   15 +-
4490  arch/powerpc/kvm/booke.c                    |  310 ++++++++++++++++++++----
4491  arch/powerpc/kvm/booke_emulate.c            |   22 +-
4492  arch/powerpc/kvm/e500.h                     |    3 +-
4493  arch/powerpc/kvm/e500_tlb.c                 |   92 ++++++--
4494  arch/powerpc/kvm/emulate.c                  |  221 ++++++++++--------
4495  arch/powerpc/kvm/powerpc.c                  |  150 ++++++++++--
4496  arch/powerpc/kvm/trace.h                    |  200 +++++++++++++---
4497  arch/powerpc/platforms/Kconfig              |    1 +
4498  arch/powerpc/sysdev/fsl_msi.c               |    9 +-
4499  arch/powerpc/sysdev/fsl_soc.c               |    2 +
4500  drivers/tty/Kconfig                         |    1 +
4501  drivers/virt/Kconfig                        |    1 +
4502  include/linux/kvm.h                         |   10 +-
4503  include/linux/kvm_host.h                    |    1 +
4504  42 files changed, 1760 insertions(+), 482 deletions(-)
4505 Merging oprofile/for-next (61bccf1 oprofile: Remove 'WQ on CPUx, prefer CPUy' warning)
4506 $ git merge oprofile/for-next
4507 Already up-to-date.
4508 Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
4509 $ git merge xen/upstream/xen
4510 Already up-to-date.
4511 Merging xen-two/linux-next (8825f04 Merge branch 'stable/for-linus-3.7' into linux-next)
4512 $ git merge xen-two/linux-next
4513 Merge made by the 'recursive' strategy.
4514  drivers/net/xen-netback/netback.c  |   11 ++++++--
4515  drivers/xen/grant-table.c          |   53 ------------------------------------
4516  drivers/xen/xenbus/xenbus_client.c |    6 ++--
4517  include/xen/grant_table.h          |   12 --------
4518  4 files changed, 12 insertions(+), 70 deletions(-)
4519 $ git am -3 ../patches/0001-The-Xen-tree-tries-to-add-a-line-to.patch
4520 Applying: The Xen tree tries to add a line to arch/arm/mach-vexpress/Makefile.boot that has been removed by the following commit in Linus' master:
4521 Using index info to reconstruct a base tree...
4522 M       arch/arm/boot/dts/Makefile
4523 Falling back to patching base and 3-way merge...
4524 No changes -- Patch already applied.
4525 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
4526 $ git merge xen-pvhvm/linux-next
4527 Already up-to-date.
4528 Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
4529 $ git merge percpu/for-next
4530 Already up-to-date.
4531 Merging workqueues/for-next (2b0f620 Merge branch 'for-3.7' into for-next)
4532 $ git merge workqueues/for-next
4533 Already up-to-date!
4534 Merge made by the 'recursive' strategy.
4535 Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
4536 $ git merge drivers-x86/linux-next
4537 Auto-merging drivers/platform/x86/asus-wmi.c
4538 Merge made by the 'recursive' strategy.
4539  drivers/platform/x86/asus-wmi.c |   76 +++++++++++++++++++++++++++++++++++++++
4540  1 file changed, 76 insertions(+)
4541 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
4542 $ git merge hwpoison/hwpoison
4543 Already up-to-date.
4544 Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
4545 $ git merge sysctl/master
4546 Already up-to-date.
4547 Merging regmap/for-next (613dac3 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/irq' into regmap-next)
4548 $ git merge regmap/for-next
4549 Already up-to-date.
4550 Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
4551 $ git merge hsi/for-next
4552 Already up-to-date.
4553 Merging leds/for-next (2f73c39 leds: add output driver configuration for pca9633 led driver)
4554 $ git merge leds/for-next
4555 Removing include/linux/platform_data/leds-lm3556.h
4556 Auto-merging include/linux/leds.h
4557 Auto-merging drivers/leds/leds-wm8350.c
4558 Removing drivers/leds/leds-lm3556.c
4559 Auto-merging drivers/leds/Makefile
4560 Auto-merging drivers/leds/Kconfig
4561 Merge made by the 'recursive' strategy.
4562  Documentation/leds/leds-lp5523.txt         |   21 +-
4563  drivers/leds/Kconfig                       |   26 +-
4564  drivers/leds/Makefile                      |    3 +-
4565  drivers/leds/led-class.c                   |   15 +
4566  drivers/leds/led-core.c                    |   16 +-
4567  drivers/leds/led-triggers.c                |   17 +-
4568  drivers/leds/leds-clevo-mail.c             |   10 +-
4569  drivers/leds/leds-gpio.c                   |   19 +-
4570  drivers/leds/leds-lm3530.c                 |   16 +-
4571  drivers/leds/leds-lm3556.c                 |  512 -------------------------
4572  drivers/leds/leds-lm355x.c                 |  572 ++++++++++++++++++++++++++++
4573  drivers/leds/leds-lm3642.c                 |  462 ++++++++++++++++++++++
4574  drivers/leds/leds-lp5523.c                 |   75 ++--
4575  drivers/leds/leds-pca9633.c                |   19 +-
4576  drivers/leds/leds-wm8350.c                 |   29 +-
4577  drivers/leds/leds.h                        |    2 +
4578  include/linux/leds-lp5523.h                |    1 +
4579  include/linux/leds.h                       |    4 +
4580  include/linux/platform_data/leds-lm3556.h  |   50 ---
4581  include/linux/platform_data/leds-lm355x.h  |   66 ++++
4582  include/linux/platform_data/leds-lm3642.h  |   38 ++
4583  include/linux/platform_data/leds-pca9633.h |   35 ++
4584  22 files changed, 1350 insertions(+), 658 deletions(-)
4585  delete mode 100644 drivers/leds/leds-lm3556.c
4586  create mode 100644 drivers/leds/leds-lm355x.c
4587  create mode 100644 drivers/leds/leds-lm3642.c
4588  delete mode 100644 include/linux/platform_data/leds-lm3556.h
4589  create mode 100644 include/linux/platform_data/leds-lm355x.h
4590  create mode 100644 include/linux/platform_data/leds-lm3642.h
4591  create mode 100644 include/linux/platform_data/leds-pca9633.h
4592 Merging driver-core/driver-core-next (e0f21e6 memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl())
4593 $ git merge driver-core/driver-core-next
4594 Already up-to-date.
4595 Merging tty/tty-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
4596 $ git merge tty/tty-next
4597 Already up-to-date.
4598 Merging usb/usb-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
4599 $ git merge usb/usb-next
4600 Already up-to-date.
4601 Merging staging/staging-next (e187895 staging: comedi: jr3_pci: fix iomem dereference)
4602 $ git merge staging/staging-next
4603 Already up-to-date.
4604 Merging char-misc/char-misc-next (5dc2db0 drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init)
4605 $ git merge char-misc/char-misc-next
4606 Already up-to-date.
4607 Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
4608 $ git merge tmem/linux-next
4609 Auto-merging include/xen/xen.h
4610 Auto-merging include/xen/interface/xen.h
4611 Auto-merging arch/x86/xen/smp.c
4612 Auto-merging arch/x86/xen/setup.c
4613 Auto-merging arch/x86/include/asm/xen/page.h
4614 Auto-merging arch/x86/include/asm/xen/interface.h
4615 Merge made by the 'recursive' strategy.
4616  arch/x86/include/asm/xen/interface.h |    3 ++-
4617  arch/x86/include/asm/xen/page.h      |    3 +++
4618  arch/x86/xen/setup.c                 |   13 +++++++++---
4619  arch/x86/xen/smp.c                   |   39 ++++++++++++++++++----------------
4620  drivers/xen/cpu_hotplug.c            |    3 ++-
4621  include/xen/interface/xen.h          |    1 +
4622  include/xen/xen.h                    |    4 ++++
4623  7 files changed, 43 insertions(+), 23 deletions(-)
4624 Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
4625 $ git merge writeback/writeback-for-next
4626 Auto-merging fs/fs-writeback.c
4627 Merge made by the 'recursive' strategy.
4628  fs/fs-writeback.c   |    2 +-
4629  mm/backing-dev.c    |   50 ++++++++++++++++++++++++++------------------------
4630  mm/page-writeback.c |   14 +++++++++++---
4631  3 files changed, 38 insertions(+), 28 deletions(-)
4632 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
4633 $ git merge arm-dt/devicetree/arm-next
4634 Already up-to-date.
4635 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
4636 $ git merge hwspinlock/linux-next
4637 Already up-to-date.
4638 Merging pinctrl/for-next (e1b2dc7 pinctrl: add bcm2835 driver)
4639 $ git merge pinctrl/for-next
4640 Already up-to-date.
4641 Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
4642 $ git merge vhost/linux-next
4643 Resolved 'drivers/net/tun.c' using previous resolution.
4644 Auto-merging drivers/net/tun.c
4645 CONFLICT (content): Merge conflict in drivers/net/tun.c
4646 Automatic merge failed; fix conflicts and then commit the result.
4647 $ git commit -v -a
4648 [master b71637e] Merge remote-tracking branch 'vhost/linux-next'
4649 $ git diff -M --stat --summary HEAD^..
4650 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
4651 $ git merge memblock/memblock-kill-early_node_map
4652 Already up-to-date.
4653 Merging remoteproc/for-next (ed26d19 remoteproc: fix (again) the virtio-related build breakage)
4654 $ git merge remoteproc/for-next
4655 Merge made by the 'recursive' strategy.
4656  drivers/remoteproc/Kconfig |    1 +
4657  1 file changed, 1 insertion(+)
4658 Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
4659 $ git merge irqdomain/irqdomain/next
4660 Already up-to-date.
4661 Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
4662 $ git merge gpio/gpio/next
4663 Already up-to-date.
4664 Merging gpio-lw/for-next (901acf5 gpio: pcf857x: select IRQ_DOMAIN)
4665 $ git merge gpio-lw/for-next
4666 Already up-to-date.
4667 Merging arm-soc/for-next (ab3ee84 Merge branch 'fixes' into for-next)
4668 $ git merge arm-soc/for-next
4669 Auto-merging drivers/mmc/host/sdhci-tegra.c
4670 Auto-merging arch/arm/mach-davinci/da850.c
4671 Auto-merging arch/arm/Kconfig
4672 Merge made by the 'recursive' strategy.
4673  .../brcm,bcm2835-armctrl-ic.txt                    |    2 +-
4674  .../bindings/timer/brcm,bcm2835-system-timer.txt   |    2 +-
4675  arch/arm/Kconfig                                   |    2 -
4676  arch/arm/boot/dts/Makefile                         |   11 ++---
4677  arch/arm/boot/dts/tegra20-seaboard.dts             |    2 +-
4678  arch/arm/boot/dts/tegra20.dtsi                     |    4 +-
4679  arch/arm/mach-at91/pm.c                            |    5 +-
4680  arch/arm/mach-at91/setup.c                         |    2 +-
4681  arch/arm/mach-davinci/da850.c                      |    2 +-
4682  arch/arm/mach-footbridge/include/mach/irqs.h       |    2 -
4683  arch/arm/mach-integrator/include/mach/cm.h         |    2 +-
4684  arch/arm/mach-integrator/include/mach/platform.h   |    6 +--
4685  arch/arm/mach-integrator/integrator_ap.c           |    2 +-
4686  arch/arm/mach-integrator/integrator_cp.c           |    4 +-
4687  arch/arm/mach-iop13xx/iq81340sc.c                  |    2 +-
4688  arch/arm/mach-iop13xx/pci.c                        |    2 +-
4689  arch/arm/mach-ks8695/include/mach/memory.h         |    3 +-
4690  arch/arm/mach-mv78xx0/addr-map.c                   |    2 +-
4691  arch/arm/mach-mv78xx0/common.c                     |    2 +-
4692  arch/arm/mach-pxa/cm-x2xx.c                        |    1 +
4693  arch/arm/mach-pxa/palmte2.c                        |    2 +
4694  arch/arm/mach-pxa/sharpsl_pm.c                     |   48 --------------------
4695  arch/arm/mach-pxa/viper.c                          |    3 +-
4696  arch/arm/mach-rpc/ecard.c                          |    4 +-
4697  arch/arm/mach-s3c24xx/irq-s3c2416.c                |    6 +--
4698  arch/arm/mach-s3c24xx/irq-s3c2443.c                |    4 +-
4699  arch/arm/mach-s3c24xx/simtec-usb.c                 |    2 +-
4700  arch/arm/mach-sa1100/assabet.c                     |    2 +-
4701  arch/arm/mach-shark/pci.c                          |    2 +-
4702  arch/arm/mach-shmobile/include/mach/common.h       |    2 +-
4703  arch/arm/mach-tegra/Kconfig                        |    6 +--
4704  arch/arm/mach-ux500/Kconfig                        |    4 +-
4705  arch/arm/mach-vt8500/include/mach/uncompress.h     |    8 ++--
4706  arch/arm/mach-vt8500/vt8500.c                      |    5 +-
4707  drivers/char/ds1620.c                              |    8 ++--
4708  drivers/char/nwflash.c                             |    4 +-
4709  drivers/mmc/host/sdhci-tegra.c                     |    1 -
4710  sound/oss/waveartist.c                             |    4 +-
4711  38 files changed, 62 insertions(+), 113 deletions(-)
4712 Merging ep93xx/ep93xx-for-next (70f0f7c Merge branch 'ep93xx-fixes' into ep93xx-for-next)
4713 $ git merge ep93xx/ep93xx-for-next
4714 Already up-to-date!
4715 Merge made by the 'recursive' strategy.
4716 Merging ixp4xx/next (2346020 IXP4xx: map CPU config registers within VMALLOC region.)
4717 $ git merge ixp4xx/next
4718 Resolved 'arch/arm/mach-ixp4xx/common.c' using previous resolution.
4719 Resolved 'arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h' using previous resolution.
4720 Auto-merging drivers/crypto/Kconfig
4721 Auto-merging drivers/char/hw_random/Kconfig
4722 Auto-merging arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
4723 CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
4724 Auto-merging arch/arm/mach-ixp4xx/common.c
4725 CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/common.c
4726 Automatic merge failed; fix conflicts and then commit the result.
4727 $ git commit -v -a
4728 [master ce4808b] Merge remote-tracking branch 'ixp4xx/next'
4729 $ git diff -M --stat --summary HEAD^..
4730  arch/arm/common/dmabounce.c                     |    4 +-
4731  arch/arm/mach-ixp4xx/common-pci.c               |    1 +
4732  arch/arm/mach-ixp4xx/common.c                   |   13 +++----
4733  arch/arm/mach-ixp4xx/goramo_mlr.c               |    3 +-
4734  arch/arm/mach-ixp4xx/include/mach/debug-macro.S |    4 +-
4735  arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h |   46 ++++++++++-------------
4736  arch/arm/mach-ixp4xx/include/mach/qmgr.h        |   12 +++---
4737  arch/arm/mach-ixp4xx/ixp4xx_npe.c               |    9 ++++-
4738  arch/arm/mach-ixp4xx/ixp4xx_qmgr.c              |   14 +------
4739  drivers/char/hw_random/Kconfig                  |    6 +--
4740  drivers/char/hw_random/ixp4xx-rng.c             |    5 ++-
4741  drivers/crypto/Kconfig                          |    2 +-
4742  drivers/crypto/ixp4xx_crypto.c                  |   12 +++---
4743  drivers/net/wan/ixp4xx_hss.c                    |    2 +-
4744  14 files changed, 62 insertions(+), 71 deletions(-)
4745 Merging msm/for-next (a0d271c Linux 3.6)
4746 $ git merge msm/for-next
4747 Already up-to-date.
4748 Merging renesas/next (b681273 Merge branch 'heads/boards' into next)
4749 $ git merge renesas/next
4750 Resolved 'arch/arm/Kconfig' using previous resolution.
4751 Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
4752 Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c
4753 Auto-merging arch/arm/mach-shmobile/include/mach/sh7372.h
4754 Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
4755 Auto-merging arch/arm/configs/kzm9g_defconfig
4756 Auto-merging arch/arm/Kconfig
4757 CONFLICT (content): Merge conflict in arch/arm/Kconfig
4758 Automatic merge failed; fix conflicts and then commit the result.
4759 $ git commit -v -a
4760 [master e70863f] Merge remote-tracking branch 'renesas/next'
4761 $ git diff -M --stat --summary HEAD^..
4762  arch/arm/Kconfig                             |    9 +++++++++
4763  arch/arm/configs/armadillo800eva_defconfig   |    1 +
4764  arch/arm/configs/kzm9g_defconfig             |    4 ++++
4765  arch/arm/configs/mackerel_defconfig          |   18 ++++++++++++++++--
4766  arch/arm/mach-shmobile/board-kzm9g.c         |   14 +++++++++++++-
4767  arch/arm/mach-shmobile/include/mach/sh7372.h |    4 ++++
4768  arch/arm/mach-shmobile/setup-r8a7740.c       |   16 ++++++++++++++++
4769  arch/arm/mach-shmobile/setup-sh7372.c        |   20 ++++++++++++++++++++
4770  arch/arm/mm/proc-v7-2level.S                 |    8 ++++++++
4771  9 files changed, 91 insertions(+), 3 deletions(-)
4772 Merging samsung/for-next (59e65fd Merge branch 'next/dt-samsung-new' into for-next)
4773 $ git merge samsung/for-next
4774 Resolved 'arch/arm/mach-exynos/clock-exynos5.c' using previous resolution.
4775 Auto-merging arch/arm/mach-exynos/clock-exynos5.c
4776 CONFLICT (content): Merge conflict in arch/arm/mach-exynos/clock-exynos5.c
4777 Automatic merge failed; fix conflicts and then commit the result.
4778 $ git commit -v -a
4779 [master 0f07345] Merge remote-tracking branch 'samsung/for-next'
4780 $ git diff -M --stat --summary HEAD^..
4781 Merging tegra/for-next (979570e Linux 3.6-rc7)
4782 $ git merge tegra/for-next
4783 Already up-to-date.
4784 Merging kvmtool/master (5fd2a45 kvm tools: Drop lchown() calls from 9p)
4785 $ git merge kvmtool/master
4786 Merge made by the 'recursive' strategy.
4787  tools/kvm/powerpc/ioport.c       |    2 +-
4788  tools/kvm/powerpc/irq.c          |   19 -------------------
4789  tools/kvm/powerpc/kvm-cpu.c      |    3 ---
4790  tools/kvm/powerpc/kvm.c          |    8 ++++----
4791  tools/kvm/powerpc/spapr_hvcons.c |    6 +++---
4792  tools/kvm/powerpc/spapr_rtas.c   |   14 +++++++++-----
4793  tools/kvm/powerpc/xics.c         |   38 +++++++++++++++++++++++---------------
4794  tools/kvm/powerpc/xics.h         |    5 -----
4795  tools/kvm/virtio/9p.c            |   16 ----------------
4796  9 files changed, 40 insertions(+), 71 deletions(-)
4797 Merging dma-mapping/dma-mapping-next (461b6f0 Merge branch 'next-cleanup' into for-v3.7)
4798 $ git merge dma-mapping/dma-mapping-next
4799 Already up-to-date.
4800 Merging pwm/for-next (85f8879 pwm: dt: Fix description of second PWM cell)
4801 $ git merge pwm/for-next
4802 Auto-merging drivers/pwm/pwm-ab8500.c
4803 Auto-merging drivers/pwm/Makefile
4804 Auto-merging drivers/pwm/Kconfig
4805 Auto-merging drivers/misc/Kconfig
4806 Removing arch/unicore32/kernel/pwm.c
4807 Auto-merging arch/unicore32/Kconfig
4808 Removing arch/mips/jz4740/timer.h
4809 Removing arch/mips/jz4740/pwm.c
4810 Auto-merging Documentation/devicetree/bindings/pwm/mxs-pwm.txt
4811 Merge made by the 'recursive' strategy.
4812  Documentation/devicetree/bindings/pwm/imx-pwm.txt  |   17 ++
4813  Documentation/devicetree/bindings/pwm/mxs-pwm.txt  |    2 +-
4814  .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt |    2 +-
4815  Documentation/driver-model/devres.txt              |    4 +
4816  Documentation/pwm.txt                              |    3 +-
4817  arch/mips/include/asm/mach-jz4740/platform.h       |    1 +
4818  arch/mips/include/asm/mach-jz4740/timer.h          |  113 ++++++++
4819  arch/mips/jz4740/Kconfig                           |    3 -
4820  arch/mips/jz4740/Makefile                          |    2 +-
4821  arch/mips/jz4740/board-qi_lb60.c                   |    1 +
4822  arch/mips/jz4740/platform.c                        |    6 +
4823  arch/mips/jz4740/pwm.c                             |  177 -------------
4824  arch/mips/jz4740/time.c                            |    2 +-
4825  arch/mips/jz4740/timer.c                           |    4 +-
4826  arch/mips/jz4740/timer.h                           |  136 ----------
4827  arch/unicore32/Kconfig                             |   12 +-
4828  arch/unicore32/include/mach/regs-ost.h             |   18 +-
4829  arch/unicore32/kernel/Makefile                     |    1 -
4830  arch/unicore32/kernel/pwm.c                        |  263 ------------------
4831  drivers/misc/Kconfig                               |   10 -
4832  drivers/misc/Makefile                              |    1 -
4833  drivers/pwm/Kconfig                                |   29 +-
4834  drivers/pwm/Makefile                               |    3 +
4835  drivers/pwm/core.c                                 |   82 +++++-
4836  drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c}    |  116 ++++----
4837  drivers/pwm/pwm-bfin.c                             |    3 -
4838  drivers/pwm/pwm-imx.c                              |  278 +++++++++++++-------
4839  drivers/pwm/pwm-jz4740.c                           |  221 ++++++++++++++++
4840  drivers/pwm/pwm-puv3.c                             |  161 ++++++++++++
4841  drivers/pwm/pwm-pxa.c                              |    3 -
4842  drivers/pwm/pwm-samsung.c                          |    3 -
4843  drivers/pwm/pwm-tiecap.c                           |   24 +-
4844  drivers/pwm/pwm-tiehrpwm.c                         |   75 ++++--
4845  drivers/video/backlight/pwm_bl.c                   |    7 +-
4846  include/linux/pwm.h                                |  108 +++++++-
4847  35 files changed, 1069 insertions(+), 822 deletions(-)
4848  create mode 100644 Documentation/devicetree/bindings/pwm/imx-pwm.txt
4849  delete mode 100644 arch/mips/jz4740/pwm.c
4850  delete mode 100644 arch/mips/jz4740/timer.h
4851  delete mode 100644 arch/unicore32/kernel/pwm.c
4852  rename drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} (52%)
4853  create mode 100644 drivers/pwm/pwm-jz4740.c
4854  create mode 100644 drivers/pwm/pwm-puv3.c
4855 Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
4856 $ git merge dma-buf/for-next
4857 Auto-merging drivers/base/dma-buf.c
4858 Merge made by the 'recursive' strategy.
4859  drivers/base/dma-buf.c |    2 ++
4860  1 file changed, 2 insertions(+)
4861 Merging userns/for-next (f3d94c2 userns: Fix posix_acl_file_xattr_userns gid conversion)
4862 $ git merge userns/for-next
4863 Auto-merging net/bluetooth/af_bluetooth.c
4864 Merge made by the 'recursive' strategy.
4865  fs/xattr_acl.c               |    2 +-
4866  net/bluetooth/af_bluetooth.c |    2 +-
4867  2 files changed, 2 insertions(+), 2 deletions(-)
4868 Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
4869 $ git merge ktest/for-next
4870 Already up-to-date.
4871 Merging signal/for-next (12f79be alpha: don't open-code trace_report_syscall_{enter,exit})
4872 $ git merge signal/for-next
4873 Auto-merging kernel/sched/core.c
4874 Auto-merging kernel/fork.c
4875 Auto-merging include/linux/sched.h
4876 Auto-merging include/linux/ptrace.h
4877 Auto-merging include/linux/compat.h
4878 Auto-merging include/linux/binfmts.h
4879 Auto-merging fs/exec.c
4880 CONFLICT (content): Merge conflict in fs/exec.c
4881 Auto-merging fs/binfmt_elf_fdpic.c
4882 Auto-merging fs/binfmt_elf.c
4883 Removing arch/xtensa/include/asm/exec.h
4884 Auto-merging arch/xtensa/include/asm/Kbuild
4885 CONFLICT (content): Merge conflict in arch/xtensa/include/asm/Kbuild
4886 Auto-merging arch/x86/um/sys_call_table_32.c
4887 Auto-merging arch/x86/um/Kconfig
4888 Removing arch/x86/kernel/sys_i386_32.c
4889 Auto-merging arch/x86/kernel/signal.c
4890 CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c
4891 Auto-merging arch/x86/kernel/process_64.c
4892 Auto-merging arch/x86/kernel/process_32.c
4893 CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
4894 Auto-merging arch/x86/kernel/process.c
4895 Auto-merging arch/x86/kernel/entry_64.S
4896 Auto-merging arch/x86/kernel/entry_32.S
4897 Auto-merging arch/x86/kernel/Makefile
4898 Auto-merging arch/x86/include/asm/thread_info.h
4899 Auto-merging arch/x86/include/asm/sys_ia32.h
4900 Auto-merging arch/x86/include/asm/processor.h
4901 Auto-merging arch/x86/ia32/sys_ia32.c
4902 Auto-merging arch/x86/ia32/ia32entry.S
4903 Auto-merging arch/x86/Kconfig
4904 CONFLICT (content): Merge conflict in arch/x86/Kconfig
4905 Removing arch/unicore32/include/asm/exec.h
4906 Auto-merging arch/unicore32/include/asm/Kbuild
4907 Auto-merging arch/um/kernel/syscall.c
4908 Auto-merging arch/um/kernel/process.c
4909 Removing arch/um/kernel/internal.h
4910 Auto-merging arch/um/kernel/exec.c
4911 CONFLICT (content): Merge conflict in arch/um/kernel/exec.c
4912 Auto-merging arch/um/include/asm/processor-generic.h
4913 Auto-merging arch/tile/kernel/compat_signal.c
4914 Removing arch/tile/include/asm/exec.h
4915 Auto-merging arch/tile/include/asm/Kbuild
4916 Removing arch/sparc/include/asm/exec.h
4917 Auto-merging arch/sparc/include/asm/Kbuild
4918 Removing arch/sh/include/asm/exec.h
4919 Auto-merging arch/s390/kernel/process.c
4920 Auto-merging arch/s390/kernel/entry64.S
4921 Auto-merging arch/s390/kernel/compat_wrapper.S
4922 Auto-merging arch/s390/kernel/compat_linux.h
4923 Auto-merging arch/s390/kernel/compat_linux.c
4924 Auto-merging arch/s390/include/asm/unistd.h
4925 Auto-merging arch/s390/include/asm/processor.h
4926 Auto-merging arch/s390/Kconfig
4927 CONFLICT (content): Merge conflict in arch/s390/Kconfig
4928 Auto-merging arch/powerpc/kernel/sys_ppc32.c
4929 Auto-merging arch/powerpc/kernel/process.c
4930 Auto-merging arch/powerpc/kernel/ppc_ksyms.c
4931 Auto-merging arch/powerpc/kernel/entry_64.S
4932 Auto-merging arch/powerpc/kernel/entry_32.S
4933 Auto-merging arch/powerpc/include/asm/unistd.h
4934 Auto-merging arch/powerpc/include/asm/thread_info.h
4935 Auto-merging arch/powerpc/include/asm/processor.h
4936 Auto-merging arch/powerpc/Kconfig
4937 CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
4938 Removing arch/parisc/include/asm/exec.h
4939 Auto-merging arch/parisc/include/asm/Kbuild
4940 Auto-merging arch/mn10300/kernel/process.c
4941 Removing arch/mn10300/kernel/kthread.S
4942 Removing arch/mn10300/kernel/kernel_execve.S
4943 Removing arch/mn10300/include/asm/exec.h
4944 Auto-merging arch/mn10300/include/asm/Kbuild
4945 CONFLICT (content): Merge conflict in arch/mn10300/include/asm/Kbuild
4946 Auto-merging arch/mn10300/Kconfig
4947 CONFLICT (content): Merge conflict in arch/mn10300/Kconfig
4948 Auto-merging arch/mips/include/asm/thread_info.h
4949 Auto-merging arch/microblaze/kernel/signal.c
4950 Removing arch/microblaze/include/asm/exec.h
4951 Auto-merging arch/microblaze/include/asm/Kbuild
4952 CONFLICT (content): Merge conflict in arch/microblaze/include/asm/Kbuild
4953 Auto-merging arch/m68k/kernel/process.c
4954 Removing arch/m68k/include/asm/exec.h
4955 Auto-merging arch/m68k/include/asm/Kbuild
4956 Auto-merging arch/m68k/Kconfig
4957 CONFLICT (content): Merge conflict in arch/m68k/Kconfig
4958 Removing arch/m32r/include/asm/exec.h
4959 Auto-merging arch/m32r/include/asm/Kbuild
4960 CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
4961 Auto-merging arch/ia64/kernel/signal.c
4962 Removing arch/ia64/include/asm/exec.h
4963 Auto-merging arch/ia64/include/asm/Kbuild
4964 CONFLICT (content): Merge conflict in arch/ia64/include/asm/Kbuild
4965 Removing arch/h8300/include/asm/exec.h
4966 Auto-merging arch/h8300/inclRecorded preimage for 'arch/microblaze/include/asm/Kbuild'
4967 Resolved 'arch/alpha/Kconfig' using previous resolution.
4968 Resolved 'arch/arm/Kconfig' using previous resolution.
4969 Resolved 'arch/arm/include/asm/thread_info.h' using previous resolution.
4970 Resolved 'arch/avr32/include/asm/Kbuild' using previous resolution.
4971 Resolved 'arch/c6x/Kconfig' using previous resolution.
4972 Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
4973 Resolved 'arch/frv/include/asm/Kbuild' using previous resolution.
4974 Resolved 'arch/h8300/include/asm/Kbuild' using previous resolution.
4975 Resolved 'arch/ia64/include/asm/Kbuild' using previous resolution.
4976 Resolved 'arch/m32r/include/asm/Kbuild' using previous resolution.
4977 Resolved 'arch/m68k/Kconfig' using previous resolution.
4978 Resolved 'arch/mn10300/Kconfig' using previous resolution.
4979 Resolved 'arch/um/kernel/exec.c' using previous resolution.
4980 Resolved 'arch/x86/Kconfig' using previous resolution.
4981 Resolved 'arch/x86/kernel/process_32.c' using previous resolution.
4982 Resolved 'arch/x86/kernel/signal.c' using previous resolution.
4983 Resolved 'fs/exec.c' using previous resolution.
4984 ude/asm/Kbuild
4985 CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
4986 Auto-merging arch/frv/kernel/process.c
4987 Removing arch/frv/kernel/kernel_thread.S
4988 Removing arch/frv/kernel/kernel_execve.S
4989 Removing arch/frv/include/asm/exec.h
4990 Auto-merging arch/frv/include/asm/Kbuild
4991 CONFLICT (content): Merge conflict in arch/frv/include/asm/Kbuild
4992 Auto-merging arch/frv/Kconfig
4993 Removing arch/cris/include/asm/exec.h
4994 Auto-merging arch/cris/include/asm/Kbuild
4995 CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
4996 Auto-merging arch/c6x/include/uapi/asm/unistd.h
4997 Removing arch/c6x/include/asm/exec.h
4998 Auto-merging arch/c6x/include/asm/Kbuild
4999 Auto-merging arch/c6x/Kconfig
5000 CONFLICT (content): Merge conflict in arch/c6x/Kconfig
5001 Removing arch/avr32/include/asm/exec.h
5002 Auto-merging arch/avr32/include/asm/Kbuild
5003 CONFLICT (content): Merge conflict in arch/avr32/include/asm/Kbuild
5004 Auto-merging arch/arm/kernel/process.c
5005 Auto-merging arch/arm/kernel/entry-common.S
5006 Auto-merging arch/arm/kernel/calls.S
5007 Auto-merging arch/arm/include/asm/unistd.h
5008 Auto-merging arch/arm/include/asm/thread_info.h
5009 CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
5010 Auto-merging arch/arm/include/asm/ptrace.h
5011 Auto-merging arch/arm/Kconfig
5012 CONFLICT (content): Merge conflict in arch/arm/Kconfig
5013 Auto-merging arch/alpha/kernel/process.c
5014 Removing arch/alpha/include/asm/exec.h
5015 Auto-merging arch/alpha/include/asm/Kbuild
5016 Auto-merging arch/alpha/Kconfig
5017 CONFLICT (content): Merge conflict in arch/alpha/Kconfig
5018 Auto-merging arch/Kconfig
5019 Automatic merge failed; fix conflicts and then commit the result.
5020 $ git commit -v -a
5021 Recorded resolution for 'arch/microblaze/include/asm/Kbuild'.
5022 Recorded resolution for 'arch/mn10300/include/asm/Kbuild'.
5023 Recorded resolution for 'arch/powerpc/Kconfig'.
5024 Recorded resolution for 'arch/s390/Kconfig'.
5025 Recorded resolution for 'arch/xtensa/include/asm/Kbuild'.
5026 [master c33f94a] Merge remote-tracking branch 'signal/for-next'
5027 $ git diff -M --stat --summary HEAD^..
5028  arch/Kconfig                              |    3 +
5029  arch/alpha/Kconfig                        |    1 +
5030  arch/alpha/include/asm/Kbuild             |    1 +
5031  arch/alpha/include/asm/exec.h             |    6 --
5032  arch/alpha/include/asm/processor.h        |    3 -
5033  arch/alpha/include/asm/thread_info.h      |    3 +-
5034  arch/alpha/include/asm/unistd.h           |    2 +
5035  arch/alpha/kernel/alpha_ksyms.c           |    3 -
5036  arch/alpha/kernel/entry.S                 |   82 +++++++---------------
5037  arch/alpha/kernel/process.c               |   79 ++++++---------------
5038  arch/alpha/kernel/ptrace.c                |   32 ++++-----
5039  arch/arm/Kconfig                          |    1 +
5040  arch/arm/include/asm/processor.h          |    5 --
5041  arch/arm/include/asm/ptrace.h             |    5 ++
5042  arch/arm/include/asm/system.h             |    1 -
5043  arch/arm/include/asm/thread_info.h        |    2 -
5044  arch/arm/include/asm/unistd.h             |    2 +
5045  arch/arm/kernel/calls.S                   |    2 +-
5046  arch/arm/kernel/entry-common.S            |   29 ++++++--
5047  arch/arm/kernel/process.c                 |   75 ++++----------------
5048  arch/arm/kernel/signal.c                  |    1 -
5049  arch/arm/kernel/sys_arm.c                 |   63 -----------------
5050  arch/avr32/include/asm/Kbuild             |    1 +
5051  arch/avr32/include/asm/exec.h             |   13 ----
5052  arch/avr32/include/asm/thread_info.h      |   18 ++---
5053  arch/avr32/kernel/signal.c                |    1 -
5054  arch/blackfin/include/asm/thread_info.h   |    4 --
5055  arch/blackfin/kernel/signal.c             |    1 -
5056  arch/c6x/Kconfig                          |    1 +
5057  arch/c6x/include/asm/Kbuild               |    1 +
5058  arch/c6x/include/asm/exec.h               |    6 --
5059  arch/c6x/include/asm/processor.h          |    2 -
5060  arch/c6x/include/asm/syscalls.h           |    5 --
5061  arch/c6x/include/asm/thread_info.h        |    1 -
5062  arch/c6x/include/uapi/asm/unistd.h        |    3 +
5063  arch/c6x/kernel/asm-offsets.c             |    1 -
5064  arch/c6x/kernel/entry.S                   |   56 +++++++--------
5065  arch/c6x/kernel/process.c                 |   72 +++----------------
5066  arch/cris/include/asm/Kbuild              |    1 +
5067  arch/cris/include/asm/exec.h              |    6 --
5068  arch/cris/include/asm/thread_info.h       |    3 -
5069  arch/frv/Kconfig                          |    1 +
5070  arch/frv/include/asm/Kbuild               |    2 +
5071  arch/frv/include/asm/exec.h               |   17 -----
5072  arch/frv/include/asm/processor.h          |    9 +--
5073  arch/frv/include/asm/ptrace.h             |    1 +
5074  arch/frv/include/asm/thread_info.h        |    3 -
5075  arch/frv/include/asm/unistd.h             |    2 +
5076  arch/frv/kernel/Makefile                  |    4 +-
5077  arch/frv/kernel/entry.S                   |   13 ++++
5078  arch/frv/kernel/frv_ksyms.c               |    1 -
5079  arch/frv/kernel/kernel_execve.S           |   33 ---------
5080  arch/frv/kernel/kernel_thread.S           |   77 ---------------------
5081  arch/frv/kernel/process.c                 |   66 +++++++-----------
5082  arch/frv/kernel/signal.c                  |    9 ---
5083  arch/h8300/include/asm/Kbuild             |    1 +
5084  arch/h8300/include/asm/exec.h             |    6 --
5085  arch/h8300/include/asm/thread_info.h      |    7 +-
5086  arch/h8300/kernel/signal.c                |    1 -
5087  arch/hexagon/include/asm/thread_info.h    |    5 --
5088  arch/hexagon/kernel/signal.c              |    1 -
5089  arch/hexagon/kernel/syscall.c             |    1 -
5090  arch/ia64/include/asm/Kbuild              |    1 +
5091  arch/ia64/include/asm/exec.h              |   14 ----
5092  arch/ia64/include/asm/thread_info.h       |    2 -
5093  arch/ia64/kernel/signal.c                 |    8 ---
5094  arch/m32r/include/asm/Kbuild              |    1 +
5095  arch/m32r/include/asm/exec.h              |   14 ----
5096  arch/m32r/include/asm/thread_info.h       |    9 +--
5097  arch/m32r/kernel/signal.c                 |    3 -
5098  arch/m68k/Kconfig                         |    1 +
5099  arch/m68k/include/asm/Kbuild              |    1 +
5100  arch/m68k/include/asm/exec.h              |    6 --
5101  arch/m68k/include/asm/processor.h         |   25 ++++---
5102  arch/m68k/include/asm/ptrace.h            |    2 +
5103  arch/m68k/include/asm/unistd.h            |    2 +
5104  arch/m68k/kernel/entry.S                  |   16 +++++
5105  arch/m68k/kernel/process.c                |  104 +++++++---------------------
5106  arch/m68k/kernel/sys_m68k.c               |   17 -----
5107  arch/microblaze/include/asm/Kbuild        |    2 +-
5108  arch/microblaze/include/asm/exec.h        |   14 ----
5109  arch/microblaze/include/asm/thread_info.h |    3 +-
5110  arch/microblaze/kernel/signal.c           |    7 +-
5111  arch/mips/include/asm/thread_info.h       |    3 -
5112  arch/mn10300/Kconfig                      |    1 +
5113  arch/mn10300/include/asm/Kbuild           |    1 +
5114  arch/mn10300/include/asm/exec.h           |   16 -----
5115  arch/mn10300/include/asm/frame.inc        |    2 +-
5116  arch/mn10300/include/asm/processor.h      |   18 +----
5117  arch/mn10300/include/asm/ptrace.h         |    1 +
5118  arch/mn10300/include/asm/thread_info.h    |    3 +-
5119  arch/mn10300/include/asm/unistd.h         |    2 +
5120  arch/mn10300/kernel/Makefile              |    4 +-
5121  arch/mn10300/kernel/entry.S               |   18 +++++
5122  arch/mn10300/kernel/internal.h            |    6 +-
5123  arch/mn10300/kernel/kernel_execve.S       |   37 ----------
5124  arch/mn10300/kernel/kthread.S             |   31 ---------
5125  arch/mn10300/kernel/process.c             |   91 +++++++-----------------
5126  arch/mn10300/kernel/signal.c              |   13 ----
5127  arch/openrisc/include/asm/thread_info.h   |    3 +-
5128  arch/parisc/hpux/gate.S                   |    2 +-
5129  arch/parisc/include/asm/Kbuild            |    1 +
5130  arch/parisc/include/asm/exec.h            |    6 --
5131  arch/parisc/include/asm/thread_info.h     |    5 +-
5132  arch/parisc/kernel/signal.c               |   45 ++++--------
5133  arch/parisc/kernel/syscall.S              |    9 +--
5134  arch/powerpc/Kconfig                      |    1 +
5135  arch/powerpc/include/asm/processor.h      |    3 -
5136  arch/powerpc/include/asm/ptrace.h         |    2 +
5137  arch/powerpc/include/asm/syscalls.h       |    3 -
5138  arch/powerpc/include/asm/thread_info.h    |    2 +
5139  arch/powerpc/include/asm/unistd.h         |    2 +
5140  arch/powerpc/kernel/entry_32.S            |   16 +++++
5141  arch/powerpc/kernel/entry_64.S            |   16 +++++
5142  arch/powerpc/kernel/misc.S                |    7 --
5143  arch/powerpc/kernel/misc_32.S             |   33 ---------
5144  arch/powerpc/kernel/misc_64.S             |   34 ---------
5145  arch/powerpc/kernel/ppc_ksyms.c           |    1 -
5146  arch/powerpc/kernel/process.c             |   59 ++++++++--------
5147  arch/powerpc/kernel/signal_32.c           |    1 -
5148  arch/powerpc/kernel/sys_ppc32.c           |   22 ------
5149  arch/s390/Kconfig                         |    1 +
5150  arch/s390/include/asm/processor.h         |    4 +-
5151  arch/s390/include/asm/thread_info.h       |    4 --
5152  arch/s390/include/asm/unistd.h            |    2 +
5153  arch/s390/kernel/compat_linux.c           |   26 -------
5154  arch/s390/kernel/compat_linux.h           |    2 -
5155  arch/s390/kernel/compat_wrapper.S         |    2 +-
5156  arch/s390/kernel/entry.S                  |   51 ++++++--------
5157  arch/s390/kernel/entry.h                  |    3 -
5158  arch/s390/kernel/entry64.S                |   50 ++++++--------
5159  arch/s390/kernel/process.c                |  107 +++++++++--------------------
5160  arch/score/include/asm/thread_info.h      |    4 --
5161  arch/score/kernel/signal.c                |    1 +
5162  arch/sh/include/asm/Kbuild                |    1 +
5163  arch/sh/include/asm/exec.h                |   10 ---
5164  arch/sh/include/asm/thread_info.h         |    3 +
5165  arch/sh/kernel/signal_32.c                |    1 -
5166  arch/sh/kernel/signal_64.c                |    1 -
5167  arch/sparc/include/asm/Kbuild             |    1 +
5168  arch/sparc/include/asm/exec.h             |    6 --
5169  arch/sparc/include/asm/thread_info_32.h   |    3 +-
5170  arch/sparc/include/asm/thread_info_64.h   |    3 +
5171  arch/tile/include/asm/Kbuild              |    1 +
5172  arch/tile/include/asm/exec.h              |   20 ------
5173  arch/tile/kernel/compat_signal.c          |    9 ---
5174  arch/tile/kernel/signal.c                 |   12 +---
5175  arch/um/include/asm/processor-generic.h   |    2 -
5176  arch/um/include/asm/thread_info.h         |    3 -
5177  arch/um/kernel/exec.c                     |   25 +------
5178  arch/um/kernel/internal.h                 |    1 -
5179  arch/um/kernel/process.c                  |   17 +----
5180  arch/um/kernel/syscall.c                  |   17 -----
5181  arch/unicore32/include/asm/Kbuild         |    1 +
5182  arch/unicore32/include/asm/exec.h         |   15 ----
5183  arch/unicore32/include/asm/thread_info.h  |    4 +-
5184  arch/unicore32/kernel/entry.S             |    2 -
5185  arch/unicore32/kernel/signal.c            |    1 -
5186  arch/unicore32/kernel/sys.c               |    1 -
5187  arch/x86/Kconfig                          |    1 +
5188  arch/x86/ia32/ia32entry.S                 |    2 +-
5189  arch/x86/ia32/sys_ia32.c                  |   15 ----
5190  arch/x86/include/asm/processor.h          |    5 --
5191  arch/x86/include/asm/sys_ia32.h           |    2 -
5192  arch/x86/include/asm/syscalls.h           |    2 +-
5193  arch/x86/include/asm/thread_info.h        |    2 -
5194  arch/x86/include/asm/unistd.h             |    2 +
5195  arch/x86/kernel/Makefile                  |    2 +-
5196  arch/x86/kernel/asm-offsets.c             |    3 +
5197  arch/x86/kernel/entry_32.S                |   43 +++++++-----
5198  arch/x86/kernel/entry_64.S                |   74 +++++++-------------
5199  arch/x86/kernel/process.c                 |   65 ------------------
5200  arch/x86/kernel/process_32.c              |   37 ++++++++--
5201  arch/x86/kernel/process_64.c              |   35 ++++++----
5202  arch/x86/kernel/signal.c                  |    4 --
5203  arch/x86/kernel/sys_i386_32.c             |   40 -----------
5204  arch/x86/kernel/vm86_32.c                 |    6 +-
5205  arch/x86/syscalls/syscall_32.tbl          |    2 +-
5206  arch/x86/um/Kconfig                       |    1 +
5207  arch/x86/um/sys_call_table_32.c           |    1 -
5208  arch/xtensa/include/asm/Kbuild            |    1 +
5209  arch/xtensa/include/asm/exec.h            |   14 ----
5210  arch/xtensa/include/asm/thread_info.h     |    5 --
5211  arch/xtensa/kernel/signal.c               |    4 --
5212  fs/binfmt_elf.c                           |    1 -
5213  fs/binfmt_elf_fdpic.c                     |    1 -
5214  fs/exec.c                                 |   61 ++++++++++++++--
5215  include/linux/binfmts.h                   |    6 ++
5216  include/linux/compat.h                    |    8 ++-
5217  include/linux/ptrace.h                    |    4 ++
5218  include/linux/sched.h                     |    3 +
5219  kernel/fork.c                             |   13 +++-
5220  kernel/sched/core.c                       |    2 +-
5221  193 files changed, 733 insertions(+), 1780 deletions(-)
5222  delete mode 100644 arch/alpha/include/asm/exec.h
5223  delete mode 100644 arch/avr32/include/asm/exec.h
5224  delete mode 100644 arch/c6x/include/asm/exec.h
5225  delete mode 100644 arch/cris/include/asm/exec.h
5226  delete mode 100644 arch/frv/include/asm/exec.h
5227  delete mode 100644 arch/frv/kernel/kernel_execve.S
5228  delete mode 100644 arch/frv/kernel/kernel_thread.S
5229  delete mode 100644 arch/h8300/include/asm/exec.h
5230  delete mode 100644 arch/ia64/include/asm/exec.h
5231  delete mode 100644 arch/m32r/include/asm/exec.h
5232  delete mode 100644 arch/m68k/include/asm/exec.h
5233  delete mode 100644 arch/microblaze/include/asm/exec.h
5234  delete mode 100644 arch/mn10300/include/asm/exec.h
5235  delete mode 100644 arch/mn10300/kernel/kernel_execve.S
5236  delete mode 100644 arch/mn10300/kernel/kthread.S
5237  delete mode 100644 arch/parisc/include/asm/exec.h
5238  delete mode 100644 arch/sh/include/asm/exec.h
5239  delete mode 100644 arch/sparc/include/asm/exec.h
5240  delete mode 100644 arch/tile/include/asm/exec.h
5241  delete mode 100644 arch/um/kernel/internal.h
5242  delete mode 100644 arch/unicore32/include/asm/exec.h
5243  delete mode 100644 arch/x86/kernel/sys_i386_32.c
5244  delete mode 100644 arch/xtensa/include/asm/exec.h
5245 Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
5246 $ git merge clk/clk-next
5247 Already up-to-date.
5248 Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
5249 $ git merge random/dev
5250 Already up-to-date.
5251 Merging lzo-update/lzo-update (5f70278 lib/lzo: Optimize code for CPUs with inefficient unaligned access)
5252 $ git merge lzo-update/lzo-update
5253 Removing lib/lzo/lzo1x_decompress.c
5254 Merge made by the 'recursive' strategy.
5255  include/linux/lzo.h             |   15 +-
5256  lib/lzo/Makefile                |    2 +-
5257  lib/lzo/lzo1x_compress.c        |  309 +++++++++++++++++++++------------------
5258  lib/lzo/lzo1x_decompress.c      |  255 --------------------------------
5259  lib/lzo/lzo1x_decompress_safe.c |  237 ++++++++++++++++++++++++++++++
5260  lib/lzo/lzodefs.h               |   34 ++++-
5261  6 files changed, 441 insertions(+), 411 deletions(-)
5262  delete mode 100644 lib/lzo/lzo1x_decompress.c
5263  create mode 100644 lib/lzo/lzo1x_decompress_safe.c
5264 Merging scsi-post-merge/merge-base:master ()
5265 $ git clone -s -l -n -q . ../rebase-tmp
5266 $ cd ../rebase-tmp
5267 $ git fetch --no-tags ../next refs/heads/akpm/master:akpm
5268 From ../next
5269  * [new branch]      akpm/master -> akpm
5270 $ git fetch --no-tags ../next refs/heads/akpm/base:akpm-base
5271 From ../next
5272  * [new branch]      akpm/base  -> akpm-base
5273 $ git checkout akpm
5274 Switched to branch 'akpm'
5275 $ git rebase --onto master akpm-base
5276 First, rewinding head to replay your work on top of it...
5277 Applying: CRIS: Fix I/O macros
5278 Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
5279 Applying: vfs: d_obtain_alias() needs to use "/" as default name.
5280 Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
5281 Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
5282 Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
5283 Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
5284 Applying: acpi_memhotplug.c: remove memory info from list before freeing it
5285 Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
5286 Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
5287 Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
5288 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
5289 Applying: x86 numa: don't check if node is NUMA_NO_NODE
5290 Applying: arch/x86/tools/insn_sanity.c: identify source of messages
5291 Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
5292 Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
5293 Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
5294 Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
5295 Applying: timeconst.pl: remove deprecated defined(@array)
5296 Applying: time: don't inline EXPORT_SYMBOL functions
5297 Applying: compiler-gcc4.h: correct verion check for __compiletime_error
5298 Applying: h8300: select generic atomic64_t support
5299 Using index info to reconstruct a base tree...
5300 M       arch/h8300/Kconfig
5301 Falling back to patching base and 3-way merge...
5302 Auto-merging arch/h8300/Kconfig
5303 CONFLICT (content): Merge conflict in arch/h8300/Kconfig
5304 Failed to merge in the changes.
5305 Patch failed at 0022 h8300: select generic atomic64_t support
5306
5307 When you have resolved this problem run "git rebase --continue".
5308 If you would prefer to skip this patch, instead run "git rebase --skip".
5309 To check out the original branch and stop rebasing run "git rebase --abort".
5310
5311 $ git rebase --continue
5312 Applying: cciss: cleanup bitops usage
5313 Applying: cciss: use check_signature()
5314 Applying: block: store partition_meta_info.uuid as a string
5315 Applying: init: reduce PARTUUID min length to 1 from 36
5316 Applying: block: partition: msdos: provide UUIDs for partitions
5317 Applying: drbd: use copy_highpage
5318 Applying: vfs: increment iversion when a file is truncated
5319 Applying: fs: change return values from -EACCES to -EPERM
5320 Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
5321 Applying: mm/page_alloc.c: remove duplicate check
5322 Applying: swap: add a simple detector for inappropriate swapin readahead
5323 Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
5324 Applying: mm/memblock: reduce overhead in binary search
5325 Applying: KSM: numa awareness sysfs knob
5326 Applying: score: select generic atomic64_t support
5327 Applying: pwm_backlight: add device tree support for Low Threshold Brightness
5328 Applying: pwm_backlight-add-device-tree-support-for-low-threshold-brightness-fix
5329 Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
5330 Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
5331 Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
5332 Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
5333 Applying: hfsplus: add on-disk layout declarations related to attributes tree
5334 Applying: hfsplus: add functionality of manipulating by records in attributes tree
5335 Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
5336 Applying: hfsplus: add support of manipulation by attributes file
5337 Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
5338 Applying: hfsplus: code style fixes - reworked support of extended attributes
5339 Applying: ipc/sem.c: alternatives to preempt_disable()
5340 $ cd ../next
5341 $ git fetch -f ../rebase-tmp akpm:akpm/master
5342 From ../rebase-tmp
5343  + 2ad4dcc...1091262 akpm       -> akpm/master  (forced update)
5344 $ rm -rf ../rebase-tmp
5345 Merging akpm/master (1091262 ipc/sem.c: alternatives to preempt_disable())
5346 $ git merge --no-ff akpm/master
5347 Merge made by the 'recursive' strategy.
5348  .../bindings/video/backlight/pwm-backlight.txt     |   10 +
5349  Documentation/vm/ksm.txt                           |    7 +
5350  arch/cris/include/asm/io.h                         |   39 +-
5351  arch/h8300/Kconfig                                 |    1 +
5352  arch/score/Kconfig                                 |    3 +-
5353  arch/x86/include/asm/uv/uv.h                       |    2 +-
5354  arch/x86/kernel/acpi/boot.c                        |    7 +-
5355  arch/x86/mm/numa.c                                 |    3 +-
5356  arch/x86/platform/iris/iris.c                      |   67 ++-
5357  arch/x86/platform/uv/tlb_uv.c                      |   10 +-
5358  arch/x86/tools/insn_sanity.c                       |   10 +-
5359  block/genhd.c                                      |    8 +-
5360  block/partitions/efi.c                             |    7 +-
5361  block/partitions/msdos.c                           |   21 +-
5362  drivers/acpi/acpi_memhotplug.c                     |  123 +++--
5363  drivers/block/cciss.c                              |   21 +-
5364  drivers/block/drbd/drbd_bitmap.c                   |    7 +-
5365  drivers/firmware/dmi_scan.c                        |   78 ++-
5366  drivers/gpu/drm/i915/intel_pm.c                    |    3 +-
5367  drivers/pcmcia/cs.c                                |   37 +-
5368  drivers/video/backlight/pwm_bl.c                   |    5 +
5369  fs/attr.c                                          |    5 +
5370  fs/autofs4/root.c                                  |    2 +-
5371  fs/block_dev.c                                     |    8 +-
5372  fs/dcache.c                                        |    2 +-
5373  fs/debugfs/inode.c                                 |    1 -
5374  fs/dlm/config.c                                    |    2 +-
5375  fs/gfs2/sys.c                                      |   18 +-
5376  fs/hfsplus/Makefile                                |    3 +-
5377  fs/hfsplus/attributes.c                            |  399 ++++++++++++++
5378  fs/hfsplus/bfind.c                                 |   79 ++-
5379  fs/hfsplus/bnode.c                                 |    6 +-
5380  fs/hfsplus/brec.c                                  |   23 +-
5381  fs/hfsplus/btree.c                                 |    8 +
5382  fs/hfsplus/catalog.c                               |   36 +-
5383  fs/hfsplus/dir.c                                   |    6 +-
5384  fs/hfsplus/extents.c                               |    4 +-
5385  fs/hfsplus/hfsplus_fs.h                            |   41 +-
5386  fs/hfsplus/hfsplus_raw.h                           |   68 ++-
5387  fs/hfsplus/inode.c                                 |   13 +
5388  fs/hfsplus/ioctl.c                                 |  542 +++++++++++++++++---
5389  fs/hfsplus/super.c                                 |   33 +-
5390  fs/hfsplus/unicode.c                               |    7 +-
5391  fs/ncpfs/ioctl.c                                   |    2 +-
5392  fs/proc/base.c                                     |    6 +-
5393  fs/udf/file.c                                      |    2 +-
5394  include/linux/compiler-gcc4.h                      |    2 +-
5395  include/linux/genhd.h                              |    8 +-
5396  include/linux/rmap.h                               |    3 +
5397  init/do_mounts.c                                   |   61 ++-
5398  ipc/sem.c                                          |  250 ++++++---
5399  kernel/time.c                                      |    4 +-
5400  kernel/timeconst.pl                                |    2 +-
5401  mm/internal.h                                      |   48 ++
5402  mm/ksm.c                                           |  135 ++++-
5403  mm/memblock.c                                      |    5 +
5404  mm/memory.c                                        |    3 +-
5405  mm/page_alloc.c                                    |    3 +-
5406  mm/rmap.c                                          |    3 +
5407  mm/shmem.c                                         |    1 +
5408  mm/swap_state.c                                    |    6 +
5409  security/selinux/netnode.c                         |    3 +-
5410  62 files changed, 1931 insertions(+), 391 deletions(-)
5411  create mode 100644 fs/hfsplus/attributes.c