diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-09 18:46:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-09 18:46:12 +1100 |
| commit | c9564d1ceda717348b513cebae0dbbf90b9c8a45 (patch) | |
| tree | 649fbfc7f13b7f604a00af90442f0ad94012d709 | |
| parent | 3b3d658d7ddd415078f132d9364081e7ee18add1 (diff) | |
Add linux-next specific files for 20081209next-20081209
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 133 | ||||
| -rw-r--r-- | Next/Trees | 135 | ||||
| -rw-r--r-- | Next/merge.log | 7167 | ||||
| -rw-r--r-- | Next/quilt-import.log | 671 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8107 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..e1827118fa74 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,133 @@ +Name SHA1 +---- ---- +origin 218d11a8b071b23b76c484fd5f72a4fe3306801e +arm-current baa745a3378046ca1c5477495df6ccbec7690428 +m68k-current 218d11a8b071b23b76c484fd5f72a4fe3306801e +powerpc-merge feaf3848a813a106f163013af6fcf6c4bfec92d9 +sparc-current 410d2c8187ed969238ba98008c1d57307a56cfd8 +scsi-rc-fixes d3acf0226debeae22d87808f8f298386bd08e391 +net-current c49b9f295e513753e6d9bb4444ba502f1aa59b29 +sound-current b6283534a3e057f8268ca5448305900f74d12608 +pci-current 6a1214113090905aca6a492fc8ef10d84c608a69 +wireless-current cde6901b7b69557a6f90f3183f76eda581af015e +kbuild-current bf1b36445dc868cbbde194aa1dd87e38fe24cf16 +driver-core.current f0c332822130b81f40c1dbb2c76b77c370d5fd36 +usb.current 16eb17584224483a2c002a6feda186d3197973ca +cpufreq-current bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e +input-current 545f4e99dee7284ed57c79384c5c1d5ac58dcd59 +md-current 7a1fc53c5adb910751a9b212af90302eb4ffb527 +audit-current c05a63c58c2884c4db00308ba5eb0dbac2fb5ac9 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 114c1cb0c4c253e441e4a62df09e8c707745db5c +avr32 105462632c37ea5484ebae7db6e85e0aaac28f4b +blackfin 62273eeb6ac516ab0abf49417378726ad8875b03 +cris 0db42c6b23ce26b05b235dbe2e0aa096db194e33 +ia64 13d428afc007fcfcd6deeb215618f54cf9c0cae6 +m68k 3ef9a61ec1cf4da706de744b59b05bda14152549 +m68knommu 7680a920c75b242adaedf3d93b7f6d253db56792 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc 94b5339dbe820cf874e826c3c9bb62493bb4da7f +powerpc 361425fc32422c9716fc69e52455b7d44fc02c18 +4xx 5b990ee0004d029f1fd588ab026c03b6ab435fa8 +galak 361425fc32422c9716fc69e52455b7d44fc02c18 +pxa 9a8585e138d7d6285d50ab3cf3cce4fdb9d4dbd1 +s390 ecc793f04b9284811ad8c6b1f930ba0a30744adb +sh e0f98bed2cbacf45de8c3c2dfc31e3d606ca7b35 +sparc 680e58f809fee29cb81b15ec44fedc09aabaa698 +x86 4bc2129f35fe83f38846ab30558cbac035070d5c +xtensa 5fee325e7d2bcbebf1cb38b4ff3a7aa3744c43e3 +driver-core e8fabb5cc720bfeecfdb287b6d09fb5b4c686817 +usb 20fbda728b2f8f0715591802451aa0078ac14a5d +tip-core d087eba39bdd9bbe1b9a2b6463dd59cada302f2e +cpus4096 ed313489badef16d700f5a3be50e8fd8f8294bc8 +ftrace 170f5ddae264fee78510893fdba7900e50d37e34 +genirq c26272486e22bf0ca4f64cac3431e40b5a7e5881 +safe-poison-pointers 83b6db87f94969d1da4f71c3400deab1f58da164 +sched c566cafb9e9621a2c9d92e1eca0b7685a5b3b83d +stackprotector 26136bb101dc26e30ebc93ca865cc16013415f67 +timers 3c84d82ee07486e9a333f779010515c1b3dea622 +pci e8a566469d768c3b11d585c3fb376c22967ccae4 +device-mapper 32b211822cafb30695f5c16f3d778892034549a9 +hid 6d373f281dad14cd64ab8d38c2a3615f9037c850 +i2c 1b1b4203768a1ff120e1c771ff2cecb62d39973f +jdelvare-hwmon c25b02d56f855ac5d472ff2700641b82071d24ed +kernel-doc 7591103c08abade60aeddb432ed0686ddd0de1c6 +v4l-dvb 6e65a8a8f16144b0f092915c9f89c2beb957e14b +jfs ec1aef33668448718fcba79e4e981592bfd7e0a3 +kbuild ff80aa97c9b4aae9449a608fe1bc3e7b5121cd66 +ide d9562086c1778039210810bd4957f5547b997531 +libata 3a9bd37d4a7585597646ac833bc0580d391f2649 +nfs 218d11a8b071b23b76c484fd5f72a4fe3306801e +xfs 14d676f56fad26fd3c31eeff5d4ef8ea4a163571 +infiniband 3a4cc7d2eb0c0732621dbc9d2af0fed029f99341 +acpi 494c0adea72358282df95c38c30fc0bffc64255b +nfsd 9f14ed96a3637540c84c1e109f626d4a93770b85 +ieee1394 e3c44fb0d594f71b1fe8fb7a176c5bcf168a10ed +ubi 6fa6f5bbc3a2ad833a3d4b798140602004f70f5a +kvm 4943c6d2d0d3ef0119a4873855b5cbba71303f0e +dlm 86c13b9cf2941fe8e3cb2fdaf32cc533f029ad28 +scsi 25a483515a35e04e8989c6eeace19b03caad3d0e +ocfs2 8bcc0570b3f3c3bb0fafb35bb86234d36e8e55db +ext4 1d5e145e366262c9ee63601ef0b11553e7be0c5e +async_tx ff3462b1a08d8fe452f8e187192ac9bd7ec9d545 +udf 0f675c1b6ef06b8f08c2a78ad99efd4e50c2603d +net 6fdd34d43bff8be9bb925b49d87a0ee144d2ab07 +mtd e93f1be503efd0e44e46fc1fd4c13dbee72a6561 +wireless c112d0c5b89037dd618083b5fdf4bb36b0c51d77 +crypto 536ebb7f626120514d308b9ec03b80ee2a0b2949 +vfs fd217f4d70172c526478f2bc76859e909fdfa674 +sound b79d51cb6b50323f092a91249c05d41de7652d7e +cpufreq 187d9f4ed4fc089f1f25a875fb485e27626972f9 +v9fs 073e30ef20440f1a95ff7dd07de1d422bc6c41b1 +rr_cpumask e861b55972252094d6da6d6c30c6a4bc64448550 +rr fe67ad68c24e74ad87dbf38fa8ce666316ccd671 +cifs 4d2c688f576208bb0ac6eb3aedb41e3ef561cde7 +mmc 12f16cb1d29bf16ab625929f3601725f96546691 +gfs2 04b985e291c464092516d0d1a4387b866389a85d +input a2d781fc8d9b16113dd9440107d73c0f21d7cbef +semaphore b552068999b0b05087c454e525b30b785c79dc9b +semaphore-removal 9ac2f04936e1140d7a28a01b84e086458e191b49 +bkl-removal 877d79ef6ad6a67bb8582b7013e0d6f56a77e5ba +ubifs 995be04548f62c8e6b447410cd28b0666614b461 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 8488f0a67246b250b40e24853f1edf76af8e5817 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 26b06189dcf12e67f3552327ae2ba5e3053730fe +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery ed8c3174dd227031d1f3b9fa4fbb512f8f623434 +leds d528785f4a5583ddd7a921e4b2501e71243c61b8 +backlight bf1fd5da75006877efdd11d5f90beef74ea7053e +kgdb 0136574e061924dc236a611f28e881a12ab6822a +slab 2a146f2c3f58fbdc6dcba061af0f627e0870526f +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md b2068ef1c8d24f005873599d14f25171fd375da3 +kmemcheck 8e350817ce083d81324ffff9e29ae92da22a82a9 +generic-ipi ed313489badef16d700f5a3be50e8fd8f8294bc8 +mfd d9f27a08919b6ea6e5266b3e32596286766715b2 +hdlc 385065acd2c59cbdda7dce5ee414304ea1e43d22 +drm f9f392c7a46c48fffb0ee27cf25f9f7b664f1af9 +voltage 28cadc50d60026f9c46489a9b56fb939aa57cbed +security-testing 94d6a5f7341ebaff53d4e41cc81fab37f0d9fbed +lblnet a5a9885bacc0bc87223c4eb3ae7221aa4365c7e8 +ttydev 355ff6f7437efc41b887e8d5bf96daf87c83fa96 +agp 7f99ef615bf1c34d0201ae0553a47867b36813dc +oprofile ed313489badef16d700f5a3be50e8fd8f8294bc8 +fastboot ed313489badef16d700f5a3be50e8fd8f8294bc8 +sparseirq f2ae3f3f232ddcf35ba34acbee9b534dffff6cc7 +iommu 529d05e60b57e650b90fbe16a589567825e17082 +uwb dcc7461eef7341e84e2f7274f904ce01a43b2506 +watchdog 822584e608da62313b4d5a3ca0e6943464672ebd +proc 788ff43b53179f3af8677d59c87104aff1f75bde +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 0b4e7781aee2f03a6f9577a4268c96d6072be59d +cpu_alloc c905c8806c7df091085a66bab590c3ee499b86cc +cputime cb7a571b4a340933645567428c0bb47544e4926d +perfmon3 9ae3682ed34a33de7aa30448104ba90e2f27883f +osd 93e4432d5c42e3dbe196ec6ef1ffe1c69c443b3a +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +fuse 5d9ec854bfb6f1e122b1d96b344164a71eac5be8 +jc_docs 2884f00b94be73a6a7875bada739bf9bb2f9a1b6 +trivial cc689b174bcd15b5d68eed83089b3851d3e69dc6 +audit b3985e2bf6ce51ae943208af4bd336287fb34ed6 +staging e5d5dd30842c748a0e03b19483f0a11a13932a30 +scsi-post-merge 04ab591808565f968d4406f6435090ad671ebdab diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..db1d821142d7 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,135 @@ +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 +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +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 +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +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 +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +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 git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +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/paulus/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#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/tip/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/tip/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/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#for-next +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#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#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/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 +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_cpumask git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask.git#master +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 +ubifs git git://git.infradead.org/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-next +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 +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 +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cpu_alloc git git://git.kernel.org/pub/scm/linux/kernel/git/christoph/work.git#cpu_alloc +cputime git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#cputime +perfmon3 git git://git.kernel.org/pub/scm/linux/kernel/git/eranian/linux-next.git#master +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/ +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..5bec48cbadde --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7167 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 218d11a Fix a race condition in FASYNC handling +Merging origin/master +$ git merge origin/master +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/include/asm/bitops.h | 16 ++++++++++------ + arch/arm/include/asm/processor.h | 2 +- + arch/arm/mach-omap1/io.c | 2 +- + arch/arm/mm/alignment.c | 26 +++++++++++++++++++++++--- + arch/arm/plat-omap/include/mach/omapfb.h | 4 ++-- + arch/arm/plat-omap/sram.c | 8 ++++---- + arch/arm/plat-orion/pcie.c | 2 +- + drivers/video/omap/omapfb_main.c | 2 +- + 8 files changed, 43 insertions(+), 19 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/scsi/aacraid/linit.c | 4 ++-- + drivers/scsi/libiscsi.c | 11 +++++------ + 2 files changed, 7 insertions(+), 8 deletions(-) +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/isdn/hardware/avm/b1isa.c | 6 +-- + drivers/isdn/hysdn/hysdn_net.c | 4 +- + drivers/net/bnx2.c | 35 ++++++++++++++- + drivers/net/bnx2.h | 6 +++ + drivers/net/enc28j60.c | 16 ++++++- + drivers/net/netx-eth.c | 2 + + drivers/net/wireless/ipw2200.c | 4 ++ + drivers/net/wireless/iwlwifi/iwl-core.c | 3 + + drivers/net/wireless/iwlwifi/iwl-sta.c | 24 +++++++++- + drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- + include/linux/can/core.h | 2 +- + net/atm/svc.c | 6 ++- + net/can/af_can.c | 68 +++++++++++++++++++++++------- + net/can/bcm.c | 7 ++- + net/ipv4/tcp_output.c | 22 +++++----- + net/ipv4/tcp_vegas.c | 2 + + net/mac80211/sta_info.c | 2 +- + net/netfilter/xt_socket.c | 2 +- + net/netlabel/netlabel_unlabeled.c | 10 +++-- + net/phonet/pn_netlink.c | 3 + + net/xfrm/xfrm_policy.c | 1 + + 21 files changed, 173 insertions(+), 54 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + lib/dynamic_printk.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/class/usbtmc.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Merge made by recursive. + drivers/char/tty_audit.c | 75 +++++++++++++++++++++++++++++------- + drivers/char/tty_io.c | 1 + + include/asm-generic/audit_write.h | 2 + + include/linux/audit.h | 6 ++- + include/linux/tty.h | 4 ++ + kernel/audit.c | 32 +++++++++++----- + kernel/auditsc.c | 24 ++++++++++- + kernel/fork.c | 1 + + 8 files changed, 115 insertions(+), 30 deletions(-) +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Removed arch/arm/boot/compressed/head-clps7500.S +Auto-merged arch/arm/include/asm/processor.h +Removed arch/arm/mach-aaec2000/clock.c +Removed arch/arm/mach-aaec2000/clock.h +Removed arch/arm/mach-aaec2000/include/mach/dma.h +Removed arch/arm/mach-at91/include/mach/dma.h +Removed arch/arm/mach-clps711x/include/mach/dma.h +Removed arch/arm/mach-clps7500/Makefile +Removed arch/arm/mach-clps7500/Makefile.boot +Removed arch/arm/mach-clps7500/core.c +Removed arch/arm/mach-clps7500/include/mach/acornfb.h +Removed arch/arm/mach-clps7500/include/mach/debug-macro.S +Removed arch/arm/mach-clps7500/include/mach/dma.h +Removed arch/arm/mach-clps7500/include/mach/entry-macro.S +Removed arch/arm/mach-clps7500/include/mach/hardware.h +Removed arch/arm/mach-clps7500/include/mach/io.h +Removed arch/arm/mach-clps7500/include/mach/irq.h +Removed arch/arm/mach-clps7500/include/mach/irqs.h +Removed arch/arm/mach-clps7500/include/mach/memory.h +Removed arch/arm/mach-clps7500/include/mach/system.h +Removed arch/arm/mach-clps7500/include/mach/timex.h +Removed arch/arm/mach-clps7500/include/mach/uncompress.h +Removed arch/arm/mach-clps7500/include/mach/vmalloc.h +Removed arch/arm/mach-davinci/include/mach/dma.h +Removed arch/arm/mach-ebsa110/include/mach/dma.h +Removed arch/arm/mach-ep93xx/include/mach/dma.h +Removed arch/arm/mach-integrator/include/mach/dma.h +Removed arch/arm/mach-iop13xx/include/mach/dma.h +Removed arch/arm/mach-iop32x/include/mach/dma.h +Removed arch/arm/mach-iop33x/include/mach/dma.h +Removed arch/arm/mach-ixp2000/include/mach/dma.h +Removed arch/arm/mach-ixp23xx/include/mach/dma.h +Removed arch/arm/mach-ixp4xx/include/mach/dma.h +Removed arch/arm/mach-kirkwood/include/mach/dma.h +Removed arch/arm/mach-ks8695/include/mach/dma.h +Removed arch/arm/mach-l7200/include/mach/dma.h +Removed arch/arm/mach-loki/include/mach/dma.h +Removed arch/arm/mach-mv78xx0/include/mach/dma.h +Removed arch/arm/mach-netx/include/mach/dma.h +Removed arch/arm/mach-ns9xxx/include/mach/dma.h +Removed arch/arm/mach-orion5x/include/mach/dma.h +Auto-merged arch/arm/mach-pxa/pcm990-baseboard.c +Removed arch/arm/mach-realview/include/mach/dma.h +Removed arch/arm/mach-versatile/include/mach/dma.h +Auto-merged arch/arm/mm/alignment.c +Removed arch/arm/mm/copypage-feroceon.S +Removed arch/arm/mm/copypage-v3.S +Removed arch/arm/mm/copypage-v4wb.S +Removed arch/arm/mm/copypage-v4wt.S +Removed arch/arm/mm/copypage-xsc3.S +Removed arch/arm/plat-mxc/include/mach/dma.h +Merge made by recursive. + arch/arm/Kconfig | 52 +- + arch/arm/Makefile | 2 +- + arch/arm/boot/compressed/Makefile | 4 - + arch/arm/boot/compressed/head-clps7500.S | 86 -- + arch/arm/boot/compressed/head.S | 20 +- + arch/arm/boot/compressed/misc.c | 2 + + arch/arm/common/Kconfig | 3 + + arch/arm/common/Makefile | 1 + + arch/arm/common/clkdev.c | 128 ++ + arch/arm/common/locomo.c | 1 + + arch/arm/configs/h5000_defconfig | 996 +++++++++++++++ + arch/arm/configs/neocore926_defconfig | 1302 ++++++++++++++++++++ + arch/arm/configs/realview-smp_defconfig | 718 ++++++----- + arch/arm/configs/realview_defconfig | 763 ++++++++---- + arch/arm/include/asm/cacheflush.h | 37 +- + arch/arm/include/asm/clkdev.h | 30 + + arch/arm/include/asm/dma.h | 24 +- + arch/arm/include/asm/hardware/iomd.h | 41 - + arch/arm/include/asm/hwcap.h | 1 + + arch/arm/include/asm/io.h | 8 + + arch/arm/include/asm/irq.h | 4 - + arch/arm/include/asm/memory.h | 7 +- + arch/arm/include/asm/mmu_context.h | 1 + + arch/arm/include/asm/page.h | 32 +- + arch/arm/include/asm/processor.h | 2 +- + arch/arm/include/asm/setup.h | 6 +- + arch/arm/include/asm/smp.h | 6 +- + arch/arm/include/asm/string.h | 9 - + arch/arm/include/asm/system.h | 2 - + arch/arm/include/asm/uaccess.h | 5 +- + arch/arm/kernel/armksyms.c | 1 + + arch/arm/kernel/head-common.S | 2 +- + arch/arm/kernel/module.c | 4 +- + arch/arm/kernel/setup.c | 57 +- + arch/arm/kernel/smp.c | 4 +- + arch/arm/kernel/thumbee.c | 2 +- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/arm/lib/Makefile | 1 - + arch/arm/lib/memset.S | 2 +- + arch/arm/mach-aaec2000/Makefile | 2 +- + arch/arm/mach-aaec2000/clock.c | 99 -- + arch/arm/mach-aaec2000/clock.h | 23 - + arch/arm/mach-aaec2000/core.c | 29 +- + arch/arm/mach-aaec2000/include/mach/dma.h | 9 - + arch/arm/mach-aaec2000/include/mach/io.h | 6 +- + arch/arm/mach-aaec2000/include/mach/memory.h | 3 - + arch/arm/mach-at91/Kconfig | 15 +- + arch/arm/mach-at91/Makefile | 13 +- + arch/arm/mach-at91/at91cap9.c | 8 + + arch/arm/mach-at91/at91cap9_devices.c | 36 +- + arch/arm/mach-at91/at91sam9260_devices.c | 38 +- + arch/arm/mach-at91/at91sam9261_devices.c | 17 +- + arch/arm/mach-at91/at91sam9263_devices.c | 17 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 11 - + arch/arm/mach-at91/board-cam60.c | 30 +- + arch/arm/mach-at91/board-cap9adk.c | 77 +- + arch/arm/mach-at91/board-neocore926.c | 397 ++++++ + arch/arm/mach-at91/board-qil-a9260.c | 35 +- + arch/arm/mach-at91/board-sam9-l9260.c | 35 +- + arch/arm/mach-at91/board-sam9260ek.c | 37 +- + arch/arm/mach-at91/board-sam9261ek.c | 80 +- + arch/arm/mach-at91/board-sam9263ek.c | 36 +- + arch/arm/mach-at91/board-sam9g20ek.c | 36 +- + arch/arm/mach-at91/board-sam9rlek.c | 32 +- + arch/arm/mach-at91/board-usb-a9260.c | 35 +- + arch/arm/mach-at91/board-usb-a9263.c | 36 +- + arch/arm/mach-at91/include/mach/at91_pmc.h | 7 + + arch/arm/mach-at91/include/mach/at91cap9.h | 4 +- + arch/arm/mach-at91/include/mach/cpu.h | 15 + + arch/arm/mach-at91/include/mach/dma.h | 19 - + arch/arm/mach-at91/include/mach/io.h | 4 +- + arch/arm/mach-at91/include/mach/memory.h | 11 - + arch/arm/mach-at91/sam9_smc.c | 47 + + arch/arm/mach-at91/sam9_smc.h | 33 + + arch/arm/mach-clps711x/include/mach/dma.h | 19 - + arch/arm/mach-clps711x/include/mach/io.h | 6 +- + arch/arm/mach-clps711x/include/mach/memory.h | 20 +- + arch/arm/mach-clps7500/Makefile | 11 - + arch/arm/mach-clps7500/Makefile.boot | 2 - + arch/arm/mach-clps7500/core.c | 395 ------ + arch/arm/mach-clps7500/include/mach/acornfb.h | 33 - + arch/arm/mach-clps7500/include/mach/debug-macro.S | 21 - + arch/arm/mach-clps7500/include/mach/dma.h | 21 - + arch/arm/mach-clps7500/include/mach/entry-macro.S | 16 - + arch/arm/mach-clps7500/include/mach/hardware.h | 67 - + arch/arm/mach-clps7500/include/mach/io.h | 255 ---- + arch/arm/mach-clps7500/include/mach/irq.h | 32 - + arch/arm/mach-clps7500/include/mach/irqs.h | 66 - + arch/arm/mach-clps7500/include/mach/memory.h | 43 - + arch/arm/mach-clps7500/include/mach/system.h | 23 - + arch/arm/mach-clps7500/include/mach/timex.h | 13 - + arch/arm/mach-clps7500/include/mach/uncompress.h | 35 - + arch/arm/mach-clps7500/include/mach/vmalloc.h | 4 - + arch/arm/mach-davinci/include/mach/dma.h | 16 - + arch/arm/mach-davinci/include/mach/io.h | 3 +- + arch/arm/mach-davinci/include/mach/memory.h | 7 +- + arch/arm/mach-davinci/include/mach/vmalloc.h | 1 - + arch/arm/mach-ebsa110/include/mach/dma.h | 11 - + arch/arm/mach-ebsa110/include/mach/memory.h | 7 - + arch/arm/mach-ep93xx/Kconfig | 6 + + arch/arm/mach-ep93xx/Makefile | 1 + + arch/arm/mach-ep93xx/clock.c | 68 +- + arch/arm/mach-ep93xx/core.c | 40 + + arch/arm/mach-ep93xx/edb9307a.c | 67 + + arch/arm/mach-ep93xx/include/mach/clkdev.h | 7 + + arch/arm/mach-ep93xx/include/mach/dma.h | 3 - + arch/arm/mach-ep93xx/include/mach/gpio.h | 2 + + arch/arm/mach-ep93xx/include/mach/io.h | 4 +- + arch/arm/mach-ep93xx/include/mach/memory.h | 4 - + arch/arm/mach-ep93xx/include/mach/platform.h | 1 + + arch/arm/mach-footbridge/include/mach/hardware.h | 14 +- + arch/arm/mach-footbridge/include/mach/io.h | 3 +- + .../include/mach/{dma.h => isa-dma.h} | 2 +- + arch/arm/mach-footbridge/include/mach/memory.h | 9 + + arch/arm/mach-footbridge/netwinder-hw.c | 53 +- + arch/arm/mach-footbridge/netwinder-leds.c | 7 +- + arch/arm/mach-h720x/include/mach/io.h | 4 +- + .../mach-h720x/include/mach/{dma.h => isa-dma.h} | 9 +- + arch/arm/mach-h720x/include/mach/memory.h | 20 +- + arch/arm/mach-imx/dma.c | 7 +- + arch/arm/mach-imx/include/mach/imx-dma.h | 12 +- + arch/arm/mach-imx/include/mach/io.h | 4 +- + arch/arm/mach-imx/include/mach/memory.h | 10 - + arch/arm/mach-integrator/clock.c | 80 +-- + arch/arm/mach-integrator/clock.h | 25 - + arch/arm/mach-integrator/core.c | 35 + + arch/arm/mach-integrator/impd1.c | 26 +- + arch/arm/mach-integrator/include/mach/clkdev.h | 25 + + arch/arm/mach-integrator/include/mach/dma.h | 19 - + arch/arm/mach-integrator/include/mach/memory.h | 13 +- + arch/arm/mach-integrator/integrator_cp.c | 18 +- + arch/arm/mach-iop13xx/include/mach/dma.h | 3 - + arch/arm/mach-iop13xx/include/mach/memory.h | 16 +- + arch/arm/mach-iop13xx/include/mach/timex.h | 2 - + arch/arm/mach-iop32x/include/mach/dma.h | 9 - + arch/arm/mach-iop32x/include/mach/io.h | 2 +- + arch/arm/mach-iop32x/include/mach/memory.h | 13 - + arch/arm/mach-iop32x/include/mach/system.h | 3 +- + arch/arm/mach-iop32x/include/mach/timex.h | 3 - + arch/arm/mach-iop33x/include/mach/dma.h | 9 - + arch/arm/mach-iop33x/include/mach/io.h | 2 +- + arch/arm/mach-iop33x/include/mach/memory.h | 13 - + arch/arm/mach-iop33x/include/mach/system.h | 1 + + arch/arm/mach-iop33x/include/mach/timex.h | 3 - + arch/arm/mach-ixp2000/include/mach/dma.h | 9 - + arch/arm/mach-ixp2000/include/mach/memory.h | 7 - + arch/arm/mach-ixp23xx/include/mach/dma.h | 3 - + arch/arm/mach-ixp23xx/include/mach/io.h | 2 - + arch/arm/mach-ixp23xx/include/mach/memory.h | 13 - + arch/arm/mach-ixp4xx/include/mach/dma.h | 21 - + arch/arm/mach-ixp4xx/include/mach/io.h | 4 +- + arch/arm/mach-ixp4xx/include/mach/memory.h | 13 +- + arch/arm/mach-kirkwood/include/mach/dma.h | 1 - + arch/arm/mach-kirkwood/include/mach/memory.h | 4 - + arch/arm/mach-ks8695/include/mach/dma.h | 17 - + arch/arm/mach-ks8695/include/mach/io.h | 4 +- + arch/arm/mach-ks8695/include/mach/memory.h | 5 - + arch/arm/mach-l7200/include/mach/dma.h | 23 - + arch/arm/mach-l7200/include/mach/io.h | 10 +- + arch/arm/mach-l7200/include/mach/memory.h | 3 - + arch/arm/mach-lh7a40x/clocks.c | 92 +-- + arch/arm/mach-lh7a40x/include/mach/io.h | 6 +- + arch/arm/mach-lh7a40x/include/mach/memory.h | 10 - + arch/arm/mach-loki/include/mach/dma.h | 1 - + arch/arm/mach-loki/include/mach/memory.h | 4 - + arch/arm/mach-msm/include/mach/io.h | 6 +- + arch/arm/mach-msm/include/mach/memory.h | 4 - + arch/arm/mach-mv78xx0/include/mach/dma.h | 1 - + arch/arm/mach-mv78xx0/include/mach/memory.h | 4 - + arch/arm/mach-netx/fb.c | 7 +- + arch/arm/mach-netx/include/mach/dma.h | 21 - + arch/arm/mach-netx/include/mach/io.h | 2 +- + arch/arm/mach-netx/include/mach/memory.h | 10 - + arch/arm/mach-ns9xxx/include/mach/dma.h | 14 - + arch/arm/mach-ns9xxx/include/mach/hardware.h | 2 - + arch/arm/mach-ns9xxx/include/mach/io.h | 2 +- + arch/arm/mach-ns9xxx/include/mach/memory.h | 3 - + arch/arm/mach-omap1/Kconfig | 3 + + arch/arm/mach-orion5x/include/mach/dma.h | 1 - + arch/arm/mach-orion5x/include/mach/io.h | 7 +- + arch/arm/mach-orion5x/include/mach/memory.h | 4 - + arch/arm/mach-pnx4008/dma.c | 3 +- + arch/arm/mach-pnx4008/include/mach/dma.h | 2 - + arch/arm/mach-pnx4008/include/mach/io.h | 4 +- + arch/arm/mach-pnx4008/include/mach/memory.h | 5 +- + arch/arm/mach-pxa/Kconfig | 17 +- + arch/arm/mach-pxa/Makefile | 1 + + arch/arm/mach-pxa/clock.c | 67 +- + arch/arm/mach-pxa/clock.h | 59 +- + arch/arm/mach-pxa/cm-x300.c | 5 +- + arch/arm/mach-pxa/corgi.c | 32 + + arch/arm/mach-pxa/cpufreq-pxa2xx.c | 57 +- + arch/arm/mach-pxa/devices.c | 95 ++- + arch/arm/mach-pxa/devices.h | 1 + + arch/arm/mach-pxa/dma.c | 2 +- + arch/arm/mach-pxa/ezx.c | 5 + + arch/arm/mach-pxa/gpio.c | 59 +- + arch/arm/mach-pxa/h5000.c | 200 +++ + arch/arm/mach-pxa/include/mach/clkdev.h | 7 + + arch/arm/mach-pxa/include/mach/h5000.h | 113 ++ + arch/arm/mach-pxa/include/mach/hardware.h | 48 +- + arch/arm/mach-pxa/include/mach/io.h | 6 +- + arch/arm/mach-pxa/include/mach/memory.h | 11 +- + arch/arm/mach-pxa/include/mach/mfp-pxa25x.h | 31 + + arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 6 + + arch/arm/mach-pxa/include/mach/mioa701.h | 9 +- + arch/arm/mach-pxa/include/mach/pxa-regs.h | 507 +-------- + arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h | 5 + + arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 12 + + arch/arm/mach-pxa/include/mach/regs-ac97.h | 99 ++ + arch/arm/mach-pxa/include/mach/regs-uart.h | 143 +++ + arch/arm/mach-pxa/include/mach/uncompress.h | 2 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/magician.c | 4 + + arch/arm/mach-pxa/mainstone.c | 4 + + arch/arm/mach-pxa/mfp-pxa2xx.c | 62 +- + arch/arm/mach-pxa/mioa701.c | 203 ++-- + arch/arm/mach-pxa/pcm990-baseboard.c | 4 + + arch/arm/mach-pxa/poodle.c | 32 + + arch/arm/mach-pxa/pwm.c | 2 +- + arch/arm/mach-pxa/pxa25x.c | 89 +- + arch/arm/mach-pxa/pxa27x.c | 115 +- + arch/arm/mach-pxa/pxa300.c | 18 +- + arch/arm/mach-pxa/pxa320.c | 8 +- + arch/arm/mach-pxa/pxa3xx.c | 111 +- + arch/arm/mach-pxa/smemc.c | 2 + + arch/arm/mach-pxa/spitz.c | 36 + + arch/arm/mach-pxa/ssp.c | 2 +- + arch/arm/mach-pxa/time.c | 1 + + arch/arm/mach-pxa/tosa.c | 74 ++ + arch/arm/mach-pxa/zylonite.c | 2 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 2 +- + arch/arm/mach-realview/Kconfig | 30 + + arch/arm/mach-realview/Makefile | 1 + + arch/arm/mach-realview/Makefile.boot | 7 +- + arch/arm/mach-realview/clock.c | 80 +-- + arch/arm/mach-realview/clock.h | 6 - + arch/arm/mach-realview/core.c | 141 ++- + arch/arm/mach-realview/core.h | 5 +- + arch/arm/mach-realview/hotplug.c | 5 +- + arch/arm/mach-realview/include/mach/board-eb.h | 18 +- + arch/arm/mach-realview/include/mach/board-pb11mp.h | 3 +- + arch/arm/mach-realview/include/mach/board-pba8.h | 152 +++ + arch/arm/mach-realview/include/mach/clkdev.h | 7 + + arch/arm/mach-realview/include/mach/debug-macro.S | 29 +- + arch/arm/mach-realview/include/mach/dma.h | 20 - + arch/arm/mach-realview/include/mach/hardware.h | 9 +- + arch/arm/mach-realview/include/mach/io.h | 9 +- + arch/arm/mach-realview/include/mach/irqs.h | 1 + + arch/arm/mach-realview/include/mach/memory.h | 14 +- + arch/arm/mach-realview/include/mach/uncompress.h | 3 + + arch/arm/mach-realview/include/mach/vmalloc.h | 2 +- + arch/arm/mach-realview/localtimer.c | 44 +- + arch/arm/mach-realview/platsmp.c | 37 +- + arch/arm/mach-realview/realview_eb.c | 33 +- + arch/arm/mach-realview/realview_pb1176.c | 13 +- + arch/arm/mach-realview/realview_pb11mp.c | 16 +- + arch/arm/mach-realview/realview_pba8.c | 300 +++++ + arch/arm/mach-rpc/include/mach/io.h | 47 +- + arch/arm/mach-rpc/include/mach/irqs.h | 1 + + .../arm/mach-rpc/include/mach/{dma.h => isa-dma.h} | 8 +- + arch/arm/mach-rpc/include/mach/memory.h | 7 - + arch/arm/mach-s3c2400/include/mach/memory.h | 3 - + arch/arm/mach-s3c2410/Kconfig | 1 + + arch/arm/mach-s3c2410/dma.c | 5 +- + arch/arm/mach-s3c2410/include/mach/dma.h | 23 +- + arch/arm/mach-s3c2410/include/mach/memory.h | 3 - + arch/arm/mach-s3c2410/include/mach/system-reset.h | 2 +- + arch/arm/mach-s3c2410/mach-bast.c | 4 +- + arch/arm/mach-s3c2410/mach-h1940.c | 2 +- + arch/arm/mach-s3c2410/mach-n30.c | 4 +- + arch/arm/mach-s3c2410/mach-qt2410.c | 4 +- + arch/arm/mach-s3c2412/Kconfig | 1 + + arch/arm/mach-s3c2412/dma.c | 5 +- + arch/arm/mach-s3c2412/mach-jive.c | 6 +- + arch/arm/mach-s3c2412/mach-smdk2413.c | 2 +- + arch/arm/mach-s3c2412/mach-vstms.c | 2 +- + arch/arm/mach-s3c2412/s3c2412.c | 2 +- + arch/arm/mach-s3c2440/Kconfig | 1 + + arch/arm/mach-s3c2440/dma.c | 5 +- + arch/arm/mach-s3c2440/mach-anubis.c | 2 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +- + arch/arm/mach-s3c2440/mach-osiris.c | 2 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- + arch/arm/mach-s3c2442/Kconfig | 1 + + arch/arm/mach-s3c2443/dma.c | 5 +- + arch/arm/mach-sa1100/clock.c | 100 +-- + arch/arm/mach-sa1100/collie.c | 29 +- + arch/arm/mach-sa1100/collie_pm.c | 22 +- + arch/arm/mach-sa1100/cpu-sa1100.c | 20 +- + arch/arm/mach-sa1100/cpu-sa1110.c | 18 +- + arch/arm/mach-sa1100/dma.c | 10 +- + arch/arm/mach-sa1100/include/mach/h3600.h | 12 +- + arch/arm/mach-sa1100/include/mach/io.h | 8 +- + arch/arm/mach-sa1100/include/mach/memory.h | 13 +- + arch/arm/mach-sa1100/pleb.c | 10 +- + arch/arm/mach-sa1100/shannon.c | 2 +- + arch/arm/mach-sa1100/sleep.S | 52 +- + arch/arm/mach-sa1100/time.c | 4 +- + arch/arm/mach-shark/core.c | 2 + + arch/arm/mach-shark/include/mach/hardware.h | 2 - + arch/arm/mach-shark/include/mach/io.h | 44 +- + .../mach-shark/include/mach/{dma.h => isa-dma.h} | 3 +- + arch/arm/mach-shark/include/mach/memory.h | 4 +- + arch/arm/mach-versatile/Kconfig | 2 + + arch/arm/mach-versatile/clock.c | 80 +-- + arch/arm/mach-versatile/clock.h | 7 +- + arch/arm/mach-versatile/core.c | 56 +- + arch/arm/mach-versatile/include/mach/clkdev.h | 7 + + arch/arm/mach-versatile/include/mach/dma.h | 20 - + arch/arm/mach-versatile/include/mach/io.h | 8 +- + arch/arm/mach-versatile/include/mach/irqs.h | 86 -- + arch/arm/mach-versatile/include/mach/memory.h | 10 - + arch/arm/mach-versatile/include/mach/platform.h | 58 - + arch/arm/mach-w90x900/Kconfig | 19 + + arch/arm/mach-w90x900/Makefile | 15 + + arch/arm/mach-w90x900/Makefile.boot | 3 + + arch/arm/mach-w90x900/cpu.h | 77 ++ + arch/arm/mach-w90x900/include/mach/entry-macro.S | 34 + + arch/arm/mach-w90x900/include/mach/hardware.h | 24 + + arch/arm/mach-w90x900/include/mach/io.h | 30 + + arch/arm/mach-w90x900/include/mach/irqs.h | 45 + + arch/arm/mach-w90x900/include/mach/map.h | 76 ++ + arch/arm/mach-w90x900/include/mach/memory.h | 23 + + arch/arm/mach-w90x900/include/mach/regs-irq.h | 51 + + arch/arm/mach-w90x900/include/mach/regs-serial.h | 59 + + arch/arm/mach-w90x900/include/mach/regs-timer.h | 42 + + arch/arm/mach-w90x900/include/mach/system.h | 28 + + arch/arm/mach-w90x900/include/mach/timex.h | 25 + + arch/arm/mach-w90x900/include/mach/uncompress.h | 40 + + arch/arm/mach-w90x900/include/mach/vmalloc.h | 23 + + arch/arm/mach-w90x900/irq.c | 76 ++ + arch/arm/mach-w90x900/mach-w90p910evb.c | 72 ++ + arch/arm/mach-w90x900/time.c | 80 ++ + arch/arm/mach-w90x900/w90p910.c | 134 ++ + arch/arm/mm/Kconfig | 67 +- + arch/arm/mm/alignment.c | 1 + + arch/arm/mm/cache-v3.S | 1 - + arch/arm/mm/cache-v4.S | 1 - + arch/arm/mm/cache-v4wt.S | 1 - + arch/arm/mm/cache-v7.S | 2 + + arch/arm/mm/copypage-feroceon.S | 95 -- + arch/arm/mm/copypage-feroceon.c | 111 ++ + arch/arm/mm/copypage-v3.S | 67 - + arch/arm/mm/copypage-v3.c | 81 ++ + arch/arm/mm/copypage-v4mc.c | 53 +- + arch/arm/mm/copypage-v4wb.S | 79 -- + arch/arm/mm/copypage-v4wb.c | 94 ++ + arch/arm/mm/copypage-v4wt.S | 73 -- + arch/arm/mm/copypage-v4wt.c | 88 ++ + arch/arm/mm/copypage-v6.c | 84 +- + arch/arm/mm/copypage-xsc3.S | 97 -- + arch/arm/mm/copypage-xsc3.c | 113 ++ + arch/arm/mm/copypage-xscale.c | 47 +- + arch/arm/mm/fault.c | 6 +- + arch/arm/mm/init.c | 60 +- + arch/arm/mm/mm.h | 4 +- + arch/arm/mm/mmu.c | 125 ++- + arch/arm/mm/nommu.c | 23 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm/mm/proc-syms.c | 4 +- + arch/arm/mm/proc-v6.S | 2 + + arch/arm/mm/proc-v7.S | 19 +- + arch/arm/mm/proc-xsc3.S | 25 + + arch/arm/plat-mxc/Kconfig | 2 + + arch/arm/plat-mxc/dma-mx1-mx2.c | 2 +- + arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h | 2 +- + arch/arm/plat-mxc/include/mach/dma.h | 14 - + arch/arm/plat-mxc/include/mach/io.h | 4 +- + arch/arm/plat-mxc/include/mach/memory.h | 13 - + arch/arm/plat-omap/Kconfig | 2 + + arch/arm/plat-omap/dma.c | 2 +- + arch/arm/plat-omap/include/mach/io.h | 6 +- + arch/arm/plat-omap/include/mach/memory.h | 17 +- + .../arm/plat-s3c/include/plat}/iic.h | 0 + .../arm/plat-s3c/include/plat}/nand.h | 0 + .../arm/plat-s3c/include/plat}/regs-ac97.h | 0 + .../arm/plat-s3c/include/plat}/regs-iic.h | 0 + .../arm/plat-s3c/include/plat}/regs-nand.h | 0 + .../arm/plat-s3c/include/plat}/regs-rtc.h | 0 + .../arm/plat-s3c/include/plat}/regs-watchdog.h | 0 + arch/arm/plat-s3c/include/plat/uncompress.h | 2 +- + arch/arm/plat-s3c24xx/common-smdk.c | 2 +- + arch/arm/plat-s3c24xx/devs.c | 4 +- + arch/arm/plat-s3c24xx/dma.c | 17 +- + .../arm/plat-s3c24xx/include/plat}/mci.h | 0 + .../arm/plat-s3c24xx/include/plat}/regs-spi.h | 0 + .../arm/plat-s3c24xx/include/plat}/regs-udc.h | 0 + .../arm/plat-s3c24xx/include/plat}/udc.h | 0 + arch/arm/tools/mach-types | 101 ++- + arch/arm/vfp/vfphw.S | 27 +- + arch/arm/vfp/vfpmodule.c | 9 + + drivers/char/ds1620.c | 25 +- + drivers/char/nwflash.c | 8 +- + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/i2c/busses/i2c-s3c2410.c | 4 +- + drivers/ide/Kconfig | 2 +- + drivers/ide/ide_arm.c | 11 +- + drivers/input/keyboard/pxa27x_keypad.c | 2 +- + drivers/input/serio/Kconfig | 2 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 2 +- + drivers/media/video/pxa_camera.c | 4 +- + drivers/media/video/pxa_camera.h | 95 ++ + drivers/mfd/asic3.c | 6 +- + drivers/mfd/mcp-core.c | 2 +- + drivers/mfd/mcp-sa11x0.c | 2 +- + drivers/mfd/ucb1x00-assabet.c | 2 +- + drivers/mfd/ucb1x00-core.c | 2 +- + drivers/mfd/ucb1x00-ts.c | 2 +- + drivers/mmc/host/mmci.c | 2 +- + drivers/mmc/host/pxamci.c | 7 +- + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mtd/maps/dc21285.c | 7 +- + drivers/mtd/maps/ixp2000.c | 2 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 4 +- + drivers/mtd/nand/s3c2410.c | 8 +- + drivers/net/cs89x0.c | 6 +- + drivers/net/irda/pxaficp_ir.c | 46 +- + drivers/net/irda/sa1100_ir.c | 2 +- + drivers/net/smc911x.h | 3 + + drivers/net/smc91x.h | 3 +- + drivers/rtc/rtc-at91sam9.c | 1 + + drivers/rtc/rtc-s3c.c | 2 +- + drivers/serial/amba-pl010.c | 2 +- + drivers/serial/amba-pl011.c | 2 +- + drivers/serial/pxa.c | 3 +- + drivers/serial/serial_lh7a40x.c | 3 +- + drivers/spi/pxa2xx_spi.c | 2 +- + drivers/spi/spi_s3c24xx.c | 2 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/gadget/s3c2410_udc.c | 4 +- + drivers/usb/host/ohci-pxa27x.c | 2 +- + drivers/video/Kconfig | 2 +- + drivers/video/amba-clcd.c | 4 +- + drivers/video/pxafb.c | 20 +- + drivers/video/pxafb.h | 3 + + drivers/video/sa1100fb.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 2 +- + drivers/watchdog/sa1100_wdt.c | 1 + + sound/arm/pxa2xx-ac97-lib.c | 2 +- + sound/arm/pxa2xx-ac97.c | 1 + + sound/arm/pxa2xx-pcm.h | 2 +- + sound/oss/waveartist.c | 8 +- + sound/soc/pxa/pxa2xx-ac97.c | 1 + + sound/soc/s3c24xx/s3c2443-ac97.c | 2 +- + 447 files changed, 9397 insertions(+), 5633 deletions(-) + delete mode 100644 arch/arm/boot/compressed/head-clps7500.S + create mode 100644 arch/arm/common/clkdev.c + create mode 100644 arch/arm/configs/h5000_defconfig + create mode 100644 arch/arm/configs/neocore926_defconfig + create mode 100644 arch/arm/include/asm/clkdev.h + delete mode 100644 arch/arm/mach-aaec2000/clock.c + delete mode 100644 arch/arm/mach-aaec2000/clock.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/dma.h + create mode 100644 arch/arm/mach-at91/board-neocore926.c + delete mode 100644 arch/arm/mach-at91/include/mach/dma.h + create mode 100644 arch/arm/mach-at91/sam9_smc.c + create mode 100644 arch/arm/mach-at91/sam9_smc.h + delete mode 100644 arch/arm/mach-clps711x/include/mach/dma.h + delete mode 100644 arch/arm/mach-clps7500/Makefile + delete mode 100644 arch/arm/mach-clps7500/Makefile.boot + delete mode 100644 arch/arm/mach-clps7500/core.c + delete mode 100644 arch/arm/mach-clps7500/include/mach/acornfb.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-clps7500/include/mach/dma.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-clps7500/include/mach/hardware.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/io.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/irq.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/irqs.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/memory.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/system.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/timex.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-clps7500/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-davinci/include/mach/dma.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/dma.h + create mode 100644 arch/arm/mach-ep93xx/edb9307a.c + create mode 100644 arch/arm/mach-ep93xx/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-ep93xx/include/mach/dma.h + rename arch/arm/mach-footbridge/include/mach/{dma.h => isa-dma.h} (91%) + rename arch/arm/mach-h720x/include/mach/{dma.h => isa-dma.h} (60%) + create mode 100644 arch/arm/mach-integrator/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-integrator/include/mach/dma.h + delete mode 100644 arch/arm/mach-iop13xx/include/mach/dma.h + delete mode 100644 arch/arm/mach-iop32x/include/mach/dma.h + delete mode 100644 arch/arm/mach-iop33x/include/mach/dma.h + delete mode 100644 arch/arm/mach-ixp2000/include/mach/dma.h + delete mode 100644 arch/arm/mach-ixp23xx/include/mach/dma.h + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/dma.h + delete mode 100644 arch/arm/mach-kirkwood/include/mach/dma.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/dma.h + delete mode 100644 arch/arm/mach-l7200/include/mach/dma.h + delete mode 100644 arch/arm/mach-loki/include/mach/dma.h + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/dma.h + delete mode 100644 arch/arm/mach-netx/include/mach/dma.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/dma.h + delete mode 100644 arch/arm/mach-orion5x/include/mach/dma.h + create mode 100644 arch/arm/mach-pxa/h5000.c + create mode 100644 arch/arm/mach-pxa/include/mach/clkdev.h + create mode 100644 arch/arm/mach-pxa/include/mach/h5000.h + create mode 100644 arch/arm/mach-pxa/include/mach/regs-ac97.h + create mode 100644 arch/arm/mach-pxa/include/mach/regs-uart.h + create mode 100644 arch/arm/mach-realview/include/mach/board-pba8.h + create mode 100644 arch/arm/mach-realview/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-realview/include/mach/dma.h + create mode 100644 arch/arm/mach-realview/realview_pba8.c + rename arch/arm/mach-rpc/include/mach/{dma.h => isa-dma.h} (71%) + rename arch/arm/mach-shark/include/mach/{dma.h => isa-dma.h} (79%) + create mode 100644 arch/arm/mach-versatile/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-versatile/include/mach/dma.h + create mode 100644 arch/arm/mach-w90x900/Kconfig + create mode 100644 arch/arm/mach-w90x900/Makefile + create mode 100644 arch/arm/mach-w90x900/Makefile.boot + create mode 100644 arch/arm/mach-w90x900/cpu.h + create mode 100644 arch/arm/mach-w90x900/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-w90x900/include/mach/hardware.h + create mode 100644 arch/arm/mach-w90x900/include/mach/io.h + create mode 100644 arch/arm/mach-w90x900/include/mach/irqs.h + create mode 100644 arch/arm/mach-w90x900/include/mach/map.h + create mode 100644 arch/arm/mach-w90x900/include/mach/memory.h + create mode 100644 arch/arm/mach-w90x900/include/mach/regs-irq.h + create mode 100644 arch/arm/mach-w90x900/include/mach/regs-serial.h + create mode 100644 arch/arm/mach-w90x900/include/mach/regs-timer.h + create mode 100644 arch/arm/mach-w90x900/include/mach/system.h + create mode 100644 arch/arm/mach-w90x900/include/mach/timex.h + create mode 100644 arch/arm/mach-w90x900/include/mach/uncompress.h + create mode 100644 arch/arm/mach-w90x900/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-w90x900/irq.c + create mode 100644 arch/arm/mach-w90x900/mach-w90p910evb.c + create mode 100644 arch/arm/mach-w90x900/time.c + create mode 100644 arch/arm/mach-w90x900/w90p910.c + delete mode 100644 arch/arm/mm/copypage-feroceon.S + create mode 100644 arch/arm/mm/copypage-feroceon.c + delete mode 100644 arch/arm/mm/copypage-v3.S + create mode 100644 arch/arm/mm/copypage-v3.c + delete mode 100644 arch/arm/mm/copypage-v4wb.S + create mode 100644 arch/arm/mm/copypage-v4wb.c + delete mode 100644 arch/arm/mm/copypage-v4wt.S + create mode 100644 arch/arm/mm/copypage-v4wt.c + delete mode 100644 arch/arm/mm/copypage-xsc3.S + create mode 100644 arch/arm/mm/copypage-xsc3.c + delete mode 100644 arch/arm/plat-mxc/include/mach/dma.h + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/iic.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/nand.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-ac97.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-iic.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-nand.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-rtc.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-watchdog.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/mci.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/regs-spi.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/regs-udc.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/udc.h (100%) + create mode 100644 drivers/media/video/pxa_camera.h +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/mach-at32ap/at32ap700x.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v10/arch/byteorder.h | 10 ++++++---- + arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- + arch/cris/include/asm/byteorder.h | 20 ++++---------------- + 3 files changed, 14 insertions(+), 22 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. + arch/m68k/fpsp040/setox.S | 4 +- + arch/m68k/mac/baboon.c | 42 ++++++++++++---- + arch/m68k/mac/config.c | 3 - + arch/m68k/mac/debug.c | 1 - + arch/m68k/mac/macints.c | 9 ++-- + arch/m68k/mac/misc.c | 16 ++++-- + arch/m68k/mac/oss.c | 1 - + arch/m68k/mac/via.c | 80 ++++++++++++------------------- + drivers/ide/macide.c | 1 - + drivers/macintosh/via-cuda.c | 1 - + drivers/macintosh/via-macii.c | 1 - + drivers/macintosh/via-maciisi.c | 1 - + drivers/macintosh/via-pmu68k.c | 1 - + drivers/scsi/mac_esp.c | 100 ++++++++++++++++++++++++++------------ + drivers/scsi/mac_scsi.c | 1 - + drivers/video/console/fbcon.c | 78 ++---------------------------- + drivers/video/macfb.c | 33 ++++++------- + include/asm-m68k/byteorder.h | 16 ++---- + include/asm-m68k/machw.h | 22 --------- + 19 files changed, 173 insertions(+), 238 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 +Merge made by recursive. + arch/parisc/include/asm/byteorder.h | 37 +++++++++++----------------------- + arch/parisc/lib/iomap.c | 2 +- + arch/parisc/lib/memcpy.c | 2 +- + drivers/parisc/asp.c | 3 +- + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/dino.c | 4 +- + drivers/parisc/hppb.c | 2 +- + drivers/parisc/lasi.c | 5 +-- + drivers/parisc/lba_pci.c | 2 +- + drivers/parisc/sba_iommu.c | 7 ++--- + drivers/parisc/wax.c | 3 +- + drivers/rtc/rtc-parisc.c | 3 +- + 12 files changed, 28 insertions(+), 44 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Auto-merged arch/powerpc/boot/dts/mpc8349emitx.dts +Merge made by recursive. + arch/powerpc/Kconfig | 4 + + arch/powerpc/Kconfig.debug | 9 + + arch/powerpc/Makefile | 1 - + arch/powerpc/boot/dts/gef_sbc610.dts | 11 + + arch/powerpc/boot/dts/kuroboxHD.dts | 1 - + arch/powerpc/boot/dts/kuroboxHG.dts | 1 - + arch/powerpc/boot/dts/lite5200.dts | 1 - + arch/powerpc/boot/dts/lite5200b.dts | 1 - + arch/powerpc/boot/dts/motionpro.dts | 1 - + arch/powerpc/boot/dts/mpc8315erdb.dts | 1 - + arch/powerpc/boot/dts/mpc8349emitx.dts | 1 - + arch/powerpc/boot/dts/mpc8349emitxgp.dts | 1 - + arch/powerpc/boot/dts/mpc8377_rdb.dts | 1 - + arch/powerpc/boot/dts/mpc8378_rdb.dts | 1 - + arch/powerpc/boot/dts/mpc8379_rdb.dts | 1 - + arch/powerpc/boot/dts/mpc8572ds.dts | 113 ++++ + arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 483 ++++++++++++++++ + arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 234 ++++++++ + arch/powerpc/boot/dts/pcm030.dts | 2 - + arch/powerpc/boot/dts/tqm5200.dts | 1 - + arch/powerpc/boot/libfdt-wrapper.c | 2 +- + arch/powerpc/configs/86xx/gef_sbc610_defconfig | 8 +- + arch/powerpc/include/asm/atomic.h | 18 +- + arch/powerpc/include/asm/byteorder.h | 38 +- + arch/powerpc/include/asm/cputable.h | 6 +- + arch/powerpc/include/asm/device.h | 12 + + arch/powerpc/include/asm/dma-mapping.h | 129 +++-- + arch/powerpc/include/asm/eeh.h | 8 +- + arch/powerpc/include/asm/highmem.h | 4 +- + arch/powerpc/include/asm/local.h | 4 +- + arch/powerpc/include/asm/lppaca.h | 3 +- + arch/powerpc/include/asm/mmu-fsl-booke.h | 2 + + arch/powerpc/include/asm/mmu_context.h | 3 + + arch/powerpc/include/asm/mutex.h | 135 +++++- + arch/powerpc/include/asm/pci-bridge.h | 4 +- + arch/powerpc/include/asm/pci.h | 11 +- + arch/powerpc/include/asm/pgalloc-32.h | 11 +- + arch/powerpc/include/asm/pgalloc-64.h | 34 -- + arch/powerpc/include/asm/pgalloc.h | 41 ++ + arch/powerpc/include/asm/processor.h | 6 + + arch/powerpc/include/asm/ps3.h | 3 + + arch/powerpc/include/asm/ps3av.h | 4 - + arch/powerpc/include/asm/sfp-machine.h | 58 ++- + arch/powerpc/include/asm/smp.h | 7 + + arch/powerpc/include/asm/spinlock.h | 2 +- + arch/powerpc/include/asm/synch.h | 4 + + arch/powerpc/include/asm/system.h | 24 +- + arch/powerpc/include/asm/time.h | 20 - + arch/powerpc/include/asm/tlbflush.h | 14 + + arch/powerpc/include/asm/vdso_datapage.h | 3 + + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/dma.c | 26 + + arch/powerpc/kernel/head_fsl_booke.S | 103 +++- + arch/powerpc/kernel/ibmebus.c | 1 + + arch/powerpc/kernel/paca.c | 1 + + arch/powerpc/kernel/pci-common.c | 276 ++++++--- + arch/powerpc/kernel/pci_32.c | 101 ++--- + arch/powerpc/kernel/pci_64.c | 134 +++--- + arch/powerpc/kernel/process.c | 4 +- + arch/powerpc/kernel/prom_parse.c | 5 +- + arch/powerpc/kernel/rtas_pci.c | 48 -- + arch/powerpc/kernel/setup_64.c | 2 - + arch/powerpc/kernel/smp-tbsync.c | 12 +- + arch/powerpc/kernel/smp.c | 59 ++ + arch/powerpc/kernel/time.c | 36 +-- + arch/powerpc/kernel/traps.c | 62 ++- + arch/powerpc/kernel/vdso32/gettimeofday.S | 208 ++++--- + arch/powerpc/kernel/vdso64/gettimeofday.S | 141 +++--- + arch/powerpc/lib/copyuser_64.S | 17 +- + arch/powerpc/lib/dma-noncoherent.c | 1 - + arch/powerpc/lib/memcpy_64.S | 16 +- + arch/powerpc/math-emu/Makefile | 2 + + arch/powerpc/math-emu/fadd.c | 1 - + arch/powerpc/math-emu/fcmpo.c | 5 +- + arch/powerpc/math-emu/fdiv.c | 9 +- + arch/powerpc/math-emu/fdivs.c | 9 +- + arch/powerpc/math-emu/fmadd.c | 5 +- + arch/powerpc/math-emu/fmadds.c | 5 +- + arch/powerpc/math-emu/fmsub.c | 5 +- + arch/powerpc/math-emu/fmsubs.c | 5 +- + arch/powerpc/math-emu/fmul.c | 3 +- + arch/powerpc/math-emu/fmuls.c | 3 +- + arch/powerpc/math-emu/fnmadd.c | 5 +- + arch/powerpc/math-emu/fnmadds.c | 5 +- + arch/powerpc/math-emu/fnmsub.c | 5 +- + arch/powerpc/math-emu/fnmsubs.c | 5 +- + arch/powerpc/math-emu/fsqrt.c | 5 +- + arch/powerpc/math-emu/fsqrts.c | 5 +- + arch/powerpc/math-emu/fsub.c | 3 +- + arch/powerpc/math-emu/fsubs.c | 3 +- + arch/powerpc/math-emu/math_efp.c | 720 ++++++++++++++++++++++++ + arch/powerpc/mm/Makefile | 2 +- + arch/powerpc/mm/fault.c | 12 +- + arch/powerpc/mm/hash_low_32.S | 30 - + arch/powerpc/mm/hugetlbpage.c | 22 +- + arch/powerpc/mm/pgtable.c | 117 ++++ + arch/powerpc/mm/pgtable_32.c | 21 - + arch/powerpc/mm/tlb_64.c | 86 --- + arch/powerpc/platforms/85xx/Makefile | 2 + + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 11 +- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 6 +- + arch/powerpc/platforms/85xx/smp.c | 104 ++++ + arch/powerpc/platforms/86xx/Kconfig | 2 + + arch/powerpc/platforms/86xx/Makefile | 3 +- + arch/powerpc/platforms/86xx/gef_gpio.c | 143 +++++ + arch/powerpc/platforms/cell/iommu.c | 5 +- + arch/powerpc/platforms/powermac/setup.c | 4 +- + arch/powerpc/platforms/ps3/device-init.c | 29 +- + arch/powerpc/platforms/ps3/setup.c | 4 + + arch/powerpc/platforms/pseries/eeh.c | 44 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 163 +++--- + arch/powerpc/platforms/pseries/xics.c | 28 +- + arch/powerpc/sysdev/mpic.c | 32 +- + arch/powerpc/sysdev/qe_lib/qe.c | 3 + + arch/powerpc/sysdev/qe_lib/ucc.c | 4 +- + arch/sparc/include/asm/device.h | 12 + + drivers/char/Kconfig | 6 + + drivers/char/Makefile | 1 + + drivers/char/bsr.c | 84 ++- + drivers/char/hvc_console.c | 6 +- + drivers/char/hvc_console.h | 2 +- + drivers/char/hvc_iseries.c | 4 +- + drivers/char/hvc_udbg.c | 96 ++++ + drivers/char/hvc_vio.c | 4 +- + drivers/char/hvcs.c | 2 +- + drivers/char/hvsi.c | 2 +- + drivers/macintosh/windfarm_smu_sat.c | 5 +- + drivers/of/base.c | 35 ++ + drivers/of/gpio.c | 36 +- + drivers/of/of_i2c.c | 11 + + drivers/pci/hotplug/rpadlpar_core.c | 69 +-- + drivers/ps3/ps3av.c | 20 - + drivers/ps3/ps3av_cmd.c | 4 +- + drivers/serial/pmac_zilog.c | 27 + + drivers/video/ps3fb.c | 17 +- + include/linux/of.h | 6 + + include/linux/of_gpio.h | 38 ++- + 137 files changed, 3714 insertions(+), 1199 deletions(-) + create mode 100644 arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts + create mode 100644 arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts + create mode 100644 arch/powerpc/math-emu/math_efp.c + create mode 100644 arch/powerpc/mm/pgtable.c + create mode 100644 arch/powerpc/platforms/85xx/smp.c + create mode 100644 arch/powerpc/platforms/86xx/gef_gpio.c + create mode 100644 drivers/char/hvc_udbg.c +Merging 4xx/next +$ git merge 4xx/next +Merge made by recursive. + arch/powerpc/boot/Makefile | 1 + + arch/powerpc/boot/dts/bamboo.dts | 3 +- + arch/powerpc/boot/dts/canyonlands.dts | 3 + + arch/powerpc/configs/ppc44x_defconfig | 12 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 306 ++++++++++++++++++++++----------- + 5 files changed, 220 insertions(+), 105 deletions(-) +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Merge made by recursive. +Merging s390/features +$ git merge s390/features +Auto-merged drivers/char/Kconfig +Auto-merged drivers/char/Makefile +CONFLICT (content): Merge conflict in drivers/char/Makefile +Resolved 'drivers/char/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 072850d: Merge commit 's390/features' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 11 + + Documentation/kmsg/s390/hvc_iucv | 50 ++ + arch/powerpc/include/asm/elf.h | 2 +- + arch/powerpc/kernel/vdso.c | 3 +- + arch/s390/Kconfig | 23 +- + arch/s390/Makefile | 1 + + arch/s390/appldata/appldata.h | 4 - + arch/s390/appldata/appldata_base.c | 12 +- + arch/s390/appldata/appldata_os.c | 21 +- + arch/s390/crypto/aes_s390.c | 14 +- + arch/s390/hypfs/hypfs_diag.c | 10 +- + arch/s390/hypfs/inode.c | 14 +- + arch/s390/include/asm/auxvec.h | 2 + + arch/s390/include/asm/bug.h | 5 +- + arch/s390/include/asm/byteorder.h | 72 +-- + arch/s390/include/asm/elf.h | 16 + + arch/s390/include/asm/fcx.h | 4 +- + arch/s390/include/asm/ftrace.h | 8 + + arch/s390/include/asm/isc.h | 1 + + arch/s390/include/asm/mmu.h | 1 + + arch/s390/include/asm/page.h | 2 + + arch/s390/include/asm/processor.h | 4 +- + arch/s390/include/asm/qdio.h | 16 +- + arch/s390/include/asm/sigp.h | 1 + + arch/s390/include/asm/smp.h | 5 +- + arch/s390/include/asm/sysinfo.h | 11 + + arch/s390/include/asm/system.h | 20 +- + arch/s390/include/asm/vdso.h | 39 ++ + arch/s390/kernel/Makefile | 17 +- + arch/s390/kernel/asm-offsets.c | 15 + + arch/s390/kernel/cpcmd.c | 7 +- + arch/s390/kernel/debug.c | 37 +- + arch/s390/kernel/head.S | 49 ++ + arch/s390/kernel/head31.S | 28 +- + arch/s390/kernel/head64.S | 24 - + arch/s390/kernel/mcount.S | 56 ++ + arch/s390/kernel/processor.c | 98 ++++ + arch/s390/kernel/ptrace.c | 10 +- + arch/s390/kernel/s390_ksyms.c | 5 + + arch/s390/kernel/setup.c | 182 ++----- + arch/s390/kernel/smp.c | 192 +------ + arch/s390/kernel/time.c | 274 +++++++--- + arch/s390/kernel/topology.c | 25 +- + arch/s390/kernel/vdso.c | 232 ++++++++ + arch/s390/kernel/vdso32/Makefile | 55 ++ + arch/s390/kernel/vdso32/clock_getres.S | 39 ++ + arch/s390/kernel/vdso32/clock_gettime.S | 128 +++++ + arch/s390/kernel/vdso32/gettimeofday.S | 82 +++ + arch/s390/kernel/vdso32/note.S | 12 + + arch/s390/kernel/vdso32/vdso32.lds.S | 138 +++++ + arch/s390/kernel/vdso32/vdso32_wrapper.S | 13 + + arch/s390/kernel/vdso64/Makefile | 55 ++ + arch/s390/kernel/vdso64/clock_getres.S | 39 ++ + arch/s390/kernel/vdso64/clock_gettime.S | 89 ++++ + arch/s390/kernel/vdso64/gettimeofday.S | 56 ++ + arch/s390/kernel/vdso64/note.S | 12 + + arch/s390/kernel/vdso64/vdso64.lds.S | 138 +++++ + arch/s390/kernel/vdso64/vdso64_wrapper.S | 13 + + arch/s390/mm/extmem.c | 106 ++--- + arch/sh/include/asm/elf.h | 2 +- + arch/sh/kernel/vsyscall/vsyscall.c | 3 +- + arch/x86/include/asm/elf.h | 2 +- + arch/x86/vdso/vdso32-setup.c | 2 +- + arch/x86/vdso/vma.c | 2 +- + drivers/char/Kconfig | 10 + + drivers/char/Makefile | 1 + + drivers/char/hvc_iucv.c | 850 ++++++++++++++++++++++++++++++ + drivers/s390/block/dasd_devmap.c | 19 +- + drivers/s390/block/dasd_proc.c | 28 +- + drivers/s390/block/dcssblk.c | 77 ++-- + drivers/s390/block/xpram.c | 41 +- + drivers/s390/char/monreader.c | 41 +- + drivers/s390/char/monwriter.c | 5 +- + drivers/s390/char/sclp_cmd.c | 29 +- + drivers/s390/char/sclp_config.c | 10 +- + drivers/s390/char/sclp_cpi_sys.c | 12 +- + drivers/s390/char/sclp_sdias.c | 18 +- + drivers/s390/char/sclp_vt220.c | 33 +- + drivers/s390/char/tape.h | 2 - + drivers/s390/char/tape_34xx.c | 155 +++---- + drivers/s390/char/tape_3590.c | 360 ++++++------- + drivers/s390/char/tape_block.c | 17 +- + drivers/s390/char/tape_char.c | 7 - + drivers/s390/char/tape_core.c | 60 +-- + drivers/s390/char/tape_proc.c | 3 - + drivers/s390/char/tape_std.c | 21 +- + drivers/s390/char/vmcp.c | 11 +- + drivers/s390/char/vmlogrdr.c | 26 +- + drivers/s390/char/vmur.c | 15 +- + drivers/s390/char/zcore.c | 14 +- + drivers/s390/cio/blacklist.c | 14 +- + drivers/s390/cio/ccwgroup.c | 8 +- + drivers/s390/cio/chsc.c | 8 +- + drivers/s390/cio/cio.c | 80 ++-- + drivers/s390/cio/cmf.c | 8 +- + drivers/s390/cio/css.c | 8 +- + drivers/s390/cio/device.c | 14 +- + drivers/s390/cio/qdio.h | 25 +- + drivers/s390/cio/qdio_debug.c | 104 ++-- + drivers/s390/cio/qdio_debug.h | 112 ++--- + drivers/s390/cio/qdio_main.c | 528 ++++++++----------- + drivers/s390/cio/qdio_perf.c | 8 + + drivers/s390/cio/qdio_perf.h | 5 + + drivers/s390/cio/qdio_setup.c | 144 +++--- + drivers/s390/cio/qdio_thinint.c | 29 +- + drivers/s390/crypto/ap_bus.c | 212 +++++++- + drivers/s390/crypto/ap_bus.h | 6 +- + drivers/s390/net/ctcm_fsms.c | 46 +- + drivers/s390/net/ctcm_main.c | 72 ++- + drivers/s390/net/ctcm_main.h | 6 - + drivers/s390/net/ctcm_mpc.c | 15 +- + drivers/s390/net/ctcm_sysfs.c | 3 + + drivers/s390/net/lcs.c | 92 ++-- + drivers/s390/net/netiucv.c | 64 ++- + drivers/s390/net/qeth_core.h | 9 +- + drivers/s390/net/qeth_core_main.c | 175 ++++--- + drivers/s390/net/qeth_l2_main.c | 37 +- + drivers/s390/net/qeth_l3_main.c | 211 ++++---- + drivers/s390/scsi/zfcp_aux.c | 28 +- + drivers/s390/scsi/zfcp_ccw.c | 3 + + drivers/s390/scsi/zfcp_cfdc.c | 3 + + drivers/s390/scsi/zfcp_dbf.c | 3 + + drivers/s390/scsi/zfcp_def.h | 2 + + drivers/s390/scsi/zfcp_erp.c | 10 +- + drivers/s390/scsi/zfcp_fc.c | 3 + + drivers/s390/scsi/zfcp_fsf.c | 3 + + drivers/s390/scsi/zfcp_qdio.c | 3 + + drivers/s390/scsi/zfcp_scsi.c | 3 + + drivers/s390/scsi/zfcp_sysfs.c | 3 + + drivers/s390/sysinfo.c | 127 +++++- + fs/binfmt_elf.c | 2 +- + include/asm-generic/memory_model.h | 2 +- + include/net/iucv/iucv.h | 45 ++ + net/iucv/af_iucv.c | 19 +- + net/iucv/iucv.c | 161 +++++-- + 135 files changed, 4753 insertions(+), 2184 deletions(-) + create mode 100644 Documentation/kmsg/s390/hvc_iucv + create mode 100644 arch/s390/include/asm/ftrace.h + create mode 100644 arch/s390/include/asm/vdso.h + create mode 100644 arch/s390/kernel/mcount.S + create mode 100644 arch/s390/kernel/processor.c + create mode 100644 arch/s390/kernel/vdso.c + create mode 100644 arch/s390/kernel/vdso32/Makefile + create mode 100644 arch/s390/kernel/vdso32/clock_getres.S + create mode 100644 arch/s390/kernel/vdso32/clock_gettime.S + create mode 100644 arch/s390/kernel/vdso32/gettimeofday.S + create mode 100644 arch/s390/kernel/vdso32/note.S + create mode 100644 arch/s390/kernel/vdso32/vdso32.lds.S + create mode 100644 arch/s390/kernel/vdso32/vdso32_wrapper.S + create mode 100644 arch/s390/kernel/vdso64/Makefile + create mode 100644 arch/s390/kernel/vdso64/clock_getres.S + create mode 100644 arch/s390/kernel/vdso64/clock_gettime.S + create mode 100644 arch/s390/kernel/vdso64/gettimeofday.S + create mode 100644 arch/s390/kernel/vdso64/note.S + create mode 100644 arch/s390/kernel/vdso64/vdso64.lds.S + create mode 100644 arch/s390/kernel/vdso64/vdso64_wrapper.S + create mode 100644 drivers/char/hvc_iucv.c +Merging sh/master +$ git merge sh/master +Removed arch/sh/boards/board-rsk7203.c +Removed arch/sh/boards/mach-se/7343/io.c +Removed arch/sh/include/asm/bitops-irq.h +Removed arch/sh/include/asm/pm.h +Removed arch/sh/kernel/pm.c +Auto-merged drivers/video/Kconfig +Merge made by recursive. + arch/sh/Kconfig | 26 +- + arch/sh/Makefile | 33 +- + arch/sh/boards/Kconfig | 11 +- + arch/sh/boards/Makefile | 1 - + arch/sh/boards/board-ap325rxa.c | 3 +- + arch/sh/boards/board-rsk7203.c | 179 ------- + arch/sh/boards/mach-hp6xx/pm.c | 78 +++- + arch/sh/boards/mach-migor/setup.c | 5 +- + arch/sh/boards/mach-rsk/Kconfig | 18 + + arch/sh/boards/mach-rsk/Makefile | 2 + + arch/sh/boards/mach-rsk/devices-rsk7203.c | 103 ++++ + arch/sh/boards/mach-rsk/setup.c | 106 +++++ + arch/sh/boards/mach-se/7343/Makefile | 2 +- + arch/sh/boards/mach-se/7343/io.c | 273 ----------- + arch/sh/boards/mach-se/7343/setup.c | 126 ++++-- + arch/sh/boards/mach-se/7722/setup.c | 3 +- + arch/sh/cchips/hd6446x/hd64461.c | 115 +---- + arch/sh/configs/rsk7201_defconfig | 703 ++++++++++++++++++++++++++++ + arch/sh/configs/rsk7203_defconfig | 65 +++- + arch/sh/configs/se7343_defconfig | 303 +++++++++++-- + arch/sh/drivers/dma/dma-sh.c | 3 +- + arch/sh/drivers/dma/dma-sh.h | 1 + + arch/sh/drivers/pci/pci-sh7780.c | 12 +- + arch/sh/include/asm/addrspace.h | 11 + + arch/sh/include/asm/bitops-grb.h | 3 + + arch/sh/include/asm/bitops-irq.h | 91 ---- + arch/sh/include/asm/bitops-llsc.h | 2 + + arch/sh/include/asm/bitops-op32.h | 142 ++++++ + arch/sh/include/asm/bitops.h | 9 +- + arch/sh/include/asm/bugs.h | 2 +- + arch/sh/include/asm/ftrace.h | 28 ++- + arch/sh/include/asm/io.h | 4 + + arch/sh/include/asm/mutex-llsc.h | 112 +++++ + arch/sh/include/asm/mutex.h | 5 +- + arch/sh/include/asm/pm.h | 17 - + arch/sh/include/asm/processor.h | 5 +- + arch/sh/include/asm/processor_32.h | 4 +- + arch/sh/include/asm/processor_64.h | 2 - + arch/sh/include/asm/unaligned-sh4a.h | 258 ++++++++++ + arch/sh/include/asm/unaligned.h | 7 +- + arch/sh/include/cpu-sh3/cpu/gpio.h | 14 + + arch/sh/include/mach-se/mach/se.h | 18 + + arch/sh/include/mach-se/mach/se7343.h | 9 +- + arch/sh/kernel/Makefile_32 | 14 +- + arch/sh/kernel/Makefile_64 | 3 +- + arch/sh/kernel/cpu/clock.c | 10 + + arch/sh/kernel/cpu/init.c | 2 + + arch/sh/kernel/cpu/sh2a/Makefile | 3 +- + arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 85 ++++ + arch/sh/kernel/cpu/sh2a/probe.c | 7 +- + arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 331 +++++++++++++ + arch/sh/kernel/cpu/sh4/softfloat.c | 73 ++-- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 310 +++++++++---- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 37 +- + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 19 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 19 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 19 +- + arch/sh/kernel/disassemble.c | 573 +++++++++++++++++++++++ + arch/sh/kernel/entry-common.S | 44 -- + arch/sh/kernel/ftrace.c | 133 ++++++ + arch/sh/kernel/idle.c | 81 ++++ + arch/sh/kernel/pm.c | 88 ---- + arch/sh/kernel/process_32.c | 62 +--- + arch/sh/kernel/process_64.c | 60 --- + arch/sh/kernel/setup.c | 1 + + arch/sh/kernel/sh_ksyms_32.c | 37 +-- + arch/sh/kernel/sys_sh.c | 92 ---- + arch/sh/kernel/timers/timer-mtu2.c | 5 + + arch/sh/kernel/traps_32.c | 22 +- + arch/sh/lib/Makefile | 16 +- + arch/sh/lib/ashiftrt.S | 149 ++++++ + arch/sh/lib/ashldi3.c | 29 ++ + arch/sh/lib/ashlsi3.S | 193 ++++++++ + arch/sh/lib/ashrdi3.c | 31 ++ + arch/sh/lib/ashrsi3.S | 185 ++++++++ + arch/sh/lib/libgcc.h | 26 + + arch/sh/lib/lshrdi3.c | 29 ++ + arch/sh/lib/lshrsi3.S | 193 ++++++++ + arch/sh/lib/mcount.S | 90 ++++ + arch/sh/lib/movmem.S | 238 ++++++++++ + arch/sh/lib/udiv_qrnnd.S | 81 ++++ + arch/sh/lib/udivsi3.S | 87 ++++ + arch/sh/lib/udivsi3_i4i-Os.S | 149 ++++++ + arch/sh/lib/udivsi3_i4i.S | 666 ++++++++++++++++++++++++++ + arch/sh/lib64/c-checksum.c | 4 +- + arch/sh/mm/fault_32.c | 11 - + arch/sh/mm/ioremap_32.c | 3 +- + arch/sh/mm/mmap.c | 94 ++++ + arch/sh/oprofile/Makefile | 2 - + arch/sh/tools/mach-types | 2 + + drivers/i2c/busses/i2c-sh_mobile.c | 73 ++-- + drivers/input/keyboard/sh_keysc.c | 28 +- + drivers/media/video/Kconfig | 2 +- + drivers/media/video/sh_mobile_ceu_camera.c | 20 +- + drivers/serial/sh-sci.c | 130 +++--- + drivers/serial/sh-sci.h | 22 +- + drivers/usb/gadget/m66592-udc.c | 34 +- + drivers/usb/gadget/m66592-udc.h | 27 +- + drivers/usb/host/r8a66597-hcd.c | 34 ++- + drivers/usb/host/r8a66597.h | 8 +- + drivers/video/Kconfig | 24 +- + drivers/video/sh7760fb.c | 94 +--- + drivers/video/sh_mobile_lcdcfb.c | 46 ++- + scripts/recordmcount.pl | 11 + + 104 files changed, 6257 insertions(+), 1618 deletions(-) + delete mode 100644 arch/sh/boards/board-rsk7203.c + create mode 100644 arch/sh/boards/mach-rsk/Kconfig + create mode 100644 arch/sh/boards/mach-rsk/Makefile + create mode 100644 arch/sh/boards/mach-rsk/devices-rsk7203.c + create mode 100644 arch/sh/boards/mach-rsk/setup.c + delete mode 100644 arch/sh/boards/mach-se/7343/io.c + create mode 100644 arch/sh/configs/rsk7201_defconfig + delete mode 100644 arch/sh/include/asm/bitops-irq.h + create mode 100644 arch/sh/include/asm/bitops-op32.h + create mode 100644 arch/sh/include/asm/mutex-llsc.h + delete mode 100644 arch/sh/include/asm/pm.h + create mode 100644 arch/sh/include/asm/unaligned-sh4a.h + create mode 100644 arch/sh/kernel/cpu/sh2a/clock-sh7201.c + create mode 100644 arch/sh/kernel/cpu/sh2a/setup-sh7201.c + create mode 100644 arch/sh/kernel/disassemble.c + create mode 100644 arch/sh/kernel/ftrace.c + create mode 100644 arch/sh/kernel/idle.c + delete mode 100644 arch/sh/kernel/pm.c + create mode 100644 arch/sh/lib/ashiftrt.S + create mode 100644 arch/sh/lib/ashldi3.c + create mode 100644 arch/sh/lib/ashlsi3.S + create mode 100644 arch/sh/lib/ashrdi3.c + create mode 100644 arch/sh/lib/ashrsi3.S + create mode 100644 arch/sh/lib/libgcc.h + create mode 100644 arch/sh/lib/lshrdi3.c + create mode 100644 arch/sh/lib/lshrsi3.S + create mode 100644 arch/sh/lib/mcount.S + create mode 100644 arch/sh/lib/movmem.S + create mode 100644 arch/sh/lib/udiv_qrnnd.S + create mode 100644 arch/sh/lib/udivsi3.S + create mode 100644 arch/sh/lib/udivsi3_i4i-Os.S + create mode 100644 arch/sh/lib/udivsi3_i4i.S +Merging sparc/master +$ git merge sparc/master +Removed arch/sparc/include/asm/unistd_32.h +Removed arch/sparc/include/asm/unistd_64.h +Removed arch/sparc/kernel/prom.c +Removed arch/sparc/math-emu/ashldi3.S +Removed arch/sparc64/Kconfig +Removed arch/sparc64/Kconfig.debug +Removed arch/sparc64/Makefile +Removed arch/sparc64/boot/.gitignore +Removed arch/sparc64/boot/Makefile +Removed arch/sparc64/kernel/Makefile +Removed arch/sparc64/kernel/asm-offsets.c +Removed arch/sparc64/kernel/cpu.c +Removed arch/sparc64/kernel/idprom.c +Removed arch/sparc64/kernel/init_task.c +Removed arch/sparc64/kernel/prom.c +Removed arch/sparc64/kernel/vmlinux.lds.S +Removed arch/sparc64/lib/Makefile +Removed arch/sparc64/lib/iomap.c +Removed arch/sparc64/math-emu/Makefile +Removed arch/sparc64/mm/Makefile +Removed arch/sparc64/oprofile/Makefile +Removed arch/sparc64/oprofile/init.c +Removed arch/sparc64/prom/Makefile +Merge made by recursive. + Makefile | 9 +- + arch/sparc/Kconfig | 519 +++++-- + arch/sparc/Kconfig.debug | 26 + + arch/sparc/Makefile | 97 +- + arch/sparc/boot/.gitignore | 8 + + arch/sparc/boot/Makefile | 38 +- + arch/sparc/boot/{piggyback.c => piggyback_32.c} | 0 + .../boot/piggyback.c => sparc/boot/piggyback_64.c} | 0 + .../sparc/{defconfig => configs/sparc32_defconfig} | 0 + .../defconfig => sparc/configs/sparc64_defconfig} | 0 + arch/sparc/include/asm/Kbuild | 2 - + arch/sparc/include/asm/atomic_64.h | 7 - + arch/sparc/include/asm/bitops_64.h | 5 - + arch/sparc/include/asm/hypervisor.h | 24 + + arch/sparc/include/asm/irq_64.h | 3 + + arch/sparc/include/asm/irqflags_64.h | 6 +- + arch/sparc/include/asm/openprom_32.h | 6 +- + arch/sparc/include/asm/oplib_32.h | 6 +- + arch/sparc/include/asm/pil.h | 9 +- + arch/sparc/include/asm/spinlock_64.h | 31 +- + arch/sparc/include/asm/spitfire.h | 4 +- + arch/sparc/include/asm/system_32.h | 5 + + arch/sparc/include/asm/system_64.h | 46 +- + arch/sparc/include/asm/tsb.h | 6 - + arch/sparc/include/asm/ttable.h | 15 +- + arch/sparc/include/asm/unistd.h | 446 +++++- + arch/sparc/include/asm/unistd_32.h | 385 ----- + arch/sparc/include/asm/unistd_64.h | 380 ----- + arch/sparc/kernel/.gitignore | 1 + + arch/sparc/kernel/Makefile | 117 ++- + arch/sparc/kernel/asm-offsets.c | 19 +- + arch/{sparc64 => sparc}/kernel/audit.c | 0 + arch/sparc/kernel/{auxio.c => auxio_32.c} | 0 + .../kernel/auxio.c => sparc/kernel/auxio_64.c} | 70 +- + arch/{sparc64 => sparc}/kernel/central.c | 0 + arch/{sparc64 => sparc}/kernel/cherrs.S | 10 +- + arch/{sparc64 => sparc}/kernel/chmc.c | 0 + arch/{sparc64 => sparc}/kernel/compat_audit.c | 3 +- + arch/sparc/kernel/cpu.c | 413 ++++-- + arch/sparc/kernel/devices.c | 2 - + arch/{sparc64 => sparc}/kernel/ds.c | 0 + arch/{sparc64 => sparc}/kernel/dtlb_miss.S | 0 + arch/{sparc64 => sparc}/kernel/dtlb_prot.S | 0 + arch/{sparc64 => sparc}/kernel/ebus.c | 0 + arch/{sparc64 => sparc}/kernel/entry.h | 3 - + arch/sparc/kernel/{etrap.S => etrap_32.S} | 0 + .../kernel/etrap.S => sparc/kernel/etrap_64.S} | 6 +- + arch/{sparc64 => sparc}/kernel/fpu_traps.S | 0 + arch/{sparc64 => sparc}/kernel/ftrace.c | 0 + arch/{sparc64 => sparc}/kernel/getsetcc.S | 0 + arch/sparc/kernel/{head.S => head_32.S} | 0 + .../kernel/head.S => sparc/kernel/head_64.S} | 8 +- + arch/{sparc64 => sparc}/kernel/helpers.S | 0 + arch/{sparc64 => sparc}/kernel/hvapi.c | 0 + arch/{sparc64 => sparc}/kernel/hvcalls.S | 32 + + arch/{sparc64 => sparc}/kernel/hvtramp.S | 5 +- + arch/sparc/kernel/idprom.c | 64 +- + arch/{sparc64 => sparc}/kernel/iommu.c | 0 + arch/{sparc64 => sparc}/kernel/iommu_common.h | 0 + arch/sparc/kernel/{irq.c => irq_32.c} | 0 + .../kernel/irq.c => sparc/kernel/irq_64.c} | 63 + + arch/{sparc64 => sparc}/kernel/itlb_miss.S | 0 + arch/{sparc64 => sparc}/kernel/ivec.S | 0 + arch/sparc/kernel/kernel.h | 8 + + arch/sparc/kernel/{kgdb.c => kgdb_32.c} | 0 + .../kernel/kgdb.c => sparc/kernel/kgdb_64.c} | 0 + arch/{sparc64 => sparc}/kernel/kprobes.c | 0 + arch/{sparc64 => sparc}/kernel/kstack.h | 0 + arch/{sparc64 => sparc}/kernel/ktlb.S | 0 + arch/{sparc64 => sparc}/kernel/ldc.c | 0 + arch/{sparc64 => sparc}/kernel/mdesc.c | 0 + arch/{sparc64 => sparc}/kernel/misctrap.S | 0 + arch/sparc/kernel/{module.c => module_32.c} | 0 + .../kernel/module.c => sparc/kernel/module_64.c} | 0 + arch/sparc/kernel/{of_device.c => of_device_32.c} | 0 + .../of_device.c => sparc/kernel/of_device_64.c} | 0 + arch/{sparc64 => sparc}/kernel/pci.c | 0 + arch/{sparc64 => sparc}/kernel/pci_common.c | 0 + arch/{sparc64 => sparc}/kernel/pci_fire.c | 0 + arch/{sparc64 => sparc}/kernel/pci_impl.h | 0 + arch/{sparc64 => sparc}/kernel/pci_msi.c | 0 + arch/{sparc64 => sparc}/kernel/pci_psycho.c | 0 + arch/{sparc64 => sparc}/kernel/pci_sabre.c | 0 + arch/{sparc64 => sparc}/kernel/pci_schizo.c | 0 + arch/{sparc64 => sparc}/kernel/pci_sun4v.c | 0 + arch/{sparc64 => sparc}/kernel/pci_sun4v.h | 0 + arch/{sparc64 => sparc}/kernel/pci_sun4v_asm.S | 0 + arch/sparc/kernel/pcic.c | 2 +- + arch/{sparc64 => sparc}/kernel/power.c | 0 + arch/sparc/kernel/{process.c => process_32.c} | 2 - + .../kernel/process.c => sparc/kernel/process_64.c} | 0 + arch/sparc/kernel/prom.c | 566 ------- + arch/sparc/kernel/prom.h | 29 + + arch/sparc/kernel/prom_32.c | 295 ++++ + arch/sparc/kernel/prom_64.c | 571 +++++++ + arch/sparc/kernel/prom_common.c | 326 ++++ + arch/sparc/kernel/prom_irqtrans.c | 842 ++++++++++ + arch/{sparc64 => sparc}/kernel/psycho_common.c | 0 + arch/{sparc64 => sparc}/kernel/psycho_common.h | 0 + arch/sparc/kernel/{ptrace.c => ptrace_32.c} | 0 + .../kernel/ptrace.c => sparc/kernel/ptrace_64.c} | 0 + arch/{sparc64 => sparc}/kernel/reboot.c | 0 + arch/sparc/kernel/{rtrap.S => rtrap_32.S} | 0 + .../kernel/rtrap.S => sparc/kernel/rtrap_64.S} | 20 +- + arch/{sparc64 => sparc}/kernel/sbus.c | 0 + arch/sparc/kernel/{setup.c => setup_32.c} | 9 +- + .../kernel/setup.c => sparc/kernel/setup_64.c} | 1 + + arch/{sparc64 => sparc}/kernel/signal32.c | 0 + arch/sparc/kernel/{signal.c => signal_32.c} | 0 + .../kernel/signal.c => sparc/kernel/signal_64.c} | 0 + arch/sparc/kernel/{smp.c => smp_32.c} | 0 + .../kernel/smp.c => sparc/kernel/smp_64.c} | 15 +- + .../kernel/{sparc_ksyms.c => sparc_ksyms_32.c} | 2 - + .../kernel/sparc_ksyms_64.c} | 8 +- + arch/{sparc64 => sparc}/kernel/spiterrs.S | 2 +- + arch/{sparc64 => sparc}/kernel/sstate.c | 0 + arch/{sparc64 => sparc}/kernel/stacktrace.c | 32 +- + arch/{sparc64 => sparc}/kernel/starfire.c | 0 + arch/sparc/kernel/sun4c_irq.c | 2 + + arch/sparc/kernel/sun4d_irq.c | 1 + + arch/sparc/kernel/sun4m_irq.c | 2 + + arch/{sparc64 => sparc}/kernel/sun4v_ivec.S | 8 +- + arch/{sparc64 => sparc}/kernel/sun4v_tlb_miss.S | 0 + arch/{sparc64 => sparc}/kernel/sys32.S | 0 + arch/{sparc64 => sparc}/kernel/sys_sparc32.c | 0 + arch/sparc/kernel/{sys_sparc.c => sys_sparc_32.c} | 0 + .../sys_sparc.c => sparc/kernel/sys_sparc_64.c} | 0 + arch/{sparc64 => sparc}/kernel/syscalls.S | 0 + arch/{sparc64 => sparc}/kernel/sysfs.c | 0 + arch/{sparc64 => sparc}/kernel/systbls.h | 0 + arch/sparc/kernel/{systbls.S => systbls_32.S} | 0 + .../kernel/systbls.S => sparc/kernel/systbls_64.S} | 0 + arch/sparc/kernel/{time.c => time_32.c} | 0 + .../kernel/time.c => sparc/kernel/time_64.c} | 0 + .../sparc/kernel/{trampoline.S => trampoline_32.S} | 0 + .../trampoline.S => sparc/kernel/trampoline_64.S} | 4 - + arch/sparc/kernel/{traps.c => traps_32.c} | 0 + .../kernel/traps.c => sparc/kernel/traps_64.c} | 5 +- + arch/{sparc64 => sparc}/kernel/tsb.S | 6 +- + arch/{sparc64 => sparc}/kernel/ttable.S | 2 +- + arch/sparc/kernel/{una_asm.S => una_asm_32.S} | 0 + .../kernel/una_asm.S => sparc/kernel/una_asm_64.S} | 0 + arch/sparc/kernel/{unaligned.c => unaligned_32.c} | 0 + .../unaligned.c => sparc/kernel/unaligned_64.c} | 0 + arch/{sparc64 => sparc}/kernel/us2e_cpufreq.c | 0 + arch/{sparc64 => sparc}/kernel/us3_cpufreq.c | 0 + arch/{sparc64 => sparc}/kernel/utrap.S | 0 + arch/{sparc64 => sparc}/kernel/vio.c | 0 + arch/{sparc64 => sparc}/kernel/viohs.c | 0 + arch/{sparc64 => sparc}/kernel/visemul.c | 0 + arch/sparc/kernel/vmlinux.lds.S | 99 +- + arch/{sparc64 => sparc}/kernel/winfixup.S | 0 + arch/{sparc64 => sparc}/lib/GENbzero.S | 0 + arch/{sparc64 => sparc}/lib/GENcopy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/GENcopy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/GENmemcpy.S | 0 + arch/{sparc64 => sparc}/lib/GENpage.S | 0 + arch/{sparc64 => sparc}/lib/GENpatch.S | 0 + arch/sparc/lib/Makefile | 47 +- + arch/{sparc64 => sparc}/lib/NG2copy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/NG2copy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/NG2memcpy.S | 0 + arch/{sparc64 => sparc}/lib/NG2page.S | 0 + arch/{sparc64 => sparc}/lib/NG2patch.S | 0 + arch/{sparc64 => sparc}/lib/NGbzero.S | 0 + arch/{sparc64 => sparc}/lib/NGcopy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/NGcopy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/NGmemcpy.S | 0 + arch/{sparc64 => sparc}/lib/NGpage.S | 0 + arch/{sparc64 => sparc}/lib/NGpatch.S | 0 + arch/{sparc64 => sparc}/lib/PeeCeeI.c | 0 + arch/{sparc64 => sparc}/lib/U1copy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/U1copy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/U1memcpy.S | 0 + arch/{sparc64 => sparc}/lib/U3copy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/U3copy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/U3memcpy.S | 0 + arch/{sparc64 => sparc}/lib/U3patch.S | 0 + arch/{sparc64 => sparc}/lib/VISsave.S | 0 + arch/sparc/lib/{atomic.S => atomic_32.S} | 0 + .../lib/atomic.S => sparc/lib/atomic_64.S} | 26 - + arch/{sparc64 => sparc}/lib/bitops.S | 24 - + arch/{sparc64 => sparc}/lib/bzero.S | 0 + arch/sparc/lib/{checksum.S => checksum_32.S} | 0 + .../lib/checksum.S => sparc/lib/checksum_64.S} | 0 + arch/{sparc64 => sparc}/lib/clear_page.S | 0 + arch/{sparc64 => sparc}/lib/copy_in_user.S | 0 + arch/{sparc64 => sparc}/lib/copy_page.S | 0 + arch/{sparc64 => sparc}/lib/csum_copy.S | 0 + arch/{sparc64 => sparc}/lib/csum_copy_from_user.S | 0 + arch/{sparc64 => sparc}/lib/csum_copy_to_user.S | 0 + arch/{sparc64 => sparc}/lib/ipcsum.S | 0 + arch/{sparc64 => sparc}/lib/mcount.S | 0 + arch/sparc/lib/{memcmp.S => memcmp_32.S} | 0 + .../lib/memcmp.S => sparc/lib/memcmp_64.S} | 0 + arch/{sparc64 => sparc}/lib/memmove.S | 0 + arch/sparc/lib/{memscan.S => memscan_32.S} | 0 + .../lib/memscan.S => sparc/lib/memscan_64.S} | 0 + arch/sparc/lib/{rwsem.S => rwsem_32.S} | 0 + arch/{sparc64/lib/rwsem.S => sparc/lib/rwsem_64.S} | 7 - + arch/sparc/lib/{strlen.S => strlen_32.S} | 0 + .../lib/strlen.S => sparc/lib/strlen_64.S} | 0 + arch/sparc/lib/{strlen_user.S => strlen_user_32.S} | 0 + .../strlen_user.S => sparc/lib/strlen_user_64.S} | 0 + arch/sparc/lib/{strncmp.S => strncmp_32.S} | 0 + .../lib/strncmp.S => sparc/lib/strncmp_64.S} | 0 + ...{strncpy_from_user.S => strncpy_from_user_32.S} | 0 + .../lib/strncpy_from_user_64.S} | 0 + arch/{sparc64 => sparc}/lib/user_fixup.c | 0 + arch/{sparc64 => sparc}/lib/xor.S | 0 + arch/sparc/math-emu/Makefile | 6 +- + arch/sparc/math-emu/ashldi3.S | 36 - + arch/sparc/math-emu/{math.c => math_32.c} | 2 +- + .../math-emu/math.c => sparc/math-emu/math_64.c} | 2 +- + arch/sparc/math-emu/{sfp-util.h => sfp-util_32.h} | 0 + .../sfp-util.h => sparc/math-emu/sfp-util_64.h} | 0 + arch/sparc/mm/Makefile | 24 +- + arch/sparc/mm/{fault.c => fault_32.c} | 0 + arch/{sparc64/mm/fault.c => sparc/mm/fault_64.c} | 0 + arch/sparc/mm/{generic.c => generic_32.c} | 0 + .../mm/generic.c => sparc/mm/generic_64.c} | 0 + arch/{sparc64 => sparc}/mm/hugetlbpage.c | 0 + arch/sparc/mm/{init.c => init_32.c} | 0 + arch/{sparc64/mm/init.c => sparc/mm/init_64.c} | 6 +- + arch/{sparc64/mm/init.h => sparc/mm/init_64.h} | 0 + arch/sparc/mm/srmmu.c | 23 +- + arch/sparc/mm/sun4c.c | 2 - + arch/{sparc64 => sparc}/mm/tlb.c | 0 + arch/{sparc64 => sparc}/mm/tsb.c | 25 +- + arch/{sparc64 => sparc}/mm/ultra.S | 6 +- + arch/sparc/oprofile/init.c | 229 +++- + arch/sparc/prom/Makefile | 19 +- + arch/sparc/prom/{bootstr.c => bootstr_32.c} | 0 + .../prom/bootstr.c => sparc/prom/bootstr_64.c} | 0 + arch/{sparc64 => sparc}/prom/cif.S | 0 + arch/sparc/prom/{console.c => console_32.c} | 0 + .../prom/console.c => sparc/prom/console_64.c} | 0 + arch/sparc/prom/{devops.c => devops_32.c} | 0 + .../prom/devops.c => sparc/prom/devops_64.c} | 0 + arch/sparc/prom/{init.c => init_32.c} | 0 + arch/{sparc64/prom/init.c => sparc/prom/init_64.c} | 0 + arch/sparc/prom/{misc.c => misc_32.c} | 2 - + arch/{sparc64/prom/misc.c => sparc/prom/misc_64.c} | 0 + arch/{sparc64 => sparc}/prom/p1275.c | 0 + arch/sparc/prom/{printf.c => printf_32.c} | 0 + .../prom/printf.c => sparc/prom/printf_64.c} | 0 + arch/sparc/prom/{tree.c => tree_32.c} | 6 +- + arch/{sparc64/prom/tree.c => sparc/prom/tree_64.c} | 0 + arch/sparc64/Kconfig | 433 ----- + arch/sparc64/Kconfig.debug | 44 - + arch/sparc64/Makefile | 48 - + arch/sparc64/boot/.gitignore | 4 - + arch/sparc64/boot/Makefile | 33 - + arch/sparc64/kernel/Makefile | 36 - + arch/sparc64/kernel/asm-offsets.c | 1 - + arch/sparc64/kernel/cpu.c | 166 -- + arch/sparc64/kernel/idprom.c | 49 - + arch/sparc64/kernel/init_task.c | 35 - + arch/sparc64/kernel/prom.c | 1684 -------------------- + arch/sparc64/kernel/vmlinux.lds.S | 147 -- + arch/sparc64/lib/Makefile | 23 - + arch/sparc64/lib/iomap.c | 48 - + arch/sparc64/math-emu/Makefile | 7 - + arch/sparc64/mm/Makefile | 9 - + arch/sparc64/oprofile/Makefile | 9 - + arch/sparc64/oprofile/init.c | 23 - + arch/sparc64/prom/Makefile | 9 - + include/linux/of_platform.h | 3 +- + kernel/sysctl.c | 14 + + 269 files changed, 4208 insertions(+), 4867 deletions(-) + create mode 100644 arch/sparc/boot/.gitignore + rename arch/sparc/boot/{piggyback.c => piggyback_32.c} (100%) + rename arch/{sparc64/boot/piggyback.c => sparc/boot/piggyback_64.c} (100%) + rename arch/sparc/{defconfig => configs/sparc32_defconfig} (100%) + rename arch/{sparc64/defconfig => sparc/configs/sparc64_defconfig} (100%) + delete mode 100644 arch/sparc/include/asm/unistd_32.h + delete mode 100644 arch/sparc/include/asm/unistd_64.h + create mode 100644 arch/sparc/kernel/.gitignore + rename arch/{sparc64 => sparc}/kernel/audit.c (100%) + rename arch/sparc/kernel/{auxio.c => auxio_32.c} (100%) + rename arch/{sparc64/kernel/auxio.c => sparc/kernel/auxio_64.c} (67%) + rename arch/{sparc64 => sparc}/kernel/central.c (100%) + rename arch/{sparc64 => sparc}/kernel/cherrs.S (98%) + rename arch/{sparc64 => sparc}/kernel/chmc.c (100%) + rename arch/{sparc64 => sparc}/kernel/compat_audit.c (91%) + rename arch/{sparc64 => sparc}/kernel/ds.c (100%) + rename arch/{sparc64 => sparc}/kernel/dtlb_miss.S (100%) + rename arch/{sparc64 => sparc}/kernel/dtlb_prot.S (100%) + rename arch/{sparc64 => sparc}/kernel/ebus.c (100%) + rename arch/{sparc64 => sparc}/kernel/entry.h (99%) + rename arch/sparc/kernel/{etrap.S => etrap_32.S} (100%) + rename arch/{sparc64/kernel/etrap.S => sparc/kernel/etrap_64.S} (97%) + rename arch/{sparc64 => sparc}/kernel/fpu_traps.S (100%) + rename arch/{sparc64 => sparc}/kernel/ftrace.c (100%) + rename arch/{sparc64 => sparc}/kernel/getsetcc.S (100%) + rename arch/sparc/kernel/{head.S => head_32.S} (100%) + rename arch/{sparc64/kernel/head.S => sparc/kernel/head_64.S} (99%) + rename arch/{sparc64 => sparc}/kernel/helpers.S (100%) + rename arch/{sparc64 => sparc}/kernel/hvapi.c (100%) + rename arch/{sparc64 => sparc}/kernel/hvcalls.S (96%) + rename arch/{sparc64 => sparc}/kernel/hvtramp.S (95%) + rename arch/{sparc64 => sparc}/kernel/iommu.c (100%) + rename arch/{sparc64 => sparc}/kernel/iommu_common.h (100%) + rename arch/sparc/kernel/{irq.c => irq_32.c} (100%) + rename arch/{sparc64/kernel/irq.c => sparc/kernel/irq_64.c} (94%) + rename arch/{sparc64 => sparc}/kernel/itlb_miss.S (100%) + rename arch/{sparc64 => sparc}/kernel/ivec.S (100%) + create mode 100644 arch/sparc/kernel/kernel.h + rename arch/sparc/kernel/{kgdb.c => kgdb_32.c} (100%) + rename arch/{sparc64/kernel/kgdb.c => sparc/kernel/kgdb_64.c} (100%) + rename arch/{sparc64 => sparc}/kernel/kprobes.c (100%) + rename arch/{sparc64 => sparc}/kernel/kstack.h (100%) + rename arch/{sparc64 => sparc}/kernel/ktlb.S (100%) + rename arch/{sparc64 => sparc}/kernel/ldc.c (100%) + rename arch/{sparc64 => sparc}/kernel/mdesc.c (100%) + rename arch/{sparc64 => sparc}/kernel/misctrap.S (100%) + rename arch/sparc/kernel/{module.c => module_32.c} (100%) + rename arch/{sparc64/kernel/module.c => sparc/kernel/module_64.c} (100%) + rename arch/sparc/kernel/{of_device.c => of_device_32.c} (100%) + rename arch/{sparc64/kernel/of_device.c => sparc/kernel/of_device_64.c} (100%) + rename arch/{sparc64 => sparc}/kernel/pci.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_common.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_fire.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_impl.h (100%) + rename arch/{sparc64 => sparc}/kernel/pci_msi.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_psycho.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_sabre.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_schizo.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_sun4v.c (100%) + rename arch/{sparc64 => sparc}/kernel/pci_sun4v.h (100%) + rename arch/{sparc64 => sparc}/kernel/pci_sun4v_asm.S (100%) + rename arch/{sparc64 => sparc}/kernel/power.c (100%) + rename arch/sparc/kernel/{process.c => process_32.c} (99%) + rename arch/{sparc64/kernel/process.c => sparc/kernel/process_64.c} (100%) + delete mode 100644 arch/sparc/kernel/prom.c + create mode 100644 arch/sparc/kernel/prom.h + create mode 100644 arch/sparc/kernel/prom_32.c + create mode 100644 arch/sparc/kernel/prom_64.c + create mode 100644 arch/sparc/kernel/prom_common.c + create mode 100644 arch/sparc/kernel/prom_irqtrans.c + rename arch/{sparc64 => sparc}/kernel/psycho_common.c (100%) + rename arch/{sparc64 => sparc}/kernel/psycho_common.h (100%) + rename arch/sparc/kernel/{ptrace.c => ptrace_32.c} (100%) + rename arch/{sparc64/kernel/ptrace.c => sparc/kernel/ptrace_64.c} (100%) + rename arch/{sparc64 => sparc}/kernel/reboot.c (100%) + rename arch/sparc/kernel/{rtrap.S => rtrap_32.S} (100%) + rename arch/{sparc64/kernel/rtrap.S => sparc/kernel/rtrap_64.S} (95%) + rename arch/{sparc64 => sparc}/kernel/sbus.c (100%) + rename arch/sparc/kernel/{setup.c => setup_32.c} (98%) + rename arch/{sparc64/kernel/setup.c => sparc/kernel/setup_64.c} (99%) + rename arch/{sparc64 => sparc}/kernel/signal32.c (100%) + rename arch/sparc/kernel/{signal.c => signal_32.c} (100%) + rename arch/{sparc64/kernel/signal.c => sparc/kernel/signal_64.c} (100%) + rename arch/sparc/kernel/{smp.c => smp_32.c} (100%) + rename arch/{sparc64/kernel/smp.c => sparc/kernel/smp_64.c} (99%) + rename arch/sparc/kernel/{sparc_ksyms.c => sparc_ksyms_32.c} (99%) + rename arch/{sparc64/kernel/sparc64_ksyms.c => sparc/kernel/sparc_ksyms_64.c} (97%) + rename arch/{sparc64 => sparc}/kernel/spiterrs.S (99%) + rename arch/{sparc64 => sparc}/kernel/sstate.c (100%) + rename arch/{sparc64 => sparc}/kernel/stacktrace.c (60%) + rename arch/{sparc64 => sparc}/kernel/starfire.c (100%) + rename arch/{sparc64 => sparc}/kernel/sun4v_ivec.S (98%) + rename arch/{sparc64 => sparc}/kernel/sun4v_tlb_miss.S (100%) + rename arch/{sparc64 => sparc}/kernel/sys32.S (100%) + rename arch/{sparc64 => sparc}/kernel/sys_sparc32.c (100%) + rename arch/sparc/kernel/{sys_sparc.c => sys_sparc_32.c} (100%) + rename arch/{sparc64/kernel/sys_sparc.c => sparc/kernel/sys_sparc_64.c} (100%) + rename arch/{sparc64 => sparc}/kernel/syscalls.S (100%) + rename arch/{sparc64 => sparc}/kernel/sysfs.c (100%) + rename arch/{sparc64 => sparc}/kernel/systbls.h (100%) + rename arch/sparc/kernel/{systbls.S => systbls_32.S} (100%) + rename arch/{sparc64/kernel/systbls.S => sparc/kernel/systbls_64.S} (100%) + rename arch/sparc/kernel/{time.c => time_32.c} (100%) + rename arch/{sparc64/kernel/time.c => sparc/kernel/time_64.c} (100%) + rename arch/sparc/kernel/{trampoline.S => trampoline_32.S} (100%) + rename arch/{sparc64/kernel/trampoline.S => sparc/kernel/trampoline_64.S} (98%) + rename arch/sparc/kernel/{traps.c => traps_32.c} (100%) + rename arch/{sparc64/kernel/traps.c => sparc/kernel/traps_64.c} (99%) + rename arch/{sparc64 => sparc}/kernel/tsb.S (99%) + rename arch/{sparc64 => sparc}/kernel/ttable.S (99%) + rename arch/sparc/kernel/{una_asm.S => una_asm_32.S} (100%) + rename arch/{sparc64/kernel/una_asm.S => sparc/kernel/una_asm_64.S} (100%) + rename arch/sparc/kernel/{unaligned.c => unaligned_32.c} (100%) + rename arch/{sparc64/kernel/unaligned.c => sparc/kernel/unaligned_64.c} (100%) + rename arch/{sparc64 => sparc}/kernel/us2e_cpufreq.c (100%) + rename arch/{sparc64 => sparc}/kernel/us3_cpufreq.c (100%) + rename arch/{sparc64 => sparc}/kernel/utrap.S (100%) + rename arch/{sparc64 => sparc}/kernel/vio.c (100%) + rename arch/{sparc64 => sparc}/kernel/viohs.c (100%) + rename arch/{sparc64 => sparc}/kernel/visemul.c (100%) + rename arch/{sparc64 => sparc}/kernel/winfixup.S (100%) + rename arch/{sparc64 => sparc}/lib/GENbzero.S (100%) + rename arch/{sparc64 => sparc}/lib/GENcopy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/GENcopy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/GENmemcpy.S (100%) + rename arch/{sparc64 => sparc}/lib/GENpage.S (100%) + rename arch/{sparc64 => sparc}/lib/GENpatch.S (100%) + rename arch/{sparc64 => sparc}/lib/NG2copy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/NG2copy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/NG2memcpy.S (100%) + rename arch/{sparc64 => sparc}/lib/NG2page.S (100%) + rename arch/{sparc64 => sparc}/lib/NG2patch.S (100%) + rename arch/{sparc64 => sparc}/lib/NGbzero.S (100%) + rename arch/{sparc64 => sparc}/lib/NGcopy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/NGcopy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/NGmemcpy.S (100%) + rename arch/{sparc64 => sparc}/lib/NGpage.S (100%) + rename arch/{sparc64 => sparc}/lib/NGpatch.S (100%) + rename arch/{sparc64 => sparc}/lib/PeeCeeI.c (100%) + rename arch/{sparc64 => sparc}/lib/U1copy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/U1copy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/U1memcpy.S (100%) + rename arch/{sparc64 => sparc}/lib/U3copy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/U3copy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/U3memcpy.S (100%) + rename arch/{sparc64 => sparc}/lib/U3patch.S (100%) + rename arch/{sparc64 => sparc}/lib/VISsave.S (100%) + rename arch/sparc/lib/{atomic.S => atomic_32.S} (100%) + rename arch/{sparc64/lib/atomic.S => sparc/lib/atomic_64.S} (84%) + rename arch/{sparc64 => sparc}/lib/bitops.S (84%) + rename arch/{sparc64 => sparc}/lib/bzero.S (100%) + rename arch/sparc/lib/{checksum.S => checksum_32.S} (100%) + rename arch/{sparc64/lib/checksum.S => sparc/lib/checksum_64.S} (100%) + rename arch/{sparc64 => sparc}/lib/clear_page.S (100%) + rename arch/{sparc64 => sparc}/lib/copy_in_user.S (100%) + rename arch/{sparc64 => sparc}/lib/copy_page.S (100%) + rename arch/{sparc64 => sparc}/lib/csum_copy.S (100%) + rename arch/{sparc64 => sparc}/lib/csum_copy_from_user.S (100%) + rename arch/{sparc64 => sparc}/lib/csum_copy_to_user.S (100%) + rename arch/{sparc64 => sparc}/lib/ipcsum.S (100%) + rename arch/{sparc64 => sparc}/lib/mcount.S (100%) + rename arch/sparc/lib/{memcmp.S => memcmp_32.S} (100%) + rename arch/{sparc64/lib/memcmp.S => sparc/lib/memcmp_64.S} (100%) + rename arch/{sparc64 => sparc}/lib/memmove.S (100%) + rename arch/sparc/lib/{memscan.S => memscan_32.S} (100%) + rename arch/{sparc64/lib/memscan.S => sparc/lib/memscan_64.S} (100%) + rename arch/sparc/lib/{rwsem.S => rwsem_32.S} (100%) + rename arch/{sparc64/lib/rwsem.S => sparc/lib/rwsem_64.S} (92%) + rename arch/sparc/lib/{strlen.S => strlen_32.S} (100%) + rename arch/{sparc64/lib/strlen.S => sparc/lib/strlen_64.S} (100%) + rename arch/sparc/lib/{strlen_user.S => strlen_user_32.S} (100%) + rename arch/{sparc64/lib/strlen_user.S => sparc/lib/strlen_user_64.S} (100%) + rename arch/sparc/lib/{strncmp.S => strncmp_32.S} (100%) + rename arch/{sparc64/lib/strncmp.S => sparc/lib/strncmp_64.S} (100%) + rename arch/sparc/lib/{strncpy_from_user.S => strncpy_from_user_32.S} (100%) + rename arch/{sparc64/lib/strncpy_from_user.S => sparc/lib/strncpy_from_user_64.S} (100%) + rename arch/{sparc64 => sparc}/lib/user_fixup.c (100%) + rename arch/{sparc64 => sparc}/lib/xor.S (100%) + delete mode 100644 arch/sparc/math-emu/ashldi3.S + rename arch/sparc/math-emu/{math.c => math_32.c} (99%) + rename arch/{sparc64/math-emu/math.c => sparc/math-emu/math_64.c} (99%) + rename arch/sparc/math-emu/{sfp-util.h => sfp-util_32.h} (100%) + rename arch/{sparc64/math-emu/sfp-util.h => sparc/math-emu/sfp-util_64.h} (100%) + rename arch/sparc/mm/{fault.c => fault_32.c} (100%) + rename arch/{sparc64/mm/fault.c => sparc/mm/fault_64.c} (100%) + rename arch/sparc/mm/{generic.c => generic_32.c} (100%) + rename arch/{sparc64/mm/generic.c => sparc/mm/generic_64.c} (100%) + rename arch/{sparc64 => sparc}/mm/hugetlbpage.c (100%) + rename arch/sparc/mm/{init.c => init_32.c} (100%) + rename arch/{sparc64/mm/init.c => sparc/mm/init_64.c} (99%) + rename arch/{sparc64/mm/init.h => sparc/mm/init_64.h} (100%) + rename arch/{sparc64 => sparc}/mm/tlb.c (100%) + rename arch/{sparc64 => sparc}/mm/tsb.c (97%) + rename arch/{sparc64 => sparc}/mm/ultra.S (99%) + rename arch/sparc/prom/{bootstr.c => bootstr_32.c} (100%) + rename arch/{sparc64/prom/bootstr.c => sparc/prom/bootstr_64.c} (100%) + rename arch/{sparc64 => sparc}/prom/cif.S (100%) + rename arch/sparc/prom/{console.c => console_32.c} (100%) + rename arch/{sparc64/prom/console.c => sparc/prom/console_64.c} (100%) + rename arch/sparc/prom/{devops.c => devops_32.c} (100%) + rename arch/{sparc64/prom/devops.c => sparc/prom/devops_64.c} (100%) + rename arch/sparc/prom/{init.c => init_32.c} (100%) + rename arch/{sparc64/prom/init.c => sparc/prom/init_64.c} (100%) + rename arch/sparc/prom/{misc.c => misc_32.c} (98%) + rename arch/{sparc64/prom/misc.c => sparc/prom/misc_64.c} (100%) + rename arch/{sparc64 => sparc}/prom/p1275.c (100%) + rename arch/sparc/prom/{printf.c => printf_32.c} (100%) + rename arch/{sparc64/prom/printf.c => sparc/prom/printf_64.c} (100%) + rename arch/sparc/prom/{tree.c => tree_32.c} (97%) + rename arch/{sparc64/prom/tree.c => sparc/prom/tree_64.c} (100%) + delete mode 100644 arch/sparc64/Kconfig + delete mode 100644 arch/sparc64/Kconfig.debug + delete mode 100644 arch/sparc64/Makefile + delete mode 100644 arch/sparc64/boot/.gitignore + delete mode 100644 arch/sparc64/boot/Makefile + delete mode 100644 arch/sparc64/kernel/Makefile + delete mode 100644 arch/sparc64/kernel/asm-offsets.c + delete mode 100644 arch/sparc64/kernel/cpu.c + delete mode 100644 arch/sparc64/kernel/idprom.c + delete mode 100644 arch/sparc64/kernel/init_task.c + delete mode 100644 arch/sparc64/kernel/prom.c + delete mode 100644 arch/sparc64/kernel/vmlinux.lds.S + delete mode 100644 arch/sparc64/lib/Makefile + delete mode 100644 arch/sparc64/lib/iomap.c + delete mode 100644 arch/sparc64/math-emu/Makefile + delete mode 100644 arch/sparc64/mm/Makefile + delete mode 100644 arch/sparc64/oprofile/Makefile + delete mode 100644 arch/sparc64/oprofile/init.c + delete mode 100644 arch/sparc64/prom/Makefile +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged Documentation/kernel-parameters.txt +Removed arch/x86/kernel/signal_64.c +Merge made by recursive. + Documentation/filesystems/proc.txt | 9 +- + Documentation/kernel-parameters.txt | 33 +- + Documentation/nmi_watchdog.txt | 5 + + Documentation/x86/boot.txt | 2 +- + Documentation/x86/x86_64/boot-options.txt | 11 - + Documentation/x86/x86_64/mm.txt | 2 +- + arch/x86/Kconfig | 80 +- + arch/x86/Kconfig.debug | 20 +- + arch/x86/boot/video-vga.c | 4 +- + arch/x86/boot/video.c | 2 +- + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/configs/x86_64_defconfig | 2 +- + arch/x86/ia32/ia32_signal.c | 68 +- + arch/x86/include/asm/apic.h | 1 + + arch/x86/include/asm/bigsmp/apic.h | 2 - + arch/x86/include/asm/bitops.h | 10 +- + arch/x86/include/asm/byteorder.h | 74 +- + arch/x86/include/asm/cpufeature.h | 4 +- + arch/x86/include/asm/dma-mapping.h | 2 - + arch/x86/include/asm/dwarf2.h | 97 +- + arch/x86/include/asm/emergency-restart.h | 4 +- + arch/x86/include/asm/es7000/apic.h | 79 +- + arch/x86/include/asm/es7000/wakecpu.h | 41 +- + arch/x86/include/asm/gart.h | 33 + + arch/x86/include/asm/genapic_32.h | 19 +- + arch/x86/include/asm/genapic_64.h | 2 + + arch/x86/include/asm/hw_irq.h | 4 +- + arch/x86/include/asm/hypervisor.h | 26 + + arch/x86/include/asm/io.h | 37 +- + arch/x86/include/asm/io_64.h | 2 - + arch/x86/include/asm/io_apic.h | 10 + + arch/x86/include/asm/iommu.h | 33 - + arch/x86/include/asm/irq.h | 4 - + arch/x86/include/asm/irq_regs_32.h | 2 + + arch/x86/include/asm/kexec.h | 31 +- + arch/x86/include/asm/linkage.h | 60 + + arch/x86/include/asm/mach-default/mach_apic.h | 2 + + arch/x86/include/asm/mach-default/mach_wakecpu.h | 24 +- + arch/x86/include/asm/mach-default/smpboot_hooks.h | 8 +- + arch/x86/include/asm/mach-generic/mach_apic.h | 1 + + arch/x86/include/asm/mach-generic/mach_wakecpu.h | 12 + + arch/x86/include/asm/msr.h | 8 +- + arch/x86/include/asm/numaq/wakecpu.h | 24 +- + arch/x86/include/asm/pci.h | 2 + + arch/x86/include/asm/processor.h | 4 + + arch/x86/include/asm/reboot.h | 5 + + arch/x86/include/asm/setup.h | 7 + + arch/x86/include/asm/system.h | 2 + + arch/x86/include/asm/tsc.h | 8 +- + arch/x86/include/asm/uv/bios.h | 34 +- + arch/x86/include/asm/uv/uv_hub.h | 87 ++- + arch/x86/include/asm/vmware.h | 27 + + arch/x86/kernel/Makefile | 7 +- + arch/x86/kernel/amd_iommu.c | 1 + + arch/x86/kernel/amd_iommu_init.c | 1 + + arch/x86/kernel/aperture_64.c | 5 +- + arch/x86/kernel/apic.c | 121 +- + arch/x86/kernel/apm_32.c | 4 - + arch/x86/kernel/bios_uv.c | 60 +- + arch/x86/kernel/check.c | 161 +++ + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/cpu/common.c | 2 + + arch/x86/kernel/cpu/hypervisor.c | 58 + + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 17 +- + arch/x86/kernel/cpu/mtrr/main.c | 346 +++--- + arch/x86/kernel/cpu/vmware.c | 112 ++ + arch/x86/kernel/crash.c | 70 +- + arch/x86/kernel/ds.c | 9 +- + arch/x86/kernel/dumpstack.c | 319 +++++ + arch/x86/kernel/dumpstack.h | 39 + + arch/x86/kernel/dumpstack_32.c | 302 +----- + arch/x86/kernel/dumpstack_64.c | 282 +----- + arch/x86/kernel/early-quirks.c | 1 + + arch/x86/kernel/entry_32.S | 477 ++++---- + arch/x86/kernel/entry_64.S | 1360 +++++++++++---------- + arch/x86/kernel/es7000_32.c | 62 +- + arch/x86/kernel/genapic_64.c | 4 + + arch/x86/kernel/genx2apic_uv_x.c | 108 ++- + arch/x86/kernel/hpet.c | 4 +- + arch/x86/kernel/irq_64.c | 24 +- + arch/x86/kernel/irqinit_32.c | 2 +- + arch/x86/kernel/irqinit_64.c | 66 - + arch/x86/kernel/machine_kexec_32.c | 104 ++- + arch/x86/kernel/microcode_core.c | 6 +- + arch/x86/kernel/microcode_intel.c | 2 +- + arch/x86/kernel/nmi.c | 58 +- + arch/x86/kernel/numaq_32.c | 10 +- + arch/x86/kernel/pci-dma.c | 7 +- + arch/x86/kernel/process.c | 16 + + arch/x86/kernel/ptrace.c | 9 +- + arch/x86/kernel/reboot.c | 126 ++- + arch/x86/kernel/relocate_kernel_32.S | 115 -- + arch/x86/kernel/setup.c | 168 +--- + arch/x86/kernel/{signal_32.c => signal.c} | 569 ++++++--- + arch/x86/kernel/signal_64.c | 516 -------- + arch/x86/kernel/smp.c | 13 - + arch/x86/kernel/smpboot.c | 17 +- + arch/x86/kernel/time_64.c | 2 + + arch/x86/kernel/tlb_uv.c | 4 - + arch/x86/kernel/tsc.c | 42 +- + arch/x86/kernel/tsc_sync.c | 8 +- + arch/x86/kernel/vsyscall_64.c | 9 + + arch/x86/lguest/boot.c | 3 +- + arch/x86/mach-generic/bigsmp.c | 1 + + arch/x86/mach-generic/default.c | 1 + + arch/x86/mach-generic/es7000.c | 14 +- + arch/x86/mach-generic/probe.c | 16 +- + arch/x86/mach-generic/summit.c | 1 + + arch/x86/mm/fault.c | 11 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 2 - + arch/x86/pci/common.c | 17 + + arch/x86/pci/direct.c | 4 +- + arch/x86/pci/pci.h | 1 + + drivers/acpi/pci_irq.c | 56 + + drivers/firmware/dmi_scan.c | 11 + + drivers/misc/sgi-gru/gruprocfs.c | 1 - + drivers/misc/sgi-xp/xp.h | 7 +- + drivers/misc/sgi-xp/xp_main.c | 7 + + drivers/misc/sgi-xp/xp_sn2.c | 34 + + drivers/misc/sgi-xp/xp_uv.c | 70 +- + drivers/misc/sgi-xp/xpc.h | 12 + + drivers/misc/sgi-xp/xpc_sn2.c | 15 +- + drivers/misc/sgi-xp/xpc_uv.c | 290 ++++- + drivers/pci/quirks.c | 170 +++- + include/linux/dmi.h | 2 + + include/linux/kexec.h | 4 + + include/linux/linkage.h | 8 - + include/linux/pci.h | 6 + + include/linux/pci_ids.h | 5 + + 131 files changed, 4255 insertions(+), 3419 deletions(-) + create mode 100644 arch/x86/include/asm/hypervisor.h + create mode 100644 arch/x86/include/asm/mach-generic/mach_wakecpu.h + create mode 100644 arch/x86/include/asm/vmware.h + create mode 100644 arch/x86/kernel/check.c + create mode 100644 arch/x86/kernel/cpu/hypervisor.c + create mode 100644 arch/x86/kernel/cpu/vmware.c + create mode 100644 arch/x86/kernel/dumpstack.c + create mode 100644 arch/x86/kernel/dumpstack.h + rename arch/x86/kernel/{signal_32.c => signal.c} (75%) + delete mode 100644 arch/x86/kernel/signal_64.c +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. + arch/xtensa/Makefile | 28 +-- + arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- + arch/xtensa/boot/boot-redboot/bootstrap.S | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/Kbuild | 0 + .../xtensa/include/asm}/asmmacro.h | 2 +- + .../xtensa/include/asm}/atomic.h | 0 + .../xtensa/include/asm}/auxvec.h | 0 + .../xtensa/include/asm}/bitops.h | 0 + .../xtensa/include/asm}/bootparam.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bug.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bugs.h | 0 + .../xtensa/include/asm}/byteorder.h | 32 ++-- + .../asm-xtensa => arch/xtensa/include/asm}/cache.h | 2 +- + .../xtensa/include/asm}/cacheasm.h | 0 + .../xtensa/include/asm}/cacheflush.h | 0 + .../xtensa/include/asm}/checksum.h | 2 +- + .../xtensa/include/asm}/coprocessor.h | 4 +- + .../xtensa/include/asm}/cpumask.h | 0 + .../xtensa/include/asm}/cputime.h | 0 + .../xtensa/include/asm}/current.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/delay.h | 0 + .../xtensa/include/asm}/device.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/div64.h | 0 + .../xtensa/include/asm}/dma-mapping.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/dma.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/elf.h | 0 + .../xtensa/include/asm}/emergency-restart.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/errno.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fb.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fcntl.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/futex.h | 0 + .../xtensa/include/asm}/hardirq.h | 0 + .../xtensa/include/asm}/highmem.h | 0 + .../xtensa/include/asm}/hw_irq.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/io.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/ioctl.h | 0 + .../xtensa/include/asm}/ioctls.h | 0 + .../xtensa/include/asm}/ipcbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/irq.h | 4 +- + .../xtensa/include/asm}/irq_regs.h | 0 + .../xtensa/include/asm}/kdebug.h | 0 + .../xtensa/include/asm}/kmap_types.h | 0 + .../xtensa/include/asm}/linkage.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/local.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mman.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mmu.h | 0 + .../xtensa/include/asm}/mmu_context.h | 0 + .../xtensa/include/asm}/module.h | 0 + .../xtensa/include/asm}/msgbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mutex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/page.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/param.h | 0 + .../xtensa/include/asm}/pci-bridge.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/pci.h | 0 + .../xtensa/include/asm}/percpu.h | 0 + .../xtensa/include/asm}/pgalloc.h | 0 + .../xtensa/include/asm}/pgtable.h | 0 + .../xtensa/include/asm}/platform.h | 2 - + .../asm-xtensa => arch/xtensa/include/asm}/poll.h | 0 + .../xtensa/include/asm}/posix_types.h | 0 + .../xtensa/include/asm}/processor.h | 2 +- + .../xtensa/include/asm}/ptrace.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/regs.h | 0 + .../xtensa/include/asm}/resource.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rmap.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rwsem.h | 0 + .../xtensa/include/asm}/scatterlist.h | 0 + .../xtensa/include/asm}/sections.h | 0 + .../xtensa/include/asm}/segment.h | 0 + .../xtensa/include/asm}/sembuf.h | 0 + .../xtensa/include/asm}/serial.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/setup.h | 0 + .../xtensa/include/asm}/shmbuf.h | 0 + .../xtensa/include/asm}/shmparam.h | 0 + .../xtensa/include/asm}/sigcontext.h | 0 + .../xtensa/include/asm}/siginfo.h | 0 + .../xtensa/include/asm}/signal.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/smp.h | 0 + .../xtensa/include/asm}/socket.h | 0 + .../xtensa/include/asm}/sockios.h | 0 + .../xtensa/include/asm}/spinlock.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/stat.h | 0 + .../xtensa/include/asm}/statfs.h | 0 + .../xtensa/include/asm}/string.h | 0 + .../xtensa/include/asm}/syscall.h | 0 + .../xtensa/include/asm}/system.h | 0 + .../xtensa/include/asm}/termbits.h | 0 + .../xtensa/include/asm}/termios.h | 0 + .../xtensa/include/asm}/thread_info.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/timex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/tlb.h | 0 + .../xtensa/include/asm}/tlbflush.h | 0 + .../xtensa/include/asm}/topology.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/types.h | 0 + .../xtensa/include/asm}/uaccess.h | 0 + .../xtensa/include/asm}/ucontext.h | 0 + .../xtensa/include/asm}/unaligned.h | 12 +- + .../xtensa/include/asm}/unistd.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/user.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/vga.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/xor.h | 0 + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/lib/checksum.S | 2 +- + arch/xtensa/lib/memcopy.S | 2 +- + arch/xtensa/lib/memset.S | 2 +- + arch/xtensa/lib/strncpy_user.S | 2 +- + arch/xtensa/lib/strnlen_user.S | 2 +- + arch/xtensa/lib/usercopy.S | 2 +- + arch/xtensa/platforms/iss/console.c | 4 +- + .../platforms/iss/include/platform}/hardware.h | 0 + .../platforms/iss/include/platform}/simcall.h | 0 + arch/xtensa/platforms/iss/io.c | 2 +- + arch/xtensa/platforms/iss/network.c | 4 +- + arch/xtensa/platforms/xt2000/Makefile | 5 + + .../platforms/xt2000/include/platform/hardware.h | 55 ++++++ + .../platforms/xt2000/include/platform/serial.h | 28 +++ + arch/xtensa/platforms/xt2000/setup.c | 181 ++++++++++++++++++++ + .../xtensa/variants/dc232b/include/variant}/core.h | 0 + .../variants/dc232b/include/variant}/tie-asm.h | 0 + .../xtensa/variants/dc232b/include/variant}/tie.h | 0 + .../xtensa/variants/fsf/include/variant}/core.h | 0 + .../xtensa/variants/fsf/include/variant}/tie-asm.h | 0 + .../xtensa/variants/fsf/include/variant}/tie.h | 0 + 124 files changed, 324 insertions(+), 69 deletions(-) + rename {include/asm-xtensa => arch/xtensa/include/asm}/Kbuild (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/asmmacro.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/atomic.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/auxvec.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bitops.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bootparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bugs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/byteorder.h (82%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cache.h (96%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheasm.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/checksum.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/coprocessor.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cpumask.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cputime.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/current.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/delay.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/device.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/div64.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma-mapping.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/elf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/emergency-restart.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/errno.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fcntl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/futex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hardirq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/highmem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hw_irq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/io.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctls.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ipcbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq.h (89%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq_regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kdebug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kmap_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/linkage.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/local.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mman.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu_context.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/module.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/msgbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mutex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/page.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/param.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci-bridge.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/percpu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgalloc.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgtable.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/platform.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/poll.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/posix_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/processor.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ptrace.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/resource.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rmap.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rwsem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/scatterlist.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sections.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/segment.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sembuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/serial.h (92%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/setup.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sigcontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/siginfo.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/signal.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/smp.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/socket.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sockios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/spinlock.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/stat.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/statfs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/string.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/syscall.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/system.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termbits.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/thread_info.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/timex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlbflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/topology.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/uaccess.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ucontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unaligned.h (80%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unistd.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/user.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/vga.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/xor.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/hardware.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/simcall.h (100%) + create mode 100644 arch/xtensa/platforms/xt2000/Makefile + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xt2000/setup.c + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie.h (100%) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged arch/arm/mach-aaec2000/core.c +Auto-merged arch/arm/mach-ep93xx/core.c +Auto-merged arch/arm/mach-integrator/core.c +Auto-merged arch/arm/mach-integrator/integrator_cp.c +Auto-merged arch/arm/mach-netx/fb.c +Auto-merged arch/arm/mach-realview/core.h +Auto-merged arch/arm/plat-omap/include/mach/memory.h +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/powerpc/kernel/ibmebus.c +Auto-merged arch/powerpc/platforms/85xx/mpc85xx_mds.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c +Auto-merged block/bsg.c +Auto-merged block/genhd.c +Auto-merged drivers/message/i2o/iop.c +Auto-merged drivers/misc/sgi-xp/xp_main.c +Auto-merged drivers/mtd/maps/ixp2000.c +Auto-merged drivers/mtd/maps/ixp4xx.c +Auto-merged drivers/scsi/sd.c +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Auto-merged drivers/usb/gadget/pxa27x_udc.c +Auto-merged drivers/usb/gadget/s3c2410_udc.c +Auto-merged include/linux/pci.h +Resolved 'arch/powerpc/platforms/85xx/mpc85xx_mds.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit c028b62: Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + arch/arm/kernel/ecard.c | 2 +- + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 6 +- + arch/arm/mach-integrator/core.c | 10 +- + arch/arm/mach-integrator/integrator_cp.c | 6 +- + arch/arm/mach-lh7a40x/clcd.c | 2 +- + arch/arm/mach-netx/fb.c | 2 +- + arch/arm/mach-realview/core.h | 2 +- + arch/arm/mach-versatile/core.h | 2 +- + arch/arm/plat-omap/include/mach/memory.h | 2 +- + arch/avr32/mach-at32ap/clock.c | 4 +- + arch/cris/arch-v32/drivers/iop_fw_load.c | 6 +- + arch/ia64/kernel/pci-dma.c | 2 +- + arch/ia64/sn/kernel/tiocx.c | 3 +- + arch/mips/kernel/vpe.c | 2 +- + arch/powerpc/kernel/ibmebus.c | 2 +- + arch/powerpc/kernel/of_device.c | 18 ++--- + arch/powerpc/kernel/vio.c | 12 ++-- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 6 +- + arch/powerpc/platforms/ps3/system-bus.c | 28 +++---- + block/bsg.c | 6 +- + block/genhd.c | 2 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/base/attribute_container.c | 2 +- + drivers/base/bus.c | 12 ++-- + drivers/base/core.c | 36 ++++---- + drivers/base/dd.c | 12 ++-- + drivers/base/firmware_class.c | 8 +-- + drivers/base/isa.c | 7 +- + drivers/base/platform.c | 130 +++++++++++++++-------------- + drivers/base/power/main.c | 21 +++-- + drivers/base/power/trace.c | 4 +- + drivers/char/mwave/mwavedd.c | 2 +- + drivers/firmware/dmi-id.c | 2 +- + drivers/gpio/gpiolib.c | 2 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/lm75.c | 2 +- + drivers/idle/i7300_idle.c | 2 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/core/ucm.c | 3 +- + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + drivers/isdn/mISDN/dsp_pipeline.c | 2 +- + drivers/macintosh/macio_asic.c | 24 +++--- + drivers/memstick/core/memstick.c | 5 +- + drivers/memstick/core/mspro_block.c | 14 ++-- + drivers/memstick/host/tifm_ms.c | 4 +- + drivers/message/i2o/device.c | 8 +- + drivers/message/i2o/i2o_proc.c | 2 +- + drivers/message/i2o/iop.c | 2 +- + drivers/misc/enclosure.c | 8 +- + drivers/misc/sgi-gru/grumain.c | 2 +- + drivers/misc/sgi-xp/xp_main.c | 2 +- + drivers/misc/sgi-xp/xpc_main.c | 8 +- + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/misc/tifm_7xx1.c | 2 +- + drivers/misc/tifm_core.c | 7 +- + drivers/mtd/devices/m25p80.c | 16 ++-- + drivers/mtd/devices/mtd_dataflash.c | 30 ++++---- + drivers/mtd/maps/integrator-flash.c | 2 +- + drivers/mtd/maps/ixp2000.c | 4 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/maps/omap_nor.c | 2 +- + drivers/mtd/maps/physmap.c | 6 +- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/nand/fsl_upm.c | 2 +- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/mtd/onenand/generic.c | 2 +- + drivers/mtd/onenand/omap2.c | 2 +- + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/vmt.c | 4 +- + drivers/pci/pci-driver.c | 46 ++++------ + drivers/pnp/card.c | 7 +- + drivers/pnp/core.c | 5 +- + drivers/pnp/system.c | 2 +- + drivers/power/ds2760_battery.c | 4 +- + drivers/rapidio/rio-scan.c | 8 +- + drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/hosts.c | 6 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_dump.c | 2 +- + drivers/scsi/libsas/sas_port.c | 2 +- + drivers/scsi/raid_class.c | 3 +- + drivers/scsi/scsi_debug.c | 4 +- + drivers/scsi/scsi_ioctl.c | 3 +- + drivers/scsi/scsi_scan.c | 7 +- + drivers/scsi/scsi_sysfs.c | 12 +-- + drivers/scsi/scsi_transport_fc.c | 18 ++-- + drivers/scsi/scsi_transport_iscsi.c | 11 +-- + drivers/scsi/scsi_transport_sas.c | 42 +++++----- + drivers/scsi/scsi_transport_srp.c | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/ses.c | 2 +- + drivers/serial/serial_core.c | 4 +- + drivers/spi/spi.c | 20 ++--- + drivers/spi/spi_bitbang.c | 2 +- + drivers/spi/spi_butterfly.c | 2 +- + drivers/spi/spi_lm70llp.c | 2 +- + drivers/ssb/main.c | 11 +-- + drivers/ssb/pcihost_wrapper.c | 2 +- + drivers/thermal/thermal_sys.c | 6 +- + drivers/uio/uio_cif.c | 3 +- + drivers/uio/uio_pdrv_genirq.c | 5 +- + drivers/usb/core/usb.c | 4 +- + drivers/usb/gadget/at91_udc.c | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/lh7a40x_udc.c | 2 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/gadget/s3c2410_udc.c | 2 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/lcd.c | 2 +- + drivers/video/output.c | 2 +- + drivers/w1/w1.c | 19 ++-- + drivers/w1/w1_int.c | 3 +- + drivers/xen/xenbus/xenbus_probe.c | 27 ++++--- + drivers/xen/xenbus/xenbus_probe.h | 4 +- + fs/char_dev.c | 30 +++---- + fs/partitions/check.c | 11 +-- + include/linux/cdev.h | 1 + + include/linux/device.h | 13 ++-- + include/linux/init.h | 1 + + include/linux/klist.h | 2 - + include/linux/mtd/concat.h | 2 +- + include/linux/pci.h | 1 - + include/linux/platform_device.h | 1 - + include/linux/pm.h | 88 +++++++------------- + include/linux/rio_drv.h | 4 +- + init/Kconfig | 44 ++++++---- + init/main.c | 9 ++ + kernel/ksysfs.c | 4 +- + kernel/power/main.c | 6 +- + lib/klist.c | 43 +++++++++- + lib/kobject.c | 50 +++++++++++ + lib/kobject_uevent.c | 8 +- + lib/swiotlb.c | 2 +- + 141 files changed, 624 insertions(+), 585 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged drivers/usb/gadget/m66592-udc.c +Auto-merged drivers/usb/gadget/pxa25x_udc.c +Auto-merged drivers/usb/gadget/pxa27x_udc.c +Auto-merged drivers/usb/gadget/s3c2410_udc.c +Auto-merged drivers/usb/host/r8a66597-hcd.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 29 + + Documentation/usb/power-management.txt | 22 +- + MAINTAINERS | 1 + + arch/arm/plat-mxc/include/mach/usb.h | 23 + + arch/arm/plat-omap/usb.c | 32 - + arch/powerpc/boot/dts/sequoia.dts | 2 +- + drivers/Makefile | 1 + + drivers/block/ub.c | 11 +- + drivers/hid/usbhid/hid-core.c | 9 +- + drivers/i2c/chips/Kconfig | 12 - + drivers/i2c/chips/Makefile | 1 - + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/net/usb/kaweth.c | 6 +- + drivers/net/usb/pegasus.c | 12 +- + drivers/usb/Kconfig | 2 + + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/class/cdc-wdm.c | 3 +- + drivers/usb/class/usbtmc.c | 9 +- + drivers/usb/core/devio.c | 5 - + drivers/usb/core/driver.c | 172 +- + drivers/usb/core/generic.c | 10 +- + drivers/usb/core/hcd.c | 14 +- + drivers/usb/core/hcd.h | 12 +- + drivers/usb/core/hub.c | 77 +- + drivers/usb/core/message.c | 47 +- + drivers/usb/core/sysfs.c | 41 +- + drivers/usb/core/usb.c | 40 +- + drivers/usb/core/usb.h | 16 +- + drivers/usb/gadget/Kconfig | 39 + + drivers/usb/gadget/Makefile | 2 + + drivers/usb/gadget/ci13xxx_udc.c | 2830 ++++++++++++++++++ + drivers/usb/gadget/ci13xxx_udc.h | 195 ++ + drivers/usb/gadget/epautoconf.c | 2 +- + drivers/usb/gadget/file_storage.c | 176 +- + drivers/usb/gadget/fsl_qe_udc.c | 12 +- + drivers/usb/gadget/gadget_chips.h | 8 +- + drivers/usb/gadget/imx_udc.c | 1494 +++++++++ + drivers/usb/gadget/imx_udc.h | 327 ++ + drivers/usb/gadget/m66592-udc.c | 9 +- + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/gadget/omap_udc.c | 4 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 - + drivers/usb/gadget/s3c2410_udc.c | 34 +- + drivers/usb/host/Kconfig | 13 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-dbg.c | 8 +- + drivers/usb/host/ehci-hub.c | 27 +- + drivers/usb/host/ehci-ppc-of.c | 45 +- + drivers/usb/host/ehci.h | 34 + + drivers/usb/host/ohci-pnx4008.c | 85 +- + drivers/usb/host/ohci-ppc-of.c | 25 + + drivers/usb/host/ohci-tmio.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 3985 +++++++++++++++++++++++++ + drivers/usb/host/oxu210hp.h | 447 +++ + drivers/usb/host/pci-quirks.c | 14 +- + drivers/usb/host/r8a66597-hcd.c | 8 +- + drivers/usb/image/microtek.c | 11 +- + drivers/usb/misc/berry_charge.c | 5 + + drivers/usb/misc/usbtest.c | 2 - + drivers/usb/mon/Kconfig | 13 +- + drivers/usb/mon/Makefile | 3 +- + drivers/usb/musb/davinci.c | 18 +- + drivers/usb/musb/musb_core.c | 32 +- + drivers/usb/musb/musb_core.h | 3 +- + drivers/usb/musb/musb_gadget.c | 2 +- + drivers/usb/musb/musb_host.c | 23 +- + drivers/usb/musb/musbhsdma.c | 2 +- + drivers/usb/musb/omap2430.c | 15 +- + drivers/usb/musb/tusb6010.c | 7 +- + drivers/usb/otg/Kconfig | 44 + + drivers/usb/otg/Makefile | 17 + + drivers/usb/otg/gpio_vbus.c | 335 +++ + drivers/{i2c/chips => usb/otg}/isp1301_omap.c | 0 + drivers/usb/otg/otg.c | 59 + + drivers/usb/serial/Kconfig | 17 + + drivers/usb/serial/Makefile | 2 + + drivers/usb/serial/ipw.c | 4 +- + drivers/usb/serial/opticon.c | 358 +++ + drivers/usb/serial/siemens_mpi.c | 77 + + drivers/usb/storage/protocol.c | 24 +- + drivers/usb/storage/protocol.h | 3 +- + drivers/usb/storage/scsiglue.c | 12 + + drivers/usb/storage/transport.c | 109 +- + drivers/usb/storage/transport.h | 2 - + drivers/usb/storage/unusual_devs.h | 137 +- + drivers/usb/storage/usb.c | 127 +- + drivers/usb/storage/usb.h | 1 - + drivers/usb/wusbcore/rh.c | 2 +- + include/linux/oxu210hp.h | 7 + + include/linux/usb.h | 21 +- + include/linux/usb/association.h | 22 +- + include/linux/usb/gpio_vbus.h | 30 + + include/linux/usb/otg.h | 1 + + include/linux/usb_usual.h | 5 +- + 95 files changed, 11440 insertions(+), 557 deletions(-) + create mode 100644 arch/arm/plat-mxc/include/mach/usb.h + create mode 100644 drivers/usb/gadget/ci13xxx_udc.c + create mode 100644 drivers/usb/gadget/ci13xxx_udc.h + create mode 100644 drivers/usb/gadget/imx_udc.c + create mode 100644 drivers/usb/gadget/imx_udc.h + create mode 100644 drivers/usb/host/oxu210hp-hcd.c + create mode 100644 drivers/usb/host/oxu210hp.h + create mode 100644 drivers/usb/otg/Kconfig + create mode 100644 drivers/usb/otg/Makefile + create mode 100644 drivers/usb/otg/gpio_vbus.c + rename drivers/{i2c/chips => usb/otg}/isp1301_omap.c (100%) + create mode 100644 drivers/usb/otg/otg.c + create mode 100644 drivers/usb/serial/opticon.c + create mode 100644 drivers/usb/serial/siemens_mpi.c + create mode 100644 include/linux/oxu210hp.h + create mode 100644 include/linux/usb/gpio_vbus.h +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged kernel/posix-cpu-timers.c +Merge made by recursive. + Documentation/lockstat.txt | 51 ++++-- + arch/um/include/asm/system.h | 14 +- + arch/x86/include/asm/percpu.h | 83 +++++++++- + arch/x86/include/asm/uaccess.h | 2 + + arch/x86/include/asm/uaccess_32.h | 8 +- + arch/x86/include/asm/uaccess_64.h | 6 + + arch/x86/lib/usercopy_32.c | 8 +- + arch/x86/lib/usercopy_64.c | 4 +- + include/asm-generic/bug.h | 7 +- + include/asm-generic/percpu.h | 11 ++- + include/asm-generic/sections.h | 10 ++ + include/asm-generic/vmlinux.lds.h | 16 ++ + include/linux/bottom_half.h | 1 - + include/linux/debug_locks.h | 2 +- + include/linux/futex.h | 5 +- + include/linux/kernel.h | 11 ++ + include/linux/lockdep.h | 31 +++- + include/linux/mutex.h | 2 + + include/linux/percpu.h | 17 ++- + include/linux/rcuclassic.h | 2 +- + include/linux/uaccess.h | 2 +- + kernel/exit.c | 2 +- + kernel/extable.c | 16 ++ + kernel/futex.c | 314 ++++++++++++++----------------------- + kernel/irq/manage.c | 12 ++ + kernel/lockdep.c | 40 +++-- + kernel/lockdep_proc.c | 28 +++- + kernel/module.c | 7 +- + kernel/mutex.c | 10 +- + kernel/notifier.c | 8 + + kernel/panic.c | 32 ++--- + kernel/posix-cpu-timers.c | 10 +- + kernel/rcuclassic.c | 4 +- + kernel/sched.c | 3 +- + kernel/softirq.c | 14 -- + kernel/softlockup.c | 2 +- + kernel/sys.c | 2 +- + lib/Kconfig.debug | 18 ++ + lib/debugobjects.c | 4 +- + mm/memory.c | 15 ++ + 40 files changed, 508 insertions(+), 326 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Already up-to-date. +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/vsyscall_64.c +Auto-merged arch/x86/mm/fault.c +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/sched.h +Auto-merged include/linux/tty.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/module.c +Auto-merged kernel/power/main.c +Auto-merged kernel/sched.c +Auto-merged kernel/sysctl.c +Auto-merged scripts/recordmcount.pl +CONFLICT (content): Merge conflict in scripts/recordmcount.pl +Resolved 'scripts/recordmcount.pl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 183e180: Merge commit 'ftrace/auto-ftrace-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ftrace.txt | 62 +- + Documentation/kernel-parameters.txt | 8 + + Documentation/markers.txt | 14 + + Documentation/tracepoints.txt | 92 ++-- + arch/powerpc/include/asm/ftrace.h | 14 +- + arch/powerpc/include/asm/module.h | 16 +- + arch/powerpc/kernel/ftrace.c | 473 +++++++++++++-- + arch/powerpc/kernel/idle.c | 5 + + arch/powerpc/kernel/module_32.c | 10 + + arch/powerpc/kernel/module_64.c | 13 + + arch/x86/Kconfig | 3 + + arch/x86/Kconfig.debug | 4 - + arch/x86/include/asm/ftrace.h | 34 +- + arch/x86/include/asm/thread_info.h | 2 + + arch/x86/kernel/Makefile | 6 + + arch/x86/kernel/entry_32.S | 42 ++- + arch/x86/kernel/entry_64.S | 5 + + arch/x86/kernel/ftrace.c | 312 +++++++++- + arch/x86/kernel/stacktrace.c | 64 ++ + arch/x86/kernel/vsyscall_64.c | 3 + + arch/x86/mm/Makefile | 3 +- + arch/x86/mm/fault.c | 2 +- + arch/x86/vdso/vclock_gettime.c | 3 + + drivers/char/sysrq.c | 18 +- + fs/seq_file.c | 14 +- + include/asm-generic/vmlinux.lds.h | 21 +- + include/linux/compiler.h | 84 +++- + include/linux/ftrace.h | 146 ++++- + include/linux/ftrace_irq.h | 13 + + include/linux/hardirq.h | 15 +- + include/linux/marker.h | 69 ++- + include/linux/rcupdate.h | 2 + + include/linux/ring_buffer.h | 1 + + include/linux/sched.h | 11 + + include/linux/seq_file.h | 1 + + include/linux/stacktrace.h | 8 + + include/linux/tracepoint.h | 57 ++- + include/linux/tty.h | 2 +- + include/trace/boot.h | 56 ++ + include/trace/sched.h | 24 +- + init/Kconfig | 1 + + init/main.c | 35 +- + kernel/Makefile | 4 + + kernel/exit.c | 5 +- + kernel/fork.c | 5 + + kernel/kthread.c | 3 + + kernel/marker.c | 192 ++++-- + kernel/module.c | 11 +- + kernel/power/disk.c | 13 +- + kernel/power/main.c | 5 +- + kernel/profile.c | 2 +- + kernel/sched.c | 7 + + kernel/signal.c | 2 + + kernel/sysctl.c | 10 + + kernel/trace/Kconfig | 76 +++ + kernel/trace/Makefile | 7 + + kernel/trace/ftrace.c | 359 ++++++++--- + kernel/trace/ring_buffer.c | 377 ++++++++---- + kernel/trace/trace.c | 795 ++++++++++++++++++++---- + kernel/trace/trace.h | 192 ++++++- + kernel/trace/trace_boot.c | 166 ++++-- + kernel/trace/trace_branch.c | 342 ++++++++++ + kernel/trace/trace_functions.c | 18 +- + kernel/trace/trace_functions_return.c | 98 +++ + kernel/trace/trace_irqsoff.c | 61 ++- + kernel/trace/trace_mmiotrace.c | 25 +- + kernel/trace/trace_nop.c | 65 ++- + kernel/trace/trace_sched_switch.c | 106 +++- + kernel/trace/trace_sched_wakeup.c | 70 ++- + kernel/trace/trace_selftest.c | 173 ++++-- + kernel/trace/trace_stack.c | 8 +- + kernel/trace/trace_sysprof.c | 19 +- + kernel/tracepoint.c | 295 ++++++--- + samples/tracepoints/tp-samples-trace.h | 4 +- + samples/tracepoints/tracepoint-probe-sample.c | 1 + + samples/tracepoints/tracepoint-probe-sample2.c | 1 + + samples/tracepoints/tracepoint-sample.c | 3 + + scripts/Makefile.build | 12 +- + scripts/bootgraph.pl | 16 +- + scripts/recordmcount.pl | 45 +- + scripts/tracing/draw_functrace.py | 130 ++++ + 81 files changed, 4461 insertions(+), 1030 deletions(-) + create mode 100644 include/linux/ftrace_irq.h + create mode 100644 include/trace/boot.h + create mode 100644 kernel/trace/trace_branch.c + create mode 100644 kernel/trace/trace_functions_return.c + create mode 100644 scripts/tracing/draw_functrace.py +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Already uptodate! +Merge made by recursive. +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged arch/powerpc/Kconfig +Auto-merged arch/x86/Kconfig +Auto-merged include/linux/sched.h +Auto-merged kernel/Makefile +Auto-merged kernel/sched.c +Merge made by recursive. + Documentation/controllers/cpuacct.txt | 32 ++++ + Documentation/scheduler/sched-arch.txt | 4 +- + arch/ia64/Kconfig | 2 +- + arch/m32r/Kconfig | 2 +- + arch/mips/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/x86/Kconfig | 4 +- + include/asm-m32r/system.h | 2 +- + include/linux/sched.h | 3 +- + kernel/Makefile | 3 +- + kernel/sched.c | 267 ++++++++++++++------------------ + kernel/sched_debug.c | 57 +++++-- + kernel/sched_rt.c | 7 +- + kernel/user.c | 2 + + 14 files changed, 205 insertions(+), 184 deletions(-) + create mode 100644 Documentation/controllers/cpuacct.txt +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/include/asm/system.h +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/panic.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/include/asm/pda.h | 4 ++-- + arch/x86/include/asm/system.h | 6 +++++- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Already uptodate! +Merge made by recursive. +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/pci-dma.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged arch/x86/pci/common.c +Auto-merged drivers/net/e1000e/netdev.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged drivers/pci/quirks.c +Auto-merged include/linux/pci.h +Merge made by recursive. + Documentation/kernel-parameters.txt | 4 + + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/mm/init_32.c | 2 + + arch/x86/mm/init_64.c | 2 + + arch/x86/pci/common.c | 8 + + drivers/acpi/pci_root.c | 20 +++ + drivers/net/e1000e/netdev.c | 2 +- + drivers/pci/Kconfig | 9 + + drivers/pci/Makefile | 2 + + drivers/pci/bus.c | 4 + + drivers/pci/hotplug/acpiphp_glue.c | 32 ++-- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/fakephp.c | 1 + + drivers/pci/hotplug/pciehp_ctrl.c | 26 ++-- + drivers/pci/irq.c | 2 +- + drivers/pci/msi.c | 31 ++--- + drivers/pci/pci-acpi.c | 82 +++++----- + drivers/pci/pci-driver.c | 20 ++- + drivers/pci/pci-stub.c | 47 ++++++ + drivers/pci/pci-sysfs.c | 5 +- + drivers/pci/pci.c | 302 +++++++++++++++++++++++++++------- + drivers/pci/pci.h | 7 +- + drivers/pci/pcie/aer/aerdrv_acpi.c | 1 - + drivers/pci/pcie/aspm.c | 27 +-- + drivers/pci/pcie/portdrv_core.c | 2 +- + drivers/pci/pcie/portdrv_pci.c | 12 +- + drivers/pci/probe.c | 9 +- + drivers/pci/proc.c | 11 ++- + drivers/pci/quirks.c | 110 +++++++++++-- + include/linux/ioport.h | 11 +- + include/linux/pci-acpi.h | 14 +-- + include/linux/pci.h | 19 +++ + include/linux/pci_regs.h | 12 ++ + kernel/resource.c | 61 +++++++- + 34 files changed, 666 insertions(+), 235 deletions(-) + create mode 100644 drivers/pci/pci-stub.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merged drivers/md/dm-table.c +Merge made by recursive. + drivers/md/dm-crypt.c | 6 +--- + drivers/md/dm-delay.c | 6 +--- + drivers/md/dm-linear.c | 6 +--- + drivers/md/dm-log.c | 22 ++++++++------- + drivers/md/dm-mpath.c | 6 +--- + drivers/md/dm-raid1.c | 6 +--- + drivers/md/dm-snap.c | 18 ++++-------- + drivers/md/dm-stripe.c | 4 +-- + drivers/md/dm-table.c | 19 +++++++++++++ + drivers/md/dm-target.c | 15 +++++----- + drivers/md/dm-zero.c | 5 +--- + drivers/md/dm.c | 58 ++++++++++++++++++++++++++++++++-------- + drivers/md/dm.h | 1 + + include/linux/device-mapper.h | 27 ++++++++++++++++++- + 14 files changed, 125 insertions(+), 74 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Removed drivers/hid/hid-bright.c +Removed drivers/hid/hid-dell.c +Auto-merged drivers/hid/usbhid/hid-core.c +Merge made by recursive. + drivers/hid/Kconfig | 22 +++----- + drivers/hid/Makefile | 3 +- + drivers/hid/hid-bright.c | 71 ------------------------ + drivers/hid/hid-core.c | 118 +++++++++++++++++++++++++++++++++++++---- + drivers/hid/hid-dell.c | 76 -------------------------- + drivers/hid/hid-dummy.c | 3 + + drivers/hid/hid-ids.h | 15 ++---- + drivers/hid/hid-lg.c | 7 --- + drivers/hid/hid-ntrig.c | 82 ++++++++++++++++++++++++++++ + drivers/hid/hidraw.c | 30 ++++++++++- + drivers/hid/usbhid/hid-core.c | 34 ++++++++---- + drivers/hid/usbhid/usbhid.h | 10 ++++ + include/linux/hid.h | 14 ++--- + include/linux/hidraw.h | 2 + + 14 files changed, 273 insertions(+), 214 deletions(-) + delete mode 100644 drivers/hid/hid-bright.c + delete mode 100644 drivers/hid/hid-dell.c + create mode 100644 drivers/hid/hid-ntrig.c +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged drivers/i2c/busses/i2c-pxa.c +Auto-merged drivers/i2c/busses/i2c-s3c2410.c +Auto-merged drivers/i2c/busses/i2c-sh_mobile.c +Merge made by recursive. + drivers/i2c/busses/i2c-ali1563.c | 4 +- + drivers/i2c/busses/i2c-amd756-s4882.c | 4 +- + drivers/i2c/busses/i2c-amd756.c | 5 +- + drivers/i2c/busses/i2c-at91.c | 2 +- + drivers/i2c/busses/i2c-bfin-twi.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 50 ++++++++++++++- + drivers/i2c/busses/i2c-pxa.c | 4 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sh7760.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/busses/i2c-sis5595.c | 4 +- + drivers/i2c/busses/i2c-sis630.c | 4 +- + drivers/i2c/i2c-core.c | 8 +- + drivers/input/misc/apanel.c | 81 ++++++++---------------- + drivers/media/video/cafe_ccic.c | 1 - + drivers/media/video/ov7670.c | 1 - + drivers/media/video/ovcamchip/ovcamchip_core.c | 1 - + drivers/media/video/w9968cf.c | 1 - + include/linux/i2c.h | 4 - + 19 files changed, 98 insertions(+), 84 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merged drivers/spi/spi_lm70llp.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + Documentation/hwmon/it87 | 20 +- + Documentation/hwmon/lm70 | 12 +- + Documentation/hwmon/ltc4245 | 81 ++ + Documentation/spi/spi-lm70llp | 10 + + drivers/hwmon/Kconfig | 42 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asb100.c | 5 +- + drivers/hwmon/f71882fg.c | 1130 ++++++++++++++++++++++++---- + drivers/hwmon/fschmd.c | 448 ++++++++++-- + drivers/hwmon/i5k_amb.c | 7 + + drivers/hwmon/it87.c | 30 +- + drivers/hwmon/k8temp.c | 15 + + drivers/hwmon/lm70.c | 91 ++- + drivers/hwmon/ltc4245.c | 567 ++++++++++++++ + drivers/hwmon/w83781d.c | 5 +- + drivers/hwmon/w83791d.c | 5 +- + drivers/hwmon/w83792d.c | 5 +- + drivers/hwmon/w83793.c | 5 +- + drivers/spi/spi_lm70llp.c | 33 +- + 20 files changed, 2246 insertions(+), 274 deletions(-) + create mode 100644 Documentation/hwmon/ltc4245 + create mode 100644 drivers/hwmon/ltc4245.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Auto-merged Makefile +Auto-merged scripts/Makefile.build +Merge made by recursive. + Documentation/kbuild/makefiles.txt | 14 ++ + Makefile | 129 +------------- + arch/blackfin/boot/Makefile | 2 +- + scripts/Kbuild.include | 22 ++- + scripts/Makefile.build | 16 ++- + scripts/Makefile.lib | 15 +- + scripts/decodecode | 32 +++- + scripts/extract-ikconfig | 8 +- + scripts/genksyms/genksyms.c | 262 ++++++++++++++++++++++++++-- + scripts/genksyms/genksyms.h | 7 + + scripts/kconfig/lxdialog/check-lxdialog.sh | 2 +- + scripts/mkcompile_h | 6 +- + scripts/mkmakefile | 4 +- + scripts/package/Makefile | 5 +- + scripts/setlocalversion | 7 +- + scripts/tags.sh | 160 +++++++++++++++++ + usr/gen_init_cpio.c | 28 +++- + 17 files changed, 541 insertions(+), 178 deletions(-) + create mode 100755 scripts/tags.sh +Merging quilt/ide +$ git merge quilt/ide +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged MAINTAINERS +Auto-merged drivers/ide/Kconfig +Removed drivers/scsi/ide-scsi.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 9 - + MAINTAINERS | 5 - + drivers/ide/Kconfig | 40 +- + drivers/ide/Makefile | 3 +- + drivers/ide/cmd64x.c | 4 +- + drivers/ide/cy82c693.c | 1 - + drivers/ide/gayle.c | 6 +- + drivers/ide/hpt366.c | 8 +- + drivers/ide/ide-atapi.c | 166 +++--- + drivers/ide/ide-cd.c | 190 +------ + drivers/ide/ide-cd.h | 14 +- + drivers/ide/ide-dma-sff.c | 54 +- + drivers/ide/ide-floppy.c | 28 +- + drivers/ide/ide-floppy_ioctl.c | 58 +- + drivers/ide/ide-io.c | 569 +++++-------------- + drivers/ide/ide-ioctls.c | 6 +- + drivers/ide/ide-iops.c | 48 +- + drivers/ide/ide-legacy.c | 58 ++ + drivers/ide/ide-lib.c | 105 ++-- + drivers/ide/ide-park.c | 27 +- + drivers/ide/ide-pm.c | 235 ++++++++ + drivers/ide/ide-probe.c | 385 ++++--------- + drivers/ide/ide-proc.c | 29 +- + drivers/ide/ide-sysfs.c | 125 +++++ + drivers/ide/ide-tape.c | 2 +- + drivers/ide/ide.c | 161 +------ + drivers/ide/pdc202xx_old.c | 9 +- + drivers/ide/pmac.c | 30 +- + drivers/ide/rz1000.c | 36 +- + drivers/ide/trm290.c | 4 +- + drivers/ide/tx4938ide.c | 11 +- + drivers/ide/tx4939ide.c | 43 +- + drivers/ide/umc8672.c | 11 +- + drivers/scsi/Kconfig | 8 +- + drivers/scsi/Makefile | 1 - + drivers/scsi/ide-scsi.c | 830 ---------------------------- + include/linux/ide.h | 158 +++--- + 37 files changed, 1149 insertions(+), 2328 deletions(-) + create mode 100644 drivers/ide/ide-legacy.c + create mode 100644 drivers/ide/ide-pm.c + create mode 100644 drivers/ide/ide-sysfs.c + delete mode 100644 drivers/scsi/ide-scsi.c +Merging libata/NEXT +$ git merge libata/NEXT +Auto-merged drivers/ata/libata-core.c +Auto-merged drivers/ata/libata-scsi.c +Auto-merged include/linux/libata.h +Merge made by recursive. + drivers/ata/ahci.c | 8 +- + drivers/ata/ata_generic.c | 5 +- + drivers/ata/libata-acpi.c | 19 ++-- + drivers/ata/libata-core.c | 203 ++++++++++++++++++++++++---------------- + drivers/ata/libata-eh.c | 116 +++++++++++++---------- + drivers/ata/libata-pmp.c | 22 ++-- + drivers/ata/libata-scsi.c | 22 ++-- + drivers/ata/pata_bf54x.c | 1 - + drivers/ata/pata_it821x.c | 34 +++---- + drivers/ata/pata_ixp4xx_cf.c | 14 +-- + drivers/ata/pata_legacy.c | 18 ++-- + drivers/ata/pata_oldpiix.c | 1 - + drivers/ata/pata_pdc2027x.c | 29 +++---- + drivers/ata/pata_platform.c | 14 +-- + drivers/ata/pata_radisys.c | 1 - + drivers/ata/pata_rz1000.c | 16 ++-- + drivers/ata/pata_scc.c | 1 - + drivers/ata/pata_serverworks.c | 1 - + drivers/ata/pata_sis.c | 1 - + drivers/ata/sata_mv.c | 1 - + drivers/ata/sata_sil.c | 2 +- + include/linux/libata.h | 71 +++++++++++---- + 22 files changed, 336 insertions(+), 264 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Removed fs/xfs/linux-2.6/xfs_vfs.h +Removed fs/xfs/linux-2.6/xfs_vnode.c +Removed fs/xfs/xfs_clnt.h +Removed fs/xfs/xfs_imap.h +Auto-merged fs/xfs/xfs_rename.c +Removed fs/xfs/xfs_vfsops.c +Removed fs/xfs/xfs_vfsops.h +Auto-merged include/linux/fs.h +Merge made by recursive. + Documentation/filesystems/xfs.txt | 4 - + fs/inode.c | 209 ++- + fs/xfs/Makefile | 6 +- + fs/xfs/linux-2.6/sv.h | 22 +- + fs/xfs/linux-2.6/xfs_aops.c | 66 +- + fs/xfs/linux-2.6/xfs_aops.h | 3 + + fs/xfs/linux-2.6/xfs_buf.c | 84 +- + fs/xfs/linux-2.6/xfs_buf.h | 22 +- + fs/xfs/linux-2.6/xfs_cred.h | 10 +- + fs/xfs/linux-2.6/xfs_export.c | 1 - + fs/xfs/linux-2.6/xfs_file.c | 46 +- + fs/xfs/linux-2.6/xfs_fs_subr.c | 23 +- + fs/xfs/linux-2.6/xfs_globals.c | 8 - + fs/xfs/linux-2.6/xfs_globals.h | 1 - + fs/xfs/linux-2.6/xfs_ioctl.c | 196 ++- + fs/xfs/linux-2.6/xfs_ioctl.h | 82 + + fs/xfs/linux-2.6/xfs_ioctl32.c | 839 ++++++--- + fs/xfs/linux-2.6/xfs_ioctl32.h | 214 +++- + fs/xfs/linux-2.6/xfs_iops.c | 122 ++- + fs/xfs/linux-2.6/xfs_linux.h | 13 +- + fs/xfs/linux-2.6/xfs_lrw.c | 12 +- + fs/xfs/linux-2.6/xfs_stats.c | 6 +- + fs/xfs/linux-2.6/xfs_stats.h | 65 + + fs/xfs/linux-2.6/xfs_super.c | 884 +++------ + fs/xfs/linux-2.6/xfs_super.h | 15 - + fs/xfs/linux-2.6/xfs_sync.c | 762 ++++++++ + fs/xfs/linux-2.6/xfs_sync.h | 55 + + fs/xfs/linux-2.6/xfs_sysctl.c | 11 - + fs/xfs/linux-2.6/xfs_sysctl.h | 3 +- + fs/xfs/linux-2.6/xfs_vfs.h | 77 - + fs/xfs/linux-2.6/xfs_vnode.c | 145 -- + fs/xfs/linux-2.6/xfs_vnode.h | 72 +- + 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 | 57 +- + fs/xfs/quota/xfs_qm.h | 3 +- + fs/xfs/quota/xfs_qm_bhv.c | 5 +- + fs/xfs/quota/xfs_qm_syscalls.c | 151 +- + fs/xfs/support/debug.c | 2 +- + fs/xfs/support/ktrace.c | 9 +- + fs/xfs/xfs.h | 2 +- + fs/xfs/xfs_acl.c | 8 +- + fs/xfs/xfs_ag.h | 15 +- + fs/xfs/xfs_alloc.c | 264 ++- + 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 | 410 +++-- + fs/xfs/xfs_bmap.h | 72 +- + 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_clnt.h | 105 -- + fs/xfs/xfs_da_btree.h | 24 +- + fs/xfs/xfs_dfrag.c | 8 +- + fs/xfs/xfs_dfrag.h | 2 +- + fs/xfs/xfs_dinode.h | 148 +- + fs/xfs/xfs_dir2_sf.h | 7 - + fs/xfs/xfs_dmops.c | 5 +- + fs/xfs/xfs_extfree_item.c | 45 +- + fs/xfs/xfs_fs.h | 22 +- + fs/xfs/xfs_fsops.c | 30 +- + fs/xfs/xfs_ialloc.c | 449 +++-- + fs/xfs/xfs_ialloc.h | 31 +- + fs/xfs/xfs_ialloc_btree.c | 2193 +++-------------------- + fs/xfs/xfs_ialloc_btree.h | 111 +- + fs/xfs/xfs_iget.c | 735 ++++---- + fs/xfs/xfs_imap.h | 40 - + fs/xfs/xfs_inode.c | 582 ++----- + fs/xfs/xfs_inode.h | 364 +++-- + fs/xfs/xfs_inode_item.c | 45 +- + fs/xfs/xfs_inode_item.h | 41 +- + fs/xfs/xfs_itable.c | 102 +- + fs/xfs/xfs_itable.h | 14 + + fs/xfs/xfs_log.c | 81 +- + fs/xfs/xfs_log.h | 4 + + fs/xfs/xfs_log_priv.h | 48 +- + fs/xfs/xfs_log_recover.c | 390 ++--- + fs/xfs/xfs_mount.c | 81 +- + fs/xfs/xfs_mount.h | 71 +- + fs/xfs/xfs_qmops.c | 5 +- + fs/xfs/xfs_quota.h | 8 +- + fs/xfs/xfs_rename.c | 12 +- + fs/xfs/xfs_rtalloc.c | 41 +- + fs/xfs/xfs_sb.h | 166 +- + fs/xfs/xfs_trans.c | 22 +- + fs/xfs/xfs_trans.h | 322 ++-- + fs/xfs/xfs_trans_ail.c | 362 +++-- + fs/xfs/xfs_trans_buf.c | 7 +- + fs/xfs/xfs_trans_inode.c | 30 +- + fs/xfs/xfs_trans_item.c | 10 + + fs/xfs/xfs_trans_priv.h | 98 +- + fs/xfs/xfs_utils.c | 12 +- + fs/xfs/xfs_vfsops.c | 757 -------- + fs/xfs/xfs_vfsops.h | 16 - + fs/xfs/xfs_vnodeops.c | 209 +-- + fs/xfs/xfs_vnodeops.h | 8 +- + include/linux/fs.h | 2 + + kernel/sysctl_check.c | 1 - + 106 files changed, 10325 insertions(+), 12431 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_ioctl.h + create mode 100644 fs/xfs/linux-2.6/xfs_sync.c + create mode 100644 fs/xfs/linux-2.6/xfs_sync.h + delete mode 100644 fs/xfs/linux-2.6/xfs_vfs.h + delete mode 100644 fs/xfs/linux-2.6/xfs_vnode.c + create mode 100644 fs/xfs/xfs_btree_trace.c + create mode 100644 fs/xfs/xfs_btree_trace.h + delete mode 100644 fs/xfs/xfs_clnt.h + delete mode 100644 fs/xfs/xfs_imap.h + delete mode 100644 fs/xfs/xfs_vfsops.c + delete mode 100644 fs/xfs/xfs_vfsops.h +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/ehca/ehca_classes.h | 7 + + drivers/infiniband/hw/ehca/ehca_main.c | 17 ++- + drivers/infiniband/hw/ehca/ehca_qp.c | 12 +- + drivers/infiniband/hw/ehca/ehca_reqs.c | 13 +- + drivers/infiniband/hw/ipath/ipath_driver.c | 49 ++++--- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 30 ++-- + drivers/infiniband/hw/ipath/ipath_fs.c | 2 +- + drivers/infiniband/hw/ipath/ipath_iba6120.c | 61 ++++++++ + drivers/infiniband/hw/ipath/ipath_iba7220.c | 83 ++++++++++- + drivers/infiniband/hw/ipath/ipath_init_chip.c | 1 + + drivers/infiniband/hw/ipath/ipath_kernel.h | 15 ++ + drivers/infiniband/hw/ipath/ipath_keys.c | 2 + + drivers/infiniband/hw/ipath/ipath_mad.c | 2 + + drivers/infiniband/hw/ipath/ipath_qp.c | 32 +++- + drivers/infiniband/hw/ipath/ipath_rc.c | 5 +- + drivers/infiniband/hw/ipath/ipath_sdma.c | 21 ++- + drivers/infiniband/hw/ipath/ipath_stats.c | 8 + + drivers/infiniband/hw/ipath/ipath_ud.c | 19 +--- + drivers/infiniband/hw/ipath/ipath_verbs.c | 3 +- + drivers/infiniband/hw/ipath/ipath_verbs.h | 1 + + drivers/infiniband/hw/nes/nes.h | 18 ++- + drivers/infiniband/hw/nes/nes_cm.c | 203 +++++++++++++++++-------- + drivers/infiniband/hw/nes/nes_cm.h | 9 +- + drivers/infiniband/hw/nes/nes_hw.c | 42 +++--- + drivers/infiniband/hw/nes/nes_utils.c | 9 +- + drivers/infiniband/hw/nes/nes_verbs.c | 45 ++----- + 26 files changed, 489 insertions(+), 220 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/reboot.c +Auto-merged drivers/Makefile +Auto-merged kernel/power/disk.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 5 +- + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/kernel/e820.c | 21 ++ + arch/x86/kernel/reboot.c | 2 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/dispatcher/dsmethod.c | 3 + + drivers/acpi/dispatcher/dsopcode.c | 53 +++- + drivers/acpi/ec.c | 43 ++-- + drivers/acpi/events/evevent.c | 14 +- + drivers/acpi/events/evgpe.c | 36 +- + drivers/acpi/events/evgpeblk.c | 38 ++- + drivers/acpi/events/evmisc.c | 51 ++-- + drivers/acpi/events/evregion.c | 133 ++++---- + drivers/acpi/events/evrgnini.c | 41 +-- + drivers/acpi/events/evsci.c | 10 +- + drivers/acpi/events/evxface.c | 2 +- + drivers/acpi/events/evxfevnt.c | 12 +- + drivers/acpi/executer/exfldio.c | 11 +- + drivers/acpi/hardware/hwsleep.c | 73 ++--- + drivers/acpi/namespace/nsaccess.c | 11 +- + drivers/acpi/namespace/nseval.c | 70 +--- + drivers/acpi/namespace/nspredef.c | 256 ++++++++++++--- + drivers/acpi/namespace/nsutils.c | 8 +- + drivers/acpi/parser/psparse.c | 12 + + drivers/acpi/parser/psxface.c | 33 ++ + drivers/acpi/sleep/main.c | 68 ++++- + drivers/acpi/tables/tbfadt.c | 21 +- + drivers/acpi/tables/tbutils.c | 24 ++ + drivers/acpi/utilities/uteval.c | 6 +- + drivers/acpi/utilities/utglobal.c | 3 +- + drivers/acpi/utilities/utxface.c | 11 + + drivers/misc/Kconfig | 284 +---------------- + drivers/misc/Makefile | 15 - + drivers/platform/Kconfig | 5 + + drivers/platform/Makefile | 5 + + drivers/platform/x86/Kconfig | 290 ++++++++++++++++ + drivers/platform/x86/Makefile | 16 + + drivers/{misc => platform/x86}/acer-wmi.c | 0 + drivers/{misc => platform/x86}/asus-laptop.c | 0 + drivers/{misc => platform/x86}/compal-laptop.c | 0 + drivers/{misc => platform/x86}/eeepc-laptop.c | 0 + drivers/{misc => platform/x86}/fujitsu-laptop.c | 0 + drivers/{misc => platform/x86}/hp-wmi.c | 0 + drivers/{misc => platform/x86}/intel_menlow.c | 0 + drivers/{misc => platform/x86}/msi-laptop.c | 0 + drivers/{misc => platform/x86}/panasonic-laptop.c | 0 + drivers/{misc => platform/x86}/sony-laptop.c | 0 + drivers/{misc => platform/x86}/tc1100-wmi.c | 0 + drivers/{misc => platform/x86}/thinkpad_acpi.c | 0 + include/acpi/acconfig.h | 6 +- + include/acpi/acexcep.h | 4 +- + include/acpi/acglobal.h | 1 + + include/acpi/aclocal.h | 1 + + include/acpi/acnamesp.h | 5 +- + include/acpi/acpixf.h | 6 +- + include/acpi/actables.h | 2 + + include/acpi/actypes.h | 8 +- + include/linux/acpi.h | 1 + + include/linux/suspend.h | 13 + + kernel/power/disk.c | 6 +- + kernel/power/snapshot.c | 368 +++++++++++---------- + kernel/power/swsusp.c | 122 +++++++ + 63 files changed, 1372 insertions(+), 862 deletions(-) + create mode 100644 drivers/platform/Kconfig + create mode 100644 drivers/platform/Makefile + create mode 100644 drivers/platform/x86/Kconfig + create mode 100644 drivers/platform/x86/Makefile + rename drivers/{misc => platform/x86}/acer-wmi.c (100%) + rename drivers/{misc => platform/x86}/asus-laptop.c (100%) + rename drivers/{misc => platform/x86}/compal-laptop.c (100%) + rename drivers/{misc => platform/x86}/eeepc-laptop.c (100%) + rename drivers/{misc => platform/x86}/fujitsu-laptop.c (100%) + rename drivers/{misc => platform/x86}/hp-wmi.c (100%) + rename drivers/{misc => platform/x86}/intel_menlow.c (100%) + rename drivers/{misc => platform/x86}/msi-laptop.c (100%) + rename drivers/{misc => platform/x86}/panasonic-laptop.c (100%) + rename drivers/{misc => platform/x86}/sony-laptop.c (100%) + rename drivers/{misc => platform/x86}/tc1100-wmi.c (100%) + rename drivers/{misc => platform/x86}/thinkpad_acpi.c (100%) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/lockd/clntproc.c | 6 +-- + fs/lockd/host.c | 52 ++++++++++++---------- + fs/lockd/mon.c | 96 +++++++++++++++++++-------------------- + fs/lockd/svc.c | 8 +++ + fs/nfsd/nfs4recover.c | 2 +- + fs/nfsd/nfs4state.c | 7 ++- + fs/nfsd/nfsfh.c | 30 ++++++++++--- + include/linux/lockd/lockd.h | 29 ++++++++---- + include/linux/lockd/sm_inter.h | 2 - + include/linux/nfsd/nfsfh.h | 4 ++ + include/linux/sunrpc/svc.h | 5 ++- + net/sunrpc/svc_xprt.c | 22 +++++++--- + 12 files changed, 159 insertions(+), 104 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-cdev.c | 36 +- + drivers/firewire/fw-device.c | 5 +- + drivers/firewire/fw-device.h | 6 + + drivers/firewire/fw-ohci.c | 73 +-- + drivers/firewire/fw-sbp2.c | 21 +- + drivers/firewire/fw-transaction.c | 2 + + drivers/ieee1394/csr.c | 8 +- + drivers/ieee1394/dma.h | 1 + + drivers/ieee1394/eth1394.c | 2 +- + drivers/ieee1394/highlevel.c | 9 +- + drivers/ieee1394/highlevel.h | 7 +- + drivers/ieee1394/ieee1394_core.c | 1 + + drivers/ieee1394/ieee1394_transactions.c | 29 + + drivers/ieee1394/ieee1394_transactions.h | 2 + + drivers/ieee1394/iso.h | 1 + + drivers/ieee1394/nodemgr.c | 10 +- + drivers/ieee1394/nodemgr.h | 18 + + drivers/ieee1394/ohci1394.c | 8 + + drivers/ieee1394/raw1394.c | 2 +- + drivers/ieee1394/sbp2.c | 4 +- + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 + + drivers/media/dvb/firesat/Kconfig | 12 + + drivers/media/dvb/firesat/Makefile | 13 + + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ + drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ + drivers/media/dvb/firesat/cmp.c | 171 +++++ + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 261 ++++++++ + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ + drivers/media/dvb/firesat/firesat-rc.h | 11 + + drivers/media/dvb/firesat/firesat.h | 227 +++++++ + drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ + drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ + drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ + drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ + 37 files changed, 3466 insertions(+), 93 deletions(-) + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/dvb/firesat/firesat_iso.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/eba.c | 51 ++++++++++++++++----------- + drivers/mtd/ubi/io.c | 26 +++++++++---- + drivers/mtd/ubi/wl.c | 92 +++++++++++++++++++++++++++++++------------------ + 3 files changed, 107 insertions(+), 62 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/powerpc/kernel/asm-offsets.c +Removed arch/powerpc/kvm/booke_host.c +Auto-merged arch/x86/kernel/cpu/mtrr/main.c +Auto-merged arch/x86/kernel/reboot.c +CONFLICT (content): Merge conflict in arch/x86/kernel/reboot.c +Resolved 'arch/x86/kernel/reboot.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 710d3da: Merge commit 'kvm/master' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/include/asm/kvm_host.h | 196 +++-- + arch/ia64/kvm/Makefile | 2 +- + arch/ia64/kvm/asm-offsets.c | 11 +- + arch/ia64/kvm/kvm-ia64.c | 70 +- + arch/ia64/kvm/kvm_lib.c | 15 + + arch/ia64/kvm/kvm_minstate.h | 4 +- + arch/ia64/kvm/misc.h | 3 +- + arch/ia64/kvm/mmio.c | 38 +- + arch/ia64/kvm/process.c | 29 +- + arch/ia64/kvm/vcpu.c | 76 ++- + arch/ia64/kvm/vcpu.h | 5 +- + arch/ia64/kvm/vmm.c | 29 + + arch/ia64/kvm/vmm_ivt.S | 1469 +++++++++++++-------------- + arch/ia64/kvm/vtlb.c | 4 +- + arch/powerpc/include/asm/disassemble.h | 80 ++ + arch/powerpc/include/asm/kvm_44x.h | 61 ++ + arch/powerpc/include/asm/kvm_host.h | 116 ++- + arch/powerpc/include/asm/kvm_ppc.h | 86 +- + arch/powerpc/include/asm/mmu-44x.h | 1 + + arch/powerpc/kernel/asm-offsets.c | 21 +- + arch/powerpc/kvm/44x.c | 228 +++++ + arch/powerpc/kvm/44x_emulate.c | 371 +++++++ + arch/powerpc/kvm/44x_tlb.c | 463 +++++++-- + arch/powerpc/kvm/44x_tlb.h | 26 +- + arch/powerpc/kvm/Kconfig | 28 +- + arch/powerpc/kvm/Makefile | 12 +- + arch/powerpc/kvm/{booke_guest.c => booke.c} | 418 ++++----- + arch/powerpc/kvm/booke.h | 60 ++ + arch/powerpc/kvm/booke_host.c | 83 -- + arch/powerpc/kvm/booke_interrupts.S | 72 +- + arch/powerpc/kvm/emulate.c | 447 +-------- + arch/powerpc/kvm/powerpc.c | 132 +--- + arch/powerpc/kvm/timing.c | 239 +++++ + arch/powerpc/kvm/timing.h | 102 ++ + arch/s390/kvm/kvm-s390.c | 39 +- + arch/x86/include/asm/kvm_host.h | 45 +- + arch/x86/include/asm/kvm_x86_emulate.h | 11 +- + arch/x86/include/asm/mtrr.h | 25 + + arch/x86/{kvm => include/asm}/svm.h | 0 + arch/x86/include/asm/virtext.h | 132 +++ + arch/x86/{kvm => include/asm}/vmx.h | 27 +- + 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/kernel/crash.c | 18 + + arch/x86/kernel/kvmclock.c | 10 +- + arch/x86/kernel/reboot.c | 62 ++- + arch/x86/kvm/i8254.c | 19 + + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/kvm_svm.h | 2 +- + arch/x86/kvm/lapic.c | 58 +- + arch/x86/kvm/mmu.c | 438 +++++++-- + arch/x86/kvm/paging_tmpl.h | 35 +- + arch/x86/kvm/svm.c | 48 +- + arch/x86/kvm/vmx.c | 368 +++++--- + arch/x86/kvm/x86.c | 144 +++- + arch/x86/kvm/x86_emulate.c | 297 ++++--- + fs/anon_inodes.c | 7 +- + include/linux/kvm.h | 21 +- + include/linux/kvm_host.h | 11 +- + virt/kvm/ioapic.c | 8 +- + virt/kvm/ioapic.h | 2 + + virt/kvm/irq_comm.c | 19 +- + virt/kvm/kvm_main.c | 391 ++++++-- + virt/kvm/kvm_trace.c | 1 + + 65 files changed, 4703 insertions(+), 2567 deletions(-) + create mode 100644 arch/ia64/kvm/kvm_lib.c + create mode 100644 arch/powerpc/include/asm/disassemble.h + create mode 100644 arch/powerpc/include/asm/kvm_44x.h + create mode 100644 arch/powerpc/kvm/44x.c + create mode 100644 arch/powerpc/kvm/44x_emulate.c + rename arch/powerpc/kvm/{booke_guest.c => booke.c} (56%) + create mode 100644 arch/powerpc/kvm/booke.h + delete mode 100644 arch/powerpc/kvm/booke_host.c + create mode 100644 arch/powerpc/kvm/timing.c + create mode 100644 arch/powerpc/kvm/timing.h + rename arch/x86/{kvm => include/asm}/svm.h (100%) + create mode 100644 arch/x86/include/asm/virtext.h + rename arch/x86/{kvm => include/asm}/vmx.h (93%) +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/dir.c | 18 +++++++++--------- + fs/dlm/lowcomms.c | 8 +------- + fs/dlm/memory.c | 6 +++--- + fs/dlm/midcomms.c | 2 +- + 4 files changed, 14 insertions(+), 20 deletions(-) +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/scsi/Makefile +Auto-merged drivers/scsi/aacraid/linit.c +Auto-merged drivers/scsi/ipr.c +Auto-merged drivers/scsi/ipr.h +Auto-merged drivers/scsi/libiscsi.c +Auto-merged drivers/scsi/scsi_ioctl.c +Merge made by recursive. + drivers/infiniband/ulp/iser/iscsi_iser.c | 48 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 5 +- + drivers/message/fusion/mptbase.c | 15 +- + drivers/scsi/Makefile | 2 +- + drivers/scsi/NCR5380.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/aacraid/aachba.c | 2 +- + drivers/scsi/aacraid/commctrl.c | 14 +- + drivers/scsi/aacraid/comminit.c | 2 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/aacraid/dpcsup.c | 2 +- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/aacraid/rkt.c | 2 +- + drivers/scsi/aacraid/rx.c | 2 +- + drivers/scsi/aacraid/sa.c | 2 +- + drivers/scsi/advansys.c | 3 +- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/atp870u.c | 4 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 18 +- + drivers/scsi/eata_pio.c | 4 +- + drivers/scsi/esp_scsi.c | 6 +- + drivers/scsi/fdomain.c | 2 +- + drivers/scsi/ibmmca.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 285 +++-- + drivers/scsi/ibmvscsi/ibmvfc.h | 30 +- + drivers/scsi/in2000.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/initio.h | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/iscsi_tcp.c | 1621 +++++--------------------- + drivers/scsi/iscsi_tcp.h | 88 +-- + drivers/scsi/libiscsi.c | 236 +++-- + drivers/scsi/libiscsi_tcp.c | 1163 ++++++++++++++++++ + drivers/scsi/nsp32.c | 3 +- + drivers/scsi/qla1280.c | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 298 +++--- + drivers/scsi/qla2xxx/qla_dbg.c | 61 +- + drivers/scsi/qla2xxx/qla_def.h | 525 +++++---- + drivers/scsi/qla2xxx/qla_dfs.c | 21 +- + drivers/scsi/qla2xxx/qla_gbl.h | 13 +- + drivers/scsi/qla2xxx/qla_gs.c | 479 ++++---- + drivers/scsi/qla2xxx/qla_init.c | 1113 +++++++++--------- + drivers/scsi/qla2xxx/qla_inline.h | 27 +- + drivers/scsi/qla2xxx/qla_iocb.c | 258 +++-- + drivers/scsi/qla2xxx/qla_isr.c | 633 ++++++----- + drivers/scsi/qla2xxx/qla_mbx.c | 761 +++++++------ + drivers/scsi/qla2xxx/qla_mid.c | 173 ++-- + drivers/scsi/qla2xxx/qla_os.c | 1274 +++++++++++--------- + drivers/scsi/qla2xxx/qla_sup.c | 537 +++++---- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qlogicfas408.c | 2 +- + drivers/scsi/scsi_error.c | 6 +- + drivers/scsi/scsi_ioctl.c | 4 +- + drivers/scsi/scsi_lib.c | 132 ++- + drivers/scsi/st.c | 47 +- + drivers/scsi/stex.c | 3 +- + drivers/scsi/sym53c416.c | 2 +- + drivers/scsi/tmscsim.c | 3 +- + drivers/scsi/u14-34f.c | 3 +- + drivers/scsi/wd7000.c | 4 +- + include/scsi/iscsi_if.h | 7 +- + include/scsi/libiscsi.h | 39 +- + include/scsi/libiscsi_tcp.h | 132 +++ + include/scsi/scsi_device.h | 2 - + include/scsi/scsi_transport_iscsi.h | 12 +- + 67 files changed, 5433 insertions(+), 4734 deletions(-) + create mode 100644 drivers/scsi/libiscsi_tcp.c + create mode 100644 include/scsi/libiscsi_tcp.h +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Removed fs/ocfs2/ocfs2_jbd_compat.h +Merge made by recursive. + Documentation/filesystems/ocfs2.txt | 3 +- + fs/Kconfig | 18 +- + fs/Makefile | 1 + + fs/dquot.c | 436 +++++-- + fs/ext3/super.c | 16 +- + fs/ext4/super.c | 15 +- + fs/ocfs2/Makefile | 6 + + fs/ocfs2/acl.c | 479 ++++++++ + fs/ocfs2/acl.h | 58 + + fs/ocfs2/alloc.c | 399 +++++-- + fs/ocfs2/alloc.h | 21 + + fs/ocfs2/aops.c | 51 +- + fs/ocfs2/buffer_head_io.c | 32 +- + fs/ocfs2/buffer_head_io.h | 27 +- + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/dir.c | 147 ++- + fs/ocfs2/dlmglue.c | 158 +++- + fs/ocfs2/dlmglue.h | 19 + + fs/ocfs2/extent_map.c | 96 ++- + fs/ocfs2/extent_map.h | 24 + + fs/ocfs2/file.c | 193 ++-- + fs/ocfs2/file.h | 3 + + fs/ocfs2/inode.c | 144 ++- + fs/ocfs2/inode.h | 18 +- + fs/ocfs2/journal.c | 176 ++- + fs/ocfs2/journal.h | 96 ++- + fs/ocfs2/localalloc.c | 8 +- + fs/ocfs2/namei.c | 280 ++++-- + fs/ocfs2/ocfs2.h | 31 +- + fs/ocfs2/ocfs2_fs.h | 126 ++- + fs/ocfs2/ocfs2_jbd_compat.h | 82 -- + fs/ocfs2/ocfs2_lockid.h | 5 + + fs/ocfs2/quota.h | 117 ++ + fs/ocfs2/quota_global.c | 990 +++++++++++++++ + fs/ocfs2/quota_local.c | 1253 +++++++++++++++++++ + fs/ocfs2/resize.c | 60 +- + fs/ocfs2/slot_map.c | 4 +- + fs/ocfs2/suballoc.c | 278 +++-- + fs/ocfs2/suballoc.h | 18 +- + fs/ocfs2/super.c | 310 +++++- + fs/ocfs2/symlink.c | 2 +- + fs/ocfs2/xattr.c | 2267 +++++++++++++++++++++-------------- + fs/ocfs2/xattr.h | 31 + + fs/quota.c | 11 +- + fs/quota_tree.c | 645 ++++++++++ + fs/quota_tree.h | 25 + + fs/quota_v1.c | 28 +- + fs/quota_v2.c | 631 ++--------- + {include/linux => fs}/quotaio_v1.h | 0 + {include/linux => fs}/quotaio_v2.h | 33 +- + fs/reiserfs/super.c | 10 +- + include/linux/Kbuild | 4 - + include/linux/dqblk_qtree.h | 56 + + include/linux/dqblk_v1.h | 7 - + include/linux/dqblk_v2.h | 22 +- + include/linux/jbd2.h | 1 + + include/linux/quota.h | 108 ++- + include/linux/quotaops.h | 96 ++- + mm/pdflush.c | 1 + + 59 files changed, 7644 insertions(+), 2533 deletions(-) + create mode 100644 fs/ocfs2/acl.c + create mode 100644 fs/ocfs2/acl.h + delete mode 100644 fs/ocfs2/ocfs2_jbd_compat.h + create mode 100644 fs/ocfs2/quota.h + create mode 100644 fs/ocfs2/quota_global.c + create mode 100644 fs/ocfs2/quota_local.c + create mode 100644 fs/quota_tree.c + create mode 100644 fs/quota_tree.h + rename {include/linux => fs}/quotaio_v1.h (100%) + rename {include/linux => fs}/quotaio_v2.h (68%) + create mode 100644 include/linux/dqblk_qtree.h +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/super.c +Merge made by recursive. + fs/ext3/hash.c | 77 ++++++++++++++++++++++++++++++++++++++------ + fs/ext3/namei.c | 7 ++++ + fs/ext3/super.c | 12 +++++++ + fs/ext4/balloc.c | 4 +- + fs/ext4/ext4.h | 3 ++ + fs/ext4/ext4_sb.h | 1 + + fs/ext4/extents.c | 11 ++---- + fs/ext4/hash.c | 77 ++++++++++++++++++++++++++++++++++++++------ + fs/ext4/ialloc.c | 4 +- + fs/ext4/inode.c | 76 ++++++++++++++++++++++++++++++++----------- + fs/ext4/namei.c | 7 ++++ + fs/ext4/super.c | 25 ++++++++------ + include/linux/ext3_fs.h | 28 +++++++++++++++- + include/linux/ext3_fs_sb.h | 1 + + 14 files changed, 271 insertions(+), 62 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Merge made by recursive. + Documentation/crypto/async-tx-api.txt | 96 ++--- + Documentation/dmaengine.txt | 1 + + arch/avr32/include/asm/atmel-mci.h | 6 +- + arch/avr32/mach-at32ap/at32ap700x.c | 15 +- + crypto/async_tx/async_tx.c | 350 +--------------- + drivers/dca/dca-core.c | 2 +- + drivers/dma/Kconfig | 2 - + drivers/dma/dmaengine.c | 766 ++++++++++++++++++++++++--------- + drivers/dma/dmatest.c | 129 +++---- + drivers/dma/dw_dmac.c | 119 +++--- + drivers/dma/fsldma.c | 5 +- + drivers/dma/ioat.c | 92 ++--- + drivers/dma/ioat_dma.c | 10 +- + drivers/dma/iop-adma.c | 30 +-- + drivers/dma/mv_xor.c | 11 +- + drivers/mmc/host/atmel-mci.c | 103 ++---- + include/linux/async_tx.h | 17 +- + include/linux/dmaengine.h | 181 +++------ + include/linux/dw_dmac.h | 31 +- + include/linux/netdevice.h | 3 - + include/net/netdma.h | 11 - + net/core/dev.c | 149 +------- + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + 26 files changed, 889 insertions(+), 1251 deletions(-) + create mode 100644 Documentation/dmaengine.txt +Merging udf/for_next +$ git merge udf/for_next +Merge made by recursive. + Documentation/filesystems/udf.txt | 2 + + fs/udf/balloc.c | 113 +++++----- + fs/udf/dir.c | 14 +- + fs/udf/directory.c | 38 ++-- + fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 213 ++++++++++--------- + fs/udf/misc.c | 29 ++-- + fs/udf/namei.c | 86 ++++---- + fs/udf/osta_udf.h | 22 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 139 ++++++++----- + fs/udf/truncate.c | 44 ++-- + fs/udf/udf_i.h | 6 +- + fs/udf/udf_sb.h | 4 + + fs/udf/udfdecl.h | 46 +++-- + fs/udf/udfend.h | 28 ++-- + fs/udf/udftime.c | 6 +- + fs/udf/unicode.c | 41 +++-- + 19 files changed, 663 insertions(+), 590 deletions(-) +Merging net/master +$ git merge net/master +Removed Documentation/DocBook/wanbook.tmpl +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged MAINTAINERS +CONFLICT (delete/modify): arch/sparc64/kernel/idprom.c deleted in HEAD and modified in net/master. Version net/master of arch/sparc64/kernel/idprom.c left in tree. +Auto-merged arch/xtensa/platforms/iss/network.c +Removed drivers/bluetooth/hci_usb.c +Removed drivers/bluetooth/hci_usb.h +Auto-merged drivers/infiniband/core/sysfs.c +Auto-merged drivers/infiniband/hw/nes/nes_cm.c +Auto-merged drivers/infiniband/hw/nes/nes_utils.c +Auto-merged drivers/infiniband/ulp/srp/ib_srp.c +Auto-merged drivers/misc/sgi-xp/xpnet.c +Auto-merged drivers/net/cs89x0.c +Auto-merged drivers/net/e1000e/netdev.c +Removed drivers/net/eepro100.c +Auto-merged drivers/net/irda/pxaficp_ir.c +Auto-merged drivers/net/irda/sa1100_ir.c +Removed drivers/net/phy/mdio-ofgpio.c +Auto-merged drivers/net/smc91x.h +Auto-merged drivers/net/usb/pegasus.c +Removed drivers/net/wan/syncppp.c +Removed drivers/net/wireless/ath9k/core.c +Auto-merged drivers/s390/net/lcs.c +Auto-merged drivers/s390/net/qeth_l2_main.c +Auto-merged drivers/scsi/iscsi_tcp.c +Auto-merged fs/lockd/host.c +CONFLICT (content): Merge conflict in fs/lockd/host.c +Auto-merged fs/lockd/mon.c +CONFLICT (content): Merge conflict in fs/lockd/mon.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged include/linux/kernel.h +Auto-merged include/linux/netdevice.h +Removed include/net/syncppp.h +Auto-merged net/core/dev.c +Removed net/ieee80211/Kconfig +Removed net/ieee80211/Makefile +Removed net/ieee80211/ieee80211_crypt.c +Auto-merged net/ipv4/tcp.c +Auto-merged net/ipv4/tcp_input.c +Auto-merged net/ipv4/tcp_ipv4.c +Auto-merged net/ipv6/tcp_ipv6.c +Auto-merged net/sunrpc/svcsock.c +Recorded preimage for 'fs/lockd/host.c' +Recorded preimage for 'fs/lockd/mon.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/sparc64/kernel/idprom.c +rm 'arch/sparc64/kernel/idprom.c' +rm 'arch/sparc64/kernel/idprom.c' +$ git commit -v -a +Recorded resolution for 'fs/lockd/host.c'. +Recorded resolution for 'fs/lockd/mon.c'. +Created commit 0bc5686: Merge commit 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/networking.tmpl | 3 - + Documentation/DocBook/wanbook.tmpl | 99 - + Documentation/RCU/rculist_nulls.txt | 167 + + Documentation/feature-removal-schedule.txt | 7 - + Documentation/networking/README.ipw2200 | 2 +- + Documentation/networking/bonding.txt | 68 +- + Documentation/networking/dccp.txt | 32 +- + Documentation/networking/driver.txt | 2 +- + Documentation/networking/generic-hdlc.txt | 8 +- + Documentation/networking/ip-sysctl.txt | 6 + + Documentation/networking/mac80211_hwsim/README | 9 +- + Documentation/networking/netdevices.txt | 2 +- + Documentation/networking/regulatory.txt | 22 +- + Documentation/rfkill.txt | 20 +- + MAINTAINERS | 35 +- + arch/arm/mach-ixp4xx/fsg-setup.c | 9 +- + arch/arm/mach-ixp4xx/nas100d-setup.c | 5 +- + arch/arm/mach-ixp4xx/nslu2-setup.c | 5 +- + arch/ia64/hp/sim/simeth.c | 10 +- + arch/s390/appldata/appldata_net_sum.c | 4 +- + arch/um/drivers/daemon_kern.c | 2 +- + arch/um/drivers/mcast_kern.c | 2 +- + arch/um/drivers/net_kern.c | 29 +- + arch/um/drivers/pcap_kern.c | 2 +- + arch/um/drivers/slip_kern.c | 2 +- + arch/um/drivers/slirp_kern.c | 2 +- + arch/um/drivers/vde_kern.c | 2 +- + arch/um/os-Linux/drivers/ethertap_kern.c | 2 +- + arch/um/os-Linux/drivers/tuntap_kern.c | 2 +- + arch/xtensa/platforms/iss/network.c | 21 +- + drivers/block/aoe/aoe.h | 1 - + drivers/block/aoe/aoeblk.c | 2 +- + drivers/block/aoe/aoecmd.c | 22 +- + drivers/block/aoe/aoenet.c | 11 - + drivers/bluetooth/Kconfig | 20 - + drivers/bluetooth/Makefile | 1 - + drivers/bluetooth/bcm203x.c | 9 +- + drivers/bluetooth/bfusb.c | 11 +- + drivers/bluetooth/bpa10x.c | 7 +- + drivers/bluetooth/bt3c_cs.c | 8 +- + drivers/bluetooth/btsdio.c | 6 +- + drivers/bluetooth/btusb.c | 229 +- + drivers/bluetooth/hci_bcsp.c | 5 - + drivers/bluetooth/hci_h4.c | 5 - + drivers/bluetooth/hci_ldisc.c | 9 +- + drivers/bluetooth/hci_usb.c | 1136 --- + drivers/bluetooth/hci_usb.h | 129 - + drivers/bluetooth/hci_vhci.c | 5 - + drivers/firmware/iscsi_ibft.c | 7 +- + drivers/infiniband/core/sysfs.c | 10 +- + drivers/infiniband/hw/amso1100/c2_provider.c | 8 +- + drivers/infiniband/hw/mthca/mthca_mcg.c | 23 +- + drivers/infiniband/hw/nes/nes.c | 17 +- + drivers/infiniband/hw/nes/nes_cm.c | 31 +- + drivers/infiniband/hw/nes/nes_nic.c | 10 +- + drivers/infiniband/hw/nes/nes_utils.c | 5 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 23 - + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 25 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 70 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 8 +- + drivers/infiniband/ulp/srp/ib_srp.c | 31 +- + drivers/isdn/gigaset/bas-gigaset.c | 3 +- + drivers/isdn/gigaset/common.c | 5 +- + drivers/isdn/gigaset/gigaset.h | 6 - + drivers/isdn/gigaset/interface.c | 4 +- + drivers/isdn/gigaset/ser-gigaset.c | 18 +- + drivers/isdn/gigaset/usb-gigaset.c | 3 +- + drivers/isdn/hysdn/hysdn_net.c | 6 +- + drivers/isdn/i4l/isdn_concap.c | 4 +- + drivers/isdn/i4l/isdn_net.c | 224 +- + drivers/isdn/i4l/isdn_net.h | 50 +- + drivers/isdn/i4l/isdn_ppp.c | 32 +- + drivers/isdn/mISDN/dsp_hwec.c | 2 +- + drivers/media/dvb/b2c2/flexcop.c | 2 +- + drivers/media/dvb/bt8xx/dst.c | 4 +- + drivers/media/dvb/dm1105/dm1105.c | 3 +- + drivers/media/dvb/dvb-core/dvb_net.c | 37 +- + drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 5 +- + drivers/media/dvb/pluto2/pluto2.c | 3 +- + drivers/message/fusion/mptlan.c | 22 +- + drivers/message/fusion/mptlan.h | 2 +- + drivers/misc/sgi-xp/xpnet.c | 13 +- + drivers/net/3c501.c | 3 +- + drivers/net/3c501.h | 2 +- + drivers/net/3c503.c | 21 +- + drivers/net/3c505.c | 51 +- + drivers/net/3c507.c | 15 +- + drivers/net/3c509.c | 6 +- + drivers/net/3c515.c | 13 +- + drivers/net/3c523.c | 44 +- + drivers/net/3c527.c | 4 +- + drivers/net/3c59x.c | 13 +- + drivers/net/7990.c | 1 - + drivers/net/8139cp.c | 41 +- + drivers/net/8139too.c | 51 +- + drivers/net/82596.c | 48 +- + drivers/net/8390.c | 39 + + drivers/net/8390.h | 15 + + drivers/net/8390p.c | 39 + + drivers/net/Kconfig | 42 +- + drivers/net/Makefile | 10 +- + drivers/net/a2065.c | 5 +- + drivers/net/ac3200.c | 5 +- + drivers/net/acenic.c | 37 +- + drivers/net/amd8111e.c | 6 +- + drivers/net/apne.c | 29 +- + drivers/net/appletalk/cops.c | 9 - + drivers/net/appletalk/ipddp.c | 6 +- + drivers/net/appletalk/ltpc.c | 13 +- + drivers/net/arcnet/arc-rawmode.c | 5 +- + drivers/net/arcnet/arc-rimi.c | 16 +- + drivers/net/arcnet/arcnet.c | 32 +- + drivers/net/arcnet/capmode.c | 7 +- + drivers/net/arcnet/com20020-isa.c | 4 +- + drivers/net/arcnet/com20020-pci.c | 2 +- + drivers/net/arcnet/com20020.c | 10 +- + drivers/net/arcnet/com90io.c | 4 +- + drivers/net/arcnet/com90xx.c | 10 +- + drivers/net/arcnet/rfc1051.c | 9 +- + drivers/net/arcnet/rfc1201.c | 14 +- + drivers/net/ariadne.c | 21 +- + drivers/net/arm/Makefile | 2 +- + drivers/net/arm/am79c961a.c | 7 +- + drivers/net/arm/at91_ether.c | 11 +- + drivers/net/arm/ep93xx_eth.c | 2 - + drivers/net/arm/ether1.c | 5 +- + drivers/net/arm/ether3.c | 5 +- + drivers/net/arm/etherh.c | 24 +- + drivers/net/arm/ixp4xx_eth.c | 1 - + drivers/net/at1700.c | 16 +- + drivers/net/atarilance.c | 52 +- + drivers/net/atl1e/atl1e_main.c | 40 +- + drivers/net/atlx/atl1.c | 98 +- + drivers/net/atlx/atl1.h | 4 +- + drivers/net/atlx/atl2.c | 101 +- + drivers/net/atlx/atl2.h | 1 - + drivers/net/atlx/atlx.c | 13 - + drivers/net/atp.c | 10 +- + drivers/net/au1000_eth.c | 49 +- + drivers/net/ax88796.c | 9 +- + drivers/net/b44.c | 6 +- + drivers/net/bfin_mac.c | 1 - + drivers/net/bmac.c | 7 +- + drivers/net/bnx2.c | 75 +- + drivers/net/bnx2.h | 37 +- + drivers/net/bnx2x_main.c | 50 +- + drivers/net/bonding/Makefile | 3 + + drivers/net/bonding/bond_3ad.c | 333 +- + drivers/net/bonding/bond_3ad.h | 10 +- + drivers/net/bonding/bond_alb.c | 25 +- + drivers/net/bonding/bond_ipv6.c | 218 + + drivers/net/bonding/bond_main.c | 317 +- + drivers/net/bonding/bond_sysfs.c | 150 +- + drivers/net/bonding/bonding.h | 39 +- + drivers/net/cassini.c | 8 +- + drivers/net/chelsio/cxgb2.c | 94 +- + drivers/net/chelsio/sge.c | 3 +- + drivers/net/cpmac.c | 5 +- + drivers/net/cris/eth_v10.c | 4 +- + drivers/net/cs89x0.c | 14 +- + drivers/net/cxgb3/cxgb3_main.c | 104 +- + drivers/net/cxgb3/sge.c | 8 +- + drivers/net/de600.c | 4 +- + drivers/net/de620.c | 26 +- + drivers/net/declance.c | 7 +- + drivers/net/defxx.c | 27 +- + drivers/net/depca.c | 54 +- + drivers/net/dl2k.c | 28 +- + drivers/net/dm9000.c | 40 +- + drivers/net/dummy.c | 15 +- + drivers/net/e100.c | 61 +- + drivers/net/e1000/e1000.h | 1 - + drivers/net/e1000/e1000_main.c | 97 +- + drivers/net/e1000e/82571.c | 19 +- + drivers/net/e1000e/defines.h | 8 + + drivers/net/e1000e/e1000.h | 2 + + drivers/net/e1000e/es2lan.c | 192 +- + drivers/net/e1000e/ethtool.c | 82 +- + drivers/net/e1000e/hw.h | 8 +- + drivers/net/e1000e/ich8lan.c | 151 +- + drivers/net/e1000e/lib.c | 80 +- + drivers/net/e1000e/netdev.c | 115 +- + drivers/net/e1000e/phy.c | 12 +- + drivers/net/e2100.c | 24 +- + drivers/net/eepro.c | 8 +- + drivers/net/eepro100.c | 2401 ------ + drivers/net/eexpress.c | 3 +- + drivers/net/ehea/ehea.h | 2 +- + drivers/net/ehea/ehea_main.c | 1 - + drivers/net/ehea/ehea_qmr.c | 10 +- + drivers/net/enc28j60.c | 19 +- + drivers/net/enic/cq_desc.h | 5 +- + drivers/net/enic/enic.h | 2 +- + drivers/net/enic/enic_main.c | 74 +- + drivers/net/enic/enic_res.c | 7 +- + drivers/net/enic/enic_res.h | 4 - + drivers/net/enic/vnic_dev.c | 70 +- + drivers/net/enic/vnic_devcmd.h | 19 +- + drivers/net/enic/vnic_intr.h | 2 +- + drivers/net/enic/vnic_resource.h | 2 +- + drivers/net/enic/vnic_rq.h | 9 +- + drivers/net/enic/vnic_rss.h | 13 + + drivers/net/enic/vnic_wq.h | 9 +- + drivers/net/epic100.c | 50 +- + drivers/net/eql.c | 12 +- + drivers/net/es3210.c | 34 +- + drivers/net/eth16i.c | 15 +- + drivers/net/ewrk3.c | 18 +- + drivers/net/fealnx.c | 6 +- + drivers/net/fec.c | 6 +- + drivers/net/fec_mpc52xx.c | 3 +- + drivers/net/forcedeth.c | 78 +- + drivers/net/fs_enet/fs_enet-main.c | 5 +- + drivers/net/gianfar.c | 8 +- + drivers/net/hamachi.c | 27 +- + drivers/net/hamradio/6pack.c | 1 - + drivers/net/hamradio/baycom_epp.c | 1 - + drivers/net/hamradio/bpqether.c | 8 +- + drivers/net/hamradio/dmascc.c | 13 +- + drivers/net/hamradio/hdlcdrv.c | 1 - + drivers/net/hamradio/mkiss.c | 1 - + drivers/net/hamradio/scc.c | 13 +- + drivers/net/hamradio/yam.c | 1 - + drivers/net/hp-plus.c | 27 +- + drivers/net/hp.c | 25 +- + drivers/net/hp100.c | 16 +- + drivers/net/hydra.c | 28 +- + drivers/net/ibm_newemac/core.c | 11 +- + drivers/net/ibmlana.c | 6 +- + drivers/net/ibmveth.c | 40 +- + drivers/net/ifb.c | 13 +- + drivers/net/igb/e1000_defines.h | 6 - + drivers/net/igb/igb.h | 36 + + drivers/net/igb/igb_ethtool.c | 129 +- + drivers/net/igb/igb_main.c | 146 +- + drivers/net/ioc3-eth.c | 13 +- + drivers/net/ipg.c | 9 - + drivers/net/irda/ali-ircc.c | 17 +- + drivers/net/irda/au1k_ir.c | 1 - + drivers/net/irda/donauboe.c | 8 +- + drivers/net/irda/irda-usb.c | 15 +- + drivers/net/irda/irtty-sir.c | 7 +- + drivers/net/irda/kingsun-sir.c | 1 - + drivers/net/irda/ks959-sir.c | 1 - + drivers/net/irda/ksdazzle-sir.c | 1 - + drivers/net/irda/mcs7780.c | 1 - + drivers/net/irda/nsc-ircc.c | 17 +- + drivers/net/irda/pxaficp_ir.c | 4 - + drivers/net/irda/sa1100_ir.c | 28 +- + drivers/net/irda/sir_dev.c | 12 +- + drivers/net/irda/stir4200.c | 1 - + drivers/net/irda/via-ircc.c | 16 +- + drivers/net/irda/vlsi_ir.c | 37 +- + drivers/net/irda/w83977af_ir.c | 15 +- + drivers/net/isa-skeleton.c | 16 +- + drivers/net/iseries_veth.c | 14 +- + drivers/net/ixgb/ixgb_main.c | 51 +- + drivers/net/ixgbe/Makefile | 2 + + drivers/net/ixgbe/ixgbe.h | 31 +- + drivers/net/ixgbe/ixgbe_82598.c | 172 +- + drivers/net/ixgbe/ixgbe_dcb.c | 332 + + drivers/net/ixgbe/ixgbe_dcb.h | 184 + + drivers/net/ixgbe/ixgbe_dcb_82598.c | 398 + + drivers/net/ixgbe/ixgbe_dcb_82598.h | 94 + + drivers/net/ixgbe/ixgbe_dcb_nl.c | 615 ++ + drivers/net/ixgbe/ixgbe_ethtool.c | 63 +- + drivers/net/ixgbe/ixgbe_main.c | 409 +- + drivers/net/ixgbe/ixgbe_phy.c | 326 + + drivers/net/ixgbe/ixgbe_phy.h | 25 + + drivers/net/ixgbe/ixgbe_type.h | 28 +- + drivers/net/ixp2000/ixpdev.c | 2 - + drivers/net/jazzsonic.c | 4 +- + drivers/net/jme.c | 70 +- + drivers/net/jme.h | 28 +- + drivers/net/korina.c | 1 - + drivers/net/lance.c | 32 +- + drivers/net/lib82596.c | 14 +- + drivers/net/lib8390.c | 26 +- + drivers/net/lne390.c | 29 +- + drivers/net/loopback.c | 29 +- + drivers/net/lp486e.c | 29 +- + drivers/net/mac8390.c | 22 +- + drivers/net/mac89x0.c | 16 +- + drivers/net/macb.c | 8 +- + drivers/net/mace.c | 34 +- + drivers/net/macmace.c | 6 +- + drivers/net/macsonic.c | 9 +- + drivers/net/macvlan.c | 49 +- + drivers/net/meth.c | 4 +- + drivers/net/mlx4/en_netdev.c | 34 +- + drivers/net/mlx4/en_rx.c | 5 +- + drivers/net/mlx4/mcg.c | 25 +- + drivers/net/mlx4/mlx4_en.h | 8 +- + drivers/net/mv643xx_eth.c | 525 +- + drivers/net/mvme147.c | 9 +- + drivers/net/myri10ge/myri10ge.c | 60 +- + drivers/net/myri10ge/myri10ge_mcp_gen_header.h | 1 + + drivers/net/myri_sbus.c | 27 +- + drivers/net/natsemi.c | 6 +- + drivers/net/ne-h8300.c | 30 +- + drivers/net/ne.c | 27 +- + drivers/net/ne2.c | 29 +- + drivers/net/ne2k-pci.c | 28 +- + drivers/net/ne3210.c | 31 +- + drivers/net/netconsole.c | 9 +- + drivers/net/netx-eth.c | 1 - + drivers/net/netxen/netxen_nic_ethtool.c | 10 +- + drivers/net/netxen/netxen_nic_hw.c | 2 +- + drivers/net/netxen/netxen_nic_init.c | 2 - + drivers/net/netxen/netxen_nic_main.c | 55 +- + drivers/net/netxen/netxen_nic_niu.c | 7 +- + drivers/net/ni5010.c | 15 +- + drivers/net/ni52.c | 43 +- + drivers/net/ni65.c | 39 +- + drivers/net/niu.c | 78 +- + drivers/net/niu.h | 2 +- + drivers/net/ns83820.c | 28 +- + drivers/net/pasemi_mac.c | 8 +- + drivers/net/pasemi_mac_ethtool.c | 4 +- + drivers/net/pci-skeleton.c | 8 +- + drivers/net/pcmcia/3c574_cs.c | 6 +- + drivers/net/pcmcia/3c589_cs.c | 6 +- + drivers/net/pcmcia/axnet_cs.c | 22 +- + drivers/net/pcmcia/com20020_cs.c | 6 +- + drivers/net/pcmcia/fmvj18x_cs.c | 79 +- + drivers/net/pcmcia/nmclan_cs.c | 6 +- + drivers/net/pcmcia/pcnet_cs.c | 3 +- + drivers/net/pcmcia/smc91c92_cs.c | 5 +- + drivers/net/pcmcia/xirc2ps_cs.c | 6 +- + drivers/net/pcnet32.c | 4 +- + drivers/net/phy/Kconfig | 18 +- + drivers/net/phy/Makefile | 4 +- + drivers/net/phy/broadcom.c | 216 +- + drivers/net/phy/mdio-gpio.c | 296 + + drivers/net/phy/mdio-ofgpio.c | 204 - + drivers/net/phy/mdio_bus.c | 18 +- + drivers/net/phy/national.c | 155 + + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phy_device.c | 35 +- + drivers/net/phy/smsc.c | 28 + + drivers/net/phy/ste10Xp.c | 137 + + drivers/net/plip.c | 15 +- + drivers/net/ppp_generic.c | 25 +- + drivers/net/pppoe.c | 5 +- + drivers/net/ps3_gelic_net.c | 6 +- + drivers/net/ps3_gelic_wireless.c | 37 +- + drivers/net/ps3_gelic_wireless.h | 4 +- + drivers/net/qla3xxx.c | 35 +- + drivers/net/qlge/qlge_main.c | 69 +- + drivers/net/r6040.c | 30 +- + drivers/net/r8169.c | 51 +- + drivers/net/rionet.c | 31 +- + drivers/net/rrunner.c | 25 +- + drivers/net/s2io.c | 134 +- + drivers/net/sb1000.c | 1 - + drivers/net/sb1250-mac.c | 5 +- + drivers/net/sc92031.c | 30 +- + drivers/net/seeq8005.c | 13 +- + drivers/net/sfc/Kconfig | 8 + + drivers/net/sfc/Makefile | 1 + + drivers/net/sfc/boards.c | 136 + + drivers/net/sfc/efx.c | 78 +- + drivers/net/sfc/efx.h | 10 + + drivers/net/sfc/enum.h | 4 +- + drivers/net/sfc/ethtool.c | 17 +- + drivers/net/sfc/falcon.c | 23 +- + drivers/net/sfc/falcon_hwdefs.h | 1 - + drivers/net/sfc/mdio_10g.c | 35 + + drivers/net/sfc/mdio_10g.h | 7 + + drivers/net/sfc/mtd.c | 268 + + drivers/net/sfc/net_driver.h | 8 + + drivers/net/sfc/rx.c | 2 +- + drivers/net/sfc/sfe4001.c | 116 +- + drivers/net/sfc/spi.h | 34 +- + drivers/net/sfc/tenxpress.c | 18 +- + drivers/net/sfc/workarounds.h | 2 + + drivers/net/sfc/xfp_phy.c | 9 + + drivers/net/sgiseeq.c | 7 +- + drivers/net/sh_eth.c | 3 +- + drivers/net/sis190.c | 7 +- + drivers/net/sis900.c | 99 +- + drivers/net/skfp/skfddi.c | 21 +- + drivers/net/skge.c | 97 +- + drivers/net/sky2.c | 56 +- + drivers/net/slip.c | 12 +- + drivers/net/smc-mca.c | 27 +- + drivers/net/smc-ultra.c | 27 +- + drivers/net/smc-ultra32.c | 5 +- + drivers/net/smc911x.c | 16 +- + drivers/net/smc9194.c | 11 +- + drivers/net/smc91x.c | 42 +- + drivers/net/smc91x.h | 58 +- + drivers/net/smsc911x.c | 2091 +++++ + drivers/net/smsc911x.h | 394 + + drivers/net/sonic.c | 1 - + drivers/net/sonic.h | 20 +- + drivers/net/spider_net.c | 2 +- + drivers/net/spider_net_ethtool.c | 8 +- + drivers/net/starfire.c | 14 +- + drivers/net/stnic.c | 25 +- + drivers/net/sun3_82586.c | 40 +- + drivers/net/sun3lance.c | 10 +- + drivers/net/sunbmac.c | 22 +- + drivers/net/sundance.c | 6 +- + drivers/net/sungem.c | 59 +- + drivers/net/sunhme.c | 31 +- + drivers/net/sunlance.c | 7 +- + drivers/net/sunqe.c | 15 +- + drivers/net/sunvnet.c | 5 +- + drivers/net/tc35815.c | 23 +- + drivers/net/tehuti.c | 66 +- + drivers/net/tg3.c | 907 ++- + drivers/net/tg3.h | 142 +- + drivers/net/tlan.c | 2 - + drivers/net/tokenring/3c359.c | 13 +- + drivers/net/tokenring/abyss.c | 4 +- + drivers/net/tokenring/ibmtr.c | 11 +- + drivers/net/tokenring/lanstreamer.c | 36 +- + drivers/net/tokenring/madgemc.c | 10 +- + drivers/net/tokenring/olympic.c | 52 +- + drivers/net/tokenring/proteon.c | 5 +- + drivers/net/tokenring/skisa.c | 5 +- + drivers/net/tokenring/smctr.c | 2 - + drivers/net/tokenring/tms380tr.c | 15 +- + drivers/net/tokenring/tmspci.c | 5 +- + drivers/net/tsi108_eth.c | 6 +- + drivers/net/tulip/de2104x.c | 50 +- + drivers/net/tulip/de4x5.c | 17 +- + drivers/net/tulip/dmfe.c | 7 +- + drivers/net/tulip/eeprom.c | 2 +- + drivers/net/tulip/interrupt.c | 2 - + drivers/net/tulip/tulip_core.c | 11 +- + drivers/net/tulip/uli526x.c | 8 +- + drivers/net/tulip/winbond-840.c | 16 +- + drivers/net/tulip/xircom_cb.c | 4 +- + drivers/net/tun.c | 33 +- + drivers/net/typhoon.c | 8 +- + drivers/net/ucc_geth.c | 6 +- + drivers/net/usb/catc.c | 2 - + drivers/net/usb/hso.c | 31 +- + drivers/net/usb/mcs7830.c | 4 +- + drivers/net/usb/pegasus.c | 41 +- + drivers/net/usb/smsc95xx.c | 79 +- + drivers/net/usb/usbnet.c | 5 +- + drivers/net/veth.c | 30 +- + drivers/net/via-rhine.c | 43 +- + drivers/net/via-velocity.c | 28 +- + drivers/net/virtio_net.c | 205 +- + drivers/net/wan/Kconfig | 2 + + drivers/net/wan/Makefile | 2 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/cosa.c | 1 - + drivers/net/wan/cycx_x25.c | 91 +- + drivers/net/wan/dlci.c | 37 +- + drivers/net/wan/dscc4.c | 4 +- + drivers/net/wan/farsync.c | 2 - + drivers/net/wan/{hd6457x.c => hd64570.c} | 255 +- + drivers/net/wan/hd64572.c | 640 ++ + drivers/net/wan/hdlc_fr.c | 10 +- + drivers/net/wan/hdlc_ppp.c | 648 ++- + drivers/net/wan/hostess_sv11.c | 1 - + drivers/net/wan/lapbether.c | 3 - + drivers/net/wan/lmc/lmc_main.c | 1 - + drivers/net/wan/lmc/lmc_proto.c | 1 - + drivers/net/wan/n2.c | 9 +- + drivers/net/wan/pc300_drv.c | 17 +- + drivers/net/wan/pc300too.c | 121 +- + drivers/net/wan/pci200syn.c | 79 +- + drivers/net/wan/sbni.c | 101 +- + drivers/net/wan/sdla.c | 48 +- + drivers/net/wan/sealevel.c | 1 - + drivers/net/wan/syncppp.c | 1480 ---- + drivers/net/wan/wanxl.c | 1 - + drivers/net/wan/x25_asy.c | 50 +- + drivers/net/wan/z85230.c | 2 +- + drivers/net/wd.c | 29 +- + drivers/net/wireless/Kconfig | 163 +- + drivers/net/wireless/Makefile | 22 +- + drivers/net/wireless/adm8211.c | 52 +- + drivers/net/wireless/adm8211.h | 2 - + drivers/net/wireless/airo.c | 241 +- + drivers/net/wireless/arlan-main.c | 27 +- + drivers/net/wireless/ath5k/ath5k.h | 97 +- + drivers/net/wireless/ath5k/attach.c | 14 +- + drivers/net/wireless/ath5k/base.c | 153 +- + drivers/net/wireless/ath5k/dma.c | 190 +- + drivers/net/wireless/ath5k/eeprom.c | 1194 +++- + drivers/net/wireless/ath5k/eeprom.h | 253 +- + drivers/net/wireless/ath5k/initvals.c | 8 +- + drivers/net/wireless/ath5k/pcu.c | 233 +- + drivers/net/wireless/ath5k/phy.c | 9 +- + drivers/net/wireless/ath5k/qcu.c | 37 +- + drivers/net/wireless/ath5k/reg.h | 16 +- + drivers/net/wireless/ath5k/reset.c | 9 +- + drivers/net/wireless/ath9k/Kconfig | 11 + + drivers/net/wireless/ath9k/Makefile | 9 +- + drivers/net/wireless/ath9k/ani.c | 852 ++ + drivers/net/wireless/ath9k/ath9k.h | 431 +- + drivers/net/wireless/ath9k/beacon.c | 242 +- + drivers/net/wireless/ath9k/calib.c | 923 +++ + drivers/net/wireless/ath9k/core.c | 1886 ----- + drivers/net/wireless/ath9k/core.h | 631 +-- + drivers/net/wireless/ath9k/debug.c | 160 + + drivers/net/wireless/ath9k/eeprom.c | 1608 ++++ + drivers/net/wireless/ath9k/hw.c | 8427 +++++--------------- + drivers/net/wireless/ath9k/hw.h | 25 +- + drivers/net/wireless/ath9k/initvals.h | 701 ++- + drivers/net/wireless/ath9k/mac.c | 947 +++ + drivers/net/wireless/ath9k/main.c | 2140 ++++-- + drivers/net/wireless/ath9k/phy.c | 24 +- + drivers/net/wireless/ath9k/rc.c | 1823 ++--- + drivers/net/wireless/ath9k/rc.h | 220 +- + drivers/net/wireless/ath9k/recv.c | 1156 +--- + drivers/net/wireless/ath9k/regd.c | 85 +- + drivers/net/wireless/ath9k/regd.h | 2 +- + drivers/net/wireless/ath9k/xmit.c | 1411 ++-- + drivers/net/wireless/atmel.c | 77 +- + drivers/net/wireless/b43/b43.h | 1 - + drivers/net/wireless/b43/dma.c | 4 +- + drivers/net/wireless/b43/main.c | 227 +- + drivers/net/wireless/b43/pio.c | 3 +- + drivers/net/wireless/b43/xmit.c | 64 +- + drivers/net/wireless/b43/xmit.h | 5 +- + drivers/net/wireless/b43legacy/b43legacy.h | 5 +- + drivers/net/wireless/b43legacy/dma.c | 48 +- + drivers/net/wireless/b43legacy/main.c | 211 +- + drivers/net/wireless/b43legacy/pio.c | 31 +- + drivers/net/wireless/b43legacy/xmit.c | 26 +- + drivers/net/wireless/b43legacy/xmit.h | 2 +- + drivers/net/wireless/hostap/Kconfig | 13 +- + drivers/net/wireless/hostap/hostap.h | 2 +- + drivers/net/wireless/hostap/hostap_80211.h | 2 +- + drivers/net/wireless/hostap/hostap_80211_rx.c | 72 +- + drivers/net/wireless/hostap/hostap_80211_tx.c | 23 +- + drivers/net/wireless/hostap/hostap_ap.c | 253 +- + drivers/net/wireless/hostap/hostap_ap.h | 8 +- + drivers/net/wireless/hostap/hostap_common.h | 13 - + drivers/net/wireless/hostap/hostap_hw.c | 71 +- + drivers/net/wireless/hostap/hostap_info.c | 16 +- + drivers/net/wireless/hostap/hostap_ioctl.c | 157 +- + drivers/net/wireless/hostap/hostap_main.c | 45 +- + drivers/net/wireless/hostap/hostap_pci.c | 2 +- + drivers/net/wireless/hostap/hostap_proc.c | 35 +- + drivers/net/wireless/hostap/hostap_wlan.h | 8 +- + drivers/net/wireless/ipw2x00/Kconfig | 191 + + drivers/net/wireless/ipw2x00/Makefile | 14 + + drivers/net/wireless/{ => ipw2x00}/ipw2100.c | 65 +- + drivers/net/wireless/{ => ipw2x00}/ipw2100.h | 0 + drivers/net/wireless/{ => ipw2x00}/ipw2200.c | 454 +- + drivers/net/wireless/{ => ipw2x00}/ipw2200.h | 1 + + .../net/wireless/ipw2x00/libipw_geo.c | 0 + .../net/wireless/ipw2x00/libipw_module.c | 51 +- + .../net/wireless/ipw2x00/libipw_rx.c | 124 +- + .../net/wireless/ipw2x00/libipw_tx.c | 7 +- + .../net/wireless/ipw2x00/libipw_wx.c | 98 +- + drivers/net/wireless/iwlwifi/Kconfig | 2 + + drivers/net/wireless/iwlwifi/Makefile | 3 +- + drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 146 +- + drivers/net/wireless/iwlwifi/iwl-3945-core.h | 26 +- + drivers/net/wireless/iwlwifi/iwl-3945-io.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 209 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 75 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 23 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 195 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 219 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 62 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 416 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c | 108 + + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 150 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 1174 +-- + drivers/net/wireless/iwlwifi/iwl-calib.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 425 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 291 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 72 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 81 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 129 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 174 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 107 - + drivers/net/wireless/iwlwifi/iwl-io.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 35 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 105 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 129 +- + drivers/net/wireless/iwlwifi/iwl-spectrum.c | 198 + + drivers/net/wireless/iwlwifi/iwl-spectrum.h | 1 + + drivers/net/wireless/iwlwifi/iwl-sta.c | 255 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 14 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 428 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 659 +- + drivers/net/wireless/libertas/assoc.c | 69 +- + drivers/net/wireless/libertas/cmd.c | 32 +- + drivers/net/wireless/libertas/cmd.h | 3 +- + drivers/net/wireless/libertas/debugfs.c | 11 +- + drivers/net/wireless/libertas/decl.h | 4 - + drivers/net/wireless/libertas/defs.h | 14 +- + drivers/net/wireless/libertas/dev.h | 7 +- + drivers/net/wireless/libertas/ethtool.c | 14 +- + drivers/net/wireless/libertas/host.h | 8 + + drivers/net/wireless/libertas/hostcmd.h | 26 +- + drivers/net/wireless/libertas/if_usb.c | 7 +- + drivers/net/wireless/libertas/main.c | 75 +- + drivers/net/wireless/libertas/persistcfg.c | 18 +- + drivers/net/wireless/libertas/radiotap.h | 3 - + drivers/net/wireless/libertas/scan.c | 105 +- + drivers/net/wireless/libertas/scan.h | 4 + + drivers/net/wireless/libertas/tx.c | 2 +- + drivers/net/wireless/libertas/types.h | 5 +- + drivers/net/wireless/libertas/wext.c | 80 +- + drivers/net/wireless/libertas_tf/cmd.c | 5 +- + drivers/net/wireless/libertas_tf/main.c | 8 +- + drivers/net/wireless/mac80211_hwsim.c | 292 +- + drivers/net/wireless/netwave_cs.c | 6 +- + drivers/net/wireless/orinoco/Makefile | 12 + + drivers/net/wireless/{ => orinoco}/airport.c | 0 + drivers/net/wireless/{ => orinoco}/hermes.c | 0 + drivers/net/wireless/{ => orinoco}/hermes.h | 0 + drivers/net/wireless/{ => orinoco}/hermes_dld.c | 0 + drivers/net/wireless/{ => orinoco}/hermes_dld.h | 0 + drivers/net/wireless/{ => orinoco}/hermes_rid.h | 0 + drivers/net/wireless/{ => orinoco}/orinoco.c | 225 +- + drivers/net/wireless/{ => orinoco}/orinoco.h | 9 + + drivers/net/wireless/{ => orinoco}/orinoco_cs.c | 2 +- + .../net/wireless/{ => orinoco}/orinoco_nortel.c | 0 + drivers/net/wireless/{ => orinoco}/orinoco_pci.c | 0 + drivers/net/wireless/{ => orinoco}/orinoco_pci.h | 0 + drivers/net/wireless/{ => orinoco}/orinoco_plx.c | 0 + drivers/net/wireless/{ => orinoco}/orinoco_tmd.c | 0 + drivers/net/wireless/{ => orinoco}/spectrum_cs.c | 23 +- + drivers/net/wireless/p54/p54.h | 57 +- + drivers/net/wireless/p54/p54common.c | 1493 +++- + drivers/net/wireless/p54/p54common.h | 334 +- + drivers/net/wireless/p54/p54pci.c | 65 +- + drivers/net/wireless/p54/p54pci.h | 2 +- + drivers/net/wireless/p54/p54usb.c | 141 +- + drivers/net/wireless/prism54/isl_ioctl.c | 24 +- + drivers/net/wireless/ray_cs.c | 10 +- + drivers/net/wireless/rndis_wlan.c | 95 +- + drivers/net/wireless/rt2x00/Kconfig | 1 + + drivers/net/wireless/rt2x00/rt2400pci.c | 373 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 2 + + drivers/net/wireless/rt2x00/rt2500pci.c | 407 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 2 + + drivers/net/wireless/rt2x00/rt2500usb.c | 443 +- + drivers/net/wireless/rt2x00/rt2500usb.h | 5 + + drivers/net/wireless/rt2x00/rt2x00.h | 113 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 202 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 79 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 47 +- + drivers/net/wireless/rt2x00/rt2x00debug.h | 13 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 86 +- + drivers/net/wireless/rt2x00/rt2x00leds.c | 88 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 33 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 56 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 41 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 37 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 94 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 47 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 145 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 141 +- + drivers/net/wireless/rt2x00/rt61pci.c | 469 +- + drivers/net/wireless/rt2x00/rt61pci.h | 2 + + drivers/net/wireless/rt2x00/rt73usb.c | 689 +- + drivers/net/wireless/rt2x00/rt73usb.h | 2 + + drivers/net/wireless/rtl818x/Makefile | 7 + + drivers/net/wireless/{ => rtl818x}/rtl8180.h | 0 + drivers/net/wireless/{ => rtl818x}/rtl8180_dev.c | 48 +- + .../net/wireless/{ => rtl818x}/rtl8180_grf5101.c | 0 + .../net/wireless/{ => rtl818x}/rtl8180_grf5101.h | 0 + .../net/wireless/{ => rtl818x}/rtl8180_max2820.c | 0 + .../net/wireless/{ => rtl818x}/rtl8180_max2820.h | 0 + .../net/wireless/{ => rtl818x}/rtl8180_rtl8225.c | 14 +- + .../net/wireless/{ => rtl818x}/rtl8180_rtl8225.h | 0 + .../net/wireless/{ => rtl818x}/rtl8180_sa2400.c | 0 + .../net/wireless/{ => rtl818x}/rtl8180_sa2400.h | 0 + drivers/net/wireless/{ => rtl818x}/rtl8187.h | 8 +- + drivers/net/wireless/{ => rtl818x}/rtl8187_dev.c | 337 +- + .../net/wireless/{ => rtl818x}/rtl8187_rtl8225.c | 397 +- + .../net/wireless/{ => rtl818x}/rtl8187_rtl8225.h | 0 + drivers/net/wireless/{ => rtl818x}/rtl818x.h | 1 + + drivers/net/wireless/strip.c | 22 +- + drivers/net/wireless/wavelan.c | 122 +- + drivers/net/wireless/wavelan_cs.c | 39 +- + drivers/net/wireless/wl3501.h | 4 +- + drivers/net/wireless/wl3501_cs.c | 11 +- + drivers/net/wireless/zd1201.c | 121 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 4 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 44 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- + drivers/net/xen-netfront.c | 1 - + drivers/net/xtsonic.c | 6 +- + drivers/net/yellowfin.c | 42 +- + drivers/net/znet.c | 28 +- + drivers/net/zorro8390.c | 29 +- + drivers/parisc/led.c | 4 +- + drivers/s390/net/lcs.c | 12 +- + drivers/s390/net/qeth_core_offl.c | 8 +- + drivers/s390/net/qeth_l2_main.c | 18 +- + drivers/scsi/iscsi_tcp.c | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 3 +- + drivers/staging/slicoss/slicoss.c | 7 +- + drivers/staging/winbond/linux/wbusb.c | 6 +- + drivers/staging/wlan-ng/p80211netdev.c | 20 +- + drivers/staging/wlan-ng/p80211wext.c | 58 +- + drivers/usb/atm/cxacru.c | 4 +- + drivers/usb/atm/usbatm.c | 5 +- + drivers/usb/gadget/u_ether.c | 10 +- + drivers/uwb/wlp/eda.c | 38 +- + firmware/Makefile | 3 + + firmware/WHENCE | 11 + + firmware/cxgb3/t3b_psram-1.1.0.bin.ihex | 162 + + firmware/cxgb3/t3c_psram-1.1.0.bin.ihex | 162 + + firmware/cxgb3/t3fw-7.0.0.bin.ihex | 1881 +++++ + fs/afs/proc.c | 4 +- + fs/afs/server.c | 9 +- + fs/cifs/cifs_spnego.c | 6 +- + fs/cifs/connect.c | 4 +- + fs/dlm/netlink.c | 2 +- + fs/lockd/host.c | 10 +- + fs/nfs/nfsroot.c | 6 +- + fs/nfs/super.c | 6 +- + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfsctl.c | 2 +- + fs/ocfs2/cluster/netdebug.c | 8 +- + fs/ocfs2/cluster/nodemanager.c | 2 +- + fs/ocfs2/cluster/tcp.c | 29 +- + include/linux/atm.h | 17 +- + include/linux/atmdev.h | 15 + + include/linux/cgroup_subsys.h | 6 + + include/linux/dcbnl.h | 338 + + include/linux/dccp.h | 42 +- + include/linux/etherdevice.h | 46 + + include/linux/fddidevice.h | 1 + + include/linux/filter.h | 3 +- + include/linux/hdlc.h | 4 +- + include/linux/hippidevice.h | 4 +- + include/linux/ieee80211.h | 214 +- + include/linux/if.h | 1 + + include/linux/in.h | 4 + + include/linux/kernel.h | 12 - + include/linux/list_nulls.h | 94 + + include/linux/mdio-gpio.h | 25 + + include/linux/netdevice.h | 294 +- + include/linux/netfilter_bridge/ebtables.h | 3 +- + include/linux/netfilter_ipv4/ipt_policy.h | 2 + + include/linux/netfilter_ipv6/ip6t_policy.h | 2 + + include/linux/netlink.h | 3 +- + include/linux/nl80211.h | 192 +- + include/linux/phy.h | 2 + + include/linux/pkt_cls.h | 14 + + include/linux/pkt_sched.h | 16 + + include/linux/rculist_nulls.h | 110 + + include/linux/rfkill.h | 1 + + include/linux/rtnetlink.h | 5 + + include/linux/skbuff.h | 52 +- + include/linux/smsc911x.h | 42 + + include/linux/snmp.h | 3 + + include/linux/sunrpc/svc_xprt.h | 8 +- + include/linux/virtio_net.h | 9 + + include/linux/xfrm.h | 14 + + include/net/bluetooth/bluetooth.h | 4 +- + include/net/bluetooth/hci.h | 2 +- + include/net/cfg80211.h | 102 +- + include/net/checksum.h | 2 +- + include/net/dcbnl.h | 53 + + include/net/dn.h | 8 +- + include/net/dn_fib.h | 6 +- + include/net/dst.h | 39 +- + include/net/flow.h | 9 +- + include/net/gen_stats.h | 3 +- + include/net/ieee80211.h | 143 +- + include/net/ieee80211_radiotap.h | 15 +- + include/net/inet_hashtables.h | 85 +- + include/net/inet_timewait_sock.h | 10 +- + include/net/ip.h | 3 +- + include/net/ip_vs.h | 17 +- + include/net/{ieee80211_crypt.h => lib80211.h} | 75 +- + include/net/mac80211.h | 438 +- + include/net/ndisc.h | 14 + + include/net/neighbour.h | 15 +- + include/net/net_namespace.h | 22 + + include/net/netfilter/nf_conntrack.h | 5 +- + include/net/netfilter/nf_conntrack_ecache.h | 57 +- + include/net/netfilter/nf_conntrack_expect.h | 2 + + include/net/netfilter/nf_conntrack_helper.h | 5 +- + include/net/netfilter/nf_conntrack_l4proto.h | 2 +- + include/net/netfilter/nf_conntrack_tuple.h | 12 +- + include/net/netfilter/nfnetlink_log.h | 14 + + include/net/netlink.h | 22 +- + include/net/netns/ipv4.h | 2 + + include/net/netns/mib.h | 3 + + include/net/netns/x_tables.h | 5 + + include/net/netns/xfrm.h | 56 + + include/net/phonet/phonet.h | 2 +- + include/net/phonet/pn_dev.h | 2 +- + include/net/pkt_cls.h | 2 +- + include/net/sch_generic.h | 38 +- + include/net/sctp/sctp.h | 9 +- + include/net/sock.h | 86 +- + include/net/syncppp.h | 102 - + include/net/tcp.h | 14 +- + include/net/udp.h | 25 +- + include/net/udplite.h | 2 +- + include/net/wireless.h | 90 +- + include/net/xfrm.h | 110 +- + lib/vsprintf.c | 77 + + net/802/fddi.c | 8 +- + net/802/hippi.c | 14 +- + net/802/tr.c | 24 +- + net/8021q/vlan.c | 26 +- + net/8021q/vlan.h | 6 +- + net/8021q/vlan_core.c | 2 - + net/8021q/vlan_dev.c | 54 +- + net/9p/trans_rdma.c | 2 - + net/Kconfig | 7 +- + net/Makefile | 4 +- + net/appletalk/aarp.c | 3 +- + net/appletalk/ddp.c | 2 +- + net/appletalk/sysctl_net_atalk.c | 14 +- + net/atm/atm_sysfs.c | 2 +- + net/atm/br2684.c | 7 +- + net/atm/clip.c | 4 +- + net/atm/common.h | 1 + + net/atm/ioctl.c | 49 +- + net/atm/lec.c | 60 +- + net/atm/mpc.c | 40 +- + net/atm/mpoa_caches.c | 18 +- + net/atm/pvc.c | 3 + + net/atm/resources.c | 88 +- + net/atm/resources.h | 2 +- + net/atm/svc.c | 19 + + net/ax25/sysctl_net_ax25.c | 58 +- + net/bluetooth/af_bluetooth.c | 50 +- + net/bluetooth/bnep/bnep.h | 2 +- + net/bluetooth/bnep/core.c | 8 +- + net/bluetooth/bnep/netdev.c | 11 +- + net/bluetooth/bnep/sock.c | 5 - + net/bluetooth/cmtp/capi.c | 5 - + net/bluetooth/cmtp/core.c | 5 - + net/bluetooth/cmtp/sock.c | 5 - + net/bluetooth/hci_conn.c | 5 - + net/bluetooth/hci_core.c | 11 +- + net/bluetooth/hci_event.c | 5 - + net/bluetooth/hci_sock.c | 5 - + net/bluetooth/hci_sysfs.c | 12 +- + net/bluetooth/hidp/core.c | 5 - + net/bluetooth/hidp/sock.c | 5 - + net/bluetooth/l2cap.c | 5 - + net/bluetooth/rfcomm/core.c | 5 - + net/bluetooth/rfcomm/sock.c | 9 +- + net/bluetooth/rfcomm/tty.c | 35 +- + net/bluetooth/sco.c | 5 - + net/bridge/br_device.c | 20 +- + net/bridge/br_if.c | 4 +- + net/bridge/br_netfilter.c | 13 +- + net/bridge/br_sysfs_br.c | 2 +- + net/bridge/netfilter/ebt_log.c | 18 +- + net/bridge/netfilter/ebtable_broute.c | 26 +- + net/bridge/netfilter/ebtable_filter.c | 41 +- + net/bridge/netfilter/ebtable_nat.c | 38 +- + net/bridge/netfilter/ebtables.c | 52 +- + net/core/datagram.c | 5 +- + net/core/dev.c | 248 +- + net/core/dst.c | 6 +- + net/core/fib_rules.c | 7 +- + net/core/filter.c | 19 + + net/core/flow.c | 6 +- + net/core/gen_estimator.c | 97 +- + net/core/neighbour.c | 73 +- + net/core/net-sysfs.c | 15 +- + net/core/net_namespace.c | 2 - + net/core/netpoll.c | 20 +- + net/core/pktgen.c | 42 +- + net/core/rtnetlink.c | 15 +- + net/core/skbuff.c | 145 +- + net/core/sock.c | 52 +- + net/core/sysctl_net_core.c | 68 +- + net/dcb/Kconfig | 22 + + net/dcb/Makefile | 1 + + net/dcb/dcbnl.c | 1121 +++ + net/dccp/ackvec.c | 9 +- + net/dccp/ackvec.h | 5 +- + net/dccp/ccid.c | 62 +- + net/dccp/ccid.h | 26 +- + net/dccp/ccids/ccid2.c | 6 +- + net/dccp/dccp.h | 17 +- + net/dccp/diag.c | 4 +- + net/dccp/feat.c | 1458 +++- + net/dccp/feat.h | 130 +- + net/dccp/input.c | 44 +- + net/dccp/ipv4.c | 13 +- + net/dccp/ipv6.c | 15 +- + net/dccp/minisocks.c | 54 +- + net/dccp/options.c | 229 +- + net/dccp/output.c | 19 +- + net/dccp/probe.c | 19 +- + net/dccp/proto.c | 224 +- + net/dccp/sysctl.c | 21 - + net/dccp/timer.c | 12 - + net/decnet/af_decnet.c | 62 +- + net/decnet/dn_dev.c | 20 +- + net/decnet/dn_neigh.c | 18 +- + net/decnet/dn_nsp_in.c | 28 +- + net/decnet/dn_nsp_out.c | 23 +- + net/decnet/dn_route.c | 25 +- + net/decnet/dn_table.c | 2 +- + net/decnet/sysctl_net_decnet.c | 48 +- + net/dsa/mv88e6060.c | 2 +- + net/dsa/mv88e6xxx.c | 2 +- + net/dsa/slave.c | 2 +- + net/dsa/tag_dsa.c | 1 - + net/dsa/tag_edsa.c | 1 - + net/dsa/tag_trailer.c | 1 - + net/ethernet/eth.c | 19 +- + net/ieee80211/Kconfig | 73 - + net/ieee80211/Makefile | 12 - + net/ieee80211/ieee80211_crypt.c | 206 - + net/ipv4/af_inet.c | 16 +- + net/ipv4/ah4.c | 10 +- + net/ipv4/arp.c | 36 +- + net/ipv4/cipso_ipv4.c | 1 - + net/ipv4/devinet.c | 19 +- + net/ipv4/esp4.c | 8 +- + net/ipv4/fib_frontend.c | 10 +- + net/ipv4/fib_hash.c | 12 +- + net/ipv4/fib_semantics.c | 8 +- + net/ipv4/fib_trie.c | 6 +- + net/ipv4/icmp.c | 39 +- + net/ipv4/igmp.c | 46 +- + net/ipv4/inet_connection_sock.c | 12 +- + net/ipv4/inet_diag.c | 31 +- + net/ipv4/inet_hashtables.c | 277 +- + net/ipv4/inet_lro.c | 4 +- + net/ipv4/inet_timewait_sock.c | 48 +- + net/ipv4/inetpeer.c | 2 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_fragment.c | 21 +- + net/ipv4/ip_gre.c | 58 +- + net/ipv4/ip_input.c | 10 +- + net/ipv4/ip_output.c | 24 +- + net/ipv4/ip_sockglue.c | 72 +- + net/ipv4/ipcomp.c | 10 +- + net/ipv4/ipconfig.c | 40 +- + net/ipv4/ipip.c | 37 +- + net/ipv4/ipmr.c | 177 +- + net/ipv4/netfilter.c | 7 +- + net/ipv4/netfilter/arp_tables.c | 16 +- + net/ipv4/netfilter/arptable_filter.c | 12 +- + net/ipv4/netfilter/ip_tables.c | 12 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 9 +- + net/ipv4/netfilter/ipt_LOG.c | 7 +- + net/ipv4/netfilter/ipt_addrtype.c | 16 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 27 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +- + net/ipv4/netfilter/nf_nat_h323.c | 58 +- + net/ipv4/netfilter/nf_nat_irc.c | 4 +- + net/ipv4/netfilter/nf_nat_rule.c | 27 +- + net/ipv4/netfilter/nf_nat_sip.c | 18 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 9 +- + net/ipv4/proc.c | 8 +- + net/ipv4/raw.c | 10 +- + net/ipv4/route.c | 227 +- + net/ipv4/sysctl_net_ipv4.c | 188 +- + net/ipv4/tcp.c | 30 +- + net/ipv4/tcp_cubic.c | 120 +- + net/ipv4/tcp_diag.c | 2 +- + net/ipv4/tcp_input.c | 511 +- + net/ipv4/tcp_ipv4.c | 102 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/tcp_output.c | 207 +- + net/ipv4/tcp_probe.c | 7 +- + net/ipv4/tcp_timer.c | 14 +- + net/ipv4/tcp_yeah.c | 4 +- + net/ipv4/udp.c | 271 +- + net/ipv4/udp_impl.h | 4 +- + net/ipv4/udplite.c | 14 +- + net/ipv4/xfrm4_policy.c | 15 +- + net/ipv4/xfrm4_state.c | 2 - + net/ipv6/addrconf.c | 80 +- + net/ipv6/addrlabel.c | 34 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/ah6.c | 9 +- + net/ipv6/anycast.c | 6 +- + net/ipv6/datagram.c | 3 +- + net/ipv6/esp6.c | 7 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/icmp.c | 21 +- + net/ipv6/inet6_connection_sock.c | 2 +- + net/ipv6/inet6_hashtables.c | 182 +- + net/ipv6/ip6_flowlabel.c | 6 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6_tunnel.c | 37 +- + net/ipv6/ip6mr.c | 31 +- + net/ipv6/ipcomp6.c | 10 +- + net/ipv6/mcast.c | 16 +- + net/ipv6/mip6.c | 3 +- + net/ipv6/ndisc.c | 105 +- + net/ipv6/netfilter.c | 7 +- + net/ipv6/netfilter/ip6t_LOG.c | 7 +- + net/ipv6/netfilter/ip6t_REJECT.c | 2 +- + net/ipv6/netfilter/ip6table_filter.c | 17 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 5 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 6 +- + net/ipv6/raw.c | 3 +- + net/ipv6/reassembly.c | 12 +- + net/ipv6/route.c | 45 +- + net/ipv6/sit.c | 35 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/sysctl_net_ipv6.c | 4 +- + net/ipv6/tcp_ipv6.c | 28 +- + net/ipv6/udp.c | 148 +- + net/ipv6/udp_impl.h | 4 +- + net/ipv6/udplite.c | 9 +- + net/ipv6/xfrm6_input.c | 9 +- + net/ipv6/xfrm6_policy.c | 22 +- + net/ipv6/xfrm6_state.c | 2 - + net/ipx/sysctl_net_ipx.c | 2 +- + net/irda/irlan/irlan_client.c | 4 +- + net/irda/irlan/irlan_common.c | 2 +- + net/irda/irsysctl.c | 50 +- + net/key/af_key.c | 217 +- + net/llc/af_llc.c | 1 - + net/llc/llc_proc.c | 3 +- + net/llc/sysctl_net_llc.c | 20 +- + net/mac80211/Kconfig | 8 +- + net/mac80211/cfg.c | 154 +- + net/mac80211/debugfs.c | 12 +- + net/mac80211/debugfs_key.c | 4 +- + net/mac80211/debugfs_netdev.c | 117 +- + net/mac80211/debugfs_sta.c | 84 +- + net/mac80211/event.c | 5 +- + net/mac80211/ht.c | 252 +- + net/mac80211/ieee80211_i.h | 63 +- + net/mac80211/iface.c | 54 +- + net/mac80211/key.c | 10 +- + net/mac80211/main.c | 255 +- + net/mac80211/mesh.c | 4 +- + net/mac80211/mesh.h | 5 +- + net/mac80211/mesh_hwmp.c | 7 +- + net/mac80211/mesh_plink.c | 49 +- + net/mac80211/mlme.c | 530 +- + net/mac80211/rate.c | 52 +- + net/mac80211/rate.h | 11 +- + net/mac80211/rc80211_minstrel.c | 109 +- + net/mac80211/rc80211_minstrel.h | 2 + + net/mac80211/rc80211_pid.h | 3 +- + net/mac80211/rc80211_pid_algo.c | 38 +- + net/mac80211/rc80211_pid_debugfs.c | 5 +- + net/mac80211/rx.c | 112 +- + net/mac80211/scan.c | 24 +- + net/mac80211/sta_info.c | 37 +- + net/mac80211/sta_info.h | 45 +- + net/mac80211/tkip.c | 10 +- + net/mac80211/tx.c | 448 +- + net/mac80211/util.c | 21 +- + net/mac80211/wep.c | 33 +- + net/mac80211/wep.h | 2 +- + net/mac80211/wext.c | 204 +- + net/mac80211/wme.c | 32 +- + net/mac80211/wpa.c | 32 +- + net/netfilter/ipvs/ip_vs_conn.c | 20 +- + net/netfilter/ipvs/ip_vs_core.c | 20 +- + net/netfilter/ipvs/ip_vs_ctl.c | 82 +- + net/netfilter/ipvs/ip_vs_dh.c | 34 +- + net/netfilter/ipvs/ip_vs_ftp.c | 13 +- + net/netfilter/ipvs/ip_vs_lblc.c | 69 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 96 +- + net/netfilter/ipvs/ip_vs_lc.c | 3 - + net/netfilter/ipvs/ip_vs_nq.c | 3 - + net/netfilter/ipvs/ip_vs_proto.c | 38 +- + net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 10 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 8 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 8 +- + net/netfilter/ipvs/ip_vs_rr.c | 3 - + net/netfilter/ipvs/ip_vs_sed.c | 3 - + net/netfilter/ipvs/ip_vs_sh.c | 34 +- + net/netfilter/ipvs/ip_vs_sync.c | 4 +- + net/netfilter/ipvs/ip_vs_wlc.c | 3 - + net/netfilter/ipvs/ip_vs_wrr.c | 3 - + net/netfilter/ipvs/ip_vs_xmit.c | 34 +- + net/netfilter/nf_conntrack_acct.c | 2 +- + net/netfilter/nf_conntrack_amanda.c | 1 + + net/netfilter/nf_conntrack_core.c | 61 +- + net/netfilter/nf_conntrack_ecache.c | 14 +- + net/netfilter/nf_conntrack_expect.c | 43 +- + net/netfilter/nf_conntrack_ftp.c | 24 +- + net/netfilter/nf_conntrack_h323_main.c | 13 +- + net/netfilter/nf_conntrack_helper.c | 32 +- + net/netfilter/nf_conntrack_irc.c | 14 +- + net/netfilter/nf_conntrack_netbios_ns.c | 1 + + net/netfilter/nf_conntrack_netlink.c | 201 +- + net/netfilter/nf_conntrack_pptp.c | 1 + + net/netfilter/nf_conntrack_proto_generic.c | 4 +- + net/netfilter/nf_conntrack_proto_gre.c | 2 +- + net/netfilter/nf_conntrack_proto_sctp.c | 30 +- + net/netfilter/nf_conntrack_proto_tcp.c | 50 +- + net/netfilter/nf_conntrack_proto_udp.c | 8 +- + net/netfilter/nf_conntrack_proto_udplite.c | 4 +- + net/netfilter/nf_conntrack_sane.c | 1 + + net/netfilter/nf_conntrack_sip.c | 1 + + net/netfilter/nf_conntrack_standalone.c | 16 +- + net/netfilter/nf_conntrack_tftp.c | 1 + + net/netfilter/nfnetlink_log.c | 4 +- + net/netfilter/xt_NFLOG.c | 5 +- + net/netfilter/xt_hashlimit.c | 14 +- + net/netfilter/xt_iprange.c | 36 +- + net/netfilter/xt_recent.c | 32 +- + net/netlabel/netlabel_addrlist.c | 4 +- + net/netlabel/netlabel_mgmt.c | 1 - + net/netlink/af_netlink.c | 7 + + net/netlink/attr.c | 8 +- + net/netrom/sysctl_net_netrom.c | 48 +- + net/packet/af_packet.c | 2 + + net/phonet/af_phonet.c | 8 +- + net/phonet/pep-gprs.c | 41 +- + net/phonet/pn_dev.c | 6 +- + net/phonet/socket.c | 11 +- + net/phonet/sysctl.c | 2 +- + net/rfkill/rfkill-input.c | 337 +- + net/rfkill/rfkill-input.h | 3 + + net/rfkill/rfkill.c | 100 +- + net/rose/sysctl_net_rose.c | 40 +- + net/rxrpc/af_rxrpc.c | 4 +- + net/rxrpc/ar-error.c | 3 +- + net/rxrpc/ar-local.c | 16 +- + net/rxrpc/ar-peer.c | 8 +- + net/rxrpc/ar-proc.c | 16 +- + net/rxrpc/ar-transport.c | 12 +- + net/rxrpc/rxkad.c | 2 +- + net/sched/Kconfig | 22 + + net/sched/Makefile | 2 + + net/sched/act_api.c | 18 +- + net/sched/act_gact.c | 4 +- + net/sched/act_ipt.c | 4 +- + net/sched/act_mirred.c | 4 +- + net/sched/act_nat.c | 4 +- + net/sched/act_pedit.c | 4 +- + net/sched/act_police.c | 33 +- + net/sched/act_simple.c | 4 +- + net/sched/act_skbedit.c | 4 +- + net/sched/cls_api.c | 3 +- + net/sched/cls_basic.c | 2 +- + net/sched/cls_cgroup.c | 288 + + net/sched/cls_fw.c | 2 +- + net/sched/cls_route.c | 2 +- + net/sched/cls_tcindex.c | 6 - + net/sched/cls_u32.c | 11 +- + net/sched/ematch.c | 18 +- + net/sched/sch_api.c | 49 +- + net/sched/sch_atm.c | 36 +- + net/sched/sch_blackhole.c | 1 + + net/sched/sch_cbq.c | 76 +- + net/sched/sch_drr.c | 519 ++ + net/sched/sch_dsmark.c | 22 +- + net/sched/sch_fifo.c | 4 +- + net/sched/sch_generic.c | 40 +- + net/sched/sch_gred.c | 22 +- + net/sched/sch_hfsc.c | 64 +- + net/sched/sch_htb.c | 155 +- + net/sched/sch_multiq.c | 82 +- + net/sched/sch_netem.c | 159 +- + net/sched/sch_prio.c | 50 +- + net/sched/sch_red.c | 33 +- + net/sched/sch_sfq.c | 69 +- + net/sched/sch_tbf.c | 44 +- + net/sched/sch_teql.c | 19 +- + net/sctp/ipv6.c | 35 +- + net/sctp/protocol.c | 29 +- + net/sctp/sm_statefuns.c | 10 +- + net/sctp/socket.c | 14 +- + net/sctp/sysctl.c | 82 +- + net/socket.c | 1 - + net/sunrpc/clnt.c | 8 +- + net/sunrpc/rpcb_clnt.c | 17 +- + net/sunrpc/svcauth_unix.c | 24 +- + net/sunrpc/svcsock.c | 6 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 14 +- + net/sunrpc/xprtrdma/transport.c | 14 +- + net/sunrpc/xprtrdma/verbs.c | 16 +- + net/sunrpc/xprtsock.c | 41 +- + net/tipc/eth_media.c | 3 +- + net/tipc/name_table.c | 2 +- + net/unix/af_unix.c | 200 +- + net/unix/garbage.c | 12 +- + net/unix/sysctl_net_unix.c | 3 +- + net/wanrouter/wanmain.c | 36 +- + net/wireless/Kconfig | 30 + + net/wireless/Makefile | 5 + + net/wireless/core.c | 14 +- + net/wireless/core.h | 13 + + net/wireless/lib80211.c | 284 + + .../lib80211_crypt_ccmp.c} | 129 +- + .../lib80211_crypt_tkip.c} | 181 +- + .../lib80211_crypt_wep.c} | 79 +- + net/wireless/nl80211.c | 348 +- + net/wireless/reg.c | 1005 ++- + net/wireless/reg.h | 33 +- + net/wireless/sysfs.c | 25 +- + net/wireless/util.c | 19 + + net/wireless/wext-compat.c | 139 + + net/wireless/wext.c | 2 +- + net/x25/sysctl_net_x25.c | 22 +- + net/xfrm/Makefile | 4 +- + net/xfrm/xfrm_input.c | 28 +- + net/xfrm/xfrm_output.c | 18 +- + net/xfrm/xfrm_policy.c | 511 +- + net/xfrm/xfrm_proc.c | 26 +- + net/xfrm/xfrm_state.c | 407 +- + net/xfrm/xfrm_sysctl.c | 85 + + net/xfrm/xfrm_user.c | 227 +- + security/selinux/avc.c | 4 +- + security/selinux/hooks.c | 4 +- + 1222 files changed, 54031 insertions(+), 41668 deletions(-) + delete mode 100644 Documentation/DocBook/wanbook.tmpl + create mode 100644 Documentation/RCU/rculist_nulls.txt + delete mode 100644 drivers/bluetooth/hci_usb.c + delete mode 100644 drivers/bluetooth/hci_usb.h + create mode 100644 drivers/net/bonding/bond_ipv6.c + delete mode 100644 drivers/net/eepro100.c + create mode 100644 drivers/net/ixgbe/ixgbe_dcb.c + create mode 100644 drivers/net/ixgbe/ixgbe_dcb.h + create mode 100644 drivers/net/ixgbe/ixgbe_dcb_82598.c + create mode 100644 drivers/net/ixgbe/ixgbe_dcb_82598.h + create mode 100644 drivers/net/ixgbe/ixgbe_dcb_nl.c + create mode 100644 drivers/net/phy/mdio-gpio.c + delete mode 100644 drivers/net/phy/mdio-ofgpio.c + create mode 100644 drivers/net/phy/national.c + create mode 100644 drivers/net/phy/ste10Xp.c + create mode 100644 drivers/net/sfc/mtd.c + create mode 100644 drivers/net/smsc911x.c + create mode 100644 drivers/net/smsc911x.h + 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 + create mode 100644 drivers/net/wireless/ath9k/ani.c + create mode 100644 drivers/net/wireless/ath9k/calib.c + delete mode 100644 drivers/net/wireless/ath9k/core.c + create mode 100644 drivers/net/wireless/ath9k/debug.c + create mode 100644 drivers/net/wireless/ath9k/eeprom.c + create mode 100644 drivers/net/wireless/ath9k/mac.c + create mode 100644 drivers/net/wireless/ipw2x00/Kconfig + create mode 100644 drivers/net/wireless/ipw2x00/Makefile + rename drivers/net/wireless/{ => ipw2x00}/ipw2100.c (99%) + rename drivers/net/wireless/{ => ipw2x00}/ipw2100.h (100%) + rename drivers/net/wireless/{ => ipw2x00}/ipw2200.c (97%) + rename drivers/net/wireless/{ => ipw2x00}/ipw2200.h (99%) + rename net/ieee80211/ieee80211_geo.c => drivers/net/wireless/ipw2x00/libipw_geo.c (100%) + rename net/ieee80211/ieee80211_module.c => drivers/net/wireless/ipw2x00/libipw_module.c (88%) + rename net/ieee80211/ieee80211_rx.c => drivers/net/wireless/ipw2x00/libipw_rx.c (94%) + rename net/ieee80211/ieee80211_tx.c => drivers/net/wireless/ipw2x00/libipw_tx.c (98%) + rename net/ieee80211/ieee80211_wx.c => drivers/net/wireless/ipw2x00/libipw_wx.c (91%) + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-spectrum.c + create mode 100644 drivers/net/wireless/orinoco/Makefile + rename drivers/net/wireless/{ => orinoco}/airport.c (100%) + rename drivers/net/wireless/{ => orinoco}/hermes.c (100%) + rename drivers/net/wireless/{ => orinoco}/hermes.h (100%) + rename drivers/net/wireless/{ => orinoco}/hermes_dld.c (100%) + rename drivers/net/wireless/{ => orinoco}/hermes_dld.h (100%) + rename drivers/net/wireless/{ => orinoco}/hermes_rid.h (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco.c (96%) + rename drivers/net/wireless/{ => orinoco}/orinoco.h (96%) + rename drivers/net/wireless/{ => orinoco}/orinoco_cs.c (99%) + rename drivers/net/wireless/{ => orinoco}/orinoco_nortel.c (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_pci.c (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_pci.h (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_plx.c (100%) + rename drivers/net/wireless/{ => orinoco}/orinoco_tmd.c (100%) + rename drivers/net/wireless/{ => orinoco}/spectrum_cs.c (96%) + create mode 100644 drivers/net/wireless/rtl818x/Makefile + rename drivers/net/wireless/{ => rtl818x}/rtl8180.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_dev.c (96%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_grf5101.c (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_grf5101.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_max2820.c (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_max2820.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_rtl8225.c (98%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_rtl8225.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.c (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8180_sa2400.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl8187.h (97%) + rename drivers/net/wireless/{ => rtl818x}/rtl8187_dev.c (82%) + rename drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.c (69%) + rename drivers/net/wireless/{ => rtl818x}/rtl8187_rtl8225.h (100%) + rename drivers/net/wireless/{ => rtl818x}/rtl818x.h (98%) + create mode 100644 firmware/cxgb3/t3b_psram-1.1.0.bin.ihex + create mode 100644 firmware/cxgb3/t3c_psram-1.1.0.bin.ihex + create mode 100644 firmware/cxgb3/t3fw-7.0.0.bin.ihex + create mode 100644 include/linux/dcbnl.h + create mode 100644 include/linux/list_nulls.h + create mode 100644 include/linux/mdio-gpio.h + create mode 100644 include/linux/rculist_nulls.h + create mode 100644 include/linux/smsc911x.h + create mode 100644 include/net/dcbnl.h + rename include/net/{ieee80211_crypt.h => lib80211.h} (58%) + create mode 100644 include/net/netfilter/nfnetlink_log.h + create mode 100644 include/net/netns/xfrm.h + delete mode 100644 include/net/syncppp.h + create mode 100644 net/dcb/Kconfig + create mode 100644 net/dcb/Makefile + create mode 100644 net/dcb/dcbnl.c + delete mode 100644 net/ieee80211/Kconfig + delete mode 100644 net/ieee80211/Makefile + delete mode 100644 net/ieee80211/ieee80211_crypt.c + create mode 100644 net/sched/cls_cgroup.c + create mode 100644 net/sched/sch_drr.c + create mode 100644 net/wireless/lib80211.c + rename net/{ieee80211/ieee80211_crypt_ccmp.c => wireless/lib80211_crypt_ccmp.c} (74%) + rename net/{ieee80211/ieee80211_crypt_tkip.c => wireless/lib80211_crypt_tkip.c} (79%) + rename net/{ieee80211/ieee80211_crypt_wep.c => wireless/lib80211_crypt_wep.c} (74%) + create mode 100644 net/wireless/wext-compat.c + create mode 100644 net/xfrm/xfrm_sysctl.c +$ git am -3 ../patches/0001-net-async_tx-merge-fix.patch +Applying net: async_tx merge fix +$ git reset HEAD^ +net/core/dev.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit 26121ed: Merge commit 'net/master' +Merging mtd/master +$ git merge mtd/master +Auto-merged drivers/mtd/devices/m25p80.c +Auto-merged drivers/mtd/maps/physmap.c +CONFLICT (content): Merge conflict in drivers/mtd/maps/physmap.c +Auto-merged drivers/mtd/nand/fsl_upm.c +Auto-merged drivers/mtd/nand/pxa3xx_nand.c +Auto-merged drivers/mtd/onenand/omap2.c +Resolved 'drivers/mtd/maps/physmap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit a6f0ef2: Merge commit 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + drivers/mtd/devices/m25p80.c | 28 ++++++++++++++++------------ + drivers/mtd/maps/physmap.c | 26 +++++++++----------------- + drivers/mtd/nand/fsl_upm.c | 8 +++++--- + drivers/mtd/nand/pasemi_nand.c | 1 + + drivers/mtd/nand/pxa3xx_nand.c | 1 + + drivers/mtd/onenand/omap2.c | 17 ++++++++--------- + 6 files changed, 40 insertions(+), 41 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/x86/crypto/crc32c-intel.c | 121 +++++----- + crypto/Kconfig | 27 +-- + crypto/Makefile | 1 + + crypto/ahash.c | 38 +++- + crypto/ansi_cprng.c | 35 ++- + crypto/api.c | 121 +++++++++- + crypto/authenc.c | 3 + + crypto/camellia.c | 84 +++---- + crypto/crc32c.c | 290 +++++++++++++---------- + crypto/crypto_null.c | 64 ++++-- + crypto/fcrypt.c | 8 +- + crypto/hmac.c | 10 +- + crypto/internal.h | 2 + + crypto/md4.c | 56 +++-- + crypto/md5.c | 50 +++-- + crypto/michael_mic.c | 72 ++++--- + crypto/proc.c | 20 +- + crypto/rmd128.c | 61 +++--- + crypto/rmd160.c | 61 +++--- + crypto/rmd256.c | 61 +++--- + crypto/rmd320.c | 61 +++--- + crypto/sha1_generic.c | 56 +++-- + crypto/sha256_generic.c | 104 +++++---- + crypto/shash.c | 508 ++++++++++++++++++++++++++++++++++++++++ + crypto/testmgr.c | 76 ++++++- + crypto/tgr192.c | 135 ++++++----- + crypto/wp512.c | 121 +++++----- + drivers/crypto/hifn_795x.c | 494 ++++++++++++++++++--------------------- + drivers/crypto/padlock-aes.c | 52 ++++- + drivers/crypto/talitos.c | 171 +++++++++----- + drivers/crypto/talitos.h | 85 ++++--- + include/crypto/algapi.h | 16 ++- + include/crypto/hash.h | 125 ++++++++++ + include/crypto/internal/hash.h | 16 +- + include/linux/crc32c.h | 6 +- + include/linux/crypto.h | 10 +- + lib/Kconfig | 2 + + lib/libcrc32c.c | 182 +++------------ + 38 files changed, 2176 insertions(+), 1229 deletions(-) + create mode 100644 crypto/shash.c +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Auto-merged MAINTAINERS +Removed sound/pci/hda/hda_patch.h +Removed sound/soc/at32/Kconfig +Removed sound/soc/at32/Makefile +Removed sound/soc/at32/at32-pcm.h +Removed sound/soc/at32/at32-ssc.c +Removed sound/soc/at32/at32-ssc.h +Removed sound/soc/at91/Kconfig +Removed sound/soc/at91/Makefile +Removed sound/soc/at91/at91-pcm.c +Removed sound/soc/at91/at91-pcm.h +Removed sound/soc/at91/at91-ssc.c +Removed sound/soc/at91/at91-ssc.h +Auto-merged sound/soc/pxa/pxa2xx-ac97.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 14 +- + Documentation/sound/alsa/HD-Audio.txt | 535 +++++++ + Documentation/sound/alsa/Procfile.txt | 10 + + Documentation/sound/alsa/soc/machine.txt | 8 +- + MAINTAINERS | 2 +- + arch/arm/mach-pxa/include/mach/palmasoc.h | 13 + + include/linux/input.h | 1 + + include/sound/asound.h | 1 + + include/sound/core.h | 28 +- + include/sound/info.h | 106 +- + include/sound/jack.h | 1 + + include/sound/l3.h | 18 + + include/sound/s3c24xx_uda134x.h | 14 + + include/sound/soc-dai.h | 223 +++ + include/sound/soc-dapm.h | 2 - + include/sound/soc.h | 191 +-- + include/sound/uda134x.h | 26 + + include/sound/version.h | 2 +- + sound/ac97_bus.c | 1 + + sound/aoa/codecs/Makefile | 4 + + sound/aoa/codecs/{snd-aoa-codec-onyx.c => onyx.c} | 12 +- + sound/aoa/codecs/{snd-aoa-codec-onyx.h => onyx.h} | 0 + ...aoa-codec-tas-basstreble.h => tas-basstreble.h} | 0 + ...aoa-codec-tas-gain-table.h => tas-gain-table.h} | 0 + sound/aoa/codecs/{snd-aoa-codec-tas.c => tas.c} | 8 +- + sound/aoa/codecs/{snd-aoa-codec-tas.h => tas.h} | 0 + .../codecs/{snd-aoa-codec-toonie.c => toonie.c} | 2 +- + sound/aoa/core/Makefile | 8 +- + sound/aoa/core/{snd-aoa-alsa.c => alsa.c} | 4 +- + sound/aoa/core/{snd-aoa-alsa.h => alsa.h} | 0 + sound/aoa/core/{snd-aoa-core.c => core.c} | 2 +- + .../{snd-aoa-gpio-feature.c => gpio-feature.c} | 2 +- + sound/aoa/core/{snd-aoa-gpio-pmf.c => gpio-pmf.c} | 0 + sound/aoa/fabrics/Makefile | 2 + + .../fabrics/{snd-aoa-fabric-layout.c => layout.c} | 2 +- + sound/aoa/soundbus/i2sbus/Makefile | 2 +- + .../i2sbus/{i2sbus-control.c => control.c} | 0 + .../aoa/soundbus/i2sbus/{i2sbus-core.c => core.c} | 4 +- + sound/aoa/soundbus/i2sbus/i2sbus.h | 2 +- + .../i2sbus/{i2sbus-interface.h => interface.h} | 0 + sound/aoa/soundbus/i2sbus/{i2sbus-pcm.c => pcm.c} | 0 + sound/core/Kconfig | 21 + + sound/core/Makefile | 2 + + sound/core/device.c | 4 +- + sound/core/hrtimer.c | 155 ++ + sound/core/info.c | 17 + + sound/core/init.c | 71 +- + sound/core/jack.c | 9 +- + sound/core/seq/seq.c | 4 +- + sound/drivers/Kconfig | 2 +- + sound/drivers/pcsp/pcsp.c | 8 +- + sound/drivers/pcsp/pcsp.h | 3 + + sound/drivers/pcsp/pcsp_lib.c | 168 ++- + sound/pci/Kconfig | 127 +-- + sound/pci/ac97/ac97_codec.c | 2 +- + sound/pci/ac97/ac97_patch.c | 2 + + sound/pci/ca0106/ca0106.h | 15 +- + sound/pci/ca0106/ca0106_main.c | 519 ++++--- + sound/pci/ca0106/ca0106_mixer.c | 182 ++- + sound/pci/cs46xx/cs46xx_lib.c | 5 +- + sound/pci/emu10k1/emu10k1_main.c | 494 +++--- + sound/pci/emu10k1/emumixer.c | 46 + + sound/pci/hda/Kconfig | 188 +++ + sound/pci/hda/Makefile | 75 +- + sound/pci/hda/hda_beep.c | 2 + + sound/pci/hda/hda_codec.c | 773 +++++++-- + sound/pci/hda/hda_codec.h | 105 ++- + sound/pci/hda/hda_eld.c | 590 +++++++ + sound/pci/hda/hda_generic.c | 21 +- + sound/pci/hda/hda_hwdep.c | 234 +++- + sound/pci/hda/hda_intel.c | 338 ++-- + sound/pci/hda/hda_local.h | 100 ++- + sound/pci/hda/hda_patch.h | 22 - + sound/pci/hda/hda_proc.c | 91 +- + sound/pci/hda/patch_analog.c | 131 ++- + sound/pci/hda/patch_atihdmi.c | 32 +- + sound/pci/hda/patch_cmedia.c | 27 +- + sound/pci/hda/patch_conexant.c | 39 +- + sound/pci/hda/patch_intelhdmi.c | 711 +++++++++ + sound/pci/hda/patch_nvhdmi.c | 28 +- + sound/pci/hda/patch_realtek.c | 1663 +++++++++++--------- + sound/pci/hda/patch_si3054.c | 35 +- + sound/pci/hda/patch_sigmatel.c | 780 ++++++---- + sound/pci/hda/patch_via.c | 99 +- + sound/pci/ice1712/ice1724.c | 23 +- + sound/pci/mixart/mixart.c | 4 +- + sound/pci/oxygen/oxygen.c | 4 + + sound/pci/pcxhr/Makefile | 2 +- + sound/pci/pcxhr/pcxhr.c | 556 +++++-- + sound/pci/pcxhr/pcxhr.h | 76 +- + sound/pci/pcxhr/pcxhr_core.c | 291 +++-- + sound/pci/pcxhr/pcxhr_core.h | 5 +- + sound/pci/pcxhr/pcxhr_hwdep.c | 158 ++- + sound/pci/pcxhr/pcxhr_mix22.c | 820 ++++++++++ + sound/pci/pcxhr/pcxhr_mix22.h | 56 + + sound/pci/pcxhr/pcxhr_mixer.c | 556 +++++-- + sound/pci/riptide/riptide.c | 2 +- + sound/pci/rme9652/hdsp.c | 2 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/ppc/pmac.c | 2 +- + sound/ppc/tumbler.c | 3 +- + sound/soc/Kconfig | 3 +- + sound/soc/Makefile | 2 +- + sound/soc/at32/Kconfig | 34 - + sound/soc/at32/Makefile | 11 - + sound/soc/at32/at32-pcm.h | 79 - + sound/soc/at32/at32-ssc.c | 849 ---------- + sound/soc/at32/at32-ssc.h | 59 - + sound/soc/at91/Kconfig | 10 - + sound/soc/at91/Makefile | 6 - + sound/soc/at91/at91-pcm.c | 434 ----- + sound/soc/at91/at91-pcm.h | 72 - + sound/soc/at91/at91-ssc.c | 791 ---------- + sound/soc/at91/at91-ssc.h | 27 - + sound/soc/atmel/Kconfig | 43 + + sound/soc/atmel/Makefile | 15 + + sound/soc/{at32/at32-pcm.c => atmel/atmel-pcm.c} | 374 +++--- + sound/soc/atmel/atmel-pcm.h | 86 + + sound/soc/atmel/atmel_ssc_dai.c | 778 +++++++++ + sound/soc/atmel/atmel_ssc_dai.h | 121 ++ + sound/soc/{at32 => atmel}/playpaq_wm8510.c | 11 +- + sound/soc/atmel/sam9g20_wm8731.c | 328 ++++ + sound/soc/au1x/psc-ac97.c | 13 +- + sound/soc/au1x/psc-i2s.c | 15 +- + sound/soc/au1x/sample-ac97.c | 4 +- + sound/soc/blackfin/Kconfig | 22 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 101 +- + sound/soc/blackfin/bf5xx-ac97.c | 166 ++- + sound/soc/blackfin/bf5xx-ac97.h | 35 +- + sound/soc/blackfin/bf5xx-ad1980.c | 8 +- + sound/soc/blackfin/bf5xx-ad73311.c | 10 +- + sound/soc/blackfin/bf5xx-i2s.c | 19 +- + sound/soc/blackfin/bf5xx-sport.h | 2 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 14 +- + sound/soc/codecs/Kconfig | 65 +- + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/ac97.c | 7 +- + sound/soc/codecs/ad1980.c | 24 +- + sound/soc/codecs/ad73311.c | 6 +- + sound/soc/codecs/ak4535.c | 7 +- + sound/soc/codecs/cs4270.c | 26 +- + sound/soc/codecs/l3.c | 91 ++ + sound/soc/codecs/pcm3008.c | 200 +++ + sound/soc/codecs/pcm3008.h | 25 + + sound/soc/codecs/ssm2602.c | 41 +- + sound/soc/codecs/tlv320aic23.c | 248 +++- + sound/soc/codecs/tlv320aic26.c | 7 +- + sound/soc/codecs/tlv320aic3x.c | 150 ++- + sound/soc/codecs/tlv320aic3x.h | 58 +- + sound/soc/codecs/twl4030.c | 1047 ++++++++++++ + sound/soc/codecs/twl4030.h | 213 +++ + sound/soc/codecs/uda134x.c | 656 ++++++++ + sound/soc/codecs/uda134x.h | 36 + + sound/soc/codecs/uda1380.c | 17 +- + sound/soc/codecs/wm8510.c | 7 +- + sound/soc/codecs/wm8580.c | 122 +- + sound/soc/codecs/wm8580.h | 1 + + sound/soc/codecs/wm8728.c | 573 +++++++ + sound/soc/codecs/wm8728.h | 30 + + sound/soc/codecs/wm8731.c | 13 +- + sound/soc/codecs/wm8750.c | 7 +- + sound/soc/codecs/wm8753.c | 27 +- + sound/soc/codecs/wm8900.c | 120 +- + sound/soc/codecs/wm8900.h | 1 + + sound/soc/codecs/wm8903.c | 21 +- + sound/soc/codecs/wm8971.c | 7 +- + sound/soc/codecs/wm8990.c | 31 +- + sound/soc/codecs/wm8990.h | 4 +- + sound/soc/codecs/wm9712.c | 12 +- + sound/soc/codecs/wm9713.c | 46 +- + sound/soc/davinci/Kconfig | 10 + + sound/soc/davinci/Makefile | 2 + + sound/soc/davinci/davinci-evm.c | 6 +- + sound/soc/davinci/davinci-i2s.c | 141 ++- + sound/soc/davinci/davinci-sffsdr.c | 157 ++ + sound/soc/fsl/Kconfig | 2 +- + sound/soc/fsl/fsl_dma.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 14 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 18 +- + sound/soc/fsl/mpc8610_hpcd.c | 8 +- + sound/soc/fsl/soc-of-simple.c | 12 +- + sound/soc/omap/Kconfig | 35 +- + sound/soc/omap/Makefile | 8 + + sound/soc/omap/n810.c | 10 +- + sound/soc/omap/omap-mcbsp.c | 44 +- + sound/soc/omap/omap2evm.c | 151 ++ + sound/soc/omap/omap3beagle.c | 149 ++ + sound/soc/omap/omap3pandora.c | 311 ++++ + sound/soc/omap/osk5912.c | 6 +- + sound/soc/omap/overo.c | 148 ++ + sound/soc/omap/sdp3430.c | 152 ++ + sound/soc/pxa/Kconfig | 22 + + sound/soc/pxa/Makefile | 6 + + sound/soc/pxa/corgi.c | 12 +- + sound/soc/pxa/e800_wm9712.c | 8 +- + sound/soc/pxa/em-x270.c | 7 +- + sound/soc/pxa/palm27x.c | 269 ++++ + sound/soc/pxa/poodle.c | 6 +- + sound/soc/pxa/pxa-ssp.c | 919 +++++++++++ + sound/soc/pxa/pxa-ssp.h | 47 + + sound/soc/pxa/pxa2xx-ac97.c | 21 +- + sound/soc/pxa/pxa2xx-i2s.c | 22 +- + sound/soc/pxa/pxa2xx-pcm.c | 2 +- + sound/soc/pxa/spitz.c | 6 +- + sound/soc/pxa/tosa.c | 38 +- + sound/soc/pxa/zylonite.c | 219 +++ + sound/soc/s3c24xx/Kconfig | 5 + + sound/soc/s3c24xx/Makefile | 2 + + sound/soc/s3c24xx/ln2440sbc_alc650.c | 8 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 9 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 25 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 15 +- + sound/soc/s3c24xx/s3c24xx-i2s.c | 23 +- + sound/soc/s3c24xx/s3c24xx_uda134x.c | 373 +++++ + sound/soc/s3c24xx/smdk2443_wm9710.c | 8 +- + sound/soc/sh/hac.c | 7 +- + sound/soc/sh/sh7760-ac97.c | 6 +- + sound/soc/sh/ssi.c | 18 +- + sound/soc/soc-core.c | 512 ++++--- + sound/soc/soc-dapm.c | 76 +- + sound/usb/caiaq/caiaq-control.c | 73 +- + sound/usb/caiaq/caiaq-device.c | 2 +- + 222 files changed, 17676 insertions(+), 6726 deletions(-) + create mode 100644 Documentation/sound/alsa/HD-Audio.txt + create mode 100644 arch/arm/mach-pxa/include/mach/palmasoc.h + create mode 100644 include/sound/l3.h + create mode 100644 include/sound/s3c24xx_uda134x.h + create mode 100644 include/sound/soc-dai.h + create mode 100644 include/sound/uda134x.h + rename sound/aoa/codecs/{snd-aoa-codec-onyx.c => onyx.c} (99%) + rename sound/aoa/codecs/{snd-aoa-codec-onyx.h => onyx.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-tas-basstreble.h => tas-basstreble.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-tas-gain-table.h => tas-gain-table.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-tas.c => tas.c} (99%) + rename sound/aoa/codecs/{snd-aoa-codec-tas.h => tas.h} (100%) + rename sound/aoa/codecs/{snd-aoa-codec-toonie.c => toonie.c} (98%) + rename sound/aoa/core/{snd-aoa-alsa.c => alsa.c} (98%) + rename sound/aoa/core/{snd-aoa-alsa.h => alsa.h} (100%) + rename sound/aoa/core/{snd-aoa-core.c => core.c} (99%) + rename sound/aoa/core/{snd-aoa-gpio-feature.c => gpio-feature.c} (99%) + rename sound/aoa/core/{snd-aoa-gpio-pmf.c => gpio-pmf.c} (100%) + rename sound/aoa/fabrics/{snd-aoa-fabric-layout.c => layout.c} (99%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-control.c => control.c} (100%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-core.c => core.c} (99%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-interface.h => interface.h} (100%) + rename sound/aoa/soundbus/i2sbus/{i2sbus-pcm.c => pcm.c} (100%) + create mode 100644 sound/core/hrtimer.c + create mode 100644 sound/pci/hda/Kconfig + create mode 100644 sound/pci/hda/hda_eld.c + delete mode 100644 sound/pci/hda/hda_patch.h + create mode 100644 sound/pci/hda/patch_intelhdmi.c + create mode 100644 sound/pci/pcxhr/pcxhr_mix22.c + create mode 100644 sound/pci/pcxhr/pcxhr_mix22.h + delete mode 100644 sound/soc/at32/Kconfig + delete mode 100644 sound/soc/at32/Makefile + delete mode 100644 sound/soc/at32/at32-pcm.h + delete mode 100644 sound/soc/at32/at32-ssc.c + delete mode 100644 sound/soc/at32/at32-ssc.h + delete mode 100644 sound/soc/at91/Kconfig + delete mode 100644 sound/soc/at91/Makefile + delete mode 100644 sound/soc/at91/at91-pcm.c + delete mode 100644 sound/soc/at91/at91-pcm.h + delete mode 100644 sound/soc/at91/at91-ssc.c + delete mode 100644 sound/soc/at91/at91-ssc.h + create mode 100644 sound/soc/atmel/Kconfig + create mode 100644 sound/soc/atmel/Makefile + rename sound/soc/{at32/at32-pcm.c => atmel/atmel-pcm.c} (50%) + create mode 100644 sound/soc/atmel/atmel-pcm.h + create mode 100644 sound/soc/atmel/atmel_ssc_dai.c + create mode 100644 sound/soc/atmel/atmel_ssc_dai.h + rename sound/soc/{at32 => atmel}/playpaq_wm8510.c (98%) + create mode 100644 sound/soc/atmel/sam9g20_wm8731.c + create mode 100644 sound/soc/codecs/l3.c + create mode 100644 sound/soc/codecs/pcm3008.c + create mode 100644 sound/soc/codecs/pcm3008.h + create mode 100644 sound/soc/codecs/twl4030.c + create mode 100644 sound/soc/codecs/twl4030.h + create mode 100644 sound/soc/codecs/uda134x.c + create mode 100644 sound/soc/codecs/uda134x.h + create mode 100644 sound/soc/codecs/wm8728.c + create mode 100644 sound/soc/codecs/wm8728.h + create mode 100644 sound/soc/davinci/davinci-sffsdr.c + create mode 100644 sound/soc/omap/omap2evm.c + create mode 100644 sound/soc/omap/omap3beagle.c + create mode 100644 sound/soc/omap/omap3pandora.c + create mode 100644 sound/soc/omap/overo.c + create mode 100644 sound/soc/omap/sdp3430.c + create mode 100644 sound/soc/pxa/palm27x.c + create mode 100644 sound/soc/pxa/pxa-ssp.c + create mode 100644 sound/soc/pxa/pxa-ssp.h + create mode 100644 sound/soc/pxa/zylonite.c + create mode 100644 sound/soc/s3c24xx/s3c24xx_uda134x.c +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 ++- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 51 +++++++++----------- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 9 ++++ + drivers/cpufreq/cpufreq.c | 55 ++++++++++++++-------- + include/linux/cpufreq.h | 1 + + 5 files changed, 74 insertions(+), 48 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. +Merging rr_cpumask/master +$ git merge rr_cpumask/master +Renamed arch/sparc/kernel/sparc_ksyms.c => arch/sparc/kernel/sparc_ksyms_32.c +Auto-merged arch/sparc/kernel/sparc_ksyms_32.c +Renamed arch/sparc64/kernel/irq.c => arch/sparc/kernel/irq_64.c +Auto-merged arch/sparc/kernel/irq_64.c +Renamed arch/sparc64/kernel/smp.c => arch/sparc/kernel/smp_64.c +Auto-merged arch/sparc/kernel/smp_64.c +Auto-merged arch/arm/kernel/smp.c +Auto-merged arch/arm/mach-pxa/time.c +Auto-merged arch/arm/mach-realview/core.c +Auto-merged arch/arm/mach-realview/localtimer.c +Auto-merged arch/arm/mach-sa1100/time.c +Auto-merged arch/arm/mach-versatile/core.c +Auto-merged arch/m32r/Kconfig +Auto-merged arch/powerpc/kernel/smp.c +Auto-merged arch/powerpc/kernel/time.c +Auto-merged arch/powerpc/platforms/pseries/xics.c +Auto-merged arch/powerpc/sysdev/mpic.c +Auto-merged arch/s390/Kconfig +Auto-merged arch/s390/kernel/smp.c +Auto-merged arch/s390/kernel/time.c +Auto-merged arch/x86/kernel/apic.c +Auto-merged arch/x86/kernel/cpu/intel_cacheinfo.c +Auto-merged arch/x86/kernel/hpet.c +Auto-merged arch/x86/kernel/irq_64.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged arch/x86/lguest/boot.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/probe.c +Auto-merged init/Kconfig +Auto-merged kernel/irq/manage.c +Auto-merged kernel/profile.c +Auto-merged kernel/sched.c +Auto-merged kernel/trace/trace.c +Auto-merged lib/Kconfig +Merge made by recursive. + arch/alpha/include/asm/smp.h | 1 - + arch/alpha/kernel/irq.c | 2 +- + arch/alpha/kernel/process.c | 2 + + arch/alpha/kernel/smp.c | 7 +-- + arch/alpha/kernel/sys_dp264.c | 8 ++-- + arch/alpha/kernel/sys_titan.c | 4 +- + arch/arm/common/gic.c | 4 +- + arch/arm/kernel/irq.c | 2 +- + arch/arm/kernel/smp.c | 10 ---- + arch/arm/mach-at91/at91rm9200_time.c | 3 +- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-davinci/time.c | 2 +- + arch/arm/mach-imx/time.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-msm/timer.c | 2 +- + arch/arm/mach-ns9xxx/time-ns9360.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/timer-gp.c | 2 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-realview/core.c | 2 +- + arch/arm/mach-realview/localtimer.c | 4 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-versatile/core.c | 2 +- + arch/arm/oprofile/op_model_mpcore.c | 4 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-orion/time.c | 2 +- + arch/avr32/kernel/time.c | 2 +- + arch/blackfin/kernel/time-ts.c | 2 +- + arch/cris/arch-v32/kernel/irq.c | 4 +- + arch/cris/arch-v32/kernel/smp.c | 4 -- + arch/cris/include/asm/smp.h | 1 - + arch/ia64/hp/sim/hpsim_irq.c | 2 +- + arch/ia64/include/asm/smp.h | 1 - + arch/ia64/kernel/iosapic.c | 12 ++-- + arch/ia64/kernel/irq.c | 9 ++-- + arch/ia64/kernel/msi_ia64.c | 12 ++-- + arch/ia64/kernel/smpboot.c | 10 +--- + arch/ia64/kernel/topology.c | 2 +- + arch/ia64/sn/kernel/irq.c | 6 +- + arch/ia64/sn/kernel/msi_sn.c | 7 ++- + arch/m32r/Kconfig | 1 + + arch/m32r/kernel/smpboot.c | 6 -- + arch/m68knommu/platform/coldfire/pit.c | 2 +- + arch/mips/include/asm/irq.h | 3 +- + arch/mips/include/asm/smp.h | 3 - + arch/mips/jazz/irq.c | 2 +- + arch/mips/kernel/cevt-bcm1480.c | 4 +- + arch/mips/kernel/cevt-ds1287.c | 2 +- + arch/mips/kernel/cevt-gt641xx.c | 2 +- + arch/mips/kernel/cevt-r4k.c | 2 +- + arch/mips/kernel/cevt-sb1250.c | 4 +- + arch/mips/kernel/cevt-smtc.c | 2 +- + arch/mips/kernel/cevt-txx9.c | 2 +- + arch/mips/kernel/i8253.c | 2 +- + arch/mips/kernel/irq-gic.c | 6 +- + arch/mips/kernel/smp-cmp.c | 6 +- + arch/mips/kernel/smp-mt.c | 2 +- + arch/mips/kernel/smp.c | 7 +-- + arch/mips/kernel/smtc.c | 6 +- + arch/mips/mti-malta/malta-smtc.c | 6 +- + arch/mips/nxp/pnx8550/common/time.c | 1 + + arch/mips/pmc-sierra/yosemite/smp.c | 6 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/mips/sgi-ip27/ip27-timer.c | 2 +- + arch/mips/sibyte/bcm1480/irq.c | 8 ++-- + arch/mips/sibyte/bcm1480/smp.c | 8 ++-- + arch/mips/sibyte/sb1250/irq.c | 8 ++-- + arch/mips/sibyte/sb1250/smp.c | 8 ++-- + arch/mips/sni/time.c | 2 +- + arch/parisc/Kconfig | 1 + + arch/parisc/kernel/irq.c | 6 +- + arch/parisc/kernel/smp.c | 15 ----- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/smp.c | 4 -- + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/platforms/pseries/xics.c | 4 +- + arch/powerpc/sysdev/mpic.c | 4 +- + arch/powerpc/sysdev/mpic.h | 2 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/smp.c | 6 -- + arch/s390/kernel/time.c | 2 +- + arch/sh/include/asm/smp.h | 2 +- + arch/sh/kernel/smp.c | 10 +--- + arch/sh/kernel/timers/timer-broadcast.c | 2 +- + arch/sh/kernel/timers/timer-tmu.c | 2 +- + arch/sparc/include/asm/smp_32.h | 2 - + arch/sparc/kernel/irq_64.c | 11 +++-- + arch/sparc/kernel/of_device_64.c | 2 +- + arch/sparc/kernel/pci_msi.c | 2 +- + arch/sparc/kernel/smp_32.c | 6 +-- + arch/sparc/kernel/smp_64.c | 4 -- + arch/sparc/kernel/sparc_ksyms_32.c | 4 -- + arch/sparc/kernel/time_64.c | 2 +- + arch/um/kernel/smp.c | 7 --- + arch/um/kernel/time.c | 2 +- + arch/x86/kernel/apic.c | 8 ++-- + arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- + arch/x86/kernel/hpet.c | 8 ++-- + arch/x86/kernel/i8253.c | 2 +- + arch/x86/kernel/io_apic.c | 81 ++++++++++++++--------------- + arch/x86/kernel/irq_32.c | 2 +- + arch/x86/kernel/irq_64.c | 2 +- + arch/x86/kernel/mfgpt_32.c | 2 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/smpboot.c | 6 -- + arch/x86/kernel/vmiclock_32.c | 2 +- + arch/x86/lguest/boot.c | 2 +- + arch/x86/mach-voyager/voyager_smp.c | 7 --- + arch/x86/xen/time.c | 2 +- + drivers/base/cpu.c | 2 +- + drivers/base/node.c | 4 +- + drivers/base/topology.c | 4 +- + drivers/clocksource/tcb_clksrc.c | 2 +- + drivers/parisc/iosapic.c | 7 ++- + drivers/pci/pci-sysfs.c | 4 +- + drivers/pci/probe.c | 4 +- + drivers/xen/events.c | 6 +- + include/asm-m32r/smp.h | 2 - + include/linux/clockchips.h | 4 +- + include/linux/cpumask.h | 87 ++++++++++++++++++++----------- + include/linux/interrupt.h | 4 +- + include/linux/irq.h | 3 +- + init/Kconfig | 9 +++ + kernel/cpu.c | 11 ++-- + kernel/cpuset.c | 4 +- + kernel/irq/chip.c | 2 +- + kernel/irq/manage.c | 22 ++++---- + kernel/irq/migration.c | 14 +++--- + kernel/irq/proc.c | 31 +++++++---- + kernel/profile.c | 4 +- + kernel/sched.c | 4 +- + kernel/sched_stats.h | 2 +- + kernel/taskstats.c | 2 +- + kernel/time/clockevents.c | 2 + + kernel/time/tick-broadcast.c | 2 +- + kernel/time/tick-common.c | 12 ++-- + kernel/trace/trace.c | 4 +- + lib/Kconfig | 7 +++ + mm/slub.c | 2 +- + 140 files changed, 365 insertions(+), 409 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Renamed arch/sparc64/kernel/of_device.c => arch/sparc/kernel/of_device_64.c +Auto-merged arch/sparc/kernel/of_device_64.c +Renamed arch/sparc64/kernel/pci_msi.c => arch/sparc/kernel/pci_msi.c +Auto-merged arch/sparc/kernel/pci_msi.c +Auto-merged arch/arm/include/asm/bitops.h +Auto-merged arch/arm/kernel/smp.c +Auto-merged arch/arm/mach-pxa/time.c +Auto-merged arch/arm/mach-realview/core.c +Auto-merged arch/arm/mach-realview/localtimer.c +Auto-merged arch/arm/mach-sa1100/time.c +Auto-merged arch/arm/mach-versatile/core.c +Auto-merged arch/ia64/kernel/iosapic.c +Auto-merged arch/m32r/Kconfig +Auto-merged arch/m32r/kernel/smpboot.c +Auto-merged arch/powerpc/kernel/smp.c +Auto-merged arch/powerpc/kernel/time.c +Auto-merged arch/powerpc/platforms/pseries/xics.c +Auto-merged arch/powerpc/sysdev/mpic.c +Auto-merged arch/s390/Kconfig +Auto-merged arch/s390/kernel/smp.c +Auto-merged arch/s390/kernel/time.c +Auto-merged arch/s390/kernel/topology.c +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/include/asm/pci.h +Auto-merged arch/x86/include/asm/setup.h +Auto-merged arch/x86/kernel/apic.c +Auto-merged arch/x86/kernel/cpu/intel_cacheinfo.c +Auto-merged arch/x86/kernel/hpet.c +Auto-merged arch/x86/kernel/irq_64.c +Auto-merged arch/x86/kernel/setup.c +CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c +Auto-merged arch/x86/kernel/setup_percpu.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged arch/x86/lguest/boot.c +Auto-merged arch/x86/mach-generic/probe.c +Auto-merged arch/x86/mach-voyager/voyager_smp.c +Auto-merged drivers/base/topology.c +Auto-merged drivers/char/hvc_console.c +Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c +Auto-merged drivers/net/sfc/efx.c +Auto-merged drivers/net/virtio_net.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/probe.c +Auto-merged include/linux/cpumask.h +Auto-merged include/linux/seq_file.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Auto-merged kernel/cpu.c +CONFLICT (content): Merge conflict in kernel/cpu.c +Auto-merged kernel/irq/manage.c +Auto-merged kernel/module.c +Auto-merged kernel/profile.c +Auto-merged kernel/sched.c +Auto-merged kernel/trace/trace.c +Auto-merged lib/Kconfig +Auto-merged net/core/neighbour.c +Auto-merged net/ipv4/route.c +Auto-merged net/netfilter/nf_conntrack_standalone.c +Resolved 'arch/x86/kernel/setup.c' using previous resolution. +Resolved 'kernel/cpu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 2a89b09: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/cputopology.txt | 6 +- + Documentation/lguest/lguest.c | 66 ++-------- + arch/alpha/include/asm/topology.h | 17 +++ + arch/alpha/kernel/setup.c | 5 + + arch/arm/include/asm/bitops.h | 1 + + arch/avr32/include/asm/bitops.h | 5 + + arch/blackfin/include/asm/bitops.h | 1 + + arch/ia64/include/asm/topology.h | 9 +- + arch/ia64/kernel/acpi.c | 2 +- + arch/ia64/kernel/iosapic.c | 7 +- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 27 ++-- + arch/m32r/kernel/smpboot.c | 2 +- + arch/m68knommu/include/asm/bitops.h | 1 + + arch/mips/include/asm/mach-ip27/topology.h | 4 +- + arch/parisc/include/asm/smp.h | 2 - + arch/powerpc/include/asm/topology.h | 12 ++- + arch/powerpc/kernel/sysfs.c | 31 +---- + arch/powerpc/platforms/cell/spu_priv1_mmio.c | 6 +- + arch/powerpc/platforms/cell/spufs/sched.c | 4 +- + arch/s390/include/asm/kvm_virtio.h | 4 + + arch/s390/include/asm/topology.h | 2 + + arch/s390/kernel/topology.c | 5 + + arch/sh/include/asm/topology.h | 1 + + arch/sparc/include/asm/topology_64.h | 13 ++- + arch/sparc/kernel/of_device_64.c | 2 +- + arch/sparc/kernel/pci_msi.c | 2 +- + arch/x86/include/asm/pci.h | 10 +- + arch/x86/include/asm/topology.h | 38 ++++-- + arch/x86/kernel/setup_percpu.c | 8 +- + arch/x86/kernel/smpboot.c | 11 +- + arch/x86/lguest/i386_head.S | 15 -- + arch/x86/mach-voyager/voyager_smp.c | 2 +- + block/blk.h | 4 +- + drivers/acpi/processor_throttling.c | 54 +++++--- + drivers/base/topology.c | 33 +++--- + drivers/block/virtio_blk.c | 41 ++++-- + drivers/char/hvc_console.c | 1 + + drivers/char/virtio_console.c | 30 ++++- + drivers/firmware/dcdbas.c | 44 +++---- + drivers/infiniband/hw/ehca/ehca_irq.c | 17 +-- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 8 +- + drivers/lguest/lg.h | 2 +- + drivers/lguest/lguest_device.c | 6 +- + drivers/lguest/lguest_user.c | 13 +- + drivers/lguest/page_tables.c | 72 ++++++++++- + drivers/net/sfc/efx.c | 4 +- + drivers/pci/pci-driver.c | 54 +++++--- + drivers/pnp/pnpbios/bioscalls.c | 2 +- + drivers/s390/kvm/kvm_virtio.c | 34 ++++- + drivers/virtio/virtio.c | 2 +- + drivers/virtio/virtio_balloon.c | 13 ++- + drivers/virtio/virtio_pci.c | 22 ++-- + drivers/virtio/virtio_ring.c | 3 +- + include/asm-generic/topology.h | 14 ++- + include/asm-m68k/bitops.h | 5 + + include/linux/bitmap.h | 35 +++--- + include/linux/bitops.h | 13 ++- + include/linux/cpumask.h | 136 ++++++------------- + include/linux/lguest_launcher.h | 6 +- + include/linux/seq_file.h | 2 +- + include/linux/smp.h | 17 ++- + include/linux/threads.h | 16 +- + include/linux/topology.h | 6 + + include/linux/virtio_balloon.h | 3 + + include/linux/virtio_console.h | 11 ++ + include/linux/virtio_pci.h | 8 + + include/linux/virtio_ring.h | 13 +- + init/Kconfig | 6 - + init/main.c | 13 +-- + kernel/cpu.c | 96 ++++++++++---- + kernel/kexec.c | 2 +- + kernel/module.c | 20 ++-- + kernel/sched.c | 6 +- + kernel/smp.c | 143 +++++++------------- + kernel/workqueue.c | 8 +- + lib/Kconfig | 4 + + lib/Makefile | 1 + + lib/find_next_bit.c | 31 +++++ + lib/is_single_threaded.c | 45 ++++++ + net/core/neighbour.c | 4 +- + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 4 +- + net/ipv4/route.c | 4 +- + net/netfilter/nf_conntrack_standalone.c | 4 +- + security/selinux/selinuxfs.c | 2 +- + 84 files changed, 846 insertions(+), 612 deletions(-) + create mode 100644 lib/is_single_threaded.c +Merging cifs/master +$ git merge cifs/master +Auto-merged fs/cifs/connect.c +CONFLICT (content): Merge conflict in fs/cifs/connect.c +Resolved 'fs/cifs/connect.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit c4c0564a: Merge commit 'cifs/master' +$ git diff -M --stat --summary HEAD^.. + fs/cifs/AUTHORS | 2 + + fs/cifs/CHANGES | 8 + + fs/cifs/README | 12 +- + fs/cifs/cifs_fs_sb.h | 5 +- + fs/cifs/cifsencrypt.c | 30 +-- + fs/cifs/cifsencrypt.h | 3 +- + fs/cifs/cifsfs.c | 75 ++++-- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 15 +- + fs/cifs/cifspdu.h | 2 +- + fs/cifs/cifsproto.h | 3 +- + fs/cifs/cifssmb.c | 16 +- + fs/cifs/connect.c | 681 +++++++++++++++++++++++++++---------------------- + fs/cifs/dir.c | 9 +- + fs/cifs/file.c | 25 +- + fs/cifs/inode.c | 58 ++++- + fs/cifs/misc.c | 9 +- + fs/cifs/sess.c | 5 +- + fs/cifs/smbdes.c | 5 +- + fs/cifs/smbencrypt.c | 9 +- + fs/cifs/transport.c | 134 +++++------ + 21 files changed, 633 insertions(+), 475 deletions(-) +$ git am -3 ../patches/0001-cifs-update-for-new-IP4-6-address-printing.patch +Applying cifs: update for new IP4/6 address printing +$ git reset HEAD^ +fs/cifs/cifsfs.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit a6e2896: Merge commit 'cifs/master' +Merging mmc/next +$ git merge mmc/next +Merge made by recursive. + drivers/mmc/card/block.c | 6 ++---- + drivers/mmc/core/mmc.c | 18 ++++++++++++++---- + drivers/mmc/host/at91_mci.c | 4 ++-- + drivers/mmc/host/ricoh_mmc.c | 37 +++++++++++++++++++++++++++---------- + drivers/mmc/host/sdhci-pci.c | 2 +- + drivers/mmc/host/sdhci.c | 12 ++++++------ + drivers/mmc/host/sdhci.h | 2 +- + drivers/mmc/host/sdricoh_cs.c | 2 ++ + include/linux/mmc/host.h | 2 ++ + 9 files changed, 57 insertions(+), 28 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at a6e2896 Merge commit 'cifs/master' +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/daemon.c +Removed fs/gfs2/daemon.h +Removed fs/gfs2/ops_dentry.h +Removed fs/gfs2/ops_fstype.h +Removed fs/gfs2/ops_inode.h +Removed fs/gfs2/ops_super.h +Auto-merged fs/ioctl.c +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/gfs2/Makefile | 2 +- + fs/gfs2/acl.c | 2 +- + fs/gfs2/bmap.c | 30 ++-- + fs/gfs2/daemon.c | 136 ------------------- + fs/gfs2/daemon.h | 17 --- + fs/gfs2/dir.c | 62 +++++----- + fs/gfs2/dir.h | 1 + + fs/gfs2/eattr.c | 40 +++--- + fs/gfs2/glock.c | 306 ++++++++++++++++++++++--------------------- + fs/gfs2/glock.h | 4 +- + fs/gfs2/glops.c | 56 +++++--- + fs/gfs2/incore.h | 55 +++------ + fs/gfs2/inode.c | 53 ++++---- + fs/gfs2/inode.h | 13 ++- + fs/gfs2/locking/dlm/mount.c | 12 ++- + fs/gfs2/locking/dlm/sysfs.c | 16 ++- + fs/gfs2/main.c | 15 ++- + fs/gfs2/mount.c | 29 +---- + fs/gfs2/ops_address.c | 26 ++-- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 --- + fs/gfs2/ops_export.c | 5 +- + fs/gfs2/ops_file.c | 20 ++-- + fs/gfs2/ops_fstype.c | 203 ++++++++++++++++++++++------ + fs/gfs2/ops_fstype.h | 19 --- + fs/gfs2/ops_inode.c | 75 +++++++++-- + fs/gfs2/ops_inode.h | 25 ---- + fs/gfs2/ops_super.c | 216 ++++++++++++++++++++----------- + fs/gfs2/ops_super.h | 17 --- + fs/gfs2/quota.c | 113 +++++++++++++++-- + fs/gfs2/quota.h | 24 ++-- + fs/gfs2/recovery.c | 48 +++++++- + fs/gfs2/recovery.h | 14 +- + fs/gfs2/rgrp.c | 58 ++++----- + fs/gfs2/super.c | 280 +-------------------------------------- + fs/gfs2/super.h | 16 ++- + fs/gfs2/sys.c | 66 +++------- + fs/gfs2/sys.h | 4 - + fs/gfs2/util.c | 1 + + fs/gfs2/util.h | 1 + + fs/ioctl.c | 44 +++++-- + include/linux/fs.h | 3 + + 42 files changed, 1005 insertions(+), 1141 deletions(-) + delete mode 100644 fs/gfs2/daemon.c + delete mode 100644 fs/gfs2/daemon.h + delete mode 100644 fs/gfs2/ops_dentry.h + delete mode 100644 fs/gfs2/ops_fstype.h + delete mode 100644 fs/gfs2/ops_inode.h + delete mode 100644 fs/gfs2/ops_super.h +Merging input/next +$ git merge input/next +Auto-merged drivers/input/evdev.c +Auto-merged drivers/input/joydev.c +Auto-merged drivers/input/mousedev.c +Merge made by recursive. + Documentation/input/walkera0701.txt | 109 ++++++++++ + drivers/input/Makefile | 2 +- + drivers/input/evbug.c | 6 +- + drivers/input/evdev.c | 199 +---------------- + drivers/input/gameport/gameport.c | 3 +- + drivers/input/gameport/ns558.c | 2 +- + drivers/input/input-compat.c | 135 ++++++++++++ + drivers/input/input-compat.h | 94 ++++++++ + drivers/input/input.c | 4 +- + drivers/input/joydev.c | 2 +- + drivers/input/joystick/Kconfig | 12 + + drivers/input/joystick/Makefile | 1 + + drivers/input/joystick/walkera0701.c | 292 +++++++++++++++++++++++++ + drivers/input/keyboard/gpio_keys.c | 4 + + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/input/misc/pcspkr.c | 4 +- + drivers/input/misc/uinput.c | 172 +++++++++++++--- + drivers/input/mouse/appletouch.c | 274 ++++++++++++------------ + drivers/input/mouse/synaptics.c | 16 +- + drivers/input/mousedev.c | 3 +- + drivers/input/serio/libps2.c | 20 ++- + drivers/input/serio/pcips2.c | 2 +- + drivers/input/serio/serio.c | 4 +- + drivers/input/serio/xilinx_ps2.c | 220 ++++++++++--------- + drivers/input/touchscreen/Kconfig | 13 ++ + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/input/touchscreen/usbtouchscreen.c | 5 +- + drivers/input/touchscreen/wacom_w8001.c | 325 ++++++++++++++++++++++++++++ + include/linux/gpio_keys.h | 1 + + include/linux/libps2.h | 2 + + include/linux/serio.h | 1 + + 32 files changed, 1439 insertions(+), 499 deletions(-) + create mode 100644 Documentation/input/walkera0701.txt + create mode 100644 drivers/input/input-compat.c + create mode 100644 drivers/input/input-compat.h + create mode 100644 drivers/input/joystick/walkera0701.c + create mode 100644 drivers/input/touchscreen/wacom_w8001.c +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged fs/ioctl.c +CONFLICT (content): Merge conflict in fs/ioctl.c +Resolved 'fs/ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 0592097: Merge commit 'bkl-removal/bkl-removal' +$ git diff -M --stat --summary HEAD^.. + drivers/char/rtc.c | 17 ++++------------- + 1 files changed, 4 insertions(+), 13 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Merge made by recursive. + Documentation/filesystems/ubifs.txt | 3 + + fs/ubifs/commit.c | 25 ++-- + fs/ubifs/compress.c | 14 +- + fs/ubifs/debug.c | 268 +++++++++++++++++++++++++++++------ + fs/ubifs/debug.h | 117 ++++++++++++---- + fs/ubifs/key.h | 32 +++-- + fs/ubifs/lprops.c | 2 +- + fs/ubifs/lpt.c | 30 ++-- + fs/ubifs/lpt_commit.c | 202 ++++++++++++++++++++++----- + fs/ubifs/orphan.c | 2 +- + fs/ubifs/sb.c | 10 +- + fs/ubifs/super.c | 82 ++++++++--- + fs/ubifs/tnc_commit.c | 7 +- + fs/ubifs/ubifs-media.h | 7 + + fs/ubifs/ubifs.h | 58 +++----- + 15 files changed, 644 insertions(+), 215 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merged block/compat_ioctl.c +Auto-merged block/genhd.c +Auto-merged block/scsi_ioctl.c +Auto-merged drivers/block/virtio_blk.c +Auto-merged drivers/md/dm-crypt.c +Auto-merged drivers/md/dm.c +Auto-merged include/linux/blkdev.h +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Merge made by recursive. + Documentation/block/biodoc.txt | 6 +- + block/as-iosched.c | 10 +- + block/blk-barrier.c | 120 +++++--- + block/blk-core.c | 63 ++--- + block/blk-settings.c | 6 +- + block/blk-sysfs.c | 7 +- + block/blk-tag.c | 1 - + block/blk-timeout.c | 21 +- + block/cfq-iosched.c | 16 +- + block/compat_ioctl.c | 2 - + block/deadline-iosched.c | 6 +- + block/elevator.c | 73 ++--- + block/genhd.c | 23 ++- + block/ioctl.c | 2 - + block/noop-iosched.c | 2 +- + block/scsi_ioctl.c | 4 +- + drivers/block/cciss.c | 72 ++--- + drivers/block/cciss.h | 4 +- + drivers/block/cciss_cmd.h | 3 +- + drivers/block/nbd.c | 10 +- + drivers/block/virtio_blk.c | 2 + + drivers/block/xen-blkfront.c | 8 +- + drivers/cdrom/cdrom.c | 703 +++++++++++++++++++++++----------------- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-io.c | 2 +- + drivers/md/dm.c | 2 +- + fs/aio.c | 100 ++++--- + fs/bio-integrity.c | 2 +- + fs/bio.c | 327 ++++++++++++++----- + fs/buffer.c | 19 +- + include/linux/aio.h | 5 +- + include/linux/bio.h | 28 ++- + include/linux/blkdev.h | 52 ++-- + include/linux/buffer_head.h | 1 + + include/linux/elevator.h | 8 +- + include/linux/genhd.h | 1 + + include/linux/mm_types.h | 5 +- + kernel/exit.c | 2 - + kernel/fork.c | 4 +- + 39 files changed, 1021 insertions(+), 703 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Auto-merged drivers/net/starfire.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +CONFLICT (content): Merge conflict in drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Auto-merged drivers/scsi/advansys.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +CONFLICT (content): Merge conflict in firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/net/tg3.c' using previous resolution. +Resolved 'firmware/Makefile' using previous resolution. +Resolved 'firmware/WHENCE' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b5191bd: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 787 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +----- + drivers/scsi/ql1040_fw.h | 2130 ------- + drivers/scsi/ql12160_fw.h | 1811 ------ + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 20 + + firmware/WHENCE | 120 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 + + firmware/advansys/38C0800.bin.ihex | 336 + + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 +++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 --------- + 49 files changed, 20558 insertions(+), 22497 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 15 ++- + drivers/leds/Makefile | 2 + + drivers/leds/led-class.c | 25 +-- + drivers/leds/leds-alix2.c | 209 +++++++++++++++++++++ + drivers/leds/leds-ams-delta.c | 4 +- + drivers/leds/leds-pca9532.c | 77 ++++++-- + drivers/leds/leds-wm8350.c | 333 ++++++++++++++++++++++++++++++++++ + drivers/leds/ledtrig-timer.c | 92 +++++----- + drivers/mfd/wm8350-core.c | 3 + + drivers/regulator/wm8350-regulator.c | 91 +++++++++ + include/linux/leds-pca9532.h | 2 + + include/linux/leds.h | 2 +- + include/linux/mfd/wm8350/pmic.h | 36 ++++ + 13 files changed, 803 insertions(+), 88 deletions(-) + create mode 100644 drivers/leds/leds-alix2.c + create mode 100644 drivers/leds/leds-wm8350.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Auto-merged drivers/video/backlight/backlight.c +Auto-merged drivers/video/backlight/lcd.c +Merge made by recursive. + drivers/video/backlight/Makefile | 2 +- + drivers/video/backlight/backlight.c | 33 +++++++++---------- + drivers/video/backlight/cr_bllcd.c | 18 ++++------ + drivers/video/backlight/{da903x.c => da903x_bl.c} | 0 + drivers/video/backlight/hp680_bl.c | 20 +++++------- + drivers/video/backlight/lcd.c | 36 +++++++++----------- + drivers/video/backlight/progear_bl.c | 20 +++++------- + drivers/video/backlight/tosa_lcd.c | 27 ++++++++++++++- + drivers/video/backlight/vgg2432a4.c | 2 +- + 9 files changed, 81 insertions(+), 77 deletions(-) + rename drivers/video/backlight/{da903x.c => da903x_bl.c} (100%) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- + kernel/kgdb.c | 6 +++--- + 2 files changed, 43 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged fs/buffer.c +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/super.c +Auto-merged fs/inode.c +Auto-merged fs/reiserfs/super.c +Auto-merged include/linux/fs.h +Auto-merged init/main.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/slub.c +Auto-merged mm/vmscan.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysctl/vm.txt | 12 + + Documentation/vm/kmemtrace.txt | 126 ++++++ + Documentation/vm/slabinfo.c | 95 ++++- + MAINTAINERS | 6 + + fs/buffer.c | 102 +++++ + fs/dcache.c | 148 ++++++-- + fs/drop_caches.c | 2 +- + fs/ext2/super.c | 9 + + fs/ext3/super.c | 8 + + fs/ext4/super.c | 8 + + fs/inode.c | 123 ++++++ + fs/proc/inode.c | 8 + + fs/reiserfs/super.c | 8 + + include/linux/fs.h | 6 + + include/linux/kmemtrace.h | 86 +++++ + include/linux/mm.h | 3 +- + include/linux/mmzone.h | 1 + + include/linux/page-flags.h | 2 + + include/linux/slab.h | 63 +++- + include/linux/slab_def.h | 68 +++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 69 ++++- + include/linux/swap.h | 3 + + init/main.c | 2 + + kernel/sysctl.c | 20 + + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/kmemtrace.c | 333 ++++++++++++++++ + mm/slab.c | 85 ++++- + mm/slob.c | 37 ++- + mm/slub.c | 547 ++++++++++++++++++++++----- + mm/vmscan.c | 64 +++- + mm/vmstat.c | 4 +- + 35 files changed, 1961 insertions(+), 198 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 +Auto-merged fs/block_dev.c +Merge made by recursive. + drivers/md/bitmap.c | 3 +- + drivers/md/faulty.c | 3 +- + drivers/md/linear.c | 3 +- + drivers/md/md.c | 410 +++++++++++++++++++++++++++++++------------- + drivers/md/multipath.c | 3 +- + drivers/md/raid0.c | 178 ++++++++++---------- + drivers/md/raid1.c | 3 +- + drivers/md/raid10.c | 3 +- + drivers/md/raid5.c | 8 +- + fs/block_dev.c | 14 ++ + include/linux/raid/md_k.h | 17 +- + include/linux/raid/md_p.h | 2 + + include/linux/raid/raid0.h | 10 +- + 13 files changed, 415 insertions(+), 242 deletions(-) +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/include/asm/dma-mapping.h +Auto-merged arch/x86/kernel/process.c +Auto-merged arch/x86/kernel/stacktrace.c +Auto-merged arch/x86/mm/Makefile +CONFLICT (content): Merge conflict in arch/x86/mm/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/mm_types.h +Auto-merged include/linux/slab.h +Auto-merged include/linux/slab_def.h +Auto-merged include/linux/stacktrace.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged kernel/sysctl.c +Auto-merged 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 'arch/x86/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 502fbcc: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 129 ++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 88 +++++ + arch/x86/Makefile | 5 + + arch/x86/include/asm/dma-mapping.h | 2 + + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_32.h | 6 + + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/string_32.h | 8 + + arch/x86/include/asm/string_64.h | 8 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 + + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/asm-x86/kmemcheck.h | 42 ++ + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 ++++ + include/linux/mm_types.h | 8 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 11 + + mm/Makefile | 1 + + mm/kmemcheck.c | 103 +++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 1982 insertions(+), 104 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merged drivers/mfd/wm8350-core.c +Merge made by recursive. + drivers/mfd/Kconfig | 2 +- + drivers/mfd/twl4030-core.c | 472 +++++++++++++++-------------- + drivers/mfd/wm8350-core.c | 126 +++++++-- + drivers/mfd/wm8350-i2c.c | 2 - + drivers/mfd/wm8350-regmap.c | 4 +- + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/power_supply_sysfs.c | 2 +- + drivers/power/wm8350_power.c | 532 +++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-twl4030.c | 2 +- + include/linux/i2c/twl4030.h | 81 +++-- + include/linux/mfd/wm8350/comparator.h | 8 + + include/linux/mfd/wm8350/core.h | 44 +++- + include/linux/mfd/wm8350/supply.h | 25 ++- + include/linux/power_supply.h | 1 + + 15 files changed, 1021 insertions(+), 288 deletions(-) + create mode 100644 drivers/power/wm8350_power.c +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Merge made by recursive. + drivers/net/wan/hdlc_ppp.c | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merged drivers/gpu/drm/drm_sysfs.c +Merge made by recursive. + drivers/gpu/drm/Kconfig | 16 + + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/drm_auth.c | 29 +- + drivers/gpu/drm/drm_bufs.c | 26 +- + drivers/gpu/drm/drm_context.c | 10 +- + drivers/gpu/drm/drm_crtc.c | 2497 ++++++++++++++++++++++++++++++++ + drivers/gpu/drm/drm_crtc_helper.c | 822 +++++++++++ + drivers/gpu/drm/drm_drv.c | 98 +- + drivers/gpu/drm/drm_edid.c | 732 ++++++++++ + drivers/gpu/drm/drm_fops.c | 223 ++-- + drivers/gpu/drm/drm_gem.c | 109 ++ + drivers/gpu/drm/drm_hashtab.c | 2 + + drivers/gpu/drm/drm_ioctl.c | 61 +- + drivers/gpu/drm/drm_irq.c | 64 +- + drivers/gpu/drm/drm_lock.c | 42 +- + drivers/gpu/drm/drm_mm.c | 1 + + drivers/gpu/drm/drm_modes.c | 576 ++++++++ + drivers/gpu/drm/drm_proc.c | 8 +- + drivers/gpu/drm/drm_stub.c | 142 ++- + drivers/gpu/drm/drm_sysfs.c | 329 +++++- + drivers/gpu/drm/drm_vm.c | 7 +- + drivers/gpu/drm/i915/Makefile | 17 +- + drivers/gpu/drm/i915/dvo.h | 151 ++ + drivers/gpu/drm/i915/dvo_ch7017.c | 454 ++++++ + drivers/gpu/drm/i915/dvo_ch7xxx.c | 368 +++++ + drivers/gpu/drm/i915/dvo_ivch.c | 442 ++++++ + drivers/gpu/drm/i915/dvo_sil164.c | 302 ++++ + drivers/gpu/drm/i915/dvo_tfp410.c | 335 +++++ + drivers/gpu/drm/i915/i915_dma.c | 344 ++++- + drivers/gpu/drm/i915/i915_drv.c | 42 +- + drivers/gpu/drm/i915/i915_drv.h | 93 ++- + drivers/gpu/drm/i915/i915_gem.c | 610 ++++++++- + drivers/gpu/drm/i915/i915_gem_proc.c | 34 + + drivers/gpu/drm/i915/i915_gem_tiling.c | 1 + + drivers/gpu/drm/i915/i915_irq.c | 51 +- + drivers/gpu/drm/i915/i915_mem.c | 3 +- + drivers/gpu/drm/i915/i915_reg.h | 20 +- + drivers/gpu/drm/i915/intel_bios.c | 193 +++ + drivers/gpu/drm/i915/intel_bios.h | 405 ++++++ + drivers/gpu/drm/i915/intel_crt.c | 284 ++++ + drivers/gpu/drm/i915/intel_display.c | 1621 +++++++++++++++++++++ + drivers/gpu/drm/i915/intel_drv.h | 146 ++ + drivers/gpu/drm/i915/intel_dvo.c | 501 +++++++ + drivers/gpu/drm/i915/intel_fb.c | 926 ++++++++++++ + drivers/gpu/drm/i915/intel_i2c.c | 184 +++ + drivers/gpu/drm/i915/intel_lvds.c | 525 +++++++ + drivers/gpu/drm/i915/intel_modes.c | 83 ++ + drivers/gpu/drm/i915/intel_sdvo.c | 1127 ++++++++++++++ + drivers/gpu/drm/i915/intel_sdvo_regs.h | 327 +++++ + drivers/gpu/drm/i915/intel_tv.c | 1725 ++++++++++++++++++++++ + drivers/gpu/drm/radeon/r300_cmdbuf.c | 11 +- + drivers/gpu/drm/radeon/radeon_cp.c | 73 +- + drivers/gpu/drm/radeon/radeon_drv.h | 14 +- + drivers/gpu/drm/radeon/radeon_state.c | 166 ++- + drivers/video/console/vgacon.c | 17 + + include/drm/Kbuild | 2 +- + include/drm/drm.h | 25 + + include/drm/drmP.h | 107 ++- + include/drm/drm_crtc.h | 737 ++++++++++ + include/drm/drm_crtc_helper.h | 121 ++ + include/drm/drm_edid.h | 202 +++ + include/drm/drm_mode.h | 278 ++++ + include/drm/drm_sarea.h | 6 +- + include/drm/i915_drm.h | 16 +- + include/linux/console.h | 4 + + 65 files changed, 18429 insertions(+), 461 deletions(-) + create mode 100644 drivers/gpu/drm/drm_crtc.c + create mode 100644 drivers/gpu/drm/drm_crtc_helper.c + create mode 100644 drivers/gpu/drm/drm_edid.c + create mode 100644 drivers/gpu/drm/drm_modes.c + create mode 100644 drivers/gpu/drm/i915/dvo.h + create mode 100644 drivers/gpu/drm/i915/dvo_ch7017.c + create mode 100644 drivers/gpu/drm/i915/dvo_ch7xxx.c + create mode 100644 drivers/gpu/drm/i915/dvo_ivch.c + create mode 100644 drivers/gpu/drm/i915/dvo_sil164.c + create mode 100644 drivers/gpu/drm/i915/dvo_tfp410.c + create mode 100644 drivers/gpu/drm/i915/intel_bios.c + create mode 100644 drivers/gpu/drm/i915/intel_bios.h + create mode 100644 drivers/gpu/drm/i915/intel_crt.c + create mode 100644 drivers/gpu/drm/i915/intel_display.c + create mode 100644 drivers/gpu/drm/i915/intel_drv.h + create mode 100644 drivers/gpu/drm/i915/intel_dvo.c + create mode 100644 drivers/gpu/drm/i915/intel_fb.c + create mode 100644 drivers/gpu/drm/i915/intel_i2c.c + create mode 100644 drivers/gpu/drm/i915/intel_lvds.c + create mode 100644 drivers/gpu/drm/i915/intel_modes.c + create mode 100644 drivers/gpu/drm/i915/intel_sdvo.c + create mode 100644 drivers/gpu/drm/i915/intel_sdvo_regs.h + create mode 100644 drivers/gpu/drm/i915/intel_tv.c + create mode 100644 include/drm/drm_crtc.h + create mode 100644 include/drm/drm_crtc_helper.h + create mode 100644 include/drm/drm_edid.h + create mode 100644 include/drm/drm_mode.h +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merged drivers/Makefile +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 136 ++++----- + drivers/Makefile | 4 +- + drivers/regulator/core.c | 403 ++++++++++++++--------- + drivers/regulator/da903x.c | 12 +- + 4 files changed, 315 insertions(+), 240 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/powerpc/mm/fault.c +Auto-merged arch/s390/hypfs/inode.c +Auto-merged arch/x86/mm/fault.c +Auto-merged drivers/char/tty_audit.c +CONFLICT (content): Merge conflict in drivers/char/tty_audit.c +Auto-merged drivers/net/tun.c +Auto-merged drivers/usb/core/devio.c +Auto-merged fs/anon_inodes.c +Auto-merged fs/binfmt_elf.c +Auto-merged fs/cifs/cifs_fs_sb.h +CONFLICT (content): Merge conflict in fs/cifs/cifs_fs_sb.h +Auto-merged fs/cifs/cifsproto.h +Auto-merged fs/cifs/connect.c +Auto-merged fs/cifs/dir.c +Auto-merged fs/cifs/inode.c +Auto-merged fs/cifs/misc.c +Auto-merged fs/dquot.c +Auto-merged fs/ext4/balloc.c +Auto-merged fs/fcntl.c +Auto-merged fs/gfs2/inode.c +Auto-merged fs/nfsd/nfs4recover.c +Auto-merged fs/nfsd/nfsfh.c +Auto-merged fs/ocfs2/namei.c +CONFLICT (content): Merge conflict in fs/ocfs2/namei.c +Auto-merged fs/quota.c +Auto-merged fs/udf/ialloc.c +Auto-merged fs/udf/namei.c +Auto-merged fs/xfs/linux-2.6/xfs_cred.h +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h +Auto-merged fs/xfs/linux-2.6/xfs_globals.h +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/xfs_acl.c +Auto-merged fs/xfs/xfs_inode.h +Auto-merged fs/xfs/xfs_vnodeops.h +CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h +Auto-merged include/linux/audit.h +Auto-merged include/linux/fs.h +Removed include/linux/key-ui.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/Makefile +Auto-merged kernel/auditsc.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/sysctl.c +Auto-merged kernel/trace/trace.c +Auto-merged kernel/user.c +Auto-merged lib/Makefile +Auto-merged net/core/dev.c +Auto-merged net/ipv4/netfilter/ipt_LOG.c +Auto-merged net/ipv6/ip6_flowlabel.c +Auto-merged net/ipv6/netfilter/ip6t_LOG.c +Auto-merged net/netfilter/nfnetlink_log.c +Auto-merged net/socket.c +Auto-merged net/unix/af_unix.c +Auto-merged security/selinux/hooks.c +Auto-merged security/selinux/selinuxfs.c +Recorded preimage for 'drivers/char/tty_audit.c' +Resolved 'fs/cifs/cifs_fs_sb.h' using previous resolution. +Resolved 'fs/ocfs2/namei.c' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_cred.h' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_globals.h' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_ioctl.c' using previous resolution. +Resolved 'fs/xfs/xfs_vnodeops.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/char/tty_audit.c'. +Created commit 41b2561: Merge commit 'security-testing/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/credentials.txt | 582 ++++++++++++ + Documentation/kernel-parameters.txt | 4 + + Documentation/scheduler/sched-design-CFS.txt | 21 + + 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 | 3 +- + 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 | 3 +- + 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 | 27 +- + fs/ecryptfs/miscdev.c | 27 +- + 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/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 | 5 +- + fs/nfsd/auth.c | 95 ++- + fs/nfsd/nfs4recover.c | 72 +- + 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 | 12 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 3 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_vnodeops.h | 6 +- + include/keys/keyring-type.h | 31 + + include/linux/audit.h | 26 + + include/linux/binfmts.h | 16 +- + include/linux/capability.h | 25 +- + include/linux/cred.h | 342 +++++++- + include/linux/fs.h | 8 +- + include/linux/init_task.h | 14 +- + include/linux/key-ui.h | 66 -- + include/linux/key.h | 32 +- + include/linux/keyctl.h | 4 +- + include/linux/nsproxy.h | 1 - + include/linux/sched.h | 65 +-- + include/linux/securebits.h | 2 +- + include/linux/security.h | 338 ++++---- + include/linux/user_namespace.h | 13 +- + 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 | 255 +++++- + kernel/capability.c | 288 +----- + kernel/cgroup.c | 17 +- + kernel/cred-internals.h | 21 + + kernel/cred.c | 588 ++++++++++++ + kernel/exit.c | 23 +- + kernel/fork.c | 62 +- + kernel/futex.c | 20 +- + kernel/futex_compat.c | 7 +- + kernel/kmod.c | 30 +- + kernel/nsproxy.c | 15 +- + kernel/ptrace.c | 29 +- + kernel/sched.c | 26 +- + kernel/signal.c | 60 +- + kernel/sys.c | 586 +++++++------ + kernel/sysctl.c | 2 +- + kernel/timer.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/tsacct.c | 6 +- + kernel/uid16.c | 31 +- + kernel/user.c | 96 +-- + kernel/user_namespace.c | 65 +- + lib/Makefile | 2 +- + mm/mempolicy.c | 9 +- + mm/migrate.c | 9 +- + mm/oom_kill.c | 12 +- + 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 | 830 +++++++++++------ + security/keys/internal.h | 49 +- + 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 | 135 ++-- + security/keys/request_key_auth.c | 46 +- + security/root_plug.c | 13 +- + security/security.c | 99 +- + security/selinux/exports.c | 8 +- + security/selinux/hooks.c | 1246 ++++++++++++++------------ + 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/nlmsgtab.c | 3 + + 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 +- + 214 files changed, 5548 insertions(+), 3284 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 +Merging lblnet/master +$ git merge lblnet/master +Auto-merged Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merged net/ipv4/cipso_ipv4.c +Auto-merged net/netlabel/netlabel_unlabeled.c +Auto-merged security/selinux/hooks.c +Auto-merged security/selinux/selinuxfs.c +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 8a248f3: Merge commit 'lblnet/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 12 + + include/net/cipso_ipv4.h | 6 +- + include/net/netlabel.h | 86 ++++++- + net/ipv4/cipso_ipv4.c | 88 +++++-- + net/netlabel/netlabel_cipso_v4.c | 61 ++---- + net/netlabel/netlabel_domainhash.c | 63 +++++ + net/netlabel/netlabel_domainhash.h | 4 + + net/netlabel/netlabel_kapi.c | 345 +++++++++++++++++++++----- + net/netlabel/netlabel_unlabeled.c | 26 +- + net/netlabel/netlabel_unlabeled.h | 15 ++ + security/selinux/Kconfig | 27 -- + security/selinux/hooks.c | 6 +- + security/selinux/selinuxfs.c | 16 +- + security/smack/smack.h | 31 +++- + security/smack/smack_access.c | 28 ++- + security/smack/smack_lsm.c | 310 +++++++++++++++++++---- + security/smack/smackfs.c | 369 ++++++++++++++++++---------- + 17 files changed, 1117 insertions(+), 376 deletions(-) +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged MAINTAINERS +Auto-merged drivers/char/Kconfig +Auto-merged drivers/char/hvc_console.c +Auto-merged drivers/char/hvsi.c +Auto-merged drivers/char/serial167.c +Auto-merged drivers/char/tty_io.c +Auto-merged drivers/isdn/gigaset/ser-gigaset.c +Auto-merged drivers/net/slip.c +Auto-merged drivers/net/usb/hso.c +Auto-merged drivers/net/wan/x25_asy.c +Auto-merged drivers/net/wireless/strip.c +Auto-merged drivers/serial/serial_core.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged fs/devpts/inode.c +CONFLICT (content): Merge conflict in fs/devpts/inode.c +Auto-merged include/linux/pci_ids.h +Auto-merged include/linux/tty.h +Resolved 'fs/devpts/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 52c6915: Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/devpts.txt | 132 ++++++ + MAINTAINERS | 6 + + drivers/char/Kconfig | 13 +- + drivers/char/amiserial.c | 34 +- + drivers/char/cyclades.c | 2 +- + drivers/char/epca.c | 265 ++++-------- + drivers/char/esp.c | 61 ++- + drivers/char/generic_serial.c | 76 ++-- + drivers/char/hvc_console.c | 2 +- + drivers/char/hvsi.c | 12 +- + drivers/char/isicom.c | 166 ++------ + drivers/char/istallion.c | 221 +++------- + drivers/char/moxa.c | 26 +- + drivers/char/mxser.c | 150 ++----- + drivers/char/n_r3964.c | 12 +- + drivers/char/n_tty.c | 792 ++++++++++++++++++++++++++-------- + drivers/char/nozomi.c | 85 ++-- + drivers/char/pcmcia/synclink_cs.c | 479 ++++++++------------- + drivers/char/pty.c | 57 +++- + drivers/char/rio/rio_linux.c | 35 +- + drivers/char/riscom8.c | 194 ++------- + drivers/char/rocket.c | 320 +++++---------- + drivers/char/rocket.h | 2 +- + drivers/char/rocket_int.h | 5 - + drivers/char/selection.c | 2 +- + drivers/char/ser_a2232.c | 23 +- + drivers/char/serial167.c | 32 +- + drivers/char/specialix.c | 34 +- + drivers/char/stallion.c | 169 ++------ + drivers/char/sx.c | 31 +- + drivers/char/synclink.c | 177 ++++----- + drivers/char/synclink_gt.c | 120 ++--- + drivers/char/synclinkmp.c | 171 +++----- + drivers/char/tty_io.c | 39 +- + drivers/char/tty_ldisc.c | 30 +- + drivers/char/tty_port.c | 225 ++++++++++ + drivers/char/vme_scc.c | 27 +- + drivers/char/vt.c | 16 +- + drivers/char/vt_ioctl.c | 2 +- + drivers/net/usb/hso.c | 434 +++++++++++++++++-- + drivers/serial/8250.c | 225 +++++++--- + drivers/serial/8250_pci.c | 131 ++++--- + drivers/serial/bfin_5xx.c | 239 ++++++----- + drivers/serial/bfin_sport_uart.c | 60 ++-- + drivers/serial/jsm/jsm_tty.c | 2 +- + drivers/serial/serial_core.c | 155 +++---- + drivers/usb/serial/console.c | 13 + + drivers/usb/serial/ftdi_sio.c | 10 +- + drivers/usb/serial/ftdi_sio.h | 3 + + drivers/usb/serial/kl5kusb105.c | 1 + + drivers/usb/serial/mct_u232.c | 2 +- + drivers/usb/serial/mos7840.c | 3 + + drivers/usb/serial/sierra.c | 2 +- + drivers/usb/serial/usb-serial.c | 26 +- + fs/devpts/inode.c | 472 ++++++++++++++++++-- + include/linux/8250_pci.h | 2 +- + include/linux/generic_serial.h | 1 - + include/linux/istallion.h | 2 - + include/linux/pci_ids.h | 1 + + include/linux/serial.h | 3 +- + include/linux/serial_8250.h | 3 + + include/linux/serial_core.h | 69 ++-- + include/linux/tty.h | 27 ++- + include/linux/tty_driver.h | 6 +- + net/irda/ircomm/ircomm_tty.c | 5 +- + 65 files changed, 3538 insertions(+), 2604 deletions(-) + create mode 100644 Documentation/filesystems/devpts.txt +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. + drivers/char/agp/ali-agp.c | 2 +- + drivers/char/agp/amd64-agp.c | 9 +++++++-- + drivers/char/agp/ati-agp.c | 2 +- + drivers/char/agp/intel-agp.c | 9 ++++++++- + drivers/char/agp/isoch.c | 2 +- + drivers/char/agp/sis-agp.c | 2 +- + drivers/char/agp/sworks-agp.c | 2 +- + drivers/char/agp/uninorth-agp.c | 2 +- + 8 files changed, 21 insertions(+), 9 deletions(-) +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already up-to-date. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Auto-merged include/linux/irq.h +Merge made by recursive. + include/linux/irq.h | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merged drivers/usb/wusbcore/rh.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-uwb_rc | 14 +- + Documentation/usb/wusb-cbaf | 9 - + drivers/usb/host/hwa-hc.c | 104 +++--- + drivers/usb/host/whci/Kbuild | 1 + + drivers/usb/host/whci/asl.c | 46 +-- + drivers/usb/host/whci/debug.c | 189 +++++++++++ + drivers/usb/host/whci/hcd.c | 6 +- + drivers/usb/host/whci/hw.c | 8 +- + drivers/usb/host/whci/int.c | 1 - + drivers/usb/host/whci/pzl.c | 49 +-- + drivers/usb/host/whci/qset.c | 40 --- + drivers/usb/host/whci/whcd.h | 11 +- + drivers/usb/host/whci/whci-hc.h | 2 + + drivers/usb/host/whci/wusb.c | 43 +-- + drivers/usb/wusbcore/cbaf.c | 1 - + drivers/usb/wusbcore/crypto.c | 15 +- + drivers/usb/wusbcore/devconnect.c | 129 +------- + drivers/usb/wusbcore/mmc.c | 118 +++----- + drivers/usb/wusbcore/pal.c | 16 +- + drivers/usb/wusbcore/reservation.c | 7 +- + drivers/usb/wusbcore/rh.c | 40 ++- + drivers/usb/wusbcore/security.c | 3 +- + drivers/usb/wusbcore/wusbhc.h | 36 +- + drivers/uwb/Makefile | 2 + + drivers/uwb/beacon.c | 122 +++---- + drivers/uwb/driver.c | 2 - + drivers/uwb/drp-ie.c | 1 - + drivers/uwb/drp.c | 24 +-- + drivers/uwb/hwa-rc.c | 23 ++- + drivers/uwb/i1480/dfu/usb.c | 1 - + drivers/uwb/i1480/i1480u-wlp/lc.c | 3 +- + drivers/uwb/i1480/i1480u-wlp/netdev.c | 51 +--- + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 1 - + drivers/uwb/ie-rcv.c | 55 +++ + drivers/uwb/ie.c | 463 +++++++++----------------- + drivers/uwb/lc-rc.c | 62 ++--- + drivers/uwb/neh.c | 46 ++- + drivers/uwb/pal.c | 25 +- + drivers/uwb/radio.c | 202 +++++++++++ + drivers/uwb/reset.c | 45 ++- + drivers/uwb/rsv.c | 88 ++++-- + drivers/uwb/umc-bus.c | 62 +++- + drivers/uwb/umc-dev.c | 3 +- + drivers/uwb/uwb-debug.c | 81 ++++- + drivers/uwb/uwb-internal.h | 46 ++-- + drivers/uwb/uwbd.c | 102 ++---- + drivers/uwb/whc-rc.c | 65 ++-- + drivers/uwb/whci.c | 6 +- + drivers/uwb/wlp/wlp-internal.h | 4 - + drivers/uwb/wlp/wlp-lc.c | 19 +- + include/linux/usb/wusb-wa.h | 1 + + include/linux/uwb.h | 76 +++-- + include/linux/uwb/debug-cmd.h | 11 + + include/linux/uwb/debug.h | 2 +- + include/linux/uwb/spec.h | 28 ++ + include/linux/uwb/umc.h | 2 + + include/linux/wlp.h | 3 +- + 57 files changed, 1403 insertions(+), 1212 deletions(-) + create mode 100644 drivers/usb/host/whci/debug.c + create mode 100644 drivers/uwb/ie-rcv.c + create mode 100644 drivers/uwb/radio.c +Merging watchdog/master +$ git merge watchdog/master +Auto-merged drivers/watchdog/Kconfig +Auto-merged drivers/watchdog/hpwdt.c +Auto-merged drivers/watchdog/iTCO_wdt.c +CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c +Auto-merged drivers/watchdog/ib700wdt.c +Auto-merged drivers/watchdog/s3c2410_wdt.c +Auto-merged drivers/watchdog/sa1100_wdt.c +Resolved 'drivers/watchdog/iTCO_wdt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit c7115da: Merge commit 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + drivers/watchdog/Kconfig | 19 ++ + drivers/watchdog/Makefile | 2 + + drivers/watchdog/hpwdt.c | 2 +- + drivers/watchdog/ib700wdt.c | 49 ++-- + drivers/watchdog/sch311x_wdt.c | 578 ++++++++++++++++++++++++++++++++++++++++ + drivers/watchdog/wm8350_wdt.c | 329 +++++++++++++++++++++++ + 6 files changed, 948 insertions(+), 31 deletions(-) + create mode 100644 drivers/watchdog/sch311x_wdt.c + create mode 100644 drivers/watchdog/wm8350_wdt.c +Merging proc/proc +$ git merge proc/proc +Auto-merged Documentation/filesystems/proc.txt +Auto-merged fs/proc/base.c +Auto-merged fs/proc/inode.c +Merge made by recursive. + Documentation/filesystems/proc.txt | 1 + + arch/mips/kernel/stacktrace.c | 24 +++- + fs/proc/base.c | 225 ++++++++++++++++++++---------------- + fs/proc/generic.c | 8 +- + fs/proc/inode.c | 3 - + fs/proc/proc_net.c | 2 +- + fs/proc/root.c | 8 +- + 7 files changed, 151 insertions(+), 120 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merged drivers/pci/intel-iommu.c +Merge made by recursive. + drivers/pci/intel-iommu.c | 228 ++++++++++++++++++++++++++++++++++++----- + include/linux/dma_remapping.h | 137 +------------------------ + include/linux/dmar.h | 1 - + include/linux/intel-iommu.h | 5 - + 4 files changed, 205 insertions(+), 166 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Auto-merged arch/powerpc/kernel/process.c +Auto-merged arch/powerpc/kernel/time.c +Auto-merged arch/s390/kernel/smp.c +Auto-merged arch/x86/xen/time.c +Auto-merged include/linux/sched.h +Auto-merged kernel/sched.c +CONFLICT (content): Merge conflict in kernel/sched.c +Auto-merged kernel/timer.c +Resolved 'kernel/sched.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 212a646: Merge commit 'cputime/cputime' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/kernel/time.c | 18 ++++--- + arch/powerpc/kernel/process.c | 1 + + arch/powerpc/kernel/time.c | 18 ++++--- + arch/s390/include/asm/cpu.h | 4 +- + arch/s390/kernel/process.c | 74 ++++++++++++++++++-------- + arch/s390/kernel/s390_ext.c | 2 +- + arch/s390/kernel/smp.c | 25 +++++---- + arch/s390/kernel/vtime.c | 16 +++--- + arch/x86/xen/time.c | 10 ++-- + drivers/s390/cio/cio.c | 2 +- + include/linux/kernel_stat.h | 13 +++-- + include/linux/sched.h | 1 - + kernel/sched.c | 115 +++++++++++++++++++++++++++-------------- + kernel/time/tick-sched.c | 12 ++-- + kernel/timer.c | 15 ----- + 15 files changed, 193 insertions(+), 133 deletions(-) +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merged MAINTAINERS +Auto-merged drivers/scsi/Kconfig +Auto-merged drivers/scsi/Makefile +Auto-merged drivers/scsi/scsi_scan.c +Merge made by recursive. + Documentation/devices.txt | 6 + + Documentation/scsi/osd.txt | 198 ++++++ + MAINTAINERS | 10 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 2 + + drivers/scsi/osd/Kbuild | 33 + + drivers/scsi/osd/Kconfig | 41 ++ + drivers/scsi/osd/Makefile | 43 ++ + drivers/scsi/osd/osd_debug.h | 30 + + drivers/scsi/osd/osd_initiator.c | 1457 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/osd/osd_ktests.c | 441 ++++++++++++ + drivers/scsi/osd/osd_ktests.h | 31 + + drivers/scsi/osd/osd_test.c | 74 ++ + drivers/scsi/osd/osd_uld.c | 445 ++++++++++++ + drivers/scsi/scsi_scan.c | 1 + + include/linux/major.h | 1 + + include/scsi/osd_attributes.h | 327 +++++++++ + include/scsi/osd_initiator.h | 379 ++++++++++ + include/scsi/osd_protocol.h | 575 +++++++++++++++ + include/scsi/osd_sec.h | 45 ++ + include/scsi/osd_types.h | 40 + + include/scsi/scsi.h | 1 + + 22 files changed, 4182 insertions(+), 0 deletions(-) + create mode 100644 Documentation/scsi/osd.txt + create mode 100644 drivers/scsi/osd/Kbuild + create mode 100644 drivers/scsi/osd/Kconfig + create mode 100755 drivers/scsi/osd/Makefile + create mode 100644 drivers/scsi/osd/osd_debug.h + create mode 100644 drivers/scsi/osd/osd_initiator.c + create mode 100644 drivers/scsi/osd/osd_ktests.c + create mode 100644 drivers/scsi/osd/osd_ktests.h + create mode 100644 drivers/scsi/osd/osd_test.c + create mode 100644 drivers/scsi/osd/osd_uld.c + create mode 100644 include/scsi/osd_attributes.h + create mode 100644 include/scsi/osd_initiator.h + create mode 100644 include/scsi/osd_protocol.h + create mode 100644 include/scsi/osd_sec.h + create mode 100644 include/scsi/osd_types.h +Merging fatfs/master +$ git merge fatfs/master +Auto-merged fs/fat/inode.c +Merge made by recursive. + fs/fat/dir.c | 1 - + fs/fat/inode.c | 2 ++ + fs/fat/namei_vfat.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging fuse/for-next +$ git merge fuse/for-next +Auto-merged fs/fuse/dev.c +Auto-merged fs/fuse/dir.c +Merge made by recursive. + fs/fuse/control.c | 6 +- + fs/fuse/dev.c | 113 ++++++++--- + fs/fuse/dir.c | 48 +++--- + fs/fuse/file.c | 457 ++++++++++++++++++++++++++++++++++++++++++-- + fs/fuse/fuse_i.h | 83 ++++++--- + fs/fuse/inode.c | 157 ++++++++------- + include/linux/fuse.h | 79 +++++++- + include/linux/miscdevice.h | 42 ++-- + 8 files changed, 783 insertions(+), 202 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Merge made by recursive. + Documentation/RCU/00-INDEX | 2 + + Documentation/RCU/rcubarrier.txt | 304 ++++++++++++++++++++++++++++++++++++++ + Documentation/bad_memory.txt | 45 ++++++ + 3 files changed, 351 insertions(+), 0 deletions(-) + create mode 100644 Documentation/RCU/rcubarrier.txt + create mode 100644 Documentation/bad_memory.txt +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merged MAINTAINERS +Auto-merged init/main.c +Merge made by recursive. + MAINTAINERS | 3 ++- + drivers/misc/ibmasm/event.c | 2 +- + drivers/rtc/rtc-ds1511.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 2 +- + init/main.c | 3 ++- + kernel/printk.c | 2 +- + lib/radix-tree.c | 11 ++++++----- + 7 files changed, 14 insertions(+), 11 deletions(-) +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +$ git revert -m 1 b6570f77683ce2c4ffbaa54e13f304f2ca4fd609 +Removed drivers/gpu/drm/drm_crtc.c +Removed drivers/gpu/drm/drm_crtc_helper.c +Removed drivers/gpu/drm/drm_edid.c +Removed drivers/gpu/drm/drm_modes.c +Removed drivers/gpu/drm/i915/dvo.h +Removed drivers/gpu/drm/i915/dvo_ch7017.c +Removed drivers/gpu/drm/i915/dvo_ch7xxx.c +Removed drivers/gpu/drm/i915/dvo_ivch.c +Removed drivers/gpu/drm/i915/dvo_sil164.c +Removed drivers/gpu/drm/i915/dvo_tfp410.c +Removed drivers/gpu/drm/i915/intel_bios.c +Removed drivers/gpu/drm/i915/intel_bios.h +Removed drivers/gpu/drm/i915/intel_crt.c +Removed drivers/gpu/drm/i915/intel_display.c +Removed drivers/gpu/drm/i915/intel_drv.h +Removed drivers/gpu/drm/i915/intel_dvo.c +Removed drivers/gpu/drm/i915/intel_fb.c +Removed drivers/gpu/drm/i915/intel_i2c.c +Removed drivers/gpu/drm/i915/intel_lvds.c +Removed drivers/gpu/drm/i915/intel_modes.c +Removed drivers/gpu/drm/i915/intel_sdvo.c +Removed drivers/gpu/drm/i915/intel_sdvo_regs.h +Removed drivers/gpu/drm/i915/intel_tv.c +Removed include/drm/drm_crtc.h +Removed include/drm/drm_crtc_helper.h +Removed include/drm/drm_edid.h +Removed include/drm/drm_mode.h +Finished one revert. +Created commit 3b3d658: Revert "Merge commit 'drm/drm-next'" + 65 files changed, 666 insertions(+), 18634 deletions(-) + delete mode 100644 drivers/gpu/drm/drm_crtc.c + delete mode 100644 drivers/gpu/drm/drm_crtc_helper.c + delete mode 100644 drivers/gpu/drm/drm_edid.c + delete mode 100644 drivers/gpu/drm/drm_modes.c + rewrite drivers/gpu/drm/drm_sysfs.c (62%) + delete mode 100644 drivers/gpu/drm/i915/dvo.h + delete mode 100644 drivers/gpu/drm/i915/dvo_ch7017.c + delete mode 100644 drivers/gpu/drm/i915/dvo_ch7xxx.c + delete mode 100644 drivers/gpu/drm/i915/dvo_ivch.c + delete mode 100644 drivers/gpu/drm/i915/dvo_sil164.c + delete mode 100644 drivers/gpu/drm/i915/dvo_tfp410.c + delete mode 100644 drivers/gpu/drm/i915/intel_bios.c + delete mode 100644 drivers/gpu/drm/i915/intel_bios.h + delete mode 100644 drivers/gpu/drm/i915/intel_crt.c + delete mode 100644 drivers/gpu/drm/i915/intel_display.c + delete mode 100644 drivers/gpu/drm/i915/intel_drv.h + delete mode 100644 drivers/gpu/drm/i915/intel_dvo.c + delete mode 100644 drivers/gpu/drm/i915/intel_fb.c + delete mode 100644 drivers/gpu/drm/i915/intel_i2c.c + delete mode 100644 drivers/gpu/drm/i915/intel_lvds.c + delete mode 100644 drivers/gpu/drm/i915/intel_modes.c + delete mode 100644 drivers/gpu/drm/i915/intel_sdvo.c + delete mode 100644 drivers/gpu/drm/i915/intel_sdvo_regs.h + delete mode 100644 drivers/gpu/drm/i915/intel_tv.c + delete mode 100644 include/drm/drm_crtc.h + delete mode 100644 include/drm/drm_crtc_helper.h + delete mode 100644 include/drm/drm_edid.h + delete mode 100644 include/drm/drm_mode.h diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..ac8b8346f6cb --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,671 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Unchanged quilt series driver-core +Importing usb based on quilt/driver-core +$ git checkout quilt/usb +Switched to branch "quilt/usb" +$ git reset --hard e8fabb5cc720bfeecfdb287b6d09fb5b4c686817 +HEAD is now at e8fabb5 warn when statically-allocated kobjects are used +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-clean-up-redundant-tests-on-unsigned.patch +usb-use-pci_ioremap_bar-in-drivers-usb.patch +usb-avoid-20ms-delay-in-ehci-resume.patch +usb-host-oxford-oxu210hp-hcd-driver.patch +usb-protect-hcd.h-from-multiple-inclusions.patch +usb-avoid-needless-address-taking-of-function-parameters.patch +usb-straighten-out-inline-code-in-sysfs.c.patch +usb-ehci-pci-quirks.c-don-t-wait-so-long-for-bios-handoff.patch +usb-wusb-annotate-association-types-withe-proper-endianness.patch +usb-remove-restrictions-on-signal-numbers-in-devio.c.patch +usb-power-availability-check-for-berry_charge.patch +usb-usbtmc-indent-braces-disagree-something-else-is-desired.patch +usb-change-interface-to-usb_lock_device_for_reset.patch +usb-fsl_qe_udc-check-for-muram-allocation-errors.patch +usb-powerpc-workaround-for-the-ppc440epx-usbh_23-errata.patch +usb-struct-device-replace-bus_id-with-dev_name-dev_set_name.patch +usb-oxu210hp-hcd.c-struct-device-replace-bus_id-with-dev_name-dev_set_name.patch +usb-usb-storage-add-quirks-module-parameter.patch +usb-add-asynchronous-autosuspend-autoresume-support.patch +usb-introduce-usb_queue_reset-to-do-resets-from-atomic-contexts-v7.patch +usb-convert-ohci-pnx4008-to-a-new-style-i2c-driver.patch +usb-m66592-and-r8a66597-resource-changes.patch +usb-gadget-pxa27x_udc.c-cleanup-kernel-doc.patch +usb-serial-ipw.c-mark-__init-__exit-for-usb_ipw_-init-exit.patch +usb-allow-usbmon-as-a-module-even-if-usbcore-is-builtin.patch +usb-announce-new-devices-earlier.patch +usb-storage-clean-up-unusual_devs.h.patch +usb-usb-storage-remove-us-sensebuf.patch +usb-storage-devices-and-sat.patch +usb-storage-flag-devices-known-to-support-sane_sense.patch +usb-g_file_storage-add-cd-rom-emulation.patch +usb-usb-storage-merge-cb-and-cbi-transport-routines.patch +usb-usb-storage-merge-atapi-and-qic-157-protocol-routines.patch +usb-storage-set-bounce-limit-for-non-dma-capable-host-controllers.patch +usb-don-t-use-__module_param_call.patch +usb-gadget-change-simple_strtol-to-simple_strtoul.patch +usb-gadget-mips-ci13xxx_udc.patch +usb-musb-sysfs-mode-updates.patch +usb-musb-build-fixes-for-davinci.patch +usb-musb-minor-locking-fix.patch +usb-musb-host-side-diagnostics-tweaks.patch +usb-musb-add-musb-git-tree-to-maintainers-entry.patch +usb-musb-check-if-set_irq_wake-succeded-and-remember-it.patch +usb-gadget-pxa25x_udc-vbus-sense-initialization.patch +usb-gadget-s3c2410_udc-uses-standard-gpio-calls.patch +usb-move-isp1301_omap-to-drivers-usb-otg.patch +usb-otg-gpio_vbus-transceiver-stub.patch +usb-otg-add-otg_put_transceiver.patch +usb-otg-sharable-otg-transceiver-ops.patch +usb-utilize-round_jiffies_up_relative.patch +usb-enhance-usage-of-pm_message_t.patch +usb-add-imx-udc-gadget-driver.patch +usb-add-new-opticon-serial-driver.patch +usb-add-siemens_mpi-usb-serial-stub-driver.patch +Importing device-mapper based on v2.6.28-rc7-91-gf6f7b52 +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard f6f7b52e2f6149d2ee365717afff315b05720162 +HEAD is now at f6f7b52 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-table-drop-reference-at-unbind.patch +dm-snapshot-change-yield-to-msleep.patch +dm-log-fix-dm_io_client-leak-on-error-paths.patch +dm-consolidate-target-deregistration-error-handling.patch +dm-log-avoid-reinitialising-io_req-on-every-operation.patch +dm-support-barriers-on-simple-devices.patch +dm-request-add-caches.patch +dm-request-extend-target-interface.patch +Unchanged quilt series i2c +Unchanged quilt series jdelvare-hwmon +Unchanged quilt series kernel-doc +Importing ide based on bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e +$ git checkout quilt/ide +Switched to branch "quilt/ide" +$ git reset --hard bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e +HEAD is now at bbeba4c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +0001-Revert-ide-respect-current-DMA-setting-during-resu.patch +ide-build-fix-for-config_blk_dev_idedma_pmac-n.patch +ide-unify-ide_intr-s-exit-points.patch +ide-ide-settings-dont-need-an-ide_lock-held.patch +ide-__ide_port_unregister_devices-doesnt-need-an-ide_lock-held.patch +ide-ide_hwgroup_t-rq-doesnt-need-an-ide_lock-held.patch +ide-push-ide_lock-to-__ide_end_request.patch +ide-ide_lock-__blk_end_request-to-blk_end_request.patch +ide-use-queue-lock-instead-of-ide_lock-when-possible.patch +ide-replace-the-global-ide_lock-spinlock-by-per-hwgroup-spinlocks-v2.patch +Context reduced to (1/1) to apply fragment at 950 +ide-cleanup-ide_do_request.patch +ide-cd-remove-obsolete-seek-optimization.patch +ide-dont-execute-the-next-queued-command-from-the-hard-irq-context-v2.patch +ali14xx-doesnt-use-shared-irqs.patch +cmd64x-set-ide_hflag_serialize-explictly-for-cmd646.patch +gayle-set-ide_hflag_serialize-explictly.patch +ide-fix-quirk_list-checking-in-ide_do_request.patch +ide-always-set-nien-on-idle-devices.patch +rz1000-apply-chipset-quirks-early-v2.patch +ide-add-max_sectors-field-to-struct-ide_port_info.patch +trm290-add-ide_hflag_trm290-host-flag.patch +cy82c693-remove-superfluous-ide_cy82c693-chipset-type.patch +ide-rework-handling-of-serialized-ports-v2.patch +Context reduced to (1/1) to apply fragment at 1401 +ide-struct-device-replace-bus_id-with-dev_name()-dev_set_name().patch +ide-remove-redundant-code-from-ide_end_drive_cmd.patch +ide-remove-inline-tags-from-ide-probe-c.patch +ide-checkpatch.pl-fixes-for-ide-lib-c.patch +ide-use-ata_dma_-defines-in-ide-dma-sff-c.patch +ide-move-power-management-support-to-ide-pm-c.patch +ide-move-legacy-isa-vlb-ports-handling-to-ide-legacy-c-v2.patch +ide-remove-superfluous-local_irq_save-restore-from-ide_dump_status.patch +ide-push-local_irq_save-restore-to-do_identify.patch +ide-cd-remove-dead-atapi_overlap-setting.patch +tx493x-fix-intendation.patch +ide-remove-chipset-type-fixup-from-ide_host_register.patch +ide-small-ide_register_port-cleanup.patch +ide-factor-out-device-type-classifying-from-do_identify.patch +ide-move-sysfs-support-to-ide-sysfs-c.patch +ide-remove-ide-pm-hack-from-do_ide_request.patch +ide-remove-paranoia-checks-for-hwgroup-busy.patch +ide-add-ide_un-lock_hwgroup-helpers.patch +ide-use-per-device-request-queue-locks.patch +ide-cd-move-debug-defines-into-header.patch +ide-make-ide_aflag_numbering-continuous-again.patch +ide-floppy-allocate-only-toplevel-packet-commands.patch +ide-remove-ide-scsi.patch +ide-atapi-add-a-dev_is_idecd-inline.patch +ide-atapi-combine-drive-specific-assignments.patch +ide-atapi-setup-dma-for-ide-cd.patch +ide-atapi-accomodate-transfer-length-calculation-for-ide-cd.patch +ide-atapi-teach-ide-atapi-about-drive-waiting_for_dma.patch +ide-cd-move-cdrom_timer_expiry-to-ide-atapi.patch +ide-atapi-remove-ide-scsi-remnants-from-ide_issue_pc.patch +ide-atapi-remove-ide-scsi-remnants-from-ide_transfer_pc.patch +ide-atapi-remove-ide-scsi-remnants-from-ide_pc_intr.patch +ide-remove-the-last-ide-scsi-remnants.patch +Importing rr based on v2.6.28-rc7-169-g218d11a +$ git checkout quilt/rr +Switched to branch "quilt/rr" +$ git reset --hard 218d11a8b071b23b76c484fd5f72a4fe3306801e +HEAD is now at 218d11a Fix a race condition in FASYNC handling +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +virtio:pci_queue_allocation_not_page_aligned.patch +virtio:struct_device_replace_bus_id_with_dev_name_dev_set_name.patch +virtio:VIRTIO_PCI_QUEUE_ADDR_SHIFT.patch +virtio:rename-vring-pagesize-to-align.patch +virtio:VIRTIO_PCI_VRING_ALIGN.patch +virtio:LGUEST_VRING_ALIGN.patch +virtio:KVM_S390_VIRTIO_RING_ALIGN.patch +virtio:virtqueue-hand-in-vqalign.patch +virtio:balloon_avoid_Linux_page_size.patch +virtio:block-no-max-segment-size-by-default.patch +virtio:block-dynamic-max-segments.patch +virtio:blk_fix_type_warning.patch +virtio:net_large_tx_mtu_support.patch +virtio:console_support_console_resizing.patch +virtio:kvm_s390_implement_config_changed_for_on_s390.patch +.dotest/patch:19: space before tab in indent. + subcode = S390_lowcore.cpu_addr; +warning: 1 line adds whitespace errors. +lguest:move_the_initial_guest_page_table_creation_code_to_the_host.patch +module:remove_config_kmod.patch +module:compare-sym-values-for-export-mark-in-proc-kallsyms.patch +module:print_unload_info-no-proc.patch +bitmap:test-for-constant.patch +6cc88bc4.patch +569712b2.patch +54ac14a8.patch +b5fe363b.patch +x86:speedstep-centrino-cleanup.patch +cpumask:centralize-common-maps.patch +cpumask:convert-few-difficult-cpumask_t-users.patch +cpumask:irq-functions-take-cpumask_t-ptr.patch +cpumask:clock_event_device-takes-cpumask-ptr.patch +cpumask:CONFIG_CPUMASK_OFFSTACK.patch +cpumask:smp_call_function_many.patch +cpumask:fix-impossible-percpu-accesses-pnp.patch +cpumask:fix-impossible-percpu-accesses-m32r.patch +cpumask:fix-impossible-percpu-accesses-x86.patch +cpumask:infiniband-avoid-NR_CPUS-iteration.patch +cpumask:convert-drivers_infiniband_ehca.patch +cpumask:convert-drivers_infiniband_ipath.patch +cpumask:use-nr_cpu_ids-in-seq_cpumask.patch +cpumask:cpumask_of_node.patch +cpumask:cpumask_of_node-x86.patch +cpumask:cpumask_of_node-sparc.patch +cpumask:cpumask_of_node-sh.patch +cpumask:cpumask_of_node-powerpc.patch +cpumask:cpumask_of_node-ia64.patch +cpumask:cpumask_of_node-mips.patch +cpumask:cpumask_of_node-alpha.patch +cpumask:all-ops-compare-against-nr_cpu_ids-core.patch +cpumask:all-ops-compare-against-nr_cpu_ids-net.patch +cpumask:CONFIG_NR_CPUS-always.patch +cpumask:use-cpumap-accessors-core.patch +cpumask:for_each_cpu-in-cpumask.h.patch +parisc:remove-cpu_online_map-declaration.patch +cpumask:cpu_online_mask-etc-as-primary.patch +cpumask:out-of-line-accessors.patch +arm:__fls.patch +avr32:__fls.patch +blackfin:__fls.patch +m68k:__fls.patch +m68knommu:__fls.patch +bitmap:find_last_bit.patch +cpumask:use-find_last_bit.patch +misc:work_on_cpu-acpi.patch +misc:work_on_cpu-dcdbas.patch +misc:work_on_cpu-pci.patch +misc:work_on_cpu-powerpc-sysfs.patch +cpumask:cpu_coregroup_mask-x86.patch +cpumask:cpu_coregroup_mask-sparc.patch +cpumask:cpu_coregroup_mask-s390.patch +cpumask:use-cpu_coregroup_mask.patch +cpumask:topology_core_cpumask-and-topology_thread_cpumask-x86.patch +cpumask:topology_core_cpumask-and-topology_thread_cpumask-sparc.patch +cpumask:topology_core_cpumask-and-topology_thread_cpumask-s390.patch +cpumask:topology_core_cpumask-and-topology_thread_cpumask-powerpc.patch +cpumask:topology_core_cpumask-and-topology_thread_cpumask-ia64.patch +cpumask:use-topology_core_cpumask-and-topology_thread_cpumask.patch +Importing ttydev based on f6f7b52e2f6149d2ee365717afff315b05720162 +$ git checkout quilt/ttydev +Switched to branch "quilt/ttydev" +$ git reset --hard f6f7b52e2f6149d2ee365717afff315b05720162 +HEAD is now at f6f7b52 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog +$ git quiltimport --author Alan Cox <alan@lxorguk.ukuu.org.uk> --patches ../quilt/ttydev +blackfin-kgdb +blackfin-sir-stopfix +blackfin-clean-early +blackfin-rxtx-lock +blackfin-clear-bi +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 +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 +tty-trivial-usb-sierra-format +tty-sparse-warning-driver-lookup +pty-simplify-resize +n-tty-fix-control +n-tty-full-checks +n-tty-bell +tty-usb-close-race +devpts-fix-unused-function-warning +tty-serial-fix-tornado +tty-serial-use-const +tty-usb-console-devcon +tty-wrap-credentials +ppp-tty-hang +tty-port-extract-cd +.dotest/patch:804: trailing whitespace. + +.dotest/patch:1332: trailing whitespace. + +.dotest/patch:1334: space before tab in indent. + usc_get_serial_signals(info); +.dotest/patch:1410: space before tab in indent. + if (!(port->flags & ASYNC_CLOSING) && (do_clocal || dcd)) +.dotest/patch:1481: space before tab in indent. + get_signals(info); +warning: squelched 4 whitespace errors +warning: 9 lines add whitespace errors. +tty-rio-ckmalloc-must-die +tty-port-extract-raise-dtr +.dotest/patch:156: space before tab in indent. + usc_set_serial_signals(info); +.dotest/patch:202: space before tab in indent. + set_signals(info); +warning: 2 lines add whitespace errors. +tty-isicom-relock +.dotest/patch:136: space before tab in indent. + set_signals(info); +warning: 1 line adds whitespace errors. +tty-genser-relock +.dotest/patch:52: trailing whitespace. + +.dotest/patch:63: space before tab in indent. + port->flags |= ASYNC_NORMAL_ACTIVE; +warning: 2 lines add whitespace errors. +tty-rocketport-flags +tty-riscom8-relock +tty-mxser-relock +tty-port-block_til_ready +.dotest/patch:348: trailing whitespace. + +.dotest/patch:429: trailing whitespace. + +warning: 2 lines add whitespace errors. +tty-istallion-rework +.dotest/patch:149: space before tab in indent. + spin_lock_irqsave(&stli_lock, flags); +warning: 1 line adds whitespace errors. +tty-stallion-rework +tty-esp-remove +tty-port-zerobaudopen +tty-port-close +.dotest/patch:103: trailing whitespace. + +.dotest/patch:464: trailing whitespace. + as we don't yet have everyone using refcounts */ +.dotest/patch:507: trailing whitespace. + +.dotest/patch:510: trailing whitespace. + +.dotest/patch:622: trailing whitespace. + if (tty_port_close_start(&info->port, tty, filp) == 0) +warning: squelched 2 whitespace errors +warning: 7 lines add whitespace errors. +tty-oxsemi-baud-base +tty-usb-tdrain-fix +tty-n-tty-sigio +tty-pty-wakeup +tty-cleanup-flag-abuse +tty-net-drivercasts +tty-drivercasts +tty-nozomi-kref +tty-kref-hso +tty-hso-fix-termios +tty-hso-modem +tty-epca-relock +tty-epca-refcount +tty-epca-portops +tty-rocket-relock +tty-rocket-flags +tty-rocket-kref +tty-rocket-portfuncs +.dotest/patch:136: trailing whitespace. + +warning: 1 line adds whitespace errors. +tty-synclink_cs-port +.dotest/patch:136: space before tab in indent. + tx_start(info, tty); +.dotest/patch:405: space before tab in indent. + if (capable(CAP_SYS_ADMIN) && tty) +.dotest/patch:443: space before tab in indent. + if (!tty || tty->termios->c_cflag & HUPCL) { +.dotest/patch:543: space before tab in indent. + tx_start(info, tty); +.dotest/patch:552: space before tab in indent. + tx_start(info, tty); +warning: squelched 7 whitespace errors +warning: 12 lines add whitespace errors. +tty-usb-lock-drop +.dotest/patch:30: space before tab in indent. + unlock_kernel(); +warning: 1 line adds whitespace errors. +tty-ioctl-includes +tty-blackfin-function +tty-serial-move-port +tty-serial-fix-port-init +tty-serial-8250-regops +tty-serial-8250-fixed +tty-serial-8250-octeon +tty-usb-sprogii +tty-move-port-kfree +tty-typo-fixes +tty-cyclades-fix-probe-leak +tty-ircomm-tweaks +tty-gigaset-poll +tty-hso-fix-modem-check +tty-hso-maintainer +Importing staging based on quilt/usb +$ git checkout quilt/staging +Switched to branch "quilt/staging" +$ git reset --hard 20fbda728b2f8f0715591802451aa0078ac14a5d +HEAD is now at 20fbda7 USB: add siemens_mpi usb-serial "stub" driver +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging +staging-move-staging-drivers-back-to-staging-specific-menu.patch +staging-kconfig-for-arch-arm-8300-cris.patch +staging-correct-dubious-use-of-x-y.patch +staging-w35und-make-wb35_probe-and-wb35_disconnect-funtions-static.patch +staging-w35und-remove-unused-wb35_open-and-wb35_close-functions.patch +staging-w35und-use-msleep-and-udelay.patch +staging-w35und-remove-the-no-op-pa_stall_execution-macro.patch +staging-w35und-purb-typedef-removal.patch +staging-w35und-reg-queue-struct-typedef-removal.patch +.dotest/patch:348: space before tab in indent. + kfree(reg_queue); +warning: 1 line adds whitespace errors. +staging-w35und-wb35reg-struct-typedef-removal.patch +.dotest/patch:546: space before tab in indent. + Wb35Reg_WriteSync(pHwData, 0x1050, pHwData->reg.BB50); +.dotest/patch:559: space before tab in indent. + Wb35Reg_WriteSync( pHwData, 0x1050, pHwData->reg.BB50); +.dotest/patch:574: space before tab in indent. + Wb35Reg_WriteSync(pHwData, 0x1050, pHwData->reg.BB50); +warning: 3 lines add whitespace errors. +staging-w35und-padapter-struct-typedef-removal.patch +staging-w35und-merge-wblinux-struct-to-adapter.patch +staging-w35und-wb35_probe-cleanup.patch +staging-w35und-remove-usb_submit_urb-wrapper-function.patch +staging-w35und-remove-usb_alloc_urb-wrapper-function.patch +staging-w35und-remove-dead-code-from-wbusb_f.h.patch +staging-w35und-remove-true-false-boolean-macros.patch +staging-w35und-os_memory_alloc-wrapper-removal.patch +staging-w35und-usb_put_dev-is-missing-from-wb35_disconnect.patch +staging-w35und-remove-macro-magic-from-mlme_getnextpacket.patch +staging-w35und-plug-memory-leak-in-wbsoft_tx.patch +staging-w35und-move-supported-band-initialization-out-of-wb35_probe.patch +staging-w35und-remove-timer-wrappers.patch +staging-w35und-remove-atomic-op-wrappers.patch +staging-w35und-remove-memcpy-memcmp-wrappers.patch +staging-w35und-remove-abs-and-bit-macros.patch +staging-w35und-remove-unused-macros-from-common.h.patch +staging-w35und-remove-unused-link-status-code.patch +staging-w35und-include-cleanup.patch +staging-w35und-remove-some-dead-code.patch +staging-w35und-move-source-files-to-one-directory.patch +.dotest/patch:2903: space before tab in indent. + kfree(reg_queue); +warning: 1 line adds whitespace errors. +staging-w35und-move-struct-wbsoft_priv-to-core.h-and-use-it.patch +staging-w35und-remove-adapter-from-struct-_hw_data_t.patch +staging-w35und-clean-up-adapter.h-a-bit.patch +staging-w35und-merge-struct-wb35_adapter-to-struct-wbsoft_priv.patch +staging-w35und-remove-global-struct-ieee80211_hw.patch +staging-w35und-inline-driver_author-and-driver_desc-macros.patch +staging-w35und-clean-up-wblinux.c-a-bit.patch +staging-w35und-remove-unused-shutdowned-member-from-struct-local_para.patch +staging-w35und-move-global-wbsoft_enabled-to-struct-wbsoft_priv.patch +staging-w35und-move-packet_came-to-wb35rx.c.patch +staging-w35und-remove-skb_array-from-struct-wbsoft_priv.patch +staging-w35und-remove-shutdown-from-struct-wbsoft_priv.patch +staging-w35und-make-functions-local-to-mds.c-static.patch +staging-w35und-make-functions-local-to-mlmetxrx.c-static.patch +staging-w35und-remove-dead-code-from-mto.c.patch +staging-w35und-make-functions-local-to-wb35rx.c-static.patch +staging-w35und-make-functions-local-to-wb35tx.c-static.patch +staging-w35und-remove-dead-code-from-wbhal.c.patch +staging-w35und-remove-rxisr.c-as-dead-code.patch +staging-w35und-fix-kconfig.patch +staging-wlan-ng-remove-pci-plx-pcmcia-files.patch +staging-wlan-ng-update-help-text-to-mention-prism3-devices.patch +staging-wlan-ng-delete-pci-plx-pcmcia-specific-code.patch +staging-wlan-ng-make-wlan-ng-use-wext-mode-by-default.patch +staging-wlan-ng-eliminate-more-2.6-kernel-support.patch +staging-wlan-ng-eliminate-all-backwards-compatibility-for-2.6.13-kernels.patch +staging-wlan-ng-eliminate-a-boatload-of-tertiaryap-only-code.patch +staging-wlan-ng-remove-ap-only-code-from-mlme-functions.patch +staging-wlan-ng-get-rid-of-the-mtu-tests-in-the-rx-conversion-path.patch +staging-wlan-ng-eliminate-one-more-rx-mtu-test.patch +staging-wlan-ng-eliminate-local-version.h.patch +staging-wlan-ng-eliminate-usage-of-procfs.patch +staging-wlan-ng-use-standard-kernel-integer-types.patch +staging-wlan-ng-eliminate-all-backwards-compatible-kernel-code.patch +staging-wlan-ng-wireless-extension-support-is-mandatory.patch +staging-wlan-ng-use-wireless_ext-not-config_wireless_ext.patch +staging-wlan-ng-delete-a-large-pile-of-now-unused-code.patch +staging-wlan-ng-delete-a-pile-of-unused-mibs.-and-fix-wext-set_txpower.patch +staging-wlan-ng-consolidate-wlan-ng-into-a-single-module.patch +staging-wlan-ng-purge-all-mibs-not-used-internally.patch +staging-wlan-ng-p80211netdev.c-fix-netdev-alloc-to-prevent-oops-on-device-start.patch +staging-wlan-ng-prism2_usb.c-always-enable-the-card-in-probe_usb.patch +staging-wlan-ng-hfa384x_usb.c-use-newest-version-of-384x_drvr_start.patch +staging-wlan-ng-p80211wext.c-add-latest-changes-remove-extra-nulls-from-wext_handlers.patch +staging-wlan-ng-p80211wext-don-t-set-default-key-id-twice.patch +staging-wlan-ng-hfa384x_usbin_callback-check-for-hardware-removed.patch +staging-wlan-ng-p80211conv.c-copy-code-from-wlan-ng-devel-branch-to-not-drop-packets.patch +staging-wlan-ng-remove-unused-include-version.h.patch +staging-wlan-ng-p80211wext.c-use-array_size.patch +staging-wlan-ng-fix-compiler-warnings.patch +staging-wlan-ng-skb_p80211_to_ether-payload_length-is-unsigned-check-before-subtraction.patch +staging-at76_usb-update-drivers-staging-at76_usb-w-mac80211-port.patch +staging-at76_usb-remove-compiler-warnings.patch +staging-at76_usb-fix-up-all-remaining-checkpatch.pl-warnings.patch +staging-poch-block-size-bug-fix.patch +staging-poch-update-todo-list.patch +staging-poch-correct-pages-from-bytes.patch +staging-poch-minor-fixes.patch +staging-poch-fix-build-warnings.patch +staging-poch-rx-control-register-init.patch +staging-poch-fix-user-space-protocol-syncing.patch +staging-poch-fine-grained-locking.patch +staging-sxg-remove-typedefs.patch +staging-sxg-break-the-build-in-a-cleaner-way-when-x86.patch +staging-sxg-update-readme.patch +staging-struct-device-replace-bus_id-with-dev_name-dev_set_name.patch +staging-echo-remove-typedefs.patch +staging-echo-lindent-drivers-staging-echo.patch +staging-go7007-saa7134-updates.patch +staging-go7007-add-sensoray-2250-2251-support.patch +staging-go7007-convert-driver-to-use-video_ioctl2.patch +staging-go7007-annotate-code-pointers.patch +staging-go7007-fix-minor-build-warnings.patch +staging-et131x-cleanup-et131x_debug.h-defines.patch +staging-et131x-fix-build-failure.patch +staging-et131x-remove-unused-variable-in-et1310_tx.c.patch +staging-usbip-cleanup-kerneldoc.patch +staging-slicoss-use-kzalloc.patch +staging-slicoss-use-correct-type-for-memory-allcations.patch +staging-slicoss-use-request_firmware.patch +staging-add-agnx-wireless-driver.patch +.dotest/patch:80: space before tab in indent. + { .bitrate = 10, .hw_value = 1, }, +.dotest/patch:81: space before tab in indent. + { .bitrate = 20, .hw_value = 2, }, +.dotest/patch:82: space before tab in indent. + { .bitrate = 55, .hw_value = 3, }, +.dotest/patch:83: space before tab in indent. + { .bitrate = 110, .hw_value = 4,}, +.dotest/patch:692: space before tab in indent. + reg = ioread32(ctl + AGNX_CIR_TXMCTL); +warning: squelched 11 whitespace errors +warning: 16 lines add whitespace errors. +staging-agnx-fix-build-warnings.patch +staging-add-otus-atheros-wireless-network-driver.patch +.dotest/patch:227: space before tab in indent. + { +.dotest/patch:2054: space before tab in indent. + j = (j + 1) & ZM_AGG_BAW_MASK; +.dotest/patch:2220: space before tab in indent. + zmw_enter_critical_section(dev); +.dotest/patch:2221: space before tab in indent. + if (((tid_rx->baw_head - tid_rx->baw_tail) & ZM_AGG_BAW_MASK) > 0) { +.dotest/patch:2222: space before tab in indent. + //DbgPrint("head=%d, tail=%d", tid_rx->baw_head, tid_rx->baw_tail); +warning: squelched 211 whitespace errors +warning: 216 lines add whitespace errors. +staging-otus-fix-name-clash.patch +staging-otus-fix-urb-callback-function-type.patch +staging-add-rt2860-wireless-driver.patch +.dotest/patch:1154: space before tab in indent. + net_dev->name, (ULONG)pci_resource_start(pci_dev, 0), +.dotest/patch:1429: space before tab in indent. + TxIdx : pAd->TxRing[pTxBlk->QueIdx].TxCpuIdx +.dotest/patch:1430: space before tab in indent. + QueIdx: pTxBlk->QueIdx +.dotest/patch:1431: space before tab in indent. + pTxD : pAd->TxRing[pTxBlk->QueIdx].Cell[TxIdx].AllocVa; +.dotest/patch:1433: space before tab in indent. + > For Rx Alloc: +warning: squelched 1028 whitespace errors +warning: 1033 lines add whitespace errors. +staging-rt2860-use-standard-bit-reverse-function.patch +staging-rtl2860-fix-minor-compiler-warnings.patch +staging-rt2860-enable-wpa_supplicant-support.patch +staging-add-serverengines-benet-10gb-ethernet-driver.patch +staging-benet-build-is-broken-unless-config_netpoll-is-enabled.patch +staging-benet-patch-to-remove-subdirectories.patch +staging-benet-fix-build-errors-when-config_netpoll-is-off.patch +staging-benet-fix-build-error.patch +staging-benet-patch-to-use-offsetof-instead-of-amap_byte_offset.patch +staging-benet-fix-problems-reported-by-checkpatch.patch +staging-add-comedi-core.patch +.dotest/patch:5817: space before tab in indent. + COMEDI_RANGEINFO +warning: 1 line adds whitespace errors. +staging-comedi-fix-up-a-lot-of-checkpatch.pl-warnings.patch +staging-comedi-fix-checkpatch.pl-errors-in-comedi_fops.c.patch +staging-comedi-fix-build-error-in-comedilib.h.patch +staging-comedi-add-kcomedilib-to-the-tree.patch +staging-comedi-set-up-infrastructure-for-individual-drivers.patch +staging-comedi-add-local-copy-of-interrupt.h.patch +staging-comedi-add-pci-and-usb-wrapper-header-files.patch +staging-comedi-comedi-driver-common-function-module.patch +staging-comedi-add-mite-comedi-pci-driver.patch +staging-comedi-add-usb-usbdux-driver.patch +staging-comedi-add-usb-usbduxfast-driver.patch +staging-comedi-add-usb-dt9812-driver.patch +staging-comedi-add-comedi_bond-driver.patch +staging-comedi-add-comedi_test-driver.patch +staging-comedi-add-comedi_parport-driver.patch +staging-comedi-dt9812-fix-up-a-lot-of-coding-style-issues.patch +staging-comedi-dt9812-remove-dt9812.h.patch +staging-comedi-dt9812-remove-typedefs.patch +staging-comedi-dt9812-fix-sparse-warnings.patch +staging-comedi-usbdux-remove-kernel-version-checks.patch +staging-comedi-usbdux-code-style-cleanups.patch +staging-comedi-usbdux-remove-comments.patch +staging-comedi-usbdux-fix-up-printk-calls.patch +staging-comedi-usbdux-remove-checkpatch.pl-warnings.patch +staging-comedi-usbdux-remove-typedef.patch +staging-comedi-usbdux-remove-comedi-usb-wrappers.patch +staging-comedi-usbduxfast-remove-comedi-usb-wrappers.patch +staging-comedi-dt9812-remove-ifdef-that-is-not-needed.patch +staging-comedi-remove-usb-wrappers.patch +staging-comedi-remove-pci-wrappers.patch +staging-comedi-add-icp_multi-driver.patch +staging-comedi-add-me4000-driver.patch +staging-comedi-fix-checkpatch.pl-issues-in-comedi_bond.c.patch +staging-comedi-fix-checkpatch.pl-issues-in-comedi_fc.c.patch +staging-comedi-remove-typedefs-from-comedi_bond.c.patch +staging-comedi-fix-sparse-issues-in-comedi_bond.c.patch +staging-comedi-fix-checkpatch.pl-issues-in-comedi_test.c.patch +staging-comedi-fix-sparse-issues-in-comedi_test.c.patch +staging-comedi-remove-typedefs-from-comedi_test.c.patch +staging-comedi-fix-comedi_parport.c-checkpatch.pl-issues.patch +staging-comedi-fix-comedi_fc.h-checkpatch.pl-issues.patch +staging-comedi-fix-comedi_pci.h-checkpatch.pl-issues.patch +staging-comedi-comedi_pci.h-remove-unneeded-wrapper.patch +staging-comedi-comedi_pci.h-remove-comedi_pci_enable_no_regions.patch +staging-comedi-comedi_pci.h-remove-comedi_pci_disable_no_regions.patch +staging-comedi-add-s626-driver.patch +staging-comedi-add-rtd520-driver.patch +staging-comedi-add-me_daq-driver.patch +staging-comedi-me_daq-fix-checkpatch.pl-issues.patch +staging-comedi-me_daq-remove-typedefs.patch +staging-comedi-me_daq-fix-sparse-issues.patch +staging-comedi-fix-checkpatch.pl-warning-in-interrupt.h.patch +staging-comedi-fix-build-if-config_proc_fs-is-not-set.patch +staging-add-asus_oled-driver.patch +staging-asus_oled-fix-build-dependancy.patch +staging-add-the-meilhaus-me-ids-driver-package.patch +.dotest/patch:41828: space before tab in indent. + void *pvContext, +.dotest/patch:41829: space before tab in indent. + int iErrorCode); +.dotest/patch:41833: space before tab in indent. + int iSubdevice, +.dotest/patch:41834: space before tab in indent. + int iChannel, +.dotest/patch:41836: space before tab in indent. + int iValue, +warning: squelched 2 whitespace errors +warning: 7 lines add whitespace errors. +staging-meilhaus-fix-__symbol_get-problems.patch +staging-add-lcd-panel-driver.patch +staging-panel-major-checkpatch-cleanup.patch +staging-panel-remove-ifdefs-and-code-for-pre-2.6-kernels.patch +staging-panel-remove-support-for-smartcards.patch +staging-add-driver-for-altera-pci-express-chaining-dma-reference-design.patch +.dotest/patch:487: space before tab in indent. + } else { +warning: 1 line adds whitespace errors. +staging-add-rtl8187se-driver.patch +.dotest/patch:82: trailing whitespace. +#ifndef __INC_DOT11D_H
+.dotest/patch:83: trailing whitespace. +#define __INC_DOT11D_H
+.dotest/patch:84: trailing whitespace. +
+.dotest/patch:85: trailing whitespace. +#include "ieee80211.h"
+.dotest/patch:86: trailing whitespace. +
+warning: squelched 2324 whitespace errors +warning: 2329 lines add whitespace errors. +staging-rtl8187se-remove-unneeded-files.patch +staging-rtl8187se-make-the-built-module-be-the-proper-name.patch +staging-rtl8187se-remove-duplicate-pci-ids.patch diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..ab1f99a6cddf --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20081209 |