diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-24 16:49:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-24 16:49:40 +1000 |
| commit | 5abec359d41554d76f8b563f44321e7fc838d1e0 (patch) | |
| tree | 86622663a66a40b784ad821fbdb877c79addaba6 | |
| parent | 68639cc9eef910c09803c3d8f45ef0166c7656b3 (diff) | |
Add linux-next specific filesnext-20080424
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 62 | ||||
| -rw-r--r-- | Next/merge.log | 2872 | ||||
| -rw-r--r-- | Next/quilt-import.log | 520 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 3455 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..914b22f401fe --- /dev/null +++ b/Next/Trees @@ -0,0 +1,62 @@ +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 +x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#for-linus +sched-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core/ +pci quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb/ +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#for-akpm +sched git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#for-akpm +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.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6#test +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +hwmon git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git#testing +ubi git git://git.infradead.org/~dedekind/ubi-2.6.git#master +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/tests.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6.git#for-akpm +m68k quilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/ +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#powerpc-next +hrt git git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git#mm +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_testing#master +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +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-2.6.26.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#vfs-2.6.25 +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +x86-latest git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#latest +sched-latest git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#latest +ldp quilt http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-ldp/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..a6c7d04de60f --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2872 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at aca239b Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 +Merging origin/master +$ git merge origin/master +Updating aca239b..3dc5063 +Fast forward + Documentation/filesystems/proc.txt | 38 ++++ + drivers/base/bus.c | 3 +- + drivers/base/power/main.c | 15 +- + drivers/leds/Kconfig | 1 - + drivers/net/hamradio/dmascc.c | 3 - + drivers/net/wireless/iwlwifi/Kconfig | 8 +- + drivers/net/wireless/iwlwifi/Makefile | 2 +- + drivers/net/wireless/rt2x00/Kconfig | 15 +- + drivers/pci/setup-bus.c | 30 ++-- + drivers/pnp/pnpacpi/rsparser.c | 10 +- + fs/dcache.c | 114 ++++++++---- + fs/internal.h | 11 + + fs/namespace.c | 331 ++++++++++++++++++++++++++------- + fs/pipe.c | 3 + + fs/pnode.c | 60 ++++++- + fs/pnode.h | 2 + + fs/proc/base.c | 125 +++++++------ + fs/seq_file.c | 111 +++++++++-- + fs/super.c | 1 + + fs/xattr.c | 1 - + include/linux/dcache.h | 3 +- + include/linux/fs.h | 6 - + include/linux/mnt_namespace.h | 12 ++ + include/linux/mount.h | 4 +- + include/linux/security.h | 52 +++--- + include/linux/seq_file.h | 6 + + include/net/xfrm.h | 3 + + kernel/exit.c | 27 +-- + kernel/time.c | 1 + + mm/slub.c | 4 +- + net/core/net-sysfs.c | 2 + + net/dccp/probe.c | 17 +- + net/ipv4/icmp.c | 10 +- + net/ipv4/ip_options.c | 12 +- + net/ipv4/tcp.c | 2 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv6/addrconf.c | 7 - + net/ipv6/ip6_fib.c | 2 +- + net/ipv6/route.c | 5 +- + net/key/af_key.c | 2 +- + net/rose/rose_route.c | 2 - + net/socket.c | 3 - + net/xfrm/xfrm_policy.c | 2 +- + net/xfrm/xfrm_user.c | 2 + + security/dummy.c | 10 +- + security/security.c | 20 +- + security/selinux/hooks.c | 8 +- + security/smack/smack_lsm.c | 4 +- + 48 files changed, 771 insertions(+), 343 deletions(-) +Applying The HTC PASIC3 LED/DS1WM chip support is ARM only +Merging x86-fixes/for-linus +$ git merge x86-fixes/for-linus +Merge made by recursive. + arch/x86/Kconfig | 2 +- + arch/x86/kernel/apic_32.c | 4 +- + arch/x86/kernel/apic_64.c | 2 +- + arch/x86/kernel/setup.c | 2 - + arch/x86/kernel/smpboot.c | 4 +- + arch/x86/mach-visws/mpparse.c | 15 +----------- + arch/x86/mach-voyager/setup.c | 2 +- + arch/x86/mach-voyager/voyager_smp.c | 43 ++++++++++------------------------ + arch/x86/mm/dump_pagetables.c | 2 +- + arch/x86/mm/highmem_32.c | 1 - + drivers/pci/intel-iommu.c | 35 +++++++++++++-------------- + include/asm-x86/arch_hooks.h | 1 - + include/asm-x86/processor.h | 3 -- + 13 files changed, 39 insertions(+), 77 deletions(-) +Merging sched-fixes/for-linus +$ git merge sched-fixes/for-linus +Merge made by recursive. + include/linux/seqlock.h | 46 +++++++++++++++++++++++++++++----------------- + kernel/time/tick-sched.c | 1 + + 2 files changed, 30 insertions(+), 17 deletions(-) +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 +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged drivers/base/power/main.c +CONFLICT (content): Merge conflict in drivers/base/power/main.c +Recorded preimage for 'drivers/base/power/main.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/apm_32.c | 8 +- + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + drivers/base/base.h | 11 - + drivers/base/class.c | 638 +------------------------------------ + drivers/base/core.c | 1 + + drivers/base/platform.c | 296 +++++++++++++++++- + drivers/base/power/main.c | 682 ++++++++++++++++++++++++++++++--------- + drivers/base/power/power.h | 2 +- + drivers/base/power/trace.c | 4 +- + drivers/net/phy/phy_device.c | 8 +- + drivers/pci/pci-driver.c | 372 +++++++++++++++++++--- + fs/sysfs/file.c | 13 + + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 1 + + include/linux/device.h | 106 +------ + include/linux/init.h | 1 + + include/linux/pci.h | 2 +- + include/linux/platform_device.h | 1 + + include/linux/pm.h | 314 ++++++++++++++++-- + include/linux/sysfs.h | 5 + + init/main.c | 9 + + kernel/power/disk.c | 20 +- + kernel/power/main.c | 6 +- + lib/kobject.c | 52 +++ + 25 files changed, 1559 insertions(+), 997 deletions(-) +Merging quilt/pci +$ git merge quilt/pci +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + Documentation/usb/WUSB-Design-overview.txt | 448 +++ + Documentation/usb/anchors.txt | 50 + + Documentation/usb/callbacks.txt | 132 + + Documentation/usb/persist.txt | 43 +- + Documentation/usb/usb-serial.txt | 7 +- + Documentation/usb/wusb-cbaf | 136 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/input/joystick/xpad.c | 20 +- + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 3 + + drivers/usb/atm/cxacru.c | 2 +- + drivers/usb/atm/ueagle-atm.c | 6 +- + drivers/usb/atm/usbatm.c | 27 +- + drivers/usb/atm/usbatm.h | 2 +- + drivers/usb/class/cdc-acm.c | 98 +- + drivers/usb/class/cdc-acm.h | 7 +- + drivers/usb/core/Kconfig | 42 +- + drivers/usb/core/config.c | 17 + + drivers/usb/core/devio.c | 73 +- + drivers/usb/core/driver.c | 52 +- + drivers/usb/core/hcd-pci.c | 15 +- + drivers/usb/core/hcd.c | 25 +- + drivers/usb/core/hcd.h | 9 +- + drivers/usb/core/hub.c | 479 ++- + drivers/usb/core/hub.h | 9 +- + drivers/usb/core/inode.c | 4 +- + drivers/usb/core/message.c | 17 +- + drivers/usb/core/quirks.c | 14 + + drivers/usb/core/sysfs.c | 22 +- + drivers/usb/core/urb.c | 26 +- + drivers/usb/core/usb.h | 2 - + drivers/usb/gadget/Kconfig | 18 +- + drivers/usb/gadget/amd5536udc.c | 10 + + drivers/usb/gadget/at91_udc.c | 9 +- + drivers/usb/gadget/dummy_hcd.c | 98 +- + drivers/usb/gadget/epautoconf.c | 12 +- + drivers/usb/gadget/ether.c | 18 +- + drivers/usb/gadget/file_storage.c | 36 +- + drivers/usb/gadget/fsl_usb2_udc.c | 4 +- + drivers/usb/gadget/fsl_usb2_udc.h | 2 +- + drivers/usb/gadget/gmidi.c | 2 +- + drivers/usb/gadget/goku_udc.c | 20 +- + drivers/usb/gadget/inode.c | 18 +- + drivers/usb/gadget/lh7a40x_udc.c | 132 +- + drivers/usb/gadget/m66592-udc.h | 2 +- + drivers/usb/gadget/net2280.h | 2 +- + drivers/usb/gadget/omap_udc.c | 20 +- + drivers/usb/gadget/printer.c | 92 +- + drivers/usb/gadget/pxa2xx_udc.c | 26 +- + drivers/usb/gadget/rndis.c | 148 +- + drivers/usb/gadget/serial.c | 3 +- + drivers/usb/host/Kconfig | 25 +- + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-au1xxx.c | 5 +- + drivers/usb/host/ehci-dbg.c | 4 +- + drivers/usb/host/ehci-fsl.c | 9 +- + drivers/usb/host/ehci-hcd.c | 113 +- + drivers/usb/host/ehci-hub.c | 34 +- + drivers/usb/host/ehci-ixp4xx.c | 3 +- + drivers/usb/host/ehci-pci.c | 9 +- + drivers/usb/host/ehci-ppc-soc.c | 5 +- + drivers/usb/host/ehci-ps3.c | 1 - + drivers/usb/host/ehci-q.c | 104 +- + drivers/usb/host/ehci-sched.c | 46 +- + drivers/usb/host/hwa-hc.c | 925 +++++ + drivers/usb/host/isp116x-hcd.c | 14 +- + drivers/usb/host/ohci-at91.c | 2 +- + drivers/usb/host/ohci-au1xxx.c | 1 - + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/ohci-ep93xx.c | 5 +- + drivers/usb/host/ohci-hub.c | 128 +- + drivers/usb/host/ohci-lh7a404.c | 1 - + drivers/usb/host/ohci-omap.c | 8 +- + drivers/usb/host/ohci-pci.c | 47 +- + drivers/usb/host/ohci-pnx4008.c | 1 - + drivers/usb/host/ohci-pnx8550.c | 1 - + drivers/usb/host/ohci-ppc-of.c | 1 - + drivers/usb/host/ohci-ppc-soc.c | 1 - + drivers/usb/host/ohci-ps3.c | 2 - + drivers/usb/host/ohci-pxa27x.c | 6 +- + drivers/usb/host/ohci-s3c2410.c | 1 - + drivers/usb/host/ohci-sa1111.c | 1 - + drivers/usb/host/ohci-sh.c | 1 - + drivers/usb/host/ohci-sm501.c | 16 +- + drivers/usb/host/ohci-ssb.c | 37 +- + drivers/usb/host/pci-quirks.c | 6 +- + drivers/usb/host/r8a66597-hcd.c | 256 +- + drivers/usb/host/r8a66597.h | 51 +- + drivers/usb/host/sl811-hcd.c | 12 +- + drivers/usb/host/u132-hcd.c | 5124 ++++++++++++++-------------- + drivers/usb/host/uhci-hcd.c | 35 +- + drivers/usb/host/uhci-q.c | 2 +- + drivers/usb/image/Kconfig | 4 +- + drivers/usb/image/microtek.c | 3 +- + drivers/usb/image/microtek.h | 1 - + drivers/usb/misc/Kconfig | 29 +- + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/adutux.c | 120 +- + drivers/usb/misc/appledisplay.c | 6 +- + drivers/usb/misc/auerswald.c | 135 +- + drivers/usb/misc/emi26.c | 30 +- + drivers/usb/misc/emi62.c | 32 +- + drivers/usb/misc/ftdi-elan.c | 2 +- + drivers/usb/misc/gotemp.c | 295 ++ + drivers/usb/misc/iowarrior.c | 10 +- + drivers/usb/misc/ldusb.c | 10 +- + drivers/usb/misc/legousbtower.c | 92 +- + drivers/usb/misc/phidgetkit.c | 6 +- + drivers/usb/misc/phidgetmotorcontrol.c | 2 +- + drivers/usb/misc/phidgetservo.c | 6 +- + drivers/usb/misc/usblcd.c | 8 +- + drivers/usb/misc/usbtest.c | 13 +- + drivers/usb/mon/Makefile | 2 +- + drivers/usb/mon/mon_bin.c | 9 +- + drivers/usb/mon/mon_main.c | 3 +- + drivers/usb/mon/mon_stat.c | 3 + + drivers/usb/serial/Kconfig | 76 +- + drivers/usb/serial/Makefile | 3 +- + drivers/usb/serial/aircable.c | 52 +- + drivers/usb/serial/airprime.c | 37 +- + drivers/usb/serial/ark3116.c | 10 +- + drivers/usb/serial/belkin_sa.c | 23 +- + drivers/usb/serial/ch341.c | 3 - + drivers/usb/serial/console.c | 10 +- + drivers/usb/serial/cp2101.c | 114 +- + drivers/usb/serial/cyberjack.c | 112 +- + drivers/usb/serial/cypress_m8.c | 579 ++-- + drivers/usb/serial/digi_acceleport.c | 50 +- + drivers/usb/serial/empeg.c | 59 +- + drivers/usb/serial/ezusb.c | 8 +- + drivers/usb/serial/ftdi_sio.c | 171 +- + drivers/usb/serial/funsoft.c | 3 - + drivers/usb/serial/garmin_gps.c | 115 +- + drivers/usb/serial/generic.c | 56 +- + drivers/usb/serial/hp4x.c | 3 - + drivers/usb/serial/io_edgeport.c | 326 +- + drivers/usb/serial/io_tables.h | 12 - + drivers/usb/serial/io_ti.c | 398 ++-- + drivers/usb/serial/ipaq.c | 53 +- + drivers/usb/serial/ipw.c | 51 +- + drivers/usb/serial/ir-usb.c | 53 +- + drivers/usb/serial/iuu_phoenix.c | 165 +- + drivers/usb/serial/keyspan.c | 281 +- + drivers/usb/serial/keyspan.h | 16 - + drivers/usb/serial/keyspan_pda.c | 42 +- + drivers/usb/serial/kl5kusb105.c | 124 +- + drivers/usb/serial/kobil_sct.c | 75 +- + drivers/usb/serial/mct_u232.c | 41 +- + drivers/usb/serial/mos7720.c | 122 +- + drivers/usb/serial/mos7840.c | 164 +- + drivers/usb/serial/navman.c | 31 +- + drivers/usb/serial/omninet.c | 42 +- + drivers/usb/serial/option.c | 92 +- + drivers/usb/serial/oti6858.c | 121 +- + drivers/usb/serial/pl2303.c | 117 +- + drivers/usb/serial/safe_serial.c | 60 +- + drivers/usb/serial/sierra.c | 129 +- + drivers/usb/serial/spcp8x5.c | 1072 ++++++ + drivers/usb/serial/ti_usb_3410_5052.c | 211 +- + drivers/usb/serial/usb-serial.c | 107 +- + drivers/usb/serial/usb_debug.c | 3 - + drivers/usb/serial/visor.c | 103 +- + drivers/usb/serial/whiteheat.c | 118 +- + drivers/usb/storage/Kconfig | 39 +- + drivers/usb/storage/Makefile | 1 + + drivers/usb/storage/cypress_atacb.c | 200 ++ + drivers/usb/storage/cypress_atacb.h | 25 + + drivers/usb/storage/libusual.c | 14 +- + drivers/usb/storage/scsiglue.c | 26 +- + drivers/usb/storage/transport.c | 23 +- + drivers/usb/storage/unusual_devs.h | 8 + + drivers/usb/storage/usb.c | 26 +- + drivers/usb/usb-skeleton.c | 8 +- + drivers/usb/wusbcore/Kconfig | 17 + + drivers/usb/wusbcore/Makefile | 20 + + drivers/usb/wusbcore/cbaf.c | 753 ++++ + drivers/usb/wusbcore/crypto.c | 537 +++ + drivers/usb/wusbcore/dev-sysfs.c | 199 ++ + drivers/usb/wusbcore/devconnect.c | 1307 +++++++ + drivers/usb/wusbcore/mmc.c | 329 ++ + drivers/usb/wusbcore/pal.c | 39 + + drivers/usb/wusbcore/reservation.c | 127 + + drivers/usb/wusbcore/rh.c | 477 +++ + drivers/usb/wusbcore/security.c | 536 +++ + drivers/usb/wusbcore/wa-hc.c | 83 + + drivers/usb/wusbcore/wa-hc.h | 420 +++ + drivers/usb/wusbcore/wa-nep.c | 313 ++ + drivers/usb/wusbcore/wa-rpipe.c | 548 +++ + drivers/usb/wusbcore/wa-xfer.c | 1710 ++++++++++ + drivers/usb/wusbcore/wusbhc.c | 395 +++ + drivers/usb/wusbcore/wusbhc.h | 522 +++ + drivers/uwb/Kconfig | 88 + + drivers/uwb/Makefile | 30 + + drivers/uwb/address.c | 380 ++ + drivers/uwb/beacon.c | 713 ++++ + drivers/uwb/driver.c | 308 ++ + drivers/uwb/drp-avail.c | 288 ++ + drivers/uwb/drp-ie.c | 230 ++ + drivers/uwb/drp.c | 406 +++ + drivers/uwb/est.c | 414 +++ + drivers/uwb/hwa-rc.c | 915 +++++ + drivers/uwb/i1480/Makefile | 2 + + drivers/uwb/i1480/dfu/Makefile | 9 + + drivers/uwb/i1480/dfu/dfu.c | 281 ++ + drivers/uwb/i1480/dfu/i1480-dfu.h | 264 ++ + drivers/uwb/i1480/dfu/mac.c | 530 +++ + drivers/uwb/i1480/dfu/phy.c | 203 ++ + drivers/uwb/i1480/dfu/usb.c | 501 +++ + drivers/uwb/i1480/i1480-est.c | 99 + + drivers/uwb/i1480/i1480-wlp.h | 160 + + drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 269 ++ + drivers/uwb/i1480/i1480u-wlp/lc.c | 421 +++ + drivers/uwb/i1480/i1480u-wlp/netdev.c | 367 ++ + drivers/uwb/i1480/i1480u-wlp/rx.c | 492 +++ + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 446 +++ + drivers/uwb/i1480/i1480u-wlp/tx.c | 641 ++++ + drivers/uwb/ie.c | 591 ++++ + drivers/uwb/lc-dev.c | 703 ++++ + drivers/uwb/lc-rc.c | 560 +++ + drivers/uwb/neh.c | 616 ++++ + drivers/uwb/pal.c | 71 + + drivers/uwb/reset.c | 328 ++ + drivers/uwb/rsv.c | 607 ++++ + drivers/uwb/scan.c | 160 + + drivers/uwb/umc-bus.c | 186 + + drivers/uwb/umc-dev.c | 104 + + drivers/uwb/umc-drv.c | 31 + + drivers/uwb/uwb-debug.c | 306 ++ + drivers/uwb/uwb-internal.h | 298 ++ + drivers/uwb/uwbd.c | 428 +++ + drivers/uwb/whc-rc.c | 552 +++ + drivers/uwb/whci.c | 285 ++ + drivers/uwb/wlp/Makefile | 10 + + drivers/uwb/wlp/driver.c | 43 + + drivers/uwb/wlp/eda.c | 449 +++ + drivers/uwb/wlp/messages.c | 1946 +++++++++++ + drivers/uwb/wlp/sysfs.c | 715 ++++ + drivers/uwb/wlp/txrx.c | 374 ++ + drivers/uwb/wlp/wlp-internal.h | 228 ++ + drivers/uwb/wlp/wlp-lc.c | 565 +++ + drivers/uwb/wlp/wss-lc.c | 1056 ++++++ + include/linux/bitmap.h | 1 + + include/linux/usb.h | 199 +- + include/linux/usb/audio.h | 2 +- + include/linux/usb/cdc.h | 4 + + include/linux/usb/ch9.h | 17 +- + include/linux/usb/g_printer.h | 4 + + include/linux/usb/gadget.h | 2 +- + include/linux/usb/gadgetfs.h | 16 +- + include/linux/usb/input.h | 8 +- + include/linux/usb/iowarrior.h | 6 +- + include/linux/usb/isp116x.h | 6 +- + include/linux/usb/midi.h | 2 +- + include/linux/usb/net2280.h | 9 +- + include/linux/usb/otg.h | 6 +- + include/linux/usb/quirks.h | 5 + + include/linux/usb/rndis_host.h | 9 +- + include/linux/usb/serial.h | 21 +- + include/linux/usb/sl811.h | 5 +- + include/linux/usb/usbnet.h | 8 +- + include/linux/usb/wusb-wa.h | 284 ++ + include/linux/usb/wusb.h | 420 +++ + include/linux/usb_usual.h | 1 + + include/linux/usbdevice_fs.h | 7 +- + include/linux/uwb.h | 770 +++++ + include/linux/uwb/bugs-macros.h | 64 + + include/linux/uwb/bugs.h | 18 + + include/linux/uwb/debug-cmd.h | 57 + + include/linux/uwb/debug.h | 82 + + include/linux/uwb/spec.h | 630 ++++ + include/linux/uwb/umc.h | 194 ++ + include/linux/uwb/util.h | 89 + + include/linux/uwb/whci.h | 117 + + include/linux/wlp.h | 728 ++++ + lib/bitmap.c | 20 + + scripts/checkpatch.pl | 7 + + 278 files changed, 41602 insertions(+), 6540 deletions(-) + create mode 100644 Documentation/usb/WUSB-Design-overview.txt + create mode 100644 Documentation/usb/anchors.txt + create mode 100644 Documentation/usb/callbacks.txt + create mode 100644 Documentation/usb/wusb-cbaf + create mode 100644 drivers/usb/host/hwa-hc.c + create mode 100644 drivers/usb/misc/gotemp.c + create mode 100644 drivers/usb/serial/spcp8x5.c + create mode 100644 drivers/usb/storage/cypress_atacb.c + create mode 100644 drivers/usb/storage/cypress_atacb.h + create mode 100644 drivers/usb/wusbcore/Kconfig + create mode 100644 drivers/usb/wusbcore/Makefile + create mode 100644 drivers/usb/wusbcore/cbaf.c + create mode 100644 drivers/usb/wusbcore/crypto.c + create mode 100644 drivers/usb/wusbcore/dev-sysfs.c + create mode 100644 drivers/usb/wusbcore/devconnect.c + create mode 100644 drivers/usb/wusbcore/mmc.c + create mode 100644 drivers/usb/wusbcore/pal.c + create mode 100644 drivers/usb/wusbcore/reservation.c + create mode 100644 drivers/usb/wusbcore/rh.c + create mode 100644 drivers/usb/wusbcore/security.c + create mode 100644 drivers/usb/wusbcore/wa-hc.c + create mode 100644 drivers/usb/wusbcore/wa-hc.h + create mode 100644 drivers/usb/wusbcore/wa-nep.c + create mode 100644 drivers/usb/wusbcore/wa-rpipe.c + create mode 100644 drivers/usb/wusbcore/wa-xfer.c + create mode 100644 drivers/usb/wusbcore/wusbhc.c + create mode 100644 drivers/usb/wusbcore/wusbhc.h + create mode 100644 drivers/uwb/Kconfig + create mode 100644 drivers/uwb/Makefile + create mode 100644 drivers/uwb/address.c + create mode 100644 drivers/uwb/beacon.c + create mode 100644 drivers/uwb/driver.c + create mode 100644 drivers/uwb/drp-avail.c + create mode 100644 drivers/uwb/drp-ie.c + create mode 100644 drivers/uwb/drp.c + create mode 100644 drivers/uwb/est.c + create mode 100644 drivers/uwb/hwa-rc.c + create mode 100644 drivers/uwb/i1480/Makefile + create mode 100644 drivers/uwb/i1480/dfu/Makefile + create mode 100644 drivers/uwb/i1480/dfu/dfu.c + create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h + create mode 100644 drivers/uwb/i1480/dfu/mac.c + create mode 100644 drivers/uwb/i1480/dfu/phy.c + create mode 100644 drivers/uwb/i1480/dfu/usb.c + create mode 100644 drivers/uwb/i1480/i1480-est.c + create mode 100644 drivers/uwb/i1480/i1480-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile + create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c + create mode 100644 drivers/uwb/ie.c + create mode 100644 drivers/uwb/lc-dev.c + create mode 100644 drivers/uwb/lc-rc.c + create mode 100644 drivers/uwb/neh.c + create mode 100644 drivers/uwb/pal.c + create mode 100644 drivers/uwb/reset.c + create mode 100644 drivers/uwb/rsv.c + create mode 100644 drivers/uwb/scan.c + create mode 100644 drivers/uwb/umc-bus.c + create mode 100644 drivers/uwb/umc-dev.c + create mode 100644 drivers/uwb/umc-drv.c + create mode 100644 drivers/uwb/uwb-debug.c + create mode 100644 drivers/uwb/uwb-internal.h + create mode 100644 drivers/uwb/uwbd.c + create mode 100644 drivers/uwb/whc-rc.c + create mode 100644 drivers/uwb/whci.c + create mode 100644 drivers/uwb/wlp/Makefile + create mode 100644 drivers/uwb/wlp/driver.c + create mode 100644 drivers/uwb/wlp/eda.c + create mode 100644 drivers/uwb/wlp/messages.c + create mode 100644 drivers/uwb/wlp/sysfs.c + create mode 100644 drivers/uwb/wlp/txrx.c + create mode 100644 drivers/uwb/wlp/wlp-internal.h + create mode 100644 drivers/uwb/wlp/wlp-lc.c + create mode 100644 drivers/uwb/wlp/wss-lc.c + create mode 100644 include/linux/usb/wusb-wa.h + create mode 100644 include/linux/usb/wusb.h + create mode 100644 include/linux/uwb.h + create mode 100644 include/linux/uwb/bugs-macros.h + create mode 100644 include/linux/uwb/bugs.h + create mode 100644 include/linux/uwb/debug-cmd.h + create mode 100644 include/linux/uwb/debug.h + create mode 100644 include/linux/uwb/spec.h + create mode 100644 include/linux/uwb/umc.h + create mode 100644 include/linux/uwb/util.h + create mode 100644 include/linux/uwb/whci.h + create mode 100644 include/linux/wlp.h +$ git revert db9ad1b590374251cfb33bf22c6f4a6d38f7c481 +Finished one revert. +Created commit 76c602c: Revert "driver core: remove no longer used "struct class_device"" + 3 files changed, 745 insertions(+), 1 deletions(-) +Merging x86/for-akpm +$ git merge x86/for-akpm +Merge made by recursive. + arch/x86/Kconfig | 3 +++ + arch/x86/Kconfig.debug | 13 +++++++++++++ + arch/x86/configs/i386_defconfig | 1 + + arch/x86/configs/x86_64_defconfig | 1 + + include/linux/compiler-gcc.h | 13 ++++++++++--- + 5 files changed, 28 insertions(+), 3 deletions(-) +Merging sched/for-akpm +$ git merge sched/for-akpm +Auto-merged arch/x86/Kconfig +Merge made by recursive. + Makefile | 4 + + arch/x86/Kconfig | 1 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/alternative.c | 4 +- + arch/x86/kernel/entry_32.S | 68 + + arch/x86/kernel/entry_64.S | 102 ++ + arch/x86/kernel/ftrace.c | 159 ++ + arch/x86/kernel/machine_kexec_32.c | 4 + + arch/x86/kernel/machine_kexec_64.c | 4 + + arch/x86/kernel/process_32.c | 3 + + arch/x86/kernel/process_64.c | 3 + + arch/x86/kernel/vsyscall_64.c | 3 +- + arch/x86/lib/Makefile | 1 + + arch/x86/lib/thunk_32.S | 47 + + arch/x86/lib/thunk_64.S | 19 +- + arch/x86/vdso/vclock_gettime.c | 15 +- + arch/x86/vdso/vgetcpu.c | 3 +- + include/asm-x86/alternative.h | 2 + + include/asm-x86/irqflags.h | 24 +- + include/asm-x86/vsyscall.h | 3 +- + include/linux/ftrace.h | 123 ++ + include/linux/irqflags.h | 13 +- + include/linux/linkage.h | 2 + + include/linux/preempt.h | 34 +- + include/linux/rcupdate.h | 2 - + include/linux/sched.h | 48 + + kernel/Makefile | 10 + + kernel/fork.c | 2 +- + kernel/lockdep.c | 30 +- + kernel/printk.c | 31 +- + kernel/rcupreempt.c | 2 - + kernel/sched.c | 73 +- + kernel/softlockup.c | 4 +- + kernel/spinlock.c | 2 +- + kernel/sysctl.c | 11 + + kernel/trace/Kconfig | 131 ++ + kernel/trace/Makefile | 23 + + kernel/trace/ftrace.c | 1396 +++++++++++++++++ + kernel/trace/trace.c | 2685 +++++++++++++++++++++++++++++++++ + kernel/trace/trace.h | 301 ++++ + kernel/trace/trace_functions.c | 76 + + kernel/trace/trace_irqsoff.c | 502 ++++++ + kernel/trace/trace_sched_switch.c | 183 +++ + kernel/trace/trace_sched_wakeup.c | 288 ++++ + kernel/trace/trace_selftest.c | 551 +++++++ + kernel/trace/trace_selftest_dynamic.c | 7 + + kernel/trace/trace_sysprof.c | 355 +++++ + lib/Kconfig.debug | 2 + + lib/Makefile | 9 + + lib/smp_processor_id.c | 6 +- + 50 files changed, 7291 insertions(+), 81 deletions(-) + create mode 100644 arch/x86/kernel/ftrace.c + create mode 100644 arch/x86/lib/thunk_32.S + create mode 100644 include/linux/ftrace.h + create mode 100644 kernel/trace/Kconfig + create mode 100644 kernel/trace/Makefile + create mode 100644 kernel/trace/ftrace.c + create mode 100644 kernel/trace/trace.c + create mode 100644 kernel/trace/trace.h + create mode 100644 kernel/trace/trace_functions.c + create mode 100644 kernel/trace/trace_irqsoff.c + create mode 100644 kernel/trace/trace_sched_switch.c + create mode 100644 kernel/trace/trace_sched_wakeup.c + create mode 100644 kernel/trace/trace_selftest.c + create mode 100644 kernel/trace/trace_selftest_dynamic.c + create mode 100644 kernel/trace/trace_sysprof.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Removed drivers/md/kcopyd.h +Merge made by recursive. + drivers/md/Makefile | 6 +- + drivers/md/dm-exception-store.c | 8 +- + drivers/md/dm-io.c | 27 +- + drivers/md/{kcopyd.c => dm-kcopyd.c} | 296 ++++++++------------ + drivers/md/dm-log.c | 254 +++++++++++------ + drivers/md/dm-raid1.c | 132 +++++----- + drivers/md/dm-snap.c | 18 +- + drivers/md/dm-snap.h | 4 +- + drivers/md/dm-table.c | 42 +--- + drivers/md/dm.c | 16 +- + drivers/md/dm.h | 98 +------ + drivers/md/kcopyd.h | 42 --- + include/linux/device-mapper.h | 96 ++++++- + .../md/dm-log.h => include/linux/dm-dirty-log.h | 84 +++--- + {drivers/md => include/linux}/dm-io.h | 18 +- + include/linux/dm-kcopyd.h | 47 +++ + 16 files changed, 594 insertions(+), 594 deletions(-) + rename drivers/md/{kcopyd.c => dm-kcopyd.c} (71%) + delete mode 100644 drivers/md/kcopyd.h + rename drivers/md/dm-log.h => include/linux/dm-dirty-log.h (53%) + rename {drivers/md => include/linux}/dm-io.h (84%) + create mode 100644 include/linux/dm-kcopyd.h +Merging hid/mm +$ git merge hid/mm +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + MAINTAINERS | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merged Documentation/00-INDEX +Auto-merged Documentation/DocBook/kernel-locking.tmpl +CONFLICT (content): Merge conflict in Documentation/DocBook/kernel-locking.tmpl +Resolved 'Documentation/DocBook/kernel-locking.tmpl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/00-INDEX | 2 - + Documentation/DMA-API.txt | 4 +- + Documentation/DocBook/kernel-locking.tmpl | 25 ++++- + Documentation/kbuild/00-INDEX | 4 + + Documentation/kbuild/make-configs.txt | 188 +++++++++++++++++++++++++++ + Documentation/{ => kbuild}/smart-config.txt | 2 +- + Documentation/spi/spidev | 168 +----------------------- + Documentation/spi/spidev_fdx.c | 158 ++++++++++++++++++++++ + README | 32 +++-- + scripts/kernel-doc | 25 +++- + 10 files changed, 417 insertions(+), 191 deletions(-) + create mode 100644 Documentation/kbuild/make-configs.txt + rename Documentation/{ => kbuild}/smart-config.txt (99%) + create mode 100644 Documentation/spi/spidev_fdx.c +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Merge made by recursive. + Documentation/video4linux/CARDLIST.au0828 | 4 + + Documentation/video4linux/CARDLIST.bttv | 2 + + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.cx88 | 9 + + Documentation/video4linux/CARDLIST.saa7134 | 9 + + Documentation/video4linux/extract_xc3028.pl | 46 +- + drivers/media/Kconfig | 11 +- + drivers/media/common/ir-functions.c | 2 +- + drivers/media/common/ir-keymaps.c | 102 ++- + drivers/media/common/saa7146_core.c | 8 +- + drivers/media/common/saa7146_i2c.c | 6 +- + drivers/media/common/saa7146_vbi.c | 4 +- + drivers/media/common/saa7146_video.c | 4 +- + drivers/media/dvb/b2c2/Kconfig | 5 + + drivers/media/dvb/b2c2/Makefile | 2 + + drivers/media/dvb/b2c2/flexcop-common.h | 17 +- + drivers/media/dvb/b2c2/flexcop-dma.c | 4 +- + drivers/media/dvb/b2c2/flexcop-eeprom.c | 9 +- + drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 211 ++- + drivers/media/dvb/b2c2/flexcop-i2c.c | 180 ++- + drivers/media/dvb/b2c2/flexcop-misc.c | 2 + + drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- + drivers/media/dvb/b2c2/flexcop-reg.h | 2 + + drivers/media/dvb/b2c2/flexcop-sram.c | 28 +- + drivers/media/dvb/b2c2/flexcop-usb.c | 17 +- + drivers/media/dvb/b2c2/flexcop.c | 18 +- + drivers/media/dvb/bt8xx/Kconfig | 2 +- + drivers/media/dvb/bt8xx/Makefile | 5 +- + drivers/media/dvb/bt8xx/dst.c | 2 +- + drivers/media/dvb/bt8xx/dst_ca.c | 10 +- + drivers/media/dvb/bt8xx/dvb-bt8xx.c | 23 +- + drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 +- + drivers/media/dvb/cinergyT2/cinergyT2.c | 9 +- + drivers/media/dvb/dvb-core/demux.h | 2 + + drivers/media/dvb/dvb-core/dmxdev.c | 87 +- + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 36 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 6 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 30 +- + drivers/media/dvb/dvb-core/dvb_net.c | 32 +- + drivers/media/dvb/dvb-core/dvb_ringbuffer.c | 6 +- + drivers/media/dvb/dvb-core/dvb_ringbuffer.h | 8 + + drivers/media/dvb/dvb-core/dvbdev.c | 47 +- + drivers/media/dvb/dvb-core/dvbdev.h | 13 +- + drivers/media/dvb/dvb-usb/Kconfig | 1 + + drivers/media/dvb/dvb-usb/a800.c | 6 +- + drivers/media/dvb/dvb-usb/af9005.c | 5 +- + drivers/media/dvb/dvb-usb/au6610.c | 6 +- + drivers/media/dvb/dvb-usb/cxusb.c | 51 +- + drivers/media/dvb/dvb-usb/dib0700.h | 4 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 9 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 325 ++++- + drivers/media/dvb/dvb-usb/dibusb-mb.c | 14 +- + drivers/media/dvb/dvb-usb/dibusb-mc.c | 5 +- + drivers/media/dvb/dvb-usb/digitv.c | 8 +- + drivers/media/dvb/dvb-usb/dtt200u.c | 17 +- + drivers/media/dvb/dvb-usb/dvb-usb-common.h | 3 +- + drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 9 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 13 +- + drivers/media/dvb/dvb-usb/dvb-usb-init.c | 16 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 5 +- + drivers/media/dvb/dvb-usb/gl861.c | 6 +- + drivers/media/dvb/dvb-usb/gp8psk-fe.c | 4 +- + drivers/media/dvb/dvb-usb/gp8psk.c | 5 +- + drivers/media/dvb/dvb-usb/m920x.c | 34 +- + drivers/media/dvb/dvb-usb/nova-t-usb2.c | 5 +- + drivers/media/dvb/dvb-usb/opera1.c | 8 +- + drivers/media/dvb/dvb-usb/ttusb2.c | 67 +- + drivers/media/dvb/dvb-usb/umt-010.c | 5 +- + drivers/media/dvb/dvb-usb/vp702x-fe.c | 18 +- + drivers/media/dvb/dvb-usb/vp702x.c | 5 +- + drivers/media/dvb/dvb-usb/vp7045.c | 6 +- + drivers/media/dvb/frontends/Kconfig | 28 + + drivers/media/dvb/frontends/Makefile | 4 + + drivers/media/dvb/frontends/au8522.c | 692 ++++++++ + drivers/media/dvb/frontends/au8522.h | 56 + + drivers/media/dvb/frontends/bcm3510.c | 4 +- + drivers/media/dvb/frontends/bcm3510.h | 2 +- + drivers/media/dvb/frontends/bsbe1.h | 58 +- + drivers/media/dvb/frontends/bsru6.h | 2 +- + drivers/media/dvb/frontends/cx22700.c | 12 +- + drivers/media/dvb/frontends/cx22700.h | 2 +- + drivers/media/dvb/frontends/cx22702.c | 26 +- + drivers/media/dvb/frontends/cx22702.h | 2 +- + drivers/media/dvb/frontends/cx24110.c | 6 +- + drivers/media/dvb/frontends/cx24110.h | 2 +- + drivers/media/dvb/frontends/cx24113.h | 48 + + drivers/media/dvb/frontends/cx24123.c | 304 +++-- + drivers/media/dvb/frontends/cx24123.h | 21 +- + drivers/media/dvb/frontends/dib3000.h | 2 +- + drivers/media/dvb/frontends/dib3000mc.h | 2 +- + drivers/media/dvb/frontends/dvb-pll.c | 260 +--- + drivers/media/dvb/frontends/dvb-pll.h | 33 +- + drivers/media/dvb/frontends/isl6405.c | 164 ++ + drivers/media/dvb/frontends/isl6405.h | 74 + + drivers/media/dvb/frontends/isl6421.h | 2 +- + drivers/media/dvb/frontends/itd1000.c | 400 +++++ + drivers/media/dvb/frontends/itd1000.h | 42 + + drivers/media/dvb/frontends/itd1000_priv.h | 88 + + drivers/media/dvb/frontends/l64781.c | 2 +- + drivers/media/dvb/frontends/l64781.h | 2 +- + drivers/media/dvb/frontends/lgdt330x.c | 40 +- + drivers/media/dvb/frontends/lgdt330x.h | 2 +- + drivers/media/dvb/frontends/lnbp21.h | 2 +- + drivers/media/dvb/frontends/mt2060.h | 2 +- + drivers/media/dvb/frontends/mt2131.c | 14 +- + drivers/media/dvb/frontends/mt2131.h | 2 +- + drivers/media/dvb/frontends/mt2266.h | 2 +- + drivers/media/dvb/frontends/mt312.c | 151 ++- + drivers/media/dvb/frontends/mt312.h | 5 +- + drivers/media/dvb/frontends/mt312_priv.h | 5 +- + drivers/media/dvb/frontends/mt352.c | 8 +- + drivers/media/dvb/frontends/mt352.h | 2 +- + drivers/media/dvb/frontends/nxt200x.c | 26 +- + drivers/media/dvb/frontends/nxt200x.h | 2 +- + drivers/media/dvb/frontends/nxt6000.c | 2 +- + drivers/media/dvb/frontends/nxt6000.h | 2 +- + drivers/media/dvb/frontends/or51132.c | 6 +- + drivers/media/dvb/frontends/or51132.h | 2 +- + drivers/media/dvb/frontends/or51211.c | 6 +- + drivers/media/dvb/frontends/or51211.h | 2 +- + drivers/media/dvb/frontends/qt1010.h | 2 +- + drivers/media/dvb/frontends/s5h1409.c | 50 +- + drivers/media/dvb/frontends/s5h1409.h | 2 +- + drivers/media/dvb/frontends/s5h1420.c | 523 ++++--- + drivers/media/dvb/frontends/s5h1420.h | 64 +- + drivers/media/dvb/frontends/s5h1420_priv.h | 102 ++ + drivers/media/dvb/frontends/sp8870.c | 38 +- + drivers/media/dvb/frontends/sp8870.h | 2 +- + drivers/media/dvb/frontends/sp887x.c | 18 +- + drivers/media/dvb/frontends/sp887x.h | 2 +- + drivers/media/dvb/frontends/stv0297.c | 14 +- + drivers/media/dvb/frontends/stv0297.h | 2 +- + drivers/media/dvb/frontends/stv0299.c | 85 +- + drivers/media/dvb/frontends/stv0299.h | 13 +- + drivers/media/dvb/frontends/tda10021.c | 4 +- + drivers/media/dvb/frontends/tda10023.c | 4 +- + drivers/media/dvb/frontends/tda1002x.h | 4 +- + drivers/media/dvb/frontends/tda10048.c | 704 ++++++++ + drivers/media/dvb/frontends/tda10048.h | 63 + + drivers/media/dvb/frontends/tda1004x.c | 56 +- + drivers/media/dvb/frontends/tda1004x.h | 5 +- + drivers/media/dvb/frontends/tda10086.c | 147 +- + drivers/media/dvb/frontends/tda10086.h | 14 +- + drivers/media/dvb/frontends/tda18271-common.c | 57 +- + drivers/media/dvb/frontends/tda18271-fe.c | 418 ++--- + drivers/media/dvb/frontends/tda18271-priv.h | 18 +- + drivers/media/dvb/frontends/tda18271-tables.c | 84 +- + drivers/media/dvb/frontends/tda18271.h | 25 +- + drivers/media/dvb/frontends/tda8083.c | 4 +- + drivers/media/dvb/frontends/tda8083.h | 2 +- + drivers/media/dvb/frontends/tda826x.c | 25 +- + drivers/media/dvb/frontends/tda826x.h | 2 +- + drivers/media/dvb/frontends/tda827x.c | 167 +- + drivers/media/dvb/frontends/tda827x.h | 6 +- + drivers/media/dvb/frontends/tua6100.c | 2 +- + drivers/media/dvb/frontends/tua6100.h | 2 +- + drivers/media/dvb/frontends/ves1820.c | 4 +- + drivers/media/dvb/frontends/ves1820.h | 2 +- + drivers/media/dvb/frontends/ves1x93.c | 8 +- + drivers/media/dvb/frontends/ves1x93.h | 2 +- + drivers/media/dvb/frontends/xc5000.c | 46 +- + drivers/media/dvb/frontends/xc5000.h | 2 +- + drivers/media/dvb/frontends/zl10353.c | 8 +- + drivers/media/dvb/frontends/zl10353.h | 2 +- + drivers/media/dvb/pluto2/pluto2.c | 5 +- + drivers/media/dvb/ttpci/av7110.c | 16 +- + drivers/media/dvb/ttpci/av7110.h | 2 +- + drivers/media/dvb/ttpci/av7110_hw.c | 42 +- + drivers/media/dvb/ttpci/av7110_ir.c | 6 +- + drivers/media/dvb/ttpci/av7110_v4l.c | 4 +- + drivers/media/dvb/ttpci/budget-av.c | 16 +- + drivers/media/dvb/ttpci/budget-ci.c | 6 +- + drivers/media/dvb/ttpci/budget-core.c | 9 +- + drivers/media/dvb/ttpci/budget.c | 111 ++- + drivers/media/dvb/ttpci/budget.h | 3 +- + drivers/media/dvb/ttpci/ttpci-eeprom.c | 2 +- + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 58 +- + drivers/media/dvb/ttusb-dec/ttusb_dec.c | 112 +- + drivers/media/dvb/ttusb-dec/ttusbdecfe.c | 4 +- + drivers/media/radio/dsbr100.c | 2 + + drivers/media/radio/miropcm20-radio.c | 2 + + drivers/media/radio/miropcm20-rds.c | 2 +- + drivers/media/radio/radio-aimslab.c | 2 + + drivers/media/radio/radio-aztech.c | 2 + + drivers/media/radio/radio-cadet.c | 12 +- + drivers/media/radio/radio-gemtek-pci.c | 2 + + drivers/media/radio/radio-gemtek.c | 2 + + drivers/media/radio/radio-maestro.c | 2 + + drivers/media/radio/radio-maxiradio.c | 2 + + drivers/media/radio/radio-rtrack2.c | 2 + + drivers/media/radio/radio-sf16fmi.c | 2 + + drivers/media/radio/radio-sf16fmr2.c | 104 +- + drivers/media/radio/radio-si470x.c | 59 +- + drivers/media/radio/radio-terratec.c | 2 + + drivers/media/radio/radio-trust.c | 2 + + drivers/media/radio/radio-typhoon.c | 44 +- + drivers/media/radio/radio-zoltrix.c | 2 + + drivers/media/video/Kconfig | 56 + + drivers/media/video/Makefile | 12 +- + drivers/media/video/adv7170.c | 2 +- + drivers/media/video/adv7175.c | 2 +- + drivers/media/video/arv.c | 6 +- + drivers/media/video/au0828/Kconfig | 12 + + drivers/media/video/au0828/Makefile | 9 + + drivers/media/video/au0828/au0828-cards.c | 182 ++ + drivers/media/video/au0828/au0828-cards.h | 25 + + drivers/media/video/au0828/au0828-core.c | 270 +++ + drivers/media/video/au0828/au0828-dvb.c | 373 +++++ + drivers/media/video/au0828/au0828-i2c.c | 385 +++++ + drivers/media/video/au0828/au0828-reg.h | 38 + + drivers/media/video/au0828/au0828.h | 128 ++ + drivers/media/video/bt819.c | 2 +- + drivers/media/video/bt856.c | 2 +- + drivers/media/video/bt8xx/bttv-cards.c | 55 +- + drivers/media/video/bt8xx/bttv-driver.c | 36 +- + drivers/media/video/bt8xx/bttv-input.c | 6 + + drivers/media/video/bt8xx/bttv-vbi.c | 2 +- + drivers/media/video/bt8xx/bttv.h | 3 + + drivers/media/video/bt8xx/bttvp.h | 1 - + drivers/media/video/bw-qcam.c | 6 +- + drivers/media/video/c-qcam.c | 13 +- + drivers/media/video/cafe_ccic.c | 4 +- + drivers/media/video/cpia.c | 2 + + drivers/media/video/cpia.h | 4 +- + drivers/media/video/cpia2/cpia2_core.c | 16 +- + drivers/media/video/cpia2/cpia2_usb.c | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 2 + + drivers/media/video/cpia_usb.c | 2 +- + drivers/media/video/cx23885/Kconfig | 2 + + drivers/media/video/cx23885/cx23885-cards.c | 68 +- + drivers/media/video/cx23885/cx23885-core.c | 102 +- + drivers/media/video/cx23885/cx23885-dvb.c | 59 +- + drivers/media/video/cx23885/cx23885-i2c.c | 19 +- + drivers/media/video/cx23885/cx23885-video.c | 58 +- + drivers/media/video/cx23885/cx23885.h | 2 + + drivers/media/video/cx25840/cx25840-core.c | 97 +- + drivers/media/video/cx25840/cx25840-core.h | 2 +- + drivers/media/video/cx25840/cx25840-firmware.c | 11 +- + drivers/media/video/cx25840/cx25840-vbi.c | 6 +- + drivers/media/video/cx88/Kconfig | 1 + + drivers/media/video/cx88/cx88-alsa.c | 10 +- + drivers/media/video/cx88/cx88-blackbird.c | 18 +- + drivers/media/video/cx88/cx88-cards.c | 585 ++++++- + drivers/media/video/cx88/cx88-core.c | 17 +- + drivers/media/video/cx88/cx88-dvb.c | 260 +++- + drivers/media/video/cx88/cx88-i2c.c | 4 +- + drivers/media/video/cx88/cx88-input.c | 15 +- + drivers/media/video/cx88/cx88-mpeg.c | 20 +- + drivers/media/video/cx88/cx88-tvaudio.c | 30 +- + drivers/media/video/cx88/cx88-vbi.c | 2 +- + drivers/media/video/cx88/cx88-video.c | 63 +- + drivers/media/video/cx88/cx88.h | 14 +- + drivers/media/video/dabfirmware.h | 7 + + drivers/media/video/dabusb.c | 8 +- + drivers/media/video/dpc7146.c | 4 +- + drivers/media/video/em28xx/Kconfig | 14 +- + drivers/media/video/em28xx/Makefile | 1 + + drivers/media/video/em28xx/em28xx-audio.c | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 207 ++- + drivers/media/video/em28xx/em28xx-core.c | 776 ++++----- + drivers/media/video/em28xx/em28xx-dvb.c | 474 ++++++ + drivers/media/video/em28xx/em28xx-i2c.c | 160 +- + drivers/media/video/em28xx/em28xx-input.c | 26 +- + drivers/media/video/em28xx/em28xx-reg.h | 88 + + drivers/media/video/em28xx/em28xx-video.c | 1078 +++++++------ + drivers/media/video/em28xx/em28xx.h | 318 ++-- + drivers/media/video/et61x251/et61x251.h | 6 +- + drivers/media/video/et61x251/et61x251_core.c | 4 +- + drivers/media/video/hexium_gemini.c | 4 +- + drivers/media/video/hexium_orion.c | 4 +- + drivers/media/video/ir-kbd-i2c.c | 28 +- + drivers/media/video/ivtv/Kconfig | 1 + + drivers/media/video/ivtv/ivtv-cards.c | 7 +- + drivers/media/video/ivtv/ivtv-cards.h | 2 +- + drivers/media/video/ivtv/ivtv-driver.c | 46 +- + drivers/media/video/ivtv/ivtv-driver.h | 2 + + drivers/media/video/ivtv/ivtv-fileops.c | 6 +- + drivers/media/video/ivtv/ivtv-i2c.c | 12 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 39 +- + drivers/media/video/ivtv/ivtv-irq.c | 25 +- + drivers/media/video/ivtv/ivtv-mailbox.c | 11 +- + drivers/media/video/ivtv/ivtv-queue.c | 4 +- + drivers/media/video/ivtv/ivtv-streams.c | 3 +- + drivers/media/video/ivtv/ivtv-yuv.c | 38 +- + drivers/media/video/meye.c | 1361 ++++++++-------- + drivers/media/video/msp3400-driver.c | 4 +- + drivers/media/video/msp3400-kthreads.c | 15 +- + drivers/media/video/mt20xx.c | 7 +- + drivers/media/video/mt20xx.h | 2 +- + drivers/media/video/mt9m001.c | 722 ++++++++ + drivers/media/video/mt9v022.c | 844 ++++++++++ + drivers/media/video/mxb.c | 4 +- + drivers/media/video/ov511.c | 4 +- + drivers/media/video/ov511.h | 2 +- + drivers/media/video/ovcamchip/ovcamchip_priv.h | 4 +- + drivers/media/video/pms.c | 6 +- + drivers/media/video/pvrusb2/pvrusb2-context.c | 116 +- + drivers/media/video/pvrusb2/pvrusb2-context.h | 8 +- + drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 19 +- + drivers/media/video/pvrusb2/pvrusb2-debug.h | 2 +- + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 56 +- + drivers/media/video/pvrusb2/pvrusb2-devattr.h | 57 +- + drivers/media/video/pvrusb2/pvrusb2-encoder.c | 10 - + drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 9 + + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 20 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 394 ++++- + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 23 +- + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-std.c | 9 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 + + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 186 ++- + drivers/media/video/pwc/pwc-if.c | 16 +- + drivers/media/video/pwc/pwc-v4l.c | 4 +- + drivers/media/video/pxa_camera.c | 1000 +++++++++++ + drivers/media/video/saa5249.c | 2 + + drivers/media/video/saa6588.c | 8 +- + drivers/media/video/saa7110.c | 2 +- + drivers/media/video/saa7111.c | 2 +- + drivers/media/video/saa7114.c | 2 +- + drivers/media/video/saa7115.c | 4 +- + drivers/media/video/saa711x.c | 2 +- + drivers/media/video/saa7134/Kconfig | 1 + + drivers/media/video/saa7134/saa7134-alsa.c | 12 +- + drivers/media/video/saa7134/saa7134-cards.c | 427 +++++- + drivers/media/video/saa7134/saa7134-core.c | 52 +- + drivers/media/video/saa7134/saa7134-dvb.c | 434 ++++-- + drivers/media/video/saa7134/saa7134-empress.c | 10 +- + drivers/media/video/saa7134/saa7134-i2c.c | 4 +- + drivers/media/video/saa7134/saa7134-input.c | 6 +- + drivers/media/video/saa7134/saa7134-reg.h | 3 + + drivers/media/video/saa7134/saa7134-ts.c | 2 +- + drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +- + drivers/media/video/saa7134/saa7134-vbi.c | 2 +- + drivers/media/video/saa7134/saa7134-video.c | 17 +- + drivers/media/video/saa7134/saa7134.h | 22 +- + drivers/media/video/saa717x.c | 1516 +++++++++++++++++ + drivers/media/video/saa7185.c | 2 +- + drivers/media/video/se401.c | 12 +- + drivers/media/video/sn9c102/sn9c102.h | 6 +- + drivers/media/video/sn9c102/sn9c102_core.c | 12 +- + drivers/media/video/sn9c102/sn9c102_sensor.h | 3 - + drivers/media/video/soc_camera.c | 1033 ++++++++++++ + drivers/media/video/stk-webcam.c | 6 +- + drivers/media/video/stradis.c | 6 +- + drivers/media/video/stv680.c | 13 +- + drivers/media/video/tcm825x.c | 2 +- + drivers/media/video/tda8290.c | 18 +- + drivers/media/video/tda8290.h | 6 +- + drivers/media/video/tda9840.c | 4 +- + drivers/media/video/tda9887.c | 42 +- + drivers/media/video/tda9887.h | 2 +- + drivers/media/video/tea5761.c | 7 +- + drivers/media/video/tea5761.h | 4 +- + drivers/media/video/tea5767.c | 34 +- + drivers/media/video/tea5767.h | 4 +- + drivers/media/video/tea6415c.c | 4 +- + drivers/media/video/tea6420.c | 4 +- + drivers/media/video/tuner-core.c | 49 +- + drivers/media/video/tuner-i2c.h | 118 ++- + drivers/media/video/tuner-simple.c | 861 ++++++++--- + drivers/media/video/tuner-simple.h | 13 +- + drivers/media/video/tuner-types.c | 188 ++- + drivers/media/video/tuner-xc2028-types.h | 18 +- + drivers/media/video/tuner-xc2028.c | 152 +- + drivers/media/video/tuner-xc2028.h | 6 +- + drivers/media/video/tvaudio.c | 8 +- + drivers/media/video/tveeprom.c | 103 -- + drivers/media/video/tvp5150.c | 2 +- + drivers/media/video/usbvideo/ibmcam.c | 64 +- + drivers/media/video/usbvideo/konicawc.c | 4 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 4 +- + drivers/media/video/usbvideo/ultracam.c | 4 +- + drivers/media/video/usbvideo/usbvideo.c | 148 +- + drivers/media/video/usbvideo/vicam.c | 4 +- + drivers/media/video/usbvision/usbvision-core.c | 45 +- + drivers/media/video/usbvision/usbvision-i2c.c | 8 +- + drivers/media/video/usbvision/usbvision-video.c | 46 +- + drivers/media/video/v4l1-compat.c | 1735 +++++++++++--------- + drivers/media/video/videobuf-core.c | 209 ++- + drivers/media/video/videobuf-dma-sg.c | 156 +- + drivers/media/video/videobuf-dvb.c | 18 +- + drivers/media/video/videobuf-vmalloc.c | 211 ++- + drivers/media/video/videocodec.c | 115 +-- + drivers/media/video/videodev.c | 74 +- + drivers/media/video/vino.c | 10 +- + drivers/media/video/vivi.c | 350 ++--- + drivers/media/video/vpx3220.c | 2 +- + drivers/media/video/w9966.c | 8 +- + drivers/media/video/w9968cf.c | 4 +- + drivers/media/video/w9968cf.h | 6 +- + drivers/media/video/zc0301/zc0301.h | 6 +- + drivers/media/video/zc0301/zc0301_core.c | 4 +- + drivers/media/video/zoran.h | 16 - + drivers/media/video/zoran_card.c | 6 +- + drivers/media/video/zoran_card.h | 2 + + drivers/media/video/zoran_device.c | 12 +- + drivers/media/video/zoran_driver.c | 26 +- + drivers/media/video/zr36016.c | 5 +- + drivers/media/video/zr36050.c | 5 +- + drivers/media/video/zr36060.c | 6 +- + drivers/media/video/zr364xx.c | 4 +- + include/linux/dvb/dmx.h | 3 +- + include/linux/i2c-id.h | 1 + + include/linux/meye.h | 2 +- + include/linux/videodev2.h | 55 +- + include/media/ir-common.h | 2 + + include/media/soc_camera.h | 179 ++ + include/media/tuner-types.h | 17 +- + include/media/tuner.h | 2 +- + include/media/v4l2-chip-ident.h | 6 + + include/media/v4l2-dev.h | 4 + + include/media/videobuf-core.h | 24 +- + include/media/videobuf-dma-sg.h | 17 +- + include/media/videobuf-dvb.h | 3 +- + include/media/videobuf-vmalloc.h | 4 + + 415 files changed, 20949 insertions(+), 7174 deletions(-) + create mode 100644 Documentation/video4linux/CARDLIST.au0828 + create mode 100644 drivers/media/dvb/frontends/au8522.c + create mode 100644 drivers/media/dvb/frontends/au8522.h + create mode 100644 drivers/media/dvb/frontends/cx24113.h + create mode 100644 drivers/media/dvb/frontends/isl6405.c + create mode 100644 drivers/media/dvb/frontends/isl6405.h + create mode 100644 drivers/media/dvb/frontends/itd1000.c + create mode 100644 drivers/media/dvb/frontends/itd1000.h + create mode 100644 drivers/media/dvb/frontends/itd1000_priv.h + create mode 100644 drivers/media/dvb/frontends/s5h1420_priv.h + create mode 100644 drivers/media/dvb/frontends/tda10048.c + create mode 100644 drivers/media/dvb/frontends/tda10048.h + create mode 100644 drivers/media/video/au0828/Kconfig + create mode 100644 drivers/media/video/au0828/Makefile + create mode 100644 drivers/media/video/au0828/au0828-cards.c + create mode 100644 drivers/media/video/au0828/au0828-cards.h + create mode 100644 drivers/media/video/au0828/au0828-core.c + create mode 100644 drivers/media/video/au0828/au0828-dvb.c + create mode 100644 drivers/media/video/au0828/au0828-i2c.c + create mode 100644 drivers/media/video/au0828/au0828-reg.h + create mode 100644 drivers/media/video/au0828/au0828.h + create mode 100644 drivers/media/video/em28xx/em28xx-dvb.c + create mode 100644 drivers/media/video/em28xx/em28xx-reg.h + create mode 100644 drivers/media/video/mt9m001.c + create mode 100644 drivers/media/video/mt9v022.c + create mode 100644 drivers/media/video/pxa_camera.c + create mode 100644 drivers/media/video/saa717x.c + create mode 100644 drivers/media/video/soc_camera.c + create mode 100644 include/media/soc_camera.h +Merging s390/features +$ git merge s390/features +Auto-merged drivers/s390/cio/ccwgroup.c +Auto-merged drivers/s390/cio/qdio.c +Merge made by recursive. + arch/s390/kernel/process.c | 18 ------------------ + arch/s390/kernel/traps.c | 26 ++++++++++++++++++++++---- + drivers/s390/cio/ccwgroup.c | 7 +++++-- + drivers/s390/cio/cmf.c | 11 ++++++++--- + drivers/s390/cio/css.c | 10 +++++++--- + drivers/s390/cio/device.c | 17 +++++++++++------ + drivers/s390/cio/qdio.c | 8 ++++---- + include/asm-s390/processor.h | 9 --------- + include/asm-s390/sysinfo.h | 5 +++++ + 9 files changed, 62 insertions(+), 49 deletions(-) +Merging sh/master +$ git merge sh/master +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Auto-merged Documentation/kernel-parameters.txt +Removed drivers/ide/cris/Makefile +Removed drivers/ide/cris/ide-cris.c +Auto-merged drivers/ide/ide-cd.c +CONFLICT (content): Merge conflict in drivers/ide/ide-cd.c +Auto-merged include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Removed include/linux/hdsmart.h +Auto-merged include/linux/ide.h +Resolved 'drivers/ide/ide-cd.c' using previous resolution. +Resolved 'include/linux/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/ide/ide-tape.txt | 211 ++---- + Documentation/ide/ide.txt | 107 +-- + Documentation/kernel-parameters.txt | 7 - + Documentation/mips/AU1xxx_IDE.README | 46 -- + drivers/ide/Kconfig | 34 - + drivers/ide/Makefile | 2 +- + drivers/ide/arm/bast-ide.c | 24 +- + drivers/ide/arm/icside.c | 68 +- + drivers/ide/arm/ide_arm.c | 20 +- + drivers/ide/arm/palm_bk3710.c | 64 +- + drivers/ide/arm/rapide.c | 12 +- + drivers/ide/cris/Makefile | 3 - + drivers/ide/cris/ide-cris.c | 1081 ------------------------- + drivers/ide/h8300/ide-h8300.c | 119 +++- + drivers/ide/ide-acpi.c | 30 +- + drivers/ide/ide-cd.c | 938 ++++++++++------------- + drivers/ide/ide-cd.h | 4 - + drivers/ide/ide-disk.c | 159 ++-- + drivers/ide/ide-dma.c | 166 +--- + drivers/ide/ide-floppy.c | 59 +- + drivers/ide/ide-generic.c | 36 +- + drivers/ide/ide-io.c | 97 +-- + drivers/ide/ide-iops.c | 426 ++++++----- + drivers/ide/ide-lib.c | 46 +- + drivers/ide/ide-pnp.c | 46 +- + drivers/ide/ide-probe.c | 293 +++++-- + drivers/ide/ide-proc.c | 169 ++--- + drivers/ide/ide-scan-pci.c | 2 +- + drivers/ide/ide-tape.c | 1221 ++++++----------------------- + drivers/ide/ide-taskfile.c | 92 +-- + drivers/ide/ide.c | 801 +++++-------------- + drivers/ide/legacy/ali14xx.c | 44 +- + drivers/ide/legacy/buddha.c | 19 +- + drivers/ide/legacy/dtc2278.c | 39 +- + drivers/ide/legacy/falconide.c | 41 +- + drivers/ide/legacy/gayle.c | 26 +- + drivers/ide/legacy/hd.c | 78 +- + drivers/ide/legacy/ht6560b.c | 57 +- + drivers/ide/legacy/ide-4drives.c | 52 +- + drivers/ide/legacy/ide-cs.c | 83 ++- + drivers/ide/legacy/ide_platform.c | 14 +- + drivers/ide/legacy/macide.c | 9 +- + drivers/ide/legacy/q40ide.c | 34 +- + drivers/ide/legacy/qd65xx.c | 238 ++---- + drivers/ide/legacy/qd65xx.h | 1 - + drivers/ide/legacy/umc8672.c | 92 +-- + drivers/ide/mips/au1xxx-ide.c | 145 ++--- + drivers/ide/mips/swarm.c | 20 +- + drivers/ide/pci/aec62xx.c | 39 +- + drivers/ide/pci/alim15x3.c | 332 ++------- + drivers/ide/pci/amd74xx.c | 19 +- + drivers/ide/pci/atiixp.c | 29 +- + drivers/ide/pci/cmd640.c | 292 ++++---- + drivers/ide/pci/cmd64x.c | 153 ++-- + drivers/ide/pci/cs5520.c | 29 +- + drivers/ide/pci/cs5530.c | 18 +- + drivers/ide/pci/cs5535.c | 24 +- + drivers/ide/pci/cy82c693.c | 97 ++-- + drivers/ide/pci/delkin_cb.c | 19 +- + drivers/ide/pci/generic.c | 10 +- + drivers/ide/pci/hpt34x.c | 17 +- + drivers/ide/pci/hpt366.c | 132 ++-- + drivers/ide/pci/it8213.c | 34 +- + drivers/ide/pci/it821x.c | 52 +- + drivers/ide/pci/jmicron.c | 29 +- + drivers/ide/pci/ns87415.c | 84 ++- + drivers/ide/pci/opti621.c | 82 +- + drivers/ide/pci/pdc202xx_new.c | 31 +- + drivers/ide/pci/pdc202xx_old.c | 126 ++-- + drivers/ide/pci/piix.c | 17 +- + drivers/ide/pci/rz1000.c | 2 +- + drivers/ide/pci/sc1200.c | 39 +- + drivers/ide/pci/scc_pata.c | 283 +++++-- + drivers/ide/pci/serverworks.c | 38 +- + drivers/ide/pci/sgiioc4.c | 141 ++-- + drivers/ide/pci/siimage.c | 473 +++++------ + drivers/ide/pci/sis5513.c | 253 +++--- + drivers/ide/pci/sl82c105.c | 83 +- + drivers/ide/pci/slc90e66.c | 22 +- + drivers/ide/pci/tc86c001.c | 54 +- + drivers/ide/pci/triflex.c | 12 +- + drivers/ide/pci/trm290.c | 47 +- + drivers/ide/pci/via82cxxx.c | 20 +- + drivers/ide/ppc/mpc8xx.c | 70 ++- + drivers/ide/ppc/pmac.c | 184 +++-- + drivers/ide/setup-pci.c | 226 +++---- + drivers/scsi/ide-scsi.c | 53 +- + include/asm-arm/arch-sa1100/ide.h | 6 +- + include/asm-cris/arch-v10/ide.h | 11 +- + include/asm-mips/mach-au1x00/au1xxx_ide.h | 42 - + include/linux/Kbuild | 1 - + include/linux/hdsmart.h | 126 --- + include/linux/ide.h | 290 ++++---- + 93 files changed, 4400 insertions(+), 7116 deletions(-) + delete mode 100644 drivers/ide/cris/Makefile + delete mode 100644 drivers/ide/cris/ide-cris.c + delete mode 100644 include/linux/hdsmart.h +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merged fs/Kconfig +Auto-merged fs/nfs/dir.c +Auto-merged net/sunrpc/auth_gss/auth_gss.c +Auto-merged net/sunrpc/clnt.c +Auto-merged net/sunrpc/rpcb_clnt.c +Auto-merged net/sunrpc/xprtsock.c +Merge made by recursive. + fs/Kconfig | 70 +++++------ + fs/lockd/clntproc.c | 184 +++++++++++++++++---------- + fs/lockd/host.c | 20 ++-- + fs/lockd/mon.c | 113 +++++++++++++---- + fs/lockd/svc.c | 12 ++ + fs/nfs/Makefile | 3 +- + fs/nfs/client.c | 23 ++++ + fs/nfs/dir.c | 2 +- + fs/nfs/direct.c | 88 ++++++++----- + fs/nfs/file.c | 18 +--- + fs/nfs/inode.c | 45 +++++++- + fs/nfs/internal.h | 13 +-- + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs2xdr.c | 113 ++++++++++------- + fs/nfs/nfs3xdr.c | 71 +++++++---- + fs/nfs/nfs4proc.c | 39 ++++--- + fs/nfs/nfs4state.c | 49 +++++++- + fs/nfs/nfs4xdr.c | 147 +++++++++++++--------- + fs/nfs/read.c | 94 ++++++++------ + fs/nfs/super.c | 147 +++++++++++++++------- + fs/nfs/unlink.c | 2 +- + fs/nfs/write.c | 207 ++++++++++++++++++------------- + include/linux/lockd/lockd.h | 18 ++-- + include/linux/lockd/sm_inter.h | 1 + + include/linux/nfs_fs.h | 5 +- + include/linux/nfs_fs_sb.h | 10 ++ + include/linux/nfs_xdr.h | 10 ++- + include/linux/sunrpc/auth.h | 17 ++- + include/linux/sunrpc/auth_gss.h | 1 + + include/linux/sunrpc/clnt.h | 9 +- + include/linux/sunrpc/sched.h | 41 +++---- + include/linux/sunrpc/xprt.h | 10 ++- + net/sunrpc/Makefile | 2 +- + net/sunrpc/auth.c | 71 +++++++---- + net/sunrpc/auth_generic.c | 177 ++++++++++++++++++++++++++ + net/sunrpc/auth_gss/auth_gss.c | 105 ++++++++++------ + net/sunrpc/auth_null.c | 3 +- + net/sunrpc/auth_unix.c | 59 ++++----- + net/sunrpc/clnt.c | 45 ++++--- + net/sunrpc/rpcb_clnt.c | 2 +- + net/sunrpc/sched.c | 264 ++++++++++++++++++--------------------- + net/sunrpc/xprt.c | 80 +++++++++---- + net/sunrpc/xprtsock.c | 82 ++++++++----- + 43 files changed, 1578 insertions(+), 896 deletions(-) + create mode 100644 net/sunrpc/auth_generic.c +Merging xfs/master +$ git merge xfs/master +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/linux-2.6/xfs_iops.c +Auto-merged fs/xfs/linux-2.6/xfs_lrw.c +Merge made by recursive. + fs/xfs/Kconfig | 13 ++ + fs/xfs/linux-2.6/mrlock.h | 60 +++---- + fs/xfs/linux-2.6/xfs_buf.c | 2 +- + fs/xfs/linux-2.6/xfs_export.c | 2 +- + fs/xfs/linux-2.6/xfs_file.c | 75 --------- + fs/xfs/linux-2.6/xfs_ioctl.c | 8 +- + fs/xfs/linux-2.6/xfs_iops.c | 3 +- + fs/xfs/linux-2.6/xfs_linux.h | 1 - + fs/xfs/linux-2.6/xfs_lrw.c | 21 +-- + fs/xfs/linux-2.6/xfs_lrw.h | 1 - + fs/xfs/linux-2.6/xfs_super.c | 2 +- + fs/xfs/linux-2.6/xfs_vnode.h | 24 --- + fs/xfs/quota/xfs_dquot.c | 4 +- + fs/xfs/quota/xfs_qm.c | 27 ++-- + fs/xfs/quota/xfs_qm_syscalls.c | 6 - + fs/xfs/quota/xfs_quota_priv.h | 5 - + fs/xfs/quota/xfs_trans_dquot.c | 2 +- + fs/xfs/xfs.h | 2 +- + fs/xfs/xfs_acl.c | 53 ++----- + fs/xfs/xfs_attr.c | 93 ++++++----- + fs/xfs/xfs_attr.h | 6 +- + fs/xfs/xfs_bmap.c | 1 - + fs/xfs/xfs_dfrag.c | 4 +- + fs/xfs/xfs_dir2_node.c | 358 ++++++++++++++++++++++----------------- + fs/xfs/xfs_fsops.c | 4 +- + fs/xfs/xfs_iget.c | 140 +++++++++------- + fs/xfs/xfs_inode.c | 25 ++-- + fs/xfs/xfs_inode.h | 16 +-- + fs/xfs/xfs_inode_item.c | 12 +- + fs/xfs/xfs_iomap.c | 6 +- + fs/xfs/xfs_itable.c | 6 - + fs/xfs/xfs_mount.c | 83 +++++----- + fs/xfs/xfs_mount.h | 6 +- + fs/xfs/xfs_rename.c | 252 ++++++---------------------- + fs/xfs/xfs_trans_inode.c | 12 +- + fs/xfs/xfs_utils.c | 45 +----- + fs/xfs/xfs_utils.h | 2 - + fs/xfs/xfs_vnodeops.c | 274 ++++--------------------------- + fs/xfs/xfs_vnodeops.h | 8 +- + 39 files changed, 581 insertions(+), 1083 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/ehca/ehca_classes.h | 1 + + drivers/infiniband/hw/ehca/ehca_irq.c | 2 +- + drivers/infiniband/hw/ehca/ehca_main.c | 75 ++++++-------- + drivers/infiniband/hw/ehca/ehca_mrmw.c | 16 ++- + drivers/infiniband/hw/ehca/ehca_qp.c | 15 ++- + drivers/infiniband/hw/ehca/ehca_reqs.c | 51 +++++----- + drivers/infiniband/hw/ehca/ehca_uverbs.c | 6 +- + drivers/infiniband/hw/ehca/hcp_if.c | 23 +++-- + drivers/infiniband/hw/mlx4/cq.c | 6 +- + drivers/infiniband/hw/mlx4/doorbell.c | 122 +----------------------- + drivers/infiniband/hw/mlx4/main.c | 3 - + drivers/infiniband/hw/mlx4/mlx4_ib.h | 33 +------ + drivers/infiniband/hw/mlx4/qp.c | 6 +- + drivers/infiniband/hw/mlx4/srq.c | 6 +- + drivers/infiniband/hw/nes/nes.c | 15 ++-- + drivers/infiniband/hw/nes/nes_cm.c | 27 +++--- + drivers/infiniband/hw/nes/nes_hw.c | 20 ++-- + drivers/infiniband/hw/nes/nes_hw.h | 2 +- + drivers/infiniband/hw/nes/nes_nic.c | 18 ++-- + drivers/infiniband/hw/nes/nes_utils.c | 4 +- + drivers/infiniband/hw/nes/nes_verbs.c | 8 ++- + drivers/infiniband/ulp/ipoib/ipoib.h | 20 +++- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 125 +++++++++++++++++------- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 19 +++- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 15 +++- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 1 + + drivers/net/mlx4/alloc.c | 111 +++++++++++++++++++++ + drivers/net/mlx4/cq.c | 2 +- + drivers/net/mlx4/main.c | 3 + + drivers/net/mlx4/mlx4.h | 3 + + include/linux/mlx4/device.h | 29 ++++++ + 32 files changed, 440 insertions(+), 350 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged arch/x86/kernel/apm_32.c +CONFLICT (content): Merge conflict in arch/x86/kernel/apm_32.c +Removed kernel/power/pm.c +Resolved 'arch/x86/kernel/apm_32.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/frv/kernel/pm.c | 8 - + arch/mips/au1000/common/power.c | 35 +--- + arch/x86/kernel/apm_32.c | 16 - + drivers/acpi/bay.c | 2 + + drivers/acpi/dispatcher/dsfield.c | 171 +++++++----- + drivers/acpi/dispatcher/dsmethod.c | 58 ++--- + drivers/acpi/dispatcher/dsmthdat.c | 2 + + drivers/acpi/dispatcher/dsobject.c | 99 +++++-- + drivers/acpi/dispatcher/dsopcode.c | 258 ++++++++++++++++- + drivers/acpi/dispatcher/dsutils.c | 165 ++++++++++-- + drivers/acpi/dispatcher/dswexec.c | 76 +++--- + drivers/acpi/dispatcher/dswload.c | 35 ++- + drivers/acpi/dispatcher/dswstate.c | 515 +++++++-------------------------- + drivers/acpi/ec.c | 240 ++++++++-------- + drivers/acpi/events/evgpe.c | 9 +- + drivers/acpi/events/evmisc.c | 90 +++--- + drivers/acpi/events/evregion.c | 2 +- + drivers/acpi/events/evxface.c | 21 +- + drivers/acpi/executer/exconfig.c | 103 ++++++-- + drivers/acpi/executer/excreate.c | 115 +------- + drivers/acpi/executer/exdump.c | 67 +++-- + drivers/acpi/executer/exfield.c | 61 +---- + drivers/acpi/executer/exfldio.c | 44 +++- + drivers/acpi/executer/exmutex.c | 235 +++++++++++----- + drivers/acpi/executer/exoparg1.c | 23 ++- + drivers/acpi/executer/exoparg2.c | 19 +- + drivers/acpi/executer/exoparg3.c | 1 + + drivers/acpi/executer/exoparg6.c | 8 +- + drivers/acpi/executer/exprep.c | 15 + + drivers/acpi/executer/exregion.c | 8 +- + drivers/acpi/executer/exresnte.c | 10 +- + drivers/acpi/executer/exresolv.c | 53 ++-- + drivers/acpi/executer/exresop.c | 11 - + drivers/acpi/executer/exstore.c | 117 ++++++-- + drivers/acpi/executer/exsystem.c | 1 - + drivers/acpi/executer/exutils.c | 65 +++-- + drivers/acpi/glue.c | 20 ++ + drivers/acpi/hardware/hwsleep.c | 14 +- + drivers/acpi/namespace/nsaccess.c | 99 ++++--- + drivers/acpi/namespace/nsdump.c | 9 +- + drivers/acpi/namespace/nsinit.c | 10 + + drivers/acpi/namespace/nsload.c | 4 +- + drivers/acpi/namespace/nsnames.c | 6 + + drivers/acpi/namespace/nsparse.c | 31 ++- + drivers/acpi/namespace/nswalk.c | 4 +- + drivers/acpi/namespace/nsxfeval.c | 13 +- + drivers/acpi/parser/psargs.c | 61 +++-- + drivers/acpi/parser/psloop.c | 59 +++- + drivers/acpi/parser/psopcode.c | 36 ++- + drivers/acpi/parser/psparse.c | 43 ++- + drivers/acpi/parser/pstree.c | 2 + + drivers/acpi/processor_idle.c | 4 + + drivers/acpi/resources/rscalc.c | 24 ++- + drivers/acpi/resources/rsdump.c | 8 +- + drivers/acpi/resources/rsio.c | 39 +++- + drivers/acpi/resources/rsirq.c | 43 +++- + drivers/acpi/resources/rsmisc.c | 11 + + drivers/acpi/resources/rsutils.c | 6 +- + drivers/acpi/scan.c | 43 +++- + drivers/acpi/tables/tbfind.c | 32 ++- + drivers/acpi/tables/tbinstal.c | 22 +- + drivers/acpi/tables/tbutils.c | 2 +- + drivers/acpi/tables/tbxface.c | 89 ++++++ + drivers/acpi/utilities/utalloc.c | 2 +- + drivers/acpi/utilities/utcopy.c | 59 ++++- + drivers/acpi/utilities/utdebug.c | 17 +- + drivers/acpi/utilities/utdelete.c | 21 ++- + drivers/acpi/utilities/utglobal.c | 47 +++- + drivers/acpi/utilities/utinit.c | 3 + + drivers/acpi/utilities/utmath.c | 2 +- + drivers/acpi/utilities/utmisc.c | 4 + + drivers/acpi/utilities/utobject.c | 6 +- + drivers/acpi/utilities/utxface.c | 40 ++-- + drivers/acpi/utils.c | 2 +- + include/acpi/acconfig.h | 13 +- + include/acpi/acdisasm.h | 36 ++- + include/acpi/acdispat.h | 29 +- + include/acpi/acglobal.h | 36 ++- + include/acpi/acinterp.h | 13 +- + include/acpi/aclocal.h | 8 +- + include/acpi/acmacros.h | 69 +++--- + include/acpi/acnamesp.h | 3 +- + include/acpi/acobject.h | 3 +- + include/acpi/acopcode.h | 4 +- + include/acpi/acparser.h | 2 + + include/acpi/acpixf.h | 5 + + include/acpi/acresrc.h | 1 + + include/acpi/acstruct.h | 3 + + include/acpi/actbl1.h | 559 +++++++++++++++++++++++++++++++++++- + include/acpi/actypes.h | 91 ++++--- + include/acpi/acutils.h | 2 + + kernel/power/Kconfig | 10 - + kernel/power/Makefile | 1 - + kernel/power/pm.c | 205 ------------- + 94 files changed, 3040 insertions(+), 1748 deletions(-) + delete mode 100644 kernel/power/pm.c +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/Kconfig +Auto-merged fs/lockd/host.c +Auto-merged fs/lockd/svc.c +Auto-merged fs/locks.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged fs/nfsd/vfs.c +Auto-merged include/net/ipv6.h +Auto-merged net/sunrpc/svc.c +Merge made by recursive. + Documentation/filesystems/nfs-rdma.txt | 252 ++++++++++++++++++++++++++++++ + fs/Kconfig | 109 +++++++------ + fs/lockd/host.c | 73 +++++----- + fs/lockd/svc.c | 150 ++++++++---------- + fs/lockd/svclock.c | 6 +- + fs/lockd/svcshare.c | 3 +- + fs/nfs/callback.c | 93 ++++++------ + fs/nfs/symlink.c | 1 - + fs/nfsd/auth.c | 1 + + fs/nfsd/export.c | 9 +- + fs/nfsd/nfs4callback.c | 28 ++-- + fs/nfsd/nfs4idmap.c | 2 +- + fs/nfsd/nfs4state.c | 71 +++++---- + fs/nfsd/nfs4xdr.c | 13 ++- + fs/nfsd/nfsctl.c | 22 ++- + fs/nfsd/nfsfh.c | 228 +++++++++++++++------------- + fs/nfsd/nfssvc.c | 2 - + fs/nfsd/vfs.c | 4 +- + include/linux/exportfs.h | 2 +- + include/linux/nfs3.h | 2 +- + include/linux/nfsd/Kbuild | 4 +- + include/linux/nfsd/cache.h | 2 - + include/linux/nfsd/nfsd.h | 11 +- + include/linux/sunrpc/cache.h | 1 - + include/linux/sunrpc/gss_krb5.h | 6 +- + include/linux/sunrpc/svc.h | 1 - + include/linux/sunrpc/svcauth.h | 5 +- + include/linux/sunrpc/svcsock.h | 4 +- + include/net/ipv6.h | 9 + + net/sunrpc/auth_gss/gss_generic_token.c | 4 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 6 +- + net/sunrpc/auth_gss/gss_krb5_seal.c | 9 +- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 4 +- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 8 +- + net/sunrpc/auth_gss/gss_spkm3_seal.c | 4 +- + net/sunrpc/auth_gss/svcauth_gss.c | 9 +- + net/sunrpc/cache.c | 1 - + net/sunrpc/svc.c | 25 +-- + net/sunrpc/svc_xprt.c | 30 +++- + net/sunrpc/svcauth_unix.c | 118 ++++++++++----- + net/sunrpc/svcsock.c | 29 ++-- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 + + 43 files changed, 864 insertions(+), 501 deletions(-) + create mode 100644 Documentation/filesystems/nfs-rdma.txt +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-card.c | 2 +- + drivers/firewire/fw-topology.c | 12 ++++++++++++ + drivers/firewire/fw-transaction.h | 9 +++++++++ + drivers/ieee1394/iso.h | 2 ++ + drivers/ieee1394/ohci1394.c | 34 ++++++++++++++++++++++++++++++++++ + drivers/ieee1394/raw1394.c | 7 ++++++- + 6 files changed, 64 insertions(+), 2 deletions(-) +Merging hwmon/testing +$ git merge hwmon/testing +Merge made by recursive. + Documentation/hwmon/w83l785ts | 3 +- + drivers/hwmon/adm1026.c | 22 ++++++--- + drivers/hwmon/adm1029.c | 30 ++++++++----- + drivers/hwmon/adm1031.c | 20 ++++++-- + drivers/hwmon/adm9240.c | 20 ++++++--- + drivers/hwmon/adt7470.c | 40 ++++++++++------- + drivers/hwmon/adt7473.c | 99 ++++++++++++++++++++++------------------ + drivers/hwmon/asb100.c | 20 +++++--- + drivers/hwmon/dme1737.c | 5 ++ + drivers/hwmon/f71805f.c | 5 ++ + drivers/hwmon/f71882fg.c | 5 ++ + drivers/hwmon/it87.c | 5 ++ + drivers/hwmon/lm75.c | 5 +-- + drivers/hwmon/pc87360.c | 6 +++ + drivers/hwmon/pc87427.c | 5 ++ + drivers/hwmon/sis5595.c | 5 ++ + drivers/hwmon/smsc47b397.c | 22 ++++++++- + drivers/hwmon/smsc47m1.c | 5 ++ + drivers/hwmon/via686a.c | 5 ++ + drivers/hwmon/vt1211.c | 5 ++ + drivers/hwmon/vt8231.c | 5 ++ + drivers/hwmon/w83627ehf.c | 6 +++ + drivers/hwmon/w83627hf.c | 5 ++ + drivers/hwmon/w83793.c | 26 ++++++----- + drivers/hwmon/w83l785ts.c | 4 +- + 25 files changed, 257 insertions(+), 121 deletions(-) +Merging ubi/master +$ git merge ubi/master +Merge made by recursive. + Documentation/ABI/stable/sysfs-class-ubi | 212 ++++++++++++++++++++ + drivers/mtd/ubi/Kconfig | 9 +- + drivers/mtd/ubi/build.c | 40 ++-- + drivers/mtd/ubi/debug.h | 2 + + drivers/mtd/ubi/gluebi.c | 5 +- + drivers/mtd/ubi/io.c | 4 + + drivers/mtd/ubi/scan.c | 41 +--- + drivers/mtd/ubi/scan.h | 2 +- + .../ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 +- + drivers/mtd/ubi/ubi.h | 3 +- + include/mtd/Kbuild | 1 - + 11 files changed, 261 insertions(+), 66 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-class-ubi + rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) +Merging kvm/master +$ git merge kvm/master +Auto-merged MAINTAINERS +Auto-merged arch/ia64/Kconfig +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Removed arch/x86/kvm/segment_descriptor.h +Auto-merged include/linux/sched.h +Auto-merged kernel/fork.c +Merge made by recursive. + Documentation/ia64/kvm.txt | 82 ++ + Documentation/ioctl-number.txt | 2 + + Documentation/powerpc/kvm_440.txt | 41 + + Documentation/s390/kvm.txt | 125 ++ + MAINTAINERS | 17 + + arch/ia64/Kconfig | 3 + + arch/ia64/Makefile | 1 + + arch/ia64/kvm/Kconfig | 49 + + arch/ia64/kvm/Makefile | 61 + + arch/ia64/kvm/asm-offsets.c | 251 ++++ + arch/ia64/kvm/kvm-ia64.c | 1806 +++++++++++++++++++++++++++++ + arch/ia64/kvm/kvm_fw.c | 500 ++++++++ + arch/ia64/kvm/kvm_minstate.h | 273 +++++ + arch/ia64/kvm/lapic.h | 25 + + arch/ia64/kvm/misc.h | 93 ++ + arch/ia64/kvm/mmio.c | 341 ++++++ + arch/ia64/kvm/optvfault.S | 918 +++++++++++++++ + arch/ia64/kvm/process.c | 970 ++++++++++++++++ + arch/ia64/kvm/trampoline.S | 1038 +++++++++++++++++ + arch/ia64/kvm/vcpu.c | 2163 +++++++++++++++++++++++++++++++++++ + arch/ia64/kvm/vcpu.h | 740 ++++++++++++ + arch/ia64/kvm/vmm.c | 66 ++ + arch/ia64/kvm/vmm_ivt.S | 1424 +++++++++++++++++++++++ + arch/ia64/kvm/vti.h | 290 +++++ + arch/ia64/kvm/vtlb.c | 636 ++++++++++ + arch/powerpc/Kconfig | 1 + + arch/powerpc/Kconfig.debug | 3 + + arch/powerpc/Makefile | 1 + + arch/powerpc/kernel/asm-offsets.c | 28 + + arch/powerpc/kvm/44x_tlb.c | 224 ++++ + arch/powerpc/kvm/44x_tlb.h | 91 ++ + arch/powerpc/kvm/Kconfig | 43 + + arch/powerpc/kvm/Makefile | 15 + + arch/powerpc/kvm/booke_guest.c | 615 ++++++++++ + arch/powerpc/kvm/booke_host.c | 83 ++ + arch/powerpc/kvm/booke_interrupts.S | 436 +++++++ + arch/powerpc/kvm/emulate.c | 760 ++++++++++++ + arch/powerpc/kvm/powerpc.c | 436 +++++++ + arch/s390/Kconfig | 14 + + arch/s390/Makefile | 2 +- + arch/s390/kernel/early.c | 4 + + arch/s390/kernel/setup.c | 14 +- + arch/s390/kernel/vtime.c | 1 + + arch/s390/kvm/Kconfig | 46 + + arch/s390/kvm/Makefile | 14 + + arch/s390/kvm/diag.c | 67 ++ + arch/s390/kvm/gaccess.h | 274 +++++ + arch/s390/kvm/intercept.c | 216 ++++ + arch/s390/kvm/interrupt.c | 592 ++++++++++ + arch/s390/kvm/kvm-s390.c | 685 +++++++++++ + arch/s390/kvm/kvm-s390.h | 64 + + arch/s390/kvm/priv.c | 323 ++++++ + arch/s390/kvm/sie64a.S | 47 + + arch/s390/kvm/sigp.c | 288 +++++ + arch/s390/mm/pgtable.c | 65 +- + arch/x86/Kconfig | 19 + + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/crash.c | 3 +- + arch/x86/kernel/kvm.c | 247 ++++ + arch/x86/kernel/kvmclock.c | 187 +++ + arch/x86/kernel/reboot.c | 13 +- + arch/x86/kernel/setup_32.c | 6 + + arch/x86/kernel/setup_64.c | 7 + + arch/x86/kvm/Kconfig | 13 +- + arch/x86/kvm/Makefile | 6 +- + arch/x86/kvm/i8254.c | 608 ++++++++++ + arch/x86/kvm/i8254.h | 63 + + arch/x86/kvm/irq.c | 18 + + arch/x86/kvm/irq.h | 3 + + arch/x86/kvm/kvm_svm.h | 2 + + arch/x86/kvm/lapic.c | 35 +- + arch/x86/kvm/mmu.c | 672 +++++++++-- + arch/x86/kvm/mmu.h | 6 + + arch/x86/kvm/paging_tmpl.h | 86 +- + arch/x86/kvm/segment_descriptor.h | 29 - + arch/x86/kvm/svm.c | 352 +++++-- + arch/x86/kvm/svm.h | 3 + + arch/x86/kvm/tss.h | 59 + + arch/x86/kvm/vmx.c | 278 ++++- + arch/x86/kvm/vmx.h | 10 +- + arch/x86/kvm/x86.c | 897 +++++++++++++-- + arch/x86/kvm/x86_emulate.c | 285 +++-- + drivers/s390/Makefile | 2 +- + drivers/s390/kvm/Makefile | 9 + + drivers/s390/kvm/kvm_virtio.c | 338 ++++++ + include/asm-ia64/gcc_intrin.h | 12 + + include/asm-ia64/kvm.h | 205 ++++- + include/asm-ia64/kvm_host.h | 524 +++++++++ + include/asm-ia64/kvm_para.h | 29 + + include/asm-ia64/processor.h | 63 + + include/asm-powerpc/kvm.h | 53 +- + include/asm-powerpc/kvm_asm.h | 55 + + include/asm-powerpc/kvm_host.h | 152 +++ + include/asm-powerpc/kvm_para.h | 38 + + include/asm-powerpc/kvm_ppc.h | 88 ++ + include/asm-powerpc/mmu-44x.h | 2 + + include/asm-s390/Kbuild | 1 + + include/asm-s390/kvm.h | 40 +- + include/asm-s390/kvm_host.h | 234 ++++ + include/asm-s390/kvm_para.h | 150 +++ + include/asm-s390/kvm_virtio.h | 53 + + include/asm-s390/lowcore.h | 15 +- + include/asm-s390/mmu.h | 1 + + include/asm-s390/mmu_context.h | 8 +- + include/asm-s390/pgtable.h | 93 ++- + include/asm-s390/setup.h | 1 + + include/asm-x86/kvm.h | 41 + + include/asm-x86/kvm_host.h | 99 ++- + include/asm-x86/kvm_para.h | 55 + + include/asm-x86/reboot.h | 2 + + include/linux/kvm.h | 130 +++- + include/linux/kvm_host.h | 58 +- + include/linux/kvm_para.h | 11 +- + include/linux/kvm_types.h | 2 + + include/linux/sched.h | 2 + + kernel/fork.c | 2 +- + mm/rmap.c | 7 +- + virt/kvm/kvm_main.c | 221 ++++- + virt/kvm/kvm_trace.c | 276 +++++ + 119 files changed, 23715 insertions(+), 633 deletions(-) + create mode 100644 Documentation/ia64/kvm.txt + create mode 100644 Documentation/powerpc/kvm_440.txt + create mode 100644 Documentation/s390/kvm.txt + create mode 100644 arch/ia64/kvm/Kconfig + create mode 100644 arch/ia64/kvm/Makefile + create mode 100644 arch/ia64/kvm/asm-offsets.c + create mode 100644 arch/ia64/kvm/kvm-ia64.c + create mode 100644 arch/ia64/kvm/kvm_fw.c + create mode 100644 arch/ia64/kvm/kvm_minstate.h + create mode 100644 arch/ia64/kvm/lapic.h + create mode 100644 arch/ia64/kvm/misc.h + create mode 100644 arch/ia64/kvm/mmio.c + create mode 100644 arch/ia64/kvm/optvfault.S + create mode 100644 arch/ia64/kvm/process.c + create mode 100644 arch/ia64/kvm/trampoline.S + create mode 100644 arch/ia64/kvm/vcpu.c + create mode 100644 arch/ia64/kvm/vcpu.h + create mode 100644 arch/ia64/kvm/vmm.c + create mode 100644 arch/ia64/kvm/vmm_ivt.S + create mode 100644 arch/ia64/kvm/vti.h + create mode 100644 arch/ia64/kvm/vtlb.c + create mode 100644 arch/powerpc/kvm/44x_tlb.c + create mode 100644 arch/powerpc/kvm/44x_tlb.h + create mode 100644 arch/powerpc/kvm/Kconfig + create mode 100644 arch/powerpc/kvm/Makefile + create mode 100644 arch/powerpc/kvm/booke_guest.c + create mode 100644 arch/powerpc/kvm/booke_host.c + create mode 100644 arch/powerpc/kvm/booke_interrupts.S + create mode 100644 arch/powerpc/kvm/emulate.c + create mode 100644 arch/powerpc/kvm/powerpc.c + create mode 100644 arch/s390/kvm/Kconfig + create mode 100644 arch/s390/kvm/Makefile + create mode 100644 arch/s390/kvm/diag.c + create mode 100644 arch/s390/kvm/gaccess.h + create mode 100644 arch/s390/kvm/intercept.c + create mode 100644 arch/s390/kvm/interrupt.c + create mode 100644 arch/s390/kvm/kvm-s390.c + create mode 100644 arch/s390/kvm/kvm-s390.h + create mode 100644 arch/s390/kvm/priv.c + create mode 100644 arch/s390/kvm/sie64a.S + create mode 100644 arch/s390/kvm/sigp.c + create mode 100644 arch/x86/kernel/kvm.c + create mode 100644 arch/x86/kernel/kvmclock.c + create mode 100644 arch/x86/kvm/i8254.c + create mode 100644 arch/x86/kvm/i8254.h + delete mode 100644 arch/x86/kvm/segment_descriptor.h + create mode 100644 arch/x86/kvm/tss.h + create mode 100644 drivers/s390/kvm/Makefile + create mode 100644 drivers/s390/kvm/kvm_virtio.c + create mode 100644 include/asm-ia64/kvm_host.h + create mode 100644 include/asm-ia64/kvm_para.h + create mode 100644 include/asm-powerpc/kvm_asm.h + create mode 100644 include/asm-powerpc/kvm_host.h + create mode 100644 include/asm-powerpc/kvm_para.h + create mode 100644 include/asm-powerpc/kvm_ppc.h + create mode 100644 include/asm-s390/kvm_host.h + create mode 100644 include/asm-s390/kvm_para.h + create mode 100644 include/asm-s390/kvm_virtio.h + create mode 100644 virt/kvm/kvm_trace.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merged fs/sysfs/file.c +Auto-merged fs/sysfs/sysfs.h +Auto-merged include/linux/sysfs.h +Merge made by recursive. + block/bsg.c | 43 ++++++++---- + drivers/misc/enclosure.c | 100 ++++++++++++++++++-------- + drivers/scsi/hosts.c | 13 +++- + drivers/scsi/lpfc/lpfc_attr.c | 10 ++-- + drivers/scsi/qla2xxx/qla_attr.c | 8 +- + drivers/scsi/scsi_priv.h | 1 + + drivers/scsi/scsi_proc.c | 7 ++- + drivers/scsi/scsi_scan.c | 84 +++++++++++---------- + drivers/scsi/scsi_sysfs.c | 142 +++++++++++++++++++----------------- + drivers/scsi/scsi_transport_sas.c | 22 +++++- + drivers/scsi/scsi_transport_spi.c | 32 ++------ + drivers/scsi/st.c | 10 ++-- + fs/sysfs/file.c | 14 +++- + fs/sysfs/group.c | 83 ++++++++++++++++++---- + fs/sysfs/sysfs.h | 2 + + include/linux/bsg.h | 14 +++- + include/linux/sysfs.h | 4 +- + include/scsi/scsi_device.h | 3 +- + 18 files changed, 376 insertions(+), 216 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging tests/master +$ git merge tests/master +Renamed drivers/misc/lkdtm.c => tests/lkdtm.c +Auto-merged tests/lkdtm.c +Auto-merged Makefile +Auto-merged drivers/misc/Makefile +Auto-merged kernel/Makefile +Auto-merged lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merged lib/Makefile +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 72 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 79 +++++++++++++++++++++++ + tests/Makefile | 10 +++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 12 ++-- + {lib => tests}/locking-selftest-hardirq.h | 0 + {lib => tests}/locking-selftest-mutex.h | 0 + {lib => tests}/locking-selftest-rlock-hardirq.h | 0 + {lib => tests}/locking-selftest-rlock-softirq.h | 0 + {lib => tests}/locking-selftest-rlock.h | 0 + {lib => tests}/locking-selftest-rsem.h | 0 + {lib => tests}/locking-selftest-softirq.h | 0 + {lib => tests}/locking-selftest-spin-hardirq.h | 0 + {lib => tests}/locking-selftest-spin-softirq.h | 0 + {lib => tests}/locking-selftest-spin.h | 0 + {lib => tests}/locking-selftest-wlock-hardirq.h | 0 + {lib => tests}/locking-selftest-wlock-softirq.h | 0 + {lib => tests}/locking-selftest-wlock.h | 0 + {lib => tests}/locking-selftest-wsem.h | 0 + {lib => tests}/locking-selftest.c | 0 + {kernel => tests}/rcutorture.c | 0 + {kernel => tests}/rtmutex-tester.c | 2 +- + {kernel => tests}/test_kprobes.c | 0 + 27 files changed, 99 insertions(+), 83 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (96%) + rename {lib => tests}/locking-selftest-hardirq.h (100%) + rename {lib => tests}/locking-selftest-mutex.h (100%) + rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-rlock.h (100%) + rename {lib => tests}/locking-selftest-rsem.h (100%) + rename {lib => tests}/locking-selftest-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) + rename {lib => tests}/locking-selftest-spin-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin.h (100%) + rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-wlock.h (100%) + rename {lib => tests}/locking-selftest-wsem.h (100%) + rename {lib => tests}/locking-selftest.c (100%) + rename {kernel => tests}/rcutorture.c (100%) + rename {kernel => tests}/rtmutex-tester.c (99%) + rename {kernel => tests}/test_kprobes.c (100%) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/cluster/sys.c | 2 +- + fs/ocfs2/dlm/dlmdebug.c | 8 +++++--- + fs/ocfs2/file.c | 4 ++++ + fs/ocfs2/localalloc.c | 4 ++-- + fs/ocfs2/stack_o2cb.c | 2 +- + fs/ocfs2/stack_user.c | 2 +- + fs/ocfs2/symlink.c | 2 ++ + 7 files changed, 16 insertions(+), 8 deletions(-) +Merging selinux/for-akpm +$ git merge selinux/for-akpm +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +Auto-merged drivers/ide/legacy/macide.c +Merge made by recursive. + arch/m68k/Kconfig | 9 +- + arch/m68k/configs/amiga_defconfig | 130 ++-- + arch/m68k/configs/apollo_defconfig | 112 ++-- + arch/m68k/configs/atari_defconfig | 115 ++-- + arch/m68k/configs/bvme6000_defconfig | 112 ++-- + arch/m68k/configs/hp300_defconfig | 114 ++-- + arch/m68k/configs/mac_defconfig | 115 ++-- + arch/m68k/configs/multi_defconfig | 1255 ++++++++++++++++++++++++++++++++++ + arch/m68k/configs/mvme147_defconfig | 112 ++-- + arch/m68k/configs/mvme16x_defconfig | 112 ++-- + arch/m68k/configs/q40_defconfig | 131 ++-- + arch/m68k/configs/sun3_defconfig | 112 ++-- + arch/m68k/configs/sun3x_defconfig | 112 ++-- + arch/m68k/kernel/head.S | 2 +- + drivers/block/amiflop.c | 6 +- + drivers/block/z2ram.c | 2 +- + drivers/char/vme_scc.c | 4 +- + drivers/ide/legacy/macide.c | 3 + + drivers/input/misc/hp_sdc_rtc.c | 5 + + drivers/input/serio/hp_sdc_mlc.c | 5 + + drivers/input/serio/q40kbd.c | 2 +- + drivers/net/82596.c | 7 + + drivers/net/apne.c | 3 + + drivers/net/mac89x0.c | 3 + + drivers/net/macmace.c | 3 + + drivers/net/sun3lance.c | 3 + + drivers/video/Kconfig | 4 +- + drivers/video/amifb.c | 4 +- + drivers/video/dnfb.c | 3 + + drivers/video/hpfb.c | 2 +- + include/asm-m68k/bug.h | 4 +- + include/asm-m68k/uaccess.h | 6 +- + 32 files changed, 2084 insertions(+), 528 deletions(-) + create mode 100644 arch/m68k/configs/multi_defconfig +Merging powerpc/powerpc-next +$ git merge powerpc/powerpc-next +Already up-to-date. +Merging hrt/mm +$ git merge hrt/mm +Auto-merged arch/x86/kernel/vsyscall_64.c +Auto-merged include/linux/jiffies.h +Auto-merged kernel/time/timekeeping.c +Merge made by recursive. + arch/ia64/kernel/time.c | 19 ++++++++++++++----- + arch/powerpc/kernel/time.c | 23 +++++++++++++++++------ + arch/x86/kernel/vsyscall_64.c | 18 ++++++++++++++---- + include/linux/clocksource.h | 10 ++++++++++ + kernel/time/timekeeping.c | 8 +++++++- + 5 files changed, 62 insertions(+), 16 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Auto-merged arch/sparc/kernel/sparc_ksyms.c +Auto-merged arch/sparc64/mm/init.c +Auto-merged fs/ext4/ialloc.c +Auto-merged fs/ext4/inode.c +Auto-merged fs/ext4/ioctl.c +Auto-merged fs/ext4/xattr.c +Auto-merged fs/jbd2/journal.c +CONFLICT (content): Merge conflict in fs/jbd2/journal.c +Auto-merged fs/jbd2/revoke.c +CONFLICT (content): Merge conflict in fs/jbd2/revoke.c +Resolved 'fs/jbd2/journal.c' using previous resolution. +Resolved 'fs/jbd2/revoke.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/arm/mm/mmu.c | 1 + + arch/m68k/mm/init.c | 1 + + arch/sparc/kernel/sparc_ksyms.c | 2 + + arch/sparc64/mm/init.c | 1 + + fs/ext4/balloc.c | 43 ++++-- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4_jbd2.c | 12 +- + fs/ext4/extents.c | 308 ++++++++++++++++++++++++++++++--------- + fs/ext4/file.c | 21 +++- + fs/ext4/fsync.c | 3 + + fs/ext4/ialloc.c | 122 ++++++++++++++-- + fs/ext4/inode.c | 52 ++++--- + fs/ext4/ioctl.c | 12 +- + fs/ext4/mballoc.c | 83 +++++------ + fs/ext4/migrate.c | 39 +++++- + fs/ext4/namei.c | 37 +++-- + fs/ext4/resize.c | 76 +++++----- + fs/ext4/super.c | 79 +++++++++-- + fs/ext4/xattr.c | 32 ++-- + fs/ext4/xattr.h | 7 - + fs/jbd2/commit.c | 19 +-- + fs/jbd2/journal.c | 38 +++-- + fs/jbd2/revoke.c | 163 +++++++++------------ + fs/jbd2/transaction.c | 41 +++++- + include/linux/ext4_fs.h | 32 ++++- + include/linux/ext4_fs_sb.h | 3 + + 26 files changed, 817 insertions(+), 412 deletions(-) +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Removed arch/ppc/configs/ads8272_defconfig +Removed arch/ppc/configs/mpc86x_ads_defconfig +Removed arch/ppc/configs/mpc885ads_defconfig +Removed arch/ppc/platforms/mpc8272ads_setup.c +Removed arch/ppc/platforms/mpc885ads.h +Removed arch/ppc/platforms/mpc885ads_setup.c +Removed arch/ppc/platforms/pq2ads.c +Removed arch/ppc/platforms/pq2ads.h +Removed arch/ppc/platforms/pq2ads_pd.h +Auto-merged arch/ppc/syslib/m8xx_setup.c +Merge made by recursive. + arch/powerpc/kernel/cpu_setup_6xx.S | 8 +- + arch/ppc/8260_io/fcc_enet.c | 19 +- + arch/ppc/8xx_io/enet.c | 23 - + arch/ppc/Kconfig | 82 +--- + arch/ppc/configs/ads8272_defconfig | 930 --------------------------------- + arch/ppc/configs/mpc86x_ads_defconfig | 633 ---------------------- + arch/ppc/configs/mpc885ads_defconfig | 622 ---------------------- + arch/ppc/platforms/Makefile | 4 - + arch/ppc/platforms/fads.h | 25 - + arch/ppc/platforms/mpc8272ads_setup.c | 367 ------------- + arch/ppc/platforms/mpc885ads.h | 93 ---- + arch/ppc/platforms/mpc885ads_setup.c | 476 ----------------- + arch/ppc/platforms/pq2ads.c | 53 -- + arch/ppc/platforms/pq2ads.h | 94 ---- + arch/ppc/platforms/pq2ads_pd.h | 32 -- + arch/ppc/syslib/m8260_setup.c | 6 - + arch/ppc/syslib/m82xx_pci.c | 38 -- + arch/ppc/syslib/m8xx_setup.c | 10 - + include/asm-ppc/mpc8260.h | 4 - + include/asm-ppc/mpc8xx.h | 4 - + 20 files changed, 9 insertions(+), 3514 deletions(-) + delete mode 100644 arch/ppc/configs/ads8272_defconfig + delete mode 100644 arch/ppc/configs/mpc86x_ads_defconfig + delete mode 100644 arch/ppc/configs/mpc885ads_defconfig + delete mode 100644 arch/ppc/platforms/mpc8272ads_setup.c + delete mode 100644 arch/ppc/platforms/mpc885ads.h + delete mode 100644 arch/ppc/platforms/mpc885ads_setup.c + delete mode 100644 arch/ppc/platforms/pq2ads.c + delete mode 100644 arch/ppc/platforms/pq2ads.h + delete mode 100644 arch/ppc/platforms/pq2ads_pd.h +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + Documentation/arm/Samsung-S3C24XX/NAND.txt | 30 + + Documentation/arm/Samsung-S3C24XX/Overview.txt | 2 + + drivers/mtd/Kconfig | 6 + + drivers/mtd/Makefile | 1 + + drivers/mtd/ar7part.c | 151 +++ + drivers/mtd/chips/cfi_cmdset_0001.c | 19 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 30 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 15 +- + drivers/mtd/chips/cfi_probe.c | 7 +- + drivers/mtd/chips/cfi_util.c | 2 +- + drivers/mtd/chips/jedec_probe.c | 73 ++- + drivers/mtd/cmdlinepart.c | 15 +- + drivers/mtd/devices/block2mtd.c | 10 +- + drivers/mtd/devices/lart.c | 16 +- + drivers/mtd/devices/m25p80.c | 8 +- + drivers/mtd/devices/mtdram.c | 1 + + drivers/mtd/devices/phram.c | 2 +- + drivers/mtd/ftl.c | 6 +- + drivers/mtd/inftlmount.c | 5 - + drivers/mtd/maps/Kconfig | 3 + + drivers/mtd/maps/bast-flash.c | 5 +- + drivers/mtd/maps/ck804xrom.c | 89 ++- + drivers/mtd/maps/integrator-flash.c | 2 + + drivers/mtd/maps/ixp2000.c | 3 +- + drivers/mtd/maps/ixp4xx.c | 2 + + drivers/mtd/maps/omap_nor.c | 12 +- + drivers/mtd/maps/pcmciamtd.c | 2 +- + drivers/mtd/maps/physmap.c | 8 + + drivers/mtd/maps/plat-ram.c | 50 +- + drivers/mtd/maps/pmcmsp-flash.c | 2 +- + drivers/mtd/maps/sa1100-flash.c | 2 + + drivers/mtd/maps/sharpsl-flash.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 6 +- + drivers/mtd/mtdoops.c | 2 +- + drivers/mtd/nand/Kconfig | 56 ++ + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/at91_nand.c | 364 +++++++- + drivers/mtd/nand/bf5xx_nand.c | 1 + + drivers/mtd/nand/cs553x_nand.c | 2 +- + drivers/mtd/nand/fsl_elbc_nand.c | 39 +- + drivers/mtd/nand/fsl_upm.c | 291 ++++++ + drivers/mtd/nand/nand_base.c | 21 + + drivers/mtd/nand/ndfc.c | 2 + + drivers/mtd/nand/orion_nand.c | 1 + + drivers/mtd/nand/plat_nand.c | 2 + + drivers/mtd/nand/pxa3xx_nand.c | 1249 ++++++++++++++++++++++++ + drivers/mtd/nand/rtc_from4.c | 50 +- + drivers/mtd/nand/s3c2410.c | 73 ++- + drivers/mtd/nftlmount.c | 5 - + drivers/mtd/ofpart.c | 2 + + drivers/mtd/onenand/onenand_base.c | 51 +- + drivers/mtd/onenand/onenand_bbt.c | 3 - + drivers/mtd/rfd_ftl.c | 2 +- + drivers/mtd/ubi/debug.h | 2 +- + drivers/mtd/ubi/ubi.h | 4 +- + fs/jffs2/README.Locking | 22 +- + fs/jffs2/build.c | 1 + + fs/jffs2/debug.c | 164 +++- + fs/jffs2/debug.h | 6 + + fs/jffs2/dir.c | 58 +- + fs/jffs2/erase.c | 80 +- + fs/jffs2/file.c | 16 +- + fs/jffs2/fs.c | 42 +- + fs/jffs2/gc.c | 42 +- + fs/jffs2/ioctl.c | 1 + + fs/jffs2/jffs2_fs_i.h | 4 +- + fs/jffs2/jffs2_fs_sb.h | 7 +- + fs/jffs2/nodelist.h | 2 +- + fs/jffs2/nodemgmt.c | 24 +- + fs/jffs2/readinode.c | 38 +- + fs/jffs2/super.c | 14 +- + fs/jffs2/wbuf.c | 28 +- + fs/jffs2/write.c | 52 +- + include/asm-arm/arch-pxa/pxa3xx_nand.h | 18 + + include/asm-arm/plat-s3c/nand.h | 5 + + include/linux/mtd/inftl.h | 5 + + include/linux/mtd/nftl.h | 5 + + include/linux/mtd/onenand.h | 3 + + include/linux/mtd/plat-ram.h | 5 +- + 79 files changed, 3038 insertions(+), 415 deletions(-) + create mode 100644 Documentation/arm/Samsung-S3C24XX/NAND.txt + create mode 100644 drivers/mtd/ar7part.c + create mode 100644 drivers/mtd/nand/fsl_upm.c + create mode 100644 drivers/mtd/nand/pxa3xx_nand.c + create mode 100644 include/asm-arm/arch-pxa/pxa3xx_nand.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging vfs/vfs-2.6.25 +$ git merge vfs/vfs-2.6.25 +Auto-merged kernel/fork.c +Auto-merged virt/kvm/kvm_main.c +Merge made by recursive. + arch/ia64/kernel/perfmon.c | 198 ++++++++++++++++++------------------------ + arch/mips/kernel/irixioctl.c | 55 ++---------- + fs/anon_inodes.c | 24 ++++- + fs/binfmt_elf.c | 23 +----- + fs/binfmt_misc.c | 18 +---- + fs/binfmt_som.c | 10 -- + fs/eventfd.c | 5 +- + fs/eventpoll.c | 7 +- + fs/exec.c | 28 +++---- + fs/signalfd.c | 6 +- + fs/timerfd.c | 5 +- + include/linux/anon_inodes.h | 6 +- + include/linux/file.h | 3 +- + include/linux/fs.h | 3 - + kernel/exit.c | 6 +- + kernel/fork.c | 58 +++++------- + virt/kvm/kvm_main.c | 17 ++-- + 17 files changed, 178 insertions(+), 294 deletions(-) +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging x86-latest/latest +$ git merge x86-latest/latest +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Removed arch/x86/kernel/cpu/nexgen.c +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/setup_32.c +Auto-merged arch/x86/kernel/setup_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged arch/x86/lib/Makefile +Removed arch/x86/lib/bitops_32.c +Removed arch/x86/lib/bitops_64.c +Auto-merged drivers/Kconfig +Auto-merged drivers/base/core.c +Auto-merged drivers/video/Kconfig +Removed include/asm-x86/bitops_32.h +Removed include/asm-x86/bitops_64.h +Removed include/asm-x86/pgalloc_32.h +Removed include/asm-x86/pgalloc_64.h +Auto-merged include/linux/fs.h +Auto-merged include/linux/ide.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/printk.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged lib/Makefile +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/filesystems/sysfs-pci.txt | 1 + + Documentation/i386/boot.txt | 26 + + Documentation/kernel-parameters.txt | 2 + + Documentation/kmemcheck.txt | 101 +++ + arch/um/Kconfig | 50 +- + arch/um/Kconfig.char | 6 +- + arch/um/Kconfig.i386 | 15 +- + arch/um/Kconfig.x86_64 | 8 + + arch/um/sys-i386/Makefile | 2 +- + arch/um/sys-x86_64/Makefile | 2 +- + arch/x86/Kconfig | 67 +- + arch/x86/Kconfig.cpu | 24 +- + arch/x86/Kconfig.debug | 76 ++ + arch/x86/Makefile | 2 +- + arch/x86/Makefile_32.cpu | 3 +- + arch/x86/boot/header.S | 6 +- + arch/x86/configs/i386_defconfig | 1 + + arch/x86/configs/x86_64_defconfig | 1 + + arch/x86/ia32/ia32_signal.c | 10 - + arch/x86/ia32/ia32entry.S | 2 +- + arch/x86/kernel/Makefile | 5 + + arch/x86/kernel/acpi/boot.c | 74 ++- + arch/x86/kernel/aperture_64.c | 283 +++++--- + arch/x86/kernel/apic_32.c | 21 +- + arch/x86/kernel/apic_64.c | 3 +- + arch/x86/kernel/cpu/Makefile | 1 - + arch/x86/kernel/cpu/amd.c | 6 - + arch/x86/kernel/cpu/common.c | 9 +- + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/nexgen.c | 59 -- + arch/x86/kernel/ds.c | 953 ++++++++++++++++++-------- + arch/x86/kernel/e820_64.c | 35 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/entry_32.S | 20 +- + arch/x86/kernel/entry_64.S | 4 +- + arch/x86/kernel/genapic_64.c | 2 +- + arch/x86/kernel/head64.c | 25 +- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/kernel/i8253.c | 6 +- + arch/x86/kernel/i8259_64.c | 30 +- + arch/x86/kernel/io_apic_32.c | 10 +- + arch/x86/kernel/io_apic_64.c | 8 +- + arch/x86/kernel/kdebugfs.c | 163 +++++- + arch/x86/kernel/kmemcheck.c | 924 +++++++++++++++++++++++++ + arch/x86/kernel/mfgpt_32.c | 11 +- + arch/x86/kernel/mmconf-fam10h_64.c | 243 +++++++ + arch/x86/kernel/mpparse.c | 39 +- + arch/x86/kernel/paravirt.c | 12 +- + arch/x86/kernel/pci-calgary_64.c | 1 + + arch/x86/kernel/pci-dma.c | 11 +- + arch/x86/kernel/pci-gart_64.c | 23 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 54 ++- + arch/x86/kernel/process_64.c | 50 ++- + arch/x86/kernel/ptrace.c | 539 ++++++++------- + arch/x86/kernel/reboot.c | 4 +- + arch/x86/kernel/setup_32.c | 4 +- + arch/x86/kernel/setup_64.c | 52 ++- + arch/x86/kernel/signal_32.c | 35 +- + arch/x86/kernel/signal_64.c | 30 +- + arch/x86/kernel/smpboot.c | 29 +- + arch/x86/kernel/summit_32.c | 5 +- + arch/x86/kernel/tlb_64.c | 4 +- + arch/x86/kernel/trampoline_32.S | 2 +- + arch/x86/kernel/traps_32.c | 18 +- + arch/x86/kernel/traps_64.c | 21 +- + arch/x86/kernel/vm86_32.c | 7 +- + arch/x86/kernel/vmi_32.c | 22 +- + arch/x86/kernel/vmlinux_32.lds.S | 1 + + arch/x86/kernel/vsmp_64.c | 2 +- + arch/x86/lib/Makefile | 3 +- + arch/x86/lib/bitops_32.c | 70 -- + arch/x86/lib/bitops_64.c | 175 ----- + arch/x86/mach-voyager/voyager_smp.c | 14 +- + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/fault.c | 32 +- + arch/x86/mm/init_32.c | 35 +- + arch/x86/mm/init_64.c | 63 ++- + arch/x86/mm/ioremap.c | 31 +- + arch/x86/mm/k8topology_64.c | 38 +- + arch/x86/mm/numa_64.c | 43 +- + arch/x86/mm/pageattr.c | 6 +- + arch/x86/mm/pat.c | 175 +++++- + arch/x86/mm/pgtable.c | 276 ++++++++ + arch/x86/mm/pgtable_32.c | 204 ------ + arch/x86/pci/Makefile_32 | 1 + + arch/x86/pci/Makefile_64 | 2 +- + arch/x86/pci/acpi.c | 81 +-- + arch/x86/pci/common.c | 76 ++- + arch/x86/pci/direct.c | 8 +- + arch/x86/pci/fixup.c | 17 + + arch/x86/pci/init.c | 17 +- + arch/x86/pci/irq.c | 4 +- + arch/x86/pci/k8-bus_64.c | 580 ++++++++++++++-- + arch/x86/pci/legacy.c | 4 +- + arch/x86/pci/mmconfig-shared.c | 252 ++++++- + arch/x86/pci/mmconfig_32.c | 4 + + arch/x86/pci/mmconfig_64.c | 22 +- + arch/x86/pci/mp_bus_to_node.c | 23 + + arch/x86/pci/pci.h | 6 +- + arch/x86/video/fbdev.c | 2 + + arch/x86/xen/Kconfig | 2 +- + arch/x86/xen/Makefile | 4 +- + arch/x86/xen/enlighten.c | 54 +- + arch/x86/xen/grant-table.c | 91 +++ + arch/x86/xen/mmu.c | 143 ++--- + arch/x86/xen/setup.c | 21 + + arch/x86/xen/smp.c | 22 +- + arch/x86/xen/xen-asm.S | 42 +- + arch/x86/xen/xen-ops.h | 8 +- + drivers/Kconfig | 2 + + drivers/acpi/bus.c | 2 + + drivers/base/core.c | 14 +- + drivers/block/xen-blkfront.c | 23 +- + drivers/char/agp/amd64-agp.c | 77 +-- + drivers/char/mem.c | 133 +++- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 2 + + drivers/input/misc/pcspkr.c | 16 +- + drivers/input/xen-kbdfront.c | 340 +++++++++ + drivers/net/xen-netfront.c | 2 + + drivers/pci/pci-sysfs.c | 84 ++- + drivers/pci/probe.c | 21 +- + drivers/video/Kconfig | 14 + + drivers/video/Makefile | 1 + + drivers/video/geode/display_gx.h | 1 - + drivers/video/geode/gxfb_core.c | 3 +- + drivers/video/geode/lxfb.h | 8 - + drivers/video/geode/lxfb_ops.c | 19 +- + drivers/video/geode/video_gx.c | 5 +- + drivers/video/geode/video_gx.h | 3 - + drivers/video/xen-fbfront.c | 550 +++++++++++++++ + drivers/xen/Kconfig | 19 + + drivers/xen/Makefile | 4 +- + drivers/xen/balloon.c | 712 +++++++++++++++++++ + {arch/x86 => drivers}/xen/events.c | 121 +++- + {arch/x86 => drivers}/xen/features.c | 0 + drivers/xen/grant-table.c | 37 +- + drivers/xen/xenbus/xenbus_client.c | 6 +- + drivers/xen/xenbus/xenbus_probe.c | 32 +- + drivers/xen/xencomm.c | 232 +++++++ + include/asm-alpha/bitops.h | 5 + + include/asm-generic/bitops/__fls.h | 43 ++ + include/asm-generic/bitops/find.h | 2 + + include/asm-generic/bitops/fls64.h | 22 + + include/asm-generic/iomap.h | 4 + + include/asm-generic/siginfo.h | 8 + + include/asm-generic/vmlinux.lds.h | 1 + + include/asm-ia64/bitops.h | 16 + + include/asm-mips/bitops.h | 5 + + include/asm-parisc/bitops.h | 1 + + include/asm-powerpc/bitops.h | 5 + + include/asm-s390/bitops.h | 1 + + include/asm-sh/bitops.h | 1 + + include/asm-sparc64/bitops.h | 1 + + include/asm-x86/bios_ebda.h | 2 + + include/asm-x86/bitops.h | 149 ++++- + include/asm-x86/bitops_32.h | 166 ----- + include/asm-x86/bitops_64.h | 162 ----- + include/asm-x86/bootparam.h | 14 + + include/asm-x86/desc.h | 22 + + include/asm-x86/ds.h | 258 ++++++-- + include/asm-x86/e820_64.h | 3 +- + include/asm-x86/gart.h | 38 + + include/asm-x86/geode.h | 16 +- + include/asm-x86/hw_irq_64.h | 3 +- + include/asm-x86/i8253.h | 31 +- + include/asm-x86/io.h | 8 + + include/asm-x86/io_32.h | 6 - + include/asm-x86/io_64.h | 6 - + include/asm-x86/io_apic.h | 6 +- + include/asm-x86/irq_64.h | 8 +- + include/asm-x86/kdebug.h | 3 +- + include/asm-x86/kmemcheck.h | 30 + + include/asm-x86/mach-default/irq_vectors.h | 1 - + include/asm-x86/mach-default/smpboot_hooks.h | 2 +- + include/asm-x86/mach-visws/irq_vectors.h | 1 - + include/asm-x86/page.h | 1 + + include/asm-x86/paravirt.h | 43 +- + include/asm-x86/pci.h | 2 + + include/asm-x86/pda.h | 2 - + include/asm-x86/pgalloc.h | 127 ++++- + include/asm-x86/pgalloc_32.h | 95 --- + include/asm-x86/pgalloc_64.h | 133 ---- + include/asm-x86/pgtable.h | 96 ++-- + include/asm-x86/pgtable_32.h | 32 +- + include/asm-x86/pgtable_64.h | 2 +- + include/asm-x86/posix_types.h | 8 +- + include/asm-x86/processor.h | 13 +- + include/asm-x86/ptrace-abi.h | 14 +- + include/asm-x86/ptrace.h | 40 +- + include/asm-x86/rio.h | 11 - + include/asm-x86/stackprotector.h | 38 + + include/asm-x86/string_32.h | 313 +++++---- + include/asm-x86/string_64.h | 1 + + include/asm-x86/system.h | 115 ++-- + include/asm-x86/topology.h | 16 + + include/asm-x86/unistd.h | 8 +- + include/asm-x86/xen/events.h | 22 + + include/asm-x86/xen/grant_table.h | 7 + + include/asm-x86/xen/hypercall.h | 6 + + include/asm-x86/xen/interface.h | 28 + + include/asm-x86/xen/page.h | 168 +++++ + include/linux/acpi.h | 5 + + include/linux/bitops.h | 140 ++++ + include/linux/fs.h | 4 +- + include/linux/gfp.h | 3 +- + include/linux/ide.h | 3 +- + include/linux/kernel.h | 2 +- + include/linux/kernel_stat.h | 2 +- + include/linux/kmemcheck.h | 29 + + include/linux/magic.h | 1 + + include/linux/mm.h | 1 + + include/linux/netdevice.h | 4 +- + include/linux/page-flags.h | 1 + + include/linux/pci.h | 12 +- + include/linux/pci_ids.h | 2 + + include/linux/percpu.h | 7 + + include/linux/sched.h | 3 +- + include/linux/skbuff.h | 3 +- + include/linux/slab.h | 7 + + include/linux/slub_kmemcheck.h | 21 + + include/linux/stackprotector.h | 16 + + include/net/inet_sock.h | 3 +- + include/net/tcp.h | 11 + + include/xen/balloon.h | 61 ++ + include/xen/events.h | 9 +- + include/xen/grant_table.h | 7 + + include/xen/interface/callback.h | 102 +++ + include/xen/interface/grant_table.h | 11 +- + include/xen/interface/io/fbif.h | 124 ++++ + include/xen/interface/io/kbdif.h | 114 +++ + include/xen/interface/io/protocols.h | 21 + + include/xen/interface/memory.h | 12 +- + include/xen/interface/vcpu.h | 5 + + include/xen/interface/xen.h | 22 +- + include/xen/interface/xencomm.h | 41 ++ + include/xen/page.h | 181 +----- + include/xen/xen-ops.h | 8 + + include/xen/xenbus.h | 1 + + include/xen/xencomm.h | 77 ++ + init/do_mounts.c | 8 +- + init/main.c | 9 + + kernel/fork.c | 20 +- + kernel/panic.c | 77 ++- + kernel/printk.c | 2 +- + kernel/signal.c | 12 + + kernel/sysctl.c | 12 + + lib/Kconfig.debug | 1 - + lib/Makefile | 1 + + lib/find_next_bit.c | 77 ++- + localversion-x86-latest.git | 1 + + mm/Makefile | 3 + + mm/bootmem.c | 157 +++-- + mm/slub.c | 25 +- + mm/slub_kmemcheck.c | 100 +++ + mm/sparse.c | 37 +- + net/core/skbuff.c | 19 +- + z.c | 12 + + 259 files changed, 10196 insertions(+), 3263 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + delete mode 100644 arch/x86/kernel/cpu/nexgen.c + create mode 100644 arch/x86/kernel/kmemcheck.c + create mode 100644 arch/x86/kernel/mmconf-fam10h_64.c + delete mode 100644 arch/x86/lib/bitops_32.c + delete mode 100644 arch/x86/lib/bitops_64.c + create mode 100644 arch/x86/mm/pgtable.c + create mode 100644 arch/x86/pci/mp_bus_to_node.c + create mode 100644 arch/x86/xen/grant-table.c + create mode 100644 drivers/input/xen-kbdfront.c + create mode 100644 drivers/video/xen-fbfront.c + create mode 100644 drivers/xen/Kconfig + create mode 100644 drivers/xen/balloon.c + rename {arch/x86 => drivers}/xen/events.c (82%) + rename {arch/x86 => drivers}/xen/features.c (100%) + create mode 100644 drivers/xen/xencomm.c + create mode 100644 include/asm-generic/bitops/__fls.h + delete mode 100644 include/asm-x86/bitops_32.h + delete mode 100644 include/asm-x86/bitops_64.h + create mode 100644 include/asm-x86/kmemcheck.h + delete mode 100644 include/asm-x86/pgalloc_32.h + delete mode 100644 include/asm-x86/pgalloc_64.h + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/asm-x86/xen/events.h + create mode 100644 include/asm-x86/xen/grant_table.h + create mode 100644 include/asm-x86/xen/page.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 include/linux/slub_kmemcheck.h + create mode 100644 include/linux/stackprotector.h + create mode 100644 include/xen/balloon.h + create mode 100644 include/xen/interface/callback.h + create mode 100644 include/xen/interface/io/fbif.h + create mode 100644 include/xen/interface/io/kbdif.h + create mode 100644 include/xen/interface/io/protocols.h + create mode 100644 include/xen/interface/xencomm.h + create mode 100644 include/xen/xen-ops.h + create mode 100644 include/xen/xencomm.h + create mode 100644 localversion-x86-latest.git + create mode 100644 mm/slub_kmemcheck.c + create mode 100644 z.c +Applying x86-latest-kvm-fix-1 +Merging sched-latest/latest +$ git merge sched-latest/latest +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/pci/pci-driver.c +Auto-merged include/linux/dcache.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/Makefile +Auto-merged lib/Kconfig.debug +Merge made by recursive. + Documentation/RCU/NMI-RCU.txt | 3 + + Documentation/RCU/RTFP.txt | 108 +++++ + Documentation/RCU/checklist.txt | 89 +++-- + Documentation/RCU/whatisRCU.txt | 58 ++- + Documentation/kernel-parameters.txt | 3 + + Documentation/tracers/mmiotrace.txt | 153 ++++++ + arch/alpha/kernel/irq.c | 2 +- + arch/ia64/sn/kernel/irq.c | 1 + + arch/x86/Kconfig.debug | 28 ++ + arch/x86/kernel/alternative.c | 18 +- + arch/x86/kernel/ftrace.c | 4 +- + arch/x86/kernel/process.c | 117 +++++ + arch/x86/kernel/process_32.c | 109 ----- + arch/x86/kernel/process_64.c | 115 ----- + arch/x86/mm/Makefile | 5 + + arch/x86/mm/fault.c | 13 + + arch/x86/mm/init_32.c | 4 + + arch/x86/mm/init_64.c | 10 +- + arch/x86/mm/ioremap.c | 9 +- + arch/x86/mm/kmmio.c | 500 ++++++++++++++++++++ + arch/x86/mm/mmio-mod.c | 453 ++++++++++++++++++ + arch/x86/mm/pageattr.c | 1 + + arch/x86/mm/pf_in.c | 489 +++++++++++++++++++ + arch/x86/mm/pf_in.h | 39 ++ + arch/x86/mm/testmmiotrace.c | 71 +++ + crypto/async_tx/async_tx.c | 1 + + drivers/base/cpu.c | 2 + + drivers/infiniband/hw/ipath/ipath_verbs.c | 1 + + drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 3 +- + drivers/net/macvlan.c | 2 +- + drivers/pci/pci-driver.c | 2 +- + include/linux/cpumask.h | 5 + + include/linux/cpuset.h | 2 + + include/linux/dcache.h | 1 + + include/linux/irq.h | 7 - + include/linux/list.h | 367 --------------- + include/linux/mmiotrace.h | 89 ++++ + include/linux/rcuclassic.h | 3 + + include/linux/rculist.h | 373 +++++++++++++++ + include/linux/rcupdate.h | 24 + + include/linux/rcupreempt.h | 42 ++- + include/linux/sched.h | 5 +- + include/linux/writeback.h | 2 + + init/main.c | 1 + + kernel/Makefile | 1 + + kernel/cpuset.c | 115 +++++- + kernel/irq/manage.c | 65 +++ + kernel/kthread.c | 50 ++- + kernel/lockdep.c | 3 + + kernel/pid.c | 1 + + kernel/printk.c | 61 ++-- + kernel/rcuclassic.c | 30 ++- + kernel/rcupdate.c | 71 ++- + kernel/rcupreempt.c | 416 +++++++++++++++-- + kernel/sched.c | 40 +- + kernel/sched_cpupri.c | 174 +++++++ + kernel/sched_cpupri.h | 36 ++ + kernel/sched_rt.c | 122 ++---- + kernel/softlockup.c | 21 + + kernel/sysctl.c | 11 + + kernel/time/tick-sched.c | 11 +- + kernel/trace/Makefile | 1 + + kernel/trace/ftrace.c | 6 +- + kernel/trace/trace.c | 571 +++++++++++++++++++---- + kernel/trace/trace.h | 49 ++- + kernel/trace/trace_functions.c | 2 + + kernel/trace/trace_mmiotrace.c | 220 +++++++++ + kernel/trace/trace_sched_switch.c | 7 +- + kernel/trace/trace_selftest.c | 16 +- + lib/Kconfig.debug | 26 +- + lib/textsearch.c | 1 + + localversion-sched-devel.git | 1 + + mm/page-writeback.c | 10 +- + net/802/psnap.c | 1 + + net/8021q/vlan.c | 1 + + net/bridge/br_fdb.c | 1 + + net/bridge/br_stp.c | 1 + + net/netlabel/netlabel_domainhash.c | 3 +- + tests/rcutorture.c | 34 ++- + 79 files changed, 4521 insertions(+), 992 deletions(-) + create mode 100644 Documentation/tracers/mmiotrace.txt + create mode 100644 arch/x86/mm/kmmio.c + create mode 100644 arch/x86/mm/mmio-mod.c + create mode 100644 arch/x86/mm/pf_in.c + create mode 100644 arch/x86/mm/pf_in.h + create mode 100644 arch/x86/mm/testmmiotrace.c + create mode 100644 include/linux/mmiotrace.h + create mode 100644 include/linux/rculist.h + create mode 100644 kernel/sched_cpupri.c + create mode 100644 kernel/sched_cpupri.h + create mode 100644 kernel/trace/trace_mmiotrace.c + create mode 100644 localversion-sched-devel.git +Merging quilt/ldp +$ git merge quilt/ldp +Auto-merged drivers/hid/usbhid/hid-quirks.c +Auto-merged drivers/media/video/Kconfig +Auto-merged drivers/media/video/Makefile +Auto-merged drivers/misc/Kconfig +CONFLICT (content): Merge conflict in drivers/misc/Kconfig +Auto-merged drivers/misc/Makefile +CONFLICT (content): Merge conflict in drivers/misc/Makefile +Auto-merged fs/Kconfig +Resolved 'drivers/misc/Kconfig' using previous resolution. +Resolved 'drivers/misc/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + drivers/hid/usbhid/hid-quirks.c | 2 + + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/appleir.c | 360 + + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 +- + drivers/media/dvb/firesat/Kconfig | 11 + + drivers/media/dvb/firesat/Makefile | 12 + + drivers/media/dvb/firesat/avc_api.c | 813 + + drivers/media/dvb/firesat/avc_api.h | 380 + + drivers/media/dvb/firesat/cmp.c | 230 + + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 95 + + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 82 + + drivers/media/dvb/firesat/firesat-rc.h | 9 + + drivers/media/dvb/firesat/firesat.h | 85 + + drivers/media/dvb/firesat/firesat_1394.c | 468 + + drivers/media/dvb/firesat/firesat_dvb.c | 325 + + drivers/media/dvb/firesat/firesat_fe.c | 263 + + drivers/media/video/Kconfig | 1 + + drivers/media/video/Makefile | 2 + + drivers/media/video/go7007/Kconfig | 14 + + drivers/media/video/go7007/Makefile | 17 + + drivers/media/video/go7007/go7007-driver.c | 693 + + drivers/media/video/go7007/go7007-fw.c | 1643 ++ + drivers/media/video/go7007/go7007-i2c.c | 309 + + drivers/media/video/go7007/go7007-priv.h | 279 + + drivers/media/video/go7007/go7007-usb.c | 1229 + + drivers/media/video/go7007/go7007-v4l2.c | 1516 + + drivers/media/video/go7007/go7007.h | 120 + + drivers/media/video/go7007/saa7134-go7007.c | 484 + + drivers/media/video/go7007/snd-go7007.c | 315 + + drivers/media/video/go7007/wis-i2c.h | 55 + + drivers/media/video/go7007/wis-ov7640.c | 146 + + drivers/media/video/go7007/wis-saa7113.c | 378 + + drivers/media/video/go7007/wis-saa7115.c | 507 + + drivers/media/video/go7007/wis-sony-tuner.c | 757 + + drivers/media/video/go7007/wis-tw2804.c | 383 + + drivers/media/video/go7007/wis-tw9903.c | 378 + + drivers/media/video/go7007/wis-uda1342.c | 136 + + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 2 + + drivers/misc/aectc/Makefile | 1 + + drivers/misc/aectc/aec_tc.c | 349 + + drivers/misc/aectc/aectc.h | 18 + + drivers/misc/aectc/read.c | 63 + + drivers/misc/aectc/write.c | 64 + + drivers/misc/me4000.c | 5435 ++++ + drivers/misc/me4000.h | 1014 + + drivers/misc/xilinx_firm.h |15416 ++++++++++ + drivers/net/Kconfig | 32 + + drivers/net/Makefile | 2 + + drivers/net/et131x/MODULE-PARAMETER.txt | 36 + + drivers/net/et131x/Makefile | 18 + + drivers/net/et131x/et1310_address_map.h | 2399 ++ + drivers/net/et131x/et1310_eeprom.c | 480 + + drivers/net/et131x/et1310_eeprom.h | 89 + + drivers/net/et131x/et1310_jagcore.c | 222 + + drivers/net/et131x/et1310_jagcore.h | 112 + + drivers/net/et131x/et1310_mac.c | 800 + + drivers/net/et131x/et1310_mac.h | 93 + + drivers/net/et131x/et1310_phy.c | 1297 + + drivers/net/et131x/et1310_phy.h | 910 + + drivers/net/et131x/et1310_pm.c | 209 + + drivers/net/et131x/et1310_pm.h | 126 + + drivers/net/et131x/et1310_rx.c | 1401 + + drivers/net/et131x/et1310_rx.h | 373 + + drivers/net/et131x/et1310_tx.c | 1541 + + drivers/net/et131x/et1310_tx.h | 242 + + drivers/net/et131x/et131x_adapter.h | 347 + + drivers/net/et131x/et131x_config.c | 312 + + drivers/net/et131x/et131x_config.h | 67 + + drivers/net/et131x/et131x_debug.c | 218 + + drivers/net/et131x/et131x_debug.h | 202 + + drivers/net/et131x/et131x_defs.h | 128 + + drivers/net/et131x/et131x_initpci.c | 1047 + + drivers/net/et131x/et131x_initpci.h | 73 + + drivers/net/et131x/et131x_isr.c | 492 + + drivers/net/et131x/et131x_isr.h | 65 + + drivers/net/et131x/et131x_netdev.c | 868 + + drivers/net/et131x/et131x_netdev.h | 64 + + drivers/net/et131x/et131x_version.h | 86 + + drivers/net/slicoss/Makefile | 1 + + drivers/net/slicoss/gbdownload.h | 8215 ++++++ + drivers/net/slicoss/gbrcvucode.h | 239 + + drivers/net/slicoss/oasisdbgdownload.h | 6850 +++++ + drivers/net/slicoss/oasisdownload.h | 6848 +++++ + drivers/net/slicoss/oasisrcvucode.h | 205 + + drivers/net/slicoss/slic.h | 619 + + drivers/net/slicoss/slic_os.h | 150 + + drivers/net/slicoss/slicbuild.h | 97 + + drivers/net/slicoss/slicdbg.h | 100 + + drivers/net/slicoss/slicdump.h | 282 + + drivers/net/slicoss/slichw.h | 855 + + drivers/net/slicoss/slicinc.h | 215 + + drivers/net/slicoss/slicoss.c | 6160 ++++ + drivers/net/usb/Kconfig | 10 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/hso.c | 3153 +++ + drivers/usb/image/Kconfig | 9 + + drivers/usb/image/Makefile | 1 + + drivers/usb/image/f2255usb.h |40334 +++++++++++++++++++++++++++ + drivers/usb/image/s2255drv.c | 2802 ++ + fs/Kconfig | 9 + + fs/Makefile | 1 + + fs/novfs/Makefile | 19 + + fs/novfs/commands.h | 1089 + + fs/novfs/daemon.c | 2444 ++ + fs/novfs/file.c | 2225 ++ + fs/novfs/inode.c | 5634 ++++ + fs/novfs/nwcapi.c | 2537 ++ + fs/novfs/nwcapi.h | 2213 ++ + fs/novfs/nwerror.h | 658 + + fs/novfs/proc.c | 152 + + fs/novfs/profile.c | 687 + + fs/novfs/scope.c | 738 + + fs/novfs/vfs.h | 447 + + 118 files changed, 145256 insertions(+), 1 deletions(-) + create mode 100644 drivers/input/misc/appleir.c + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/video/go7007/Kconfig + create mode 100644 drivers/media/video/go7007/Makefile + create mode 100644 drivers/media/video/go7007/go7007-driver.c + create mode 100644 drivers/media/video/go7007/go7007-fw.c + create mode 100644 drivers/media/video/go7007/go7007-i2c.c + create mode 100644 drivers/media/video/go7007/go7007-priv.h + create mode 100644 drivers/media/video/go7007/go7007-usb.c + create mode 100644 drivers/media/video/go7007/go7007-v4l2.c + create mode 100644 drivers/media/video/go7007/go7007.h + create mode 100644 drivers/media/video/go7007/saa7134-go7007.c + create mode 100644 drivers/media/video/go7007/snd-go7007.c + create mode 100644 drivers/media/video/go7007/wis-i2c.h + create mode 100644 drivers/media/video/go7007/wis-ov7640.c + create mode 100644 drivers/media/video/go7007/wis-saa7113.c + create mode 100644 drivers/media/video/go7007/wis-saa7115.c + create mode 100644 drivers/media/video/go7007/wis-sony-tuner.c + create mode 100644 drivers/media/video/go7007/wis-tw2804.c + create mode 100644 drivers/media/video/go7007/wis-tw9903.c + create mode 100644 drivers/media/video/go7007/wis-uda1342.c + create mode 100644 drivers/misc/aectc/Makefile + create mode 100644 drivers/misc/aectc/aec_tc.c + create mode 100644 drivers/misc/aectc/aectc.h + create mode 100644 drivers/misc/aectc/read.c + create mode 100644 drivers/misc/aectc/write.c + create mode 100644 drivers/misc/me4000.c + create mode 100644 drivers/misc/me4000.h + create mode 100644 drivers/misc/xilinx_firm.h + create mode 100644 drivers/net/et131x/MODULE-PARAMETER.txt + create mode 100644 drivers/net/et131x/Makefile + create mode 100644 drivers/net/et131x/et1310_address_map.h + create mode 100644 drivers/net/et131x/et1310_eeprom.c + create mode 100644 drivers/net/et131x/et1310_eeprom.h + create mode 100644 drivers/net/et131x/et1310_jagcore.c + create mode 100644 drivers/net/et131x/et1310_jagcore.h + create mode 100644 drivers/net/et131x/et1310_mac.c + create mode 100644 drivers/net/et131x/et1310_mac.h + create mode 100644 drivers/net/et131x/et1310_phy.c + create mode 100644 drivers/net/et131x/et1310_phy.h + create mode 100644 drivers/net/et131x/et1310_pm.c + create mode 100644 drivers/net/et131x/et1310_pm.h + create mode 100644 drivers/net/et131x/et1310_rx.c + create mode 100644 drivers/net/et131x/et1310_rx.h + create mode 100644 drivers/net/et131x/et1310_tx.c + create mode 100644 drivers/net/et131x/et1310_tx.h + create mode 100644 drivers/net/et131x/et131x_adapter.h + create mode 100644 drivers/net/et131x/et131x_config.c + create mode 100644 drivers/net/et131x/et131x_config.h + create mode 100644 drivers/net/et131x/et131x_debug.c + create mode 100644 drivers/net/et131x/et131x_debug.h + create mode 100644 drivers/net/et131x/et131x_defs.h + create mode 100644 drivers/net/et131x/et131x_initpci.c + create mode 100644 drivers/net/et131x/et131x_initpci.h + create mode 100644 drivers/net/et131x/et131x_isr.c + create mode 100644 drivers/net/et131x/et131x_isr.h + create mode 100644 drivers/net/et131x/et131x_netdev.c + create mode 100644 drivers/net/et131x/et131x_netdev.h + create mode 100644 drivers/net/et131x/et131x_version.h + create mode 100644 drivers/net/slicoss/Makefile + create mode 100644 drivers/net/slicoss/gbdownload.h + create mode 100644 drivers/net/slicoss/gbrcvucode.h + create mode 100644 drivers/net/slicoss/oasisdbgdownload.h + create mode 100644 drivers/net/slicoss/oasisdownload.h + create mode 100644 drivers/net/slicoss/oasisrcvucode.h + create mode 100644 drivers/net/slicoss/slic.h + create mode 100644 drivers/net/slicoss/slic_os.h + create mode 100644 drivers/net/slicoss/slicbuild.h + create mode 100644 drivers/net/slicoss/slicdbg.h + create mode 100644 drivers/net/slicoss/slicdump.h + create mode 100644 drivers/net/slicoss/slichw.h + create mode 100644 drivers/net/slicoss/slicinc.h + create mode 100644 drivers/net/slicoss/slicoss.c + create mode 100644 drivers/net/usb/hso.c + create mode 100644 drivers/usb/image/f2255usb.h + create mode 100644 drivers/usb/image/s2255drv.c + create mode 100644 fs/novfs/Makefile + create mode 100644 fs/novfs/commands.h + create mode 100644 fs/novfs/daemon.c + create mode 100644 fs/novfs/file.c + create mode 100644 fs/novfs/inode.c + create mode 100644 fs/novfs/nwcapi.c + create mode 100644 fs/novfs/nwcapi.h + create mode 100644 fs/novfs/nwerror.h + create mode 100644 fs/novfs/proc.c + create mode 100644 fs/novfs/profile.c + create mode 100644 fs/novfs/scope.c + create mode 100644 fs/novfs/vfs.h +$ git revert 9f466fca805b7366f471fb70866736287d485209 +Removed drivers/media/dvb/firesat/Kconfig +Removed drivers/media/dvb/firesat/Makefile +Removed drivers/media/dvb/firesat/avc_api.c +Removed drivers/media/dvb/firesat/avc_api.h +Removed drivers/media/dvb/firesat/cmp.c +Removed drivers/media/dvb/firesat/cmp.h +Removed drivers/media/dvb/firesat/firesat-ci.c +Removed drivers/media/dvb/firesat/firesat-ci.h +Removed drivers/media/dvb/firesat/firesat-rc.c +Removed drivers/media/dvb/firesat/firesat-rc.h +Removed drivers/media/dvb/firesat/firesat.h +Removed drivers/media/dvb/firesat/firesat_1394.c +Removed drivers/media/dvb/firesat/firesat_dvb.c +Removed drivers/media/dvb/firesat/firesat_fe.c +Finished one revert. +Created commit 65df82e: Revert "DVB: add firesat driver" + 16 files changed, 1 insertions(+), 2794 deletions(-) + delete mode 100644 drivers/media/dvb/firesat/Kconfig + delete mode 100644 drivers/media/dvb/firesat/Makefile + delete mode 100644 drivers/media/dvb/firesat/avc_api.c + delete mode 100644 drivers/media/dvb/firesat/avc_api.h + delete mode 100644 drivers/media/dvb/firesat/cmp.c + delete mode 100644 drivers/media/dvb/firesat/cmp.h + delete mode 100644 drivers/media/dvb/firesat/firesat-ci.c + delete mode 100644 drivers/media/dvb/firesat/firesat-ci.h + delete mode 100644 drivers/media/dvb/firesat/firesat-rc.c + delete mode 100644 drivers/media/dvb/firesat/firesat-rc.h + delete mode 100644 drivers/media/dvb/firesat/firesat.h + delete mode 100644 drivers/media/dvb/firesat/firesat_1394.c + delete mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + delete mode 100644 drivers/media/dvb/firesat/firesat_fe.c +Applying parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP +Applying nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP +Applying smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..018edb46f880 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,520 @@ +Importing driver-core based on 2.6.25-git3 +$ git branch -D quilt/driver-core +Deleted branch quilt/driver-core. +$ git checkout -b quilt/driver-core 807501475fce0ebe68baedf87f202c3e4ee0d12c +Switched to a new branch "quilt/driver-core" +$ git quiltimport --patches ../quilt/driver-core +net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch +pm-new-suspend-and-hibernation-callbacks-for-platform-bus-type.patch +pm-new-suspend-and-hibernation-callbacks-for-pci-bus-type.patch +driver-core-remove-no-longer-used-struct-class_device.patch +put_device-might_sleep.patch +warn-when-statically-allocated-kobjects-are-used.patch +sysfs-crash-debugging.patch +Importing pci based on quilt/driver-core +$ git branch -D quilt/pci +Deleted branch quilt/pci. +$ git checkout -b quilt/pci quilt/driver-core +Switched to a new branch "quilt/pci" +$ git quiltimport --patches ../quilt/pci +Importing usb based on quilt/pci +$ git branch -D quilt/usb +Deleted branch quilt/usb. +$ git checkout -b quilt/usb quilt/pci +Switched to a new branch "quilt/usb" +$ git quiltimport --patches ../quilt/usb +usb-cp2101-add-new-device-ids.patch +usb-fix-memory-leak-in-mon_stat_release.patch +usb-add-hp-hs2300-broadband-wireless-module-to-sierra.c.patch +usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch +usb-reorganize-code-in-hub.c.patch +usb-make-usb-persist-work-after-every-system-sleep.patch +usb-remove-config_usb_persist-setting.patch +.dotest/patch:225: space before tab in indent. + */ +warning: 1 line adds whitespace errors. +usb-check-serial-number-string-after-device-reset.patch +usb-enable-usb-persist-by-default.patch +checkpatch-usb_free_urb-can-take-null.patch +usb-add-usb_dt_cs_radio_control-define-to-ch9.h.patch +usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch +usb-microtek-remove-unused-semaphore.patch +usb-libusual-locking-cleanup.patch +usb-make-usb_storage_onetouch-available-with-pm.patch +usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch +usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch +usb-defines-for-usb-link-power-management-ecn.patch +usb-ehci-minor-cleanups.patch +usb-ohci-port-reset-paranoia-timeout.patch +usb-ehci-tolerates-some-buggy-devices.patch +usb-ehci-minor-soc-bus-glue-fixes.patch +usb-m66592-udc-reduce-size-of-data-structure.patch +usb-ehci-refactor-if-state-hc_state_halt.patch +usb-gadget-hangup-tty-on-g_serial-disconnect.patch +usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch +usb-cypress_m8-feature-buffer-fixes.patch +usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch +usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch +usb-cypress_m8-get-rid-of-pointless-null-check.patch +usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch +usb-misc-auerswald-cp_mutex-to-mutex.diff +usb-misc-auerswald-ccp_readmutex-to-mutex.diff +usb-misc-auerswald-ccp_mutex-to-mutex.diff +usb-minor-ehci-xitd-simplifications.patch +usb-usb-serial-prepare-for-bkl-push-down.patch +usb-ftdi_sio-note-missing-locking.patch +usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch +usb-iuu_phoenix-lock-priv-tiostatus-properly.patch +usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch +usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch +usb-io_ti-lock-mcr-and-msr-shadows-properly.patch +usb-use-div_round_up.patch +usb-io_ti.c-remove-unneeded-null-tty-check.patch +usb-partial-usb-embedded-host-support.patch +usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch +usb-ipaq-fix-devices-having-more-than-one-endpoint.patch +usb-remove-dev-power.power_state.patch +usb-ehci-paranoia-reject-large-control-transfers.patch +usb-cypress_m8-speed-handling.patch +drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch +usb-usb.h-reduce-syslog-clutter.patch +usb-standardize-inclusion-protection-and-add-where-missing.patch +usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch +usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch +usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch +usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch +usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch +usb-remove-experimental-designation-from-usb-mdc800-support.patch +usb-remove-experimental-from-dynamic-usb-minor-allocation.patch +usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch +usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch +usbmon-restore-mmap.patch +usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch +usb-increase-cdc-acm-write-throughput.patch +usb-serial-sierra-clean-up.patch +usb-serial-sierra-c597-fix.patch +usb-serial-sierra-add-new-dev-group.patch +usb-add-usb-serial-spcp8x5-driver.patch +u132-hcd-fix-checkpatch-style-issues.patch +u132-hdc-semaphore-to-mutex.patch +usb-fix-comments-of-2-functions-in-hcd.c.patch +usb-serial-remove-obsolete-contact-addresses.patch +usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch +usb-g_printer-bugfixes.patch +usb-usb-storage-use-adaptive-dma-mask.patch +usb-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.patch +usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch +usb-ohci-fix-bug-in-controller-resume.patch +usb-convert-away-from-urb-status-in-xpad-driver.patch +usb-root-hubs-don-t-lie-about-their-number-of-tts.patch +usb-clarify-usage-of-hcd-suspend-resume-methods.patch +usb-ohci-host-controller-resumes-leave-root-hub-suspended.patch +usb-replace-remaining-__pretty_function__-occurrences.patch +usb-rework-sysfs-removal-of-interface-files.patch +usb-gadget-section-fixes.patch +usb-dummy-hcd-use-dynamic-allocation-for-platform_devices.patch +usb-at91_udc-can-prefetch-data.patch +usb-ehci-shutdown-refactored.patch +usb-oti6858-fix-tcflsh-ioctl-handling.patch +usb-r8a66597-hcd-fix-interrupt-transfer-interval.patch +usb-r8a66597-hcd-fix-usb-device-connection-timing.patch +usb-r8a66597-hcd-add-support-for-sh7366-usb-host.patch +usb-add-extension-of-anchor-api-usb_unlink_anchored_urbs.patch +usb-remove-superfluous-depends-on-usb_serial-from-kconfig.patch +usb-update-comments-about-usb-driver-s-header.patch +usb-log-an-error-message-when-usb-enumeration-fails.patch +usb-ehci-qh-qtd-cleanup-comments.patch +usb-add-documentation-about-usb_anchor.patch +usb-option.c-correct-dtr-behaviour.patch +usb-serial-remove-unneeded-number-endpoints-settings.patch +usb-serial-remove-endpoints-setting-checks-from-core-and-header.patch +usb-g_file_storage-ignore-bulk-out-data-after-invalid-cbw.patch +usb-hcds-use-the-do_remote_wakeup-flag.patch +usb-ohci-turn-off-rd-when-remote-wakeup-is-disabled.patch +usb-don-t-explicitly-reenable-root-hub-status-interrupts.patch +usb-add-documentation-about-callbacks.patch +usb-cdc-acm-signedness-fix.patch +usb-ehci-qh_completions-cleanup-and-bugfix.patch +usb-fix-compile-problems-in-ehci-hcd.patch +usb-usbfs-export-the-urb_no_interrupt-flag-to-userspace.patch +usb-replace-remaining-__function__-occurrences.patch +.dotest/patch:2592: space before tab in indent. + dbg(1," %s : file is NULL", __func__); +.dotest/patch:2600: space before tab in indent. + dbg(1," %s : object is NULL", __func__); +.dotest/patch:8357: space before tab in indent. + dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length); +.dotest/patch:8732: space before tab in indent. + dbg ("%s - Update complete 0x%x", __func__, status); +.dotest/patch:8796: space before tab in indent. + dbg ("%s - Error downloading operational code image", __func__); +warning: squelched 5 whitespace errors +warning: 10 lines add whitespace errors. +usb-serial-more-fixes-and-groundwork-for-tty-changes.patch +.dotest/patch:345: space before tab in indent. + mct_u232_set_modem_ctrl(serial, priv->control_state); +warning: 1 line adds whitespace errors. +usb-remove-unnecessary-type-casting-of-urb-context.patch +wusb-add-authenticated-bit-to-usb-dev.patch +.dotest/patch:19: space before tab in indent. + unsigned authenticated:1; +warning: 1 line adds whitespace errors. +usb-add-usb_dev_reset_delayed.patch +wusb-add-link-wusb-usb-dev.patch +wusb-teach-choose-address-about-wireless-devices.patch +wusb-devices-dont-use-a-set-address.patch +.dotest/patch:14: space before tab in indent. + /* +.dotest/patch:15: space before tab in indent. + * If device is WUSB, we already assigned an +.dotest/patch:16: space before tab in indent. + * unauthorized address in the Connect Ack sequence; +.dotest/patch:17: space before tab in indent. + * authorization will assign the final address. +.dotest/patch:18: space before tab in indent. + */ +warning: squelched 2 whitespace errors +warning: 7 lines add whitespace errors. +wusb-make-ep0-reinit-available.patch +wusb-update-devnum.patch +wusb-documentation.patch +bitmap-add-bitmap_copy_le.patch +wusb-add-usb-specific-wusb-include-files.patch +wusb-add-the-uwb-include-files.patch +uwb-add-the-uwb-stack.patch +wusb-add-whc-rc-radio-control-driver.patch +.dotest/patch:494: space before tab in indent. + whcrc->umc_dev = umc_dev; +.dotest/patch:507: space before tab in indent. + result = whcrc_setup_rc_umc(whcrc); +.dotest/patch:509: space before tab in indent. + dev_err(dev, "Can't setup RC UMC interface: %d\n", result); +.dotest/patch:514: space before tab in indent. + dev_err(dev, "Can't setup RC interface: %d\n", result); +.dotest/patch:576: space before tab in indent. + .probe = whcrc_probe, +warning: squelched 1 whitespace error +warning: 6 lines add whitespace errors. +wusb-add-hwa-rc-radio-controller-driver.patch +wusb-add-uwb-core-for-wimedia-link-protocol.patch +wusb-add-the-i1480-driver.patch +.dotest/patch:969: space before tab in indent. + const struct firmware *fw; +.dotest/patch:1329: space before tab in indent. + const struct firmware *fw; +.dotest/patch:3487: space before tab in indent. + "Dropping\n", untd_hdr->reserved1); +.dotest/patch:4783: space before tab in indent. + /* +warning: 4 lines add whitespace errors. +wusb-add-the-usb-wireless-core-code.patch +wusb-add-the-usb-wusb-cbaf-driver.patch +wusb-add-the-wire-adapter-core.patch +wusb-add-hwa-hc-wireless-host-controller-driver.patch +usb-gotemp.patch +Importing device-mapper based on 2.6.25 +$ git branch -D quilt/device-mapper +Deleted branch quilt/device-mapper. +$ git checkout -b quilt/device-mapper v2.6.25 +Switched to a new branch "quilt/device-mapper" +$ git quiltimport --patches ../quilt/device-mapper +dm-raid1-use-list_split_init.patch +dm-log-generalise-name-in-messages.patch +dm-log-move-dirty-region-log-code-into-separate-module.patch +dm-snapshot-store-pointer-to-target-instance.patch +dm-io-rename-error-to-error_bits.patch +dm-io-clean-interface.patch +dm-kcopyd-clean-interface.patch +dm-log-clean-interface.patch +dm-log-move-register-functions.patch +dm-log-make-module-use-tracking-internal.patch +dm-kcopyd-per-device.patch +dm-kcopyd-private-mempool.patch +dm-kcopyd-remove-redundant-client-counting.patch +dm-expose-macros.patch +dm-kcopyd-rename.patch +dm-move-include-files.patch +dm-table-drop-void-suspend_targets-return.patch +dm-table-remove-unused-dm_create_error_table.patch +dm-raid1-use-timer.patch +dm-remove-md-argument-from-specific_minor.patch +Importing i2c based on 2.6.25-git4 +$ git branch -D quilt/i2c +Deleted branch quilt/i2c. +$ git checkout -b quilt/i2c 94bc891b00e40cbec375feb4568780af183fd7f4 +Switched to a new branch "quilt/i2c" +$ git quiltimport --patches ../quilt/i2c +i2c-new-co-maintainer.patch +Importing kernel-doc based on 2.6.25-rc8 +$ git branch -D quilt/kernel-doc +Deleted branch quilt/kernel-doc. +$ git checkout -b quilt/kernel-doc v2.6.25-rc8 +Switched to a new branch "quilt/kernel-doc" +$ git quiltimport --patches ../quilt/kernel-doc +docsrc-spi-split-fix.patch +kconfig_allconfig_docv2.patch +move-smart-config.patch +kerndoc-dup-section-name-err.patch +docbook-klocking-tryfunc.patch +kerndoc-trailing-info.patch +doc-dma-api-txt.patch +Importing ide based on commit e675349e2bdbfb661fa0d8ff2441b4cf48fb7e48 +$ git branch -D quilt/ide +Deleted branch quilt/ide. +$ git checkout -b quilt/ide e675349e2bdbfb661fa0d8ff2441b4cf48fb7e48 +Switched to a new branch "quilt/ide" +$ git quiltimport --patches ../quilt/ide +ide-make-ide_pci_check_iomem-actually-work.patch +ide-cleanup-ide_match_hwif.patch +ide-cleanup-ide_find_port.patch +swarm-use-ide_find_port.patch +ide-pmac-dynamically-allocate-struct-pmac_ide_hwif-instances-take-2.patch +ide-pmac-use-ide_find_port.patch +sgiioc4-use-ide_find_port.patch +scc_pata-ide_find_port.patch +au1xxx-ide-use-ide_find_port.patch +cmd640-remove-cmd_drives.patch +cmd640-use-ide_find_port.patch +scc_pata-store-hwif-pointer-in-struct-scc_ports.patch +umc8672-dont-use-ide_hwifs-in-umc_set_pio_mode.patch +ht6560b-use-driver-name-for-resource-allocation.patch +qd65xx-return-error-value-in-qd_probe.patch +ide-ide_hflag_bootable-to-ide_hflag_non_bootable.patch +ide-use-div_round_up.patch +ide-remove-pio-downgrade-quirk.patch +ide-merge-ide_match_hwif-and-ide_find_port.patch +ide-use-ide_find_port-in-legacy-vlb-host-drivers-take-2.patch +ide-generic-use-ide_find_port-take-3.patch +ide-unexport-ide_hwifs.patch +ide-disk-add-proc_idedisk_read_smart-helper.patch +ide-disk-fix-issues-found-by-checkpatch-pl.patch +ide-cd-remove-the-internal-64k-buffer.patch +remove-include-linux-hdsmart-h.patch +ide_platform-fix-resources-handling.patch +delkin_cb-fix-resources-handling.patch +bast-ide-fix-resources-reservation.patch +mpc8xx-make-m8xx_ide_init_ports-return-an-error-value.patch +mpc8xx-fix-resources-reservation.patch +falconide-fix-resources-reservation-take-2.patch +ide-remove-ide_hflag_cy82c693-host-flag.patch +ide-remove-hwif-straight8-flag.patch +ide-coding-style-fixes-to-drivers_ide_setup-pci-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_tc86c001-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_slc90e66-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_sis5513-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_jmicron-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_generic-c.patch +ide-coding-style-fixes-to-drivers_ide_legacy_umc8672-c.patch +ide-coding-style-fixes-to-drivers_ide_legacy_ide-4drives-c.patch +ide-coding-style-fixes-to-drivers_ide_ide-proc-c.patch +ide-coding-style-fixes-to-drivers_ide_ide-pnp-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_opti621-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_cmd640-c.patch +ide-coding-style-fixes-to-drivers_ide_legacy_hd-c.patch +ide-coding-style-fixes-to-drivers_ide_legacy_ali14xx-c.patch +ide-coding-style-fixes-to-drivers_ide_ide-floppy-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_it8213-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_cy82c693-c.patch +ide-coding-style-fixes-to-drivers_ide_ide-cd-c.patch +ide-cd-replace-__function__-with-__func__.patch +ide-cd-put-proc-related-functions-together-under-single-ifdef.patch +qd65xx-selectproc-method-needs-to-be-always-used.patch +qd65xx-use-ide_hflag_single-host-flag.patch +it821x-fix-kzalloc-failure-handling.patch +sis5513-fail-early-for-unsupported-chipsets.patch +ide-sanitize-handling-of-ide_hflag_no_set_mode-host-flag.patch +ide-add-struct-ide_port_ops-take-2.patch +ide-cd-include-proper-headers.patch +ide-cd-put-all-proc-related-code-at-one-place.patch +ide-cd-fixup-comments.patch +ide-cd-shorten-lines-longer-than-80-columns.patch +ide-cd-fix-remaining-checkpatch-pl-issues.patch +ide-remove-noprobe-field-from-ide_hwif_t.patch +ide-add-ide_legacy_device_add-helper.patch +ide-use-ide_legacy_device_add-for-qd65xx-take-2.patch +qd65xx-cleanup-qd_probe.patch +ide-pnp-manage-io-resources-in-driver.patch +ide-cs-manage-io-resources-in-driver.patch +ide-register-ports-with-non-present-devices-for-warm-plug.patch +ide-remove-ide_hwif_release_regions.patch +ide-generic-manage-io-resources-in-driver.patch +ide-4drives-manage-io-resources-in-driver.patch +ide_arm-manage-io-resources-in-driver.patch +ide-add-ide_legacy_init_one-helper.patch +ide-manage-io-resources-in-ide_legacy_init_one.patch +cmd640-manage-io-resources-in-driver.patch +ide-manage-resources-for-pci-devices-in-ide_pci_enable-take-2.patch +ide-remove-ide_hwif_request_regions.patch +ide-cleanup-setting-hwif-mmio-flag.patch +ide-tape-remove-idetape_pipeline_active.patch +ide-replace-remaining-__function__-occurrences.patch +ide-remove-extra-field-from-struct-ide_port_info.patch +ide-remove-ide_dma_iobase.patch +ide-remove-cds-field-from-ide_hwif_t-take-2.patch +ide-dont-display-bios-settings-in-ide_setup_dma.patch +pdc202xx_old-remove-init_dma_pdc202xx.patch +alim15x3-skip-dma-initialization-completely-on-revs-lt-0x20.patch +ide-move-ide_setup_dma-call-out-from-init_dma-method.patch +ide-export-ide_allocate_dma_engine.patch +ide-factor-out-setting-pci-bus-mastering-from-ide_hwif_setup_dma.patch +ide-cleanup-ide_setup_dma.patch +au1xxx-ide-fix-mwdma-support.patch +ide-do-complete-dma-setup-in-init_dma-method-take-2.patch +ide-pmac-use-init_dma-method.patch +icside-use-init_dma-method.patch +sgiioc4-use-init_dma-method.patch +palm_bk3710-use-init_dma-method.patch +au1xxx-ide-use-init_dma-method.patch +sl82c105-check-bridge-revision-in-sl82c105_init_one.patch +ide-add-ide_hflag_serialize_dma-host-flag.patch +ide-add-struct-ide_dma_ops-take-3.patch +ide-constify-struct-ide_dma_ops.patch +ide-tape-remove-tape-cache_stage.patch +ide-tape-remove-pipeline-specific-code-from-idetape_add_chrdev_write_request.patch +ide-tape-remove-pipeline-speed_control-calculations.patch +ide-tape-remove-pipeline-specific-code-from-idetape_add_chrdev_read_request.patch +ide-add-ignore_cable-kernel-parameter-take-2.patch +ide-remove-obsoleted-idex-serialize-kernel-parameter.patch +ide-remove-obsoleted-idex-reset-kernel-parameter.patch +ide-remove-obsoleted-idex-kernel-parameters.patch +ide-remove-obsoleted-hdx-noautotune-kernel-parameter.patch +ide-tape-remove-unused-parameter-from-idetape_copy_stage_to_user.patch +ide-tape-remove-unused-parameter-from-idetape_copy_stage_from_user.patch +ide-tape-remove-pipeline-specific-code-in-idetape_space_over_filemarks.patch +ide-tape-remove-idetape_pipeline_size.patch +ide-tape-remove-idetape_remove_stage_head.patch +ide-tape-remove-pipeline-specific-code-from-idetape_end_request.patch +ide-tape-unwrap-idetape_queue_pc_tail.patch +ide-tape-remove-remaining-pipeline-functionality.patch +ide-tape-remove-pipelined-mode-tape-control-flags.patch +ide-tape-remove-pipeline-specific-members-from-struct-ide_tape_obj.patch +ide-tape-remove-pipelined-mode-parameters.patch +ide-tape-remove-misc-references-to-pipelined-operation-in-the-comments.patch +ide-tape-remove-pipelined-mode-description-from-documentation_ide_ide-tape-txt.patch +ide-tape-remove-comments-markup-from-documentation_ide_ide-tape-txt.patch +ide-add-vlb-pci_clock-parameter.patch +ide-mark-idebus-kernel-parameter-as-obsoleted-take-2.patch +ide-remove-obsoleted-idebus-kernel-parameter.patch +ide-always-auto-tune-pio-in-legacy-vlb-host-drivers.patch +cmd640-always-auto-tune-pio.patch +ide-remove-ide_hflag_no_autotune-host-flag.patch +ide-remove-obsoleted-hdx-autotune-kernel-parameter.patch +ide-add-nodma-noflush-noprobe-nowerr-parameters.patch +ide-add-cdrom-and-chs-parameters.patch +ide-remove-obsoleted-hdx-kernel-parameters.patch +ide-cleanup-init_ide_data.patch +gayle-add-doubler-parameter.patch +ide-add-noacpi-acpigtf-acpionboot-parameters.patch +ide-remove-obsoleted-ide-parameters.patch +mpc8xx-ide-use-ide_find_port.patch +ide-sanitize-ide_unregister-usage.patch +ide-make-ide_unregister-take-ide_hwif_t-as-an-argument.patch +ide-fix-hwif-s-initialization.patch +ide-make-ide_hwifs-static.patch +ide-make-32-bit-io-support-for-ide-vlb-available-only-when-it-makes-sense.patch +ide-add-struct-ide_io_ports-take-2.patch +ide-tape-improve-buffer-allocation-strategy.patch +ide-tape-mv-tape-stage_size-tape-buffer_size.patch +ide-tape-mv-tape-pages_per_stage-tape-pages_per_buffer.patch +ide-tape-improve-buffer-pages-freeing-strategy.patch +ide-remove-_proc_ide_ali.patch +ide-remove-now-unused-ide_pci_create_host_proc.patch +ide-tape-make-__idetape_discard_read_pipeline-of-type-void.patch +ide-tape-mv-idetape_discard_read_pipeline-ide_tape_discard_merge_buffer.patch +ide-tape-mv-idetape_empty_write_pipeline-ide_tape_flush_merge_buffer.patch +ide-tape-mv-tape-merge_stage_size-tape-merge_bh_size.patch +ide-tape-remove-tape-merge_stage.patch +ide-tape-fix-mem-leak.patch +falconide-q40ide-add-atapi_-put_bytes-and-ata_-put_data-methods-take-2.patch +ide-merge-atapi_-put_bytes-and-ata_-put_data-methods.patch +scc_pata-add-in-out-put_data-methods-take-2.patch +au1xxx-ide-add-in-out-put_data-methods-take-2.patch +ide-h8300-add-in-out-put_data-methods-take-2.patch +ide-add-ide_hflag_mmio-host-flag-take-2.patch +ide-remove-inswl-and-outswl-methods.patch +siimage-do-clocking-register-posting-earlier-in-setup_mmio_siimage.patch +siimage-add-sil_-io-ops.patch +siimage-remove-proc_reports_siimage.patch +ide-always-use-outbsync-method-for-executing-commands.patch +ide-floppy-tape-scsi-400ns-delay-is-required-after-executing-the-command.patch +ide-add-ide_execute_pkt_cmd-helper.patch +ide-factor-out-debugging-code-from-ide_tf_load.patch +ide-move-ide_tf_load-read-to-ide-iops-c.patch +ide-add-tf_load-and-tf_read-methods.patch +ide-cris-add-tf_load-read-methods.patch +ide-h8300-add-tf_load-read-methods.patch +scc_pata-add-tf_load-read-methods.patch +ns87415-add-tf_read-method.patch +ide-use-ide-io-helpers-directly-in-ide_tf_load-read.patch +ide-remove-inw-and-outw-methods.patch +ide-add-ide_pad_transfer-helper.patch +ide-skip-vlb-sync-if-host-uses-mmio.patch +scc_pata-add-dma_host_set-and-dma_start-methods.patch +ide-remove-dma_vendor1-3-fields-from-ide_hwif_t.patch +ide-remove-dma_prdtable-field-from-ide_hwif_t.patch +remove-the-broken-etrax_ide-driver.patch +Importing m68k based on 94bc891b00e40cbec375feb4568780af183fd7f4 +$ git branch -D quilt/m68k +Deleted branch quilt/m68k. +$ git checkout -b quilt/m68k 94bc891b00e40cbec375feb4568780af183fd7f4 +Switched to a new branch "quilt/m68k" +$ git quiltimport --patches ../quilt/m68k +m68k-convert-access_ok-to-inline-func.diff +m68k-kill-CONFIG_FB_DAFB.diff +m68k-correct-FB_HP300-dependencies.diff +m68k-whippet-serial-no-longer-exists.diff +m68k-vme_scc-globals.diff +m68k-silence-BUG-can-return-warnings.diff +m68k-hp300-breaks-multi-platform.diff +m68k-macide-breaks-multi-platform.diff +m68k-dnfb-breaks-multi-platform.diff +m68k-net-drivers-break-multiplatform.diff +m68k-input-drivers-break-multiplatform.diff +m68k-initcalls-should-return-ENODEV-if-device-not-found.diff +m68k-q40-floppy-is-broken.diff +m68k-update-defconfig.diff +m68k-add-multi_defconfig.diff +Importing ldp based on quilt/usb +$ git branch -D quilt/ldp +Deleted branch quilt/ldp. +$ git checkout -b quilt/ldp quilt/usb +Switched to a new branch "quilt/ldp" +$ git quiltimport --patches ../quilt/ldp +usb-add-sensoray-2255-v4l-driver.patch +dvb-add-firesat-driver.patch +usb-add-option-hso-driver.patch +video-add-the-go7007-driver.patch +.dotest/patch:1896: space before tab in indent. + 0xd3), +.dotest/patch:1911: space before tab in indent. + GO7007_SENSOR_TV) && +.dotest/patch:1915: space before tab in indent. + GO7007_SENSOR_TV) && +.dotest/patch:2125: space before tab in indent. + (1 << 14) | (1 << 9) : 0) | +.dotest/patch:2128: space before tab in indent. + GO7007_SENSOR_CONFIG_MASK), +warning: 5 lines add whitespace errors. +net-add-alacritech-slicoss-driver.patch +.dotest/patch:58: trailing whitespace. +obj-$(CONFIG_SLICOSS) += slicoss.o
+.dotest/patch:24450: space before tab in indent. + ushort DramRomFn; // 14 Dram/Rom function +Context reduced to (2/2) to apply fragment at 223 +warning: 2 lines add whitespace errors. +input-add-appleir-driver.patch +add-me4000-pci-data-collection-driver.patch +novfs-add-the-novell-filesystem-client-kernel-module.patch +aectc-add-the-aectc-driver.patch +net-add-et131x-driver.patch +.dotest/patch:2767: space before tab in indent. + /* bits 1:0 are equal to 1 */ +.dotest/patch:2822: space before tab in indent. + /* I2C write complete */ +.dotest/patch:7854: space before tab in indent. + pRxLocal->local_psr_full.bits.psr_full_wrap) { +.dotest/patch:12027: space before tab in indent. + * I need to call this function twice to get my card in a +Context reduced to (2/2) to apply fragment at 19 +warning: 4 lines add whitespace errors. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..1831265e43b9 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080424 |