diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 2027 |
1 files changed, 2027 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..27ad3a013ed6 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2027 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ad41a1e Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris +Merging origin/master +$ git merge origin/master +Updating ad41a1e..da5cabf +Fast-forward + Documentation/DMA-API-HOWTO.txt | 6 +- + Documentation/acpi/method-customizing.txt | 2 + + Documentation/filesystems/Locking | 8 +- + Documentation/filesystems/vfs.txt | 6 +- + Documentation/hwmon/emc2103 | 33 + + Documentation/hwmon/ltc4245 | 24 +- + Documentation/hwmon/pc87427 | 27 +- + Documentation/hwmon/sysfs-interface | 29 +- + Documentation/hwmon/w83627ehf | 15 +- + Documentation/kbuild/makefiles.txt | 6 - + Documentation/kernel-parameters.txt | 135 +-- + Documentation/scsi/scsi-parameters.txt | 139 ++ + MAINTAINERS | 21 +- + Makefile | 5 +- + arch/alpha/defconfig | 884 +-------- + arch/alpha/include/asm/Kbuild | 11 +- + arch/alpha/kernel/osf_sys.c | 6 +- + arch/alpha/kernel/process.c | 2 +- + arch/arm/include/asm/Kbuild | 2 +- + arch/arm/include/asm/hardware/pl080.h | 4 +- + arch/arm/kernel/sys_arm.c | 4 +- + arch/arm/kernel/sys_oabi-compat.c | 6 +- + arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 + + arch/arm/mach-mx3/mach-qong.c | 1 + + arch/arm/mach-orion5x/ts78xx-setup.c | 1 + + arch/arm/mach-s3c64xx/Kconfig | 9 + + arch/arm/mach-s3c64xx/Makefile | 1 + + arch/arm/mach-s3c64xx/dma.c | 2 +- + arch/arm/mach-s3c64xx/include/mach/memory.h | 2 + + arch/arm/mach-s3c64xx/mach-real6410.c | 152 ++ + arch/arm/mach-s3c64xx/mach-smartq.c | 40 +- + arch/arm/mach-s3c64xx/mach-smartq5.c | 36 +- + arch/arm/mach-s3c64xx/mach-smartq7.c | 28 - + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 + + arch/arm/mach-w90x900/include/mach/i2c.h | 9 + + arch/arm/plat-samsung/Kconfig | 2 +- + arch/avr32/configs/atngw100_defconfig | 1249 ----------- + arch/avr32/configs/atngw100_evklcd100_defconfig | 1374 ------------ + arch/avr32/configs/atngw100_evklcd101_defconfig | 1369 ------------ + arch/avr32/configs/atngw100_mrmt_defconfig | 1213 ----------- + arch/avr32/configs/atngw100mkii_defconfig | 1254 ----------- + .../avr32/configs/atngw100mkii_evklcd100_defconfig | 1377 ------------ + .../avr32/configs/atngw100mkii_evklcd101_defconfig | 1378 ------------ + arch/avr32/configs/atstk1002_defconfig | 1319 ------------ + arch/avr32/configs/atstk1003_defconfig | 946 +-------- + arch/avr32/configs/atstk1004_defconfig | 601 +------ + arch/avr32/configs/atstk1006_defconfig | 1321 ------------ + arch/avr32/configs/favr-32_defconfig | 1079 +---------- + arch/avr32/configs/hammerhead_defconfig | 1311 +------------ + arch/avr32/configs/merisc_defconfig | 1105 ---------- + arch/avr32/configs/mimc200_defconfig | 991 +--------- + arch/avr32/include/asm/syscalls.h | 2 +- + arch/avr32/kernel/process.c | 3 +- + arch/blackfin/configs/BF518F-EZBRD_defconfig | 1307 ------------ + arch/blackfin/configs/BF526-EZBRD_defconfig | 1594 -------------- + arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 1698 --------------- + arch/blackfin/configs/BF527-EZKIT_defconfig | 1651 -------------- + arch/blackfin/configs/BF533-EZKIT_defconfig | 1222 ----------- + arch/blackfin/configs/BF533-STAMP_defconfig | 1384 ------------ + arch/blackfin/configs/BF537-STAMP_defconfig | 1435 ------------- + arch/blackfin/configs/BF538-EZKIT_defconfig | 1365 ------------ + arch/blackfin/configs/BF548-EZKIT_defconfig | 1757 --------------- + arch/blackfin/configs/BF561-ACVILON_defconfig | 1482 ------------- + arch/blackfin/configs/BF561-EZKIT_defconfig | 1206 ----------- + arch/blackfin/configs/BlackStamp_defconfig | 1098 +---------- + arch/blackfin/configs/CM-BF527_defconfig | 1404 ------------ + arch/blackfin/configs/CM-BF533_defconfig | 841 -------- + arch/blackfin/configs/CM-BF537E_defconfig | 1112 ---------- + arch/blackfin/configs/CM-BF537U_defconfig | 986 --------- + arch/blackfin/configs/CM-BF548_defconfig | 1367 ------------ + arch/blackfin/configs/CM-BF561_defconfig | 1049 --------- + arch/blackfin/configs/H8606_defconfig | 1085 +---------- + arch/blackfin/configs/IP0X_defconfig | 1164 +---------- + arch/blackfin/configs/PNAV-10_defconfig | 1371 ------------ + arch/blackfin/configs/SRV1_defconfig | 1217 +----------- + arch/blackfin/configs/TCM-BF518_defconfig | 1240 ----------- + arch/blackfin/configs/TCM-BF537_defconfig | 1085 ---------- + arch/blackfin/include/asm/Kbuild | 4 +- + arch/blackfin/kernel/process.c | 2 +- + arch/blackfin/mach-bf537/boards/stamp.c | 1 + + arch/blackfin/mach-bf561/boards/acvilon.c | 1 + + arch/cris/configs/artpec_3_defconfig | 538 ----- + arch/cris/configs/etrax-100lx_defconfig | 489 +----- + arch/cris/configs/etrax-100lx_v2_defconfig | 537 ----- + arch/cris/configs/etraxfs_defconfig | 545 ----- + arch/cris/include/asm/Kbuild | 5 +- + arch/frv/defconfig | 600 +------ + arch/frv/include/asm/Kbuild | 3 +- + arch/frv/kernel/process.c | 3 +- + arch/h8300/defconfig | 333 +--- + arch/h8300/kernel/process.c | 2 +- + arch/ia64/configs/bigsur_defconfig | 183 +- + arch/ia64/configs/generic_defconfig | 351 ++-- + arch/ia64/configs/gensparse_defconfig | 313 ++-- + arch/ia64/configs/sim_defconfig | 87 +- + arch/ia64/configs/tiger_defconfig | 265 ++-- + arch/ia64/configs/xen_domu_defconfig | 279 ++-- + arch/ia64/configs/zx1_defconfig | 231 +- + arch/ia64/include/asm/Kbuild | 9 +- + arch/ia64/include/asm/atomic.h | 8 +- + arch/ia64/include/asm/unistd.h | 7 +- + arch/ia64/kernel/entry.S | 3 + + arch/ia64/kernel/process.c | 2 +- + arch/m32r/configs/m32104ut_defconfig | 897 +-------- + arch/m32r/configs/m32700ut.smp_defconfig | 779 +------- + arch/m32r/configs/m32700ut.up_defconfig | 777 +------- + arch/m32r/configs/mappi.nommu_defconfig | 609 ------ + arch/m32r/configs/mappi.smp_defconfig | 710 +------- + arch/m32r/configs/mappi.up_defconfig | 709 +------ + arch/m32r/configs/mappi2.opsp_defconfig | 681 ------ + arch/m32r/configs/mappi2.vdec2_defconfig | 680 ------ + arch/m32r/configs/mappi3.smp_defconfig | 714 +------- + arch/m32r/configs/oaks32r_defconfig | 583 ----- + arch/m32r/configs/opsput_defconfig | 664 ------ + arch/m32r/configs/usrv_defconfig | 693 +------ + arch/m32r/kernel/process.c | 3 +- + arch/m68k/configs/amiga_defconfig | 867 +-------- + arch/m68k/configs/apollo_defconfig | 784 ------- + arch/m68k/configs/atari_defconfig | 824 +------- + arch/m68k/configs/bvme6000_defconfig | 758 ------- + arch/m68k/configs/hp300_defconfig | 793 ------- + arch/m68k/configs/mac_defconfig | 815 ------- + arch/m68k/configs/multi_defconfig | 895 +-------- + arch/m68k/configs/mvme147_defconfig | 759 ------- + arch/m68k/configs/mvme16x_defconfig | 758 ------- + arch/m68k/configs/q40_defconfig | 839 -------- + arch/m68k/configs/sun3_defconfig | 779 ------- + arch/m68k/configs/sun3x_defconfig | 790 ------- + arch/m68k/kernel/process.c | 2 +- + arch/m68knommu/configs/m5208evb_defconfig | 559 ----- + arch/m68knommu/configs/m5249evb_defconfig | 580 ----- + arch/m68knommu/configs/m5272c3_defconfig | 580 ----- + arch/m68knommu/configs/m5275evb_defconfig | 580 ----- + arch/m68knommu/configs/m5307c3_defconfig | 600 ------ + arch/m68knommu/configs/m5407c3_defconfig | 589 ----- + arch/m68knommu/defconfig | 588 +----- + arch/m68knommu/kernel/process.c | 2 +- + arch/microblaze/configs/mmu_defconfig | 842 +-------- + arch/microblaze/configs/nommu_defconfig | 849 +-------- + arch/microblaze/kernel/sys_microblaze.c | 2 +- + arch/mips/configs/ar7_defconfig | 1119 ---------- + arch/mips/configs/bcm47xx_defconfig | 1593 -------------- + arch/mips/configs/bcm63xx_defconfig | 1135 ---------- + arch/mips/configs/bigsur_defconfig | 1357 ------------ + arch/mips/configs/capcella_defconfig | 779 +------- + arch/mips/configs/cavium-octeon_defconfig | 850 +-------- + arch/mips/configs/cobalt_defconfig | 1143 +---------- + arch/mips/configs/db1000_defconfig | 1064 ---------- + arch/mips/configs/db1100_defconfig | 1085 ---------- + arch/mips/configs/db1200_defconfig | 1396 ------------ + arch/mips/configs/db1500_defconfig | 1152 ---------- + arch/mips/configs/db1550_defconfig | 1292 ----------- + arch/mips/configs/decstation_defconfig | 860 +-------- + arch/mips/configs/e55_defconfig | 543 ----- + arch/mips/configs/fuloong2e_defconfig | 1563 -------------- + arch/mips/configs/gpr_defconfig | 1711 --------------- + arch/mips/configs/ip22_defconfig | 918 +-------- + arch/mips/configs/ip27_defconfig | 1167 +---------- + arch/mips/configs/ip28_defconfig | 807 +------- + arch/mips/configs/ip32_defconfig | 1031 --------- + arch/mips/configs/jazz_defconfig | 1116 +---------- + arch/mips/configs/jmr3927_defconfig | 800 ------- + arch/mips/configs/lasat_defconfig | 753 ------- + arch/mips/configs/lemote2f_defconfig | 1750 --------------- + arch/mips/configs/malta_defconfig | 1250 +----------- + arch/mips/configs/markeins_defconfig | 1269 +----------- + arch/mips/configs/mipssim_defconfig | 601 +------ + arch/mips/configs/mpc30x_defconfig | 780 ------- + arch/mips/configs/msp71xx_defconfig | 1400 +------------ + arch/mips/configs/mtx1_defconfig | 1797 ---------------- + arch/mips/configs/pb1100_defconfig | 1096 ---------- + arch/mips/configs/pb1200_defconfig | 1397 ------------ + arch/mips/configs/pb1500_defconfig | 1233 ----------- + arch/mips/configs/pb1550_defconfig | 1288 ----------- + arch/mips/configs/pnx8335-stb225_defconfig | 1051 +--------- + arch/mips/configs/pnx8550-jbs_defconfig | 1204 +----------- + arch/mips/configs/pnx8550-stb810_defconfig | 1200 +----------- + arch/mips/configs/powertv_defconfig | 1535 -------------- + arch/mips/configs/rb532_defconfig | 1328 ------------ + arch/mips/configs/rbtx49xx_defconfig | 981 --------- + arch/mips/configs/rm200_defconfig | 1379 +------------ + arch/mips/configs/sb1250-swarm_defconfig | 960 +-------- + arch/mips/configs/tb0219_defconfig | 830 +-------- + arch/mips/configs/tb0226_defconfig | 833 +-------- + arch/mips/configs/tb0287_defconfig | 1003 +--------- + arch/mips/configs/workpad_defconfig | 708 ------ + arch/mips/configs/wrppmc_defconfig | 896 +-------- + arch/mips/configs/yosemite_defconfig | 824 +------- + arch/mips/kernel/syscall.c | 2 +- + arch/mips/pnx833x/common/platform.c | 1 + + arch/mn10300/configs/asb2303_defconfig | 563 ----- + arch/mn10300/kernel/process.c | 2 +- + arch/parisc/configs/712_defconfig | 909 -------- + arch/parisc/configs/a500_defconfig | 1110 ---------- + arch/parisc/configs/b180_defconfig | 1144 ---------- + arch/parisc/configs/c3000_defconfig | 1353 +------------ + arch/parisc/configs/default_defconfig | 1380 ------------ + arch/parisc/hpux/fs.c | 7 +- + arch/parisc/include/asm/Kbuild | 2 +- + arch/powerpc/include/asm/Kbuild | 53 +- + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/sys_ppc32.c | 2 +- + arch/s390/appldata/appldata_net_sum.c | 3 +- + arch/s390/defconfig | 970 --------- + arch/s390/include/asm/Kbuild | 11 +- + arch/s390/include/asm/unistd.h | 5 +- + arch/s390/kernel/compat_linux.c | 10 +- + arch/s390/kernel/compat_linux.h | 10 +- + arch/s390/kernel/compat_wrapper.S | 26 +- + arch/s390/kernel/entry.h | 4 +- + arch/s390/kernel/process.c | 2 +- + arch/s390/kernel/sys_s390.c | 4 +- + arch/s390/kernel/syscalls.S | 3 + + arch/score/configs/spct6600_defconfig | 632 ------ + arch/sh/configs/ap325rxa_defconfig | 1331 ------------ + arch/sh/configs/cayman_defconfig | 1319 ------------ + arch/sh/configs/dreamcast_defconfig | 1087 ---------- + arch/sh/configs/ecovec24-romimage_defconfig | 1016 --------- + arch/sh/configs/ecovec24_defconfig | 1631 -------------- + arch/sh/configs/edosk7705_defconfig | 481 ----- + arch/sh/configs/edosk7760_defconfig | 1118 ---------- + arch/sh/configs/espt_defconfig | 1159 ---------- + arch/sh/configs/hp6xx_defconfig | 936 -------- + arch/sh/configs/kfr2r09-romimage_defconfig | 763 ------- + arch/sh/configs/kfr2r09_defconfig | 1033 --------- + arch/sh/configs/landisk_defconfig | 1446 ------------- + arch/sh/configs/lboxre2_defconfig | 1324 ------------ + arch/sh/configs/magicpanelr2_defconfig | 1060 --------- + arch/sh/configs/microdev_defconfig | 974 --------- + arch/sh/configs/migor_defconfig | 1304 ------------ + arch/sh/configs/polaris_defconfig | 972 --------- + arch/sh/configs/r7780mp_defconfig | 1569 -------------- + arch/sh/configs/r7785rp_defconfig | 1582 -------------- + arch/sh/configs/rsk7201_defconfig | 745 ------- + arch/sh/configs/rsk7203_defconfig | 1159 ---------- + arch/sh/configs/rts7751r2d1_defconfig | 1582 -------------- + arch/sh/configs/rts7751r2dplus_defconfig | 1661 --------------- + arch/sh/configs/sdk7780_defconfig | 1568 -------------- + arch/sh/configs/sdk7786_defconfig | 1773 +---------------- + arch/sh/configs/se7206_defconfig | 1000 --------- + arch/sh/configs/se7343_defconfig | 1244 ----------- + arch/sh/configs/se7619_defconfig | 706 ------ + arch/sh/configs/se7705_defconfig | 996 --------- + arch/sh/configs/se7712_defconfig | 1088 ---------- + arch/sh/configs/se7721_defconfig | 1229 ----------- + arch/sh/configs/se7722_defconfig | 1031 --------- + arch/sh/configs/se7724_defconfig | 1682 --------------- + arch/sh/configs/se7750_defconfig | 1030 --------- + arch/sh/configs/se7751_defconfig | 990 --------- + arch/sh/configs/se7780_defconfig | 1366 ------------ + arch/sh/configs/sh03_defconfig | 1218 ----------- + arch/sh/configs/sh7710voipgw_defconfig | 1012 --------- + arch/sh/configs/sh7724_generic_defconfig | 707 ------ + arch/sh/configs/sh7763rdp_defconfig | 1172 ---------- + arch/sh/configs/sh7770_generic_defconfig | 697 ------ + arch/sh/configs/sh7785lcr_32bit_defconfig | 1734 --------------- + arch/sh/configs/sh7785lcr_defconfig | 1537 -------------- + arch/sh/configs/shmin_defconfig | 908 -------- + arch/sh/configs/shx3_defconfig | 1312 ------------ + arch/sh/configs/snapgear_defconfig | 954 --------- + arch/sh/configs/systemh_defconfig | 677 ------ + arch/sh/configs/titan_defconfig | 1612 -------------- + arch/sh/configs/ul2_defconfig | 1233 ----------- + arch/sh/configs/urquell_defconfig | 1732 --------------- + arch/sh/include/asm/Kbuild | 9 +- + arch/sh/include/asm/syscalls_32.h | 2 +- + arch/sh/include/asm/syscalls_64.h | 2 +- + arch/sh/kernel/process_64.c | 2 +- + arch/sparc/configs/sparc32_defconfig | 1120 ---------- + arch/sparc/configs/sparc64_defconfig | 1714 --------------- + arch/sparc/kernel/sys_sparc32.c | 7 +- + arch/tile/Makefile | 20 +- + arch/tile/configs/tile_defconfig | 1219 ----------- + arch/tile/include/arch/abi.h | 4 +- + arch/tile/include/asm/atomic_32.h | 37 - + arch/tile/include/asm/backtrace.h | 4 +- + arch/tile/include/asm/bitops.h | 9 +- + arch/tile/include/asm/cache.h | 5 +- + arch/tile/include/asm/highmem.h | 2 +- + arch/tile/include/asm/page.h | 6 +- + arch/tile/include/asm/scatterlist.h | 21 - + arch/tile/include/asm/setup.h | 8 +- + arch/tile/include/asm/siginfo.h | 4 + + arch/tile/include/asm/uaccess.h | 4 +- + arch/tile/include/hv/hypervisor.h | 8 +- + arch/tile/kernel/backtrace.c | 137 +- + arch/tile/kernel/compat_signal.c | 4 +- + arch/tile/kernel/intvec_32.S | 14 +- + arch/tile/kernel/proc.c | 1 - + arch/tile/kernel/setup.c | 4 +- + arch/tile/kernel/stack.c | 8 - + arch/tile/kernel/time.c | 33 +- + arch/tile/kernel/traps.c | 4 +- + arch/tile/lib/Makefile | 4 +- + arch/tile/lib/exports.c | 16 +- + arch/tile/lib/memcpy_32.S | 20 +- + arch/tile/lib/memset_32.c | 25 - + arch/tile/mm/fault.c | 8 + + arch/tile/mm/highmem.c | 4 +- + arch/tile/mm/homecache.c | 3 + + arch/tile/mm/pgtable.c | 1 - + arch/um/kernel/exec.c | 6 +- + arch/um/kernel/internal.h | 2 +- + arch/um/kernel/syscall.c | 2 +- + arch/x86/configs/i386_defconfig | 2242 +------------------- + arch/x86/configs/x86_64_defconfig | 2209 +------------------- + arch/x86/ia32/sys_ia32.c | 14 +- + arch/x86/include/asm/Kbuild | 29 +- + arch/x86/include/asm/kdebug.h | 6 + + arch/x86/include/asm/page.h | 7 + + arch/x86/include/asm/sys_ia32.h | 12 +- + arch/x86/include/asm/syscalls.h | 2 +- + arch/x86/include/asm/uv/uv_bau.h | 151 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 4 + + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce-apei.c | 4 +- + arch/x86/kernel/cpu/perf_event_p4.c | 9 +- + arch/x86/kernel/crash.c | 3 + + arch/x86/kernel/entry_64.S | 4 +- + arch/x86/kernel/mpparse.c | 16 + + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/tlb_uv.c | 760 +++++--- + arch/x86/lib/atomic64_386_32.S | 238 ++- + arch/x86/mm/fault.c | 4 +- + arch/x86/oprofile/nmi_int.c | 1 + + arch/xtensa/kernel/process.c | 2 +- + drivers/acpi/Kconfig | 11 +- + drivers/acpi/Makefile | 5 +- + drivers/acpi/acpica/acevents.h | 4 + + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/aclocal.h | 1 + + drivers/acpi/acpica/evgpe.c | 73 + + drivers/acpi/acpica/evxface.c | 77 +- + drivers/acpi/acpica/evxfevnt.c | 62 +- + drivers/acpi/acpica/utmutex.c | 5 +- + drivers/acpi/apei/Kconfig | 9 + + drivers/acpi/apei/Makefile | 1 + + drivers/acpi/apei/apei-base.c | 4 +- + drivers/acpi/apei/erst-dbg.c | 207 ++ + drivers/acpi/apei/ghes.c | 172 +- + drivers/acpi/apei/hest.c | 76 +- + drivers/acpi/bus.c | 4 +- + drivers/acpi/debug.c | 422 ---- + drivers/acpi/debugfs.c | 93 + + drivers/acpi/glue.c | 3 +- + drivers/acpi/internal.h | 8 +- + drivers/acpi/numa.c | 4 +- + drivers/acpi/osl.c | 7 +- + drivers/acpi/power.c | 129 +-- + drivers/acpi/proc.c | 70 - + drivers/acpi/processor_driver.c | 85 - + drivers/acpi/processor_idle.c | 102 +- + drivers/acpi/processor_thermal.c | 83 - + drivers/acpi/processor_throttling.c | 2 - + drivers/acpi/sleep.c | 60 +- + drivers/acpi/sleep.h | 5 +- + drivers/acpi/{system.c => sysfs.c} | 466 +++-- + drivers/acpi/thermal.c | 86 +- + drivers/acpi/video.c | 141 +- + drivers/acpi/wakeup.c | 48 +- + drivers/ata/libata-acpi.c | 6 - + drivers/crypto/Kconfig | 2 +- + drivers/firmware/Kconfig | 10 +- + drivers/firmware/Makefile | 1 - + drivers/firmware/iscsi_ibft.c | 6 +- + drivers/gpu/drm/i915/i915_opregion.c | 1 + + drivers/hwmon/Kconfig | 14 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asc7621.c | 9 +- + drivers/hwmon/emc1403.c | 33 + + drivers/hwmon/emc2103.c | 740 +++++++ + drivers/hwmon/it87.c | 46 +- + drivers/hwmon/k8temp.c | 3 +- + drivers/hwmon/lm75.c | 39 + + drivers/hwmon/lm75.h | 1 + + drivers/hwmon/ltc4245.c | 177 ++- + drivers/hwmon/pc87360.c | 31 +- + drivers/hwmon/pc87427.c | 862 +++++++- + drivers/hwmon/via-cputemp.c | 2 +- + drivers/hwmon/w83627ehf.c | 97 +- + drivers/i2c/busses/Kconfig | 11 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-davinci.c | 314 +++- + drivers/i2c/busses/i2c-nuc900.c | 709 +++++++ + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/idle/Kconfig | 3 +- + drivers/idle/intel_idle.c | 61 +- + drivers/input/joystick/amijoy.c | 2 +- + drivers/input/keyboard/hil_kbd.c | 4 +- + drivers/isdn/hardware/avm/c4.c | 1 + + drivers/isdn/hardware/avm/t1pci.c | 1 + + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 5 +- + drivers/media/IR/Kconfig | 9 +- + drivers/media/dvb/dm1105/Kconfig | 2 +- + drivers/media/dvb/dvb-usb/Kconfig | 2 +- + drivers/media/dvb/siano/Kconfig | 2 +- + drivers/media/dvb/ttpci/Kconfig | 2 +- + drivers/media/video/bt8xx/Kconfig | 2 +- + drivers/media/video/cx18/Kconfig | 2 +- + drivers/media/video/cx231xx/Kconfig | 2 +- + drivers/media/video/cx23885/Kconfig | 2 +- + drivers/media/video/cx88/Kconfig | 2 +- + drivers/media/video/em28xx/Kconfig | 2 +- + drivers/media/video/ivtv/Kconfig | 2 +- + drivers/media/video/saa7134/Kconfig | 2 +- + drivers/media/video/tlg2300/Kconfig | 2 +- + drivers/media/video/v4l2-compat-ioctl32.c | 7 +- + drivers/media/video/v4l2-ctrls.c | 1 + + drivers/message/fusion/mptbase.c | 6 +- + drivers/mmc/host/Kconfig | 9 +- + drivers/mmc/host/Makefile | 2 +- + drivers/mmc/host/mmc_spi.c | 59 +- + drivers/mmc/host/msm_sdcc.c | 35 +- + drivers/mtd/devices/m25p80.c | 14 +- + drivers/mtd/nand/denali.c | 497 ++--- + drivers/mtd/nand/denali.h | 18 - + drivers/mtd/nand/nand_ids.c | 2 +- + drivers/mtd/nand/plat_nand.c | 5 + + drivers/net/caif/caif_spi_slave.c | 4 +- + drivers/net/pcmcia/xirc2ps_cs.c | 2 +- + drivers/net/phy/Kconfig | 2 +- + drivers/net/phy/phy.c | 2 +- + drivers/net/qlcnic/qlcnic_main.c | 72 +- + drivers/net/usb/usbnet.c | 22 +- + drivers/net/wan/farsync.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 19 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 85 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 29 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 14 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 5 +- + drivers/net/wireless/libertas/cfg.c | 1 + + drivers/net/wireless/p54/p54pci.c | 2 - + drivers/pci/intel-iommu.c | 2 +- + drivers/pci/intr_remapping.c | 20 + + drivers/platform/x86/Kconfig | 7 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/ideapad_acpi.c | 306 +++ + drivers/s390/block/dasd.c | 4 +- + drivers/s390/net/claw.c | 118 +- + drivers/s390/net/claw.h | 4 +- + drivers/s390/net/ctcm_fsms.c | 60 +- + drivers/s390/net/ctcm_main.c | 80 +- + drivers/s390/net/ctcm_main.h | 4 +- + drivers/s390/net/ctcm_mpc.c | 64 +- + drivers/s390/net/ctcm_sysfs.c | 20 +- + drivers/scsi/Kconfig | 8 + + drivers/scsi/Makefile | 1 + + drivers/scsi/be2iscsi/Kconfig | 1 + + drivers/scsi/be2iscsi/be_cmds.h | 147 ++- + drivers/scsi/be2iscsi/be_iscsi.c | 76 +- + drivers/scsi/be2iscsi/be_iscsi.h | 2 + + drivers/scsi/be2iscsi/be_main.c | 311 +++ + drivers/scsi/be2iscsi/be_main.h | 7 +- + drivers/scsi/be2iscsi/be_mgmt.c | 71 + + drivers/scsi/ibmvscsi/ibmvfc.c | 380 ++-- + drivers/scsi/ibmvscsi/ibmvfc.h | 6 +- + drivers/{firmware => scsi}/iscsi_boot_sysfs.c | 0 + drivers/scsi/libfc/fc_fcp.c | 4 +- + drivers/scsi/lpfc/lpfc.h | 3 + + drivers/scsi/lpfc/lpfc_attr.c | 46 +- + drivers/scsi/lpfc/lpfc_bsg.c | 9 - + drivers/scsi/lpfc/lpfc_compat.h | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 76 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 17 +- + drivers/scsi/lpfc/lpfc_hw.h | 32 +- + drivers/scsi/lpfc/lpfc_init.c | 132 +- + drivers/scsi/lpfc/lpfc_mbox.c | 8 +- + drivers/scsi/lpfc/lpfc_scsi.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 36 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 13 +- + drivers/scsi/qla4xxx/ql4_def.h | 36 +- + drivers/scsi/qla4xxx/ql4_fw.h | 20 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 2 + + drivers/scsi/qla4xxx/ql4_init.c | 14 +- + drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- + drivers/scsi/qla4xxx/ql4_isr.c | 3 + + drivers/scsi/qla4xxx/ql4_mbx.c | 48 +- + drivers/scsi/qla4xxx/ql4_nx.c | 17 +- + drivers/scsi/qla4xxx/ql4_os.c | 315 +++- + drivers/scsi/qla4xxx/ql4_version.h | 2 +- + drivers/scsi/scsi_error.c | 11 +- + drivers/scsi/scsi_tgt_lib.c | 1 + + drivers/spi/amba-pl022.c | 6 +- + drivers/spi/mpc512x_psc_spi.c | 16 +- + drivers/spi/omap_spi_100k.c | 23 +- + drivers/spi/spi.c | 225 ++- + drivers/spi/spi_bitbang.c | 9 +- + drivers/spi/spi_bitbang_txrx.h | 16 +- + drivers/spi/spi_butterfly.c | 2 +- + drivers/spi/spi_gpio.c | 109 +- + drivers/spi/spi_lm70llp.c | 2 +- + drivers/spi/spi_s3c24xx_gpio.c | 8 +- + drivers/spi/spi_sh_sci.c | 8 +- + drivers/watchdog/Kconfig | 19 +- + drivers/watchdog/hpwdt.c | 306 ++-- + fs/afs/cell.c | 56 +- + fs/afs/dir.c | 47 +- + fs/afs/inode.c | 86 + + fs/afs/internal.h | 11 +- + fs/afs/mntpt.c | 78 +- + fs/afs/proc.c | 2 +- + fs/afs/super.c | 20 +- + fs/bad_inode.c | 7 - + fs/cifs/README | 10 + + fs/compat.c | 23 +- + fs/compat_ioctl.c | 3 +- + fs/dcache.c | 2 +- + fs/file_table.c | 9 - + fs/ioctl.c | 18 +- + fs/jbd2/transaction.c | 46 +- + fs/logfs/dir.c | 2 +- + fs/logfs/file.c | 6 +- + fs/logfs/logfs.h | 3 +- + fs/nfs/Kconfig | 17 + + fs/nfs/dns_resolve.c | 24 + + fs/nfs/dns_resolve.h | 12 + + fs/notify/fanotify/fanotify.c | 8 +- + fs/notify/fanotify/fanotify_user.c | 6 +- + fs/notify/fsnotify.c | 12 +- + fs/notify/inotify/inotify_fsnotify.c | 12 +- + fs/notify/notification.c | 33 +- + fs/ocfs2/acl.c | 33 +- + fs/ocfs2/cluster/tcp.c | 17 +- + fs/ocfs2/dlm/dlmmaster.c | 9 +- + fs/ocfs2/dlm/dlmrecovery.c | 22 +- + fs/ocfs2/dlm/dlmthread.c | 114 +- + fs/ocfs2/refcounttree.c | 20 +- + fs/partitions/ibm.c | 2 +- + fs/proc/inode.c | 17 +- + fs/proc/task_mmu.c | 8 +- + fs/stat.c | 29 +- + fs/utimes.c | 7 +- + include/acpi/acpixf.h | 2 +- + include/acpi/processor.h | 1 - + include/asm-generic/Kbuild | 9 +- + include/asm-generic/Kbuild.asm | 67 +- + include/asm-generic/unistd.h | 6 +- + include/drm/Kbuild | 26 +- + include/linux/Kbuild | 468 ++-- + include/linux/byteorder/Kbuild | 4 +- + include/linux/compat.h | 6 +- + include/linux/cper.h | 8 +- + include/linux/dma-mapping.h | 2 + + include/linux/dvb/Kbuild | 7 +- + include/linux/etherdevice.h | 2 +- + include/linux/fs.h | 11 +- + include/linux/fsnotify.h | 37 +- + include/linux/fsnotify_backend.h | 16 +- + include/linux/i2c/ltc4245.h | 21 + + include/linux/netfilter/Kbuild | 19 +- + include/linux/netfilter_arp/Kbuild | 3 +- + include/linux/netfilter_bridge/Kbuild | 5 +- + include/linux/netfilter_ipv4/Kbuild | 5 +- + include/linux/netfilter_ipv6/Kbuild | 5 +- + include/linux/netpoll.h | 2 +- + include/linux/nfsd/Kbuild | 12 +- + include/linux/spi/spi.h | 12 + + include/linux/spi/spi_gpio.h | 5 + + include/linux/sunrpc/Kbuild | 2 +- + include/linux/syscalls.h | 20 +- + include/linux/time.h | 2 +- + include/net/bluetooth/l2cap.h | 4 +- + include/net/sock.h | 4 +- + include/sound/Kbuild | 9 +- + include/video/Kbuild | 5 +- + kernel/audit_watch.c | 4 +- + kernel/time/timekeeping.c | 7 +- + mm/memory.c | 32 +- + mm/mlock.c | 8 + + mm/nommu.c | 5 - + mm/page-writeback.c | 4 +- + net/bluetooth/l2cap.c | 11 +- + net/caif/cfpkt_skbuff.c | 2 +- + net/can/bcm.c | 41 +- + net/dns_resolver/dns_key.c | 92 +- + net/dns_resolver/dns_query.c | 5 + + net/dsa/Kconfig | 2 +- + net/sched/sch_api.c | 22 +- + net/sched/sch_atm.c | 4 +- + net/sched/sch_sfq.c | 14 +- + net/sched/sch_tbf.c | 4 +- + net/sched/sch_teql.c | 2 +- + net/wireless/mlme.c | 8 +- + scripts/Makefile.headersinst | 3 +- + scripts/kconfig/conf.c | 15 +- + scripts/kconfig/confdata.c | 111 +- + scripts/kconfig/expr.c | 2 +- + scripts/kconfig/lkc.h | 10 + + scripts/kconfig/nconf.c | 2 + + scripts/setlocalversion | 2 +- + sound/oss/sh_dac_audio.c | 1 - + sound/pci/hda/hda_codec.c | 26 +- + sound/pci/hda/hda_codec.h | 5 +- + sound/pci/hda/hda_eld.c | 49 + + sound/pci/hda/hda_local.h | 2 + + sound/pci/hda/patch_cirrus.c | 2 +- + sound/pci/hda/patch_conexant.c | 2 +- + sound/pci/hda/patch_hdmi.c | 42 + + sound/pci/hda/patch_intelhdmi.c | 1 + + sound/pci/hda/patch_nvhdmi.c | 4 +- + sound/pci/hda/patch_realtek.c | 2 +- + sound/soc/codecs/wm8994.c | 23 +- + sound/usb/format.c | 8 + + tools/perf/Makefile | 31 +- + tools/perf/builtin-annotate.c | 2 +- + tools/perf/builtin-report.c | 31 +- + tools/perf/builtin-timechart.c | 4 +- + tools/perf/builtin-trace.c | 19 +- + tools/perf/util/debug.c | 2 +- + tools/perf/util/debug.h | 9 +- + tools/perf/util/hist.c | 16 +- + tools/perf/util/hist.h | 3 +- + tools/perf/util/include/linux/list.h | 8 + + tools/perf/util/include/linux/types.h | 12 + + tools/perf/util/newt.c | 1568 -------------- + tools/perf/util/probe-event.c | 11 +- + tools/perf/util/probe-finder.c | 9 +- + tools/perf/util/pstack.h | 2 + + tools/perf/util/sort.c | 6 +- + tools/perf/util/symbol.c | 40 +- + tools/perf/util/symbol.h | 1 + + tools/perf/util/ui/browser.c | 329 +++ + tools/perf/util/ui/browser.h | 46 + + tools/perf/util/ui/browsers/annotate.c | 240 +++ + tools/perf/util/ui/browsers/hists.c | 948 +++++++++ + tools/perf/util/ui/browsers/map.c | 161 ++ + tools/perf/util/ui/browsers/map.h | 6 + + tools/perf/util/ui/helpline.c | 69 + + tools/perf/util/ui/helpline.h | 11 + + tools/perf/util/ui/libslang.h | 27 + + tools/perf/util/ui/progress.c | 60 + + tools/perf/util/ui/progress.h | 11 + + tools/perf/util/ui/setup.c | 42 + + tools/perf/util/ui/util.c | 114 + + tools/perf/util/ui/util.h | 10 + + 643 files changed, 13519 insertions(+), 213739 deletions(-) + create mode 100644 Documentation/hwmon/emc2103 + create mode 100644 Documentation/scsi/scsi-parameters.txt + create mode 100644 arch/arm/mach-s3c64xx/mach-real6410.c + create mode 100644 arch/arm/mach-w90x900/include/mach/i2c.h + create mode 100644 drivers/acpi/apei/erst-dbg.c + delete mode 100644 drivers/acpi/debug.c + create mode 100644 drivers/acpi/debugfs.c + rename drivers/acpi/{system.c => sysfs.c} (57%) + create mode 100644 drivers/hwmon/emc2103.c + create mode 100644 drivers/i2c/busses/i2c-nuc900.c + create mode 100644 drivers/platform/x86/ideapad_acpi.c + rename drivers/{firmware => scsi}/iscsi_boot_sysfs.c (100%) + create mode 100644 include/linux/i2c/ltc4245.h + delete mode 100644 tools/perf/util/newt.c + create mode 100644 tools/perf/util/ui/browser.c + create mode 100644 tools/perf/util/ui/browser.h + create mode 100644 tools/perf/util/ui/browsers/annotate.c + create mode 100644 tools/perf/util/ui/browsers/hists.c + create mode 100644 tools/perf/util/ui/browsers/map.c + create mode 100644 tools/perf/util/ui/browsers/map.h + create mode 100644 tools/perf/util/ui/helpline.c + create mode 100644 tools/perf/util/ui/helpline.h + create mode 100644 tools/perf/util/ui/libslang.h + create mode 100644 tools/perf/util/ui/progress.c + create mode 100644 tools/perf/util/ui/progress.h + create mode 100644 tools/perf/util/ui/setup.c + create mode 100644 tools/perf/util/ui/util.c + create mode 100644 tools/perf/util/ui/util.h +Merging fixes/fixes +$ git merge fixes/fixes +Updating da5cabf..95a2e73 +Fast-forward + drivers/ata/sata_dwc_460ex.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + include/linux/pci.h | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/ath/ath5k/base.c | 21 +++++++++++++++++++++ + drivers/net/wireless/ath/ath9k/eeprom.h | 1 + + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 7 ++++++- + drivers/net/wireless/ath/ath9k/hif_usb.c | 8 ++------ + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 3 ++- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 15 ++++++++++----- + drivers/net/wireless/ath/ath9k/reg.h | 1 + + drivers/net/wireless/ipw2x00/ipw2100.c | 5 +++-- + drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 +- + 10 files changed, 48 insertions(+), 16 deletions(-) +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + include/linux/kobject.h | 35 +-------------------------- + include/linux/kobject_ns.h | 56 ++++++++++++++++++++++++++++++++++++++++++++ + include/linux/sysfs.h | 1 + + 3 files changed, 58 insertions(+), 34 deletions(-) + create mode 100644 include/linux/kobject_ns.h +Merging quilt/tty.current +$ git merge quilt/tty.current +Merge made by recursive. + drivers/serial/8250_early.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/gadget/uvc_v4l2.c | 2 +- + drivers/usb/host/isp1760-hcd.c | 2 ++ + drivers/usb/serial/navman.c | 1 + + drivers/usb/serial/option.c | 7 +++++-- + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 4 ++++ + drivers/usb/serial/usb-serial.c | 23 +++++++---------------- + 7 files changed, 21 insertions(+), 19 deletions(-) +Merging quilt/staging.current +$ git merge quilt/staging.current +Merge made by recursive. + drivers/staging/spectra/ffsport.c | 29 ++-- + drivers/staging/spectra/flash.c | 420 +------------------------------------ + 2 files changed, 18 insertions(+), 431 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Auto-merging drivers/char/hw_random/n2-drv.c +Merge made by recursive. + crypto/Kconfig | 8 ++++---- + crypto/ahash.c | 7 +++++-- + crypto/algboss.c | 8 ++++---- + crypto/testmgr.c | 4 ++-- + drivers/char/hw_random/n2-drv.c | 2 +- + 5 files changed, 16 insertions(+), 13 deletions(-) +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Already up-to-date. +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging arch/arm/mach-davinci/board-da830-evm.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c +Merge made by recursive. +Merging i.MX/for-next +$ git merge i.MX/for-next +Merge made by recursive. + arch/arm/mach-imx/Kconfig | 9 + + arch/arm/mach-imx/Makefile | 1 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 263 ++++++++++++++++++++ + arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx25/mach-cpuimx25.c | 4 +- + arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx3/mach-cpuimx35.c | 4 +- + arch/arm/plat-mxc/include/mach/eukrea-baseboards.h | 4 +- + 8 files changed, 281 insertions(+), 8 deletions(-) + create mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c +Merging msm/for-next +$ git merge msm/for-next +Already uptodate! +Merge made by recursive. +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/configs/omap_4430sdp_defconfig | 3 + + arch/arm/mach-omap2/Makefile | 1 + + arch/arm/mach-omap2/board-n8x0.c | 49 ++++++++++++++++-------- + arch/arm/mach-omap2/board-omap4panda.c | 2 - + arch/arm/mach-omap2/clock3xxx_data.c | 14 +++--- + arch/arm/mach-omap2/id.c | 2 +- + arch/arm/mach-omap2/include/mach/entry-macro.S | 6 ++- + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/omap-iommu.c | 2 - + arch/arm/mach-omap2/omap-smp.c | 3 +- + arch/arm/mach-omap2/pm34xx.c | 4 +- + arch/arm/plat-omap/gpio.c | 4 +- + arch/arm/plat-omap/include/plat/smp.h | 7 --- + 13 files changed, 56 insertions(+), 43 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Resolved 'arch/arm/mach-s3c64xx/Makefile' using previous resolution. +Resolved 'arch/arm/mach-s3c64xx/mach-smdk6410.c' using previous resolution. +Resolved 'arch/arm/plat-samsung/Kconfig' using previous resolution. +Resolved 'drivers/input/touchscreen/s3c2410_ts.c' using previous resolution. +Renaming arch/arm/mach-s3c2410/include/mach/ts.h->arch/arm/plat-samsung/include/plat/ts.h +Auto-merging arch/arm/plat-samsung/include/plat/ts.h +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-s3c64xx/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c +Auto-merging arch/arm/plat-s3c24xx/devs.c +Auto-merging arch/arm/plat-samsung/Kconfig +CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig +Auto-merging drivers/input/touchscreen/s3c2410_ts.c +CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4de7ea6] Merge remote branch 'samsung/next-samsung' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-s3c64xx/dev-ts.c | 61 +++++++++++++++++++++++++++++++++ + arch/arm/mach-s3c64xx/mach-smdk6410.c | 5 +++ + 2 files changed, 66 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-s3c64xx/dev-ts.c +Merging s5p/for-next +$ git merge s5p/for-next +Already up-to-date. +Merging tegra/for-next +$ git merge tegra/for-next +Resolved 'arch/arm/Kconfig' using previous resolution. +Resolved 'arch/arm/mm/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/mm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 727ccdf] Merge remote branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/configs/tegra_defconfig | 1095 ++++++++++++++++++++++++++++++++++++++ + 1 files changed, 1095 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/configs/tegra_defconfig +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 11 +++++++++++ + arch/blackfin/include/asm/bitops.h | 17 ++++++++++------- + 2 files changed, 21 insertions(+), 7 deletions(-) +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already uptodate! +Merge made by recursive. +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Auto-merging arch/m68knommu/kernel/process.c +Auto-merging drivers/serial/68328serial.c +Merge made by recursive. + arch/m68k/include/asm/ide.h | 13 +++++++++++-- + arch/m68knommu/kernel/process.c | 10 +++++----- + drivers/spi/coldfire_qspi.c | 1 + + 3 files changed, 17 insertions(+), 7 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Auto-merging arch/microblaze/include/asm/page.h +Auto-merging drivers/serial/uartlite.c +Merge made by recursive. + arch/microblaze/Kconfig | 17 +++++++++++++++++ + arch/microblaze/include/asm/page.h | 3 --- + arch/microblaze/include/asm/prom.h | 1 + + arch/microblaze/include/asm/seccomp.h | 16 ++++++++++++++++ + arch/microblaze/include/asm/setup.h | 6 ++++++ + arch/microblaze/include/asm/thread_info.h | 20 ++++++++------------ + arch/microblaze/kernel/entry.S | 23 +++++++---------------- + arch/microblaze/kernel/exceptions.c | 8 +------- + arch/microblaze/kernel/kgdb.c | 3 +-- + arch/microblaze/kernel/setup.c | 6 ------ + arch/microblaze/kernel/timer.c | 2 +- + arch/microblaze/platform/generic/system.dts | 1 + + drivers/serial/uartlite.c | 26 +++++++++++++++++++++++++- + kernel/debug/kdb/kdb_private.h | 7 +++++++ + kernel/debug/kdb/kdb_support.c | 4 ++-- + 15 files changed, 93 insertions(+), 50 deletions(-) + create mode 100644 arch/microblaze/include/asm/seccomp.h +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/master +$ git merge sh/master +Recorded preimage for 'arch/sh/include/asm/Kbuild' +Resolved 'drivers/Makefile' using previous resolution. +Auto-merging arch/sh/Kconfig +Auto-merging arch/sh/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/sh/include/asm/Kbuild +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/i2c/busses/i2c-sh_mobile.c +Auto-merging drivers/serial/sh-sci.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/sh/include/asm/Kbuild'. +[master 9764f13] Merge remote branch 'sh/master' +$ git diff -M --stat --summary HEAD^.. + arch/sh/Kconfig | 3 +- + arch/sh/boards/Kconfig | 16 + + arch/sh/boards/Makefile | 2 + + arch/sh/boards/board-sh2007.c | 133 +++ + arch/sh/boards/board-sh7757lcr.c | 374 +++++++ + arch/sh/configs/sh2007_defconfig | 1357 +++++++++++++++++++++++++ + arch/sh/configs/sh7757lcr_defconfig | 1126 ++++++++++++++++++++ + arch/sh/drivers/dma/dma-api.c | 4 +- + arch/sh/drivers/pci/pci-sh7751.c | 2 +- + arch/sh/drivers/pci/pci-sh7780.c | 2 +- + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + arch/sh/include/asm/Kbuild | 2 + + arch/sh/include/asm/elf.h | 27 +- + arch/sh/include/asm/fixmap.h | 4 +- + arch/sh/include/asm/irq.h | 2 +- + arch/sh/include/asm/kprobes.h | 1 - + arch/sh/include/asm/processor_32.h | 3 - + arch/sh/include/asm/processor_64.h | 3 - + arch/sh/include/asm/ptrace.h | 169 ++-- + arch/sh/include/asm/ptrace_32.h | 83 ++ + arch/sh/include/asm/ptrace_64.h | 20 + + arch/sh/include/asm/system_32.h | 13 +- + arch/sh/include/asm/tlbflush.h | 2 + + arch/sh/include/cpu-sh4/cpu/sh7757.h | 301 +++--- + arch/sh/include/mach-common/mach/sh2007.h | 117 +++ + arch/sh/kernel/Makefile | 2 +- + arch/sh/kernel/cpu/sh4/probe.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 199 ++-- + arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 1582 +++++++++++++++++------------ + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 66 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 222 +++-- + arch/sh/kernel/kprobes.c | 100 +- + arch/sh/kernel/ptrace.c | 33 + + arch/sh/kernel/ptrace_32.c | 27 + + arch/sh/kernel/ptrace_64.c | 79 ++ + arch/sh/kernel/reboot.c | 4 + + arch/sh/mm/consistent.c | 3 +- + arch/sh/mm/init.c | 52 +- + arch/sh/mm/tlbflush_32.c | 16 + + arch/sh/mm/tlbflush_64.c | 5 + + arch/sh/tools/mach-types | 2 + + drivers/Makefile | 2 +- + drivers/clocksource/sh_cmt.c | 12 +- + drivers/i2c/busses/i2c-sh_mobile.c | 23 +- + drivers/serial/sh-sci.h | 17 +- + drivers/sh/clk.c | 17 +- + sound/soc/sh/siu_pcm.c | 2 + + 47 files changed, 5042 insertions(+), 1193 deletions(-) + create mode 100644 arch/sh/boards/board-sh2007.c + create mode 100644 arch/sh/boards/board-sh7757lcr.c + create mode 100644 arch/sh/configs/sh2007_defconfig + create mode 100644 arch/sh/configs/sh7757lcr_defconfig + create mode 100644 arch/sh/include/asm/ptrace_32.h + create mode 100644 arch/sh/include/asm/ptrace_64.h + create mode 100644 arch/sh/include/mach-common/mach/sh2007.h + create mode 100644 arch/sh/kernel/ptrace.c +Merging genesis/master +$ git merge genesis/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 14dbe08] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Resolved 'net/Makefile' using previous resolution. +Auto-merging MAINTAINERS +Removing fs/ceph/README +Removing fs/ceph/ceph_strings.c +Auto-merging net/Kconfig +Auto-merging net/Makefile +CONFLICT (content): Merge conflict in net/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8bfc285] Merge remote branch 'ceph/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 + + drivers/block/Kconfig | 16 + + drivers/block/Makefile | 1 + + drivers/block/rbd.c | 1844 +++++++++++++++++++++++++++++ + drivers/block/rbd_types.h | 73 ++ + fs/ceph/Kconfig | 14 +- + fs/ceph/Makefile | 11 +- + fs/ceph/README | 20 - + fs/ceph/addr.c | 65 +- + fs/ceph/caps.c | 35 +- + fs/ceph/ceph_frag.c | 3 +- + fs/ceph/ceph_strings.c | 193 --- + fs/ceph/debugfs.c | 407 ++----- + fs/ceph/dir.c | 55 +- + fs/ceph/export.c | 5 +- + fs/ceph/file.c | 207 +--- + fs/ceph/inode.c | 19 +- + fs/ceph/ioctl.c | 11 +- + fs/ceph/locks.c | 6 +- + fs/ceph/mds_client.c | 85 +- + fs/ceph/mds_client.h | 20 +- + fs/ceph/mdsmap.c | 11 +- + fs/ceph/snap.c | 10 +- + fs/ceph/strings.c | 117 ++ + fs/ceph/super.c | 1154 ++++++++----------- + fs/ceph/super.h | 397 +++---- + fs/ceph/xattr.c | 15 +- + {fs => include/linux}/ceph/auth.h | 4 +- + {fs => include/linux}/ceph/buffer.h | 0 + {fs => include/linux}/ceph/ceph_debug.h | 2 +- + {fs => include/linux}/ceph/ceph_frag.h | 0 + {fs => include/linux}/ceph/ceph_fs.h | 0 + {fs => include/linux}/ceph/ceph_hash.h | 0 + {fs => include/linux}/ceph/crush/crush.h | 0 + {fs => include/linux}/ceph/crush/hash.h | 0 + {fs => include/linux}/ceph/crush/mapper.h | 0 + include/linux/ceph/debugfs.h | 33 + + {fs => include/linux}/ceph/decode.h | 5 + + include/linux/ceph/libceph.h | 249 ++++ + {fs => include/linux}/ceph/mdsmap.h | 0 + {fs => include/linux}/ceph/messenger.h | 12 +- + {fs => include/linux}/ceph/mon_client.h | 1 + + {fs => include/linux}/ceph/msgpool.h | 0 + {fs => include/linux}/ceph/msgr.h | 0 + {fs => include/linux}/ceph/osd_client.h | 67 ++ + {fs => include/linux}/ceph/osdmap.h | 2 + + {fs => include/linux}/ceph/pagelist.h | 2 +- + {fs => include/linux}/ceph/rados.h | 0 + {fs => include/linux}/ceph/types.h | 0 + net/Kconfig | 1 + + net/Makefile | 1 + + net/ceph/Kconfig | 27 + + net/ceph/Makefile | 37 + + {fs => net}/ceph/armor.c | 0 + {fs => net}/ceph/auth.c | 10 +- + {fs => net}/ceph/auth_none.c | 7 +- + {fs => net}/ceph/auth_none.h | 3 +- + {fs => net}/ceph/auth_x.c | 9 +- + {fs => net}/ceph/auth_x.h | 3 +- + {fs => net}/ceph/auth_x_protocol.h | 0 + {fs => net}/ceph/buffer.c | 9 +- + net/ceph/ceph_common.c | 529 +++++++++ + {fs => net}/ceph/ceph_fs.c | 5 +- + {fs => net}/ceph/ceph_hash.c | 2 +- + net/ceph/ceph_strings.c | 84 ++ + {fs => net}/ceph/crush/crush.c | 2 +- + {fs => net}/ceph/crush/hash.c | 2 +- + {fs => net}/ceph/crush/mapper.c | 4 +- + {fs => net}/ceph/crypto.c | 4 +- + {fs => net}/ceph/crypto.h | 4 +- + net/ceph/debugfs.c | 268 +++++ + {fs => net}/ceph/messenger.c | 296 ++++- + {fs => net}/ceph/mon_client.c | 73 +- + {fs => net}/ceph/msgpool.c | 4 +- + {fs => net}/ceph/osd_client.c | 400 +++++-- + {fs => net}/ceph/osdmap.c | 30 +- + {fs => net}/ceph/pagelist.c | 8 +- + net/ceph/pagevec.c | 223 ++++ + 78 files changed, 5187 insertions(+), 2040 deletions(-) + create mode 100644 drivers/block/rbd.c + create mode 100644 drivers/block/rbd_types.h + delete mode 100644 fs/ceph/README + delete mode 100644 fs/ceph/ceph_strings.c + create mode 100644 fs/ceph/strings.c + rename {fs => include/linux}/ceph/auth.h (97%) + rename {fs => include/linux}/ceph/buffer.h (100%) + rename {fs => include/linux}/ceph/ceph_debug.h (96%) + rename {fs => include/linux}/ceph/ceph_frag.h (100%) + rename {fs => include/linux}/ceph/ceph_fs.h (100%) + rename {fs => include/linux}/ceph/ceph_hash.h (100%) + rename {fs => include/linux}/ceph/crush/crush.h (100%) + rename {fs => include/linux}/ceph/crush/hash.h (100%) + rename {fs => include/linux}/ceph/crush/mapper.h (100%) + create mode 100644 include/linux/ceph/debugfs.h + rename {fs => include/linux}/ceph/decode.h (96%) + create mode 100644 include/linux/ceph/libceph.h + rename {fs => include/linux}/ceph/mdsmap.h (100%) + rename {fs => include/linux}/ceph/messenger.h (95%) + rename {fs => include/linux}/ceph/mon_client.h (99%) + rename {fs => include/linux}/ceph/msgpool.h (100%) + rename {fs => include/linux}/ceph/msgr.h (100%) + rename {fs => include/linux}/ceph/osd_client.h (76%) + rename {fs => include/linux}/ceph/osdmap.h (97%) + rename {fs => include/linux}/ceph/pagelist.h (93%) + rename {fs => include/linux}/ceph/rados.h (100%) + rename {fs => include/linux}/ceph/types.h (100%) + create mode 100644 net/ceph/Kconfig + create mode 100644 net/ceph/Makefile + rename {fs => net}/ceph/armor.c (100%) + rename {fs => net}/ceph/auth.c (97%) + rename {fs => net}/ceph/auth_none.c (96%) + rename {fs => net}/ceph/auth_none.h (94%) + rename {fs => net}/ceph/auth_x.c (99%) + rename {fs => net}/ceph/auth_x.h (96%) + rename {fs => net}/ceph/auth_x_protocol.h (100%) + rename {fs => net}/ceph/buffer.c (86%) + create mode 100644 net/ceph/ceph_common.c + rename {fs => net}/ceph/ceph_fs.c (92%) + rename {fs => net}/ceph/ceph_hash.c (98%) + create mode 100644 net/ceph/ceph_strings.c + rename {fs => net}/ceph/crush/crush.c (98%) + rename {fs => net}/ceph/crush/hash.c (98%) + rename {fs => net}/ceph/crush/mapper.c (99%) + rename {fs => net}/ceph/crypto.c (99%) + rename {fs => net}/ceph/crypto.h (95%) + create mode 100644 net/ceph/debugfs.c + rename {fs => net}/ceph/messenger.c (89%) + rename {fs => net}/ceph/mon_client.c (94%) + rename {fs => net}/ceph/msgpool.c (95%) + rename {fs => net}/ceph/osd_client.c (84%) + rename {fs => net}/ceph/osdmap.c (97%) + rename {fs => net}/ceph/pagelist.c (83%) + create mode 100644 net/ceph/pagevec.c +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. + fs/ecryptfs/keystore.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Recorded preimage for 'fs/logfs/logfs.h' +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/logfs/logfs.h'. +[master d7bb446] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merging fs/nfs/super.c +Auto-merging net/sunrpc/xprtsock.c +Merge made by recursive. + fs/nfs/dir.c | 7 +++++++ + fs/nfs/file.c | 2 +- + fs/nfs/nfs4proc.c | 3 +-- + fs/nfs/super.c | 7 +++++++ + net/sunrpc/xprtrdma/rpc_rdma.c | 2 ++ + net/sunrpc/xprtrdma/verbs.c | 22 +++++++++++++++++----- + net/sunrpc/xprtsock.c | 28 ++++++++++++++++++++++------ + 7 files changed, 57 insertions(+), 14 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/super.c | 4 +++- + fs/nilfs2/the_nilfs.c | 8 ++++---- + include/linux/nilfs2_fs.h | 1 + + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging include/linux/fs.h +Merge made by recursive. + fs/ext3/super.c | 4 +- + fs/ext4/super.c | 8 +- + fs/jbd2/journal.c | 4 + + fs/libfs.c | 29 ++++ + fs/ocfs2/aops.c | 9 +- + fs/ocfs2/aops.h | 3 +- + fs/ocfs2/blockcheck.c | 4 +- + fs/ocfs2/file.c | 49 +++---- + fs/ocfs2/inode.c | 6 +- + fs/ocfs2/inode.h | 11 +- + fs/ocfs2/ioctl.c | 356 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/ocfs2/journal.c | 9 +- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/mmap.c | 7 +- + fs/ocfs2/ocfs2.h | 23 ++- + fs/ocfs2/ocfs2_ioctl.h | 95 +++++++++++++ + fs/ocfs2/refcounttree.c | 43 ++++++- + fs/ocfs2/refcounttree.h | 7 +- + fs/ocfs2/super.c | 51 ++++++- + include/linux/fs.h | 2 + + 20 files changed, 645 insertions(+), 78 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Merge made by recursive. + fs/reiserfs/inode.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + drivers/pci/pci.c | 2 +- + drivers/pci/proc.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/Kconfig | 6 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-apple.c | 7 +- + drivers/hid/hid-cherry.c | 7 +- + drivers/hid/hid-core.c | 5 +- + drivers/hid/hid-cypress.c | 9 +- + drivers/hid/hid-elecom.c | 7 +- + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-input.c | 4 + + drivers/hid/hid-kye.c | 7 +- + drivers/hid/hid-lg.c | 9 +- + drivers/hid/hid-microsoft.c | 7 +- + drivers/hid/hid-monterey.c | 7 +- + drivers/hid/hid-ortek.c | 7 +- + drivers/hid/hid-petalynx.c | 7 +- + drivers/hid/hid-prodikeys.c | 7 +- + drivers/hid/hid-samsung.c | 20 +- + drivers/hid/hid-sony.c | 7 +- + drivers/hid/hid-sunplus.c | 7 +- + drivers/hid/hid-uclogic.c | 404 +++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-zydacron.c | 7 +- + drivers/hid/usbhid/hid-quirks.c | 3 +- + include/linux/hid.h | 4 +- + 23 files changed, 494 insertions(+), 57 deletions(-) + create mode 100644 drivers/hid/hid-uclogic.c +Merging quilt/i2c +$ git merge quilt/i2c +Already up-to-date. +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Already up-to-date. +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Recorded preimage for 'Documentation/kernel-parameters.txt' +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/kernel-parameters.txt'. +[master 405bf45] Merge branch 'quilt/kernel-doc' +$ git diff -M --stat --summary HEAD^.. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Auto-merging drivers/media/video/cx23885/cx23885-i2c.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.h +Auto-merging drivers/media/video/ivtv/ivtv-i2c.c +Auto-merging drivers/media/video/v4l2-common.c +Auto-merging drivers/media/video/v4l2-dev.c +Merge made by recursive. +Merging kbuild/for-next +$ git merge kbuild/for-next +Merge made by recursive. + scripts/kconfig/confdata.c | 6 ++++-- + scripts/kconfig/symbol.c | 2 ++ + 2 files changed, 6 insertions(+), 2 deletions(-) +Merging kconfig/for-next +$ git merge kconfig/for-next +Already uptodate! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/infiniband/hw/cxgb4/cq.c | 4 ++-- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/cxgb4/qp.c | 6 +++--- + drivers/infiniband/hw/nes/nes_verbs.c | 12 ++++++------ + 5 files changed, 13 insertions(+), 13 deletions(-) +Merging acpi/test +$ git merge acpi/test +Already up-to-date. +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging arch/x86/kernel/i387.c +Auto-merging arch/x86/kvm/x86.c +Merge made by recursive. + arch/x86/kernel/i387.c | 1 + + arch/x86/kvm/i8254.c | 2 +- + arch/x86/kvm/x86.c | 4 ++-- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Already uptodate! +Merge made by recursive. +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + drivers/cpufreq/cpufreq.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Already up-to-date. +Merging input/next +$ git merge input/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Merge made by recursive. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/leds-gpio.c +Merge made by recursive. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging drivers/char/keyboard.c +Merge made by recursive. + drivers/char/keyboard.c | 37 +++++++++++++++++++++++++++++++++++++ + drivers/serial/kgdboc.c | 13 +++++++++++++ + include/linux/kbd_kern.h | 1 + + 3 files changed, 51 insertions(+), 0 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging include/linux/slub_def.h +Auto-merging mm/slab.c +Merge made by recursive. + include/linux/slub_def.h | 2 +- + mm/slab.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Auto-merging drivers/video/via/via-core.c +Merge made by recursive. +Merging florian-viafb/viafb-next +$ git merge florian-viafb/viafb-next +Removing drivers/video/via/lcdtbl.h +Merge made by recursive. + drivers/video/via/dvi.c | 172 +++++++++---- + drivers/video/via/dvi.h | 4 +- + drivers/video/via/hw.c | 456 ++++++++++++-------------------- + drivers/video/via/hw.h | 16 +- + drivers/video/via/ioctl.c | 2 + + drivers/video/via/lcd.c | 49 +++- + drivers/video/via/lcd.h | 6 +- + drivers/video/via/lcdtbl.h | 591 ------------------------------------------ + drivers/video/via/viafbdev.c | 8 +- + drivers/video/via/viafbdev.h | 3 + + 10 files changed, 360 insertions(+), 947 deletions(-) + delete mode 100644 drivers/video/via/lcdtbl.h +Merging voltage/for-next +$ git merge voltage/for-next +Recorded preimage for 'drivers/regulator/ab8500.c' +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/regulator/ab8500.c +CONFLICT (add/add): Merge conflict in drivers/regulator/ab8500.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/regulator/ab8500.c'. +[master 23552a1] Merge remote branch 'voltage/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/regulator/ab8500.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + security/apparmor/lsm.c | 2 +- + security/tomoyo/common.c | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merging include/linux/wlp.h +Merge made by recursive. + drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ + drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- + drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ + drivers/uwb/wlp/wlp-lc.c | 12 +++++----- + include/linux/wlp.h | 2 +- + 5 files changed, 58 insertions(+), 58 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging arch/blackfin/mach-bf537/boards/stamp.c +Auto-merging block/blk-core.c +Auto-merging drivers/gpu/drm/radeon/radeon_cs.c +Auto-merging drivers/rtc/rtc-nuc900.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging fs/exofs/inode.c +Auto-merging fs/exofs/ios.c +Merge made by recursive. + Documentation/arm/SA1100/FreeBird | 4 ++-- + arch/blackfin/mach-bf527/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf537/boards/stamp.c | 2 +- + arch/xtensa/include/asm/uaccess.h | 2 +- + block/blk-core.c | 2 +- + drivers/ata/pata_bf54x.c | 2 +- + drivers/base/core.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/media/video/zoran/videocodec.h | 2 +- + drivers/net/depca.c | 2 +- + drivers/net/igb/igb_main.c | 2 +- + drivers/net/ps3_gelic_net.c | 4 ++-- + drivers/net/skfp/hwt.c | 2 +- + drivers/net/skfp/skfddi.c | 2 +- + drivers/net/tulip/pnic2.c | 2 +- + drivers/rtc/rtc-nuc900.c | 2 +- + drivers/s390/block/dasd_3990_erp.c | 2 +- + drivers/s390/char/tape_3590.c | 6 +++--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/usb/gadget/at91_udc.c | 1 - + drivers/usb/gadget/f_audio.c | 2 -- + drivers/usb/gadget/f_hid.c | 4 ---- + drivers/usb/gadget/fsl_udc_core.c | 6 ------ + drivers/usb/gadget/langwell_udc.c | 3 --- + drivers/usb/gadget/pxa27x_udc.c | 2 -- + drivers/usb/gadget/rndis.c | 2 -- + drivers/usb/host/ehci-hcd.c | 1 - + drivers/usb/host/imx21-hcd.c | 4 ++-- + drivers/usb/host/ohci-hcd.c | 1 - + drivers/usb/host/oxu210hp-hcd.c | 9 --------- + drivers/usb/host/pci-quirks.c | 2 -- + drivers/usb/host/u132-hcd.c | 8 ++------ + drivers/usb/image/microtek.c | 9 --------- + drivers/usb/misc/ftdi-elan.c | 2 -- + drivers/usb/mon/mon_main.c | 2 -- + drivers/usb/musb/musb_gadget.c | 1 - + drivers/usb/serial/cypress_m8.c | 2 -- + drivers/usb/serial/ftdi_sio.c | 1 - + drivers/usb/serial/garmin_gps.c | 1 - + drivers/usb/serial/io_edgeport.c | 11 ----------- + drivers/usb/serial/io_ti.c | 4 ---- + drivers/usb/serial/iuu_phoenix.c | 1 - + drivers/usb/serial/keyspan_pda.c | 1 - + drivers/usb/serial/mos7720.c | 6 ------ + drivers/usb/serial/mos7840.c | 7 ------- + drivers/usb/serial/omninet.c | 2 -- + drivers/usb/serial/sierra.c | 2 -- + drivers/usb/serial/spcp8x5.c | 1 - + drivers/usb/serial/usb_wwan.c | 1 - + drivers/usb/serial/whiteheat.c | 6 ------ + drivers/video/bf54x-lq043fb.c | 6 +++--- + drivers/video/bfin-t350mcqb-fb.c | 2 +- + fs/exofs/inode.c | 14 +++++++------- + fs/exofs/ios.c | 10 +++++----- + fs/jfs/jfs_mount.c | 4 ++-- + kernel/trace/trace_kprobe.c | 2 +- + mm/percpu.c | 2 +- + net/mac80211/mesh.h | 2 +- + net/wanrouter/wanmain.c | 4 ++-- + 59 files changed, 50 insertions(+), 147 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Already up-to-date. +Merging irda/for-next +$ git merge irda/for-next +Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. +Auto-merging drivers/net/irda/irda-usb.c +CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3d4be67] Merge remote branch 'irda/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging catalin/for-next +$ git merge catalin/for-next +Auto-merging arch/arm/include/asm/tlbflush.h +Auto-merging arch/arm/mm/Kconfig +Auto-merging mm/kmemleak.c +Merge made by recursive. + Documentation/arm/00-INDEX | 2 + + Documentation/arm/swp_emulation | 27 ++++ + arch/arm/include/asm/assembler.h | 13 +- + arch/arm/include/asm/cacheflush.h | 9 +- + arch/arm/include/asm/domain.h | 31 ++++- + arch/arm/include/asm/futex.h | 9 +- + arch/arm/include/asm/pgtable.h | 29 ++++- + arch/arm/include/asm/smp_plat.h | 4 + + arch/arm/include/asm/tlbflush.h | 12 ++- + arch/arm/include/asm/traps.h | 2 + + arch/arm/include/asm/uaccess.h | 16 +- + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/fiq.c | 5 + + arch/arm/kernel/swp_emulate.c | 260 +++++++++++++++++++++++++++++++++++++ + arch/arm/kernel/traps.c | 14 ++- + arch/arm/lib/getuser.S | 13 +- + arch/arm/lib/putuser.S | 29 ++-- + arch/arm/lib/uaccess.S | 83 ++++++------ + arch/arm/mm/Kconfig | 43 ++++++ + arch/arm/mm/cache-l2x0.c | 15 ++- + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/mm/copypage-v6.c | 2 +- + arch/arm/mm/copypage-xscale.c | 2 +- + arch/arm/mm/dma-mapping.c | 6 + + arch/arm/mm/fault-armv.c | 8 +- + arch/arm/mm/flush.c | 46 +++++-- + arch/arm/mm/mmu.c | 20 +++- + arch/arm/mm/proc-macros.S | 7 + + arch/arm/mm/proc-v7.S | 9 +- + 30 files changed, 600 insertions(+), 123 deletions(-) + create mode 100644 Documentation/arm/swp_emulation + create mode 100644 arch/arm/kernel/swp_emulate.c +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Recorded preimage for 'include/linux/Kbuild' +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/Kbuild'. +[master 7c3aec3] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/edac/i7core_edac.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f6202a9] Merge remote branch 'i7core_edac/linux_next' +$ git diff -M --stat --summary HEAD^.. +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging limits/writable_limits +$ git merge limits/writable_limits +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/kernel/i387.c +Merge made by recursive. + Documentation/x86/x86_64/kernel-stacks | 6 +++--- + arch/x86/Kconfig.debug | 10 ---------- + arch/x86/include/asm/apb_timer.h | 1 - + arch/x86/include/asm/cpu.h | 1 - + arch/x86/include/asm/irq.h | 12 +++++------- + arch/x86/include/asm/module.h | 7 +------ + arch/x86/include/asm/page_32_types.h | 4 ---- + arch/x86/kernel/apb_timer.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 12 ++++++------ + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/intel.c | 2 +- + arch/x86/kernel/i387.c | 6 ++++++ + arch/x86/kernel/irq_32.c | 8 +------- + arch/x86/kernel/process.c | 1 - + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/mm/k8topology_64.c | 6 +++--- + include/linux/irq.h | 2 +- + 20 files changed, 32 insertions(+), 57 deletions(-) +Merging lost-spurious-irq/lost-spurious-irq +$ git merge lost-spurious-irq/lost-spurious-irq +Resolved 'drivers/ata/sata_fsl.c' using previous resolution. +Resolved 'drivers/ata/sata_mv.c' using previous resolution. +Resolved 'drivers/ata/sata_nv.c' using previous resolution. +Resolved 'include/linux/libata.h' using previous resolution. +Auto-merging arch/arm/mach-bcmring/core.c +Auto-merging arch/arm/mach-ep93xx/core.c +Auto-merging arch/arm/mach-integrator/integrator_ap.c +Auto-merging arch/arm/mach-mmp/time.c +Auto-merging arch/arm/mach-u300/timer.c +Auto-merging arch/arm/plat-iop/time.c +Auto-merging arch/ia64/kernel/time.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ata/libata-sff.c +Auto-merging drivers/ata/sata_fsl.c +CONFLICT (content): Merge conflict in drivers/ata/sata_fsl.c +Auto-merging drivers/ata/sata_mv.c +CONFLICT (content): Merge conflict in drivers/ata/sata_mv.c +Auto-merging drivers/ata/sata_nv.c +CONFLICT (content): Merge conflict in drivers/ata/sata_nv.c +Auto-merging drivers/clocksource/sh_cmt.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/irq.h +Auto-merging include/linux/libata.h +CONFLICT (content): Merge conflict in include/linux/libata.h +Auto-merging kernel/irq/manage.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bbb57ab] Merge remote branch 'lost-spurious-irq/lost-spurious-irq' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-at91/at91rm9200_time.c | 2 +- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-bcmring/core.c | 2 +- + arch/arm/mach-clps711x/time.c | 2 +- + arch/arm/mach-cns3xxx/core.c | 2 +- + arch/arm/mach-ebsa110/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-footbridge/dc21285-timer.c | 2 +- + arch/arm/mach-footbridge/isa-timer.c | 2 +- + arch/arm/mach-h720x/cpu-h7201.c | 2 +- + arch/arm/mach-h720x/cpu-h7202.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 2 +- + arch/arm/mach-ixp2000/core.c | 2 +- + arch/arm/mach-ixp23xx/core.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-lh7a40x/time.c | 2 +- + arch/arm/mach-mmp/time.c | 2 +- + arch/arm/mach-netx/time.c | 2 +- + arch/arm/mach-ns9xxx/irq.c | 3 - + arch/arm/mach-ns9xxx/time-ns9360.c | 2 +- + arch/arm/mach-nuc93x/time.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/timer-gp.c | 2 +- + arch/arm/mach-pnx4008/time.c | 2 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-shark/core.c | 2 +- + arch/arm/mach-u300/timer.c | 2 +- + arch/arm/mach-w90x900/time.c | 2 +- + arch/arm/plat-iop/time.c | 2 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-samsung/time.c | 2 +- + arch/arm/plat-versatile/timer-sp.c | 2 +- + arch/blackfin/kernel/time-ts.c | 6 +- + arch/ia64/kernel/time.c | 2 +- + arch/parisc/kernel/irq.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 5 +- + arch/x86/kernel/time.c | 2 +- + drivers/ata/libata-core.c | 54 ++- + drivers/ata/libata-eh.c | 4 +- + drivers/ata/libata-sff.c | 37 +- + drivers/ata/sata_fsl.c | 8 +- + drivers/ata/sata_mv.c | 25 +- + drivers/ata/sata_nv.c | 57 +-- + drivers/clocksource/sh_cmt.c | 3 +- + drivers/clocksource/sh_mtu2.c | 3 +- + drivers/clocksource/sh_tmu.c | 3 +- + drivers/usb/core/hcd.c | 1 + + include/linux/interrupt.h | 43 +- + include/linux/irq.h | 40 +- + include/linux/libata.h | 2 + + kernel/irq/chip.c | 20 +- + kernel/irq/handle.c | 7 +- + kernel/irq/internals.h | 10 +- + kernel/irq/manage.c | 18 +- + kernel/irq/proc.c | 5 +- + kernel/irq/spurious.c | 978 +++++++++++++++++++++++++----- + 59 files changed, 1062 insertions(+), 344 deletions(-) +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging bkl-core/bkl/core +$ git merge bkl-core/bkl/core +Already up-to-date. +Merging bkl-procfs/bkl/procfs +$ git merge bkl-procfs/bkl/procfs +Already up-to-date. +Merging bkl-ioctl/bkl/ioctl +$ git merge bkl-ioctl/bkl/ioctl +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Already up-to-date. +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging staging-next/staging-next +$ git merge staging-next/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. +$ rm -r ../rebase-tmp |