diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-18 19:27:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-18 19:27:47 +1000 |
| commit | 43a2c1df777e18dfb0ba48d03b4f8b8ff80f1b57 (patch) | |
| tree | f5bf5c7e1ec6997686db4855aeae1f3564a4c9d2 | |
| parent | 0c3c25b3abb07f762a42b78632c2ee95eb0bfc55 (diff) | |
Add linux-next specific files for 20080718next-20080718
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 109 | ||||
| -rw-r--r-- | Next/merge.log | 6286 | ||||
| -rw-r--r-- | Next/quilt-import.log | 228 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6624 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..eec3c6e8596c --- /dev/null +++ b/Next/Trees @@ -0,0 +1,109 @@ +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/benh/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-fixes.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 +md-current git git://neil.brown.name/md#for-2.6.26 +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/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-timers-next +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-x86-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 +m68k quilt http://www.kernel.org/pub/linux/kernel/people/geert/linux-m68k-patches-2.6/ +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +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 +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#for-next +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 +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 +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 +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +cris git git://www.jni.nu/cris.git#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#reg-for-linus +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..e6ffeb4c2f34 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6286 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 8a0ca91 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc +Merging origin/master +$ git merge origin/master +Updating 8a0ca91..5b664cb +Fast forward + Documentation/filesystems/configfs/configfs.txt | 10 +- + .../filesystems/configfs/configfs_example.c | 14 +- + Documentation/kernel-parameters.txt | 9 +- + MAINTAINERS | 12 +- + Makefile | 1 - + arch/frv/mb93090-mb00/pci-frv.c | 30 - + arch/ia64/kvm/kvm-ia64.c | 4 +- + arch/ia64/kvm/kvm_fw.c | 2 +- + arch/m68knommu/kernel/comempci.c | 9 - + arch/mips/pmc-sierra/yosemite/ht.c | 36 - + arch/s390/Kconfig | 2 +- + arch/s390/kernel/stacktrace.c | 1 + + arch/sh/drivers/pci/pci.c | 32 - + arch/sparc64/kernel/pci.c | 2 +- + arch/x86/kernel/Makefile | 3 +- + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/kernel/apm_32.c | 8 +- + arch/x86/kernel/early-quirks.c | 26 +- + arch/x86/kernel/numaq_32.c | 2 +- + arch/x86/kernel/setup.c | 5 + + arch/x86/mm/init_64.c | 2 +- + arch/x86/pci/common.c | 30 +- + arch/x86/pci/early.c | 60 +- + arch/x86/pci/irq.c | 120 +- + arch/x86/pci/pci.h | 1 + + drivers/acpi/Kconfig | 9 + + drivers/acpi/Makefile | 1 + + drivers/acpi/bus.c | 22 + + drivers/acpi/glue.c | 2 + + drivers/acpi/pci_slot.c | 368 ++ + drivers/acpi/power.c | 138 +- + drivers/acpi/scan.c | 42 +- + drivers/acpi/sleep/main.c | 301 +- + drivers/acpi/sleep/wakeup.c | 13 +- + drivers/base/platform.c | 296 ++- + drivers/base/power/main.c | 675 +++- + drivers/base/power/power.h | 2 +- + drivers/base/power/sysfs.c | 3 - + drivers/base/power/trace.c | 4 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/ide/legacy/ide-cs.c | 2 - + drivers/net/netconsole.c | 10 +- + drivers/pci/Makefile | 2 +- + drivers/pci/hotplug/acpi_pcihp.c | 85 +- + drivers/pci/hotplug/acpiphp.h | 1 - + drivers/pci/hotplug/acpiphp_core.c | 25 +- + drivers/pci/hotplug/acpiphp_glue.c | 23 +- + drivers/pci/hotplug/acpiphp_ibm.c | 6 +- + drivers/pci/hotplug/cpci_hotplug_core.c | 2 +- + drivers/pci/hotplug/cpqphp_core.c | 4 +- + drivers/pci/hotplug/fakephp.c | 86 +- + drivers/pci/hotplug/ibmphp_ebda.c | 3 +- + drivers/pci/hotplug/pci_hotplug_core.c | 284 +- + drivers/pci/hotplug/pciehp.h | 16 +- + drivers/pci/hotplug/pciehp_core.c | 127 +- + drivers/pci/hotplug/pciehp_hpc.c | 318 +- + drivers/pci/hotplug/rpadlpar_sysfs.c | 5 +- + drivers/pci/hotplug/rpaphp_slot.c | 44 +- + drivers/pci/hotplug/sgi_hotplug.c | 12 +- + drivers/pci/hotplug/shpchp.h | 14 +- + drivers/pci/hotplug/shpchp_core.c | 37 +- + drivers/pci/hotplug/shpchp_hpc.c | 1 - + drivers/pci/intel-iommu.c | 1 - + drivers/pci/msi.c | 22 +- + drivers/pci/pci-acpi.c | 271 +- + drivers/pci/pci-driver.c | 388 ++- + drivers/pci/pci.c | 479 ++- + drivers/pci/pci.h | 47 +- + drivers/pci/pcie/aer/aerdrv.c | 9 +- + drivers/pci/pcie/aer/aerdrv_acpi.c | 8 +- + drivers/pci/pcie/aer/aerdrv_core.c | 24 +- + drivers/pci/pcie/portdrv_bus.c | 1 + + drivers/pci/pcie/portdrv_core.c | 22 +- + drivers/pci/pcie/portdrv_pci.c | 5 +- + drivers/pci/probe.c | 38 +- + drivers/pci/proc.c | 4 +- + drivers/pci/quirks.c | 134 +- + drivers/pci/setup-bus.c | 43 +- + drivers/pci/setup-irq.c | 3 +- + drivers/pci/setup-res.c | 70 +- + drivers/pci/slot.c | 233 ++ + drivers/pcmcia/cistpl.c | 2 +- + drivers/s390/block/dasd_diag.c | 25 +- + drivers/s390/block/dasd_eckd.c | 4 +- + drivers/s390/block/dasd_fba.c | 7 +- + drivers/s390/char/vmur.c | 10 +- + drivers/s390/char/zcore.c | 101 +- + drivers/s390/cio/Makefile | 2 + + drivers/s390/cio/chsc.c | 9 +- + drivers/s390/cio/chsc.h | 2 + + drivers/s390/cio/qdio.c | 3929 -------------------- + drivers/s390/cio/qdio.h | 835 ++--- + drivers/s390/cio/qdio_debug.c | 240 ++ + drivers/s390/cio/qdio_debug.h | 91 + + drivers/s390/cio/qdio_main.c | 1755 +++++++++ + drivers/s390/cio/qdio_perf.c | 151 + + drivers/s390/cio/qdio_perf.h | 54 + + drivers/s390/cio/qdio_setup.c | 521 +++ + drivers/s390/cio/qdio_thinint.c | 380 ++ + drivers/s390/net/qeth_core.h | 12 +- + drivers/s390/net/qeth_core_main.c | 87 +- + drivers/s390/net/qeth_l2_main.c | 26 +- + drivers/s390/net/qeth_l3_main.c | 25 +- + drivers/s390/scsi/zfcp_dbf.c | 12 +- + drivers/s390/scsi/zfcp_dbf.h | 2 - + drivers/s390/scsi/zfcp_ext.h | 5 +- + drivers/s390/scsi/zfcp_qdio.c | 42 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 7 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 7 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 7 +- + fs/Kconfig | 8 + + fs/configfs/configfs_internal.h | 4 + + fs/configfs/dir.c | 147 +- + fs/configfs/inode.c | 2 + + fs/configfs/symlink.c | 16 +- + fs/dlm/config.c | 45 +- + fs/ocfs2/aops.c | 13 +- + fs/ocfs2/cluster/heartbeat.c | 17 +- + fs/ocfs2/cluster/netdebug.c | 8 +- + fs/ocfs2/cluster/nodemanager.c | 45 +- + fs/ocfs2/dlmglue.c | 122 +- + fs/ocfs2/file.c | 2 +- + fs/ocfs2/journal.c | 2 +- + fs/ocfs2/localalloc.c | 2 +- + fs/ocfs2/ocfs2.h | 12 + + fs/ocfs2/ocfs2_fs.h | 2 +- + fs/ocfs2/stack_user.c | 19 +- + fs/ocfs2/super.c | 6 +- + include/acpi/acpi_bus.h | 8 + + include/acpi/acpi_drivers.h | 4 +- + include/asm-generic/vmlinux.lds.h | 6 + + include/asm-s390/Kbuild | 2 +- + include/asm-s390/chpid.h | 6 +- + include/asm-s390/qdio.h | 646 ++-- + include/asm-s390/schid.h | 3 + + include/asm-s390/setup.h | 2 +- + include/asm-x86/e820.h | 3 +- + include/asm-x86/pci-direct.h | 4 + + include/linux/acpi.h | 3 + + include/linux/configfs.h | 4 +- + include/linux/device.h | 9 + + include/linux/init_task.h | 4 +- + include/linux/pci.h | 57 +- + include/linux/pci_hotplug.h | 14 +- + include/linux/pci_regs.h | 1 + + include/linux/platform_device.h | 1 + + include/linux/pm.h | 314 ++- + include/linux/pm_wakeup.h | 28 +- + include/linux/sched.h | 26 +- + include/linux/suspend.h | 14 +- + kernel/Makefile | 3 +- + kernel/exit.c | 451 ++- + kernel/fork.c | 6 +- + kernel/power/disk.c | 50 +- + kernel/power/main.c | 16 +- + kernel/ptrace.c | 37 +- + lib/Makefile | 14 +- + lib/kobject.c | 1 + + scripts/Makefile.fwinst | 25 +- + 159 files changed, 8743 insertions(+), 7051 deletions(-) + create mode 100644 drivers/acpi/pci_slot.c + create mode 100644 drivers/pci/slot.c + delete mode 100644 drivers/s390/cio/qdio.c + create mode 100644 drivers/s390/cio/qdio_debug.c + create mode 100644 drivers/s390/cio/qdio_debug.h + create mode 100644 drivers/s390/cio/qdio_main.c + create mode 100644 drivers/s390/cio/qdio_perf.c + create mode 100644 drivers/s390/cio/qdio_perf.h + create mode 100644 drivers/s390/cio/qdio_setup.c + create mode 100644 drivers/s390/cio/qdio_thinint.c +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/arm/ixp4xx_eth.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) +Merging sparc-current/master +$ git merge sparc-current/master +Auto-merged arch/sparc64/Kconfig +Merge made by recursive. + arch/sparc64/Kconfig | 11 +---------- + arch/sparc64/defconfig | 8 ++++---- + arch/sparc64/lib/copy_page.S | 6 +++--- + arch/sparc64/mm/tsb.c | 6 ------ + include/asm-sparc64/mmu.h | 4 ---- + include/asm-sparc64/page.h | 4 ---- + include/asm-sparc64/pgtable.h | 6 ------ + 7 files changed, 8 insertions(+), 37 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + sound/isa/opti9xx/opti92x-ad1848.c | 2 +- + sound/pci/ac97/ac97_codec.c | 3 +- + sound/pci/ens1370.c | 3 +- + sound/pci/hda/hda_intel.c | 6 ++- + sound/pci/hda/patch_realtek.c | 1 + + sound/soc/au1x/psc-i2s.c | 2 +- + sound/soc/soc-dapm.c | 105 +++++++++++++++++------------------- + 7 files changed, 61 insertions(+), 61 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Auto-merged lib/kobject.c +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 md-current/for-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged arch/arm/kernel/ecard.c +Auto-merged arch/arm/kernel/time.c +CONFLICT (content): Merge conflict in arch/arm/kernel/time.c +Auto-merged arch/mips/kernel/rtlx.c +Auto-merged arch/mips/sibyte/common/sb_tbprof.c +Auto-merged arch/s390/kernel/smp.c +Auto-merged arch/s390/kernel/time.c +Auto-merged arch/sparc64/kernel/pci.c +CONFLICT (content): Merge conflict in arch/sparc64/kernel/pci.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 arch/x86/kernel/pci-dma.c +Auto-merged arch/x86/kernel/pci-gart_64.c +Auto-merged arch/x86/kernel/traps_32.c +CONFLICT (content): Merge conflict in arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/traps_64.c +Auto-merged block/bsg.c +Auto-merged block/genhd.c +Auto-merged drivers/acpi/fan.c +Auto-merged drivers/acpi/glue.c +Auto-merged drivers/acpi/processor_core.c +Auto-merged drivers/acpi/scan.c +Auto-merged drivers/acpi/video.c +Auto-merged drivers/base/Kconfig +Auto-merged drivers/base/firmware_class.c +Auto-merged drivers/base/power/trace.c +Auto-merged drivers/base/topology.c +CONFLICT (content): Merge conflict in drivers/base/topology.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/block/pktcdvd.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/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/hid/hidraw.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 +Auto-merged drivers/ide/ide-tape.c +Auto-merged drivers/ieee1394/raw1394.c +Auto-merged drivers/ieee1394/video1394.c +Auto-merged drivers/infiniband/core/cm.c +Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.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/message/fusion/mptbase.h +Auto-merged drivers/message/fusion/mptfc.c +Auto-merged drivers/misc/Kconfig +Auto-merged drivers/misc/Makefile +Auto-merged drivers/misc/phantom.c +Auto-merged drivers/mtd/mtdchar.c +Auto-merged drivers/net/arm/etherh.c +Auto-merged drivers/net/ppp_generic.c +Auto-merged drivers/net/wan/cosa.c +Auto-merged drivers/net/wireless/libertas/if_sdio.c +Auto-merged drivers/pci/hotplug/acpiphp.h +Auto-merged drivers/pci/probe.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_eer.c +Auto-merged drivers/s390/block/dasd_fba.c +CONFLICT (content): Merge conflict in drivers/s390/block/dasd_fba.c +Auto-merged drivers/s390/block/dcssblk.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/vmlogrdr.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/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 +CONFLICT (delete/modify): drivers/s390/cio/qdio.c deleted in HEAD and modified in quilt/driver-core. Version quilt/driver-core of drivers/s390/cio/qdio.c left in tree. +Auto-merged drivers/s390/crypto/ap_bus.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/netiucv.c +CONFLICT (content): Merge conflict in drivers/s390/net/netiucv.c +Auto-merged drivers/s390/net/qeth_core.h +Auto-merged drivers/s390/net/qeth_core_main.c +Auto-merged drivers/s390/scsi/zfcp_aux.c +CONFLICT (content): Merge conflict in drivers/s390/scsi/zfcp_aux.c +Auto-merged drivers/s390/scsi/zfcp_def.h +CONFLICT (content): Merge conflict in drivers/s390/scsi/zfcp_def.h +Auto-merged drivers/scsi/dpt_i2o.c +Auto-merged drivers/scsi/hosts.c +Auto-merged drivers/scsi/scsi_transport_iscsi.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 drivers/xen/balloon.c +Auto-merged include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Auto-merged include/linux/firmware.h +Auto-merged include/linux/pci.h +Auto-merged include/scsi/scsi_transport_iscsi.h +Auto-merged init/main.c +Auto-merged lib/Kconfig.debug +Auto-merged lib/kobject.c +Auto-merged scripts/mod/file2alias.c +Auto-merged sound/core/init.c +Auto-merged sound/pci/maestro3.c +CONFLICT (content): Merge conflict in sound/pci/maestro3.c +Auto-merged sound/pci/pcxhr/pcxhr_core.c +Auto-merged sound/pci/ymfpci/ymfpci_main.c +CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c +Auto-merged sound/sound_core.c +Resolved 'arch/arm/kernel/time.c' using previous resolution. +Resolved 'arch/sparc64/kernel/pci.c' using previous resolution. +Resolved 'arch/x86/kernel/traps_32.c' using previous resolution. +Resolved 'arch/x86/kernel/traps_64.c' using previous resolution. +Resolved 'drivers/base/topology.c' using previous resolution. +Resolved 'drivers/i2c/i2c-core.c' using previous resolution. +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. +Resolved 'drivers/s390/net/netiucv.c' using previous resolution. +Resolved 'drivers/s390/scsi/zfcp_aux.c' using previous resolution. +Resolved 'drivers/s390/scsi/zfcp_def.h' using previous resolution. +Resolved 'include/linux/device.h' using previous resolution. +Resolved 'sound/pci/maestro3.c' using previous resolution. +Resolved 'sound/pci/ymfpci/ymfpci_main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 8fe4acd: Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-dev | 20 + + Documentation/DocBook/uio-howto.tmpl | 63 ++- + Documentation/HOWTO | 2 +- + Documentation/filesystems/sysfs.txt | 6 + + Documentation/sysfs-rules.txt | 5 +- + 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/kernel/time.c | 4 +- + arch/arm/mach-integrator/impd1.c | 7 +- + arch/arm/mach-integrator/lm.c | 6 +- + arch/arm/plat-omap/mailbox.c | 2 +- + arch/avr32/kernel/cpu.c | 38 +- + arch/ia64/kernel/err_inject.c | 22 +- + arch/mips/kernel/rtlx.c | 4 +- + arch/mips/sibyte/common/sb_tbprof.c | 3 +- + arch/powerpc/kernel/sysfs.c | 15 +- + arch/powerpc/platforms/cell/cbe_thermal.c | 45 +- + arch/powerpc/platforms/cell/spu_base.c | 3 +- + arch/powerpc/platforms/chrp/pci.c | 2 +- + arch/s390/kernel/smp.c | 36 +- + arch/s390/kernel/time.c | 35 +- + arch/sh/drivers/dma/dma-sysfs.c | 15 +- + arch/sparc64/kernel/ebus.c | 4 +- + arch/sparc64/kernel/of_device.c | 4 +- + arch/sparc64/kernel/pci.c | 2 +- + arch/sparc64/kernel/sysfs.c | 3 +- + arch/sparc64/kernel/vio.c | 18 +- + arch/x86/kernel/cpu/mcheck/mce_64.c | 18 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 + + arch/x86/kernel/cpuid.c | 4 +- + arch/x86/kernel/microcode.c | 10 +- + arch/x86/kernel/msr.c | 4 +- + arch/x86/kernel/pci-dma.c | 6 +- + 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 | 3 +- + block/genhd.c | 205 +++--- + drivers/acpi/fan.c | 10 +- + drivers/acpi/glue.c | 6 +- + drivers/acpi/processor_core.c | 5 +- + drivers/acpi/scan.c | 2 +- + drivers/acpi/thermal.c | 4 +- + drivers/acpi/video.c | 5 +- + drivers/base/Kconfig | 3 +- + drivers/base/base.h | 27 + + drivers/base/class.c | 153 +++-- + drivers/base/core.c | 188 +++-- + drivers/base/cpu.c | 10 +- + drivers/base/memory.c | 12 +- + drivers/base/node.c | 15 +- + drivers/base/power/trace.c | 2 +- + drivers/base/sys.c | 64 ++- + drivers/base/topology.c | 9 +- + drivers/block/aoe/aoechr.c | 5 +- + drivers/block/paride/pg.c | 5 +- + drivers/block/paride/pt.c | 10 +- + drivers/block/pktcdvd.c | 4 +- + 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/cpuidle/sysfs.c | 10 +- + drivers/dca/dca-sysfs.c | 8 +- + drivers/eisa/Makefile | 2 +- + drivers/eisa/eisa-bus.c | 4 +- + drivers/hid/hidraw.c | 5 +- + drivers/hwmon/hwmon.c | 3 +- + drivers/i2c/i2c-core.c | 6 +- + drivers/i2c/i2c-dev.c | 6 +- + drivers/ide/ide-tape.c | 10 +- + drivers/ieee1394/dv1394.c | 7 +- + drivers/ieee1394/nodemgr.c | 23 +- + drivers/ieee1394/raw1394.c | 4 +- + drivers/ieee1394/video1394.c | 6 +- + drivers/infiniband/core/cm.c | 72 +- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- + drivers/isdn/capi/capi.c | 3 +- + drivers/macintosh/adb.c | 3 +- + drivers/mca/mca-bus.c | 2 +- + drivers/media/dvb/dvb-core/dvbdev.c | 4 +- + drivers/memstick/host/jmb38x_ms.c | 4 +- + drivers/message/fusion/mptbase.h | 2 +- + drivers/message/fusion/mptfc.c | 4 +- + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/hpilo.c | 769 ++++++++++++++++++++ + drivers/misc/hpilo.h | 189 +++++ + drivers/misc/phantom.c | 5 +- + drivers/mtd/devices/block2mtd.c | 8 +- + drivers/mtd/mtdchar.c | 9 +- + drivers/net/3c59x.c | 2 +- + drivers/net/arm/at91_ether.c | 2 +- + drivers/net/arm/ep93xx_eth.c | 2 +- + drivers/net/arm/etherh.c | 6 +- + drivers/net/phy/phy_device.c | 8 +- + drivers/net/ppp_generic.c | 3 +- + drivers/net/wan/cosa.c | 6 +- + drivers/pci/hotplug/acpiphp.h | 4 +- + drivers/power/apm_power.c | 2 +- + drivers/power/power_supply_core.c | 4 +- + drivers/rtc/interface.c | 2 +- + 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 | 18 +- + drivers/s390/cio/css.c | 4 +- + drivers/s390/cio/device.c | 4 +- + drivers/s390/cio/device_fsm.c | 6 +- + drivers/s390/cio/device_ops.c | 2 +- + 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 | 2 +- + 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 | 10 +- + drivers/s390/scsi/zfcp_def.h | 4 +- + drivers/sbus/sbus.c | 6 +- + drivers/scsi/dpt_i2o.c | 4 +- + drivers/scsi/hosts.c | 7 +- + drivers/scsi/scsi_transport_fc.c | 9 +- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/spi/spi.c | 2 +- + drivers/spi/spidev.c | 4 +- + drivers/uio/Kconfig | 10 +- + drivers/uio/Makefile | 1 + + drivers/uio/uio.c | 26 + + drivers/uio/uio_pdrv.c | 118 +++ + drivers/usb/core/devio.c | 15 +- + drivers/usb/core/file.c | 5 +- + drivers/usb/gadget/printer.c | 4 +- + drivers/usb/mon/mon_bin.c | 5 +- + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/aty/radeonfb.h | 2 +- + drivers/video/console/fbcon.c | 3 +- + drivers/video/fbmem.c | 5 +- + drivers/xen/balloon.c | 1 + + fs/coda/psdev.c | 5 +- + fs/debugfs/inode.c | 114 +++- + fs/partitions/check.c | 2 +- + fs/sysfs/dir.c | 37 +- + fs/sysfs/file.c | 18 +- + fs/sysfs/mount.c | 2 +- + fs/sysfs/symlink.c | 41 +- + fs/sysfs/sysfs.h | 2 + + include/linux/debugfs.h | 4 + + include/linux/device.h | 51 +- + include/linux/eisa.h | 2 +- + include/linux/init.h | 1 + + include/linux/kobject.h | 3 +- + include/linux/mtd/map.h | 2 +- + include/linux/mtd/mtd.h | 2 +- + include/linux/spi/spi.h | 2 +- + include/linux/sysdev.h | 39 +- + include/linux/sysfs.h | 15 + + include/linux/uio_driver.h | 8 +- + include/scsi/scsi_host.h | 2 +- + include/scsi/scsi_transport_fc.h | 4 +- + include/scsi/scsi_transport_iscsi.h | 2 +- + init/main.c | 9 + + kernel/rtmutex-tester.c | 7 +- + kernel/time/clocksource.c | 8 +- + lib/Kconfig.debug | 3 + + lib/kobject.c | 62 ++- + lib/kobject_uevent.c | 3 +- + net/bluetooth/hci_sysfs.c | 7 - + .../firmware_sample_firmware_class.c | 2 +- + samples/kobject/kset-example.c | 2 +- + scripts/mod/file2alias.c | 24 +- + sound/core/init.c | 5 +- + sound/oss/soundcard.c | 14 +- + sound/sound_core.c | 5 +- + 212 files changed, 2802 insertions(+), 970 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-dev + create mode 100644 drivers/misc/hpilo.c + create mode 100644 drivers/misc/hpilo.h + create mode 100644 drivers/uio/uio_pdrv.c +$ git am -3 ../patches/0001-scsi-fix-fallout-from-the-class_find_device-API-cha.patch +Applying scsi: fix fallout from the class_find_device API change +error: patch failed: drivers/scsi/scsi_transport_iscsi.c:221 +error: drivers/scsi/scsi_transport_iscsi.c: patch does not apply +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Auto-merged drivers/scsi/scsi_transport_iscsi.c +$ git reset HEAD^ +drivers/scsi/scsi_transport_iscsi.c: needs update +$ git commit -v -a --amend +Created commit 1077f08: Merge branch 'quilt/driver-core' +$ git am -3 ../patches/0001-scsi-fix-fallout-from-KOBJ_NAME_LEN-removal.patch +Applying scsi: fix fallout from KOBJ_NAME_LEN removal +$ git reset HEAD^ +drivers/message/fusion/mptbase.c: needs update +drivers/message/fusion/mptbase.h: needs update +$ git commit -v -a --amend +Created commit 99c2fcc: Merge branch 'quilt/driver-core' +Merging quilt/usb +$ git merge quilt/usb +Renamed drivers/usb/gadget/pxa2xx_udc.c => drivers/usb/gadget/pxa25x_udc.c +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Removed Documentation/usb/uhci.txt +Auto-merged drivers/usb/core/devio.c +Auto-merged drivers/usb/core/file.c +Auto-merged drivers/usb/gadget/Kconfig +Auto-merged drivers/usb/gadget/Makefile +Auto-merged drivers/usb/gadget/at91_udc.c +Auto-merged drivers/usb/gadget/ether.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/ether.c +Auto-merged drivers/usb/gadget/gadget_chips.h +Auto-merged drivers/usb/gadget/inode.c +Auto-merged drivers/usb/gadget/omap_udc.c +Auto-merged drivers/usb/gadget/printer.c +Auto-merged drivers/usb/gadget/pxa27x_udc.c +Auto-merged drivers/usb/host/ohci-omap.c +Auto-merged drivers/usb/misc/emi62.c +Auto-merged drivers/usb/serial/Kconfig +Removed drivers/usb/serial/airprime.c +CONFLICT (delete/modify): drivers/usb/serial/io_fw_down3.h deleted in HEAD and modified in quilt/usb. Version quilt/usb of drivers/usb/serial/io_fw_down3.h left in tree. +Auto-merged drivers/usb/serial/io_ti.c +CONFLICT (content): Merge conflict in drivers/usb/serial/io_ti.c +Auto-merged drivers/usb/serial/keyspan.h +Auto-merged drivers/usb/serial/keyspan_pda.c +CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in HEAD and modified in quilt/usb. Version quilt/usb of drivers/usb/serial/ti_fw_3410.h left in tree. +CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in HEAD and modified in quilt/usb. Version quilt/usb 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 +Resolved 'drivers/usb/gadget/ether.c' using previous resolution. +Resolved 'drivers/usb/serial/ti_usb_3410_5052.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 99c2fcc Merge branch 'quilt/driver-core' +$ git checkout -b tmp quilt/usb +Switched to a new branch "tmp" +$ git revert 1f023570c8d00d3511799ccad21dc3525a6160e1 +Finished one revert. +Created commit 32e64f0: Revert "USB: io_ti: FIrst cut at a big clean up" + 2 files changed, 1030 insertions(+), 869 deletions(-) +$ git checkout master +Switched to branch "master" +$ git merge tmp +Renamed drivers/usb/gadget/pxa2xx_udc.c => drivers/usb/gadget/pxa25x_udc.c +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Removed Documentation/usb/uhci.txt +Auto-merged drivers/usb/core/devio.c +Auto-merged drivers/usb/core/file.c +Auto-merged drivers/usb/gadget/Kconfig +Auto-merged drivers/usb/gadget/Makefile +Auto-merged drivers/usb/gadget/at91_udc.c +Auto-merged drivers/usb/gadget/ether.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/ether.c +Auto-merged drivers/usb/gadget/gadget_chips.h +Auto-merged drivers/usb/gadget/inode.c +Auto-merged drivers/usb/gadget/omap_udc.c +Auto-merged drivers/usb/gadget/printer.c +Auto-merged drivers/usb/gadget/pxa27x_udc.c +Auto-merged drivers/usb/host/ohci-omap.c +Auto-merged drivers/usb/misc/emi62.c +Auto-merged drivers/usb/serial/Kconfig +Removed drivers/usb/serial/airprime.c +Auto-merged drivers/usb/serial/keyspan.h +Auto-merged drivers/usb/serial/keyspan_pda.c +CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in HEAD and modified in tmp. Version tmp of drivers/usb/serial/ti_fw_3410.h left in tree. +CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in HEAD and modified in tmp. Version tmp 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 +Resolved 'drivers/usb/gadget/ether.c' using previous resolution. +Resolved 'drivers/usb/serial/ti_usb_3410_5052.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm drivers/usb/serial/ti_fw_3410.h drivers/usb/serial/ti_fw_5052.h +rm 'drivers/usb/serial/ti_fw_3410.h' +rm 'drivers/usb/serial/ti_fw_3410.h' +rm 'drivers/usb/serial/ti_fw_5052.h' +rm 'drivers/usb/serial/ti_fw_5052.h' +$ git commit -v -a +Created commit de898a9: Merge branch 'tmp' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/gadget.tmpl | 38 + + Documentation/usb/gadget_serial.txt | 35 +- + Documentation/usb/persist.txt | 7 +- + Documentation/usb/uhci.txt | 165 --- + drivers/hid/usbhid/hid-core.c | 2 +- + drivers/usb/atm/cxacru.c | 1 - + drivers/usb/atm/speedtch.c | 1 - + drivers/usb/class/cdc-acm.c | 177 ++- + drivers/usb/class/cdc-acm.h | 5 + + drivers/usb/class/cdc-wdm.c | 127 ++- + drivers/usb/core/devices.c | 4 - + drivers/usb/core/devio.c | 98 +- + drivers/usb/core/driver.c | 168 ++- + drivers/usb/core/endpoint.c | 4 +- + drivers/usb/core/file.c | 10 +- + drivers/usb/core/hcd.c | 6 +- + drivers/usb/core/hcd.h | 4 +- + drivers/usb/core/hub.c | 536 ++++--- + drivers/usb/core/inode.c | 16 +- + drivers/usb/core/message.c | 22 +- + drivers/usb/core/usb.c | 7 +- + drivers/usb/core/usb.h | 19 +- + drivers/usb/gadget/Kconfig | 14 + + drivers/usb/gadget/Makefile | 13 +- + drivers/usb/gadget/amd5536udc.c | 2 +- + drivers/usb/gadget/at91_udc.c | 13 + + drivers/usb/gadget/cdc2.c | 246 ++++ + drivers/usb/gadget/composite.c | 1041 ++++++++++++++ + drivers/usb/gadget/config.c | 76 +- + drivers/usb/gadget/dummy_hcd.c | 4 +- + drivers/usb/gadget/epautoconf.c | 1 + + drivers/usb/gadget/ether.c | 2631 +++------------------------------- + drivers/usb/gadget/f_acm.c | 589 ++++++++ + drivers/usb/gadget/f_ecm.c | 833 +++++++++++ + drivers/usb/gadget/f_loopback.c | 381 +++++ + drivers/usb/gadget/f_rndis.c | 827 +++++++++++ + drivers/usb/gadget/f_serial.c | 296 ++++ + drivers/usb/gadget/f_sourcesink.c | 587 ++++++++ + drivers/usb/gadget/f_subset.c | 423 ++++++ + drivers/usb/gadget/file_storage.c | 4 +- + drivers/usb/gadget/fsl_usb2_udc.c | 2 +- + drivers/usb/gadget/g_zero.h | 25 + + drivers/usb/gadget/gadget_chips.h | 23 + + drivers/usb/gadget/goku_udc.c | 2 +- + drivers/usb/gadget/inode.c | 23 +- + drivers/usb/gadget/lh7a40x_udc.c | 2 +- + drivers/usb/gadget/m66592-udc.c | 2 +- + drivers/usb/gadget/ndis.h | 10 +- + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/gadget/omap_udc.c | 2 +- + drivers/usb/gadget/printer.c | 7 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 1 - + drivers/usb/gadget/rndis.c | 421 ++----- + drivers/usb/gadget/rndis.h | 9 +- + drivers/usb/gadget/serial.c | 2315 ++---------------------------- + drivers/usb/gadget/u_ether.c | 967 +++++++++++++ + drivers/usb/gadget/u_ether.h | 127 ++ + drivers/usb/gadget/u_serial.c | 1246 ++++++++++++++++ + drivers/usb/gadget/u_serial.h | 58 + + drivers/usb/gadget/zero.c | 1162 ++-------------- + drivers/usb/host/ehci-au1xxx.c | 369 +++--- + drivers/usb/host/ehci-dbg.c | 4 +- + drivers/usb/host/ehci-fsl.c | 17 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-ixp4xx.c | 8 +- + drivers/usb/host/ehci-orion.c | 8 +- + drivers/usb/host/ehci-ps3.c | 2 +- + drivers/usb/host/ehci-q.c | 17 +- + drivers/usb/host/ehci.h | 5 +- + drivers/usb/host/isp116x-hcd.c | 25 +- + drivers/usb/host/isp1760-hcd.c | 81 +- + drivers/usb/host/isp1760-hcd.h | 20 +- + drivers/usb/host/isp1760-if.c | 37 +- + drivers/usb/host/ohci-at91.c | 9 +- + drivers/usb/host/ohci-au1xxx.c | 327 ++--- + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/ohci-omap.c | 2 +- + drivers/usb/host/ohci-pnx4008.c | 28 +- + drivers/usb/host/ohci-ppc-of.c | 2 +- + drivers/usb/host/ohci-ps3.c | 2 +- + drivers/usb/host/ohci-q.c | 3 - + drivers/usb/host/ohci-sm501.c | 2 +- + drivers/usb/host/ohci-ssb.c | 2 +- + drivers/usb/host/r8a66597-hcd.c | 44 +- + drivers/usb/host/sl811-hcd.c | 2 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/usb/host/uhci-hub.c | 2 +- + drivers/usb/misc/Kconfig | 10 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/auerswald.c | 10 +- + drivers/usb/misc/emi62.c | 2 - + drivers/usb/misc/ftdi-elan.c | 24 - + drivers/usb/misc/gotemp.c | 301 ++++ + drivers/usb/misc/iowarrior.c | 8 +- + drivers/usb/misc/rio500.c | 8 +- + drivers/usb/misc/sisusbvga/sisusb.c | 13 +- + drivers/usb/misc/usblcd.c | 6 +- + drivers/usb/mon/mon_stat.c | 14 +- + drivers/usb/serial/Kconfig | 16 +- + drivers/usb/serial/Makefile | 1 - + drivers/usb/serial/airprime.c | 353 ----- + drivers/usb/serial/cp2101.c | 13 +- + drivers/usb/serial/digi_acceleport.c | 3 +- + drivers/usb/serial/ipaq.c | 3 +- + drivers/usb/serial/ir-usb.c | 490 ++++--- + drivers/usb/serial/keyspan.h | 5 +- + drivers/usb/serial/keyspan_pda.c | 2 +- + drivers/usb/serial/kl5kusb105.c | 2 +- + drivers/usb/serial/option.c | 2 + + drivers/usb/serial/usb-serial.c | 13 +- + drivers/usb/serial/usb_debug.c | 9 + + 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 | 53 +- + 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 | 83 +- + 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 +- + firmware/keyspan_pda/keyspan_pda.S | 2 +- + firmware/keyspan_pda/xircom_pgs.S | 2 +- + include/linux/usb.h | 12 +- + include/linux/usb/composite.h | 338 +++++ + include/linux/usb/gadget.h | 27 +- + include/linux/usb/irda.h | 151 ++ + include/linux/usbdevice_fs.h | 2 - + 146 files changed, 11082 insertions(+), 7949 deletions(-) + delete mode 100644 Documentation/usb/uhci.txt + create mode 100644 drivers/usb/gadget/cdc2.c + create mode 100644 drivers/usb/gadget/composite.c + create mode 100644 drivers/usb/gadget/f_acm.c + create mode 100644 drivers/usb/gadget/f_ecm.c + create mode 100644 drivers/usb/gadget/f_loopback.c + create mode 100644 drivers/usb/gadget/f_rndis.c + create mode 100644 drivers/usb/gadget/f_serial.c + create mode 100644 drivers/usb/gadget/f_sourcesink.c + create mode 100644 drivers/usb/gadget/f_subset.c + create mode 100644 drivers/usb/gadget/g_zero.h + create mode 100644 drivers/usb/gadget/u_ether.c + create mode 100644 drivers/usb/gadget/u_ether.h + create mode 100644 drivers/usb/gadget/u_serial.c + create mode 100644 drivers/usb/gadget/u_serial.h + create mode 100644 drivers/usb/misc/gotemp.c + delete mode 100644 drivers/usb/serial/airprime.c + create mode 100644 include/linux/usb/composite.h + create mode 100644 include/linux/usb/irda.h +$ git am -3 ../patches/0001-pci-usb-fixup-1.patch +Applying pci: usb fixup 1 +$ git reset HEAD^ +drivers/usb/core/driver.c: needs update +$ git commit -v -a --amend +Created commit 25a27d0: Merge branch 'tmp' +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/sched.h +Auto-merged lib/Kconfig.debug +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 + + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/vmlinux_32.lds.S | 1 + + include/asm-generic/percpu.h | 11 ++++- + include/asm-generic/sections.h | 10 ++++ + include/asm-generic/vmlinux.lds.h | 17 +++++++ + include/asm-x86/percpu.h | 83 ++++++++++++++++++++++++++++++++-- + include/linux/percpu.h | 24 ++++++++++- + include/linux/sched.h | 3 +- + kernel/lockdep.c | 4 +- + kernel/module.c | 7 ++- + kernel/softlockup.c | 45 ++++++++++++++++--- + kernel/sysctl.c | 20 +++++++-- + kernel/time/tick-sched.c | 4 +- + lib/Kconfig.debug | 26 ++++++++++- + mm/filemap.c | 15 +++--- + 16 files changed, 240 insertions(+), 35 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged drivers/acpi/processor_throttling.c +CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c +Auto-merged drivers/base/cpu.c +Auto-merged kernel/cpu.c +Auto-merged kernel/time/clocksource.c +Resolved 'drivers/acpi/processor_throttling.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 66a2663: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 6 +- + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 8 +- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 10 +- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 4 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 4 +- + arch/x86/kernel/io_apic_64.c | 8 +- + arch/x86/kernel/smpboot.c | 8 +- + arch/x86/xen/smp.c | 4 +- + drivers/acpi/processor_throttling.c | 6 +- + drivers/base/cpu.c | 4 +- + drivers/cpufreq/cpufreq.c | 14 ++-- + drivers/cpufreq/cpufreq_conservative.c | 2 +- + drivers/cpufreq/cpufreq_ondemand.c | 4 +- + drivers/infiniband/hw/ehca/ehca_irq.c | 4 +- + include/asm-x86/ipi.h | 2 +- + include/linux/cpumask.h | 94 ++++++++++++++-------- + kernel/cpu.c | 2 +- + kernel/rcuclassic.c | 2 +- + kernel/rcupreempt.c | 10 +- + kernel/sched.c | 36 ++++---- + kernel/sched_fair.c | 2 +- + kernel/sched_rt.c | 4 +- + kernel/taskstats.c | 4 +- + kernel/time/clocksource.c | 4 +- + kernel/time/tick-broadcast.c | 3 +- + kernel/workqueue.c | 6 +- + lib/cpumask.c | 9 ++ + mm/allocpercpu.c | 4 +- + mm/vmstat.c | 2 +- + net/core/dev.c | 4 +- + net/iucv/iucv.c | 2 +- + net/sunrpc/svc.c | 2 +- + 34 files changed, 161 insertions(+), 125 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Already up-to-date. +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Already up-to-date. +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 10 ++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Already up-to-date. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/exit.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 | 3 +-- + 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 | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 132 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Merge made by recursive. + drivers/char/hpet.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ + include/linux/hpet.h | 3 +- + 2 files changed, 65 insertions(+), 1 deletions(-) +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged arch/x86/kernel/Makefile +CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/early-quirks.c +Auto-merged arch/x86/kernel/pci-dma.c +Auto-merged arch/x86/kernel/pci-gart_64.c +Auto-merged arch/x86/kernel/process.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/setup.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged arch/x86/pci/pci.h +Auto-merged arch/x86/xen/smp.c +Auto-merged drivers/pci/intel-iommu.c +Auto-merged include/asm-x86/e820.h +Auto-merged include/asm-x86/ipi.h +Auto-merged include/asm-x86/pci-direct.h +CONFLICT (content): Merge conflict in include/asm-x86/pci-direct.h +Auto-merged include/asm-x86/percpu.h +Auto-merged include/asm-x86/processor.h +Auto-merged include/asm-x86/system.h +Recorded preimage for 'include/asm-x86/pci-direct.h' +Resolved 'arch/x86/kernel/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/asm-x86/pci-direct.h'. +Created commit f7d00f2: Merge commit 'x86/auto-x86-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/ia32/ia32entry.S | 18 +- + arch/x86/kernel/Makefile | 3 +- + arch/x86/kernel/amd_iommu.c | 231 +++++++- + arch/x86/kernel/amd_iommu_init.c | 332 ++++++++--- + arch/x86/kernel/aperture_64.c | 1 + + arch/x86/kernel/asm-offsets_64.c | 11 + + arch/x86/kernel/cpu/amd_64.c | 2 + + arch/x86/kernel/cpu/common_64.c | 7 +- + arch/x86/kernel/early-quirks.c | 5 +- + arch/x86/kernel/entry_32.S | 23 +- + arch/x86/kernel/entry_64.S | 120 ++++- + arch/x86/kernel/head64.c | 11 +- + arch/x86/kernel/head_64.S | 1 + + arch/x86/kernel/io_delay.c | 3 + + arch/x86/kernel/irq_32.c | 7 +- + arch/x86/kernel/kprobes.c | 1 - + arch/x86/kernel/module_64.c | 10 +- + arch/x86/kernel/paravirt.c | 28 + + arch/x86/kernel/pci-calgary_64.c | 2 +- + arch/x86/kernel/pci-dma.c | 14 +- + arch/x86/kernel/pci-gart_64.c | 1 + + arch/x86/kernel/pci-nommu.c | 2 +- + arch/x86/kernel/pci-swiotlb_64.c | 2 +- + arch/x86/kernel/process.c | 3 + + arch/x86/kernel/process_64.c | 56 +- + arch/x86/kernel/ptrace.c | 151 ++--- + arch/x86/kernel/setup.c | 5 +- + arch/x86/kernel/signal_32.c | 6 - + arch/x86/kernel/signal_64.c | 6 - + arch/x86/kernel/smpboot.c | 5 +- + arch/x86/kernel/step.c | 35 +- + arch/x86/mm/init_32.c | 2 - + arch/x86/pci/Makefile | 12 +- + arch/x86/pci/legacy.c | 9 +- + arch/x86/pci/{numa.c => numaq_32.c} | 4 +- + arch/x86/pci/pci.h | 3 +- + arch/x86/pci/visws.c | 23 +- + arch/x86/vdso/Makefile | 2 +- + arch/x86/vdso/vdso32-setup.c | 19 +- + arch/x86/vdso/vdso32.S | 13 +- + arch/x86/xen/Kconfig | 9 +- + arch/x86/xen/Makefile | 2 +- + arch/x86/xen/enlighten.c | 688 ++++++++++++++++----- + arch/x86/xen/mmu.c | 316 +++++++--- + arch/x86/xen/mmu.h | 29 +- + arch/x86/xen/multicalls.c | 1 + + arch/x86/xen/setup.c | 79 ++- + arch/x86/xen/smp.c | 306 ++++++++-- + arch/x86/xen/suspend.c | 5 +- + arch/x86/xen/{xen-asm.S => xen-asm_32.S} | 0 + arch/x86/xen/xen-asm_64.S | 271 ++++++++ + arch/x86/xen/xen-head.S | 28 +- + arch/x86/xen/xen-ops.h | 21 +- + drivers/net/xen-netfront.c | 19 +- + drivers/pci/intel-iommu.c | 2 +- + drivers/xen/events.c | 27 + + drivers/xen/manage.c | 6 +- + include/asm-x86/a.out-core.h | 6 +- + include/asm-x86/a.out.h | 6 +- + include/asm-x86/acpi.h | 6 +- + include/asm-x86/agp.h | 6 +- + include/asm-x86/alternative.h | 6 +- + include/asm-x86/amd_iommu.h | 6 +- + include/asm-x86/amd_iommu_types.h | 114 ++++- + include/asm-x86/apic.h | 6 +- + include/asm-x86/apicdef.h | 6 +- + include/asm-x86/arch_hooks.h | 6 +- + include/asm-x86/asm.h | 6 +- + include/asm-x86/atomic_32.h | 6 +- + include/asm-x86/atomic_64.h | 6 +- + include/asm-x86/auxvec.h | 6 +- + include/asm-x86/bios_ebda.h | 6 +- + include/asm-x86/bitops.h | 6 +- + include/asm-x86/boot.h | 6 +- + include/asm-x86/bootparam.h | 6 +- + include/asm-x86/bug.h | 6 +- + include/asm-x86/bugs.h | 6 +- + include/asm-x86/byteorder.h | 6 +- + include/asm-x86/cache.h | 6 +- + include/asm-x86/cacheflush.h | 6 +- + include/asm-x86/calgary.h | 6 +- + include/asm-x86/calling.h | 6 +- + include/asm-x86/checksum_32.h | 6 +- + include/asm-x86/checksum_64.h | 6 +- + include/asm-x86/cmpxchg_32.h | 6 +- + include/asm-x86/cmpxchg_64.h | 6 +- + include/asm-x86/compat.h | 6 +- + include/asm-x86/cpu.h | 6 +- + include/asm-x86/cpufeature.h | 6 +- + include/asm-x86/current.h | 6 +- + include/asm-x86/debugreg.h | 6 +- + include/asm-x86/delay.h | 6 +- + include/asm-x86/desc.h | 6 +- + include/asm-x86/desc_defs.h | 6 +- + include/asm-x86/device.h | 6 +- + include/asm-x86/div64.h | 6 +- + include/asm-x86/dma.h | 6 +- + include/asm-x86/dmi.h | 6 +- + include/asm-x86/dwarf2.h | 6 +- + include/asm-x86/e820.h | 6 +- + include/asm-x86/edac.h | 6 +- + include/asm-x86/efi.h | 6 +- + include/asm-x86/elf.h | 6 +- + include/asm-x86/emergency-restart.h | 6 +- + include/asm-x86/fb.h | 6 +- + include/asm-x86/fixmap.h | 6 +- + include/asm-x86/fixmap_32.h | 6 +- + include/asm-x86/fixmap_64.h | 6 +- + include/asm-x86/floppy.h | 6 +- + include/asm-x86/futex.h | 6 +- + include/asm-x86/gart.h | 7 +- + include/asm-x86/genapic_32.h | 6 +- + include/asm-x86/genapic_64.h | 6 +- + include/asm-x86/geode.h | 6 +- + include/asm-x86/gpio.h | 6 +- + include/asm-x86/hardirq_32.h | 6 +- + include/asm-x86/hardirq_64.h | 6 +- + include/asm-x86/highmem.h | 6 +- + include/asm-x86/hpet.h | 6 +- + include/asm-x86/hugetlb.h | 6 +- + include/asm-x86/hw_irq.h | 6 +- + include/asm-x86/hypertransport.h | 6 +- + include/asm-x86/i387.h | 6 +- + include/asm-x86/i8253.h | 6 +- + include/asm-x86/i8259.h | 6 +- + include/asm-x86/ia32.h | 6 +- + include/asm-x86/ia32_unistd.h | 6 +- + include/asm-x86/ide.h | 6 +- + include/asm-x86/idle.h | 6 +- + include/asm-x86/intel_arch_perfmon.h | 6 +- + include/asm-x86/io.h | 6 +- + include/asm-x86/io_32.h | 6 +- + include/asm-x86/io_64.h | 6 +- + include/asm-x86/io_apic.h | 6 +- + include/asm-x86/ioctls.h | 6 +- + include/asm-x86/iommu.h | 16 +- + include/asm-x86/ipcbuf.h | 6 +- + include/asm-x86/ipi.h | 6 +- + include/asm-x86/irq.h | 6 +- + include/asm-x86/irq_regs_32.h | 6 +- + include/asm-x86/irq_vectors.h | 6 +- + include/asm-x86/ist.h | 6 +- + include/asm-x86/k8.h | 6 +- + include/asm-x86/kdebug.h | 6 +- + include/asm-x86/kexec.h | 6 +- + include/asm-x86/kgdb.h | 6 +- + include/asm-x86/kmap_types.h | 6 +- + include/asm-x86/kprobes.h | 6 +- + include/asm-x86/kvm.h | 6 +- + include/asm-x86/kvm_host.h | 8 +- + include/asm-x86/kvm_para.h | 6 +- + include/asm-x86/kvm_x86_emulate.h | 6 +- + include/asm-x86/ldt.h | 6 +- + include/asm-x86/lguest.h | 6 +- + include/asm-x86/lguest_hcall.h | 6 +- + include/asm-x86/linkage.h | 6 +- + include/asm-x86/local.h | 6 +- + include/asm-x86/mach-bigsmp/mach_apic.h | 6 +- + include/asm-x86/mach-bigsmp/mach_apicdef.h | 6 +- + include/asm-x86/mach-bigsmp/mach_ipi.h | 6 +- + include/asm-x86/mach-default/apm.h | 6 +- + include/asm-x86/mach-default/mach_apic.h | 6 +- + include/asm-x86/mach-default/mach_apicdef.h | 6 +- + include/asm-x86/mach-default/mach_ipi.h | 6 +- + include/asm-x86/mach-default/mach_mpparse.h | 6 +- + include/asm-x86/mach-default/mach_mpspec.h | 6 +- + include/asm-x86/mach-default/mach_timer.h | 6 +- + include/asm-x86/mach-default/mach_traps.h | 6 +- + include/asm-x86/mach-default/mach_wakecpu.h | 6 +- + include/asm-x86/mach-es7000/mach_apic.h | 6 +- + include/asm-x86/mach-es7000/mach_apicdef.h | 6 +- + include/asm-x86/mach-es7000/mach_ipi.h | 6 +- + include/asm-x86/mach-es7000/mach_mpparse.h | 6 +- + include/asm-x86/mach-es7000/mach_wakecpu.h | 6 +- + include/asm-x86/mach-generic/gpio.h | 6 +- + include/asm-x86/mach-generic/irq_vectors_limits.h | 6 +- + include/asm-x86/mach-generic/mach_apic.h | 6 +- + include/asm-x86/mach-generic/mach_apicdef.h | 6 +- + include/asm-x86/mach-generic/mach_ipi.h | 6 +- + include/asm-x86/mach-generic/mach_mpparse.h | 6 +- + include/asm-x86/mach-generic/mach_mpspec.h | 6 +- + include/asm-x86/mach-numaq/mach_apic.h | 6 +- + include/asm-x86/mach-numaq/mach_apicdef.h | 6 +- + include/asm-x86/mach-numaq/mach_ipi.h | 6 +- + include/asm-x86/mach-numaq/mach_mpparse.h | 6 +- + include/asm-x86/mach-numaq/mach_wakecpu.h | 6 +- + include/asm-x86/mach-rdc321x/gpio.h | 6 +- + include/asm-x86/mach-summit/irq_vectors_limits.h | 6 +- + include/asm-x86/mach-summit/mach_apic.h | 6 +- + include/asm-x86/mach-summit/mach_apicdef.h | 6 +- + include/asm-x86/mach-summit/mach_ipi.h | 6 +- + include/asm-x86/mach-summit/mach_mpparse.h | 6 +- + include/asm-x86/math_emu.h | 6 +- + include/asm-x86/mc146818rtc.h | 6 +- + include/asm-x86/mca.h | 6 +- + include/asm-x86/mca_dma.h | 6 +- + include/asm-x86/mce.h | 6 +- + include/asm-x86/mman.h | 6 +- + include/asm-x86/mmconfig.h | 6 +- + include/asm-x86/mmu.h | 6 +- + include/asm-x86/mmu_context.h | 6 +- + include/asm-x86/mmu_context_32.h | 6 +- + include/asm-x86/mmu_context_64.h | 6 +- + include/asm-x86/mmx.h | 6 +- + include/asm-x86/mmzone_32.h | 6 +- + include/asm-x86/mmzone_64.h | 6 +- + include/asm-x86/module.h | 6 +- + include/asm-x86/mpspec.h | 6 +- + include/asm-x86/mpspec_def.h | 6 +- + include/asm-x86/msgbuf.h | 6 +- + include/asm-x86/msidef.h | 6 +- + include/asm-x86/msr-index.h | 6 +- + include/asm-x86/msr.h | 6 +- + include/asm-x86/mtrr.h | 6 +- + include/asm-x86/mutex_32.h | 6 +- + include/asm-x86/mutex_64.h | 6 +- + include/asm-x86/namei.h | 6 +- + include/asm-x86/nmi.h | 6 +- + include/asm-x86/nops.h | 6 +- + include/asm-x86/numa_32.h | 6 +- + include/asm-x86/numa_64.h | 6 +- + include/asm-x86/numaq.h | 6 +- + include/asm-x86/olpc.h | 6 +- + include/asm-x86/page.h | 6 +- + include/asm-x86/page_32.h | 6 +- + include/asm-x86/page_64.h | 6 +- + include/asm-x86/param.h | 6 +- + include/asm-x86/paravirt.h | 75 ++- + include/asm-x86/parport.h | 6 +- + include/asm-x86/pat.h | 6 +- + include/asm-x86/pci-direct.h | 6 +- + include/asm-x86/pci.h | 6 +- + include/asm-x86/pci_32.h | 6 +- + include/asm-x86/pci_64.h | 6 +- + include/asm-x86/percpu.h | 32 +- + include/asm-x86/pgalloc.h | 6 +- + include/asm-x86/pgtable-2level-defs.h | 6 +- + include/asm-x86/pgtable-2level.h | 6 +- + include/asm-x86/pgtable-3level-defs.h | 6 +- + include/asm-x86/pgtable-3level.h | 6 +- + include/asm-x86/pgtable.h | 24 +- + include/asm-x86/pgtable_32.h | 21 +- + include/asm-x86/pgtable_64.h | 8 +- + include/asm-x86/posix_types_32.h | 6 +- + include/asm-x86/posix_types_64.h | 6 +- + include/asm-x86/prctl.h | 6 +- + include/asm-x86/processor-flags.h | 6 +- + include/asm-x86/processor.h | 6 +- + include/asm-x86/proto.h | 6 +- + include/asm-x86/ptrace-abi.h | 12 +- + include/asm-x86/ptrace.h | 6 +- + include/asm-x86/pvclock-abi.h | 6 +- + include/asm-x86/pvclock.h | 6 +- + include/asm-x86/reboot.h | 6 +- + include/asm-x86/reboot_fixups.h | 6 +- + include/asm-x86/required-features.h | 6 +- + include/asm-x86/resume-trace.h | 6 +- + include/asm-x86/rio.h | 6 +- + include/asm-x86/rwlock.h | 6 +- + include/asm-x86/rwsem.h | 6 +- + include/asm-x86/scatterlist.h | 6 +- + include/asm-x86/seccomp_32.h | 6 +- + include/asm-x86/seccomp_64.h | 6 +- + include/asm-x86/segment.h | 6 +- + include/asm-x86/sembuf.h | 6 +- + include/asm-x86/serial.h | 6 +- + include/asm-x86/setup.h | 7 +- + include/asm-x86/shmbuf.h | 6 +- + include/asm-x86/shmparam.h | 6 +- + include/asm-x86/sigcontext.h | 6 +- + include/asm-x86/sigcontext32.h | 6 +- + include/asm-x86/siginfo.h | 6 +- + include/asm-x86/signal.h | 6 +- + include/asm-x86/smp.h | 8 +- + include/asm-x86/socket.h | 6 +- + include/asm-x86/sockios.h | 6 +- + include/asm-x86/sparsemem.h | 6 +- + include/asm-x86/spinlock.h | 124 ++++- + include/asm-x86/spinlock_types.h | 8 +- + include/asm-x86/srat.h | 6 +- + include/asm-x86/stacktrace.h | 6 +- + include/asm-x86/stat.h | 6 +- + include/asm-x86/statfs.h | 6 +- + include/asm-x86/string_32.h | 6 +- + include/asm-x86/string_64.h | 6 +- + include/asm-x86/suspend_32.h | 6 +- + include/asm-x86/suspend_64.h | 6 +- + include/asm-x86/swiotlb.h | 12 +- + include/asm-x86/sync_bitops.h | 6 +- + include/asm-x86/system.h | 6 +- + include/asm-x86/system_64.h | 6 +- + include/asm-x86/tce.h | 6 +- + include/asm-x86/termbits.h | 6 +- + include/asm-x86/termios.h | 6 +- + include/asm-x86/therm_throt.h | 6 +- + include/asm-x86/thread_info.h | 27 +- + include/asm-x86/time.h | 6 +- + include/asm-x86/timer.h | 6 +- + include/asm-x86/timex.h | 6 +- + include/asm-x86/tlb.h | 6 +- + include/asm-x86/tlbflush.h | 6 +- + include/asm-x86/topology.h | 6 +- + include/asm-x86/trampoline.h | 6 +- + include/asm-x86/tsc.h | 6 +- + include/asm-x86/types.h | 6 +- + include/asm-x86/uaccess.h | 6 +- + include/asm-x86/uaccess_32.h | 6 +- + include/asm-x86/uaccess_64.h | 6 +- + include/asm-x86/ucontext.h | 6 +- + include/asm-x86/unaligned.h | 6 +- + include/asm-x86/unistd_32.h | 6 +- + include/asm-x86/unistd_64.h | 6 +- + include/asm-x86/unwind.h | 6 +- + include/asm-x86/user32.h | 6 +- + include/asm-x86/user_32.h | 6 +- + include/asm-x86/user_64.h | 6 +- + include/asm-x86/uv/uv_bau.h | 6 +- + include/asm-x86/uv/uv_hub.h | 6 +- + include/asm-x86/uv/uv_mmrs.h | 6 +- + include/asm-x86/vdso.h | 8 + + include/asm-x86/vga.h | 6 +- + include/asm-x86/vgtod.h | 6 +- + include/asm-x86/visws/cobalt.h | 6 +- + include/asm-x86/visws/lithium.h | 6 +- + include/asm-x86/visws/piix4.h | 6 +- + include/asm-x86/vm86.h | 6 +- + include/asm-x86/vmi_time.h | 6 +- + include/asm-x86/vsyscall.h | 6 +- + include/asm-x86/xen/events.h | 7 +- + include/asm-x86/xen/grant_table.h | 6 +- + include/asm-x86/xen/hypercall.h | 269 ++++++--- + include/asm-x86/xen/hypervisor.h | 6 +- + include/asm-x86/xen/interface.h | 139 ++--- + include/asm-x86/xen/interface_32.h | 97 +++ + include/asm-x86/xen/interface_64.h | 159 +++++ + include/asm-x86/xen/page.h | 12 +- + include/xen/events.h | 7 + + include/xen/hvc-console.h | 7 +- + include/xen/interface/callback.h | 6 +- + include/xen/xen-ops.h | 3 + + 340 files changed, 4000 insertions(+), 1751 deletions(-) + rename arch/x86/pci/{numa.c => numaq_32.c} (97%) + rename arch/x86/xen/{xen-asm.S => xen-asm_32.S} (100%) + create mode 100644 arch/x86/xen/xen-asm_64.S + create mode 100644 include/asm-x86/xen/interface_32.h + create mode 100644 include/asm-x86/xen/interface_64.h +$ git am -3 ../patches/0001-pci-fix-xen-fallout-from-PM-API-change.patch +Applying pci: fix xen fallout from PM API change +$ git reset HEAD^ +drivers/xen/manage.c: needs update +$ git commit -v -a --amend +Created commit 9dab773: Merge commit 'x86/auto-x86-next' +$ git revert aa27f95867447916d97c7aa6e5422ff6518630dd +Auto-merged include/asm-x86/e820.h +Auto-merged include/asm-x86/gart.h +Auto-merged include/asm-x86/iommu.h +Auto-merged include/asm-x86/ipi.h +Auto-merged include/asm-x86/paravirt.h +Auto-merged include/asm-x86/pci-direct.h +CONFLICT (content): Merge conflict in include/asm-x86/pci-direct.h +Auto-merged include/asm-x86/percpu.h +Auto-merged include/asm-x86/pgtable.h +Auto-merged include/asm-x86/pgtable_32.h +Auto-merged include/asm-x86/pgtable_64.h +Auto-merged include/asm-x86/processor.h +Auto-merged include/asm-x86/ptrace-abi.h +Auto-merged include/asm-x86/setup.h +Auto-merged include/asm-x86/smp.h +Auto-merged include/asm-x86/spinlock.h +Auto-merged include/asm-x86/spinlock_types.h +Auto-merged include/asm-x86/swiotlb.h +Auto-merged include/asm-x86/system.h +Auto-merged include/asm-x86/thread_info.h +Auto-merged include/asm-x86/xen/events.h +Auto-merged include/asm-x86/xen/hypercall.h +Auto-merged include/asm-x86/xen/page.h +Automatic revert failed. After resolving the conflicts, +mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result. +$ git commit -v -a +Created commit 6747948: Revert "x86: consolidate header guards" + 272 files changed, 816 insertions(+), 816 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-crypt.c | 18 ++++- + drivers/md/dm-linear.c | 38 ++++++++- + drivers/md/dm-log.c | 4 +- + drivers/md/dm-mpath.c | 32 +++++--- + drivers/md/dm-snap.c | 163 +++++++++++++++++++++++++++++++++++------ + drivers/md/dm-snap.h | 11 +++ + drivers/md/dm-table.c | 13 ++-- + drivers/md/dm.c | 46 +++++++++++- + drivers/md/dm.h | 6 -- + include/linux/device-mapper.h | 6 ++ + include/linux/dm-ioctl.h | 4 +- + 11 files changed, 282 insertions(+), 59 deletions(-) +Merging hid/mm +$ git merge hid/mm +Auto-merged drivers/hid/hidraw.c +Merge made by recursive. + drivers/hid/hid-core.c | 10 ++++---- + drivers/hid/hid-input-quirks.c | 40 ++++++++++++++++++++++++++++++++ + drivers/hid/hid-input.c | 1 + + drivers/hid/hidraw.c | 48 +++++++++++++++++++++----------------- + drivers/hid/usbhid/hid-quirks.c | 22 ++++++++++++++++- + drivers/hid/usbhid/hiddev.c | 14 ++++++++--- + drivers/hid/usbhid/usbkbd.c | 4 +- + drivers/hid/usbhid/usbmouse.c | 2 +- + include/linux/hid.h | 2 +- + 9 files changed, 106 insertions(+), 37 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + arch/arm/mach-omap1/board-h3.c | 4 + + arch/arm/mach-omap2/board-h4.c | 11 +++ + drivers/i2c/chips/isp1301_omap.c | 141 +++++++++++++-------------------- + drivers/video/matrox/i2c-matroxfb.c | 21 +++-- + drivers/video/matrox/matroxfb_maven.c | 97 +++++++++------------- + include/linux/i2c-id.h | 2 - + 6 files changed, 123 insertions(+), 153 deletions(-) +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 +Merge made by recursive. + arch/avr32/boards/atstk1000/atstk1003.c | 2 +- + arch/avr32/boards/atstk1000/atstk1004.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Auto-merged drivers/media/common/tuners/tuner-xc2028.c +Auto-merged drivers/media/common/tuners/xc5000.c +Auto-merged drivers/media/dvb/dvb-usb/cxusb.c +Auto-merged drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +Auto-merged drivers/media/video/cx18/cx18-av-firmware.c +Removed drivers/media/video/saa711x.c +Auto-merged drivers/media/video/videodev.c +Auto-merged include/linux/i2c-id.h +Merge made by recursive. + Documentation/video4linux/CARDLIST.cx23885 | 1 + + Documentation/video4linux/CARDLIST.em28xx | 5 +- + Documentation/video4linux/CARDLIST.saa7134 | 7 +- + Documentation/video4linux/cx18.txt | 36 +- + Documentation/video4linux/gspca.txt | 241 + + drivers/media/Makefile | 1 + + drivers/media/common/ir-functions.c | 1 - + drivers/media/common/saa7146_core.c | 4 +- + drivers/media/common/saa7146_hlp.c | 2 +- + drivers/media/common/saa7146_i2c.c | 34 +- + drivers/media/common/saa7146_video.c | 4 +- + drivers/media/common/tuners/Kconfig | 1 + + drivers/media/common/tuners/tda18271-maps.c | 2 +- + drivers/media/common/tuners/tuner-xc2028.c | 25 +- + drivers/media/common/tuners/xc5000.c | 7 + + drivers/media/dvb/Kconfig | 1 + + drivers/media/dvb/Makefile | 2 +- + drivers/media/dvb/bt8xx/bt878.h | 2 +- + drivers/media/dvb/dvb-core/demux.h | 2 +- + drivers/media/dvb/dvb-core/dmxdev.c | 2 +- + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 8 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 17 +- + drivers/media/dvb/dvb-core/dvb_net.c | 2 +- + drivers/media/dvb/dvb-core/dvb_ringbuffer.c | 78 +- + drivers/media/dvb/dvb-core/dvb_ringbuffer.h | 12 +- + drivers/media/dvb/dvb-usb/Kconfig | 15 + + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/anysee.c | 553 ++ + 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/cxusb.c | 146 +- + drivers/media/dvb/dvb-usb/cxusb.h | 3 + + drivers/media/dvb/dvb-usb/dib0700_devices.c | 7 +- + drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 4 - + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 8 + + drivers/media/dvb/dvb-usb/gl861.c | 38 +- + drivers/media/dvb/dvb-usb/gl861.h | 2 +- + drivers/media/dvb/frontends/Kconfig | 14 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/au8522.c | 1 - + 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/lgdt330x.c | 24 +- + drivers/media/dvb/frontends/s5h1409.c | 1 - + drivers/media/dvb/frontends/s5h1411.c | 1 - + drivers/media/dvb/frontends/tda10023.c | 197 +- + drivers/media/dvb/frontends/tda1002x.h | 41 +- + drivers/media/dvb/pluto2/pluto2.c | 2 +- + drivers/media/dvb/siano/Kconfig | 26 + + drivers/media/dvb/siano/Makefile | 8 + + drivers/media/dvb/siano/sms-cards.c | 102 + + drivers/media/dvb/siano/sms-cards.h | 45 + + drivers/media/dvb/siano/smscoreapi.c | 1251 ++++ + drivers/media/dvb/siano/smscoreapi.h | 433 ++ + drivers/media/dvb/siano/smsdvb.c | 449 ++ + drivers/media/dvb/siano/smsusb.c | 459 ++ + drivers/media/dvb/ttpci/Kconfig | 2 + + drivers/media/dvb/ttpci/Makefile | 1 + + drivers/media/dvb/ttpci/av7110.c | 47 +- + drivers/media/dvb/ttpci/av7110.h | 1 - + drivers/media/dvb/ttpci/av7110_av.c | 2 +- + drivers/media/dvb/ttpci/av7110_ca.c | 2 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 - + drivers/media/dvb/ttpci/budget-av.c | 12 +- + drivers/media/dvb/ttpci/budget-ci.c | 24 + + drivers/media/dvb/ttpci/budget-core.c | 4 - + drivers/media/dvb/ttpci/budget-patch.c | 44 +- + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 22 +- + drivers/media/radio/radio-si470x.c | 483 +- + drivers/media/video/Kconfig | 11 + + drivers/media/video/Makefile | 2 + + drivers/media/video/bt819.c | 2 +- + drivers/media/video/bt8xx/bt832.c | 1 - + drivers/media/video/bt8xx/bttv-driver.c | 51 +- + drivers/media/video/bt8xx/bttv-i2c.c | 49 +- + drivers/media/video/bt8xx/bttv-vbi.c | 6 +- + drivers/media/video/bt8xx/bttv.h | 1 - + drivers/media/video/bt8xx/bttvp.h | 9 +- + drivers/media/video/cafe_ccic.c | 18 +- + drivers/media/video/compat_ioctl32.c | 1 + + drivers/media/video/cs5345.c | 1 - + drivers/media/video/cs53l32a.c | 2 - + drivers/media/video/cx18/cx18-audio.c | 15 +- + drivers/media/video/cx18/cx18-av-audio.c | 12 +- + drivers/media/video/cx18/cx18-av-core.c | 77 +- + drivers/media/video/cx18/cx18-av-core.h | 13 +- + drivers/media/video/cx18/cx18-av-firmware.c | 72 +- + drivers/media/video/cx18/cx18-av-vbi.c | 25 +- + drivers/media/video/cx18/cx18-cards.c | 87 +- + drivers/media/video/cx18/cx18-cards.h | 8 + + drivers/media/video/cx18/cx18-controls.c | 216 +- + drivers/media/video/cx18/cx18-controls.h | 7 +- + drivers/media/video/cx18/cx18-driver.c | 20 +- + drivers/media/video/cx18/cx18-driver.h | 6 +- + drivers/media/video/cx18/cx18-firmware.c | 10 +- + drivers/media/video/cx18/cx18-gpio.c | 34 + + drivers/media/video/cx18/cx18-gpio.h | 1 + + drivers/media/video/cx18/cx18-i2c.c | 25 +- + drivers/media/video/cx18/cx18-ioctl.c | 1170 ++-- + drivers/media/video/cx18/cx18-ioctl.h | 6 +- + drivers/media/video/cx18/cx18-mailbox.c | 1 + + drivers/media/video/cx18/cx18-streams.c | 8 +- + drivers/media/video/cx18/cx23418.h | 5 + + drivers/media/video/cx2341x.c | 29 +- + drivers/media/video/cx23885/Kconfig | 1 + + drivers/media/video/cx23885/cx23885-417.c | 701 +- + drivers/media/video/cx23885/cx23885-cards.c | 13 + + drivers/media/video/cx23885/cx23885-core.c | 10 +- + drivers/media/video/cx23885/cx23885-dvb.c | 42 + + drivers/media/video/cx23885/cx23885-video.c | 24 +- + drivers/media/video/cx23885/cx23885.h | 1 + + drivers/media/video/cx25840/cx25840-core.c | 1 - + drivers/media/video/cx88/cx88-alsa.c | 1 - + drivers/media/video/cx88/cx88-blackbird.c | 19 +- + drivers/media/video/cx88/cx88-i2c.c | 1 - + drivers/media/video/cx88/cx88-video.c | 24 +- + drivers/media/video/cx88/cx88-vp3054-i2c.c | 1 - + drivers/media/video/em28xx/em28xx-cards.c | 74 +- + drivers/media/video/em28xx/em28xx-dvb.c | 25 + + drivers/media/video/em28xx/em28xx-i2c.c | 1 - + drivers/media/video/em28xx/em28xx-input.c | 87 + + drivers/media/video/em28xx/em28xx-video.c | 32 +- + drivers/media/video/em28xx/em28xx.h | 12 + + drivers/media/video/gspca/Kconfig | 13 + + drivers/media/video/gspca/Makefile | 29 + + drivers/media/video/gspca/conex.c | 1084 +++ + drivers/media/video/gspca/etoms.c | 955 +++ + drivers/media/video/gspca/gspca.c | 1813 +++++ + drivers/media/video/gspca/gspca.h | 173 + + drivers/media/video/gspca/jpeg.h | 301 + + drivers/media/video/gspca/mars.c | 452 ++ + drivers/media/video/gspca/ov519.c | 2189 ++++++ + drivers/media/video/gspca/pac207.c | 681 ++ + drivers/media/video/gspca/pac7311.c | 774 ++ + drivers/media/video/gspca/sonixb.c | 913 +++ + drivers/media/video/gspca/sonixj.c | 1665 +++++ + drivers/media/video/gspca/spca500.c | 1217 ++++ + drivers/media/video/gspca/spca501.c | 2230 ++++++ + drivers/media/video/gspca/spca505.c | 953 +++ + drivers/media/video/gspca/spca506.c | 850 +++ + drivers/media/video/gspca/spca508.c | 1794 +++++ + drivers/media/video/gspca/spca561.c | 1045 +++ + drivers/media/video/gspca/stk014.c | 596 ++ + drivers/media/video/gspca/sunplus.c | 1670 +++++ + drivers/media/video/gspca/t613.c | 1050 +++ + drivers/media/video/gspca/tv8532.c | 714 ++ + drivers/media/video/gspca/vc032x.c | 1832 +++++ + drivers/media/video/gspca/zc3xx.c | 7603 ++++++++++++++++++++ + drivers/media/video/ivtv/ivtv-cards.c | 75 +- + drivers/media/video/ivtv/ivtv-cards.h | 3 +- + drivers/media/video/ivtv/ivtv-controls.c | 225 +- + drivers/media/video/ivtv/ivtv-controls.h | 6 +- + drivers/media/video/ivtv/ivtv-driver.c | 19 +- + drivers/media/video/ivtv/ivtv-driver.h | 1 - + drivers/media/video/ivtv/ivtv-fileops.c | 25 +- + drivers/media/video/ivtv/ivtv-gpio.c | 11 +- + drivers/media/video/ivtv/ivtv-i2c.c | 4 - + drivers/media/video/ivtv/ivtv-ioctl.c | 2184 +++--- + drivers/media/video/ivtv/ivtv-ioctl.h | 9 +- + drivers/media/video/ivtv/ivtv-streams.c | 3 +- + drivers/media/video/ivtv/ivtvfb.c | 86 + + drivers/media/video/m52790.c | 1 - + drivers/media/video/meye.c | 18 +- + drivers/media/video/msp3400-driver.c | 3 +- + drivers/media/video/msp3400-kthreads.c | 1 - + drivers/media/video/mt9v022.c | 1 - + drivers/media/video/ov7670.c | 12 +- + drivers/media/video/ovcamchip/ovcamchip_core.c | 1 - + 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 | 75 +- + 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/pwc/pwc-ctrl.c | 2 - + drivers/media/video/pwc/pwc-ioctl.h | 1 - + drivers/media/video/s2255drv.c | 2495 +++++++ + drivers/media/video/saa5246a.c | 1 + + drivers/media/video/saa5249.c | 1 + + drivers/media/video/saa6588.c | 1 - + drivers/media/video/saa7115.c | 2 - + drivers/media/video/saa711x.c | 584 -- + drivers/media/video/saa7127.c | 1 - + drivers/media/video/saa7134/saa6752hs.c | 105 +- + drivers/media/video/saa7134/saa7134-alsa.c | 4 - + drivers/media/video/saa7134/saa7134-cards.c | 138 +- + drivers/media/video/saa7134/saa7134-core.c | 1 - + drivers/media/video/saa7134/saa7134-dvb.c | 10 + + drivers/media/video/saa7134/saa7134-empress.c | 86 +- + drivers/media/video/saa7134/saa7134-i2c.c | 2 + + drivers/media/video/saa7134/saa7134-input.c | 2 + + drivers/media/video/saa7134/saa7134-reg.h | 1 + + drivers/media/video/saa7134/saa7134-tvaudio.c | 35 +- + drivers/media/video/saa7134/saa7134-video.c | 82 +- + drivers/media/video/saa7134/saa7134.h | 5 +- + drivers/media/video/soc_camera.c | 18 +- + drivers/media/video/stk-webcam.c | 18 +- + drivers/media/video/tcm825x.c | 6 + + drivers/media/video/tcm825x.h | 1 + + drivers/media/video/tda7432.c | 1 + + drivers/media/video/tda9840.c | 1 + + drivers/media/video/tda9875.c | 2 +- + drivers/media/video/tea6415c.c | 1 + + drivers/media/video/tea6420.c | 1 + + drivers/media/video/tlv320aic23b.c | 1 - + drivers/media/video/tuner-core.c | 1 - + drivers/media/video/tvaudio.c | 13 - + drivers/media/video/usbvision/usbvision-core.c | 4 - + drivers/media/video/usbvision/usbvision-i2c.c | 5 - + drivers/media/video/usbvision/usbvision-video.c | 30 +- + drivers/media/video/uvc/Kconfig | 17 + + drivers/media/video/uvc/uvc_ctrl.c | 1 + + drivers/media/video/uvc/uvc_driver.c | 31 +- + drivers/media/video/uvc/uvc_queue.c | 1 + + drivers/media/video/uvc/uvc_status.c | 20 +- + drivers/media/video/uvc/uvc_v4l2.c | 3 +- + drivers/media/video/uvc/uvc_video.c | 117 +- + drivers/media/video/uvc/uvcvideo.h | 3 + + drivers/media/video/videobuf-dma-sg.c | 6 +- + drivers/media/video/videobuf-dvb.c | 2 - + drivers/media/video/videodev.c | 745 ++- + drivers/media/video/vivi.c | 37 +- + drivers/media/video/vp27smpx.c | 1 - + drivers/media/video/wm8739.c | 1 - + drivers/media/video/wm8775.c | 2 - + drivers/media/video/zoran_card.c | 34 +- + drivers/media/video/zoran_driver.c | 5 +- + drivers/media/video/zr364xx.c | 16 +- + include/linux/i2c-id.h | 8 - + include/linux/videodev2.h | 14 + + include/media/cx2341x.h | 7 +- + include/media/pwc-ioctl.h | 3 +- + include/media/saa7146.h | 4 +- + include/media/v4l2-dev.h | 81 +- + include/media/v4l2-i2c-drv-legacy.h | 1 - + 278 files changed, 46285 insertions(+), 4590 deletions(-) + create mode 100644 Documentation/video4linux/gspca.txt + 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 + create mode 100644 drivers/media/dvb/siano/Kconfig + create mode 100644 drivers/media/dvb/siano/Makefile + create mode 100644 drivers/media/dvb/siano/sms-cards.c + create mode 100644 drivers/media/dvb/siano/sms-cards.h + create mode 100644 drivers/media/dvb/siano/smscoreapi.c + create mode 100644 drivers/media/dvb/siano/smscoreapi.h + create mode 100644 drivers/media/dvb/siano/smsdvb.c + create mode 100644 drivers/media/dvb/siano/smsusb.c + create mode 100644 drivers/media/video/gspca/Kconfig + create mode 100644 drivers/media/video/gspca/Makefile + create mode 100644 drivers/media/video/gspca/conex.c + create mode 100644 drivers/media/video/gspca/etoms.c + create mode 100644 drivers/media/video/gspca/gspca.c + create mode 100644 drivers/media/video/gspca/gspca.h + create mode 100644 drivers/media/video/gspca/jpeg.h + create mode 100644 drivers/media/video/gspca/mars.c + create mode 100644 drivers/media/video/gspca/ov519.c + create mode 100644 drivers/media/video/gspca/pac207.c + create mode 100644 drivers/media/video/gspca/pac7311.c + create mode 100644 drivers/media/video/gspca/sonixb.c + create mode 100644 drivers/media/video/gspca/sonixj.c + create mode 100644 drivers/media/video/gspca/spca500.c + create mode 100644 drivers/media/video/gspca/spca501.c + create mode 100644 drivers/media/video/gspca/spca505.c + create mode 100644 drivers/media/video/gspca/spca506.c + create mode 100644 drivers/media/video/gspca/spca508.c + create mode 100644 drivers/media/video/gspca/spca561.c + create mode 100644 drivers/media/video/gspca/stk014.c + create mode 100644 drivers/media/video/gspca/sunplus.c + create mode 100644 drivers/media/video/gspca/t613.c + create mode 100644 drivers/media/video/gspca/tv8532.c + create mode 100644 drivers/media/video/gspca/vc032x.c + create mode 100644 drivers/media/video/gspca/zc3xx.c + create mode 100644 drivers/media/video/s2255drv.c + delete mode 100644 drivers/media/video/saa711x.c + create mode 100644 drivers/media/video/uvc/Kconfig +$ git am -3 ../patches/0001-v4l-dvb-class_for_each_device-API-change-fallout.patch +Applying v4l-dvb: class_for_each_device API change fallout +$ git reset HEAD^ +drivers/media/video/videodev.c: needs update +$ git commit -v -a --amend +Created commit 629a3df: Merge commit 'v4l-dvb/stable' +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/master +$ git merge sh/master +Removed arch/sh/boot/compressed/vmlinux.scr +Removed arch/sh/kernel/cpu/sh4a/clock-sh7343.c +Merge made by recursive. + arch/sh/Kconfig | 33 + + arch/sh/Kconfig.debug | 3 +- + arch/sh/Makefile | 4 + + arch/sh/boards/dreamcast/rtc.c | 4 +- + arch/sh/boards/renesas/ap325rxa/Makefile | 1 + + arch/sh/boards/renesas/ap325rxa/setup.c | 107 +++ + arch/sh/boards/renesas/migor/setup.c | 7 +- + arch/sh/boards/renesas/rsk7203/Makefile | 1 + + arch/sh/boards/renesas/rsk7203/setup.c | 126 +++ + arch/sh/boards/renesas/sh7763rdp/Makefile | 1 + + arch/sh/boards/renesas/sh7763rdp/irq.c | 45 + + arch/sh/boards/renesas/sh7763rdp/setup.c | 128 +++ + arch/sh/boards/renesas/sh7785lcr/Makefile | 1 + + arch/sh/boards/renesas/sh7785lcr/setup.c | 302 +++++++ + arch/sh/boards/se/7343/irq.c | 232 ++---- + arch/sh/boards/se/7343/setup.c | 70 ++- + arch/sh/boards/se/770x/io.c | 59 +- + arch/sh/boards/se/770x/setup.c | 53 +- + arch/sh/boards/se/7722/setup.c | 8 +- + arch/sh/boot/compressed/Makefile_32 | 5 +- + arch/sh/boot/compressed/Makefile_64 | 5 +- + arch/sh/boot/compressed/piggy.S | 8 + + arch/sh/boot/compressed/vmlinux.scr | 9 - + arch/sh/configs/ap325rxa_defconfig | 947 ++++++++++++++++++++ + arch/sh/configs/se7343_defconfig | 735 ++++++++-------- + arch/sh/configs/se7712_defconfig | 659 ++++++-------- + arch/sh/configs/sh7763rdp_defconfig | 1052 ++++++++++++++++++++++ + arch/sh/configs/sh7785lcr_defconfig | 1388 +++++++++++++++++++++++++++++ + arch/sh/drivers/pci/Makefile | 1 + + arch/sh/drivers/pci/fixups-sh7785lcr.c | 46 + + arch/sh/drivers/pci/ops-dreamcast.c | 2 + + arch/sh/drivers/pci/ops-sh7785lcr.c | 66 ++ + arch/sh/drivers/pci/pci-auto.c | 2 +- + arch/sh/drivers/pci/pci.c | 2 +- + arch/sh/kernel/Makefile_32 | 2 +- + arch/sh/kernel/cf-enabler.c | 2 +- + arch/sh/kernel/cpu/clock.c | 20 +- + arch/sh/kernel/cpu/irq/intc.c | 31 +- + arch/sh/kernel/cpu/sh2/entry.S | 133 ++-- + arch/sh/kernel/cpu/sh2/ex.S | 15 +- + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 24 + + arch/sh/kernel/cpu/sh2a/Makefile | 2 +- + arch/sh/kernel/cpu/sh2a/entry.S | 249 ++++++ + arch/sh/kernel/cpu/sh2a/ex.S | 72 ++ + arch/sh/kernel/cpu/sh3/ex.S | 38 +- + arch/sh/kernel/cpu/sh4/probe.c | 6 +- + arch/sh/kernel/cpu/sh4a/Makefile | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 99 -- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 221 ++++-- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 253 ++++++ + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 139 +++- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 85 ++- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 138 +++- + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 21 +- + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 11 +- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 17 +- + arch/sh/kernel/entry-common.S | 2 +- + arch/sh/kernel/process_32.c | 14 +- + arch/sh/kernel/process_64.c | 10 - + arch/sh/kernel/ptrace_32.c | 23 + + arch/sh/kernel/setup.c | 7 + + arch/sh/kernel/signal_32.c | 36 +- + arch/sh/kernel/stacktrace.c | 1 + + arch/sh/kernel/time_32.c | 2 +- + arch/sh/kernel/timers/timer-tmu.c | 2 +- + arch/sh/kernel/traps_32.c | 4 + + arch/sh/lib/Makefile | 4 +- + arch/sh/mm/Kconfig | 12 +- + arch/sh/mm/cache-debugfs.c | 2 +- + arch/sh/mm/cache-sh4.c | 59 +- + arch/sh/mm/consistent.c | 30 + + arch/sh/mm/fault_32.c | 12 +- + arch/sh/mm/pg-sh4.c | 2 +- + arch/sh/mm/pg-sh7705.c | 2 +- + arch/sh/mm/pmb.c | 2 +- + arch/sh/tools/mach-types | 4 + + drivers/serial/sh-sci.c | 17 +- + drivers/serial/sh-sci.h | 38 +- + fs/Kconfig.binfmt | 2 +- + fs/binfmt_elf_fdpic.c | 45 +- + include/asm-sh/clock.h | 21 +- + include/asm-sh/cpu-sh4/cacheflush.h | 1 - + include/asm-sh/cpu-sh4/freq.h | 4 + + include/asm-sh/device.h | 5 + + include/asm-sh/elf.h | 53 ++- + include/asm-sh/hw_irq.h | 4 +- + include/asm-sh/migor.h | 4 - + 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 | 5 +- + include/asm-sh/processor_64.h | 4 - + include/asm-sh/ptrace.h | 5 + + include/asm-sh/se.h | 17 + + include/asm-sh/se7343.h | 93 ++- + include/asm-sh/se7722.h | 4 - + include/asm-sh/segment.h | 30 +- + include/asm-sh/sh7763rdp.h | 54 ++ + include/asm-sh/sh7785lcr.h | 55 ++ + include/asm-sh/system.h | 8 - + include/asm-sh/thread_info.h | 2 + + include/asm-sh/timer.h | 1 - + include/asm-sh/uaccess.h | 222 +++++ + include/asm-sh/uaccess_32.h | 341 +------ + include/asm-sh/uaccess_64.h | 206 ----- + include/asm-sh/unistd.h | 14 +- + include/linux/maple.h | 2 - + 108 files changed, 7201 insertions(+), 1989 deletions(-) + create mode 100644 arch/sh/boards/renesas/ap325rxa/Makefile + create mode 100644 arch/sh/boards/renesas/ap325rxa/setup.c + create mode 100644 arch/sh/boards/renesas/rsk7203/Makefile + create mode 100644 arch/sh/boards/renesas/rsk7203/setup.c + create mode 100644 arch/sh/boards/renesas/sh7763rdp/Makefile + create mode 100644 arch/sh/boards/renesas/sh7763rdp/irq.c + create mode 100644 arch/sh/boards/renesas/sh7763rdp/setup.c + create mode 100644 arch/sh/boards/renesas/sh7785lcr/Makefile + create mode 100644 arch/sh/boards/renesas/sh7785lcr/setup.c + create mode 100644 arch/sh/boot/compressed/piggy.S + delete mode 100644 arch/sh/boot/compressed/vmlinux.scr + create mode 100644 arch/sh/configs/ap325rxa_defconfig + create mode 100644 arch/sh/configs/sh7763rdp_defconfig + create mode 100644 arch/sh/configs/sh7785lcr_defconfig + create mode 100644 arch/sh/drivers/pci/fixups-sh7785lcr.c + create mode 100644 arch/sh/drivers/pci/ops-sh7785lcr.c + create mode 100644 arch/sh/kernel/cpu/sh2a/entry.S + create mode 100644 arch/sh/kernel/cpu/sh2a/ex.S + delete mode 100644 arch/sh/kernel/cpu/sh4a/clock-sh7343.c + create mode 100644 include/asm-sh/sh7763rdp.h + create mode 100644 include/asm-sh/sh7785lcr.h +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Auto-merged Makefile +Auto-merged arch/x86/Kconfig +Auto-merged drivers/misc/Kconfig +Auto-merged drivers/mtd/maps/Kconfig +Auto-merged include/Kbuild +CONFLICT (content): Merge conflict in include/Kbuild +Auto-merged include/asm-generic/vmlinux.lds.h +Removed scripts/hdrcheck.sh +Auto-merged sound/oss/Kconfig +Resolved 'include/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 08c16bd: Merge commit 'kbuild/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/sparse.txt | 8 +- + Kbuild | 3 +- + Makefile | 116 ++++++++++++------- + arch/x86/Kconfig | 4 +- + drivers/media/radio/Kconfig | 16 ++-- + drivers/misc/Kconfig | 2 +- + drivers/mtd/devices/Kconfig | 3 +- + drivers/mtd/maps/Kconfig | 2 +- + include/Kbuild | 4 +- + include/asm-generic/vmlinux.lds.h | 4 +- + init/Kconfig | 4 +- + scripts/Makefile.headersinst | 230 +++++++++++-------------------------- + scripts/diffconfig | 129 +++++++++++++++++++++ + scripts/hdrcheck.sh | 10 -- + scripts/headers.sh | 41 +++++++ + scripts/headers_check.pl | 56 +++++++++ + scripts/headers_install.pl | 45 +++++++ + scripts/kconfig/conf.c | 161 +++++++++++--------------- + scripts/kconfig/confdata.c | 72 ++++++++++++- + scripts/kconfig/lkc.h | 11 ++ + scripts/kconfig/menu.c | 41 ++++++- + scripts/kconfig/util.c | 16 +++ + scripts/kernel-doc | 1 + + scripts/setlocalversion | 4 +- + sound/oss/Kconfig | 10 +- + 25 files changed, 646 insertions(+), 347 deletions(-) + create mode 100755 scripts/diffconfig + delete mode 100755 scripts/hdrcheck.sh + create mode 100755 scripts/headers.sh + create mode 100644 scripts/headers_check.pl + create mode 100644 scripts/headers_install.pl +$ git revert 9ba4ff5059e1a26698786373c8c71321c37ef7f9 +Finished one revert. +Created commit 7e253aa: Revert "kconfig: normalize int/hex values" + 4 files changed, 6 insertions(+), 55 deletions(-) +Merging quilt/ide +$ git merge quilt/ide +Renamed drivers/ide/ide-timing.h->drivers/ide/ide-timings.c +Auto-merged drivers/ide/ide-timings.c +Renamed drivers/ide/legacy/hd.c->drivers/block/hd.c +Auto-merged drivers/block/hd.c +Auto-merged drivers/ide/Kconfig +CONFLICT (content): Merge conflict in drivers/ide/Kconfig +Auto-merged drivers/ide/arm/icside.c +CONFLICT (content): Merge conflict in drivers/ide/arm/icside.c +Auto-merged drivers/ide/arm/palm_bk3710.c +CONFLICT (content): Merge conflict in drivers/ide/arm/palm_bk3710.c +Auto-merged drivers/ide/arm/rapide.c +CONFLICT (content): Merge conflict in drivers/ide/arm/rapide.c +Auto-merged drivers/ide/h8300/ide-h8300.c +CONFLICT (content): Merge conflict in drivers/ide/h8300/ide-h8300.c +Auto-merged drivers/ide/ide-cd.c +Auto-merged drivers/ide/ide-disk.c +Auto-merged drivers/ide/ide-floppy.c +Auto-merged drivers/ide/ide-io.c +Auto-merged drivers/ide/ide-iops.c +Auto-merged drivers/ide/ide-lib.c +Auto-merged drivers/ide/ide-pnp.c +CONFLICT (content): Merge conflict in drivers/ide/ide-pnp.c +Auto-merged drivers/ide/ide-probe.c +CONFLICT (content): Merge conflict in drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Auto-merged drivers/ide/ide-taskfile.c +Auto-merged drivers/ide/ide.c +CONFLICT (content): Merge conflict in drivers/ide/ide.c +Auto-merged drivers/ide/legacy/buddha.c +CONFLICT (content): Merge conflict in drivers/ide/legacy/buddha.c +Auto-merged drivers/ide/legacy/falconide.c +CONFLICT (content): Merge conflict in drivers/ide/legacy/falconide.c +Auto-merged drivers/ide/legacy/gayle.c +CONFLICT (content): Merge conflict in drivers/ide/legacy/gayle.c +Auto-merged drivers/ide/legacy/ide-4drives.c +CONFLICT (content): Merge conflict in drivers/ide/legacy/ide-4drives.c +Auto-merged drivers/ide/legacy/ide-cs.c +CONFLICT (content): Merge conflict in drivers/ide/legacy/ide-cs.c +Auto-merged drivers/ide/legacy/ide_platform.c +CONFLICT (content): Merge conflict in drivers/ide/legacy/ide_platform.c +Auto-merged drivers/ide/legacy/macide.c +CONFLICT (content): Merge conflict in drivers/ide/legacy/macide.c +Auto-merged drivers/ide/legacy/q40ide.c +CONFLICT (content): Merge conflict in drivers/ide/legacy/q40ide.c +Auto-merged drivers/ide/mips/au1xxx-ide.c +CONFLICT (content): Merge conflict in drivers/ide/mips/au1xxx-ide.c +Auto-merged drivers/ide/mips/swarm.c +CONFLICT (content): Merge conflict in drivers/ide/mips/swarm.c +Auto-merged drivers/ide/pci/alim15x3.c +Auto-merged drivers/ide/pci/amd74xx.c +CONFLICT (content): Merge conflict in drivers/ide/pci/amd74xx.c +Auto-merged drivers/ide/pci/cmd640.c +CONFLICT (content): Merge conflict in drivers/ide/pci/cmd640.c +Auto-merged drivers/ide/pci/cmd64x.c +Auto-merged drivers/ide/pci/cs5535.c +CONFLICT (content): Merge conflict in drivers/ide/pci/cs5535.c +Auto-merged drivers/ide/pci/cy82c693.c +Auto-merged drivers/ide/pci/delkin_cb.c +CONFLICT (content): Merge conflict in drivers/ide/pci/delkin_cb.c +Auto-merged drivers/ide/pci/it821x.c +Auto-merged drivers/ide/pci/scc_pata.c +CONFLICT (content): Merge conflict in drivers/ide/pci/scc_pata.c +Auto-merged drivers/ide/pci/sgiioc4.c +CONFLICT (content): Merge conflict in drivers/ide/pci/sgiioc4.c +Auto-merged drivers/ide/pci/siimage.c +Auto-merged drivers/ide/pci/sis5513.c +CONFLICT (content): Merge conflict in drivers/ide/pci/sis5513.c +Auto-merged drivers/ide/pci/sl82c105.c +Auto-merged drivers/ide/pci/via82cxxx.c +CONFLICT (content): Merge conflict in drivers/ide/pci/via82cxxx.c +Auto-merged drivers/ide/ppc/pmac.c +CONFLICT (content): Merge conflict in drivers/ide/ppc/pmac.c +Auto-merged drivers/ide/setup-pci.c +CONFLICT (content): Merge conflict in drivers/ide/setup-pci.c +Auto-merged drivers/scsi/ide-scsi.c +Removed include/asm-alpha/ide.h +Removed include/asm-blackfin/ide.h +Removed include/asm-cris/arch-v10/ide.h +Removed include/asm-cris/arch-v32/ide.h +Removed include/asm-cris/ide.h +Removed include/asm-h8300/ide.h +Removed include/asm-ia64/ide.h +Removed include/asm-m32r/ide.h +Removed include/asm-sh/ide.h +Removed include/asm-x86/ide.h +Removed include/asm-xtensa/ide.h +Auto-merged include/linux/ide.h +CONFLICT (content): Merge conflict in include/linux/ide.h +Recorded preimage for 'drivers/ide/legacy/ide-cs.c' +Resolved 'drivers/ide/Kconfig' using previous resolution. +Resolved 'drivers/ide/arm/icside.c' using previous resolution. +Resolved 'drivers/ide/arm/palm_bk3710.c' using previous resolution. +Resolved 'drivers/ide/arm/rapide.c' using previous resolution. +Resolved 'drivers/ide/h8300/ide-h8300.c' using previous resolution. +Resolved 'drivers/ide/ide-pnp.c' using previous resolution. +Resolved 'drivers/ide/ide-probe.c' using previous resolution. +Resolved 'drivers/ide/ide.c' using previous resolution. +Resolved 'drivers/ide/legacy/buddha.c' using previous resolution. +Resolved 'drivers/ide/legacy/falconide.c' using previous resolution. +Resolved 'drivers/ide/legacy/gayle.c' using previous resolution. +Resolved 'drivers/ide/legacy/ide-4drives.c' using previous resolution. +Resolved 'drivers/ide/legacy/ide_platform.c' using previous resolution. +Resolved 'drivers/ide/legacy/macide.c' using previous resolution. +Resolved 'drivers/ide/legacy/q40ide.c' using previous resolution. +Resolved 'drivers/ide/mips/au1xxx-ide.c' using previous resolution. +Resolved 'drivers/ide/mips/swarm.c' using previous resolution. +Resolved 'drivers/ide/pci/amd74xx.c' using previous resolution. +Resolved 'drivers/ide/pci/cmd640.c' using previous resolution. +Resolved 'drivers/ide/pci/cs5535.c' using previous resolution. +Resolved 'drivers/ide/pci/delkin_cb.c' using previous resolution. +Resolved 'drivers/ide/pci/scc_pata.c' using previous resolution. +Resolved 'drivers/ide/pci/sgiioc4.c' using previous resolution. +Resolved 'drivers/ide/pci/sis5513.c' using previous resolution. +Resolved 'drivers/ide/pci/via82cxxx.c' using previous resolution. +Resolved 'drivers/ide/ppc/pmac.c' using previous resolution. +Resolved 'drivers/ide/setup-pci.c' using previous resolution. +Resolved 'include/linux/ide.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/ide/legacy/ide-cs.c'. +Created commit 6abb004: Merge branch 'quilt/ide' +$ git diff -M --stat --summary HEAD^.. + drivers/ide/Kconfig | 4 +- + drivers/ide/arm/icside.c | 77 ++++---- + drivers/ide/arm/ide_arm.c | 14 +-- + drivers/ide/arm/palm_bk3710.c | 30 +-- + drivers/ide/arm/rapide.c | 30 ++-- + drivers/ide/h8300/ide-h8300.c | 48 ++--- + drivers/ide/ide-atapi.c | 58 ++++-- + drivers/ide/ide-cd.c | 169 ++++++++-------- + drivers/ide/ide-cd.h | 38 ---- + drivers/ide/ide-cd_ioctl.c | 35 ++-- + drivers/ide/ide-disk.c | 14 +- + drivers/ide/ide-dma.c | 105 ++++++---- + drivers/ide/ide-floppy.c | 102 +++++----- + drivers/ide/ide-generic.c | 107 +++++++---- + drivers/ide/ide-io.c | 42 ++-- + drivers/ide/ide-iops.c | 236 +++++++++++++++-------- + drivers/ide/ide-lib.c | 17 +-- + drivers/ide/ide-pnp.c | 29 ++-- + drivers/ide/ide-probe.c | 374 +++++++++++++++++++++++++---------- + drivers/ide/ide-proc.c | 8 +- + drivers/ide/ide-tape.c | 155 +++++++-------- + drivers/ide/ide-taskfile.c | 38 +++-- + drivers/ide/ide.c | 96 +++++----- + drivers/ide/legacy/buddha.c | 24 +-- + drivers/ide/legacy/falconide.c | 56 ++++-- + drivers/ide/legacy/gayle.c | 39 ++--- + drivers/ide/legacy/ide-4drives.c | 20 +-- + drivers/ide/legacy/ide-cs.c | 54 +++--- + drivers/ide/legacy/ide_platform.c | 32 +-- + drivers/ide/legacy/macide.c | 15 +-- + drivers/ide/legacy/q40ide.c | 47 +++-- + drivers/ide/mips/au1xxx-ide.c | 56 +++--- + drivers/ide/mips/swarm.c | 24 +-- + drivers/ide/pci/aec62xx.c | 81 +++++--- + drivers/ide/pci/alim15x3.c | 30 +++- + drivers/ide/pci/amd74xx.c | 156 +++++++-------- + drivers/ide/pci/atiixp.c | 20 ++- + drivers/ide/pci/cmd640.c | 29 +--- + drivers/ide/pci/cmd64x.c | 62 +++---- + drivers/ide/pci/cs5520.c | 63 ++----- + drivers/ide/pci/cs5530.c | 20 ++- + drivers/ide/pci/cs5535.c | 16 ++- + drivers/ide/pci/cy82c693.c | 35 +++- + drivers/ide/pci/delkin_cb.c | 25 +-- + drivers/ide/pci/generic.c | 78 ++++---- + drivers/ide/pci/hpt34x.c | 22 ++- + drivers/ide/pci/hpt366.c | 206 ++++++++++---------- + drivers/ide/pci/it8213.c | 35 ++-- + drivers/ide/pci/it821x.c | 74 ++++--- + drivers/ide/pci/jmicron.c | 13 +- + drivers/ide/pci/ns87415.c | 126 +++++++------ + drivers/ide/pci/opti621.c | 13 +- + drivers/ide/pci/pdc202xx_new.c | 78 +++++--- + drivers/ide/pci/pdc202xx_old.c | 52 +++-- + drivers/ide/pci/piix.c | 122 ++++++------ + drivers/ide/pci/rz1000.c | 13 +- + drivers/ide/pci/sc1200.c | 50 +++-- + drivers/ide/pci/scc_pata.c | 139 ++++++++----- + drivers/ide/pci/serverworks.c | 44 +++-- + drivers/ide/pci/sgiioc4.c | 65 ++++--- + drivers/ide/pci/siimage.c | 167 +++++++++------- + drivers/ide/pci/sis5513.c | 39 +++- + drivers/ide/pci/sl82c105.c | 21 ++- + drivers/ide/pci/slc90e66.c | 13 +- + drivers/ide/pci/tc86c001.c | 73 +++++-- + drivers/ide/pci/triflex.c | 13 +- + drivers/ide/pci/trm290.c | 17 ++- + drivers/ide/pci/via82cxxx.c | 140 +++++++------ + drivers/ide/ppc/pmac.c | 223 +++++++++++++--------- + drivers/ide/setup-pci.c | 331 +++++++++++++++++++------------ + drivers/macintosh/mediabay.c | 48 ++--- + drivers/scsi/ide-scsi.c | 40 ++--- + include/asm-alpha/ide.h | 44 ---- + include/asm-arm/ide.h | 4 - + include/asm-blackfin/ide.h | 27 --- + include/asm-cris/arch-v10/ide.h | 91 --------- + include/asm-cris/arch-v32/ide.h | 56 ------ + include/asm-cris/ide.h | 1 - + include/asm-frv/ide.h | 4 - + include/asm-h8300/ide.h | 26 --- + include/asm-ia64/ide.h | 51 ----- + include/asm-m32r/ide.h | 70 ------- + include/asm-m68k/ide.h | 4 - + include/asm-mips/mach-generic/ide.h | 48 ----- + include/asm-mn10300/ide.h | 4 - + include/asm-parisc/ide.h | 4 - + include/asm-powerpc/ide.h | 26 --- + include/asm-powerpc/mediabay.h | 1 - + include/asm-sh/ide.h | 21 -- + include/asm-sparc/ide.h | 3 - + include/asm-sparc64/ide.h | 8 - + include/asm-x86/ide.h | 65 ------ + include/asm-xtensa/ide.h | 35 ---- + include/linux/ide.h | 223 ++++++++++++++------- + 94 files changed, 2923 insertions(+), 2878 deletions(-) + delete mode 100644 include/asm-alpha/ide.h + delete mode 100644 include/asm-blackfin/ide.h + delete mode 100644 include/asm-cris/arch-v10/ide.h + delete mode 100644 include/asm-cris/arch-v32/ide.h + delete mode 100644 include/asm-cris/ide.h + delete mode 100644 include/asm-h8300/ide.h + delete mode 100644 include/asm-ia64/ide.h + delete mode 100644 include/asm-m32r/ide.h + delete mode 100644 include/asm-sh/ide.h + delete mode 100644 include/asm-x86/ide.h + delete mode 100644 include/asm-xtensa/ide.h +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 +Merge made by recursive. + fs/dcache.c | 102 +++++++ + fs/xfs/Makefile | 3 +- + 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_ioctl.c | 8 +- + fs/xfs/linux-2.6/xfs_iops.c | 283 +++++++------------ + fs/xfs/linux-2.6/xfs_iops.h | 2 + + fs/xfs/linux-2.6/xfs_linux.h | 8 + + fs/xfs/linux-2.6/xfs_super.c | 567 +++++++++++++++++++++++++++++++++++-- + fs/xfs/linux-2.6/xfs_super.h | 4 +- + fs/xfs/linux-2.6/xfs_xattr.c | 333 ++++++++++++++++++++++ + 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_acl.c | 3 +- + fs/xfs/xfs_acl.h | 4 +- + fs/xfs/xfs_attr.c | 608 ++++++---------------------------------- + fs/xfs/xfs_attr.h | 90 ++---- + fs/xfs/xfs_attr_leaf.c | 99 ++----- + fs/xfs/xfs_attr_leaf.h | 29 +-- + fs/xfs/xfs_attr_sf.h | 10 +- + fs/xfs/xfs_bmap.c | 114 ++++---- + fs/xfs/xfs_bmap.h | 13 +- + fs/xfs/xfs_bmap_btree.c | 76 +++--- + 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 | 93 ++++-- + fs/xfs/xfs_dir2_node.c | 402 ++++++++++++++++----------- + fs/xfs/xfs_dir2_sf.c | 83 ++++--- + fs/xfs/xfs_dir2_sf.h | 6 +- + 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 | 4 + + fs/xfs/xfs_fsops.c | 4 +- + fs/xfs/xfs_inode.c | 165 ++++------- + fs/xfs/xfs_inode.h | 3 - + fs/xfs/xfs_inode_item.c | 7 +- + fs/xfs/xfs_iomap.c | 10 + + 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 | 118 +++------ + fs/xfs/xfs_mount.h | 15 +- + fs/xfs/xfs_mru_cache.c | 8 +- + fs/xfs/xfs_rename.c | 22 +- + 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 | 388 ++++++++------------------ + fs/xfs/xfs_vnodeops.h | 4 +- + include/linux/dcache.h | 1 + + 71 files changed, 2315 insertions(+), 2359 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_xattr.c +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/cma.c | 7 ++- + drivers/infiniband/core/ucm.c | 10 ++- + drivers/infiniband/core/ucma.c | 11 ++- + drivers/infiniband/core/verbs.c | 138 +++++++++++++++++++++++++++++++++++++-- + drivers/infiniband/hw/mlx4/qp.c | 2 +- + drivers/net/mlx4/fw.c | 8 ++ + include/linux/mlx4/qp.h | 2 +- + include/rdma/ib_verbs.h | 60 ++++++++++++++++- + include/rdma/rdma_cm.h | 3 +- + 9 files changed, 224 insertions(+), 17 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merged fs/lockd/svc4proc.c +Auto-merged fs/lockd/svclock.c +Auto-merged fs/lockd/svcproc.c +Auto-merged include/linux/fs.h +Auto-merged net/sunrpc/svc.c +CONFLICT (content): Merge conflict in net/sunrpc/svc.c +Resolved 'net/sunrpc/svc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 4d66d2e: Merge commit 'nfsd/nfsd-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/nfs-rdma.txt | 103 +++++---- + fs/lockd/svc.c | 33 +-- + fs/lockd/svc4proc.c | 7 +- + fs/lockd/svclock.c | 33 +-- + fs/lockd/svcproc.c | 7 +- + fs/lockd/svcsubs.c | 32 ++- + fs/nfsd/lockd.c | 2 +- + fs/nfsd/nfs2acl.c | 7 +- + fs/nfsd/nfs3acl.c | 5 +- + fs/nfsd/nfs3proc.c | 8 +- + fs/nfsd/nfs4proc.c | 76 +++++- + fs/nfsd/nfs4state.c | 49 +++- + fs/nfsd/nfs4xdr.c | 390 +++++++++++++----------------- + fs/nfsd/nfsctl.c | 118 +++++++--- + fs/nfsd/nfsfh.c | 31 ++- + fs/nfsd/nfsproc.c | 9 +- + fs/nfsd/nfssvc.c | 148 ++++++------ + fs/nfsd/vfs.c | 140 ++++++------ + include/linux/fs.h | 4 +- + include/linux/lockd/lockd.h | 8 +- + include/linux/nfs4.h | 3 - + include/linux/nfsd/nfsd.h | 27 +- + include/linux/nfsd/state.h | 2 - + include/linux/sunrpc/gss_krb5.h | 3 + + include/linux/sunrpc/svc.h | 7 +- + include/linux/sunrpc/svc_rdma.h | 36 +++- + net/sunrpc/auth_gss/Makefile | 4 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 - + 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 | 72 ++++--- + net/sunrpc/svc.c | 110 +++------ + net/sunrpc/xprtrdma/svc_rdma.c | 35 +++ + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 84 +++---- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 166 ++++++------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 195 ++++++---------- + 36 files changed, 1041 insertions(+), 965 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-card.c | 2 +- + drivers/firewire/fw-topology.c | 2 -- + drivers/firewire/fw-transaction.c | 21 +++++++++------------ + 3 files changed, 10 insertions(+), 15 deletions(-) +Merging hwmon/testing +$ git merge hwmon/testing +Auto-merged drivers/hwmon/adt7473.c +Merge made by recursive. + Documentation/hwmon/dme1737 | 4 + + Documentation/hwmon/lm85 | 11 +- + drivers/hwmon/Kconfig | 25 ++- + drivers/hwmon/adt7473.c | 16 +- + drivers/hwmon/dme1737.c | 297 ++++++++++++-------- + drivers/hwmon/lm75.c | 282 +++++++++++++----- + drivers/hwmon/lm85.c | 672 ++++++++++++++++++------------------------- + 7 files changed, 691 insertions(+), 616 deletions(-) +Merging ubi/master +$ git merge ubi/master +Auto-merged drivers/mtd/ubi/cdev.c +Merge made by recursive. + drivers/mtd/ubi/build.c | 77 ++++++++++++--- + drivers/mtd/ubi/cdev.c | 230 +++++++++++++++++++++++++++++++++++++++---- + drivers/mtd/ubi/debug.c | 160 ++++++++++++++++-------------- + drivers/mtd/ubi/debug.h | 74 +++++++++----- + drivers/mtd/ubi/eba.c | 68 ++++--------- + drivers/mtd/ubi/gluebi.c | 12 +- + drivers/mtd/ubi/io.c | 26 +++--- + drivers/mtd/ubi/kapi.c | 50 +++++++--- + drivers/mtd/ubi/misc.c | 2 +- + drivers/mtd/ubi/scan.c | 30 +++--- + drivers/mtd/ubi/scan.h | 19 ++-- + drivers/mtd/ubi/ubi-media.h | 23 +++-- + drivers/mtd/ubi/ubi.h | 71 +++++++++----- + drivers/mtd/ubi/upd.c | 22 ++-- + drivers/mtd/ubi/vmt.c | 144 +++++++++++++++++---------- + drivers/mtd/ubi/vtbl.c | 108 ++++++++++++++++----- + drivers/mtd/ubi/wl.c | 97 +++++++++--------- + include/linux/mtd/ubi.h | 5 +- + include/mtd/ubi-user.h | 60 +++++++++++- + 19 files changed, 863 insertions(+), 415 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/ia64/kvm/kvm-ia64.c +Auto-merged arch/x86/kvm/vmx.c +CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c +Auto-merged arch/x86/kvm/x86.c +Auto-merged include/asm-x86/kvm_host.h +Auto-merged virt/kvm/kvm_main.c +CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c +Resolved 'arch/x86/kvm/vmx.c' using previous resolution. +Resolved 'virt/kvm/kvm_main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 8627136: Merge commit 'kvm/master' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/kvm/Makefile | 3 +- + arch/ia64/kvm/kvm-ia64.c | 20 +- + arch/powerpc/kvm/44x_tlb.c | 15 +- + arch/powerpc/kvm/Kconfig | 11 + + arch/powerpc/kvm/Makefile | 6 +- + arch/powerpc/kvm/emulate.c | 6 + + arch/powerpc/kvm/powerpc.c | 11 +- + arch/s390/kvm/interrupt.c | 32 +- + arch/s390/kvm/kvm-s390.c | 21 +- + arch/s390/kvm/priv.c | 2 +- + arch/s390/kvm/sigp.c | 20 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kvm/Makefile | 3 +- + arch/x86/kvm/i8254.c | 24 +- + arch/x86/kvm/i8259.c | 27 +- + arch/x86/kvm/irq.c | 11 + + arch/x86/kvm/irq.h | 4 + + arch/x86/kvm/kvm_cache_regs.h | 32 ++ + arch/x86/kvm/lapic.c | 18 +- + arch/x86/kvm/lapic.h | 1 + + arch/x86/kvm/mmu.c | 80 ++++-- + arch/x86/kvm/mmu.h | 3 +- + arch/x86/kvm/paging_tmpl.h | 28 +- + arch/x86/kvm/svm.c | 266 ++++++++------- + arch/x86/kvm/vmx.c | 578 +++++++++++++++++++------------- + arch/x86/kvm/vmx.h | 16 +- + arch/x86/kvm/x86.c | 674 +++++++++++++++++++------------------ + arch/x86/kvm/x86.h | 22 ++ + arch/x86/kvm/x86_emulate.c | 276 ++++++++++------ + include/asm-ia64/kvm_host.h | 3 + + include/asm-powerpc/kvm_host.h | 2 + + include/asm-s390/kvm_host.h | 36 +- + include/asm-x86/kvm.h | 21 -- + include/asm-x86/kvm_host.h | 114 ++++--- + include/asm-x86/kvm_x86_emulate.h | 11 +- + include/linux/kvm.h | 79 ++++- + include/linux/kvm_host.h | 30 ++- + virt/kvm/coalesced_mmio.c | 156 +++++++++ + virt/kvm/coalesced_mmio.h | 23 ++ + virt/kvm/ioapic.c | 23 ++- + virt/kvm/iodev.h | 8 +- + virt/kvm/kvm_main.c | 135 +++++++- + virt/kvm/kvm_trace.c | 46 ++- + 43 files changed, 1846 insertions(+), 1053 deletions(-) + create mode 100644 arch/x86/kvm/kvm_cache_regs.h + create mode 100644 arch/x86/kvm/x86.h + create mode 100644 virt/kvm/coalesced_mmio.c + create mode 100644 virt/kvm/coalesced_mmio.h +Merging dlm/next +$ git merge dlm/next +Auto-merged fs/dlm/user.c +Merge made by recursive. + fs/dlm/lock.c | 4 +++- + fs/dlm/lowcomms.c | 4 +++- + fs/dlm/user.c | 2 +- + 3 files changed, 7 insertions(+), 3 deletions(-) +Merging scsi/master +$ git merge scsi/master +Auto-merged include/scsi/scsi_host.h +Merge made by recursive. + drivers/scsi/qla2xxx/qla_attr.c | 69 +++++++++++++------ + drivers/scsi/qla2xxx/qla_dbg.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 12 ++- + drivers/scsi/qla2xxx/qla_gbl.h | 5 +- + drivers/scsi/qla2xxx/qla_gs.c | 6 ++ + drivers/scsi/qla2xxx/qla_init.c | 126 ++++++++++++++++++++---------------- + drivers/scsi/qla2xxx/qla_iocb.c | 23 ++++--- + drivers/scsi/qla2xxx/qla_isr.c | 4 - + drivers/scsi/qla2xxx/qla_mbx.c | 12 ++- + drivers/scsi/qla2xxx/qla_mid.c | 15 ++--- + drivers/scsi/qla2xxx/qla_os.c | 86 +++++++++++++++--------- + drivers/scsi/qla2xxx/qla_sup.c | 48 +++++++++++++- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/scsi.c | 19 ++++-- + drivers/scsi/scsi_lib.c | 15 ++++ + drivers/scsi/sd.c | 27 ++++---- + drivers/scsi/st.c | 11 +-- + drivers/scsi/stex.c | 2 +- + include/scsi/scsi_host.h | 2 +- + 20 files changed, 313 insertions(+), 177 deletions(-) +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + Documentation/ia64/paravirt_ops.txt | 137 +++++++++ + arch/ia64/Kconfig | 4 +- + arch/ia64/Makefile | 6 + + arch/ia64/kernel/Makefile | 44 +++ + arch/ia64/kernel/acpi.c | 5 +- + arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 4 +- + 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/module.c | 3 +- + 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 - + drivers/char/mmtimer.c | 29 +- + 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 +- + include/asm-ia64/uv/uv_mmrs.h | 423 +++++++++++++++++++++++++++- + 37 files changed, 2251 insertions(+), 387 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 kernel/rtmutex-tester.c => tests/rtmutex-tester.c +Auto-merged tests/rtmutex-tester.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 +Created commit dfc53a7: Merge commit 'tests/master' +$ git diff -M --stat --summary HEAD^.. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 93 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 101 +++++++++++++++++++++++ + tests/Makefile | 10 ++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 0 + {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, 115 insertions(+), 98 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (100%) + 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 +Auto-merged Documentation/filesystems/configfs/configfs.txt +Auto-merged fs/Kconfig +Auto-merged fs/configfs/configfs_internal.h +CONFLICT (content): Merge conflict in fs/configfs/configfs_internal.h +Auto-merged fs/configfs/dir.c +CONFLICT (content): Merge conflict in fs/configfs/dir.c +Auto-merged fs/configfs/symlink.c +CONFLICT (content): Merge conflict in fs/configfs/symlink.c +Auto-merged fs/ocfs2/aops.c +Auto-merged fs/ocfs2/journal.c +Auto-merged fs/ocfs2/ocfs2.h +Auto-merged fs/ocfs2/ocfs2_fs.h +Auto-merged fs/ocfs2/stack_user.c +Auto-merged fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merged include/linux/configfs.h +Recorded preimage for 'fs/configfs/configfs_internal.h' +Recorded preimage for 'fs/configfs/dir.c' +Recorded preimage for 'fs/configfs/symlink.c' +Recorded preimage for 'fs/ocfs2/super.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/configfs/configfs_internal.h'. +Recorded resolution for 'fs/configfs/dir.c'. +Recorded resolution for 'fs/configfs/symlink.c'. +Recorded resolution for 'fs/ocfs2/super.c'. +Created commit fa52bdc: Merge commit 'ocfs2/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/configfs/configfs.txt | 17 ++- + ...figfs_example.c => configfs_example_explicit.c} | 16 +- + ...onfigfs_example.c => configfs_example_macros.c} | 73 ++----- + fs/configfs/configfs_internal.h | 3 + + fs/configfs/dir.c | 210 ++++++++++++++++---- + fs/configfs/symlink.c | 26 +++ + fs/ocfs2/aops.c | 17 ++ + fs/ocfs2/journal.c | 173 +++++++++++++---- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/ocfs2.h | 2 + + fs/ocfs2/ocfs2_fs.h | 5 +- + fs/ocfs2/super.c | 12 +- + include/linux/configfs.h | 67 ++++++- + 13 files changed, 473 insertions(+), 151 deletions(-) + copy Documentation/filesystems/configfs/{configfs_example.c => configfs_example_explicit.c} (97%) + rename Documentation/filesystems/configfs/{configfs_example.c => configfs_example_macros.c} (85%) +Merging quilt/m68k +$ git merge quilt/m68k +Removed arch/m68k/mac/bootparse.c +Removed arch/m68k/sun3/sbus.c +Auto-merged init/main.c +Merge made by recursive. + arch/m68k/Kconfig | 36 +----------- + arch/m68k/Makefile | 2 +- + arch/m68k/amiga/config.c | 22 +++---- + arch/m68k/atari/debug.c | 37 ++--------- + arch/m68k/fpsp040/Makefile | 1 - + arch/m68k/ifpsp060/Makefile | 1 - + arch/m68k/kernel/Makefile | 2 - + arch/m68k/kernel/setup.c | 9 +++ + arch/m68k/kernel/vmlinux-std.lds | 3 +- + arch/m68k/kernel/vmlinux-sun3.lds | 7 +- + arch/m68k/lib/Makefile | 2 - + arch/m68k/mac/Makefile | 2 +- + arch/m68k/mac/baboon.c | 26 ++++---- + arch/m68k/mac/bootparse.c | 122 ------------------------------------- + arch/m68k/mac/config.c | 11 ++-- + arch/m68k/mac/debug.c | 41 +++--------- + arch/m68k/mac/oss.c | 8 +- + arch/m68k/mac/psc.c | 4 +- + arch/m68k/mac/via.c | 2 +- + arch/m68k/math-emu/Makefile | 2 - + arch/m68k/mm/motorola.c | 1 - + arch/m68k/mm/sun3mmu.c | 1 - + arch/m68k/q40/config.c | 26 ++++---- + arch/m68k/sun3/Makefile | 2 +- + arch/m68k/sun3/config.c | 7 +- + arch/m68k/sun3/dvma.c | 2 +- + arch/m68k/sun3/idprom.c | 4 +- + arch/m68k/sun3/mmu_emu.c | 2 +- + arch/m68k/sun3/prom/Makefile | 1 - + arch/m68k/sun3/prom/console.c | 6 +-- + arch/m68k/sun3/prom/init.c | 11 +--- + arch/m68k/sun3/prom/misc.c | 2 +- + arch/m68k/sun3/prom/printf.c | 7 +-- + arch/m68k/sun3/sbus.c | 27 -------- + arch/m68k/sun3/sun3dvma.c | 2 +- + arch/m68k/sun3/sun3ints.c | 2 +- + drivers/block/ataflop.c | 4 +- + drivers/char/nvram.c | 2 +- + drivers/dio/dio-driver.c | 14 +---- + drivers/input/keyboard/atakbd.c | 2 +- + drivers/net/Kconfig | 9 --- + drivers/net/ariadne.c | 47 +++++++-------- + drivers/video/amifb.c | 3 + + drivers/video/atafb.c | 5 +- + drivers/video/c2p.c | 3 + + drivers/zorro/proc.c | 4 +- + drivers/zorro/zorro-sysfs.c | 10 +--- + drivers/zorro/zorro.c | 2 - + drivers/zorro/zorro.ids | 2 - + include/asm-m68k/amigahw.h | 4 - + include/asm-m68k/amigaints.h | 2 + + include/asm-m68k/apollodma.h | 2 +- + include/asm-m68k/dvma.h | 4 +- + include/asm-m68k/fpu.h | 10 ++-- + include/asm-m68k/irq.h | 2 +- + include/asm-m68k/mac_baboon.h | 2 - + include/asm-m68k/mac_via.h | 1 - + include/asm-m68k/machines.h | 4 +- + include/asm-m68k/macintosh.h | 5 -- + include/asm-m68k/md.h | 2 +- + include/asm-m68k/openprom.h | 1 - + include/asm-m68k/oplib.h | 3 +- + include/asm-m68k/sbus.h | 5 -- + include/asm-m68k/sun3-head.h | 1 - + include/asm-m68k/tlbflush.h | 8 +- + init/main.c | 5 +- + 66 files changed, 155 insertions(+), 456 deletions(-) + delete mode 100644 arch/m68k/mac/bootparse.c + delete mode 100644 arch/m68k/sun3/sbus.c +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Merge made by recursive. + arch/avr32/mach-at32ap/at32ap700x.c | 27 +- + crypto/async_tx/async_memset.c | 2 +- + drivers/dma/Kconfig | 37 +- + drivers/dma/Makefile | 3 + + drivers/dma/dmaengine.c | 35 +- + drivers/dma/dmatest.c | 444 +++++++++ + drivers/dma/dw_dmac.c | 1122 +++++++++++++++++++++++ + drivers/dma/dw_dmac_regs.h | 225 +++++ + drivers/dma/fsldma.c | 38 +- + drivers/dma/ioat_dma.c | 53 +- + drivers/dma/iop-adma.c | 38 +- + drivers/dma/mv_xor.c | 1375 ++++++++++++++++++++++++++++ + drivers/dma/mv_xor.h | 183 ++++ + include/asm-arm/plat-orion/mv_xor.h | 28 + + include/asm-avr32/arch-at32ap/at32ap700x.h | 16 + + include/linux/dmaengine.h | 61 ++- + include/linux/dw_dmac.h | 62 ++ + 17 files changed, 3662 insertions(+), 87 deletions(-) + create mode 100644 drivers/dma/dmatest.c + create mode 100644 drivers/dma/dw_dmac.c + create mode 100644 drivers/dma/dw_dmac_regs.h + create mode 100644 drivers/dma/mv_xor.c + create mode 100644 drivers/dma/mv_xor.h + create mode 100644 include/asm-arm/plat-orion/mv_xor.h + create mode 100644 include/linux/dw_dmac.h +Merging udf/for_next +$ git merge udf/for_next +Already uptodate! +Merge made by recursive. +Merging net/master +$ git merge net/master +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged Documentation/powerpc/booting-without-of.txt +CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt +Auto-merged MAINTAINERS +Auto-merged drivers/atm/Makefile +CONFLICT (content): Merge conflict in drivers/atm/Makefile +Removed drivers/atm/fore200e_firmware_copyright +Removed drivers/atm/fore200e_mkfirm.c +Removed drivers/atm/pca200e.data +Removed drivers/atm/pca200e_ecd.data +Removed drivers/atm/sba200e_ecd.data +Auto-merged drivers/infiniband/ulp/ipoib/ipoib_multicast.c +Auto-merged drivers/media/dvb/dvb-core/dvb_net.c +Auto-merged drivers/net/Kconfig +Auto-merged drivers/net/Makefile +Removed drivers/net/bnx2x.c +Auto-merged drivers/net/cxgb3/common.h +Auto-merged drivers/net/cxgb3/cxgb3_ctl_defs.h +Auto-merged drivers/net/cxgb3/cxgb3_offload.c +Auto-merged drivers/net/fs_enet/fs_enet-main.c +CONFLICT (content): Merge conflict in drivers/net/fs_enet/fs_enet-main.c +Removed drivers/net/ibm_emac/Kconfig +Removed drivers/net/ibm_emac/Makefile +Removed drivers/net/ibm_emac/ibm_emac.h +Removed drivers/net/ibm_emac/ibm_emac_core.c +Removed drivers/net/ibm_emac/ibm_emac_core.h +Removed drivers/net/ibm_emac/ibm_emac_debug.c +Removed drivers/net/ibm_emac/ibm_emac_debug.h +Removed drivers/net/ibm_emac/ibm_emac_mal.c +Removed drivers/net/ibm_emac/ibm_emac_mal.h +Removed drivers/net/ibm_emac/ibm_emac_phy.c +Removed drivers/net/ibm_emac/ibm_emac_phy.h +Removed drivers/net/ibm_emac/ibm_emac_rgmii.c +Removed drivers/net/ibm_emac/ibm_emac_rgmii.h +Removed drivers/net/ibm_emac/ibm_emac_tah.c +Removed drivers/net/ibm_emac/ibm_emac_tah.h +Removed drivers/net/ibm_emac/ibm_emac_zmii.c +Removed drivers/net/ibm_emac/ibm_emac_zmii.h +Auto-merged drivers/net/ibm_newemac/core.c +Auto-merged drivers/net/macb.c +Auto-merged drivers/net/macvlan.c +Auto-merged drivers/net/myri10ge/myri10ge.c +Auto-merged drivers/net/ppp_generic.c +Removed drivers/net/saa9730.c +Removed drivers/net/saa9730.h +Removed drivers/net/sfc/i2c-direct.c +Removed drivers/net/sfc/i2c-direct.h +Auto-merged drivers/net/tun.c +Auto-merged drivers/net/ucc_geth.c +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/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 +Removed drivers/net/wireless/strip.c +Auto-merged drivers/net/wireless/zd1201.c +Auto-merged drivers/pci/pci-acpi.c +CONFLICT (content): Merge conflict in drivers/pci/pci-acpi.c +Auto-merged drivers/s390/net/qeth_l3_main.c +Auto-merged fs/compat_ioctl.c +Auto-merged include/linux/pci_ids.h +Auto-merged lib/textsearch.c +Auto-merged net/8021q/vlan.c +CONFLICT (content): Merge conflict in net/8021q/vlan.c +Auto-merged net/bridge/br_fdb.c +Auto-merged net/bridge/br_stp.c +Auto-merged net/core/dev.c +Auto-merged net/irda/irnet/irnet_ppp.c +Auto-merged net/iucv/af_iucv.c +Auto-merged net/iucv/iucv.c +CONFLICT (content): Merge conflict in net/iucv/iucv.c +Auto-merged net/netfilter/nf_conntrack_netlink.c +Auto-merged net/sunrpc/auth_gss/auth_gss.c +Resolved 'Documentation/powerpc/booting-without-of.txt' using previous resolution. +Resolved 'drivers/atm/Makefile' using previous resolution. +Resolved 'drivers/net/fs_enet/fs_enet-main.c' using previous resolution. +Resolved 'drivers/pci/pci-acpi.c' using previous resolution. +Resolved 'net/8021q/vlan.c' using previous resolution. +Resolved 'net/iucv/iucv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 0e1e510: Merge commit 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 22 + + Documentation/networking/bonding.txt | 110 +- + Documentation/networking/dm9000.txt | 167 + + Documentation/networking/ip-sysctl.txt | 21 +- + Documentation/networking/ixgb.txt | 419 +- + Documentation/networking/mac80211_hwsim/README | 67 + + .../networking/mac80211_hwsim/hostapd.conf | 11 + + .../networking/mac80211_hwsim/wpa_supplicant.conf | 10 + + Documentation/networking/multiqueue.txt | 79 +- + Documentation/networking/s2io.txt | 7 +- + Documentation/powerpc/booting-without-of.txt | 21 + + Documentation/rfkill.txt | 547 +- + MAINTAINERS | 22 +- + arch/blackfin/mach-bf527/boards/ezkit.c | 7 +- + arch/blackfin/mach-bf533/boards/H8606.c | 7 +- + arch/blackfin/mach-bf537/boards/generic_board.c | 7 +- + drivers/atm/Kconfig | 79 +- + drivers/atm/Makefile | 39 - + drivers/atm/fore200e.c | 130 +- + drivers/atm/fore200e.h | 3 - + drivers/atm/fore200e_firmware_copyright | 31 - + drivers/atm/fore200e_mkfirm.c | 154 - + drivers/atm/he.c | 152 - + drivers/atm/he.h | 26 - + drivers/atm/iphase.c | 30 +- + drivers/atm/pca200e.data | 850 - + drivers/atm/pca200e_ecd.data | 906 - + drivers/atm/sba200e_ecd.data | 928 - + drivers/atm/suni.c | 130 +- + drivers/atm/suni.h | 40 +- + drivers/bluetooth/Kconfig | 1 + + drivers/bluetooth/hci_bcsp.c | 44 +- + drivers/char/pcmcia/synclink_cs.c | 28 +- + drivers/char/synclink.c | 33 +- + drivers/char/synclink_gt.c | 28 +- + drivers/char/synclinkmp.c | 31 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 4 +- + drivers/isdn/i4l/isdn_net.c | 2 +- + drivers/media/dvb/dvb-core/dvb_net.c | 4 +- + drivers/net/3c503.c | 14 +- + drivers/net/3c515.c | 4 + + drivers/net/3c523.c | 37 +- + drivers/net/3c527.c | 45 +- + drivers/net/8139cp.c | 44 +- + drivers/net/8139too.c | 66 +- + drivers/net/8390.h | 19 +- + drivers/net/8390p.c | 66 + + drivers/net/Kconfig | 191 +- + drivers/net/Makefile | 15 +- + drivers/net/a2065.c | 4 - + drivers/net/acenic.c | 21 +- + drivers/net/acenic.h | 1 - + drivers/net/amd8111e.c | 137 +- + drivers/net/atarilance.c | 2 +- + drivers/net/atlx/atl1.c | 3 +- + drivers/net/b44.c | 140 +- + drivers/net/bnx2.c | 1292 +- + drivers/net/bnx2.h | 112 +- + drivers/net/bnx2_fw.h | 80 + + drivers/net/bnx2_fw2.h | 8856 +++++----- + drivers/net/bnx2x.c | 9988 ---------- + drivers/net/bnx2x.h | 1585 +- + drivers/net/bnx2x_fw_defs.h | 483 +- + drivers/net/bnx2x_hsi.h | 1101 +- + drivers/net/bnx2x_init.h | 352 +- + drivers/net/bnx2x_init_values.h |19186 ++++++++++++++------ + drivers/net/bnx2x_link.c | 4527 +++++ + drivers/net/bnx2x_link.h | 168 + + drivers/net/bnx2x_main.c |10294 +++++++++++ + drivers/net/bnx2x_reg.h | 1969 ++- + drivers/net/bonding/bond_alb.c | 6 +- + drivers/net/bonding/bond_main.c | 822 +- + drivers/net/bonding/bond_sysfs.c | 103 +- + drivers/net/bonding/bonding.h | 17 +- + drivers/net/chelsio/cxgb2.c | 2 - + drivers/net/chelsio/sge.c | 70 +- + drivers/net/cpmac.c | 14 - + drivers/net/cxgb3/adapter.h | 18 + + drivers/net/cxgb3/common.h | 1 + + drivers/net/cxgb3/cxgb3_ctl_defs.h | 5 +- + drivers/net/cxgb3/cxgb3_ioctl.h | 1 + + drivers/net/cxgb3/cxgb3_main.c | 19 + + drivers/net/cxgb3/cxgb3_offload.c | 32 +- + drivers/net/cxgb3/l2t.c | 2 +- + drivers/net/cxgb3/regs.h | 10 +- + drivers/net/cxgb3/sge.c | 391 +- + drivers/net/cxgb3/t3_cpl.h | 51 + + drivers/net/cxgb3/t3cdev.h | 4 +- + drivers/net/declance.c | 4 - + drivers/net/dl2k.c | 10 +- + drivers/net/dm9000.c | 1161 +- + drivers/net/dm9000.h | 11 + + drivers/net/e1000/e1000_main.c | 46 +- + drivers/net/e1000e/e1000.h | 4 + + drivers/net/e1000e/netdev.c | 56 +- + drivers/net/fealnx.c | 43 +- + drivers/net/forcedeth.c | 82 +- + drivers/net/fs_enet/fs_enet-main.c | 31 +- + drivers/net/gianfar.c | 78 +- + drivers/net/gianfar.h | 11 - + drivers/net/hamachi.c | 12 +- + drivers/net/hamradio/6pack.c | 26 +- + drivers/net/hamradio/bpqether.c | 12 +- + drivers/net/hamradio/mkiss.c | 2 + + drivers/net/hp.c | 14 +- + drivers/net/hplance.c | 4 +- + drivers/net/ibm_emac/Kconfig | 70 - + drivers/net/ibm_emac/Makefile | 11 - + drivers/net/ibm_emac/ibm_emac.h | 329 - + drivers/net/ibm_emac/ibm_emac_core.c | 2263 --- + drivers/net/ibm_emac/ibm_emac_core.h | 222 - + drivers/net/ibm_emac/ibm_emac_debug.c | 211 - + drivers/net/ibm_emac/ibm_emac_debug.h | 62 - + drivers/net/ibm_emac/ibm_emac_mal.c | 570 - + drivers/net/ibm_emac/ibm_emac_mal.h | 267 - + drivers/net/ibm_emac/ibm_emac_phy.c | 398 - + drivers/net/ibm_emac/ibm_emac_phy.h | 80 - + drivers/net/ibm_emac/ibm_emac_rgmii.c | 200 - + drivers/net/ibm_emac/ibm_emac_rgmii.h | 64 - + drivers/net/ibm_emac/ibm_emac_tah.c | 110 - + drivers/net/ibm_emac/ibm_emac_tah.h | 87 - + drivers/net/ibm_emac/ibm_emac_zmii.c | 253 - + drivers/net/ibm_emac/ibm_emac_zmii.h | 82 - + drivers/net/ibm_newemac/core.c | 4 + + drivers/net/ifb.c | 12 +- + drivers/net/igb/e1000_82575.c | 446 +- + drivers/net/igb/e1000_82575.h | 36 +- + drivers/net/igb/e1000_defines.h | 38 +- + drivers/net/igb/e1000_hw.h | 16 +- + drivers/net/igb/e1000_mac.c | 144 +- + drivers/net/igb/e1000_mac.h | 1 + + drivers/net/igb/e1000_nvm.c | 52 +- + drivers/net/igb/e1000_phy.c | 138 +- + drivers/net/igb/e1000_regs.h | 9 +- + drivers/net/igb/igb.h | 53 +- + drivers/net/igb/igb_ethtool.c | 203 +- + drivers/net/igb/igb_main.c | 1302 +- + drivers/net/ipg.c | 105 +- + drivers/net/ipg.h | 83 +- + drivers/net/irda/ali-ircc.h | 2 - + drivers/net/irda/au1000_ircc.h | 1 - + drivers/net/irda/donauboe.c | 6 +- + drivers/net/irda/smsc-ircc2.c | 1 - + drivers/net/irda/smsc-ircc2.h | 1 - + drivers/net/irda/via-ircc.h | 1 - + drivers/net/ixgb/Makefile | 2 +- + drivers/net/ixgb/ixgb.h | 21 +- + drivers/net/ixgb/ixgb_ee.c | 28 +- + drivers/net/ixgb/ixgb_ee.h | 12 +- + drivers/net/ixgb/ixgb_ethtool.c | 120 +- + drivers/net/ixgb/ixgb_hw.c | 40 +- + drivers/net/ixgb/ixgb_hw.h | 2 +- + drivers/net/ixgb/ixgb_ids.h | 10 +- + drivers/net/ixgb/ixgb_main.c | 482 +- + drivers/net/ixgb/ixgb_osdep.h | 4 +- + drivers/net/ixgb/ixgb_param.c | 44 +- + drivers/net/ixgbe/ixgbe.h | 9 + + drivers/net/ixgbe/ixgbe_ethtool.c | 17 +- + drivers/net/ixgbe/ixgbe_main.c | 158 +- + drivers/net/ixp2000/ixpdev.c | 4 +- + drivers/net/lib8390.c | 100 +- + drivers/net/mac8390.c | 8 +- + drivers/net/macb.c | 6 +- + drivers/net/macsonic.c | 19 +- + drivers/net/macvlan.c | 28 +- + drivers/net/mv643xx_eth.c | 4557 ++--- + drivers/net/myri10ge/myri10ge.c | 1076 +- + drivers/net/natsemi.c | 4 +- + drivers/net/ne.c | 14 +- + drivers/net/ne2.c | 16 +- + drivers/net/niu.c | 158 + + drivers/net/niu.h | 2 +- + drivers/net/ns83820.c | 9 +- + drivers/net/pci-skeleton.c | 1 - + 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 | 9 +- + drivers/net/phy/Makefile | 1 + + drivers/net/phy/broadcom.c | 201 +- + drivers/net/phy/mdio-bitbang.c | 2 + + drivers/net/phy/mdio-ofgpio.c | 205 + + drivers/net/ppp_generic.c | 22 +- + drivers/net/ps3_gelic_net.c | 10 +- + drivers/net/ps3_gelic_net.h | 2 +- + drivers/net/ps3_gelic_wireless.c | 236 +- + drivers/net/ps3_gelic_wireless.h | 7 +- + drivers/net/qla3xxx.c | 4 +- + drivers/net/r8169.c | 145 +- + drivers/net/s2io.c | 143 +- + drivers/net/s2io.h | 3 +- + drivers/net/saa9730.c | 1139 -- + drivers/net/saa9730.h | 384 - + drivers/net/sb1250-mac.c | 2 +- + drivers/net/sfc/Kconfig | 2 + + drivers/net/sfc/Makefile | 2 +- + drivers/net/sfc/boards.c | 2 +- + drivers/net/sfc/boards.h | 3 +- + drivers/net/sfc/efx.c | 6 +- + drivers/net/sfc/falcon.c | 74 +- + drivers/net/sfc/i2c-direct.c | 381 - + drivers/net/sfc/i2c-direct.h | 91 - + drivers/net/sfc/net_driver.h | 11 +- + drivers/net/sfc/sfe4001.c | 126 +- + drivers/net/sh_eth.c | 1174 ++ + drivers/net/sh_eth.h | 464 + + drivers/net/sis190.c | 2 +- + drivers/net/sis900.c | 2 +- + drivers/net/sky2.c | 241 +- + drivers/net/sky2.h | 24 +- + drivers/net/smc911x.c | 422 +- + drivers/net/smc911x.h | 494 +- + drivers/net/spider_net.c | 4 +- + drivers/net/starfire.c | 111 +- + drivers/net/sunlance.c | 4 - + drivers/net/tehuti.c | 2 +- + drivers/net/tehuti.h | 1 + + drivers/net/tg3.c | 1268 +- + drivers/net/tg3.h | 40 +- + drivers/net/tlan.c | 490 +- + drivers/net/tlan.h | 26 +- + drivers/net/tokenring/3c359.c | 20 +- + drivers/net/tokenring/3c359.h | 2 - + drivers/net/tsi108_eth.c | 11 +- + drivers/net/tulip/21142.c | 6 +- + drivers/net/tulip/de2104x.c | 10 +- + drivers/net/tulip/eeprom.c | 6 +- + drivers/net/tulip/interrupt.c | 5 +- + drivers/net/tulip/media.c | 5 +- + drivers/net/tulip/pnic.c | 5 +- + drivers/net/tulip/pnic2.c | 5 +- + drivers/net/tulip/timer.c | 6 +- + drivers/net/tulip/tulip.h | 4 +- + drivers/net/tulip/tulip_core.c | 8 +- + drivers/net/tun.c | 458 +- + drivers/net/typhoon.c | 3 - + drivers/net/ucc_geth.c | 29 +- + drivers/net/ucc_geth_ethtool.c | 4 +- + drivers/net/usb/Kconfig | 10 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/hso.c | 2836 +++ + drivers/net/usb/rndis_host.c | 14 +- + drivers/net/via-rhine.c | 27 +- + drivers/net/via-velocity.c | 183 +- + drivers/net/via-velocity.h | 5 - + drivers/net/virtio_net.c | 3 +- + drivers/net/wan/Kconfig | 3 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/dscc4.c | 22 +- + drivers/net/wan/farsync.c | 70 +- + drivers/net/wan/hd6457x.c | 33 +- + drivers/net/wan/hdlc.c | 2 +- + drivers/net/wan/hdlc_cisco.c | 4 +- + drivers/net/wan/hdlc_fr.c | 54 +- + drivers/net/wan/hdlc_raw_eth.c | 2 +- + drivers/net/wan/hdlc_x25.c | 6 +- + drivers/net/wan/pc300_drv.c | 71 +- + drivers/net/wan/pc300_tty.c | 6 +- + drivers/net/wan/wanxl.c | 26 +- + drivers/net/wireless/Kconfig | 49 +- + drivers/net/wireless/Makefile | 3 +- + drivers/net/wireless/adm8211.c | 58 +- + drivers/net/wireless/adm8211.h | 1 - + drivers/net/wireless/airo.c | 156 +- + drivers/net/wireless/arlan-main.c | 40 +- + drivers/net/wireless/arlan.h | 1 - + drivers/net/wireless/ath5k/Kconfig | 3 + + drivers/net/wireless/ath5k/base.c | 377 +- + drivers/net/wireless/ath5k/base.h | 36 +- + drivers/net/wireless/ath5k/hw.c | 4 +- + drivers/net/wireless/atmel.c | 70 +- + drivers/net/wireless/b43/b43.h | 49 +- + drivers/net/wireless/b43/debugfs.c | 436 +- + drivers/net/wireless/b43/debugfs.h | 24 +- + drivers/net/wireless/b43/dma.c | 119 +- + drivers/net/wireless/b43/dma.h | 3 +- + drivers/net/wireless/b43/lo.c | 731 +- + drivers/net/wireless/b43/lo.h | 115 +- + drivers/net/wireless/b43/main.c | 450 +- + drivers/net/wireless/b43/main.h | 7 + + 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 | 44 +- + drivers/net/wireless/b43/pio.h | 8 +- + drivers/net/wireless/b43/rfkill.c | 27 +- + drivers/net/wireless/b43/xmit.c | 88 +- + drivers/net/wireless/b43/xmit.h | 4 +- + drivers/net/wireless/b43legacy/b43legacy.h | 17 - + drivers/net/wireless/b43legacy/dma.c | 172 +- + drivers/net/wireless/b43legacy/dma.h | 7 +- + drivers/net/wireless/b43legacy/main.c | 72 +- + drivers/net/wireless/b43legacy/phy.c | 14 +- + drivers/net/wireless/b43legacy/pio.c | 27 +- + drivers/net/wireless/b43legacy/pio.h | 7 +- + drivers/net/wireless/b43legacy/radio.c | 12 +- + drivers/net/wireless/b43legacy/rfkill.c | 28 +- + drivers/net/wireless/b43legacy/xmit.c | 70 +- + drivers/net/wireless/b43legacy/xmit.h | 2 +- + drivers/net/wireless/hostap/hostap.h | 3 +- + drivers/net/wireless/hostap/hostap_80211_rx.c | 21 + + drivers/net/wireless/hostap/hostap_ap.c | 32 +- + drivers/net/wireless/hostap/hostap_hw.c | 17 +- + drivers/net/wireless/hostap/hostap_ioctl.c | 63 +- + drivers/net/wireless/hostap/hostap_main.c | 20 +- + drivers/net/wireless/hostap/hostap_wlan.h | 14 +- + drivers/net/wireless/iwlwifi/Kconfig | 32 +- + drivers/net/wireless/iwlwifi/Makefile | 11 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 13 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 146 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 17 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 131 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 51 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 634 +- + drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 1233 +- + drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 105 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 4004 +---- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 134 + + drivers/net/wireless/iwlwifi/iwl-5000.c | 1580 ++ + drivers/net/wireless/iwlwifi/iwl-calib.c | 802 + + drivers/net/wireless/iwlwifi/iwl-calib.h | 84 + + .../{iwl-4965-commands.h => iwl-commands.h} | 462 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 1259 ++- + drivers/net/wireless/iwlwifi/iwl-core.h | 219 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 38 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 31 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 103 +- + .../net/wireless/iwlwifi/{iwl-4965.h => iwl-dev.h} | 567 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 171 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 206 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 391 + + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 92 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 209 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 5 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 423 + + drivers/net/wireless/iwlwifi/iwl-power.h | 76 + + drivers/net/wireless/iwlwifi/iwl-prph.h | 333 +- + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 106 +- + drivers/net/wireless/iwlwifi/iwl-rfkill.h | 6 - + drivers/net/wireless/iwlwifi/iwl-rx.c | 1321 ++ + drivers/net/wireless/iwlwifi/iwl-scan.c | 931 + + drivers/net/wireless/iwlwifi/iwl-sta.c | 712 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 28 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 1519 ++ + drivers/net/wireless/iwlwifi/iwl3945-base.c | 535 +- + drivers/net/wireless/iwlwifi/iwl4965-base.c | 5004 +----- + drivers/net/wireless/libertas/Makefile | 8 +- + drivers/net/wireless/libertas/assoc.c | 8 +- + drivers/net/wireless/libertas/cmd.c | 192 +- + drivers/net/wireless/libertas/cmd.h | 8 +- + drivers/net/wireless/libertas/cmdresp.c | 25 +- + drivers/net/wireless/libertas/decl.h | 8 +- + 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 | 315 +- + drivers/net/wireless/libertas/if_usb.c | 22 + + drivers/net/wireless/libertas/main.c | 254 +- + drivers/net/wireless/libertas/persistcfg.c | 453 + + drivers/net/wireless/libertas/rx.c | 4 +- + drivers/net/wireless/libertas/scan.c | 36 +- + drivers/net/wireless/libertas/types.h | 30 + + drivers/net/wireless/libertas/wext.c | 32 +- + drivers/net/wireless/mac80211_hwsim.c | 515 + + drivers/net/wireless/orinoco.c | 30 +- + drivers/net/wireless/p54/p54.h | 2 +- + drivers/net/wireless/p54/p54common.c | 138 +- + drivers/net/wireless/p54/p54common.h | 1 - + drivers/net/wireless/p54/p54pci.c | 2 +- + drivers/net/wireless/prism54/isl_ioctl.c | 49 +- + drivers/net/wireless/rndis_wlan.c | 205 +- + drivers/net/wireless/rt2x00/Kconfig | 63 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 352 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 7 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 312 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 11 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 307 +- + drivers/net/wireless/rt2x00/rt2500usb.h | 47 +- + drivers/net/wireless/rt2x00/rt2x00.h | 105 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 2 + + drivers/net/wireless/rt2x00/rt2x00debug.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 362 +- + drivers/net/wireless/rt2x00/rt2x00firmware.c | 8 + + drivers/net/wireless/rt2x00/rt2x00lib.h | 78 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 172 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 231 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 45 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 413 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 136 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 145 +- + drivers/net/wireless/rt2x00/rt2x00rfkill.c | 114 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 361 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 69 +- + drivers/net/wireless/rt2x00/rt61pci.c | 344 +- + drivers/net/wireless/rt2x00/rt61pci.h | 7 +- + drivers/net/wireless/rt2x00/rt73usb.c | 270 +- + drivers/net/wireless/rt2x00/rt73usb.h | 7 +- + drivers/net/wireless/rtl8180_dev.c | 71 +- + drivers/net/wireless/rtl8187.h | 119 +- + drivers/net/wireless/rtl8187_dev.c | 558 +- + drivers/net/wireless/rtl8187_rtl8225.c | 250 +- + drivers/net/wireless/rtl8187_rtl8225.h | 15 +- + drivers/net/wireless/rtl818x.h | 36 +- + drivers/net/wireless/strip.c | 2804 --- + drivers/net/wireless/wl3501_cs.c | 10 +- + drivers/net/wireless/zd1201.c | 21 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 262 +- + drivers/net/wireless/zd1211rw/zd_mac.h | 16 - + drivers/net/wireless/zd1211rw/zd_usb.c | 29 +- + drivers/s390/net/qeth_l3_main.c | 4 +- + drivers/ssb/Kconfig | 2 +- + drivers/ssb/main.c | 75 +- + drivers/ssb/pci.c | 20 +- + fs/compat_ioctl.c | 113 +- + include/linux/brcmphy.h | 6 + + include/linux/dccp.h | 6 +- + include/linux/dm9000.h | 1 + + include/linux/ethtool.h | 33 + + include/linux/hdlc.h | 7 - + include/linux/ieee80211.h | 499 +- + include/linux/if_bridge.h | 2 - + include/linux/if_packet.h | 23 + + include/linux/if_ppp.h | 2 - + include/linux/if_tun.h | 34 +- + include/linux/if_vlan.h | 238 +- + include/linux/igmp.h | 1 - + include/linux/ip6_tunnel.h | 4 - + include/linux/ipv6.h | 4 + + include/linux/mroute.h | 28 +- + include/linux/mroute6.h | 35 +- + include/linux/mv643xx_eth.h | 65 +- + include/linux/net.h | 4 +- + include/linux/netdevice.h | 221 +- + include/linux/netfilter/nfnetlink_conntrack.h | 10 + + include/linux/netfilter/xt_string.h | 15 +- + include/linux/netfilter_bridge/ebt_ip6.h | 40 + + include/linux/netfilter_bridge/ebt_log.h | 3 +- + include/linux/netfilter_ipv4.h | 1 + + include/linux/netfilter_ipv6.h | 5 + + include/linux/netlink.h | 2 +- + include/linux/nl80211.h | 13 +- + include/linux/notifier.h | 1 + + include/linux/pci_ids.h | 3 + + include/linux/pkt_cls.h | 1 + + include/linux/ppp-comp.h | 2 - + include/linux/ppp_defs.h | 2 - + include/linux/rfkill.h | 46 +- + include/linux/skbuff.h | 27 +- + include/linux/smc911x.h | 12 + + include/linux/sonet.h | 2 +- + include/linux/ssb/ssb.h | 144 +- + include/linux/sunrpc/auth_gss.h | 2 - + include/linux/sunrpc/gss_api.h | 2 - + include/linux/sunrpc/svcauth_gss.h | 3 - + include/linux/tcp.h | 50 +- + include/linux/textsearch.h | 13 +- + include/linux/tipc_config.h | 10 +- + include/linux/udp.h | 6 + + include/linux/usb/rndis_host.h | 3 +- + include/linux/wanrouter.h | 2 +- + include/linux/wireless.h | 30 + + include/net/addrconf.h | 3 +- + include/net/fib_rules.h | 2 +- + include/net/garp.h | 128 + + include/net/icmp.h | 16 +- + include/net/ieee80211.h | 11 - + include/net/if_inet6.h | 1 - + include/net/inet6_hashtables.h | 10 +- + include/net/inet_hashtables.h | 12 +- + include/net/inet_sock.h | 9 +- + include/net/inetpeer.h | 2 - + include/net/ip6_tunnel.h | 5 - + include/net/ipconfig.h | 2 - + include/net/ipip.h | 1 - + include/net/ipv6.h | 2 - + include/net/irda/irda_device.h | 2 +- + include/net/iw_handler.h | 151 +- + include/net/mac80211.h | 599 +- + include/net/net_namespace.h | 3 + + include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 2 - + include/net/netfilter/nf_conntrack.h | 22 +- + include/net/netns/hash.h | 21 + + include/net/netns/ipv4.h | 5 + + include/net/netns/ipv6.h | 1 + + include/net/pkt_sched.h | 14 +- + include/net/rose.h | 2 +- + include/net/route.h | 2 +- + include/net/sch_generic.h | 92 +- + include/net/sctp/sctp.h | 4 +- + include/net/sctp/structs.h | 6 +- + include/net/sctp/user.h | 36 +- + include/net/snmp.h | 2 - + include/net/sock.h | 37 +- + include/net/stp.h | 14 + + include/net/tcp.h | 23 +- + include/net/tipc/tipc_port.h | 10 +- + include/net/transp_v6.h | 2 +- + include/net/udp.h | 16 +- + include/net/wext.h | 7 + + include/net/wireless.h | 6 + + ipc/mqueue.c | 2 +- + lib/textsearch.c | 14 +- + lib/ts_bm.c | 26 +- + lib/ts_fsm.c | 6 +- + lib/ts_kmp.c | 29 +- + net/802/Kconfig | 7 + + net/802/Makefile | 2 + + net/802/garp.c | 633 + + net/802/stp.c | 102 + + net/8021q/Kconfig | 10 + + net/8021q/Makefile | 12 +- + net/8021q/vlan.c | 82 +- + net/8021q/vlan.h | 86 +- + net/8021q/vlan_core.c | 64 + + net/8021q/vlan_dev.c | 296 +- + net/8021q/vlan_gvrp.c | 66 + + net/8021q/vlan_netlink.c | 7 +- + net/8021q/vlanproc.c | 13 +- + net/Kconfig | 1 + + net/Makefile | 4 +- + net/atm/addr.c | 10 +- + net/atm/addr.h | 4 +- + net/atm/br2684.c | 14 +- + net/atm/common.c | 8 +- + net/atm/lec.c | 55 +- + net/atm/lec.h | 10 +- + net/ax25/af_ax25.c | 6 +- + net/ax25/ax25_std_timer.c | 8 +- + net/bluetooth/bnep/bnep.h | 4 - + net/bluetooth/bnep/core.c | 4 - + net/bluetooth/bnep/netdev.c | 4 - + net/bluetooth/bnep/sock.c | 4 - + net/bluetooth/rfcomm/core.c | 2 - + net/bluetooth/rfcomm/sock.c | 2 - + net/bluetooth/rfcomm/tty.c | 2 - + net/bridge/Kconfig | 1 + + net/bridge/br.c | 18 +- + net/bridge/br_device.c | 14 +- + net/bridge/br_fdb.c | 2 - + net/bridge/br_forward.c | 6 +- + net/bridge/br_if.c | 12 +- + net/bridge/br_input.c | 25 +- + net/bridge/br_ioctl.c | 2 - + net/bridge/br_notify.c | 2 - + net/bridge/br_private.h | 10 +- + net/bridge/br_private_stp.h | 2 - + net/bridge/br_stp.c | 2 - + net/bridge/br_stp_bpdu.c | 14 +- + net/bridge/br_stp_if.c | 6 +- + net/bridge/br_stp_timer.c | 2 - + net/bridge/netfilter/Kconfig | 11 +- + net/bridge/netfilter/Makefile | 1 + + net/bridge/netfilter/ebt_ip6.c | 144 + + net/bridge/netfilter/ebt_log.c | 66 +- + net/core/dev.c | 246 +- + net/core/dev_mcast.c | 24 +- + net/core/ethtool.c | 37 + + net/core/fib_rules.c | 2 +- + net/core/link_watch.c | 11 +- + net/core/net-sysfs.c | 26 +- + net/core/rtnetlink.c | 26 +- + net/core/skbuff.c | 166 +- + net/core/sock.c | 6 +- + net/core/sysctl_net_core.c | 39 +- + net/dccp/ccids/ccid3.c | 14 +- + net/dccp/ccids/lib/loss_interval.c | 10 +- + net/dccp/ccids/lib/packet_history.c | 103 +- + net/dccp/ccids/lib/packet_history.h | 30 +- + net/dccp/dccp.h | 17 +- + net/dccp/ipv4.c | 7 +- + net/dccp/ipv6.c | 4 +- + net/dccp/options.c | 14 +- + net/dccp/proto.c | 4 +- + net/decnet/af_decnet.c | 30 +- + net/decnet/dn_rules.c | 2 +- + net/econet/af_econet.c | 4 +- + net/ieee80211/ieee80211_rx.c | 2 +- + net/ieee80211/ieee80211_tx.c | 86 - + net/ieee80211/ieee80211_wx.c | 137 +- + net/ipv4/af_inet.c | 7 +- + net/ipv4/arp.c | 4 +- + net/ipv4/devinet.c | 35 +- + net/ipv4/fib_frontend.c | 19 +- + net/ipv4/fib_hash.c | 8 +- + net/ipv4/fib_rules.c | 4 +- + net/ipv4/fib_semantics.c | 2 - + net/ipv4/fib_trie.c | 8 +- + net/ipv4/icmp.c | 24 +- + net/ipv4/igmp.c | 2 - + net/ipv4/inet_connection_sock.c | 6 +- + net/ipv4/inet_diag.c | 2 - + net/ipv4/inet_hashtables.c | 19 +- + net/ipv4/inet_timewait_sock.c | 6 +- + net/ipv4/inetpeer.c | 2 - + net/ipv4/ip_forward.c | 5 +- + net/ipv4/ip_fragment.c | 36 +- + net/ipv4/ip_gre.c | 32 +- + net/ipv4/ip_input.c | 2 - + net/ipv4/ip_options.c | 2 - + net/ipv4/ip_output.c | 5 +- + net/ipv4/ip_sockglue.c | 2 - + net/ipv4/ipconfig.c | 2 - + net/ipv4/ipip.c | 24 +- + net/ipv4/ipmr.c | 119 +- + net/ipv4/ipvs/ip_vs_app.c | 2 - + net/ipv4/ipvs/ip_vs_conn.c | 2 - + net/ipv4/ipvs/ip_vs_core.c | 2 - + net/ipv4/ipvs/ip_vs_ctl.c | 2 - + net/ipv4/ipvs/ip_vs_dh.c | 2 - + net/ipv4/ipvs/ip_vs_est.c | 2 - + net/ipv4/ipvs/ip_vs_ftp.c | 2 - + net/ipv4/ipvs/ip_vs_lblc.c | 2 - + net/ipv4/ipvs/ip_vs_lblcr.c | 2 - + net/ipv4/ipvs/ip_vs_lc.c | 2 - + net/ipv4/ipvs/ip_vs_nq.c | 2 - + net/ipv4/ipvs/ip_vs_proto.c | 2 - + net/ipv4/ipvs/ip_vs_proto_ah.c | 2 - + net/ipv4/ipvs/ip_vs_proto_esp.c | 2 - + net/ipv4/ipvs/ip_vs_proto_tcp.c | 2 - + net/ipv4/ipvs/ip_vs_proto_udp.c | 2 - + net/ipv4/ipvs/ip_vs_rr.c | 2 - + net/ipv4/ipvs/ip_vs_sched.c | 2 - + net/ipv4/ipvs/ip_vs_sed.c | 2 - + net/ipv4/ipvs/ip_vs_sh.c | 2 - + net/ipv4/ipvs/ip_vs_sync.c | 2 - + net/ipv4/ipvs/ip_vs_wlc.c | 2 - + net/ipv4/ipvs/ip_vs_wrr.c | 2 - + net/ipv4/ipvs/ip_vs_xmit.c | 2 - + net/ipv4/netfilter/Kconfig | 15 +- + net/ipv4/netfilter/Makefile | 1 + + net/ipv4/netfilter/ip_queue.c | 3 - + net/ipv4/netfilter/iptable_security.c | 180 + + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 5 +- + net/ipv4/proc.c | 2 - + net/ipv4/protocol.c | 2 - + net/ipv4/raw.c | 10 +- + net/ipv4/route.c | 259 +- + net/ipv4/syncookies.c | 2 - + net/ipv4/sysctl_net_ipv4.c | 5 +- + net/ipv4/tcp.c | 72 +- + net/ipv4/tcp_diag.c | 2 - + net/ipv4/tcp_input.c | 88 +- + net/ipv4/tcp_ipv4.c | 177 +- + net/ipv4/tcp_minisocks.c | 2 - + net/ipv4/tcp_output.c | 12 +- + net/ipv4/tcp_timer.c | 17 +- + net/ipv4/udp.c | 67 +- + net/ipv4/udp_impl.h | 2 +- + net/ipv4/udplite.c | 2 - + net/ipv6/addrconf.c | 87 +- + net/ipv6/addrlabel.c | 106 +- + net/ipv6/af_inet6.c | 17 +- + net/ipv6/datagram.c | 2 - + net/ipv6/exthdrs.c | 2 - + net/ipv6/icmp.c | 5 +- + net/ipv6/inet6_hashtables.c | 9 +- + net/ipv6/ip6_fib.c | 2 - + net/ipv6/ip6_input.c | 5 +- + net/ipv6/ip6_output.c | 15 +- + net/ipv6/ip6_tunnel.c | 28 +- + net/ipv6/ip6mr.c | 79 +- + net/ipv6/ipv6_sockglue.c | 2 - + net/ipv6/mcast.c | 3 - + net/ipv6/netfilter/Kconfig | 12 + + net/ipv6/netfilter/Makefile | 1 + + net/ipv6/netfilter/ip6_queue.c | 3 - + net/ipv6/netfilter/ip6table_filter.c | 31 +- + net/ipv6/netfilter/ip6table_security.c | 172 + + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 5 +- + net/ipv6/proc.c | 2 - + net/ipv6/protocol.c | 2 - + net/ipv6/raw.c | 8 +- + net/ipv6/reassembly.c | 63 +- + net/ipv6/route.c | 24 +- + net/ipv6/sit.c | 26 +- + net/ipv6/sysctl_net_ipv6.c | 29 +- + net/ipv6/tcp_ipv6.c | 144 +- + net/ipv6/udp.c | 53 +- + net/ipv6/udp_impl.h | 2 +- + net/ipv6/udplite.c | 2 - + net/irda/irnet/irnet_ppp.c | 54 +- + net/irda/irnet/irnet_ppp.h | 7 +- + net/iucv/af_iucv.c | 1 + + net/iucv/iucv.c | 13 +- + net/key/af_key.c | 622 +- + net/llc/af_llc.c | 4 +- + net/mac80211/Kconfig | 174 +- + net/mac80211/Makefile | 20 +- + net/mac80211/aes_ccm.c | 53 +- + net/mac80211/aes_ccm.h | 6 +- + net/mac80211/cfg.c | 42 +- + net/mac80211/debugfs.c | 58 +- + net/mac80211/debugfs_key.c | 8 +- + net/mac80211/debugfs_netdev.c | 59 +- + net/mac80211/debugfs_netdev.h | 5 - + net/mac80211/debugfs_sta.c | 56 +- + net/mac80211/ieee80211_i.h | 182 +- + net/mac80211/iface.c | 396 +- + net/mac80211/key.c | 11 +- + net/mac80211/key.h | 54 +- + net/mac80211/main.c | 589 +- + net/mac80211/mesh.c | 38 +- + net/mac80211/mesh.h | 2 +- + net/mac80211/mesh_hwmp.c | 2 +- + net/mac80211/mesh_pathtbl.c | 54 +- + net/mac80211/mesh_plink.c | 88 +- + net/mac80211/michael.c | 116 +- + net/mac80211/michael.h | 8 +- + net/mac80211/mlme.c | 1035 +- + net/mac80211/rate.c | 12 +- + net/mac80211/rate.h | 37 +- + net/mac80211/rc80211_pid.h | 4 +- + net/mac80211/rc80211_pid_algo.c | 40 +- + net/mac80211/rc80211_pid_debugfs.c | 8 +- + net/mac80211/rx.c | 683 +- + net/mac80211/sta_info.c | 55 +- + net/mac80211/sta_info.h | 168 +- + net/mac80211/tkip.c | 282 +- + net/mac80211/tkip.h | 8 +- + net/mac80211/tx.c | 1167 +- + net/mac80211/util.c | 144 +- + net/mac80211/wep.c | 71 +- + net/mac80211/wep.h | 2 +- + net/mac80211/wext.c | 145 +- + net/mac80211/wme.c | 223 +- + net/mac80211/wme.h | 10 +- + net/mac80211/wpa.c | 403 +- + net/netfilter/Kconfig | 5 +- + net/netfilter/nf_conntrack_core.c | 29 +- + net/netfilter/nf_conntrack_extend.c | 10 +- + net/netfilter/nf_conntrack_netlink.c | 32 +- + net/netfilter/nf_conntrack_proto_dccp.c | 3 +- + net/netfilter/nf_conntrack_proto_sctp.c | 80 + + net/netfilter/nf_conntrack_proto_tcp.c | 11 +- + net/netfilter/nfnetlink_queue.c | 1 - + net/netfilter/xt_CONNSECMARK.c | 10 +- + net/netfilter/xt_SECMARK.c | 10 +- + net/netfilter/xt_string.c | 38 +- + net/netlabel/netlabel_cipso_v4.c | 2 +- + net/netlink/af_netlink.c | 4 +- + net/netrom/af_netrom.c | 20 +- + net/packet/af_packet.c | 197 +- + net/rfkill/rfkill-input.c | 98 +- + net/rfkill/rfkill-input.h | 1 + + net/rfkill/rfkill.c | 314 +- + net/rose/af_rose.c | 22 +- + net/rose/rose_route.c | 29 +- + net/rxrpc/ar-input.c | 5 +- + net/sched/cls_api.c | 9 +- + net/sched/cls_flow.c | 52 +- + net/sched/cls_route.c | 4 +- + net/sched/sch_api.c | 183 +- + net/sched/sch_atm.c | 6 +- + net/sched/sch_cbq.c | 135 +- + net/sched/sch_dsmark.c | 6 +- + net/sched/sch_fifo.c | 47 +- + net/sched/sch_generic.c | 210 +- + net/sched/sch_gred.c | 2 +- + net/sched/sch_hfsc.c | 94 +- + net/sched/sch_htb.c | 181 +- + net/sched/sch_netem.c | 35 +- + net/sched/sch_prio.c | 16 +- + net/sched/sch_red.c | 33 +- + net/sched/sch_sfq.c | 4 +- + net/sched/sch_tbf.c | 33 +- + net/sched/sch_teql.c | 28 +- + net/sctp/associola.c | 3 + + net/sctp/input.c | 32 +- + net/sctp/output.c | 7 +- + net/sctp/outqueue.c | 34 +- + net/sctp/proc.c | 141 + + net/sctp/protocol.c | 5 + + net/sctp/sm_sideeffect.c | 44 +- + net/sctp/sm_statefuns.c | 16 +- + net/sctp/socket.c | 321 +- + net/socket.c | 10 + + net/sunrpc/auth_gss/auth_gss.c | 2 - + net/sysctl_net.c | 31 +- + net/tipc/bcast.c | 14 +- + net/tipc/bearer.c | 8 +- + net/tipc/cluster.c | 4 +- + 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 | 14 +- + net/tipc/discover.h | 2 +- + net/tipc/eth_media.c | 6 +- + net/tipc/link.c | 98 +- + net/tipc/msg.c | 13 +- + net/tipc/msg.h | 42 +- + net/tipc/name_distr.c | 6 +- + net/tipc/name_table.c | 55 +- + net/tipc/net.c | 14 +- + net/tipc/net.h | 2 +- + net/tipc/netlink.c | 16 +- + net/tipc/node.c | 55 +- + net/tipc/port.c | 115 +- + net/tipc/ref.c | 14 +- + net/tipc/socket.c | 62 +- + net/tipc/subscr.c | 249 +- + net/tipc/subscr.h | 34 +- + net/tipc/user_reg.c | 14 +- + net/unix/af_unix.c | 2 - + net/wanrouter/Kconfig | 2 - + net/wanrouter/wanmain.c | 6 +- + net/wanrouter/wanproc.c | 2 +- + net/wireless/Kconfig | 11 + + net/wireless/core.c | 33 +- + net/wireless/nl80211.c | 6 +- + net/wireless/radiotap.c | 16 +- + net/wireless/wext.c | 582 +- + net/x25/af_x25.c | 9 +- + 818 files changed, 86759 insertions(+), 67724 deletions(-) + create mode 100644 Documentation/networking/dm9000.txt + create mode 100644 Documentation/networking/mac80211_hwsim/README + create mode 100644 Documentation/networking/mac80211_hwsim/hostapd.conf + create mode 100644 Documentation/networking/mac80211_hwsim/wpa_supplicant.conf + delete mode 100644 drivers/atm/fore200e_firmware_copyright + delete mode 100644 drivers/atm/fore200e_mkfirm.c + delete mode 100644 drivers/atm/pca200e.data + delete mode 100644 drivers/atm/pca200e_ecd.data + delete mode 100644 drivers/atm/sba200e_ecd.data + create mode 100644 drivers/net/8390p.c + delete mode 100644 drivers/net/bnx2x.c + create mode 100644 drivers/net/bnx2x_link.c + create mode 100644 drivers/net/bnx2x_link.h + create mode 100644 drivers/net/bnx2x_main.c + delete mode 100644 drivers/net/ibm_emac/Kconfig + delete mode 100644 drivers/net/ibm_emac/Makefile + delete mode 100644 drivers/net/ibm_emac/ibm_emac.h + delete mode 100644 drivers/net/ibm_emac/ibm_emac_core.c + delete mode 100644 drivers/net/ibm_emac/ibm_emac_core.h + delete mode 100644 drivers/net/ibm_emac/ibm_emac_debug.c + delete mode 100644 drivers/net/ibm_emac/ibm_emac_debug.h + delete mode 100644 drivers/net/ibm_emac/ibm_emac_mal.c + delete mode 100644 drivers/net/ibm_emac/ibm_emac_mal.h + delete mode 100644 drivers/net/ibm_emac/ibm_emac_phy.c + delete mode 100644 drivers/net/ibm_emac/ibm_emac_phy.h + delete mode 100644 drivers/net/ibm_emac/ibm_emac_rgmii.c + delete mode 100644 drivers/net/ibm_emac/ibm_emac_rgmii.h + delete mode 100644 drivers/net/ibm_emac/ibm_emac_tah.c + delete mode 100644 drivers/net/ibm_emac/ibm_emac_tah.h + delete mode 100644 drivers/net/ibm_emac/ibm_emac_zmii.c + delete mode 100644 drivers/net/ibm_emac/ibm_emac_zmii.h + create mode 100644 drivers/net/phy/mdio-ofgpio.c + delete mode 100644 drivers/net/saa9730.c + delete mode 100644 drivers/net/saa9730.h + delete mode 100644 drivers/net/sfc/i2c-direct.c + delete mode 100644 drivers/net/sfc/i2c-direct.h + create mode 100644 drivers/net/sh_eth.c + create mode 100644 drivers/net/sh_eth.h + create mode 100644 drivers/net/usb/hso.c + 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} (89%) + rename drivers/net/wireless/iwlwifi/{iwl-4965.h => iwl-dev.h} (66%) + 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-scan.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-tx.c + create mode 100644 drivers/net/wireless/libertas/persistcfg.c + create mode 100644 drivers/net/wireless/mac80211_hwsim.c + delete mode 100644 drivers/net/wireless/strip.c + create mode 100644 include/linux/brcmphy.h + create mode 100644 include/linux/netfilter_bridge/ebt_ip6.h + create mode 100644 include/linux/smc911x.h + create mode 100644 include/net/garp.h + create mode 100644 include/net/netns/hash.h + create mode 100644 include/net/stp.h + create mode 100644 net/802/Kconfig + create mode 100644 net/802/garp.c + create mode 100644 net/802/stp.c + create mode 100644 net/8021q/vlan_core.c + create mode 100644 net/8021q/vlan_gvrp.c + create mode 100644 net/bridge/netfilter/ebt_ip6.c + create mode 100644 net/ipv4/netfilter/iptable_security.c + create mode 100644 net/ipv6/netfilter/ip6table_security.c +Merging sparc/master +$ git merge sparc/master +Auto-merged arch/sparc/kernel/apc.c +Auto-merged arch/sparc64/Kconfig +Auto-merged drivers/sbus/char/uctrl.c +Auto-merged drivers/sbus/char/vfc_dev.c +Auto-merged include/asm-sparc/ide.h +CONFLICT (content): Merge conflict in include/asm-sparc/ide.h +Auto-merged include/asm-sparc/smp.h +CONFLICT (content): Merge conflict in include/asm-sparc/smp.h +Auto-merged include/asm-sparc64/ide.h +CONFLICT (content): Merge conflict in include/asm-sparc64/ide.h +Auto-merged include/asm-sparc64/mmu.h +CONFLICT (content): Merge conflict in include/asm-sparc64/mmu.h +Auto-merged include/asm-sparc64/page.h +CONFLICT (content): Merge conflict in include/asm-sparc64/page.h +Auto-merged include/asm-sparc64/pgtable.h +CONFLICT (content): Merge conflict in include/asm-sparc64/pgtable.h +Resolved 'include/asm-sparc/ide.h' using previous resolution. +Resolved 'include/asm-sparc/smp.h' using previous resolution. +Resolved 'include/asm-sparc64/ide.h' using previous resolution. +Resolved 'include/asm-sparc64/mmu.h' using previous resolution. +Resolved 'include/asm-sparc64/page.h' using previous resolution. +Resolved 'include/asm-sparc64/pgtable.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 6767d95: Merge commit 'sparc/master' +$ git diff -M --stat --summary HEAD^.. + arch/sparc/kernel/apc.c | 42 +- + arch/sparc/kernel/ebus.c | 9 +- + arch/sparc/kernel/entry.S | 5 +- + arch/sparc/kernel/etrap.S | 1 - + arch/sparc/kernel/head.S | 2 - + arch/sparc/kernel/idprom.c | 2 +- + arch/sparc/kernel/ioport.c | 13 +- + arch/sparc/kernel/irq.c | 2 +- + arch/sparc/kernel/process.c | 3 +- + arch/sparc/kernel/rtrap.S | 2 - + arch/sparc/kernel/setup.c | 4 +- + arch/sparc/kernel/smp.c | 7 - + arch/sparc/kernel/sun4c_irq.c | 3 +- + arch/sparc/kernel/sun4d_irq.c | 7 +- + arch/sparc/kernel/sun4m_irq.c | 7 +- + arch/sparc/kernel/sun4m_smp.c | 9 +- + arch/sparc/kernel/time.c | 4 +- + arch/sparc/kernel/traps.c | 9 +- + arch/sparc/kernel/wof.S | 1 - + arch/sparc/kernel/wuf.S | 1 - + arch/sparc/mm/fault.c | 2 +- + arch/sparc/mm/init.c | 9 +- + arch/sparc/mm/srmmu.c | 38 +- + arch/sparc/mm/tsunami.S | 1 - + arch/sparc64/Kconfig | 8 +- + arch/sparc64/Makefile | 4 +- + arch/sparc64/kernel/central.c | 14 +- + arch/sparc64/kernel/ds.c | 2 +- + arch/sparc64/kernel/pci_msi.c | 10 +- + arch/sparc64/kernel/pci_sun4v.c | 2 +- + arch/sparc64/kernel/sys_sparc.c | 6 +- + arch/sparc64/kernel/sys_sparc32.c | 7 +- + drivers/sbus/char/uctrl.c | 16 +- + drivers/sbus/char/vfc.h | 4 - + drivers/sbus/char/vfc_dev.c | 39 +- + drivers/sbus/char/vfc_i2c.c | 12 +- + drivers/sbus/dvma.c | 2 +- + include/asm-sparc/Kbuild | 15 +- + include/asm-sparc/agp.h | 20 + + include/asm-sparc/apb.h | 36 + + include/asm-sparc/asi.h | 153 ++- + include/asm-sparc/atomic.h | 169 +-- + include/asm-sparc/atomic_32.h | 165 ++ + include/asm-sparc/atomic_64.h | 128 ++ + include/asm-sparc/auxio.h | 97 +- + include/asm-sparc/auxio_32.h | 89 + + include/asm-sparc/auxio_64.h | 100 ++ + include/asm-sparc/backoff.h | 31 + + include/asm-sparc/bbc.h | 225 +++ + include/asm-sparc/bitops.h | 117 +-- + include/asm-sparc/bitops_32.h | 111 ++ + include/asm-sparc/bitops_64.h | 107 ++ + include/asm-sparc/cacheflush.h | 93 +- + include/asm-sparc/cacheflush_32.h | 85 + + include/asm-sparc/cacheflush_64.h | 76 + + include/asm-sparc/chafsr.h | 241 +++ + include/asm-sparc/checksum.h | 249 +--- + include/asm-sparc/checksum_32.h | 241 +++ + include/asm-sparc/checksum_64.h | 167 ++ + include/asm-sparc/chmctrl.h | 183 +++ + include/asm-sparc/cmt.h | 59 + + include/asm-sparc/compat.h | 243 +++ + include/asm-sparc/compat_signal.h | 29 + + include/asm-sparc/cpudata.h | 35 +- + include/asm-sparc/cpudata_32.h | 27 + + include/asm-sparc/cpudata_64.h | 240 +++ + include/asm-sparc/dcr.h | 14 + + include/asm-sparc/dcu.h | 27 + + include/asm-sparc/delay.h | 42 +- + include/asm-sparc/delay_32.h | 34 + + include/asm-sparc/delay_64.h | 17 + + include/asm-sparc/display7seg.h | 79 + + include/asm-sparc/dma-mapping.h | 17 +- + include/asm-sparc/dma-mapping_32.h | 11 + + include/asm-sparc/dma-mapping_64.h | 154 ++ + include/asm-sparc/dma.h | 290 +---- + include/asm-sparc/dma_32.h | 288 ++++ + include/asm-sparc/dma_64.h | 205 +++ + include/asm-sparc/ebus.h | 105 +-- + include/asm-sparc/ebus_32.h | 99 ++ + include/asm-sparc/ebus_64.h | 94 ++ + include/asm-sparc/elf.h | 149 +-- + include/asm-sparc/elf_32.h | 145 ++ + include/asm-sparc/elf_64.h | 217 +++ + include/asm-sparc/envctrl.h | 103 ++ + include/asm-sparc/estate.h | 49 + + include/asm-sparc/fbio.h | 37 +- + include/asm-sparc/fcntl.h | 4 + + include/asm-sparc/fhc.h | 121 ++ + include/asm-sparc/floppy.h | 394 +----- + include/asm-sparc/floppy_32.h | 388 +++++ + include/asm-sparc/floppy_64.h | 782 +++++++++ + include/asm-sparc/fpumacro.h | 33 + + include/asm-sparc/futex.h | 12 +- + include/asm-sparc/futex_32.h | 6 + + include/asm-sparc/futex_64.h | 110 ++ + include/asm-sparc/hardirq.h | 31 +- + include/asm-sparc/hardirq_32.h | 23 + + include/asm-sparc/hardirq_64.h | 19 + + include/asm-sparc/head.h | 106 +-- + include/asm-sparc/head_32.h | 102 ++ + include/asm-sparc/head_64.h | 76 + + include/asm-sparc/hugetlb.h | 84 + + include/asm-sparc/hvtramp.h | 37 + + include/asm-sparc/hypervisor.h | 2945 +++++++++++++++++++++++++++++++++ + include/asm-sparc/ide.h | 100 +-- + include/asm-sparc/ide_32.h | 95 ++ + include/asm-sparc/ide_64.h | 118 ++ + include/asm-sparc/idprom.h | 2 +- + include/asm-sparc/intr_queue.h | 15 + + include/asm-sparc/io.h | 331 +---- + include/asm-sparc/io_32.h | 325 ++++ + include/asm-sparc/io_64.h | 511 ++++++ + include/asm-sparc/ioctls.h | 4 +- + include/asm-sparc/iommu.h | 129 +-- + include/asm-sparc/iommu_32.h | 121 ++ + include/asm-sparc/iommu_64.h | 62 + + include/asm-sparc/ipcbuf.h | 39 +- + include/asm-sparc/ipcbuf_32.h | 31 + + include/asm-sparc/ipcbuf_64.h | 28 + + include/asm-sparc/irq.h | 21 +- + include/asm-sparc/irq_32.h | 15 + + include/asm-sparc/irq_64.h | 93 ++ + include/asm-sparc/irqflags.h | 47 +- + include/asm-sparc/irqflags_32.h | 39 + + include/asm-sparc/irqflags_64.h | 89 + + include/asm-sparc/kdebug.h | 81 +- + include/asm-sparc/kdebug_32.h | 73 + + include/asm-sparc/kdebug_64.h | 19 + + include/asm-sparc/kmap_types.h | 4 + + include/asm-sparc/kprobes.h | 49 + + include/asm-sparc/ldc.h | 138 ++ + include/asm-sparc/lmb.h | 10 + + include/asm-sparc/lsu.h | 19 + + include/asm-sparc/machines.h | 2 - + include/asm-sparc/mbus.h | 2 - + include/asm-sparc/mc146818rtc.h | 35 +- + include/asm-sparc/mc146818rtc_32.h | 29 + + include/asm-sparc/mc146818rtc_64.h | 34 + + include/asm-sparc/mdesc.h | 78 + + include/asm-sparc/mmu.h | 13 +- + include/asm-sparc/mmu_32.h | 7 + + include/asm-sparc/mmu_64.h | 127 ++ + include/asm-sparc/mmu_context.h | 50 +- + include/asm-sparc/mmu_context_32.h | 42 + + include/asm-sparc/mmu_context_64.h | 155 ++ + include/asm-sparc/mmzone.h | 17 + + include/asm-sparc/module.h | 15 +- + include/asm-sparc/module_32.h | 7 + + include/asm-sparc/module_64.h | 7 + + include/asm-sparc/mostek.h | 175 +-- + include/asm-sparc/mostek_32.h | 171 ++ + include/asm-sparc/mostek_64.h | 143 ++ + include/asm-sparc/msgbuf.h | 23 +- + include/asm-sparc/namei.h | 21 +- + include/asm-sparc/namei_32.h | 13 + + include/asm-sparc/namei_64.h | 13 + + include/asm-sparc/ns87303.h | 118 ++ + include/asm-sparc/of_platform.h | 32 +- + include/asm-sparc/of_platform_32.h | 24 + + include/asm-sparc/of_platform_64.h | 25 + + include/asm-sparc/openprom.h | 265 +--- + include/asm-sparc/openprom_32.h | 255 +++ + include/asm-sparc/openprom_64.h | 280 ++++ + include/asm-sparc/oplib.h | 279 +---- + include/asm-sparc/oplib_32.h | 272 ++++ + include/asm-sparc/oplib_64.h | 322 ++++ + include/asm-sparc/page.h | 167 +-- + include/asm-sparc/page_32.h | 163 ++ + include/asm-sparc/page_64.h | 142 ++ + include/asm-sparc/parport.h | 246 +++ + include/asm-sparc/pci.h | 176 +-- + include/asm-sparc/pci_32.h | 170 ++ + include/asm-sparc/pci_64.h | 209 +++ + include/asm-sparc/percpu.h | 14 +- + include/asm-sparc/percpu_32.h | 6 + + include/asm-sparc/percpu_64.h | 28 + + include/asm-sparc/pgalloc.h | 76 +- + include/asm-sparc/pgalloc_32.h | 68 + + include/asm-sparc/pgalloc_64.h | 81 + + include/asm-sparc/pgtable.h | 477 +------ + include/asm-sparc/pgtable_32.h | 480 ++++++ + include/asm-sparc/pgtable_64.h | 781 +++++++++ + include/asm-sparc/pil.h | 21 + + include/asm-sparc/posix_types.h | 124 +-- + include/asm-sparc/posix_types_32.h | 118 ++ + include/asm-sparc/posix_types_64.h | 122 ++ + include/asm-sparc/processor.h | 132 +-- + include/asm-sparc/processor_32.h | 128 ++ + include/asm-sparc/processor_64.h | 237 +++ + include/asm-sparc/psrcompat.h | 45 + + include/asm-sparc/pstate.h | 91 ++ + include/asm-sparc/ptrace.h | 179 +-- + include/asm-sparc/ptrace_32.h | 175 ++ + include/asm-sparc/ptrace_64.h | 346 ++++ + include/asm-sparc/reboot.h | 6 + + include/asm-sparc/reg.h | 87 +- + include/asm-sparc/reg_32.h | 79 + + include/asm-sparc/reg_64.h | 56 + + include/asm-sparc/resource.h | 6 +- + include/asm-sparc/rwsem-const.h | 12 + + include/asm-sparc/rwsem.h | 84 + + include/asm-sparc/sbus.h | 161 +-- + include/asm-sparc/sbus_32.h | 153 ++ + include/asm-sparc/sbus_64.h | 190 +++ + include/asm-sparc/scatterlist.h | 32 +- + include/asm-sparc/scatterlist_32.h | 26 + + include/asm-sparc/scatterlist_64.h | 27 + + include/asm-sparc/scratchpad.h | 14 + + include/asm-sparc/seccomp.h | 21 + + include/asm-sparc/sections.h | 12 +- + include/asm-sparc/sections_32.h | 6 + + include/asm-sparc/sections_64.h | 9 + + include/asm-sparc/sembuf.h | 12 +- + include/asm-sparc/setup.h | 6 +- + include/asm-sparc/sfafsr.h | 82 + + include/asm-sparc/sfp-machine.h | 214 +--- + include/asm-sparc/sfp-machine_32.h | 212 +++ + include/asm-sparc/sfp-machine_64.h | 93 ++ + include/asm-sparc/shmbuf.h | 14 +- + include/asm-sparc/shmparam.h | 19 +- + include/asm-sparc/shmparam_32.h | 11 + + include/asm-sparc/shmparam_64.h | 10 + + include/asm-sparc/sigcontext.h | 70 +- + include/asm-sparc/sigcontext_32.h | 62 + + include/asm-sparc/sigcontext_64.h | 87 + + include/asm-sparc/siginfo.h | 25 +- + include/asm-sparc/siginfo_32.h | 17 + + include/asm-sparc/siginfo_64.h | 32 + + include/asm-sparc/signal.h | 209 +--- + include/asm-sparc/signal_32.h | 207 +++ + include/asm-sparc/signal_64.h | 194 +++ + include/asm-sparc/smp.h | 177 +-- + include/asm-sparc/smp_32.h | 173 ++ + include/asm-sparc/smp_64.h | 64 + + include/asm-sparc/sparsemem.h | 12 + + include/asm-sparc/spinlock.h | 200 +--- + include/asm-sparc/spinlock_32.h | 192 +++ + include/asm-sparc/spinlock_64.h | 250 +++ + include/asm-sparc/spinlock_types.h | 2 +- + include/asm-sparc/spitfire.h | 342 ++++ + include/asm-sparc/sstate.h | 13 + + include/asm-sparc/stacktrace.h | 6 + + include/asm-sparc/starfire.h | 21 + + include/asm-sparc/stat.h | 82 +- + include/asm-sparc/stat_32.h | 76 + + include/asm-sparc/stat_64.h | 47 + + include/asm-sparc/statfs.h | 12 +- + include/asm-sparc/statfs_32.h | 6 + + include/asm-sparc/statfs_64.h | 54 + + include/asm-sparc/string.h | 213 +--- + include/asm-sparc/string_32.h | 205 +++ + include/asm-sparc/string_64.h | 83 + + include/asm-sparc/syscalls.h | 13 + + include/asm-sparc/system.h | 290 +---- + include/asm-sparc/system_32.h | 288 ++++ + include/asm-sparc/system_64.h | 355 ++++ + include/asm-sparc/termbits.h | 5 + + include/asm-sparc/termios.h | 79 +- + include/asm-sparc/thread_info.h | 157 +-- + include/asm-sparc/thread_info_32.h | 151 ++ + include/asm-sparc/thread_info_64.h | 277 ++++ + include/asm-sparc/timer.h | 113 +-- + include/asm-sparc/timer_32.h | 107 ++ + include/asm-sparc/timer_64.h | 30 + + include/asm-sparc/timex.h | 21 +- + include/asm-sparc/timex_32.h | 15 + + include/asm-sparc/timex_64.h | 19 + + include/asm-sparc/tlb.h | 32 +- + include/asm-sparc/tlb_32.h | 24 + + include/asm-sparc/tlb_64.h | 111 ++ + include/asm-sparc/tlbflush.h | 68 +- + include/asm-sparc/tlbflush_32.h | 60 + + include/asm-sparc/tlbflush_64.h | 44 + + include/asm-sparc/topology.h | 14 +- + include/asm-sparc/topology_32.h | 6 + + include/asm-sparc/topology_64.h | 86 + + include/asm-sparc/tsb.h | 283 ++++ + include/asm-sparc/ttable.h | 658 ++++++++ + include/asm-sparc/types.h | 32 +- + include/asm-sparc/uaccess.h | 342 +---- + include/asm-sparc/uaccess_32.h | 336 ++++ + include/asm-sparc/uaccess_64.h | 273 ++++ + include/asm-sparc/uctx.h | 71 + + include/asm-sparc/unistd.h | 386 +----- + include/asm-sparc/unistd_32.h | 378 +++++ + include/asm-sparc/unistd_64.h | 373 +++++ + include/asm-sparc/upa.h | 109 ++ + include/asm-sparc/utrap.h | 51 + + include/asm-sparc/vaddrs.h | 5 - + include/asm-sparc/vio.h | 406 +++++ + include/asm-sparc/visasm.h | 62 + + include/asm-sparc/watchdog.h | 31 + + include/asm-sparc/xor.h | 277 +---- + include/asm-sparc/xor_32.h | 269 ++++ + include/asm-sparc/xor_64.h | 70 + + include/asm-sparc64/Kbuild | 24 +- + include/asm-sparc64/agp.h | 21 +- + include/asm-sparc64/apb.h | 37 +- + include/asm-sparc64/asi.h | 161 +-- + include/asm-sparc64/atomic.h | 129 +-- + include/asm-sparc64/auxio.h | 101 +-- + include/asm-sparc64/backoff.h | 32 +- + include/asm-sparc64/bbc.h | 226 +--- + include/asm-sparc64/bitops.h | 108 +-- + include/asm-sparc64/cacheflush.h | 77 +- + include/asm-sparc64/chafsr.h | 242 +--- + include/asm-sparc64/checksum.h | 168 +-- + include/asm-sparc64/chmctrl.h | 184 +--- + include/asm-sparc64/cmt.h | 60 +- + include/asm-sparc64/compat.h | 244 +--- + include/asm-sparc64/compat_signal.h | 30 +- + include/asm-sparc64/cpudata.h | 241 +--- + include/asm-sparc64/dcr.h | 15 +- + include/asm-sparc64/dcu.h | 28 +- + include/asm-sparc64/delay.h | 18 +- + include/asm-sparc64/display7seg.h | 80 +- + include/asm-sparc64/dma-mapping.h | 155 +-- + include/asm-sparc64/dma.h | 206 +--- + include/asm-sparc64/ebus.h | 95 +-- + include/asm-sparc64/elf.h | 218 +--- + include/asm-sparc64/envctrl.h | 104 +-- + include/asm-sparc64/estate.h | 50 +- + include/asm-sparc64/fbio.h | 331 +---- + include/asm-sparc64/fcntl.h | 36 +- + include/asm-sparc64/fhc.h | 132 +-- + include/asm-sparc64/floppy.h | 783 +--------- + include/asm-sparc64/fpumacro.h | 34 +- + include/asm-sparc64/futex.h | 111 +-- + include/asm-sparc64/hardirq.h | 20 +- + include/asm-sparc64/head.h | 77 +- + include/asm-sparc64/hugetlb.h | 85 +- + include/asm-sparc64/hvtramp.h | 38 +- + include/asm-sparc64/hw_irq.h | 5 +- + include/asm-sparc64/hypervisor.h | 2946 +--------------------------------- + include/asm-sparc64/ide.h | 111 +-- + include/asm-sparc64/idprom.h | 26 +- + include/asm-sparc64/intr_queue.h | 16 +- + include/asm-sparc64/io.h | 512 +------ + include/asm-sparc64/ioctl.h | 68 +- + include/asm-sparc64/ioctls.h | 137 +-- + include/asm-sparc64/iommu.h | 63 +- + include/asm-sparc64/ipcbuf.h | 29 +- + include/asm-sparc64/irq.h | 94 +-- + include/asm-sparc64/irq_regs.h | 2 +- + include/asm-sparc64/irqflags.h | 90 +- + include/asm-sparc64/kdebug.h | 20 +- + include/asm-sparc64/kmap_types.h | 26 +- + include/asm-sparc64/kprobes.h | 50 +- + include/asm-sparc64/kvm.h | 7 +- + include/asm-sparc64/ldc.h | 139 +-- + include/asm-sparc64/linkage.h | 7 +- + include/asm-sparc64/lmb.h | 11 +- + include/asm-sparc64/lsu.h | 20 +- + include/asm-sparc64/mc146818rtc.h | 35 +- + include/asm-sparc64/mdesc.h | 79 +- + include/asm-sparc64/mman.h | 32 +- + include/asm-sparc64/mmu.h | 124 +-- + include/asm-sparc64/mmu_context.h | 156 +-- + include/asm-sparc64/mmzone.h | 18 +- + include/asm-sparc64/module.h | 8 +- + include/asm-sparc64/mostek.h | 144 +-- + include/asm-sparc64/msgbuf.h | 28 +- + include/asm-sparc64/mutex.h | 10 +- + include/asm-sparc64/namei.h | 14 +- + include/asm-sparc64/ns87303.h | 119 +-- + include/asm-sparc64/of_platform.h | 26 +- + include/asm-sparc64/openprom.h | 281 +---- + include/asm-sparc64/openpromio.h | 70 +- + include/asm-sparc64/oplib.h | 323 +---- + include/asm-sparc64/page.h | 139 +-- + include/asm-sparc64/param.h | 24 +- + include/asm-sparc64/parport.h | 247 +--- + include/asm-sparc64/pci.h | 210 +--- + include/asm-sparc64/percpu.h | 29 +- + include/asm-sparc64/perfctr.h | 174 +-- + include/asm-sparc64/pgalloc.h | 82 +- + include/asm-sparc64/pgtable.h | 776 +--------- + include/asm-sparc64/pil.h | 22 +- + include/asm-sparc64/poll.h | 13 +- + include/asm-sparc64/posix_types.h | 123 +-- + include/asm-sparc64/processor.h | 238 +--- + include/asm-sparc64/psrcompat.h | 46 +- + include/asm-sparc64/pstate.h | 92 +-- + include/asm-sparc64/ptrace.h | 347 +---- + include/asm-sparc64/reboot.h | 7 +- + include/asm-sparc64/reg.h | 57 +- + include/asm-sparc64/resource.h | 20 +- + include/asm-sparc64/rtc.h | 27 +- + include/asm-sparc64/rwsem-const.h | 13 +- + include/asm-sparc64/rwsem.h | 85 +- + include/asm-sparc64/sbus.h | 191 +--- + include/asm-sparc64/scatterlist.h | 28 +- + include/asm-sparc64/scratchpad.h | 15 +- + include/asm-sparc64/seccomp.h | 22 +- + include/asm-sparc64/sections.h | 10 +- + include/asm-sparc64/semaphore.h | 2 +- + include/asm-sparc64/sembuf.h | 23 +- + include/asm-sparc64/setup.h | 11 +- + include/asm-sparc64/sfafsr.h | 83 +- + include/asm-sparc64/sfp-machine.h | 94 +-- + include/asm-sparc64/shmbuf.h | 39 +- + include/asm-sparc64/shmparam.h | 11 +- + include/asm-sparc64/sigcontext.h | 88 +- + include/asm-sparc64/siginfo.h | 33 +- + include/asm-sparc64/signal.h | 195 +--- + include/asm-sparc64/smp.h | 65 +- + include/asm-sparc64/socket.h | 58 +- + include/asm-sparc64/sockios.h | 15 +- + include/asm-sparc64/sparsemem.h | 13 +- + include/asm-sparc64/spinlock.h | 251 +--- + include/asm-sparc64/spinlock_types.h | 21 +- + include/asm-sparc64/spitfire.h | 343 +---- + include/asm-sparc64/sstate.h | 14 +- + include/asm-sparc64/stacktrace.h | 7 +- + include/asm-sparc64/starfire.h | 22 +- + include/asm-sparc64/stat.h | 48 +- + include/asm-sparc64/statfs.h | 55 +- + include/asm-sparc64/string.h | 84 +- + include/asm-sparc64/sunbpp.h | 81 +- + include/asm-sparc64/syscalls.h | 14 +- + include/asm-sparc64/system.h | 356 +---- + include/asm-sparc64/termbits.h | 261 +--- + include/asm-sparc64/termios.h | 187 +--- + include/asm-sparc64/thread_info.h | 278 +---- + include/asm-sparc64/timer.h | 31 +- + include/asm-sparc64/timex.h | 20 +- + include/asm-sparc64/tlb.h | 112 +-- + include/asm-sparc64/tlbflush.h | 45 +- + include/asm-sparc64/topology.h | 87 +- + include/asm-sparc64/tsb.h | 284 +---- + include/asm-sparc64/ttable.h | 659 +-------- + include/asm-sparc64/types.h | 35 +- + include/asm-sparc64/uaccess.h | 274 +---- + include/asm-sparc64/uctx.h | 72 +- + include/asm-sparc64/unaligned.h | 11 +- + include/asm-sparc64/unistd.h | 374 +----- + include/asm-sparc64/upa.h | 110 +-- + include/asm-sparc64/utrap.h | 52 +- + include/asm-sparc64/vga.h | 34 +- + include/asm-sparc64/vio.h | 407 +----- + include/asm-sparc64/visasm.h | 63 +- + include/asm-sparc64/watchdog.h | 32 +- + include/asm-sparc64/xor.h | 71 +- + 444 files changed, 25775 insertions(+), 26848 deletions(-) + create mode 100644 include/asm-sparc/agp.h + create mode 100644 include/asm-sparc/apb.h + create mode 100644 include/asm-sparc/atomic_32.h + create mode 100644 include/asm-sparc/atomic_64.h + create mode 100644 include/asm-sparc/auxio_32.h + create mode 100644 include/asm-sparc/auxio_64.h + create mode 100644 include/asm-sparc/backoff.h + create mode 100644 include/asm-sparc/bbc.h + create mode 100644 include/asm-sparc/bitops_32.h + create mode 100644 include/asm-sparc/bitops_64.h + create mode 100644 include/asm-sparc/cacheflush_32.h + create mode 100644 include/asm-sparc/cacheflush_64.h + create mode 100644 include/asm-sparc/chafsr.h + create mode 100644 include/asm-sparc/checksum_32.h + create mode 100644 include/asm-sparc/checksum_64.h + create mode 100644 include/asm-sparc/chmctrl.h + create mode 100644 include/asm-sparc/cmt.h + create mode 100644 include/asm-sparc/compat.h + create mode 100644 include/asm-sparc/compat_signal.h + create mode 100644 include/asm-sparc/cpudata_32.h + create mode 100644 include/asm-sparc/cpudata_64.h + create mode 100644 include/asm-sparc/dcr.h + create mode 100644 include/asm-sparc/dcu.h + create mode 100644 include/asm-sparc/delay_32.h + create mode 100644 include/asm-sparc/delay_64.h + create mode 100644 include/asm-sparc/display7seg.h + create mode 100644 include/asm-sparc/dma-mapping_32.h + create mode 100644 include/asm-sparc/dma-mapping_64.h + create mode 100644 include/asm-sparc/dma_32.h + create mode 100644 include/asm-sparc/dma_64.h + create mode 100644 include/asm-sparc/ebus_32.h + create mode 100644 include/asm-sparc/ebus_64.h + create mode 100644 include/asm-sparc/elf_32.h + create mode 100644 include/asm-sparc/elf_64.h + create mode 100644 include/asm-sparc/envctrl.h + create mode 100644 include/asm-sparc/estate.h + create mode 100644 include/asm-sparc/fhc.h + create mode 100644 include/asm-sparc/floppy_32.h + create mode 100644 include/asm-sparc/floppy_64.h + create mode 100644 include/asm-sparc/fpumacro.h + create mode 100644 include/asm-sparc/futex_32.h + create mode 100644 include/asm-sparc/futex_64.h + create mode 100644 include/asm-sparc/hardirq_32.h + create mode 100644 include/asm-sparc/hardirq_64.h + create mode 100644 include/asm-sparc/head_32.h + create mode 100644 include/asm-sparc/head_64.h + create mode 100644 include/asm-sparc/hugetlb.h + create mode 100644 include/asm-sparc/hvtramp.h + create mode 100644 include/asm-sparc/hypervisor.h + create mode 100644 include/asm-sparc/ide_32.h + create mode 100644 include/asm-sparc/ide_64.h + create mode 100644 include/asm-sparc/intr_queue.h + create mode 100644 include/asm-sparc/io_32.h + create mode 100644 include/asm-sparc/io_64.h + create mode 100644 include/asm-sparc/iommu_32.h + create mode 100644 include/asm-sparc/iommu_64.h + create mode 100644 include/asm-sparc/ipcbuf_32.h + create mode 100644 include/asm-sparc/ipcbuf_64.h + create mode 100644 include/asm-sparc/irq_32.h + create mode 100644 include/asm-sparc/irq_64.h + create mode 100644 include/asm-sparc/irqflags_32.h + create mode 100644 include/asm-sparc/irqflags_64.h + create mode 100644 include/asm-sparc/kdebug_32.h + create mode 100644 include/asm-sparc/kdebug_64.h + create mode 100644 include/asm-sparc/kprobes.h + create mode 100644 include/asm-sparc/ldc.h + create mode 100644 include/asm-sparc/lmb.h + create mode 100644 include/asm-sparc/lsu.h + create mode 100644 include/asm-sparc/mc146818rtc_32.h + create mode 100644 include/asm-sparc/mc146818rtc_64.h + create mode 100644 include/asm-sparc/mdesc.h + create mode 100644 include/asm-sparc/mmu_32.h + create mode 100644 include/asm-sparc/mmu_64.h + create mode 100644 include/asm-sparc/mmu_context_32.h + create mode 100644 include/asm-sparc/mmu_context_64.h + create mode 100644 include/asm-sparc/mmzone.h + create mode 100644 include/asm-sparc/module_32.h + create mode 100644 include/asm-sparc/module_64.h + create mode 100644 include/asm-sparc/mostek_32.h + create mode 100644 include/asm-sparc/mostek_64.h + create mode 100644 include/asm-sparc/namei_32.h + create mode 100644 include/asm-sparc/namei_64.h + create mode 100644 include/asm-sparc/ns87303.h + create mode 100644 include/asm-sparc/of_platform_32.h + create mode 100644 include/asm-sparc/of_platform_64.h + create mode 100644 include/asm-sparc/openprom_32.h + create mode 100644 include/asm-sparc/openprom_64.h + create mode 100644 include/asm-sparc/oplib_32.h + create mode 100644 include/asm-sparc/oplib_64.h + create mode 100644 include/asm-sparc/page_32.h + create mode 100644 include/asm-sparc/page_64.h + create mode 100644 include/asm-sparc/parport.h + create mode 100644 include/asm-sparc/pci_32.h + create mode 100644 include/asm-sparc/pci_64.h + create mode 100644 include/asm-sparc/percpu_32.h + create mode 100644 include/asm-sparc/percpu_64.h + create mode 100644 include/asm-sparc/pgalloc_32.h + create mode 100644 include/asm-sparc/pgalloc_64.h + create mode 100644 include/asm-sparc/pgtable_32.h + create mode 100644 include/asm-sparc/pgtable_64.h + create mode 100644 include/asm-sparc/pil.h + create mode 100644 include/asm-sparc/posix_types_32.h + create mode 100644 include/asm-sparc/posix_types_64.h + create mode 100644 include/asm-sparc/processor_32.h + create mode 100644 include/asm-sparc/processor_64.h + create mode 100644 include/asm-sparc/psrcompat.h + create mode 100644 include/asm-sparc/pstate.h + create mode 100644 include/asm-sparc/ptrace_32.h + create mode 100644 include/asm-sparc/ptrace_64.h + create mode 100644 include/asm-sparc/reboot.h + create mode 100644 include/asm-sparc/reg_32.h + create mode 100644 include/asm-sparc/reg_64.h + create mode 100644 include/asm-sparc/rwsem-const.h + create mode 100644 include/asm-sparc/rwsem.h + create mode 100644 include/asm-sparc/sbus_32.h + create mode 100644 include/asm-sparc/sbus_64.h + create mode 100644 include/asm-sparc/scatterlist_32.h + create mode 100644 include/asm-sparc/scatterlist_64.h + create mode 100644 include/asm-sparc/scratchpad.h + create mode 100644 include/asm-sparc/seccomp.h + create mode 100644 include/asm-sparc/sections_32.h + create mode 100644 include/asm-sparc/sections_64.h + create mode 100644 include/asm-sparc/sfafsr.h + create mode 100644 include/asm-sparc/sfp-machine_32.h + create mode 100644 include/asm-sparc/sfp-machine_64.h + create mode 100644 include/asm-sparc/shmparam_32.h + create mode 100644 include/asm-sparc/shmparam_64.h + create mode 100644 include/asm-sparc/sigcontext_32.h + create mode 100644 include/asm-sparc/sigcontext_64.h + create mode 100644 include/asm-sparc/siginfo_32.h + create mode 100644 include/asm-sparc/siginfo_64.h + create mode 100644 include/asm-sparc/signal_32.h + create mode 100644 include/asm-sparc/signal_64.h + create mode 100644 include/asm-sparc/smp_32.h + create mode 100644 include/asm-sparc/smp_64.h + create mode 100644 include/asm-sparc/sparsemem.h + create mode 100644 include/asm-sparc/spinlock_32.h + create mode 100644 include/asm-sparc/spinlock_64.h + create mode 100644 include/asm-sparc/spitfire.h + create mode 100644 include/asm-sparc/sstate.h + create mode 100644 include/asm-sparc/stacktrace.h + create mode 100644 include/asm-sparc/starfire.h + create mode 100644 include/asm-sparc/stat_32.h + create mode 100644 include/asm-sparc/stat_64.h + create mode 100644 include/asm-sparc/statfs_32.h + create mode 100644 include/asm-sparc/statfs_64.h + create mode 100644 include/asm-sparc/string_32.h + create mode 100644 include/asm-sparc/string_64.h + create mode 100644 include/asm-sparc/syscalls.h + create mode 100644 include/asm-sparc/system_32.h + create mode 100644 include/asm-sparc/system_64.h + create mode 100644 include/asm-sparc/thread_info_32.h + create mode 100644 include/asm-sparc/thread_info_64.h + create mode 100644 include/asm-sparc/timer_32.h + create mode 100644 include/asm-sparc/timer_64.h + create mode 100644 include/asm-sparc/timex_32.h + create mode 100644 include/asm-sparc/timex_64.h + create mode 100644 include/asm-sparc/tlb_32.h + create mode 100644 include/asm-sparc/tlb_64.h + create mode 100644 include/asm-sparc/tlbflush_32.h + create mode 100644 include/asm-sparc/tlbflush_64.h + create mode 100644 include/asm-sparc/topology_32.h + create mode 100644 include/asm-sparc/topology_64.h + create mode 100644 include/asm-sparc/tsb.h + create mode 100644 include/asm-sparc/ttable.h + create mode 100644 include/asm-sparc/uaccess_32.h + create mode 100644 include/asm-sparc/uaccess_64.h + create mode 100644 include/asm-sparc/uctx.h + create mode 100644 include/asm-sparc/unistd_32.h + create mode 100644 include/asm-sparc/unistd_64.h + create mode 100644 include/asm-sparc/upa.h + create mode 100644 include/asm-sparc/utrap.h + create mode 100644 include/asm-sparc/vio.h + create mode 100644 include/asm-sparc/visasm.h + create mode 100644 include/asm-sparc/watchdog.h + create mode 100644 include/asm-sparc/xor_32.h + create mode 100644 include/asm-sparc/xor_64.h +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Auto-merged Documentation/powerpc/booting-without-of.txt +Removed arch/powerpc/platforms/83xx/pci.c +Auto-merged drivers/net/fs_enet/fs_enet-main.c +CONFLICT (content): Merge conflict in drivers/net/fs_enet/fs_enet-main.c +Auto-merged drivers/net/gianfar.c +Auto-merged drivers/net/gianfar.h +Resolved 'drivers/net/fs_enet/fs_enet-main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 13c5bc3: Merge commit 'galak/powerpc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/powerpc/booting-without-of.txt | 189 +++++--- + .../powerpc/dts-bindings/fsl/cpm_qe/gpio.txt | 38 ++ + .../powerpc/dts-bindings/fsl/cpm_qe/qe/usb.txt | 53 ++- + .../powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt | 17 + + Documentation/powerpc/dts-bindings/fsl/pmc.txt | 63 +++ + Documentation/powerpc/dts-bindings/fsl/tsec.txt | 31 +- + .../powerpc/dts-bindings/fsl/upm-nand.txt | 28 + + Documentation/powerpc/dts-bindings/gpio/led.txt | 15 + + arch/powerpc/Kconfig | 14 +- + arch/powerpc/boot/dts/mpc7448hpc2.dts | 24 +- + arch/powerpc/boot/dts/mpc8313erdb.dts | 241 +++++++--- + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 14 + + arch/powerpc/configs/85xx/mpc8544_ds_defconfig | 8 +- + arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 8 +- + arch/powerpc/configs/mpc85xx_defconfig | 8 +- + arch/powerpc/configs/mpc8610_hpcd_defconfig | 121 ++++- + arch/powerpc/configs/mpc8641_hpcn_defconfig | 8 +- + arch/powerpc/kernel/head_fsl_booke.S | 187 ++----- + arch/powerpc/platforms/52xx/Kconfig | 1 + + arch/powerpc/platforms/82xx/Kconfig | 1 + + arch/powerpc/platforms/82xx/ep8248e.c | 4 - + arch/powerpc/platforms/83xx/Kconfig | 3 +- + arch/powerpc/platforms/83xx/Makefile | 2 +- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 1 + + arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 + + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 1 + + arch/powerpc/platforms/83xx/mpc834x_itx.c | 1 + + arch/powerpc/platforms/83xx/mpc834x_mds.c | 1 + + arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 + + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 1 + + arch/powerpc/platforms/83xx/mpc837x_mds.c | 1 + + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 + + arch/powerpc/platforms/83xx/mpc83xx.h | 5 +- + arch/powerpc/platforms/83xx/pci.c | 91 ---- + arch/powerpc/platforms/83xx/sbc834x.c | 1 + + arch/powerpc/platforms/83xx/suspend-asm.S | 533 ++++++++++++++++++++ + arch/powerpc/platforms/83xx/suspend.c | 388 ++++++++++++++ + arch/powerpc/platforms/83xx/usb.c | 24 +- + arch/powerpc/platforms/85xx/Kconfig | 3 +- + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 - + arch/powerpc/platforms/86xx/Kconfig | 3 + + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 87 ---- + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 - + arch/powerpc/platforms/Kconfig | 6 +- + arch/powerpc/platforms/Kconfig.cputype | 2 + + arch/powerpc/platforms/fsl_uli1575.c | 117 ++++- + arch/powerpc/platforms/iseries/Kconfig | 1 + + arch/powerpc/platforms/ps3/Kconfig | 1 + + arch/powerpc/platforms/pseries/Kconfig | 1 + + arch/powerpc/sysdev/fsl_pci.c | 61 +++ + arch/powerpc/sysdev/fsl_pci.h | 1 + + arch/powerpc/sysdev/fsl_soc.c | 90 ++-- + arch/powerpc/sysdev/fsl_soc.h | 1 + + arch/powerpc/sysdev/ipic.c | 71 +++ + arch/powerpc/sysdev/qe_lib/qe.c | 6 +- + arch/powerpc/sysdev/qe_lib/ucc.c | 6 +- + arch/powerpc/sysdev/qe_lib/ucc_fast.c | 16 +- + drivers/net/fs_enet/Makefile | 5 - + drivers/net/fs_enet/fs_enet-main.c | 312 +------------ + drivers/net/fs_enet/fs_enet.h | 4 - + drivers/net/fs_enet/mac-fcc.c | 67 +--- + drivers/net/fs_enet/mac-fec.c | 23 +- + drivers/net/fs_enet/mac-scc.c | 37 +-- + drivers/net/fs_enet/mii-bitbang.c | 107 ---- + drivers/net/fs_enet/mii-fec.c | 144 +------ + drivers/net/gianfar.c | 122 +++++- + drivers/net/gianfar.h | 12 +- + drivers/net/gianfar_ethtool.c | 41 ++- + include/asm-powerpc/pgtable-ppc32.h | 15 +- + include/asm-powerpc/reg.h | 4 + + include/asm-powerpc/ucc_fast.h | 8 +- + include/linux/fs_enet_pd.h | 4 - + include/linux/fsl_devices.h | 7 + + 73 files changed, 2164 insertions(+), 1354 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/fsl/cpm_qe/gpio.txt + create mode 100644 Documentation/powerpc/dts-bindings/fsl/mcu-mpc8349emitx.txt + create mode 100644 Documentation/powerpc/dts-bindings/fsl/pmc.txt + create mode 100644 Documentation/powerpc/dts-bindings/fsl/upm-nand.txt + create mode 100644 Documentation/powerpc/dts-bindings/gpio/led.txt + delete mode 100644 arch/powerpc/platforms/83xx/pci.c + create mode 100644 arch/powerpc/platforms/83xx/suspend-asm.S + create mode 100644 arch/powerpc/platforms/83xx/suspend.c +Merging mtd/master +$ git merge mtd/master +Auto-merged arch/arm/mach-at91/at91cap9_devices.c +Auto-merged arch/arm/mach-at91/at91sam9260_devices.c +Auto-merged arch/arm/mach-at91/at91sam9261_devices.c +Auto-merged arch/arm/mach-at91/at91sam9263_devices.c +Auto-merged arch/arm/mach-at91/at91sam9rl_devices.c +Auto-merged arch/arm/mach-at91/board-cap9adk.c +Auto-merged arch/arm/mach-at91/board-dk.c +Auto-merged arch/arm/mach-at91/board-kb9202.c +Auto-merged arch/arm/mach-at91/board-sam9rlek.c +Auto-merged arch/arm/mach-at91/board-yl-9200.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c +Auto-merged arch/avr32/boards/atstk1000/atstk1002.c +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Auto-merged drivers/mtd/devices/Kconfig +Auto-merged drivers/mtd/devices/block2mtd.c +Auto-merged drivers/mtd/ftl.c +Auto-merged drivers/mtd/maps/Kconfig +Auto-merged drivers/mtd/maps/Makefile +Removed drivers/mtd/maps/bast-flash.c +CONFLICT (delete/modify): drivers/mtd/maps/mtx-1_flash.c deleted in HEAD and modified in mtd/master. Version mtd/master of drivers/mtd/maps/mtx-1_flash.c left in tree. +Auto-merged drivers/mtd/maps/pcmciamtd.c +Auto-merged drivers/mtd/mtdchar.c +Removed include/asm-arm/arch-at91/at91_ecc.h +Auto-merged include/asm-arm/arch-at91/board.h +Auto-merged include/asm-avr32/arch-at32ap/board.h +Auto-merged include/linux/mtd/map.h +Auto-merged include/linux/mtd/mtd.h +Resolved 'arch/arm/mach-at91/board-yl-9200.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm drivers/mtd/maps/mtx-1_flash.c +rm 'drivers/mtd/maps/mtx-1_flash.c' +rm 'drivers/mtd/maps/mtx-1_flash.c' +$ git commit -v -a +Created commit 9cfae55: Merge commit 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-at91/at91cap9_devices.c | 8 +- + arch/arm/mach-at91/at91rm9200_devices.c | 8 +- + arch/arm/mach-at91/at91sam9260_devices.c | 8 +- + arch/arm/mach-at91/at91sam9261_devices.c | 12 +- + arch/arm/mach-at91/at91sam9263_devices.c | 8 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 12 +- + arch/arm/mach-at91/board-cam60.c | 2 +- + arch/arm/mach-at91/board-cap9adk.c | 2 +- + arch/arm/mach-at91/board-dk.c | 2 +- + arch/arm/mach-at91/board-kb9202.c | 2 +- + arch/arm/mach-at91/board-sam9-l9260.c | 2 +- + arch/arm/mach-at91/board-sam9260ek.c | 2 +- + arch/arm/mach-at91/board-sam9261ek.c | 2 +- + arch/arm/mach-at91/board-sam9263ek.c | 2 +- + arch/arm/mach-at91/board-sam9rlek.c | 2 +- + arch/arm/mach-at91/board-yl-9200.c | 12 +- + arch/avr32/boards/atstk1000/Kconfig | 4 + + arch/avr32/boards/atstk1000/Makefile | 1 + + arch/avr32/boards/atstk1000/atstk1002.c | 78 +++++++- + arch/avr32/mach-at32ap/at32ap700x.c | 52 +++++ + arch/avr32/mach-at32ap/hsmc.c | 2 +- + drivers/mtd/Kconfig | 2 - + drivers/mtd/afs.c | 2 - + drivers/mtd/chips/cfi_cmdset_0001.c | 8 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 3 - + drivers/mtd/chips/cfi_cmdset_0020.c | 2 - + drivers/mtd/chips/cfi_probe.c | 1 - + drivers/mtd/chips/cfi_util.c | 3 - + drivers/mtd/chips/chipreg.c | 2 - + drivers/mtd/chips/gen_probe.c | 5 +- + drivers/mtd/chips/jedec_probe.c | 119 ++++++++++- + drivers/mtd/chips/map_absent.c | 1 - + drivers/mtd/chips/map_ram.c | 1 - + drivers/mtd/chips/map_rom.c | 1 - + drivers/mtd/cmdlinepart.c | 4 +- + drivers/mtd/devices/Kconfig | 1 - + drivers/mtd/devices/Makefile | 1 - + drivers/mtd/devices/block2mtd.c | 6 - + drivers/mtd/devices/doc2000.c | 2 - + drivers/mtd/devices/doc2001.c | 2 - + drivers/mtd/devices/doc2001plus.c | 2 - + drivers/mtd/devices/docecc.c | 2 - + drivers/mtd/devices/docprobe.c | 5 - + drivers/mtd/devices/lart.c | 2 - + drivers/mtd/devices/m25p80.c | 22 ++ + drivers/mtd/devices/ms02-nv.c | 2 - + drivers/mtd/devices/ms02-nv.h | 2 - + drivers/mtd/devices/mtd_dataflash.c | 135 ++++++++++-- + drivers/mtd/devices/mtdram.c | 1 - + drivers/mtd/devices/phram.c | 2 - + drivers/mtd/devices/pmc551.c | 2 - + drivers/mtd/devices/slram.c | 2 - + drivers/mtd/ftl.c | 3 - + drivers/mtd/inftlcore.c | 5 - + drivers/mtd/inftlmount.c | 4 - + drivers/mtd/maps/Kconfig | 30 +-- + drivers/mtd/maps/Makefile | 3 +- + drivers/mtd/maps/amd76xrom.c | 1 - + drivers/mtd/maps/autcpu12-nvram.c | 2 - + drivers/mtd/maps/bast-flash.c | 226 ------------------- + drivers/mtd/maps/bfin-async-flash.c | 219 +++++++++++++++++++ + drivers/mtd/maps/cdb89712.c | 1 - + drivers/mtd/maps/ceiva.c | 1 - + drivers/mtd/maps/cfi_flagadm.c | 2 - + drivers/mtd/maps/dbox2-flash.c | 2 - + drivers/mtd/maps/dc21285.c | 2 - + drivers/mtd/maps/dilnetpc.c | 2 - + drivers/mtd/maps/dmv182.c | 2 - + drivers/mtd/maps/ebony.c | 2 - + drivers/mtd/maps/edb7312.c | 2 - + drivers/mtd/maps/fortunet.c | 1 - + drivers/mtd/maps/h720x-flash.c | 2 - + drivers/mtd/maps/ichxrom.c | 1 - + drivers/mtd/maps/impa7.c | 2 - + drivers/mtd/maps/integrator-flash.c | 2 - + drivers/mtd/maps/ipaq-flash.c | 2 - + drivers/mtd/maps/ixp2000.c | 2 - + drivers/mtd/maps/ixp4xx.c | 2 - + drivers/mtd/maps/l440gx.c | 2 - + drivers/mtd/maps/map_funcs.c | 2 - + drivers/mtd/maps/mbx860.c | 2 - + drivers/mtd/maps/netsc520.c | 2 - + drivers/mtd/maps/nettel.c | 2 - + drivers/mtd/maps/octagon-5066.c | 1 - + drivers/mtd/maps/omap-toto-flash.c | 2 - + drivers/mtd/maps/pci.c | 2 - + drivers/mtd/maps/pcmciamtd.c | 5 +- + drivers/mtd/maps/physmap.c | 2 - + drivers/mtd/maps/plat-ram.c | 2 - + drivers/mtd/maps/redwood.c | 2 - + drivers/mtd/maps/rpxlite.c | 2 - + drivers/mtd/maps/sa1100-flash.c | 2 - + drivers/mtd/maps/sbc8240.c | 3 - + drivers/mtd/maps/sbc_gxx.c | 2 - + drivers/mtd/maps/sc520cdp.c | 2 - + drivers/mtd/maps/scb2_flash.c | 1 - + drivers/mtd/maps/scx200_docflash.c | 2 - + drivers/mtd/maps/sharpsl-flash.c | 2 - + drivers/mtd/maps/solutionengine.c | 2 - + drivers/mtd/maps/sun_uflash.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 2 - + drivers/mtd/maps/ts5500_flash.c | 2 - + drivers/mtd/maps/tsunami_flash.c | 1 - + drivers/mtd/maps/uclinux.c | 2 - + drivers/mtd/maps/vmax301.c | 1 - + drivers/mtd/maps/walnut.c | 2 - + drivers/mtd/maps/wr_sbc82xx_flash.c | 2 - + drivers/mtd/mtd_blkdevs.c | 34 +-- + drivers/mtd/mtdblock.c | 2 - + drivers/mtd/mtdblock_ro.c | 2 - + drivers/mtd/mtdchar.c | 24 +- + drivers/mtd/mtdconcat.c | 2 - + drivers/mtd/mtdcore.c | 14 +- + drivers/mtd/mtdpart.c | 25 +-- + drivers/mtd/nand/Kconfig | 28 ++-- + drivers/mtd/nand/Makefile | 3 +- + drivers/mtd/nand/{at91_nand.c => atmel_nand.c} | 278 ++++++++++++++---------- + drivers/mtd/nand/atmel_nand_ecc.h | 36 +++ + drivers/mtd/nand/au1550nd.c | 2 - + drivers/mtd/nand/autcpu12.c | 2 - + drivers/mtd/nand/cafe_nand.c | 6 +- + drivers/mtd/nand/diskonchip.c | 4 - + drivers/mtd/nand/edb7312.c | 2 - + drivers/mtd/nand/excite_nandflash.c | 2 +- + drivers/mtd/nand/fsl_elbc_nand.c | 59 +++++- + drivers/mtd/nand/h1910.c | 2 - + drivers/mtd/nand/nand_bbt.c | 2 - + drivers/mtd/nand/nand_ecc.c | 2 - + drivers/mtd/nand/nand_ids.c | 2 - + drivers/mtd/nand/nandsim.c | 41 ++-- + drivers/mtd/nand/ppchameleonevb.c | 2 - + drivers/mtd/nand/rtc_from4.c | 2 - + drivers/mtd/nand/s3c2410.c | 25 +-- + drivers/mtd/nand/sharpsl.c | 2 - + drivers/mtd/nand/spia.c | 2 - + drivers/mtd/nand/toto.c | 2 - + drivers/mtd/nand/ts7250.c | 2 - + drivers/mtd/nftlcore.c | 5 - + drivers/mtd/nftlmount.c | 4 - + drivers/mtd/onenand/onenand_base.c | 54 ++--- + drivers/mtd/redboot.c | 2 - + drivers/mtd/rfd_ftl.c | 2 - + fs/jffs2/dir.c | 2 +- + fs/jffs2/file.c | 2 +- + fs/jffs2/ioctl.c | 3 +- + fs/jffs2/os-linux.h | 2 +- + include/asm-arm/arch-at91/at91_ecc.h | 38 ---- + include/asm-arm/arch-at91/board.h | 4 +- + include/asm-avr32/arch-at32ap/board.h | 13 + + include/linux/jffs2.h | 3 - + include/linux/mtd/blktrans.h | 2 - + include/linux/mtd/cfi.h | 1 - + include/linux/mtd/cfi_endian.h | 5 - + include/linux/mtd/concat.h | 2 - + include/linux/mtd/doc2000.h | 2 - + include/linux/mtd/flashchip.h | 3 - + include/linux/mtd/ftl.h | 2 - + include/linux/mtd/gen_probe.h | 1 - + include/linux/mtd/inftl.h | 4 - + include/linux/mtd/map.h | 1 - + include/linux/mtd/mtd.h | 2 - + include/linux/mtd/nand.h | 2 - + include/linux/mtd/nand_ecc.h | 2 - + include/linux/mtd/nftl.h | 2 - + include/linux/mtd/partitions.h | 2 - + include/linux/mtd/physmap.h | 2 - + include/linux/mtd/plat-ram.h | 2 - + include/linux/mtd/pmc551.h | 4 +- + include/linux/mtd/xip.h | 2 - + include/mtd/inftl-user.h | 2 - + include/mtd/jffs2-user.h | 2 - + include/mtd/mtd-abi.h | 2 - + include/mtd/mtd-user.h | 2 - + include/mtd/nftl-user.h | 2 - + 174 files changed, 1055 insertions(+), 892 deletions(-) + delete mode 100644 drivers/mtd/maps/bast-flash.c + create mode 100644 drivers/mtd/maps/bfin-async-flash.c + rename drivers/mtd/nand/{at91_nand.c => atmel_nand.c} (62%) + create mode 100644 drivers/mtd/nand/atmel_nand_ecc.h + delete mode 100644 include/asm-arm/arch-at91/at91_ecc.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + crypto/Kconfig | 93 +++++++----- + crypto/Makefile | 2 +- + crypto/prng.c | 394 ++++++++++++++++++++++++++++++++++++++++++++++ + crypto/prng.h | 27 +++ + drivers/crypto/talitos.c | 49 ++++-- + 5 files changed, 510 insertions(+), 55 deletions(-) + create mode 100644 crypto/prng.c + create mode 100644 crypto/prng.h +Merging vfs/for-next +$ git merge vfs/for-next +CONFLICT (delete/modify): arch/mips/kernel/irixelf.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of arch/mips/kernel/irixelf.c left in tree. +Auto-merged fs/cifs/cifsfs.c +Auto-merged fs/gfs2/inode.c +Auto-merged fs/gfs2/inode.h +Auto-merged fs/gfs2/ops_file.c +Auto-merged fs/gfs2/ops_inode.c +Auto-merged fs/namespace.c +Auto-merged fs/nfs/dir.c +Auto-merged fs/nfsd/vfs.c +Auto-merged fs/ocfs2/file.c +Auto-merged fs/proc/base.c +Auto-merged fs/smbfs/file.c +Auto-merged fs/splice.c +Auto-merged fs/xfs/linux-2.6/xfs_iops.c +Removed include/asm-alpha/namei.h +Removed include/asm-arm/namei.h +Removed include/asm-avr32/namei.h +Removed include/asm-blackfin/namei.h +Removed include/asm-cris/namei.h +Removed include/asm-frv/namei.h +Removed include/asm-h8300/namei.h +Removed include/asm-ia64/namei.h +Removed include/asm-m32r/namei.h +Removed include/asm-m68k/namei.h +Removed include/asm-m68knommu/namei.h +CONFLICT (delete/modify): include/asm-mips/namei.h deleted in vfs/for-next and modified in HEAD. Version HEAD of include/asm-mips/namei.h left in tree. +Removed include/asm-mn10300/namei.h +Removed include/asm-parisc/namei.h +Removed include/asm-powerpc/namei.h +Removed include/asm-s390/namei.h +Removed include/asm-sh/namei.h +CONFLICT (delete/modify): include/asm-sparc/namei.h deleted in vfs/for-next and modified in HEAD. Version HEAD of include/asm-sparc/namei.h left in tree. +CONFLICT (delete/modify): include/asm-sparc64/namei.h deleted in vfs/for-next and modified in HEAD. Version HEAD of include/asm-sparc64/namei.h left in tree. +Removed include/asm-um/namei.h +Removed include/asm-v850/namei.h +Removed include/asm-x86/namei.h +Removed include/asm-xtensa/namei.h +Auto-merged include/linux/fs.h +Auto-merged include/linux/nfs_fs.h +Auto-merged include/linux/security.h +Auto-merged include/net/net_namespace.h +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged mm/filemap.c +Auto-merged net/ipv4/af_inet.c +Auto-merged net/ipv4/sysctl_net_ipv4.c +Auto-merged net/sysctl_net.c +CONFLICT (delete/modify): security/dummy.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of security/dummy.c left in tree. +Auto-merged security/security.c +Auto-merged security/selinux/hooks.c +Auto-merged security/smack/smack_lsm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm security/dummy.c +rm 'security/dummy.c' +rm 'security/dummy.c' +$ git rm include/asm-sparc/namei.h include/asm-sparc64/namei.h include/asm-sparc/namei_32.h include/asm-sparc/namei_64.h +rm 'include/asm-sparc/namei.h' +rm 'include/asm-sparc/namei.h' +rm 'include/asm-sparc/namei_32.h' +rm 'include/asm-sparc/namei_64.h' +rm 'include/asm-sparc64/namei.h' +rm 'include/asm-sparc64/namei.h' +$ git rm arch/mips/kernel/irixelf.c include/asm-mips/namei.h +rm 'arch/mips/kernel/irixelf.c' +rm 'arch/mips/kernel/irixelf.c' +rm 'include/asm-mips/namei.h' +rm 'include/asm-mips/namei.h' +$ git commit -v -a +Created commit c049b3c: Merge commit 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/afs/internal.h | 4 +- + fs/afs/security.c | 2 +- + fs/bad_inode.c | 3 +- + fs/cifs/cifsfs.c | 2 +- + fs/coda/dir.c | 4 +- + fs/coda/pioctl.c | 6 +- + fs/ecryptfs/inode.c | 21 +-- + fs/exec.c | 4 +- + fs/ext2/acl.c | 2 +- + fs/ext2/acl.h | 2 +- + fs/ext3/acl.c | 2 +- + fs/ext3/acl.h | 2 +- + fs/ext4/acl.c | 2 +- + fs/ext4/acl.h | 2 +- + fs/fifo.c | 8 +- + fs/fuse/dir.c | 6 +- + fs/fuse/file.c | 2 +- + fs/hfs/inode.c | 3 +- + fs/hfsplus/inode.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/namei.c | 2 +- + fs/hppfs/hppfs.c | 7 - + fs/jffs2/acl.c | 2 +- + fs/jffs2/acl.h | 2 +- + fs/jfs/acl.c | 2 +- + fs/jfs/jfs_acl.h | 2 +- + fs/namei.c | 142 ++++---------- + fs/namespace.c | 8 +- + fs/nfs/dir.c | 7 +- + fs/nfsd/vfs.c | 10 +- + fs/ntfs/file.c | 2 +- + fs/ocfs2/file.c | 2 +- + fs/ocfs2/file.h | 3 +- + fs/open.c | 18 +- + fs/pipe.c | 51 +---- + fs/proc/base.c | 3 +- + fs/proc/inode.c | 5 + + fs/proc/proc_sysctl.c | 429 ++++++++++++++++++---------------------- + fs/reiserfs/xattr.c | 2 +- + fs/smbfs/file.c | 4 +- + fs/splice.c | 4 +- + fs/xfs/linux-2.6/xfs_iops.c | 3 +- + fs/xfs/linux-2.6/xfs_lrw.c | 2 +- + include/asm-alpha/namei.h | 17 -- + include/asm-arm/namei.h | 25 --- + include/asm-avr32/namei.h | 7 - + include/asm-blackfin/namei.h | 19 -- + include/asm-cris/namei.h | 17 -- + include/asm-frv/namei.h | 18 -- + include/asm-h8300/namei.h | 17 -- + include/asm-ia64/namei.h | 25 --- + include/asm-m32r/namei.h | 17 -- + include/asm-m68k/namei.h | 17 -- + include/asm-m68knommu/namei.h | 1 - + include/asm-mips/namei.h | 11 - + include/asm-mn10300/namei.h | 22 -- + include/asm-parisc/namei.h | 17 -- + include/asm-powerpc/namei.h | 20 -- + include/asm-s390/namei.h | 21 -- + include/asm-sh/namei.h | 17 -- + include/asm-sparc/namei.h | 8 - + include/asm-sparc/namei_32.h | 13 -- + include/asm-sparc/namei_64.h | 13 -- + include/asm-sparc64/namei.h | 1 - + include/asm-um/namei.h | 6 - + include/asm-v850/namei.h | 17 -- + include/asm-x86/namei.h | 11 - + include/asm-xtensa/namei.h | 26 --- + include/linux/coda_linux.h | 2 +- + include/linux/fs.h | 14 +- + include/linux/fs_struct.h | 3 +- + include/linux/namei.h | 3 - + include/linux/nfs_fs.h | 2 +- + include/linux/proc_fs.h | 5 + + include/linux/reiserfs_xattr.h | 2 +- + include/linux/security.h | 7 +- + include/linux/shmem_fs.h | 2 +- + include/linux/sysctl.h | 25 +++- + include/net/ip.h | 2 + + include/net/net_namespace.h | 2 +- + kernel/exec_domain.c | 1 - + kernel/exit.c | 2 - + kernel/fork.c | 7 - + kernel/sysctl.c | 162 ++++++++++++++-- + mm/filemap.c | 7 +- + mm/filemap_xip.c | 2 +- + mm/shmem_acl.c | 2 +- + net/ipv4/af_inet.c | 4 + + net/ipv4/sysctl_net_ipv4.c | 7 + + net/sysctl_net.c | 13 +- + security/security.c | 4 +- + security/selinux/hooks.c | 5 +- + security/smack/smack_lsm.c | 3 +- + 93 files changed, 527 insertions(+), 937 deletions(-) + delete mode 100644 include/asm-alpha/namei.h + delete mode 100644 include/asm-arm/namei.h + delete mode 100644 include/asm-avr32/namei.h + delete mode 100644 include/asm-blackfin/namei.h + delete mode 100644 include/asm-cris/namei.h + delete mode 100644 include/asm-frv/namei.h + delete mode 100644 include/asm-h8300/namei.h + delete mode 100644 include/asm-ia64/namei.h + delete mode 100644 include/asm-m32r/namei.h + delete mode 100644 include/asm-m68k/namei.h + delete mode 100644 include/asm-m68knommu/namei.h + delete mode 100644 include/asm-mips/namei.h + delete mode 100644 include/asm-mn10300/namei.h + delete mode 100644 include/asm-parisc/namei.h + delete mode 100644 include/asm-powerpc/namei.h + delete mode 100644 include/asm-s390/namei.h + delete mode 100644 include/asm-sh/namei.h + delete mode 100644 include/asm-sparc/namei.h + delete mode 100644 include/asm-sparc/namei_32.h + delete mode 100644 include/asm-sparc/namei_64.h + delete mode 100644 include/asm-sparc64/namei.h + delete mode 100644 include/asm-um/namei.h + delete mode 100644 include/asm-v850/namei.h + delete mode 100644 include/asm-x86/namei.h + delete mode 100644 include/asm-xtensa/namei.h +Merging sound/master +$ git merge sound/master +Auto-merged sound/pci/ac97/ac97_codec.c +Merge made by recursive. + sound/pci/ac97/ac97_codec.c | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) +Merging arm/devel +$ git merge arm/devel +CONFLICT (rename/delete): Renamed arch/arm/configs/em_x270_defconfig->arch/sh/configs/sh7785lcr_defconfig in HEAD and deleted in arm/devel +Auto-merged MAINTAINERS +Auto-merged arch/arm/common/sa1111.c +Auto-merged arch/sh/boards/renesas/migor/setup.c +Auto-merged drivers/pcmcia/Kconfig +Auto-merged drivers/pcmcia/Makefile +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Removed include/asm-arm/arch-pxa/cm-x270.h +Auto-merged sound/soc/pxa/Kconfig +Auto-merged sound/soc/pxa/tosa.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 5bbac1e: Merge commit 'arm/devel' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/arm/common/sa1111.c | 2 +- + arch/arm/configs/ezx_defconfig | 1614 +++++++++++++++++++++++++++++++ + arch/arm/mach-pxa/Kconfig | 219 +++-- + arch/arm/mach-pxa/Makefile | 15 +- + arch/arm/mach-pxa/clock.c | 30 - + arch/arm/mach-pxa/clock.h | 33 + + arch/arm/mach-pxa/cm-x270-pci.c | 27 +- + arch/arm/mach-pxa/cm-x270-pci.h | 14 +- + arch/arm/mach-pxa/cm-x270.c | 403 ++++++--- + arch/arm/mach-pxa/corgi.c | 1 + + arch/arm/mach-pxa/devices.c | 61 ++ + arch/arm/mach-pxa/devices.h | 2 + + arch/arm/mach-pxa/e400_lcd.c | 56 ++ + arch/arm/mach-pxa/e740_lcd.c | 123 +++ + arch/arm/mach-pxa/e750_lcd.c | 109 +++ + arch/arm/mach-pxa/e800_lcd.c | 159 +++ + arch/arm/mach-pxa/em-x270.c | 371 ++++++-- + arch/arm/mach-pxa/eseries.c | 15 +- + arch/arm/mach-pxa/eseries_udc.c | 57 ++ + arch/arm/mach-pxa/ezx.c | 220 +++++ + arch/arm/mach-pxa/littleton.c | 70 ++- + arch/arm/mach-pxa/lubbock.c | 19 +- + arch/arm/mach-pxa/magician.c | 49 +- + arch/arm/mach-pxa/mainstone.c | 18 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 71 +- + arch/arm/mach-pxa/palmtx.c | 416 ++++++++ + arch/arm/mach-pxa/pcm027.c | 31 + + arch/arm/mach-pxa/pcm990-baseboard.c | 74 +- + arch/arm/mach-pxa/poodle.c | 1 + + arch/arm/mach-pxa/pxa25x.c | 59 ++- + arch/arm/mach-pxa/pxa300.c | 19 +- + arch/arm/mach-pxa/pxa320.c | 21 +- + arch/arm/mach-pxa/pxa3xx.c | 25 +- + arch/arm/mach-pxa/pxa930.c | 190 ++++ + arch/arm/mach-pxa/reset.c | 96 ++ + arch/arm/mach-pxa/saar.c | 84 ++ + arch/arm/mach-pxa/spitz.c | 10 +- + arch/arm/mach-pxa/ssp.c | 13 +- + arch/arm/mach-pxa/tavorevb.c | 84 ++ + arch/arm/mach-pxa/tosa-bt.c | 150 +++ + arch/arm/mach-pxa/tosa.c | 382 +++++++- + arch/arm/mach-pxa/trizeps4.c | 1 + + arch/arm/mach-pxa/zylonite.c | 103 ++- + arch/arm/mach-pxa/zylonite_pxa300.c | 46 + + arch/arm/mach-pxa/zylonite_pxa320.c | 6 + + arch/arm/mach-sa1100/clock.c | 2 +- + arch/arm/mm/Makefile | 2 + + arch/arm/tools/mach-types | 10 +- + arch/sh/boards/renesas/migor/setup.c | 3 +- + drivers/input/keyboard/tosakbd.c | 2 - + drivers/mfd/Kconfig | 11 + + drivers/mfd/Makefile | 4 + + drivers/mfd/mfd-core.c | 114 +++ + drivers/mfd/tc6393xb.c | 600 ++++++++++++ + drivers/mtd/nand/cmx270_nand.c | 79 +- + drivers/net/smc91x.c | 94 +- + drivers/net/smc91x.h | 76 +- + drivers/pcmcia/Kconfig | 3 +- + drivers/pcmcia/Makefile | 1 + + drivers/pcmcia/pxa2xx_cm_x270.c | 93 +-- + drivers/pcmcia/pxa2xx_palmtx.c | 118 +++ + drivers/power/Kconfig | 6 + + drivers/power/Makefile | 1 + + drivers/power/palmtx_battery.c | 198 ++++ + drivers/usb/gadget/pxa25x_udc.c | 6 +- + drivers/video/pxafb.c | 64 ++- + include/asm-arm/arch-pxa/cm-x270.h | 50 - + include/asm-arm/arch-pxa/eseries-gpio.h | 50 + + include/asm-arm/arch-pxa/eseries-irq.h | 27 + + include/asm-arm/arch-pxa/hardware.h | 33 + + include/asm-arm/arch-pxa/irqs.h | 3 + + include/asm-arm/arch-pxa/mfp-pxa2xx.h | 1 + + include/asm-arm/arch-pxa/mfp-pxa930.h | 491 ++++++++++ + include/asm-arm/arch-pxa/mfp.h | 8 + + include/asm-arm/arch-pxa/palmtx.h | 106 ++ + include/asm-arm/arch-pxa/pxa27x-udc.h | 2 +- + include/asm-arm/arch-pxa/pxa2xx_spi.h | 2 + + include/asm-arm/arch-pxa/pxa3xx_nand.h | 2 + + include/asm-arm/arch-pxa/pxafb.h | 3 +- + include/asm-arm/arch-pxa/regs-lcd.h | 6 + + include/asm-arm/arch-pxa/regs-ssp.h | 16 +- + include/asm-arm/arch-pxa/system.h | 17 +- + include/asm-arm/arch-pxa/tosa.h | 50 +- + include/asm-arm/arch-pxa/tosa_bt.h | 22 + + include/asm-arm/arch-pxa/uncompress.h | 13 +- + include/asm-arm/arch-pxa/zylonite.h | 2 + + include/asm-arm/mach/udc_pxa2xx.h | 1 + + include/linux/mfd/core.h | 55 ++ + include/linux/mfd/tc6393xb.h | 49 + + include/linux/mfd/tmio.h | 17 + + include/linux/smc91x.h | 12 +- + sound/soc/pxa/Kconfig | 1 + + sound/soc/pxa/tosa.c | 29 +- + 94 files changed, 7354 insertions(+), 795 deletions(-) + create mode 100644 arch/arm/configs/ezx_defconfig + create mode 100644 arch/arm/mach-pxa/e400_lcd.c + create mode 100644 arch/arm/mach-pxa/e740_lcd.c + create mode 100644 arch/arm/mach-pxa/e750_lcd.c + create mode 100644 arch/arm/mach-pxa/e800_lcd.c + create mode 100644 arch/arm/mach-pxa/eseries_udc.c + create mode 100644 arch/arm/mach-pxa/ezx.c + create mode 100644 arch/arm/mach-pxa/palmtx.c + create mode 100644 arch/arm/mach-pxa/pxa930.c + create mode 100644 arch/arm/mach-pxa/reset.c + create mode 100644 arch/arm/mach-pxa/saar.c + create mode 100644 arch/arm/mach-pxa/tavorevb.c + create mode 100644 arch/arm/mach-pxa/tosa-bt.c + create mode 100644 drivers/mfd/mfd-core.c + create mode 100644 drivers/mfd/tc6393xb.c + create mode 100644 drivers/pcmcia/pxa2xx_palmtx.c + create mode 100644 drivers/power/palmtx_battery.c + delete mode 100644 include/asm-arm/arch-pxa/cm-x270.h + create mode 100644 include/asm-arm/arch-pxa/eseries-gpio.h + create mode 100644 include/asm-arm/arch-pxa/eseries-irq.h + create mode 100644 include/asm-arm/arch-pxa/mfp-pxa930.h + create mode 100644 include/asm-arm/arch-pxa/palmtx.h + create mode 100644 include/asm-arm/arch-pxa/tosa_bt.h + create mode 100644 include/linux/mfd/core.h + create mode 100644 include/linux/mfd/tc6393xb.h + create mode 100644 include/linux/mfd/tmio.h +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merged drivers/cpufreq/cpufreq.c +CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c +Auto-merged drivers/cpufreq/freq_table.c +Resolved 'drivers/cpufreq/cpufreq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d49e0f9: Merge commit 'cpufreq/next' +$ git diff -M --stat --summary HEAD^.. + 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 arch/s390/Kconfig +Auto-merged arch/s390/kernel/kprobes.c +Auto-merged arch/s390/kernel/setup.c +Auto-merged drivers/char/Kconfig +Auto-merged drivers/char/Makefile +Auto-merged drivers/char/hvc_console.c +Auto-merged drivers/char/hvc_console.h +CONFLICT (content): Merge conflict in drivers/char/hvc_console.h +Auto-merged drivers/char/hvc_xen.c +Auto-merged drivers/char/snsc.c +Auto-merged drivers/char/viotape.c +Auto-merged drivers/infiniband/core/user_mad.c +Auto-merged drivers/lguest/x86/core.c +Auto-merged drivers/net/3c527.c +Auto-merged drivers/net/tun.c +CONFLICT (content): Merge conflict in drivers/net/tun.c +Auto-merged drivers/net/virtio_net.c +Auto-merged drivers/net/wireless/airo.c +Auto-merged drivers/s390/kvm/kvm_virtio.c +Auto-merged drivers/usb/core/usb.c +Auto-merged drivers/usb/gadget/inode.c +Auto-merged fs/xfs/linux-2.6/xfs_buf.c +Auto-merged include/linux/if_tun.h +CONFLICT (content): Merge conflict in include/linux/if_tun.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/sched.h +Auto-merged include/linux/usb.h +Auto-merged init/Kconfig +Auto-merged kernel/cpu.c +Auto-merged kernel/exec_domain.c +Auto-merged kernel/kthread.c +Auto-merged kernel/module.c +Auto-merged kernel/mutex.c +Auto-merged kernel/printk.c +Auto-merged kernel/rcuclassic.c +Auto-merged kernel/sched.c +Auto-merged kernel/semaphore.c +Auto-merged kernel/softirq.c +Auto-merged kernel/stop_machine.c +CONFLICT (content): Merge conflict in kernel/stop_machine.c +Auto-merged kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Auto-merged lib/textsearch.c +Auto-merged mm/page_alloc.c +Resolved 'drivers/char/hvc_console.h' using previous resolution. +Resolved 'drivers/net/tun.c' using previous resolution. +Resolved 'include/linux/if_tun.h' using previous resolution. +Resolved 'kernel/stop_machine.c' using previous resolution. +Resolved 'kernel/sysctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 43d170b: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/kernel-locking.tmpl | 57 ++-- + Documentation/filesystems/bfs.txt | 10 +- + Documentation/lguest/lguest.c | 407 ++++++++++++++++---- + .../sound/alsa/DocBook/alsa-driver-api.tmpl | 2 +- + Documentation/telephony/ixj.txt | 13 +- + Documentation/video4linux/w9968cf.txt | 3 - + arch/blackfin/Kconfig | 4 +- + arch/ia64/kernel/salinfo.c | 4 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/kprobes.c | 6 +- + arch/s390/kernel/setup.c | 4 +- + arch/sparc64/kernel/process.c | 6 +- + arch/sparc64/kernel/traps.c | 3 - + arch/xtensa/Kconfig | 4 +- + drivers/block/virtio_blk.c | 10 +- + drivers/char/Kconfig | 11 +- + drivers/char/Makefile | 1 + + drivers/char/hvc_console.c | 85 +--- + drivers/char/hvc_console.h | 35 ++- + drivers/char/hvc_irq.c | 45 +++ + drivers/char/hvc_iseries.c | 2 + + drivers/char/hvc_vio.c | 2 + + drivers/char/hvc_xen.c | 2 + + drivers/char/hw_random/intel-rng.c | 6 +- + drivers/char/snsc.c | 4 +- + drivers/char/viotape.c | 4 +- + drivers/char/virtio_console.c | 40 ++- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/input/serio/hil_mlc.c | 4 +- + drivers/input/serio/hp_sdc_mlc.c | 14 +- + drivers/lguest/core.c | 1 + + drivers/lguest/interrupts_and_traps.c | 24 +- + drivers/lguest/lguest_device.c | 14 +- + drivers/lguest/x86/core.c | 4 +- + drivers/md/dm-raid1.c | 2 +- + drivers/net/3c527.c | 2 +- + drivers/net/irda/sir_dev.c | 2 +- + drivers/net/tun.c | 16 +- + drivers/net/virtio_net.c | 111 +++++- + drivers/net/wireless/airo.c | 12 +- + drivers/s390/kvm/kvm_virtio.c | 34 ++- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/gadget/inode.c | 2 +- + drivers/virtio/virtio.c | 26 +- + drivers/virtio/virtio_pci.c | 13 +- + drivers/virtio/virtio_ring.c | 41 ++- + 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/asm-s390/kvm_virtio.h | 10 + + include/linux/compiler-gcc.h | 18 + + include/linux/compiler-intel.h | 2 + + include/linux/kernel.h | 35 ++ + include/linux/kmod.h | 5 +- + include/linux/kthread.h | 29 ++- + include/linux/module.h | 50 ++-- + include/linux/mutex.h | 4 - + include/linux/semaphore.h | 8 +- + include/linux/stop_machine.h | 53 ++- + include/linux/timer.h | 32 ++- + include/linux/usb.h | 2 +- + include/linux/virtio_9p.h | 2 + + include/linux/virtio_balloon.h | 2 + + include/linux/virtio_blk.h | 5 + + include/linux/virtio_config.h | 16 +- + include/linux/virtio_console.h | 2 + + include/linux/virtio_net.h | 2 + + include/linux/virtio_pci.h | 5 +- + include/linux/virtio_ring.h | 14 +- + include/linux/virtio_rng.h | 2 + + init/Kconfig | 15 +- + kernel/cpu.c | 16 +- + kernel/exec_domain.c | 2 +- + kernel/kmod.c | 2 +- + kernel/kthread.c | 29 +-- + kernel/module.c | 342 ++++++++++------- + kernel/mutex.c | 4 +- + kernel/printk.c | 4 +- + kernel/rcuclassic.c | 4 +- + kernel/semaphore.c | 17 +- + kernel/stop_machine.c | 286 +++++++-------- + kernel/sysctl.c | 4 +- + lib/textsearch.c | 2 +- + mm/page_alloc.c | 4 +- + 86 files changed, 1394 insertions(+), 752 deletions(-) + create mode 100644 drivers/char/hvc_irq.c +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Merge made by recursive. + drivers/mmc/card/mmc_test.c | 138 +++++++++++++++++++++++++++++++++++- + include/linux/scatterlist.h | 12 +++ + lib/scatterlist.c | 166 +++++++++++++++++++++++++++++++------------ + 3 files changed, 269 insertions(+), 47 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging input/next +$ git merge input/next +Auto-merged MAINTAINERS +Auto-merged drivers/char/keyboard.c +Auto-merged drivers/hwmon/hdaps.c +Auto-merged drivers/input/input.c +Auto-merged drivers/input/serio/hil_mlc.c +Auto-merged drivers/input/serio/hp_sdc_mlc.c +Auto-merged drivers/input/serio/q40kbd.c +Auto-merged drivers/macintosh/adbhid.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 | 12 +- + drivers/input/evdev.c | 101 ++++++- + 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/input.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 | 46 +++- + 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/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + 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/sgio2_btns.c | 156 ++++++++++ + drivers/input/misc/wistron_btns.c | 19 ++- + drivers/input/misc/yealink.c | 50 ++-- + drivers/input/mouse/appletouch.c | 299 +++++++++---------- + drivers/input/mouse/atarimouse.c | 27 +- + 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/Kconfig | 10 + + drivers/input/serio/Makefile | 1 + + drivers/input/serio/ct82c710.c | 2 - + drivers/input/serio/hil_mlc.c | 6 +- + drivers/input/serio/hp_sdc_mlc.c | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 58 +++- + drivers/input/serio/libps2.c | 52 ---- + drivers/input/serio/q40kbd.c | 4 +- + drivers/input/serio/rpckbd.c | 2 - + drivers/input/serio/serio.c | 9 +- + drivers/input/serio/xilinx_ps2.c | 380 ++++++++++++++++++++++++ + drivers/input/tablet/acecad.c | 4 +- + drivers/input/tablet/aiptek.c | 6 +- + drivers/input/tablet/gtco.c | 2 +- + 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 | 46 +++ + drivers/input/touchscreen/Makefile | 4 + + drivers/input/touchscreen/gunze.c | 2 - + drivers/input/touchscreen/h3600_ts_input.c | 2 - + drivers/input/touchscreen/htcpen.c | 255 ++++++++++++++++ + drivers/input/touchscreen/inexio.c | 207 +++++++++++++ + drivers/input/touchscreen/migor_ts.c | 250 ++++++++++++++++ + drivers/input/touchscreen/touchit213.c | 234 +++++++++++++++ + drivers/input/touchscreen/usbtouchscreen.c | 42 ++- + drivers/input/touchscreen/wm9712.c | 18 +- + 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 - + include/linux/serio.h | 4 +- + 99 files changed, 2241 insertions(+), 550 deletions(-) + create mode 100644 drivers/input/misc/sgio2_btns.c + create mode 100644 drivers/input/serio/xilinx_ps2.c + create mode 100644 drivers/input/touchscreen/htcpen.c + create mode 100644 drivers/input/touchscreen/inexio.c + create mode 100644 drivers/input/touchscreen/migor_ts.c + create mode 100644 drivers/input/touchscreen/touchit213.c +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Auto-merged drivers/input/misc/hp_sdc_rtc.c +Auto-merged include/asm-sparc64/semaphore.h +CONFLICT (content): Merge conflict in include/asm-sparc64/semaphore.h +Auto-merged include/linux/semaphore.h +Resolved 'include/asm-sparc64/semaphore.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 90489bc: Merge commit 'semaphore/semaphore' +$ git diff -M --stat --summary HEAD^.. + 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-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 ++---- + 26 files changed, 27 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/scsi/qla2xxx/qla_attr.c' +Recorded preimage for 'drivers/scsi/qla2xxx/qla_mid.c' +Recorded preimage for 'drivers/scsi/qla2xxx/qla_os.c' +Resolved 'drivers/net/ps3_gelic_wireless.c' using previous resolution. +Resolved 'drivers/scsi/qla2xxx/qla_def.h' using previous resolution. +Resolved 'drivers/scsi/qla2xxx/qla_mbx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 90489bc Merge commit 'semaphore/semaphore' +$ git checkout -b tmp semaphore-removal/semaphore-removal +Switched to a new branch "tmp" +$ git revert e2c6f1aa2f67c585ffcb879d32ff3e74b53faf25 +Finished one revert. +Created commit 32b8d83: Revert "Convert qla_os to use mutex instead of semaphore" + 1 files changed, 5 insertions(+), 7 deletions(-) +$ git revert 5469811b8b0085c0f19fd3aaad29cde59761e243 +Finished one revert. +Created commit 492edca: Revert "qla2xxx: Turn vport_sem into vport_mutex" + 5 files changed, 16 insertions(+), 15 deletions(-) +$ git checkout master +Switched to branch "master" +$ git merge tmp +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 sound/soc/s3c24xx/s3c2443-ac97.c +Resolved 'drivers/net/ps3_gelic_wireless.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 38f8b5d: Merge branch 'tmp' +$ 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 ++++++++++++++---------------- + 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 ++++++----- + 11 files changed, 69 insertions(+), 63 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Merge made by recursive. +Merging trivial/next +$ git merge trivial/next +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/base/sys.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 include/linux/securebits.h +CONFLICT (content): Merge conflict in include/linux/securebits.h +Auto-merged mm/migrate.c +Auto-merged mm/slub.c +Auto-merged net/wireless/wext.c +Resolved 'include/linux/securebits.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 309785f: Merge commit 'trivial/next' +$ git diff -M --stat --summary HEAD^.. + 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 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 20 files changed, 25 insertions(+), 25 deletions(-) +Merging ubifs/for_andrew +$ git merge ubifs/for_andrew +Merge made by recursive. + Documentation/filesystems/ubifs.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Auto-merged drivers/char/Kconfig +Auto-merged drivers/char/Makefile +Auto-merged drivers/char/vt.c +Merge made by recursive. + drivers/char/Kconfig | 8 ++++++++ + drivers/char/Makefile | 4 ++-- + drivers/char/vt.c | 2 +- + include/linux/consolemap.h | 14 ++++++++++++++ + include/linux/vt_kern.h | 19 +++++++++++++++++++ + 5 files changed, 44 insertions(+), 3 deletions(-) +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Auto-merged drivers/media/dvb/ttpci/Makefile +CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/media/dvb/ttpci/av7110_hw.h +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Auto-merged drivers/net/acenic.h +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +Resolved 'drivers/media/dvb/ttpci/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 0da0a28: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 24 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 ----------------------------------- + drivers/net/e100.c | 283 +- + drivers/net/tg3.c | 789 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +------ + drivers/scsi/ql1040_fw.h | 2130 -------- + drivers/scsi/ql12160_fw.h | 1811 ------- + drivers/scsi/ql1280_fw.h | 2048 -------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 61 +- + drivers/scsi/qlogicpti_asm.c | 1160 ----- + firmware/Makefile | 17 + + firmware/WHENCE | 90 + + firmware/acenic/tg1.bin.ihex | 4573 +++++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 ++++++++++++++++++ + firmware/advansys/3550.bin.ihex | 317 ++ + firmware/advansys/38C0800.bin.ihex | 336 ++ + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 ++++++++ + firmware/qlogic/12160.bin.ihex | 1771 +++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 +++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + 40 files changed, 19377 insertions(+), 19349 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex +Merging pcmcia/master +$ git merge pcmcia/master +Auto-merged drivers/char/pcmcia/cm4000_cs.c +Auto-merged drivers/ide/legacy/ide-cs.c +Merge made by recursive. +Merging battery/master +$ git merge battery/master +Auto-merged drivers/power/Kconfig +CONFLICT (content): Merge conflict in drivers/power/Kconfig +Auto-merged drivers/power/Makefile +CONFLICT (content): Merge conflict in drivers/power/Makefile +Auto-merged drivers/power/power_supply_sysfs.c +Resolved 'drivers/power/Kconfig' using previous resolution. +Resolved 'drivers/power/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 43322de: Merge commit 'battery/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/power/power_supply_class.txt | 4 + + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/olpc_battery.c | 273 +++++++++++----- + drivers/power/power_supply_sysfs.c | 1 + + drivers/power/tosa_battery.c | 486 ++++++++++++++++++++++++++++ + include/linux/power_supply.h | 1 + + 7 files changed, 697 insertions(+), 76 deletions(-) + create mode 100644 drivers/power/tosa_battery.c +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + arch/arm/mach-iop32x/n2100.c | 52 ++++++ + drivers/leds/Kconfig | 16 ++ + drivers/leds/Makefile | 2 + + drivers/leds/led-triggers.c | 3 +- + drivers/leds/leds-atmel-pwm.c | 2 +- + drivers/leds/leds-h1940.c | 9 +- + drivers/leds/leds-pca9532.c | 337 ++++++++++++++++++++++++++++++++++++ + drivers/leds/leds-pca955x.c | 384 +++++++++++++++++++++++++++++++++++++++++ + include/linux/leds-pca9532.h | 45 +++++ + include/linux/leds.h | 16 ++- + 10 files changed, 860 insertions(+), 6 deletions(-) + create mode 100644 drivers/leds/leds-pca9532.c + create mode 100644 drivers/leds/leds-pca955x.c + create mode 100644 include/linux/leds-pca9532.h +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + drivers/video/backlight/Kconfig | 9 +++ + drivers/video/backlight/Makefile | 2 + + drivers/video/backlight/backlight.c | 1 + + drivers/video/backlight/mbp_nvidia_bl.c | 116 +++++++++++++++++++++++++++++++ + 4 files changed, 128 insertions(+), 0 deletions(-) + create mode 100644 drivers/video/backlight/mbp_nvidia_bl.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merged arch/powerpc/Kconfig +Merge made by recursive. + arch/arm/Kconfig | 1 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/kgdb.c | 201 +++++++++++++++ + arch/arm/kernel/setup.c | 2 + + arch/arm/kernel/traps.c | 5 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/Kconfig.debug | 50 +---- + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/kgdb.c | 410 +++++++++++++++++++++++++++++++ + arch/powerpc/kernel/setup_32.c | 16 -- + arch/powerpc/platforms/powermac/setup.c | 6 - + drivers/serial/cpm_uart/cpm_uart_core.c | 95 +++++++- + drivers/serial/mpsc.c | 148 +++++++++++- + include/asm-arm/kgdb.h | 104 ++++++++ + include/asm-arm/traps.h | 2 + + include/asm-powerpc/kgdb.h | 92 ++++---- + 16 files changed, 1025 insertions(+), 110 deletions(-) + create mode 100644 arch/arm/kernel/kgdb.c + create mode 100644 arch/powerpc/kernel/kgdb.c + create mode 100644 include/asm-arm/kgdb.h +Merging slab/for-next +$ git merge slab/for-next +Auto-merged mm/slub.c +Merge made by recursive. + mm/slub.c | 8 -------- + 1 files changed, 0 insertions(+), 8 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/Kconfig | 15 + + arch/m68knommu/Makefile | 11 +- + arch/m68knommu/configs/m5208evb_defconfig | 610 ++++++++++++++++++++++++ + arch/m68knommu/configs/m5249evb_defconfig | 497 ++++++++++++++++++++ + arch/m68knommu/configs/m5275evb_defconfig | 627 +++++++++++++++++++++++++ + arch/m68knommu/configs/m5307c3_defconfig | 580 +++++++++++++++++++++++ + arch/m68knommu/configs/m5407c3_defconfig | 641 ++++++++++++++++++++++++++ + arch/m68knommu/kernel/time.c | 40 +- + arch/m68knommu/kernel/traps.c | 38 ++- + arch/m68knommu/kernel/vmlinux.lds.S | 1 + + arch/m68knommu/platform/coldfire/Makefile | 2 +- + arch/m68knommu/platform/coldfire/dma_timer.c | 84 ++++ + arch/m68knommu/platform/coldfire/head.S | 3 +- + arch/m68knommu/platform/coldfire/pit.c | 91 ++++- + drivers/net/fec.c | 54 +--- + include/asm-m68knommu/bitops.h | 30 ++ + include/asm-m68knommu/byteorder.h | 16 +- + include/asm-m68knommu/commproc.h | 19 - + include/asm-m68knommu/system.h | 11 + + 19 files changed, 3253 insertions(+), 117 deletions(-) + create mode 100644 arch/m68knommu/configs/m5208evb_defconfig + create mode 100644 arch/m68knommu/configs/m5249evb_defconfig + create mode 100644 arch/m68knommu/configs/m5275evb_defconfig + create mode 100644 arch/m68knommu/configs/m5307c3_defconfig + create mode 100644 arch/m68knommu/configs/m5407c3_defconfig + create mode 100644 arch/m68knommu/platform/coldfire/dma_timer.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merged drivers/md/linear.c +Auto-merged drivers/md/raid10.c +Auto-merged drivers/md/raid5.c +Merge made by recursive. + Documentation/md.txt | 30 ++- + drivers/md/bitmap.c | 39 ++- + drivers/md/linear.c | 2 +- + drivers/md/md.c | 563 ++++++++++++++++++++++------------ + drivers/md/multipath.c | 15 +- + drivers/md/raid1.c | 19 +- + drivers/md/raid10.c | 20 +- + drivers/md/raid5.c | 729 +++++++++++++++---------------------------- + include/linux/raid/bitmap.h | 1 + + include/linux/raid/md.h | 2 +- + include/linux/raid/md_k.h | 9 +- + include/linux/raid/md_p.h | 3 - + include/linux/raid/raid5.h | 64 +++-- + 13 files changed, 763 insertions(+), 733 deletions(-) +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/arch-v10/boot/Makefile | 1 - + arch/cris/arch-v10/boot/compressed/Makefile | 14 +-- + .../compressed/{decompress.ld => decompress.lds} | 3 +- + arch/cris/arch-v10/boot/compressed/head.S | 98 +++++++------- + arch/cris/arch-v10/boot/compressed/misc.c | 144 +++++++++++--------- + arch/cris/arch-v10/boot/rescue/Makefile | 9 +- + .../arch-v10/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/arch-v10/drivers/pcf8563.c | 2 +- + arch/cris/arch-v10/kernel/debugport.c | 20 ++- + arch/cris/arch-v32/boot/Makefile | 1 - + arch/cris/arch-v32/boot/compressed/Makefile | 6 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v32/boot/rescue/Makefile | 3 +- + .../arch-v32/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/arch-v32/drivers/pcf8563.c | 2 +- + include/asm-cris/Kbuild | 5 +- + 16 files changed, 154 insertions(+), 154 deletions(-) + rename arch/cris/arch-v10/boot/compressed/{decompress.ld => decompress.lds} (82%) + rename arch/cris/arch-v10/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/arch-v32/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v32/boot/rescue/{rescue.ld => rescue.lds} (100%) +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/process.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged arch/x86/mm/fault.c +Auto-merged include/asm-x86/pgtable.h +Auto-merged include/asm-x86/pgtable_32.h +Auto-merged include/asm-x86/pgtable_64.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/kmemcheck.txt | 135 ++++++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 109 +++++++++ + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 12 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps_32.c | 11 +- + arch/x86/kernel/traps_64.c | 11 +- + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 ++- + arch/x86/mm/kmemcheck/Makefile | 3 + + arch/x86/mm/kmemcheck/error.c | 216 ++++++++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 ++ + arch/x86/mm/kmemcheck/kmemcheck.c | 485 +++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 72 ++++++ + arch/x86/mm/kmemcheck/opcode.h | 9 + + arch/x86/mm/kmemcheck/pte.c | 22 ++ + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 175 +++++++++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 ++ + arch/x86/mm/kmemcheck/smp.c | 80 ++++++ + arch/x86/mm/kmemcheck/smp.h | 23 ++ + arch/x86/mm/kmemcheck/string.c | 95 +++++++ + include/asm-x86/kdebug.h | 3 +- + include/asm-x86/kmemcheck.h | 36 +++ + include/asm-x86/pgtable.h | 4 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/pgtable_64.h | 6 + + include/asm-x86/string_32.h | 8 + + include/asm-x86/string_64.h | 1 + + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 70 ++++++ + include/linux/mm_types.h | 4 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++++ + include/linux/stacktrace.h | 3 + + init/main.c | 3 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 26 ++- + mm/Makefile | 2 +- + mm/kmemcheck.c | 97 ++++++++ + mm/slab.c | 101 ++------- + mm/slub.c | 20 ++- + 46 files changed, 1944 insertions(+), 118 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 arch/x86/mm/kmemcheck/smp.c + create mode 100644 arch/x86/mm/kmemcheck/smp.h + create mode 100644 arch/x86/mm/kmemcheck/string.c + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merged drivers/mfd/Kconfig +Merge made by recursive. + drivers/mfd/Kconfig | 2 +- + drivers/mfd/asic3.c | 388 ++++++++++++++++++++++++++------------------- + include/linux/mfd/asic3.h | 185 +++++++++++----------- + 3 files changed, 319 insertions(+), 256 deletions(-) +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Auto-merged drivers/char/pcmcia/synclink_cs.c +Auto-merged drivers/char/synclink.c +Auto-merged drivers/char/synclink_gt.c +Auto-merged drivers/char/synclinkmp.c +Auto-merged drivers/net/wan/Kconfig +Auto-merged drivers/net/wan/cosa.c +CONFLICT (content): Merge conflict in drivers/net/wan/cosa.c +Auto-merged drivers/net/wan/dscc4.c +Auto-merged drivers/net/wan/farsync.c +Auto-merged drivers/net/wan/hdlc.c +Auto-merged drivers/net/wan/hdlc_cisco.c +Auto-merged drivers/net/wan/hdlc_fr.c +Auto-merged drivers/net/wan/hdlc_raw_eth.c +Auto-merged drivers/net/wan/hdlc_x25.c +Auto-merged drivers/net/wan/pc300_drv.c +CONFLICT (content): Merge conflict in drivers/net/wan/pc300_drv.c +Auto-merged net/wanrouter/wanmain.c +Resolved 'drivers/net/wan/cosa.c' using previous resolution. +Resolved 'drivers/net/wan/pc300_drv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 91ddb10: Merge commit 'hdlc/hdlc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/z8530book.tmpl | 38 +-- + drivers/char/pcmcia/synclink_cs.c | 4 - + drivers/char/synclink.c | 4 - + drivers/char/synclink_gt.c | 5 - + drivers/char/synclinkmp.c | 4 - + drivers/net/wan/Kconfig | 13 +- + drivers/net/wan/Makefile | 11 +- + drivers/net/wan/cosa.c | 292 +++++++--------- + drivers/net/wan/dscc4.c | 1 - + drivers/net/wan/farsync.c | 5 +- + drivers/net/wan/farsync.h | 6 - + drivers/net/wan/hdlc.c | 25 +- + drivers/net/wan/hdlc_cisco.c | 29 +- + drivers/net/wan/hdlc_fr.c | 19 +- + drivers/net/wan/hdlc_ppp.c | 15 +- + drivers/net/wan/hdlc_raw.c | 15 +- + drivers/net/wan/hdlc_raw_eth.c | 17 +- + drivers/net/wan/hdlc_x25.c | 17 +- + drivers/net/wan/hostess_sv11.c | 382 ++++++++------------ + drivers/net/wan/lmc/lmc.h | 11 +- + drivers/net/wan/lmc/lmc_debug.c | 7 +- + drivers/net/wan/lmc/lmc_debug.h | 6 +- + drivers/net/wan/lmc/lmc_ioctl.h | 2 +- + drivers/net/wan/lmc/lmc_main.c | 672 +++++++++++++++------------------- + drivers/net/wan/lmc/lmc_media.c | 66 ++-- + drivers/net/wan/lmc/lmc_proto.c | 146 ++------ + drivers/net/wan/lmc/lmc_proto.h | 14 +- + drivers/net/wan/lmc/lmc_var.h | 360 +++++++------------ + drivers/net/wan/pc300.h | 228 +++++------- + drivers/net/wan/pc300_drv.c | 146 ++++---- + drivers/net/wan/sealevel.c | 361 +++++++----------- + drivers/net/wan/syncppp.c | 9 - + drivers/net/wan/z85230.c | 193 ++++------ + drivers/net/wan/z85230.h | 10 +- + include/net/syncppp.h | 2 - + net/wanrouter/wanmain.c | 27 -- + 36 files changed, 1245 insertions(+), 1917 deletions(-) +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merged drivers/char/Makefile +Auto-merged drivers/gpu/Makefile +CONFLICT (add/add): Merge conflict in drivers/gpu/Makefile +Auto-merged drivers/gpu/drm/i830/Makefile +CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i830/Makefile +Auto-merged include/Kbuild +CONFLICT (content): Merge conflict in include/Kbuild +Auto-merged include/drm/Kbuild +CONFLICT (add/add): Merge conflict in include/drm/Kbuild +Resolved 'drivers/gpu/Makefile' using previous resolution. +Resolved 'drivers/gpu/drm/i830/Makefile' using previous resolution. +Resolved 'include/Kbuild' using previous resolution. +Resolved 'include/drm/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 58fccd2: Merge commit 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. +Merging voltage/reg-for-linus +$ git merge voltage/reg-for-linus +Auto-merged MAINTAINERS +Auto-merged arch/arm/Kconfig +Auto-merged drivers/Makefile +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 315 ++++ + Documentation/power/regulator/consumer.txt | 182 +++ + Documentation/power/regulator/machine.txt | 101 ++ + Documentation/power/regulator/overview.txt | 171 ++ + Documentation/power/regulator/regulator.txt | 30 + + MAINTAINERS | 9 + + arch/arm/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/regulator/Kconfig | 59 + + drivers/regulator/Makefile | 12 + + drivers/regulator/bq24022.c | 167 ++ + drivers/regulator/core.c | 1903 +++++++++++++++++++++++ + drivers/regulator/fixed.c | 129 ++ + drivers/regulator/virtual.c | 345 ++++ + include/linux/regulator/bq24022.h | 21 + + include/linux/regulator/consumer.h | 284 ++++ + include/linux/regulator/driver.h | 99 ++ + include/linux/regulator/fixed.h | 22 + + include/linux/regulator/machine.h | 104 ++ + 19 files changed, 3956 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-regulator + create mode 100644 Documentation/power/regulator/consumer.txt + create mode 100644 Documentation/power/regulator/machine.txt + create mode 100644 Documentation/power/regulator/overview.txt + create mode 100644 Documentation/power/regulator/regulator.txt + create mode 100644 drivers/regulator/Kconfig + create mode 100644 drivers/regulator/Makefile + create mode 100644 drivers/regulator/bq24022.c + create mode 100644 drivers/regulator/core.c + create mode 100644 drivers/regulator/fixed.c + create mode 100644 drivers/regulator/virtual.c + create mode 100644 include/linux/regulator/bq24022.h + create mode 100644 include/linux/regulator/consumer.h + create mode 100644 include/linux/regulator/driver.h + create mode 100644 include/linux/regulator/fixed.h + create mode 100644 include/linux/regulator/machine.h +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged drivers/char/Kconfig +Auto-merged drivers/char/Makefile +Auto-merged drivers/char/ip2/ip2main.c +Auto-merged drivers/char/istallion.c +Auto-merged drivers/char/pcmcia/synclink_cs.c +Auto-merged drivers/char/stallion.c +Auto-merged drivers/char/synclink.c +Auto-merged drivers/char/synclink_gt.c +Auto-merged drivers/char/synclinkmp.c +Auto-merged drivers/char/tty_io.c +Auto-merged drivers/isdn/capi/capi.c +Auto-merged drivers/net/hamradio/6pack.c +Auto-merged drivers/net/hamradio/mkiss.c +Auto-merged drivers/net/ppp_async.c +Auto-merged drivers/net/wan/pc300_tty.c +CONFLICT (delete/modify): drivers/net/wireless/strip.c deleted in HEAD and modified in quilt/ttydev. Version quilt/ttydev of drivers/net/wireless/strip.c left in tree. +Auto-merged drivers/serial/8250_pnp.c +Auto-merged drivers/serial/mpc52xx_uart.c +Auto-merged drivers/serial/mpsc.c +Auto-merged drivers/serial/sh-sci.c +Auto-merged drivers/usb/class/cdc-acm.c +CONFLICT (delete/modify): drivers/usb/serial/airprime.c deleted in HEAD and modified in quilt/ttydev. Version quilt/ttydev of drivers/usb/serial/airprime.c left in tree. +Auto-merged drivers/usb/serial/cp2101.c +CONFLICT (content): Merge conflict in drivers/usb/serial/cp2101.c +Auto-merged drivers/usb/serial/digi_acceleport.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged drivers/usb/serial/ipaq.c +Auto-merged drivers/usb/serial/ir-usb.c +CONFLICT (content): Merge conflict in drivers/usb/serial/ir-usb.c +Auto-merged drivers/usb/serial/keyspan.h +Auto-merged drivers/usb/serial/keyspan_pda.c +Auto-merged drivers/usb/serial/kl5kusb105.c +Auto-merged drivers/usb/serial/option.c +Auto-merged drivers/usb/serial/usb-serial.c +CONFLICT (content): Merge conflict in drivers/usb/serial/usb-serial.c +Auto-merged net/bluetooth/rfcomm/tty.c +Recorded preimage for 'drivers/usb/serial/cp2101.c' +Recorded preimage for 'drivers/usb/serial/ir-usb.c' +Recorded preimage for 'drivers/usb/serial/usb-serial.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm drivers/net/wireless/strip.c +rm 'drivers/net/wireless/strip.c' +rm 'drivers/net/wireless/strip.c' +$ git rm drivers/usb/serial/airprime.c +rm 'drivers/usb/serial/airprime.c' +rm 'drivers/usb/serial/airprime.c' +$ git commit -v -a +Recorded resolution for 'drivers/usb/serial/cp2101.c'. +Recorded resolution for 'drivers/usb/serial/ir-usb.c'. +Recorded resolution for 'drivers/usb/serial/usb-serial.c'. +Created commit f122807: Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. + Documentation/serial/driver | 11 + + Documentation/specialix.txt | 8 +- + arch/ia64/hp/sim/simserial.c | 46 +- + arch/mn10300/kernel/mn10300-serial.c | 2 +- + drivers/bluetooth/hci_ldisc.c | 6 +- + drivers/char/Kconfig | 10 - + drivers/char/Makefile | 2 +- + drivers/char/amiserial.c | 3 +- + drivers/char/cyclades.c | 350 +++--- + drivers/char/epca.c | 168 ++-- + drivers/char/epca.h | 7 +- + drivers/char/esp.c | 277 +++--- + drivers/char/generic_serial.c | 158 ++-- + drivers/char/ip2/i2lib.c | 4 +- + drivers/char/ip2/ip2main.c | 7 +- + drivers/char/isicom.c | 245 ++--- + drivers/char/istallion.c | 132 ++-- + drivers/char/moxa.c | 96 +- + drivers/char/mxser.c | 331 +++---- + drivers/char/n_hdlc.c | 10 +- + drivers/char/n_r3964.c | 2 +- + drivers/char/n_tty.c | 2 +- + drivers/char/pcmcia/synclink_cs.c | 9 +- + drivers/char/pty.c | 10 +- + drivers/char/rio/cirrus.h | 3 - + drivers/char/rio/cmdblk.h | 6 - + drivers/char/rio/cmdpkt.h | 6 - + drivers/char/rio/daemon.h | 6 - + drivers/char/rio/errors.h | 6 - + drivers/char/rio/func.h | 6 - + drivers/char/rio/map.h | 4 - + drivers/char/rio/param.h | 5 - + drivers/char/rio/parmmap.h | 7 - + drivers/char/rio/pci.h | 4 - + drivers/char/rio/protsts.h | 7 - + drivers/char/rio/rio_linux.c | 25 +- + drivers/char/rio/rioboard.h | 6 - + drivers/char/rio/riocmd.c | 13 +- + drivers/char/rio/rioctrl.c | 4 - + drivers/char/rio/riodrvr.h | 4 - + drivers/char/rio/rioinfo.h | 4 - + drivers/char/rio/rioinit.c | 3 - + drivers/char/rio/riointr.c | 14 +- + drivers/char/rio/rioparam.c | 6 +- + drivers/char/rio/rioroute.c | 3 - + drivers/char/rio/riospace.h | 4 - + drivers/char/rio/riotable.c | 3 - + drivers/char/rio/riotty.c | 20 +- + drivers/char/rio/route.h | 6 - + drivers/char/rio/unixrup.h | 4 - + drivers/char/riscom8.c | 214 ++--- + drivers/char/riscom8.h | 10 +- + drivers/char/rocket.c | 144 ++-- + drivers/char/rocket.h | 4 +- + drivers/char/rocket_int.h | 11 +- + drivers/char/selection.c | 3 +- + drivers/char/specialix.c | 934 +++++++--------- + drivers/char/specialix_io8.h | 8 +- + drivers/char/stallion.c | 176 ++-- + drivers/char/sx.c | 118 +- + drivers/char/synclink.c | 220 ++-- + drivers/char/synclink_gt.c | 230 ++-- + drivers/char/synclinkmp.c | 228 ++-- + drivers/char/tty_io.c | 755 ++----------- + drivers/char/tty_ioctl.c | 16 +- + drivers/char/tty_ldisc.c | 714 ++++++++++++ + drivers/char/vme_scc.c | 5 +- + drivers/input/serio/serport.c | 2 +- + drivers/isdn/capi/capi.c | 7 +- + drivers/isdn/gigaset/ser-gigaset.c | 2 +- + drivers/net/hamradio/6pack.c | 2 +- + drivers/net/hamradio/mkiss.c | 2 +- + drivers/net/irda/irtty-sir.c | 2 +- + drivers/net/ppp_async.c | 2 +- + drivers/net/ppp_synctty.c | 2 +- + drivers/net/slip.c | 2 +- + drivers/net/wan/pc300_tty.c | 4 +- + drivers/net/wan/x25_asy.c | 2 +- + drivers/serial/21285.c | 12 +- + drivers/serial/68328serial.c | 30 +- + drivers/serial/68360serial.c | 52 +- + drivers/serial/8250.c | 16 +- + drivers/serial/8250.h | 2 - + drivers/serial/8250_pci.c | 2 - + drivers/serial/8250_pnp.c | 2 - + drivers/serial/Kconfig | 2 - + drivers/serial/Makefile | 2 - + drivers/serial/amba-pl010.c | 8 +- + drivers/serial/amba-pl011.c | 4 +- + drivers/serial/atmel_serial.c | 21 +- + drivers/serial/bfin_5xx.c | 10 +- + drivers/serial/bfin_sport_uart.c | 4 +- + drivers/serial/clps711x.c | 9 +- + drivers/serial/crisv10.c | 79 +- + drivers/serial/dz.c | 4 +- + drivers/serial/icom.c | 2 +- + drivers/serial/imx.c | 2 +- + drivers/serial/ioc3_serial.c | 14 +- + drivers/serial/ioc4_serial.c | 21 +- + drivers/serial/ip22zilog.c | 4 +- + drivers/serial/jsm/jsm_neo.c | 2 +- + drivers/serial/jsm/jsm_tty.c | 8 +- + drivers/serial/m32r_sio.c | 6 +- + drivers/serial/mcf.c | 2 +- + drivers/serial/mcfserial.c | 32 +- + drivers/serial/mpc52xx_uart.c | 2 +- + drivers/serial/mpsc.c | 6 +- + drivers/serial/mux.c | 2 +- + drivers/serial/netx-serial.c | 2 +- + drivers/serial/pmac_zilog.c | 4 +- + drivers/serial/pnx8xxx_uart.c | 4 +- + drivers/serial/pxa.c | 2 +- + drivers/serial/sa1100.c | 9 +- + drivers/serial/sb1250-duart.c | 2 +- + drivers/serial/sc26xx.c | 2 +- + drivers/serial/serial_core.c | 85 +- + drivers/serial/serial_ks8695.c | 2 +- + drivers/serial/serial_lh7a40x.c | 2 +- + drivers/serial/serial_txx9.c | 2 +- + drivers/serial/sh-sci.c | 8 +- + drivers/serial/sn_console.c | 2 +- + drivers/serial/sunhv.c | 2 +- + drivers/serial/sunsab.c | 2 +- + drivers/serial/sunsu.c | 4 +- + drivers/serial/sunzilog.c | 4 +- + drivers/serial/uartlite.c | 4 +- + drivers/serial/ucc_uart.c | 2 +- + drivers/serial/v850e_uart.c | 4 +- + drivers/serial/vr41xx_siu.c | 2 +- + drivers/serial/zs.c | 2 +- + drivers/usb/class/cdc-acm.c | 9 +- + drivers/usb/serial/aircable.c | 19 +- + drivers/usb/serial/ark3116.c | 32 +- + drivers/usb/serial/belkin_sa.c | 201 ++-- + drivers/usb/serial/belkin_sa.h | 15 +- + drivers/usb/serial/bus.c | 20 +- + drivers/usb/serial/ch341.c | 10 +- + drivers/usb/serial/console.c | 136 +-- + drivers/usb/serial/cp2101.c | 379 ++++---- + drivers/usb/serial/cyberjack.c | 176 ++-- + drivers/usb/serial/cypress_m8.c | 703 +++++++------ + drivers/usb/serial/cypress_m8.h | 2 +- + drivers/usb/serial/digi_acceleport.c | 457 ++++---- + drivers/usb/serial/empeg.c | 257 +++--- + drivers/usb/serial/ezusb.c | 22 +- + drivers/usb/serial/ftdi_sio.c | 1247 +++++++++++---------- + drivers/usb/serial/ftdi_sio.h | 126 ++-- + drivers/usb/serial/funsoft.c | 2 +- + drivers/usb/serial/garmin_gps.c | 400 ++++---- + drivers/usb/serial/generic.c | 122 ++- + drivers/usb/serial/hp4x.c | 3 +- + drivers/usb/serial/io_edgeport.c | 1964 ++++++++++++++++++--------------- + drivers/usb/serial/io_tables.h | 6 +- + drivers/usb/serial/io_ti.c | 95 +- + drivers/usb/serial/ipaq.c | 143 ++-- + drivers/usb/serial/ipw.c | 294 +++--- + drivers/usb/serial/ir-usb.c | 56 +- + drivers/usb/serial/iuu_phoenix.c | 58 +- + drivers/usb/serial/keyspan.c | 955 ++++++++-------- + drivers/usb/serial/keyspan.h | 39 +- + drivers/usb/serial/keyspan_pda.c | 231 ++-- + drivers/usb/serial/kl5kusb105.c | 415 ++++---- + drivers/usb/serial/kobil_sct.c | 617 ++++++----- + drivers/usb/serial/mct_u232.c | 364 +++---- + drivers/usb/serial/mos7720.c | 308 +++--- + drivers/usb/serial/mos7840.c | 557 ++++------ + drivers/usb/serial/navman.c | 10 +- + drivers/usb/serial/omninet.c | 171 ++-- + drivers/usb/serial/option.c | 166 ++-- + drivers/usb/serial/oti6858.c | 255 ++--- + drivers/usb/serial/pl2303.c | 140 ++-- + drivers/usb/serial/safe_serial.c | 298 +++--- + drivers/usb/serial/sierra.c | 95 +-- + drivers/usb/serial/spcp8x5.c | 73 +- + drivers/usb/serial/ti_usb_3410_5052.c | 449 ++++---- + drivers/usb/serial/usb-serial.c | 387 ++++--- + drivers/usb/serial/visor.c | 384 ++++--- + drivers/usb/serial/whiteheat.c | 441 +++++---- + drivers/usb/serial/whiteheat.h | 78 +- + fs/proc/proc_tty.c | 48 - + include/asm-avr32/ioctls.h | 4 + + include/asm-frv/ioctls.h | 4 + + include/asm-frv/termbits.h | 5 +- + include/linux/cyclades.h | 13 +- + include/linux/generic_serial.h | 8 +- + include/linux/hayesesp.h | 9 +- + include/linux/istallion.h | 6 +- + include/linux/serial_core.h | 27 +- + include/linux/stallion.h | 6 +- + include/linux/synclink.h | 1 + + include/linux/tty.h | 213 +++-- + include/linux/tty_driver.h | 14 +- + include/linux/tty_ldisc.h | 7 +- + include/linux/usb/serial.h | 56 +- + net/bluetooth/rfcomm/tty.c | 13 +- + net/irda/ircomm/ircomm_tty.c | 14 +- + 196 files changed, 10183 insertions(+), 10060 deletions(-) + create mode 100644 drivers/char/tty_ldisc.c +$ git am -3 ../patches/0001-usb-tty-API-change-fallout.patch +Applying usb: tty API change fallout +$ git reset HEAD^ +drivers/usb/serial/usb_debug.c: needs update +$ git commit -v -a --amend +Created commit 0a47200: Merge branch 'quilt/ttydev' +Applying sparc64: sysdev API change fallout +Applying sparc32: smp_call_function API change fallout diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..9d13df1ffa5f --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,228 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Unchanged quilt series driver-core +Unchanged quilt series usb +Importing device-mapper based on v2.6.26-3414-g33af79d +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard 33af79d12e0fa25545d49e86afc67ea8ad5f2f40 +HEAD is now at 33af79d scsi_dh: Verify "dev" is a sdev before accessing it. +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-mpath-free-path-selector-on-invalid-args.patch +dm-log-make-dm_dirty_log-init-and-exit-static.patch +dm-io-remove-struct-padding.patch +dm-mpath-return-parameter-error.patch +dm-mpath-fix-test-for-reinstate_path.patch +dm-mpath-use-more-error-codes.patch +dm-snapshot-track-snapshot-reads.patch +dm-snapshot-fix-race-during-exception-creation.patch +dm-snapshot-use-per-device-mempools.patch +dm-introduce-merge_bvec_fn.patch +dm-linear-add-merge.patch +dm-table-remove-merge_bvec-sector-restriction.patch +dm-crypt-add-merge.patch +Unchanged quilt series i2c +Unchanged quilt series kernel-doc +Unchanged quilt series ide +Importing m68k based on 45158894d4d6704afbb4cefe55e5f6ca279fe12a +$ git checkout quilt/m68k +Switched to branch "quilt/m68k" +$ git reset --hard 45158894d4d6704afbb4cefe55e5f6ca279fe12a +HEAD is now at 4515889 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc +$ git quiltimport --author Geert Uytterhoeven <geert@linux-m68k.org> --patches ../quilt/m68k +m68k-remove-CVS-keywords.diff +m68k-ariadne-use-netstats-in-net_device-structure.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 +m68k-make-multi_defconfig-the-default-defconfig.diff +m68k-remove-AP1000-code.diff +zorro-replace-deprecated-__initcall-with-equivalent-device_initcall.diff +zorro-use-memory_read_from_buffer.diff +amifb-add-ami_modedb-to-modelist.diff +atafb-add-atafb_modedb-to-modelist.diff +drivers-video-c2p.c-add-MODULE_LICENSE.diff +m68k-export-amiga_vblank.diff +m68k-export-c2p.diff +m68k-amiga-possible-cleanups.diff +m68k-atari-debug.c-possible-cleanups.diff +m68k-mac-possible-cleanups.diff +m68k-q40-config.c-make-functions-static.diff +m68k-sun3-possible-cleanups.diff +m68k-remove-stale-ARCH_SUN4-define.diff +apollo-missing-bootinfo.diff +m68k-mac-remove-the-unused-ADB_KEYBOARD-option.diff +m68k-atari-remove-the-dead-ATARI_SCC-options.diff +m68k-apollo-remove-the-unused-APOLLO_ELPLUS-option.diff +m68k-motorola-eliminate-NULL-test-and-memset-after-alloc_bootmem.diff +m68k-sun3-eliminate-NULL-test-and-memset-after-alloc_bootmem.diff +dio-use-dio_match_device.diff +m68k-initrd-fix.diff +Unchanged quilt series rr +Importing ttydev based on a3cf859321486f69506326146ab3e2fd15c05c3f +$ git checkout quilt/ttydev +Switched to branch "quilt/ttydev" +$ git reset --hard a3cf859321486f69506326146ab3e2fd15c05c3f +HEAD is now at a3cf859 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 +$ git quiltimport --author Alan Cox <alan@lxorguk.ukuu.org.uk> --patches ../quilt/ttydev +tty-simserial-fixes +serial-add-flush-buffer-to-uart_ops +atmel_serial-implement-flush-buffer-hook +tty-iscicom-enable-disable-pci +ldisc-ref +.dotest/patch:123: trailing whitespace. + if ( tty->ldisc.ops->flush_buffer ) +.dotest/patch:378: trailing whitespace. + +.dotest/patch:489: trailing whitespace. + +.dotest/patch:652: trailing whitespace. + +.dotest/patch:800: trailing whitespace. + +warning: 5 lines add whitespace errors. +rio_vcs +serial_vcs +tty-introduce-tty_port +.dotest/patch:72: trailing whitespace. + +warning: 1 line adds whitespace errors. +serial-core-use-tty_port +tty-mn10300-use-tty_port +tty-sparc-fix +tty-ppc-fix-zilog +ioc3_serial-fix-tty-port-breakage +tty-rest-fix-tty-port-breakage +tty.h-cleanup +epca-use-tty_port +esp-use-tty_port +gs-use-tty_port +riscom8-use-tty_port +riscom-tty-remove-dud-checks +isicom-use-tty_port +istallion-use-tty_port +moxa-use-tty_port +mxser-use-tty_port +rocketport-use-tty_port +atmel_serial-fix-tty_port-breakage +stallion-use-tty_port +synclink-use-tty_port +.dotest/patch:67: trailing whitespace. + if ( (info->port.flags & ASYNC_CHECK_CD) && +.dotest/patch:86: trailing whitespace. + if ( (info->port.flags & ASYNC_CTS_FLOW) && +.dotest/patch:125: space before tab in indent. + struct tty_struct *tty = info->port.tty; +.dotest/patch:153: space before tab in indent. + if (capable(CAP_SYS_ADMIN) && info->port.tty) +.dotest/patch:186: space before tab in indent. + if (!info->port.tty || info->port.tty->termios->c_cflag & HUPCL) { +warning: squelched 19 whitespace errors +warning: 24 lines add whitespace errors. +cleanup-tiocmset +cyclades-use-tty_port +termios-arch-laggards +more-tty_port-fields +tty-fix-strip +usb-serial-api-change +.dotest/patch:1406: trailing whitespace. +static void digi_set_termios(struct tty_struct *tty, +.dotest/patch:3280: trailing whitespace. +static void edge_set_termios(struct tty_struct *tty, +.dotest/patch:3620: space before tab in indent. + tty = port->port.tty; +.dotest/patch:3658: trailing whitespace. + port->serial->dev, +.dotest/patch:4305: space before tab in indent. + struct tty_struct *tty = port->port.tty; +warning: squelched 8 whitespace errors +warning: 13 lines add whitespace errors. +whiteheat-coding-style +whiteheat-fix-termios +tty-belkin_sa-cleanup +tty-tidy-usb-serial-bus +tty-tidy-usb-console +tty-usb-console-fix-termios +.dotest/patch:15: trailing whitespace. + +warning: 1 line adds whitespace errors. +tty-tidy-usb-cp2101 +tty-tidy-usb-cyberjack +tty-tidy-usb-cypress +tty-usb-cypress-charsize +tty-tidy-usb-digi-acceleport +tty-tidy-usb-empeg +tty-tidy-usb-ftdi-sio +tty-tidy-usb-funsoft +tty-tidy-usb-garmin-gps +tty-tidy-usb-generic +tty-tidy-usb-hp4x +tty-tidy-usb-visor +tty-tidy-usb-serial +tty-tidy-usb-io-ti +tty-tidy-usb-ipaq +tty-tidy-usb-ipw +.dotest/patch:362: space before tab in indent. + USB_RECIP_INTERFACE | USB_DIR_OUT, +.dotest/patch:385: space before tab in indent. + USB_RECIP_INTERFACE | USB_DIR_OUT, +warning: 2 lines add whitespace errors. +tty-tidy-usb-iuu-phoenix +tty-tidy-usb-keyspan +tty-usb-keyspan-flipstr +tty-tidy-usb-keyspan-pda +tty-usb-keyspan-pda-flip +tty-tidy-usb-kl5kusb105 +tty-tidy-usb-kobil-sct +tty-usb-kobil-sct-ioctl +tty-tidy-usb-mct-u232 +tty-usb-mct-u232-flip +tty-tidy-usb-pl2303 +tty-tidy-usb-sierra +tty-tidy-usb-spcp8x5 +tty-tidy-usb-ti-usb +tty-tidy-usb-safe-serial +tty-tidy-usb-oti6858 +tty-tidy-usb-option +tty-tidy-usb-omninet +tty-usb-omninet-flip +tty-tidy-usb-mos7840 +tty-tidy-usb-mos7720 +tty-tidy-usb-io-edgeport +.dotest/patch:442: trailing whitespace. + +warning: 1 line adds whitespace errors. +tty-usb-io-edgeport-returns +tty-split-ldisc +.dotest/patch:20: trailing whitespace. +obj-y += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o +.dotest/patch:857: trailing whitespace. + +.dotest/patch:950: trailing whitespace. + +.dotest/patch:1270: trailing whitespace. + +warning: 4 lines add whitespace errors. +tty-specialix-tidy +tty-specialix-code-tidy +tty-epca-fixes +tty-mxser-deadbrk +tty-mark-broken-brk +tty-break-errorhandler +tty-epca-restore +tty-isi-restore +tty-riscom8-restore +tty-stallion-brk-fixes +tty-specialix-restore +tty-ppc-fixes +tty-mxser-add-cpu-102uf +tty-epca-setup +tty-8250-shared-irq +tty-break-fix-sdio-uart +tty-n_hdlc-nonblock +Context reduced to (1/1) to apply fragment at 679 +tty-synclink_gt-bitorder +tty-synclink_gt-dma-fill +error: patch failed: drivers/char/synclink_gt.c:3457 +error: drivers/char/synclink_gt.c: patch does not apply diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..f6a0c5112194 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080718 |