diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-04 17:29:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-04 17:29:12 +1000 |
| commit | 062cd71c971edaa979961f455b898f4c163ffbfd (patch) | |
| tree | d1d65ff7607f879f2e0e0fa1c58131acab101ad3 | |
| parent | 7e0ae4bb91a4f7fc0570a632e637b0e8c24cadb7 (diff) | |
Add linux-next specific filesnext-20080604
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 91 | ||||
| -rw-r--r-- | Next/merge.log | 4525 | ||||
| -rw-r--r-- | Next/quilt-import.log | 420 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5037 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..ea3f12928b7d --- /dev/null +++ b/Next/Trees @@ -0,0 +1,91 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-x86-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sched-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-ftrace-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#stable +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6#test +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +hwmon git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git#testing +ubi git git://git.infradead.org/~dedekind/ubi-2.6.git#master +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/tests.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6.git#for-akpm +m68k quilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/ +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#powerpc-next +hrt git git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git#mm +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_testing#master +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-next +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#vfs-2.6.25 +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#core/rcu +locking git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#core/locking +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#safe-poison-pointers +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#stackprotector +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +ldp.next quilt http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-ldp.next/ +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next +ubifs git git://git.infradead.org/~dedekind/ubifs-2.6.git#for_andrew +lsm git git://gitkernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..979a54e594d2 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4525 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at c3b25b3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 +Merging origin/master +$ git merge origin/master +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/message/fusion/mptfc.c | 2 - + drivers/message/fusion/mptsas.c | 2 - + drivers/message/fusion/mptscsih.c | 8 ---- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/ibmvscsi/viosrp.h | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 13 ++++++-- + drivers/scsi/qla2xxx/qla_def.h | 2 +- + drivers/scsi/qla2xxx/qla_gbl.h | 3 ++ + drivers/scsi/qla2xxx/qla_inline.h | 4 ++ + drivers/scsi/qla2xxx/qla_isr.c | 63 ++++++++---------------------------- + drivers/scsi/qla2xxx/qla_mbx.c | 12 ++---- + drivers/scsi/qla2xxx/qla_mid.c | 19 ++++++----- + drivers/scsi/qla2xxx/qla_os.c | 30 ++++++++++------- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/scsi_sysfs.c | 7 +++- + 15 files changed, 73 insertions(+), 99 deletions(-) +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + net/ax25/ax25_subr.c | 11 +++-------- + net/bluetooth/rfcomm/tty.c | 13 ++++++++++++- + 2 files changed, 15 insertions(+), 9 deletions(-) +Merging sparc-current/master +$ git merge sparc-current/master +Merge made by recursive. + include/asm-sparc64/io.h | 66 ++++++++++++++++++++++++++++++--------------- + 1 files changed, 44 insertions(+), 22 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + include/sound/ac97_codec.h | 1 + + sound/pci/ac97/ac97_patch.c | 48 +++++++++++++++++++++++++++----------- + sound/pci/hda/patch_analog.c | 50 +++++++++++++++++++++++------------------ + sound/pci/hda/patch_cmedia.c | 1 + + sound/pci/hda/patch_realtek.c | 1 - + 5 files changed, 64 insertions(+), 37 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/boot/compressed/head-xscale.S | 4 ---- + arch/arm/mach-pxa/cm-x270.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/tosa.c | 4 ++-- + include/asm-arm/arch-at91/io.h | 2 -- + include/asm-arm/arch-pxa/mfp-pxa27x.h | 1 + + include/asm-arm/arch-pxa/pxa2xx-gpio.h | 9 +++++++++ + include/asm-arm/pgtable-nommu.h | 1 - + include/asm-arm/spinlock.h | 2 +- + 9 files changed, 15 insertions(+), 12 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/airo.c | 2 +- + drivers/net/wireless/b43legacy/main.c | 17 +++++++++-------- + drivers/net/wireless/ipw2200.c | 27 +++++++++++++++++++++++++-- + drivers/net/wireless/libertas/debugfs.c | 4 ++-- + drivers/net/wireless/p54/p54usb.c | 1 + + drivers/ssb/driver_pcicore.c | 4 ++-- + include/linux/wireless.h | 6 ++++++ + net/ipv4/tcp_output.c | 29 ++++++++++++++++------------- + 8 files changed, 62 insertions(+), 28 deletions(-) +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + Documentation/kobject.txt | 4 ++++ + drivers/base/core.c | 5 +++++ + include/linux/sysfs.h | 4 +++- + lib/kobject.c | 18 +++++------------- + 4 files changed, 17 insertions(+), 14 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged drivers/ata/libata-scsi.c +Auto-merged drivers/lguest/lguest_device.c +Auto-merged drivers/message/fusion/mptfc.c +Auto-merged drivers/net/wireless/p54/p54usb.c +Auto-merged drivers/s390/kvm/kvm_virtio.c +CONFLICT (content): Merge conflict in drivers/s390/kvm/kvm_virtio.c +Auto-merged drivers/scsi/scsi_sysfs.c +Auto-merged drivers/virtio/virtio.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio.c +Auto-merged drivers/virtio/virtio_pci.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio_pci.c +Resolved 'drivers/s390/kvm/kvm_virtio.c' using previous resolution. +Resolved 'drivers/virtio/virtio.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 +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-dev | 20 ++ + Documentation/filesystems/sysfs.txt | 6 + + arch/arm/common/dmabounce.c | 22 +-- + arch/arm/common/locomo.c | 2 +- + arch/arm/common/sa1111.c | 10 +- + arch/arm/common/scoop.c | 2 +- + arch/arm/kernel/ecard.c | 5 +- + arch/arm/mach-integrator/impd1.c | 7 +- + arch/arm/mach-integrator/lm.c | 6 +- + arch/arm/plat-omap/mailbox.c | 2 +- + arch/avr32/mach-at32ap/clock.c | 4 +- + arch/mips/kernel/rtlx.c | 4 +- + arch/mips/sibyte/common/sb_tbprof.c | 3 +- + arch/powerpc/platforms/chrp/pci.c | 2 +- + arch/ppc/platforms/cpci690.c | 4 +- + arch/ppc/platforms/ev64260.c | 4 +- + arch/ppc/platforms/ev64360.c | 4 +- + arch/ppc/platforms/hdpu.c | 4 +- + arch/ppc/platforms/katana.c | 4 +- + arch/ppc/platforms/radstone_ppc7d.c | 4 +- + arch/ppc/syslib/ppc_sys.c | 12 +- + arch/sparc64/kernel/ebus.c | 4 +- + arch/sparc64/kernel/of_device.c | 4 +- + arch/sparc64/kernel/pci.c | 2 +- + arch/sparc64/kernel/vio.c | 18 +- + arch/x86/kernel/cpuid.c | 4 +- + arch/x86/kernel/microcode.c | 4 +- + arch/x86/kernel/msr.c | 4 +- + arch/x86/kernel/pci-dma.c | 8 +- + arch/x86/kernel/pci-gart_64.c | 4 +- + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + block/bsg.c | 9 +- + block/genhd.c | 201 ++++++++++------- + drivers/acpi/ac.c | 2 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/fan.c | 10 +- + drivers/acpi/glue.c | 14 +- + drivers/acpi/processor_core.c | 11 +- + drivers/acpi/scan.c | 6 +- + drivers/acpi/sleep/proc.c | 2 +- + drivers/acpi/thermal.c | 12 +- + drivers/acpi/video.c | 5 +- + drivers/acpi/wmi.c | 2 +- + drivers/amba/bus.c | 4 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/base/attribute_container.c | 2 +- + drivers/base/base.h | 27 +++ + drivers/base/bus.c | 12 +- + drivers/base/class.c | 153 ++++++++------ + drivers/base/core.c | 228 ++++++++++++------- + drivers/base/dd.c | 12 +- + drivers/base/firmware_class.c | 10 +- + drivers/base/isa.c | 4 +- + drivers/base/platform.c | 18 +- + drivers/base/power/main.c | 2 +- + drivers/base/power/trace.c | 6 +- + drivers/block/aoe/aoechr.c | 5 +- + drivers/block/paride/pg.c | 5 +- + drivers/block/paride/pt.c | 10 +- + drivers/block/pktcdvd.c | 4 +- + drivers/bluetooth/bfusb.c | 3 +- + drivers/bluetooth/bt3c_cs.c | 3 +- + drivers/char/cyclades.c | 10 +- + drivers/char/drm/drm_sysfs.c | 3 +- + drivers/char/dsp56k.c | 3 +- + drivers/char/ip2/ip2main.c | 12 +- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/istallion.c | 5 +- + drivers/char/lp.c | 3 +- + drivers/char/mem.c | 6 +- + drivers/char/misc.c | 4 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 3 +- + drivers/char/ppdev.c | 5 +- + drivers/char/raw.c | 7 +- + drivers/char/snsc.c | 3 +- + drivers/char/stallion.c | 4 +- + drivers/char/tty_io.c | 12 +- + drivers/char/vc_screen.c | 12 +- + drivers/char/viotape.c | 8 +- + drivers/char/vt.c | 14 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 +- + drivers/dca/dca-sysfs.c | 8 +- + drivers/dma/dmaengine.c | 2 +- + drivers/edac/cell_edac.c | 2 +- + drivers/edac/edac_device.c | 2 +- + drivers/edac/edac_mc.c | 2 +- + drivers/edac/edac_pci.c | 2 +- + drivers/edac/edac_pci_sysfs.c | 6 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/mv64x60_edac.c | 8 +- + drivers/eisa/Makefile | 2 +- + drivers/eisa/eisa-bus.c | 6 +- + drivers/firewire/fw-device.c | 16 +- + drivers/firewire/fw-ohci.c | 2 +- + drivers/firewire/fw-sbp2.c | 2 +- + drivers/firmware/dell_rbu.c | 2 +- + drivers/firmware/dmi-id.c | 2 +- + drivers/hid/hidraw.c | 5 +- + drivers/hwmon/hwmon.c | 5 +- + drivers/i2c/busses/i2c-pxa.c | 4 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/i2c-core.c | 104 +++++---- + drivers/i2c/i2c-dev.c | 6 +- + drivers/ide/ide-acpi.c | 2 +- + drivers/ide/ide-probe.c | 4 +- + drivers/ide/ide-tape.c | 10 +- + drivers/ieee1394/dv1394.c | 7 +- + drivers/ieee1394/hosts.c | 4 +- + drivers/ieee1394/nodemgr.c | 37 ++-- + drivers/ieee1394/raw1394.c | 4 +- + drivers/ieee1394/video1394.c | 6 +- + drivers/infiniband/core/cm.c | 72 +++---- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/core/ucm.c | 3 +- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + drivers/input/evdev.c | 2 +- + drivers/input/gameport/gameport.c | 2 +- + drivers/input/gameport/ns558.c | 2 +- + drivers/input/input.c | 2 +- + drivers/input/joydev.c | 2 +- + drivers/input/mousedev.c | 3 +- + drivers/input/serio/ambakmi.c | 4 +- + drivers/input/serio/gscps2.c | 2 +- + drivers/input/serio/pcips2.c | 2 +- + drivers/input/serio/sa1111ps2.c | 4 +- + drivers/input/serio/serio.c | 2 +- + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/isdn/capi/capi.c | 3 +- + drivers/lguest/lguest_device.c | 4 +- + drivers/macintosh/adb.c | 3 +- + drivers/macintosh/macio_asic.c | 8 +- + drivers/mca/mca-bus.c | 2 +- + drivers/media/common/tuners/tuner-xc2028.c | 2 +- + drivers/media/common/tuners/xc5000.c | 2 +- + drivers/media/dvb/dvb-core/dvbdev.c | 4 +- + drivers/media/dvb/dvb-usb/cxusb.c | 21 ++- + drivers/media/dvb/dvb-usb/gp8psk.c | 3 +- + drivers/media/dvb/frontends/bcm3510.c | 5 +- + drivers/media/dvb/frontends/nxt200x.c | 3 +- + drivers/media/dvb/frontends/or51211.c | 4 +- + drivers/media/dvb/frontends/sp8870.c | 2 +- + drivers/media/dvb/frontends/sp887x.c | 2 +- + drivers/media/dvb/frontends/tda10048.c | 2 +- + drivers/media/dvb/frontends/tda1004x.c | 2 +- + drivers/media/dvb/ttusb-dec/ttusb_dec.c | 2 +- + drivers/media/video/bt8xx/bttv-cards.c | 3 +- + drivers/media/video/bt8xx/bttv-gpio.c | 7 +- + drivers/media/video/bt8xx/bttv.h | 2 +- + drivers/media/video/cx25840/cx25840-firmware.c | 27 +-- + drivers/media/video/em28xx/em28xx-video.c | 4 +- + drivers/media/video/et61x251/et61x251_core.c | 2 +- + drivers/media/video/ir-kbd-i2c.c | 6 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 +- + drivers/media/video/sn9c102/sn9c102_core.c | 2 +- + drivers/media/video/soc_camera.c | 5 +- + drivers/media/video/usbvision/usbvision-video.c | 2 +- + drivers/media/video/videodev.c | 2 +- + drivers/media/video/zc0301/zc0301_core.c | 2 +- + drivers/memstick/core/memstick.c | 6 +- + drivers/memstick/core/mspro_block.c | 14 +- + drivers/memstick/host/jmb38x_ms.c | 4 +- + drivers/memstick/host/tifm_ms.c | 6 +- + drivers/message/fusion/mptbase.h | 2 +- + drivers/message/fusion/mptfc.c | 4 +- + drivers/message/i2o/device.c | 6 +- + drivers/message/i2o/i2o_proc.c | 2 +- + drivers/message/i2o/iop.c | 2 +- + drivers/misc/enclosure.c | 8 +- + drivers/misc/phantom.c | 5 +- + drivers/misc/thinkpad_acpi.c | 8 +- + drivers/misc/tifm_7xx1.c | 2 +- + drivers/misc/tifm_core.c | 7 +- + drivers/mmc/core/bus.c | 4 +- + drivers/mmc/core/host.c | 6 +- + drivers/mmc/core/sdio_bus.c | 4 +- + drivers/mmc/host/mmc_spi.c | 2 +- + drivers/mmc/host/tifm_sd.c | 18 +- + drivers/mtd/devices/m25p80.c | 14 +- + drivers/mtd/devices/mtd_dataflash.c | 28 ++-- + drivers/mtd/maps/bast-flash.c | 2 +- + 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/mtdchar.c | 9 +- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/onenand/generic.c | 2 +- + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/vmt.c | 4 +- + drivers/net/3c59x.c | 6 +- + drivers/net/arm/at91_ether.c | 2 +- + drivers/net/arm/ep93xx_eth.c | 2 +- + drivers/net/arm/etherh.c | 6 +- + drivers/net/au1000_eth.c | 4 +- + drivers/net/bfin_mac.c | 8 +- + drivers/net/bmac.c | 2 +- + drivers/net/cxgb3/common.h | 5 +- + drivers/net/cxgb3/t3_hw.c | 7 +- + drivers/net/declance.c | 6 +- + drivers/net/defxx.c | 2 +- + drivers/net/depca.c | 4 +- + drivers/net/enc28j60.c | 2 +- + drivers/net/irda/irda-usb.c | 12 +- + drivers/net/jazzsonic.c | 6 +- + drivers/net/macb.c | 8 +- + drivers/net/macsonic.c | 15 +- + drivers/net/myri10ge/myri10ge.c | 11 +- + drivers/net/pasemi_mac.h | 2 +- + drivers/net/phy/mdio_bus.c | 2 +- + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phy_device.c | 14 +- + drivers/net/ppp_generic.c | 3 +- + drivers/net/sb1250-mac.c | 10 +- + drivers/net/smc911x.c | 2 +- + drivers/net/smc91x.c | 2 +- + drivers/net/tc35815.c | 4 +- + drivers/net/tulip/de4x5.c | 4 +- + drivers/net/wan/cosa.c | 6 +- + drivers/net/wireless/atmel.c | 6 +- + drivers/net/wireless/libertas/defs.h | 2 +- + drivers/net/wireless/libertas/if_cs.c | 2 +- + drivers/net/wireless/libertas/if_sdio.c | 4 +- + drivers/net/wireless/libertas/if_usb.c | 4 +- + drivers/net/wireless/orinoco.c | 2 +- + drivers/net/wireless/orinoco_cs.c | 2 +- + drivers/net/wireless/p54/p54usb.c | 5 +- + drivers/net/wireless/rt2x00/rt2x00.h | 4 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 2 +- + drivers/net/wireless/rt2x00/rt61pci.c | 4 +- + drivers/net/wireless/rt2x00/rt73usb.c | 6 +- + drivers/net/wireless/spectrum_cs.c | 2 +- + drivers/net/wireless/zd1201.c | 2 +- + drivers/parisc/dino.c | 11 +- + drivers/pci/hotplug/acpiphp.h | 4 +- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/cpqphp_sysfs.c | 2 +- + drivers/pci/hotplug/fakephp.c | 9 +- + drivers/pci/pci-acpi.c | 2 +- + drivers/pci/pcie/aer/aerdrv.c | 6 +- + drivers/pci/pcie/aer/aerdrv_acpi.c | 2 +- + drivers/pci/pcie/aer/aerdrv_core.c | 8 +- + drivers/pci/pcie/portdrv_core.c | 13 +- + drivers/pci/probe.c | 8 +- + drivers/pcmcia/cs.c | 2 +- + drivers/pcmcia/cs_internal.h | 4 +- + drivers/pcmcia/ds.c | 48 ++-- + drivers/pcmcia/rsrc_mgr.c | 2 +- + drivers/pcmcia/rsrc_nonstatic.c | 8 +- + drivers/pnp/card.c | 4 +- + drivers/pnp/core.c | 6 +- + drivers/pnp/system.c | 2 +- + drivers/power/apm_power.c | 2 +- + drivers/power/ds2760_battery.c | 4 +- + drivers/power/power_supply_core.c | 4 +- + drivers/rtc/class.c | 16 +- + drivers/rtc/interface.c | 4 +- + drivers/rtc/rtc-at91sam9.c | 4 +- + drivers/rtc/rtc-cmos.c | 10 +- + drivers/rtc/rtc-omap.c | 4 +- + drivers/s390/block/dasd.c | 32 ++-- + drivers/s390/block/dasd_3990_erp.c | 2 +- + drivers/s390/block/dasd_devmap.c | 28 ++-- + drivers/s390/block/dasd_eckd.c | 6 +- + drivers/s390/block/dasd_eer.c | 4 +- + drivers/s390/block/dasd_fba.c | 4 +- + drivers/s390/block/dasd_int.h | 4 +- + drivers/s390/block/dasd_proc.c | 2 +- + drivers/s390/block/dcssblk.c | 7 +- + drivers/s390/char/raw3270.c | 14 +- + drivers/s390/char/tape_3590.c | 129 ++++++------ + drivers/s390/char/tape_block.c | 2 +- + drivers/s390/char/tape_class.c | 7 +- + drivers/s390/char/tape_core.c | 20 +- + drivers/s390/char/tape_proc.c | 2 +- + drivers/s390/char/tape_std.c | 12 +- + drivers/s390/char/vmlogrdr.c | 5 +- + drivers/s390/char/vmur.c | 11 +- + drivers/s390/cio/ccwgroup.c | 3 +- + drivers/s390/cio/chp.c | 3 +- + drivers/s390/cio/cio.c | 29 ++- + drivers/s390/cio/cio.h | 4 + + drivers/s390/cio/css.c | 4 +- + drivers/s390/cio/device.c | 20 ++- + drivers/s390/cio/device_fsm.c | 6 +- + drivers/s390/cio/device_ops.c | 2 +- + drivers/s390/cio/qdio.c | 24 +- + drivers/s390/crypto/ap_bus.c | 4 +- + drivers/s390/kvm/kvm_virtio.c | 15 +- + drivers/s390/net/claw.c | 50 +++-- + drivers/s390/net/claw.h | 2 +- + drivers/s390/net/ctcm_main.c | 22 +- + drivers/s390/net/ctcm_main.h | 2 +- + drivers/s390/net/lcs.c | 30 ++-- + drivers/s390/net/netiucv.c | 4 +- + drivers/s390/net/qeth_core.h | 10 +- + drivers/s390/net/qeth_core_main.c | 10 +- + drivers/s390/s390_rdev.c | 2 +- + drivers/s390/scsi/zfcp_aux.c | 23 +-- + drivers/s390/scsi/zfcp_def.h | 4 +- + drivers/sbus/sbus.c | 6 +- + drivers/scsi/NCR_D700.c | 2 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/aic94xx/aic94xx_sds.c | 12 +- + drivers/scsi/aic94xx/aic94xx_sds.h | 4 +- + drivers/scsi/aic94xx/aic94xx_seq.c | 7 +- + drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/dpt_i2o.c | 4 +- + drivers/scsi/hosts.c | 13 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/lasi700.c | 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 | 2 +- + drivers/scsi/scsi_scan.c | 7 +- + drivers/scsi/scsi_sysfs.c | 12 +- + drivers/scsi/scsi_transport_fc.c | 23 +- + drivers/scsi/scsi_transport_iscsi.c | 12 +- + drivers/scsi/scsi_transport_sas.c | 32 ++-- + drivers/scsi/scsi_transport_srp.c | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/ses.c | 2 +- + drivers/scsi/sim710.c | 5 +- + drivers/scsi/sni_53c710.c | 2 +- + drivers/scsi/zalon.c | 2 +- + drivers/serial/serial_core.c | 4 +- + drivers/serial/sunzilog.c | 4 +- + drivers/spi/atmel_spi.c | 8 +- + drivers/spi/mpc52xx_psc_spi.c | 2 +- + drivers/spi/omap2_mcspi.c | 2 +- + drivers/spi/omap_uwire.c | 12 +- + drivers/spi/pxa2xx_spi.c | 4 +- + drivers/spi/spi.c | 18 +- + drivers/spi/spi_bfin5xx.c | 2 +- + drivers/spi/spi_bitbang.c | 2 +- + drivers/spi/spi_butterfly.c | 2 +- + drivers/spi/spi_imx.c | 4 +- + drivers/spi/spi_lm70llp.c | 2 +- + drivers/spi/spi_mpc83xx.c | 2 +- + drivers/spi/spi_txx9.c | 2 +- + drivers/spi/spidev.c | 3 +- + drivers/ssb/main.c | 11 +- + drivers/ssb/pcihost_wrapper.c | 2 +- + drivers/thermal/thermal_sys.c | 6 +- + drivers/usb/atm/cxacru.c | 2 +- + drivers/usb/atm/ueagle-atm.c | 20 +- + drivers/usb/core/devio.c | 15 +- + drivers/usb/core/driver.c | 6 +- + drivers/usb/core/endpoint.c | 4 +- + drivers/usb/core/file.c | 15 +- + drivers/usb/core/hcd.c | 6 +- + drivers/usb/core/hcd.h | 2 +- + drivers/usb/core/message.c | 8 +- + drivers/usb/core/usb.c | 7 +- + drivers/usb/gadget/amd5536udc.c | 2 +- + drivers/usb/gadget/at91_udc.c | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/dummy_hcd.c | 4 +- + drivers/usb/gadget/ether.c | 2 +- + drivers/usb/gadget/file_storage.c | 4 +- + drivers/usb/gadget/fsl_usb2_udc.c | 2 +- + drivers/usb/gadget/goku_udc.c | 2 +- + drivers/usb/gadget/lh7a40x_udc.c | 4 +- + drivers/usb/gadget/m66592-udc.c | 2 +- + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/gadget/omap_udc.c | 2 +- + drivers/usb/gadget/printer.c | 4 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/gadget/pxa2xx_udc.c | 4 +- + drivers/usb/gadget/s3c2410_udc.c | 2 +- + drivers/usb/host/ehci-dbg.c | 4 +- + drivers/usb/host/ehci-fsl.c | 12 +- + drivers/usb/host/ehci-ixp4xx.c | 8 +- + drivers/usb/host/ehci-orion.c | 8 +- + drivers/usb/host/ehci-ps3.c | 2 +- + drivers/usb/host/isp116x-hcd.c | 2 +- + drivers/usb/host/isp1760-hcd.c | 2 +- + drivers/usb/host/isp1760-if.c | 6 +- + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/ohci-omap.c | 2 +- + drivers/usb/host/ohci-pnx4008.c | 2 +- + drivers/usb/host/ohci-ps3.c | 2 +- + drivers/usb/host/ohci-sm501.c | 2 +- + drivers/usb/host/ohci-ssb.c | 2 +- + drivers/usb/host/sl811-hcd.c | 2 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/usb/misc/isight_firmware.c | 2 +- + drivers/usb/mon/mon_bin.c | 5 +- + drivers/usb/serial/usb-serial.c | 6 +- + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/aty/radeonfb.h | 2 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/lcd.c | 2 +- + drivers/video/console/fbcon.c | 3 +- + drivers/video/fbmem.c | 5 +- + drivers/video/output.c | 2 +- + drivers/video/pmag-ba-fb.c | 16 +- + drivers/video/pmagb-b-fb.c | 16 +- + drivers/video/ps3fb.c | 2 +- + drivers/virtio/virtio.c | 2 +- + drivers/virtio/virtio_pci.c | 4 +- + drivers/w1/w1.c | 19 +- + drivers/w1/w1_int.c | 3 +- + drivers/xen/xenbus/xenbus_probe.c | 10 +- + drivers/xen/xenbus/xenbus_probe.h | 2 +- + fs/coda/psdev.c | 5 +- + fs/partitions/check.c | 16 +- + fs/sysfs/file.c | 13 ++ + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 1 + + include/asm-parisc/parisc-device.h | 4 +- + include/linux/device.h | 55 +++-- + include/linux/eisa.h | 2 +- + include/linux/firmware.h | 2 +- + include/linux/init.h | 1 + + include/linux/kobject.h | 1 - + include/linux/mmc/card.h | 2 +- + include/linux/mmc/host.h | 2 +- + include/linux/mmc/sdio_func.h | 2 +- + include/linux/mtd/map.h | 2 +- + include/linux/mtd/mtd.h | 2 +- + include/linux/pci.h | 4 +- + include/linux/phy.h | 6 +- + include/linux/rio_drv.h | 2 +- + include/linux/spi/spi.h | 2 +- + include/linux/sysfs.h | 5 + + include/linux/usb.h | 2 +- + include/net/wireless.h | 4 +- + include/scsi/scsi_host.h | 2 +- + include/scsi/scsi_transport_fc.h | 4 +- + include/scsi/scsi_transport_iscsi.h | 2 +- + init/main.c | 9 + + lib/Kconfig.debug | 3 + + lib/kobject.c | 62 +++++- + lib/swiotlb.c | 2 +- + net/atm/atm_sysfs.c | 2 +- + net/bluetooth/hci_sysfs.c | 14 +- + net/core/net-sysfs.c | 3 +- + net/rfkill/rfkill.c | 6 +- + net/wireless/core.c | 3 +- + net/wireless/nl80211.c | 2 +- + .../firmware_sample_firmware_class.c | 4 +- + scripts/mod/file2alias.c | 24 ++- + sound/core/init.c | 5 +- + sound/drivers/ml403-ac97cr.c | 4 +- + sound/drivers/vx/vx_core.c | 4 +- + sound/isa/ad1848/ad1848.c | 6 +- + sound/isa/adlib.c | 12 +- + sound/isa/cs423x/cs4231.c | 9 +- + sound/isa/cs423x/cs4236.c | 8 +- + sound/isa/es1688/es1688.c | 6 +- + sound/isa/gus/gusclassic.c | 8 +- + sound/isa/gus/gusextreme.c | 12 +- + sound/isa/sb/sb8.c | 4 +- + sound/oss/soundcard.c | 14 +- + sound/pci/ac97/ac97_codec.c | 2 +- + sound/pci/maestro3.c | 29 ++-- + sound/pci/pcxhr/pcxhr_core.c | 4 +- + sound/pci/riptide/riptide.c | 10 +- + sound/pci/vx222/vx222_ops.c | 2 +- + sound/pci/ymfpci/ymfpci_main.c | 59 +++--- + sound/sound_core.c | 5 +- + 472 files changed, 2080 insertions(+), 1733 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-dev +Merging quilt/usb +$ git merge quilt/usb +Removed Documentation/usb/uhci.txt +Merge made by recursive. + Documentation/usb/WUSB-Design-overview.txt | 448 +++++++ + Documentation/usb/gadget_serial.txt | 35 +- + Documentation/usb/uhci.txt | 165 --- + Documentation/usb/wusb-cbaf | 133 ++ + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 3 + + drivers/usb/core/devices.c | 2 - + drivers/usb/core/devio.c | 2 - + drivers/usb/core/driver.c | 31 +- + drivers/usb/core/hub.c | 506 +++++--- + drivers/usb/gadget/Makefile | 2 +- + drivers/usb/gadget/rndis.c | 55 +- + drivers/usb/gadget/rndis.h | 2 - + drivers/usb/gadget/serial.c | 1392 ++------------------- + drivers/usb/gadget/u_serial.c | 1270 ++++++++++++++++++ + drivers/usb/gadget/u_serial.h | 51 + + drivers/usb/host/Kconfig | 26 + + drivers/usb/host/Makefile | 3 + + drivers/usb/host/hwa-hc.c | 935 +++++++++++++ + drivers/usb/host/isp1760-hcd.c | 8 +- + drivers/usb/host/whci/Kbuild | 11 + + drivers/usb/host/whci/asl.c | 366 ++++++ + drivers/usb/host/whci/hcd.c | 339 +++++ + drivers/usb/host/whci/hw.c | 80 ++ + drivers/usb/host/whci/init.c | 181 +++ + drivers/usb/host/whci/int.c | 95 ++ + drivers/usb/host/whci/pzl.c | 398 ++++++ + drivers/usb/host/whci/qset.c | 563 ++++++++ + drivers/usb/host/whci/whcd.h | 195 +++ + drivers/usb/host/whci/whci-hc.h | 413 ++++++ + drivers/usb/host/whci/wusb.c | 241 ++++ + drivers/usb/misc/Kconfig | 10 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/emi62.c | 2 - + drivers/usb/misc/gotemp.c | 301 +++++ + drivers/usb/serial/Kconfig | 8 + + drivers/usb/serial/digi_acceleport.c | 2 - + drivers/usb/serial/io_fw_down3.h | 11 +- + drivers/usb/serial/io_ti.c | 1888 ++++++++++++--------------- + drivers/usb/serial/keyspan_pda.S | 2 +- + drivers/usb/serial/kl5kusb105.c | 2 +- + drivers/usb/serial/ti_fw_3410.h | 4 + + drivers/usb/serial/ti_fw_5052.h | 5 + + drivers/usb/serial/ti_usb_3410_5052.c | 106 +- + drivers/usb/serial/xircom_pgs.S | 2 +- + drivers/usb/storage/datafab.c | 2 - + drivers/usb/storage/debug.c | 2 - + drivers/usb/storage/debug.h | 2 - + drivers/usb/storage/dpcm.c | 2 - + drivers/usb/storage/dpcm.h | 2 - + drivers/usb/storage/freecom.c | 2 - + drivers/usb/storage/freecom.h | 2 - + drivers/usb/storage/initializers.c | 2 - + drivers/usb/storage/initializers.h | 2 - + drivers/usb/storage/isd200.c | 8 +- + drivers/usb/storage/jumpshot.c | 2 - + drivers/usb/storage/protocol.c | 2 - + drivers/usb/storage/protocol.h | 2 - + drivers/usb/storage/scsiglue.c | 28 +- + drivers/usb/storage/scsiglue.h | 2 - + drivers/usb/storage/sddr09.c | 1 - + drivers/usb/storage/sddr09.h | 2 - + drivers/usb/storage/sddr55.c | 2 - + drivers/usb/storage/sddr55.h | 2 - + drivers/usb/storage/shuttle_usbat.c | 2 - + drivers/usb/storage/shuttle_usbat.h | 2 - + drivers/usb/storage/transport.c | 78 +- + drivers/usb/storage/transport.h | 2 - + drivers/usb/storage/unusual_devs.h | 2 - + drivers/usb/storage/usb.c | 111 +- + drivers/usb/storage/usb.h | 25 +- + drivers/usb/wusbcore/Kconfig | 17 + + drivers/usb/wusbcore/Makefile | 20 + + drivers/usb/wusbcore/cbaf.c | 620 +++++++++ + drivers/usb/wusbcore/crypto.c | 538 ++++++++ + drivers/usb/wusbcore/dev-sysfs.c | 199 +++ + drivers/usb/wusbcore/devconnect.c | 1319 +++++++++++++++++++ + drivers/usb/wusbcore/mmc.c | 329 +++++ + drivers/usb/wusbcore/pal.c | 39 + + drivers/usb/wusbcore/reservation.c | 115 ++ + drivers/usb/wusbcore/rh.c | 477 +++++++ + drivers/usb/wusbcore/security.c | 644 +++++++++ + drivers/usb/wusbcore/wa-hc.c | 83 ++ + drivers/usb/wusbcore/wa-hc.h | 416 ++++++ + drivers/usb/wusbcore/wa-nep.c | 313 +++++ + drivers/usb/wusbcore/wa-rpipe.c | 562 ++++++++ + drivers/usb/wusbcore/wa-xfer.c | 1709 ++++++++++++++++++++++++ + drivers/usb/wusbcore/wusbhc.c | 392 ++++++ + drivers/usb/wusbcore/wusbhc.h | 525 ++++++++ + drivers/uwb/Kconfig | 89 ++ + drivers/uwb/Makefile | 29 + + drivers/uwb/address.c | 374 ++++++ + drivers/uwb/beacon.c | 707 ++++++++++ + drivers/uwb/driver.c | 142 ++ + drivers/uwb/drp-avail.c | 288 ++++ + drivers/uwb/drp-ie.c | 233 ++++ + drivers/uwb/drp.c | 451 +++++++ + drivers/uwb/est.c | 414 ++++++ + drivers/uwb/hwa-rc.c | 912 +++++++++++++ + drivers/uwb/i1480/Makefile | 2 + + drivers/uwb/i1480/dfu/Makefile | 9 + + drivers/uwb/i1480/dfu/dfu.c | 281 ++++ + drivers/uwb/i1480/dfu/i1480-dfu.h | 263 ++++ + drivers/uwb/i1480/dfu/mac.c | 529 ++++++++ + drivers/uwb/i1480/dfu/phy.c | 203 +++ + drivers/uwb/i1480/dfu/usb.c | 501 +++++++ + drivers/uwb/i1480/i1480-est.c | 99 ++ + drivers/uwb/i1480/i1480-wlp.h | 155 +++ + drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 269 ++++ + drivers/uwb/i1480/i1480u-wlp/lc.c | 421 ++++++ + drivers/uwb/i1480/i1480u-wlp/netdev.c | 367 ++++++ + drivers/uwb/i1480/i1480u-wlp/rx.c | 491 +++++++ + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 446 +++++++ + drivers/uwb/i1480/i1480u-wlp/tx.c | 638 +++++++++ + drivers/uwb/ie.c | 570 ++++++++ + drivers/uwb/lc-dev.c | 517 ++++++++ + drivers/uwb/lc-rc.c | 485 +++++++ + drivers/uwb/neh.c | 615 +++++++++ + drivers/uwb/pal.c | 71 + + drivers/uwb/reset.c | 319 +++++ + drivers/uwb/rsv.c | 677 ++++++++++ + drivers/uwb/scan.c | 159 +++ + drivers/uwb/umc-bus.c | 185 +++ + drivers/uwb/umc-dev.c | 103 ++ + drivers/uwb/umc-drv.c | 31 + + drivers/uwb/uwb-debug.c | 367 ++++++ + drivers/uwb/uwb-internal.h | 283 ++++ + drivers/uwb/uwbd.c | 425 ++++++ + drivers/uwb/whc-rc.c | 511 ++++++++ + drivers/uwb/whci.c | 274 ++++ + drivers/uwb/wlp/Makefile | 10 + + drivers/uwb/wlp/driver.c | 43 + + drivers/uwb/wlp/eda.c | 449 +++++++ + drivers/uwb/wlp/messages.c | 1946 ++++++++++++++++++++++++++++ + drivers/uwb/wlp/sysfs.c | 715 ++++++++++ + drivers/uwb/wlp/txrx.c | 374 ++++++ + drivers/uwb/wlp/wlp-internal.h | 228 ++++ + drivers/uwb/wlp/wlp-lc.c | 572 ++++++++ + drivers/uwb/wlp/wss-lc.c | 1056 +++++++++++++++ + include/linux/bitmap.h | 1 + + include/linux/byteorder/bitfields.h | 114 ++ + include/linux/usb.h | 6 + + include/linux/usb/wusb-wa.h | 281 ++++ + include/linux/usb/wusb.h | 419 ++++++ + include/linux/usbdevice_fs.h | 2 - + include/linux/uwb.h | 759 +++++++++++ + include/linux/uwb/debug-cmd.h | 57 + + include/linux/uwb/debug.h | 82 ++ + include/linux/uwb/spec.h | 625 +++++++++ + include/linux/uwb/umc.h | 194 +++ + include/linux/uwb/whci.h | 117 ++ + include/linux/wlp.h | 728 +++++++++++ + lib/bitmap.c | 22 + + 156 files changed, 38655 insertions(+), 2966 deletions(-) + create mode 100644 Documentation/usb/WUSB-Design-overview.txt + delete mode 100644 Documentation/usb/uhci.txt + create mode 100644 Documentation/usb/wusb-cbaf + create mode 100644 drivers/usb/gadget/u_serial.c + create mode 100644 drivers/usb/gadget/u_serial.h + create mode 100644 drivers/usb/host/hwa-hc.c + create mode 100644 drivers/usb/host/whci/Kbuild + create mode 100644 drivers/usb/host/whci/asl.c + create mode 100644 drivers/usb/host/whci/hcd.c + create mode 100644 drivers/usb/host/whci/hw.c + create mode 100644 drivers/usb/host/whci/init.c + create mode 100644 drivers/usb/host/whci/int.c + create mode 100644 drivers/usb/host/whci/pzl.c + create mode 100644 drivers/usb/host/whci/qset.c + create mode 100644 drivers/usb/host/whci/whcd.h + create mode 100644 drivers/usb/host/whci/whci-hc.h + create mode 100644 drivers/usb/host/whci/wusb.c + create mode 100644 drivers/usb/misc/gotemp.c + create mode 100644 drivers/usb/wusbcore/Kconfig + create mode 100644 drivers/usb/wusbcore/Makefile + create mode 100644 drivers/usb/wusbcore/cbaf.c + create mode 100644 drivers/usb/wusbcore/crypto.c + create mode 100644 drivers/usb/wusbcore/dev-sysfs.c + create mode 100644 drivers/usb/wusbcore/devconnect.c + create mode 100644 drivers/usb/wusbcore/mmc.c + create mode 100644 drivers/usb/wusbcore/pal.c + create mode 100644 drivers/usb/wusbcore/reservation.c + create mode 100644 drivers/usb/wusbcore/rh.c + create mode 100644 drivers/usb/wusbcore/security.c + create mode 100644 drivers/usb/wusbcore/wa-hc.c + create mode 100644 drivers/usb/wusbcore/wa-hc.h + create mode 100644 drivers/usb/wusbcore/wa-nep.c + create mode 100644 drivers/usb/wusbcore/wa-rpipe.c + create mode 100644 drivers/usb/wusbcore/wa-xfer.c + create mode 100644 drivers/usb/wusbcore/wusbhc.c + create mode 100644 drivers/usb/wusbcore/wusbhc.h + create mode 100644 drivers/uwb/Kconfig + create mode 100644 drivers/uwb/Makefile + create mode 100644 drivers/uwb/address.c + create mode 100644 drivers/uwb/beacon.c + create mode 100644 drivers/uwb/driver.c + create mode 100644 drivers/uwb/drp-avail.c + create mode 100644 drivers/uwb/drp-ie.c + create mode 100644 drivers/uwb/drp.c + create mode 100644 drivers/uwb/est.c + create mode 100644 drivers/uwb/hwa-rc.c + create mode 100644 drivers/uwb/i1480/Makefile + create mode 100644 drivers/uwb/i1480/dfu/Makefile + create mode 100644 drivers/uwb/i1480/dfu/dfu.c + create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h + create mode 100644 drivers/uwb/i1480/dfu/mac.c + create mode 100644 drivers/uwb/i1480/dfu/phy.c + create mode 100644 drivers/uwb/i1480/dfu/usb.c + create mode 100644 drivers/uwb/i1480/i1480-est.c + create mode 100644 drivers/uwb/i1480/i1480-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile + create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c + create mode 100644 drivers/uwb/ie.c + create mode 100644 drivers/uwb/lc-dev.c + create mode 100644 drivers/uwb/lc-rc.c + create mode 100644 drivers/uwb/neh.c + create mode 100644 drivers/uwb/pal.c + create mode 100644 drivers/uwb/reset.c + create mode 100644 drivers/uwb/rsv.c + create mode 100644 drivers/uwb/scan.c + create mode 100644 drivers/uwb/umc-bus.c + create mode 100644 drivers/uwb/umc-dev.c + create mode 100644 drivers/uwb/umc-drv.c + create mode 100644 drivers/uwb/uwb-debug.c + create mode 100644 drivers/uwb/uwb-internal.h + create mode 100644 drivers/uwb/uwbd.c + create mode 100644 drivers/uwb/whc-rc.c + create mode 100644 drivers/uwb/whci.c + create mode 100644 drivers/uwb/wlp/Makefile + create mode 100644 drivers/uwb/wlp/driver.c + create mode 100644 drivers/uwb/wlp/eda.c + create mode 100644 drivers/uwb/wlp/messages.c + create mode 100644 drivers/uwb/wlp/sysfs.c + create mode 100644 drivers/uwb/wlp/txrx.c + create mode 100644 drivers/uwb/wlp/wlp-internal.h + create mode 100644 drivers/uwb/wlp/wlp-lc.c + create mode 100644 drivers/uwb/wlp/wss-lc.c + create mode 100644 include/linux/byteorder/bitfields.h + create mode 100644 include/linux/usb/wusb-wa.h + create mode 100644 include/linux/usb/wusb.h + create mode 100644 include/linux/uwb.h + create mode 100644 include/linux/uwb/debug-cmd.h + create mode 100644 include/linux/uwb/debug.h + create mode 100644 include/linux/uwb/spec.h + create mode 100644 include/linux/uwb/umc.h + create mode 100644 include/linux/uwb/whci.h + create mode 100644 include/linux/wlp.h +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Removed arch/x86/kernel/i8259_64.c +Removed arch/x86/kernel/nmi_32.c +Auto-merged arch/x86/kernel/pci-dma.c +Auto-merged arch/x86/kernel/pci-gart_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged arch/x86/lguest/boot.c +Removed arch/x86/xen/manage.c +Auto-merged drivers/base/power/trace.c +Removed include/asm-x86/current_32.h +Removed include/asm-x86/current_64.h +Removed include/asm-x86/hw_irq_32.h +Removed include/asm-x86/hw_irq_64.h +Removed include/asm-x86/irq_32.h +Removed include/asm-x86/irq_64.h +Removed include/asm-x86/mach-default/irq_vectors.h +Removed include/asm-x86/mach-default/irq_vectors_limits.h +Removed include/asm-x86/mach-visws/irq_vectors.h +Removed include/asm-x86/mach-voyager/irq_vectors.h +Removed include/asm-x86/thread_info_32.h +Removed include/asm-x86/thread_info_64.h +Auto-merged include/linux/pci.h +Merge made by recursive. + Documentation/filesystems/sysfs-pci.txt | 1 + + Documentation/kernel-parameters.txt | 23 + + Documentation/{ => x86}/i386/IO-APIC.txt | 0 + Documentation/{ => x86}/i386/boot.txt | 79 +- + .../{ => x86}/i386/usb-legacy-support.txt | 0 + Documentation/{ => x86}/i386/zero-page.txt | 0 + Documentation/{ => x86}/x86_64/00-INDEX | 0 + Documentation/{ => x86}/x86_64/boot-options.txt | 0 + Documentation/{ => x86}/x86_64/cpu-hotplug-spec | 0 + .../{ => x86}/x86_64/fake-numa-for-cpusets | 0 + Documentation/{ => x86}/x86_64/kernel-stacks | 0 + Documentation/{ => x86}/x86_64/machinecheck | 0 + Documentation/{ => x86}/x86_64/mm.txt | 5 +- + Documentation/{ => x86}/x86_64/uefi.txt | 0 + arch/x86/Kconfig | 116 +- + arch/x86/Kconfig.cpu | 4 + + arch/x86/Kconfig.debug | 4 +- + arch/x86/Makefile | 4 +- + arch/x86/boot/compressed/head_64.S | 5 +- + arch/x86/boot/compressed/misc.c | 39 +- + arch/x86/boot/cpu.c | 2 + + arch/x86/boot/main.c | 4 + + arch/x86/boot/memory.c | 3 +- + arch/x86/boot/video-vga.c | 3 +- + arch/x86/configs/i386_defconfig | 1711 ++++++++++++++------ + arch/x86/configs/x86_64_defconfig | 1735 ++++++++++++++------ + arch/x86/kernel/Makefile | 6 +- + arch/x86/kernel/acpi/boot.c | 350 ++++- + arch/x86/kernel/aperture_64.c | 300 +++-- + arch/x86/kernel/apic_32.c | 34 +- + arch/x86/kernel/apic_64.c | 22 +- + arch/x86/kernel/apm_32.c | 25 +- + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/cpu/addon_cpuid_features.c | 3 + + arch/x86/kernel/cpu/amd.c | 5 + + arch/x86/kernel/cpu/amd_64.c | 239 +++ + arch/x86/kernel/cpu/bugs.c | 27 +- + arch/x86/kernel/cpu/centaur_64.c | 31 + + arch/x86/kernel/cpu/intel_64.c | 92 + + arch/x86/kernel/cpu/intel_cacheinfo.c | 1 + + arch/x86/kernel/cpu/mcheck/mce_64.c | 20 +- + arch/x86/kernel/cpu/mtrr/generic.c | 38 +- + arch/x86/kernel/cpu/mtrr/main.c | 901 ++++++++++- + arch/x86/kernel/cpu/mtrr/mtrr.h | 3 + + arch/x86/kernel/e820.c | 766 +++++++++ + arch/x86/kernel/e820_32.c | 472 +----- + arch/x86/kernel/e820_64.c | 724 +-------- + arch/x86/kernel/early-quirks.c | 13 - + arch/x86/kernel/efi.c | 26 + + arch/x86/kernel/efi_64.c | 2 +- + arch/x86/kernel/entry_32.S | 2 +- + arch/x86/kernel/entry_64.S | 4 - + arch/x86/kernel/genx2apic_uv_x.c | 141 ++- + arch/x86/kernel/head32.c | 77 + + arch/x86/kernel/head64.c | 22 +- + arch/x86/kernel/head_32.S | 6 + + arch/x86/kernel/head_64.S | 27 +- + arch/x86/kernel/hpet.c | 43 +- + arch/x86/kernel/i387.c | 44 +- + arch/x86/kernel/{i8259_32.c => i8259.c} | 136 +-- + arch/x86/kernel/i8259_64.c | 512 ------ + arch/x86/kernel/io_apic_32.c | 232 ++-- + arch/x86/kernel/io_apic_64.c | 181 ++- + arch/x86/kernel/ipi.c | 1 - + arch/x86/kernel/irq_32.c | 254 ++-- + arch/x86/kernel/irq_64.c | 28 + + arch/x86/kernel/irqinit_32.c | 114 ++ + arch/x86/kernel/irqinit_64.c | 217 +++ + arch/x86/kernel/ldt.c | 6 +- + arch/x86/kernel/mmconf-fam10h_64.c | 1 + + arch/x86/kernel/mpparse.c | 711 +++++---- + arch/x86/kernel/{nmi_64.c => nmi.c} | 215 ++- + arch/x86/kernel/nmi_32.c | 472 ------ + arch/x86/kernel/numaq_32.c | 11 + + arch/x86/kernel/paravirt.c | 1 + + arch/x86/kernel/pci-dma.c | 13 +- + arch/x86/kernel/pci-gart_64.c | 54 +- + arch/x86/kernel/quirks.c | 56 +- + arch/x86/kernel/reboot.c | 18 +- + arch/x86/kernel/reboot_fixups_32.c | 4 +- + arch/x86/kernel/setup.c | 308 ++++- + arch/x86/kernel/setup.h | 26 + + arch/x86/kernel/setup64.c | 8 +- + arch/x86/kernel/setup_32.c | 246 +-- + arch/x86/kernel/setup_64.c | 391 +----- + arch/x86/kernel/smpboot.c | 111 +- + arch/x86/kernel/srat_32.c | 37 +- + arch/x86/kernel/time_32.c | 3 +- + arch/x86/kernel/trampoline.c | 2 +- + arch/x86/kernel/traps_32.c | 8 +- + arch/x86/kernel/traps_64.c | 31 +- + arch/x86/kernel/tsc_32.c | 6 +- + arch/x86/kernel/tsc_64.c | 2 +- + arch/x86/kernel/vmiclock_32.c | 3 +- + arch/x86/kernel/vmlinux_32.lds.S | 7 - + arch/x86/kernel/vmlinux_64.lds.S | 7 - + arch/x86/kernel/vsmp_64.c | 3 + + arch/x86/lguest/boot.c | 5 +- + arch/x86/lib/delay_32.c | 31 +- + arch/x86/lib/delay_64.c | 30 +- + arch/x86/mach-default/setup.c | 7 +- + arch/x86/mach-es7000/es7000plat.c | 2 + + arch/x86/mach-visws/mpparse.c | 7 +- + arch/x86/mach-visws/visws_apic.c | 3 +- + arch/x86/mach-voyager/setup.c | 7 +- + arch/x86/mach-voyager/voyager_smp.c | 14 - + arch/x86/math-emu/fpu_entry.c | 13 +- + arch/x86/mm/discontig_32.c | 129 +- + arch/x86/mm/dump_pagetables.c | 2 +- + arch/x86/mm/init_32.c | 18 +- + arch/x86/mm/init_64.c | 19 +- + arch/x86/mm/ioremap.c | 15 +- + arch/x86/mm/k8topology_64.c | 13 +- + arch/x86/mm/numa_64.c | 89 +- + arch/x86/mm/pageattr.c | 39 + + arch/x86/mm/pat.c | 86 +- + arch/x86/mm/pgtable.c | 2 +- + arch/x86/mm/srat_64.c | 5 +- + arch/x86/pci/acpi.c | 18 +- + arch/x86/pci/direct.c | 21 +- + arch/x86/pci/k8-bus_64.c | 4 +- + arch/x86/pci/mmconfig-shared.c | 2 +- + arch/x86/vdso/vma.c | 2 +- + arch/x86/xen/Kconfig | 12 +- + arch/x86/xen/Makefile | 2 +- + arch/x86/xen/enlighten.c | 166 ++- + arch/x86/xen/manage.c | 143 -- + arch/x86/xen/mmu.c | 227 +++- + arch/x86/xen/mmu.h | 32 +- + arch/x86/xen/setup.c | 5 +- + arch/x86/xen/smp.c | 8 +- + arch/x86/xen/suspend.c | 45 + + arch/x86/xen/time.c | 13 + + arch/x86/xen/xen-head.S | 9 +- + arch/x86/xen/xen-ops.h | 11 + + drivers/acpi/pci_irq.c | 5 + + drivers/base/power/trace.c | 2 +- + drivers/base/topology.c | 25 +- + drivers/char/agp/amd64-agp.c | 85 +- + drivers/char/hvc_xen.c | 61 +- + drivers/firmware/dmi_scan.c | 5 + + drivers/input/xen-kbdfront.c | 20 +- + drivers/lguest/lg.h | 1 - + drivers/pci/pci-sysfs.c | 84 +- + drivers/video/xen-fbfront.c | 211 ++- + drivers/xen/Makefile | 2 +- + drivers/xen/balloon.c | 10 +- + drivers/xen/events.c | 114 ++- + drivers/xen/grant-table.c | 4 +- + drivers/xen/manage.c | 252 +++ + drivers/xen/xenbus/xenbus_comms.c | 23 +- + fs/proc/proc_misc.c | 16 + + include/asm-generic/vmlinux.lds.h | 14 + + include/asm-x86/acpi.h | 1 + + include/asm-x86/apic.h | 1 - + include/asm-x86/atomic_64.h | 6 - + include/asm-x86/bitops.h | 34 +- + include/asm-x86/bootparam.h | 1 + + include/asm-x86/cpufeature.h | 6 +- + include/asm-x86/current.h | 42 +- + include/asm-x86/current_32.h | 17 - + include/asm-x86/current_64.h | 27 - + include/asm-x86/desc.h | 22 + + include/asm-x86/e820.h | 68 +- + include/asm-x86/e820_32.h | 24 +- + include/asm-x86/e820_64.h | 22 - + include/asm-x86/fixmap_32.h | 8 +- + include/asm-x86/gart.h | 62 + + include/asm-x86/genapic_64.h | 2 + + include/asm-x86/hardirq.h | 6 + + include/asm-x86/hw_irq.h | 105 ++- + include/asm-x86/hw_irq_32.h | 66 - + include/asm-x86/hw_irq_64.h | 173 -- + include/asm-x86/i387.h | 2 + + include/asm-x86/i8259.h | 2 + + include/asm-x86/io.h | 56 + + include/asm-x86/io_32.h | 49 - + include/asm-x86/io_64.h | 71 - + include/asm-x86/io_apic.h | 29 +- + include/asm-x86/ipi.h | 1 + + include/asm-x86/irq.h | 51 +- + include/asm-x86/irq_32.h | 51 - + include/asm-x86/irq_64.h | 51 - + include/asm-x86/irq_vectors.h | 169 ++ + include/asm-x86/mach-default/irq_vectors.h | 96 -- + include/asm-x86/mach-default/irq_vectors_limits.h | 16 - + include/asm-x86/mach-visws/irq_vectors.h | 62 - + include/asm-x86/mach-voyager/irq_vectors.h | 79 - + include/asm-x86/mmconfig.h | 18 + + include/asm-x86/mmzone_32.h | 8 +- + include/asm-x86/mpspec.h | 15 +- + include/asm-x86/nmi.h | 5 +- + include/asm-x86/numa_64.h | 19 +- + include/asm-x86/page.h | 11 +- + include/asm-x86/page_32.h | 8 + + include/asm-x86/paravirt.h | 15 + + include/asm-x86/pci.h | 2 + + include/asm-x86/pda.h | 5 +- + include/asm-x86/percpu.h | 46 + + include/asm-x86/pgtable.h | 72 +- + include/asm-x86/processor-flags.h | 6 + + include/asm-x86/ptrace.h | 8 +- + include/asm-x86/reboot.h | 2 +- + include/asm-x86/required-features.h | 6 +- + include/asm-x86/resume-trace.h | 2 +- + include/asm-x86/seccomp_32.h | 1 + + include/asm-x86/setup.h | 11 +- + include/asm-x86/smp.h | 16 +- + include/asm-x86/string_32.h | 323 +++-- + include/asm-x86/system.h | 3 +- + include/asm-x86/thread_info.h | 248 +++- + include/asm-x86/thread_info_32.h | 205 --- + include/asm-x86/thread_info_64.h | 195 --- + include/asm-x86/topology.h | 152 +- + include/asm-x86/uv/uv_hub.h | 188 ++- + include/asm-x86/uv/uv_mmrs.h | 509 ++++++- + include/asm-x86/vm86.h | 11 +- + include/asm-x86/xen/hypercall.h | 11 +- + include/asm-x86/xen/page.h | 29 +- + include/linux/console.h | 2 + + include/linux/efi.h | 4 - + include/linux/kernel_stat.h | 2 +- + include/linux/mm.h | 1 + + include/linux/page-flags.h | 1 + + include/linux/pageblock-flags.h | 8 +- + include/linux/pci.h | 1 + + include/linux/resume-trace.h | 2 +- + include/xen/events.h | 4 + + include/xen/grant_table.h | 3 + + include/xen/hvc-console.h | 9 + + include/xen/interface/elfnote.h | 20 + + include/xen/interface/io/fbif.h | 29 +- + include/xen/interface/io/kbdif.h | 2 + + include/xen/interface/memory.h | 12 +- + include/xen/xen-ops.h | 6 + + kernel/printk.c | 3 + + mm/page_alloc.c | 5 + + 237 files changed, 11289 insertions(+), 7286 deletions(-) + rename Documentation/{ => x86}/i386/IO-APIC.txt (100%) + rename Documentation/{ => x86}/i386/boot.txt (96%) + rename Documentation/{ => x86}/i386/usb-legacy-support.txt (100%) + rename Documentation/{ => x86}/i386/zero-page.txt (100%) + rename Documentation/{ => x86}/x86_64/00-INDEX (100%) + rename Documentation/{ => x86}/x86_64/boot-options.txt (100%) + rename Documentation/{ => x86}/x86_64/cpu-hotplug-spec (100%) + rename Documentation/{ => x86}/x86_64/fake-numa-for-cpusets (100%) + rename Documentation/{ => x86}/x86_64/kernel-stacks (100%) + rename Documentation/{ => x86}/x86_64/machinecheck (100%) + rename Documentation/{ => x86}/x86_64/mm.txt (87%) + rename Documentation/{ => x86}/x86_64/uefi.txt (100%) + create mode 100644 arch/x86/kernel/cpu/amd_64.c + create mode 100644 arch/x86/kernel/cpu/centaur_64.c + create mode 100644 arch/x86/kernel/cpu/intel_64.c + create mode 100644 arch/x86/kernel/e820.c + rename arch/x86/kernel/{i8259_32.c => i8259.c} (70%) + delete mode 100644 arch/x86/kernel/i8259_64.c + create mode 100644 arch/x86/kernel/irqinit_32.c + create mode 100644 arch/x86/kernel/irqinit_64.c + rename arch/x86/kernel/{nmi_64.c => nmi.c} (69%) + delete mode 100644 arch/x86/kernel/nmi_32.c + create mode 100644 arch/x86/kernel/setup.h + delete mode 100644 arch/x86/xen/manage.c + create mode 100644 arch/x86/xen/suspend.c + create mode 100644 drivers/xen/manage.c + delete mode 100644 include/asm-x86/current_32.h + delete mode 100644 include/asm-x86/current_64.h + delete mode 100644 include/asm-x86/hw_irq_32.h + delete mode 100644 include/asm-x86/hw_irq_64.h + delete mode 100644 include/asm-x86/irq_32.h + delete mode 100644 include/asm-x86/irq_64.h + create mode 100644 include/asm-x86/irq_vectors.h + delete mode 100644 include/asm-x86/mach-default/irq_vectors.h + delete mode 100644 include/asm-x86/mach-default/irq_vectors_limits.h + delete mode 100644 include/asm-x86/mach-visws/irq_vectors.h + delete mode 100644 include/asm-x86/mach-voyager/irq_vectors.h + create mode 100644 include/asm-x86/mmconfig.h + delete mode 100644 include/asm-x86/thread_info_32.h + delete mode 100644 include/asm-x86/thread_info_64.h +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged init/main.c +Merge made by recursive. + Documentation/RCU/NMI-RCU.txt | 3 + + Documentation/RCU/RTFP.txt | 108 ++++++ + Documentation/RCU/checklist.txt | 89 ++++-- + Documentation/RCU/whatisRCU.txt | 58 +++- + arch/ia64/sn/kernel/irq.c | 1 + + crypto/async_tx/async_tx.c | 1 + + drivers/infiniband/hw/ipath/ipath_verbs.c | 1 + + drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 3 +- + drivers/net/macvlan.c | 2 +- + include/linux/dcache.h | 1 + + include/linux/list.h | 367 -------------------- + include/linux/rcuclassic.h | 3 + + include/linux/rculist.h | 373 ++++++++++++++++++++ + include/linux/rcupdate.h | 26 ++- + include/linux/rcupreempt.h | 42 ++- + init/main.c | 1 + + kernel/pid.c | 1 + + kernel/rcuclassic.c | 30 ++- + kernel/rcupdate.c | 71 +++-- + kernel/rcupreempt.c | 419 ++++++++++++++++++++--- + kernel/rcupreempt_trace.c | 1 - + kernel/rcutorture.c | 34 ++- + lib/textsearch.c | 1 + + net/802/psnap.c | 1 + + net/8021q/vlan.c | 1 + + net/bridge/br_fdb.c | 1 + + net/bridge/br_stp.c | 1 + + net/netfilter/nf_conntrack_helper.c | 1 + + net/netfilter/nf_conntrack_netlink.c | 1 + + net/netlabel/netlabel_domainhash.c | 3 +- + 30 files changed, 1142 insertions(+), 503 deletions(-) + create mode 100644 include/linux/rculist.h +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged arch/x86/mm/ioremap.c +Auto-merged arch/x86/mm/pageattr.c +Auto-merged kernel/printk.c +Auto-merged lib/Kconfig.debug +Merge made by recursive. + Documentation/tracers/mmiotrace.txt | 164 ++ + Makefile | 4 + + arch/arm/Kconfig | 2 + + arch/arm/boot/compressed/Makefile | 6 + + arch/arm/kernel/Makefile | 5 + + arch/arm/kernel/armksyms.c | 5 + + arch/arm/kernel/entry-common.S | 47 + + arch/arm/kernel/ftrace.c | 128 ++ + arch/arm/kernel/kprobes.c | 2 +- + arch/powerpc/Kconfig | 4 +- + arch/powerpc/kernel/Makefile | 14 + + arch/powerpc/kernel/entry_32.S | 123 ++ + arch/powerpc/kernel/entry_64.S | 62 + + arch/powerpc/kernel/ftrace.c | 171 ++ + arch/powerpc/kernel/io.c | 3 +- + arch/powerpc/kernel/irq.c | 6 +- + arch/powerpc/kernel/ppc_ksyms.c | 5 + + arch/powerpc/kernel/setup_32.c | 6 +- + arch/powerpc/platforms/powermac/Makefile | 5 + + arch/sparc64/Kconfig | 2 + + arch/sparc64/Kconfig.debug | 2 +- + arch/sparc64/kernel/Makefile | 1 + + arch/sparc64/kernel/ftrace.c | 99 + + arch/sparc64/lib/mcount.S | 58 +- + arch/x86/Kconfig | 2 + + arch/x86/Kconfig.debug | 28 + + arch/x86/kernel/Makefile | 8 + + arch/x86/kernel/alternative.c | 22 +- + arch/x86/kernel/entry_32.S | 68 + + arch/x86/kernel/entry_64.S | 102 + + arch/x86/kernel/ftrace.c | 159 ++ + arch/x86/kernel/i386_ksyms_32.c | 9 +- + arch/x86/kernel/machine_kexec_32.c | 4 + + arch/x86/kernel/machine_kexec_64.c | 4 + + arch/x86/kernel/process_32.c | 3 + + arch/x86/kernel/process_64.c | 3 + + arch/x86/kernel/vsyscall_64.c | 3 +- + arch/x86/kernel/x8664_ksyms_64.c | 11 +- + arch/x86/lib/Makefile | 1 + + arch/x86/lib/thunk_32.S | 47 + + arch/x86/lib/thunk_64.S | 19 +- + arch/x86/mm/Makefile | 5 + + arch/x86/mm/fault.c | 13 + + arch/x86/mm/init_32.c | 4 + + arch/x86/mm/init_64.c | 10 +- + arch/x86/mm/ioremap.c | 11 +- + arch/x86/mm/kmmio.c | 509 +++++ + arch/x86/mm/mmio-mod.c | 515 +++++ + arch/x86/mm/pageattr.c | 1 + + arch/x86/mm/pf_in.c | 489 +++++ + arch/x86/mm/pf_in.h | 39 + + arch/x86/mm/testmmiotrace.c | 71 + + arch/x86/vdso/vclock_gettime.c | 15 +- + arch/x86/vdso/vgetcpu.c | 3 +- + include/asm-arm/kprobes.h | 1 + + include/asm-powerpc/ftrace.h | 6 + + include/asm-powerpc/hw_irq.h | 10 + + include/asm-x86/alternative.h | 2 + + include/asm-x86/irqflags.h | 24 +- + include/asm-x86/vsyscall.h | 3 +- + include/linux/ftrace.h | 139 ++ + include/linux/irqflags.h | 13 +- + include/linux/linkage.h | 2 + + include/linux/marker.h | 40 +- + include/linux/mmiotrace.h | 85 + + include/linux/preempt.h | 34 +- + include/linux/sched.h | 16 + + include/linux/writeback.h | 2 + + kernel/Makefile | 14 + + kernel/fork.c | 2 +- + kernel/lockdep.c | 33 +- + kernel/marker.c | 30 +- + kernel/printk.c | 2 + + kernel/sched.c | 58 +- + kernel/sched_trace.h | 41 + + kernel/semaphore.c | 2 + + kernel/spinlock.c | 2 +- + kernel/sysctl.c | 11 + + kernel/trace/Kconfig | 135 ++ + kernel/trace/Makefile | 24 + + kernel/trace/ftrace.c | 1553 +++++++++++++++ + kernel/trace/trace.c | 3131 ++++++++++++++++++++++++++++++ + kernel/trace/trace.h | 333 ++++ + kernel/trace/trace_functions.c | 78 + + kernel/trace/trace_irqsoff.c | 486 +++++ + kernel/trace/trace_mmiotrace.c | 295 +++ + kernel/trace/trace_sched_switch.c | 286 +++ + kernel/trace/trace_sched_wakeup.c | 447 +++++ + kernel/trace/trace_selftest.c | 563 ++++++ + kernel/trace/trace_selftest_dynamic.c | 7 + + kernel/trace/trace_sysprof.c | 363 ++++ + lib/Kconfig.debug | 2 + + lib/Makefile | 9 + + lib/smp_processor_id.c | 6 +- + mm/page-writeback.c | 10 +- + scripts/Makefile.lib | 3 +- + 96 files changed, 11289 insertions(+), 116 deletions(-) + create mode 100644 Documentation/tracers/mmiotrace.txt + create mode 100644 arch/arm/kernel/ftrace.c + create mode 100644 arch/powerpc/kernel/ftrace.c + create mode 100644 arch/sparc64/kernel/ftrace.c + create mode 100644 arch/x86/kernel/ftrace.c + create mode 100644 arch/x86/lib/thunk_32.S + create mode 100644 arch/x86/mm/kmmio.c + create mode 100644 arch/x86/mm/mmio-mod.c + create mode 100644 arch/x86/mm/pf_in.c + create mode 100644 arch/x86/mm/pf_in.h + create mode 100644 arch/x86/mm/testmmiotrace.c + create mode 100644 include/asm-powerpc/ftrace.h + create mode 100644 include/linux/ftrace.h + create mode 100644 include/linux/mmiotrace.h + create mode 100644 kernel/sched_trace.h + create mode 100644 kernel/trace/Kconfig + create mode 100644 kernel/trace/Makefile + create mode 100644 kernel/trace/ftrace.c + create mode 100644 kernel/trace/trace.c + create mode 100644 kernel/trace/trace.h + create mode 100644 kernel/trace/trace_functions.c + create mode 100644 kernel/trace/trace_irqsoff.c + create mode 100644 kernel/trace/trace_mmiotrace.c + create mode 100644 kernel/trace/trace_sched_switch.c + create mode 100644 kernel/trace/trace_sched_wakeup.c + create mode 100644 kernel/trace/trace_selftest.c + create mode 100644 kernel/trace/trace_selftest_dynamic.c + create mode 100644 kernel/trace/trace_sysprof.c +Applying ftrace: fix rculist split fallout +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/apm_32.c +Auto-merged arch/x86/kernel/setup_64.c +Auto-merged drivers/base/platform.c +Auto-merged drivers/base/power/main.c +CONFLICT (content): Merge conflict in drivers/base/power/main.c +Auto-merged drivers/base/power/trace.c +Auto-merged drivers/pci/pci-acpi.c +Auto-merged drivers/pci/probe.c +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Auto-merged include/linux/pci.h +Resolved 'drivers/base/power/main.c' using previous resolution. +Resolved 'include/linux/device.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 3 + + arch/x86/kernel/apm_32.c | 8 +- + arch/x86/kernel/setup_64.c | 5 + + arch/x86/pci/common.c | 26 ++ + arch/x86/pci/early.c | 60 +++- + arch/x86/pci/irq.c | 511 +++++++++++++++----------- + arch/x86/pci/pci.h | 1 + + drivers/base/platform.c | 296 +++++++++++++++- + drivers/base/power/main.c | 675 +++++++++++++++++++++++++++-------- + drivers/base/power/power.h | 2 +- + drivers/base/power/trace.c | 4 +- + drivers/pci/hotplug/acpi_pcihp.c | 85 +++++- + drivers/pci/hotplug/pciehp.h | 9 +- + drivers/pci/hotplug/pciehp_core.c | 13 +- + drivers/pci/hotplug/pciehp_hpc.c | 104 +----- + drivers/pci/hotplug/shpchp.h | 14 +- + drivers/pci/hotplug/shpchp_core.c | 17 +- + drivers/pci/hotplug/shpchp_hpc.c | 1 - + drivers/pci/msi.c | 12 +- + drivers/pci/pci-acpi.c | 216 +++++------- + drivers/pci/pci-driver.c | 388 ++++++++++++++++++--- + drivers/pci/pci.c | 2 - + drivers/pci/probe.c | 44 +++ + drivers/pci/proc.c | 4 +- + drivers/pci/quirks.c | 118 +++++-- + include/asm-generic/vmlinux.lds.h | 6 + + include/asm-x86/pci-direct.h | 4 + + include/linux/device.h | 8 + + include/linux/pci.h | 17 +- + include/linux/pci_hotplug.h | 2 +- + include/linux/platform_device.h | 1 + + include/linux/pm.h | 314 +++++++++++++++-- + kernel/power/disk.c | 22 +- + kernel/power/main.c | 6 +- + 34 files changed, 2227 insertions(+), 771 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging hid/mm +$ git merge hid/mm +Auto-merged drivers/hid/hidraw.c +Auto-merged drivers/hid/usbhid/hid-quirks.c +CONFLICT (content): Merge conflict in drivers/hid/usbhid/hid-quirks.c +Recorded preimage for 'drivers/hid/usbhid/hid-quirks.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + drivers/hid/hid-core.c | 10 ++++---- + drivers/hid/hidraw.c | 47 ++++++++++++++++++++------------------ + drivers/hid/usbhid/hid-quirks.c | 2 +- + drivers/hid/usbhid/hiddev.c | 13 ++++++++-- + 4 files changed, 41 insertions(+), 31 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Removed Documentation/i2c/busses/i2c-i810 +Removed Documentation/i2c/busses/i2c-prosavage +Removed Documentation/i2c/busses/i2c-savage4 +Removed drivers/i2c/busses/i2c-i810.c +Removed drivers/i2c/busses/i2c-prosavage.c +Auto-merged drivers/i2c/busses/i2c-s3c2410.c +Removed drivers/i2c/busses/i2c-savage4.c +Auto-merged drivers/i2c/i2c-core.c +CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c +Auto-merged drivers/i2c/i2c-dev.c +Resolved 'drivers/i2c/i2c-core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 7 - + Documentation/i2c/busses/i2c-i810 | 47 -- + Documentation/i2c/busses/i2c-prosavage | 23 - + Documentation/i2c/busses/i2c-savage4 | 26 - + Documentation/i2c/fault-codes | 127 +++++ + Documentation/i2c/smbus-protocol | 4 +- + Documentation/i2c/writing-clients | 22 +- + drivers/i2c/algos/i2c-algo-bit.c | 4 +- + drivers/i2c/algos/i2c-algo-pca.c | 2 +- + drivers/i2c/busses/Kconfig | 524 ++++++++++---------- + drivers/i2c/busses/Makefile | 43 +- + drivers/i2c/busses/i2c-ali1535.c | 36 +- + drivers/i2c/busses/i2c-ali1563.c | 38 +- + drivers/i2c/busses/i2c-ali15x3.c | 30 +- + drivers/i2c/busses/i2c-amd756-s4882.c | 4 +- + drivers/i2c/busses/i2c-amd756.c | 32 +- + drivers/i2c/busses/i2c-amd8111.c | 54 ++- + drivers/i2c/busses/i2c-at91.c | 2 +- + drivers/i2c/busses/i2c-cpm.c | 745 ++++++++++++++++++++++++++++ + drivers/i2c/busses/i2c-davinci.c | 91 +++- + drivers/i2c/busses/i2c-elektor.c | 2 +- + drivers/i2c/busses/i2c-gpio.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 52 ++- + drivers/i2c/busses/i2c-i810.c | 260 ---------- + drivers/i2c/busses/i2c-ibm_iic.c | 4 +- + drivers/i2c/busses/i2c-iop3xx.c | 2 +- + drivers/i2c/busses/i2c-isch.c | 339 +++++++++++++ + drivers/i2c/busses/i2c-mpc.c | 2 +- + drivers/i2c/busses/i2c-mv64xxx.c | 2 +- + drivers/i2c/busses/i2c-nforce2-s4985.c | 257 ++++++++++ + drivers/i2c/busses/i2c-nforce2.c | 49 ++- + drivers/i2c/busses/i2c-ocores.c | 2 +- + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/i2c/busses/i2c-parport-light.c | 2 +- + drivers/i2c/busses/i2c-parport.c | 2 +- + drivers/i2c/busses/i2c-pasemi.c | 2 +- + drivers/i2c/busses/i2c-pca-platform.c | 2 +- + drivers/i2c/busses/i2c-piix4.c | 71 ++-- + drivers/i2c/busses/i2c-pmcmsp.c | 2 +- + drivers/i2c/busses/i2c-prosavage.c | 325 ------------ + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-savage4.c | 185 ------- + drivers/i2c/busses/i2c-sibyte.c | 4 +- + drivers/i2c/busses/i2c-sis5595.c | 27 +- + drivers/i2c/busses/i2c-sis630.c | 56 ++- + drivers/i2c/busses/i2c-sis96x.c | 34 +- + drivers/i2c/busses/i2c-stub.c | 6 +- + drivers/i2c/busses/i2c-taos-evm.c | 5 +- + drivers/i2c/busses/i2c-tiny-usb.c | 2 +- + drivers/i2c/busses/i2c-via.c | 2 +- + drivers/i2c/busses/i2c-viapro.c | 29 +- + drivers/i2c/busses/scx200_acb.c | 2 +- + drivers/i2c/chips/eeprom.c | 47 +- + drivers/i2c/i2c-core.c | 304 ++++++++---- + drivers/i2c/i2c-dev.c | 5 +- + drivers/video/fb_ddc.c | 1 + + drivers/video/intelfb/intelfb_i2c.c | 12 +- + drivers/video/matrox/i2c-matroxfb.c | 20 +- + include/linux/i2c-id.h | 1 - + include/linux/i2c.h | 8 +- + 60 files changed, 2428 insertions(+), 1566 deletions(-) + delete mode 100644 Documentation/i2c/busses/i2c-i810 + delete mode 100644 Documentation/i2c/busses/i2c-prosavage + delete mode 100644 Documentation/i2c/busses/i2c-savage4 + create mode 100644 Documentation/i2c/fault-codes + create mode 100644 drivers/i2c/busses/i2c-cpm.c + delete mode 100644 drivers/i2c/busses/i2c-i810.c + create mode 100644 drivers/i2c/busses/i2c-isch.c + create mode 100644 drivers/i2c/busses/i2c-nforce2-s4985.c + delete mode 100644 drivers/i2c/busses/i2c-prosavage.c + delete mode 100644 drivers/i2c/busses/i2c-savage4.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/00-INDEX | 2 -- + Documentation/early-userspace/00-INDEX | 8 ++++++++ + Documentation/{ => early-userspace}/initrd.txt | 6 +++--- + 3 files changed, 11 insertions(+), 5 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Auto-merged arch/avr32/kernel/avr32_ksyms.c +Merge made by recursive. +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Auto-merged drivers/media/common/tuners/tuner-xc2028.c +Auto-merged drivers/media/dvb/dvb-usb/gp8psk.c +Auto-merged drivers/media/dvb/ttusb-dec/ttusb_dec.c +Auto-merged drivers/media/video/bt8xx/bttv-cards.c +Auto-merged drivers/media/video/em28xx/em28xx-video.c +Auto-merged drivers/media/video/pvrusb2/pvrusb2-hdw.c +Auto-merged drivers/media/video/pvrusb2/pvrusb2-sysfs.c +Auto-merged drivers/media/video/usbvision/usbvision-video.c +Auto-merged drivers/media/video/videodev.c +Merge made by recursive. + Documentation/video4linux/cx18.txt | 4 +- + drivers/media/Makefile | 7 +- + drivers/media/common/tuners/Kconfig | 1 + + drivers/media/common/tuners/mxl5005s.c | 4 +- + drivers/media/common/tuners/tea5761.c | 2 +- + drivers/media/common/tuners/tuner-i2c.h | 8 + + drivers/media/common/tuners/tuner-simple.c | 6 +- + drivers/media/common/tuners/tuner-xc2028.c | 87 +- + drivers/media/dvb/b2c2/flexcop-usb.c | 2 +- + drivers/media/dvb/cinergyT2/cinergyT2.c | 46 +- + drivers/media/dvb/dvb-core/dvb_net.c | 12 +- + drivers/media/dvb/dvb-usb/Kconfig | 11 +- + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/anysee.c | 555 ++++++++ + drivers/media/dvb/dvb-usb/anysee.h | 304 ++++ + drivers/media/dvb/dvb-usb/au6610.c | 83 +- + drivers/media/dvb/dvb-usb/au6610.h | 22 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 21 +- + drivers/media/dvb/dvb-usb/dvb-usb-firmware.c | 2 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 + + drivers/media/dvb/dvb-usb/gp8psk.c | 10 +- + drivers/media/dvb/dvb-usb/m920x.c | 7 +- + drivers/media/dvb/frontends/Kconfig | 14 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/au8522.c | 1 - + drivers/media/dvb/frontends/dib7000p.h | 15 +- + drivers/media/dvb/frontends/drx397xD.c | 1504 ++++++++++++++++++++ + drivers/media/dvb/frontends/drx397xD.h | 130 ++ + drivers/media/dvb/frontends/drx397xD_fw.h | 40 + + drivers/media/dvb/frontends/dvb-pll.c | 47 + + drivers/media/dvb/frontends/dvb-pll.h | 1 + + drivers/media/dvb/frontends/or51132.c | 6 +- + drivers/media/dvb/frontends/s5h1409.c | 1 - + drivers/media/dvb/frontends/s5h1411.c | 1 - + drivers/media/dvb/frontends/tda10023.c | 193 ++-- + drivers/media/dvb/frontends/tda1002x.h | 31 +- + drivers/media/dvb/ttpci/av7110.c | 9 +- + drivers/media/dvb/ttpci/av7110_av.c | 34 +- + drivers/media/dvb/ttpci/budget-av.c | 12 +- + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 2 +- + drivers/media/dvb/ttusb-dec/Kconfig | 2 +- + drivers/media/dvb/ttusb-dec/ttusb_dec.c | 25 +- + drivers/media/dvb/ttusb-dec/ttusbdecfe.c | 10 +- + drivers/media/radio/radio-si470x.c | 13 +- + drivers/media/video/au0828/Kconfig | 2 +- + drivers/media/video/au0828/au0828-dvb.c | 6 - + drivers/media/video/bt8xx/bttv-cards.c | 5 +- + drivers/media/video/bt8xx/bttv-driver.c | 44 +- + drivers/media/video/bt8xx/bttv-risc.c | 8 +- + drivers/media/video/bt8xx/bttv-vbi.c | 6 +- + drivers/media/video/bt8xx/bttvp.h | 6 +- + drivers/media/video/btcx-risc.c | 2 +- + drivers/media/video/btcx-risc.h | 4 +- + drivers/media/video/cafe_ccic.c | 18 +- + drivers/media/video/compat_ioctl32.c | 1 + + drivers/media/video/cx18/cx18-av-core.c | 81 +- + drivers/media/video/cx18/cx18-cards.c | 4 +- + drivers/media/video/cx18/cx18-controls.c | 6 +- + drivers/media/video/cx18/cx18-driver.c | 28 +- + drivers/media/video/cx18/cx18-driver.h | 9 +- + drivers/media/video/cx18/cx18-fileops.c | 13 +- + drivers/media/video/cx18/cx18-gpio.c | 33 +- + drivers/media/video/cx18/cx18-ioctl.c | 12 +- + drivers/media/video/cx18/cx18-irq.c | 12 +- + drivers/media/video/cx18/cx18-mailbox.c | 8 +- + drivers/media/video/cx18/cx18-streams.c | 37 +- + drivers/media/video/cx23885/cx23885-core.c | 8 +- + drivers/media/video/cx23885/cx23885-video.c | 24 +- + drivers/media/video/cx88/cx88-blackbird.c | 16 +- + drivers/media/video/cx88/cx88-core.c | 8 +- + drivers/media/video/cx88/cx88-video.c | 24 +- + drivers/media/video/em28xx/em28xx-video.c | 38 +- + drivers/media/video/ivtv/ivtv-cards.c | 41 +- + drivers/media/video/ivtv/ivtv-cards.h | 3 +- + drivers/media/video/ivtv/ivtv-driver.c | 3 +- + drivers/media/video/ivtv/ivtv-driver.h | 10 +- + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- + drivers/media/video/ivtv/ivtv-gpio.c | 11 +- + drivers/media/video/ivtv/ivtv-irq.c | 8 +- + drivers/media/video/ivtv/ivtv-queue.c | 2 +- + drivers/media/video/ivtv/ivtv-streams.c | 30 +- + drivers/media/video/ivtv/ivtv-version.h | 4 +- + drivers/media/video/ivtv/ivtv-yuv.c | 2 +- + drivers/media/video/ivtv/ivtv-yuv.h | 2 +- + drivers/media/video/ivtv/ivtvfb.c | 82 ++ + drivers/media/video/meye.c | 18 +- + drivers/media/video/pvrusb2/pvrusb2-audio.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-audio.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-context.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-context.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-ctrl.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-debug.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-debugifc.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 11 +- + drivers/media/video/pvrusb2/pvrusb2-devattr.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-eeprom.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-eeprom.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-encoder.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-encoder.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 46 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 1 - + .../media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-i2c-core.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-io.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-io.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-ioread.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-ioread.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-main.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-std.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-std.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 461 ++----- + drivers/media/video/pvrusb2/pvrusb2-sysfs.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-tuner.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-tuner.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-util.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-v4l2.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-video-v4l.h | 1 - + drivers/media/video/pvrusb2/pvrusb2-wm8775.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-wm8775.h | 1 - + drivers/media/video/pvrusb2/pvrusb2.h | 1 - + drivers/media/video/saa7134/saa7134-empress.c | 15 +- + drivers/media/video/saa7134/saa7134-reg.h | 1 + + drivers/media/video/saa7134/saa7134-tvaudio.c | 24 +- + drivers/media/video/saa7134/saa7134-video.c | 46 +- + drivers/media/video/stk-webcam.c | 18 +- + drivers/media/video/tcm825x.c | 6 + + drivers/media/video/tcm825x.h | 1 + + drivers/media/video/tuner-core.c | 40 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- + drivers/media/video/usbvision/usbvision-video.c | 18 +- + drivers/media/video/videodev.c | 293 +++-- + drivers/media/video/vivi.c | 18 +- + drivers/media/video/zoran.h | 4 +- + drivers/media/video/zoran_device.c | 2 +- + drivers/media/video/zoran_driver.c | 10 +- + drivers/media/video/zr364xx.c | 16 +- + include/linux/videodev2.h | 16 +- + include/media/v4l2-dev.h | 74 +- + 149 files changed, 3911 insertions(+), 1225 deletions(-) + create mode 100644 drivers/media/dvb/dvb-usb/anysee.c + create mode 100644 drivers/media/dvb/dvb-usb/anysee.h + create mode 100644 drivers/media/dvb/frontends/drx397xD.c + create mode 100644 drivers/media/dvb/frontends/drx397xD.h + create mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h +Applying v4l-dvb: fix fallout from struct member renames +Merging s390/features +$ git merge s390/features +Removed arch/s390/kernel/binfmt_elf32.c +Auto-merged drivers/s390/block/dasd.c +CONFLICT (content): Merge conflict in drivers/s390/block/dasd.c +Auto-merged drivers/s390/block/dasd_3990_erp.c +Auto-merged drivers/s390/block/dasd_eckd.c +CONFLICT (content): Merge conflict in drivers/s390/block/dasd_eckd.c +Auto-merged drivers/s390/block/dasd_fba.c +CONFLICT (content): Merge conflict in drivers/s390/block/dasd_fba.c +Auto-merged drivers/s390/char/raw3270.c +Auto-merged drivers/s390/char/tape_3590.c +Auto-merged drivers/s390/char/tape_core.c +CONFLICT (content): Merge conflict in drivers/s390/char/tape_core.c +Auto-merged drivers/s390/char/vmur.c +Auto-merged drivers/s390/cio/chp.c +Auto-merged drivers/s390/cio/cio.c +Auto-merged drivers/s390/cio/cio.h +Auto-merged drivers/s390/cio/css.c +Auto-merged drivers/s390/cio/device.c +Auto-merged drivers/s390/cio/device_fsm.c +CONFLICT (content): Merge conflict in drivers/s390/cio/device_fsm.c +Auto-merged drivers/s390/cio/device_ops.c +Auto-merged drivers/s390/cio/qdio.c +Auto-merged drivers/s390/net/claw.c +CONFLICT (content): Merge conflict in drivers/s390/net/claw.c +Auto-merged drivers/s390/net/ctcm_main.c +CONFLICT (content): Merge conflict in drivers/s390/net/ctcm_main.c +Auto-merged drivers/s390/net/lcs.c +CONFLICT (content): Merge conflict in drivers/s390/net/lcs.c +Auto-merged drivers/s390/net/qeth_core_main.c +Auto-merged scripts/mod/file2alias.c +Resolved 'drivers/s390/block/dasd.c' using previous resolution. +Resolved 'drivers/s390/block/dasd_eckd.c' using previous resolution. +Resolved 'drivers/s390/block/dasd_fba.c' using previous resolution. +Resolved 'drivers/s390/char/tape_core.c' using previous resolution. +Resolved 'drivers/s390/cio/device_fsm.c' using previous resolution. +Resolved 'drivers/s390/net/claw.c' using previous resolution. +Resolved 'drivers/s390/net/ctcm_main.c' using previous resolution. +Resolved 'drivers/s390/net/lcs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-css | 35 ++ + arch/s390/Kconfig | 2 + + arch/s390/kernel/Makefile | 7 +- + arch/s390/kernel/binfmt_elf32.c | 214 -------- + arch/s390/kernel/compat_ptrace.h | 4 +- + arch/s390/kernel/early.c | 18 + + arch/s390/kernel/ptrace.c | 363 ++++++++++++-- + arch/s390/kernel/time.c | 634 ++++++++++++++++++------ + arch/s390/mm/vmem.c | 2 +- + drivers/s390/block/dasd.c | 18 +- + drivers/s390/block/dasd_3990_erp.c | 15 +- + drivers/s390/block/dasd_eckd.c | 12 +- + drivers/s390/block/dasd_fba.c | 12 +- + drivers/s390/char/con3215.c | 6 +- + drivers/s390/char/con3270.c | 6 +- + drivers/s390/char/fs3270.c | 6 +- + drivers/s390/char/raw3270.c | 16 +- + drivers/s390/char/tape_34xx.c | 12 +- + drivers/s390/char/tape_3590.c | 21 +- + drivers/s390/char/tape_core.c | 15 +- + drivers/s390/char/tty3270.c | 6 +- + drivers/s390/char/vmur.c | 5 +- + drivers/s390/cio/Makefile | 3 +- + drivers/s390/cio/blacklist.c | 6 +- + drivers/s390/cio/chp.c | 70 +++- + drivers/s390/cio/chp.h | 15 +- + drivers/s390/cio/chsc.c | 292 ++++-------- + drivers/s390/cio/chsc.h | 6 +- + drivers/s390/cio/cio.c | 252 ++++++---- + drivers/s390/cio/cio.h | 10 +- + drivers/s390/cio/cmf.c | 8 +- + drivers/s390/cio/css.c | 249 ++++----- + drivers/s390/cio/css.h | 43 +- + drivers/s390/cio/device.c | 450 +++++++++++++---- + drivers/s390/cio/device.h | 7 +- + drivers/s390/cio/device_fsm.c | 210 +++----- + drivers/s390/cio/device_id.c | 16 +- + drivers/s390/cio/device_ops.c | 134 +++++- + drivers/s390/cio/device_pgid.c | 26 +- + drivers/s390/cio/device_status.c | 133 +++--- + drivers/s390/cio/fcx.c | 350 +++++++++++++ + drivers/s390/cio/io_sch.h | 46 ++- + drivers/s390/cio/itcw.c | 327 ++++++++++++ + drivers/s390/cio/qdio.c | 4 +- + drivers/s390/cio/scsw.c | 844 +++++++++++++++++++++++++++++++ + drivers/s390/net/claw.c | 77 ++-- + drivers/s390/net/ctcm_fsms.c | 12 +- + drivers/s390/net/ctcm_main.c | 28 +- + drivers/s390/net/lcs.c | 37 +- + drivers/s390/net/qeth_core_main.c | 12 +- + drivers/s390/s390mach.c | 106 ++-- + drivers/s390/s390mach.h | 10 + + include/asm-s390/ccwdev.h | 12 + + include/asm-s390/cio.h | 114 ++++- + include/asm-s390/elf.h | 51 +-- + include/asm-s390/etr.h | 45 ++- + include/asm-s390/fcx.h | 311 ++++++++++++ + include/asm-s390/itcw.h | 30 ++ + include/asm-s390/processor.h | 14 +- + include/asm-s390/ptrace.h | 15 + + include/linux/mod_devicetable.h | 9 + + scripts/mod/file2alias.c | 12 + + 62 files changed, 4316 insertions(+), 1509 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-css + delete mode 100644 arch/s390/kernel/binfmt_elf32.c + create mode 100644 drivers/s390/cio/fcx.c + create mode 100644 drivers/s390/cio/itcw.c + create mode 100644 drivers/s390/cio/scsw.c + create mode 100644 include/asm-s390/fcx.h + create mode 100644 include/asm-s390/itcw.h +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 4 + + arch/sh/Kconfig.debug | 2 +- + arch/sh/Makefile | 3 + + arch/sh/boards/renesas/rsk7203/Makefile | 1 + + arch/sh/boards/renesas/rsk7203/setup.c | 126 ++++++++++++ + arch/sh/kernel/Makefile_32 | 2 +- + arch/sh/kernel/cpu/irq/intc-sh5.c | 1 + + arch/sh/kernel/module.c | 39 +--- + arch/sh/kernel/ptrace_32.c | 23 ++ + arch/sh/kernel/signal_32.c | 25 ++- + arch/sh/mm/Kconfig | 12 +- + arch/sh/tools/mach-types | 1 + + fs/Kconfig.binfmt | 2 +- + fs/binfmt_elf_fdpic.c | 45 +++-- + include/asm-sh/checksum_32.h | 2 +- + include/asm-sh/elf.h | 53 +++++- + include/asm-sh/mmu.h | 4 + + include/asm-sh/page.h | 2 + + include/asm-sh/pgtable_32.h | 4 +- + include/asm-sh/processor.h | 1 + + include/asm-sh/processor_32.h | 4 - + include/asm-sh/processor_64.h | 4 - + include/asm-sh/ptrace.h | 5 + + include/asm-sh/segment.h | 30 +++- + include/asm-sh/thread_info.h | 2 + + include/asm-sh/uaccess.h | 222 ++++++++++++++++++++ + include/asm-sh/uaccess_32.h | 341 +++++-------------------------- + include/asm-sh/uaccess_64.h | 206 ------------------- + 28 files changed, 595 insertions(+), 571 deletions(-) + create mode 100644 arch/sh/boards/renesas/rsk7203/Makefile + create mode 100644 arch/sh/boards/renesas/rsk7203/setup.c +Merging jfs/next +$ git merge jfs/next +Merge made by recursive. + fs/jfs/jfs_debug.c | 62 ++++++++++++++++++++------------------------ + fs/jfs/jfs_debug.h | 10 +++--- + fs/jfs/jfs_imap.c | 2 +- + fs/jfs/jfs_logmgr.c | 35 +++++++++++------------- + fs/jfs/jfs_metapage.c | 36 ++++++++++++------------- + fs/jfs/jfs_txnmgr.c | 68 ++++++++++++++++++++++-------------------------- + fs/jfs/jfs_xtree.c | 36 ++++++++++++------------- + fs/jfs/namei.c | 2 +- + fs/jfs/super.c | 7 ++--- + 9 files changed, 119 insertions(+), 139 deletions(-) +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged block/blk-core.c +Auto-merged drivers/ide/ide-acpi.c +Auto-merged drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Auto-merged drivers/ide/legacy/macide.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 - + MAINTAINERS | 7 - + block/blk-core.c | 12 +- + block/blk-exec.c | 6 +- + drivers/block/paride/pd.c | 20 +- + drivers/ide/Kconfig | 22 + + drivers/ide/Makefile | 5 +- + drivers/ide/arm/bast-ide.c | 1 - + drivers/ide/arm/palm_bk3710.c | 4 - + drivers/ide/h8300/ide-h8300.c | 7 +- + drivers/ide/ide-acpi.c | 6 +- + drivers/ide/ide-atapi.c | 296 ++++++++++++++ + drivers/ide/ide-cd.c | 122 +++--- + drivers/ide/ide-cd.h | 4 +- + drivers/ide/ide-cd_ioctl.c | 113 +++--- + drivers/ide/ide-disk.c | 13 +- + drivers/ide/ide-dma.c | 4 +- + drivers/ide/ide-floppy.c | 357 ++++-------------- + drivers/ide/ide-generic.c | 1 + + drivers/ide/ide-io.c | 114 +----- + drivers/ide/ide-iops.c | 36 +- + drivers/ide/ide-lib.c | 151 ------- + drivers/ide/ide-pio-blacklist.c | 94 +++++ + drivers/ide/ide-pnp.c | 1 - + drivers/ide/ide-probe.c | 27 +- + drivers/ide/ide-proc.c | 1 - + drivers/ide/ide-tape.c | 561 ++++++++------------------- + drivers/ide/ide-taskfile.c | 38 ++- + drivers/ide/{ide-timing.h => ide-timings.c} | 205 +++++------ + drivers/ide/ide.c | 377 ++----------------- + drivers/ide/legacy/ali14xx.c | 5 +- + drivers/ide/legacy/buddha.c | 1 - + drivers/ide/legacy/falconide.c | 1 - + drivers/ide/legacy/gayle.c | 4 +- + drivers/ide/legacy/ht6560b.c | 9 +- + drivers/ide/legacy/ide-cs.c | 1 - + drivers/ide/legacy/macide.c | 1 - + drivers/ide/legacy/q40ide.c | 1 - + drivers/ide/legacy/qd65xx.c | 7 +- + drivers/ide/pci/aec62xx.c | 2 +- + drivers/ide/pci/alim15x3.c | 8 +- + drivers/ide/pci/amd74xx.c | 18 +- + drivers/ide/pci/cmd640.c | 16 +- + drivers/ide/pci/cmd64x.c | 10 +- + drivers/ide/pci/cs5535.c | 6 +- + drivers/ide/pci/cy82c693.c | 11 +- + drivers/ide/pci/delkin_cb.c | 1 - + drivers/ide/pci/hpt366.c | 3 +- + drivers/ide/pci/ns87415.c | 4 +- + drivers/ide/pci/opti621.c | 12 +- + drivers/ide/pci/scc_pata.c | 12 +- + drivers/ide/pci/sgiioc4.c | 7 +- + drivers/ide/pci/siimage.c | 25 +- + drivers/ide/pci/sis5513.c | 8 +- + drivers/ide/pci/sl82c105.c | 3 +- + drivers/ide/pci/via82cxxx.c | 18 +- + drivers/ide/ppc/mpc8xx.c | 33 +- + drivers/ide/ppc/pmac.c | 21 +- + drivers/ide/setup-pci.c | 4 +- + drivers/scsi/ide-scsi.c | 302 ++++----------- + include/linux/blkdev.h | 1 - + include/linux/ide.h | 112 +++--- + 62 files changed, 1238 insertions(+), 2037 deletions(-) + create mode 100644 drivers/ide/ide-atapi.c + create mode 100644 drivers/ide/ide-pio-blacklist.c + rename drivers/ide/{ide-timing.h => ide-timings.c} (56%) +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Auto-merged fs/xfs/linux-2.6/xfs_buf.c +Auto-merged fs/xfs/linux-2.6/xfs_buf.h +Auto-merged fs/xfs/xfs_inode.c +Auto-merged fs/xfs/xfs_vnodeops.c +Auto-merged fs/xfs/xfs_vnodeops.h +Auto-merged include/linux/dcache.h +Merge made by recursive. + fs/dcache.c | 102 +++++++ + fs/xfs/linux-2.6/kmem.c | 6 +- + fs/xfs/linux-2.6/kmem.h | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 5 +- + fs/xfs/linux-2.6/xfs_buf.c | 14 +- + fs/xfs/linux-2.6/xfs_buf.h | 2 +- + fs/xfs/linux-2.6/xfs_export.c | 2 +- + fs/xfs/linux-2.6/xfs_iops.c | 74 +++++- + fs/xfs/linux-2.6/xfs_iops.h | 1 + + fs/xfs/linux-2.6/xfs_linux.h | 1 + + fs/xfs/linux-2.6/xfs_super.c | 566 ++++++++++++++++++++++++++++++++++++++-- + fs/xfs/linux-2.6/xfs_super.h | 3 - + fs/xfs/quota/xfs_dquot.c | 3 +- + fs/xfs/quota/xfs_dquot.h | 2 +- + fs/xfs/quota/xfs_dquot_item.c | 4 +- + fs/xfs/quota/xfs_qm.c | 14 +- + fs/xfs/quota/xfs_qm_syscalls.c | 8 +- + fs/xfs/support/ktrace.c | 4 +- + fs/xfs/xfs_attr.c | 158 +++--------- + fs/xfs/xfs_attr.h | 2 - + fs/xfs/xfs_attr_leaf.c | 38 ++-- + fs/xfs/xfs_attr_sf.h | 10 +- + fs/xfs/xfs_bmap.c | 2 +- + fs/xfs/xfs_buf_item.c | 8 +- + fs/xfs/xfs_clnt.h | 1 + + fs/xfs/xfs_da_btree.c | 46 +++- + fs/xfs/xfs_da_btree.h | 36 +++- + fs/xfs/xfs_dfrag.c | 4 +- + fs/xfs/xfs_dir2.c | 125 ++++++++-- + fs/xfs/xfs_dir2.h | 6 +- + fs/xfs/xfs_dir2_block.c | 56 +++-- + fs/xfs/xfs_dir2_data.c | 5 +- + fs/xfs/xfs_dir2_leaf.c | 80 ++++-- + fs/xfs/xfs_dir2_node.c | 387 ++++++++++++++++------------ + fs/xfs/xfs_dir2_sf.c | 83 ++++--- + fs/xfs/xfs_dir2_trace.c | 20 +- + fs/xfs/xfs_error.c | 5 +- + fs/xfs/xfs_extfree_item.c | 6 +- + fs/xfs/xfs_fs.h | 1 + + fs/xfs/xfs_fsops.c | 4 +- + fs/xfs/xfs_inode.c | 95 ++------ + fs/xfs/xfs_inode.h | 3 - + fs/xfs/xfs_inode_item.c | 7 +- + fs/xfs/xfs_itable.c | 6 +- + fs/xfs/xfs_log.c | 49 ++-- + fs/xfs/xfs_log_priv.h | 6 +- + fs/xfs/xfs_log_recover.c | 21 +- + fs/xfs/xfs_mount.c | 92 ++----- + fs/xfs/xfs_mount.h | 15 +- + fs/xfs/xfs_mru_cache.c | 8 +- + fs/xfs/xfs_rtalloc.c | 2 +- + fs/xfs/xfs_sb.h | 17 ++- + fs/xfs/xfs_trans.c | 4 +- + fs/xfs/xfs_trans_inode.c | 2 +- + fs/xfs/xfs_trans_item.c | 8 +- + fs/xfs/xfs_vfsops.c | 479 +--------------------------------- + fs/xfs/xfs_vfsops.h | 5 - + fs/xfs/xfs_vnodeops.c | 34 ++- + fs/xfs/xfs_vnodeops.h | 2 +- + include/linux/dcache.h | 1 + + 60 files changed, 1511 insertions(+), 1243 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Auto-merged drivers/infiniband/core/cm.c +Auto-merged drivers/infiniband/core/sysfs.c +Auto-merged drivers/infiniband/core/ucm.c +Auto-merged drivers/infiniband/ulp/srp/ib_srp.c +Merge made by recursive. + drivers/infiniband/core/addr.c | 41 ++++++++++-------- + drivers/infiniband/core/agent.h | 2 - + drivers/infiniband/core/cache.c | 2 - + drivers/infiniband/core/cm.c | 2 - + drivers/infiniband/core/cma.c | 42 ++++++++++--------- + drivers/infiniband/core/core_priv.h | 2 - + drivers/infiniband/core/device.c | 2 - + drivers/infiniband/core/fmr_pool.c | 2 - + drivers/infiniband/core/mad_priv.h | 2 - + drivers/infiniband/core/mad_rmpp.c | 2 - + drivers/infiniband/core/mad_rmpp.h | 2 - + drivers/infiniband/core/packer.c | 2 - + drivers/infiniband/core/sa_query.c | 24 +++++++---- + drivers/infiniband/core/sysfs.c | 2 - + drivers/infiniband/core/ucm.c | 2 - + drivers/infiniband/core/ud_header.c | 2 - + drivers/infiniband/core/umem.c | 2 - + drivers/infiniband/core/user_mad.c | 2 - + drivers/infiniband/core/uverbs.h | 2 - + drivers/infiniband/core/uverbs_cmd.c | 2 - + drivers/infiniband/core/uverbs_main.c | 2 - + drivers/infiniband/core/verbs.c | 2 - + drivers/infiniband/hw/ipath/ipath_iba7220.c | 4 +- + drivers/infiniband/hw/mlx4/qp.c | 8 +++- + drivers/infiniband/hw/mthca/mthca_allocator.c | 2 - + drivers/infiniband/hw/mthca/mthca_av.c | 2 - + drivers/infiniband/hw/mthca/mthca_catas.c | 2 - + drivers/infiniband/hw/mthca/mthca_cmd.c | 2 - + drivers/infiniband/hw/mthca/mthca_cmd.h | 2 - + drivers/infiniband/hw/mthca/mthca_config_reg.h | 2 - + drivers/infiniband/hw/mthca/mthca_cq.c | 2 - + drivers/infiniband/hw/mthca/mthca_dev.h | 2 - + drivers/infiniband/hw/mthca/mthca_doorbell.h | 2 - + drivers/infiniband/hw/mthca/mthca_eq.c | 2 - + drivers/infiniband/hw/mthca/mthca_mad.c | 2 - + drivers/infiniband/hw/mthca/mthca_main.c | 2 - + drivers/infiniband/hw/mthca/mthca_mcg.c | 2 - + drivers/infiniband/hw/mthca/mthca_memfree.c | 2 - + drivers/infiniband/hw/mthca/mthca_memfree.h | 2 - + drivers/infiniband/hw/mthca/mthca_mr.c | 2 - + drivers/infiniband/hw/mthca/mthca_pd.c | 2 - + drivers/infiniband/hw/mthca/mthca_profile.c | 2 - + drivers/infiniband/hw/mthca/mthca_profile.h | 2 - + drivers/infiniband/hw/mthca/mthca_provider.c | 2 - + drivers/infiniband/hw/mthca/mthca_provider.h | 2 - + drivers/infiniband/hw/mthca/mthca_qp.c | 2 - + drivers/infiniband/hw/mthca/mthca_reset.c | 2 - + drivers/infiniband/hw/mthca/mthca_srq.c | 2 - + drivers/infiniband/hw/mthca/mthca_uar.c | 2 - + drivers/infiniband/hw/mthca/mthca_user.h | 1 - + drivers/infiniband/hw/mthca/mthca_wqe.h | 2 - + drivers/infiniband/hw/nes/nes_cm.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib.h | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 21 +++++++++- + drivers/infiniband/ulp/ipoib/ipoib_fs.c | 2 - + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 - + drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 +++- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 2 - + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 2 - + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 - + drivers/infiniband/ulp/iser/iscsi_iser.c | 3 - + drivers/infiniband/ulp/iser/iscsi_iser.h | 2 - + drivers/infiniband/ulp/iser/iser_initiator.c | 2 - + drivers/infiniband/ulp/iser/iser_memory.c | 2 - + drivers/infiniband/ulp/iser/iser_verbs.c | 2 - + drivers/infiniband/ulp/srp/ib_srp.c | 15 ++----- + drivers/infiniband/ulp/srp/ib_srp.h | 2 - + include/rdma/ib_addr.h | 50 ++++++++++++---------- + include/rdma/ib_cache.h | 2 - + include/rdma/ib_cm.h | 2 - + include/rdma/ib_fmr_pool.h | 4 +- + include/rdma/ib_mad.h | 17 +++----- + include/rdma/ib_pack.h | 2 - + include/rdma/ib_sa.h | 2 - + include/rdma/ib_smi.h | 4 +- + include/rdma/ib_user_cm.h | 2 - + include/rdma/ib_user_mad.h | 2 - + include/rdma/ib_user_verbs.h | 2 - + include/rdma/ib_verbs.h | 6 +-- + include/rdma/iw_cm.h | 2 +- + include/rdma/rdma_cm.h | 52 +++++++++++++----------- + include/rdma/rdma_cm_ib.h | 50 ++++++++++++---------- + 82 files changed, 195 insertions(+), 285 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged drivers/acpi/glue.c +Auto-merged drivers/acpi/processor_core.c +Auto-merged drivers/acpi/scan.c +Auto-merged drivers/acpi/sleep/proc.c +Merge made by recursive. + drivers/acpi/executer/exdump.c | 27 +++++------------- + drivers/acpi/executer/exresolv.c | 13 +++------ + drivers/acpi/executer/exstore.c | 23 +++------------ + drivers/acpi/glue.c | 6 ++++ + drivers/acpi/parser/psargs.c | 37 ++----------------------- + drivers/acpi/processor_core.c | 14 +++++++--- + drivers/acpi/scan.c | 56 +++++++++++++++++++++---------------- + drivers/acpi/sleep/proc.c | 6 ++++ + drivers/acpi/tables/tbxface.c | 2 +- + drivers/acpi/utilities/utcopy.c | 8 ----- + kernel/cpu.c | 1 + + 11 files changed, 76 insertions(+), 117 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + Documentation/filesystems/nfs-rdma.txt | 103 +++++++++------- + fs/nfsd/nfs4proc.c | 1 + + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfs4xdr.c | 2 +- + include/linux/sunrpc/gss_krb5.h | 28 +++++ + include/linux/sunrpc/svc_rdma.h | 36 +++++- + net/sunrpc/auth_gss/Makefile | 4 +- + net/sunrpc/auth_gss/auth_gss.c | 14 ++- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 64 +++++++++-- + net/sunrpc/auth_gss/gss_krb5_seal.c | 26 ++-- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 16 ++-- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 79 +++++++----- + net/sunrpc/auth_gss/gss_mech_switch.c | 14 ++ + net/sunrpc/auth_gss/svcauth_gss.c | 15 +++ + net/sunrpc/xprtrdma/svc_rdma.c | 40 ++++++ + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 84 ++++++------- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 125 +++++++++---------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 195 +++++++++++------------------- + 18 files changed, 495 insertions(+), 355 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/firewire/fw-sbp2.c +Auto-merged drivers/ieee1394/raw1394.c +Auto-merged drivers/ieee1394/sbp2.c +Auto-merged drivers/ieee1394/video1394.c +Auto-merged drivers/scsi/sd.c +Auto-merged include/scsi/scsi_device.h +Merge made by recursive. + drivers/firewire/fw-sbp2.c | 25 +++++++++++++++++++++++-- + drivers/ieee1394/csr1212.c | 32 ++++++++++++++++++++++---------- + drivers/ieee1394/highlevel.c | 4 +--- + drivers/ieee1394/highlevel.h | 13 ++++++++++++- + drivers/ieee1394/raw1394.c | 20 +++++++++++++++----- + drivers/ieee1394/sbp2.c | 22 ++++++++++++++++++++-- + drivers/ieee1394/sbp2.h | 1 + + drivers/ieee1394/video1394.c | 2 ++ + drivers/scsi/sd.c | 5 +++++ + include/scsi/scsi_device.h | 1 + + 10 files changed, 102 insertions(+), 23 deletions(-) +Merging hwmon/testing +$ git merge hwmon/testing +Merge made by recursive. + Documentation/hwmon/dme1737 | 4 + + Documentation/hwmon/sysfs-interface | 33 ++--- + drivers/hwmon/abituguru3.c | 3 +- + drivers/hwmon/adt7473.c | 19 +-- + drivers/hwmon/dme1737.c | 297 ++++++++++++++++++++++------------- + drivers/hwmon/lm85.c | 25 ++-- + 6 files changed, 218 insertions(+), 163 deletions(-) +Merging ubi/master +$ git merge ubi/master +Auto-merged drivers/mtd/ubi/build.c +Auto-merged drivers/mtd/ubi/vmt.c +Merge made by recursive. + drivers/mtd/ubi/build.c | 8 +++++- + drivers/mtd/ubi/cdev.c | 6 ++-- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/kapi.c | 6 ++-- + drivers/mtd/ubi/misc.c | 2 +- + drivers/mtd/ubi/upd.c | 6 ++-- + drivers/mtd/ubi/vmt.c | 2 +- + drivers/mtd/ubi/vtbl.c | 55 ++++++++++++++++++++++++++++------------------ + drivers/mtd/ubi/wl.c | 3 +- + 9 files changed, 52 insertions(+), 38 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged drivers/s390/s390mach.c +Merge made by recursive. + arch/ia64/kvm/kvm-ia64.c | 8 -- + arch/ia64/kvm/mmio.c | 3 +- + arch/powerpc/kvm/44x_tlb.c | 9 +- + arch/powerpc/kvm/booke_guest.c | 33 ----- + arch/powerpc/kvm/emulate.c | 12 ++ + arch/powerpc/kvm/powerpc.c | 4 - + arch/s390/kvm/diag.c | 2 +- + arch/s390/kvm/interrupt.c | 7 +- + arch/s390/kvm/kvm-s390.c | 17 ++- + arch/s390/mm/pgtable.c | 44 ++++--- + arch/x86/kvm/i8254.c | 21 +++- + arch/x86/kvm/irq.c | 6 + + arch/x86/kvm/irq.h | 2 + + arch/x86/kvm/lapic.c | 7 +- + arch/x86/kvm/lapic.h | 1 + + arch/x86/kvm/mmu.c | 44 +++++-- + arch/x86/kvm/mmu.h | 3 +- + arch/x86/kvm/paging_tmpl.h | 30 +++-- + arch/x86/kvm/svm.c | 87 ++++++++++---- + arch/x86/kvm/vmx.c | 259 +++++++++++++++++++++++++++++++++------- + arch/x86/kvm/vmx.h | 15 ++- + arch/x86/kvm/x86.c | 204 ++++++++++++++++++-------------- + arch/x86/kvm/x86_emulate.c | 83 ++++++++++++-- + drivers/s390/s390mach.c | 1 + + include/asm-ia64/kvm_host.h | 2 + + include/asm-powerpc/kvm_ppc.h | 1 + + include/asm-x86/kvm.h | 1 + + include/asm-x86/kvm_host.h | 43 ++++++- + include/linux/kvm_host.h | 5 +- + virt/kvm/ioapic.c | 20 +++- + virt/kvm/kvm_main.c | 68 ++++++++--- + 31 files changed, 744 insertions(+), 298 deletions(-) +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/lock.c | 3 ++- + fs/dlm/user.c | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging scsi/master +$ git merge scsi/master +Removed drivers/md/dm-emc.c +Removed drivers/md/dm-hw-handler.c +Removed drivers/md/dm-hw-handler.h +Removed drivers/md/dm-mpath-hp-sw.c +Removed drivers/md/dm-mpath-rdac.c +Auto-merged drivers/message/fusion/mptbase.h +Auto-merged drivers/message/fusion/mptfc.c +Auto-merged drivers/message/fusion/mptsas.c +Auto-merged drivers/message/fusion/mptscsih.c +Auto-merged drivers/s390/scsi/zfcp_aux.c +Auto-merged drivers/s390/scsi/zfcp_def.h +Auto-merged drivers/scsi/Kconfig +Auto-merged drivers/scsi/scsi_sysfs.c +Auto-merged include/scsi/scsi_device.h +Merge made by recursive. + Documentation/scsi/aacraid.txt | 24 +- + drivers/md/Kconfig | 19 +- + drivers/md/Makefile | 7 +- + drivers/md/dm-emc.c | 345 ------------- + drivers/md/dm-hw-handler.c | 213 -------- + drivers/md/dm-hw-handler.h | 63 --- + drivers/md/dm-mpath-hp-sw.c | 247 ---------- + drivers/md/dm-mpath-rdac.c | 700 --------------------------- + drivers/md/dm-mpath.c | 161 ++++--- + drivers/md/dm-mpath.h | 1 - + drivers/message/fusion/lsi/mpi.h | 2 +- + drivers/message/fusion/lsi/mpi_cnfg.h | 2 +- + drivers/message/fusion/mptbase.c | 100 ++++- + drivers/message/fusion/mptbase.h | 17 +- + drivers/message/fusion/mptctl.c | 4 +- + drivers/message/fusion/mptctl.h | 2 +- + drivers/message/fusion/mptdebug.h | 2 +- + drivers/message/fusion/mptfc.c | 2 +- + drivers/message/fusion/mptlan.c | 2 +- + drivers/message/fusion/mptlan.h | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/fusion/mptsas.h | 2 +- + drivers/message/fusion/mptscsih.c | 2 +- + drivers/message/fusion/mptscsih.h | 2 +- + drivers/message/fusion/mptspi.c | 3 +- + drivers/s390/scsi/zfcp_aux.c | 40 ++- + drivers/s390/scsi/zfcp_dbf.c | 33 +- + drivers/s390/scsi/zfcp_dbf.h | 12 +- + drivers/s390/scsi/zfcp_def.h | 30 +- + drivers/s390/scsi/zfcp_erp.c | 37 +- + drivers/s390/scsi/zfcp_ext.h | 8 +- + drivers/s390/scsi/zfcp_fsf.c | 105 +++-- + drivers/s390/scsi/zfcp_fsf.h | 11 +- + drivers/s390/scsi/zfcp_qdio.c | 27 +- + drivers/s390/scsi/zfcp_scsi.c | 65 +++ + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 1 + + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/arm/Kconfig | 2 +- + drivers/scsi/arm/acornscsi-io.S | 15 +- + drivers/scsi/arm/acornscsi.c | 426 ++++++++--------- + drivers/scsi/arm/acornscsi.h | 9 +- + drivers/scsi/device_handler/Kconfig | 32 ++ + drivers/scsi/device_handler/Makefile | 7 + + drivers/scsi/device_handler/scsi_dh.c | 162 ++++++ + drivers/scsi/device_handler/scsi_dh_emc.c | 499 +++++++++++++++++++ + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 202 ++++++++ + drivers/scsi/device_handler/scsi_dh_rdac.c | 691 ++++++++++++++++++++++++++ + drivers/scsi/mesh.c | 8 +- + drivers/scsi/scsi.c | 9 + + drivers/scsi/scsi_error.c | 11 + + drivers/scsi/scsi_lib.c | 8 + + drivers/scsi/scsi_sysfs.c | 1 + + include/scsi/scsi.h | 1 + + include/scsi/scsi_device.h | 22 + + include/scsi/scsi_dh.h | 59 +++ + 56 files changed, 2398 insertions(+), 2065 deletions(-) + delete mode 100644 drivers/md/dm-emc.c + delete mode 100644 drivers/md/dm-hw-handler.c + delete mode 100644 drivers/md/dm-hw-handler.h + delete mode 100644 drivers/md/dm-mpath-hp-sw.c + delete mode 100644 drivers/md/dm-mpath-rdac.c + create mode 100644 drivers/scsi/device_handler/Kconfig + create mode 100644 drivers/scsi/device_handler/Makefile + create mode 100644 drivers/scsi/device_handler/scsi_dh.c + create mode 100644 drivers/scsi/device_handler/scsi_dh_emc.c + create mode 100644 drivers/scsi/device_handler/scsi_dh_hp_sw.c + create mode 100644 drivers/scsi/device_handler/scsi_dh_rdac.c + create mode 100644 include/scsi/scsi_dh.h +Applying scsi: fix fallout from KOBJ_NAME_LEN removal +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + Documentation/ia64/paravirt_ops.txt | 137 +++++++++++ + arch/ia64/Makefile | 6 + + arch/ia64/kernel/Makefile | 44 ++++ + arch/ia64/kernel/entry.S | 115 ++++++---- + arch/ia64/kernel/head.S | 41 +++ + arch/ia64/kernel/iosapic.c | 45 +++-- + arch/ia64/kernel/irq_ia64.c | 19 +- + arch/ia64/kernel/ivt.S | 462 +++++++++++++++++----------------- + arch/ia64/kernel/minstate.h | 13 +- + arch/ia64/kernel/nr-irqs.c | 24 ++ + arch/ia64/kernel/paravirt.c | 369 ++++++++++++++++++++++++++++ + arch/ia64/kernel/paravirt_inst.h | 29 +++ + arch/ia64/kernel/paravirtentry.S | 60 +++++ + arch/ia64/kernel/setup.c | 10 + + arch/ia64/kernel/smpboot.c | 2 + + arch/ia64/kernel/time.c | 23 ++ + arch/ia64/kernel/vmlinux.lds.S | 1 - + include/asm-ia64/Kbuild | 2 +- + include/asm-ia64/gcc_intrin.h | 24 +- + include/asm-ia64/hw_irq.h | 23 ++- + include/asm-ia64/intel_intrin.h | 41 ++-- + include/asm-ia64/intrinsics.h | 55 ++++ + include/asm-ia64/iosapic.h | 18 ++- + include/asm-ia64/irq.h | 9 +- + include/asm-ia64/mmu_context.h | 6 +- + include/asm-ia64/native/inst.h | 175 +++++++++++++ + include/asm-ia64/native/irq.h | 35 +++ + include/asm-ia64/paravirt.h | 255 +++++++++++++++++++ + include/asm-ia64/paravirt_privop.h | 114 +++++++++ + include/asm-ia64/smp.h | 2 + + include/asm-ia64/system.h | 11 +- + 31 files changed, 1813 insertions(+), 357 deletions(-) + create mode 100644 Documentation/ia64/paravirt_ops.txt + create mode 100644 arch/ia64/kernel/nr-irqs.c + create mode 100644 arch/ia64/kernel/paravirt.c + create mode 100644 arch/ia64/kernel/paravirt_inst.h + create mode 100644 arch/ia64/kernel/paravirtentry.S + create mode 100644 include/asm-ia64/native/inst.h + create mode 100644 include/asm-ia64/native/irq.h + create mode 100644 include/asm-ia64/paravirt.h + create mode 100644 include/asm-ia64/paravirt_privop.h +Merging tests/master +$ git merge tests/master +Renamed drivers/misc/lkdtm.c => tests/lkdtm.c +Auto-merged tests/lkdtm.c +Auto-merged Makefile +Auto-merged drivers/misc/Makefile +Auto-merged kernel/Makefile +Auto-merged lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merged lib/Makefile +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 72 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 80 +++++++++++++++++++++++ + tests/Makefile | 10 +++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 12 ++-- + {lib => tests}/locking-selftest-hardirq.h | 0 + {lib => tests}/locking-selftest-mutex.h | 0 + {lib => tests}/locking-selftest-rlock-hardirq.h | 0 + {lib => tests}/locking-selftest-rlock-softirq.h | 0 + {lib => tests}/locking-selftest-rlock.h | 0 + {lib => tests}/locking-selftest-rsem.h | 0 + {lib => tests}/locking-selftest-softirq.h | 0 + {lib => tests}/locking-selftest-spin-hardirq.h | 0 + {lib => tests}/locking-selftest-spin-softirq.h | 0 + {lib => tests}/locking-selftest-spin.h | 0 + {lib => tests}/locking-selftest-wlock-hardirq.h | 0 + {lib => tests}/locking-selftest-wlock-softirq.h | 0 + {lib => tests}/locking-selftest-wlock.h | 0 + {lib => tests}/locking-selftest-wsem.h | 0 + {lib => tests}/locking-selftest.c | 0 + {kernel => tests}/rcutorture.c | 0 + {kernel => tests}/rtmutex-tester.c | 2 +- + {kernel => tests}/test_kprobes.c | 0 + 27 files changed, 100 insertions(+), 83 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (96%) + rename {lib => tests}/locking-selftest-hardirq.h (100%) + rename {lib => tests}/locking-selftest-mutex.h (100%) + rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-rlock.h (100%) + rename {lib => tests}/locking-selftest-rsem.h (100%) + rename {lib => tests}/locking-selftest-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) + rename {lib => tests}/locking-selftest-spin-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin.h (100%) + rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-wlock.h (100%) + rename {lib => tests}/locking-selftest-wsem.h (100%) + rename {lib => tests}/locking-selftest.c (100%) + rename {kernel => tests}/rcutorture.c (100%) + rename {kernel => tests}/rtmutex-tester.c (99%) + rename {kernel => tests}/test_kprobes.c (100%) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/Kconfig | 8 +++ + fs/ocfs2/dlmglue.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++- + fs/ocfs2/ocfs2.h | 12 +++++ + 3 files changed, 141 insertions(+), 1 deletions(-) +Merging selinux/for-akpm +$ git merge selinux/for-akpm +Auto-merged fs/proc/base.c +Merge made by recursive. + fs/proc/base.c | 9 +- + fs/proc/task_mmu.c | 8 +- + fs/proc/task_nommu.c | 2 +- + include/linux/ptrace.h | 8 +- + include/linux/security.h | 16 ++- + kernel/ptrace.c | 15 +- + security/commoncap.c | 3 +- + security/dummy.c | 3 +- + security/security.c | 5 +- + security/selinux/hooks.c | 78 ++++++++-- + security/selinux/include/audit.h | 4 +- + security/selinux/include/avc.h | 15 +- + security/selinux/include/objsec.h | 1 - + security/selinux/include/security.h | 5 + + security/selinux/netnode.c | 1 - + security/selinux/netport.c | 3 +- + security/selinux/selinuxfs.c | 10 +- + security/selinux/ss/avtab.c | 2 +- + security/selinux/ss/context.h | 27 ++++- + security/selinux/ss/mls.c | 19 ++- + security/selinux/ss/mls.h | 3 +- + security/selinux/ss/services.c | 277 ++++++++++++++++++++++++----------- + security/selinux/ss/sidtab.c | 58 +++----- + security/selinux/ss/sidtab.h | 7 +- + security/smack/smack_lsm.c | 5 +- + 25 files changed, 381 insertions(+), 203 deletions(-) +Merging quilt/m68k +$ git merge quilt/m68k +Merge made by recursive. + arch/m68k/configs/amiga_defconfig | 6 ++-- + arch/m68k/configs/apollo_defconfig | 6 ++-- + arch/m68k/configs/atari_defconfig | 6 ++-- + arch/m68k/configs/bvme6000_defconfig | 6 ++-- + arch/m68k/configs/hp300_defconfig | 6 ++-- + arch/m68k/configs/mac_defconfig | 6 ++-- + arch/m68k/configs/multi_defconfig | 6 ++-- + arch/m68k/configs/mvme147_defconfig | 6 ++-- + arch/m68k/configs/mvme16x_defconfig | 6 ++-- + arch/m68k/configs/q40_defconfig | 6 ++-- + arch/m68k/configs/sun3_defconfig | 6 ++-- + arch/m68k/configs/sun3x_defconfig | 6 ++-- + arch/m68k/fpsp040/Makefile | 1 - + arch/m68k/ifpsp060/Makefile | 1 - + arch/m68k/kernel/Makefile | 2 - + arch/m68k/kernel/setup.c | 6 ++++ + arch/m68k/kernel/vmlinux-std.lds | 3 +- + arch/m68k/kernel/vmlinux-sun3.lds | 7 +++-- + arch/m68k/lib/Makefile | 2 - + arch/m68k/math-emu/Makefile | 2 - + arch/m68k/sun3/idprom.c | 2 +- + arch/m68k/sun3/prom/Makefile | 1 - + arch/m68k/sun3/prom/console.c | 2 +- + arch/m68k/sun3/prom/init.c | 2 +- + arch/m68k/sun3/prom/misc.c | 2 +- + arch/m68k/sun3/prom/printf.c | 2 +- + drivers/block/ataflop.c | 4 +- + drivers/char/nvram.c | 2 +- + drivers/input/keyboard/atakbd.c | 2 +- + drivers/net/ariadne.c | 47 ++++++++++++++++------------------ + drivers/video/atafb.c | 2 +- + drivers/zorro/proc.c | 4 +-- + drivers/zorro/zorro.c | 2 - + drivers/zorro/zorro.ids | 2 - + include/asm-m68k/apollodma.h | 2 +- + include/asm-m68k/dvma.h | 2 +- + include/asm-m68k/fpu.h | 10 +++--- + include/asm-m68k/irq.h | 2 +- + include/asm-m68k/machines.h | 2 +- + include/asm-m68k/md.h | 2 +- + include/asm-m68k/openprom.h | 1 - + include/asm-m68k/oplib.h | 2 +- + include/asm-m68k/sun3-head.h | 1 - + include/asm-m68k/tlbflush.h | 8 +++--- + mm/mmap.c | 8 +++++- + 45 files changed, 103 insertions(+), 109 deletions(-) +Merging powerpc/powerpc-next +$ git merge powerpc/powerpc-next +Auto-merged arch/powerpc/kernel/entry_32.S +Removed drivers/net/fec_8xx/Kconfig +Removed drivers/net/fec_8xx/Makefile +Removed drivers/net/fec_8xx/fec_8xx-netta.c +Removed drivers/net/fec_8xx/fec_8xx.h +Removed drivers/net/fec_8xx/fec_main.c +Removed drivers/net/fec_8xx/fec_mii.c +Merge made by recursive. + arch/powerpc/boot/cuboot-warp.c | 47 +- + arch/powerpc/boot/dts/bamboo.dts | 142 ++-- + arch/powerpc/boot/dts/canyonlands.dts | 222 +++--- + arch/powerpc/boot/dts/ebony.dts | 164 ++-- + arch/powerpc/boot/dts/ep405.dts | 100 ++-- + arch/powerpc/boot/dts/glacier.dts | 262 +++--- + arch/powerpc/boot/dts/haleakala.dts | 136 ++-- + arch/powerpc/boot/dts/holly.dts | 122 ++-- + arch/powerpc/boot/dts/katmai.dts | 210 +++--- + arch/powerpc/boot/dts/kilauea.dts | 182 +++-- + arch/powerpc/boot/dts/makalu.dts | 182 +++-- + arch/powerpc/boot/dts/ps3.dts | 16 +- + arch/powerpc/boot/dts/rainier.dts | 163 ++-- + arch/powerpc/boot/dts/sequoia.dts | 172 ++-- + arch/powerpc/boot/dts/taishan.dts | 212 +++--- + arch/powerpc/boot/dts/walnut.dts | 118 ++-- + arch/powerpc/boot/dts/warp.dts | 145 ++-- + arch/powerpc/boot/dts/yosemite.dts | 146 ++-- + arch/powerpc/kernel/entry_32.S | 12 +- + arch/powerpc/kernel/head_booke.h | 2 +- + arch/powerpc/kernel/kprobes.c | 2 +- + arch/powerpc/kernel/lparcfg.c | 6 +- + arch/powerpc/kernel/machine_kexec_64.c | 4 +- + arch/powerpc/kernel/msi.c | 2 +- + arch/powerpc/kernel/of_device.c | 48 -- + arch/powerpc/kernel/rtas-proc.c | 14 +- + arch/powerpc/kernel/rtas.c | 6 +- + arch/powerpc/kernel/rtas_flash.c | 4 +- + arch/powerpc/kernel/rtas_pci.c | 4 +- + arch/powerpc/kernel/signal.c | 12 +- + arch/powerpc/kernel/signal_32.c | 2 +- + arch/powerpc/kernel/smp.c | 4 - + arch/powerpc/kernel/time.c | 10 +- + arch/powerpc/kernel/vdso64/vdso64.lds.S | 6 +- + arch/powerpc/mm/hash_utils_64.c | 6 +- + arch/powerpc/mm/init_32.c | 3 +- + arch/powerpc/mm/init_64.c | 4 +- + arch/powerpc/mm/stab.c | 4 +- + arch/powerpc/mm/tlb_64.c | 7 +- + arch/powerpc/platforms/44x/warp-nand.c | 49 +- + arch/powerpc/platforms/44x/warp.c | 293 ++++++-- + arch/powerpc/platforms/cell/axon_msi.c | 58 ++ + arch/powerpc/platforms/chrp/setup.c | 7 - + arch/powerpc/platforms/maple/time.c | 2 - + arch/powerpc/platforms/powermac/pic.c | 8 +- + arch/powerpc/platforms/pseries/firmware.c | 1 + + arch/powerpc/platforms/pseries/iommu.c | 15 +- + arch/powerpc/platforms/pseries/lpar.c | 2 +- + arch/powerpc/platforms/pseries/ras.c | 2 +- + arch/powerpc/platforms/pseries/rtasd.c | 4 +- + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/powerpc/sysdev/6xx-suspend.S | 52 ++ + arch/powerpc/sysdev/Makefile | 4 + + arch/powerpc/sysdev/dcr.c | 156 +++- + arch/powerpc/sysdev/mpic.c | 9 +- + arch/powerpc/sysdev/mpic_msi.c | 1 + + arch/powerpc/sysdev/mpic_pasemi_msi.c | 6 +- + arch/powerpc/sysdev/mpic_u3msi.c | 8 +- + arch/powerpc/sysdev/mv64x60_dev.c | 10 + + arch/powerpc/xmon/xmon.c | 66 +- + arch/ppc/kernel/entry.S | 4 +- + drivers/char/hvc_console.c | 8 +- + drivers/char/hvc_console.h | 10 + + drivers/macintosh/macio_sysfs.c | 12 +- + drivers/net/Kconfig | 1 - + drivers/net/Makefile | 1 - + drivers/net/fec_8xx/Kconfig | 20 - + drivers/net/fec_8xx/Makefile | 12 - + drivers/net/fec_8xx/fec_8xx-netta.c | 151 ---- + drivers/net/fec_8xx/fec_8xx.h | 220 ----- + drivers/net/fec_8xx/fec_main.c | 1264 ----------------------------- + drivers/net/fec_8xx/fec_mii.c | 418 ---------- + drivers/of/device.c | 84 ++- + drivers/of/gpio.c | 38 +- + drivers/of/platform.c | 3 + + include/asm-powerpc/dcr-generic.h | 49 ++ + include/asm-powerpc/dcr-mmio.h | 20 +- + include/asm-powerpc/dcr-native.h | 16 +- + include/asm-powerpc/dcr.h | 39 +- + include/asm-powerpc/ioctl.h | 58 +-- + include/asm-powerpc/mmu-hash64.h | 1 + + include/asm-powerpc/mpc6xx.h | 6 + + include/asm-powerpc/mpic.h | 2 + + include/asm-powerpc/of_device.h | 2 - + include/asm-powerpc/ppc_asm.h | 6 + + include/asm-powerpc/ptrace.h | 1 + + include/asm-powerpc/smp.h | 2 + + include/asm-powerpc/system.h | 1 + + include/asm-powerpc/thread_info.h | 19 +- + include/asm-powerpc/time.h | 1 + + include/asm-powerpc/xmon.h | 9 + + include/linux/of_device.h | 3 + + 92 files changed, 2321 insertions(+), 3820 deletions(-) + create mode 100644 arch/powerpc/sysdev/6xx-suspend.S + delete mode 100644 drivers/net/fec_8xx/Kconfig + delete mode 100644 drivers/net/fec_8xx/Makefile + delete mode 100644 drivers/net/fec_8xx/fec_8xx-netta.c + delete mode 100644 drivers/net/fec_8xx/fec_8xx.h + delete mode 100644 drivers/net/fec_8xx/fec_main.c + delete mode 100644 drivers/net/fec_8xx/fec_mii.c + create mode 100644 include/asm-powerpc/dcr-generic.h + create mode 100644 include/asm-powerpc/mpc6xx.h +Merging hrt/mm +$ git merge hrt/mm +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Merge made by recursive. + fs/ext4/balloc.c | 12 +++++-- + fs/ext4/ext4.h | 7 ++-- + fs/ext4/ext4_i.h | 2 +- + fs/ext4/ext4_sb.h | 2 +- + fs/ext4/inode.c | 20 +++++++----- + fs/ext4/mballoc.c | 86 +++++++++++++++++++++++++------------------------ + fs/jbd2/commit.c | 3 ++ + include/linux/jbd2.h | 2 + + 8 files changed, 76 insertions(+), 58 deletions(-) +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Merge made by recursive. + drivers/dma/fsldma.c | 31 ++++++++++++++++--------------- + net/core/user_dma.c | 2 +- + 2 files changed, 17 insertions(+), 16 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Merge made by recursive. + fs/udf/super.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging net/master +$ git merge net/master +Auto-merged drivers/net/Kconfig +Auto-merged drivers/net/atlx/atl1.c +Auto-merged drivers/net/cxgb3/common.h +Auto-merged drivers/net/ppp_generic.c +Auto-merged drivers/net/sb1250-mac.c +Auto-merged drivers/net/wireless/airo.c +Auto-merged drivers/net/wireless/atmel.c +Auto-merged drivers/net/wireless/b43/b43.h +Auto-merged drivers/net/wireless/b43/main.c +Auto-merged drivers/net/wireless/b43legacy/main.c +Auto-merged drivers/net/wireless/iwlwifi/iwl-4965-rs.c +Auto-merged drivers/net/wireless/rt2x00/rt2x00.h +Auto-merged drivers/net/wireless/rt2x00/rt2x00dev.c +Auto-merged drivers/net/wireless/rt2x00/rt2x00mac.c +Auto-merged drivers/net/wireless/rt2x00/rt2x00pci.h +Auto-merged drivers/net/wireless/rt2x00/rt61pci.c +Auto-merged drivers/net/wireless/rt2x00/rt73usb.c +Auto-merged drivers/net/wireless/zd1211rw/zd_mac.c +Auto-merged include/linux/pci_ids.h +Auto-merged net/core/net-sysfs.c +Auto-merged net/mac80211/cfg.c +Auto-merged net/mac80211/main.c +Auto-merged net/mac80211/mlme.c +Auto-merged net/mac80211/rx.c +Auto-merged net/mac80211/wext.c +Auto-merged net/wireless/core.c +Merge made by recursive. + Documentation/networking/bonding.txt | 96 +- + drivers/net/3c515.c | 4 + + drivers/net/3c523.c | 37 +- + drivers/net/3c527.c | 45 +- + drivers/net/8139cp.c | 43 +- + drivers/net/8139too.c | 53 +- + drivers/net/8390.h | 1 - + drivers/net/Kconfig | 2 + + drivers/net/acenic.c | 21 +- + drivers/net/acenic.h | 1 - + drivers/net/atlx/atl1.c | 3 +- + drivers/net/bnx2.c | 242 ++- + drivers/net/bnx2.h | 4 +- + drivers/net/bnx2_fw.h | 80 + + drivers/net/bonding/bond_main.c | 706 ++++--- + drivers/net/bonding/bond_sysfs.c | 81 +- + drivers/net/bonding/bonding.h | 13 +- + drivers/net/cxgb3/adapter.h | 18 + + drivers/net/cxgb3/common.h | 1 + + drivers/net/cxgb3/cxgb3_ioctl.h | 1 + + drivers/net/cxgb3/cxgb3_main.c | 19 + + drivers/net/cxgb3/sge.c | 391 +++- + drivers/net/cxgb3/t3_cpl.h | 11 + + drivers/net/dl2k.c | 8 +- + drivers/net/dm9000.c | 6 +- + drivers/net/gianfar.c | 2 +- + drivers/net/hamachi.c | 12 +- + drivers/net/hamradio/6pack.c | 24 +- + drivers/net/ixp2000/ixpdev.c | 4 +- + drivers/net/lib8390.c | 96 +- + drivers/net/natsemi.c | 4 +- + drivers/net/niu.h | 2 +- + drivers/net/pcmcia/3c574_cs.c | 47 +- + drivers/net/pcmcia/3c589_cs.c | 49 +- + drivers/net/pcmcia/axnet_cs.c | 70 +- + drivers/net/pcnet32.c | 6 +- + drivers/net/phy/Kconfig | 3 +- + drivers/net/phy/broadcom.c | 201 ++- + drivers/net/ppp_generic.c | 22 +- + drivers/net/qla3xxx.c | 4 +- + drivers/net/s2io.c | 4 +- + drivers/net/s2io.h | 2 +- + drivers/net/sb1250-mac.c | 2 +- + drivers/net/sis190.c | 2 +- + drivers/net/sis900.c | 2 +- + drivers/net/sky2.c | 2 +- + drivers/net/spider_net.c | 4 +- + drivers/net/tg3.c | 1268 ++++++++---- + drivers/net/tg3.h | 40 +- + drivers/net/tokenring/3c359.c | 20 +- + drivers/net/tokenring/3c359.h | 2 - + drivers/net/tsi108_eth.c | 4 +- + drivers/net/ucc_geth_ethtool.c | 4 +- + drivers/net/via-velocity.c | 25 +- + drivers/net/wireless/adm8211.c | 14 +- + drivers/net/wireless/airo.c | 57 +- + drivers/net/wireless/arlan-main.c | 40 +- + drivers/net/wireless/arlan.h | 1 - + drivers/net/wireless/ath5k/base.c | 33 +- + drivers/net/wireless/ath5k/base.h | 3 +- + drivers/net/wireless/atmel.c | 46 +- + drivers/net/wireless/b43/b43.h | 19 +- + drivers/net/wireless/b43/debugfs.c | 77 +- + drivers/net/wireless/b43/debugfs.h | 1 + + drivers/net/wireless/b43/dma.c | 8 +- + drivers/net/wireless/b43/lo.c | 731 +++----- + drivers/net/wireless/b43/lo.h | 115 +- + drivers/net/wireless/b43/main.c | 58 +- + drivers/net/wireless/b43/main.h | 3 + + drivers/net/wireless/b43/nphy.c | 2 - + drivers/net/wireless/b43/phy.c | 291 +--- + drivers/net/wireless/b43/phy.h | 16 +- + drivers/net/wireless/b43/pio.c | 8 +- + drivers/net/wireless/b43/xmit.c | 7 +- + drivers/net/wireless/b43legacy/b43legacy.h | 17 - + drivers/net/wireless/b43legacy/dma.c | 8 +- + drivers/net/wireless/b43legacy/main.c | 18 +- + drivers/net/wireless/b43legacy/phy.c | 14 +- + drivers/net/wireless/b43legacy/pio.c | 8 +- + drivers/net/wireless/b43legacy/radio.c | 12 +- + drivers/net/wireless/b43legacy/xmit.c | 6 +- + drivers/net/wireless/iwlwifi/Kconfig | 40 +- + drivers/net/wireless/iwlwifi/Makefile | 11 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 13 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 1 - + drivers/net/wireless/iwlwifi/iwl-3945.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 615 +------ + drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 1017 +++++----- + drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 87 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 2214 +++++--------------- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 133 ++ + drivers/net/wireless/iwlwifi/iwl-5000.c | 560 +++++ + drivers/net/wireless/iwlwifi/iwl-calib.c | 779 +++++++ + drivers/net/wireless/iwlwifi/iwl-calib.h | 104 + + .../{iwl-4965-commands.h => iwl-commands.h} | 111 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 780 +++++++- + drivers/net/wireless/iwlwifi/iwl-core.h | 79 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 32 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 46 +- + .../net/wireless/iwlwifi/{iwl-4965.h => iwl-dev.h} | 281 ++-- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 118 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 205 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 391 ++++ + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 423 ++++ + drivers/net/wireless/iwlwifi/iwl-power.h | 76 + + drivers/net/wireless/iwlwifi/iwl-prph.h | 310 +++- + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 422 ++++ + drivers/net/wireless/iwlwifi/iwl-sta.c | 151 ++- + drivers/net/wireless/iwlwifi/iwl-sta.h | 11 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 373 ++++ + drivers/net/wireless/iwlwifi/iwl3945-base.c | 79 +- + drivers/net/wireless/iwlwifi/iwl4965-base.c | 2145 +++++--------------- + drivers/net/wireless/libertas/cmd.c | 32 - + drivers/net/wireless/libertas/cmd.h | 3 +- + drivers/net/wireless/libertas/decl.h | 4 +- + drivers/net/wireless/libertas/main.c | 38 +- + drivers/net/wireless/p54/p54.h | 2 +- + drivers/net/wireless/p54/p54common.c | 35 +- + drivers/net/wireless/rt2x00/Kconfig | 55 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 42 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 41 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 26 +- + drivers/net/wireless/rt2x00/rt2x00.h | 20 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 39 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 6 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 37 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 21 +- + drivers/net/wireless/rt2x00/rt61pci.c | 32 +- + drivers/net/wireless/rt2x00/rt73usb.c | 38 +- + drivers/net/wireless/rtl8180_dev.c | 9 +- + drivers/net/wireless/rtl8187_dev.c | 10 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 29 +- + drivers/ssb/pci.c | 20 +- + include/linux/brcmphy.h | 6 + + include/linux/ieee80211.h | 32 +- + include/linux/pci_ids.h | 1 + + include/linux/tcp.h | 50 +- + include/linux/tipc_config.h | 10 +- + include/linux/wanrouter.h | 2 +- + include/net/ieee80211.h | 11 - + include/net/ip6_tunnel.h | 1 - + include/net/ipip.h | 1 - + include/net/mac80211.h | 152 +- + include/net/net_namespace.h | 3 + + include/net/sctp/sctp.h | 2 + + include/net/sctp/structs.h | 4 + + include/net/sctp/user.h | 36 +- + include/net/tipc/tipc_port.h | 3 +- + net/bridge/br_device.c | 11 +- + net/bridge/br_forward.c | 2 +- + net/bridge/br_input.c | 10 +- + net/bridge/br_private.h | 1 - + net/core/net-sysfs.c | 9 +- + net/core/rtnetlink.c | 20 +- + net/core/sysctl_net_core.c | 39 +- + net/ieee80211/ieee80211_rx.c | 2 +- + net/ieee80211/ieee80211_tx.c | 86 - + net/ieee80211/ieee80211_wx.c | 89 - + net/ipv4/ip_fragment.c | 34 +- + net/ipv4/ip_gre.c | 32 +- + net/ipv4/ipip.c | 22 +- + net/ipv4/ipmr.c | 29 +- + net/ipv6/ip6_tunnel.c | 26 +- + net/ipv6/ip6mr.c | 22 +- + net/ipv6/reassembly.c | 61 +- + net/ipv6/sit.c | 24 +- + net/ipv6/sysctl_net_ipv6.c | 29 +- + net/irda/irnet/irnet_ppp.c | 54 +- + net/irda/irnet/irnet_ppp.h | 7 +- + net/mac80211/aes_ccm.c | 2 +- + net/mac80211/aes_ccm.h | 2 +- + net/mac80211/cfg.c | 2 + + net/mac80211/debugfs.c | 43 - + net/mac80211/debugfs_netdev.c | 2 +- + net/mac80211/debugfs_sta.c | 55 +- + net/mac80211/ieee80211_i.h | 17 +- + net/mac80211/iface.c | 6 +- + net/mac80211/key.c | 11 +- + net/mac80211/main.c | 52 +- + net/mac80211/mesh_hwmp.c | 2 +- + net/mac80211/mesh_plink.c | 88 +- + net/mac80211/mlme.c | 139 +- + net/mac80211/rx.c | 219 ++- + net/mac80211/sta_info.c | 16 +- + net/mac80211/sta_info.h | 74 +- + net/mac80211/tkip.c | 145 +- + net/mac80211/tkip.h | 4 +- + net/mac80211/tx.c | 30 +- + net/mac80211/wep.c | 2 +- + net/mac80211/wep.h | 2 +- + net/mac80211/wext.c | 28 +- + net/mac80211/wme.c | 119 +- + net/mac80211/wpa.c | 8 +- + net/sctp/associola.c | 3 + + net/sctp/proc.c | 141 ++ + net/sctp/protocol.c | 3 + + net/sctp/sm_sideeffect.c | 17 +- + net/sctp/socket.c | 306 ++- + net/sysctl_net.c | 30 + + net/tipc/config.c | 11 +- + net/tipc/core.c | 13 +- + net/tipc/core.h | 126 +- + net/tipc/dbg.c | 231 +-- + net/tipc/dbg.h | 12 +- + net/tipc/discover.c | 5 +- + net/tipc/link.c | 20 +- + net/tipc/msg.c | 10 +- + net/tipc/name_distr.c | 3 - + net/tipc/name_table.c | 7 +- + net/tipc/net.c | 10 +- + net/tipc/net.h | 2 +- + net/tipc/netlink.c | 16 +- + net/tipc/node.c | 26 + + net/tipc/port.c | 21 +- + net/tipc/ref.c | 12 +- + net/tipc/socket.c | 5 +- + net/tipc/subscr.c | 249 ++- + net/tipc/subscr.h | 34 +- + net/wanrouter/wanmain.c | 6 +- + net/wanrouter/wanproc.c | 2 +- + net/wireless/core.c | 33 +- + net/wireless/radiotap.c | 16 +- + 231 files changed, 11963 insertions(+), 9051 deletions(-) + create mode 100644 drivers/net/wireless/iwlwifi/iwl-5000-hw.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-5000.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-calib.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-calib.h + rename drivers/net/wireless/iwlwifi/{iwl-4965-commands.h => iwl-commands.h} (96%) + rename drivers/net/wireless/iwlwifi/{iwl-4965.h => iwl-dev.h} (85%) + create mode 100644 drivers/net/wireless/iwlwifi/iwl-fh.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-power.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-power.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-rx.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-tx.c + create mode 100644 include/linux/brcmphy.h +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Auto-merged arch/powerpc/boot/dts/mpc8610_hpcd.dts +Auto-merged arch/powerpc/kernel/entry_32.S +Auto-merged arch/powerpc/kernel/irq.c +Auto-merged arch/powerpc/kernel/setup_32.c +Merge made by recursive. + Documentation/powerpc/booting-without-of.txt | 49 +- + arch/powerpc/boot/Makefile | 3 +- + arch/powerpc/boot/dts/asp834x-redboot.dts | 247 ++++++ + arch/powerpc/boot/dts/ksi8560.dts | 3 +- + arch/powerpc/boot/dts/mpc7448hpc2.dts | 2 - + arch/powerpc/boot/dts/mpc8540ads.dts | 5 +- + arch/powerpc/boot/dts/mpc8541cds.dts | 5 +- + arch/powerpc/boot/dts/mpc8544ds.dts | 21 +- + arch/powerpc/boot/dts/mpc8548cds.dts | 5 +- + arch/powerpc/boot/dts/mpc8555cds.dts | 5 +- + arch/powerpc/boot/dts/mpc8560ads.dts | 3 +- + arch/powerpc/boot/dts/mpc8568mds.dts | 5 +- + arch/powerpc/boot/dts/mpc8572ds.dts | 22 +- + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 18 +- + arch/powerpc/boot/dts/mpc8641_hpcn.dts | 2 - + arch/powerpc/boot/dts/sbc8548.dts | 5 +- + arch/powerpc/boot/dts/sbc8560.dts | 5 +- + arch/powerpc/boot/dts/storcenter.dts | 1 + + arch/powerpc/boot/dts/stx_gp3_8560.dts | 4 +- + arch/powerpc/boot/dts/tqm8540.dts | 4 +- + arch/powerpc/boot/dts/tqm8541.dts | 4 +- + arch/powerpc/boot/dts/tqm8555.dts | 4 +- + arch/powerpc/boot/dts/tqm8560.dts | 4 +- + arch/powerpc/boot/redboot-83xx.c | 60 ++ + arch/powerpc/boot/wrapper | 6 +- + arch/powerpc/configs/asp8347_defconfig | 1214 ++++++++++++++++++++++++++ + arch/powerpc/kernel/asm-offsets.c | 23 + + arch/powerpc/kernel/entry_32.S | 138 +++- + arch/powerpc/kernel/head_40x.S | 24 +- + arch/powerpc/kernel/head_44x.S | 9 - + arch/powerpc/kernel/head_booke.h | 100 ++- + arch/powerpc/kernel/head_fsl_booke.S | 9 - + arch/powerpc/kernel/irq.c | 33 + + arch/powerpc/kernel/setup_32.c | 24 + + arch/powerpc/platforms/83xx/Kconfig | 9 + + arch/powerpc/platforms/83xx/Makefile | 1 + + arch/powerpc/platforms/83xx/asp834x.c | 90 ++ + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 4 +- + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 3 +- + arch/powerpc/sysdev/Makefile | 3 +- + arch/powerpc/sysdev/fsl_msi.c | 429 +++++++++ + arch/powerpc/sysdev/fsl_msi.h | 42 + + arch/powerpc/sysdev/fsl_pci.c | 12 + + arch/powerpc/sysdev/fsl_soc.c | 5 + + include/asm-powerpc/irq.h | 13 + + 45 files changed, 2544 insertions(+), 133 deletions(-) + create mode 100644 arch/powerpc/boot/dts/asp834x-redboot.dts + create mode 100644 arch/powerpc/boot/redboot-83xx.c + create mode 100644 arch/powerpc/configs/asp8347_defconfig + create mode 100644 arch/powerpc/platforms/83xx/asp834x.c + create mode 100644 arch/powerpc/sysdev/fsl_msi.c + create mode 100644 arch/powerpc/sysdev/fsl_msi.h +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/chips/cfi_cmdset_0001.c | 6 +++++- + drivers/mtd/chips/jedec_probe.c | 32 ++++++++++++++++++++++++++++++++ + 2 files changed, 37 insertions(+), 1 deletions(-) +Merging wireless/master +$ git merge wireless/master +Auto-merged drivers/net/Kconfig +Auto-merged drivers/net/wireless/b43/b43.h +Auto-merged drivers/net/wireless/b43/main.c +Auto-merged drivers/net/wireless/b43legacy/main.c +Auto-merged drivers/net/wireless/ipw2200.c +Auto-merged drivers/net/wireless/iwlwifi/iwl-4965-rs.c +Auto-merged drivers/net/wireless/libertas/defs.h +Auto-merged drivers/net/wireless/libertas/if_cs.c +Auto-merged drivers/net/wireless/libertas/if_usb.c +Auto-merged drivers/net/wireless/libertas/main.c +CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/main.c +Auto-merged drivers/net/wireless/rndis_wlan.c +Auto-merged drivers/net/wireless/rt2x00/rt2x00.h +Auto-merged drivers/net/wireless/rt2x00/rt2x00dev.c +CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2x00dev.c +Auto-merged drivers/net/wireless/rt2x00/rt2x00mac.c +Auto-merged drivers/net/wireless/rt2x00/rt2x00pci.h +Auto-merged drivers/net/wireless/rt2x00/rt61pci.c +Auto-merged drivers/net/wireless/rt2x00/rt73usb.c +Auto-merged drivers/net/wireless/rtl8187_dev.c +Auto-merged drivers/net/wireless/zd1211rw/zd_mac.c +Auto-merged drivers/net/wireless/zd1211rw/zd_usb.c +Auto-merged include/linux/wireless.h +Auto-merged include/net/mac80211.h +Auto-merged include/net/wireless.h +Auto-merged net/mac80211/cfg.c +Auto-merged net/mac80211/main.c +Auto-merged net/mac80211/mlme.c +Auto-merged net/mac80211/rx.c +Auto-merged net/mac80211/util.c +Resolved 'drivers/net/wireless/libertas/main.c' using previous resolution. +Resolved 'drivers/net/wireless/rt2x00/rt2x00dev.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + drivers/net/Kconfig | 13 + + drivers/net/ps3_gelic_net.c | 10 +- + drivers/net/ps3_gelic_net.h | 2 +- + drivers/net/ps3_gelic_wireless.c | 206 ++-- + drivers/net/ps3_gelic_wireless.h | 7 +- + drivers/net/wireless/adm8211.c | 35 +- + drivers/net/wireless/adm8211.h | 1 - + drivers/net/wireless/ath5k/base.c | 74 +- + drivers/net/wireless/ath5k/base.h | 1 - + drivers/net/wireless/b43/b43.h | 28 +- + drivers/net/wireless/b43/dma.c | 46 +- + drivers/net/wireless/b43/dma.h | 3 +- + drivers/net/wireless/b43/main.c | 225 +++- + drivers/net/wireless/b43/pio.c | 36 +- + drivers/net/wireless/b43/pio.h | 8 +- + drivers/net/wireless/b43/xmit.c | 65 +- + drivers/net/wireless/b43/xmit.h | 4 +- + drivers/net/wireless/b43legacy/dma.c | 35 +- + drivers/net/wireless/b43legacy/dma.h | 7 +- + drivers/net/wireless/b43legacy/main.c | 13 +- + drivers/net/wireless/b43legacy/pio.c | 19 +- + drivers/net/wireless/b43legacy/pio.h | 7 +- + drivers/net/wireless/b43legacy/xmit.c | 47 +- + drivers/net/wireless/b43legacy/xmit.h | 2 +- + drivers/net/wireless/ipw2200.c | 176 ++-- + drivers/net/wireless/ipw2200.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 5 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 169 ++-- + drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 1019 ++++++---------- + drivers/net/wireless/iwlwifi/iwl-5000.c | 897 ++++++++++++++- + drivers/net/wireless/iwlwifi/iwl-calib.c | 27 + + drivers/net/wireless/iwlwifi/iwl-calib.h | 9 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 243 ++++- + drivers/net/wireless/iwlwifi/iwl-core.c | 327 +++++- + drivers/net/wireless/iwlwifi/iwl-core.h | 56 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 10 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 55 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 152 ++- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 28 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 1 + + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 21 + + drivers/net/wireless/iwlwifi/iwl-prph.h | 39 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 48 + + drivers/net/wireless/iwlwifi/iwl-sta.c | 501 ++++++++- + drivers/net/wireless/iwlwifi/iwl-sta.h | 7 + + drivers/net/wireless/iwlwifi/iwl-tx.c | 1058 +++++++++++++++++- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 90 +- + drivers/net/wireless/iwlwifi/iwl4965-base.c | 1670 +++------------------------ + drivers/net/wireless/libertas/Makefile | 8 +- + drivers/net/wireless/libertas/assoc.c | 8 +- + drivers/net/wireless/libertas/cmd.c | 174 ++- + drivers/net/wireless/libertas/cmd.h | 5 + + drivers/net/wireless/libertas/cmdresp.c | 25 +- + drivers/net/wireless/libertas/decl.h | 4 + + drivers/net/wireless/libertas/defs.h | 14 +- + drivers/net/wireless/libertas/dev.h | 8 +- + drivers/net/wireless/libertas/host.h | 17 + + drivers/net/wireless/libertas/hostcmd.h | 4 +- + drivers/net/wireless/libertas/if_cs.c | 227 ++-- + drivers/net/wireless/libertas/if_usb.c | 22 + + drivers/net/wireless/libertas/main.c | 216 +++-- + drivers/net/wireless/libertas/persistcfg.c | 453 ++++++++ + drivers/net/wireless/libertas/rx.c | 4 +- + drivers/net/wireless/libertas/types.h | 30 + + drivers/net/wireless/libertas/wext.c | 32 +- + drivers/net/wireless/p54/p54common.c | 106 +- + drivers/net/wireless/p54/p54common.h | 1 - + drivers/net/wireless/p54/p54pci.c | 2 +- + drivers/net/wireless/rndis_wlan.c | 2 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 132 ++- + drivers/net/wireless/rt2x00/rt2400pci.h | 5 + + drivers/net/wireless/rt2x00/rt2500pci.c | 120 ++- + drivers/net/wireless/rt2x00/rt2500pci.h | 5 + + drivers/net/wireless/rt2x00/rt2500usb.c | 85 +- + drivers/net/wireless/rt2x00/rt2500usb.h | 5 + + drivers/net/wireless/rt2x00/rt2x00.h | 52 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 226 +--- + drivers/net/wireless/rt2x00/rt2x00lib.h | 6 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 76 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 103 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 28 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 167 +++- + drivers/net/wireless/rt2x00/rt2x00queue.h | 73 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 11 - + drivers/net/wireless/rt2x00/rt2x00usb.c | 228 ++-- + drivers/net/wireless/rt2x00/rt2x00usb.h | 26 +- + drivers/net/wireless/rt2x00/rt61pci.c | 133 ++- + drivers/net/wireless/rt2x00/rt61pci.h | 5 + + drivers/net/wireless/rt2x00/rt73usb.c | 59 +- + drivers/net/wireless/rt2x00/rt73usb.h | 5 + + drivers/net/wireless/rtl8180_dev.c | 62 +- + drivers/net/wireless/rtl8187.h | 6 - + drivers/net/wireless/rtl8187_dev.c | 45 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 161 +-- + drivers/net/wireless/zd1211rw/zd_mac.h | 16 - + drivers/net/wireless/zd1211rw/zd_usb.c | 29 +- + include/linux/ieee80211.h | 20 +- + include/linux/wireless.h | 2 + + include/net/mac80211.h | 350 +++--- + include/net/wireless.h | 6 + + net/mac80211/Kconfig | 14 +- + net/mac80211/Makefile | 2 +- + net/mac80211/cfg.c | 4 +- + net/mac80211/debugfs_key.c | 8 +- + net/mac80211/debugfs_netdev.c | 9 - + net/mac80211/debugfs_sta.c | 1 - + net/mac80211/ieee80211_i.h | 78 +- + net/mac80211/iface.c | 2 +- + net/mac80211/key.h | 17 +- + net/mac80211/main.c | 291 +++--- + net/mac80211/mesh.c | 38 +- + net/mac80211/mesh.h | 2 +- + net/mac80211/mesh_pathtbl.c | 53 +- + net/mac80211/michael.c | 106 +-- + net/mac80211/michael.h | 8 +- + net/mac80211/mlme.c | 88 ++- + net/mac80211/rate.c | 12 +- + net/mac80211/rate.h | 33 +- + net/mac80211/rc80211_pid.h | 4 +- + net/mac80211/rc80211_pid_algo.c | 22 +- + net/mac80211/rc80211_pid_debugfs.c | 8 +- + net/mac80211/rx.c | 72 +- + net/mac80211/sta_info.c | 8 +- + net/mac80211/sta_info.h | 6 +- + net/mac80211/tkip.c | 86 +- + net/mac80211/tkip.h | 4 - + net/mac80211/tx.c | 841 +++++++------- + net/mac80211/util.c | 59 +- + net/mac80211/wep.c | 19 +- + net/mac80211/wme.c | 28 +- + net/mac80211/wme.h | 2 +- + net/mac80211/wpa.c | 135 +-- + 139 files changed, 7703 insertions(+), 5548 deletions(-) + create mode 100644 drivers/net/wireless/libertas/persistcfg.c +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + crypto/Kconfig | 52 +++++ + crypto/Makefile | 5 + + crypto/ahash.c | 106 +++++++++ + crypto/api.c | 8 +- + crypto/cryptd.c | 252 +++++++++++++++++++++- + crypto/digest.c | 81 +++++++ + crypto/hash.c | 102 ++++++++- + crypto/internal.h | 1 + + crypto/ripemd.h | 43 ++++ + crypto/rmd128.c | 325 +++++++++++++++++++++++++++ + crypto/rmd160.c | 369 +++++++++++++++++++++++++++++++ + crypto/rmd256.c | 344 +++++++++++++++++++++++++++++ + crypto/rmd320.c | 393 +++++++++++++++++++++++++++++++++ + crypto/tcrypt.c | 172 ++++++++++++--- + crypto/tcrypt.h | 526 +++++++++++++++++++++++++++++++++++++++++++- + drivers/crypto/hifn_795x.c | 367 +++++++++++++++---------------- + include/crypto/algapi.h | 36 +++ + include/linux/crypto.h | 187 +++++++++++++++- + 18 files changed, 3121 insertions(+), 248 deletions(-) + create mode 100644 crypto/ahash.c + create mode 100644 crypto/ripemd.h + create mode 100644 crypto/rmd128.c + create mode 100644 crypto/rmd160.c + create mode 100644 crypto/rmd256.c + create mode 100644 crypto/rmd320.c +Merging vfs/vfs-2.6.25 +$ git merge vfs/vfs-2.6.25 +Auto-merged fs/exec.c +Auto-merged kernel/fork.c +Auto-merged kernel/sysctl.c +Merge made by recursive. +Merging sound/master +$ git merge sound/master +Auto-merged sound/core/init.c +Auto-merged sound/pci/ac97/ac97_patch.c +Auto-merged sound/pci/hda/patch_realtek.c +Auto-merged sound/pci/pcxhr/pcxhr_core.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 12 +- + .../sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 4 +- + include/sound/core.h | 8 +- + include/sound/emu10k1.h | 1 + + include/sound/soc-dapm.h | 25 +- + include/sound/soc.h | 73 +- + include/sound/uda1341.h | 2 - + sound/Kconfig | 34 +- + sound/aoa/Kconfig | 11 +- + sound/aoa/codecs/Kconfig | 4 - + sound/aoa/fabrics/Kconfig | 1 - + sound/aoa/soundbus/Kconfig | 1 - + sound/arm/Kconfig | 21 +- + sound/arm/sa11xx-uda1341.c | 2 - + sound/core/Kconfig | 29 +- + sound/core/init.c | 67 +- + sound/core/memalloc.c | 62 - + sound/drivers/Kconfig | 91 +- + sound/i2c/cs8427.c | 6 +- + sound/i2c/l3/uda1341.c | 2 - + sound/isa/Kconfig | 51 +- + sound/isa/sb/Makefile | 2 - + sound/mips/Kconfig | 14 +- + sound/oss/Kconfig | 49 +- + sound/oss/msnd.c | 2 - + sound/oss/msnd.h | 2 - + sound/oss/msnd_classic.h | 2 - + sound/oss/msnd_pinnacle.c | 5 - + sound/oss/msnd_pinnacle.h | 2 - + sound/parisc/Kconfig | 13 +- + sound/pci/Kconfig | 104 +-- + sound/pci/Makefile | 2 +- + sound/pci/ac97/Makefile | 12 +- + sound/pci/ac97/ac97_patch.c | 76 ++ + sound/pci/{ac97 => }/ak4531_codec.c | 32 +- + sound/pci/au88x0/au88x0_game.c | 2 - + sound/pci/azt3328.c | 1192 +++++++++++++------- + sound/pci/azt3328.h | 197 +++- + sound/pci/emu10k1/emu10k1_main.c | 1 + + sound/pci/emu10k1/emumixer.c | 13 +- + sound/pci/emu10k1/memory.c | 66 +- + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_hwdep.c | 2 +- + sound/pci/hda/hda_intel.c | 134 ++- + sound/pci/hda/patch_realtek.c | 377 ++++++- + sound/pci/ice1712/envy24ht.h | 10 +- + sound/pci/ice1712/ice1712.h | 2 + + sound/pci/ice1712/ice1724.c | 213 +++- + sound/pci/oxygen/hifier.c | 33 +- + sound/pci/oxygen/oxygen.c | 76 +- + sound/pci/oxygen/oxygen.h | 14 + + sound/pci/oxygen/oxygen_io.c | 22 +- + sound/pci/oxygen/oxygen_lib.c | 106 ++- + sound/pci/oxygen/oxygen_pcm.c | 53 +- + sound/pci/oxygen/virtuoso.c | 252 +++-- + sound/pci/pcxhr/pcxhr.c | 4 +- + sound/pci/pcxhr/pcxhr_core.c | 18 +- + sound/pci/trident/trident_memory.c | 178 --- + sound/pcmcia/Kconfig | 15 +- + sound/ppc/Kconfig | 26 +- + sound/sh/Kconfig | 16 +- + sound/soc/Kconfig | 17 +- + sound/soc/at91/Kconfig | 2 +- + sound/soc/at91/eti_b1_wm8731.c | 17 +- + sound/soc/codecs/Kconfig | 13 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ac97.c | 3 - + sound/soc/codecs/tlv320aic3x.c | 319 +++--- + sound/soc/codecs/tlv320aic3x.h | 51 + + sound/soc/codecs/uda1380.c | 852 ++++++++++++++ + sound/soc/codecs/uda1380.h | 89 ++ + sound/soc/codecs/wm8731.c | 44 +- + sound/soc/codecs/wm8750.c | 52 +- + sound/soc/codecs/wm8753.c | 53 +- + sound/soc/codecs/wm9712.c | 46 +- + sound/soc/codecs/wm9713.c | 44 +- + sound/soc/davinci/Kconfig | 2 +- + sound/soc/davinci/davinci-evm.c | 14 +- + sound/soc/fsl/Kconfig | 2 +- + sound/soc/omap/n810.c | 35 +- + sound/soc/pxa/Kconfig | 11 +- + sound/soc/pxa/Makefile | 3 +- + sound/soc/pxa/corgi.c | 16 +- + sound/soc/pxa/em-x270.c | 102 ++ + sound/soc/pxa/poodle.c | 14 +- + sound/soc/pxa/pxa2xx-i2s.c | 3 - + sound/soc/pxa/spitz.c | 17 +- + sound/soc/pxa/tosa.c | 17 +- + sound/soc/s3c24xx/Kconfig | 4 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 67 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 3 - + sound/soc/s3c24xx/s3c24xx-i2s.c | 10 +- + sound/soc/s3c24xx/s3c24xx-pcm.c | 4 - + sound/soc/s3c24xx/smdk2443_wm9710.c | 3 - + sound/soc/sh/Kconfig | 5 +- + sound/soc/soc-core.c | 201 +++- + sound/soc/soc-dapm.c | 171 +++- + sound/sparc/Kconfig | 17 +- + sound/spi/Kconfig | 13 +- + sound/usb/Kconfig | 16 +- + sound/usb/caiaq/caiaq-audio.c | 1 + + sound/usb/caiaq/caiaq-device.c | 12 +- + sound/usb/caiaq/caiaq-device.h | 1 + + sound/usb/usbquirks.h | 33 + + 104 files changed, 4309 insertions(+), 1940 deletions(-) + rename sound/pci/{ac97 => }/ak4531_codec.c (96%) + create mode 100644 sound/soc/codecs/uda1380.c + create mode 100644 sound/soc/codecs/uda1380.h + create mode 100644 sound/soc/pxa/em-x270.c +Merging arm/devel +$ git merge arm/devel +Auto-merged arch/arm/Kconfig +Removed arch/arm/common/rtctime.c +Auto-merged arch/arm/kernel/ecard.c +Removed arch/arm/mach-footbridge/co285.c +Removed arch/arm/mach-integrator/time.c +Auto-merged arch/arm/mach-pxa/em-x270.c +Auto-merged arch/arm/mach-pxa/spitz.c +Auto-merged arch/arm/mach-pxa/tosa.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c +Auto-merged drivers/i2c/busses/i2c-pxa.c +Auto-merged drivers/net/arm/etherh.c +Auto-merged drivers/rtc/rtc-at91sam9.c +Auto-merged drivers/rtc/rtc-omap.c +Auto-merged drivers/usb/gadget/pxa2xx_udc.c +Removed include/asm-arm/dyntick.h +Removed include/asm-arm/rtc.h +Auto-merged kernel/sysctl.c +Auto-merged sound/soc/pxa/pxa2xx-i2s.c +Resolved 'arch/arm/mach-pxa/tosa.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 33 +- + arch/arm/Makefile | 2 - + arch/arm/common/Makefile | 1 - + arch/arm/common/rtctime.c | 434 ---------- + arch/arm/common/sharpsl_pm.c | 3 + + arch/arm/configs/at91cap9adk_defconfig | 82 ++- + arch/arm/configs/at91rm9200dk_defconfig | 1 - + arch/arm/configs/at91rm9200ek_defconfig | 1 - + arch/arm/configs/at91sam9260ek_defconfig | 1 - + arch/arm/configs/at91sam9261ek_defconfig | 1 - + arch/arm/configs/at91sam9263ek_defconfig | 1 - + arch/arm/configs/at91sam9rlek_defconfig | 1 - + arch/arm/configs/ateb9200_defconfig | 1 - + arch/arm/configs/collie_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/ecbat91_defconfig | 1 - + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/eseries_pxa_defconfig | 1 - + arch/arm/configs/iop13xx_defconfig | 1 - + arch/arm/configs/iop32x_defconfig | 1 - + arch/arm/configs/iop33x_defconfig | 1 - + arch/arm/configs/ixp2000_defconfig | 1 - + arch/arm/configs/ixp23xx_defconfig | 1 - + arch/arm/configs/ixp4xx_defconfig | 9 +- + arch/arm/configs/kafa_defconfig | 1 - + arch/arm/configs/kb9202_defconfig | 1 - + arch/arm/configs/ks8695_defconfig | 1 - + arch/arm/configs/lpd270_defconfig | 1 - + arch/arm/configs/lpd7a404_defconfig | 1 - + arch/arm/configs/netx_defconfig | 1 - + arch/arm/configs/onearm_defconfig | 1 - + arch/arm/configs/picotux200_defconfig | 1 - + arch/arm/configs/pnx4008_defconfig | 1 - + .../{em_x270_defconfig => qil-a9260_defconfig} | 729 ++++++++--------- + arch/arm/configs/realview-smp_defconfig | 1 - + arch/arm/configs/realview_defconfig | 1 - + arch/arm/configs/rpc_defconfig | 1 - + arch/arm/configs/s3c2410_defconfig | 1 - + arch/arm/configs/sam9_l9260_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + arch/arm/configs/tct_hammer_defconfig | 1 - + arch/arm/configs/trizeps4_defconfig | 1 - + .../{em_x270_defconfig => usb-a9260_defconfig} | 699 +++++++---------- + .../{em_x270_defconfig => usb-a9263_defconfig} | 691 +++++++---------- + arch/arm/configs/versatile_defconfig | 1 - + .../{cm_x270_defconfig => xm_x270_defconfig} | 861 ++++++++++++++------ + arch/arm/kernel/ecard.c | 13 +- + arch/arm/kernel/ecard.h | 13 + + arch/arm/kernel/process.c | 4 +- + arch/arm/kernel/time.c | 120 --- + arch/arm/mach-at91/Kconfig | 27 + + arch/arm/mach-at91/Makefile | 4 + + arch/arm/mach-at91/at91cap9_devices.c | 99 +++ + arch/arm/mach-at91/at91sam9rl_devices.c | 95 +++ + arch/arm/mach-at91/board-cap9adk.c | 9 + + arch/arm/mach-at91/board-carmeva.c | 23 +- + arch/arm/mach-at91/board-csb637.c | 4 +- + arch/arm/mach-at91/board-dk.c | 25 +- + arch/arm/mach-at91/board-eb9200.c | 26 +- + arch/arm/mach-at91/board-ek.c | 25 +- + arch/arm/mach-at91/board-kb9202.c | 29 +- + arch/arm/mach-at91/board-qil-a9260.c | 255 ++++++ + arch/arm/mach-at91/board-sam9rlek.c | 10 + + arch/arm/mach-at91/board-usb-a9260.c | 215 +++++ + arch/arm/mach-at91/board-usb-a9263.c | 230 ++++++ + arch/arm/mach-at91/board-yl-9200.c | 853 +++++++++----------- + arch/arm/mach-at91/clock.c | 45 +- + arch/arm/mach-footbridge/Makefile | 2 - + arch/arm/mach-footbridge/co285.c | 39 - + arch/arm/mach-footbridge/common.c | 21 - + arch/arm/mach-footbridge/ebsa285-leds.c | 2 +- + arch/arm/mach-footbridge/time.c | 3 +- + arch/arm/mach-integrator/Makefile | 2 +- + arch/arm/mach-integrator/time.c | 223 ----- + arch/arm/mach-ixp4xx/Kconfig | 9 + + arch/arm/mach-ixp4xx/Makefile | 2 + + arch/arm/mach-ixp4xx/fsg-pci.c | 71 ++ + arch/arm/mach-ixp4xx/fsg-setup.c | 276 +++++++ + arch/arm/mach-omap1/pm.c | 7 - + arch/arm/mach-omap2/pm.c | 7 - + arch/arm/mach-pxa/Kconfig | 55 +- + arch/arm/mach-pxa/Makefile | 3 +- + arch/arm/mach-pxa/clock.c | 2 +- + arch/arm/mach-pxa/cm-x270-pci.c | 26 +- + arch/arm/mach-pxa/corgi.c | 1 + + arch/arm/mach-pxa/corgi_pm.c | 7 + + arch/arm/mach-pxa/devices.c | 69 ++ + arch/arm/mach-pxa/devices.h | 5 + + arch/arm/mach-pxa/em-x270.c | 1 + + arch/arm/mach-pxa/generic.c | 17 - + arch/arm/mach-pxa/lpd270.c | 47 +- + arch/arm/mach-pxa/magician.c | 110 ++- + arch/arm/mach-pxa/mainstone.c | 63 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 1 + + arch/arm/mach-pxa/poodle.c | 1 + + arch/arm/mach-pxa/pwm.c | 299 +++++++ + arch/arm/mach-pxa/pxa25x.c | 7 +- + arch/arm/mach-pxa/pxa27x.c | 10 +- + arch/arm/mach-pxa/pxa3xx.c | 6 +- + arch/arm/mach-pxa/reset.c | 96 +++ + arch/arm/mach-pxa/spitz.c | 7 +- + arch/arm/mach-pxa/spitz_pm.c | 7 + + arch/arm/mach-pxa/standby.S | 83 +- + arch/arm/mach-pxa/tosa.c | 45 +- + arch/arm/mach-pxa/trizeps4.c | 2 + + arch/arm/mach-pxa/zylonite.c | 26 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 2 +- + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/se7705_defconfig | 1 - + arch/sh/configs/se7712_defconfig | 1 - + arch/sh/configs/se7750_defconfig | 1 - + drivers/i2c/busses/i2c-pxa.c | 29 - + drivers/input/keyboard/tosakbd.c | 2 - + drivers/net/arm/etherh.c | 2 +- + drivers/pcmcia/pxa2xx_cm_x270.c | 15 +- + drivers/pcmcia/pxa2xx_mainstone.c | 13 +- + drivers/pcmcia/pxa2xx_sharpsl.c | 12 +- + drivers/rtc/Kconfig | 19 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-at91rm9200.c | 4 - + drivers/rtc/rtc-at91sam9.c | 1 - + drivers/rtc/rtc-omap.c | 1 - + drivers/rtc/rtc-pl030.c | 217 +++++ + drivers/rtc/rtc-pl031.c | 36 +- + drivers/rtc/rtc-s3c.c | 4 - + drivers/rtc/rtc-sa1100.c | 37 +- + drivers/usb/gadget/Kconfig | 4 +- + drivers/usb/gadget/pxa2xx_udc.c | 10 +- + drivers/video/backlight/Kconfig | 7 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/pwm_bl.c | 185 +++++ + include/asm-arm/arch-at91/at91_pmc.h | 7 +- + include/asm-arm/arch-at91/at91cap9.h | 2 +- + include/asm-arm/arch-at91/at91cap9_matrix.h | 5 + + include/asm-arm/arch-at91/at91sam9rl.h | 2 +- + include/asm-arm/arch-at91/board.h | 4 + + include/asm-arm/arch-at91/timex.h | 17 +- + include/asm-arm/arch-ebsa285/hardware.h | 26 - + include/asm-arm/arch-ebsa285/memory.h | 19 - + include/asm-arm/arch-ebsa285/vmalloc.h | 4 - + include/asm-arm/arch-ixp4xx/fsg.h | 50 ++ + include/asm-arm/arch-ixp4xx/hardware.h | 1 + + include/asm-arm/arch-ixp4xx/irqs.h | 7 + + include/asm-arm/arch-pxa/hardware.h | 12 +- + include/asm-arm/arch-pxa/pxa-regs.h | 570 +------------- + include/asm-arm/arch-pxa/pxa25x-udc.h | 163 ++++ + include/asm-arm/arch-pxa/pxa27x-udc.h | 256 ++++++ + include/asm-arm/arch-pxa/pxa2xx-regs.h | 162 ++++ + include/asm-arm/arch-pxa/system.h | 18 +- + include/asm-arm/arch-pxa/zylonite.h | 1 - + include/asm-arm/arch-rpc/io.h | 5 +- + include/asm-arm/dyntick.h | 6 - + include/asm-arm/ecard.h | 35 - + include/asm-arm/hw_irq.h | 11 - + include/asm-arm/mach/time.h | 22 - + include/asm-arm/rtc.h | 43 - + include/linux/pwm.h | 31 + + include/linux/pwm_backlight.h | 17 + + kernel/hrtimer.c | 2 +- + kernel/sysctl.c | 12 - + kernel/timer.c | 10 +- + sound/soc/pxa/pxa2xx-i2s.c | 12 +- + 164 files changed, 5452 insertions(+), 4054 deletions(-) + delete mode 100644 arch/arm/common/rtctime.c + copy arch/arm/configs/{em_x270_defconfig => qil-a9260_defconfig} (66%) + copy arch/arm/configs/{em_x270_defconfig => usb-a9260_defconfig} (70%) + rename arch/arm/configs/{em_x270_defconfig => usb-a9263_defconfig} (70%) + rename arch/arm/configs/{cm_x270_defconfig => xm_x270_defconfig} (65%) + create mode 100644 arch/arm/mach-at91/board-qil-a9260.c + create mode 100644 arch/arm/mach-at91/board-usb-a9260.c + create mode 100644 arch/arm/mach-at91/board-usb-a9263.c + delete mode 100644 arch/arm/mach-footbridge/co285.c + delete mode 100644 arch/arm/mach-integrator/time.c + create mode 100644 arch/arm/mach-ixp4xx/fsg-pci.c + create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c + create mode 100644 arch/arm/mach-pxa/pwm.c + create mode 100644 arch/arm/mach-pxa/reset.c + create mode 100644 drivers/rtc/rtc-pl030.c + create mode 100644 drivers/video/backlight/pwm_bl.c + create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h + create mode 100644 include/asm-arm/arch-pxa/pxa25x-udc.h + create mode 100644 include/asm-arm/arch-pxa/pxa27x-udc.h + delete mode 100644 include/asm-arm/dyntick.h + delete mode 100644 include/asm-arm/rtc.h + create mode 100644 include/linux/pwm.h + create mode 100644 include/linux/pwm_backlight.h +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merged drivers/cpufreq/cpufreq.c +Auto-merged drivers/cpufreq/freq_table.c +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/powernow-k7.h | 1 - + drivers/cpufreq/cpufreq.c | 45 +++++++++++++++------------- + drivers/cpufreq/cpufreq_stats.c | 24 ++++++++-------- + drivers/cpufreq/freq_table.c | 12 ++++---- + include/linux/cpufreq.h | 3 -- + 5 files changed, 42 insertions(+), 43 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged drivers/char/snsc.c +Auto-merged drivers/char/viotape.c +Auto-merged drivers/infiniband/core/user_mad.c +Auto-merged drivers/lguest/lguest_device.c +Auto-merged drivers/net/3c527.c +Auto-merged drivers/net/wireless/airo.c +Auto-merged drivers/usb/core/usb.c +Auto-merged drivers/virtio/virtio.c +Auto-merged drivers/virtio/virtio_pci.c +Auto-merged fs/xfs/linux-2.6/xfs_buf.c +Auto-merged include/linux/usb.h +Auto-merged kernel/cpu.c +Auto-merged kernel/printk.c +Auto-merged kernel/semaphore.c +Merge made by recursive. + Documentation/DocBook/kernel-locking.tmpl | 57 +++---- + Documentation/lguest/lguest.c | 113 +++++++++++- + arch/ia64/kernel/salinfo.c | 4 +- + drivers/block/virtio_blk.c | 10 +- + drivers/char/snsc.c | 4 +- + drivers/char/viotape.c | 4 +- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/input/serio/hil_mlc.c | 4 +- + drivers/input/serio/hp_sdc_mlc.c | 14 +- + drivers/lguest/lguest_device.c | 3 +- + drivers/md/dm-raid1.c | 2 +- + drivers/net/3c527.c | 2 +- + drivers/net/irda/sir_dev.c | 2 +- + drivers/net/virtio_net.c | 190 ++++++++++++++++++-- + drivers/net/wireless/airo.c | 12 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/gadget/inode.c | 2 +- + drivers/virtio/virtio.c | 5 + + drivers/virtio/virtio_pci.c | 6 +- + drivers/virtio/virtio_ring.c | 28 ++- + fs/ocfs2/inode.c | 4 - + fs/reiserfs/journal.c | 2 +- + fs/xfs/linux-2.6/sema.h | 8 +- + fs/xfs/linux-2.6/xfs_buf.c | 4 +- + include/linux/compiler-gcc.h | 19 ++ + include/linux/compiler-intel.h | 2 + + include/linux/kernel.h | 35 ++++ + include/linux/kthread.h | 29 +++- + include/linux/mutex.h | 4 - + include/linux/semaphore.h | 8 +- + include/linux/stop_machine.h | 27 ++-- + include/linux/timer.h | 32 +++- + include/linux/usb.h | 2 +- + include/linux/virtio_blk.h | 3 + + include/linux/virtio_config.h | 7 + + include/linux/virtio_net.h | 2 +- + include/linux/virtio_ring.h | 15 ++- + kernel/cpu.c | 13 +- + kernel/kthread.c | 29 +--- + kernel/mutex.c | 4 +- + kernel/printk.c | 4 +- + kernel/semaphore.c | 17 +- + kernel/stop_machine.c | 278 +++++++++++++---------------- + 44 files changed, 669 insertions(+), 347 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/cifsglob.h | 3 +- + fs/cifs/cifspdu.h | 23 ++++++-- + fs/cifs/cifssmb.c | 6 +-- + fs/cifs/connect.c | 4 ++ + fs/cifs/dir.c | 4 +- + fs/cifs/file.c | 7 --- + fs/cifs/inode.c | 148 ++++++++++++++++++++++++++++++--------------------- + fs/cifs/misc.c | 3 +- + fs/cifs/readdir.c | 77 ++++++++++++++------------- + 9 files changed, 156 insertions(+), 119 deletions(-) +Merging mmc/next +$ git merge mmc/next +Auto-merged drivers/mmc/core/bus.c +Auto-merged drivers/mmc/host/Kconfig +Auto-merged drivers/mmc/host/sdhci.h +Auto-merged include/linux/mmc/card.h +Auto-merged include/linux/pci_ids.h +Merge made by recursive. + drivers/mmc/core/Kconfig | 12 + + drivers/mmc/core/Makefile | 1 + + drivers/mmc/core/bus.c | 12 + + drivers/mmc/core/core.c | 8 + + drivers/mmc/core/lock.c | 193 +++++++++++ + drivers/mmc/core/lock.h | 41 +++ + drivers/mmc/core/mmc.c | 16 +- + drivers/mmc/core/mmc_ops.c | 117 +++++++ + drivers/mmc/core/mmc_ops.h | 3 + + drivers/mmc/core/sd.c | 16 +- + drivers/mmc/host/Kconfig | 18 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/sdhci-pci.c | 739 ++++++++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/sdhci.c | 541 ++++++++----------------------- + drivers/mmc/host/sdhci.h | 82 ++++-- + include/linux/mmc/card.h | 3 + + include/linux/mmc/mmc.h | 8 + + include/linux/pci_ids.h | 1 + + 18 files changed, 1371 insertions(+), 441 deletions(-) + create mode 100644 drivers/mmc/core/lock.c + create mode 100644 drivers/mmc/core/lock.h + create mode 100644 drivers/mmc/host/sdhci-pci.c +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/locking/nolock/Makefile +Removed fs/gfs2/locking/nolock/main.c +Merge made by recursive. + fs/gfs2/Kconfig | 18 +- + fs/gfs2/Makefile | 1 - + fs/gfs2/glock.c | 1624 ++++++++++++++++----------------------- + fs/gfs2/glock.h | 9 +- + fs/gfs2/glops.c | 70 ++- + fs/gfs2/incore.h | 35 +- + fs/gfs2/locking.c | 52 ++- + fs/gfs2/locking/dlm/lock.c | 356 +++++++-- + fs/gfs2/locking/dlm/lock_dlm.h | 12 +- + fs/gfs2/locking/dlm/mount.c | 4 - + fs/gfs2/locking/dlm/thread.c | 324 +-------- + fs/gfs2/locking/nolock/Makefile | 3 - + fs/gfs2/locking/nolock/main.c | 238 ------ + fs/gfs2/log.c | 2 + + fs/gfs2/log.h | 2 + + fs/gfs2/main.c | 2 - + fs/gfs2/meta_io.c | 14 +- + fs/gfs2/meta_io.h | 1 + + fs/gfs2/ops_address.c | 40 +- + fs/gfs2/ops_file.c | 8 +- + fs/gfs2/ops_fstype.c | 5 +- + fs/gfs2/recovery.c | 5 +- + fs/gfs2/super.c | 3 +- + 23 files changed, 1123 insertions(+), 1705 deletions(-) + delete mode 100644 fs/gfs2/locking/nolock/Makefile + delete mode 100644 fs/gfs2/locking/nolock/main.c +Merging rcu/core/rcu +$ git merge rcu/core/rcu +Already up-to-date. +Merging locking/core/locking +$ git merge locking/core/locking +Merge made by recursive. + kernel/mutex-debug.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging safe-poison-pointers/safe-poison-pointers +$ git merge safe-poison-pointers/safe-poison-pointers +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 10 ++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) +Merging stackprotector/stackprotector +$ git merge stackprotector/stackprotector +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/mm/fault.c +Auto-merged include/asm-x86/pda.h +Auto-merged include/asm-x86/system.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/fork.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/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++- + arch/x86/mm/fault.c | 7 +++ + include/asm-x86/pda.h | 2 - + include/asm-x86/stackprotector.h | 38 +++++++++++++++++++ + include/asm-x86/system.h | 6 ++- + 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 | 77 +++++++++++++++++++++++++++++++++++++- + kernel/sched.c | 7 +--- + 17 files changed, 196 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging input/next +$ git merge input/next +Auto-merged MAINTAINERS +Auto-merged drivers/hwmon/hdaps.c +Auto-merged drivers/input/gameport/gameport.c +Auto-merged drivers/input/gameport/ns558.c +Auto-merged drivers/input/keyboard/atkbd.c +Auto-merged drivers/input/keyboard/pxa27x_keypad.c +Auto-merged drivers/input/serio/i8042-x86ia64io.h +Auto-merged drivers/input/serio/q40kbd.c +Auto-merged drivers/input/serio/serio.c +Auto-merged include/linux/input.h +Merge made by recursive. + Documentation/input/gameport-programming.txt | 2 - + Documentation/input/input.txt | 1 - + Documentation/input/joystick-api.txt | 2 - + Documentation/input/joystick-parport.txt | 1 - + Documentation/input/joystick.txt | 1 - + MAINTAINERS | 6 + + drivers/char/keyboard.c | 2 + + drivers/hwmon/hdaps.c | 2 + + drivers/input/evbug.c | 2 - + drivers/input/ff-memless.c | 4 +- + drivers/input/gameport/emu10k1-gp.c | 2 - + drivers/input/gameport/gameport.c | 22 -- + drivers/input/gameport/lightning.c | 2 - + drivers/input/gameport/ns558.c | 2 - + drivers/input/joystick/a3d.c | 2 - + drivers/input/joystick/amijoy.c | 2 - + drivers/input/joystick/cobra.c | 2 - + drivers/input/joystick/db9.c | 2 - + drivers/input/joystick/gf2k.c | 2 - + drivers/input/joystick/grip.c | 2 - + drivers/input/joystick/grip_mp.c | 2 - + drivers/input/joystick/guillemot.c | 2 - + drivers/input/joystick/iforce/iforce-ff.c | 2 - + drivers/input/joystick/iforce/iforce-main.c | 2 - + drivers/input/joystick/iforce/iforce-packets.c | 2 - + drivers/input/joystick/iforce/iforce-serio.c | 2 - + drivers/input/joystick/iforce/iforce-usb.c | 8 +- + drivers/input/joystick/iforce/iforce.h | 2 - + drivers/input/joystick/interact.c | 2 - + drivers/input/joystick/joydump.c | 2 - + drivers/input/joystick/magellan.c | 2 - + drivers/input/joystick/spaceball.c | 2 - + drivers/input/joystick/spaceorb.c | 2 - + drivers/input/joystick/stinger.c | 2 - + drivers/input/joystick/tmdc.c | 2 - + drivers/input/joystick/turbografx.c | 2 - + drivers/input/joystick/twidjoy.c | 4 - + drivers/input/joystick/warrior.c | 2 - + drivers/input/joystick/xpad.c | 12 +- + drivers/input/keyboard/amikbd.c | 2 - + drivers/input/keyboard/atkbd.c | 20 +- + drivers/input/keyboard/gpio_keys.c | 89 ++++++-- + drivers/input/keyboard/lkkbd.c | 6 +- + drivers/input/keyboard/pxa27x_keypad.c | 15 ++- + drivers/input/keyboard/sunkbd.c | 2 - + drivers/input/keyboard/xtkbd.c | 2 - + drivers/input/misc/ati_remote.c | 18 +- + drivers/input/misc/ati_remote2.c | 18 +- + drivers/input/misc/keyspan_remote.c | 20 +- + drivers/input/misc/powermate.c | 6 +- + drivers/input/misc/yealink.c | 12 +- + drivers/input/mouse/appletouch.c | 299 +++++++++++------------- + drivers/input/mouse/hil_ptr.c | 37 ++- + drivers/input/mouse/inport.c | 2 - + drivers/input/mouse/logibm.c | 2 - + drivers/input/mouse/pc110pad.c | 2 - + drivers/input/mouse/sermouse.c | 2 - + drivers/input/serio/ct82c710.c | 2 - + drivers/input/serio/i8042-x86ia64io.h | 29 ++- + drivers/input/serio/libps2.c | 52 ---- + drivers/input/serio/q40kbd.c | 2 - + drivers/input/serio/rpckbd.c | 2 - + drivers/input/serio/serio.c | 9 +- + drivers/input/tablet/acecad.c | 4 +- + drivers/input/tablet/aiptek.c | 6 +- + drivers/input/tablet/kbtab.c | 6 +- + drivers/input/tablet/wacom.h | 2 +- + drivers/input/tablet/wacom_sys.c | 6 +- + drivers/input/tablet/wacom_wac.c | 39 ++-- + drivers/input/touchscreen/Kconfig | 23 ++ + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/gunze.c | 2 - + drivers/input/touchscreen/h3600_ts_input.c | 2 - + drivers/input/touchscreen/htcpen.c | 255 ++++++++++++++++++++ + drivers/input/touchscreen/migor_ts.c | 250 ++++++++++++++++++++ + drivers/input/touchscreen/usbtouchscreen.c | 22 +- + drivers/macintosh/adbhid.c | 61 ++++- + include/linux/gameport.h | 1 - + include/linux/gpio_keys.h | 1 + + include/linux/input.h | 7 +- + include/linux/joystick.h | 2 - + include/linux/libps2.h | 1 - + 82 files changed, 968 insertions(+), 493 deletions(-) + create mode 100644 drivers/input/touchscreen/htcpen.c + create mode 100644 drivers/input/touchscreen/migor_ts.c +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Auto-merged include/linux/semaphore.h +Merge made by recursive. + drivers/input/keyboard/hil_kbd.c | 1 + + drivers/input/misc/hp_sdc_rtc.c | 1 + + drivers/input/serio/hp_sdc.c | 1 + + include/asm-alpha/semaphore.h | 1 + + include/asm-arm/semaphore.h | 1 + + include/asm-avr32/semaphore.h | 1 + + include/asm-blackfin/semaphore.h | 1 + + include/asm-cris/semaphore.h | 1 + + include/asm-frv/semaphore.h | 1 + + include/asm-h8300/semaphore.h | 1 + + include/asm-ia64/semaphore.h | 1 + + include/asm-m32r/semaphore.h | 1 + + include/asm-m68k/semaphore.h | 1 + + include/asm-m68knommu/semaphore.h | 1 + + include/asm-mips/semaphore.h | 1 + + include/asm-mn10300/semaphore.h | 1 + + include/asm-parisc/semaphore.h | 1 + + include/asm-powerpc/semaphore.h | 1 + + include/asm-s390/semaphore.h | 1 + + include/asm-sh/semaphore.h | 1 + + include/asm-sparc/semaphore.h | 1 + + include/asm-sparc64/semaphore.h | 1 + + include/asm-um/semaphore.h | 1 + + include/asm-v850/semaphore.h | 1 + + include/asm-x86/semaphore.h | 1 + + include/asm-xtensa/semaphore.h | 1 + + include/linux/semaphore.h | 6 ++---- + 27 files changed, 28 insertions(+), 4 deletions(-) +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ps3_gelic_net.c +Auto-merged drivers/net/ps3_gelic_wireless.c +CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/net/ps3_gelic_wireless.h +Auto-merged drivers/scsi/qla2xxx/qla_attr.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_attr.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h +Auto-merged drivers/scsi/qla2xxx/qla_mbx.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c +Auto-merged drivers/scsi/qla2xxx/qla_mid.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mid.c +Auto-merged drivers/scsi/qla2xxx/qla_os.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Recorded preimage for 'drivers/net/ps3_gelic_wireless.c' +Resolved 'drivers/scsi/qla2xxx/qla_attr.c' using previous resolution. +Resolved 'drivers/scsi/qla2xxx/qla_def.h' using previous resolution. +Resolved 'drivers/scsi/qla2xxx/qla_mbx.c' using previous resolution. +Resolved 'drivers/scsi/qla2xxx/qla_mid.c' using previous resolution. +Resolved 'drivers/scsi/qla2xxx/qla_os.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- + drivers/net/bonding/bond_main.c | 21 +++++++++++---------- + drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- + drivers/net/ppp_async.c | 8 ++++---- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/qla2xxx/qla_os.c | 4 +++- + include/net/bluetooth/hci_core.h | 7 ++++--- + net/9p/trans_virtio.c | 21 +++++++++++---------- + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- + 13 files changed, 72 insertions(+), 65 deletions(-) +Merging quilt/ldp.next +$ git merge quilt/ldp.next +Auto-merged drivers/hid/usbhid/hid-quirks.c +Auto-merged drivers/net/Makefile +Merge made by recursive. + drivers/hid/usbhid/hid-quirks.c | 2 + + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/appleir.c | 361 +++++ + drivers/media/video/Kconfig | 9 + + drivers/media/video/Makefile | 1 + + drivers/media/video/s2255drv.c | 2486 ++++++++++++++++++++++++++++++++++ + drivers/net/Makefile | 1 + + drivers/net/usb/Kconfig | 10 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/hso.c | 2836 +++++++++++++++++++++++++++++++++++++++ + 11 files changed, 5720 insertions(+), 0 deletions(-) + create mode 100644 drivers/input/misc/appleir.c + create mode 100644 drivers/media/video/s2255drv.c + create mode 100644 drivers/net/usb/hso.c +Applying ldp: fix fallout from v4l struct element renaming +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged arch/mips/kernel/rtlx.c +Auto-merged arch/mips/sibyte/common/sb_tbprof.c +Auto-merged arch/x86/kernel/apm_32.c +Auto-merged arch/x86/kernel/cpu/mcheck/mce_64.c +Auto-merged arch/x86/kernel/cpuid.c +Auto-merged arch/x86/kernel/microcode.c +Auto-merged arch/x86/kernel/msr.c +Auto-merged block/bsg.c +Auto-merged drivers/block/aoe/aoechr.c +Auto-merged drivers/block/paride/pg.c +Auto-merged drivers/block/paride/pt.c +Auto-merged drivers/char/drm/drm_fops.c +Auto-merged drivers/char/dsp56k.c +Auto-merged drivers/char/ip2/ip2main.c +Auto-merged drivers/char/ipmi/ipmi_devintf.c +Auto-merged drivers/char/lp.c +Auto-merged drivers/char/mem.c +Auto-merged drivers/char/misc.c +Auto-merged drivers/char/nvram.c +Auto-merged drivers/char/pcmcia/cm4000_cs.c +Auto-merged drivers/char/pcmcia/cm4040_cs.c +Auto-merged drivers/char/ppdev.c +Auto-merged drivers/char/raw.c +Auto-merged drivers/char/snsc.c +Auto-merged drivers/char/tty_io.c +Auto-merged drivers/char/vc_screen.c +Auto-merged drivers/char/viotape.c +Auto-merged drivers/char/xilinx_hwicap/xilinx_hwicap.c +Auto-merged drivers/firewire/fw-cdev.c +Auto-merged drivers/hid/hidraw.c +Auto-merged drivers/i2c/i2c-dev.c +Auto-merged drivers/ide/ide-tape.c +Auto-merged drivers/ieee1394/dv1394.c +Auto-merged drivers/ieee1394/raw1394.c +Auto-merged drivers/ieee1394/video1394.c +Auto-merged drivers/infiniband/core/ucm.c +Auto-merged drivers/infiniband/core/user_mad.c +Auto-merged drivers/infiniband/core/uverbs_main.c +Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c +Auto-merged drivers/input/input.c +Auto-merged drivers/input/misc/hp_sdc_rtc.c +Auto-merged drivers/input/mousedev.c +Auto-merged drivers/isdn/capi/capi.c +Auto-merged drivers/macintosh/adb.c +Auto-merged drivers/media/dvb/dvb-core/dvbdev.c +Auto-merged drivers/media/video/videodev.c +Auto-merged drivers/misc/phantom.c +Auto-merged drivers/mtd/mtdchar.c +Auto-merged drivers/mtd/ubi/cdev.c +Auto-merged drivers/net/ppp_generic.c +Auto-merged drivers/net/wan/cosa.c +Auto-merged drivers/s390/block/dasd_eer.c +Auto-merged drivers/s390/char/fs3270.c +Auto-merged drivers/s390/char/vmlogrdr.c +Auto-merged drivers/s390/char/vmur.c +Auto-merged drivers/sbus/char/bpp.c +Auto-merged drivers/scsi/3w-9xxx.c +Auto-merged drivers/scsi/aacraid/linit.c +Auto-merged drivers/scsi/ch.c +Auto-merged drivers/scsi/dpt_i2o.c +Auto-merged drivers/scsi/osst.c +Auto-merged drivers/scsi/sg.c +Auto-merged drivers/scsi/st.c +Auto-merged drivers/spi/spidev.c +Auto-merged drivers/uio/uio.c +Auto-merged drivers/usb/core/devio.c +Auto-merged drivers/usb/core/file.c +Auto-merged drivers/usb/gadget/printer.c +Auto-merged drivers/usb/mon/mon_bin.c +Auto-merged drivers/video/fbmem.c +Auto-merged fs/dlm/user.c +Auto-merged fs/ocfs2/stack_user.c +Auto-merged net/irda/irnet/irnet_ppp.c +Auto-merged sound/core/sound.c +Auto-merged sound/sound_core.c +Merge made by recursive. + arch/blackfin/mach-bf561/coreb.c | 4 +++ + arch/cris/arch-v10/drivers/eeprom.c | 4 +- + arch/cris/arch-v10/drivers/gpio.c | 3 ++ + arch/cris/arch-v10/drivers/i2c.c | 2 + + arch/cris/arch-v10/drivers/sync_serial.c | 34 ++++++++++++++--------- + arch/cris/arch-v32/drivers/cryptocop.c | 3 +- + arch/cris/arch-v32/drivers/i2c.c | 2 + + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 4 +++ + arch/cris/arch-v32/drivers/mach-fs/gpio.c | 5 +++- + arch/cris/arch-v32/drivers/sync_serial.c | 33 +++++++++++++--------- + arch/m68k/bvme6000/rtc.c | 7 ++++- + arch/m68k/mvme16x/rtc.c | 4 +++ + arch/mips/basler/excite/excite_iodev.c | 9 +++++- + arch/mips/kernel/rtlx.c | 7 ++++- + arch/mips/kernel/vpe.c | 12 ++++++-- + arch/mips/sibyte/common/sb_tbprof.c | 25 ++++++++++++----- + arch/parisc/kernel/perf.c | 4 +++ + arch/s390/crypto/prng.c | 2 + + arch/sh/boards/landisk/gio.c | 10 +++++-- + arch/sparc/kernel/apc.c | 2 + + arch/sparc64/kernel/time.c | 7 ++++- + arch/um/drivers/harddog_kern.c | 3 ++ + arch/um/drivers/mmapper_kern.c | 2 + + arch/um/drivers/random.c | 3 ++ + arch/x86/kernel/apm_32.c | 4 +++ + arch/x86/kernel/cpu/mcheck/mce_64.c | 4 +++ + arch/x86/kernel/cpuid.c | 25 +++++++++++----- + arch/x86/kernel/microcode.c | 2 + + arch/x86/kernel/msr.c | 16 ++++++++--- + block/bsg.c | 7 ++++- + drivers/block/aoe/aoechr.c | 7 ++++- + drivers/block/paride/pg.c | 22 +++++++++++---- + drivers/block/paride/pt.c | 8 +++++- + drivers/bluetooth/hci_vhci.c | 5 +++ + drivers/char/agp/frontend.c | 4 +++ + drivers/char/apm-emulation.c | 3 ++ + drivers/char/briq_panel.c | 9 +++++- + drivers/char/cs5535_gpio.c | 2 + + drivers/char/drm/drm_fops.c | 9 +++++- + drivers/char/ds1286.c | 4 +++ + drivers/char/ds1620.c | 9 +++++- + drivers/char/dsp56k.c | 16 +++++++--- + drivers/char/dtlk.c | 3 ++ + drivers/char/efirtc.c | 2 + + drivers/char/genrtc.c | 7 ++++- + drivers/char/hpet.c | 4 +++ + drivers/char/hw_random/core.c | 2 + + drivers/char/ip2/ip2main.c | 34 +--------------------- + drivers/char/ip27-rtc.c | 4 +++ + drivers/char/ipmi/ipmi_devintf.c | 8 ++++- + drivers/char/ipmi/ipmi_watchdog.c | 3 ++ + drivers/char/lcd.c | 3 ++ + drivers/char/lp.c | 38 +++++++++++++++++-------- + drivers/char/mbcs.c | 5 +++ + drivers/char/mem.c | 10 +++++- + drivers/char/misc.c | 3 ++ + drivers/char/mwave/mwavedd.c | 2 + + drivers/char/nvram.c | 4 +++ + drivers/char/pc8736x_gpio.c | 2 + + drivers/char/pcmcia/cm4000_cs.c | 26 +++++++++++++----- + drivers/char/pcmcia/cm4040_cs.c | 23 +++++++++++---- + drivers/char/ppdev.c | 2 + + drivers/char/raw.c | 3 ++ + drivers/char/rtc.c | 4 +++ + drivers/char/scx200_gpio.c | 2 + + drivers/char/snsc.c | 5 +++- + drivers/char/sonypi.c | 3 ++ + drivers/char/tb0219.c | 2 + + drivers/char/tlclk.c | 19 ++++++++----- + drivers/char/tpm/tpm.c | 5 +++ + drivers/char/tty_io.c | 27 +++++++++++++++++- + drivers/char/vc_screen.c | 9 +++++- + drivers/char/viotape.c | 3 ++ + drivers/char/vr41xx_giu.c | 2 + + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 6 +++- + drivers/firewire/fw-cdev.c | 16 ++++++++--- + drivers/hid/hidraw.c | 2 + + drivers/i2c/i2c-dev.c | 22 +++++++++++---- + drivers/ide/ide-tape.c | 7 ++++- + drivers/ieee1394/dv1394.c | 6 +++- + drivers/ieee1394/raw1394.c | 3 ++ + drivers/ieee1394/video1394.c | 18 +++++++++--- + drivers/infiniband/core/ucm.c | 2 + + drivers/infiniband/core/ucma.c | 3 ++ + drivers/infiniband/core/user_mad.c | 7 ++++- + drivers/infiniband/core/uverbs_main.c | 9 +++++- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 + + drivers/input/input.c | 16 ++++++++--- + drivers/input/misc/hp_sdc_rtc.c | 2 + + drivers/input/misc/uinput.c | 3 ++ + drivers/input/mousedev.c | 12 +++++++- + drivers/input/serio/serio_raw.c | 6 +++- + drivers/isdn/capi/capi.c | 17 +++++++---- + drivers/isdn/hardware/eicon/divamnt.c | 16 +++++++--- + drivers/isdn/hardware/eicon/divasi.c | 2 + + drivers/isdn/hardware/eicon/divasmain.c | 2 + + drivers/isdn/i4l/isdn_common.c | 3 +- + drivers/macintosh/adb.c | 18 +++++++++--- + drivers/macintosh/ans-lcd.c | 2 + + drivers/macintosh/smu.c | 3 ++ + drivers/macintosh/via-pmu.c | 3 ++ + drivers/media/dvb/dvb-core/dvbdev.c | 4 +++ + drivers/media/radio/miropcm20-rds.c | 4 +++ + drivers/media/video/videodev.c | 4 +++ + drivers/message/i2o/i2o_config.c | 2 + + drivers/misc/hdpuftrs/hdpu_cpustate.c | 9 +++++- + drivers/misc/phantom.c | 9 +++++- + drivers/misc/sony-laptop.c | 3 ++ + drivers/mtd/mtdchar.c | 22 +++++++++++---- + drivers/mtd/ubi/cdev.c | 7 ++++- + drivers/net/ppp_generic.c | 2 + + drivers/net/tun.c | 2 + + drivers/net/wan/cosa.c | 22 +++++++++++---- + drivers/parisc/eisa_eeprom.c | 3 ++ + drivers/pcmcia/pcmcia_ioctl.c | 25 ++++++++++++----- + drivers/rtc/rtc-dev.c | 12 ++++++-- + drivers/rtc/rtc-m41t80.c | 7 ++++- + drivers/s390/block/dasd_eer.c | 6 ++++ + drivers/s390/char/fs3270.c | 23 +++++++++++----- + drivers/s390/char/monreader.c | 4 +++ + drivers/s390/char/monwriter.c | 3 ++ + drivers/s390/char/tape_char.c | 12 ++++++-- + drivers/s390/char/vmcp.c | 4 +++ + drivers/s390/char/vmlogrdr.c | 8 +++++- + drivers/s390/char/vmur.c | 12 ++++++-- + drivers/s390/char/vmwatchdog.c | 7 ++++- + drivers/s390/crypto/zcrypt_api.c | 3 ++ + drivers/sbus/char/bpp.c | 3 ++ + drivers/sbus/char/cpwatchdog.c | 4 +++ + drivers/sbus/char/display7seg.c | 1 + + drivers/sbus/char/envctrl.c | 2 + + drivers/sbus/char/flash.c | 6 +++- + drivers/sbus/char/jsflash.c | 13 +++++++-- + drivers/sbus/char/openprom.c | 3 ++ + drivers/sbus/char/riowatchdog.c | 2 + + drivers/sbus/char/rtc.c | 3 ++ + drivers/sbus/char/uctrl.c | 3 ++ + drivers/sbus/char/vfc_dev.c | 5 +++ + drivers/scsi/3w-9xxx.c | 3 ++ + drivers/scsi/3w-xxxx.c | 3 ++ + drivers/scsi/aacraid/linit.c | 3 ++ + drivers/scsi/ch.c | 4 +++ + drivers/scsi/dpt_i2o.c | 5 +++ + drivers/scsi/gdth.c | 3 ++ + drivers/scsi/megaraid.c | 5 ++- + drivers/scsi/megaraid/megaraid_mm.c | 2 + + drivers/scsi/megaraid/megaraid_sas.c | 2 + + drivers/scsi/osst.c | 15 +++++++++- + drivers/scsi/scsi_tgt_if.c | 2 + + drivers/scsi/sg.c | 16 +++++++++-- + drivers/scsi/st.c | 11 ++++++- + drivers/spi/spidev.c | 3 ++ + drivers/telephony/phonedev.c | 3 ++ + drivers/uio/uio.c | 17 ++++++++--- + drivers/usb/core/devio.c | 2 + + drivers/usb/core/file.c | 3 ++ + drivers/usb/gadget/printer.c | 3 +- + drivers/usb/mon/mon_bin.c | 6 ++++ + drivers/video/fbmem.c | 15 +++++++--- + fs/char_dev.c | 7 ++--- + fs/dlm/user.c | 9 +++++- + fs/fat/cache.c | 2 +- + fs/fat/dir.c | 4 +- + fs/fat/file.c | 6 ---- + fs/fat/inode.c | 26 +++++++++++------- + fs/msdos/namei.c | 35 +++++++++++++----------- + fs/ocfs2/stack_user.c | 3 ++ + fs/vfat/namei.c | 35 +++++++++++++----------- + include/linux/smp_lock.h | 13 +++++++++ + kernel/pm_qos_params.c | 7 ++++- + kernel/power/user.c | 10 ++++++- + net/irda/irnet/irnet.h | 1 + + net/irda/irnet/irnet_ppp.c | 3 ++ + sound/core/sound.c | 15 +++++++++- + sound/sound_core.c | 5 +++ + 175 files changed, 1075 insertions(+), 320 deletions(-) +Merging trivial/next +$ git merge trivial/next +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/net/spider_net.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/edac.txt | 2 +- + Documentation/filesystems/hfs.txt | 2 +- + Documentation/ja_JP/SubmittingPatches | 4 ++-- + Documentation/zh_CN/SubmittingPatches | 4 ++-- + arch/mips/kernel/vpe.c | 2 +- + arch/sh/lib64/c-checksum.c | 4 ++-- + drivers/base/sys.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/net/spider_net.c | 2 +- + drivers/serial/mpc52xx_uart.c | 4 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/proc/nommu.c | 2 +- + include/linux/securebits.h | 2 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 21 files changed, 26 insertions(+), 26 deletions(-) +Merging ubifs/for_andrew +$ git merge ubifs/for_andrew +Auto-merged fs/Kconfig +Merge made by recursive. + Documentation/filesystems/ubifs.txt | 163 ++ + fs/Kconfig | 3 + + fs/Makefile | 1 + + fs/fs-writeback.c | 22 +- + fs/ubifs/Kconfig | 72 + + fs/ubifs/Makefile | 9 + + fs/ubifs/budget.c | 862 ++++++++++ + fs/ubifs/commit.c | 677 ++++++++ + fs/ubifs/compress.c | 253 +++ + fs/ubifs/debug.c | 2201 ++++++++++++++++++++++++++ + fs/ubifs/debug.h | 396 +++++ + fs/ubifs/dir.c | 1017 ++++++++++++ + fs/ubifs/file.c | 960 ++++++++++++ + fs/ubifs/find.c | 975 ++++++++++++ + fs/ubifs/gc.c | 762 +++++++++ + fs/ubifs/io.c | 921 +++++++++++ + fs/ubifs/ioctl.c | 212 +++ + fs/ubifs/journal.c | 1275 +++++++++++++++ + fs/ubifs/key.h | 579 +++++++ + fs/ubifs/log.c | 799 ++++++++++ + fs/ubifs/lprops.c | 1355 ++++++++++++++++ + fs/ubifs/lpt.c | 2241 ++++++++++++++++++++++++++ + fs/ubifs/lpt_commit.c | 1631 +++++++++++++++++++ + fs/ubifs/master.c | 387 +++++ + fs/ubifs/misc.h | 310 ++++ + fs/ubifs/orphan.c | 958 +++++++++++ + fs/ubifs/recovery.c | 1536 ++++++++++++++++++ + fs/ubifs/replay.c | 1066 +++++++++++++ + fs/ubifs/sb.c | 619 ++++++++ + fs/ubifs/scan.c | 362 +++++ + fs/ubifs/shrinker.c | 322 ++++ + fs/ubifs/super.c | 1969 +++++++++++++++++++++++ + fs/ubifs/tnc.c | 2961 +++++++++++++++++++++++++++++++++++ + fs/ubifs/tnc_commit.c | 1105 +++++++++++++ + fs/ubifs/tnc_misc.c | 496 ++++++ + fs/ubifs/ubifs-media.h | 733 +++++++++ + fs/ubifs/ubifs.h | 1597 +++++++++++++++++++ + fs/ubifs/xattr.c | 581 +++++++ + include/linux/fs.h | 2 + + init/do_mounts.c | 3 +- + 40 files changed, 32382 insertions(+), 11 deletions(-) + create mode 100644 Documentation/filesystems/ubifs.txt + create mode 100644 fs/ubifs/Kconfig + create mode 100644 fs/ubifs/Makefile + create mode 100644 fs/ubifs/budget.c + create mode 100644 fs/ubifs/commit.c + create mode 100644 fs/ubifs/compress.c + create mode 100644 fs/ubifs/debug.c + create mode 100644 fs/ubifs/debug.h + create mode 100644 fs/ubifs/dir.c + create mode 100644 fs/ubifs/file.c + create mode 100644 fs/ubifs/find.c + create mode 100644 fs/ubifs/gc.c + create mode 100644 fs/ubifs/io.c + create mode 100644 fs/ubifs/ioctl.c + create mode 100644 fs/ubifs/journal.c + create mode 100644 fs/ubifs/key.h + create mode 100644 fs/ubifs/log.c + create mode 100644 fs/ubifs/lprops.c + create mode 100644 fs/ubifs/lpt.c + create mode 100644 fs/ubifs/lpt_commit.c + create mode 100644 fs/ubifs/master.c + create mode 100644 fs/ubifs/misc.h + create mode 100644 fs/ubifs/orphan.c + create mode 100644 fs/ubifs/recovery.c + create mode 100644 fs/ubifs/replay.c + create mode 100644 fs/ubifs/sb.c + create mode 100644 fs/ubifs/scan.c + create mode 100644 fs/ubifs/shrinker.c + create mode 100644 fs/ubifs/super.c + create mode 100644 fs/ubifs/tnc.c + create mode 100644 fs/ubifs/tnc_commit.c + create mode 100644 fs/ubifs/tnc_misc.c + create mode 100644 fs/ubifs/ubifs-media.h + create mode 100644 fs/ubifs/ubifs.h + create mode 100644 fs/ubifs/xattr.c +Merging lsm/for-next +$ git merge lsm/for-next +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 1 - + fs/proc/array.c | 2 +- + include/linux/capability.h | 29 ++++++++--- + kernel/capability.c | 111 +++++++++++++++++++++++++++++--------------- + 4 files changed, 95 insertions(+), 48 deletions(-) +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Merge made by recursive. + drivers/char/Kconfig | 8 ++++++++ + drivers/char/Makefile | 4 ++-- + include/linux/consolemap.h | 14 ++++++++++++++ + include/linux/vt_kern.h | 14 ++++++++++++++ + 4 files changed, 38 insertions(+), 2 deletions(-) +Merging firmware/master +$ git merge firmware/master +Auto-merged Makefile +Auto-merged arch/x86/kernel/microcode.c +Auto-merged drivers/base/firmware_class.c +Auto-merged drivers/media/common/tuners/tuner-xc2028.c +Auto-merged drivers/media/dvb/dvb-usb/gp8psk.c +Auto-merged drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +Removed drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h +Auto-merged drivers/media/dvb/ttusb-dec/ttusb_dec.c +Auto-merged drivers/media/video/bt8xx/bttv-cards.c +Auto-merged drivers/net/cxgb3/common.h +Removed drivers/net/tokenring/smctr_firmware.h +Auto-merged drivers/net/usb/Kconfig +Removed drivers/net/usb/kawethfw.h +Auto-merged drivers/net/wireless/atmel.c +Auto-merged drivers/net/wireless/libertas/if_cs.c +Auto-merged drivers/net/wireless/libertas/if_usb.c +Auto-merged drivers/net/wireless/p54/p54usb.c +Auto-merged drivers/net/wireless/rt2x00/rt2x00.h +Auto-merged drivers/net/wireless/rt2x00/rt2x00pci.h +Auto-merged drivers/net/wireless/rt2x00/rt61pci.c +Auto-merged drivers/net/wireless/rt2x00/rt73usb.c +Auto-merged drivers/usb/misc/Kconfig +Removed drivers/usb/misc/emi26_fw.h +Auto-merged drivers/usb/misc/emi62.c +Removed drivers/usb/misc/emi62_fw_m.h +Removed drivers/usb/misc/emi62_fw_s.h +Auto-merged drivers/usb/serial/Kconfig +CONFLICT (content): Merge conflict in drivers/usb/serial/Kconfig +Removed drivers/usb/serial/keyspan_mpr_fw.h +Removed drivers/usb/serial/keyspan_pda_fw.h +Removed drivers/usb/serial/keyspan_usa18x_fw.h +Removed drivers/usb/serial/keyspan_usa19_fw.h +Removed drivers/usb/serial/keyspan_usa19qi_fw.h +Removed drivers/usb/serial/keyspan_usa19qw_fw.h +Removed drivers/usb/serial/keyspan_usa19w_fw.h +Removed drivers/usb/serial/keyspan_usa28_fw.h +Removed drivers/usb/serial/keyspan_usa28x_fw.h +Removed drivers/usb/serial/keyspan_usa28xa_fw.h +Removed drivers/usb/serial/keyspan_usa28xb_fw.h +Removed drivers/usb/serial/keyspan_usa49w_fw.h +Removed drivers/usb/serial/keyspan_usa49wlc_fw.h +CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_3410.h left in tree. +CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_5052.h left in tree. +Auto-merged drivers/usb/serial/ti_usb_3410_5052.c +CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c +Removed drivers/usb/serial/whiteheat_fw.h +Removed drivers/usb/serial/xircom_pgs_fw.h +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/firmware.h +Auto-merged sound/pci/Kconfig +CONFLICT (content): Merge conflict in sound/pci/Kconfig +Removed sound/pci/korg1212/korg1212-firmware.h +Auto-merged sound/pci/maestro3.c +CONFLICT (content): Merge conflict in sound/pci/maestro3.c +Auto-merged sound/pci/pcxhr/pcxhr_core.c +Removed sound/pci/ymfpci/ymfpci_image.h +Auto-merged sound/pci/ymfpci/ymfpci_main.c +CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c +Recorded preimage for 'drivers/usb/serial/Kconfig' +Recorded preimage for 'drivers/usb/serial/ti_usb_3410_5052.c' +Recorded preimage for 'sound/pci/Kconfig' +Recorded preimage for 'sound/pci/maestro3.c' +Recorded preimage for 'sound/pci/ymfpci/ymfpci_main.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Makefile | 11 +- + drivers/base/Kconfig | 33 + + drivers/base/firmware_class.c | 33 +- + drivers/media/dvb/ttusb-budget/Kconfig | 9 + + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 16 +- + .../media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h | 1644 ---- + drivers/net/tokenring/Kconfig | 9 + + drivers/net/tokenring/smctr.c | 56 +- + drivers/net/tokenring/smctr.h | 2 - + drivers/net/tokenring/smctr_firmware.h | 978 --- + drivers/net/usb/Kconfig | 9 + + drivers/net/usb/kaweth.c | 40 +- + drivers/net/usb/kawethfw.h | 557 -- + drivers/usb/misc/Kconfig | 16 + + drivers/usb/misc/emi26.c | 96 +- + drivers/usb/misc/emi26_fw.h | 5779 ------------- + drivers/usb/misc/emi62.c | 130 +- + drivers/usb/misc/emi62_fw_m.h | 8853 -------------------- + drivers/usb/misc/emi62_fw_s.h | 8837 ------------------- + drivers/usb/serial/Kconfig | 45 +- + drivers/usb/serial/keyspan.c | 78 +- + drivers/usb/serial/keyspan.h | 84 - + drivers/usb/serial/keyspan_mpr_fw.h | 286 - + drivers/usb/serial/keyspan_pda.c | 51 +- + drivers/usb/serial/keyspan_pda_fw.h | 99 - + drivers/usb/serial/keyspan_usa18x_fw.h | 447 - + drivers/usb/serial/keyspan_usa19_fw.h | 285 - + drivers/usb/serial/keyspan_usa19qi_fw.h | 284 - + drivers/usb/serial/keyspan_usa19qw_fw.h | 448 - + drivers/usb/serial/keyspan_usa19w_fw.h | 446 - + drivers/usb/serial/keyspan_usa28_fw.h | 466 - + drivers/usb/serial/keyspan_usa28x_fw.h | 447 - + drivers/usb/serial/keyspan_usa28xa_fw.h | 449 - + drivers/usb/serial/keyspan_usa28xb_fw.h | 448 - + drivers/usb/serial/keyspan_usa49w_fw.h | 464 - + drivers/usb/serial/keyspan_usa49wlc_fw.h | 476 -- + drivers/usb/serial/ti_fw_3410.h | 889 -- + drivers/usb/serial/ti_fw_5052.h | 890 -- + drivers/usb/serial/ti_usb_3410_5052.c | 124 +- + drivers/usb/serial/whiteheat.c | 77 +- + drivers/usb/serial/whiteheat_fw.h | 1669 ---- + drivers/usb/serial/xircom_pgs_fw.h | 103 - + firmware/Makefile | 126 + + firmware/WHENCE | 228 + + firmware/emi26/bitstream.HEX | 4391 ++++++++++ + firmware/emi26/firmware.HEX | 1261 +++ + firmware/emi26/loader.HEX | 116 + + firmware/emi62/bitstream.HEX | 4372 ++++++++++ + firmware/emi62/loader.HEX | 107 + + firmware/emi62/midi.HEX | 1266 +++ + firmware/emi62/spdif.HEX | 1257 +++ + firmware/ess/maestro3_assp_kernel.fw.ihex | 120 + + firmware/ess/maestro3_assp_minisrc.fw.ihex | 51 + + firmware/ihex2fw.c | 238 + + firmware/kaweth/new_code.bin.ihex | 206 + + firmware/kaweth/new_code_fix.bin.ihex | 40 + + firmware/kaweth/trigger_code.bin.ihex | 13 + + firmware/kaweth/trigger_code_fix.bin.ihex | 3 + + firmware/keyspan/mpr.HEX | 104 + + firmware/keyspan/usa18x.HEX | 141 + + firmware/keyspan/usa19.HEX | 101 + + firmware/keyspan/usa19qi.HEX | 101 + + firmware/keyspan/usa19qw.HEX | 142 + + firmware/keyspan/usa19w.HEX | 141 + + firmware/keyspan/usa28.HEX | 148 + + firmware/keyspan/usa28x.HEX | 141 + + firmware/keyspan/usa28xa.HEX | 141 + + firmware/keyspan/usa28xb.HEX | 142 + + firmware/keyspan/usa49w.HEX | 145 + + firmware/keyspan/usa49wlc.HEX | 153 + + firmware/keyspan_pda/keyspan_pda.HEX | 83 + + .../serial => firmware/keyspan_pda}/keyspan_pda.S | 0 + firmware/keyspan_pda/xircom_pgs.HEX | 87 + + .../serial => firmware/keyspan_pda}/xircom_pgs.S | 0 + firmware/korg/k1212.dsp.ihex | 987 +++ + firmware/ti_3410.fw.ihex | 862 ++ + firmware/ti_5052.fw.ihex | 862 ++ + firmware/tr_smctr.bin.ihex | 477 ++ + firmware/ttusb-budget/dspbootcode.bin.ihex | 820 ++ + firmware/whiteheat.HEX | 1097 +++ + firmware/whiteheat_loader.HEX | 314 + + firmware/whiteheat_loader_debug.HEX | 403 + + firmware/yamaha/ds1_ctrl.fw.ihex | 769 ++ + firmware/yamaha/ds1_dsp.fw.ihex | 9 + + firmware/yamaha/ds1e_ctrl.fw.ihex | 769 ++ + include/asm-generic/vmlinux.lds.h | 7 + + include/linux/firmware.h | 21 + + include/linux/ihex.h | 68 + + scripts/Makefile.fwinst | 31 + + sound/pci/Kconfig | 12 +- + sound/pci/korg1212/korg1212-firmware.h | 987 --- + sound/pci/korg1212/korg1212.c | 18 - + sound/pci/maestro3.c | 171 - + sound/pci/ymfpci/ymfpci_image.h | 1565 ---- + sound/pci/ymfpci/ymfpci_main.c | 63 - + 95 files changed, 23603 insertions(+), 38437 deletions(-) + delete mode 100644 drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h + delete mode 100644 drivers/net/tokenring/smctr_firmware.h + delete mode 100644 drivers/net/usb/kawethfw.h + delete mode 100644 drivers/usb/misc/emi26_fw.h + delete mode 100644 drivers/usb/misc/emi62_fw_m.h + delete mode 100644 drivers/usb/misc/emi62_fw_s.h + delete mode 100644 drivers/usb/serial/keyspan_mpr_fw.h + delete mode 100644 drivers/usb/serial/keyspan_pda_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa18x_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa19_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa19qi_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa19qw_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa19w_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa28_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa28x_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa28xa_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa28xb_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa49w_fw.h + delete mode 100644 drivers/usb/serial/keyspan_usa49wlc_fw.h + delete mode 100644 drivers/usb/serial/ti_fw_3410.h + delete mode 100644 drivers/usb/serial/ti_fw_5052.h + delete mode 100644 drivers/usb/serial/whiteheat_fw.h + delete mode 100644 drivers/usb/serial/xircom_pgs_fw.h + create mode 100644 firmware/Makefile + create mode 100644 firmware/WHENCE + create mode 100644 firmware/emi26/bitstream.HEX + create mode 100644 firmware/emi26/firmware.HEX + create mode 100644 firmware/emi26/loader.HEX + create mode 100644 firmware/emi62/bitstream.HEX + create mode 100644 firmware/emi62/loader.HEX + create mode 100644 firmware/emi62/midi.HEX + create mode 100644 firmware/emi62/spdif.HEX + create mode 100644 firmware/ess/maestro3_assp_kernel.fw.ihex + create mode 100644 firmware/ess/maestro3_assp_minisrc.fw.ihex + create mode 100644 firmware/ihex2fw.c + create mode 100644 firmware/kaweth/new_code.bin.ihex + create mode 100644 firmware/kaweth/new_code_fix.bin.ihex + create mode 100644 firmware/kaweth/trigger_code.bin.ihex + create mode 100644 firmware/kaweth/trigger_code_fix.bin.ihex + create mode 100644 firmware/keyspan/mpr.HEX + create mode 100644 firmware/keyspan/usa18x.HEX + create mode 100644 firmware/keyspan/usa19.HEX + create mode 100644 firmware/keyspan/usa19qi.HEX + create mode 100644 firmware/keyspan/usa19qw.HEX + create mode 100644 firmware/keyspan/usa19w.HEX + create mode 100644 firmware/keyspan/usa28.HEX + create mode 100644 firmware/keyspan/usa28x.HEX + create mode 100644 firmware/keyspan/usa28xa.HEX + create mode 100644 firmware/keyspan/usa28xb.HEX + create mode 100644 firmware/keyspan/usa49w.HEX + create mode 100644 firmware/keyspan/usa49wlc.HEX + create mode 100644 firmware/keyspan_pda/keyspan_pda.HEX + rename {drivers/usb/serial => firmware/keyspan_pda}/keyspan_pda.S (100%) + create mode 100644 firmware/keyspan_pda/xircom_pgs.HEX + rename {drivers/usb/serial => firmware/keyspan_pda}/xircom_pgs.S (100%) + create mode 100644 firmware/korg/k1212.dsp.ihex + create mode 100644 firmware/ti_3410.fw.ihex + create mode 100644 firmware/ti_5052.fw.ihex + create mode 100644 firmware/tr_smctr.bin.ihex + create mode 100644 firmware/ttusb-budget/dspbootcode.bin.ihex + create mode 100644 firmware/whiteheat.HEX + create mode 100644 firmware/whiteheat_loader.HEX + create mode 100644 firmware/whiteheat_loader_debug.HEX + create mode 100644 firmware/yamaha/ds1_ctrl.fw.ihex + create mode 100644 firmware/yamaha/ds1_dsp.fw.ihex + create mode 100644 firmware/yamaha/ds1e_ctrl.fw.ihex + create mode 100644 include/linux/ihex.h + create mode 100644 scripts/Makefile.fwinst + delete mode 100644 sound/pci/korg1212/korg1212-firmware.h + delete mode 100644 sound/pci/ymfpci/ymfpci_image.h +Applying firmware: build fixes 1 +Applying Fix various 8390 builds diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..6cab2b0309bb --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,420 @@ +Importing driver-core.current based on 2.6.26-rc4-git4 +$ git branch -D quilt/driver-core.current +Deleted branch quilt/driver-core.current. +$ git checkout -b quilt/driver-core.current 1beee8dc8cf58e3f605bd7b34d7a39939be7d8d2 +Switched to a new branch "quilt/driver-core.current" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +kobject-fix-kobject_rename-and-config_sysfs.patch +Importing usb.current based on quilt/driver-core.current +$ git branch -D quilt/usb.current +Deleted branch quilt/usb.current. +$ git checkout -b quilt/usb.current quilt/driver-core.current +Switched to a new branch "quilt/usb.current" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +Importing driver-core based on quilt/usb.current +$ git branch -D quilt/driver-core +Deleted branch quilt/driver-core. +$ git checkout -b quilt/driver-core quilt/usb.current +Switched to a new branch "quilt/driver-core" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +sysfs-add-sys-dev-char-block-to-lookup-sysfs-path-by-major-minor.patch +kobject-replace-with-in-name.patch +debugfs-add-a-reference-to-the-debugfs-api-documentation.patch +firmware-fix-typo-in-example-code.patch +device-create-block-convert-device_create-to-device_create_drvdata.patch +device-create-char-convert-device_create-to-device_create_drvdata.patch +device-create-coda-convert-device_create-to-device_create_drvdata.patch +device-create-dca-convert-device_create-to-device_create_drvdata.patch +device-create-dvb-convert-device_create-to-device_create_drvdata.patch +device-create-framebuffer-convert-device_create-to-device_create_drvdata.patch +device-create-hid-convert-device_create-to-device_create_drvdata.patch +device-create-hwmon-convert-device_create-to-device_create_drvdata.patch +device-create-i2c-convert-device_create-to-device_create_drvdata.patch +device-create-ide-convert-device_create-to-device_create_drvdata.patch +device-create-ieee1394-convert-device_create-to-device_create_drvdata.patch +device-create-infiniband-convert-device_create-to-device_create_drvdata.patch +device-create-isdn-convert-device_create-to-device_create_drvdata.patch +device-create-macintosh-convert-device_create-to-device_create_drvdata.patch +device-create-mips-convert-device_create-to-device_create_drvdata.patch +device-create-misc-convert-device_create-to-device_create_drvdata.patch +device-create-mtd-convert-device_create-to-device_create_drvdata.patch +device-create-net-convert-device_create-to-device_create_drvdata.patch +device-create-s390-convert-device_create-to-device_create_drvdata.patch +device-create-scsi-convert-device_create-to-device_create_drvdata.patch +device-create-sound-convert-device_create-to-device_create_drvdata.patch +device-create-usb-convert-device_create-to-device_create_drvdata.patch +device-create-x86-convert-device_create-to-device_create_drvdata.patch +driver-core-remove-device_create.patch +driver-core-add-ability-for-class_for_each_device-to-start-in-middle-of-list.patch +driver-core-add-ability-for-class_find_device-to-start-in-middle-of-list.patch +block-fix-compiler-warning-in-genhd.c.patch +block-make-printk_partition-use-the-class-iterator-function.patch +block-make-blk_lookup_devt-use-the-class-iterator-function.patch +block-make-proc-diskstats-only-build-if-config_proc_fs-is-enabled.patch +block-make-proc-files-seq_start-use-the-class_find_device.patch +block-move-header-for-proc-partitions-to-seq_start.patch +block-make-proc-partitions-and-proc-diskstats-use-class_find_device.patch +i2c-use-class_for_each_device.patch +infiniband-rename-device-to-ib_device-in-cm_device.patch +infiniband-make-cm_device-use-a-struct-device-and-not-a-kobject.patch +bluetooth-remove-improper-bluetooth-class-symlinks.patch +class-move-driver-core-specific-parts-to-a-private-structure.patch +class-rename-devices-to-class_devices-in-internal-class-structure.patch +class-rename-interfaces-to-class_interfaces-in-internal-class-structure.patch +class-rename-subsys-to-class_subsys-in-internal-class-structure.patch +class-rename-sem-to-class_sem-in-internal-class-structure.patch +class-fix-docbook-comments-for-class_private-structure.patch +class-add-lockdep-infrastructure.patch +class-change-internal-semaphore-to-a-mutex.patch +driver-core-remove-kobj_name_len-define.patch +driver-core-remove-device_name_size-define.patch +driver-core-remove-device_id_size-define.patch +driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch +pnp-add-acpi-modalias-entries.patch +pci-make-pci_name-use-dev_name.patch +sparc64-fix-up-bus_id-changes-in-sparc-core-code.patch +s390-bus_id-dev_name-conversions.patch +s390-more-bus_id-dev_name-conversions.patch +s390-use-s390_root_dev_-in-kvm_virtio.patch +s390-bus_id-dev_set_name-changes.patch +arm-bus_id-dev_name-and-dev_set_name-conversions.patch +driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch +driver-core-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch +driver-core-lguest-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch +driver-core-add-init_name-to-struct-device.patch +libertas-treat-firmware-data-as-const.patch +bluetooth-treat-firmware-data-as-const.patch +cyclades-treat-firmware-data-as-const.patch +cx25840-treat-firmware-data-as-const.patch +myri10ge-treat-firmware-data-as-const.patch +vx222-treat-firmware-data-as-const.patch +riptide-treat-firmware-data-as-const.patch +pcxhr-treat-firmware-data-as-const.patch +vx-treat-firmware-data-as-const.patch +ueagle-atm-treat-firmware-data-as-const.patch +cxacru-treat-firmware-data-as-const.patch +aic94xx-treat-firmware-data-as-const.patch +zd1201-treat-firmware-data-as-const.patch +rt2x00-treat-firmware-data-as-const.patch +p54-treat-firmware-data-as-const.patch +atmel-treat-firmware-data-as-const.patch +irda-usb-treat-firmware-data-as-const.patch +cxgb3-treat-firmware-data-as-const.patch +bt8xx-treat-firmware-data-as-const.patch +ttusb-dec-treat-firmware-data-as-const.patch +dvb-frontends-treat-firmware-data-as-const.patch +cxusb-treat-firmware-data-as-const.patch +gp8psk-treat-firmware-data-as-const.patch +tuners-treat-firmware-data-as-const.patch +maestro3-treat-firmware-data-as-const.patch +ymfpci-treat-firmware-data-as-const.patch +isight-firmware-data-is-const.patch +dell_rbu-firmware-data-is-const.patch +x86-microcode-firmware-data-is-const.patch +firmware-make-fw-data-const.patch +net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +put_device-might_sleep.patch +warn-when-statically-allocated-kobjects-are-used.patch +sysfs-crash-debugging.patch +Importing usb based on quilt/driver-core +$ git branch -D quilt/usb +Deleted branch quilt/usb. +$ git checkout -b quilt/usb quilt/driver-core +Switched to a new branch "quilt/usb" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-use-get_unaligned_-helpers-for-kl5kusb105-driver.patch +ti_usb-kick-firmware-into-user-space.patch +usb-add-new-routine-for-checking-port-resume-type.patch +usb-debounce-before-unregistering.patch +usb-simplify-hub_restart-logic.patch +usb-try-to-salvage-lost-power-sessions.patch +usb-optimize-port-debouncing-during-hub-activation.patch +usb-combine-hub_activate-and-hub_restart.patch +usb-combine-hub_quiesce-and-hub_stop.patch +usb-io_ti-first-cut-at-a-big-clean-up.patch +usb-storage-separate-dynamic-flags-from-fixed-flags.patch +usb-storage-change-remaining-semaphore-to-completion.patch +usb-isp1760-hcd.c-make-2-functions-static.patch +usb-implement-soft-unbinding.patch +usb-storage-implement-soft-unbinding.patch +usb-remove-cvs-keywords.patch +usb-remove-documentation-usb-uhci.txt.patch +usb-serial-gadget-modular-tty-glue.patch +usb-serial-gadget-use-new-tty-glue.patch +usb-rndis-switch-to-seq_files.patch +bitmap-add-bitmap_copy_le.patch +add-linux-byteorder-bitfields.h.patch +usb-add-usb_dev_reset_delayed.patch +uwb-documentation.patch +uwb-add-the-uwb-include-files.patch +uwb-stack-core.patch +uwb-stack-urci.patch +uwb-stack-mlme.patch +uwb-stack-reservation-manager.patch +uwb-stack-debug.patch +uwb-stack-build-system.patch +uwb-add-umc-bus.patch +uwb-add-whci-enumerator.patch +uwb-add-whc-rc-radio-control-driver.patch +uwb-add-hwa-rc-radio-controller-driver.patch +uwb-add-wimedia-llc-protocol-core.patch +uwb-wlp-messages.patch +uwb-wlp-wss.patch +uwb-wlp-build-system.patch +uwb-i1480-driver.patch +uwb-i1480-wlp-driver.patch +wusb-add-usb-specific-wusb-include-files.patch +wusb-core.patch +wusb-protocol.patch +wusb-security.patch +wusb-build-system.patch +wusb-add-the-usb-wusb-cbaf-driver.patch +wusb-whci-hcd-driver.patch +wusb-add-the-wire-adapter-core.patch +wusb-add-hwa-hc-wireless-host-controller-driver.patch +wusb-fix-error-path-for-wusb_set_dev_addr.patch +uwb-disable-command-event-filtering-for-DUB-1210.patch +usb-gotemp.patch +Importing device-mapper based on v2.6.25-rc2 +$ git branch -D quilt/device-mapper +Deleted branch quilt/device-mapper. +$ git checkout -b quilt/device-mapper v2.6.25-rc2 +Switched to a new branch "quilt/device-mapper" +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +Importing i2c based on 2.6.26-rc4-git5 +$ git branch -D quilt/i2c +Deleted branch quilt/i2c. +$ git checkout -b quilt/i2c c3b25b32e8bef526cca748e1ba023c6bdd705a99 +Switched to a new branch "quilt/i2c" +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-davinci-01-clock-between-7-12-mhz.patch +i2c-davinci-02-move-dev_dbg-statement-for-more-output.patch +i2c-davinci-03-remove-useless-ivr-read.patch +i2c-davinci-04-fix-signal-handling-bug.patch +i2c-davinci-05-initialize-cmd_complete-sooner.patch +i2c-nforce2-add-tyan-s4985-spport.patch +i2c-remove-3-deprecated-bus-drivers.patch +i2c-bfin-twi-update-dependencies.patch +i2c-document-standard-fault-codes.patch +i2c-core-remove-useless-include.patch +i2c-core-return-proper-error-codes.patch +i2c-group-bus-drivers.patch +i2c-delete-i2c_smbus_write_quick.patch +i2c-update-refs-to-smbus_access.patch +i2c-kerneldoc-for-most-i-o-calls.patch +i2c-i2c_use_client-defends-against-null.patch +i2c-adapters-return-proper-error-codes.patch +i2c-piix4-more-cleanups.patch +i2c-bus-fix-handling-of-unsupported-transactions.patch +i2c-use-class_for_each_device.patch +i2c-pca-algo-fix-errorcode.patch +i2c-pca-platform-fix-errorcode.patch +i2c-core-use-list_for_each_entry_safe.patch +i2c-simplify-i2c_del_driver.patch +i2c-add-intel-sch-i2c-smbus-support.patch +i2c-acpi-check-conflict.patch +i2c-push-ioctl-bkl-down-into-the-i2c-code.patch +i2c-add-support-for-i2c-bus-on-freescale-cpm1-cpm2-controllers.patch +i2c-01-fb-drivers-declare-ddc-class.patch +i2c-02-bus-drivers-declare-spd-class.patch +i2c-03-eeprom-should-not-probe-all-adapters.patch +i2c-eeprom-use-word-read-transactions.patch +Importing kernel-doc based on 2.6.25-git13 +$ git branch -D quilt/kernel-doc +Deleted branch quilt/kernel-doc. +$ git checkout -b quilt/kernel-doc a01e035ebb552223c03f2d9138ffc73f2d4d3965 +Switched to a new branch "quilt/kernel-doc" +$ git quiltimport --author Randy Dunlap <randy.dunlap@oracle.com> --patches ../quilt/kernel-doc +doc-move-initrd-txt.patch +Importing ide based on commit f26a3988917913b3d11b2bd741601a2c64ab9204 +$ git branch -D quilt/ide +Deleted branch quilt/ide. +$ git checkout -b quilt/ide f26a3988917913b3d11b2bd741601a2c64ab9204 +Switched to a new branch "quilt/ide" +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-remove-obsoleted-idebus-kernel-parameter.patch +ide-remove-obsoleted-hdx-kernel-parameters.patch +ide-cleanup-init_ide_data.patch +ide-remove-obsoleted-ide-parameters.patch +ide-eliminate-fit-macro.patch +ide-tape-use-clamp_t-rather-than-nested-min_t-_max_t.patch +ide-use-get_unaligned_-helpers.patch +ide-set-req_preempt-request-flag-in-ide_do_drive_cmd-users.patch +ide-use-__generic_unplug_device-in-ide_do_drive_cmd-take-2.patch +ide-cd-convert-ide_cd_queue_pc-to-use-blk_execute_rq.patch +ide-cd-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-disk-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-floppy-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-taskfile-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-tape-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +block-handle-blk_pm_resume_request-requests-in-blk_execute_rq_nowait.patch +ide-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-remove-ide_wait_head_wait-path-in-ide_do_drive_cmd.patch +Context reduced to (2/2) to apply fragment at 1602 +ide-remove-ide_init_drive_cmd.patch +ide-cd-remove-ide_cd_init_rq.patch +block-convert-pd_special_command-to-use-blk_execute_rq.patch +block-remove-the-checking-for-null-queue-in-blk_put_request.patch +block-unexport-blk_end_sync_rq.patch +ide-remove-try_to_flush_leftover_data.patch +sgiioc4-use-extra_base-instead-of-dma_status-for-dma_handle.patch +ide-remove-commented-out-code-from-ide_config_drive_speed.patch +ide-fix-do_probe-to-use-select_drive.patch +ide-remove-ide_tflag_no_select_mask-taskfile-flag.patch +ide-move-irq-unmasking-out-from-tf_load-method.patch +ide-remove-mmio-flag-from-ide_hwif_t.patch +ide-pass-hwif-instead-of-drive-to-outbsync-method.patch +ide-use-outbsync-in-init_irq.patch +ide-use-outbsync-in-ide_set_irq.patch +ide-remove-drive-ctl.patch +ide-scsi-replace-ide_do_drive_cmd-with-blk_execute_rq_nowait.patch +ide-remove-action-argument-in-ide_do_drive_cmd.patch +ide-scsi-fix-race-in-idescsi_transfer_pc.patch +ide-scsi-fix-drq-checking-for-dma-transfers-in-idescsi_pc_intr.patch +ide-scsi-fix-handling-of-dma-errors-in-idescsi_pc_intr.patch +ide-scsi-fix-interrupt-reason-checking-in-idescsi_pc_intr.patch +ide-scsi-merge-idescsi_input_buffers-and-idescsi_output_buffers.patch +ide-scsi-remove-superfluous-bug_on-from-idescsi_transfer_pc.patch +ide-scsi-add-debug_log-macro.patch +ide-tape-idetape_pc_intr-should-use-local_irq_enable_in_hardirq.patch +ide-tape-remove-superfluous-error-message-from-idetape_pc_intr.patch +ide-tape-remove-superfluous-warning-message-from-idetape_issue_pc.patch +ide-tape-remove-unneeded-config_blk_dev_idedma-ifdef.patch +ide-tape-remove-stale-comments-from-idetape_pc_intr.patch +ide-tape-remove-simulate_errors-debug-code.patch +ide-floppy-merge-idefloppy_transfer_pc-and-idefloppy_transfer_pc1.patch +ide-floppy-tape-scsi-log-device-name-instead-of-driver-name.patch +ide-tape-make-idetape_retry_pc-void.patch +ide-tape-merge-callbacks.patch +ide-tape-make-pc-idetape_callback-void.patch +ide-floppy-merge-callbacks.patch +ide-floppy-tape-merge-pc-idefloppy_callback-and-pc-idetape_callback.patch +ide-floppy-tape-pc_flag_dma_recommended-to-pc_flag_dma_ok.patch +ide-floppy-start-dma-engine-in-idefloppy_transfer_pc1.patch +ide-tape-set-pc_flag_dma_in_progress-flag-in-idetape_transfer_pc.patch +ide-tape-factor-out-waiting-for-good-ireason-from-idetape_transfer_pc.patch +ide-add-pc_flag_zip_drive-pc-flag.patch +ide-cd-floppy-tape-remove-checking-for-drive-scsi.patch +ide-scsi-set-drive-scsi-flag-for-devices-handled-by-the-driver.patch +ide-add-ide_transfer_pc-helper.patch +ide-scsi-move-idescsi_map_sg-call-out-from-idescsi_issue_pc.patch +ide-add-pc_flag_drq_interrupt-pc-flag.patch +ide-add-ide_issue_pc-helper.patch +ide-floppy-tape-move-checking-of-failed_pc-to-callback.patch +ide-tape-factor-out-dsc-handling-from-idetape_pc_intr.patch +ide-tape-add-ide_tape_io_buffers-helper.patch +ide-tape-always-log-debug-info-in-idetape_pc_intr-if-debugging-is-enabled.patch +ide-floppy-add-more-debugging-to-idefloppy_pc_intr.patch +ide-scsi-use-pc-callback.patch +ide-scsi-add-more-debugging-to-idescsi_pc_intr.patch +ide-floppy-scsi-read-status-register-before-stopping-dma-engine.patch +ide-add-ide_pc_intr-helper.patch +ide-remove-the-ide_etrax100-chipset-type.patch +maintainers-remove-sis-5513-ide-entry.patch +ide-tape-unify-idetape_create_read-write_cmd.patch +sis5513-add-missing-pci_enable_device-call.patch +ide-remove-needless-includes-from-ide-lib-c.patch +ide-remove-unused-xfer_udma_slow.patch +ide-use-u8-for-xfer-modes-in-ide-timing-h.patch +ide-move-some-bits-from-ide-timing-h-to-linux-ide-h.patch +ide-remove-xfer_-masks-from-ide-timing-h.patch +ide-checkpatch-pl-fixes-for-ide-timing-h.patch +ide-convert-ide-timing-h-to-ide-timings-c-library.patch +ali14xx-convert-to-use-ide_timing_find_mode.patch +ht6560b-convert-to-use-ide_timing_find_mode.patch +qd65xx-convert-to-use-ide_timing_find_mode.patch +alim15x3-convert-to-use-ide_timing_find_mode.patch +cmd640-convert-to-use-ide_timing_find_mode.patch +cmd64x-convert-to-use-ide_timing_find_mode.patch +cy82c693-convert-to-use-ide_timing_find_mode.patch +opti621-convert-to-use-ide_timing_find_mode.patch +sl82c105-convert-to-use-ide_timing_find_mode.patch +ide-mpc8xx-convert-to-use-ide_timing_find_mode.patch +ide-pmac-convert-to-use-ide_timing_find_mode.patch +ide-move-ide_pio_cycle_time-to-ide-timings-c.patch +ide-remove-no-longer-used-ide_pio_timings.patch +ide-move-pio-blacklist-to-ide-pio-blacklist-c.patch +ide-floppy-fix-unfortunate-function-naming.patch +ide-generic-add-missing-hwif-chipset-setup.patch +ide-fix-hwif-s-initialization.patch +ide-make-ide_hwifs-static.patch +Importing m68k based on e490517a039a99d692cb3a5561941b0a5f576172 +$ git branch -D quilt/m68k +Deleted branch quilt/m68k. +$ git checkout -b quilt/m68k e490517a039a99d692cb3a5561941b0a5f576172 +Switched to a new branch "quilt/m68k" +$ git quiltimport --author Geert Uytterhoeven <geert@linux-m68k.org> --patches ../quilt/m68k +m68k-set-CONFIG_COMPAT_BRK-in-defconfigs.diff +brk-check-lower-bound-properly.diff +m68k-remove-CVS-keywords.diff +m68k-ariadne-use-netstats-in-net_device-structure.diff +zorro-replace-deprecated-__initcall-with-equivalent-device_initcall.diff +m68k-initcalls-should-return-ENODEV-if-device-not-found2.diff +m68k-vmlinux-std_sun3.lds.S_cleanup_use_PAGE_SIZE_macro.diff +m68k-allnoconfig.diff +m68k-remove-traditional.diff +Importing rr based on v2.6.26-rc4-168-gc3b25b3 +$ git branch -D quilt/rr +Deleted branch quilt/rr. +$ git checkout -b quilt/rr v2.6.26-rc4-168-gc3b25b3 +Switched to a new branch "quilt/rr" +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +virtio:net-fix-last-xmit.patch +virtio:net-fix-dangling-packets.patch +virtio:net_fix_skb_csum_start_computation.patch +virtio:fix_typo_in_net_hdr_comments.patch +virtio:net_free_transmit_skbs_in_a_timer.patch +virtio:net-force-callback-on-empty.patch +lguest:rng.patch +virtio:net_add_ethtool_ops_for_sg_gso.patch +virtio:net_allow_receiving_sg_packets.patch +virtio:net-recycle-unused-pages.patch +virtio:transport-features.patch +virtio:vring-enhance.patch +lguest:publish-indices.patch +Context reduced to (1/1) to apply fragment at 1141 +virtio:blk_check_for_hardsector_size_from_host.patch +misc:add_all_cpus_option_to_stop_machine_run.patch +stop_machine:simplify.patch +misc:kernel-locking-doc-remove-semaphores.patch +.dotest/patch:61: trailing whitespace. + and <function>mutex_unlock()</function> to release it. There is also a +.dotest/patch:62: trailing whitespace. + <function>mutex_lock()</function>, which should be avoided, because it +.dotest/patch:68: trailing whitespace. + Example: <filename>net/netfilter/nf_sockopt.c</filename> allows +warning: 3 lines add whitespace errors. +misc:kthread-printf-attribute.patch +misc:cast_if_type.patch +misc:typesafe_cb.patch +misc:stop_machine-typesafe.patch +misc:kthread-typesafe.patch +misc:timer-typesafe.patch +misc:introduce-down_nowait.patch +misc:down_nowait.patch +misc:down_nowait-documentation.patch +misc:down_nowait-arch_ia64_kernel_salinfo.patch +misc:down_nowait-drivers_char_snsc.patch +misc:down_nowait-drivers_char_viotape.patch +misc:down_nowait-drivers_infiniband_core_user_mad.patch +misc:down_nowait-drivers_input_serio_hil_mlc.patch +misc:down_nowait-drivers_input_serio_hp_sdc_mlc.patch +misc:down_nowait-drivers_md_dm-raid1.patch +misc:down_nowait-drivers_net_3c527.patch +misc:down_nowait-drivers_net_irda_sir_dev.patch +misc:down_nowait-drivers_net_wireless_airo.patch +misc:down_nowait-drivers_scsi_aacraid_commsup.patch +misc:down_nowait-drivers_usb_core_usb.patch +misc:down_nowait-drivers_usb_gadget_inode.patch +misc:down_nowait-fs_reiserfs_journal.patch +misc:down_nowait-xfs.patch +misc:down_nowait-kernel_printk.patch +Importing ldp.next based on quilt/usb +$ git branch -D quilt/ldp.next +Deleted branch quilt/ldp.next. +$ git checkout -b quilt/ldp.next quilt/usb +Switched to a new branch "quilt/ldp.next" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/ldp.next +usb-add-option-hso-driver.patch +usb-add-sensoray-2255-v4l-driver.patch +input-add-appleir-driver.patch diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..f49a52e1eb4e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080604 |