diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 23:13:08 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 23:13:08 +1100 |
| commit | 475e608d353a81db6ccd1078505d30f70f42e3e5 (patch) | |
| tree | 5887ec72fabeaecfa746ff5b888c97a21e66c5ee | |
| parent | e792acd12ffe8357ee7f9c911c4d7d6e09f85f66 (diff) | |
Add linux-next specific files for 20081020next-20081020
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 122 | ||||
| -rw-r--r-- | Next/Trees | 124 | ||||
| -rw-r--r-- | Next/merge.log | 4367 | ||||
| -rw-r--r-- | Next/quilt-import.log | 248 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4862 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ee3e52822566 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,122 @@ +Name SHA1 +---- ---- +origin 0cfd81031a26717fe14380d18275f8e217571615 +powerpc-merge 61e9916eba35dfb76d38013a5aae9a59cc50877a +scsi-rc-fixes c9eeb248f3b44939532a9716bc06413383aa5d63 +net-current 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a +sparc-current 615c9136b385d5225d3ece20aa30b28a90c438d6 +sound-current 219b22b24546dbd512419766eb46f6b729a5453a +arm-current 778c4c821779bb7eef7f5a1eea4d15d05d976f8b +pci-current 278429cff8809958d25415ba0ed32b59866ab1a8 +wireless-current 8713a7ccd88d93d9f8a72436088d6627c82490db +kbuild-current 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc +driver-core.current ac7b643ad9c570efa0b5cbc9af5581db8c2faf64 +usb.current 078d8b60ab8002ba5d8e680aac348f42b254f295 +cpufreq-current 8d5922572038bae9f7b16fcb974eee806727b44c +input-current 2a0bd75e5e687a9c34921e942c18477ea7ec2d63 +md-current 7a1fc53c5adb910751a9b212af90302eb4ffb527 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 4249d00bde7a2ba45d27cdb61315356737a5a069 +avr32 22a304363ea6bf3100504606393e20a252173fd2 +blackfin 1390da4ee75168b6e4d8354e93e3b5f0a0291f2f +cris 8f808417fe211648c0816e28947cdc74eb1e1032 +ia64 fe393164c529f72def1952fb66c11732d0984d78 +m68k b8f7e0b624d9fcf1d570819f04c46b81603b5676 +m68knommu 7680a920c75b242adaedf3d93b7f6d253db56792 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc 81e192d6ce303b6792aa38ff35f41a1a7357f23a +powerpc 6dc6472581f693b5fc95aebedf67b4960fb85cf0 +4xx 878e7556bfe7b10178ea58862bf9708f35afe001 +galak 6dc6472581f693b5fc95aebedf67b4960fb85cf0 +pxa 45e9c0de2e86485f8b6633fd64ab19cfbff167f6 +s390 a1c90d2a51224967f5d4cfcefa36ead1812d3632 +sh 14866543ad22014a0b12e10657a917eb6b487248 +sparc 4480f15b3306f43bbb0310d461142b4e897ca45b +x86 113455f80fae63de7044f93a6624b498d5c6b8a0 +xtensa dbd3dca3d7d5b1cd36a3df2ee9ed2c46d99b7f64 +driver-core 0f8bf1f2e0b12a72ae3fbd580bc606b60f9d4238 +usb 93279633c8604f1d08bad81ac284d4299e7fe22e +tip-core f55b84c11bf03809ab2fcf8626035d67ae93719e +cpus4096 4145ddda112a16b870e6bc5461625afd28d9df1f +ftrace 98d9c66ab07471006fd7910cb16453581c41a3e7 +genirq 14a6b3e8964be7b82c6cb4246fe4e0d9f6ddc9d5 +safe-poison-pointers ad666554bd18330eec5fcbcb89c80ef5bb2f4797 +sched 202fb5378a17e8d100079a2c13d092f1d88ef766 +stackprotector c2d98093cf3fd7a9ef34b1ae9aa12a4a5b061872 +timers eeb2d0fcb69ea2dccaf1c1fdfc510cb1973c9b7f +pci 2766d9a736aafe6853e8c291e917856ef8f973f3 +device-mapper e46deea4f2f54f31bca52da963d5a51bf012758a +hid 550cb3c3c1fa48171c6358b8641bd01119f5386f +i2c 26c0fa2ca244d264f568669d9d39c0ad74059885 +jdelvare-hwmon 0cfd81031a26717fe14380d18275f8e217571615 +kernel-doc a881214af7025692df7329c477edb044a3920bb4 +v4l-dvb 828687a7b6699fbc6bc62d03f381e3cd468134ab +jfs ec1aef33668448718fcba79e4e981592bfd7e0a3 +kbuild 56b2f0706d82535fd8d85503f2dcc0be40c8e55d +ide ec5305b930766bd51938bcadbc8c1107e6f2e4e1 +libata a551b98d5f6fce5897d497abd8bfb262efb33d2a +nfs 2e532d68a2b3e2aa6b19731501222069735c741c +xfs bfd2bd10da76378dc4afd87d7d204a1d3d70b347 +infiniband af713b499f830a630f554b7df3fa0e81be848963 +acpi 7d1e85d91ec9f6101a5f0514946594f6783c0c4a +nfsd 0cfd81031a26717fe14380d18275f8e217571615 +ieee1394 7365c004cc40c9f5776c8cc7aeca547c3b30e38a +ubi 762a9f291bfdf9e4d5c2b80d730d79055c8d8c99 +kvm ef39d659b957837d37698fd72054291f1807fbb3 +dlm 27eccf46491e1f77f9af9bbe0778122ce6882890 +scsi 23d617b2f9ef16646b0c122f4b5a47f6b57a768e +tests 94a97a3018e55a27d1c29e011b3c38fee01a967f +ocfs2 fd350473bd20282b725f336721751c80b724efd5 +ext4 f287a1a56130be5fdb96a4a62d1290bd064f308e +async_tx 77cd62e8082b9743b59ee1946a4c3ee2e3cd2bce +udf 5c89468c12899b84886cb47eec93f0c88e0f896a +net 4480f15b3306f43bbb0310d461142b4e897ca45b +mtd be8f78b8e8b5bcafc19ac85b815e98049aa86314 +wireless ad788b5e079484aa1d48aa90a3ebd7d954d2e7db +crypto 4c61f406471d6de3a6963c90ab4953f8f1daf9a6 +vfs 33e3239775fdd1ab95a5dc40dda9c8332a8acf01 +sound 21f2ed4cd9d6cf2ecbc408cd0cdc7e8a1fc43770 +cpufreq 4f6e6b9f97b0ce98a8d1da65adbaf743bd0486a9 +v9fs 7eb923b80c8ce16697129fb2dcdfaeabf83f0dbc +rr 656e026c14dea833b3494434be42222b601280d3 +cifs dd1db2dedc4f6ad736fbba5aa6ecfe6e7c8ee0f4 +mmc 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e +gfs2 c59f927e7facd5a911c6bc68e56e3bda8de5d65e +input b8d055a878ee0f997ded40649701089d2486f850 +semaphore b552068999b0b05087c454e525b30b785c79dc9b +semaphore-removal 9ac2f04936e1140d7a28a01b84e086458e191b49 +bkl-removal 46006b35f9e32479181c4ede98980a30ef536a49 +trivial 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 +ubifs 54779aabb0183bbe049d2b52e96cd148366dfb0b +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block f73e2d13a16cc88c4faa4729967f92bfeec8a142 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 0105f18683fde1df6ef69e7812582a52701e8a54 +pcmcia 5cb02ff3489d710c73b4a21bb804feedeacce116 +battery ed8c3174dd227031d1f3b9fa4fbb512f8f623434 +leds bfd34c4804433451929ca59db8b48456da9a899f +backlight e488bf8c4089681d5b905a9ef5c3409e697d7285 +kgdb 39465d79f822869f8969ab12aa97a9b20178dde3 +slab 51b19be3535c8fbcce6b6f838d89b9a6a4cc5b92 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 97ce0a7f9caf9d715cee815a016ee21575f71c95 +kmemcheck fb46cf6fb9dbf4cf58e4fd6939b77de1c39d40d2 +generic-ipi 85ba94ba0592296053f7f2846812173424afe1cb +mfd 64c12e9b7edb0bfce9c5d7db43091b67894d8339 +hdlc 959ffb0d55b2c3cf64417f9ac5c4d9ed8df981d4 +drm 4b40893918203ee1a1f6a114316c2a19c072e9bd +voltage 02bdc62abff3fe77bc57372196efb58216a9b248 +security-testing 0da939b0058742ad2d8580b7db6b966d0fc72252 +lblnet 7591103c08abade60aeddb432ed0686ddd0de1c6 +ttydev fd13cafdcc95c68e9ea3af4ea1d629abeac55638 +agp a64d2b37c2259e169759c1701ac565f0a11dc0ea +creds b84a6734984c2d19db6326513f94ec4a792a443d +oprofile c8145f94f83b98ed42241f6a8b91763e7a6aebaa +fastboot 4bca8a4b21ae2a9cac26b9027d5b5db682e624e2 +sparseirq 278429cff8809958d25415ba0ed32b59866ab1a8 +iommu 4480f15b3306f43bbb0310d461142b4e897ca45b +uwb 8092d7c9789581eea478c40d615a2632c3af17bb +watchdog 821c9a396f7b833cd8b86cc6683a947a113c16d7 +proc d9fde1d3bb935d46c34a19ea6b912e7f97f01f12 +scsi-post-merge 04ab591808565f968d4406f6435090ad671ebdab +bdev a390554d92a96e91c0fc568902d87afd13d4e49a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..339bc2088a64 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,124 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-2.6.26 +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k quilt http://www.kernel.org/pub/linux/kernel/people/geert/linux-m68k-patches-2.6/ +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +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 +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-x86-next +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-timers-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#stable +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +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 +ubi git git://git.infradead.org/~dedekind/ubi-2.6.git#linux-next +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 +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/test.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next +ubifs git git://git.infradead.org/~dedekind/ubifs-2.6.git#linux-next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-linus +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +creds git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next-creds-subsys +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next +fastboot git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next +sparseirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-iommu-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +proc git git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git#proc +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev-next.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..5a528a31bac1 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4367 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 73b4a24 init/do_mounts_md.c must #include <linux/delay.h> +Merging origin/master +$ git merge origin/master +Updating 73b4a24..0cfd810 +Fast forward + Documentation/ABI/stable/sysfs-driver-usb-usbtmc | 62 + + Documentation/ABI/testing/sysfs-bus-usb | 16 + + .../ABI/testing/sysfs-bus-usb-devices-usbsevseg | 43 + + Documentation/DocBook/gadget.tmpl | 3 + + Documentation/devices.txt | 3 + + Documentation/filesystems/ext4.txt | 32 +- + Documentation/hwmon/adt7470 | 76 + + Documentation/hwmon/it87 | 4 +- + Documentation/hwmon/lm85 | 10 - + Documentation/hwmon/lm87 | 9 +- + Documentation/hwmon/lm90 | 45 +- + Documentation/hwmon/pc87360 | 7 +- + Documentation/hwmon/pc87427 | 2 +- + Documentation/hwmon/w83781d | 37 +- + Documentation/hwmon/w83791d | 43 +- + Documentation/ioctl-number.txt | 3 + + Documentation/kernel-parameters.txt | 19 + + Documentation/sysctl/kernel.txt | 1 + + Documentation/usb/anchors.txt | 17 + + Documentation/usb/misc_usbsevseg.txt | 46 + + Documentation/usb/power-management.txt | 8 +- + Documentation/video4linux/CARDLIST.au0828 | 2 +- + Documentation/video4linux/CARDLIST.tuner | 1 + + MAINTAINERS | 18 +- + arch/cris/Makefile | 2 + + arch/cris/arch-v10/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v10/boot/rescue/Makefile | 2 +- + .../arch-v10/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/arch-v32/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v32/boot/rescue/Makefile | 2 +- + .../arch-v32/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/{ => configs}/artpec_3_defconfig | 0 + .../defconfig => configs/etrax-100lx_defconfig} | 0 + .../etrax-100lx_v2_defconfig} | 0 + arch/cris/{ => configs}/etraxfs_defconfig | 0 + arch/frv/mb93090-mb00/pci-dma-nommu.c | 23 +- + arch/frv/mb93090-mb00/pci-dma.c | 11 +- + arch/frv/mb93090-mb00/pci-frv.c | 32 - + arch/frv/mb93090-mb00/pci-frv.h | 1 - + arch/frv/mb93090-mb00/pci-vdk.c | 2 +- + arch/frv/mm/init.c | 2 - + arch/ia64/include/asm/kvm_host.h | 6 +- + arch/ia64/kvm/Kconfig | 2 + + arch/ia64/kvm/Makefile | 6 +- + arch/ia64/kvm/irq.h | 31 + + arch/ia64/kvm/kvm-ia64.c | 66 +- + arch/ia64/kvm/kvm_minstate.h | 23 +- + arch/ia64/kvm/optvfault.S | 181 +- + arch/ia64/kvm/process.c | 4 +- + arch/ia64/kvm/vcpu.h | 26 +- + arch/ia64/kvm/vmm_ivt.S | 39 +- + arch/ia64/kvm/vtlb.c | 23 +- + arch/m32r/mm/discontig.c | 4 +- + arch/powerpc/Kconfig | 3 + + arch/powerpc/include/asm/kvm_host.h | 14 +- + arch/powerpc/include/asm/kvm_ppc.h | 12 + + arch/powerpc/include/asm/types.h | 7 - + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x_tlb.c | 53 +- + arch/powerpc/kvm/Kconfig | 11 + + arch/powerpc/kvm/Makefile | 6 +- + arch/powerpc/kvm/booke_guest.c | 17 + + arch/powerpc/kvm/booke_interrupts.S | 79 +- + arch/powerpc/kvm/emulate.c | 8 +- + arch/powerpc/kvm/powerpc.c | 99 +- + arch/powerpc/platforms/Kconfig.cputype | 1 - + arch/powerpc/sysdev/ppc4xx_pci.c | 16 +- + arch/s390/Kconfig | 7 +- + arch/s390/kvm/priv.c | 4 +- + arch/x86/Kconfig | 4 +- + arch/x86/kernel/e820.c | 4 +- + arch/x86/kernel/kvmclock.c | 30 + + arch/x86/kernel/pvclock.c | 12 + + arch/x86/kvm/Makefile | 5 +- + arch/x86/kvm/i8254.c | 81 +- + arch/x86/kvm/i8254.h | 7 +- + arch/x86/kvm/i8259.c | 53 +- + arch/x86/kvm/irq.c | 3 +- + arch/x86/kvm/irq.h | 6 +- + arch/x86/kvm/kvm_cache_regs.h | 32 + + arch/x86/kvm/lapic.c | 43 +- + arch/x86/kvm/mmu.c | 680 ++- + arch/x86/kvm/paging_tmpl.h | 249 +- + arch/x86/kvm/svm.c | 156 +- + arch/x86/kvm/vmx.c | 712 +- + arch/x86/kvm/vmx.h | 3 - + arch/x86/kvm/x86.c | 552 +- + arch/x86/kvm/x86.h | 22 + + arch/x86/kvm/x86_emulate.c | 170 +- + arch/x86/mm/fault.c | 45 +- + arch/x86/mm/highmem_32.c | 1 + + arch/x86/mm/ioremap.c | 6 + + arch/x86/xen/time.c | 11 +- + block/blk-core.c | 37 +- + block/blk-merge.c | 20 +- + block/blk-settings.c | 2 - + block/blk.h | 1 + + block/elevator.c | 16 +- + block/genhd.c | 3 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/block/ub.c | 3 - + drivers/firewire/fw-card.c | 56 +- + drivers/firewire/fw-cdev.c | 6 +- + drivers/firewire/fw-device.c | 37 +- + drivers/firewire/fw-sbp2.c | 116 +- + drivers/firewire/fw-transaction.c | 48 +- + drivers/firewire/fw-transaction.h | 9 +- + drivers/firmware/dmi_scan.c | 22 +- + drivers/gpu/drm/Kconfig | 3 +- + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/drm_agpsupport.c | 52 +- + drivers/gpu/drm/drm_cache.c | 69 + + drivers/gpu/drm/drm_drv.c | 6 + + drivers/gpu/drm/drm_fops.c | 8 +- + drivers/gpu/drm/drm_gem.c | 421 + + drivers/gpu/drm/drm_irq.c | 464 +- + drivers/gpu/drm/drm_memory.c | 2 + + drivers/gpu/drm/drm_mm.c | 5 +- + drivers/gpu/drm/drm_proc.c | 135 +- + drivers/gpu/drm/drm_stub.c | 11 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/i915_dma.c | 332 +- + drivers/gpu/drm/i915/i915_drv.c | 476 +- + drivers/gpu/drm/i915/i915_drv.h | 1180 +-- + drivers/gpu/drm/i915/i915_gem.c | 2558 +++++ + drivers/gpu/drm/i915/i915_gem_debug.c | 201 + + drivers/gpu/drm/i915/i915_gem_proc.c | 292 + + drivers/gpu/drm/i915/i915_gem_tiling.c | 257 + + drivers/gpu/drm/i915/i915_irq.c | 514 +- + drivers/gpu/drm/i915/i915_opregion.c | 371 + + drivers/gpu/drm/i915/i915_reg.h | 1417 +++ + drivers/gpu/drm/i915/i915_suspend.c | 509 + + drivers/gpu/drm/mga/mga_drv.c | 29 +- + drivers/gpu/drm/mga/mga_drv.h | 6 +- + drivers/gpu/drm/mga/mga_irq.c | 74 +- + drivers/gpu/drm/mga/mga_state.c | 2 +- + drivers/gpu/drm/r128/r128_drv.c | 29 +- + drivers/gpu/drm/r128/r128_drv.h | 11 +- + drivers/gpu/drm/r128/r128_irq.c | 55 +- + drivers/gpu/drm/r128/r128_state.c | 2 +- + drivers/gpu/drm/radeon/radeon_cp.c | 53 +- + drivers/gpu/drm/radeon/radeon_drv.c | 32 +- + drivers/gpu/drm/radeon/radeon_drv.h | 57 +- + drivers/gpu/drm/radeon/radeon_irq.c | 268 +- + drivers/gpu/drm/radeon/radeon_state.c | 2 +- + drivers/gpu/drm/sis/sis_mm.c | 10 +- + drivers/gpu/drm/via/via_drv.c | 26 +- + drivers/gpu/drm/via/via_drv.h | 16 +- + drivers/gpu/drm/via/via_irq.c | 105 +- + drivers/gpu/drm/via/via_mm.c | 3 +- + drivers/hid/usbhid/hid-core.c | 4 +- + drivers/hwmon/Kconfig | 8 +- + drivers/hwmon/adm1026.c | 17 +- + drivers/hwmon/adm1029.c | 5 +- + drivers/hwmon/ams/ams-core.c | 82 +- + drivers/hwmon/ams/ams-i2c.c | 60 +- + drivers/hwmon/ams/ams-input.c | 63 +- + drivers/hwmon/ams/ams-pmu.c | 18 +- + drivers/hwmon/ams/ams.h | 4 +- + drivers/hwmon/ibmaem.c | 7 + + drivers/hwmon/ibmpex.c | 6 + + drivers/hwmon/it87.c | 11 +- + drivers/hwmon/lm78.c | 270 +- + drivers/hwmon/lm85.c | 352 +- + drivers/hwmon/lm87.c | 33 +- + drivers/hwmon/lm90.c | 444 +- + drivers/hwmon/max1619.c | 17 +- + drivers/hwmon/w83781d.c | 976 ++- + drivers/hwmon/w83791d.c | 324 +- + drivers/i2c/busses/i2c-powermac.c | 29 + + drivers/ide/ide-io.c | 4 +- + drivers/ieee1394/csr1212.c | 2 +- + drivers/ieee1394/dv1394.c | 2 +- + drivers/ieee1394/eth1394.c | 2 +- + drivers/ieee1394/nodemgr.c | 279 +- + drivers/ieee1394/nodemgr.h | 2 +- + drivers/ieee1394/raw1394-private.h | 1 + + drivers/ieee1394/raw1394.c | 230 +- + drivers/ieee1394/sbp2.c | 218 +- + drivers/ieee1394/sbp2.h | 33 +- + drivers/ieee1394/video1394.c | 8 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 3 +- + drivers/input/joystick/iforce/iforce-ff.c | 36 +- + drivers/input/joystick/iforce/iforce-main.c | 14 +- + drivers/input/joystick/iforce/iforce-packets.c | 8 +- + drivers/input/joystick/iforce/iforce-usb.c | 2 +- + drivers/input/joystick/xpad.c | 2 +- + drivers/input/misc/ati_remote.c | 20 +- + drivers/input/misc/yealink.c | 3 +- + drivers/input/tablet/acecad.c | 3 +- + drivers/input/tablet/aiptek.c | 26 +- + drivers/input/tablet/gtco.c | 4 +- + drivers/input/tablet/kbtab.c | 3 +- + drivers/input/tablet/wacom_sys.c | 3 +- + drivers/md/dm-mpath.c | 2 +- + drivers/md/multipath.c | 4 +- + drivers/media/common/tuners/mxl5005s.c | 10 +- + drivers/media/common/tuners/tuner-simple.c | 2 + + drivers/media/common/tuners/tuner-types.c | 33 +- + drivers/media/common/tuners/xc5000.c | 73 +- + drivers/media/common/tuners/xc5000.h | 8 +- + drivers/media/dvb/dm1105/dm1105.c | 12 + + drivers/media/dvb/dvb-core/dvb_frontend.c | 134 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 1 + + drivers/media/dvb/dvb-core/dvbdev.c | 3 + + drivers/media/dvb/dvb-core/dvbdev.h | 4 + + drivers/media/dvb/dvb-usb/dw2102.c | 12 + + drivers/media/dvb/frontends/cx22702.c | 506 +- + drivers/media/dvb/frontends/cx22702.h | 20 +- + drivers/media/dvb/frontends/cx24116.c | 589 +- + drivers/media/dvb/frontends/cx24116.h | 21 +- + drivers/media/dvb/frontends/cx24123.c | 228 +- + drivers/media/dvb/frontends/cx24123.h | 10 +- + drivers/media/dvb/frontends/s5h1409.c | 138 +- + drivers/media/dvb/frontends/s5h1409.h | 15 +- + drivers/media/dvb/frontends/s5h1411.c | 8 +- + drivers/media/dvb/frontends/tda10048.c | 100 +- + drivers/media/dvb/frontends/z0194a.h | 16 +- + drivers/media/dvb/siano/sms-cards.c | 4 + + drivers/media/radio/Kconfig | 2 +- + drivers/media/radio/dsbr100.c | 13 +- + drivers/media/radio/radio-si470x.c | 234 +- + drivers/media/video/adv7170.c | 251 +- + drivers/media/video/adv7175.c | 243 +- + drivers/media/video/au0828/au0828-cards.c | 5 +- + drivers/media/video/au0828/au0828-core.c | 3 +- + drivers/media/video/au0828/au0828-dvb.c | 3 +- + drivers/media/video/bt819.c | 321 +- + drivers/media/video/bt856.c | 218 +- + drivers/media/video/bt866.c | 255 +- + drivers/media/video/cx23885/cx23885-cards.c | 152 +- + drivers/media/video/cx23885/cx23885-core.c | 276 +- + drivers/media/video/cx23885/cx23885-dvb.c | 190 +- + drivers/media/video/cx23885/cx23885-i2c.c | 47 +- + drivers/media/video/cx23885/cx23885-video.c | 25 +- + drivers/media/video/cx23885/cx23885.h | 26 +- + drivers/media/video/cx88/cx88-cards.c | 58 +- + drivers/media/video/cx88/cx88-core.c | 3 +- + drivers/media/video/cx88/cx88-dvb.c | 405 +- + drivers/media/video/cx88/cx88-i2c.c | 17 +- + drivers/media/video/cx88/cx88-mpeg.c | 22 +- + drivers/media/video/cx88/cx88-tvaudio.c | 11 + + drivers/media/video/cx88/cx88-video.c | 52 +- + drivers/media/video/cx88/cx88.h | 7 +- + drivers/media/video/dabusb.c | 4 +- + drivers/media/video/gspca/gspca.c | 3 +- + drivers/media/video/gspca/gspca.h | 1 - + drivers/media/video/gspca/m5602/m5602_bridge.h | 29 +- + drivers/media/video/gspca/m5602/m5602_core.c | 46 +- + drivers/media/video/gspca/m5602/m5602_mt9m111.c | 18 +- + drivers/media/video/gspca/m5602/m5602_mt9m111.h | 7 +- + drivers/media/video/gspca/m5602/m5602_ov9650.c | 40 +- + drivers/media/video/gspca/m5602/m5602_ov9650.h | 3 +- + drivers/media/video/gspca/m5602/m5602_po1030.c | 90 +- + drivers/media/video/gspca/m5602/m5602_po1030.h | 46 +- + drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 22 +- + drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 3 +- + drivers/media/video/gspca/m5602/m5602_s5k83a.c | 6 +- + drivers/media/video/gspca/m5602/m5602_s5k83a.h | 4 +- + drivers/media/video/gspca/m5602/m5602_sensor.h | 2 +- + drivers/media/video/gspca/t613.c | 375 +- + drivers/media/video/ivtv/ivtv-fileops.c | 15 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 18 +- + drivers/media/video/ks0127.c | 476 +- + drivers/media/video/ov511.c | 19 +- + drivers/media/video/saa7110.c | 242 +- + drivers/media/video/saa7111.c | 224 +- + drivers/media/video/saa7114.c | 364 +- + drivers/media/video/saa7127.c | 2 +- + drivers/media/video/saa7134/saa7134-dvb.c | 216 +- + drivers/media/video/saa7134/saa7134.h | 2 +- + drivers/media/video/saa7185.c | 210 +- + drivers/media/video/sh_mobile_ceu_camera.c | 96 +- + drivers/media/video/soc_camera_platform.c | 20 +- + drivers/media/video/stk-webcam.c | 27 +- + drivers/media/video/stk-webcam.h | 1 - + drivers/media/video/tveeprom.c | 2 +- + drivers/media/video/usbvideo/konicawc.c | 8 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 14 +- + drivers/media/video/videobuf-dvb.c | 201 +- + drivers/media/video/vivi.c | 278 +- + drivers/media/video/vpx3220.c | 328 +- + drivers/media/video/zoran/zoran_card.c | 1 + + drivers/media/video/zoran/zoran_driver.c | 1 - + drivers/mtd/nand/alauda.c | 4 +- + drivers/net/Kconfig | 12 +- + drivers/net/irda/kingsun-sir.c | 3 +- + drivers/net/irda/ks959-sir.c | 3 +- + drivers/net/irda/ksdazzle-sir.c | 3 +- + drivers/net/irda/stir4200.c | 18 +- + drivers/net/ixgbe/ixgbe.h | 4 +- + drivers/net/ixgbe/ixgbe_main.c | 32 +- + drivers/net/myri10ge/myri10ge.c | 26 +- + drivers/net/pcmcia/Kconfig | 2 +- + drivers/net/usb/catc.c | 8 +- + drivers/net/usb/kaweth.c | 27 +- + drivers/net/usb/rtl8150.c | 31 +- + drivers/net/wan/lmc/lmc_main.c | 31 +- + drivers/net/xen-netfront.c | 5 +- + drivers/pci/dmar.c | 4 +- + drivers/pci/hotplug/ibmphp_ebda.c | 2 +- + drivers/pci/intel-iommu.c | 116 +- + drivers/pci/intr_remapping.c | 2 +- + drivers/pci/intr_remapping.h | 2 +- + drivers/pci/iova.c | 2 +- + drivers/pci/quirks.c | 3 +- + drivers/pci/setup-bus.c | 9 +- + drivers/pnp/quirks.c | 3 +- + drivers/s390/block/dasd_diag.c | 2 +- + drivers/s390/block/dasd_eckd.c | 2 +- + drivers/s390/block/dasd_fba.c | 2 +- + drivers/s390/scsi/zfcp_def.h | 2 + + drivers/s390/scsi/zfcp_fsf.c | 34 + + drivers/s390/scsi/zfcp_fsf.h | 12 + + drivers/s390/scsi/zfcp_qdio.c | 1 + + drivers/scsi/constants.c | 3 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 3 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 3 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 6 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 3 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 - + drivers/scsi/iscsi_tcp.c | 44 +- + drivers/scsi/libiscsi.c | 183 +- + drivers/scsi/lpfc/lpfc.h | 96 +- + drivers/scsi/lpfc/lpfc_attr.c | 1375 +++- + drivers/scsi/lpfc/lpfc_crtn.h | 51 +- + drivers/scsi/lpfc/lpfc_ct.c | 20 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 400 +- + drivers/scsi/lpfc/lpfc_disc.h | 23 + + drivers/scsi/lpfc/lpfc_els.c | 1712 ++++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 241 +- + drivers/scsi/lpfc/lpfc_hw.h | 183 +- + drivers/scsi/lpfc/lpfc_init.c | 924 ++- + drivers/scsi/lpfc/lpfc_mbox.c | 624 +- + drivers/scsi/lpfc/lpfc_mem.c | 116 +- + drivers/scsi/lpfc/lpfc_nl.h | 163 + + drivers/scsi/lpfc/lpfc_nportdisc.c | 24 +- + drivers/scsi/lpfc/lpfc_scsi.c | 514 +- + drivers/scsi/lpfc/lpfc_scsi.h | 5 + + drivers/scsi/lpfc/lpfc_sli.c | 1715 +++- + drivers/scsi/lpfc/lpfc_sli.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 168 +- + drivers/scsi/lpfc/lpfc_vport.h | 4 + + drivers/scsi/qla2xxx/qla_attr.c | 1 - + drivers/scsi/qla2xxx/qla_isr.c | 14 +- + drivers/scsi/qla2xxx/qla_os.c | 26 +- + drivers/scsi/qla4xxx/ql4_isr.c | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/scsi.c | 10 +- + drivers/scsi/scsi_error.c | 72 +- + drivers/scsi/scsi_lib.c | 106 +- + drivers/scsi/scsi_priv.h | 1 + + drivers/scsi/scsi_scan.c | 1 + + drivers/scsi/scsi_transport_fc.c | 47 +- + drivers/scsi/scsi_transport_iscsi.c | 19 +- + drivers/scsi/scsi_transport_spi.c | 4 +- + drivers/scsi/sd.c | 17 +- + drivers/scsi/sd.h | 21 +- + drivers/scsi/sd_dif.c | 42 +- + drivers/staging/Kconfig | 46 + + drivers/staging/Makefile | 15 + + drivers/staging/at76_usb/Kconfig | 8 + + drivers/staging/at76_usb/Makefile | 1 + + drivers/staging/at76_usb/TODO | 2 + + drivers/staging/at76_usb/at76_usb.c | 5559 +++++++++++ + drivers/staging/at76_usb/at76_usb.h | 619 ++ + drivers/staging/echo/Kconfig | 9 + + drivers/staging/echo/Makefile | 1 + + drivers/staging/echo/TODO | 10 + + drivers/staging/echo/bit_operations.h | 253 + + drivers/staging/echo/echo.c | 632 ++ + drivers/staging/echo/echo.h | 220 + + drivers/staging/echo/fir.h | 369 + + drivers/staging/echo/mmx.h | 288 + + drivers/staging/et131x/Kconfig | 18 + + drivers/staging/et131x/Makefile | 18 + + drivers/staging/et131x/README | 25 + + drivers/staging/et131x/et1310_address_map.h | 2399 +++++ + drivers/staging/et131x/et1310_eeprom.c | 480 + + drivers/staging/et131x/et1310_eeprom.h | 89 + + drivers/staging/et131x/et1310_jagcore.c | 220 + + drivers/staging/et131x/et1310_jagcore.h | 112 + + drivers/staging/et131x/et1310_mac.c | 792 ++ + drivers/staging/et131x/et1310_mac.h | 93 + + drivers/staging/et131x/et1310_phy.c | 1281 +++ + drivers/staging/et131x/et1310_phy.h | 910 ++ + drivers/staging/et131x/et1310_pm.c | 207 + + drivers/staging/et131x/et1310_pm.h | 125 + + drivers/staging/et131x/et1310_rx.c | 1391 +++ + drivers/staging/et131x/et1310_rx.h | 373 + + drivers/staging/et131x/et1310_tx.c | 1525 +++ + drivers/staging/et131x/et1310_tx.h | 242 + + drivers/staging/et131x/et131x_adapter.h | 347 + + drivers/staging/et131x/et131x_config.c | 325 + + drivers/staging/et131x/et131x_config.h | 67 + + drivers/staging/et131x/et131x_debug.c | 218 + + drivers/staging/et131x/et131x_debug.h | 201 + + drivers/staging/et131x/et131x_defs.h | 128 + + drivers/staging/et131x/et131x_initpci.c | 1046 ++ + drivers/staging/et131x/et131x_initpci.h | 73 + + drivers/staging/et131x/et131x_isr.c | 488 + + drivers/staging/et131x/et131x_isr.h | 65 + + drivers/staging/et131x/et131x_netdev.c | 856 ++ + drivers/staging/et131x/et131x_netdev.h | 64 + + drivers/staging/et131x/et131x_version.h | 81 + + drivers/staging/go7007/Kconfig | 25 + + drivers/staging/go7007/Makefile | 18 + + drivers/staging/go7007/README | 11 + + drivers/staging/go7007/go7007-driver.c | 688 ++ + drivers/staging/go7007/go7007-fw.c | 1639 ++++ + drivers/staging/go7007/go7007-i2c.c | 309 + + drivers/staging/go7007/go7007-priv.h | 279 + + drivers/staging/go7007/go7007-usb.c | 1229 +++ + drivers/staging/go7007/go7007-v4l2.c | 1499 +++ + drivers/staging/go7007/go7007.h | 114 + + drivers/staging/go7007/saa7134-go7007.c | 484 + + drivers/staging/go7007/snd-go7007.c | 305 + + drivers/staging/go7007/wis-i2c.h | 55 + + drivers/staging/go7007/wis-ov7640.c | 130 + + drivers/staging/go7007/wis-saa7113.c | 358 + + drivers/staging/go7007/wis-saa7115.c | 491 + + drivers/staging/go7007/wis-sony-tuner.c | 742 ++ + drivers/staging/go7007/wis-tw2804.c | 380 + + drivers/staging/go7007/wis-tw9903.c | 362 + + drivers/staging/go7007/wis-uda1342.c | 136 + + drivers/staging/me4000/Kconfig | 10 + + drivers/staging/me4000/Makefile | 1 + + drivers/staging/me4000/README | 13 + + drivers/staging/me4000/me4000.c | 6133 ++++++++++++ + drivers/staging/me4000/me4000.h | 954 ++ + drivers/staging/me4000/me4000_firmware.h |10033 ++++++++++++++++++++ + drivers/staging/me4000/me4610_firmware.h | 5409 +++++++++++ + drivers/staging/slicoss/Kconfig | 14 + + drivers/staging/slicoss/Makefile | 1 + + drivers/staging/slicoss/README | 19 + + drivers/staging/slicoss/gbdownload.h | 8215 ++++++++++++++++ + drivers/staging/slicoss/gbrcvucode.h | 238 + + drivers/staging/slicoss/oasisdbgdownload.h | 6850 +++++++++++++ + drivers/staging/slicoss/oasisdownload.h | 6848 +++++++++++++ + drivers/staging/slicoss/oasisrcvucode.h | 205 + + drivers/staging/slicoss/slic.h | 598 ++ + drivers/staging/slicoss/slic_os.h | 84 + + drivers/staging/slicoss/slicbuild.h | 96 + + drivers/staging/slicoss/slicdbg.h | 100 + + drivers/staging/slicoss/slicdump.h | 278 + + drivers/staging/slicoss/slichw.h | 845 ++ + drivers/staging/slicoss/slicinc.h | 185 + + drivers/staging/slicoss/slicoss.c | 5936 ++++++++++++ + drivers/staging/staging.c | 19 + + drivers/staging/sxg/Kconfig | 10 + + drivers/staging/sxg/Makefile | 1 + + drivers/staging/sxg/README | 13 + + drivers/staging/sxg/saharadbgdownload.h | 4854 ++++++++++ + drivers/staging/sxg/sxg.c | 3624 +++++++ + drivers/staging/sxg/sxg.h | 773 ++ + drivers/staging/sxg/sxg_os.h | 154 + + drivers/staging/sxg/sxgdbg.h | 190 + + drivers/staging/sxg/sxghif.h | 861 ++ + drivers/staging/sxg/sxghw.h | 734 ++ + drivers/staging/sxg/sxgphycode.h | 349 + + drivers/staging/usbip/Kconfig | 36 + + drivers/staging/usbip/Makefile | 12 + + drivers/staging/usbip/README | 6 + + drivers/staging/usbip/stub.h | 95 + + drivers/staging/usbip/stub_dev.c | 483 + + drivers/staging/usbip/stub_main.c | 300 + + drivers/staging/usbip/stub_rx.c | 615 ++ + drivers/staging/usbip/stub_tx.c | 371 + + drivers/staging/usbip/usbip_common.c | 997 ++ + drivers/staging/usbip/usbip_common.h | 406 + + drivers/staging/usbip/usbip_event.c | 141 + + drivers/staging/usbip/vhci.h | 142 + + drivers/staging/usbip/vhci_hcd.c | 1275 +++ + drivers/staging/usbip/vhci_rx.c | 251 + + drivers/staging/usbip/vhci_sysfs.c | 250 + + drivers/staging/usbip/vhci_tx.c | 239 + + drivers/staging/winbond/Kconfig | 7 + + drivers/staging/winbond/Makefile | 18 + + drivers/staging/winbond/README | 10 + + drivers/staging/winbond/adapter.h | 23 + + drivers/staging/winbond/bss_f.h | 59 + + drivers/staging/winbond/bssdscpt.h | 156 + + drivers/staging/winbond/ds_tkip.h | 33 + + drivers/staging/winbond/gl_80211.h | 125 + + drivers/staging/winbond/ioctls.h | 678 ++ + drivers/staging/winbond/linux/common.h | 143 + + drivers/staging/winbond/linux/sysdef.h | 73 + + drivers/staging/winbond/linux/wb35reg.c | 747 ++ + drivers/staging/winbond/linux/wb35reg_f.h | 56 + + drivers/staging/winbond/linux/wb35reg_s.h | 170 + + drivers/staging/winbond/linux/wb35rx.c | 337 + + drivers/staging/winbond/linux/wb35rx_f.h | 17 + + drivers/staging/winbond/linux/wb35rx_s.h | 48 + + drivers/staging/winbond/linux/wb35tx.c | 313 + + drivers/staging/winbond/linux/wb35tx_f.h | 20 + + drivers/staging/winbond/linux/wb35tx_s.h | 47 + + drivers/staging/winbond/linux/wbusb.c | 404 + + drivers/staging/winbond/linux/wbusb_f.h | 34 + + drivers/staging/winbond/linux/wbusb_s.h | 42 + + drivers/staging/winbond/localpara.h | 275 + + drivers/staging/winbond/mac_structures.h | 670 ++ + drivers/staging/winbond/mds.c | 630 ++ + drivers/staging/winbond/mds_f.h | 33 + + drivers/staging/winbond/mds_s.h | 183 + + drivers/staging/winbond/mlme_mib.h | 84 + + drivers/staging/winbond/mlme_s.h | 195 + + drivers/staging/winbond/mlmetxrx.c | 150 + + drivers/staging/winbond/mlmetxrx_f.h | 52 + + drivers/staging/winbond/mto.c | 1229 +++ + drivers/staging/winbond/mto.h | 265 + + drivers/staging/winbond/mto_f.h | 7 + + drivers/staging/winbond/os_common.h | 2 + + drivers/staging/winbond/phy_calibration.c | 1759 ++++ + drivers/staging/winbond/phy_calibration.h | 101 + + drivers/staging/winbond/reg.c | 2683 ++++++ + drivers/staging/winbond/rxisr.c | 30 + + drivers/staging/winbond/scan_s.h | 115 + + drivers/staging/winbond/sme_api.c | 13 + + drivers/staging/winbond/sme_api.h | 265 + + drivers/staging/winbond/sme_s.h | 228 + + drivers/staging/winbond/wb35_ver.h | 30 + + drivers/staging/winbond/wbhal.c | 878 ++ + drivers/staging/winbond/wbhal_f.h | 122 + + drivers/staging/winbond/wbhal_s.h | 615 ++ + drivers/staging/winbond/wblinux.c | 277 + + drivers/staging/winbond/wblinux_f.h | 23 + + drivers/staging/winbond/wblinux_s.h | 45 + + drivers/staging/wlan-ng/Kconfig | 10 + + drivers/staging/wlan-ng/Makefile | 9 + + drivers/staging/wlan-ng/README | 8 + + drivers/staging/wlan-ng/hfa384x.c | 4018 ++++++++ + drivers/staging/wlan-ng/hfa384x.h | 3067 ++++++ + drivers/staging/wlan-ng/hfa384x_usb.c | 5027 ++++++++++ + drivers/staging/wlan-ng/p80211conv.c | 683 ++ + drivers/staging/wlan-ng/p80211conv.h | 186 + + drivers/staging/wlan-ng/p80211hdr.h | 299 + + drivers/staging/wlan-ng/p80211ioctl.h | 123 + + drivers/staging/wlan-ng/p80211meta.h | 169 + + drivers/staging/wlan-ng/p80211metadef.h | 2524 +++++ + drivers/staging/wlan-ng/p80211metamib.h | 105 + + drivers/staging/wlan-ng/p80211metamsg.h | 105 + + drivers/staging/wlan-ng/p80211metastruct.h | 644 ++ + drivers/staging/wlan-ng/p80211mgmt.h | 575 ++ + drivers/staging/wlan-ng/p80211mod.c | 216 + + drivers/staging/wlan-ng/p80211msg.h | 102 + + drivers/staging/wlan-ng/p80211netdev.c | 1502 +++ + drivers/staging/wlan-ng/p80211netdev.h | 336 + + drivers/staging/wlan-ng/p80211req.c | 329 + + drivers/staging/wlan-ng/p80211req.h | 68 + + drivers/staging/wlan-ng/p80211types.h | 675 ++ + drivers/staging/wlan-ng/p80211wep.c | 317 + + drivers/staging/wlan-ng/p80211wext.c | 2048 ++++ + drivers/staging/wlan-ng/prism2_cs.c | 1487 +++ + drivers/staging/wlan-ng/prism2_pci.c | 332 + + drivers/staging/wlan-ng/prism2_plx.c | 472 + + drivers/staging/wlan-ng/prism2_usb.c | 361 + + drivers/staging/wlan-ng/prism2mgmt.c | 2956 ++++++ + drivers/staging/wlan-ng/prism2mgmt.h | 182 + + drivers/staging/wlan-ng/prism2mib.c | 3799 ++++++++ + drivers/staging/wlan-ng/prism2sta.c | 2502 +++++ + drivers/staging/wlan-ng/version.h | 64 + + drivers/staging/wlan-ng/wlan_compat.h | 757 ++ + drivers/usb/atm/usbatm.c | 10 +- + drivers/usb/atm/usbatm.h | 10 +- + drivers/usb/atm/xusbatm.c | 2 +- + drivers/usb/class/Kconfig | 10 + + drivers/usb/class/Makefile | 1 + + drivers/usb/class/cdc-acm.c | 26 +- + drivers/usb/class/cdc-wdm.c | 48 +- + drivers/usb/class/usblp.c | 25 +- + drivers/usb/class/usbtmc.c | 1087 +++ + drivers/usb/core/Kconfig | 2 +- + drivers/usb/core/devio.c | 12 +- + drivers/usb/core/driver.c | 3 +- + drivers/usb/core/endpoint.c | 3 +- + drivers/usb/core/file.c | 5 +- + drivers/usb/core/hcd.c | 4 + + drivers/usb/core/hcd.h | 6 + + drivers/usb/core/hub.c | 102 +- + drivers/usb/core/inode.c | 18 +- + drivers/usb/core/message.c | 3 +- + drivers/usb/core/sysfs.c | 24 + + drivers/usb/core/urb.c | 169 +- + drivers/usb/gadget/Kconfig | 315 +- + drivers/usb/gadget/Makefile | 1 + + drivers/usb/gadget/cdc2.c | 1 - + drivers/usb/gadget/composite.c | 68 +- + drivers/usb/gadget/dummy_hcd.c | 33 +- + drivers/usb/gadget/ether.c | 2 - + drivers/usb/gadget/f_loopback.c | 1 - + drivers/usb/gadget/f_obex.c | 493 + + drivers/usb/gadget/f_sourcesink.c | 1 - + drivers/usb/gadget/file_storage.c | 23 +- + drivers/usb/gadget/fsl_qe_udc.c | 2760 ++++++ + drivers/usb/gadget/fsl_qe_udc.h | 437 + + drivers/usb/gadget/fsl_usb2_udc.c | 176 +- + drivers/usb/gadget/fsl_usb2_udc.h | 21 +- + drivers/usb/gadget/gadget_chips.h | 9 + + drivers/usb/gadget/gmidi.c | 2 +- + drivers/usb/gadget/net2280.c | 40 +- + drivers/usb/gadget/net2280.h | 1 + + drivers/usb/gadget/omap_udc.c | 7 + + drivers/usb/gadget/printer.c | 6 +- + drivers/usb/gadget/pxa27x_udc.c | 1 - + drivers/usb/gadget/s3c2410_udc.c | 2 +- + drivers/usb/gadget/serial.c | 15 +- + drivers/usb/gadget/u_ether.c | 7 + + drivers/usb/gadget/u_serial.h | 1 + + drivers/usb/host/ehci-dbg.c | 56 +- + drivers/usb/host/ehci-hcd.c | 48 +- + drivers/usb/host/ehci-hub.c | 27 +- + drivers/usb/host/ehci-ppc-soc.c | 201 - + drivers/usb/host/ehci.h | 23 +- + drivers/usb/host/isp116x-hcd.c | 13 +- + drivers/usb/host/isp1760-if.c | 7 +- + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/ohci-hcd.c | 10 +- + drivers/usb/host/ohci-hub.c | 87 +- + drivers/usb/host/ohci-omap.c | 4 +- + drivers/usb/host/ohci-pnx4008.c | 2 +- + drivers/usb/host/ohci.h | 8 - + drivers/usb/host/r8a66597-hcd.c | 101 +- + drivers/usb/host/sl811-hcd.c | 15 +- + drivers/usb/host/uhci-hcd.c | 10 +- + drivers/usb/host/uhci-q.c | 17 +- + drivers/usb/image/mdc800.c | 61 +- + drivers/usb/misc/Kconfig | 24 + + drivers/usb/misc/Makefile | 2 + + drivers/usb/misc/adutux.c | 22 +- + drivers/usb/misc/appledisplay.c | 26 +- + drivers/usb/misc/cypress_cy7c63.c | 6 +- + drivers/usb/misc/cytherm.c | 9 +- + drivers/usb/misc/emi26.c | 17 +- + drivers/usb/misc/emi62.c | 4 +- + drivers/usb/misc/ftdi-elan.c | 10 +- + drivers/usb/misc/idmouse.c | 5 +- + drivers/usb/misc/legousbtower.c | 23 +- + drivers/usb/misc/rio500.c | 11 +- + drivers/usb/misc/trancevibrator.c | 3 +- + drivers/usb/misc/usblcd.c | 13 +- + drivers/usb/misc/usbsevseg.c | 394 + + drivers/usb/misc/uss720.c | 19 +- + drivers/usb/misc/vstusb.c | 782 ++ + drivers/usb/mon/mon_main.c | 2 +- + drivers/usb/musb/Kconfig | 4 - + drivers/usb/musb/cppi_dma.h | 4 +- + drivers/usb/musb/davinci.c | 20 +- + drivers/usb/musb/musb_core.c | 41 +- + drivers/usb/musb/musb_gadget_ep0.c | 24 +- + drivers/usb/musb/musb_host.c | 19 +- + drivers/usb/musb/musb_io.h | 4 +- + drivers/usb/musb/musbhsdma.c | 306 +- + drivers/usb/serial/aircable.c | 8 +- + drivers/usb/serial/belkin_sa.c | 39 +- + drivers/usb/serial/cp2101.c | 3 +- + drivers/usb/serial/cyberjack.c | 28 +- + drivers/usb/serial/cypress_m8.c | 21 +- + drivers/usb/serial/digi_acceleport.c | 68 +- + drivers/usb/serial/empeg.c | 11 +- + drivers/usb/serial/ezusb.c | 3 +- + drivers/usb/serial/ftdi_sio.c | 82 +- + drivers/usb/serial/ftdi_sio.h | 5 + + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/hp4x.c | 3 +- + drivers/usb/serial/io_edgeport.c | 19 +- + drivers/usb/serial/io_ti.c | 3 +- + drivers/usb/serial/ipaq.c | 30 +- + drivers/usb/serial/ipw.c | 3 +- + drivers/usb/serial/ir-usb.c | 3 +- + drivers/usb/serial/iuu_phoenix.c | 3 +- + drivers/usb/serial/keyspan.c | 3 +- + drivers/usb/serial/keyspan_pda.c | 17 +- + drivers/usb/serial/kl5kusb105.c | 69 +- + drivers/usb/serial/kobil_sct.c | 4 +- + drivers/usb/serial/mct_u232.c | 42 +- + drivers/usb/serial/mos7720.c | 22 +- + drivers/usb/serial/mos7840.c | 29 +- + drivers/usb/serial/omninet.c | 22 +- + drivers/usb/serial/option.c | 42 +- + drivers/usb/serial/pl2303.c | 2 +- + drivers/usb/serial/safe_serial.c | 28 +- + drivers/usb/serial/sierra.c | 72 +- + drivers/usb/serial/spcp8x5.c | 10 +- + drivers/usb/serial/ti_usb_3410_5052.c | 4 +- + drivers/usb/serial/usb-serial.c | 26 +- + drivers/usb/serial/visor.c | 17 +- + drivers/usb/serial/whiteheat.c | 121 +- + drivers/usb/storage/onetouch.c | 9 +- + drivers/usb/storage/transport.c | 2 +- + fs/Kconfig | 2 +- + fs/Makefile | 2 +- + fs/block_dev.c | 2 +- + fs/ext4/balloc.c | 12 +- + fs/ext4/ext4.h | 1 - + fs/ext4/ext4_sb.h | 3 - + fs/ext4/inode.c | 143 +- + fs/ext4/mballoc.c | 263 +- + fs/ext4/mballoc.h | 31 +- + fs/ext4/super.c | 132 +- + fs/jbd2/commit.c | 3 + + fs/jbd2/transaction.c | 1 + + fs/nfs/client.c | 5 +- + fs/nfs/dir.c | 20 +- + fs/nfs/file.c | 18 +- + fs/nfs/inode.c | 183 +- + fs/nfs/internal.h | 25 +- + fs/nfs/mount_clnt.c | 3 +- + fs/nfs/namespace.c | 7 +- + fs/nfs/nfs3acl.c | 2 + + fs/nfs/nfs3proc.c | 20 +- + fs/nfs/nfs4namespace.c | 105 +- + fs/nfs/proc.c | 10 +- + fs/nfs/super.c | 126 +- + fs/nfs/unlink.c | 5 +- + fs/nfs/write.c | 3 +- + fs/partitions/check.c | 10 + + include/asm-frv/unaligned.h | 2 +- + include/asm-x86/kvm.h | 22 - + include/asm-x86/kvm_host.h | 82 +- + include/asm-x86/msr-index.h | 3 + + include/asm-x86/page_32.h | 2 - + include/asm-x86/page_64.h | 1 - + include/asm-x86/pgtable.h | 7 +- + include/asm-x86/pvclock.h | 1 + + include/asm-x86/xen/page.h | 4 +- + include/drm/drm.h | 63 +- + include/drm/drmP.h | 249 +- + include/drm/drm_pciids.h | 54 +- + include/drm/i915_drm.h | 333 + + include/linux/bio.h | 33 +- + include/linux/blkdev.h | 16 +- + include/linux/blktrace_api.h | 32 + + {drivers/pci => include/linux}/dma_remapping.h | 0 + include/linux/dvb/frontend.h | 2 + + include/linux/firewire-cdev.h | 9 +- + include/linux/i2c-id.h | 2 +- + {drivers/pci => include/linux}/intel-iommu.h | 24 +- + include/linux/interrupt.h | 23 + + include/linux/ioport.h | 1 + + {drivers/pci => include/linux}/iova.h | 0 + include/linux/jbd2.h | 9 + + include/linux/kernel.h | 4 + + include/linux/kvm.h | 72 +- + include/linux/kvm_host.h | 82 + + include/linux/nfs_fs.h | 19 +- + include/linux/nfs_fs_sb.h | 1 - + include/linux/nfs_mount.h | 4 + + include/linux/nfs_xdr.h | 11 +- + include/linux/pfn.h | 6 +- + include/linux/smp.h | 4 +- + include/linux/sunrpc/xprtrdma.h | 4 +- + include/linux/types.h | 8 +- + include/linux/usb.h | 7 + + include/linux/usb/Kbuild | 3 +- + include/linux/usb/cdc.h | 9 + + include/linux/usb/composite.h | 11 +- + include/linux/usb/serial.h | 2 +- + include/linux/usb/tmc.h | 43 + + include/linux/usb/vstusb.h | 71 + + include/linux/writeback.h | 10 +- + include/media/soc_camera_platform.h | 11 + + include/media/tuner.h | 1 + + include/media/v4l2-i2c-drv-legacy.h | 11 + + include/media/v4l2-i2c-drv.h | 11 + + include/media/videobuf-dvb.h | 29 +- + include/scsi/iscsi_if.h | 2 + + include/scsi/libiscsi.h | 15 +- + include/scsi/scsi.h | 6 + + include/scsi/scsi_device.h | 10 + + include/scsi/scsi_transport_fc.h | 8 +- + include/scsi/scsi_transport_iscsi.h | 5 +- + kernel/module.c | 11 + + kernel/panic.c | 2 + + kernel/printk.c | 22 +- + kernel/resource.c | 51 +- + kernel/sched_clock.c | 6 +- + kernel/softirq.c | 142 +- + kernel/time/tick-sched.c | 2 +- + kernel/timer.c | 1 + + lib/Kconfig.debug | 5 + + lib/vsprintf.c | 223 +- + mm/Kconfig | 3 + + mm/filemap.c | 15 +- + mm/page-writeback.c | 12 +- + mm/shmem.c | 1 + + net/bluetooth/af_bluetooth.c | 8 +- + net/bridge/netfilter/ebtables.c | 15 +- + net/can/af_can.c | 4 +- + net/core/dev.c | 2 - + net/core/rtnetlink.c | 4 +- + net/dccp/ccid.c | 2 +- + net/decnet/dn_dev.c | 2 - + net/ipv4/devinet.c | 2 - + net/ipv4/inet_diag.c | 2 - + net/ipv4/route.c | 7 +- + net/ipv4/tcp_cong.c | 4 +- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nfnetlink.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/phonet/af_phonet.c | 3 +- + net/sched/act_api.c | 2 +- + net/sched/cls_api.c | 2 +- + net/sched/ematch.c | 2 +- + net/sched/sch_api.c | 2 +- + net/socket.c | 2 +- + net/sunrpc/auth.c | 2 - + net/sunrpc/clnt.c | 4 +- + net/sunrpc/rpcb_clnt.c | 40 +- + net/sunrpc/xprt.c | 12 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 29 +- + net/sunrpc/xprtrdma/transport.c | 41 +- + net/sunrpc/xprtrdma/verbs.c | 741 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 17 +- + scripts/mod/modpost.c | 9 + + sound/arm/pxa2xx-ac97-lib.c | 12 +- + sound/core/jack.c | 3 + + sound/core/pcm_lib.c | 48 +- + sound/core/pcm_native.c | 24 +- + sound/pci/hda/patch_nvhdmi.c | 1 + + sound/pci/hda/patch_realtek.c | 88 +- + sound/pci/hda/patch_sigmatel.c | 2 +- + sound/soc/at32/playpaq_wm8510.c | 12 +- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/tlv320aic23.c | 10 +- + sound/soc/soc-dapm.c | 2 +- + sound/usb/usx2y/us122l.c | 13 +- + virt/kvm/ioapic.c | 22 +- + virt/kvm/ioapic.h | 10 +- + virt/kvm/irq_comm.c | 60 + + virt/kvm/kvm_main.c | 382 +- + virt/kvm/kvm_trace.c | 30 +- + virt/kvm/vtd.c | 191 + + 837 files changed, 189691 insertions(+), 13001 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-usb-usbtmc + create mode 100644 Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg + create mode 100644 Documentation/hwmon/adt7470 + create mode 100644 Documentation/usb/misc_usbsevseg.txt + rename arch/cris/arch-v10/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v10/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/arch-v32/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v32/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/{ => configs}/artpec_3_defconfig (100%) + rename arch/cris/{arch-v10/defconfig => configs/etrax-100lx_defconfig} (100%) + rename arch/cris/{defconfig => configs/etrax-100lx_v2_defconfig} (100%) + rename arch/cris/{ => configs}/etraxfs_defconfig (100%) + create mode 100644 arch/ia64/kvm/irq.h + create mode 100644 arch/x86/kvm/kvm_cache_regs.h + create mode 100644 arch/x86/kvm/x86.h + create mode 100644 drivers/gpu/drm/drm_cache.c + create mode 100644 drivers/gpu/drm/drm_gem.c + create mode 100644 drivers/gpu/drm/i915/i915_gem.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_debug.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_proc.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_tiling.c + create mode 100644 drivers/gpu/drm/i915/i915_opregion.c + create mode 100644 drivers/gpu/drm/i915/i915_reg.h + create mode 100644 drivers/gpu/drm/i915/i915_suspend.c + create mode 100644 drivers/scsi/lpfc/lpfc_nl.h + create mode 100644 drivers/staging/Kconfig + create mode 100644 drivers/staging/Makefile + create mode 100644 drivers/staging/at76_usb/Kconfig + create mode 100644 drivers/staging/at76_usb/Makefile + create mode 100644 drivers/staging/at76_usb/TODO + create mode 100644 drivers/staging/at76_usb/at76_usb.c + create mode 100644 drivers/staging/at76_usb/at76_usb.h + create mode 100644 drivers/staging/echo/Kconfig + create mode 100644 drivers/staging/echo/Makefile + create mode 100644 drivers/staging/echo/TODO + create mode 100644 drivers/staging/echo/bit_operations.h + create mode 100644 drivers/staging/echo/echo.c + create mode 100644 drivers/staging/echo/echo.h + create mode 100644 drivers/staging/echo/fir.h + create mode 100644 drivers/staging/echo/mmx.h + create mode 100644 drivers/staging/et131x/Kconfig + create mode 100644 drivers/staging/et131x/Makefile + create mode 100644 drivers/staging/et131x/README + create mode 100644 drivers/staging/et131x/et1310_address_map.h + create mode 100644 drivers/staging/et131x/et1310_eeprom.c + create mode 100644 drivers/staging/et131x/et1310_eeprom.h + create mode 100644 drivers/staging/et131x/et1310_jagcore.c + create mode 100644 drivers/staging/et131x/et1310_jagcore.h + create mode 100644 drivers/staging/et131x/et1310_mac.c + create mode 100644 drivers/staging/et131x/et1310_mac.h + create mode 100644 drivers/staging/et131x/et1310_phy.c + create mode 100644 drivers/staging/et131x/et1310_phy.h + create mode 100644 drivers/staging/et131x/et1310_pm.c + create mode 100644 drivers/staging/et131x/et1310_pm.h + create mode 100644 drivers/staging/et131x/et1310_rx.c + create mode 100644 drivers/staging/et131x/et1310_rx.h + create mode 100644 drivers/staging/et131x/et1310_tx.c + create mode 100644 drivers/staging/et131x/et1310_tx.h + create mode 100644 drivers/staging/et131x/et131x_adapter.h + create mode 100644 drivers/staging/et131x/et131x_config.c + create mode 100644 drivers/staging/et131x/et131x_config.h + create mode 100644 drivers/staging/et131x/et131x_debug.c + create mode 100644 drivers/staging/et131x/et131x_debug.h + create mode 100644 drivers/staging/et131x/et131x_defs.h + create mode 100644 drivers/staging/et131x/et131x_initpci.c + create mode 100644 drivers/staging/et131x/et131x_initpci.h + create mode 100644 drivers/staging/et131x/et131x_isr.c + create mode 100644 drivers/staging/et131x/et131x_isr.h + create mode 100644 drivers/staging/et131x/et131x_netdev.c + create mode 100644 drivers/staging/et131x/et131x_netdev.h + create mode 100644 drivers/staging/et131x/et131x_version.h + create mode 100644 drivers/staging/go7007/Kconfig + create mode 100644 drivers/staging/go7007/Makefile + create mode 100644 drivers/staging/go7007/README + create mode 100644 drivers/staging/go7007/go7007-driver.c + create mode 100644 drivers/staging/go7007/go7007-fw.c + create mode 100644 drivers/staging/go7007/go7007-i2c.c + create mode 100644 drivers/staging/go7007/go7007-priv.h + create mode 100644 drivers/staging/go7007/go7007-usb.c + create mode 100644 drivers/staging/go7007/go7007-v4l2.c + create mode 100644 drivers/staging/go7007/go7007.h + create mode 100644 drivers/staging/go7007/saa7134-go7007.c + create mode 100644 drivers/staging/go7007/snd-go7007.c + create mode 100644 drivers/staging/go7007/wis-i2c.h + create mode 100644 drivers/staging/go7007/wis-ov7640.c + create mode 100644 drivers/staging/go7007/wis-saa7113.c + create mode 100644 drivers/staging/go7007/wis-saa7115.c + create mode 100644 drivers/staging/go7007/wis-sony-tuner.c + create mode 100644 drivers/staging/go7007/wis-tw2804.c + create mode 100644 drivers/staging/go7007/wis-tw9903.c + create mode 100644 drivers/staging/go7007/wis-uda1342.c + create mode 100644 drivers/staging/me4000/Kconfig + create mode 100644 drivers/staging/me4000/Makefile + create mode 100644 drivers/staging/me4000/README + create mode 100644 drivers/staging/me4000/me4000.c + create mode 100644 drivers/staging/me4000/me4000.h + create mode 100644 drivers/staging/me4000/me4000_firmware.h + create mode 100644 drivers/staging/me4000/me4610_firmware.h + create mode 100644 drivers/staging/slicoss/Kconfig + create mode 100644 drivers/staging/slicoss/Makefile + create mode 100644 drivers/staging/slicoss/README + create mode 100644 drivers/staging/slicoss/gbdownload.h + create mode 100644 drivers/staging/slicoss/gbrcvucode.h + create mode 100644 drivers/staging/slicoss/oasisdbgdownload.h + create mode 100644 drivers/staging/slicoss/oasisdownload.h + create mode 100644 drivers/staging/slicoss/oasisrcvucode.h + create mode 100644 drivers/staging/slicoss/slic.h + create mode 100644 drivers/staging/slicoss/slic_os.h + create mode 100644 drivers/staging/slicoss/slicbuild.h + create mode 100644 drivers/staging/slicoss/slicdbg.h + create mode 100644 drivers/staging/slicoss/slicdump.h + create mode 100644 drivers/staging/slicoss/slichw.h + create mode 100644 drivers/staging/slicoss/slicinc.h + create mode 100644 drivers/staging/slicoss/slicoss.c + create mode 100644 drivers/staging/staging.c + create mode 100644 drivers/staging/sxg/Kconfig + create mode 100644 drivers/staging/sxg/Makefile + create mode 100644 drivers/staging/sxg/README + create mode 100644 drivers/staging/sxg/saharadbgdownload.h + create mode 100644 drivers/staging/sxg/sxg.c + create mode 100644 drivers/staging/sxg/sxg.h + create mode 100644 drivers/staging/sxg/sxg_os.h + create mode 100644 drivers/staging/sxg/sxgdbg.h + create mode 100644 drivers/staging/sxg/sxghif.h + create mode 100644 drivers/staging/sxg/sxghw.h + create mode 100644 drivers/staging/sxg/sxgphycode.h + create mode 100644 drivers/staging/usbip/Kconfig + create mode 100644 drivers/staging/usbip/Makefile + create mode 100644 drivers/staging/usbip/README + create mode 100644 drivers/staging/usbip/stub.h + create mode 100644 drivers/staging/usbip/stub_dev.c + create mode 100644 drivers/staging/usbip/stub_main.c + create mode 100644 drivers/staging/usbip/stub_rx.c + create mode 100644 drivers/staging/usbip/stub_tx.c + create mode 100644 drivers/staging/usbip/usbip_common.c + create mode 100644 drivers/staging/usbip/usbip_common.h + create mode 100644 drivers/staging/usbip/usbip_event.c + create mode 100644 drivers/staging/usbip/vhci.h + create mode 100644 drivers/staging/usbip/vhci_hcd.c + create mode 100644 drivers/staging/usbip/vhci_rx.c + create mode 100644 drivers/staging/usbip/vhci_sysfs.c + create mode 100644 drivers/staging/usbip/vhci_tx.c + create mode 100644 drivers/staging/winbond/Kconfig + create mode 100644 drivers/staging/winbond/Makefile + create mode 100644 drivers/staging/winbond/README + create mode 100644 drivers/staging/winbond/adapter.h + create mode 100644 drivers/staging/winbond/bss_f.h + create mode 100644 drivers/staging/winbond/bssdscpt.h + create mode 100644 drivers/staging/winbond/ds_tkip.h + create mode 100644 drivers/staging/winbond/gl_80211.h + create mode 100644 drivers/staging/winbond/ioctls.h + create mode 100644 drivers/staging/winbond/linux/common.h + create mode 100644 drivers/staging/winbond/linux/sysdef.h + create mode 100644 drivers/staging/winbond/linux/wb35reg.c + create mode 100644 drivers/staging/winbond/linux/wb35reg_f.h + create mode 100644 drivers/staging/winbond/linux/wb35reg_s.h + create mode 100644 drivers/staging/winbond/linux/wb35rx.c + create mode 100644 drivers/staging/winbond/linux/wb35rx_f.h + create mode 100644 drivers/staging/winbond/linux/wb35rx_s.h + create mode 100644 drivers/staging/winbond/linux/wb35tx.c + create mode 100644 drivers/staging/winbond/linux/wb35tx_f.h + create mode 100644 drivers/staging/winbond/linux/wb35tx_s.h + create mode 100644 drivers/staging/winbond/linux/wbusb.c + create mode 100644 drivers/staging/winbond/linux/wbusb_f.h + create mode 100644 drivers/staging/winbond/linux/wbusb_s.h + create mode 100644 drivers/staging/winbond/localpara.h + create mode 100644 drivers/staging/winbond/mac_structures.h + create mode 100644 drivers/staging/winbond/mds.c + create mode 100644 drivers/staging/winbond/mds_f.h + create mode 100644 drivers/staging/winbond/mds_s.h + create mode 100644 drivers/staging/winbond/mlme_mib.h + create mode 100644 drivers/staging/winbond/mlme_s.h + create mode 100644 drivers/staging/winbond/mlmetxrx.c + create mode 100644 drivers/staging/winbond/mlmetxrx_f.h + create mode 100644 drivers/staging/winbond/mto.c + create mode 100644 drivers/staging/winbond/mto.h + create mode 100644 drivers/staging/winbond/mto_f.h + create mode 100644 drivers/staging/winbond/os_common.h + create mode 100644 drivers/staging/winbond/phy_calibration.c + create mode 100644 drivers/staging/winbond/phy_calibration.h + create mode 100644 drivers/staging/winbond/reg.c + create mode 100644 drivers/staging/winbond/rxisr.c + create mode 100644 drivers/staging/winbond/scan_s.h + create mode 100644 drivers/staging/winbond/sme_api.c + create mode 100644 drivers/staging/winbond/sme_api.h + create mode 100644 drivers/staging/winbond/sme_s.h + create mode 100644 drivers/staging/winbond/wb35_ver.h + create mode 100644 drivers/staging/winbond/wbhal.c + create mode 100644 drivers/staging/winbond/wbhal_f.h + create mode 100644 drivers/staging/winbond/wbhal_s.h + create mode 100644 drivers/staging/winbond/wblinux.c + create mode 100644 drivers/staging/winbond/wblinux_f.h + create mode 100644 drivers/staging/winbond/wblinux_s.h + create mode 100644 drivers/staging/wlan-ng/Kconfig + create mode 100644 drivers/staging/wlan-ng/Makefile + create mode 100644 drivers/staging/wlan-ng/README + create mode 100644 drivers/staging/wlan-ng/hfa384x.c + create mode 100644 drivers/staging/wlan-ng/hfa384x.h + create mode 100644 drivers/staging/wlan-ng/hfa384x_usb.c + create mode 100644 drivers/staging/wlan-ng/p80211conv.c + create mode 100644 drivers/staging/wlan-ng/p80211conv.h + create mode 100644 drivers/staging/wlan-ng/p80211hdr.h + create mode 100644 drivers/staging/wlan-ng/p80211ioctl.h + create mode 100644 drivers/staging/wlan-ng/p80211meta.h + create mode 100644 drivers/staging/wlan-ng/p80211metadef.h + create mode 100644 drivers/staging/wlan-ng/p80211metamib.h + create mode 100644 drivers/staging/wlan-ng/p80211metamsg.h + create mode 100644 drivers/staging/wlan-ng/p80211metastruct.h + create mode 100644 drivers/staging/wlan-ng/p80211mgmt.h + create mode 100644 drivers/staging/wlan-ng/p80211mod.c + create mode 100644 drivers/staging/wlan-ng/p80211msg.h + create mode 100644 drivers/staging/wlan-ng/p80211netdev.c + create mode 100644 drivers/staging/wlan-ng/p80211netdev.h + create mode 100644 drivers/staging/wlan-ng/p80211req.c + create mode 100644 drivers/staging/wlan-ng/p80211req.h + create mode 100644 drivers/staging/wlan-ng/p80211types.h + create mode 100644 drivers/staging/wlan-ng/p80211wep.c + create mode 100644 drivers/staging/wlan-ng/p80211wext.c + create mode 100644 drivers/staging/wlan-ng/prism2_cs.c + create mode 100644 drivers/staging/wlan-ng/prism2_pci.c + create mode 100644 drivers/staging/wlan-ng/prism2_plx.c + create mode 100644 drivers/staging/wlan-ng/prism2_usb.c + create mode 100644 drivers/staging/wlan-ng/prism2mgmt.c + create mode 100644 drivers/staging/wlan-ng/prism2mgmt.h + create mode 100644 drivers/staging/wlan-ng/prism2mib.c + create mode 100644 drivers/staging/wlan-ng/prism2sta.c + create mode 100644 drivers/staging/wlan-ng/version.h + create mode 100644 drivers/staging/wlan-ng/wlan_compat.h + create mode 100644 drivers/usb/class/usbtmc.c + create mode 100644 drivers/usb/gadget/f_obex.c + create mode 100644 drivers/usb/gadget/fsl_qe_udc.c + create mode 100644 drivers/usb/gadget/fsl_qe_udc.h + delete mode 100644 drivers/usb/host/ehci-ppc-soc.c + create mode 100644 drivers/usb/misc/usbsevseg.c + create mode 100644 drivers/usb/misc/vstusb.c + rename {drivers/pci => include/linux}/dma_remapping.h (100%) + rename {drivers/pci => include/linux}/intel-iommu.h (92%) + rename {drivers/pci => include/linux}/iova.h (100%) + create mode 100644 include/linux/usb/tmc.h + create mode 100644 include/linux/usb/vstusb.h + create mode 100644 virt/kvm/irq_comm.c + create mode 100644 virt/kvm/vtd.c +$ git cherry-pick c917a47312d1dcfadbb8d558fab121d4d6467d10 +Finished one cherry-pick. +Created commit 2f20e42: mfd: Don't use NO_IRQ in WM8350 + 1 files changed, 1 insertions(+), 1 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 sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/Kconfig | 2 +- + arch/arm/common/Kconfig | 2 +- + arch/arm/common/sa1111.c | 2 ++ + arch/arm/configs/trizeps4_defconfig | 1 + + arch/arm/mach-ixp4xx/Kconfig | 5 ----- + arch/arm/mach-pxa/Kconfig | 1 - + arch/arm/mach-pxa/include/mach/irqs.h | 5 ++++- + arch/arm/mach-pxa/include/mach/spitz.h | 2 +- + arch/arm/mach-pxa/pwm.c | 2 +- + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-s3c2443/clock.c | 3 +-- + arch/arm/mm/cache-v4.S | 6 +++--- + arch/arm/plat-s3c24xx/pwm-clock.c | 2 +- + arch/arm/plat-s3c24xx/pwm.c | 12 ++++++------ + drivers/pcmcia/Makefile | 2 +- + drivers/serial/Kconfig | 2 +- + 16 files changed, 25 insertions(+), 26 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Auto-merged Documentation/sysctl/kernel.txt +CONFLICT (content): Merge conflict in Documentation/sysctl/kernel.txt +Recorded preimage for 'Documentation/sysctl/kernel.txt' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/sysctl/kernel.txt'. +Created commit 25f3d7c: Merge branch 'quilt/driver-core.current' +$ git diff -M --stat --summary HEAD^.. + Documentation/sysctl/kernel.txt | 24 +++++++++++++++++------- + 1 files changed, 17 insertions(+), 7 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Auto-merged Documentation/ioctl-number.txt +Auto-merged drivers/usb/misc/Kconfig +Auto-merged drivers/usb/misc/Makefile +CONFLICT (content): Merge conflict in drivers/usb/misc/Makefile +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged drivers/usb/serial/option.c +CONFLICT (content): Merge conflict in drivers/usb/serial/option.c +Auto-merged include/linux/usb/Kbuild +CONFLICT (content): Merge conflict in include/linux/usb/Kbuild +Recorded preimage for 'drivers/usb/misc/Makefile' +Recorded preimage for 'drivers/usb/serial/option.c' +Recorded preimage for 'include/linux/usb/Kbuild' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/misc/Makefile'. +Recorded resolution for 'drivers/usb/serial/option.c'. +Recorded resolution for 'include/linux/usb/Kbuild'. +Created commit f87b493: Merge branch 'quilt/usb.current' +$ git diff -M --stat --summary HEAD^.. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + Documentation/input/elantech.txt | 405 ++++++++++++++++++++ + drivers/input/mouse/Kconfig | 25 ++- + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/elantech.c | 674 +++++++++++++++++++++++++++++++++ + drivers/input/mouse/elantech.h | 124 ++++++ + drivers/input/mouse/psmouse-base.c | 23 ++ + drivers/input/mouse/psmouse.h | 1 + + drivers/input/serio/i8042-x86ia64io.h | 8 + + 8 files changed, 1259 insertions(+), 2 deletions(-) + create mode 100644 Documentation/input/elantech.txt + create mode 100644 drivers/input/mouse/elantech.c + create mode 100644 drivers/input/mouse/elantech.h +Merging md-current/for-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Merge made by recursive. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/Kconfig | 12 +- + arch/avr32/Makefile | 2 + + arch/avr32/boards/atngw100/Kconfig | 35 + + arch/avr32/boards/atngw100/Makefile | 3 +- + arch/avr32/boards/atngw100/evklcd10x.c | 155 +++ + arch/avr32/boards/atngw100/setup.c | 5 + + arch/avr32/boards/favr-32/Kconfig | 22 + + arch/avr32/boards/favr-32/Makefile | 1 + + arch/avr32/boards/favr-32/flash.c | 98 ++ + arch/avr32/boards/favr-32/setup.c | 352 +++++++ + arch/avr32/boards/mimc200/Makefile | 1 + + arch/avr32/boards/mimc200/flash.c | 143 +++ + arch/avr32/boards/mimc200/fram.c | 80 ++ + arch/avr32/boards/mimc200/setup.c | 237 +++++ + arch/avr32/configs/atngw100_evklcd100_defconfig | 1264 +++++++++++++++++++++++ + arch/avr32/configs/atngw100_evklcd101_defconfig | 1264 +++++++++++++++++++++++ + arch/avr32/configs/favr-32_defconfig | 1235 ++++++++++++++++++++++ + arch/avr32/configs/mimc200_defconfig | 1109 ++++++++++++++++++++ + arch/avr32/mach-at32ap/at32ap700x.c | 6 +- + 19 files changed, 6020 insertions(+), 4 deletions(-) + create mode 100644 arch/avr32/boards/atngw100/Kconfig + create mode 100644 arch/avr32/boards/atngw100/evklcd10x.c + create mode 100644 arch/avr32/boards/favr-32/Kconfig + create mode 100644 arch/avr32/boards/favr-32/Makefile + create mode 100644 arch/avr32/boards/favr-32/flash.c + create mode 100644 arch/avr32/boards/favr-32/setup.c + create mode 100644 arch/avr32/boards/mimc200/Makefile + create mode 100644 arch/avr32/boards/mimc200/flash.c + create mode 100644 arch/avr32/boards/mimc200/fram.c + create mode 100644 arch/avr32/boards/mimc200/setup.c + create mode 100644 arch/avr32/configs/atngw100_evklcd100_defconfig + create mode 100644 arch/avr32/configs/atngw100_evklcd101_defconfig + create mode 100644 arch/avr32/configs/favr-32_defconfig + create mode 100644 arch/avr32/configs/mimc200_defconfig +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + Documentation/ia64/xen.txt | 183 ++++++++++++ + arch/ia64/Kconfig | 50 ++++ + arch/ia64/Makefile | 3 + + arch/ia64/configs/generic_defconfig | 2 + + arch/ia64/configs/tiger_defconfig | 2 + + arch/ia64/dig/Makefile | 5 + + arch/ia64/dig/dig_vtd_iommu.c | 59 ++++ + arch/ia64/dig/machvec_vtd.c | 3 + + arch/ia64/ia32/ia32_entry.S | 11 +- + arch/ia64/ia32/sys_ia32.c | 106 +------- + arch/ia64/include/asm/break.h | 9 + + arch/ia64/include/asm/cacheflush.h | 2 + + arch/ia64/include/asm/device.h | 3 + + arch/ia64/include/asm/dma-mapping.h | 50 ++++ + arch/ia64/include/asm/iommu.h | 16 + + arch/ia64/include/asm/kregs.h | 2 +- + arch/ia64/include/asm/machvec.h | 4 + + arch/ia64/include/asm/machvec_dig_vtd.h | 38 +++ + arch/ia64/include/asm/machvec_init.h | 1 + + arch/ia64/include/asm/machvec_xen.h | 22 ++ + arch/ia64/include/asm/meminit.h | 3 +- + arch/ia64/include/asm/native/inst.h | 10 +- + arch/ia64/include/asm/native/pvchk_inst.h | 263 +++++++++++++++++ + arch/ia64/include/asm/paravirt.h | 4 +- + arch/ia64/include/asm/pci.h | 3 + + arch/ia64/include/asm/ptrace.h | 8 + + arch/ia64/include/asm/pvclock-abi.h | 48 +++ + arch/ia64/include/asm/swiotlb.h | 56 ++++ + arch/ia64/include/asm/sync_bitops.h | 51 ++++ + arch/ia64/include/asm/syscall.h | 163 ++++++++++ + arch/ia64/include/asm/thread_info.h | 3 - + arch/ia64/include/asm/timex.h | 2 + + arch/ia64/include/asm/unistd.h | 1 + + arch/ia64/include/asm/xen/events.h | 50 ++++ + arch/ia64/include/asm/xen/grant_table.h | 29 ++ + arch/ia64/include/asm/xen/hypercall.h | 265 +++++++++++++++++ + arch/ia64/include/asm/xen/hypervisor.h | 89 ++++++ + arch/ia64/include/asm/xen/inst.h | 458 +++++++++++++++++++++++++++++ + arch/ia64/include/asm/xen/interface.h | 346 ++++++++++++++++++++++ + arch/ia64/include/asm/xen/irq.h | 44 +++ + arch/ia64/include/asm/xen/minstate.h | 134 +++++++++ + arch/ia64/include/asm/xen/page.h | 65 ++++ + arch/ia64/include/asm/xen/privop.h | 129 ++++++++ + arch/ia64/include/asm/xen/xcom_hcall.h | 51 ++++ + arch/ia64/include/asm/xen/xencomm.h | 42 +++ + arch/ia64/kernel/Makefile | 22 ++ + arch/ia64/kernel/acpi.c | 22 ++ + arch/ia64/kernel/asm-offsets.c | 31 ++ + arch/ia64/kernel/entry.S | 5 + + arch/ia64/kernel/ivt.S | 6 +- + arch/ia64/kernel/msi_ia64.c | 80 +++++ + arch/ia64/kernel/nr-irqs.c | 1 + + arch/ia64/kernel/paravirt.c | 2 +- + arch/ia64/kernel/paravirt_inst.h | 4 +- + arch/ia64/kernel/pci-dma.c | 129 ++++++++ + arch/ia64/kernel/pci-swiotlb.c | 46 +++ + arch/ia64/kernel/perfmon.c | 7 +- + arch/ia64/kernel/process.c | 22 +- + arch/ia64/kernel/ptrace.c | 112 +++++-- + arch/ia64/kernel/setup.c | 42 ++- + arch/ia64/kernel/signal.c | 8 + + arch/ia64/lib/flush.S | 55 ++++ + arch/ia64/mm/tlb.c | 8 +- + arch/ia64/scripts/pvcheck.sed | 32 ++ + arch/ia64/xen/Kconfig | 26 ++ + arch/ia64/xen/Makefile | 22 ++ + arch/ia64/xen/grant-table.c | 155 ++++++++++ + arch/ia64/xen/hypercall.S | 91 ++++++ + arch/ia64/xen/hypervisor.c | 96 ++++++ + arch/ia64/xen/irq_xen.c | 435 +++++++++++++++++++++++++++ + arch/ia64/xen/irq_xen.h | 34 +++ + arch/ia64/xen/machvec.c | 4 + + arch/ia64/xen/suspend.c | 64 ++++ + arch/ia64/xen/time.c | 213 +++++++++++++ + arch/ia64/xen/time.h | 24 ++ + arch/ia64/xen/xcom_hcall.c | 441 +++++++++++++++++++++++++++ + arch/ia64/xen/xen_pv_ops.c | 364 +++++++++++++++++++++++ + arch/ia64/xen/xencomm.c | 105 +++++++ + arch/ia64/xen/xenivt.S | 52 ++++ + arch/ia64/xen/xensetup.S | 83 ++++++ + 80 files changed, 5546 insertions(+), 185 deletions(-) + create mode 100644 Documentation/ia64/xen.txt + create mode 100644 arch/ia64/dig/dig_vtd_iommu.c + create mode 100644 arch/ia64/dig/machvec_vtd.c + create mode 100644 arch/ia64/include/asm/iommu.h + create mode 100644 arch/ia64/include/asm/machvec_dig_vtd.h + create mode 100644 arch/ia64/include/asm/machvec_xen.h + create mode 100644 arch/ia64/include/asm/native/pvchk_inst.h + create mode 100644 arch/ia64/include/asm/pvclock-abi.h + create mode 100644 arch/ia64/include/asm/swiotlb.h + create mode 100644 arch/ia64/include/asm/sync_bitops.h + create mode 100644 arch/ia64/include/asm/syscall.h + create mode 100644 arch/ia64/include/asm/xen/events.h + create mode 100644 arch/ia64/include/asm/xen/grant_table.h + create mode 100644 arch/ia64/include/asm/xen/hypercall.h + create mode 100644 arch/ia64/include/asm/xen/hypervisor.h + create mode 100644 arch/ia64/include/asm/xen/inst.h + create mode 100644 arch/ia64/include/asm/xen/interface.h + create mode 100644 arch/ia64/include/asm/xen/irq.h + create mode 100644 arch/ia64/include/asm/xen/minstate.h + create mode 100644 arch/ia64/include/asm/xen/page.h + create mode 100644 arch/ia64/include/asm/xen/privop.h + create mode 100644 arch/ia64/include/asm/xen/xcom_hcall.h + create mode 100644 arch/ia64/include/asm/xen/xencomm.h + create mode 100644 arch/ia64/kernel/pci-dma.c + create mode 100644 arch/ia64/kernel/pci-swiotlb.c + create mode 100644 arch/ia64/scripts/pvcheck.sed + create mode 100644 arch/ia64/xen/Kconfig + create mode 100644 arch/ia64/xen/Makefile + create mode 100644 arch/ia64/xen/grant-table.c + create mode 100644 arch/ia64/xen/hypercall.S + create mode 100644 arch/ia64/xen/hypervisor.c + create mode 100644 arch/ia64/xen/irq_xen.c + create mode 100644 arch/ia64/xen/irq_xen.h + create mode 100644 arch/ia64/xen/machvec.c + create mode 100644 arch/ia64/xen/suspend.c + create mode 100644 arch/ia64/xen/time.c + create mode 100644 arch/ia64/xen/time.h + create mode 100644 arch/ia64/xen/xcom_hcall.c + create mode 100644 arch/ia64/xen/xen_pv_ops.c + create mode 100644 arch/ia64/xen/xencomm.c + create mode 100644 arch/ia64/xen/xenivt.S + create mode 100644 arch/ia64/xen/xensetup.S +Merging quilt/m68k +$ git merge quilt/m68k +Merge made by recursive. + drivers/char/amiserial.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +CONFLICT (rename/delete): Renamed include/asm-parisc/a.out.h->arch/parisc/include/asm/a.out.h in parisc/master and deleted in HEAD +Auto-merged arch/parisc/Kconfig +Auto-merged arch/parisc/kernel/syscall_table.S +Auto-merged drivers/char/agp/parisc-agp.c +Auto-merged drivers/rtc/Kconfig +Auto-merged drivers/rtc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/parisc/include/asm/a.out.h +rm 'arch/parisc/include/asm/a.out.h' +$ git commit -v -a +Created commit 67d318d: Merge commit 'parisc/master' +$ git diff -M --stat --summary HEAD^.. + arch/parisc/Kconfig | 2 + + .../asm-parisc => arch/parisc/include/asm}/Kbuild | 0 + .../asm-parisc => arch/parisc/include/asm}/agp.h | 0 + .../parisc/include/asm}/asmregs.h | 0 + .../parisc/include/asm}/assembly.h | 0 + .../parisc/include/asm}/atomic.h | 0 + .../parisc/include/asm}/auxvec.h | 0 + .../parisc/include/asm}/bitops.h | 0 + .../asm-parisc => arch/parisc/include/asm}/bug.h | 0 + .../asm-parisc => arch/parisc/include/asm}/bugs.h | 0 + .../parisc/include/asm}/byteorder.h | 0 + .../asm-parisc => arch/parisc/include/asm}/cache.h | 0 + .../parisc/include/asm}/cacheflush.h | 0 + .../parisc/include/asm}/checksum.h | 0 + .../parisc/include/asm}/compat.h | 0 + .../parisc/include/asm}/compat_rt_sigframe.h | 0 + .../parisc/include/asm}/compat_signal.h | 0 + .../parisc/include/asm}/compat_ucontext.h | 0 + .../parisc/include/asm}/cputime.h | 0 + .../parisc/include/asm}/current.h | 0 + .../asm-parisc => arch/parisc/include/asm}/delay.h | 0 + .../parisc/include/asm}/device.h | 0 + .../asm-parisc => arch/parisc/include/asm}/div64.h | 0 + .../parisc/include/asm}/dma-mapping.h | 0 + .../asm-parisc => arch/parisc/include/asm}/dma.h | 0 + .../parisc/include/asm}/eisa_bus.h | 0 + .../parisc/include/asm}/eisa_eeprom.h | 0 + .../asm-parisc => arch/parisc/include/asm}/elf.h | 0 + .../parisc/include/asm}/emergency-restart.h | 0 + .../asm-parisc => arch/parisc/include/asm}/errno.h | 0 + .../asm-parisc => arch/parisc/include/asm}/fb.h | 0 + .../asm-parisc => arch/parisc/include/asm}/fcntl.h | 0 + .../parisc/include/asm}/fixmap.h | 0 + .../parisc/include/asm}/floppy.h | 0 + .../asm-parisc => arch/parisc/include/asm}/futex.h | 0 + .../parisc/include/asm}/grfioctl.h | 0 + .../parisc/include/asm}/hardirq.h | 0 + .../parisc/include/asm}/hardware.h | 0 + .../parisc/include/asm}/hw_irq.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ide.h | 0 + .../asm-parisc => arch/parisc/include/asm}/io.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ioctl.h | 0 + .../parisc/include/asm}/ioctls.h | 0 + .../parisc/include/asm}/ipcbuf.h | 0 + .../asm-parisc => arch/parisc/include/asm}/irq.h | 0 + .../parisc/include/asm}/irq_regs.h | 0 + .../parisc/include/asm}/kdebug.h | 0 + .../parisc/include/asm}/kmap_types.h | 0 + .../asm-parisc => arch/parisc/include/asm}/led.h | 0 + .../parisc/include/asm}/linkage.h | 0 + .../asm-parisc => arch/parisc/include/asm}/local.h | 0 + .../parisc/include/asm}/machdep.h | 0 + .../parisc/include/asm}/mc146818rtc.h | 0 + .../parisc/include/asm}/mckinley.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mman.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mmu.h | 0 + .../parisc/include/asm}/mmu_context.h | 0 + .../parisc/include/asm}/mmzone.h | 0 + .../parisc/include/asm}/module.h | 0 + .../parisc/include/asm}/msgbuf.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mutex.h | 0 + .../asm-parisc => arch/parisc/include/asm}/page.h | 0 + .../asm-parisc => arch/parisc/include/asm}/param.h | 0 + .../parisc/include/asm}/parisc-device.h | 0 + .../parisc/include/asm}/parport.h | 0 + .../asm-parisc => arch/parisc/include/asm}/pci.h | 0 + .../asm-parisc => arch/parisc/include/asm}/pdc.h | 5 + + .../parisc/include/asm}/pdc_chassis.h | 0 + .../parisc/include/asm}/pdcpat.h | 0 + .../parisc/include/asm}/percpu.h | 0 + .../asm-parisc => arch/parisc/include/asm}/perf.h | 0 + .../parisc/include/asm}/pgalloc.h | 0 + .../parisc/include/asm}/pgtable.h | 0 + .../asm-parisc => arch/parisc/include/asm}/poll.h | 0 + .../parisc/include/asm}/posix_types.h | 0 + .../parisc/include/asm}/prefetch.h | 0 + .../parisc/include/asm}/processor.h | 0 + .../asm-parisc => arch/parisc/include/asm}/psw.h | 0 + .../parisc/include/asm}/ptrace.h | 10 + + .../asm-parisc => arch/parisc/include/asm}/real.h | 0 + .../parisc/include/asm}/resource.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ropes.h | 2 +- + .../parisc/include/asm}/rt_sigframe.h | 0 + .../asm-parisc => arch/parisc/include/asm}/rtc.h | 0 + .../parisc/include/asm}/runway.h | 0 + .../parisc/include/asm}/scatterlist.h | 0 + .../parisc/include/asm}/sections.h | 0 + .../parisc/include/asm}/segment.h | 0 + .../parisc/include/asm}/sembuf.h | 0 + .../parisc/include/asm}/serial.h | 0 + .../asm-parisc => arch/parisc/include/asm}/setup.h | 0 + .../parisc/include/asm}/shmbuf.h | 0 + .../parisc/include/asm}/shmparam.h | 0 + .../parisc/include/asm}/sigcontext.h | 0 + .../parisc/include/asm}/siginfo.h | 0 + .../parisc/include/asm}/signal.h | 0 + .../asm-parisc => arch/parisc/include/asm}/smp.h | 0 + .../parisc/include/asm}/socket.h | 0 + .../parisc/include/asm}/sockios.h | 0 + .../parisc/include/asm}/spinlock.h | 0 + .../parisc/include/asm}/spinlock_types.h | 0 + .../asm-parisc => arch/parisc/include/asm}/stat.h | 0 + .../parisc/include/asm}/statfs.h | 0 + .../parisc/include/asm}/string.h | 0 + .../parisc/include/asm}/superio.h | 0 + .../parisc/include/asm}/system.h | 0 + .../parisc/include/asm}/termbits.h | 0 + .../parisc/include/asm}/termios.h | 0 + .../parisc/include/asm}/thread_info.h | 0 + .../asm-parisc => arch/parisc/include/asm}/timex.h | 0 + .../asm-parisc => arch/parisc/include/asm}/tlb.h | 0 + .../parisc/include/asm}/tlbflush.h | 0 + .../parisc/include/asm}/topology.h | 0 + .../asm-parisc => arch/parisc/include/asm}/traps.h | 0 + .../asm-parisc => arch/parisc/include/asm}/types.h | 0 + .../parisc/include/asm}/uaccess.h | 0 + .../parisc/include/asm}/ucontext.h | 0 + .../parisc/include/asm}/unaligned.h | 0 + .../parisc/include/asm}/unistd.h | 8 +- + .../parisc/include/asm}/unwind.h | 2 + + .../asm-parisc => arch/parisc/include/asm}/user.h | 0 + .../asm-parisc => arch/parisc/include/asm}/vga.h | 0 + .../asm-parisc => arch/parisc/include/asm}/xor.h | 0 + arch/parisc/kernel/.gitignore | 1 + + arch/parisc/kernel/asm-offsets.c | 3 + + arch/parisc/kernel/firmware.c | 69 ++- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/ptrace.c | 429 ++++++++------------ + arch/parisc/kernel/real2.S | 12 + + arch/parisc/kernel/setup.c | 29 ++- + arch/parisc/kernel/syscall_table.S | 8 +- + arch/parisc/kernel/time.c | 20 +- + arch/parisc/kernel/unwind.c | 4 +- + drivers/char/agp/parisc-agp.c | 4 +- + drivers/parisc/ccio-dma.c | 43 +-- + drivers/rtc/Kconfig | 8 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-parisc.c | 111 +++++ + 138 files changed, 456 insertions(+), 317 deletions(-) + rename {include/asm-parisc => arch/parisc/include/asm}/Kbuild (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/agp.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/asmregs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/assembly.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/atomic.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/auxvec.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bitops.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bug.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bugs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/byteorder.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cache.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cacheflush.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/checksum.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_rt_sigframe.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_signal.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_ucontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cputime.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/current.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/delay.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/device.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/div64.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/dma-mapping.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/dma.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/eisa_bus.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/eisa_eeprom.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/elf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/emergency-restart.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/errno.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fb.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fcntl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fixmap.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/floppy.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/futex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/grfioctl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hardirq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hardware.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hw_irq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ide.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/io.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ioctl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ioctls.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ipcbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/irq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/irq_regs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/kdebug.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/kmap_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/led.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/linkage.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/local.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/machdep.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mc146818rtc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mckinley.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mman.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmu.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmu_context.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmzone.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/module.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/msgbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mutex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/page.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/param.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/parisc-device.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/parport.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pci.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdc.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdc_chassis.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdcpat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/percpu.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/perf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pgalloc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pgtable.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/poll.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/posix_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/prefetch.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/processor.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/psw.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ptrace.h (85%) + rename {include/asm-parisc => arch/parisc/include/asm}/real.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/resource.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ropes.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/rt_sigframe.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/rtc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/runway.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/scatterlist.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sections.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/segment.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sembuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/serial.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/setup.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/shmbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/shmparam.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sigcontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/siginfo.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/signal.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/smp.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/socket.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sockios.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/spinlock.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/spinlock_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/stat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/statfs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/string.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/superio.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/system.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/termbits.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/termios.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/thread_info.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/timex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/tlb.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/tlbflush.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/topology.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/traps.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/uaccess.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ucontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/unaligned.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/unistd.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/unwind.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/user.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/vga.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/xor.h (100%) + create mode 100644 arch/parisc/kernel/.gitignore + create mode 100644 drivers/rtc/rtc-parisc.c +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Merge made by recursive. + arch/powerpc/boot/Makefile | 4 +- + arch/powerpc/boot/cuboot-acadia.c | 174 ++++++ + arch/powerpc/boot/dts/acadia.dts | 224 +++++++ + arch/powerpc/boot/dts/hcu4.dts | 168 +++++ + arch/powerpc/configs/40x/acadia_defconfig | 921 +++++++++++++++++++++++++++ + arch/powerpc/configs/40x/hcu4_defconfig | 929 ++++++++++++++++++++++++++++ + arch/powerpc/kernel/cputable.c | 13 + + arch/powerpc/platforms/40x/Kconfig | 38 ++ + arch/powerpc/platforms/40x/Makefile | 2 + + arch/powerpc/platforms/40x/hcu4.c | 61 ++ + arch/powerpc/platforms/40x/ppc40x_simple.c | 80 +++ + arch/powerpc/platforms/44x/Kconfig | 8 + + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/ppc4xx_gpio.c | 217 +++++++ + 14 files changed, 2839 insertions(+), 1 deletions(-) + create mode 100644 arch/powerpc/boot/cuboot-acadia.c + create mode 100644 arch/powerpc/boot/dts/acadia.dts + create mode 100644 arch/powerpc/boot/dts/hcu4.dts + create mode 100644 arch/powerpc/configs/40x/acadia_defconfig + create mode 100644 arch/powerpc/configs/40x/hcu4_defconfig + create mode 100644 arch/powerpc/platforms/40x/hcu4.c + create mode 100644 arch/powerpc/platforms/40x/ppc40x_simple.c + create mode 100644 arch/powerpc/sysdev/ppc4xx_gpio.c +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/mmu.h | 3 ++- + arch/s390/include/asm/mmu_context.h | 19 ++++++++++++++++--- + arch/s390/include/asm/pgtable.h | 8 ++++---- + arch/s390/kernel/smp.c | 24 +++++++++--------------- + arch/s390/mm/pgtable.c | 16 ++++++++-------- + drivers/s390/char/vmcp.c | 3 --- + drivers/s390/cio/qdio_debug.c | 19 ++++++------------- + drivers/s390/cio/qdio_main.c | 1 - + 8 files changed, 45 insertions(+), 48 deletions(-) +Merging sh/master +$ git merge sh/master +Auto-merged Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Auto-merged arch/sh/include/asm/elf.h +CONFLICT (content): Merge conflict in arch/sh/include/asm/elf.h +Removed arch/sh/kernel/dump_task.c +Auto-merged arch/sh/kernel/smp.c +Auto-merged drivers/net/sh_eth.c +Auto-merged drivers/rtc/rtc-sh.c +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Resolved 'arch/sh/include/asm/elf.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 3613da8: Merge commit 'sh/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 12 +- + arch/sh/Kconfig | 16 +- + arch/sh/Kconfig.debug | 2 +- + arch/sh/Makefile | 2 + + arch/sh/boards/Kconfig | 7 + + arch/sh/boards/Makefile | 1 + + arch/sh/boards/board-ap325rxa.c | 35 +- + arch/sh/boards/board-edosk7760.c | 193 ++++ + arch/sh/boards/mach-migor/lcd_qvga.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + arch/sh/boot/.gitignore | 3 + + arch/sh/boot/Makefile | 6 + + arch/sh/boot/compressed/Makefile_32 | 5 + + arch/sh/boot/compressed/misc_32.c | 2 +- + arch/sh/configs/edosk7760_defconfig | 1050 ++++++++++++++++++++ + arch/sh/configs/rts7751r2dplus_qemu_defconfig | 909 +++++++++++++++++ + arch/sh/include/asm/bitops-llsc.h | 144 +++ + arch/sh/include/asm/bitops.h | 2 + + arch/sh/include/asm/clock.h | 1 + + arch/sh/include/asm/cmpxchg-llsc.h | 71 ++ + arch/sh/include/asm/elf.h | 14 +- + arch/sh/include/asm/fpu.h | 19 + + arch/sh/include/asm/ftrace.h | 8 + + arch/sh/include/asm/hw_irq.h | 92 +-- + arch/sh/include/asm/io.h | 300 +++---- + arch/sh/include/asm/io_generic.h | 7 - + arch/sh/include/asm/irq.h | 3 + + arch/sh/include/asm/kprobes.h | 58 ++ + arch/sh/include/asm/machvec.h | 7 - + arch/sh/include/asm/migor.h | 2 +- + arch/sh/include/asm/mmzone.h | 2 + + arch/sh/include/asm/page.h | 2 + + arch/sh/include/asm/pgtable.h | 1 + + arch/sh/include/asm/processor.h | 44 +- + arch/sh/include/asm/processor_32.h | 22 +- + arch/sh/include/asm/processor_64.h | 45 +- + arch/sh/include/asm/ptrace.h | 11 +- + arch/sh/include/asm/rtc.h | 1 + + arch/sh/include/asm/setup.h | 1 - + arch/sh/include/asm/sizes.h | 61 ++ + arch/sh/include/asm/smp.h | 26 +- + arch/sh/include/asm/syscall.h | 10 + + arch/sh/include/asm/syscall_32.h | 110 ++ + arch/sh/include/asm/syscall_64.h | 6 + + arch/sh/include/asm/syscalls.h | 25 + + arch/sh/include/asm/syscalls_32.h | 56 + + arch/sh/include/asm/syscalls_64.h | 34 + + arch/sh/include/asm/system.h | 8 +- + arch/sh/include/asm/system_32.h | 44 +- + arch/sh/include/asm/thread_info.h | 32 +- + arch/sh/include/asm/uaccess_64.h | 26 +- + arch/sh/kernel/Makefile_32 | 2 +- + arch/sh/kernel/Makefile_64 | 1 - + arch/sh/kernel/cpu/clock.c | 5 +- + arch/sh/kernel/cpu/irq/Makefile | 2 - + arch/sh/kernel/cpu/irq/ipr.c | 4 +- + arch/sh/kernel/cpu/sh4/fpu.c | 25 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 5 + + arch/sh/kernel/cpu/sh4/softfloat.c | 29 + + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 67 +- + arch/sh/kernel/cpu/sh5/Makefile | 5 + + arch/sh/kernel/cpu/sh5/clock-sh5.c | 79 ++ + arch/sh/kernel/dump_task.c | 32 - + arch/sh/kernel/entry-common.S | 44 + + arch/sh/kernel/io.c | 12 +- + arch/sh/kernel/io_generic.c | 67 +- + arch/sh/kernel/kprobes.c | 584 +++++++++++ + arch/sh/kernel/machvec.c | 4 +- + arch/sh/kernel/process_32.c | 36 +- + arch/sh/kernel/process_64.c | 11 +- + arch/sh/kernel/ptrace_32.c | 298 +++++- + arch/sh/kernel/ptrace_64.c | 1 + + arch/sh/kernel/setup.c | 48 +- + arch/sh/kernel/sh_ksyms_32.c | 4 + + arch/sh/kernel/signal_32.c | 69 +- + arch/sh/kernel/signal_64.c | 26 +- + arch/sh/kernel/smp.c | 43 +- + arch/sh/kernel/stacktrace.c | 23 +- + arch/sh/kernel/sys_sh.c | 9 +- + arch/sh/kernel/sys_sh32.c | 5 +- + arch/sh/kernel/time_32.c | 11 +- + arch/sh/kernel/time_64.c | 168 +--- + arch/sh/kernel/timers/Makefile | 1 + + arch/sh/kernel/timers/timer-broadcast.c | 57 ++ + arch/sh/kernel/timers/timer-cmt.c | 2 +- + arch/sh/kernel/timers/timer-tmu.c | 177 +++-- + arch/sh/kernel/traps_32.c | 95 +- + arch/sh/lib/div64-generic.c | 1 + + arch/sh/lib/io.c | 8 +- + arch/sh/mm/Kconfig | 6 +- + arch/sh/mm/cache-sh4.c | 2 +- + arch/sh/mm/consistent.c | 2 +- + arch/sh/mm/fault_32.c | 63 +- + arch/sh/mm/init.c | 74 ++- + arch/sh/mm/pg-nommu.c | 1 + + arch/sh/mm/tlb-nommu.c | 1 + + arch/sh/tools/mach-types | 1 + + drivers/net/sh_eth.c | 5 +- + drivers/rtc/rtc-sh.c | 21 +- + drivers/serial/sh-sci.c | 90 +- + drivers/serial/sh-sci.h | 14 +- + drivers/sh/Makefile | 2 +- + {arch/sh/kernel/cpu/irq => drivers/sh}/intc.c | 35 +- + drivers/video/sh_mobile_lcdcfb.c | 8 +- + include/linux/sh_intc.h | 91 ++ + .../include/asm => include/video}/sh_mobile_lcdc.h | 0 + 106 files changed, 4959 insertions(+), 1059 deletions(-) + create mode 100644 arch/sh/boards/board-edosk7760.c + create mode 100644 arch/sh/configs/edosk7760_defconfig + create mode 100644 arch/sh/configs/rts7751r2dplus_qemu_defconfig + create mode 100644 arch/sh/include/asm/bitops-llsc.h + create mode 100644 arch/sh/include/asm/cmpxchg-llsc.h + create mode 100644 arch/sh/include/asm/ftrace.h + create mode 100644 arch/sh/include/asm/kprobes.h + create mode 100644 arch/sh/include/asm/sizes.h + create mode 100644 arch/sh/include/asm/syscall.h + create mode 100644 arch/sh/include/asm/syscall_32.h + create mode 100644 arch/sh/include/asm/syscall_64.h + create mode 100644 arch/sh/include/asm/syscalls.h + create mode 100644 arch/sh/include/asm/syscalls_32.h + create mode 100644 arch/sh/include/asm/syscalls_64.h + create mode 100644 arch/sh/kernel/cpu/sh5/clock-sh5.c + delete mode 100644 arch/sh/kernel/dump_task.c + create mode 100644 arch/sh/kernel/kprobes.c + create mode 100644 arch/sh/kernel/timers/timer-broadcast.c + rename {arch/sh/kernel/cpu/irq => drivers/sh}/intc.c (96%) + create mode 100644 include/linux/sh_intc.h + rename {arch/sh/include/asm => include/video}/sh_mobile_lcdc.h (100%) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/Kconfig +Auto-merged drivers/pci/quirks.c +Auto-merged include/linux/pci_ids.h +Merge made by recursive. + Documentation/kernel-parameters.txt | 11 +++ + arch/x86/Kconfig | 24 +++++ + arch/x86/pci/common.c | 17 ++++ + drivers/acpi/pci_irq.c | 56 ++++++++++++ + drivers/pci/quirks.c | 170 ++++++++++++++++++++++++++++++----- + include/asm-x86/io_apic.h | 10 ++ + include/asm-x86/pci.h | 2 + + include/linux/pci.h | 6 ++ + include/linux/pci_ids.h | 5 + + 9 files changed, 280 insertions(+), 21 deletions(-) +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. + arch/xtensa/kernel/irq.c | 2 +- + arch/xtensa/platforms/iss/network.c | 2 +- + include/asm-xtensa/rwsem.h | 4 ++++ + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged drivers/net/xen-netfront.c +Auto-merged include/linux/pci.h +Merge made by recursive. + drivers/acpi/scan.c | 2 +- + drivers/base/platform.c | 115 ++++++++++++++------------- + drivers/base/power/main.c | 19 +++-- + drivers/block/xen-blkfront.c | 14 ++-- + drivers/eisa/pci_eisa.c | 2 +- + drivers/eisa/virtual_root.c | 2 +- + drivers/ide/legacy/ide_platform.c | 2 +- + drivers/input/xen-kbdfront.c | 8 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 22 +++--- + drivers/mfd/htc-pasic3.c | 8 +- + drivers/net/3c509.c | 42 +++++++--- + drivers/net/depca.c | 17 +++- + drivers/net/hp100.c | 4 +- + drivers/net/ne3210.c | 4 +- + drivers/net/tulip/de4x5.c | 7 +- + drivers/net/wireless/atmel_cs.c | 2 +- + drivers/net/wireless/ipw2100.c | 8 +- + drivers/net/wireless/ipw2200.c | 46 ++++++------ + drivers/net/wireless/iwlwifi/iwl3945-base.c | 22 +++--- + drivers/net/xen-netfront.c | 10 +- + drivers/pci/pci-driver.c | 46 ++++------- + drivers/pcmcia/ds.c | 8 +- + drivers/s390/block/dasd_devmap.c | 6 +- + drivers/s390/char/con3215.c | 16 ++-- + drivers/s390/char/raw3270.c | 16 ++-- + drivers/s390/char/tape_34xx.c | 4 +- + drivers/s390/char/tape_core.c | 20 +++--- + drivers/s390/char/vmlogrdr.c | 12 ++-- + drivers/s390/char/vmur.c | 10 +- + drivers/s390/net/claw.c | 40 +++++----- + drivers/s390/net/lcs.c | 23 +++--- + drivers/s390/net/netiucv.c | 47 ++++++------ + drivers/scsi/aha1740.c | 3 +- + drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- + drivers/scsi/libsrp.c | 2 +- + drivers/thermal/thermal_sys.c | 4 +- + drivers/usb/core/usb.c | 4 +- + drivers/video/xen-fbfront.c | 8 +- + include/linux/device.h | 8 +- + include/linux/eisa.h | 4 +- + include/linux/init.h | 1 + + include/linux/pci.h | 1 - + include/linux/platform_device.h | 1 - + include/linux/pm.h | 76 ++++++------------ + init/main.c | 9 ++ + lib/kobject.c | 50 ++++++++++++ + 46 files changed, 416 insertions(+), 361 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/usb/host/ohci-hcd.c +Auto-merged drivers/usb/misc/Kconfig +CONFLICT (content): Merge conflict in drivers/usb/misc/Kconfig +Auto-merged drivers/usb/misc/Makefile +Auto-merged include/linux/usb.h +Recorded preimage for 'drivers/usb/misc/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/misc/Kconfig'. +Created commit cca019c: Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. + drivers/net/usb/hso.c | 24 ++-- + drivers/usb/Kconfig | 1 + + drivers/usb/host/ohci-hcd.c | 21 +++ + drivers/usb/host/ohci-tmio.c | 376 ++++++++++++++++++++++++++++++++++++++++++ + drivers/usb/misc/Kconfig | 8 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/gotemp.c | 301 +++++++++++++++++++++++++++++++++ + include/linux/usb.h | 4 - + 8 files changed, 720 insertions(+), 16 deletions(-) + create mode 100644 drivers/usb/host/ohci-tmio.c + create mode 100644 drivers/usb/misc/gotemp.c +$ git am -3 ../patches/USB_unbreak_recursive_dependency +Applying USB: unbreak recursive dependancy +$ git revert 8b4f0f72cb43fc180c27950199d6f91af6a7c947 +Finished one revert. +Created commit d6cb159: Revert "USB: remove info() macro from usb.h" + 1 files changed, 2 insertions(+), 0 deletions(-) +$ git revert 097f2cd062c99a098831b29107441bc66d9079c9 +Finished one revert. +Created commit 1fa79d8: Revert "USB: remove warn() macro from usb.h" + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged arch/powerpc/include/asm/page.h +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/kernel.h +Auto-merged kernel/module.c +Auto-merged kernel/softlockup.c +Auto-merged lib/Kconfig.debug +Merge made by recursive. + Documentation/lockstat.txt | 1 + + arch/powerpc/include/asm/page.h | 6 +- + arch/x86/lib/usercopy_32.c | 8 +- + arch/x86/lib/usercopy_64.c | 4 +- + include/asm-generic/percpu.h | 11 ++- + include/asm-generic/sections.h | 10 ++ + include/asm-generic/vmlinux.lds.h | 16 ++ + include/asm-um/system-generic.h | 32 ++-- + include/asm-x86/percpu.h | 83 ++++++++++- + include/asm-x86/uaccess.h | 2 + + include/asm-x86/uaccess_32.h | 8 +- + include/asm-x86/uaccess_64.h | 6 + + include/linux/debug_locks.h | 2 +- + include/linux/futex.h | 2 + + include/linux/kernel.h | 11 ++ + include/linux/lockdep.h | 18 +++ + include/linux/percpu.h | 17 ++- + include/linux/uaccess.h | 2 +- + kernel/extable.c | 16 ++ + kernel/futex.c | 290 +++++++++++++------------------------ + kernel/lockdep.c | 4 +- + kernel/lockdep_proc.c | 7 +- + kernel/module.c | 7 +- + kernel/notifier.c | 8 + + kernel/sched.c | 2 +- + kernel/softlockup.c | 2 +- + lib/Kconfig.debug | 10 ++ + mm/memory.c | 15 ++ + 28 files changed, 365 insertions(+), 235 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/smp.c +Auto-merged arch/x86/xen/smp.c +Auto-merged include/asm-x86/smp.h +CONFLICT (content): Merge conflict in include/asm-x86/smp.h +Resolved 'include/asm-x86/smp.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit c8d71d9: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 17 +++++++++++------ + arch/x86/kernel/smp.c | 6 +++--- + arch/x86/xen/smp.c | 6 +++--- + include/asm-x86/smp.h | 6 +++--- + kernel/smp.c | 12 +++++------- + 5 files changed, 25 insertions(+), 22 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged arch/x86/Kconfig +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/init.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/module.h +Auto-merged init/Kconfig +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged kernel/notifier.c +Auto-merged kernel/sched.c +Auto-merged scripts/bootgraph.pl +CONFLICT (add/add): Merge conflict in scripts/bootgraph.pl +Resolved 'init/main.c' using previous resolution. +Resolved 'kernel/module.c' using previous resolution. +Resolved 'scripts/bootgraph.pl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 7535bf8: Merge commit 'ftrace/auto-ftrace-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/markers.txt | 10 +- + Documentation/tracepoints.txt | 101 ++ + Documentation/tracers/mmiotrace.txt | 5 +- + arch/powerpc/platforms/cell/spufs/sputrace.c | 1 + + arch/x86/Kconfig | 1 + + arch/x86/kernel/cpu/perfctr-watchdog.c | 11 +- + arch/x86/kernel/entry_32.S | 14 - + arch/x86/kernel/entry_64.S | 26 - + arch/x86/kernel/ftrace.c | 124 +- + arch/x86/mm/mmio-mod.c | 87 +- + arch/x86/mm/pf_in.c | 121 +- + arch/x86/mm/testmmiotrace.c | 4 + + include/asm-generic/vmlinux.lds.h | 14 +- + include/asm-x86/ftrace.h | 10 + + include/linux/compiler.h | 2 + + include/linux/ftrace.h | 84 +- + include/linux/init.h | 2 +- + include/linux/kernel.h | 5 + + include/linux/kprobes.h | 5 +- + include/linux/linkage.h | 2 - + include/linux/marker.h | 7 + + include/linux/mmiotrace.h | 20 +- + include/linux/module.h | 17 + + include/linux/ring_buffer.h | 127 ++ + include/linux/tracepoint.h | 137 ++ + include/trace/sched.h | 56 + + init/Kconfig | 7 + + init/main.c | 34 +- + kernel/Makefile | 1 + + kernel/exit.c | 10 +- + kernel/fork.c | 3 + + kernel/kthread.c | 5 + + kernel/marker.c | 36 +- + kernel/module.c | 81 +- + kernel/notifier.c | 2 +- + kernel/sched.c | 17 +- + kernel/signal.c | 3 + + kernel/trace/Kconfig | 64 +- + kernel/trace/Makefile | 4 + + kernel/trace/ftrace.c | 275 +++- + kernel/trace/ring_buffer.c | 2014 ++++++++++++++++++++++++ + kernel/trace/trace.c | 1845 +++++++++++----------- + kernel/trace/trace.h | 211 ++- + kernel/trace/trace_boot.c | 126 ++ + kernel/trace/trace_functions.c | 2 +- + kernel/trace/trace_irqsoff.c | 19 +- + kernel/trace/trace_mmiotrace.c | 116 ++- + kernel/trace/trace_nop.c | 64 + + kernel/trace/trace_sched_switch.c | 137 +-- + kernel/trace/trace_sched_wakeup.c | 148 +-- + kernel/trace/trace_selftest.c | 83 +- + kernel/trace/trace_stack.c | 310 ++++ + kernel/trace/trace_sysprof.c | 2 +- + kernel/tracepoint.c | 477 ++++++ + samples/Kconfig | 6 + + samples/Makefile | 2 +- + samples/markers/probe-example.c | 1 + + samples/tracepoints/Makefile | 6 + + samples/tracepoints/tp-samples-trace.h | 13 + + samples/tracepoints/tracepoint-probe-sample.c | 55 + + samples/tracepoints/tracepoint-probe-sample2.c | 42 + + samples/tracepoints/tracepoint-sample.c | 53 + + scripts/Makefile.build | 7 + + scripts/bootgraph.pl | 24 +- + scripts/recordmcount.pl | 395 +++++ + 65 files changed, 6108 insertions(+), 1585 deletions(-) + create mode 100644 Documentation/tracepoints.txt + create mode 100644 include/linux/ring_buffer.h + create mode 100644 include/linux/tracepoint.h + create mode 100644 include/trace/sched.h + create mode 100644 kernel/trace/ring_buffer.c + create mode 100644 kernel/trace/trace_boot.c + create mode 100644 kernel/trace/trace_nop.c + create mode 100644 kernel/trace/trace_stack.c + create mode 100644 kernel/tracepoint.c + create mode 100644 samples/tracepoints/Makefile + create mode 100644 samples/tracepoints/tp-samples-trace.h + create mode 100644 samples/tracepoints/tracepoint-probe-sample.c + create mode 100644 samples/tracepoints/tracepoint-probe-sample2.c + create mode 100644 samples/tracepoints/tracepoint-sample.c + create mode 100755 scripts/recordmcount.pl +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged include/linux/irq.h +Auto-merged kernel/irq/manage.c +Merge made by recursive. + include/linux/irq.h | 4 - + kernel/irq/chip.c | 17 +++--- + kernel/irq/handle.c | 2 - + kernel/irq/internals.h | 3 + + kernel/irq/manage.c | 43 ++++++++++----- + kernel/irq/spurious.c | 146 ++++++++++++++++++++++++++++++------------------ + 6 files changed, 132 insertions(+), 83 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Already uptodate! +Merge made by recursive. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/mm/fault.c +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/panic.c +Auto-merged kernel/sched.c +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 208ce14: Merge commit 'stackprotector/auto-stackprotector-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/pda.h | 4 ++-- + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/asm-x86/system.h | 6 +++++- + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged arch/ia64/kvm/kvm-ia64.c +Auto-merged arch/x86/kvm/i8254.c +CONFLICT (content): Merge conflict in arch/x86/kvm/i8254.c +Auto-merged arch/x86/kvm/lapic.c +Auto-merged fs/binfmt_elf.c +Auto-merged fs/compat.c +Auto-merged include/linux/sched.h +Auto-merged include/linux/time.h +Auto-merged kernel/compat.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/futex.c +Auto-merged kernel/sched.c +Auto-merged kernel/signal.c +Auto-merged kernel/sys.c +Auto-merged kernel/time/tick-sched.c +Auto-merged kernel/timer.c +Resolved 'arch/x86/kvm/i8254.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 4b26b04: Merge commit 'timers/auto-timers-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/osf_sys.c | 13 +- + arch/ia64/kvm/kvm-ia64.c | 2 +- + arch/powerpc/oprofile/cell/spu_profiler.c | 2 +- + arch/x86/kvm/i8254.c | 8 +- + arch/x86/kvm/lapic.c | 6 +- + drivers/clocksource/acpi_pm.c | 7 +- + drivers/cpuidle/cpuidle.c | 7 + + drivers/s390/crypto/ap_bus.c | 6 +- + fs/binfmt_elf.c | 19 +- + fs/compat.c | 187 ++++------- + fs/proc/array.c | 8 +- + fs/select.c | 396 +++++++++++++---------- + fs/timerfd.c | 8 +- + include/linux/clocksource.h | 14 +- + include/linux/hrtimer.h | 104 ++++++- + include/linux/init_task.h | 1 + + include/linux/kernel_stat.h | 1 + + include/linux/poll.h | 8 +- + include/linux/posix-timers.h | 4 +- + include/linux/prctl.h | 7 + + include/linux/sched.h | 90 +++++- + include/linux/thread_info.h | 8 + + include/linux/time.h | 9 + + include/linux/timex.h | 11 +- + kernel/compat.c | 53 +--- + kernel/exit.c | 19 +- + kernel/fork.c | 94 +++--- + kernel/futex.c | 11 +- + kernel/hrtimer.c | 227 +++++++++++-- + kernel/itimer.c | 33 +-- + kernel/posix-cpu-timers.c | 512 +++++++++++++++-------------- + kernel/posix-timers.c | 163 ++++------ + kernel/rtmutex.c | 3 +- + kernel/sched.c | 26 +- + kernel/sched_fair.c | 1 + + kernel/sched_rt.c | 4 +- + kernel/sched_stats.h | 86 +++++ + kernel/signal.c | 8 +- + kernel/sys.c | 85 ++--- + kernel/time.c | 18 + + kernel/time/clocksource.c | 3 + + kernel/time/jiffies.c | 1 + + kernel/time/ntp.c | 96 +++--- + kernel/time/tick-sched.c | 21 +- + kernel/time/timekeeping.c | 122 +++++--- + kernel/time/timer_list.c | 8 +- + kernel/timer.c | 11 +- + net/sched/sch_cbq.c | 7 +- + security/selinux/hooks.c | 9 +- + sound/drivers/pcsp/pcsp_lib.c | 5 +- + 50 files changed, 1507 insertions(+), 1045 deletions(-) +$ git am -3 ../patches/0001-DECLARE_PER_CPU-needs-linux-percpu.h.patch +Applying DECLARE_PER_CPU needs linux/percpu.h +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/ia64/include/asm/pci.h +Auto-merged arch/powerpc/include/asm/pci.h +Auto-merged arch/powerpc/kernel/pci-common.c +Auto-merged arch/x86/pci/irq.c +Auto-merged drivers/i2c/busses/i2c-viapro.c +Auto-merged drivers/pci/hotplug/ibmphp_ebda.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/pcie/aspm.c +CONFLICT (content): Merge conflict in drivers/pci/pcie/aspm.c +Auto-merged drivers/pci/probe.c +Auto-merged drivers/pci/quirks.c +CONFLICT (content): Merge conflict in drivers/pci/quirks.c +Auto-merged drivers/pci/setup-bus.c +Auto-merged drivers/scsi/ipr.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged drivers/scsi/qla2xxx/qla_os.c +Auto-merged include/linux/pci.h +Auto-merged include/linux/pci_ids.h +Auto-merged init/Kconfig +Recorded preimage for 'drivers/pci/quirks.c' +Resolved 'drivers/pci/pcie/aspm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/pci/quirks.c'. +Created commit 97fe851: Merge commit 'pci/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/MSI-HOWTO.txt | 6 +- + Documentation/PCI/pci.txt | 4 + + Documentation/kernel-parameters.txt | 31 +++-- + arch/ia64/include/asm/pci.h | 12 +-- + arch/ia64/pci/pci.c | 7 +- + arch/powerpc/include/asm/pci-bridge.h | 7 + + arch/powerpc/include/asm/pci.h | 11 ++ + arch/powerpc/kernel/pci-common.c | 136 ++++++++++++++++++- + arch/x86/pci/irq.c | 19 ++- + drivers/i2c/busses/i2c-amd756.c | 5 - + drivers/i2c/busses/i2c-viapro.c | 5 - + drivers/pci/bus.c | 7 + + drivers/pci/hotplug/ibmphp_ebda.c | 92 +++--------- + drivers/pci/hotplug/pci_hotplug_core.c | 14 +- + drivers/pci/hotplug/pciehp.h | 16 ++- + drivers/pci/hotplug/pciehp_core.c | 78 ++++++---- + drivers/pci/hotplug/pciehp_ctrl.c | 136 ++++++++++-------- + drivers/pci/hotplug/pciehp_hpc.c | 202 +++++++++++++++----------- + drivers/pci/hotplug/pciehp_pci.c | 26 ++-- + drivers/pci/hotplug/rpaphp.h | 4 +- + drivers/pci/hotplug/rpaphp_core.c | 4 +- + drivers/pci/hotplug/rpaphp_pci.c | 2 +- + drivers/pci/msi.c | 10 +- + drivers/pci/pci-driver.c | 21 +++- + drivers/pci/pci-sysfs.c | 241 +++++++++++++++++++++++--------- + drivers/pci/pci.c | 95 ++++++++++--- + drivers/pci/pci.h | 26 ++++ + drivers/pci/pcie/aer/aerdrv.c | 6 +- + drivers/pci/pcie/aer/aerdrv_core.c | 47 ++----- + drivers/pci/pcie/aspm.c | 6 +- + drivers/pci/pcie/portdrv_core.c | 23 +--- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/pci/probe.c | 129 ++++++------------ + drivers/pci/quirks.c | 173 ++++++++++++----------- + drivers/pci/remove.c | 11 +- + drivers/pci/setup-bus.c | 4 +- + drivers/pci/setup-res.c | 9 +- + drivers/pci/slot.c | 10 ++ + drivers/scsi/ipr.c | 1 - + drivers/scsi/qla2xxx/qla_def.h | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 5 +- + include/linux/aer.h | 4 - + include/linux/pci.h | 24 +++- + include/linux/pci_ids.h | 6 +- + include/linux/pci_regs.h | 14 ++ + init/Kconfig | 8 + + 46 files changed, 1027 insertions(+), 674 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merged drivers/md/dm-mpath.c +Merge made by recursive. + drivers/md/dm-crypt.c | 9 ++- + drivers/md/dm-delay.c | 3 +- + drivers/md/dm-exception-store.c | 108 ++++++++++++++++++++++++++------------- + drivers/md/dm-io.c | 2 +- + drivers/md/dm-kcopyd.c | 14 +++++- + drivers/md/dm-linear.c | 2 +- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-mpath.c | 3 +- + drivers/md/dm-path-selector.c | 3 +- + drivers/md/dm-raid1.c | 6 +-- + drivers/md/dm-round-robin.c | 3 +- + drivers/md/dm-snap.c | 11 +--- + drivers/md/dm-snap.h | 5 +-- + drivers/md/dm-stripe.c | 6 +- + drivers/md/dm-zero.c | 2 +- + drivers/md/dm.h | 9 --- + include/linux/device-mapper.h | 3 + + 17 files changed, 116 insertions(+), 75 deletions(-) +Merging hid/mm +$ git merge hid/mm +Merge made by recursive. + drivers/hid/Kconfig | 2 -- + drivers/hid/hid-core.c | 3 +-- + drivers/hid/hid-gyration.c | 4 +++- + drivers/hid/hid-ids.h | 3 +-- + drivers/hid/hid-lg.c | 5 ----- + drivers/hid/hidraw.c | 2 +- + 6 files changed, 6 insertions(+), 13 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Removed Documentation/i2c/porting-clients +Auto-merged include/linux/device.h +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + Documentation/i2c/busses/i2c-i801 | 7 +- + Documentation/i2c/porting-clients | 160 --------- + Documentation/i2c/writing-clients | 495 +++++++--------------------- + drivers/i2c/algos/i2c-algo-pcf.c | 21 +- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-elektor.c | 3 +- + drivers/i2c/busses/i2c-i801.c | 3 + + include/linux/device.h | 2 +- + include/linux/i2c-algo-pcf.h | 5 +- + include/linux/i2c.h | 161 +++++----- + 11 files changed, 235 insertions(+), 631 deletions(-) + delete mode 100644 Documentation/i2c/porting-clients +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Already up-to-date. +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merged Documentation/00-INDEX +Auto-merged include/linux/kernel.h +Merge made by recursive. + Documentation/00-INDEX | 2 -- + Documentation/early-userspace/00-INDEX | 8 ++++++++ + Documentation/{ => early-userspace}/initrd.txt | 6 +++--- + include/linux/kernel.h | 4 ++-- + scripts/kernel-doc | 6 +++--- + 5 files changed, 16 insertions(+), 10 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) +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 +Removed arch/arm/mach-sa1100/include/mach/ide.h +Auto-merged drivers/ide/Kconfig +Auto-merged drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Removed drivers/ide/pci/hpt34x.c +Merge made by recursive. + arch/arm/mach-sa1100/include/mach/ide.h | 75 --- + arch/parisc/include/asm/ide.h | 4 - + drivers/ide/Kconfig | 94 ++--- + drivers/ide/Makefile | 19 +- + drivers/ide/ide-atapi.c | 2 +- + drivers/ide/ide-cd.c | 61 ++- + drivers/ide/ide-cd_ioctl.c | 8 +- + drivers/ide/ide-disk.c | 382 +++------------- + drivers/ide/ide-disk.h | 21 +- + drivers/ide/ide-disk_ioctl.c | 4 +- + drivers/ide/ide-disk_proc.c | 2 +- + drivers/ide/ide-dma-sff.c | 2 +- + drivers/ide/ide-floppy.c | 357 ++------------- + drivers/ide/ide-floppy.h | 41 +-- + drivers/ide/ide-floppy_ioctl.c | 23 +- + drivers/ide/ide-floppy_proc.c | 2 +- + drivers/ide/ide-gd.c | 398 ++++++++++++++++ + drivers/ide/ide-gd.h | 44 ++ + drivers/ide/ide-iops.c | 2 +- + drivers/ide/ide-probe.c | 1 + + drivers/ide/ide-proc.c | 6 +- + drivers/ide/ide-tape.c | 16 +- + drivers/ide/mips/Makefile | 1 + + drivers/ide/mips/tx4939ide.c | 775 +++++++++++++++++++++++++++++++ + drivers/ide/pci/Makefile | 1 - + drivers/ide/pci/delkin_cb.c | 63 +++- + drivers/ide/pci/hpt34x.c | 193 -------- + drivers/ide/pci/hpt366.c | 35 +- + drivers/ide/pci/scc_pata.c | 4 - + drivers/ide/pci/sgiioc4.c | 49 +-- + drivers/leds/Kconfig | 2 +- + drivers/scsi/ide-scsi.c | 26 +- + include/asm-frv/ide.h | 10 +- + include/asm-m68k/ide.h | 9 - + include/linux/ide.h | 36 +- + 35 files changed, 1597 insertions(+), 1171 deletions(-) + delete mode 100644 arch/arm/mach-sa1100/include/mach/ide.h + create mode 100644 drivers/ide/ide-gd.c + create mode 100644 drivers/ide/ide-gd.h + create mode 100644 drivers/ide/mips/tx4939ide.c + delete mode 100644 drivers/ide/pci/hpt34x.c +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/inode.c | 207 ++- + fs/xfs/Makefile | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 2 +- + fs/xfs/linux-2.6/xfs_iops.c | 19 +- + fs/xfs/linux-2.6/xfs_stats.c | 4 + + fs/xfs/linux-2.6/xfs_stats.h | 65 + + fs/xfs/linux-2.6/xfs_super.c | 351 ++--- + fs/xfs/linux-2.6/xfs_super.h | 3 - + fs/xfs/linux-2.6/xfs_sync.c | 802 +++++++++ + fs/xfs/linux-2.6/xfs_sync.h | 55 + + fs/xfs/linux-2.6/xfs_vfs.h | 31 - + fs/xfs/linux-2.6/xfs_vnode.c | 15 +- + fs/xfs/linux-2.6/xfs_vnode.h | 5 - + fs/xfs/quota/xfs_dquot.c | 39 +- + fs/xfs/quota/xfs_dquot.h | 4 +- + fs/xfs/quota/xfs_dquot_item.c | 45 +- + fs/xfs/quota/xfs_qm.c | 12 +- + fs/xfs/quota/xfs_qm.h | 1 - + fs/xfs/quota/xfs_qm_syscalls.c | 137 +- + fs/xfs/support/debug.c | 2 +- + fs/xfs/xfs.h | 2 +- + fs/xfs/xfs_ag.h | 10 +- + fs/xfs/xfs_alloc.c | 195 ++- + fs/xfs/xfs_alloc.h | 27 +- + fs/xfs/xfs_alloc_btree.c | 2387 ++++----------------------- + fs/xfs/xfs_alloc_btree.h | 107 +- + fs/xfs/xfs_arch.h | 39 +- + fs/xfs/xfs_bit.h | 3 +- + fs/xfs/xfs_bmap.c | 296 ++-- + fs/xfs/xfs_bmap.h | 61 +- + fs/xfs/xfs_bmap_btree.c | 2614 ++++++------------------------ + fs/xfs/xfs_bmap_btree.h | 171 +-- + fs/xfs/xfs_btree.c | 3596 +++++++++++++++++++++++++++++++++++----- + fs/xfs/xfs_btree.h | 392 +++-- + fs/xfs/xfs_btree_trace.c | 249 +++ + fs/xfs/xfs_btree_trace.h | 116 ++ + fs/xfs/xfs_buf_item.c | 25 +- + fs/xfs/xfs_da_btree.c | 5 + + fs/xfs/xfs_da_btree.h | 24 +- + fs/xfs/xfs_dinode.h | 5 +- + fs/xfs/xfs_dir2.c | 6 + + fs/xfs/xfs_extfree_item.c | 45 +- + fs/xfs/xfs_fsops.c | 24 +- + fs/xfs/xfs_ialloc.c | 132 ++- + fs/xfs/xfs_ialloc.h | 21 +- + fs/xfs/xfs_ialloc_btree.c | 2193 +++---------------------- + fs/xfs/xfs_ialloc_btree.h | 111 +- + fs/xfs/xfs_iget.c | 483 ++---- + fs/xfs/xfs_imap.h | 2 - + fs/xfs/xfs_inode.c | 266 ++-- + fs/xfs/xfs_inode.h | 269 ++-- + fs/xfs/xfs_inode_item.c | 30 +- + fs/xfs/xfs_inode_item.h | 41 +- + fs/xfs/xfs_itable.c | 26 +- + fs/xfs/xfs_log.c | 10 +- + fs/xfs/xfs_log_priv.h | 1 + + fs/xfs/xfs_log_recover.c | 105 +- + fs/xfs/xfs_mount.c | 47 +- + fs/xfs/xfs_mount.h | 51 +- + fs/xfs/xfs_trans.c | 13 +- + fs/xfs/xfs_trans.h | 322 ++-- + fs/xfs/xfs_trans_ail.c | 362 +++-- + fs/xfs/xfs_trans_buf.c | 7 +- + fs/xfs/xfs_trans_item.c | 10 + + fs/xfs/xfs_trans_priv.h | 98 +- + fs/xfs/xfs_vfsops.c | 616 +------- + fs/xfs/xfs_vfsops.h | 2 - + fs/xfs/xfs_vnodeops.c | 118 +-- + include/linux/fs.h | 2 + + 69 files changed, 7878 insertions(+), 9662 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_sync.c + create mode 100644 fs/xfs/linux-2.6/xfs_sync.h + create mode 100644 fs/xfs/xfs_btree_trace.c + create mode 100644 fs/xfs/xfs_btree_trace.h +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/mad.c | 14 +++++--------- + drivers/infiniband/core/ucma.c | 4 ++-- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 + + drivers/infiniband/hw/ehca/ehca_qp.c | 6 ++++++ + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 +++---- + 5 files changed, 17 insertions(+), 15 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/acpi/boot.c +CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/boot.c +Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged drivers/Makefile +Auto-merged drivers/acpi/Kconfig +CONFLICT (content): Merge conflict in drivers/acpi/Kconfig +Removed drivers/acpi/bay.c +Auto-merged drivers/acpi/scan.c +CONFLICT (content): Merge conflict in drivers/acpi/scan.c +Auto-merged drivers/acpi/toshiba_acpi.c +Auto-merged drivers/cpuidle/cpuidle.c +Auto-merged drivers/misc/Kconfig +Auto-merged drivers/pnp/Makefile +CONFLICT (content): Merge conflict in drivers/pnp/Makefile +Auto-merged drivers/pnp/base.h +Auto-merged drivers/pnp/core.c +Auto-merged drivers/pnp/driver.c +Auto-merged drivers/pnp/isapnp/core.c +Auto-merged drivers/pnp/pnpacpi/core.c +Auto-merged drivers/pnp/pnpbios/core.c +Auto-merged drivers/pnp/quirks.c +CONFLICT (content): Merge conflict in drivers/pnp/quirks.c +Auto-merged drivers/pnp/resource.c +Auto-merged include/acpi/acmacros.h +Auto-merged include/asm-x86/idle.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/pci_ids.h +Auto-merged include/linux/pnp.h +Recorded preimage for 'drivers/pnp/quirks.c' +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/acpi/Kconfig' using previous resolution. +Resolved 'drivers/acpi/scan.c' using previous resolution. +Resolved 'drivers/pnp/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/acpi/boot.c'. +Recorded resolution for 'drivers/pnp/quirks.c'. +Created commit 4931dc1: Merge commit 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 61 ++- + Documentation/laptops/acer-wmi.txt | 28 +- + MAINTAINERS | 15 +- + arch/ia64/sn/kernel/io_acpi_init.c | 8 +- + arch/x86/Kconfig | 5 + + arch/x86/kernel/acpi/boot.c | 3 + + arch/x86/kernel/acpi/sleep.c | 4 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 + + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 42 +- + arch/x86/kernel/process_64.c | 7 + + drivers/Makefile | 1 + + drivers/acpi/Kconfig | 11 +- + drivers/acpi/Makefile | 1 - + drivers/acpi/ac.c | 4 +- + drivers/acpi/acpi_memhotplug.c | 11 +- + drivers/acpi/asus_acpi.c | 227 ++++---- + drivers/acpi/battery.c | 2 +- + drivers/acpi/bay.c | 411 --------------- + drivers/acpi/bus.c | 78 +++- + drivers/acpi/button.c | 6 +- + drivers/acpi/cm_sbs.c | 6 +- + drivers/acpi/container.c | 4 +- + drivers/acpi/dock.c | 388 +++++++++++---- + drivers/acpi/ec.c | 400 ++++++++------- + drivers/acpi/executer/exconfig.c | 116 +++-- + drivers/acpi/fan.c | 6 +- + drivers/acpi/hardware/hwsleep.c | 44 +- + drivers/acpi/namespace/nsxfeval.c | 79 +++ + drivers/acpi/namespace/nsxfname.c | 5 + + drivers/acpi/numa.c | 2 +- + drivers/acpi/osl.c | 54 ++- + drivers/acpi/parser/psloop.c | 2 + + drivers/acpi/pci_link.c | 6 +- + drivers/acpi/pci_root.c | 4 +- + drivers/acpi/pci_slot.c | 10 +- + drivers/acpi/power.c | 74 ++- + drivers/acpi/processor_core.c | 6 +- + drivers/acpi/processor_idle.c | 1 + + drivers/acpi/processor_perflib.c | 37 +- + drivers/acpi/processor_throttling.c | 19 +- + drivers/acpi/reboot.c | 25 +- + drivers/acpi/sbs.c | 2 +- + drivers/acpi/sbshc.c | 6 +- + drivers/acpi/scan.c | 91 ++-- + drivers/acpi/sleep/main.c | 61 +++- + drivers/acpi/system.c | 4 +- + drivers/acpi/tables/tbfadt.c | 32 +- + drivers/acpi/tables/tbinstal.c | 61 ++- + drivers/acpi/thermal.c | 57 ++- + drivers/acpi/toshiba_acpi.c | 2 +- + drivers/acpi/utilities/utglobal.c | 44 ++- + drivers/acpi/utilities/utobject.c | 8 +- + drivers/acpi/utilities/utxface.c | 7 +- + drivers/acpi/utils.c | 4 +- + drivers/acpi/video.c | 59 +-- + drivers/acpi/wmi.c | 49 ++- + drivers/ata/libata-acpi.c | 135 ++---- + drivers/cpuidle/cpuidle.c | 9 +- + drivers/dma/ioat_dma.c | 3 + + drivers/idle/Kconfig | 16 + + drivers/idle/Makefile | 2 + + drivers/idle/i7300_idle.c | 674 ++++++++++++++++++++++++ + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 1 + + drivers/misc/acer-wmi.c | 225 +++++--- + drivers/misc/asus-laptop.c | 15 +- + drivers/misc/eeepc-laptop.c | 232 ++++++++- + drivers/misc/fujitsu-laptop.c | 135 +++--- + drivers/misc/intel_menlow.c | 29 +- + drivers/misc/panasonic-laptop.c | 767 ++++++++++++++++++++++++++++ + drivers/misc/sony-laptop.c | 2 +- + drivers/misc/thinkpad_acpi.c | 50 ++- + drivers/pci/hotplug/acpiphp_glue.c | 20 +- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/sgi_hotplug.c | 4 +- + drivers/pnp/Kconfig | 20 +- + drivers/pnp/Makefile | 4 - + drivers/pnp/base.h | 10 + + drivers/pnp/core.c | 29 +- + drivers/pnp/driver.c | 4 - + drivers/pnp/isapnp/Makefile | 4 - + drivers/pnp/isapnp/core.c | 12 +- + drivers/pnp/manager.c | 34 +- + drivers/pnp/pnpacpi/Makefile | 4 - + drivers/pnp/pnpacpi/core.c | 16 +- + drivers/pnp/pnpacpi/rsparser.c | 43 +- + drivers/pnp/pnpbios/Makefile | 4 - + drivers/pnp/pnpbios/core.c | 4 +- + drivers/pnp/pnpbios/rsparser.c | 18 +- + drivers/pnp/quirks.c | 5 +- + drivers/pnp/resource.c | 12 +- + drivers/pnp/support.c | 14 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acdisasm.h | 4 + + include/acpi/acmacros.h | 253 +++++----- + include/acpi/acpi_bus.h | 11 +- + include/acpi/acpi_drivers.h | 11 +- + include/acpi/acpiosxf.h | 3 + + include/acpi/actbl1.h | 51 ++- + include/acpi/actypes.h | 3 +- + include/acpi/acutils.h | 4 +- + include/acpi/platform/aclinux.h | 6 + + include/asm-x86/idle.h | 1 + + include/linux/acpi.h | 8 - + include/linux/kernel.h | 24 + + include/linux/pci_ids.h | 1 + + include/linux/pnp.h | 10 - + 107 files changed, 3919 insertions(+), 1746 deletions(-) + delete mode 100644 drivers/acpi/bay.c + create mode 100644 drivers/idle/Kconfig + create mode 100644 drivers/idle/Makefile + create mode 100644 drivers/idle/i7300_idle.c + create mode 100644 drivers/misc/panasonic-laptop.c +$ git am -3 ../patches/0001-acpi-merge-fix-for-dpulicate-acpi_mcfg_64bit_base_a.patch +Applying acpi: merge fix for dpulicate acpi_mcfg_64bit_base_addr +$ git reset HEAD^ +arch/x86/kernel/acpi/boot.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit 2a4661c: Merge commit 'acpi/test' +$ git am -3 ../patches/0001-acpi-acpi_os_hotplug_execute-needs-to-be-exported.patch +Applying acpi: acpi_os_hotplug_execute needs to be exported +$ git reset HEAD^ +drivers/acpi/osl.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit 14eb35e: Merge commit 'acpi/test' +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-cdev.c | 36 ++++++++----------- + drivers/firewire/fw-device.c | 3 ++ + drivers/firewire/fw-device.h | 4 ++ + drivers/firewire/fw-ohci.c | 73 ++++++++++++++++++------------------- + drivers/firewire/fw-sbp2.c | 3 +- + drivers/firewire/fw-transaction.h | 2 +- + 6 files changed, 60 insertions(+), 61 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/cdev.c | 6 +----- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/vtbl.c | 4 ++-- + 3 files changed, 4 insertions(+), 8 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/ia64/kvm/kvm-ia64.c +Auto-merged arch/x86/kvm/i8254.c +Auto-merged arch/x86/kvm/lapic.c +Merge made by recursive. + arch/ia64/include/asm/kvm_host.h | 6 +- + arch/ia64/kvm/Makefile | 3 +- + arch/ia64/kvm/kvm-ia64.c | 80 +++++----- + arch/ia64/kvm/kvm_fw.c | 9 +- + arch/ia64/kvm/process.c | 2 +- + arch/x86/kernel/cpu/mtrr/generic.c | 12 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 18 +-- + arch/x86/kvm/i8254.c | 26 +++- + arch/x86/kvm/i8254.h | 1 + + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/lapic.c | 35 ++++- + arch/x86/kvm/mmu.c | 122 ++++++++++++++- + arch/x86/kvm/svm.c | 6 + + arch/x86/kvm/vmx.c | 315 +++++++++++++++++++++++++----------- + arch/x86/kvm/vmx.h | 12 ++- + arch/x86/kvm/x86.c | 125 +++++++++++++- + arch/x86/kvm/x86_emulate.c | 8 +- + include/asm-x86/kvm_host.h | 22 ++- + include/asm-x86/kvm_x86_emulate.h | 10 +- + include/asm-x86/mtrr.h | 25 +++ + include/linux/kvm.h | 17 ++- + include/linux/kvm_host.h | 7 +- + virt/kvm/ioapic.c | 1 + + virt/kvm/irq_comm.c | 42 +++++- + virt/kvm/kvm_main.c | 12 +- + 26 files changed, 702 insertions(+), 219 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/scsi/ipr.c +Merge made by recursive. + drivers/message/fusion/mptscsih.c | 3 +- + drivers/scsi/3w-9xxx.c | 3 - + drivers/scsi/3w-xxxx.c | 7 +- + drivers/scsi/aic7xxx/aic79xx.reg | 185 +++ + drivers/scsi/aic7xxx/aic79xx_core.c | 15 +- + drivers/scsi/aic7xxx/aic79xx_pci.c | 12 +- + drivers/scsi/aic7xxx/aic79xx_reg.h_shipped | 567 ++------ + drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped | 1723 ---------------------- + drivers/scsi/aic7xxx/aic7xxx.reg | 124 ++ + drivers/scsi/aic7xxx/aic7xxx_core.c | 7 + + drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped | 875 ----------- + drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped | 1165 --------------- + drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 10 + + drivers/scsi/aic7xxx/aicasm/aicasm_scan.l | 1 + + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 3 + + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 3 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 3 + + drivers/scsi/ipr.c | 16 +- + drivers/scsi/scsi_lib.c | 83 +- + drivers/scsi/scsi_netlink.c | 9 +- + drivers/scsi/sd.c | 19 +- + drivers/scsi/sun3x_esp.c | 4 +- + lib/string_helpers.c | 34 +- + 23 files changed, 579 insertions(+), 4292 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/mmap.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Auto-merged drivers/dma/ioat_dma.c +Merge made by recursive. + crypto/async_tx/async_tx.c | 34 +++--- + drivers/dma/Kconfig | 10 +- + drivers/dma/dmatest.c | 7 +- + drivers/dma/fsldma.c | 270 ++++++++++++++----------------------------- + drivers/dma/fsldma.h | 1 + + drivers/dma/ioat_dma.c | 2 - + 6 files changed, 116 insertions(+), 208 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Removed drivers/mtd/maps/ebony.c +Removed drivers/mtd/maps/ocotea.c +Removed drivers/mtd/maps/omap-toto-flash.c +Removed drivers/mtd/maps/walnut.c +Auto-merged drivers/mtd/mtdchar.c +Auto-merged drivers/mtd/mtdpart.c +Removed drivers/mtd/nand/toto.c +Auto-merged fs/Kconfig +Auto-merged include/linux/pci.h +Merge made by recursive. + Documentation/mtd/nand_ecc.txt | 714 +++++++++++++++++ + arch/arm/mach-pxa/include/mach/pxa3xx_nand.h | 44 +- + arch/arm/plat-mxc/include/mach/mxc_nand.h | 27 + + arch/arm/plat-omap/include/mach/onenand.h | 6 +- + drivers/mtd/Kconfig | 5 + + drivers/mtd/chips/Kconfig | 4 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 71 ++- + drivers/mtd/chips/cfi_cmdset_0002.c | 52 ++- + drivers/mtd/chips/cfi_probe.c | 58 +-- + drivers/mtd/chips/cfi_util.c | 66 ++- + drivers/mtd/chips/gen_probe.c | 2 +- + drivers/mtd/cmdlinepart.c | 1 + + drivers/mtd/devices/Kconfig | 21 + + drivers/mtd/devices/m25p80.c | 140 +++-- + drivers/mtd/devices/mtd_dataflash.c | 214 +++++- + drivers/mtd/inftlcore.c | 5 +- + drivers/mtd/maps/Kconfig | 33 +- + drivers/mtd/maps/Makefile | 4 - + drivers/mtd/maps/ebony.c | 163 ---- + drivers/mtd/maps/ocotea.c | 154 ---- + drivers/mtd/maps/omap-toto-flash.c | 133 ---- + drivers/mtd/maps/pci.c | 18 +- + drivers/mtd/maps/physmap_of.c | 3 +- + drivers/mtd/maps/walnut.c | 122 --- + drivers/mtd/mtdchar.c | 4 +- + drivers/mtd/mtdconcat.c | 4 +- + drivers/mtd/mtdoops.c | 42 +- + drivers/mtd/mtdpart.c | 4 +- + drivers/mtd/nand/Kconfig | 42 +- + drivers/mtd/nand/Makefile | 4 +- + drivers/mtd/nand/atmel_nand.c | 58 +-- + drivers/mtd/nand/cs553x_nand.c | 2 + + drivers/mtd/nand/fsl_elbc_nand.c | 3 +- + drivers/mtd/nand/fsl_upm.c | 68 +- + drivers/mtd/nand/gpio.c | 375 +++++++++ + drivers/mtd/nand/mxc_nand.c | 1077 ++++++++++++++++++++++++++ + drivers/mtd/nand/nand_base.c | 16 +- + drivers/mtd/nand/nand_ecc.c | 554 ++++++++++--- + drivers/mtd/nand/nandsim.c | 1 - + drivers/mtd/nand/pxa3xx_nand.c | 147 ++-- + drivers/mtd/nand/sh_flctl.c | 301 +++++++ + drivers/mtd/nand/toto.c | 206 ----- + drivers/mtd/ofpart.c | 1 - + drivers/mtd/onenand/Kconfig | 8 + + drivers/mtd/onenand/Makefile | 1 + + drivers/mtd/onenand/omap2.c | 802 +++++++++++++++++++ + drivers/mtd/onenand/onenand_base.c | 2 +- + drivers/mtd/ssfdc.c | 3 +- + drivers/pci/rom.c | 6 +- + fs/Kconfig | 190 +----- + fs/jffs2/Kconfig | 188 +++++ + fs/jffs2/compr.c | 4 +- + fs/jffs2/dir.c | 2 +- + fs/jffs2/erase.c | 4 +- + fs/jffs2/fs.c | 6 +- + fs/jffs2/nodemgmt.c | 4 + + fs/jffs2/wbuf.c | 5 +- + include/linux/mtd/cfi.h | 9 +- + include/linux/mtd/flashchip.h | 4 + + include/linux/mtd/mtd.h | 4 +- + include/linux/mtd/nand-gpio.h | 19 + + include/linux/mtd/nand.h | 1 + + include/linux/mtd/onenand_regs.h | 2 + + include/linux/mtd/partitions.h | 1 - + include/linux/mtd/sh_flctl.h | 125 +++ + include/linux/pci.h | 2 + + 66 files changed, 4861 insertions(+), 1500 deletions(-) + create mode 100644 Documentation/mtd/nand_ecc.txt + create mode 100644 arch/arm/plat-mxc/include/mach/mxc_nand.h + delete mode 100644 drivers/mtd/maps/ebony.c + delete mode 100644 drivers/mtd/maps/ocotea.c + delete mode 100644 drivers/mtd/maps/omap-toto-flash.c + delete mode 100644 drivers/mtd/maps/walnut.c + create mode 100644 drivers/mtd/nand/gpio.c + create mode 100644 drivers/mtd/nand/mxc_nand.c + create mode 100644 drivers/mtd/nand/sh_flctl.c + delete mode 100644 drivers/mtd/nand/toto.c + create mode 100644 drivers/mtd/onenand/omap2.c + create mode 100644 fs/jffs2/Kconfig + create mode 100644 include/linux/mtd/nand-gpio.h + create mode 100644 include/linux/mtd/sh_flctl.h +$ git revert aaf7ea20000436df3cbb397ccb734ad1e2e5164d +Removed drivers/mtd/nand/gpio.c +Removed include/linux/mtd/nand-gpio.h +Finished one revert. +Created commit 2c510b5: Revert "[MTD] [NAND] GPIO NAND flash driver" + 4 files changed, 0 insertions(+), 401 deletions(-) + delete mode 100644 drivers/mtd/nand/gpio.c + delete mode 100644 include/linux/mtd/nand-gpio.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + crypto/camellia.c | 84 +++++++++------------- + crypto/testmgr.c | 7 ++- + drivers/crypto/hifn_795x.c | 5 ++ + drivers/crypto/talitos.c | 169 ++++++++++++++++++++++++++++---------------- + drivers/crypto/talitos.h | 11 +++- + 5 files changed, 165 insertions(+), 111 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Auto-merged arch/alpha/kernel/osf_sys.c +Auto-merged arch/parisc/hpux/fs.c +Auto-merged drivers/md/dm-table.c +Auto-merged fs/block_dev.c +Auto-merged fs/char_dev.c +Auto-merged fs/compat.c +Auto-merged fs/dcache.c +Auto-merged fs/dquot.c +Auto-merged fs/ecryptfs/main.c +Auto-merged fs/ext2/dir.c +Auto-merged fs/ext2/ext2.h +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/namei.c +CONFLICT (content): Merge conflict in fs/ext4/namei.c +Auto-merged fs/ext4/super.c +Auto-merged fs/fat/inode.c +Auto-merged fs/fuse/inode.c +Auto-merged fs/gfs2/ops_inode.c +Auto-merged fs/jffs2/dir.c +Auto-merged fs/nfs/dir.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged fs/nfsd/nfsctl.c +Auto-merged fs/nfsd/vfs.c +Auto-merged include/linux/fs.h +Auto-merged init/main.c +Auto-merged net/unix/af_unix.c +Resolved 'fs/ext4/namei.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit f446093: Merge commit 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/osf_sys.c | 7 +- + arch/parisc/hpux/fs.c | 5 +- + arch/powerpc/platforms/cell/spufs/syscalls.c | 4 +- + drivers/md/dm-table.c | 21 +--- + fs/block_dev.c | 14 ++-- + fs/char_dev.c | 21 +++-- + fs/compat.c | 22 ++--- + fs/configfs/symlink.c | 16 ++-- + fs/dcache.c | 85 +++++++++--------- + fs/dquot.c | 10 +- + fs/ecryptfs/main.c | 23 ++--- + fs/efs/namei.c | 29 +----- + fs/exportfs/expfs.c | 16 ++-- + fs/ext2/dir.c | 14 ++-- + fs/ext2/ext2.h | 4 +- + fs/ext2/namei.c | 30 ++----- + fs/ext3/namei.c | 84 +++++++---------- + fs/ext3/super.c | 22 ++-- + fs/ext4/namei.c | 14 +--- + fs/ext4/super.c | 22 ++-- + fs/fat/inode.c | 52 ++++------- + fs/fuse/inode.c | 23 ++--- + fs/gfs2/ops_export.c | 33 ++----- + fs/gfs2/ops_inode.c | 2 +- + fs/hpfs/file.c | 2 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/inode.c | 29 ++++-- + fs/hpfs/namei.c | 2 +- + fs/isofs/export.c | 33 +------ + fs/jffs2/dir.c | 4 +- + fs/jffs2/super.c | 48 ++++++++++ + fs/jfs/namei.c | 15 +--- + fs/libfs.c | 26 +----- + fs/namei.c | 75 +++++++-------- + fs/namespace.c | 126 ++++++++++++------------- + fs/nfs/dir.c | 6 +- + fs/nfs/getroot.c | 6 +- + fs/nfsd/export.c | 125 ++++++++++++------------- + fs/nfsd/nfs4recover.c | 50 +++++----- + fs/nfsd/nfs4state.c | 8 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nfsd/vfs.c | 126 ++++++++++++++++++++++--- + fs/ntfs/namei.c | 22 +---- + fs/ocfs2/export.c | 30 +----- + fs/read_write.c | 58 ++++++++---- + fs/readdir.c | 22 ++--- + fs/reiserfs/inode.c | 13 +-- + fs/reiserfs/namei.c | 11 +-- + fs/reiserfs/super.c | 18 ++-- + fs/super.c | 15 +-- + fs/udf/namei.c | 17 +--- + fs/xfs/linux-2.6/xfs_export.c | 32 +------ + fs/xfs/linux-2.6/xfs_file.c | 128 -------------------------- + fs/xfs/linux-2.6/xfs_ioctl.c | 3 +- + include/linux/dcache.h | 2 +- + include/linux/fs.h | 1 - + include/linux/namei.h | 7 +- + init/main.c | 1 - + kernel/audit_tree.c | 48 +++++----- + net/unix/af_unix.c | 18 ++-- + 60 files changed, 724 insertions(+), 986 deletions(-) +$ git am -3 ../patches/0001-vfs-fix-up-merge-of-ext4.patch +Applying vfs: fix up merge of ext4 +$ git reset HEAD^ +fs/ext4/super.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit 33ff22c: Merge commit 'vfs/for-next' +Applying vfs/xfs: fallout from i_vnode change +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/core/pcm_misc.c | 1 + + sound/drivers/dummy.c | 2 +- + sound/pci/ca0106/ca0106_main.c | 1 - + 3 files changed, 2 insertions(+), 2 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Removed net/9p/conv.c +Removed net/9p/fcprint.c +Merge made by recursive. + fs/9p/v9fs.c | 4 +- + fs/9p/v9fs_vfs.h | 6 +- + fs/9p/vfs_addr.c | 5 +- + fs/9p/vfs_dir.c | 60 ++- + fs/9p/vfs_file.c | 93 +++- + fs/9p/vfs_inode.c | 39 +- + fs/9p/vfs_super.c | 6 +- + include/net/9p/9p.h | 119 +--- + include/net/9p/client.h | 124 ++++- + include/net/9p/transport.h | 55 +-- + net/9p/Makefile | 3 +- + net/9p/client.c | 1467 +++++++++++++++++++++++++------------------- + net/9p/conv.c | 1054 ------------------------------- + net/9p/fcprint.c | 366 ----------- + net/9p/mod.c | 1 + + net/9p/protocol.c | 558 +++++++++++++++++ + net/9p/protocol.h | 34 + + net/9p/trans_fd.c | 1431 ++++++++++++++----------------------------- + net/9p/trans_virtio.c | 246 ++------- + net/9p/util.c | 4 + + 20 files changed, 2224 insertions(+), 3451 deletions(-) + delete mode 100644 net/9p/conv.c + delete mode 100644 net/9p/fcprint.c + create mode 100644 net/9p/protocol.c + create mode 100644 net/9p/protocol.h +Merging quilt/rr +$ git merge quilt/rr +Auto-merged drivers/md/md.c +CONFLICT (content): Merge conflict in drivers/md/md.c +Auto-merged drivers/mtd/mtdpart.c +Auto-merged drivers/net/ppp_generic.c +Auto-merged drivers/video/fbmem.c +Auto-merged fs/char_dev.c +Auto-merged fs/exec.c +Auto-merged include/linux/module.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Auto-merged kernel/kmod.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged kernel/panic.c +Auto-merged kernel/workqueue.c +Auto-merged net/decnet/dn_dev.c +Auto-merged net/ipv4/devinet.c +Auto-merged net/netfilter/nfnetlink.c +Resolved 'drivers/md/md.c' using previous resolution. +Resolved 'kernel/module.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 5646fdb: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/lguest/lguest.c | 60 +-------- + arch/x86/lguest/i386_head.S | 15 --- + drivers/lguest/lg.h | 2 +- + drivers/lguest/lguest_user.c | 13 +-- + drivers/lguest/page_tables.c | 61 +++++++++- + drivers/md/md.c | 2 + + drivers/net/virtio_net.c | 21 ++-- + include/linux/module.h | 6 +- + include/linux/moduleparam.h | 25 ++++- + include/linux/workqueue.h | 18 ++-- + init/Kconfig | 6 - + init/main.c | 12 +-- + kernel/module.c | 240 ++++++++++++++++-------------------- + kernel/panic.c | 17 +-- + kernel/params.c | 274 ++++++++++++++++++++++------------------- + kernel/stop_machine.c | 111 ++++++----------- + kernel/workqueue.c | 7 +- + 17 files changed, 426 insertions(+), 464 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/README | 3 +++ + fs/cifs/connect.c | 53 ++++++++++++++++++++++++----------------------------- + fs/cifs/inode.c | 15 ++++++++++----- + 3 files changed, 37 insertions(+), 34 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/ops_dentry.h +Auto-merged fs/gfs2/ops_export.c +Removed fs/gfs2/ops_fstype.h +Auto-merged fs/gfs2/ops_inode.c +Removed fs/gfs2/ops_inode.h +Removed fs/gfs2/ops_super.h +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/gfs2/inode.c | 1 - + fs/gfs2/inode.h | 11 +++++++++++ + fs/gfs2/main.c | 2 +- + fs/gfs2/ops_address.c | 16 +++++++--------- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 ----------------- + fs/gfs2/ops_export.c | 3 +-- + fs/gfs2/ops_file.c | 1 - + fs/gfs2/ops_fstype.c | 3 --- + fs/gfs2/ops_fstype.h | 19 ------------------- + fs/gfs2/ops_inode.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- + fs/gfs2/ops_inode.h | 25 ------------------------- + fs/gfs2/ops_super.c | 8 ++++---- + fs/gfs2/ops_super.h | 17 ----------------- + fs/gfs2/super.h | 8 ++++++++ + fs/ioctl.c | 44 ++++++++++++++++++++++++++++++++++---------- + include/linux/fs.h | 3 +++ + 17 files changed, 117 insertions(+), 112 deletions(-) + delete mode 100644 fs/gfs2/ops_dentry.h + delete mode 100644 fs/gfs2/ops_fstype.h + delete mode 100644 fs/gfs2/ops_inode.h + delete mode 100644 fs/gfs2/ops_super.h +Merging input/next +$ git merge input/next +Already up-to-date. +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged arch/arm/mach-lh7a40x/clocks.c +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged include/net/bluetooth/hci_core.h +Auto-merged net/9p/trans_virtio.c +CONFLICT (content): Merge conflict in net/9p/trans_virtio.c +Auto-merged net/bluetooth/hci_core.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Resolved 'net/9p/trans_virtio.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ab264f1: Merge commit 'semaphore-removal/semaphore-removal' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- + drivers/net/bonding/bond_main.c | 21 +++++++++++---------- + drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- + drivers/net/ppp_async.c | 8 ++++---- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- + include/net/bluetooth/hci_core.h | 7 ++++--- + net/9p/trans_virtio.c | 21 +++++++++++---------- + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- + 11 files changed, 69 insertions(+), 63 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged drivers/uio/uio.c +Merge made by recursive. + drivers/uio/uio.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) +Merging trivial/next +$ git merge trivial/next +Auto-merged Documentation/edac.txt +CONFLICT (content): Merge conflict in Documentation/edac.txt +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/base/sys.c +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/net/spider_net.c +Auto-merged drivers/serial/mpc52xx_uart.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/ntfs/aops.c +Auto-merged fs/proc/nommu.c +Auto-merged include/linux/securebits.h +CONFLICT (content): Merge conflict in include/linux/securebits.h +Auto-merged mm/migrate.c +Auto-merged mm/slub.c +Auto-merged net/wireless/wext.c +Resolved 'Documentation/edac.txt' using previous resolution. +Resolved 'include/linux/securebits.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 7b9642b: Merge commit 'trivial/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/hfs.txt | 2 +- + Documentation/ja_JP/SubmittingPatches | 4 ++-- + Documentation/zh_CN/SubmittingPatches | 4 ++-- + arch/mips/kernel/vpe.c | 2 +- + arch/sh/lib64/c-checksum.c | 4 ++-- + drivers/base/sys.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/net/spider_net.c | 2 +- + drivers/serial/mpc52xx_uart.c | 4 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/proc/nommu.c | 2 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 19 files changed, 24 insertions(+), 24 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merged fs/ubifs/super.c +Merge made by recursive. + Documentation/filesystems/ubifs.txt | 9 + + fs/ubifs/budget.c | 26 ++-- + fs/ubifs/compress.c | 2 - + fs/ubifs/debug.c | 79 +++++++-- + fs/ubifs/debug.h | 6 + + fs/ubifs/file.c | 260 ++++++++++++++++++++++++++ + fs/ubifs/find.c | 4 +- + fs/ubifs/gc.c | 90 ++++++++-- + fs/ubifs/io.c | 12 +- + fs/ubifs/key.h | 22 ++- + fs/ubifs/lprops.c | 34 +---- + fs/ubifs/lpt.c | 48 ++++- + fs/ubifs/lpt_commit.c | 187 ++++++++++++++++++- + fs/ubifs/misc.h | 27 +++ + fs/ubifs/scan.c | 2 +- + fs/ubifs/super.c | 109 +++++++++-- + fs/ubifs/tnc.c | 345 ++++++++++++++++++++++++++++++++--- + fs/ubifs/tnc_misc.c | 4 +- + fs/ubifs/ubifs-media.h | 1 - + fs/ubifs/ubifs.h | 85 +++++++-- + fs/ubifs/xattr.c | 2 +- + 21 files changed, 1187 insertions(+), 167 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Auto-merged drivers/media/dvb/ttpci/av7110.c +Removed drivers/media/dvb/ttpci/fdump.c +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Auto-merged drivers/scsi/qlogicpti.c +CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Auto-merged sound/isa/Kconfig +Auto-merged sound/isa/wavefront/wavefront_fx.c +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/scsi/qlogicpti.c' using previous resolution. +Resolved 'firmware/WHENCE' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 309f42c: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 789 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +----- + drivers/scsi/ql1040_fw.h | 2130 ------- + drivers/scsi/ql12160_fw.h | 1811 ------ + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 20 + + firmware/WHENCE | 121 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 + + firmware/advansys/38C0800.bin.ihex | 336 + + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 +++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 --------- + 49 files changed, 20560 insertions(+), 22498 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Merge made by recursive. + drivers/bluetooth/bluecard_cs.c | 2 +- + drivers/bluetooth/bt3c_cs.c | 6 ++++-- + drivers/bluetooth/btuart_cs.c | 6 ++++-- + drivers/bluetooth/dtl1_cs.c | 7 +++++-- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/parport/parport_cs.c | 2 +- + drivers/pcmcia/pcmcia_resource.c | 3 ++- + drivers/scsi/fdomain.c | 2 ++ + 8 files changed, 20 insertions(+), 10 deletions(-) +Merging battery/master +$ git merge battery/master +Merge made by recursive. + drivers/power/Kconfig | 8 +- + drivers/power/Makefile | 3 +- + drivers/power/bq27x00_battery.c | 381 +++++++++++++++++++++++++++++++++++++ + drivers/power/pda_power.c | 11 +- + drivers/power/power_supply_core.c | 25 +++ + include/linux/power_supply.h | 6 + + 6 files changed, 428 insertions(+), 6 deletions(-) + create mode 100644 drivers/power/bq27x00_battery.c +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merged drivers/leds/Kconfig +Merge made by recursive. + drivers/leds/Kconfig | 16 ++++ + drivers/leds/Makefile | 2 + + drivers/leds/leds-da903x.c | 175 ++++++++++++++++++++++++++++++++++++++ + drivers/leds/ledtrig-backlight.c | 110 ++++++++++++++++++++++++ + include/linux/leds.h | 4 +- + 5 files changed, 305 insertions(+), 2 deletions(-) + create mode 100644 drivers/leds/leds-da903x.c + create mode 100644 drivers/leds/ledtrig-backlight.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Auto-merged drivers/leds/led-class.c +Merge made by recursive. + arch/arm/mach-pxa/include/mach/tosa.h | 3 + + arch/arm/mach-pxa/tosa.c | 21 +++- + drivers/leds/led-class.c | 5 +- + drivers/leds/leds-wrap.c | 5 +- + drivers/leds/ledtrig-timer.c | 8 +- + drivers/video/backlight/Kconfig | 25 +++ + drivers/video/backlight/Makefile | 4 + + drivers/video/backlight/da903x.c | 201 +++++++++++++++++++++++ + drivers/video/backlight/tosa_bl.c | 198 +++++++++++++++++++++++ + drivers/video/backlight/tosa_lcd.c | 280 +++++++++++++++++++++++++++++++++ + 10 files changed, 737 insertions(+), 13 deletions(-) + create mode 100644 drivers/video/backlight/da903x.c + create mode 100644 drivers/video/backlight/tosa_bl.c + create mode 100644 drivers/video/backlight/tosa_lcd.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + drivers/serial/serial_txx9.c | 113 ++++++++++++++++++++++++++++++++++-------- + 1 files changed, 92 insertions(+), 21 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged init/main.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/slob.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++++ + Documentation/kernel-parameters.txt | 10 + + Documentation/vm/kmemtrace.txt | 126 ++++++++++ + MAINTAINERS | 6 + + include/linux/kmemtrace.h | 86 +++++++ + include/linux/slab.h | 8 +- + include/linux/slab_def.h | 68 +++++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 53 ++++- + init/main.c | 2 + + kernel/relay.c | 7 +- + lib/Kconfig.debug | 20 ++ + mm/Makefile | 2 +- + mm/kmemtrace.c | 333 +++++++++++++++++++++++++++ + mm/slab.c | 79 ++++++- + mm/slob.c | 37 +++- + mm/slub.c | 123 ++++++++--- + 17 files changed, 969 insertions(+), 71 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/linux/kmemtrace.h + create mode 100644 mm/kmemtrace.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged include/asm-x86/pgtable.h +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/slab.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Auto-merged mm/slab.c +CONFLICT (content): Merge conflict in mm/slab.c +Auto-merged mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'init/main.c' using previous resolution. +Resolved 'mm/Makefile' using previous resolution. +Resolved 'mm/slab.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 1f84852: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 135 +++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 87 +++++ + arch/x86/Makefile | 5 + + arch/x86/kernel/cpu/common.c | 11 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 756 +++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 ++ + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/asm-x86/dma-mapping.h | 2 + + include/asm-x86/kmemcheck.h | 42 ++ + include/asm-x86/pgtable.h | 4 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/pgtable_64.h | 6 + + include/asm-x86/string_32.h | 8 + + include/asm-x86/string_64.h | 8 + + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 +++++ + include/linux/mm_types.h | 4 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 26 +- + mm/Makefile | 1 + + mm/kmemcheck.c | 111 ++++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 2012 insertions(+), 109 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merged arch/arm/mach-pxa/include/mach/tosa.h +Auto-merged arch/arm/mach-pxa/tosa.c +Merge made by recursive. + arch/arm/mach-pxa/include/mach/tosa.h | 2 - + arch/arm/mach-pxa/tosa.c | 37 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/mfd/Kconfig | 16 + + drivers/mfd/Makefile | 2 + + drivers/mfd/da903x.c | 563 ++++++++++++++++ + drivers/mfd/htc-egpio.c | 2 +- + drivers/mfd/mfd-core.c | 15 +- + drivers/mfd/sm501.c | 6 +- + drivers/mfd/t7l66xb.c | 40 +- + drivers/mfd/tc6387xb.c | 47 +- + drivers/mfd/tc6393xb.c | 296 +++++++-- + drivers/mfd/twl4030-core.c | 1193 +++++++++++++++++++++++++++++++++ + include/linux/i2c/twl4030.h | 339 ++++++++++ + include/linux/mfd/da903x.h | 201 ++++++ + include/linux/mfd/t7l66xb.h | 2 - + include/linux/mfd/tc6387xb.h | 3 - + include/linux/mfd/tc6393xb.h | 17 +- + 18 files changed, 2686 insertions(+), 97 deletions(-) + create mode 100644 drivers/mfd/da903x.c + create mode 100644 drivers/mfd/twl4030-core.c + create mode 100644 include/linux/i2c/twl4030.h + create mode 100644 include/linux/mfd/da903x.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Removed Documentation/DocBook/wanbook.tmpl +Removed drivers/net/wan/syncppp.c +Removed include/net/syncppp.h +Merge made by recursive. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/networking.tmpl | 3 - + Documentation/DocBook/wanbook.tmpl | 99 -- + Documentation/networking/generic-hdlc.txt | 8 +- + drivers/net/wan/Makefile | 2 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/{hd6457x.c => hd64570.c} | 254 ++---- + drivers/net/wan/hd64572.c | 641 +++++++++++++ + drivers/net/wan/hdlc_fr.c | 10 +- + drivers/net/wan/hdlc_ppp.c | 648 ++++++++++++- + drivers/net/wan/n2.c | 9 +- + drivers/net/wan/pc300_drv.c | 17 +- + drivers/net/wan/pc300too.c | 73 +- + drivers/net/wan/pci200syn.c | 77 +- + drivers/net/wan/syncppp.c | 1479 ----------------------------- + include/linux/hdlc.h | 2 +- + include/net/syncppp.h | 102 -- + 17 files changed, 1372 insertions(+), 2060 deletions(-) + delete mode 100644 Documentation/DocBook/wanbook.tmpl + rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) + create mode 100644 drivers/net/wan/hd64572.c + delete mode 100644 drivers/net/wan/syncppp.c + delete mode 100644 include/net/syncppp.h +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-linus +$ git merge voltage/for-linus +Auto-merged drivers/Kconfig +Merge made by recursive. + drivers/Kconfig | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged include/linux/pci_ids.h +Merge made by recursive. + Documentation/filesystems/devpts.txt | 132 ++++++ + drivers/char/Kconfig | 11 + + drivers/char/epca.c | 6 +- + drivers/char/n_tty.c | 741 +++++++++++++++++++++++++++------- + drivers/char/pty.c | 54 +++- + drivers/char/tty_io.c | 37 +- + drivers/char/vt.c | 16 +- + drivers/parport/parport_pc.c | 20 +- + drivers/serial/8250_pci.c | 231 +++++++++++ + drivers/serial/bfin_5xx.c | 239 ++++++----- + fs/devpts/inode.c | 472 +++++++++++++++++++--- + include/linux/pci_ids.h | 8 + + include/linux/tty.h | 9 +- + include/linux/tty_driver.h | 6 +- + 14 files changed, 1626 insertions(+), 356 deletions(-) + create mode 100644 Documentation/filesystems/devpts.txt +$ git revert fd13cafdcc95c68e9ea3af4ea1d629abeac55638 +Finished one revert. +Created commit c4052e6: Revert "8250-oxsemi-mainpine" + 1 files changed, 5 insertions(+), 25 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging creds/next-creds-subsys +$ git merge creds/next-creds-subsys +Auto-merged arch/ia64/ia32/sys_ia32.c +Auto-merged arch/ia64/kernel/perfmon.c +Auto-merged arch/ia64/kernel/signal.c +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/x86/mm/fault.c +Auto-merged drivers/gpu/drm/drm_fops.c +Auto-merged drivers/usb/core/devio.c +Auto-merged drivers/usb/core/inode.c +Auto-merged fs/9p/vfs_inode.c +Auto-merged fs/9p/vfs_super.c +Auto-merged fs/binfmt_elf.c +Auto-merged fs/cifs/connect.c +Auto-merged fs/cifs/inode.c +Auto-merged fs/compat.c +Auto-merged fs/devpts/inode.c +CONFLICT (content): Merge conflict in fs/devpts/inode.c +Auto-merged fs/dquot.c +Auto-merged fs/ecryptfs/main.c +Auto-merged fs/exec.c +Auto-merged fs/exportfs/expfs.c +Auto-merged fs/ext4/balloc.c +Auto-merged fs/fat/inode.c +Auto-merged fs/gfs2/inode.c +Auto-merged fs/hpfs/namei.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/namei.c +Auto-merged fs/namespace.c +CONFLICT (content): Merge conflict in fs/namespace.c +Auto-merged fs/nfsd/nfs4recover.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c +Auto-merged fs/nfsd/vfs.c +Auto-merged fs/proc/array.c +Auto-merged fs/reiserfs/namei.c +Auto-merged fs/ubifs/budget.c +Auto-merged fs/udf/namei.c +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/xfs_inode.h +Auto-merged include/linux/fs.h +Auto-merged include/linux/init_task.h +Removed include/linux/key-ui.h +Auto-merged include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/Makefile +Auto-merged kernel/exit.c +CONFLICT (content): Merge conflict in kernel/exit.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/futex.c +Auto-merged kernel/kmod.c +Auto-merged kernel/sched.c +Auto-merged kernel/signal.c +CONFLICT (content): Merge conflict in kernel/signal.c +Auto-merged kernel/sys.c +Auto-merged kernel/sysctl.c +Auto-merged kernel/timer.c +Auto-merged kernel/trace/trace.c +Auto-merged kernel/workqueue.c +Auto-merged lib/Makefile +Auto-merged mm/migrate.c +Auto-merged mm/shmem.c +Auto-merged net/9p/client.c +CONFLICT (content): Merge conflict in net/9p/client.c +Auto-merged net/core/dev.c +Auto-merged net/socket.c +Auto-merged net/sunrpc/auth.c +Auto-merged net/unix/af_unix.c +Auto-merged security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Recorded preimage for 'fs/devpts/inode.c' +Resolved 'fs/namespace.c' using previous resolution. +Resolved 'fs/nfsd/nfs4recover.c' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Resolved 'kernel/exit.c' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Resolved 'kernel/signal.c' using previous resolution. +Resolved 'net/9p/client.c' using previous resolution. +Resolved 'security/selinux/hooks.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/devpts/inode.c'. +Created commit c721810: Merge commit 'creds/next-creds-subsys' +$ git diff -M --stat --summary HEAD^.. + Documentation/credentials.txt | 582 +++++++++++++ + arch/alpha/kernel/asm-offsets.c | 11 +- + arch/alpha/kernel/entry.S | 10 +- + arch/ia64/ia32/sys_ia32.c | 7 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/perfmon.c | 43 +- + arch/ia64/kernel/signal.c | 4 +- + arch/mips/kernel/kspd.c | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 5 +- + arch/mips/kernel/vpe.c | 4 +- + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 8 +- + arch/s390/hypfs/inode.c | 4 +- + arch/s390/kernel/compat_linux.c | 28 +- + arch/um/drivers/mconsole_kern.c | 3 +- + arch/x86/ia32/ia32_aout.c | 2 +- + arch/x86/mm/fault.c | 2 +- + drivers/block/loop.c | 6 +- + drivers/char/tty_audit.c | 6 +- + drivers/connector/cn_proc.c | 16 +- + drivers/isdn/capi/capifs.c | 4 +- + drivers/isdn/hysdn/hysdn_procconf.c | 6 +- + drivers/net/tun.c | 8 +- + drivers/usb/core/devio.c | 10 +- + drivers/usb/core/inode.c | 4 +- + fs/9p/fid.c | 2 +- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_super.c | 4 +- + fs/affs/inode.c | 4 +- + fs/affs/super.c | 4 +- + fs/anon_inodes.c | 4 +- + fs/attr.c | 4 +- + fs/autofs/inode.c | 4 +- + fs/autofs4/dev-ioctl.c | 3 +- + fs/autofs4/inode.c | 4 +- + fs/autofs4/waitq.c | 4 +- + fs/bfs/dir.c | 4 +- + fs/binfmt_aout.c | 2 +- + fs/binfmt_elf.c | 20 +- + fs/binfmt_elf_fdpic.c | 19 +- + fs/binfmt_flat.c | 2 +- + fs/binfmt_som.c | 2 +- + fs/cifs/cifs_fs_sb.h | 2 +- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 4 +- + fs/cifs/dir.c | 12 +- + fs/cifs/inode.c | 8 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/misc.c | 4 +- + fs/coda/cache.c | 6 +- + fs/coda/file.c | 2 +- + fs/coda/upcall.c | 2 +- + fs/compat.c | 42 +- + fs/devpts/inode.c | 4 +- + fs/dquot.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 3 +- + fs/ecryptfs/kthread.c | 9 +- + fs/ecryptfs/main.c | 3 +- + fs/ecryptfs/messaging.c | 18 +- + fs/ecryptfs/miscdev.c | 20 +- + fs/exec.c | 183 +++-- + fs/exportfs/expfs.c | 4 +- + fs/ext2/balloc.c | 2 +- + fs/ext2/ialloc.c | 4 +- + fs/ext3/balloc.c | 2 +- + fs/ext3/ialloc.c | 4 +- + fs/ext4/balloc.c | 5 +- + fs/ext4/ialloc.c | 4 +- + fs/fat/file.c | 2 +- + fs/fat/inode.c | 4 +- + fs/fcntl.c | 18 +- + fs/file_table.c | 10 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 25 +- + fs/gfs2/inode.c | 10 +- + fs/hfs/inode.c | 4 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/inode.c | 4 +- + fs/hfsplus/options.c | 4 +- + fs/hpfs/namei.c | 24 +- + fs/hpfs/super.c | 4 +- + fs/hppfs/hppfs.c | 6 +- + fs/hugetlbfs/inode.c | 21 +- + fs/inotify_user.c | 2 +- + fs/internal.h | 6 + + fs/ioprio.c | 18 +- + fs/jfs/jfs_inode.c | 4 +- + fs/locks.c | 2 +- + fs/minix/bitmap.c | 4 +- + fs/namei.c | 10 +- + fs/namespace.c | 2 +- + fs/ncpfs/ioctl.c | 91 +-- + fs/nfsctl.c | 3 +- + fs/nfsd/auth.c | 95 ++- + fs/nfsd/nfs4recover.c | 71 +- + fs/nfsd/nfsfh.c | 11 +- + fs/nfsd/vfs.c | 9 +- + fs/ocfs2/dlm/dlmfs.c | 8 +- + fs/ocfs2/namei.c | 4 +- + fs/omfs/inode.c | 8 +- + fs/open.c | 59 +- + fs/pipe.c | 4 +- + fs/posix_acl.c | 4 +- + fs/proc/array.c | 32 +- + fs/proc/base.c | 32 +- + fs/quota.c | 4 +- + fs/ramfs/inode.c | 4 +- + fs/reiserfs/namei.c | 4 +- + fs/smbfs/dir.c | 3 +- + fs/smbfs/inode.c | 2 +- + fs/smbfs/proc.c | 2 +- + fs/sysv/ialloc.c | 4 +- + fs/ubifs/budget.c | 2 +- + fs/ubifs/dir.c | 4 +- + fs/udf/ialloc.c | 4 +- + fs/udf/namei.c | 2 +- + fs/ufs/ialloc.c | 4 +- + fs/xfs/linux-2.6/xfs_cred.h | 6 +- + fs/xfs/linux-2.6/xfs_globals.h | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 5 +- + fs/xfs/xfs_acl.c | 6 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_vnodeops.h | 10 +- + include/keys/keyring-type.h | 31 + + include/linux/binfmts.h | 16 +- + include/linux/capability.h | 2 - + include/linux/cred.h | 340 +++++++- + include/linux/fs.h | 8 +- + include/linux/init_task.h | 13 +- + include/linux/key-ui.h | 66 -- + include/linux/key.h | 32 +- + include/linux/keyctl.h | 4 +- + include/linux/sched.h | 64 +-- + include/linux/securebits.h | 2 +- + include/linux/security.h | 326 ++++---- + include/net/scm.h | 4 +- + init/main.c | 1 + + ipc/mqueue.c | 19 +- + ipc/shm.c | 9 +- + ipc/util.c | 18 +- + kernel/Makefile | 2 +- + kernel/acct.c | 7 +- + kernel/auditsc.c | 57 +- + kernel/capability.c | 268 +------ + kernel/cgroup.c | 17 +- + kernel/cred-internals.h | 21 + + kernel/cred.c | 577 +++++++++++++ + kernel/exit.c | 23 +- + kernel/fork.c | 47 +- + kernel/futex.c | 20 +- + kernel/futex_compat.c | 7 +- + kernel/kmod.c | 30 +- + kernel/ptrace.c | 29 +- + kernel/sched.c | 26 +- + kernel/signal.c | 60 +- + kernel/sys.c | 579 ++++++++------ + kernel/sysctl.c | 2 +- + kernel/timer.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/tsacct.c | 6 +- + kernel/uid16.c | 31 +- + kernel/user.c | 37 +- + kernel/user_namespace.c | 14 +- + kernel/workqueue.c | 8 +- + lib/Makefile | 2 +- + lib/is_single_threaded.c | 45 + + mm/mempolicy.c | 9 +- + mm/migrate.c | 9 +- + mm/oom_kill.c | 6 +- + mm/shmem.c | 8 +- + net/9p/client.c | 2 +- + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 2 +- + net/core/dev.c | 8 +- + net/core/scm.c | 10 +- + net/ipv4/netfilter/ipt_LOG.c | 4 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/netfilter/ip6t_LOG.c | 4 +- + net/netfilter/nfnetlink_log.c | 5 +- + net/netfilter/xt_owner.c | 16 +- + net/netrom/af_netrom.c | 4 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/ar-key.c | 6 +- + net/sched/cls_flow.c | 4 +- + net/socket.c | 4 +- + net/sunrpc/auth.c | 14 +- + net/unix/af_unix.c | 11 +- + security/capability.c | 56 +- + security/commoncap.c | 699 ++++++++++------ + security/keys/internal.h | 47 +- + security/keys/key.c | 25 +- + security/keys/keyctl.c | 210 +++-- + security/keys/keyring.c | 15 +- + security/keys/permission.c | 29 +- + security/keys/proc.c | 8 +- + security/keys/process_keys.c | 469 +++++------ + security/keys/request_key.c | 133 ++-- + security/keys/request_key_auth.c | 46 +- + security/root_plug.c | 13 +- + security/security.c | 96 +-- + security/selinux/exports.c | 8 +- + security/selinux/hooks.c | 1151 ++++++++++++++------------ + security/selinux/include/av_perm_to_string.h | 2 + + security/selinux/include/av_permissions.h | 2 + + security/selinux/include/class_to_string.h | 5 + + security/selinux/include/flask.h | 1 + + security/selinux/include/objsec.h | 11 - + security/selinux/selinuxfs.c | 13 +- + security/selinux/xfrm.c | 6 +- + security/smack/smack_access.c | 4 +- + security/smack/smack_lsm.c | 173 +++-- + security/smack/smackfs.c | 6 +- + 213 files changed, 5063 insertions(+), 3100 deletions(-) + create mode 100644 Documentation/credentials.txt + create mode 100644 include/keys/keyring-type.h + delete mode 100644 include/linux/key-ui.h + create mode 100644 kernel/cred-internals.h + create mode 100644 kernel/cred.c + create mode 100644 lib/is_single_threaded.c +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already uptodate! +Merge made by recursive. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Auto-merged drivers/acpi/battery.c +Auto-merged drivers/acpi/button.c +Auto-merged drivers/acpi/thermal.c +Auto-merged drivers/md/Kconfig +CONFLICT (content): Merge conflict in drivers/md/Kconfig +Auto-merged drivers/pci/pci.c +Auto-merged drivers/usb/host/ehci-hcd.c +Auto-merged drivers/usb/host/ohci-hcd.c +Auto-merged drivers/usb/host/uhci-hcd.c +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/init.h +CONFLICT (content): Merge conflict in include/linux/init.h +Auto-merged init/Kconfig +Auto-merged init/do_mounts.c +Auto-merged init/initramfs.c +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged scripts/bootgraph.pl +CONFLICT (add/add): Merge conflict in scripts/bootgraph.pl +Resolved 'drivers/md/Kconfig' using previous resolution. +Resolved 'include/linux/init.h' using previous resolution. +Resolved 'init/main.c' using previous resolution. +Resolved 'scripts/bootgraph.pl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 4c54be7: Merge commit 'fastboot/auto-fastboot-next' +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/battery.c | 2 +- + drivers/acpi/button.c | 2 +- + drivers/acpi/thermal.c | 2 +- + drivers/pci/pci.c | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/uhci-hcd.c | 2 +- + include/asm-generic/vmlinux.lds.h | 6 ++- + include/linux/init.h | 8 ++++ + init/Kconfig | 11 +++++ + init/do_mounts.c | 2 + + init/initramfs.c | 73 ++++++++++++++++++++++++++++------- + init/main.c | 77 +++++++++++++++++++++++++++++++++++- + 13 files changed, 165 insertions(+), 26 deletions(-) +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Already up-to-date. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merged Documentation/ABI/testing/sysfs-bus-usb +CONFLICT (content): Merge conflict in Documentation/ABI/testing/sysfs-bus-usb +Auto-merged MAINTAINERS +Auto-merged arch/arm/Kconfig +Auto-merged arch/h8300/Kconfig +Auto-merged drivers/Kconfig +Auto-merged drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merged drivers/usb/Kconfig +Auto-merged drivers/usb/host/Kconfig +Recorded preimage for 'drivers/Makefile' +Resolved 'Documentation/ABI/testing/sysfs-bus-usb' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/Makefile'. +Created commit 6955699: Merge commit 'uwb/for-upstream' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 11 + + Documentation/ABI/testing/sysfs-bus-umc | 28 + + Documentation/ABI/testing/sysfs-bus-usb | 43 + + Documentation/ABI/testing/sysfs-class-usb_host | 25 + + Documentation/ABI/testing/sysfs-class-uwb_rc | 144 ++ + Documentation/ABI/testing/sysfs-wusb_cbaf | 100 ++ + Documentation/usb/WUSB-Design-overview.txt | 448 ++++++ + Documentation/usb/wusb-cbaf | 139 ++ + MAINTAINERS | 17 + + arch/arm/Kconfig | 2 + + arch/cris/Kconfig | 2 + + arch/h8300/Kconfig | 2 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 3 + + drivers/usb/host/Kconfig | 28 + + drivers/usb/host/Makefile | 3 + + drivers/usb/host/hwa-hc.c | 925 +++++++++++ + drivers/usb/host/whci/Kbuild | 11 + + drivers/usb/host/whci/asl.c | 367 +++++ + drivers/usb/host/whci/hcd.c | 339 ++++ + drivers/usb/host/whci/hw.c | 87 ++ + drivers/usb/host/whci/init.c | 188 +++ + drivers/usb/host/whci/int.c | 95 ++ + drivers/usb/host/whci/pzl.c | 398 +++++ + drivers/usb/host/whci/qset.c | 567 +++++++ + drivers/usb/host/whci/whcd.h | 197 +++ + drivers/usb/host/whci/whci-hc.h | 416 +++++ + drivers/usb/host/whci/wusb.c | 241 +++ + drivers/usb/wusbcore/Kconfig | 41 + + drivers/usb/wusbcore/Makefile | 26 + + drivers/usb/wusbcore/cbaf.c | 673 ++++++++ + drivers/usb/wusbcore/crypto.c | 538 +++++++ + drivers/usb/wusbcore/dev-sysfs.c | 143 ++ + drivers/usb/wusbcore/devconnect.c | 1297 ++++++++++++++++ + drivers/usb/wusbcore/mmc.c | 321 ++++ + drivers/usb/wusbcore/pal.c | 42 + + drivers/usb/wusbcore/reservation.c | 115 ++ + drivers/usb/wusbcore/rh.c | 477 ++++++ + drivers/usb/wusbcore/security.c | 642 ++++++++ + drivers/usb/wusbcore/wa-hc.c | 95 ++ + drivers/usb/wusbcore/wa-hc.h | 417 +++++ + drivers/usb/wusbcore/wa-nep.c | 310 ++++ + drivers/usb/wusbcore/wa-rpipe.c | 562 +++++++ + drivers/usb/wusbcore/wa-xfer.c | 1709 +++++++++++++++++++++ + drivers/usb/wusbcore/wusbhc.c | 418 +++++ + drivers/usb/wusbcore/wusbhc.h | 495 ++++++ + drivers/uwb/Kconfig | 90 ++ + drivers/uwb/Makefile | 29 + + drivers/uwb/address.c | 374 +++++ + drivers/uwb/beacon.c | 642 ++++++++ + drivers/uwb/driver.c | 144 ++ + drivers/uwb/drp-avail.c | 288 ++++ + drivers/uwb/drp-ie.c | 232 +++ + drivers/uwb/drp.c | 461 ++++++ + drivers/uwb/est.c | 477 ++++++ + drivers/uwb/hwa-rc.c | 926 +++++++++++ + drivers/uwb/i1480/Makefile | 2 + + drivers/uwb/i1480/dfu/Makefile | 9 + + drivers/uwb/i1480/dfu/dfu.c | 217 +++ + drivers/uwb/i1480/dfu/i1480-dfu.h | 260 ++++ + drivers/uwb/i1480/dfu/mac.c | 527 +++++++ + drivers/uwb/i1480/dfu/phy.c | 203 +++ + drivers/uwb/i1480/dfu/usb.c | 500 ++++++ + drivers/uwb/i1480/i1480-est.c | 99 ++ + drivers/uwb/i1480/i1480-wlp.h | 200 +++ + drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 284 ++++ + drivers/uwb/i1480/i1480u-wlp/lc.c | 421 +++++ + drivers/uwb/i1480/i1480u-wlp/netdev.c | 368 +++++ + drivers/uwb/i1480/i1480u-wlp/rx.c | 486 ++++++ + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 408 +++++ + drivers/uwb/i1480/i1480u-wlp/tx.c | 632 ++++++++ + drivers/uwb/ie.c | 541 +++++++ + drivers/uwb/lc-dev.c | 492 ++++++ + drivers/uwb/lc-rc.c | 495 ++++++ + drivers/uwb/neh.c | 616 ++++++++ + drivers/uwb/pal.c | 91 ++ + drivers/uwb/reset.c | 362 +++++ + drivers/uwb/rsv.c | 680 +++++++++ + drivers/uwb/scan.c | 133 ++ + drivers/uwb/umc-bus.c | 218 +++ + drivers/uwb/umc-dev.c | 104 ++ + drivers/uwb/umc-drv.c | 31 + + drivers/uwb/uwb-debug.c | 367 +++++ + drivers/uwb/uwb-internal.h | 305 ++++ + drivers/uwb/uwbd.c | 410 +++++ + drivers/uwb/whc-rc.c | 520 +++++++ + drivers/uwb/whci.c | 269 ++++ + 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 | 709 +++++++++ + drivers/uwb/wlp/txrx.c | 374 +++++ + drivers/uwb/wlp/wlp-internal.h | 228 +++ + drivers/uwb/wlp/wlp-lc.c | 585 +++++++ + drivers/uwb/wlp/wss-lc.c | 1055 +++++++++++++ + include/linux/bitmap.h | 1 + + include/linux/usb/wusb-wa.h | 271 ++++ + include/linux/usb/wusb.h | 376 +++++ + include/linux/uwb.h | 765 ++++++++++ + include/linux/uwb/debug-cmd.h | 57 + + include/linux/uwb/debug.h | 82 + + include/linux/uwb/spec.h | 727 +++++++++ + include/linux/uwb/umc.h | 194 +++ + include/linux/uwb/whci.h | 117 ++ + include/linux/wlp.h | 735 +++++++++ + lib/bitmap.c | 22 + + 110 files changed, 35819 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-umc + create mode 100644 Documentation/ABI/testing/sysfs-class-usb_host + create mode 100644 Documentation/ABI/testing/sysfs-class-uwb_rc + create mode 100644 Documentation/ABI/testing/sysfs-wusb_cbaf + create mode 100644 Documentation/usb/WUSB-Design-overview.txt + create mode 100644 Documentation/usb/wusb-cbaf + create mode 100644 drivers/usb/host/hwa-hc.c + create mode 100644 drivers/usb/host/whci/Kbuild + create mode 100644 drivers/usb/host/whci/asl.c + create mode 100644 drivers/usb/host/whci/hcd.c + create mode 100644 drivers/usb/host/whci/hw.c + create mode 100644 drivers/usb/host/whci/init.c + create mode 100644 drivers/usb/host/whci/int.c + create mode 100644 drivers/usb/host/whci/pzl.c + create mode 100644 drivers/usb/host/whci/qset.c + create mode 100644 drivers/usb/host/whci/whcd.h + create mode 100644 drivers/usb/host/whci/whci-hc.h + create mode 100644 drivers/usb/host/whci/wusb.c + create mode 100644 drivers/usb/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/debug-cmd.h + create mode 100644 include/linux/uwb/debug.h + create mode 100644 include/linux/uwb/spec.h + create mode 100644 include/linux/uwb/umc.h + create mode 100644 include/linux/uwb/whci.h + create mode 100644 include/linux/wlp.h +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/ib700wdt.c | 49 ++++++++++++++++-------------------------- + 1 files changed, 19 insertions(+), 30 deletions(-) +Merging proc/proc +$ git merge proc/proc +Auto-merged block/genhd.c +Auto-merged fs/locks.c +Removed fs/proc/proc_misc.c +Auto-merged include/asm-x86/pgtable.h +Auto-merged include/linux/fs.h +Auto-merged include/linux/sched.h +Auto-merged include/linux/slab.h +Auto-merged kernel/module.c +Auto-merged kernel/sched.c +Auto-merged kernel/sched_stats.h +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Merge made by recursive. + arch/m68k/amiga/config.c | 21 +- + arch/m68k/atari/config.c | 15 +- + arch/m68k/atari/stram.c | 28 +- + arch/m68k/bvme6000/config.c | 11 - + arch/m68k/kernel/setup.c | 35 ++- + arch/m68k/mvme147/config.c | 10 - + arch/m68k/mvme16x/config.c | 15 +- + arch/m68k/q40/config.c | 10 - + arch/m68k/sun3/config.c | 12 +- + arch/m68k/sun3x/config.c | 12 +- + arch/x86/mm/pageattr.c | 11 +- + block/genhd.c | 37 ++- + fs/filesystems.c | 39 ++ + fs/locks.c | 22 +- + fs/proc/Makefile | 13 +- + fs/proc/cmdline.c | 29 ++ + fs/proc/cpuinfo.c | 24 ++ + fs/proc/devices.c | 70 ++++ + fs/proc/inode.c | 3 +- + fs/proc/internal.h | 3 +- + fs/proc/interrupts.c | 53 +++ + fs/proc/kcore.c | 14 +- + fs/proc/kmsg.c | 12 +- + fs/proc/loadavg.c | 51 +++ + fs/proc/meminfo.c | 147 +++++++ + fs/proc/page.c | 147 +++++++ + fs/proc/proc_devtree.c | 3 +- + fs/proc/proc_misc.c | 914 ------------------------------------------- + fs/proc/proc_sysctl.c | 4 +- + fs/proc/root.c | 8 +- + fs/proc/stat.c | 154 ++++++++ + fs/proc/task_mmu.c | 25 +- + fs/proc/uptime.c | 43 ++ + fs/proc/version.c | 34 ++ + fs/proc/vmcore.c | 6 +- + include/asm-m68k/machdep.h | 2 +- + include/asm-x86/pgtable.h | 3 +- + include/linux/crash_dump.h | 2 - + include/linux/fs.h | 1 - + include/linux/genhd.h | 3 - + include/linux/hugetlb.h | 6 +- + include/linux/proc_fs.h | 5 - + include/linux/sched.h | 4 - + include/linux/slab.h | 5 - + include/linux/vmalloc.h | 2 - + include/linux/vmstat.h | 4 - + kernel/exec_domain.c | 33 ++- + kernel/module.c | 59 ++- + kernel/sched.c | 1 + + kernel/sched_stats.h | 9 +- + mm/hugetlb.c | 5 +- + mm/slab.c | 52 +++- + mm/slub.c | 29 +- + mm/vmalloc.c | 33 ++- + mm/vmstat.c | 69 +++- + 55 files changed, 1242 insertions(+), 1120 deletions(-) + create mode 100644 fs/proc/cmdline.c + create mode 100644 fs/proc/cpuinfo.c + create mode 100644 fs/proc/devices.c + create mode 100644 fs/proc/interrupts.c + create mode 100644 fs/proc/loadavg.c + create mode 100644 fs/proc/meminfo.c + create mode 100644 fs/proc/page.c + delete mode 100644 fs/proc/proc_misc.c + create mode 100644 fs/proc/stat.c + create mode 100644 fs/proc/uptime.c + create mode 100644 fs/proc/version.c +Merging scsi-post-merge/master +$ git am -3 ../patches/0001-sparc-qlogicpti-fallout-from-sbus-removal.patch +Applying sparc: qlogicpti fallout from sbus removal +$ git am -3 ../patches/0001-tpm-don-t-export-static-functions.patch +Applying tpm: don't export static functions +$ git am -3 ../patches/0001-mfd-wm8350-don-t-export-static-functions.patch +Applying mfd/wm8350: don't export static functions +$ git am -3 ../patches/ibm_newemac__Fix_new_MAL_feature_handling +Applying ibm_newemac: Fix new MAL feature handling +Applying staging: sxg depends on X86 diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..92d2c17c13bd --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,248 @@ +Importing driver-core.current based on 2.6.27-git7 +$ git checkout quilt/driver-core.current +Switched to branch "quilt/driver-core.current" +$ git reset --hard 2e532d68a2b3e2aa6b19731501222069735c741c +HEAD is now at 2e532d6 {pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol() +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +document-kernel-taint-flags-properly.patch +error: patch failed: Documentation/sysctl/kernel.txt:363 +error: Documentation/sysctl/kernel.txt: patch does not apply +Importing usb.current based on quilt/driver-core.current +$ git checkout quilt/usb.current +Switched to branch "quilt/usb.current" +$ git reset --hard ac7b643ad9c570efa0b5cbc9af5581db8c2faf64 +HEAD is now at ac7b643 Document kernel taint flags properly +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-option-add-ericsson-f3507g-and-dell-5530.patch +usb-option.c-remove-duplicate-device-ids-now-supported-in-hso.c.patch +usb-add-oceanic-product-id-to-ftdi_sio.patch +usb-added-driver-for-a-delcom-usb-7-segment-led-display.patch +usb-add-usb-test-and-measurement-class-driver.patch +Importing m68k based on 0cfd81031a26717fe14380d18275f8e217571615 +$ git checkout quilt/m68k +Switched to branch "quilt/m68k" +$ git reset --hard 0cfd81031a26717fe14380d18275f8e217571615 +HEAD is now at 0cfd810 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 +$ git quiltimport --author Geert Uytterhoeven <geert@linux-m68k.org> --patches ../quilt/m68k +amiga-amiserial-no-serial-console-if-modular.diff +Importing driver-core based on quilt/usb.current +$ git checkout quilt/driver-core +Switched to branch "quilt/driver-core" +$ git reset --hard 078d8b60ab8002ba5d8e680aac348f42b254f295 +HEAD is now at 078d8b6 USB: add USB test and measurement class driver +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +driver-core-use-dev_get_drvdata-accessors.patch +acpi-fixup-typo-in-acpi_device_remove.patch +pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch +warn-when-statically-allocated-kobjects-are-used.patch +Importing usb based on quilt/driver-core +$ git checkout quilt/usb +Switched to branch "quilt/usb" +$ git reset --hard 0f8bf1f2e0b12a72ae3fbd580bc606b60f9d4238 +HEAD is now at 0f8bf1f warn when statically-allocated kobjects are used +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +drivers-usb-class-usblp.c-adjust-error-handling-code.patch +usb-kill-urbs-permanently.patch +usb-extend-poisoning-to-anchors.patch +ub-remove-sg_stat.patch +usb-let-some-usb-host-controllers-get-irq-flags-from-resource.patch +usb-gadget-kconfig-cleanup.patch +usb-gadget-dummy_hcd-implement-set_wedge.patch +usb-gadget-net2280-implement-set_wedge.patch +usb-gadget-function-activation-deactivation.patch +usb-gadget-cdc-obex-glue.patch +usb-gadget-defer-obex-enumeration.patch +usb-remove-unused-include-version.h.patch +usb-drivers-usb-misc-use-an-is_err-test-rather-than-a-null-test.patch +usb-add-freescale-qe-cpm-usb-peripheral-controller-driver.patch +usb-storage-report-underflow-with-no-sense-data.patch +ohci-allow-broken-controllers-to-auto-stop.patch +usb-documentation-usb-anchors.txt-2.patch +usb-core-fix-usb_otg_blacklist_hub-typo.patch +usb-ftdi_sio-fix-product-parameter-description.patch +usb-reset_resume-needs-to-block-autosuspend-when-remote-wakeup-is-needed.patch +usb-serial-sierra-debug-message-fix.patch +usb-fix-doc-for-usb_autopm_enable.patch +usb-fix-spelling-in-usb-serial.h.patch +usb-g_printer-fix-handling-zero-length-packet.patch +usb-gadget-workaround-storage-command-size-issues.patch +usb-ehci-dbg-increase-debug-buffer-size-for-periodic-file.patch +usb-ehci-dbg-fix-reading-less-content-of-periodic-file.patch +usb-change-hub-initialization-sleeps-to-delayed_work.patch +.dotest/patch:178: space before tab in indent. + hub_power_on(hub, true); +warning: 1 line adds whitespace errors. +usbmon-fix-tiny-race-exposed-by-the-fastboot-patches.patch +usb-remove-code-associated-with-config_ppc_merge.patch +musb-add-sanity-check-for-maximum-number-of-endpoints.patch +usb-gadget-usb_gadget_vbus_draw-kconfig-option.patch +usb-fix-s3c2410_udc-usb-speed-handling.patch +musb-io-only-define-read-write-stubs-if-they-re-not-defined-yet.patch +omap-musb-fixes-the-tt-programming.patch +omap-musb-corrects-urb-unlink-function-path.patch +usb-musb-do-not-mess-up-count-number-and-csr0-register-value.patch +usb-musb_hdrc-build-fixes.patch +usb-musb-general-cleanup-to-musbhsdma.c.patch +usb-musb-remove-dead-code-from-procfs.patch +usb-ohci-omap-handle-other-omap15xx-chips.patch +usb-omap_udc-sync-with-omap-tree.patch +usb-gadget-cdc-ethernet-notification-bugfix.patch +usb-vstusb.c-new-driver-for-spectrometers-used-by-vernier-software-technology-inc.patch +usb-ti_usb_3410_5052-removed-duplicated-include.patch +usb-uhci-improve-scheduling-of-interrupt-urbs.patch +usb-improve-ehci_watchdog-s-side-effect-in-cpu-power-management.patch +usb-isp1760-use-an-is_err-test-rather-than-a-null-test.patch +usb-ftdi-elan-always-pass-usb_bulk_msg-a-timeout-in-milliseconds.patch +usb-anchor-api-changes-needed-for-btusb.patch +usb-ehci-ohci-uhci-remove-version-numbers.patch +usb-ehci-log-a-warning-if-ehci-hcd-is-not-loaded-first.patch +usb-option-anydata-new-modem-same-id.patch +usb-snoop-processes-opening-usbfs-device-files.patch +usb-ehci-fix-remote-wakeup-support-for-arc-tdi-core.patch +usb-export-if-an-interface-driver-supports-autosuspend.patch +usb-ohci-add-support-for-tmio-ohci-cell.patch +usb-hub.c-add-initial_descriptor_timeout-module-parameter-for-usbcore.patch +usb-option-add-pantech-cards.patch +usb-ohci-fix-endless-polling-behavior.patch +usb-fix-up-problems-in-the-vtusb-driver.patch +fsl_usb2_udc-make-dr_ep_setup-function-static.patch +fsl_usb2_udc-remove-check-for-udc-null-in-dr_controller_setup.patch +fsl_usb2_udc-fix-some-sparse-warnings-and-remove-redundant-code.patch +fsl_usb2_udc-clean-up-whitespace-in-errors-and-warnings.patch +fsl_usb2_udc-clean-up-whitespace-in-proc-debugging-output.patch +fsl_usb2_udc-initialize-spinlock-earlier.patch +fsl_usb2_udc-rename-the-arguments-of-the-fsl_writel-macro.patch +fsl_usb2_udc-uninline-udc_reset_ep_queue.patch +fsl_usb2_udc-make-fsl_queue_td-return-type-void.patch +fsl_usb2_udc-add-a-wmb-before-priming-endpoint.patch +fsl_usb2_udc-fix-oops-on-probe-failure.patch +usb-fsl_qe_udc-fix-response-to-get-status-request.patch +usb-fsl_qe_udc-clear-data-toggle-on-clear-halt-request.patch +hso-fix-hso_serial_close-refcounting.patch +hso-put-linefeeds-on-printk-s-in-hso.c.patch +usb-remove-warn-macro-from-usb-input-drivers.patch +usb-remove-warn-macro-from-usb-media-drivers.patch +usb-remove-warn-macro-from-usb-net-drivers.patch +usb-remove-warn-macro-from-usb-drivers.patch +usb-remove-warn-macro-from-hid-core.patch +usb-remove-warn-macro-from-usb.h.patch +usb-remove-info-macro-from-usb-serial-drivers.patch +usb-remove-info-macro-from-usb-misc-drivers.patch +usb-remove-info-macro-from-remaining-usb-drivers.patch +.dotest/patch:33: space before tab in indent. + USB_ENDPOINT_DIR_MASK + info->epnum +warning: 1 line adds whitespace errors. +usb-remove-info-macro-from-usb-network-drivers.patch +usb-remove-info-macro-from-usb-input-drivers.patch +usb-remove-info-macro-from-usb-mtd-drivers.patch +usb-remove-info-macro-from-usb.h.patch +usb-remove-use-of-err-in-drivers-usb-serial.patch +usb-remove-err-macro-from-usb-class-drivers.patch +usb-remove-err-macro-from-usb-core-code.patch +usb-remove-err-macro-from-usb-misc-drivers.patch +usb-remove-err-macro-from-more-usb-drivers.patch +usb-gotemp.patch +Importing device-mapper based on v2.6.27-3976-g7591103 +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard 7591103c08abade60aeddb432ed0686ddd0de1c6 +HEAD is now at 7591103 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-kcopyd-avoid-queue-shuffle.patch +dm-snapshot-fix-primary_pe-race.patch +dm-snapshot-drop-unused-last_percent.patch +dm-exception-store-refactor-zero_area.patch +dm-exception-store-fix-misordered-writes.patch +dm-publish-array_too_big.patch +dm-remove-dm-header-from-targets.patch +dm-crypt-tidy-sector.patch +Importing i2c based on 2.6.27-git8 +$ git checkout quilt/i2c +Switched to branch "quilt/i2c" +$ git reset --hard 0cfd81031a26717fe14380d18275f8e217571615 +HEAD is now at 0cfd810 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-i801-smbus-patch-for-intel-ibex-peak-deviceids.patch +i2c-algo-pcf-01-pass-adapter-data-into-waitforpin-method.patch +i2c-algo-pcf-02-add-adapter-hooks-around-xfer-begin-and-end.patch +i2c-algo-pcf-03-fix-typo-in-debugging-log-message.patch +i2c-clarify-i2c_adapter-class-usage.patch +i2c-delete-outdated-client-porting-guide.patch +i2c-constify-i2c_get_clientdata-parameter.patch +i2c-delete-legacy-model-documentation.patch +i2c-drop-2-byte-addr-block-transactions.patch +i2c-update-doc-writing-clients.patch +i2c-cleanup-header.patch +i2c-deprecate-legacy-binding.patch +Importing jdelvare-hwmon based on 2.6.27-git8 + quilt series is empty +$ git update-ref refs/heads/quilt/jdelvare-hwmon 0cfd81031a26717fe14380d18275f8e217571615 +Unchanged quilt series kernel-doc +Unchanged quilt series ide +Unchanged quilt series rr +Importing ttydev based on 2e532d68a2b3e2aa6b19731501222069735c741c +$ git checkout quilt/ttydev +Switched to branch "quilt/ttydev" +$ git reset --hard 2e532d68a2b3e2aa6b19731501222069735c741c +HEAD is now at 2e532d6 {pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol() +$ git quiltimport --author Alan Cox <alan@lxorguk.ukuu.org.uk> --patches ../quilt/ttydev +8250-oxsemi +.dotest/patch:154: trailing whitespace. + +.dotest/patch:179: space before tab in indent. + pci_oxsemi_tornado_init(dev, board); +.dotest/patch:180: trailing whitespace. + +.dotest/patch:191: space before tab in indent. + { PCI_VENDOR_ID_OXSEMI, 0xc101, /* OXPCIe952 1 Legacy UART */ +.dotest/patch:194: space before tab in indent. + { PCI_VENDOR_ID_OXSEMI, 0xc105, /* OXPCIe952 1 Legacy UART */ +warning: squelched 2 whitespace errors +warning: 7 lines add whitespace errors. +blackfin-kgdb +blackfin-sir-stopfix +blackfin-clean-early +blackfin-rxtx-lock +blackfin-clear-bi +pty-simplify-resize +n-tty-bkl-drop +.dotest/patch:120: trailing whitespace. + +.dotest/patch:340: trailing whitespace. + +.dotest/patch:590: trailing whitespace. + +.dotest/patch:974: trailing whitespace. + +.dotest/patch:1044: trailing whitespace. + +warning: 5 lines add whitespace errors. +n-tty-clean +epca-break-infinite +pty-remove-pts-global +pty-per-mount-allocated +pty-per-mount-config +pty-option-parsing +pty-pts-multiple-instances +pty-mknod-ptmx +pty-get-init-pts-sb +pty-pts-enable-multiple +pty-multiple-doc +.dotest/patch:98: space before tab in indent. + - adding ptmxmode mount option to devpts entry in /etc/fstab, or +.dotest/patch:142: trailing whitespace. + +warning: 2 lines add whitespace errors. +pty-devpts-tidy +8250-oxsemi-mainpine +.dotest/patch:18: space before tab in indent. + return 0; +.dotest/patch:54: space before tab in indent. + { PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 1 Port V.34 Super-G3 Fax *. +.dotest/patch:57: space before tab in indent. + { PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 2 Port V.34 Super-G3 Fax */ +.dotest/patch:60: space before tab in indent. + { PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 4 Port V.34 Super-G3 Fax */ +.dotest/patch:63: space before tab in indent. + { PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 8 Port V.34 Super-G3 Fax */ +warning: 5 lines add whitespace errors. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..6b5780d6924b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20081020 |