diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 3931 |
1 files changed, 3931 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..8c3f78b45c9d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3931 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at b58602a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 +Merging origin/master +$ git merge origin/master +Updating b58602a..7d3b56b +Fast forward + CREDITS | 8 +- + Documentation/ABI/testing/sysfs-class-uwb_rc | 14 +- + Documentation/cpu-hotplug.txt | 17 +- + Documentation/cputopology.txt | 48 + + Documentation/feature-removal-schedule.txt | 9 - + Documentation/filesystems/devpts.txt | 132 ++ + Documentation/filesystems/ubifs.txt | 3 + + Documentation/ioctl/ioctl-number.txt | 4 + + Documentation/kbuild/00-INDEX | 6 +- + Documentation/kbuild/kbuild.txt | 126 ++ + Documentation/kbuild/kconfig.txt | 188 +++ + Documentation/usb/wusb-cbaf | 9 - + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/si470x.txt | 1 + + Documentation/video4linux/v4l2-framework.txt | 19 +- + MAINTAINERS | 19 +- + Makefile | 3 +- + README | 32 +- + arch/alpha/include/asm/smp.h | 1 - + arch/alpha/include/asm/topology.h | 17 + + arch/alpha/kernel/Makefile | 2 +- + arch/alpha/kernel/binfmt_loader.c | 51 + + arch/alpha/kernel/irq.c | 5 +- + arch/alpha/kernel/process.c | 2 + + arch/alpha/kernel/setup.c | 5 + + arch/alpha/kernel/smp.c | 7 +- + arch/alpha/kernel/sys_dp264.c | 8 +- + arch/alpha/kernel/sys_titan.c | 4 +- + arch/arm/common/gic.c | 4 +- + arch/arm/kernel/irq.c | 2 +- + arch/arm/kernel/smp.c | 10 - + arch/arm/mach-at91/at91rm9200_time.c | 3 +- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-davinci/time.c | 2 +- + arch/arm/mach-imx/time.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-msm/timer.c | 2 +- + arch/arm/mach-ns9xxx/time-ns9360.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-pxa/time.c | 2 +- + arch/arm/mach-realview/core.c | 2 +- + arch/arm/mach-realview/localtimer.c | 4 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-versatile/core.c | 2 +- + arch/arm/oprofile/op_model_mpcore.c | 4 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-orion/time.c | 2 +- + arch/avr32/include/asm/bitops.h | 5 + + arch/avr32/kernel/time.c | 2 +- + arch/blackfin/include/asm/bitops.h | 1 + + arch/blackfin/kernel/time-ts.c | 2 +- + arch/cris/arch-v32/kernel/irq.c | 4 +- + arch/cris/arch-v32/kernel/smp.c | 4 - + arch/cris/include/asm/bitops.h | 1 + + arch/cris/include/asm/smp.h | 1 - + arch/h8300/include/asm/bitops.h | 1 + + arch/ia64/Kconfig | 3 + + arch/ia64/hp/sim/hpsim_irq.c | 2 +- + arch/ia64/include/asm/irq.h | 2 +- + arch/ia64/include/asm/kvm.h | 6 +- + arch/ia64/include/asm/kvm_host.h | 198 ++-- + arch/ia64/include/asm/smp.h | 1 - + arch/ia64/include/asm/topology.h | 11 +- + arch/ia64/kernel/acpi.c | 3 +- + arch/ia64/kernel/iosapic.c | 35 +- + arch/ia64/kernel/irq.c | 13 +- + arch/ia64/kernel/msi_ia64.c | 12 +- + arch/ia64/kernel/smpboot.c | 10 +- + arch/ia64/kernel/time.c | 18 +- + arch/ia64/kernel/topology.c | 2 +- + arch/ia64/kvm/Makefile | 6 +- + arch/ia64/kvm/asm-offsets.c | 11 +- + arch/ia64/kvm/kvm-ia64.c | 110 +- + arch/ia64/kvm/kvm_lib.c | 15 + + arch/ia64/kvm/kvm_minstate.h | 4 +- + arch/ia64/kvm/misc.h | 3 +- + arch/ia64/kvm/mmio.c | 38 +- + arch/ia64/kvm/process.c | 29 +- + arch/ia64/kvm/vcpu.c | 76 ++- + arch/ia64/kvm/vcpu.h | 5 +- + arch/ia64/kvm/vmm.c | 29 + + arch/ia64/kvm/vmm_ivt.S | 1469 +++++++++++------------ + arch/ia64/kvm/vtlb.c | 4 +- + arch/ia64/sn/kernel/irq.c | 6 +- + arch/ia64/sn/kernel/msi_sn.c | 7 +- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 27 +- + arch/m32r/Kconfig | 1 + + arch/m32r/kernel/smpboot.c | 8 +- + arch/m68k/Kconfig | 1 - + arch/m68knommu/include/asm/bitops.h | 1 + + arch/m68knommu/platform/coldfire/pit.c | 2 +- + arch/mips/include/asm/irq.h | 3 +- + arch/mips/include/asm/mach-ip27/topology.h | 5 +- + arch/mips/include/asm/smp.h | 3 - + arch/mips/jazz/irq.c | 2 +- + arch/mips/kernel/cevt-bcm1480.c | 4 +- + arch/mips/kernel/cevt-ds1287.c | 2 +- + arch/mips/kernel/cevt-gt641xx.c | 2 +- + arch/mips/kernel/cevt-r4k.c | 2 +- + arch/mips/kernel/cevt-sb1250.c | 4 +- + arch/mips/kernel/cevt-smtc.c | 2 +- + arch/mips/kernel/cevt-txx9.c | 2 +- + arch/mips/kernel/i8253.c | 2 +- + arch/mips/kernel/irq-gic.c | 6 +- + arch/mips/kernel/smp-cmp.c | 6 +- + arch/mips/kernel/smp-mt.c | 2 +- + arch/mips/kernel/smp.c | 7 +- + arch/mips/kernel/smtc.c | 6 +- + arch/mips/mti-malta/malta-smtc.c | 6 +- + arch/mips/nxp/pnx8550/common/time.c | 1 + + arch/mips/pmc-sierra/yosemite/smp.c | 6 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/mips/sgi-ip27/ip27-timer.c | 2 +- + arch/mips/sibyte/bcm1480/irq.c | 8 +- + arch/mips/sibyte/bcm1480/smp.c | 8 +- + arch/mips/sibyte/sb1250/irq.c | 8 +- + arch/mips/sibyte/sb1250/smp.c | 8 +- + arch/mips/sni/time.c | 2 +- + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/smp.h | 2 - + arch/parisc/kernel/irq.c | 6 +- + arch/parisc/kernel/smp.c | 15 - + arch/powerpc/include/asm/disassemble.h | 80 ++ + arch/powerpc/include/asm/kvm_44x.h | 61 + + arch/powerpc/include/asm/kvm_host.h | 116 ++- + arch/powerpc/include/asm/kvm_ppc.h | 83 +- + arch/powerpc/include/asm/mmu-44x.h | 1 + + arch/powerpc/include/asm/topology.h | 13 +- + arch/powerpc/kernel/asm-offsets.c | 21 +- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/process.c | 1 + + arch/powerpc/kernel/smp.c | 4 - + arch/powerpc/kernel/time.c | 20 +- + arch/powerpc/kvm/44x.c | 228 ++++ + arch/powerpc/kvm/44x_emulate.c | 371 ++++++ + arch/powerpc/kvm/44x_tlb.c | 463 ++++++-- + arch/powerpc/kvm/44x_tlb.h | 26 +- + arch/powerpc/kvm/Kconfig | 28 +- + arch/powerpc/kvm/Makefile | 12 +- + arch/powerpc/kvm/{booke_guest.c => booke.c} | 418 +++---- + arch/powerpc/kvm/booke.h | 60 + + arch/powerpc/kvm/booke_host.c | 83 -- + arch/powerpc/kvm/booke_interrupts.S | 72 +- + arch/powerpc/kvm/emulate.c | 447 +------- + arch/powerpc/kvm/powerpc.c | 130 +-- + arch/powerpc/kvm/timing.c | 239 ++++ + arch/powerpc/kvm/timing.h | 102 ++ + arch/powerpc/platforms/cell/spu_priv1_mmio.c | 6 +- + arch/powerpc/platforms/cell/spufs/sched.c | 4 +- + arch/powerpc/platforms/pseries/xics.c | 4 +- + arch/powerpc/sysdev/mpic.c | 4 +- + arch/powerpc/sysdev/mpic.h | 2 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/cpu.h | 7 +- + arch/s390/include/asm/cputime.h | 42 +- + arch/s390/include/asm/lowcore.h | 49 +- + arch/s390/include/asm/system.h | 4 +- + arch/s390/include/asm/thread_info.h | 2 + + arch/s390/include/asm/timer.h | 16 +- + arch/s390/include/asm/topology.h | 2 + + arch/s390/include/asm/vdso.h | 15 +- + arch/s390/kernel/asm-offsets.c | 5 + + arch/s390/kernel/entry.S | 5 +- + arch/s390/kernel/entry64.S | 50 +- + arch/s390/kernel/head64.S | 2 + + arch/s390/kernel/process.c | 43 +- + arch/s390/kernel/s390_ext.c | 2 +- + arch/s390/kernel/setup.c | 2 + + arch/s390/kernel/smp.c | 40 +- + arch/s390/kernel/time.c | 2 +- + arch/s390/kernel/topology.c | 5 + + arch/s390/kernel/vdso.c | 123 ++- + arch/s390/kernel/vdso64/clock_getres.S | 5 + + arch/s390/kernel/vdso64/clock_gettime.S | 39 +- + arch/s390/kernel/vtime.c | 486 ++++---- + arch/s390/kvm/kvm-s390.c | 41 +- + arch/sh/include/asm/smp.h | 2 +- + arch/sh/include/asm/topology.h | 2 +- + arch/sh/kernel/smp.c | 10 +- + arch/sh/kernel/timers/timer-broadcast.c | 2 +- + arch/sh/kernel/timers/timer-tmu.c | 2 +- + arch/sparc/include/asm/smp_32.h | 2 - + arch/sparc/include/asm/topology_64.h | 13 +- + arch/sparc/kernel/irq_64.c | 11 +- + arch/sparc/kernel/of_device_64.c | 4 +- + arch/sparc/kernel/pci_msi.c | 4 +- + arch/sparc/kernel/smp_32.c | 6 +- + arch/sparc/kernel/smp_64.c | 4 - + arch/sparc/kernel/sparc_ksyms_32.c | 4 - + arch/sparc/kernel/time_64.c | 2 +- + arch/um/kernel/smp.c | 7 - + arch/um/kernel/time.c | 2 +- + arch/x86/Kconfig | 26 +- + arch/x86/ia32/ia32_signal.c | 3 +- + arch/x86/ia32/ipc32.c | 1 + + arch/x86/ia32/sys_ia32.c | 2 +- + arch/x86/include/asm/amd_iommu_types.h | 61 +- + arch/x86/include/asm/apic.h | 3 +- + arch/x86/include/asm/bigsmp/apic.h | 32 +- + arch/x86/include/asm/bigsmp/ipi.h | 13 +- + arch/x86/include/asm/desc.h | 10 +- + arch/x86/include/asm/efi.h | 1 + + arch/x86/include/asm/es7000/apic.h | 60 +- + arch/x86/include/asm/es7000/ipi.h | 12 +- + arch/x86/include/asm/genapic_32.h | 13 +- + arch/x86/include/asm/genapic_64.h | 14 +- + arch/x86/include/asm/ipi.h | 23 +- + arch/x86/include/asm/irq.h | 3 +- + arch/x86/include/asm/kvm_host.h | 47 +- + arch/x86/include/asm/kvm_x86_emulate.h | 11 +- + arch/x86/include/asm/lguest.h | 2 +- + arch/x86/include/asm/mach-default/mach_apic.h | 28 +- + arch/x86/include/asm/mach-default/mach_ipi.h | 18 +- + arch/x86/include/asm/mach-generic/mach_apic.h | 1 + + arch/x86/include/asm/mpspec.h | 2 +- + arch/x86/include/asm/mtrr.h | 25 + + arch/x86/include/asm/numaq/apic.h | 16 +- + arch/x86/include/asm/numaq/ipi.h | 13 +- + arch/x86/include/asm/pci.h | 10 +- + arch/x86/{pci/pci.h => include/asm/pci_x86.h} | 17 +- + arch/x86/include/asm/smp.h | 6 +- + arch/x86/include/asm/summit/apic.h | 39 +- + arch/x86/include/asm/summit/ipi.h | 9 +- + arch/x86/{kvm => include/asm}/svm.h | 0 + arch/x86/include/asm/sys_ia32.h | 101 ++ + arch/x86/include/asm/topology.h | 38 +- + arch/x86/include/asm/uv/uv_bau.h | 46 +- + arch/x86/include/asm/virtext.h | 132 ++ + arch/x86/{kvm => include/asm}/vmx.h | 27 +- + arch/x86/kernel/acpi/boot.c | 31 +- + arch/x86/kernel/amd_iommu.c | 666 ++++++++++- + arch/x86/kernel/amd_iommu_init.c | 19 +- + arch/x86/kernel/apic.c | 42 +- + arch/x86/kernel/bios_uv.c | 2 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 28 +- + arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 9 + + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 24 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 45 +- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 108 +- + arch/x86/kernel/cpu/mtrr/generic.c | 12 +- + arch/x86/kernel/cpu/mtrr/main.c | 10 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 18 +- + arch/x86/kernel/cpuid.c | 8 +- + arch/x86/kernel/crash.c | 18 + + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/genapic_flat_64.c | 107 ++- + arch/x86/kernel/genx2apic_cluster.c | 81 +- + arch/x86/kernel/genx2apic_phys.c | 78 +- + arch/x86/kernel/genx2apic_uv_x.c | 61 +- + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/hpet.c | 8 +- + arch/x86/kernel/i8253.c | 2 +- + arch/x86/kernel/io_apic.c | 372 +++--- + arch/x86/kernel/ipi.c | 28 +- + arch/x86/kernel/irq.c | 3 + + arch/x86/kernel/irq_32.c | 13 +- + arch/x86/kernel/irq_64.c | 15 +- + arch/x86/kernel/irqinit_32.c | 16 +- + arch/x86/kernel/irqinit_64.c | 13 + + arch/x86/kernel/kvmclock.c | 10 +- + arch/x86/kernel/ldt.c | 4 +- + arch/x86/kernel/mfgpt_32.c | 2 +- + arch/x86/kernel/mmconf-fam10h_64.c | 3 +- + arch/x86/kernel/mpparse.c | 10 +- + arch/x86/kernel/msr.c | 2 +- + arch/x86/kernel/nmi.c | 3 +- + arch/x86/kernel/pci-gart_64.c | 2 +- + arch/x86/kernel/reboot.c | 73 +- + arch/x86/kernel/setup_percpu.c | 36 +- + arch/x86/kernel/smp.c | 8 +- + arch/x86/kernel/smpboot.c | 48 +- + arch/x86/kernel/tlb_32.c | 2 +- + arch/x86/kernel/tlb_64.c | 2 +- + arch/x86/kernel/tlb_uv.c | 9 - + arch/x86/kernel/traps.c | 45 +- + arch/x86/kernel/vmiclock_32.c | 2 +- + arch/x86/kernel/xsave.c | 2 +- + arch/x86/kvm/Makefile | 4 +- + arch/x86/kvm/i8254.c | 19 + + arch/x86/kvm/i8259.c | 52 +- + arch/x86/kvm/irq.h | 6 + + arch/x86/kvm/kvm_svm.h | 2 +- + arch/x86/kvm/lapic.c | 58 +- + arch/x86/kvm/mmu.c | 444 ++++++-- + arch/x86/kvm/paging_tmpl.h | 44 +- + arch/x86/kvm/svm.c | 48 +- + arch/x86/kvm/vmx.c | 350 ++++-- + arch/x86/kvm/x86.c | 120 ++- + arch/x86/kvm/x86_emulate.c | 297 +++-- + arch/x86/lguest/boot.c | 2 +- + arch/x86/mach-default/setup.c | 15 +- + arch/x86/mach-generic/bigsmp.c | 5 +- + arch/x86/mach-generic/es7000.c | 5 +- + arch/x86/mach-generic/numaq.c | 5 +- + arch/x86/mach-generic/summit.c | 5 +- + arch/x86/mach-voyager/voyager_smp.c | 16 +- + arch/x86/mm/init_32.c | 8 +- + arch/x86/mm/numa_64.c | 4 +- + arch/x86/mm/srat_64.c | 2 +- + arch/x86/pci/acpi.c | 2 +- + arch/x86/pci/amd_bus.c | 2 +- + arch/x86/pci/common.c | 3 +- + arch/x86/pci/direct.c | 2 +- + arch/x86/pci/early.c | 2 +- + arch/x86/pci/fixup.c | 3 +- + arch/x86/pci/i386.c | 2 +- + arch/x86/pci/init.c | 2 +- + arch/x86/pci/irq.c | 3 +- + arch/x86/pci/legacy.c | 2 +- + arch/x86/pci/mmconfig-shared.c | 3 +- + arch/x86/pci/mmconfig_32.c | 2 +- + arch/x86/pci/mmconfig_64.c | 3 +- + arch/x86/pci/numaq_32.c | 2 +- + arch/x86/pci/olpc.c | 2 +- + arch/x86/pci/pcbios.c | 5 +- + arch/x86/pci/visws.c | 3 +- + arch/x86/xen/mmu.c | 20 +- + arch/x86/xen/smp.c | 27 +- + arch/x86/xen/suspend.c | 3 +- + arch/x86/xen/time.c | 12 +- + arch/x86/xen/xen-ops.h | 2 +- + block/blk.h | 4 +- + drivers/acpi/processor_core.c | 14 +- + drivers/acpi/processor_perflib.c | 28 +- + drivers/acpi/processor_throttling.c | 80 +- + drivers/base/Makefile | 1 + + drivers/base/cpu.c | 46 +- + drivers/base/iommu.c | 100 ++ + drivers/base/node.c | 4 +- + drivers/base/topology.c | 4 +- + drivers/char/Kconfig | 13 +- + drivers/char/amiserial.c | 34 +- + drivers/char/cyclades.c | 2 +- + drivers/char/epca.c | 265 ++--- + drivers/char/esp.c | 61 +- + drivers/char/generic_serial.c | 76 +- + drivers/char/hvc_console.c | 2 +- + drivers/char/hvsi.c | 12 +- + drivers/char/i8k.c | 16 +- + drivers/char/isicom.c | 166 +--- + drivers/char/istallion.c | 221 ++--- + drivers/char/moxa.c | 26 +- + drivers/char/mxser.c | 150 +-- + drivers/char/n_r3964.c | 12 +- + drivers/char/n_tty.c | 792 ++++++++++--- + drivers/char/nozomi.c | 85 +- + drivers/char/pcmcia/synclink_cs.c | 479 +++----- + drivers/char/pty.c | 57 +- + drivers/char/random.c | 40 +- + drivers/char/rio/rio_linux.c | 35 +- + drivers/char/riscom8.c | 194 +--- + drivers/char/rocket.c | 320 ++---- + drivers/char/rocket.h | 2 +- + drivers/char/rocket_int.h | 5 - + drivers/char/selection.c | 2 +- + drivers/char/ser_a2232.c | 23 +- + drivers/char/serial167.c | 32 +- + drivers/char/specialix.c | 34 +- + drivers/char/stallion.c | 169 +-- + drivers/char/sx.c | 31 +- + drivers/char/synclink.c | 177 ++-- + drivers/char/synclink_gt.c | 120 +-- + drivers/char/synclinkmp.c | 171 ++-- + drivers/char/tty_io.c | 39 +- + drivers/char/tty_ldisc.c | 30 +- + drivers/char/tty_port.c | 225 ++++ + drivers/char/vme_scc.c | 27 +- + drivers/char/vt.c | 16 +- + drivers/char/vt_ioctl.c | 2 +- + drivers/clocksource/tcb_clksrc.c | 2 +- + drivers/ide/Kconfig | 18 +- + drivers/ide/Makefile | 2 +- + drivers/ide/ide-atapi.c | 248 +++-- + drivers/ide/ide-cd.c | 99 +-- + drivers/ide/ide-cd.h | 12 +- + drivers/ide/ide-floppy.c | 28 +- + drivers/ide/ide-floppy_ioctl.c | 58 +- + drivers/ide/ide-io.c | 282 ++--- + drivers/ide/ide-ioctls.c | 3 +- + drivers/ide/ide-park.c | 13 +- + drivers/ide/ide-probe.c | 223 ++--- + drivers/ide/ide-sysfs.c | 125 ++ + drivers/ide/ide-tape.c | 2 +- + drivers/ide/ide.c | 72 +-- + drivers/ide/tx4938ide.c | 11 +- + drivers/ide/tx4939ide.c | 43 +- + drivers/infiniband/hw/ehca/ehca_irq.c | 17 +- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 8 +- + drivers/lguest/interrupts_and_traps.c | 13 +- + drivers/media/common/saa7146_fops.c | 21 +- + drivers/media/common/saa7146_video.c | 5 +- + drivers/media/common/tuners/tuner-simple.c | 16 +- + drivers/media/dvb/dvb-core/dvbdev.c | 3 +- + drivers/media/dvb/dvb-usb/gp8psk.c | 2 +- + drivers/media/dvb/frontends/cx24116.c | 1 + + drivers/media/dvb/frontends/cx24116.h | 3 +- + drivers/media/dvb/frontends/stb0899_drv.c | 1 + + drivers/media/dvb/frontends/zl10353.c | 7 + + drivers/media/dvb/siano/sms-cards.c | 19 +- + drivers/media/dvb/ttpci/av7110_v4l.c | 4 +- + drivers/media/dvb/ttpci/budget-av.c | 2 +- + drivers/media/dvb/ttusb-budget/Kconfig | 2 +- + drivers/media/dvb/ttusb-dec/Kconfig | 2 +- + drivers/media/radio/Kconfig | 19 + + drivers/media/radio/Makefile | 1 + + drivers/media/radio/dsbr100.c | 14 +- + drivers/media/radio/radio-aimslab.c | 10 +- + drivers/media/radio/radio-aztech.c | 10 +- + drivers/media/radio/radio-cadet.c | 10 +- + drivers/media/radio/radio-gemtek-pci.c | 10 +- + drivers/media/radio/radio-gemtek.c | 10 +- + drivers/media/radio/radio-maestro.c | 10 +- + drivers/media/radio/radio-maxiradio.c | 10 +- + drivers/media/radio/radio-mr800.c | 14 +- + drivers/media/radio/radio-rtrack2.c | 10 +- + drivers/media/radio/radio-sf16fmi.c | 10 +- + drivers/media/radio/radio-sf16fmr2.c | 10 +- + drivers/media/radio/radio-si470x.c | 14 +- + drivers/media/radio/radio-tea5764.c | 634 ++++++++++ + drivers/media/radio/radio-terratec.c | 10 +- + drivers/media/radio/radio-trust.c | 10 +- + drivers/media/radio/radio-typhoon.c | 10 +- + drivers/media/radio/radio-zoltrix.c | 10 +- + drivers/media/video/Makefile | 5 +- + drivers/media/video/arv.c | 14 +- + drivers/media/video/bt8xx/bttv-driver.c | 30 +- + drivers/media/video/bw-qcam.c | 14 +- + drivers/media/video/c-qcam.c | 14 +- + drivers/media/video/cafe_ccic.c | 16 +- + drivers/media/video/cpia.c | 14 +- + drivers/media/video/cpia2/cpia2_v4l.c | 16 +- + drivers/media/video/cs5345.c | 13 +- + drivers/media/video/cs53l32a.c | 2 +- + drivers/media/video/cx18/cx18-fileops.c | 6 +- + drivers/media/video/cx18/cx18-fileops.h | 4 +- + drivers/media/video/cx18/cx18-i2c.c | 28 +- + drivers/media/video/cx18/cx18-i2c.h | 1 - + drivers/media/video/cx18/cx18-ioctl.c | 49 +- + drivers/media/video/cx18/cx18-ioctl.h | 2 +- + drivers/media/video/cx18/cx18-streams.c | 13 +- + drivers/media/video/cx23885/cx23885-417.c | 15 +- + drivers/media/video/cx23885/cx23885-video.c | 22 +- + drivers/media/video/cx25840/cx25840-core.c | 13 +- + drivers/media/video/cx88/cx88-blackbird.c | 13 +- + drivers/media/video/cx88/cx88-mpeg.c | 3 +- + drivers/media/video/cx88/cx88-video.c | 27 +- + drivers/media/video/cx88/cx88.h | 2 +- + drivers/media/video/em28xx/em28xx-audio.c | 91 +- + drivers/media/video/em28xx/em28xx-core.c | 3 +- + drivers/media/video/em28xx/em28xx-reg.h | 2 +- + drivers/media/video/em28xx/em28xx-video.c | 44 +- + drivers/media/video/em28xx/em28xx.h | 4 +- + drivers/media/video/et61x251/et61x251_core.c | 20 +- + drivers/media/video/gspca/gspca.c | 12 +- + drivers/media/video/hexium_gemini.c | 2 +- + drivers/media/video/hexium_orion.c | 2 +- + drivers/media/video/ivtv/ivtv-driver.c | 7 +- + drivers/media/video/ivtv/ivtv-fileops.c | 4 +- + drivers/media/video/ivtv/ivtv-fileops.h | 4 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 25 +- + drivers/media/video/ivtv/ivtv-streams.c | 8 +- + drivers/media/video/m52790.c | 13 +- + drivers/media/video/meye.c | 12 +- + drivers/media/video/msp3400-driver.c | 4 +- + drivers/media/video/mt9m001.c | 19 +- + drivers/media/video/mt9m111.c | 19 +- + drivers/media/video/mt9t031.c | 18 +- + drivers/media/video/mt9v022.c | 19 +- + drivers/media/video/mxb.c | 2 +- + drivers/media/video/omap24xxcam.c | 9 +- + drivers/media/video/ov511.c | 16 +- + drivers/media/video/ov7670.c | 2 +- + drivers/media/video/ov772x.c | 7 +- + drivers/media/video/pms.c | 14 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 11 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 4 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 29 +- + drivers/media/video/pwc/pwc-ctrl.c | 4 +- + drivers/media/video/pwc/pwc-if.c | 20 +- + drivers/media/video/pwc/pwc-v4l.c | 2 +- + drivers/media/video/pwc/pwc.h | 4 +- + drivers/media/video/s2255drv.c | 12 +- + drivers/media/video/saa5246a.c | 13 +- + drivers/media/video/saa5249.c | 16 +- + drivers/media/video/saa7115.c | 13 +- + drivers/media/video/saa7127.c | 13 +- + drivers/media/video/saa7134/saa6752hs.c | 2 +- + drivers/media/video/saa7134/saa7134-cards.c | 44 +- + drivers/media/video/saa7134/saa7134-dvb.c | 18 + + drivers/media/video/saa7134/saa7134-empress.c | 23 +- + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/saa7134/saa7134-video.c | 23 +- + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/saa717x.c | 9 +- + drivers/media/video/se401.c | 14 +- + drivers/media/video/sn9c102/sn9c102_core.c | 18 +- + drivers/media/video/soc_camera.c | 13 +- + drivers/media/video/stk-webcam.c | 10 +- + drivers/media/video/stradis.c | 12 +- + drivers/media/video/stv680.c | 14 +- + drivers/media/video/tda9840.c | 2 +- + drivers/media/video/tea6415c.c | 2 +- + drivers/media/video/tea6420.c | 2 +- + drivers/media/video/tuner-core.c | 2 +- + drivers/media/video/tvaudio.c | 2 +- + drivers/media/video/tvp5150.c | 13 +- + drivers/media/video/tw9910.c | 6 +- + drivers/media/video/upd64031a.c | 13 +- + drivers/media/video/upd64083.c | 13 +- + drivers/media/video/usbvideo/usbvideo.c | 20 +- + drivers/media/video/usbvideo/vicam.c | 16 +- + drivers/media/video/usbvision/usbvision-video.c | 37 +- + drivers/media/video/uvc/uvc_v4l2.c | 14 +- + drivers/media/video/uvc/uvcvideo.h | 2 +- + drivers/media/video/v4l1-compat.c | 164 ++-- + drivers/media/video/v4l2-common.c | 29 +- + drivers/media/video/v4l2-compat-ioctl32.c | 27 +- + drivers/media/video/v4l2-dev.c | 25 +- + drivers/media/video/v4l2-ioctl.c | 36 +- + drivers/media/video/v4l2-subdev.c | 2 +- + drivers/media/video/vino.c | 13 +- + drivers/media/video/vivi.c | 12 +- + drivers/media/video/vp27smpx.c | 2 +- + drivers/media/video/w9966.c | 16 +- + drivers/media/video/w9968cf.c | 36 +- + drivers/media/video/wm8739.c | 2 +- + drivers/media/video/wm8775.c | 2 +- + drivers/media/video/zc0301/zc0301_core.c | 18 +- + drivers/media/video/zoran/zoran_driver.c | 25 +- + drivers/media/video/zr364xx.c | 8 +- + drivers/mmc/card/block.c | 122 ++- + drivers/mmc/core/core.c | 77 ++ + drivers/mmc/core/mmc.c | 18 +- + drivers/mmc/host/Makefile | 3 + + drivers/mmc/host/at91_mci.c | 4 +- + drivers/mmc/host/mmc_spi.c | 4 +- + drivers/mmc/host/of_mmc_spi.c | 149 +++ + drivers/mmc/host/pxamci.c | 2 +- + drivers/mmc/host/ricoh_mmc.c | 17 +- + drivers/mmc/host/sdhci-pci.c | 2 +- + drivers/mmc/host/sdhci.c | 17 +- + drivers/mmc/host/sdhci.h | 2 +- + drivers/mmc/host/sdricoh_cs.c | 4 +- + drivers/mmc/host/tmio_mmc.c | 3 +- + drivers/mtd/ubi/build.c | 5 +- + drivers/mtd/ubi/cdev.c | 3 +- + drivers/mtd/ubi/debug.h | 10 +- + drivers/mtd/ubi/eba.c | 51 +- + drivers/mtd/ubi/io.c | 28 +- + drivers/mtd/ubi/ubi.h | 45 +- + drivers/mtd/ubi/wl.c | 489 ++++----- + drivers/net/usb/hso.c | 434 ++++++- + drivers/parisc/iosapic.c | 7 +- + drivers/pci/dmar.c | 46 +- + drivers/pci/hotplug/cpqphp_core.c | 2 +- + drivers/pci/hotplug/cpqphp_pci.c | 2 +- + drivers/pci/hotplug/ibmphp_core.c | 2 +- + drivers/pci/intel-iommu.c | 944 +++++++++++++-- + drivers/pci/pci-sysfs.c | 4 +- + drivers/pci/probe.c | 4 +- + drivers/pnp/pnpbios/bioscalls.c | 2 +- + drivers/s390/cio/cio.c | 2 +- + drivers/s390/s390mach.c | 3 + + drivers/scsi/Kconfig | 8 +- + drivers/scsi/Makefile | 1 - + drivers/scsi/ide-scsi.c | 840 ------------- + drivers/serial/8250.c | 225 +++- + drivers/serial/8250_pci.c | 134 ++- + drivers/serial/bfin_5xx.c | 239 ++-- + drivers/serial/bfin_sport_uart.c | 60 +- + drivers/serial/jsm/jsm_tty.c | 2 +- + drivers/serial/serial_core.c | 155 +-- + drivers/usb/host/hwa-hc.c | 159 +-- + drivers/usb/host/whci/Kbuild | 1 + + drivers/usb/host/whci/asl.c | 46 +- + drivers/usb/host/whci/debug.c | 189 +++ + drivers/usb/host/whci/hcd.c | 6 +- + drivers/usb/host/whci/hw.c | 8 +- + drivers/usb/host/whci/int.c | 1 - + drivers/usb/host/whci/pzl.c | 49 +- + drivers/usb/host/whci/qset.c | 40 - + drivers/usb/host/whci/whcd.h | 11 +- + drivers/usb/host/whci/whci-hc.h | 2 + + drivers/usb/host/whci/wusb.c | 43 +- + drivers/usb/serial/console.c | 13 + + drivers/usb/serial/ftdi_sio.c | 9 +- + drivers/usb/serial/kl5kusb105.c | 1 + + drivers/usb/serial/mct_u232.c | 2 +- + drivers/usb/serial/mos7840.c | 3 + + drivers/usb/serial/sierra.c | 2 +- + drivers/usb/serial/usb-serial.c | 26 +- + drivers/usb/wusbcore/cbaf.c | 1 - + drivers/usb/wusbcore/crypto.c | 79 +- + drivers/usb/wusbcore/dev-sysfs.c | 4 - + drivers/usb/wusbcore/devconnect.c | 233 +---- + drivers/usb/wusbcore/mmc.c | 118 +-- + drivers/usb/wusbcore/pal.c | 16 +- + drivers/usb/wusbcore/reservation.c | 21 +- + drivers/usb/wusbcore/rh.c | 104 +- + drivers/usb/wusbcore/security.c | 78 +-- + drivers/usb/wusbcore/wa-nep.c | 16 +- + drivers/usb/wusbcore/wa-rpipe.c | 68 +- + drivers/usb/wusbcore/wa-xfer.c | 180 +--- + drivers/usb/wusbcore/wusbhc.h | 36 +- + drivers/uwb/Makefile | 3 + + drivers/uwb/address.c | 2 +- + drivers/uwb/allocator.c | 386 ++++++ + drivers/uwb/beacon.c | 134 +-- + drivers/uwb/driver.c | 4 +- + drivers/uwb/drp-avail.c | 4 +- + drivers/uwb/drp-ie.c | 161 ++- + drivers/uwb/drp.c | 695 ++++++++--- + drivers/uwb/est.c | 14 +- + drivers/uwb/hwa-rc.c | 53 +- + drivers/uwb/i1480/dfu/dfu.c | 10 +- + drivers/uwb/i1480/dfu/mac.c | 18 - + drivers/uwb/i1480/dfu/usb.c | 27 - + drivers/uwb/i1480/i1480u-wlp/lc.c | 5 +- + drivers/uwb/i1480/i1480u-wlp/netdev.c | 53 +- + drivers/uwb/i1480/i1480u-wlp/rx.c | 25 +- + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 3 +- + drivers/uwb/i1480/i1480u-wlp/tx.c | 66 +- + drivers/uwb/ie-rcv.c | 55 + + drivers/uwb/ie.c | 463 +++----- + drivers/uwb/lc-dev.c | 23 +- + drivers/uwb/lc-rc.c | 62 +- + drivers/uwb/neh.c | 72 +- + drivers/uwb/pal.c | 25 +- + drivers/uwb/radio.c | 202 ++++ + drivers/uwb/reset.c | 47 +- + drivers/uwb/rsv.c | 565 +++++++-- + drivers/uwb/umc-bus.c | 62 +- + drivers/uwb/umc-dev.c | 11 +- + drivers/uwb/uwb-debug.c | 151 ++- + drivers/uwb/uwb-internal.h | 126 ++- + drivers/uwb/uwbd.c | 176 +-- + drivers/uwb/whc-rc.c | 118 +-- + drivers/uwb/whci.c | 6 +- + drivers/uwb/wlp/eda.c | 19 +- + drivers/uwb/wlp/messages.c | 181 +--- + drivers/uwb/wlp/sysfs.c | 2 +- + drivers/uwb/wlp/txrx.c | 37 +- + drivers/uwb/wlp/wlp-internal.h | 4 - + drivers/uwb/wlp/wlp-lc.c | 80 +- + drivers/uwb/wlp/wss-lc.c | 130 +-- + drivers/watchdog/Kconfig | 19 + + drivers/watchdog/Makefile | 2 + + drivers/watchdog/ib700wdt.c | 49 +- + drivers/watchdog/sch311x_wdt.c | 578 +++++++++ + drivers/watchdog/wm8350_wdt.c | 329 +++++ + drivers/xen/events.c | 6 +- + fs/anon_inodes.c | 7 +- + fs/binfmt_aout.c | 81 +-- + fs/devpts/inode.c | 472 +++++++- + fs/exec.c | 41 +- + fs/seq_file.c | 3 +- + fs/ubifs/budget.c | 208 ++--- + fs/ubifs/commit.c | 25 +- + fs/ubifs/compress.c | 18 +- + fs/ubifs/debug.c | 265 ++++- + fs/ubifs/debug.h | 117 ++- + fs/ubifs/file.c | 8 +- + fs/ubifs/ioctl.c | 2 + + fs/ubifs/journal.c | 4 +- + fs/ubifs/key.h | 32 +- + fs/ubifs/lprops.c | 14 +- + fs/ubifs/lpt.c | 45 +- + fs/ubifs/lpt_commit.c | 210 +++- + fs/ubifs/orphan.c | 2 +- + fs/ubifs/replay.c | 15 +- + fs/ubifs/sb.c | 20 +- + fs/ubifs/super.c | 255 +++-- + fs/ubifs/tnc.c | 31 +- + fs/ubifs/tnc_commit.c | 9 +- + fs/ubifs/ubifs-media.h | 7 + + fs/ubifs/ubifs.h | 111 +- + include/acpi/processor.h | 4 +- + include/asm-frv/bitops.h | 13 + + include/asm-generic/topology.h | 14 +- + include/asm-m32r/bitops.h | 1 + + include/asm-m32r/smp.h | 2 - + include/asm-m68k/bitops.h | 5 + + include/asm-mn10300/bitops.h | 11 + + include/asm-xtensa/bitops.h | 11 + + include/linux/8250_pci.h | 2 +- + include/linux/bitmap.h | 35 +- + include/linux/bitops.h | 13 +- + include/linux/clockchips.h | 4 +- + include/linux/compiler-gcc.h | 5 + + include/linux/compiler-gcc3.h | 5 +- + include/linux/compiler-gcc4.h | 8 +- + include/linux/compiler.h | 8 +- + include/linux/cpumask.h | 295 +++--- + include/linux/dma_remapping.h | 138 +--- + include/linux/dmar.h | 1 - + include/linux/dvb/frontend.h | 27 +- + include/linux/generic_serial.h | 1 - + include/linux/ide.h | 121 +- + include/linux/intel-iommu.h | 25 +- + include/linux/interrupt.h | 6 +- + include/linux/iommu.h | 112 ++ + include/linux/irq.h | 3 +- + include/linux/istallion.h | 2 - + include/linux/kernel_stat.h | 13 +- + include/linux/kvm.h | 18 + + include/linux/kvm_host.h | 42 +- + include/linux/mmc/core.h | 2 + + include/linux/mmc/host.h | 2 + + include/linux/pci_ids.h | 2 + + include/linux/random.h | 50 - + include/linux/rcuclassic.h | 4 +- + include/linux/sched.h | 93 ++- + include/linux/seq_file.h | 7 +- + include/linux/serial.h | 3 +- + include/linux/serial_8250.h | 3 + + include/linux/serial_core.h | 69 +- + include/linux/smp.h | 18 +- + include/linux/spi/mmc_spi.h | 15 +- + include/linux/stop_machine.h | 6 +- + include/linux/threads.h | 16 +- + include/linux/tick.h | 4 +- + include/linux/topology.h | 6 +- + include/linux/tty.h | 27 +- + include/linux/tty_driver.h | 6 +- + include/linux/usb/wusb-wa.h | 1 + + include/linux/uwb.h | 123 ++- + include/linux/uwb/debug-cmd.h | 13 +- + include/linux/uwb/debug.h | 82 -- + include/linux/uwb/spec.h | 53 + + include/linux/uwb/umc.h | 2 + + include/linux/videodev2.h | 51 +- + include/linux/wlp.h | 3 +- + include/media/saa7146_vv.h | 6 +- + include/media/soc_camera.h | 6 +- + include/media/v4l2-chip-ident.h | 4 +- + include/media/v4l2-common.h | 6 +- + include/media/v4l2-dev.h | 15 +- + include/media/v4l2-device.h | 2 +- + include/media/v4l2-int-device.h | 2 +- + include/media/v4l2-ioctl.h | 31 +- + include/media/v4l2-subdev.h | 8 +- + include/sound/tea575x-tuner.h | 2 +- + init/Kconfig | 9 + + init/main.c | 22 +- + kernel/compat.c | 49 +- + kernel/cpu.c | 145 ++- + kernel/cpuset.c | 4 +- + kernel/irq/chip.c | 2 +- + kernel/irq/manage.c | 31 +- + kernel/irq/migration.c | 14 +- + kernel/irq/proc.c | 59 +- + kernel/kexec.c | 2 +- + kernel/power/poweroff.c | 2 +- + kernel/profile.c | 38 +- + kernel/rcuclassic.c | 32 +- + kernel/rcupreempt.c | 19 +- + kernel/rcutorture.c | 27 +- + kernel/sched.c | 1090 ++++++++++------- + kernel/sched_cpupri.c | 39 +- + kernel/sched_cpupri.h | 5 +- + kernel/sched_fair.c | 32 +- + kernel/sched_rt.c | 74 +- + kernel/sched_stats.h | 3 +- + kernel/smp.c | 145 +-- + kernel/softirq.c | 2 +- + kernel/softlockup.c | 10 +- + kernel/stop_machine.c | 8 +- + kernel/taskstats.c | 41 +- + kernel/time/clockevents.c | 2 + + kernel/time/clocksource.c | 9 +- + kernel/time/tick-broadcast.c | 113 +- + kernel/time/tick-common.c | 18 +- + kernel/time/tick-sched.c | 22 +- + kernel/timer.c | 15 - + kernel/trace/ring_buffer.c | 42 +- + kernel/trace/trace.c | 68 +- + kernel/trace/trace.h | 2 +- + kernel/trace/trace_boot.c | 2 +- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/trace/trace_hw_branches.c | 6 +- + kernel/trace/trace_power.c | 2 +- + kernel/trace/trace_sysprof.c | 13 +- + kernel/workqueue.c | 26 +- + lib/Kconfig | 15 + + lib/Makefile | 1 + + lib/cpumask.c | 62 +- + lib/find_last_bit.c | 45 + + lib/vsprintf.c | 3 + + mm/pdflush.c | 16 +- + mm/slab.c | 2 +- + mm/slub.c | 20 +- + mm/vmscan.c | 4 +- + mm/vmstat.c | 4 +- + net/irda/ircomm/ircomm_tty.c | 5 +- + scripts/headers_check.pl | 70 ++- + scripts/headers_install.pl | 3 + + scripts/kconfig/expr.h | 82 +- + scripts/kconfig/lex.zconf.c_shipped | 7 +- + scripts/kconfig/zconf.l | 7 +- + scripts/tags.sh | 1 - + security/selinux/selinuxfs.c | 2 +- + sound/i2c/other/tea575x-tuner.c | 6 +- + virt/kvm/ioapic.c | 8 +- + virt/kvm/ioapic.h | 2 + + virt/kvm/{vtd.c => iommu.c} | 135 ++- + virt/kvm/irq_comm.c | 19 +- + virt/kvm/kvm_main.c | 470 ++++++-- + virt/kvm/kvm_trace.c | 1 + + 811 files changed, 22951 insertions(+), 15120 deletions(-) + create mode 100644 Documentation/filesystems/devpts.txt + create mode 100644 Documentation/kbuild/kbuild.txt + create mode 100644 Documentation/kbuild/kconfig.txt + create mode 100644 arch/alpha/kernel/binfmt_loader.c + create mode 100644 arch/ia64/kvm/kvm_lib.c + create mode 100644 arch/powerpc/include/asm/disassemble.h + create mode 100644 arch/powerpc/include/asm/kvm_44x.h + create mode 100644 arch/powerpc/kvm/44x.c + create mode 100644 arch/powerpc/kvm/44x_emulate.c + rename arch/powerpc/kvm/{booke_guest.c => booke.c} (56%) + create mode 100644 arch/powerpc/kvm/booke.h + delete mode 100644 arch/powerpc/kvm/booke_host.c + create mode 100644 arch/powerpc/kvm/timing.c + create mode 100644 arch/powerpc/kvm/timing.h + rename arch/x86/{pci/pci.h => include/asm/pci_x86.h} (88%) + rename arch/x86/{kvm => include/asm}/svm.h (100%) + create mode 100644 arch/x86/include/asm/sys_ia32.h + create mode 100644 arch/x86/include/asm/virtext.h + rename arch/x86/{kvm => include/asm}/vmx.h (93%) + create mode 100644 drivers/base/iommu.c + create mode 100644 drivers/ide/ide-sysfs.c + create mode 100644 drivers/media/radio/radio-tea5764.c + create mode 100644 drivers/mmc/host/of_mmc_spi.c + delete mode 100644 drivers/scsi/ide-scsi.c + create mode 100644 drivers/usb/host/whci/debug.c + create mode 100644 drivers/uwb/allocator.c + create mode 100644 drivers/uwb/ie-rcv.c + create mode 100644 drivers/uwb/radio.c + create mode 100644 drivers/watchdog/sch311x_wdt.c + create mode 100644 drivers/watchdog/wm8350_wdt.c + create mode 100644 include/linux/iommu.h + delete mode 100644 include/linux/uwb/debug.h + create mode 100644 lib/find_last_bit.c + rename virt/kvm/{vtd.c => iommu.c} (58%) +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 +Removed arch/sparc/include/asm/openprom_32.h +Removed arch/sparc/include/asm/openprom_64.h +Removed arch/sparc/include/asm/posix_types_32.h +Removed arch/sparc/include/asm/posix_types_64.h +Removed arch/sparc/include/asm/ptrace_32.h +Removed arch/sparc/include/asm/ptrace_64.h +Removed arch/sparc/include/asm/sigcontext_32.h +Removed arch/sparc/include/asm/sigcontext_64.h +Removed arch/sparc/include/asm/siginfo_32.h +Removed arch/sparc/include/asm/siginfo_64.h +Removed arch/sparc/include/asm/signal_32.h +Removed arch/sparc/include/asm/signal_64.h +Removed arch/sparc/include/asm/stat_32.h +Removed arch/sparc/include/asm/stat_64.h +Merge made by recursive. + arch/sparc/Kconfig | 28 -- + arch/sparc/configs/sparc64_defconfig | 105 +++++--- + arch/sparc/include/asm/Kbuild | 14 - + arch/sparc/include/asm/byteorder.h | 12 +- + arch/sparc/include/asm/jsflash.h | 2 +- + arch/sparc/include/asm/openprom.h | 277 +++++++++++++++++++- + arch/sparc/include/asm/openprom_32.h | 255 ------------------ + arch/sparc/include/asm/openprom_64.h | 280 ------------------- + arch/sparc/include/asm/posix_types.h | 157 +++++++++++- + arch/sparc/include/asm/posix_types_32.h | 118 -------- + arch/sparc/include/asm/posix_types_64.h | 122 --------- + arch/sparc/include/asm/processor_32.h | 2 +- + arch/sparc/include/asm/ptrace.h | 448 ++++++++++++++++++++++++++++++- + arch/sparc/include/asm/ptrace_32.h | 186 ------------- + arch/sparc/include/asm/ptrace_64.h | 356 ------------------------ + arch/sparc/include/asm/sigcontext.h | 102 +++++++- + arch/sparc/include/asm/sigcontext_32.h | 62 ----- + arch/sparc/include/asm/sigcontext_64.h | 87 ------ + arch/sparc/include/asm/siginfo.h | 43 +++- + arch/sparc/include/asm/siginfo_32.h | 17 -- + arch/sparc/include/asm/siginfo_64.h | 32 --- + arch/sparc/include/asm/signal.h | 212 ++++++++++++++- + arch/sparc/include/asm/signal_32.h | 207 -------------- + arch/sparc/include/asm/signal_64.h | 194 ------------- + arch/sparc/include/asm/smp_32.h | 3 - + arch/sparc/include/asm/stat.h | 111 +++++++- + arch/sparc/include/asm/stat_32.h | 76 ------ + arch/sparc/include/asm/stat_64.h | 47 ---- + arch/sparc/include/asm/thread_info_32.h | 2 +- + arch/sparc/include/asm/traps.h | 11 +- + arch/sparc/kernel/kgdb_32.c | 12 +- + arch/sparc/kernel/muldiv.c | 8 +- + arch/sparc/kernel/pci_psycho.c | 5 +- + arch/sparc/kernel/process_32.c | 16 +- + arch/sparc/kernel/signal_32.c | 6 +- + arch/sparc/kernel/traps_32.c | 4 +- + arch/sparc/kernel/unaligned_32.c | 12 +- + arch/sparc/kernel/windows.c | 6 +- + 38 files changed, 1427 insertions(+), 2210 deletions(-) + delete mode 100644 arch/sparc/include/asm/openprom_32.h + delete mode 100644 arch/sparc/include/asm/openprom_64.h + delete mode 100644 arch/sparc/include/asm/posix_types_32.h + delete mode 100644 arch/sparc/include/asm/posix_types_64.h + delete mode 100644 arch/sparc/include/asm/ptrace_32.h + delete mode 100644 arch/sparc/include/asm/ptrace_64.h + delete mode 100644 arch/sparc/include/asm/sigcontext_32.h + delete mode 100644 arch/sparc/include/asm/sigcontext_64.h + delete mode 100644 arch/sparc/include/asm/siginfo_32.h + delete mode 100644 arch/sparc/include/asm/siginfo_64.h + delete mode 100644 arch/sparc/include/asm/signal_32.h + delete mode 100644 arch/sparc/include/asm/signal_64.h + delete mode 100644 arch/sparc/include/asm/stat_32.h + delete mode 100644 arch/sparc/include/asm/stat_64.h +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. +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 +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/storage/unusual_devs.h | 30 +++++++++++++++++++++++++++++- + 1 files changed, 29 insertions(+), 1 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 +Auto-merged drivers/input/keyboard/omap-keypad.c +Auto-merged drivers/input/touchscreen/ads7846.c +Merge made by recursive. + Documentation/input/walkera0701.txt | 109 +++++++ + arch/arm/mach-pxa/include/mach/pxa930_rotary.h | 20 ++ + arch/arm/mach-pxa/include/mach/pxa930_trkball.h | 10 + + drivers/input/Makefile | 2 +- + drivers/input/evbug.c | 6 +- + drivers/input/evdev.c | 199 +----------- + drivers/input/gameport/gameport.c | 3 +- + drivers/input/gameport/ns558.c | 2 +- + drivers/input/input-compat.c | 135 ++++++++ + drivers/input/input-compat.h | 94 ++++++ + drivers/input/input.c | 4 +- + drivers/input/joydev.c | 2 +- + drivers/input/joystick/Kconfig | 24 ++ + drivers/input/joystick/Makefile | 2 + + drivers/input/joystick/maplecontrol.c | 193 +++++++++++ + drivers/input/joystick/walkera0701.c | 292 +++++++++++++++++ + drivers/input/keyboard/Kconfig | 9 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/atkbd.c | 60 ++++ + drivers/input/keyboard/gpio_keys.c | 4 + + drivers/input/keyboard/hil_kbd.c | 1 + + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/input/keyboard/pxa930_rotary.c | 212 ++++++++++++ + drivers/input/misc/pcspkr.c | 4 +- + drivers/input/misc/uinput.c | 172 +++++++++-- + drivers/input/mouse/Kconfig | 6 + + drivers/input/mouse/Makefile | 27 +- + drivers/input/mouse/appletouch.c | 274 ++++++++-------- + drivers/input/mouse/gpio_mouse.c | 2 +- + drivers/input/mouse/hgpk.c | 32 ++- + drivers/input/mouse/hil_ptr.c | 2 +- + drivers/input/mouse/pxa930_trkball.c | 269 ++++++++++++++++ + drivers/input/mouse/synaptics.c | 16 +- + drivers/input/mousedev.c | 3 +- + drivers/input/serio/hil_mlc.c | 1 + + drivers/input/serio/i8042-x86ia64io.h | 8 + + drivers/input/serio/libps2.c | 20 +- + drivers/input/serio/pcips2.c | 2 +- + drivers/input/serio/serio.c | 4 +- + drivers/input/serio/xilinx_ps2.c | 220 +++++++------- + drivers/input/tablet/gtco.c | 2 +- + drivers/input/tablet/wacom_wac.c | 2 +- + drivers/input/touchscreen/Kconfig | 32 ++ + drivers/input/touchscreen/Makefile | 3 + + drivers/input/touchscreen/ads7846.c | 6 +- + drivers/input/touchscreen/da9034-ts.c | 389 +++++++++++++++++++++++ + drivers/input/touchscreen/tsc2007.c | 381 ++++++++++++++++++++++ + drivers/input/touchscreen/usbtouchscreen.c | 5 +- + drivers/input/touchscreen/wacom_w8001.c | 325 +++++++++++++++++++ + include/linux/gpio_keys.h | 1 + + include/linux/i2c/tsc2007.h | 17 + + include/linux/libps2.h | 2 + + include/linux/map_to_7segment.h | 2 +- + include/linux/serio.h | 1 + + 54 files changed, 3098 insertions(+), 522 deletions(-) + create mode 100644 Documentation/input/walkera0701.txt + create mode 100644 arch/arm/mach-pxa/include/mach/pxa930_rotary.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa930_trkball.h + create mode 100644 drivers/input/input-compat.c + create mode 100644 drivers/input/input-compat.h + create mode 100644 drivers/input/joystick/maplecontrol.c + create mode 100644 drivers/input/joystick/walkera0701.c + create mode 100644 drivers/input/keyboard/pxa930_rotary.c + create mode 100644 drivers/input/mouse/pxa930_trkball.c + create mode 100644 drivers/input/touchscreen/da9034-ts.c + create mode 100644 drivers/input/touchscreen/tsc2007.c + create mode 100644 drivers/input/touchscreen/wacom_w8001.c + create mode 100644 include/linux/i2c/tsc2007.h +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 +Auto-merged drivers/char/tty_audit.c +CONFLICT (content): Merge conflict in drivers/char/tty_audit.c +Auto-merged drivers/char/tty_io.c +Auto-merged include/linux/audit.h +Auto-merged include/linux/tty.h +Auto-merged kernel/auditsc.c +Auto-merged kernel/fork.c +Resolved 'drivers/char/tty_audit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 91f3571: Merge commit 'audit-current/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Removed arch/arm/configs/clps7500_defconfig +Merge made by recursive. + arch/arm/configs/clps7500_defconfig | 801 ----------------------------------- + arch/arm/mach-clps711x/edb7211-mm.c | 1 - + arch/arm/mach-clps711x/fortunet.c | 1 - + arch/arm/mach-footbridge/common.c | 7 + + arch/arm/mach-pxa/e750.c | 52 +++ + 5 files changed, 59 insertions(+), 803 deletions(-) + delete mode 100644 arch/arm/configs/clps7500_defconfig +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/kernel/process.c | 1 + + arch/avr32/kernel/signal.c | 1 + + arch/avr32/kernel/sys_avr32.c | 1 + + arch/avr32/mm/cache.c | 1 + + include/asm-avr32/syscalls.h | 39 +++++++++++++++++++++++++++++++++++++++ + 5 files changed, 43 insertions(+), 0 deletions(-) + create mode 100644 include/asm-avr32/syscalls.h +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v10/arch/byteorder.h | 10 ++++++---- + arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- + arch/cris/include/asm/byteorder.h | 20 ++++---------------- + 3 files changed, 14 insertions(+), 22 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +Merge made by recursive. + arch/parisc/include/asm/byteorder.h | 37 ++++++++++---------------------- + arch/parisc/include/asm/io.h | 12 ++-------- + arch/parisc/include/asm/mmu_context.h | 13 ++++++++--- + arch/parisc/kernel/setup.c | 5 ---- + arch/parisc/kernel/unwind.c | 2 +- + arch/parisc/lib/iomap.c | 2 +- + arch/parisc/lib/memcpy.c | 2 +- + drivers/parisc/asp.c | 3 +- + drivers/parisc/ccio-dma.c | 4 +-- + drivers/parisc/dino.c | 4 +- + drivers/parisc/hppb.c | 2 +- + drivers/parisc/lasi.c | 5 +-- + drivers/parisc/lba_pci.c | 2 +- + drivers/parisc/sba_iommu.c | 9 ++----- + drivers/parisc/wax.c | 3 +- + drivers/rtc/rtc-parisc.c | 3 +- + 16 files changed, 41 insertions(+), 67 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Auto-merged arch/powerpc/boot/dts/mpc8641_hpcn.dts +Merge made by recursive. + Documentation/powerpc/dts-bindings/fsl/board.txt | 32 ++++- + arch/powerpc/boot/dts/mpc836x_mds.dts | 43 +++++- + arch/powerpc/boot/dts/mpc836x_rdk.dts | 19 ++- + arch/powerpc/boot/dts/mpc8641_hpcn.dts | 56 ++++--- + arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 43 +++-- + arch/powerpc/include/asm/qe.h | 37 ++++- + arch/powerpc/include/asm/qe_ic.h | 21 ++- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 9 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 5 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 81 +++++++++- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 6 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 1 - + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 - + arch/powerpc/platforms/83xx/mpc83xx.h | 1 + + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 7 + + arch/powerpc/platforms/85xx/smp.c | 1 + + arch/powerpc/platforms/Kconfig | 11 ++ + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/fsl_pci.c | 7 +- + arch/powerpc/sysdev/fsl_soc.h | 5 + + arch/powerpc/sysdev/qe_lib/Kconfig | 3 +- + arch/powerpc/sysdev/qe_lib/gpio.c | 195 ++++++++++++++++++++++ + arch/powerpc/sysdev/simple_gpio.c | 155 +++++++++++++++++ + arch/powerpc/sysdev/simple_gpio.h | 12 ++ + 26 files changed, 686 insertions(+), 71 deletions(-) + create mode 100644 arch/powerpc/sysdev/simple_gpio.c + create mode 100644 arch/powerpc/sysdev/simple_gpio.h +Merging pxa/for-next +$ git merge pxa/for-next +Merge made by recursive. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/ptrace.h | 7 +++++-- + arch/s390/kernel/vdso32/gettimeofday.S | 4 ---- + 2 files changed, 5 insertions(+), 6 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 7 + + arch/sh/boards/Kconfig | 4 +- + arch/sh/boards/mach-migor/setup.c | 109 ++---------- + arch/sh/include/asm/gpio.h | 70 +++++--- + arch/sh/include/asm/posix_types_32.h | 8 +- + arch/sh/include/asm/posix_types_64.h | 8 +- + arch/sh/kernel/Makefile_32 | 2 +- + arch/sh/kernel/Makefile_64 | 2 +- + arch/sh/kernel/gpio.c | 338 +++++++++++++++++++++------------- + arch/sh/mm/ioremap_64.c | 2 +- + drivers/serial/sh-sci.h | 2 +- + 11 files changed, 283 insertions(+), 269 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Already uptodate! +Merge made by recursive. +Merging xtensa/master +$ git merge xtensa/master +Auto-merged arch/xtensa/platforms/iss/network.c +Merge made by recursive. + arch/xtensa/Makefile | 28 +-- + arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- + arch/xtensa/boot/boot-redboot/bootstrap.S | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/Kbuild | 0 + .../xtensa/include/asm}/asmmacro.h | 2 +- + .../xtensa/include/asm}/atomic.h | 0 + .../xtensa/include/asm}/auxvec.h | 0 + .../xtensa/include/asm}/bitops.h | 0 + .../xtensa/include/asm}/bootparam.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bug.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bugs.h | 0 + .../xtensa/include/asm}/byteorder.h | 32 ++-- + .../asm-xtensa => arch/xtensa/include/asm}/cache.h | 2 +- + .../xtensa/include/asm}/cacheasm.h | 0 + .../xtensa/include/asm}/cacheflush.h | 0 + .../xtensa/include/asm}/checksum.h | 2 +- + .../xtensa/include/asm}/coprocessor.h | 4 +- + .../xtensa/include/asm}/cpumask.h | 0 + .../xtensa/include/asm}/cputime.h | 0 + .../xtensa/include/asm}/current.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/delay.h | 0 + .../xtensa/include/asm}/device.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/div64.h | 0 + .../xtensa/include/asm}/dma-mapping.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/dma.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/elf.h | 0 + .../xtensa/include/asm}/emergency-restart.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/errno.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fb.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fcntl.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/futex.h | 0 + .../xtensa/include/asm}/hardirq.h | 0 + .../xtensa/include/asm}/highmem.h | 0 + .../xtensa/include/asm}/hw_irq.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/io.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/ioctl.h | 0 + .../xtensa/include/asm}/ioctls.h | 0 + .../xtensa/include/asm}/ipcbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/irq.h | 4 +- + .../xtensa/include/asm}/irq_regs.h | 0 + .../xtensa/include/asm}/kdebug.h | 0 + .../xtensa/include/asm}/kmap_types.h | 0 + .../xtensa/include/asm}/linkage.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/local.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mman.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mmu.h | 0 + .../xtensa/include/asm}/mmu_context.h | 0 + .../xtensa/include/asm}/module.h | 0 + .../xtensa/include/asm}/msgbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mutex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/page.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/param.h | 0 + .../xtensa/include/asm}/pci-bridge.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/pci.h | 0 + .../xtensa/include/asm}/percpu.h | 0 + .../xtensa/include/asm}/pgalloc.h | 0 + .../xtensa/include/asm}/pgtable.h | 0 + .../xtensa/include/asm}/platform.h | 2 - + .../asm-xtensa => arch/xtensa/include/asm}/poll.h | 0 + .../xtensa/include/asm}/posix_types.h | 0 + .../xtensa/include/asm}/processor.h | 2 +- + .../xtensa/include/asm}/ptrace.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/regs.h | 0 + .../xtensa/include/asm}/resource.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rmap.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rwsem.h | 0 + .../xtensa/include/asm}/scatterlist.h | 0 + .../xtensa/include/asm}/sections.h | 0 + .../xtensa/include/asm}/segment.h | 0 + .../xtensa/include/asm}/sembuf.h | 0 + .../xtensa/include/asm}/serial.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/setup.h | 0 + .../xtensa/include/asm}/shmbuf.h | 0 + .../xtensa/include/asm}/shmparam.h | 0 + .../xtensa/include/asm}/sigcontext.h | 0 + .../xtensa/include/asm}/siginfo.h | 0 + .../xtensa/include/asm}/signal.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/smp.h | 0 + .../xtensa/include/asm}/socket.h | 0 + .../xtensa/include/asm}/sockios.h | 0 + .../xtensa/include/asm}/spinlock.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/stat.h | 0 + .../xtensa/include/asm}/statfs.h | 0 + .../xtensa/include/asm}/string.h | 0 + .../xtensa/include/asm}/syscall.h | 0 + .../xtensa/include/asm}/system.h | 0 + .../xtensa/include/asm}/termbits.h | 0 + .../xtensa/include/asm}/termios.h | 0 + .../xtensa/include/asm}/thread_info.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/timex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/tlb.h | 0 + .../xtensa/include/asm}/tlbflush.h | 0 + .../xtensa/include/asm}/topology.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/types.h | 0 + .../xtensa/include/asm}/uaccess.h | 0 + .../xtensa/include/asm}/ucontext.h | 0 + .../xtensa/include/asm}/unaligned.h | 12 +- + .../xtensa/include/asm}/unistd.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/user.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/vga.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/xor.h | 0 + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/lib/checksum.S | 2 +- + arch/xtensa/lib/memcopy.S | 2 +- + arch/xtensa/lib/memset.S | 2 +- + arch/xtensa/lib/strncpy_user.S | 2 +- + arch/xtensa/lib/strnlen_user.S | 2 +- + arch/xtensa/lib/usercopy.S | 2 +- + arch/xtensa/platforms/iss/console.c | 4 +- + .../platforms/iss/include/platform}/hardware.h | 0 + .../platforms/iss/include/platform}/simcall.h | 0 + arch/xtensa/platforms/iss/io.c | 2 +- + arch/xtensa/platforms/iss/network.c | 4 +- + arch/xtensa/platforms/xt2000/Makefile | 5 + + .../platforms/xt2000/include/platform/hardware.h | 55 ++++++ + .../platforms/xt2000/include/platform/serial.h | 28 +++ + arch/xtensa/platforms/xt2000/setup.c | 181 ++++++++++++++++++++ + .../xtensa/variants/dc232b/include/variant}/core.h | 0 + .../variants/dc232b/include/variant}/tie-asm.h | 0 + .../xtensa/variants/dc232b/include/variant}/tie.h | 0 + .../xtensa/variants/fsf/include/variant}/core.h | 0 + .../xtensa/variants/fsf/include/variant}/tie-asm.h | 0 + .../xtensa/variants/fsf/include/variant}/tie.h | 0 + 124 files changed, 324 insertions(+), 69 deletions(-) + rename {include/asm-xtensa => arch/xtensa/include/asm}/Kbuild (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/asmmacro.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/atomic.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/auxvec.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bitops.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bootparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bugs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/byteorder.h (82%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cache.h (96%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheasm.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/checksum.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/coprocessor.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cpumask.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cputime.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/current.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/delay.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/device.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/div64.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma-mapping.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/elf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/emergency-restart.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/errno.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fcntl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/futex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hardirq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/highmem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hw_irq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/io.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctls.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ipcbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq.h (89%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq_regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kdebug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kmap_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/linkage.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/local.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mman.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu_context.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/module.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/msgbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mutex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/page.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/param.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci-bridge.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/percpu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgalloc.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgtable.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/platform.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/poll.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/posix_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/processor.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ptrace.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/resource.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rmap.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rwsem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/scatterlist.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sections.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/segment.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sembuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/serial.h (92%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/setup.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sigcontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/siginfo.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/signal.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/smp.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/socket.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sockios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/spinlock.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/stat.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/statfs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/string.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/syscall.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/system.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termbits.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/thread_info.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/timex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlbflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/topology.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/uaccess.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ucontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unaligned.h (80%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unistd.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/user.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/vga.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/xor.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/hardware.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/simcall.h (100%) + create mode 100644 arch/xtensa/platforms/xt2000/Makefile + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xt2000/setup.c + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie.h (100%) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged arch/arm/mach-aaec2000/core.c +Auto-merged arch/arm/mach-ep93xx/core.c +Auto-merged arch/arm/mach-integrator/core.c +Auto-merged arch/arm/mach-integrator/integrator_cp.c +Auto-merged arch/arm/mach-netx/fb.c +Auto-merged arch/arm/mach-realview/core.h +Auto-merged arch/arm/plat-omap/include/mach/memory.h +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/powerpc/kernel/ibmebus.c +Auto-merged arch/powerpc/platforms/85xx/mpc85xx_mds.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c +Auto-merged arch/powerpc/platforms/ps3/system-bus.c +Removed arch/s390/include/asm/s390_rdev.h +Auto-merged block/genhd.c +Auto-merged drivers/ata/libata-scsi.c +Auto-merged drivers/gpu/drm/drm_sysfs.c +Auto-merged drivers/infiniband/core/sysfs.c +Auto-merged drivers/infiniband/ulp/srp/ib_srp.c +Auto-merged drivers/isdn/mISDN/dsp_pipeline.c +Auto-merged drivers/lguest/lguest_device.c +Auto-merged drivers/misc/sgi-xp/xp_main.c +Auto-merged drivers/misc/sgi-xp/xpnet.c +Auto-merged drivers/mtd/maps/ixp2000.c +Auto-merged drivers/mtd/maps/ixp4xx.c +Auto-merged drivers/mtd/onenand/omap2.c +Auto-merged drivers/mtd/ubi/build.c +Auto-merged drivers/s390/block/dcssblk.c +Auto-merged drivers/s390/crypto/ap_bus.c +Auto-merged drivers/s390/kvm/kvm_virtio.c +Auto-merged drivers/s390/net/qeth_core_main.c +Auto-merged drivers/s390/net/qeth_l2_main.c +Auto-merged drivers/s390/net/qeth_l3_main.c +Removed drivers/s390/s390_rdev.c +Auto-merged drivers/scsi/ipr.c +Auto-merged drivers/scsi/ipr.h +Auto-merged drivers/scsi/scsi_ioctl.c +Auto-merged drivers/scsi/scsi_scan.c +Auto-merged drivers/scsi/scsi_transport_fc.c +Auto-merged drivers/scsi/sd.c +Auto-merged drivers/scsi/ses.c +Auto-merged drivers/serial/serial_core.c +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Auto-merged drivers/usb/gadget/pxa27x_udc.c +Auto-merged drivers/usb/gadget/s3c2410_udc.c +Auto-merged drivers/virtio/virtio_pci.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio_pci.c +Auto-merged include/linux/kernel.h +Auto-merged include/linux/pci.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Auto-merged kernel/power/main.c +Auto-merged lib/swiotlb.c +Auto-merged net/iucv/iucv.c +Resolved 'arch/powerpc/platforms/85xx/mpc85xx_mds.c' using previous resolution. +Resolved 'drivers/virtio/virtio_pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b3e670a: Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/uio-howto.tmpl | 101 +++++++++++++++- + Documentation/kobject.txt | 4 +- + arch/arm/kernel/ecard.c | 2 +- + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 6 +- + arch/arm/mach-integrator/core.c | 10 +- + arch/arm/mach-integrator/integrator_cp.c | 6 +- + arch/arm/mach-lh7a40x/clcd.c | 2 +- + arch/arm/mach-netx/fb.c | 2 +- + arch/arm/mach-realview/core.h | 2 +- + arch/arm/mach-versatile/core.h | 2 +- + arch/arm/plat-omap/include/mach/memory.h | 2 +- + arch/avr32/mach-at32ap/clock.c | 4 +- + arch/cris/arch-v32/drivers/iop_fw_load.c | 6 +- + arch/ia64/kernel/pci-dma.c | 2 +- + arch/ia64/sn/kernel/tiocx.c | 3 +- + arch/mips/kernel/vpe.c | 2 +- + arch/s390/include/asm/s390_rdev.h | 15 --- + block/bsg.c | 6 +- + block/genhd.c | 2 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/base/attribute_container.c | 2 +- + drivers/base/base.h | 26 ++++ + drivers/base/bus.c | 52 +++++--- + drivers/base/core.c | 197 +++++++++++++++++++++++------- + drivers/base/dd.c | 26 ++-- + drivers/base/driver.c | 13 ++- + drivers/base/firmware_class.c | 8 +- + drivers/base/isa.c | 7 +- + drivers/base/platform.c | 130 ++++++++++---------- + drivers/base/power/main.c | 21 ++-- + drivers/base/power/trace.c | 4 +- + drivers/char/mwave/mwavedd.c | 2 +- + drivers/firmware/dmi-id.c | 2 +- + drivers/gpio/gpiolib.c | 2 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/lm75.c | 2 +- + drivers/idle/i7300_idle.c | 2 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/core/ucm.c | 3 +- + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + drivers/isdn/mISDN/dsp_pipeline.c | 2 +- + drivers/lguest/lguest_device.c | 10 +- + drivers/macintosh/macio_asic.c | 24 ++-- + drivers/memstick/core/memstick.c | 5 +- + drivers/memstick/core/mspro_block.c | 14 +- + drivers/memstick/host/tifm_ms.c | 4 +- + drivers/message/i2o/device.c | 8 +- + drivers/message/i2o/i2o_proc.c | 2 +- + drivers/message/i2o/iop.c | 2 +- + drivers/misc/enclosure.c | 8 +- + drivers/misc/sgi-gru/grumain.c | 2 +- + drivers/misc/sgi-xp/xp_main.c | 2 +- + drivers/misc/sgi-xp/xpc_main.c | 8 +- + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/misc/tifm_7xx1.c | 2 +- + drivers/misc/tifm_core.c | 7 +- + drivers/mtd/devices/m25p80.c | 16 ++-- + drivers/mtd/devices/mtd_dataflash.c | 30 +++--- + drivers/mtd/maps/integrator-flash.c | 2 +- + drivers/mtd/maps/ixp2000.c | 4 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/maps/omap_nor.c | 2 +- + drivers/mtd/maps/physmap.c | 6 +- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/nand/fsl_upm.c | 2 +- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/mtd/onenand/generic.c | 2 +- + drivers/mtd/onenand/omap2.c | 2 +- + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/vmt.c | 4 +- + drivers/pci/pci-driver.c | 132 ++++++++++++-------- + drivers/pnp/card.c | 7 +- + drivers/pnp/core.c | 5 +- + drivers/pnp/system.c | 2 +- + drivers/power/ds2760_battery.c | 4 +- + drivers/s390/Makefile | 2 +- + drivers/s390/block/dcssblk.c | 11 +- + drivers/s390/crypto/ap_bus.c | 7 +- + drivers/s390/kvm/kvm_virtio.c | 5 +- + drivers/s390/net/cu3088.c | 7 +- + drivers/s390/net/qeth_core_main.c | 7 +- + drivers/s390/net/qeth_l2_main.c | 2 - + drivers/s390/net/qeth_l3_main.c | 2 - + drivers/s390/s390_rdev.c | 51 -------- + drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/hosts.c | 6 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_dump.c | 2 +- + drivers/scsi/libsas/sas_port.c | 2 +- + drivers/scsi/raid_class.c | 3 +- + drivers/scsi/scsi_debug.c | 4 +- + drivers/scsi/scsi_ioctl.c | 3 +- + drivers/scsi/scsi_scan.c | 7 +- + drivers/scsi/scsi_sysfs.c | 12 +- + drivers/scsi/scsi_transport_fc.c | 18 ++-- + drivers/scsi/scsi_transport_iscsi.c | 11 +- + drivers/scsi/scsi_transport_sas.c | 42 ++++--- + drivers/scsi/scsi_transport_srp.c | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/ses.c | 2 +- + drivers/serial/serial_core.c | 4 +- + drivers/spi/spi.c | 20 ++-- + drivers/spi/spi_bitbang.c | 2 +- + drivers/spi/spi_butterfly.c | 2 +- + drivers/spi/spi_lm70llp.c | 2 +- + drivers/thermal/thermal_sys.c | 6 +- + drivers/uio/uio.c | 159 +++++++++++++++++++++--- + drivers/uio/uio_cif.c | 3 +- + drivers/uio/uio_pdrv_genirq.c | 5 +- + drivers/usb/core/usb.c | 4 +- + drivers/usb/gadget/at91_udc.c | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/lh7a40x_udc.c | 2 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/gadget/s3c2410_udc.c | 2 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/lcd.c | 2 +- + drivers/video/output.c | 2 +- + drivers/virtio/virtio_pci.c | 17 +-- + drivers/w1/w1.c | 19 ++-- + drivers/w1/w1_int.c | 3 +- + drivers/xen/xenbus/xenbus_probe.c | 27 +++-- + drivers/xen/xenbus/xenbus_probe.h | 4 +- + fs/partitions/check.c | 11 +-- + include/linux/device.h | 39 ++++-- + include/linux/init.h | 1 + + include/linux/kernel.h | 8 +- + include/linux/klist.h | 2 - + include/linux/mtd/concat.h | 2 +- + include/linux/pci.h | 1 - + include/linux/platform_device.h | 1 - + include/linux/pm.h | 88 +++++--------- + include/linux/uio_driver.h | 30 ++++- + init/Kconfig | 44 ++++--- + init/main.c | 9 ++ + kernel/ksysfs.c | 4 +- + kernel/power/main.c | 6 +- + lib/dynamic_printk.c | 58 ++++----- + lib/klist.c | 43 ++++++- + lib/kobject.c | 50 ++++++++ + lib/kobject_uevent.c | 8 +- + lib/swiotlb.c | 2 +- + net/iucv/iucv.c | 7 +- + 151 files changed, 1186 insertions(+), 770 deletions(-) + delete mode 100644 arch/s390/include/asm/s390_rdev.h + delete mode 100644 drivers/s390/s390_rdev.c +Merging quilt/usb +$ git merge quilt/usb +Auto-merged CREDITS +Auto-merged Documentation/DocBook/networking.tmpl +CONFLICT (content): Merge conflict in Documentation/DocBook/networking.tmpl +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged drivers/media/video/pvrusb2/pvrusb2-hdw.c +Auto-merged drivers/net/Kconfig +Auto-merged drivers/net/Makefile +Auto-merged drivers/net/usb/kaweth.c +Auto-merged drivers/net/usb/pegasus.c +Auto-merged drivers/usb/core/devio.c +Auto-merged drivers/usb/gadget/m66592-udc.c +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Auto-merged drivers/usb/gadget/pxa27x_udc.c +Auto-merged drivers/usb/gadget/s3c2410_udc.c +Auto-merged drivers/usb/host/r8a66597-hcd.c +Auto-merged drivers/usb/serial/mos7840.c +Removed drivers/usb/storage/dpcm.c +Removed drivers/usb/storage/dpcm.h +Auto-merged drivers/usb/wusbcore/rh.c +CONFLICT (content): Merge conflict in drivers/usb/wusbcore/rh.c +Auto-merged include/linux/Kbuild +Auto-merged net/Kconfig +Auto-merged net/Makefile +Resolved 'Documentation/DocBook/networking.tmpl' using previous resolution. +Resolved 'drivers/usb/wusbcore/rh.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d761afb: Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 17 + + Documentation/DocBook/networking.tmpl | 8 + + Documentation/kernel-parameters.txt | 36 + + Documentation/usb/power-management.txt | 22 +- + Documentation/wimax/README.i2400m | 260 ++ + Documentation/wimax/README.wimax | 81 + + MAINTAINERS | 17 + + arch/arm/plat-mxc/include/mach/usb.h | 23 + + arch/arm/plat-omap/usb.c | 32 - + arch/powerpc/boot/dts/sequoia.dts | 2 +- + drivers/Makefile | 1 + + drivers/block/ub.c | 11 +- + drivers/hid/usbhid/hid-core.c | 9 +- + drivers/i2c/chips/Kconfig | 12 - + drivers/i2c/chips/Makefile | 1 - + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/net/Kconfig | 2 + + drivers/net/Makefile | 1 + + drivers/net/usb/kaweth.c | 6 +- + drivers/net/usb/pegasus.c | 12 +- + drivers/net/wimax/Kconfig | 17 + + drivers/net/wimax/Makefile | 2 + + drivers/net/wimax/i2400m/Kconfig | 49 + + drivers/net/wimax/i2400m/Makefile | 29 + + drivers/net/wimax/i2400m/control.c | 1291 ++++++++ + drivers/net/wimax/i2400m/debug-levels.h | 45 + + drivers/net/wimax/i2400m/debugfs.c | 392 +++ + drivers/net/wimax/i2400m/driver.c | 728 +++++ + drivers/net/wimax/i2400m/fw.c | 1095 +++++++ + drivers/net/wimax/i2400m/i2400m-sdio.h | 132 + + drivers/net/wimax/i2400m/i2400m-usb.h | 264 ++ + drivers/net/wimax/i2400m/i2400m.h | 755 +++++ + drivers/net/wimax/i2400m/netdev.c | 524 ++++ + drivers/net/wimax/i2400m/op-rfkill.c | 207 ++ + drivers/net/wimax/i2400m/rx.c | 534 ++++ + drivers/net/wimax/i2400m/sdio-debug-levels.h | 22 + + drivers/net/wimax/i2400m/sdio-fw.c | 224 ++ + drivers/net/wimax/i2400m/sdio-rx.c | 255 ++ + drivers/net/wimax/i2400m/sdio-tx.c | 153 + + drivers/net/wimax/i2400m/sdio.c | 511 ++++ + drivers/net/wimax/i2400m/tx.c | 817 +++++ + drivers/net/wimax/i2400m/usb-debug-levels.h | 42 + + drivers/net/wimax/i2400m/usb-fw.c | 340 +++ + drivers/net/wimax/i2400m/usb-notif.c | 269 ++ + drivers/net/wimax/i2400m/usb-rx.c | 417 +++ + drivers/net/wimax/i2400m/usb-tx.c | 229 ++ + drivers/net/wimax/i2400m/usb.c | 591 ++++ + drivers/usb/Kconfig | 2 + + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/class/cdc-wdm.c | 3 +- + drivers/usb/class/usbtmc.c | 9 +- + drivers/usb/core/devio.c | 5 - + drivers/usb/core/driver.c | 172 +- + drivers/usb/core/endpoint.c | 4 +- + drivers/usb/core/generic.c | 10 +- + drivers/usb/core/hcd-pci.c | 201 +- + drivers/usb/core/hcd.c | 20 +- + drivers/usb/core/hcd.h | 16 +- + drivers/usb/core/hub.c | 140 +- + drivers/usb/core/message.c | 97 +- + drivers/usb/core/sysfs.c | 49 +- + drivers/usb/core/urb.c | 43 +- + drivers/usb/core/usb.c | 77 +- + drivers/usb/core/usb.h | 20 +- + drivers/usb/gadget/Kconfig | 43 +- + drivers/usb/gadget/Makefile | 2 + + drivers/usb/gadget/ci13xxx_udc.c | 2830 ++++++++++++++++++ + drivers/usb/gadget/ci13xxx_udc.h | 195 ++ + drivers/usb/gadget/epautoconf.c | 2 +- + drivers/usb/gadget/file_storage.c | 177 +- + drivers/usb/gadget/fsl_qe_udc.c | 12 +- + drivers/usb/gadget/gadget_chips.h | 8 +- + drivers/usb/gadget/imx_udc.c | 1516 ++++++++++ + drivers/usb/gadget/imx_udc.h | 344 +++ + drivers/usb/gadget/m66592-udc.c | 9 +- + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/gadget/omap_udc.c | 4 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 - + drivers/usb/gadget/s3c2410_udc.c | 34 +- + drivers/usb/host/Kconfig | 13 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-dbg.c | 8 +- + drivers/usb/host/ehci-hub.c | 27 +- + drivers/usb/host/ehci-pci.c | 12 +- + drivers/usb/host/ehci-ppc-of.c | 45 +- + drivers/usb/host/ehci.h | 34 + + drivers/usb/host/isp1760-hcd.c | 13 +- + drivers/usb/host/isp1760-hcd.h | 1 - + drivers/usb/host/isp1760-if.c | 116 +- + drivers/usb/host/ohci-hcd.c | 12 +- + drivers/usb/host/ohci-pci.c | 6 +- + drivers/usb/host/ohci-pnx4008.c | 85 +- + drivers/usb/host/ohci-ppc-of.c | 25 + + drivers/usb/host/ohci-tmio.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 3985 +++++++++++++++++++++++++ + drivers/usb/host/oxu210hp.h | 447 +++ + drivers/usb/host/pci-quirks.c | 14 +- + drivers/usb/host/r8a66597-hcd.c | 8 +- + drivers/usb/host/uhci-hcd.c | 2 + + drivers/usb/image/microtek.c | 11 +- + drivers/usb/misc/berry_charge.c | 5 + + drivers/usb/misc/usbtest.c | 2 - + drivers/usb/mon/Kconfig | 13 +- + drivers/usb/mon/Makefile | 3 +- + drivers/usb/musb/Kconfig | 12 +- + drivers/usb/musb/Makefile | 8 + + drivers/usb/musb/blackfin.c | 320 ++ + drivers/usb/musb/blackfin.h | 52 + + drivers/usb/musb/davinci.c | 18 +- + drivers/usb/musb/musb_core.c | 84 +- + drivers/usb/musb/musb_core.h | 73 +- + drivers/usb/musb/musb_gadget.c | 2 +- + drivers/usb/musb/musb_host.c | 45 +- + drivers/usb/musb/musb_io.h | 26 +- + drivers/usb/musb/musb_regs.h | 397 ++- + drivers/usb/musb/musbhsdma.c | 84 +- + drivers/usb/musb/musbhsdma.h | 149 + + drivers/usb/musb/omap2430.c | 15 +- + drivers/usb/musb/tusb6010.c | 7 +- + drivers/usb/otg/Kconfig | 54 + + drivers/usb/otg/Makefile | 15 + + drivers/usb/otg/gpio_vbus.c | 335 +++ + drivers/{i2c/chips => usb/otg}/isp1301_omap.c | 0 + drivers/usb/otg/otg.c | 65 + + drivers/usb/otg/twl4030-usb.c | 721 +++++ + drivers/usb/serial/Kconfig | 17 + + drivers/usb/serial/Makefile | 2 + + drivers/usb/serial/digi_acceleport.c | 28 +- + drivers/usb/serial/garmin_gps.c | 2 +- + drivers/usb/serial/ipw.c | 4 +- + drivers/usb/serial/iuu_phoenix.c | 38 +- + drivers/usb/serial/mos7840.c | 38 +- + drivers/usb/serial/opticon.c | 358 +++ + drivers/usb/serial/option.c | 11 +- + drivers/usb/serial/siemens_mpi.c | 77 + + drivers/usb/serial/spcp8x5.c | 20 +- + drivers/usb/serial/usb_debug.c | 2 +- + drivers/usb/storage/Kconfig | 11 +- + drivers/usb/storage/Makefile | 3 +- + drivers/usb/storage/dpcm.c | 86 - + drivers/usb/storage/dpcm.h | 32 - + drivers/usb/storage/libusual.c | 7 + + drivers/usb/storage/option_ms.c | 147 + + drivers/usb/storage/option_ms.h | 4 + + drivers/usb/storage/protocol.c | 24 +- + drivers/usb/storage/protocol.h | 3 +- + drivers/usb/storage/scsiglue.c | 43 + + drivers/usb/storage/sddr09.c | 43 + + drivers/usb/storage/sddr09.h | 5 +- + drivers/usb/storage/transport.c | 219 +- + drivers/usb/storage/transport.h | 2 - + drivers/usb/storage/unusual_devs.h | 338 +-- + drivers/usb/storage/usb.c | 106 +- + drivers/usb/storage/usb.h | 5 +- + drivers/usb/wusbcore/rh.c | 2 +- + fs/debugfs/file.c | 32 + + include/linux/Kbuild | 2 + + include/linux/debugfs.h | 2 + + include/linux/oxu210hp.h | 7 + + include/linux/usb.h | 26 +- + include/linux/usb/association.h | 22 +- + include/linux/usb/gpio_vbus.h | 30 + + include/linux/usb/musb.h | 5 + + include/linux/usb/otg.h | 1 + + include/linux/usb_usual.h | 7 +- + include/linux/wimax.h | 234 ++ + include/linux/wimax/Kbuild | 1 + + include/linux/wimax/debug.h | 453 +++ + include/linux/wimax/i2400m.h | 512 ++++ + include/net/wimax.h | 520 ++++ + net/Kconfig | 2 + + net/Makefile | 1 + + net/netlink/genetlink.c | 1 + + net/wimax/Kconfig | 36 + + net/wimax/Makefile | 13 + + net/wimax/debug-levels.h | 42 + + net/wimax/debugfs.c | 90 + + net/wimax/id-table.c | 142 + + net/wimax/op-msg.c | 421 +++ + net/wimax/op-reset.c | 143 + + net/wimax/op-rfkill.c | 532 ++++ + net/wimax/stack.c | 599 ++++ + net/wimax/wimax-internal.h | 91 + + 184 files changed, 28187 insertions(+), 1370 deletions(-) + create mode 100644 Documentation/wimax/README.i2400m + create mode 100644 Documentation/wimax/README.wimax + create mode 100644 arch/arm/plat-mxc/include/mach/usb.h + create mode 100644 drivers/net/wimax/Kconfig + create mode 100644 drivers/net/wimax/Makefile + create mode 100644 drivers/net/wimax/i2400m/Kconfig + create mode 100644 drivers/net/wimax/i2400m/Makefile + create mode 100644 drivers/net/wimax/i2400m/control.c + create mode 100644 drivers/net/wimax/i2400m/debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/debugfs.c + create mode 100644 drivers/net/wimax/i2400m/driver.c + create mode 100644 drivers/net/wimax/i2400m/fw.c + create mode 100644 drivers/net/wimax/i2400m/i2400m-sdio.h + create mode 100644 drivers/net/wimax/i2400m/i2400m-usb.h + create mode 100644 drivers/net/wimax/i2400m/i2400m.h + create mode 100644 drivers/net/wimax/i2400m/netdev.c + create mode 100644 drivers/net/wimax/i2400m/op-rfkill.c + create mode 100644 drivers/net/wimax/i2400m/rx.c + create mode 100644 drivers/net/wimax/i2400m/sdio-debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/sdio-fw.c + create mode 100644 drivers/net/wimax/i2400m/sdio-rx.c + create mode 100644 drivers/net/wimax/i2400m/sdio-tx.c + create mode 100644 drivers/net/wimax/i2400m/sdio.c + create mode 100644 drivers/net/wimax/i2400m/tx.c + create mode 100644 drivers/net/wimax/i2400m/usb-debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/usb-fw.c + create mode 100644 drivers/net/wimax/i2400m/usb-notif.c + create mode 100644 drivers/net/wimax/i2400m/usb-rx.c + create mode 100644 drivers/net/wimax/i2400m/usb-tx.c + create mode 100644 drivers/net/wimax/i2400m/usb.c + create mode 100644 drivers/usb/gadget/ci13xxx_udc.c + create mode 100644 drivers/usb/gadget/ci13xxx_udc.h + create mode 100644 drivers/usb/gadget/imx_udc.c + create mode 100644 drivers/usb/gadget/imx_udc.h + create mode 100644 drivers/usb/host/oxu210hp-hcd.c + create mode 100644 drivers/usb/host/oxu210hp.h + create mode 100644 drivers/usb/musb/blackfin.c + create mode 100644 drivers/usb/musb/blackfin.h + create mode 100644 drivers/usb/musb/musbhsdma.h + create mode 100644 drivers/usb/otg/Kconfig + create mode 100644 drivers/usb/otg/Makefile + create mode 100644 drivers/usb/otg/gpio_vbus.c + rename drivers/{i2c/chips => usb/otg}/isp1301_omap.c (100%) + create mode 100644 drivers/usb/otg/otg.c + create mode 100644 drivers/usb/otg/twl4030-usb.c + create mode 100644 drivers/usb/serial/opticon.c + create mode 100644 drivers/usb/serial/siemens_mpi.c + delete mode 100644 drivers/usb/storage/dpcm.c + delete mode 100644 drivers/usb/storage/dpcm.h + create mode 100644 drivers/usb/storage/option_ms.c + create mode 100644 drivers/usb/storage/option_ms.h + create mode 100644 include/linux/oxu210hp.h + create mode 100644 include/linux/usb/gpio_vbus.h + create mode 100644 include/linux/wimax.h + create mode 100644 include/linux/wimax/Kbuild + create mode 100644 include/linux/wimax/debug.h + create mode 100644 include/linux/wimax/i2400m.h + create mode 100644 include/net/wimax.h + create mode 100644 net/wimax/Kconfig + create mode 100644 net/wimax/Makefile + create mode 100644 net/wimax/debug-levels.h + create mode 100644 net/wimax/debugfs.c + create mode 100644 net/wimax/id-table.c + create mode 100644 net/wimax/op-msg.c + create mode 100644 net/wimax/op-reset.c + create mode 100644 net/wimax/op-rfkill.c + create mode 100644 net/wimax/stack.c + create mode 100644 net/wimax/wimax-internal.h +$ git reset --hard HEAD^ +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Merge made by recursive. + arch/x86/include/asm/percpu.h | 83 ++++++++++++++++++++++++++++++++++-- + include/asm-generic/percpu.h | 11 ++++- + include/asm-generic/sections.h | 10 ++++ + include/asm-generic/vmlinux.lds.h | 16 +++++++ + include/linux/percpu.h | 17 +++++++- + include/linux/percpu_counter.h | 14 ++++-- + kernel/futex.c | 74 ++++++++++++++++++--------------- + kernel/lockdep.c | 4 +- + kernel/module.c | 7 ++- + lib/percpu_counter.c | 18 ++------ + lib/proportions.c | 6 +- + mm/backing-dev.c | 2 +- + 12 files changed, 195 insertions(+), 67 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/x86/kernel/apic.c +Auto-merged arch/x86/kernel/cpu/common.c +Auto-merged arch/x86/kernel/cpuid.c +Auto-merged arch/x86/kernel/io_apic.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/setup_percpu.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged kernel/rcuclassic.c +CONFLICT (content): Merge conflict in kernel/rcuclassic.c +Auto-merged kernel/sched.c +Auto-merged kernel/time/tick-sched.c +Recorded preimage for 'kernel/rcuclassic.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/rcuclassic.c'. +Created commit edb90ad: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/smp.h | 32 +++++++- + arch/x86/kernel/cpu/common.c | 26 +++++- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 23 ++++-- + arch/x86/kernel/microcode_core.c | 83 ++++++++++---------- + arch/x86/kernel/setup_percpu.c | 25 ++++++- + arch/x86/kernel/smp.c | 17 +++- + arch/x86/kernel/smpboot.c | 128 ++++++++++++++++--------------- + 7 files changed, 210 insertions(+), 124 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged MAINTAINERS +Auto-merged init/main.c +Auto-merged kernel/trace/trace.c +Auto-merged kernel/trace/trace.h +Auto-merged kernel/trace/trace_boot.c +Auto-merged kernel/trace/trace_functions_graph.c +Auto-merged kernel/trace/trace_hw_branches.c +Auto-merged kernel/trace/trace_power.c +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 +++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysrq.txt | 2 + + Documentation/vm/kmemtrace.txt | 126 ++++ + MAINTAINERS | 6 + + arch/x86/kvm/Kconfig | 3 +- + drivers/char/sysrq.c | 2 +- + include/linux/slab_def.h | 68 ++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 53 ++- + include/trace/kmemtrace.h | 75 +++ + init/main.c | 2 + + kernel/relay.c | 4 +- + kernel/trace/Kconfig | 23 + + kernel/trace/Makefile | 3 + + kernel/trace/kmemtrace.c | 345 +++++++++++ + kernel/trace/trace.c | 741 ++---------------------- + kernel/trace/trace.h | 61 ++- + kernel/trace/trace_boot.c | 1 + + kernel/trace/trace_branch.c | 295 ++++++---- + kernel/trace/trace_functions_graph.c | 8 +- + kernel/trace/trace_hw_branches.c | 1 + + kernel/trace/trace_mmiotrace.c | 4 +- + kernel/trace/trace_output.c | 832 +++++++++++++++++++++++++++ + kernel/trace/trace_output.h | 59 ++ + kernel/trace/trace_power.c | 1 + + kernel/trace/trace_selftest.c | 1 - + kernel/trace/trace_stat.c | 251 ++++++++ + mm/Makefile | 1 + + mm/kmemtrace.c | 333 +++++++++++ + mm/slab.c | 71 ++- + mm/slob.c | 37 +- + mm/slub.c | 83 +++- + 33 files changed, 2705 insertions(+), 877 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/trace/kmemtrace.h + create mode 100644 kernel/trace/kmemtrace.c + create mode 100644 kernel/trace/trace_output.c + create mode 100644 kernel/trace/trace_output.h + create mode 100644 kernel/trace/trace_stat.c + create mode 100644 mm/kmemtrace.c +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged kernel/irq/chip.c +Merge made by recursive. + kernel/irq/chip.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged include/linux/sched.h +Merge made by recursive. + include/linux/sched.h | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/include/asm/pda.h | 4 ++-- + arch/x86/include/asm/system.h | 6 +++++- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged include/linux/clockchips.h +Auto-merged kernel/hrtimer.c +Auto-merged kernel/time/tick-common.c +CONFLICT (content): Merge conflict in kernel/time/tick-common.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/time/tick-common.c'. +Created commit 5c424e7: Merge commit 'timers/auto-timers-next' +$ git diff -M --stat --summary HEAD^.. + include/linux/clockchips.h | 1 + + kernel/hrtimer.c | 34 +++++++++++++++++++++++++++++++++- + kernel/time/tick-common.c | 26 +++++++++++++++++++------- + 3 files changed, 53 insertions(+), 8 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/alpha/kernel/sys_dp264.c +Auto-merged arch/powerpc/kernel/prom_parse.c +Auto-merged arch/x86/kernel/pci-dma.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged arch/x86/pci/acpi.c +Auto-merged arch/x86/pci/common.c +Auto-merged arch/x86/pci/i386.c +Auto-merged arch/x86/pci/init.c +Auto-merged arch/x86/pci/irq.c +Auto-merged arch/x86/pci/visws.c +Auto-merged drivers/net/e1000e/netdev.c +Auto-merged drivers/parisc/dino.c +Auto-merged drivers/parisc/iosapic.c +Auto-merged drivers/pci/hotplug/acpiphp.h +Auto-merged drivers/pci/hotplug/acpiphp_glue.c +Auto-merged drivers/pci/hotplug/cpqphp_pci.c +Auto-merged drivers/pci/msi.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/probe.c +Auto-merged drivers/pci/quirks.c +Auto-merged include/linux/pci.h +Auto-merged kernel/resource.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 4 + + arch/alpha/kernel/pci.c | 2 +- + arch/alpha/kernel/pci_impl.h | 9 +- + arch/alpha/kernel/sys_dp264.c | 2 +- + arch/alpha/kernel/sys_eiger.c | 2 +- + arch/alpha/kernel/sys_miata.c | 2 +- + arch/alpha/kernel/sys_noritake.c | 2 +- + arch/alpha/kernel/sys_ruffian.c | 2 +- + arch/alpha/kernel/sys_sable.c | 2 +- + arch/arm/kernel/bios32.c | 6 +- + arch/arm/mach-integrator/pci.c | 11 +- + arch/mips/pci/pci-ip27.c | 6 - + arch/mips/pci/pci.c | 9 +- + arch/powerpc/kernel/prom_parse.c | 7 +- + arch/sh/drivers/pci/ops-cayman.c | 9 +- + arch/sh/drivers/pci/pci.c | 7 +- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/mm/init_32.c | 2 + + arch/x86/mm/init_64.c | 2 + + arch/x86/pci/acpi.c | 9 +- + arch/x86/pci/common.c | 8 + + arch/x86/pci/i386.c | 4 +- + arch/x86/pci/init.c | 3 +- + arch/x86/pci/irq.c | 54 ++--- + arch/x86/pci/visws.c | 7 +- + drivers/acpi/pci_root.c | 20 ++ + drivers/net/e1000e/netdev.c | 2 +- + drivers/parisc/dino.c | 4 +- + drivers/parisc/iosapic.c | 3 +- + drivers/pci/Kconfig | 9 + + drivers/pci/Makefile | 2 + + drivers/pci/bus.c | 87 ++++--- + drivers/pci/hotplug/acpiphp.h | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 38 ++-- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 4 +- + drivers/pci/hotplug/cpqphp_pci.c | 2 +- + drivers/pci/hotplug/fakephp.c | 1 + + drivers/pci/hotplug/pciehp_ctrl.c | 26 +- + drivers/pci/irq.c | 2 +- + drivers/pci/msi.c | 31 +-- + drivers/pci/pci-acpi.c | 82 +++---- + drivers/pci/pci-driver.c | 74 ++++--- + drivers/pci/pci-stub.c | 47 ++++ + drivers/pci/pci-sysfs.c | 57 +++-- + drivers/pci/pci.c | 410 +++++++++++++++++++++++++------- + drivers/pci/pci.h | 26 ++- + drivers/pci/pcie/aer/aerdrv_acpi.c | 1 - + drivers/pci/pcie/aer/aerdrv_errprint.c | 2 +- + drivers/pci/pcie/aspm.c | 27 +-- + drivers/pci/pcie/portdrv_core.c | 6 +- + drivers/pci/pcie/portdrv_pci.c | 21 ++- + drivers/pci/probe.c | 40 ++-- + drivers/pci/proc.c | 18 +- + drivers/pci/quirks.c | 112 ++++++++-- + drivers/pci/setup-bus.c | 6 +- + drivers/pci/setup-res.c | 24 +- + include/linux/ioport.h | 11 +- + include/linux/pci-acpi.h | 14 +- + include/linux/pci.h | 74 ++++--- + include/linux/pci_regs.h | 12 + + kernel/resource.c | 61 +++++- + 62 files changed, 1015 insertions(+), 518 deletions(-) + create mode 100644 drivers/pci/pci-stub.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/Makefile | 5 +- + drivers/md/dm-crypt.c | 6 +- + drivers/md/dm-delay.c | 6 +- + drivers/md/dm-exception-store.c | 749 +-------------------------------------- + drivers/md/dm-exception-store.h | 148 ++++++++ + drivers/md/dm-ioctl.c | 16 +- + drivers/md/dm-linear.c | 6 +- + drivers/md/dm-log.c | 40 ++- + drivers/md/dm-mpath.c | 14 +- + drivers/md/dm-raid1.c | 24 +- + drivers/md/dm-snap-persistent.c | 704 ++++++++++++++++++++++++++++++++++++ + drivers/md/dm-snap-transient.c | 98 +++++ + drivers/md/dm-snap.c | 48 ++- + drivers/md/dm-snap.h | 129 +------- + drivers/md/dm-stripe.c | 4 +- + drivers/md/dm-sysfs.c | 99 +++++ + drivers/md/dm-table.c | 47 +++- + drivers/md/dm-target.c | 111 ++---- + drivers/md/dm-zero.c | 5 +- + drivers/md/dm.c | 101 ++++-- + drivers/md/dm.h | 12 +- + include/linux/device-mapper.h | 30 ++- + 22 files changed, 1352 insertions(+), 1050 deletions(-) + create mode 100644 drivers/md/dm-exception-store.h + create mode 100644 drivers/md/dm-snap-persistent.c + create mode 100644 drivers/md/dm-snap-transient.c + create mode 100644 drivers/md/dm-sysfs.c +Merging hid/for-next +$ git merge hid/for-next +Removed drivers/hid/hid-bright.c +Removed drivers/hid/hid-dell.c +Merge made by recursive. + drivers/hid/Kconfig | 70 ++++++++------- + drivers/hid/Makefile | 5 +- + drivers/hid/hid-bright.c | 71 --------------- + drivers/hid/hid-core.c | 120 +++++++++++++++++++++++--- + drivers/hid/hid-dell.c | 76 ---------------- + drivers/hid/hid-dummy.c | 6 ++ + drivers/hid/hid-gaff.c | 185 +++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-ids.h | 21 +++-- + drivers/hid/hid-lg.c | 7 -- + drivers/hid/hid-ntrig.c | 82 +++++++++++++++++ + drivers/hid/hid-sony.c | 2 +- + drivers/hid/hid-topseed.c | 77 ++++++++++++++++ + drivers/hid/hidraw.c | 32 ++++++- + drivers/hid/usbhid/Kconfig | 2 +- + drivers/hid/usbhid/hid-core.c | 34 +++++--- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/usbhid/hiddev.c | 135 +++++++++++++++++++++-------- + drivers/hid/usbhid/usbhid.h | 10 ++ + include/linux/hid.h | 16 ++-- + include/linux/hidraw.h | 2 + + 20 files changed, 685 insertions(+), 269 deletions(-) + delete mode 100644 drivers/hid/hid-bright.c + delete mode 100644 drivers/hid/hid-dell.c + create mode 100644 drivers/hid/hid-gaff.c + create mode 100644 drivers/hid/hid-ntrig.c + create mode 100644 drivers/hid/hid-topseed.c +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged drivers/i2c/busses/i2c-pxa.c +Auto-merged drivers/i2c/busses/i2c-s3c2410.c +Auto-merged drivers/i2c/busses/i2c-sh_mobile.c +Auto-merged drivers/media/video/cafe_ccic.c +Auto-merged drivers/media/video/ov7670.c +Auto-merged drivers/media/video/w9968cf.c +Merge made by recursive. + drivers/i2c/busses/i2c-ali1563.c | 4 +- + drivers/i2c/busses/i2c-amd756-s4882.c | 4 +- + drivers/i2c/busses/i2c-amd756.c | 5 +- + drivers/i2c/busses/i2c-at91.c | 2 +- + drivers/i2c/busses/i2c-bfin-twi.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 50 ++++++++++++++- + drivers/i2c/busses/i2c-pxa.c | 4 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sh7760.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/busses/i2c-sis5595.c | 4 +- + drivers/i2c/busses/i2c-sis630.c | 4 +- + drivers/i2c/i2c-core.c | 8 +- + drivers/input/misc/apanel.c | 81 ++++++++---------------- + drivers/media/video/cafe_ccic.c | 1 - + drivers/media/video/ov7670.c | 1 - + drivers/media/video/ovcamchip/ovcamchip_core.c | 1 - + drivers/media/video/w9968cf.c | 1 - + include/linux/i2c.h | 4 - + 19 files changed, 98 insertions(+), 84 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged drivers/spi/spi_lm70llp.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + Documentation/hwmon/f71882fg | 89 ++ + Documentation/hwmon/it87 | 20 +- + Documentation/hwmon/lm70 | 12 +- + Documentation/hwmon/lm85 | 2 +- + Documentation/hwmon/ltc4245 | 81 ++ + Documentation/spi/spi-lm70llp | 10 + + drivers/hwmon/Kconfig | 47 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asb100.c | 5 +- + drivers/hwmon/dme1737.c | 5 + + drivers/hwmon/f71805f.c | 5 + + drivers/hwmon/f71882fg.c | 1547 +++++++++++++++++++++++----- + drivers/hwmon/fschmd.c | 448 ++++++++- + drivers/hwmon/i5k_amb.c | 7 + + drivers/hwmon/it87.c | 37 +- + drivers/hwmon/k8temp.c | 15 + + drivers/hwmon/lm70.c | 91 ++- + drivers/hwmon/ltc4245.c | 567 ++++++++++ + drivers/hwmon/pc87360.c | 6 + + drivers/hwmon/pc87427.c | 5 + + drivers/hwmon/sis5595.c | 5 + + drivers/hwmon/smsc47b397.c | 5 + + drivers/hwmon/smsc47m1.c | 5 + + drivers/hwmon/via686a.c | 5 + + drivers/hwmon/vt1211.c | 5 + + drivers/hwmon/vt8231.c | 5 + + drivers/hwmon/w83627ehf.c | 8 +- + drivers/hwmon/w83627hf.c | 5 + + drivers/hwmon/w83781d.c | 5 +- + drivers/hwmon/w83791d.c | 5 +- + drivers/hwmon/w83792d.c | 5 +- + drivers/hwmon/w83793.c | 5 +- + drivers/spi/spi_lm70llp.c | 33 +- + 34 files changed, 2743 insertions(+), 361 deletions(-) + create mode 100644 Documentation/hwmon/f71882fg + create mode 100644 Documentation/hwmon/ltc4245 + create mode 100644 drivers/hwmon/ltc4245.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Merge made by recursive. + Documentation/ide/warm-plug-howto.txt | 5 + + drivers/ide/Kconfig | 7 + + drivers/ide/Makefile | 1 + + drivers/ide/aec62xx.c | 4 +- + drivers/ide/alim15x3.c | 10 +- + drivers/ide/amd74xx.c | 4 +- + drivers/ide/au1xxx-ide.c | 11 +- + drivers/ide/cmd640.c | 5 +- + drivers/ide/cmd64x.c | 23 +- + drivers/ide/cs5520.c | 2 +- + drivers/ide/cy82c693.c | 2 +- + drivers/ide/falconide.c | 1 - + drivers/ide/hpt366.c | 23 +- + drivers/ide/icside.c | 12 +- + drivers/ide/ide-acpi.c | 22 +- + drivers/ide/ide-atapi.c | 13 +- + drivers/ide/ide-cd.c | 118 +-------- + drivers/ide/ide-cd.h | 34 ++-- + drivers/ide/ide-disk.c | 4 +- + drivers/ide/ide-dma-sff.c | 63 +++-- + drivers/ide/ide-dma.c | 2 +- + drivers/ide/ide-floppy.c | 2 +- + drivers/ide/ide-gd.c | 3 +- + drivers/ide/ide-gd.h | 10 +- + drivers/ide/ide-h8300.c | 1 - + drivers/ide/ide-io.c | 409 ++++++++++++++--------------- + drivers/ide/ide-iops.c | 100 +++---- + drivers/ide/ide-lib.c | 9 +- + drivers/ide/ide-park.c | 16 +- + drivers/ide/ide-pm.c | 8 +- + drivers/ide/ide-probe.c | 474 +++++++++++++++++---------------- + drivers/ide/ide-proc.c | 23 +- + drivers/ide/ide-tape.c | 20 +- + drivers/ide/ide-taskfile.c | 14 +- + drivers/ide/ide.c | 187 +------------- + drivers/ide/it8172.c | 166 ++++++++++++ + drivers/ide/it8213.c | 4 +- + drivers/ide/it821x.c | 13 +- + drivers/ide/ns87415.c | 14 +- + drivers/ide/palm_bk3710.c | 3 +- + drivers/ide/pdc202xx_new.c | 4 +- + drivers/ide/pdc202xx_old.c | 14 +- + drivers/ide/piix.c | 8 +- + drivers/ide/pmac.c | 7 +- + drivers/ide/q40ide.c | 1 - + drivers/ide/qd65xx.c | 7 +- + drivers/ide/qd65xx.h | 4 +- + drivers/ide/sc1200.c | 9 +- + drivers/ide/scc_pata.c | 33 ++-- + drivers/ide/serverworks.c | 2 +- + drivers/ide/setup-pci.c | 12 +- + drivers/ide/sgiioc4.c | 15 +- + drivers/ide/siimage.c | 11 +- + drivers/ide/sis5513.c | 2 +- + drivers/ide/sl82c105.c | 5 +- + drivers/ide/slc90e66.c | 4 +- + drivers/ide/tc86c001.c | 17 +- + drivers/ide/triflex.c | 2 +- + drivers/ide/trm290.c | 10 +- + drivers/ide/tx4939ide.c | 23 +- + drivers/ide/umc8672.c | 13 +- + drivers/ide/via82cxxx.c | 2 +- + include/linux/ide.h | 171 +++++-------- + include/linux/pci_ids.h | 1 + + 64 files changed, 1036 insertions(+), 1183 deletions(-) + create mode 100644 drivers/ide/it8172.c +Merging libata/NEXT +$ git merge libata/NEXT +Auto-merged drivers/ata/libata-core.c +Auto-merged drivers/ata/libata-scsi.c +Auto-merged drivers/ata/sata_sil.c +Merge made by recursive. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/acpi/boot.c +Auto-merged arch/x86/kernel/e820.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged kernel/power/disk.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + Documentation/kernel-parameters.txt | 5 +- + arch/x86/kernel/acpi/boot.c | 11 + + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/kernel/e820.c | 21 ++ + arch/x86/kernel/reboot.c | 2 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/Kconfig | 84 ----- + drivers/acpi/Makefile | 3 - + drivers/acpi/battery.c | 14 +- + drivers/acpi/dispatcher/dsmethod.c | 3 + + drivers/acpi/dispatcher/dsopcode.c | 53 +++- + drivers/acpi/ec.c | 43 ++-- + drivers/acpi/events/evevent.c | 14 +- + drivers/acpi/events/evgpe.c | 36 +- + drivers/acpi/events/evgpeblk.c | 38 ++- + drivers/acpi/events/evmisc.c | 51 ++-- + drivers/acpi/events/evregion.c | 133 ++++---- + drivers/acpi/events/evrgnini.c | 41 +-- + drivers/acpi/events/evsci.c | 10 +- + drivers/acpi/events/evxface.c | 2 +- + drivers/acpi/events/evxfevnt.c | 12 +- + drivers/acpi/executer/exfldio.c | 11 +- + drivers/acpi/hardware/hwsleep.c | 77 ++--- + drivers/acpi/namespace/nsaccess.c | 11 +- + drivers/acpi/namespace/nseval.c | 70 +--- + drivers/acpi/namespace/nspredef.c | 256 ++++++++++++--- + drivers/acpi/namespace/nsutils.c | 8 +- + drivers/acpi/parser/psparse.c | 12 + + drivers/acpi/parser/psxface.c | 33 ++ + drivers/acpi/pci_link.c | 39 +-- + drivers/acpi/sbs.c | 31 +- + drivers/acpi/sleep/main.c | 67 ++++- + drivers/acpi/sleep/proc.c | 53 ++-- + drivers/acpi/tables/tbfadt.c | 38 ++- + drivers/acpi/tables/tbutils.c | 27 ++- + drivers/acpi/utilities/uteval.c | 6 +- + drivers/acpi/utilities/utglobal.c | 3 +- + drivers/acpi/utilities/utxface.c | 11 + + drivers/acpi/video.c | 15 + + drivers/misc/Kconfig | 284 +---------------- + drivers/misc/Makefile | 13 - + drivers/platform/Kconfig | 5 + + drivers/platform/Makefile | 5 + + drivers/platform/x86/Kconfig | 375 +++++++++++++++++++++ + drivers/platform/x86/Makefile | 19 + + drivers/{misc => platform/x86}/acer-wmi.c | 0 + drivers/{misc => platform/x86}/asus-laptop.c | 0 + drivers/{acpi => platform/x86}/asus_acpi.c | 0 + drivers/{misc => platform/x86}/compal-laptop.c | 0 + drivers/{misc => platform/x86}/eeepc-laptop.c | 0 + drivers/{misc => platform/x86}/fujitsu-laptop.c | 0 + drivers/{misc => platform/x86}/hp-wmi.c | 0 + drivers/{misc => platform/x86}/intel_menlow.c | 0 + drivers/{misc => platform/x86}/msi-laptop.c | 0 + drivers/{misc => platform/x86}/panasonic-laptop.c | 0 + drivers/{misc => platform/x86}/sony-laptop.c | 0 + drivers/{misc => platform/x86}/tc1100-wmi.c | 0 + drivers/{misc => platform/x86}/thinkpad_acpi.c | 0 + drivers/{acpi => platform/x86}/toshiba_acpi.c | 0 + drivers/{acpi => platform/x86}/wmi.c | 0 + drivers/power/power_supply_sysfs.c | 2 + + include/acpi/acconfig.h | 6 +- + include/acpi/acexcep.h | 4 +- + include/acpi/acglobal.h | 1 + + include/acpi/aclocal.h | 1 + + include/acpi/acnamesp.h | 5 +- + include/acpi/acpixf.h | 6 +- + include/acpi/actables.h | 2 + + include/acpi/actypes.h | 8 +- + include/linux/acpi.h | 1 + + include/linux/power_supply.h | 2 + + include/linux/suspend.h | 13 + + kernel/power/disk.c | 6 +- + kernel/power/snapshot.c | 370 +++++++++++---------- + kernel/power/swsusp.c | 122 +++++++ + 77 files changed, 1597 insertions(+), 1010 deletions(-) + create mode 100644 drivers/platform/Kconfig + create mode 100644 drivers/platform/Makefile + create mode 100644 drivers/platform/x86/Kconfig + create mode 100644 drivers/platform/x86/Makefile + rename drivers/{misc => platform/x86}/acer-wmi.c (100%) + rename drivers/{misc => platform/x86}/asus-laptop.c (100%) + rename drivers/{acpi => platform/x86}/asus_acpi.c (100%) + rename drivers/{misc => platform/x86}/compal-laptop.c (100%) + rename drivers/{misc => platform/x86}/eeepc-laptop.c (100%) + rename drivers/{misc => platform/x86}/fujitsu-laptop.c (100%) + rename drivers/{misc => platform/x86}/hp-wmi.c (100%) + rename drivers/{misc => platform/x86}/intel_menlow.c (100%) + rename drivers/{misc => platform/x86}/msi-laptop.c (100%) + rename drivers/{misc => platform/x86}/panasonic-laptop.c (100%) + rename drivers/{misc => platform/x86}/sony-laptop.c (100%) + rename drivers/{misc => platform/x86}/tc1100-wmi.c (100%) + rename drivers/{misc => platform/x86}/thinkpad_acpi.c (100%) + rename drivers/{acpi => platform/x86}/toshiba_acpi.c (100%) + rename drivers/{acpi => platform/x86}/wmi.c (100%) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merged fs/lockd/host.c +Auto-merged fs/lockd/svc.c +Auto-merged fs/nfs/nfs4_fs.h +Auto-merged fs/nfs/nfs4proc.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged include/linux/lockd/lockd.h +Removed include/linux/lockd/sm_inter.h +Merge made by recursive. + fs/lockd/clntproc.c | 7 +- + fs/lockd/host.c | 170 ++----------- + fs/lockd/mon.c | 569 ++++++++++++++++++++++++++++++---------- + fs/lockd/svc.c | 72 ++++-- + fs/lockd/svc4proc.c | 13 +- + fs/lockd/svcproc.c | 13 +- + fs/lockd/svcsubs.c | 1 - + fs/lockd/xdr.c | 5 +- + fs/lockd/xdr4.c | 5 +- + fs/nfsd/nfs4recover.c | 2 +- + fs/nfsd/nfs4state.c | 37 ++- + fs/nfsd/nfsctl.c | 479 +++++++++++++++++++++++++++++++-- + fs/nfsd/nfsfh.c | 30 ++- + include/linux/lockd/lockd.h | 68 +++-- + include/linux/lockd/sm_inter.h | 48 ---- + include/linux/lockd/xdr.h | 15 +- + include/linux/nfsd/nfsfh.h | 4 + + include/linux/sunrpc/svc.h | 5 +- + net/sunrpc/svc_xprt.c | 22 ++- + net/sunrpc/svcsock.c | 21 ++- + 20 files changed, 1095 insertions(+), 491 deletions(-) + delete mode 100644 include/linux/lockd/sm_inter.h +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/media/dvb/Kconfig +Merge made by recursive. + drivers/firewire/fw-card.c | 20 +- + drivers/firewire/fw-cdev.c | 63 ++- + drivers/firewire/fw-device.c | 11 +- + drivers/firewire/fw-device.h | 6 + + drivers/firewire/fw-ohci.c | 73 +-- + drivers/firewire/fw-sbp2.c | 21 +- + drivers/firewire/fw-topology.c | 16 +- + drivers/firewire/fw-transaction.c | 2 + + drivers/firewire/fw-transaction.h | 13 +- + drivers/ieee1394/csr.c | 12 +- + drivers/ieee1394/csr.h | 10 +- + drivers/ieee1394/csr1212.c | 45 +- + drivers/ieee1394/csr1212.h | 9 +- + drivers/ieee1394/dma.h | 1 + + drivers/ieee1394/dv1394-private.h | 44 +- + drivers/ieee1394/dv1394.c | 12 +- + drivers/ieee1394/eth1394.c | 28 +- + drivers/ieee1394/eth1394.h | 16 +- + drivers/ieee1394/highlevel.c | 9 +- + drivers/ieee1394/highlevel.h | 7 +- + drivers/ieee1394/hosts.c | 6 +- + drivers/ieee1394/hosts.h | 2 +- + drivers/ieee1394/ieee1394.h | 3 + + drivers/ieee1394/ieee1394_core.c | 1 + + drivers/ieee1394/ieee1394_transactions.c | 29 + + drivers/ieee1394/ieee1394_transactions.h | 2 + + drivers/ieee1394/iso.h | 1 + + drivers/ieee1394/nodemgr.c | 30 +- + drivers/ieee1394/nodemgr.h | 21 +- + drivers/ieee1394/ohci1394.c | 26 +- + drivers/ieee1394/pcilynx.c | 2 +- + drivers/ieee1394/pcilynx.h | 2 +- + drivers/ieee1394/raw1394.c | 2 +- + drivers/ieee1394/sbp2.c | 4 +- + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 + + drivers/media/dvb/firesat/Kconfig | 12 + + drivers/media/dvb/firesat/Makefile | 13 + + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ + drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ + drivers/media/dvb/firesat/cmp.c | 171 +++++ + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 261 ++++++++ + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ + drivers/media/dvb/firesat/firesat-rc.h | 11 + + drivers/media/dvb/firesat/firesat.h | 227 +++++++ + drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ + drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ + drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ + drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ + include/linux/firewire-cdev.h | 2 +- + 52 files changed, 3619 insertions(+), 246 deletions(-) + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/dvb/firesat/firesat_iso.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Merge made by recursive. + arch/ia64/include/asm/kvm.h | 14 + + arch/ia64/include/asm/kvm_host.h | 8 +- + arch/ia64/kvm/kvm-ia64.c | 96 ++++- + arch/ia64/kvm/process.c | 15 - + arch/ia64/kvm/vcpu.c | 39 +-- + arch/ia64/kvm/vtlb.c | 5 - + arch/powerpc/include/asm/kvm.h | 7 + + arch/powerpc/include/asm/kvm_44x.h | 7 + + arch/powerpc/include/asm/kvm_asm.h | 7 +- + arch/powerpc/include/asm/kvm_e500.h | 67 +++ + arch/powerpc/include/asm/kvm_host.h | 16 +- + arch/powerpc/include/asm/kvm_ppc.h | 12 +- + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x.c | 6 +- + arch/powerpc/kvm/44x_emulate.c | 217 +-------- + arch/powerpc/kvm/44x_tlb.c | 39 ++- + arch/powerpc/kvm/44x_tlb.h | 9 - + arch/powerpc/kvm/Kconfig | 13 + + arch/powerpc/kvm/Makefile | 10 + + arch/powerpc/kvm/booke.c | 50 ++- + arch/powerpc/kvm/booke.h | 35 +- + arch/powerpc/kvm/booke_emulate.c | 266 +++++++++++ + arch/powerpc/kvm/booke_interrupts.S | 5 + + arch/powerpc/kvm/e500.c | 169 +++++++ + arch/powerpc/kvm/e500_emulate.c | 196 ++++++++ + arch/powerpc/kvm/e500_tlb.c | 737 ++++++++++++++++++++++++++++++ + arch/powerpc/kvm/e500_tlb.h | 184 ++++++++ + arch/powerpc/kvm/emulate.c | 93 +++-- + arch/powerpc/kvm/powerpc.c | 6 +- + arch/s390/include/asm/kvm.h | 7 + + arch/s390/include/asm/kvm_host.h | 3 - + arch/s390/kvm/kvm-s390.c | 4 +- + arch/x86/include/asm/kvm.h | 23 + + arch/x86/include/asm/kvm_host.h | 54 ++- + arch/x86/include/asm/msr-index.h | 7 + + arch/x86/include/asm/svm.h | 4 - + arch/x86/include/asm/virtext.h | 2 +- + arch/x86/include/asm/vmx.h | 5 +- + arch/x86/kvm/i8254.c | 6 +- + arch/x86/kvm/i8254.h | 1 + + arch/x86/kvm/kvm_svm.h | 16 +- + arch/x86/kvm/mmu.c | 171 ++++---- + arch/x86/kvm/paging_tmpl.h | 209 ++++----- + arch/x86/kvm/svm.c | 863 +++++++++++++++++++++++++++++++---- + arch/x86/kvm/vmx.c | 268 +++++++---- + arch/x86/kvm/x86.c | 261 +++++++---- + arch/x86/kvm/x86_emulate.c | 15 +- + include/linux/kvm.h | 60 ++- + include/linux/kvm_host.h | 6 +- + include/linux/kvm_types.h | 13 - + virt/kvm/kvm_main.c | 6 +- + 51 files changed, 3407 insertions(+), 929 deletions(-) + create mode 100644 arch/powerpc/include/asm/kvm_e500.h + create mode 100644 arch/powerpc/kvm/booke_emulate.c + create mode 100644 arch/powerpc/kvm/e500.c + create mode 100644 arch/powerpc/kvm/e500_emulate.c + create mode 100644 arch/powerpc/kvm/e500_tlb.c + create mode 100644 arch/powerpc/kvm/e500_tlb.h +Merging dlm/next +$ git merge dlm/next +Auto-merged fs/dlm/netlink.c +Merge made by recursive. + fs/dlm/ast.c | 56 ++++----- + fs/dlm/ast.h | 4 +- + fs/dlm/debug_fs.c | 310 ++++++++++++++++++++++++++++++++++++++++--------- + fs/dlm/dir.c | 18 ++-- + fs/dlm/dlm_internal.h | 4 +- + fs/dlm/lock.c | 31 +++--- + fs/dlm/lowcomms.c | 8 +- + fs/dlm/memory.c | 6 +- + fs/dlm/midcomms.c | 2 +- + fs/dlm/netlink.c | 1 - + fs/dlm/user.c | 4 +- + fs/dlm/user.h | 2 +- + 12 files changed, 316 insertions(+), 130 deletions(-) +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/scsi/scsi_ioctl.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_ioctl.c +Recorded preimage for 'drivers/scsi/scsi_ioctl.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/scsi/scsi_ioctl.c'. +Created commit 857fc51: Merge commit 'scsi/master' +$ git diff -M --stat --summary HEAD^.. + block/blk-map.c | 19 +- + drivers/message/fusion/mptctl.c | 5 +- + drivers/scsi/NCR_D700.c | 2 +- + drivers/scsi/a2091.c | 18 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/gvp11.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 14 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 16 +- + drivers/scsi/lasi700.c | 3 +- + drivers/scsi/libsas/sas_host_smp.c | 12 +- + drivers/scsi/lpfc/lpfc_init.c | 3 +- + drivers/scsi/mvsas.c | 2 +- + drivers/scsi/scsi.c | 4 - + drivers/scsi/scsi_error.c | 24 +-- + drivers/scsi/scsi_ioctl.c | 10 +- + drivers/scsi/scsi_lib.c | 6 +- + drivers/scsi/sg.c | 2 + + drivers/scsi/sgiwd93.c | 3 +- + drivers/scsi/sim710.c | 4 +- + drivers/scsi/sni_53c710.c | 3 +- + drivers/scsi/st.c | 492 ++++++++++++++++-------------------- + drivers/scsi/st.h | 14 +- + drivers/scsi/zalon.c | 4 +- + fs/bio.c | 36 ++- + include/linux/blkdev.h | 2 + + 25 files changed, 338 insertions(+), 370 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merged fs/Kconfig +Auto-merged fs/Makefile +Removed fs/ocfs2/ocfs2_jbd_compat.h +Merge made by recursive. + Documentation/filesystems/ocfs2.txt | 3 +- + fs/Kconfig | 18 +- + fs/Makefile | 1 + + fs/configfs/dir.c | 59 + + fs/dquot.c | 436 ++++-- + fs/ext3/super.c | 16 +- + fs/ext4/super.c | 15 +- + fs/jbd2/commit.c | 9 + + fs/jbd2/journal.c | 19 + + fs/jbd2/transaction.c | 47 + + fs/ocfs2/Makefile | 7 + + fs/ocfs2/acl.c | 479 ++++++ + fs/ocfs2/acl.h | 58 + + fs/ocfs2/alloc.c | 710 ++++++--- + fs/ocfs2/alloc.h | 30 +- + fs/ocfs2/aops.c | 59 +- + fs/ocfs2/blockcheck.c | 477 ++++++ + fs/ocfs2/blockcheck.h | 82 + + fs/ocfs2/buffer_head_io.c | 32 +- + fs/ocfs2/buffer_head_io.h | 27 +- + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/dir.c | 399 ++++- + fs/ocfs2/dir.h | 2 + + fs/ocfs2/dlm/dlmast.c | 52 +- + fs/ocfs2/dlm/dlmcommon.h | 3 + + fs/ocfs2/dlm/dlmdebug.c | 53 +- + fs/ocfs2/dlm/dlmdomain.c | 1 + + fs/ocfs2/dlm/dlmmaster.c | 42 +- + fs/ocfs2/dlm/dlmthread.c | 3 +- + fs/ocfs2/dlmglue.c | 168 ++- + fs/ocfs2/dlmglue.h | 19 + + fs/ocfs2/extent_map.c | 96 +- + fs/ocfs2/extent_map.h | 24 + + fs/ocfs2/file.c | 209 ++-- + fs/ocfs2/file.h | 3 + + fs/ocfs2/inode.c | 175 ++- + fs/ocfs2/inode.h | 18 +- + fs/ocfs2/journal.c | 364 ++++- + fs/ocfs2/journal.h | 128 ++- + fs/ocfs2/localalloc.c | 26 +- + fs/ocfs2/namei.c | 318 +++-- + fs/ocfs2/ocfs2.h | 46 +- + fs/ocfs2/ocfs2_fs.h | 213 +++- + fs/ocfs2/ocfs2_jbd_compat.h | 82 - + fs/ocfs2/ocfs2_lockid.h | 5 + + fs/ocfs2/quota.h | 119 ++ + fs/ocfs2/quota_global.c | 1025 ++++++++++++ + fs/ocfs2/quota_local.c | 1253 +++++++++++++++ + fs/ocfs2/resize.c | 76 +- + fs/ocfs2/slot_map.c | 4 +- + fs/ocfs2/suballoc.c | 363 +++-- + fs/ocfs2/suballoc.h | 18 +- + fs/ocfs2/super.c | 328 ++++- + fs/ocfs2/symlink.c | 2 +- + fs/ocfs2/xattr.c | 2984 +++++++++++++++++++++-------------- + fs/ocfs2/xattr.h | 45 + + fs/quota.c | 11 +- + fs/quota_tree.c | 645 ++++++++ + fs/quota_tree.h | 25 + + fs/quota_v1.c | 28 +- + fs/quota_v2.c | 631 +------- + {include/linux => fs}/quotaio_v1.h | 0 + {include/linux => fs}/quotaio_v2.h | 33 +- + fs/reiserfs/super.c | 10 +- + include/linux/Kbuild | 4 - + include/linux/dqblk_qtree.h | 56 + + include/linux/dqblk_v1.h | 7 - + include/linux/dqblk_v2.h | 22 +- + include/linux/jbd2.h | 32 + + include/linux/journal-head.h | 8 + + include/linux/quota.h | 108 +- + include/linux/quotaops.h | 96 +- + 73 files changed, 9815 insertions(+), 3153 deletions(-) + create mode 100644 fs/ocfs2/acl.c + create mode 100644 fs/ocfs2/acl.h + create mode 100644 fs/ocfs2/blockcheck.c + create mode 100644 fs/ocfs2/blockcheck.h + delete mode 100644 fs/ocfs2/ocfs2_jbd_compat.h + create mode 100644 fs/ocfs2/quota.h + create mode 100644 fs/ocfs2/quota_global.c + create mode 100644 fs/ocfs2/quota_local.c + create mode 100644 fs/quota_tree.c + create mode 100644 fs/quota_tree.h + rename {include/linux => fs}/quotaio_v1.h (100%) + rename {include/linux => fs}/quotaio_v2.h (68%) + create mode 100644 include/linux/dqblk_qtree.h +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/block_dev.c +Auto-merged fs/ext3/namei.c +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/balloc.c +Auto-merged fs/ext4/ialloc.c +CONFLICT (content): Merge conflict in fs/ext4/ialloc.c +Auto-merged fs/ext4/inode.c +Auto-merged fs/ext4/namei.c +Auto-merged fs/ext4/super.c +Auto-merged fs/jbd2/commit.c +Auto-merged fs/jbd2/journal.c +Auto-merged fs/jbd2/transaction.c +Auto-merged fs/super.c +Auto-merged include/linux/fs.h +Auto-merged include/linux/jbd2.h +Recorded preimage for 'fs/ext4/ialloc.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/ext4/ialloc.c'. +Created commit c62324c: Merge commit 'ext4/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ext4.txt | 56 +++- + fs/block_dev.c | 15 + + fs/ext3/hash.c | 77 ++++- + fs/ext3/namei.c | 11 +- + fs/ext3/super.c | 32 ++ + fs/ext4/balloc.c | 293 ++++++------------ + fs/ext4/bitmap.c | 5 +- + fs/ext4/dir.c | 8 +- + fs/ext4/ext4.h | 151 +++++++-- + fs/ext4/ext4_extents.h | 5 - + fs/ext4/ext4_i.h | 16 +- + fs/ext4/ext4_jbd2.c | 83 ++++-- + fs/ext4/ext4_jbd2.h | 83 ++++- + fs/ext4/ext4_sb.h | 6 +- + fs/ext4/extents.c | 56 ++-- + fs/ext4/file.c | 3 - + fs/ext4/hash.c | 77 ++++- + fs/ext4/ialloc.c | 322 +++++++++++-------- + fs/ext4/inode.c | 309 +++++++++++++----- + fs/ext4/ioctl.c | 2 +- + fs/ext4/mballoc.c | 625 ++++++++++++++++++++++++++---------- + fs/ext4/mballoc.h | 71 +---- + fs/ext4/migrate.c | 5 +- + fs/ext4/namei.c | 86 +++--- + fs/ext4/resize.c | 106 ++----- + fs/ext4/super.c | 473 +++++++++++++++++++--------- + fs/ext4/xattr.c | 25 +- + fs/jbd2/checkpoint.c | 24 +- + fs/jbd2/commit.c | 54 +++- + fs/jbd2/journal.c | 84 +----- + fs/jbd2/transaction.c | 60 +++- + fs/super.c | 2 + + include/linux/ext3_fs.h | 28 ++- + include/linux/ext3_fs_sb.h | 1 + + include/linux/fs.h | 2 + + include/linux/jbd2.h | 38 ++- + 36 files changed, 2116 insertions(+), 1178 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Auto-merged include/linux/netdevice.h +Auto-merged net/core/dev.c +Auto-merged net/ipv4/tcp.c +Auto-merged net/ipv4/tcp_input.c +Auto-merged net/ipv4/tcp_ipv4.c +Auto-merged net/ipv6/tcp_ipv6.c +Merge made by recursive. + Documentation/crypto/async-tx-api.txt | 96 ++--- + Documentation/dmaengine.txt | 1 + + arch/avr32/include/asm/atmel-mci.h | 6 +- + arch/avr32/mach-at32ap/at32ap700x.c | 15 +- + crypto/async_tx/async_tx.c | 350 +--------------- + drivers/dca/dca-core.c | 2 +- + drivers/dma/Kconfig | 2 - + drivers/dma/dmaengine.c | 773 ++++++++++++++++++++++++--------- + drivers/dma/dmatest.c | 129 ++---- + drivers/dma/dw_dmac.c | 119 +++--- + drivers/dma/fsldma.c | 5 +- + drivers/dma/ioat.c | 92 ++--- + drivers/dma/ioat_dma.c | 5 +- + drivers/dma/iop-adma.c | 30 +-- + drivers/dma/mv_xor.c | 11 +- + drivers/mmc/host/atmel-mci.c | 103 ++---- + include/linux/async_tx.h | 17 +- + include/linux/dmaengine.h | 181 +++------ + include/linux/dw_dmac.h | 31 +- + include/linux/netdevice.h | 3 - + include/net/netdma.h | 11 - + net/core/dev.c | 147 +------ + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + 26 files changed, 887 insertions(+), 1253 deletions(-) + create mode 100644 Documentation/dmaengine.txt +$ git am -3 ../patches/0001-net-async_tx-merge-fix.patch +Applying: net: async_tx merge fix +$ git reset HEAD^ +net/core/dev.c: locally modified +$ git add . +$ git commit -v -a --amend +Created commit 205a04e: Merge commit 'async_tx/next' +Merging udf/for_next +$ git merge udf/for_next +Auto-merged fs/udf/ialloc.c +Auto-merged fs/udf/namei.c +Merge made by recursive. + Documentation/filesystems/udf.txt | 2 + + fs/udf/balloc.c | 113 +++++----- + fs/udf/dir.c | 14 +- + fs/udf/directory.c | 38 ++-- + fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 213 ++++++++++--------- + fs/udf/misc.c | 29 ++-- + fs/udf/namei.c | 86 ++++---- + fs/udf/osta_udf.h | 22 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 139 ++++++++----- + fs/udf/truncate.c | 44 ++-- + fs/udf/udf_i.h | 6 +- + fs/udf/udf_sb.h | 4 + + fs/udf/udfdecl.h | 46 +++-- + fs/udf/udfend.h | 28 ++-- + fs/udf/udftime.c | 6 +- + fs/udf/unicode.c | 41 +++-- + 19 files changed, 663 insertions(+), 590 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Auto-merged arch/arm/mach-pxa/corgi.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/corgi.c +Auto-merged arch/arm/mach-pxa/poodle.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c +Auto-merged arch/arm/mach-pxa/spitz.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/spitz.c +Auto-merged drivers/mtd/devices/m25p80.c +CONFLICT (content): Merge conflict in drivers/mtd/devices/m25p80.c +Auto-merged drivers/mtd/devices/mtd_dataflash.c +CONFLICT (content): Merge conflict in drivers/mtd/devices/mtd_dataflash.c +Auto-merged drivers/mtd/maps/ixp2000.c +Auto-merged drivers/mtd/maps/ixp4xx.c +Auto-merged drivers/mtd/maps/physmap.c +Auto-merged drivers/mtd/mtdconcat.c +Auto-merged drivers/mtd/onenand/omap2.c +Auto-merged drivers/mtd/ubi/build.c +Resolved 'arch/arm/mach-pxa/corgi.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/poodle.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/spitz.c' using previous resolution. +Resolved 'drivers/mtd/devices/m25p80.c' using previous resolution. +Resolved 'drivers/mtd/devices/mtd_dataflash.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 7380bdd: Merge commit 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-pxa/corgi.c | 54 ++++++ + arch/arm/mach-pxa/poodle.c | 51 ++++++ + arch/arm/mach-pxa/spitz.c | 77 ++++++++ + drivers/mtd/chips/cfi_cmdset_0001.c | 12 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 8 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 14 +- + drivers/mtd/chips/fwh_lock.h | 4 +- + drivers/mtd/devices/lart.c | 6 +- + drivers/mtd/devices/m25p80.c | 41 +++-- + drivers/mtd/devices/mtd_dataflash.c | 24 ++- + drivers/mtd/ftl.c | 100 +++++----- + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/inftlmount.c | 4 +- + drivers/mtd/maps/Kconfig | 17 ++- + drivers/mtd/maps/alchemy-flash.c | 2 +- + drivers/mtd/maps/amd76xrom.c | 4 +- + drivers/mtd/maps/cfi_flagadm.c | 2 +- + drivers/mtd/maps/ck804xrom.c | 4 +- + drivers/mtd/maps/dbox2-flash.c | 2 +- + drivers/mtd/maps/edb7312.c | 2 +- + drivers/mtd/maps/esb2rom.c | 4 +- + drivers/mtd/maps/fortunet.c | 2 +- + drivers/mtd/maps/h720x-flash.c | 2 +- + drivers/mtd/maps/ichxrom.c | 4 +- + drivers/mtd/maps/impa7.c | 2 +- + drivers/mtd/maps/ipaq-flash.c | 2 +- + drivers/mtd/maps/mbx860.c | 2 +- + drivers/mtd/maps/nettel.c | 5 +- + drivers/mtd/maps/octagon-5066.c | 2 +- + drivers/mtd/maps/physmap.c | 33 ++--- + drivers/mtd/maps/pmcmsp-flash.c | 2 +- + drivers/mtd/maps/redwood.c | 2 +- + drivers/mtd/maps/rpxlite.c | 2 +- + drivers/mtd/maps/sbc8240.c | 2 +- + drivers/mtd/maps/scb2_flash.c | 8 +- + drivers/mtd/maps/sharpsl-flash.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 2 +- + drivers/mtd/maps/uclinux.c | 4 +- + drivers/mtd/maps/vmax301.c | 2 +- + drivers/mtd/maps/wr_sbc82xx_flash.c | 2 +- + drivers/mtd/mtdchar.c | 6 +- + drivers/mtd/mtdconcat.c | 35 ++-- + drivers/mtd/mtdcore.c | 16 ++- + drivers/mtd/mtdoops.c | 9 +- + drivers/mtd/mtdpart.c | 34 ++-- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/nand_base.c | 25 ++- + drivers/mtd/nand/nand_bbt.c | 31 ++-- + drivers/mtd/nand/nandsim.c | 338 ++++++++++++++++++++++++++++++----- + drivers/mtd/nand/sharpsl.c | 247 +++++++++++++------------- + drivers/mtd/nftlcore.c | 2 +- + drivers/mtd/nftlmount.c | 4 +- + drivers/mtd/onenand/onenand_base.c | 8 +- + drivers/mtd/rfd_ftl.c | 29 ++-- + drivers/mtd/ssfdc.c | 7 +- + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/gluebi.c | 17 +- + fs/jffs2/compr_rubin.c | 120 +++++++------ + fs/jffs2/erase.c | 5 +- + include/linux/mtd/ftl.h | 38 ++-- + include/linux/mtd/mtd.h | 75 ++++++-- + include/linux/mtd/nand.h | 7 +- + include/linux/mtd/partitions.h | 6 +- + include/linux/mtd/sharpsl.h | 20 ++ + 64 files changed, 1069 insertions(+), 532 deletions(-) + create mode 100644 include/linux/mtd/sharpsl.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/pci/hda/patch_conexant.c | 114 ++++++++++++- + sound/pci/hda/patch_realtek.c | 3 +- + sound/soc/codecs/twl4030.c | 377 ++++++++++++++++++++-------------------- + sound/soc/codecs/twl4030.h | 7 + + sound/soc/pxa/pxa2xx-pcm.c | 4 +- + sound/soc/soc-core.c | 46 +++--- + sound/soc/soc-dapm.c | 10 +- + sound/usb/caiaq/caiaq-device.c | 4 +- + sound/usb/usbaudio.c | 8 +- + sound/usb/usbmidi.c | 42 +++--- + sound/usb/usbmixer.c | 6 +- + sound/usb/usx2y/us122l.c | 4 +- + sound/usb/usx2y/usbusx2y.c | 4 +- + 13 files changed, 374 insertions(+), 255 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 ++- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 51 +++++++++----------- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 9 ++++ + drivers/cpufreq/cpufreq.c | 55 ++++++++++++++-------- + include/linux/cpufreq.h | 1 + + 5 files changed, 74 insertions(+), 48 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/include/asm/percpu.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h +Auto-merged drivers/pci/pci-driver.c +Auto-merged include/asm-generic/percpu.h +CONFLICT (content): Merge conflict in include/asm-generic/percpu.h +Auto-merged include/linux/percpu.h +CONFLICT (content): Merge conflict in include/linux/percpu.h +Auto-merged init/Kconfig +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/lockdep.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged kernel/sched.c +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 17916de Merge commit 'cpufreq/next' +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/daemon.c +Removed fs/gfs2/daemon.h +Auto-merged fs/gfs2/inode.c +Removed fs/gfs2/ops_dentry.h +Removed fs/gfs2/ops_fstype.h +Removed fs/gfs2/ops_inode.h +Removed fs/gfs2/ops_super.h +Auto-merged fs/ioctl.c +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/gfs2/Makefile | 2 +- + fs/gfs2/acl.c | 2 +- + fs/gfs2/bmap.c | 77 +++-------- + fs/gfs2/bmap.h | 34 +++++- + fs/gfs2/daemon.c | 136 ------------------- + fs/gfs2/daemon.h | 17 --- + fs/gfs2/dir.c | 62 +++++----- + fs/gfs2/dir.h | 1 + + fs/gfs2/eattr.c | 40 +++--- + fs/gfs2/glock.c | 303 ++++++++++++++++++++++--------------------- + fs/gfs2/glock.h | 2 +- + fs/gfs2/glops.c | 56 ++++++--- + fs/gfs2/incore.h | 55 +++------ + fs/gfs2/inode.c | 53 ++++---- + fs/gfs2/inode.h | 13 ++- + fs/gfs2/locking/dlm/mount.c | 12 ++- + fs/gfs2/locking/dlm/sysfs.c | 16 ++- + fs/gfs2/main.c | 15 ++- + fs/gfs2/mount.c | 29 +---- + fs/gfs2/ops_address.c | 32 +++--- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 --- + fs/gfs2/ops_export.c | 5 +- + fs/gfs2/ops_file.c | 22 ++-- + fs/gfs2/ops_fstype.c | 125 ++++++++++++------ + fs/gfs2/ops_fstype.h | 19 --- + fs/gfs2/ops_inode.c | 75 +++++++++-- + fs/gfs2/ops_inode.h | 25 ---- + fs/gfs2/ops_super.c | 149 +++++++++++++++++++-- + fs/gfs2/ops_super.h | 17 --- + fs/gfs2/quota.c | 113 +++++++++++++++-- + fs/gfs2/quota.h | 24 ++-- + fs/gfs2/recovery.c | 48 +++++++- + fs/gfs2/recovery.h | 14 +- + fs/gfs2/rgrp.c | 58 ++++----- + fs/gfs2/super.c | 246 +---------------------------------- + fs/gfs2/super.h | 13 +- + fs/gfs2/sys.c | 66 +++------- + fs/gfs2/sys.h | 4 - + fs/gfs2/util.c | 1 + + fs/gfs2/util.h | 1 + + fs/ioctl.c | 44 +++++-- + include/linux/fs.h | 3 + + 43 files changed, 964 insertions(+), 1084 deletions(-) + delete mode 100644 fs/gfs2/daemon.c + delete mode 100644 fs/gfs2/daemon.h + delete mode 100644 fs/gfs2/ops_dentry.h + delete mode 100644 fs/gfs2/ops_fstype.h + delete mode 100644 fs/gfs2/ops_inode.h + delete mode 100644 fs/gfs2/ops_super.h +Merging input/next +$ git merge input/next +Already up-to-date. +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged fs/fcntl.c +Auto-merged fs/ioctl.c +CONFLICT (content): Merge conflict in fs/ioctl.c +Resolved 'fs/ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit c0c3d5b: Merge commit 'bkl-removal/bkl-removal' +$ git diff -M --stat --summary HEAD^.. + drivers/char/rtc.c | 17 ++++------------- + 1 files changed, 4 insertions(+), 13 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-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 embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Auto-merged drivers/net/starfire.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +CONFLICT (content): Merge conflict in drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Auto-merged drivers/scsi/advansys.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +CONFLICT (content): Merge conflict in firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/net/tg3.c' using previous resolution. +Resolved 'firmware/Makefile' using previous resolution. +Resolved 'firmware/WHENCE' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 267a060: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 787 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +----- + drivers/scsi/ql1040_fw.h | 2130 ------- + drivers/scsi/ql12160_fw.h | 1811 ------ + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 20 + + firmware/WHENCE | 120 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 + + firmware/advansys/38C0800.bin.ihex | 336 + + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 +++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 --------- + 49 files changed, 20558 insertions(+), 22497 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 15 ++- + drivers/leds/Makefile | 2 + + drivers/leds/led-class.c | 25 +-- + drivers/leds/leds-alix2.c | 209 +++++++++++++++++++++ + drivers/leds/leds-ams-delta.c | 4 +- + drivers/leds/leds-pca9532.c | 77 ++++++-- + drivers/leds/leds-wm8350.c | 333 ++++++++++++++++++++++++++++++++++ + drivers/leds/ledtrig-timer.c | 92 +++++----- + drivers/mfd/wm8350-core.c | 3 + + drivers/regulator/wm8350-regulator.c | 91 +++++++++ + include/linux/leds-pca9532.h | 2 + + include/linux/leds.h | 2 +- + include/linux/mfd/wm8350/pmic.h | 36 ++++ + 13 files changed, 803 insertions(+), 88 deletions(-) + create mode 100644 drivers/leds/leds-alix2.c + create mode 100644 drivers/leds/leds-wm8350.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Auto-merged drivers/video/backlight/backlight.c +Auto-merged drivers/video/backlight/lcd.c +Merge made by recursive. + drivers/video/backlight/Makefile | 2 +- + drivers/video/backlight/backlight.c | 33 +++++++++---------- + drivers/video/backlight/cr_bllcd.c | 18 ++++------ + drivers/video/backlight/{da903x.c => da903x_bl.c} | 0 + drivers/video/backlight/hp680_bl.c | 20 +++++------- + drivers/video/backlight/lcd.c | 36 +++++++++----------- + drivers/video/backlight/progear_bl.c | 20 +++++------- + drivers/video/backlight/tosa_lcd.c | 27 ++++++++++++++- + drivers/video/backlight/vgg2432a4.c | 2 +- + 9 files changed, 81 insertions(+), 77 deletions(-) + rename drivers/video/backlight/{da903x.c => da903x_bl.c} (100%) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- + kernel/kgdb.c | 6 +++--- + 2 files changed, 43 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merged fs/block_dev.c +Merge made by recursive. + drivers/md/bitmap.c | 3 +- + drivers/md/faulty.c | 3 +- + drivers/md/linear.c | 3 +- + drivers/md/md.c | 418 +++++++++++++++++++++++++++++++------------- + drivers/md/multipath.c | 3 +- + drivers/md/raid0.c | 178 +++++++++---------- + drivers/md/raid1.c | 11 +- + drivers/md/raid10.c | 3 +- + drivers/md/raid5.c | 8 +- + fs/block_dev.c | 14 ++ + include/linux/raid/md_k.h | 20 ++- + include/linux/raid/md_p.h | 2 + + include/linux/raid/raid0.h | 10 +- + 13 files changed, 431 insertions(+), 245 deletions(-) +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/kernel/traps.c +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged mm/Makefile +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 9049d81: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 129 ++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 88 +++++ + arch/x86/Makefile | 5 + + arch/x86/include/asm/dma-mapping.h | 2 + + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_32.h | 6 + + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/string_32.h | 8 + + arch/x86/include/asm/string_64.h | 8 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 + + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/asm-x86/kmemcheck.h | 42 ++ + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 ++++ + include/linux/mm_types.h | 8 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 11 + + mm/Makefile | 1 + + mm/kmemcheck.c | 103 +++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 1982 insertions(+), 104 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merged drivers/mfd/wm8350-core.c +Auto-merged drivers/power/power_supply_sysfs.c +Auto-merged drivers/regulator/wm8350-regulator.c +Auto-merged include/linux/mfd/wm8350/pmic.h +Auto-merged include/linux/power_supply.h +Merge made by recursive. + drivers/i2c/chips/Kconfig | 23 - + drivers/i2c/chips/Makefile | 2 - + drivers/mfd/Kconfig | 66 +- + drivers/mfd/Makefile | 7 +- + drivers/mfd/da903x.c | 16 +- + drivers/mfd/dm355evm_msp.c | 420 +++++++ + drivers/{i2c/chips => mfd}/menelaus.c | 0 + drivers/mfd/mfd-core.c | 1 + + drivers/{i2c/chips => mfd}/tps65010.c | 0 + drivers/mfd/twl4030-core.c | 472 ++++---- + drivers/mfd/twl4030-irq.c | 30 +- + drivers/mfd/wm8350-core.c | 266 ++++- + drivers/mfd/wm8350-i2c.c | 4 +- + drivers/mfd/wm8350-regmap.c | 2100 ++++++++++++++++++++++++++++++++- + drivers/mfd/wm8400-core.c | 31 +- + drivers/power/Kconfig | 14 + + drivers/power/Makefile | 2 + + drivers/power/da9030_battery.c | 600 ++++++++++ + drivers/power/power_supply_sysfs.c | 2 +- + drivers/power/wm8350_power.c | 532 +++++++++ + drivers/regulator/wm8350-regulator.c | 7 + + include/linux/i2c/dm355evm_msp.h | 79 ++ + include/linux/i2c/twl4030.h | 81 +- + include/linux/mfd/da903x.h | 44 +- + include/linux/mfd/wm8350/comparator.h | 8 + + include/linux/mfd/wm8350/core.h | 52 +- + include/linux/mfd/wm8350/pmic.h | 4 + + include/linux/mfd/wm8350/supply.h | 25 +- + include/linux/power_supply.h | 1 + + 29 files changed, 4546 insertions(+), 343 deletions(-) + create mode 100644 drivers/mfd/dm355evm_msp.c + rename drivers/{i2c/chips => mfd}/menelaus.c (100%) + rename drivers/{i2c/chips => mfd}/tps65010.c (100%) + create mode 100644 drivers/power/da9030_battery.c + create mode 100644 drivers/power/wm8350_power.c + create mode 100644 include/linux/i2c/dm355evm_msp.h +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 voltage/for-next +$ git merge voltage/for-next +Auto-merged drivers/Makefile +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 136 ++++----- + drivers/Makefile | 4 +- + drivers/regulator/core.c | 403 ++++++++++++++--------- + drivers/regulator/da903x.c | 12 +- + 4 files changed, 315 insertions(+), 240 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Auto-merged Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merged security/selinux/selinuxfs.c +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 32e9d85: Merge commit 'lblnet/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 12 + + include/net/cipso_ipv4.h | 6 +- + include/net/netlabel.h | 86 ++++++- + net/ipv4/cipso_ipv4.c | 88 +++++-- + net/netlabel/netlabel_cipso_v4.c | 61 ++---- + net/netlabel/netlabel_domainhash.c | 67 +++++ + net/netlabel/netlabel_domainhash.h | 4 + + net/netlabel/netlabel_kapi.c | 347 +++++++++++++++++++++----- + net/netlabel/netlabel_unlabeled.c | 26 +- + net/netlabel/netlabel_unlabeled.h | 15 ++ + security/selinux/Kconfig | 27 -- + security/selinux/hooks.c | 6 +- + security/selinux/selinuxfs.c | 16 +- + security/smack/smack.h | 31 +++- + security/smack/smack_access.c | 28 ++- + security/smack/smack_lsm.c | 310 +++++++++++++++++++---- + security/smack/smackfs.c | 369 ++++++++++++++++++---------- + 17 files changed, 1123 insertions(+), 376 deletions(-) +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged MAINTAINERS +Auto-merged drivers/serial/serial_core.c +Auto-merged include/linux/pci_ids.h +Merge made by recursive. +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already up-to-date. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Already uptodate! +Merge made by recursive. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Auto-merged lib/swiotlb.c +Merge made by recursive. + arch/ia64/include/asm/swiotlb.h | 39 +------ + arch/x86/include/asm/swiotlb.h | 38 +------ + arch/x86/kernel/pci-swiotlb_64.c | 2 +- + include/linux/swiotlb.h | 3 +- + lib/swiotlb.c | 236 ++++++++++++++++---------------------- + 5 files changed, 104 insertions(+), 214 deletions(-) +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging proc/proc +$ git merge proc/proc +Auto-merged Documentation/filesystems/proc.txt +Auto-merged fs/proc/base.c +Merge made by recursive. + Documentation/filesystems/proc.txt | 1 + + arch/mips/kernel/stacktrace.c | 24 +++- + fs/proc/base.c | 225 ++++++++++++++++++++---------------- + fs/proc/generic.c | 8 +- + fs/proc/inode.c | 3 - + fs/proc/proc_net.c | 2 +- + fs/proc/root.c | 8 +- + 7 files changed, 151 insertions(+), 120 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merged drivers/pci/intel-iommu.c +CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c +Auto-merged include/linux/dma_remapping.h +Auto-merged include/linux/intel-iommu.h +Recorded preimage for 'drivers/pci/intel-iommu.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/pci/intel-iommu.c'. +Created commit 10331ca: Merge commit 'dwmw2-iommu/master' +$ git diff -M --stat --summary HEAD^.. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merged MAINTAINERS +Auto-merged drivers/scsi/Kconfig +Auto-merged drivers/scsi/Makefile +Auto-merged drivers/scsi/scsi_scan.c +Merge made by recursive. + Documentation/devices.txt | 6 + + Documentation/scsi/osd.txt | 198 +++++ + MAINTAINERS | 10 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 2 + + drivers/scsi/osd/Kbuild | 45 + + drivers/scsi/osd/Kconfig | 53 ++ + drivers/scsi/osd/Makefile | 37 + + drivers/scsi/osd/osd_debug.h | 30 + + drivers/scsi/osd/osd_initiator.c | 1646 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/osd/osd_ktests.c | 441 ++++++++++ + drivers/scsi/osd/osd_ktests.h | 31 + + drivers/scsi/osd/osd_uld.c | 457 +++++++++++ + drivers/scsi/scsi_scan.c | 1 + + include/linux/major.h | 1 + + include/scsi/osd_attributes.h | 327 ++++++++ + include/scsi/osd_initiator.h | 428 ++++++++++ + include/scsi/osd_protocol.h | 579 ++++++++++++++ + include/scsi/osd_sec.h | 45 + + include/scsi/osd_sense.h | 260 ++++++ + include/scsi/osd_types.h | 40 + + include/scsi/scsi.h | 1 + + 22 files changed, 4640 insertions(+), 0 deletions(-) + create mode 100644 Documentation/scsi/osd.txt + create mode 100644 drivers/scsi/osd/Kbuild + create mode 100644 drivers/scsi/osd/Kconfig + create mode 100755 drivers/scsi/osd/Makefile + create mode 100644 drivers/scsi/osd/osd_debug.h + create mode 100644 drivers/scsi/osd/osd_initiator.c + create mode 100644 drivers/scsi/osd/osd_ktests.c + create mode 100644 drivers/scsi/osd/osd_ktests.h + create mode 100644 drivers/scsi/osd/osd_uld.c + create mode 100644 include/scsi/osd_attributes.h + create mode 100644 include/scsi/osd_initiator.h + create mode 100644 include/scsi/osd_protocol.h + create mode 100644 include/scsi/osd_sec.h + create mode 100644 include/scsi/osd_sense.h + create mode 100644 include/scsi/osd_types.h +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Auto-merged fs/fuse/dev.c +Auto-merged fs/fuse/dir.c +Merge made by recursive. + fs/fuse/control.c | 6 +- + fs/fuse/dev.c | 113 ++++++++--- + fs/fuse/dir.c | 48 +++--- + fs/fuse/file.c | 457 ++++++++++++++++++++++++++++++++++++++++++-- + fs/fuse/fuse_i.h | 83 ++++++--- + fs/fuse/inode.c | 157 ++++++++------- + include/linux/fuse.h | 79 +++++++- + include/linux/miscdevice.h | 42 ++-- + 8 files changed, 783 insertions(+), 202 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Auto-merged Documentation/RCU/00-INDEX +Merge made by recursive. + Documentation/RCU/00-INDEX | 2 + + Documentation/RCU/rcubarrier.txt | 304 ++++++++++++++++++++++++++++++++++++++ + Documentation/bad_memory.txt | 45 ++++++ + 3 files changed, 351 insertions(+), 0 deletions(-) + create mode 100644 Documentation/RCU/rcubarrier.txt + create mode 100644 Documentation/bad_memory.txt +Merging nommu/master +$ git merge nommu/master +Auto-merged arch/powerpc/lib/dma-noncoherent.c +Auto-merged fs/binfmt_elf_fdpic.c +Auto-merged fs/binfmt_flat.c +Auto-merged include/linux/mm.h +Auto-merged include/linux/mm_types.h +Auto-merged ipc/shm.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d1d8cf3: Merge commit 'nommu/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/nommu-mmap.txt | 31 +- + Documentation/sysctl/vm.txt | 18 + + arch/arm/include/asm/mmu.h | 1 - + arch/arm/mm/dma-mapping.c | 28 +- + arch/blackfin/include/asm/mmu.h | 1 - + arch/blackfin/kernel/ptrace.c | 6 +- + arch/blackfin/kernel/traps.c | 11 +- + arch/frv/kernel/ptrace.c | 11 +- + arch/h8300/include/asm/mmu.h | 1 - + arch/m68knommu/include/asm/mmu.h | 1 - + arch/sh/include/asm/mmu.h | 1 - + fs/binfmt_elf_fdpic.c | 35 +-- + fs/binfmt_flat.c | 34 +- + fs/proc/internal.h | 2 - + fs/proc/meminfo.c | 6 + + fs/proc/nommu.c | 71 ++-- + fs/proc/task_nommu.c | 120 ++++-- + include/asm-frv/mmu.h | 1 - + include/asm-m32r/mmu.h | 1 - + include/linux/mm.h | 26 +- + include/linux/mm_types.h | 19 +- + init/initramfs.c | 1 + + ipc/shm.c | 12 + + kernel/fork.c | 4 +- + kernel/sysctl.c | 14 + + lib/Kconfig.debug | 7 + + mm/mmap.c | 10 + + mm/nommu.c | 1027 ++++++++++++++++++++++++++------------ + mm/tiny-shmem.c | 11 - + 29 files changed, 982 insertions(+), 529 deletions(-) +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merged MAINTAINERS +Auto-merged drivers/hwmon/fschmd.c +Auto-merged drivers/input/keyboard/atkbd.c +Auto-merged drivers/scsi/qla1280.c +Auto-merged drivers/scsi/scsi_error.c +Auto-merged fs/proc/task_nommu.c +Auto-merged include/acpi/actypes.h +Auto-merged include/linux/mtd/mtd.h +Auto-merged init/main.c +Auto-merged mm/slub.c +Auto-merged sound/usb/usx2y/usbusx2y.c +Merge made by recursive. + CREDITS | 2 +- + Documentation/dell_rbu.txt | 4 ++-- + Documentation/hwmon/abituguru-datasheet | 6 +++--- + Documentation/laptops/thinkpad-acpi.txt | 2 +- + Documentation/networking/rxrpc.txt | 2 +- + Documentation/networking/tuntap.txt | 2 +- + Documentation/scsi/ChangeLog.lpfc | 2 +- + Documentation/scsi/ChangeLog.ncr53c8xx | 2 +- + Documentation/scsi/ChangeLog.sym53c8xx | 2 +- + MAINTAINERS | 3 ++- + arch/blackfin/kernel/kgdb.c | 2 +- + arch/cris/arch-v32/kernel/signal.c | 2 +- + arch/ia64/kernel/kprobes.c | 2 +- + arch/m68k/Kconfig | 2 +- + arch/m68k/kernel/traps.c | 2 +- + arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | 2 +- + arch/powerpc/boot/Makefile | 2 +- + arch/powerpc/kernel/kprobes.c | 2 +- + arch/powerpc/oprofile/cell/spu_profiler.c | 2 +- + arch/s390/Kconfig | 2 +- + arch/s390/kernel/kprobes.c | 2 +- + arch/sparc/kernel/kprobes.c | 2 +- + arch/x86/kernel/kprobes.c | 2 +- + arch/x86/kernel/mfgpt_32.c | 2 +- + drivers/acpi/acpi_memhotplug.c | 2 +- + drivers/acpi/executer/exprep.c | 2 +- + drivers/acpi/executer/exresolv.c | 2 +- + drivers/acpi/executer/exstore.c | 2 +- + drivers/acpi/resources/rscreate.c | 2 +- + drivers/acpi/utilities/utobject.c | 4 ++-- + drivers/base/Kconfig | 2 +- + drivers/char/epca.c | 2 +- + drivers/cpufreq/Kconfig | 4 ++-- + drivers/hwmon/fschmd.c | 2 +- + drivers/infiniband/hw/mlx4/cq.c | 2 +- + drivers/input/keyboard/atkbd.c | 2 +- + drivers/macintosh/Kconfig | 2 +- + drivers/message/i2o/i2o_scsi.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/misc/phantom.c | 2 +- + drivers/mtd/devices/pmc551.c | 2 +- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/io.c | 2 +- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/ubi-media.h | 4 ++-- + drivers/mtd/ubi/vtbl.c | 2 +- + drivers/mtd/ubi/wl.c | 4 ++-- + drivers/net/bnx2x_link.c | 2 +- + drivers/net/e1000/e1000_hw.c | 4 ++-- + drivers/net/slip.h | 2 +- + drivers/net/tehuti.c | 4 ++-- + drivers/net/tokenring/smctr.c | 2 +- + drivers/net/wireless/atmel.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 4 ++-- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 4 ++-- + drivers/net/wireless/strip.c | 2 +- + drivers/rtc/rtc-ds1511.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 2 +- + drivers/s390/block/dasd_eer.c | 4 ++-- + drivers/s390/char/vmlogrdr.c | 4 ++-- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++-- + drivers/scsi/lpfc/lpfc_sli.c | 10 +++++----- + drivers/scsi/megaraid.c | 4 ++-- + drivers/scsi/qla1280.c | 4 ++-- + drivers/scsi/qla4xxx/ql4_mbx.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/serial/8250.c | 2 +- + drivers/serial/crisv10.c | 4 ++-- + drivers/uwb/i1480/dfu/usb.c | 2 +- + drivers/video/console/vgacon.c | 2 +- + fs/ncpfs/ioctl.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/proc/task_nommu.c | 2 +- + fs/ubifs/Kconfig | 2 +- + fs/ubifs/budget.c | 4 ++-- + fs/ubifs/gc.c | 2 +- + fs/ubifs/journal.c | 2 +- + fs/ubifs/shrinker.c | 2 +- + fs/xfs/linux-2.6/xfs_super.c | 2 +- + include/acpi/acmacros.h | 4 ++-- + include/acpi/actypes.h | 2 +- + include/linux/mtd/mtd.h | 2 +- + include/linux/ncp_fs.h | 2 +- + include/linux/spi/spi.h | 4 ++-- + include/mtd/ubi-user.h | 2 +- + init/main.c | 3 ++- + kernel/pid.c | 2 +- + kernel/printk.c | 2 +- + kernel/time/jiffies.c | 2 +- + lib/radix-tree.c | 11 ++++++----- + mm/slub.c | 2 +- + net/sctp/auth.c | 4 ++-- + net/sctp/sm_statefuns.c | 6 +++--- + net/sctp/socket.c | 2 +- + net/sctp/tsnmap.c | 2 +- + sound/oss/aedsp16.c | 2 +- + sound/usb/usx2y/usbusx2y.c | 2 +- + 98 files changed, 132 insertions(+), 129 deletions(-) +Merging quilt/staging +$ git merge quilt/staging +Auto-merged CREDITS +Auto-merged Documentation/DocBook/networking.tmpl +CONFLICT (content): Merge conflict in Documentation/DocBook/networking.tmpl +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/arm/Kconfig +Auto-merged drivers/Makefile +Auto-merged drivers/hid/usbhid/hid-core.c +Auto-merged drivers/i2c/chips/Kconfig +CONFLICT (content): Merge conflict in drivers/i2c/chips/Kconfig +Auto-merged drivers/i2c/chips/Makefile +CONFLICT (content): Merge conflict in drivers/i2c/chips/Makefile +Auto-merged drivers/media/video/pvrusb2/pvrusb2-hdw.c +Auto-merged drivers/net/Kconfig +Auto-merged drivers/net/Makefile +Auto-merged drivers/net/usb/kaweth.c +Auto-merged drivers/net/usb/pegasus.c +Auto-merged drivers/staging/slicoss/slicoss.c +Removed drivers/staging/winbond/adapter.h +Removed drivers/staging/winbond/linux/common.h +Removed drivers/staging/winbond/linux/sysdef.h +Removed drivers/staging/winbond/linux/wb35rx_f.h +Removed drivers/staging/winbond/linux/wb35tx_f.h +CONFLICT (delete/modify): drivers/staging/winbond/linux/wbusb.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/winbond/linux/wbusb.c left in tree. +Removed drivers/staging/winbond/linux/wbusb_f.h +Removed drivers/staging/winbond/rxisr.c +Removed drivers/staging/winbond/sme_api.c +Removed drivers/staging/winbond/wblinux.c +Removed drivers/staging/winbond/wblinux_s.h +Removed drivers/staging/wlan-ng/hfa384x.c +Removed drivers/staging/wlan-ng/p80211mod.c +Auto-merged drivers/staging/wlan-ng/p80211netdev.c +CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c +Auto-merged drivers/staging/wlan-ng/p80211wext.c +CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211wext.c +Removed drivers/staging/wlan-ng/prism2_cs.c +Removed drivers/staging/wlan-ng/prism2_pci.c +Removed drivers/staging/wlan-ng/prism2_plx.c +Removed drivers/staging/wlan-ng/version.h +Auto-merged drivers/usb/core/devio.c +Auto-merged drivers/usb/gadget/m66592-udc.c +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Auto-merged drivers/usb/gadget/pxa27x_udc.c +Auto-merged drivers/usb/gadget/s3c2410_udc.c +Auto-merged drivers/usb/host/r8a66597-hcd.c +Auto-merged drivers/usb/serial/mos7840.c +Removed drivers/usb/storage/dpcm.c +Removed drivers/usb/storage/dpcm.h +Auto-merged drivers/usb/wusbcore/rh.c +CONFLICT (content): Merge conflict in drivers/usb/wusbcore/rh.c +Auto-merged include/linux/Kbuild +Auto-merged net/Kconfig +Auto-merged net/Makefile +Recorded preimage for 'drivers/i2c/chips/Kconfig' +Recorded preimage for 'drivers/i2c/chips/Makefile' +Resolved 'Documentation/DocBook/networking.tmpl' using previous resolution. +Resolved 'drivers/staging/wlan-ng/p80211netdev.c' using previous resolution. +Resolved 'drivers/staging/wlan-ng/p80211wext.c' using previous resolution. +Resolved 'drivers/usb/wusbcore/rh.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at b26c5f8 Merge commit 'trivial/for-next' |