diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-30 17:12:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-30 17:12:54 +1100 |
| commit | 1f1a57cfd65f9f4a2f443fbcd18128360540b86a (patch) | |
| tree | a6741af3eec27f404a5ed3fbd3841b153bb08dfe | |
| parent | f6d1d61abf5f92e5de8d67c39eee1256a58c1600 (diff) | |
Add linux-next specific files for 20081030next-20081030
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 125 | ||||
| -rw-r--r-- | Next/Trees | 127 | ||||
| -rw-r--r-- | Next/merge.log | 3348 | ||||
| -rw-r--r-- | Next/quilt-import.log | 56 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3657 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..cadc45706d66 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,125 @@ +Name SHA1 +---- ---- +origin e946217e4fdaa67681bbabfa8e6b18641921f750 +powerpc-merge 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 +scsi-rc-fixes c9eeb248f3b44939532a9716bc06413383aa5d63 +net-current 48e5ecae691cfb50aa39036ba9fc193f5c24dbb3 +sparc-current 60b8267338aafde5315fc65ff385f3d4d75eccfe +sound-current 0552f297951d0ab3a1027f9b06fa40c9be8378ba +arm-current 27f680adc65ca08bf72ed85d3a48d1ee70f77c7a +pci-current 3b15e581981b3ad35809f56d8131d5c19b6da1bd +wireless-current adef199c61a224703dfa95c69d360c793ab2ea97 +kbuild-current 15a2ee74d22674c58f347b16b3af5601fa4e15db +driver-core.current b9005ce07e71fd4dc2dd398aea4d6e7f12852d9a +usb.current 669916a50ccce5d98a733f0fc39c792ce24737a6 +cpufreq-current 8d5922572038bae9f7b16fcb974eee806727b44c +input-current 2a0bd75e5e687a9c34921e942c18477ea7ec2d63 +md-current 7a1fc53c5adb910751a9b212af90302eb4ffb527 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm df5d2a42fd2c4fa1aa4deeaf8b29475f83f8e9ca +avr32 105462632c37ea5484ebae7db6e85e0aaac28f4b +blackfin 1390da4ee75168b6e4d8354e93e3b5f0a0291f2f +cris 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 +ia64 e946217e4fdaa67681bbabfa8e6b18641921f750 +m68k 78bbcef69c34ae5e8a9b571ace0b620b3276877f +m68knommu 7680a920c75b242adaedf3d93b7f6d253db56792 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc 81e192d6ce303b6792aa38ff35f41a1a7357f23a +powerpc 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 +4xx 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 +galak 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 +pxa f37eff4f7f06f211db32caccb262b5476cc4c492 +s390 cb5b80c3846d43df17ee441bc988b75b9a8b9866 +sh 3eeebf17f31c583f83e081b17b3076477cb96886 +sparc 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 +x86 332ad310c50c49b6c78a1fb78b2b335094c56e6b +xtensa dbd3dca3d7d5b1cd36a3df2ee9ed2c46d99b7f64 +driver-core 3683ddb5a1f30a15de87190b0be86e1477f7d3dc +usb 4861b57b3f571b6becf6832264cc9403ba582528 +tip-core e10c450837c6f4c959c779bc1ea7342aa2c7e4f0 +cpus4096 9d8b344cfa76f459fb7670b1ba08be622c6dea7d +ftrace 088aee67d5fd8ac49de43a472921bb4ac8bc3bf9 +genirq 49fdf6785fd660e18a1eb4588928f47e9fa29a9a +safe-poison-pointers 08fbd941a1c385b147ba7e14142cb0e4281ba372 +sched 3aba30018fabe0ad7369e3612b2dde44257023a7 +stackprotector 543735ed69703ba8dcec461e3323edf35b070c99 +timers abbc0a09214e6b2f02d3cf974880b88ce43e4733 +pci f7642508f9229964d18612cd25349ece9d829ec4 +device-mapper 0b4a8d0cfed78f4c991d74ae052080dfbb2dec35 +hid 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 +i2c 1eed982efc90e565bb59c25c5ff54956f17d3de8 +jdelvare-hwmon 47fd550939fc9f1dd0a20a59d4db83f9b7a164ad +kernel-doc 7591103c08abade60aeddb432ed0686ddd0de1c6 +v4l-dvb 331536133fdbd10df29a9876a054fd78f7f48ff4 +jfs ec1aef33668448718fcba79e4e981592bfd7e0a3 +kbuild 56b2f0706d82535fd8d85503f2dcc0be40c8e55d +ide d0ae393a154847012337dac231abf8d356e90e31 +libata 1d63e726408dfdb3e10ed8f00c383b30ebb333d3 +nfs e946217e4fdaa67681bbabfa8e6b18641921f750 +xfs 676a7711ee281c3bf41db18e29e296584de82793 +infiniband 574d96b272fd130bf37823875fca4929b4d69196 +acpi 3ef275bf7d2cdfd1989a7a39078aec8fd59e60a9 +nfsd 30bc4dfd3b64eb1fbefe2c63e30d8fc129273e20 +ieee1394 7ccf54a0cc18ef8fe3a1e21727f8c15cd14fa66e +ubi 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 +kvm 8ac952a4c150f281f9ecfe3ce46a3de6ef2ce1c6 +dlm 27eccf46491e1f77f9af9bbe0778122ce6882890 +scsi 520a2c2741747062e75f91cd0faddb564fbc64d2 +tests 94a97a3018e55a27d1c29e011b3c38fee01a967f +ocfs2 c2e2c581ace8de4a9cff733bc54e3c5677ff3c37 +ext4 f287a1a56130be5fdb96a4a62d1290bd064f308e +async_tx 77cd62e8082b9743b59ee1946a4c3ee2e3cd2bce +udf 5c89468c12899b84886cb47eec93f0c88e0f896a +net 9edb8bb68b5ea63061ba833831b00c229ac9fbd2 +mtd f04de505e3fa322728d1a851e08bf7060b117743 +wireless ad788b5e079484aa1d48aa90a3ebd7d954d2e7db +crypto 6aa7aef26e24d713397c7f56615ab90281dc59e6 +vfs fd217f4d70172c526478f2bc76859e909fdfa674 +sound 88944617300cee773f888ee54a9eb52b813c97d7 +cpufreq 4f6e6b9f97b0ce98a8d1da65adbaf743bd0486a9 +v9fs 7db8ce2de65b850096687e22aaadde2ad575726a +rr c9a490ff0dabd92ea9aa79b6ebb578f96dd0acf8 +cifs edf1ae403896cb7750800508b14996ba6be39a53 +mmc 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e +gfs2 5e8a3ca3f6e3db33654e22aada1446be92884044 +input dde4ac07263161264d089c7556d0295487787b77 +semaphore b552068999b0b05087c454e525b30b785c79dc9b +semaphore-removal 9ac2f04936e1140d7a28a01b84e086458e191b49 +bkl-removal 0d4a7bc12ffecd3ba41dd94179cc5b272b71ce8a +trivial 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 +ubifs e946217e4fdaa67681bbabfa8e6b18641921f750 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 75361dec7c1b1ecb1eeb85583cc1eef09263c6b0 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 0105f18683fde1df6ef69e7812582a52701e8a54 +pcmcia 5cb02ff3489d710c73b4a21bb804feedeacce116 +battery ed8c3174dd227031d1f3b9fa4fbb512f8f623434 +leds 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +backlight 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +kgdb 29c2e152262690a5e87543b0c2cd3b13884f70a9 +slab 371918b6d7889da7d035489f513061686fe30d95 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 30d97ce791a96b3039d5ffcc515ef1f53feac845 +kmemcheck 9178d480ae1672cf4b60a487f3d52b6385e6256a +generic-ipi 49fdf6785fd660e18a1eb4588928f47e9fa29a9a +mfd c3177623edf3fabf200c60bde9b400d03b6271f7 +hdlc 959ffb0d55b2c3cf64417f9ac5c4d9ed8df981d4 +drm 4e270e9b8a9d246290f3901f1fb6c5efdb734ddf +voltage d85784c0a6b7c14aeca21e226a9dfe84019aea14 +security-testing 0da939b0058742ad2d8580b7db6b966d0fc72252 +lblnet f8a024796b2bbec3d1a4ad5aae6173cfb18226b4 +ttydev f8d56f1771e4867acc461146764b4feeb5245669 +agp a64d2b37c2259e169759c1701ac565f0a11dc0ea +creds 1be293b20f2df77ea2cc37106592bf8c209a5ab5 +oprofile 49fdf6785fd660e18a1eb4588928f47e9fa29a9a +fastboot 49fdf6785fd660e18a1eb4588928f47e9fa29a9a +sparseirq adeb893bcfd0d39f9962344a807bb6515aec0479 +iommu 49fdf6785fd660e18a1eb4588928f47e9fa29a9a +uwb f8d56f1771e4867acc461146764b4feeb5245669 +watchdog 675e3a6ab42b44038e95f8843237af925c8976cb +proc e8f3f01b012e0267908005c15717619678710651 +bdev 56b26add02b4bdea81d5e0ebda60db1fe3311ad4 +dwmw2-iommu b876d08f816527af257e13d89fb0d3b4b849223c +cpu_alloc 3ba98730fe1feb5b3fd9747fa1d3d629cd7ec0f7 +userns 472203385bdc25cd75ec1c88fd68b8d2850a50b1 +scsi-post-merge 04ab591808565f968d4406f6435090ad671ebdab diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..66f8f2488949 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,127 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-2.6.26 +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k quilt http://www.kernel.org/pub/linux/kernel/people/geert/linux-m68k-patches-2.6/ +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-x86-next +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-timers-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.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 +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/test.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-linus +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +creds git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/cred-2.6.git#creds-v4 +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 +userns git git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/userns-2.6#next +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..73206b6ba632 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3348 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at e946217 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +Merging origin/master +$ git merge origin/master +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/amd8111e.c | 14 ++-- + drivers/net/ehea/ehea.h | 2 +- + drivers/net/ehea/ehea_qmr.c | 57 ++++++++++++- + drivers/net/ehea/ehea_qmr.h | 3 + + drivers/net/ibm_newemac/core.c | 2 +- + drivers/net/mlx4/en_main.c | 1 - + drivers/net/mlx4/fw.c | 2 +- + drivers/net/tulip/dmfe.c | 12 +++- + drivers/net/usb/dm9601.c | 15 ++++ + drivers/net/via-velocity.c | 11 ++- + drivers/net/wan/syncppp.c | 5 +- + drivers/net/wireless/ath5k/base.c | 33 +++----- + drivers/net/wireless/p54/p54common.c | 5 +- + drivers/net/wireless/p54/p54pci.c | 132 +++++++++++++++--------------- + drivers/s390/net/qeth_core_main.c | 3 +- + drivers/s390/net/qeth_l2_main.c | 27 ++---- + drivers/s390/net/qeth_l3_main.c | 13 +--- + drivers/s390/net/qeth_l3_sys.c | 7 -- + include/net/mac80211.h | 11 +-- + net/core/pktgen.c | 27 +++--- + net/mac80211/rc80211_minstrel_debugfs.c | 6 +- + net/rfkill/rfkill-input.c | 5 + + 22 files changed, 220 insertions(+), 173 deletions(-) +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + sound/core/control.c | 7 ++++++- + sound/pci/hda/hda_codec.c | 1 + + sound/pci/hda/hda_intel.c | 29 +++++++++++++++++++++++++++++ + sound/pci/hda/patch_analog.c | 1 + + sound/pci/hda/patch_sigmatel.c | 4 +--- + sound/pci/intel8x0.c | 1 + + 6 files changed, 39 insertions(+), 4 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Removed Documentation/arm/empeg/README +Removed Documentation/arm/empeg/ir.txt +Removed Documentation/arm/empeg/mkdevs +Merge made by recursive. + Documentation/arm/empeg/README | 13 ---------- + Documentation/arm/empeg/ir.txt | 49 ---------------------------------------- + Documentation/arm/empeg/mkdevs | 11 --------- + MAINTAINERS | 5 ++++ + arch/arm/mm/proc-xsc3.S | 2 +- + drivers/mmc/host/mmci.c | 5 ++- + 6 files changed, 9 insertions(+), 76 deletions(-) + delete mode 100644 Documentation/arm/empeg/README + delete mode 100644 Documentation/arm/empeg/ir.txt + delete mode 100644 Documentation/arm/empeg/mkdevs +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + arch/ia64/include/asm/iommu.h | 1 - + arch/ia64/kernel/pci-dma.c | 7 ------- + arch/x86/include/asm/iommu.h | 1 - + arch/x86/kernel/pci-dma.c | 16 ++++++++++++++++ + drivers/pci/quirks.c | 14 -------------- + 5 files changed, 16 insertions(+), 23 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 2 ++ + drivers/net/wireless/ath5k/base.c | 4 +--- + drivers/net/wireless/ath5k/debug.c | 2 +- + drivers/net/wireless/ath5k/initvals.c | 2 ++ + drivers/net/wireless/ath5k/reset.c | 22 +++++++--------------- + drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- + drivers/net/wireless/libertas/cmd.c | 4 ++-- + drivers/net/wireless/libertas/scan.c | 4 ++-- + drivers/net/wireless/rt2x00/Kconfig | 2 +- + 9 files changed, 19 insertions(+), 25 deletions(-) +Merging kbuild-current/master +$ git merge kbuild-current/master +Merge made by recursive. + Makefile | 8 +++++++- + include/linux/init.h | 6 +++++- + scripts/Makefile.modpost | 2 +- + scripts/checksyscalls.sh | 4 ++-- + scripts/headers_check.pl | 10 +++++----- + scripts/headers_install.pl | 17 +++++++++-------- + scripts/mod/sumversion.c | 12 +++++++++++- + scripts/package/mkspec | 5 ++++- + scripts/setlocalversion | 6 ++++-- + 9 files changed, 48 insertions(+), 22 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + Documentation/ja_JP/HOWTO | 14 +++++++------- + Documentation/stable_kernel_rules.txt | 1 + + Documentation/sysctl/kernel.txt | 24 +++++++++++++++++------- + drivers/base/sys.c | 10 ++++++---- + lib/dynamic_printk.c | 4 +++- + 5 files changed, 34 insertions(+), 19 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/class/usbtmc.c | 2 +- + drivers/usb/core/hcd.c | 35 ++++++++++++++++++++++++++++++++--- + drivers/usb/core/hcd.h | 1 + + drivers/usb/core/hub.c | 4 ++++ + drivers/usb/core/urb.c | 22 ++++++++++++++++++++++ + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 6 files changed, 67 insertions(+), 4 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 dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merged arch/arm/Kconfig +Auto-merged arch/arm/boot/compressed/Makefile +Removed arch/arm/boot/compressed/head-clps7500.S +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 +Merge made by recursive. + arch/arm/Kconfig | 36 ++- + arch/arm/Makefile | 1 - + arch/arm/boot/compressed/Makefile | 4 - + arch/arm/boot/compressed/head-clps7500.S | 86 ----- + arch/arm/boot/compressed/misc.c | 2 + + arch/arm/include/asm/hardware/iomd.h | 41 --- + arch/arm/include/asm/page.h | 2 +- + arch/arm/include/asm/processor.h | 2 +- + arch/arm/include/asm/string.h | 9 - + arch/arm/include/asm/uaccess.h | 2 +- + arch/arm/lib/Makefile | 1 - + arch/arm/lib/memset.S | 2 +- + arch/arm/mach-at91/Kconfig | 7 + + 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-omap1/Kconfig | 3 + + arch/arm/mach-pxa/Kconfig | 3 + + arch/arm/mach-realview/Kconfig | 2 + + arch/arm/mach-s3c2410/Kconfig | 1 + + arch/arm/mach-s3c2412/Kconfig | 1 + + arch/arm/mach-s3c2440/Kconfig | 1 + + arch/arm/mach-s3c2442/Kconfig | 1 + + arch/arm/mach-versatile/Kconfig | 2 + + arch/arm/mm/Kconfig | 65 +--- + arch/arm/mm/mmu.c | 2 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm/plat-mxc/Kconfig | 2 + + arch/arm/plat-omap/Kconfig | 2 + + drivers/ide/Kconfig | 2 +- + drivers/ide/ide_arm.c | 11 +- + drivers/input/serio/Kconfig | 2 +- + drivers/mfd/asic3.c | 6 +- + drivers/mtd/maps/ixp2000.c | 2 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/nand/s3c2410.c | 4 +- + drivers/net/cs89x0.c | 6 +- + drivers/video/Kconfig | 2 +- + drivers/video/sa1100fb.c | 2 +- + 52 files changed, 86 insertions(+), 1272 deletions(-) + delete mode 100644 arch/arm/boot/compressed/head-clps7500.S + 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 +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 +Removed include/asm-cris/arch-v32/arbiter.h +Removed include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h +Removed include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h +Removed include/asm-cris/arch-v32/hwregs/gio_defs.h +Removed include/asm-cris/arch-v32/hwregs/intr_vect.h +Removed include/asm-cris/arch-v32/hwregs/pinmux_defs.h +Removed include/asm-cris/arch-v32/hwregs/strmux_defs.h +Removed include/asm-cris/arch-v32/pinmux.h +Removed include/asm-cris/spinlock.h +Merge made by recursive. + arch/cris/Makefile | 26 +- + arch/cris/arch-v10/boot/.gitignore | 2 + + arch/cris/arch-v10/boot/compressed/head.S | 2 +- + arch/cris/arch-v10/boot/compressed/misc.c | 2 +- + arch/cris/arch-v10/boot/rescue/head.S | 2 +- + arch/cris/arch-v10/boot/rescue/kimagerescue.S | 2 +- + arch/cris/arch-v10/boot/rescue/testrescue.S | 2 +- + arch/cris/arch-v10/drivers/axisflashmap.c | 2 +- + arch/cris/arch-v10/drivers/ds1302.c | 4 +- + arch/cris/arch-v10/drivers/gpio.c | 4 +- + arch/cris/arch-v10/drivers/i2c.c | 4 +- + arch/cris/arch-v10/drivers/sync_serial.c | 4 +- + arch/cris/arch-v10/kernel/crisksyms.c | 2 +- + arch/cris/arch-v10/kernel/debugport.c | 2 +- + arch/cris/arch-v10/kernel/dma.c | 2 +- + arch/cris/arch-v10/kernel/entry.S | 2 +- + arch/cris/arch-v10/kernel/fasttimer.c | 2 +- + arch/cris/arch-v10/kernel/head.S | 2 +- + arch/cris/arch-v10/kernel/io_interface_mux.c | 4 +- + arch/cris/arch-v10/kernel/kgdb.c | 2 +- + arch/cris/arch-v10/kernel/process.c | 2 +- + arch/cris/arch-v10/kernel/time.c | 2 +- + arch/cris/arch-v10/kernel/traps.c | 2 +- + arch/cris/arch-v10/mm/fault.c | 2 +- + arch/cris/arch-v10/mm/init.c | 2 +- + arch/cris/arch-v10/mm/tlb.c | 2 +- + arch/cris/arch-v32/boot/compressed/head.S | 4 +- + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 2 +- + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +- + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +- + arch/cris/arch-v32/drivers/pci/bios.c | 2 +- + arch/cris/arch-v32/kernel/cache.c | 4 +- + arch/cris/arch-v32/kernel/crisksyms.c | 8 +- + arch/cris/arch-v32/kernel/debugport.c | 2 +- + arch/cris/arch-v32/kernel/entry.S | 4 +- + arch/cris/arch-v32/kernel/head.S | 4 +- + arch/cris/arch-v32/kernel/kgdb.c | 8 +- + arch/cris/arch-v32/kernel/kgdb_asm.S | 2 +- + arch/cris/arch-v32/kernel/pinmux.c | 8 +- + arch/cris/arch-v32/kernel/ptrace.c | 2 +- + arch/cris/arch-v32/kernel/signal.c | 4 +- + arch/cris/arch-v32/lib/nand_init.S | 10 +- + arch/cris/arch-v32/mach-a3/dma.c | 2 +- + arch/cris/arch-v32/mach-a3/io.c | 2 +- + arch/cris/arch-v32/mach-fs/cpufreq.c | 6 +- + arch/cris/arch-v32/mach-fs/dma.c | 2 +- + arch/cris/arch-v32/mach-fs/io.c | 4 +- + arch/cris/arch-v32/mach-fs/vcs_hook.c | 4 +- + arch/cris/arch-v32/mm/init.c | 4 +- + arch/cris/arch-v32/mm/tlb.c | 4 +- + .../cris/include/arch-v10/arch}/Kbuild | 0 + .../cris/include/arch-v10/arch}/atomic.h | 0 + .../cris/include/arch-v10/arch}/bitops.h | 0 + .../cris/include/arch-v10/arch}/bug.h | 0 + .../cris/include/arch-v10/arch}/byteorder.h | 0 + .../cris/include/arch-v10/arch}/cache.h | 0 + .../cris/include/arch-v10/arch}/checksum.h | 0 + .../cris/include/arch-v10/arch}/delay.h | 0 + .../cris/include/arch-v10/arch}/dma.h | 0 + .../cris/include/arch-v10/arch}/elf.h | 0 + .../cris/include/arch-v10/arch}/io.h | 2 +- + .../cris/include/arch-v10/arch}/io_interface_mux.h | 0 + .../cris/include/arch-v10/arch}/irq.h | 2 +- + .../cris/include/arch-v10/arch}/memmap.h | 0 + .../cris/include/arch-v10/arch}/mmu.h | 0 + .../cris/include/arch-v10/arch}/offset.h | 0 + .../cris/include/arch-v10/arch}/page.h | 0 + .../cris/include/arch-v10/arch}/pgtable.h | 0 + .../cris/include/arch-v10/arch}/processor.h | 0 + .../cris/include/arch-v10/arch}/ptrace.h | 0 + .../cris/include/arch-v10/arch}/sv_addr.agh | 0 + .../cris/include/arch-v10/arch}/sv_addr_ag.h | 0 + .../cris/include/arch-v10/arch}/svinto.h | 0 + .../cris/include/arch-v10/arch}/system.h | 0 + .../cris/include/arch-v10/arch}/thread_info.h | 0 + .../cris/include/arch-v10/arch}/timex.h | 0 + .../cris/include/arch-v10/arch}/tlb.h | 0 + .../cris/include/arch-v10/arch}/uaccess.h | 0 + .../cris/include/arch-v10/arch}/unistd.h | 0 + .../cris/include/arch-v10/arch}/user.h | 0 + .../cris/include/arch-v32/arch}/Kbuild | 0 + .../cris/include/arch-v32/arch}/atomic.h | 0 + .../cris/include/arch-v32/arch}/bitops.h | 0 + .../cris/include/arch-v32/arch}/bug.h | 0 + .../cris/include/arch-v32/arch}/byteorder.h | 0 + .../cris/include/arch-v32/arch}/cache.h | 2 +- + .../cris/include/arch-v32/arch}/checksum.h | 0 + .../cris/include/arch-v32/arch}/cryptocop.h | 2 +- + .../cris/include/arch-v32/arch}/delay.h | 0 + .../cris/include/arch-v32/arch}/dma.h | 0 + .../cris/include/arch-v32/arch}/elf.h | 0 + .../cris/include/arch-v32/arch}/hwregs/Makefile | 0 + .../arch-v32/arch}/hwregs/asm/ata_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/bif_core_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/bif_dma_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/bif_slave_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/config_defs_asm.h | 0 + .../include/arch-v32/arch}/hwregs/asm/cpu_vect.h | 0 + .../arch-v32/arch}/hwregs/asm/cris_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/cris_supp_reg.h | 0 + .../arch-v32/arch}/hwregs/asm/dma_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/eth_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/gio_defs_asm.h | 0 + .../include/arch-v32/arch}/hwregs/asm/intr_vect.h | 0 + .../arch-v32/arch}/hwregs/asm/intr_vect_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/irq_nmi_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/marb_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/mmu_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/mmu_supp_reg.h | 0 + .../arch-v32/arch}/hwregs/asm/rt_trace_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/ser_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/sser_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/strcop_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/strmux_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/asm/timer_defs_asm.h | 0 + .../cris/include/arch-v32/arch}/hwregs/ata_defs.h | 0 + .../include/arch-v32/arch}/hwregs/bif_core_defs.h | 0 + .../include/arch-v32/arch}/hwregs/bif_dma_defs.h | 0 + .../include/arch-v32/arch}/hwregs/bif_slave_defs.h | 0 + .../include/arch-v32/arch}/hwregs/config_defs.h | 0 + .../cris/include/arch-v32/arch}/hwregs/cpu_vect.h | 0 + .../cris/include/arch-v32/arch}/hwregs/dma.h | 0 + .../cris/include/arch-v32/arch}/hwregs/dma_defs.h | 0 + .../cris/include/arch-v32/arch}/hwregs/eth_defs.h | 0 + .../include/arch-v32/arch}/hwregs/extmem_defs.h | 0 + .../include/arch-v32/arch}/hwregs/iop/Makefile | 0 + .../arch}/hwregs/iop/asm/iop_crc_par_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_dmc_in_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_dmc_out_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_fifo_in_defs_asm.h | 0 + .../hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_fifo_out_defs_asm.h | 0 + .../hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_mpu_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_reg_space_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_sap_in_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_sap_out_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_scrc_in_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_scrc_out_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_spu_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_sw_cfg_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_sw_cpu_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_sw_mpu_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_sw_spu_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_timer_grp_defs_asm.h | 0 + .../hwregs/iop/asm/iop_trigger_grp_defs_asm.h | 0 + .../arch}/hwregs/iop/asm/iop_version_defs_asm.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_crc_par_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_dmc_in_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_dmc_out_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_fifo_in_defs.h | 0 + .../arch}/hwregs/iop/iop_fifo_in_extra_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_fifo_out_defs.h | 0 + .../arch}/hwregs/iop/iop_fifo_out_extra_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_mpu_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_mpu_macros.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_reg_space.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_sap_in_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_sap_out_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_scrc_in_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_scrc_out_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_spu_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_sw_cfg_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_sw_cpu_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_sw_mpu_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_sw_spu_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_timer_grp_defs.h | 0 + .../arch}/hwregs/iop/iop_trigger_grp_defs.h | 0 + .../arch-v32/arch}/hwregs/iop/iop_version_defs.h | 0 + .../include/arch-v32/arch}/hwregs/irq_nmi_defs.h | 0 + .../include/arch-v32/arch}/hwregs/marb_bp_defs.h | 0 + .../cris/include/arch-v32/arch}/hwregs/marb_defs.h | 0 + .../cris/include/arch-v32/arch}/hwregs/reg_rdwr.h | 0 + .../include/arch-v32/arch}/hwregs/rt_trace_defs.h | 0 + .../cris/include/arch-v32/arch}/hwregs/ser_defs.h | 0 + .../cris/include/arch-v32/arch}/hwregs/sser_defs.h | 0 + .../cris/include/arch-v32/arch}/hwregs/strcop.h | 0 + .../include/arch-v32/arch}/hwregs/strcop_defs.h | 0 + .../cris/include/arch-v32/arch}/hwregs/supp_reg.h | 0 + .../cris/include/arch-v32/arch}/intmem.h | 0 + .../cris/include/arch-v32/arch}/io.h | 4 +- + .../cris/include/arch-v32/arch}/irq.h | 0 + .../cris/include/arch-v32/arch}/memmap.h | 0 + .../cris/include/arch-v32/arch}/mmu.h | 0 + .../cris/include/arch-v32/arch}/offset.h | 0 + .../cris/include/arch-v32/arch}/page.h | 0 + .../cris/include/arch-v32/arch}/pgtable.h | 0 + .../cris/include/arch-v32/arch}/processor.h | 0 + .../cris/include/arch-v32/arch}/ptrace.h | 0 + .../cris/include/arch-v32/arch}/spinlock.h | 0 + .../cris/include/arch-v32/arch}/system.h | 0 + .../cris/include/arch-v32/arch}/thread_info.h | 0 + .../cris/include/arch-v32/arch}/timex.h | 0 + .../cris/include/arch-v32/arch}/tlb.h | 0 + .../cris/include/arch-v32/arch}/uaccess.h | 0 + .../cris/include/arch-v32/arch}/unistd.h | 0 + .../cris/include/arch-v32/arch}/user.h | 0 + .../cris/include/arch-v32/mach-a3/mach}/arbiter.h | 0 + .../cris/include/arch-v32/mach-a3/mach}/dma.h | 0 + .../mach-a3/mach}/hwregs/asm/clkgen_defs_asm.h | 0 + .../mach-a3/mach}/hwregs/asm/ddr2_defs_asm.h | 0 + .../mach-a3/mach}/hwregs/asm/gio_defs_asm.h | 0 + .../mach-a3/mach}/hwregs/asm/pinmux_defs_asm.h | 0 + .../mach-a3/mach}/hwregs/asm/pio_defs_asm.h | 0 + .../mach-a3/mach}/hwregs/asm/reg_map_asm.h | 0 + .../mach-a3/mach}/hwregs/asm/timer_defs_asm.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/clkgen_defs.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/ddr2_defs.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/gio_defs.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/intr_vect.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/intr_vect_defs.h | 0 + .../mach}/hwregs/iop/asm/iop_reg_space_asm.h | 0 + .../mach}/hwregs/iop/asm/iop_sap_in_defs_asm.h | 0 + .../mach}/hwregs/iop/asm/iop_sap_out_defs_asm.h | 0 + .../mach}/hwregs/iop/asm/iop_sw_cfg_defs_asm.h | 0 + .../mach}/hwregs/iop/asm/iop_sw_cpu_defs_asm.h | 0 + .../mach}/hwregs/iop/asm/iop_sw_mpu_defs_asm.h | 0 + .../mach}/hwregs/iop/asm/iop_sw_spu_defs_asm.h | 0 + .../mach}/hwregs/iop/asm/iop_version_defs_asm.h | 0 + .../mach-a3/mach}/hwregs/iop/iop_reg_space.h | 0 + .../mach-a3/mach}/hwregs/iop/iop_sap_in_defs.h | 0 + .../mach-a3/mach}/hwregs/iop/iop_sap_out_defs.h | 0 + .../mach-a3/mach}/hwregs/iop/iop_sw_cfg_defs.h | 0 + .../mach-a3/mach}/hwregs/iop/iop_sw_cpu_defs.h | 0 + .../mach-a3/mach}/hwregs/iop/iop_sw_mpu_defs.h | 0 + .../mach-a3/mach}/hwregs/iop/iop_sw_spu_defs.h | 0 + .../mach-a3/mach}/hwregs/iop/iop_version_defs.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/l2cache_defs.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/marb_bar_defs.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/marb_foo_defs.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/pinmux_defs.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/pio_defs.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/reg_map.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/strmux_defs.h | 0 + .../arch-v32/mach-a3/mach}/hwregs/timer_defs.h | 0 + .../cris/include/arch-v32/mach-a3/mach}/memmap.h | 0 + .../cris/include/arch-v32/mach-a3/mach}/pinmux.h | 0 + .../include/arch-v32/mach-a3/mach}/startup.inc | 0 + .../cris/include/arch-v32/mach-fs/mach}/arbiter.h | 0 + .../mach-fs/mach}/hwregs/asm/bif_core_defs_asm.h | 0 + .../mach-fs/mach}/hwregs/asm/config_defs_asm.h | 0 + .../mach-fs/mach}/hwregs/asm/gio_defs_asm.h | 0 + .../mach-fs/mach}/hwregs/asm/pinmux_defs_asm.h | 0 + .../mach-fs/mach}/hwregs/asm/reg_map_asm.h | 0 + .../mach-fs/mach}/hwregs/asm/timer_defs_asm.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/bif_core_defs.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/bif_dma_defs.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/bif_slave_defs.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/config_defs.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/gio_defs.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/intr_vect.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/intr_vect_defs.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/marb_bp_defs.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/marb_defs.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/pinmux_defs.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/reg_map.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/strmux_defs.h | 0 + .../arch-v32/mach-fs/mach}/hwregs/timer_defs.h | 0 + .../cris/include/arch-v32/mach-fs/mach}/pinmux.h | 0 + .../include/arch-v32/mach-fs/mach}/startup.inc | 0 + {include/asm-cris => arch/cris/include/asm}/Kbuild | 0 + .../asm-cris => arch/cris/include/asm}/atomic.h | 2 +- + .../asm-cris => arch/cris/include/asm}/auxvec.h | 0 + .../cris/include/asm}/axisflashmap.h | 0 + .../asm-cris => arch/cris/include/asm}/bitops.h | 2 +- + {include/asm-cris => arch/cris/include/asm}/bug.h | 2 +- + {include/asm-cris => arch/cris/include/asm}/bugs.h | 0 + .../asm-cris => arch/cris/include/asm}/byteorder.h | 2 +- + .../asm-cris => arch/cris/include/asm}/cache.h | 2 +- + .../cris/include/asm}/cacheflush.h | 0 + .../asm-cris => arch/cris/include/asm}/checksum.h | 2 +- + .../asm-cris => arch/cris/include/asm}/cputime.h | 0 + .../asm-cris => arch/cris/include/asm}/current.h | 0 + .../asm-cris => arch/cris/include/asm}/delay.h | 2 +- + .../asm-cris => arch/cris/include/asm}/device.h | 0 + .../asm-cris => arch/cris/include/asm}/div64.h | 0 + .../cris/include/asm}/dma-mapping.h | 0 + {include/asm-cris => arch/cris/include/asm}/dma.h | 2 +- + {include/asm-cris => arch/cris/include/asm}/elf.h | 2 +- + .../cris/include/asm}/emergency-restart.h | 0 + .../asm-cris => arch/cris/include/asm}/errno.h | 0 + .../asm-cris => arch/cris/include/asm}/eshlibld.h | 0 + .../asm-cris => arch/cris/include/asm}/ethernet.h | 0 + .../asm-cris => arch/cris/include/asm}/etraxgpio.h | 0 + .../asm-cris => arch/cris/include/asm}/etraxi2c.h | 0 + .../asm-cris => arch/cris/include/asm}/fasttimer.h | 0 + {include/asm-cris => arch/cris/include/asm}/fb.h | 0 + .../asm-cris => arch/cris/include/asm}/fcntl.h | 0 + .../asm-cris => arch/cris/include/asm}/futex.h | 0 + .../asm-cris => arch/cris/include/asm}/hardirq.h | 0 + .../asm-cris => arch/cris/include/asm}/hw_irq.h | 0 + {include/asm-cris => arch/cris/include/asm}/io.h | 2 +- + .../asm-cris => arch/cris/include/asm}/ioctl.h | 0 + .../asm-cris => arch/cris/include/asm}/ioctls.h | 0 + .../asm-cris => arch/cris/include/asm}/ipcbuf.h | 0 + {include/asm-cris => arch/cris/include/asm}/irq.h | 2 +- + .../asm-cris => arch/cris/include/asm}/irq_regs.h | 0 + .../asm-cris => arch/cris/include/asm}/kdebug.h | 0 + .../cris/include/asm}/kmap_types.h | 0 + .../asm-cris => arch/cris/include/asm}/linkage.h | 0 + .../asm-cris => arch/cris/include/asm}/local.h | 0 + {include/asm-cris => arch/cris/include/asm}/mman.h | 0 + {include/asm-cris => arch/cris/include/asm}/mmu.h | 2 +- + .../cris/include/asm}/mmu_context.h | 0 + .../asm-cris => arch/cris/include/asm}/module.h | 0 + .../asm-cris => arch/cris/include/asm}/msgbuf.h | 0 + .../asm-cris => arch/cris/include/asm}/mutex.h | 0 + {include/asm-cris => arch/cris/include/asm}/page.h | 2 +- + .../asm-cris => arch/cris/include/asm}/param.h | 0 + {include/asm-cris => arch/cris/include/asm}/pci.h | 0 + .../asm-cris => arch/cris/include/asm}/percpu.h | 0 + .../asm-cris => arch/cris/include/asm}/pgalloc.h | 0 + .../asm-cris => arch/cris/include/asm}/pgtable.h | 2 +- + {include/asm-cris => arch/cris/include/asm}/poll.h | 0 + .../cris/include/asm}/posix_types.h | 0 + .../asm-cris => arch/cris/include/asm}/processor.h | 2 +- + .../asm-cris => arch/cris/include/asm}/ptrace.h | 2 +- + .../asm-cris => arch/cris/include/asm}/resource.h | 0 + .../asm-cris => arch/cris/include/asm}/rs485.h | 0 + {include/asm-cris => arch/cris/include/asm}/rtc.h | 0 + .../cris/include/asm}/scatterlist.h | 0 + .../asm-cris => arch/cris/include/asm}/sections.h | 0 + .../asm-cris => arch/cris/include/asm}/segment.h | 0 + .../asm-cris => arch/cris/include/asm}/sembuf.h | 0 + .../asm-cris => arch/cris/include/asm}/setup.h | 0 + .../asm-cris => arch/cris/include/asm}/shmbuf.h | 0 + .../asm-cris => arch/cris/include/asm}/shmparam.h | 0 + .../cris/include/asm}/sigcontext.h | 0 + .../asm-cris => arch/cris/include/asm}/siginfo.h | 0 + .../asm-cris => arch/cris/include/asm}/signal.h | 0 + {include/asm-cris => arch/cris/include/asm}/smp.h | 0 + .../asm-cris => arch/cris/include/asm}/socket.h | 0 + .../asm-cris => arch/cris/include/asm}/sockios.h | 0 + arch/cris/include/asm/spinlock.h | 1 + + {include/asm-cris => arch/cris/include/asm}/stat.h | 0 + .../asm-cris => arch/cris/include/asm}/statfs.h | 0 + .../asm-cris => arch/cris/include/asm}/string.h | 0 + .../cris/include/asm}/sync_serial.h | 0 + .../asm-cris => arch/cris/include/asm}/system.h | 2 +- + .../asm-cris => arch/cris/include/asm}/termbits.h | 0 + .../asm-cris => arch/cris/include/asm}/termios.h | 0 + .../cris/include/asm}/thread_info.h | 2 +- + .../asm-cris => arch/cris/include/asm}/timex.h | 2 +- + {include/asm-cris => arch/cris/include/asm}/tlb.h | 2 +- + .../asm-cris => arch/cris/include/asm}/tlbflush.h | 0 + .../asm-cris => arch/cris/include/asm}/topology.h | 0 + .../asm-cris => arch/cris/include/asm}/types.h | 0 + .../asm-cris => arch/cris/include/asm}/uaccess.h | 2 +- + .../asm-cris => arch/cris/include/asm}/ucontext.h | 0 + .../asm-cris => arch/cris/include/asm}/unaligned.h | 0 + .../asm-cris => arch/cris/include/asm}/unistd.h | 2 +- + {include/asm-cris => arch/cris/include/asm}/user.h | 2 +- + arch/cris/mm/ioremap.c | 2 +- + drivers/net/cris/eth_v10.c | 4 +- + drivers/serial/crisv10.c | 4 +- + drivers/serial/crisv10.h | 2 +- + include/asm-cris/arch-v32/arbiter.h | 30 - + .../asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h | 632 -------------------- + include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h | 96 --- + include/asm-cris/arch-v32/hwregs/gio_defs.h | 295 --------- + include/asm-cris/arch-v32/hwregs/intr_vect.h | 39 -- + include/asm-cris/arch-v32/hwregs/pinmux_defs.h | 357 ----------- + include/asm-cris/arch-v32/hwregs/strmux_defs.h | 127 ---- + include/asm-cris/arch-v32/pinmux.h | 40 -- + include/asm-cris/spinlock.h | 1 - + 365 files changed, 124 insertions(+), 1746 deletions(-) + create mode 100644 arch/cris/arch-v10/boot/.gitignore + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/Kbuild (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/atomic.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/bitops.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/bug.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/byteorder.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/cache.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/checksum.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/delay.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/dma.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/elf.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/io.h (99%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/io_interface_mux.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/irq.h (99%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/memmap.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/mmu.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/offset.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/page.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/pgtable.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/processor.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/ptrace.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/sv_addr.agh (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/sv_addr_ag.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/svinto.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/system.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/thread_info.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/timex.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/tlb.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/uaccess.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/unistd.h (100%) + rename {include/asm-cris/arch-v10 => arch/cris/include/arch-v10/arch}/user.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/Kbuild (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/atomic.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/bitops.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/bug.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/byteorder.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/cache.h (93%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/checksum.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/cryptocop.h (99%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/delay.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/dma.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/elf.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/Makefile (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/ata_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/bif_core_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/bif_dma_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/bif_slave_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/config_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/cpu_vect.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/cris_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/cris_supp_reg.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/dma_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/eth_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/gio_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/intr_vect.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/intr_vect_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/irq_nmi_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/marb_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/mmu_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/mmu_supp_reg.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/rt_trace_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/ser_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/sser_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/strcop_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/strmux_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/asm/timer_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/ata_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/bif_core_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/bif_dma_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/bif_slave_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/config_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/cpu_vect.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/dma.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/dma_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/eth_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/extmem_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/Makefile (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_crc_par_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_dmc_in_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_dmc_out_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_fifo_in_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_fifo_out_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_mpu_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_reg_space_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_sap_in_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_sap_out_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_scrc_in_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_scrc_out_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_spu_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_sw_cfg_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_sw_cpu_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_sw_mpu_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_sw_spu_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_timer_grp_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_trigger_grp_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/asm/iop_version_defs_asm.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_crc_par_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_dmc_in_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_dmc_out_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_fifo_in_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_fifo_in_extra_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_fifo_out_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_fifo_out_extra_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_mpu_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_mpu_macros.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_reg_space.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_sap_in_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_sap_out_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_scrc_in_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_scrc_out_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_spu_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_sw_cfg_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_sw_cpu_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_sw_mpu_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_sw_spu_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_timer_grp_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_trigger_grp_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/iop/iop_version_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/irq_nmi_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/marb_bp_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/marb_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/reg_rdwr.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/rt_trace_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/ser_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/sser_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/strcop.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/strcop_defs.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/hwregs/supp_reg.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/intmem.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/io.h (98%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/irq.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/memmap.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/mmu.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/offset.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/page.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/pgtable.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/processor.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/ptrace.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/spinlock.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/system.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/thread_info.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/timex.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/tlb.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/uaccess.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/unistd.h (100%) + rename {include/asm-cris/arch-v32 => arch/cris/include/arch-v32/arch}/user.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/arbiter.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/dma.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/asm/clkgen_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/asm/ddr2_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/asm/gio_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/asm/pinmux_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/asm/pio_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/asm/reg_map_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/asm/timer_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/clkgen_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/ddr2_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/gio_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/intr_vect.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/intr_vect_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/asm/iop_reg_space_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/asm/iop_sap_in_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/asm/iop_sap_out_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/asm/iop_sw_cfg_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/asm/iop_sw_cpu_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/asm/iop_sw_mpu_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/asm/iop_sw_spu_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/asm/iop_version_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/iop_reg_space.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/iop_sap_in_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/iop_sap_out_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/iop_sw_cfg_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/iop_sw_cpu_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/iop_sw_mpu_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/iop_sw_spu_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/iop/iop_version_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/l2cache_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/marb_bar_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/marb_foo_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/pinmux_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/pio_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/reg_map.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/strmux_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/hwregs/timer_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/memmap.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/pinmux.h (100%) + rename {include/asm-cris/arch-v32/mach-a3 => arch/cris/include/arch-v32/mach-a3/mach}/startup.inc (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/arbiter.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/asm/bif_core_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/asm/config_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/asm/gio_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/asm/pinmux_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/asm/reg_map_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/asm/timer_defs_asm.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/bif_core_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/bif_dma_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/bif_slave_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/config_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/gio_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/intr_vect.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/intr_vect_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/marb_bp_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/marb_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/pinmux_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/reg_map.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/strmux_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/hwregs/timer_defs.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/pinmux.h (100%) + rename {include/asm-cris/arch-v32/mach-fs => arch/cris/include/arch-v32/mach-fs/mach}/startup.inc (100%) + rename {include/asm-cris => arch/cris/include/asm}/Kbuild (100%) + rename {include/asm-cris => arch/cris/include/asm}/atomic.h (99%) + rename {include/asm-cris => arch/cris/include/asm}/auxvec.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/axisflashmap.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/bitops.h (99%) + rename {include/asm-cris => arch/cris/include/asm}/bug.h (64%) + rename {include/asm-cris => arch/cris/include/asm}/bugs.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/byteorder.h (94%) + rename {include/asm-cris => arch/cris/include/asm}/cache.h (71%) + rename {include/asm-cris => arch/cris/include/asm}/cacheflush.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/checksum.h (98%) + rename {include/asm-cris => arch/cris/include/asm}/cputime.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/current.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/delay.h (94%) + rename {include/asm-cris => arch/cris/include/asm}/device.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/div64.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/dma-mapping.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/dma.h (93%) + rename {include/asm-cris => arch/cris/include/asm}/elf.h (99%) + rename {include/asm-cris => arch/cris/include/asm}/emergency-restart.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/errno.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/eshlibld.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/ethernet.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/etraxgpio.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/etraxi2c.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/fasttimer.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/fb.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/fcntl.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/futex.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/hardirq.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/hw_irq.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/io.h (99%) + rename {include/asm-cris => arch/cris/include/asm}/ioctl.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/ioctls.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/ipcbuf.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/irq.h (83%) + rename {include/asm-cris => arch/cris/include/asm}/irq_regs.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/kdebug.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/kmap_types.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/linkage.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/local.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/mman.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/mmu.h (78%) + rename {include/asm-cris => arch/cris/include/asm}/mmu_context.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/module.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/msgbuf.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/mutex.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/page.h (98%) + rename {include/asm-cris => arch/cris/include/asm}/param.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/pci.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/percpu.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/pgalloc.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/pgtable.h (99%) + rename {include/asm-cris => arch/cris/include/asm}/poll.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/posix_types.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/processor.h (98%) + rename {include/asm-cris => arch/cris/include/asm}/ptrace.h (91%) + rename {include/asm-cris => arch/cris/include/asm}/resource.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/rs485.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/rtc.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/scatterlist.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/sections.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/segment.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/sembuf.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/setup.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/shmbuf.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/shmparam.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/sigcontext.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/siginfo.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/signal.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/smp.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/socket.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/sockios.h (100%) + create mode 100644 arch/cris/include/asm/spinlock.h + rename {include/asm-cris => arch/cris/include/asm}/stat.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/statfs.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/string.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/sync_serial.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/system.h (98%) + rename {include/asm-cris => arch/cris/include/asm}/termbits.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/termios.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/thread_info.h (98%) + rename {include/asm-cris => arch/cris/include/asm}/timex.h (92%) + rename {include/asm-cris => arch/cris/include/asm}/tlb.h (93%) + rename {include/asm-cris => arch/cris/include/asm}/tlbflush.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/topology.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/types.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/uaccess.h (99%) + rename {include/asm-cris => arch/cris/include/asm}/ucontext.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/unaligned.h (100%) + rename {include/asm-cris => arch/cris/include/asm}/unistd.h (99%) + rename {include/asm-cris => arch/cris/include/asm}/user.h (98%) + delete mode 100644 include/asm-cris/arch-v32/arbiter.h + delete mode 100644 include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h + delete mode 100644 include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h + delete mode 100644 include/asm-cris/arch-v32/hwregs/gio_defs.h + delete mode 100644 include/asm-cris/arch-v32/hwregs/intr_vect.h + delete mode 100644 include/asm-cris/arch-v32/hwregs/pinmux_defs.h + delete mode 100644 include/asm-cris/arch-v32/hwregs/strmux_defs.h + delete mode 100644 include/asm-cris/arch-v32/pinmux.h + delete mode 100644 include/asm-cris/spinlock.h +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +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 | 107 ++++++++++++++++++-------------------- + include/asm-m68k/machw.h | 22 -------- + 18 files changed, 203 insertions(+), 266 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 +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merged arch/arm/mach-pxa/Kconfig +Merge made by recursive. + arch/arm/configs/h5000_defconfig | 996 ++++++++++++++++++++++++++++++ + arch/arm/mach-pxa/Kconfig | 4 + + arch/arm/mach-pxa/Makefile | 1 + + arch/arm/mach-pxa/corgi_pm.c | 4 +- + arch/arm/mach-pxa/h5000.c | 200 ++++++ + arch/arm/mach-pxa/include/mach/h5000.h | 113 ++++ + arch/arm/mach-pxa/include/mach/sharpsl.h | 1 + + arch/arm/mach-pxa/spitz.c | 12 + + arch/arm/mach-pxa/spitz_pm.c | 4 +- + drivers/video/backlight/corgi_lcd.c | 4 +- + 10 files changed, 1335 insertions(+), 4 deletions(-) + create mode 100644 arch/arm/configs/h5000_defconfig + create mode 100644 arch/arm/mach-pxa/h5000.c + create mode 100644 arch/arm/mach-pxa/include/mach/h5000.h +Merging s390/features +$ git merge s390/features +Auto-merged drivers/s390/net/qeth_core_main.c +Auto-merged drivers/s390/net/qeth_l2_main.c +CONFLICT (content): Merge conflict in drivers/s390/net/qeth_l2_main.c +Auto-merged drivers/s390/net/qeth_l3_main.c +CONFLICT (content): Merge conflict in drivers/s390/net/qeth_l3_main.c +Resolved 'drivers/s390/net/qeth_l2_main.c' using previous resolution. +Resolved 'drivers/s390/net/qeth_l3_main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ab9c442: Merge commit 's390/features' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/include/asm/elf.h | 2 +- + arch/powerpc/kernel/vdso.c | 3 +- + arch/s390/Kconfig | 4 + + arch/s390/appldata/appldata.h | 4 - + arch/s390/appldata/appldata_base.c | 11 +- + arch/s390/appldata/appldata_os.c | 20 +-- + arch/s390/crypto/aes_s390.c | 13 +- + arch/s390/hypfs/hypfs_diag.c | 9 +- + arch/s390/hypfs/inode.c | 13 +- + arch/s390/include/asm/auxvec.h | 2 + + arch/s390/include/asm/elf.h | 16 ++ + arch/s390/include/asm/mmu.h | 1 + + arch/s390/include/asm/page.h | 2 + + arch/s390/include/asm/sigp.h | 1 + + arch/s390/include/asm/smp.h | 5 +- + arch/s390/include/asm/vdso.h | 39 +++++ + arch/s390/kernel/Makefile | 11 +- + arch/s390/kernel/asm-offsets.c | 15 ++ + arch/s390/kernel/cpcmd.c | 6 +- + arch/s390/kernel/debug.c | 36 ++-- + arch/s390/kernel/processor.c | 97 +++++++++++ + arch/s390/kernel/setup.c | 159 ++++++------------- + arch/s390/kernel/smp.c | 191 +++------------------- + arch/s390/kernel/time.c | 256 ++++++++++++++++++++---------- + arch/s390/kernel/topology.c | 4 +- + 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 | 105 +++++-------- + 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/s390/block/dcssblk.c | 71 ++++----- + drivers/s390/block/xpram.c | 40 ++--- + drivers/s390/char/monreader.c | 40 ++--- + drivers/s390/char/monwriter.c | 4 +- + drivers/s390/char/sclp_cmd.c | 28 ++-- + drivers/s390/char/sclp_config.c | 9 +- + drivers/s390/char/sclp_cpi_sys.c | 11 +- + drivers/s390/char/sclp_sdias.c | 17 ++- + drivers/s390/char/vmcp.c | 10 +- + drivers/s390/char/vmlogrdr.c | 25 ++-- + drivers/s390/char/vmur.c | 14 +- + drivers/s390/char/zcore.c | 13 +- + drivers/s390/cio/blacklist.c | 13 +- + drivers/s390/cio/chsc.c | 7 +- + drivers/s390/cio/cio.c | 4 +- + drivers/s390/cio/cmf.c | 7 +- + drivers/s390/cio/css.c | 7 +- + drivers/s390/crypto/ap_bus.c | 9 +- + drivers/s390/net/ctcm_fsms.c | 45 +++-- + drivers/s390/net/ctcm_main.c | 71 +++++--- + drivers/s390/net/ctcm_main.h | 6 - + drivers/s390/net/ctcm_mpc.c | 14 +- + drivers/s390/net/ctcm_sysfs.c | 2 + + drivers/s390/net/lcs.c | 91 ++++++----- + drivers/s390/net/netiucv.c | 63 +++++--- + drivers/s390/net/qeth_core.h | 7 - + drivers/s390/net/qeth_core_main.c | 148 ++++++++++-------- + drivers/s390/net/qeth_l2_main.c | 36 +++-- + drivers/s390/net/qeth_l3_main.c | 210 +++++++++++++------------ + drivers/s390/scsi/zfcp_aux.c | 8 +- + drivers/s390/scsi/zfcp_ccw.c | 2 + + drivers/s390/scsi/zfcp_cfdc.c | 2 + + drivers/s390/scsi/zfcp_dbf.c | 2 + + drivers/s390/scsi/zfcp_erp.c | 2 + + drivers/s390/scsi/zfcp_fc.c | 2 + + drivers/s390/scsi/zfcp_fsf.c | 2 + + drivers/s390/scsi/zfcp_qdio.c | 2 + + drivers/s390/scsi/zfcp_scsi.c | 2 + + drivers/s390/scsi/zfcp_sysfs.c | 2 + + fs/binfmt_elf.c | 2 +- + net/iucv/af_iucv.c | 18 ++- + net/iucv/iucv.c | 8 +- + 88 files changed, 2231 insertions(+), 982 deletions(-) + create mode 100644 arch/s390/include/asm/vdso.h + 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 +Merging sh/master +$ git merge sh/master +Removed arch/sh/cchips/hd6446x/hd64465/Makefile +Removed arch/sh/cchips/hd6446x/hd64465/gpio.c +Removed arch/sh/cchips/hd6446x/hd64465/io.c +Removed arch/sh/cchips/hd6446x/hd64465/setup.c +Removed arch/sh/include/asm/hd64465/gpio.h +Removed arch/sh/include/asm/hd64465/hd64465.h +Removed arch/sh/include/asm/hd64465/io.h +Removed drivers/pcmcia/hd64465_ss.c +Merge made by recursive. + Documentation/sh/new-machine.txt | 4 +- + arch/sh/Makefile | 29 +- + arch/sh/cchips/Kconfig | 33 - + arch/sh/cchips/hd6446x/Makefile | 1 - + arch/sh/cchips/hd6446x/hd64465/Makefile | 6 - + arch/sh/cchips/hd6446x/hd64465/gpio.c | 196 ------ + arch/sh/cchips/hd6446x/hd64465/io.c | 211 ------ + arch/sh/cchips/hd6446x/hd64465/setup.c | 181 ----- + arch/sh/configs/ul2_defconfig | 1169 +++++++++++++++++++++++++++++++ + arch/sh/include/asm/hd64465/gpio.h | 46 -- + arch/sh/include/asm/hd64465/hd64465.h | 256 ------- + arch/sh/include/asm/hd64465/io.h | 44 -- + arch/sh/include/asm/serial.h | 17 - + arch/sh/include/cpu-sh4/cpu/rtc.h | 2 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 34 +- + arch/sh/kernel/sh_ksyms_32.c | 11 +- + arch/sh/oprofile/op_model_sh7750.c | 6 +- + arch/sh/tools/mach-types | 1 - + drivers/cdrom/gdrom.c | 5 +- + drivers/pcmcia/Kconfig | 4 - + drivers/pcmcia/Makefile | 1 - + drivers/pcmcia/hd64465_ss.c | 939 ------------------------- + drivers/serial/sh-sci.c | 17 +- + drivers/serial/sh-sci.h | 82 +-- + 24 files changed, 1249 insertions(+), 2046 deletions(-) + delete mode 100644 arch/sh/cchips/hd6446x/hd64465/Makefile + delete mode 100644 arch/sh/cchips/hd6446x/hd64465/gpio.c + delete mode 100644 arch/sh/cchips/hd6446x/hd64465/io.c + delete mode 100644 arch/sh/cchips/hd6446x/hd64465/setup.c + create mode 100644 arch/sh/configs/ul2_defconfig + delete mode 100644 arch/sh/include/asm/hd64465/gpio.h + delete mode 100644 arch/sh/include/asm/hd64465/hd64465.h + delete mode 100644 arch/sh/include/asm/hd64465/io.h + delete mode 100644 drivers/pcmcia/hd64465_ss.c +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged drivers/pci/quirks.c +Merge made by recursive. + .mailmap | 2 + + Documentation/00-INDEX | 4 +- + Documentation/kernel-parameters.txt | 23 +- + Documentation/lguest/lguest.c | 2 +- + Documentation/x86/x86_64/boot-options.txt | 4 +- + Documentation/x86/x86_64/fake-numa-for-cpusets | 2 +- + arch/x86/Kconfig | 33 ++ + arch/x86/Kconfig.cpu | 24 +- + arch/x86/Kconfig.debug | 20 +- + arch/x86/ia32/ia32_signal.c | 5 - + arch/x86/include/asm/byteorder.h | 74 ++--- + arch/x86/include/asm/es7000/wakecpu.h | 9 +- + arch/x86/include/asm/io_apic.h | 10 + + arch/x86/include/asm/irq.h | 4 - + arch/x86/include/asm/mach-default/mach_wakecpu.h | 9 +- + arch/x86/include/asm/msr.h | 8 +- + arch/x86/include/asm/pci.h | 2 + + arch/x86/include/asm/setup.h | 4 + + arch/x86/include/asm/uv/bios.h | 6 +- + arch/x86/include/asm/uv/uv_hub.h | 87 +++++- + arch/x86/kernel/Makefile | 4 +- + arch/x86/kernel/bios_uv.c | 8 +- + arch/x86/kernel/check.c | 161 ++++++++++ + arch/x86/kernel/cpu/mtrr/main.c | 346 +++++++++++----------- + 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/genx2apic_uv_x.c | 106 +++++++- + arch/x86/kernel/k8.c | 1 - + arch/x86/kernel/machine_kexec_32.c | 5 +- + arch/x86/kernel/microcode_amd.c | 2 +- + arch/x86/kernel/microcode_core.c | 4 +- + arch/x86/kernel/nmi.c | 43 +++- + arch/x86/kernel/pci-gart_64.c | 2 +- + arch/x86/kernel/setup.c | 151 ---------- + arch/x86/kernel/signal_32.c | 22 ++ + arch/x86/kernel/signal_64.c | 25 ++- + arch/x86/mm/fault.c | 11 +- + arch/x86/mm/init_32.c | 2 - + arch/x86/mm/init_64.c | 11 +- + arch/x86/pci/common.c | 17 + + drivers/acpi/pci_irq.c | 56 ++++ + drivers/pci/quirks.c | 170 ++++++++++-- + include/linux/pci.h | 6 + + include/linux/pci_ids.h | 5 + + 46 files changed, 1344 insertions(+), 1088 deletions(-) + create mode 100644 arch/x86/kernel/check.c + create mode 100644 arch/x86/kernel/dumpstack.c + create mode 100644 arch/x86/kernel/dumpstack.h +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. +Merging quilt/driver-core +$ git merge quilt/driver-core +Merge made by recursive. + drivers/uio/uio_cif.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + drivers/net/usb/hso.c | 24 ++++++++++++------------ + drivers/usb/host/ehci-dbg.c | 8 ++------ + drivers/usb/host/ehci-hub.c | 18 +++++++++++++++--- + drivers/usb/host/pci-quirks.c | 12 ++++++------ + drivers/usb/misc/usbtest.c | 2 -- + include/linux/usb.h | 4 ---- + 6 files changed, 35 insertions(+), 33 deletions(-) +$ git revert 4861b57b3f571b6becf6832264cc9403ba582528 +Finished one revert. +Created commit d344f3f: Revert "USB: remove info() macro from usb.h" + 1 files changed, 2 insertions(+), 0 deletions(-) +$ git revert 56142c3f24c0986b0eecd2f205e2f8bae4f75a2d +Finished one revert. +Created commit 1c4a756: Revert "USB: remove warn() macro from usb.h" + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged kernel/sched.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/percpu.h | 11 ++- + include/asm-generic/sections.h | 10 ++ + include/asm-generic/vmlinux.lds.h | 16 ++ + include/linux/debug_locks.h | 2 +- + include/linux/futex.h | 2 + + include/linux/kernel.h | 11 ++ + include/linux/lockdep.h | 31 ++++- + include/linux/percpu.h | 17 ++- + include/linux/uaccess.h | 2 +- + kernel/extable.c | 16 ++ + kernel/futex.c | 290 +++++++++++++------------------------ + kernel/lockdep.c | 37 +++-- + kernel/lockdep_proc.c | 28 +++- + kernel/module.c | 7 +- + kernel/mutex.c | 2 +- + kernel/notifier.c | 8 + + kernel/sched.c | 2 +- + kernel/softlockup.c | 2 +- + lib/Kconfig.debug | 10 ++ + mm/memory.c | 15 ++ + 28 files changed, 433 insertions(+), 262 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/s390/Kconfig +Auto-merged arch/s390/kernel/smp.c +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/genx2apic_uv_x.c +Auto-merged kernel/irq/proc.c +Auto-merged kernel/sched.c +Auto-merged kernel/trace/trace.c +Auto-merged lib/Kconfig.debug +Merge made by recursive. + arch/alpha/kernel/irq.c | 3 +- + arch/alpha/kernel/smp.c | 13 +- + arch/arm/kernel/irq.c | 2 +- + arch/arm/kernel/smp.c | 10 - + arch/cris/arch-v32/kernel/smp.c | 4 - + arch/cris/kernel/setup.c | 2 +- + arch/frv/kernel/setup.c | 2 +- + arch/h8300/kernel/setup.c | 2 +- + arch/ia64/kernel/acpi.c | 2 +- + arch/ia64/kernel/iosapic.c | 5 +- + arch/ia64/kernel/irq.c | 2 +- + arch/ia64/kernel/mca.c | 6 +- + arch/ia64/kernel/perfmon.c | 4 +- + arch/ia64/kernel/salinfo.c | 6 +- + arch/ia64/kernel/setup.c | 4 +- + arch/ia64/kernel/smpboot.c | 6 - + arch/ia64/kernel/topology.c | 2 +- + arch/ia64/sn/kernel/setup.c | 2 +- + arch/ia64/sn/kernel/sn2/sn2_smp.c | 6 +- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 +- + arch/m32r/Kconfig | 1 + + arch/m32r/kernel/setup.c | 2 +- + arch/m32r/kernel/smpboot.c | 8 +- + arch/m68knommu/kernel/setup.c | 2 +- + arch/mips/include/asm/smp.h | 3 - + arch/mips/kernel/irq-gic.c | 2 +- + arch/mips/kernel/proc.c | 2 +- + arch/mips/kernel/smp-cmp.c | 8 +- + arch/mips/kernel/smp-mt.c | 2 +- + arch/mips/kernel/smp.c | 7 +- + arch/mips/kernel/smtc.c | 12 +- + arch/mips/pmc-sierra/yosemite/smp.c | 6 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/mips/sibyte/bcm1480/irq.c | 2 +- + arch/mips/sibyte/bcm1480/smp.c | 10 +- + arch/mips/sibyte/sb1250/smp.c | 10 +- + arch/mn10300/kernel/irq.c | 4 +- + arch/mn10300/kernel/setup.c | 2 +- + arch/parisc/Kconfig | 1 + + arch/parisc/kernel/irq.c | 4 +- + arch/parisc/kernel/processor.c | 4 +- + arch/parisc/kernel/smp.c | 15 - + arch/powerpc/include/asm/cputhreads.h | 2 +- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/machine_kexec_64.c | 2 +- + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/setup-common.c | 10 +- + arch/powerpc/kernel/smp.c | 4 - + arch/powerpc/mm/numa.c | 4 +- + arch/powerpc/platforms/cell/spu_base.c | 9 +- + arch/powerpc/platforms/powermac/setup.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 4 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- + arch/powerpc/platforms/pseries/rtasd.c | 2 +- + arch/powerpc/platforms/pseries/xics.c | 4 +- + arch/powerpc/xmon/xmon.c | 4 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/smp.c | 16 +- + arch/sh/kernel/setup.c | 2 +- + arch/sh/kernel/smp.c | 6 - + arch/sparc/include/asm/smp_32.h | 2 - + arch/sparc/kernel/smp.c | 17 +- + arch/sparc/kernel/sparc_ksyms.c | 4 - + arch/sparc/kernel/sun4d_smp.c | 9 +- + arch/sparc/kernel/sun4m_smp.c | 8 +- + arch/sparc/mm/srmmu.c | 2 +- + arch/sparc64/kernel/ds.c | 2 +- + arch/sparc64/kernel/irq.c | 4 +- + arch/sparc64/kernel/smp.c | 4 - + arch/sparc64/mm/init.c | 2 +- + arch/um/kernel/smp.c | 7 - + arch/um/kernel/um_arch.c | 2 +- + arch/x86/Kconfig | 27 +- + arch/x86/include/asm/bigsmp/apic.h | 14 +- + arch/x86/include/asm/bigsmp/ipi.h | 9 +- + arch/x86/include/asm/es7000/apic.h | 22 +- + arch/x86/include/asm/es7000/ipi.h | 9 +- + arch/x86/include/asm/genapic_32.h | 11 +- + arch/x86/include/asm/genapic_64.h | 11 +- + arch/x86/include/asm/ipi.h | 21 +- + arch/x86/include/asm/mach-default/mach_apic.h | 17 +- + arch/x86/include/asm/mach-default/mach_ipi.h | 18 +- + arch/x86/include/asm/numaq/apic.h | 4 +- + arch/x86/include/asm/numaq/ipi.h | 9 +- + arch/x86/include/asm/smp.h | 6 +- + arch/x86/include/asm/summit/apic.h | 12 +- + arch/x86/include/asm/summit/ipi.h | 9 +- + arch/x86/kernel/apic.c | 4 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- + arch/x86/kernel/crash.c | 5 +- + arch/x86/kernel/genapic_flat_64.c | 76 ++- + arch/x86/kernel/genx2apic_cluster.c | 60 +- + arch/x86/kernel/genx2apic_phys.c | 55 +- + arch/x86/kernel/genx2apic_uv_x.c | 43 +- + arch/x86/kernel/io_apic.c | 118 ++-- + arch/x86/kernel/ipi.c | 26 +- + arch/x86/kernel/irq_32.c | 2 +- + arch/x86/kernel/setup_percpu.c | 9 +- + arch/x86/kernel/smp.c | 8 +- + arch/x86/kernel/smpboot.c | 6 - + arch/x86/kernel/tlb_32.c | 2 +- + arch/x86/kernel/tlb_64.c | 2 +- + arch/x86/mach-generic/bigsmp.c | 5 +- + arch/x86/mach-generic/es7000.c | 5 +- + arch/x86/mach-generic/numaq.c | 5 +- + arch/x86/mach-generic/summit.c | 5 +- + arch/x86/mach-voyager/voyager_smp.c | 11 +- + arch/x86/mm/numa_64.c | 4 +- + arch/x86/mm/srat_64.c | 2 +- + arch/x86/xen/smp.c | 17 +- + drivers/base/cpu.c | 2 +- + drivers/base/node.c | 4 +- + drivers/base/topology.c | 4 +- + drivers/infiniband/hw/ehca/ehca_irq.c | 2 +- + drivers/pci/pci-sysfs.c | 4 +- + drivers/pci/probe.c | 4 +- + drivers/pnp/pnpbios/bioscalls.c | 2 +- + include/linux/cpumask.h | 798 +++++++++++--------- + include/linux/seq_file.h | 2 +- + include/linux/smp.h | 9 + + include/linux/threads.h | 16 +- + init/Kconfig | 9 + + init/main.c | 14 +- + kernel/Kconfig.preempt | 8 + + kernel/cpu.c | 100 ++- + kernel/cpuset.c | 4 +- + kernel/irq/proc.c | 4 +- + kernel/kexec.c | 2 +- + kernel/kmod.c | 2 +- + kernel/kthread.c | 4 +- + kernel/profile.c | 4 +- + kernel/sched.c | 192 +++--- + kernel/sched_stats.h | 2 +- + kernel/smp.c | 14 +- + kernel/taskstats.c | 2 +- + kernel/time/timer_list.c | 4 +- + kernel/trace/trace.c | 4 +- + kernel/workqueue.c | 6 +- + lib/Kconfig.debug | 7 + + lib/cpumask.c | 69 ++- + mm/allocpercpu.c | 4 +- + mm/slub.c | 2 +- + mm/vmstat.c | 4 +- + 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 +- + 148 files changed, 1253 insertions(+), 1081 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/mm/fault.c +Auto-merged kernel/trace/trace.c +Merge made by recursive. + arch/x86/Kconfig.debug | 4 - + arch/x86/mm/Makefile | 3 +- + arch/x86/mm/fault.c | 2 +- + include/linux/ftrace.h | 2 + + include/linux/marker.h | 2 - + kernel/marker.c | 80 ++++++++--------------- + kernel/sysctl.c | 10 +++ + kernel/trace/ftrace.c | 8 ++ + kernel/trace/trace.c | 29 +++++++- + scripts/tracing/draw_functrace.py | 130 +++++++++++++++++++++++++++++++++++++ + 10 files changed, 206 insertions(+), 64 deletions(-) + create mode 100644 scripts/tracing/draw_functrace.py +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Already up-to-date. +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Already uptodate! +Merge made by recursive. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +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/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 +Merge made by recursive. + kernel/hrtimer.c | 17 ++++++++++++++++- + 1 files changed, 16 insertions(+), 1 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/quirks.c +Merge made by recursive. + drivers/pci/hotplug/pciehp_ctrl.c | 26 ++++++++++++-------------- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.h | 4 ++++ + drivers/pci/proc.c | 11 ++++++++++- + drivers/pci/quirks.c | 5 +++-- + 5 files changed, 30 insertions(+), 18 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-snap.c | 16 +++++++++------- + 1 files changed, 9 insertions(+), 7 deletions(-) +Merging hid/mm +$ git merge hid/mm +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/busses/scx200_i2c.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/it87 | 20 +- + Documentation/hwmon/ltc4245 | 81 +++ + drivers/hwmon/Kconfig | 14 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asb100.c | 5 +- + drivers/hwmon/f71882fg.c | 1130 ++++++++++++++++++++++++++++++++++++------- + drivers/hwmon/it87.c | 30 +- + 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 +- + 12 files changed, 1681 insertions(+), 187 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 v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merged MAINTAINERS +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 24 - + Documentation/video4linux/README.cx88 | 12 +- + MAINTAINERS | 31 + + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 3 + + drivers/media/dvb/Kconfig | 13 + + drivers/media/dvb/dm1105/dm1105.c | 1 - + drivers/media/dvb/dvb-core/dvb_frontend.c | 74 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 134 ++- + drivers/media/dvb/dvb-core/dvbdev.c | 57 +- + drivers/media/dvb/dvb-core/dvbdev.h | 1 + + drivers/media/dvb/dvb-usb/Kconfig | 3 +- + drivers/media/dvb/dvb-usb/dw2102.c | 1 - + drivers/media/dvb/frontends/Kconfig | 45 + + drivers/media/dvb/frontends/Makefile | 9 + + drivers/media/dvb/frontends/dvb-pll.c | 2 +- + drivers/media/dvb/frontends/lgdt3304.c | 378 ++++++ + drivers/media/dvb/frontends/lgdt3304.h | 45 + + drivers/media/dvb/frontends/s921_core.c | 216 +++ + drivers/media/dvb/frontends/s921_core.h | 114 ++ + drivers/media/dvb/frontends/s921_module.c | 190 +++ + drivers/media/dvb/frontends/s921_module.h | 49 + + drivers/media/dvb/frontends/stb0899_algo.c | 1519 +++++++++++++++++++++ + drivers/media/dvb/frontends/stb0899_cfg.h | 287 ++++ + drivers/media/dvb/frontends/stb0899_drv.c | 1685 +++++++++++++++++++++++ + drivers/media/dvb/frontends/stb0899_drv.h | 162 +++ + drivers/media/dvb/frontends/stb0899_priv.h | 267 ++++ + drivers/media/dvb/frontends/stb0899_reg.h | 2027 ++++++++++++++++++++++++++++ + drivers/media/dvb/frontends/stb6100.c | 545 ++++++++ + drivers/media/dvb/frontends/stb6100.h | 115 ++ + drivers/media/dvb/frontends/stb6100_cfg.h | 108 ++ + drivers/media/dvb/frontends/tda8261.c | 230 ++++ + drivers/media/dvb/frontends/tda8261.h | 55 + + drivers/media/dvb/frontends/tda8261_cfg.h | 84 ++ + drivers/media/dvb/frontends/zl10353.c | 3 + + drivers/media/dvb/ttpci/Kconfig | 4 + + drivers/media/dvb/ttpci/budget-av.c | 298 ++++ + drivers/media/dvb/ttpci/budget-ci.c | 311 +++++ + drivers/media/dvb/ttpci/budget.h | 1 + + drivers/media/radio/radio-si470x.c | 6 + + drivers/media/video/cafe_ccic.c | 6 +- + drivers/media/video/compat_ioctl32.c | 3 + + drivers/media/video/cx88/cx88-dvb.c | 5 + + drivers/media/video/cx88/cx88-video.c | 10 +- + drivers/media/video/saa7110.c | 4 +- + drivers/media/video/saa7134/saa7134-core.c | 3 +- + drivers/media/video/tvp5150.c | 15 + + drivers/media/video/usbvideo/ibmcam.c | 12 +- + 48 files changed, 9090 insertions(+), 78 deletions(-) + create mode 100644 drivers/media/dvb/frontends/lgdt3304.c + create mode 100644 drivers/media/dvb/frontends/lgdt3304.h + create mode 100644 drivers/media/dvb/frontends/s921_core.c + create mode 100644 drivers/media/dvb/frontends/s921_core.h + create mode 100644 drivers/media/dvb/frontends/s921_module.c + create mode 100644 drivers/media/dvb/frontends/s921_module.h + create mode 100644 drivers/media/dvb/frontends/stb0899_algo.c + create mode 100644 drivers/media/dvb/frontends/stb0899_cfg.h + create mode 100644 drivers/media/dvb/frontends/stb0899_drv.c + create mode 100644 drivers/media/dvb/frontends/stb0899_drv.h + create mode 100644 drivers/media/dvb/frontends/stb0899_priv.h + create mode 100644 drivers/media/dvb/frontends/stb0899_reg.h + create mode 100644 drivers/media/dvb/frontends/stb6100.c + create mode 100644 drivers/media/dvb/frontends/stb6100.h + create mode 100644 drivers/media/dvb/frontends/stb6100_cfg.h + create mode 100644 drivers/media/dvb/frontends/tda8261.c + create mode 100644 drivers/media/dvb/frontends/tda8261.h + create mode 100644 drivers/media/dvb/frontends/tda8261_cfg.h +$ git am -3 ../patches/0001-v4l-dvb-fallout-from-DVB_DYNAMIC_MINORS-addition.patch +Applying v4l-dvb: fallout from DVB_DYNAMIC_MINORS addition +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Merge made by recursive. + drivers/ide/alim15x3.c | 2 +- + drivers/ide/cmd64x.c | 4 +- + drivers/ide/gayle.c | 6 +- + drivers/ide/hpt366.c | 2 +- + drivers/ide/ide-cd.c | 130 ++++++-------------------- + drivers/ide/ide-cd.h | 2 - + drivers/ide/ide-disk.c | 2 +- + drivers/ide/ide-gd.c | 7 +- + drivers/ide/ide-io.c | 209 +++++++++++++++++----------------------- + drivers/ide/ide-ioctls.c | 3 - + drivers/ide/ide-iops.c | 50 +++++----- + drivers/ide/ide-lib.c | 7 +- + drivers/ide/ide-park.c | 16 ++-- + drivers/ide/ide-pci-generic.c | 2 +- + drivers/ide/ide-probe.c | 29 +++--- + drivers/ide/ide-proc.c | 28 +----- + drivers/ide/ide.c | 15 +--- + drivers/ide/it821x.c | 2 +- + drivers/ide/jmicron.c | 2 +- + drivers/ide/piix.c | 2 +- + drivers/ide/scc_pata.c | 2 +- + drivers/ide/siimage.c | 2 +- + drivers/ide/tx4938ide.c | 41 ++++++--- + drivers/ide/umc8672.c | 11 ++- + drivers/scsi/ide-scsi.c | 32 ++++-- + include/linux/ide.h | 25 ++---- + 26 files changed, 258 insertions(+), 375 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Removed fs/xfs/xfs_clnt.h +Merge made by recursive. + Documentation/filesystems/xfs.txt | 4 - + fs/inode.c | 208 ++- + fs/xfs/Makefile | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 2 +- + fs/xfs/linux-2.6/xfs_cred.h | 8 - + 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 | 7 +- + fs/xfs/linux-2.6/xfs_iops.c | 25 +- + fs/xfs/linux-2.6/xfs_linux.h | 2 +- + fs/xfs/linux-2.6/xfs_stats.c | 4 + + fs/xfs/linux-2.6/xfs_stats.h | 65 + + fs/xfs/linux-2.6/xfs_super.c | 851 ++++------ + fs/xfs/linux-2.6/xfs_super.h | 3 - + fs/xfs/linux-2.6/xfs_sync.c | 763 ++++++++ + 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 | 31 - + fs/xfs/linux-2.6/xfs_vnode.c | 15 +- + fs/xfs/linux-2.6/xfs_vnode.h | 5 - + fs/xfs/quota/xfs_dquot.c | 39 +- + fs/xfs/quota/xfs_dquot.h | 4 +- + fs/xfs/quota/xfs_dquot_item.c | 45 +- + fs/xfs/quota/xfs_qm.c | 13 +- + fs/xfs/quota/xfs_qm.h | 1 - + fs/xfs/quota/xfs_qm_bhv.c | 1 - + fs/xfs/quota/xfs_qm_syscalls.c | 137 +- + fs/xfs/support/debug.c | 2 +- + fs/xfs/xfs.h | 2 +- + fs/xfs/xfs_acl.c | 2 +- + fs/xfs/xfs_ag.h | 10 +- + fs/xfs/xfs_alloc.c | 195 ++- + fs/xfs/xfs_alloc.h | 27 +- + fs/xfs/xfs_alloc_btree.c | 2387 ++++--------------------- + fs/xfs/xfs_alloc_btree.h | 107 +- + fs/xfs/xfs_arch.h | 39 +- + fs/xfs/xfs_bit.h | 3 +- + fs/xfs/xfs_bmap.c | 296 ++-- + fs/xfs/xfs_bmap.h | 61 +- + fs/xfs/xfs_bmap_btree.c | 2614 +++++---------------------- + fs/xfs/xfs_bmap_btree.h | 171 +-- + fs/xfs/xfs_btree.c | 3596 ++++++++++++++++++++++++++++++++----- + fs/xfs/xfs_btree.h | 392 +++-- + fs/xfs/xfs_btree_trace.c | 249 +++ + fs/xfs/xfs_btree_trace.h | 116 ++ + fs/xfs/xfs_buf_item.c | 25 +- + fs/xfs/xfs_clnt.h | 105 -- + fs/xfs/xfs_da_btree.c | 5 + + fs/xfs/xfs_da_btree.h | 24 +- + fs/xfs/xfs_dinode.h | 5 +- + fs/xfs/xfs_dir2.c | 6 + + fs/xfs/xfs_dmops.c | 5 +- + fs/xfs/xfs_extfree_item.c | 45 +- + fs/xfs/xfs_fsops.c | 24 +- + fs/xfs/xfs_ialloc.c | 132 ++- + fs/xfs/xfs_ialloc.h | 21 +- + fs/xfs/xfs_ialloc_btree.c | 2193 +++-------------------- + fs/xfs/xfs_ialloc_btree.h | 111 +- + fs/xfs/xfs_iget.c | 501 ++---- + fs/xfs/xfs_imap.h | 2 - + fs/xfs/xfs_inode.c | 292 ++-- + fs/xfs/xfs_inode.h | 288 ++-- + fs/xfs/xfs_inode_item.c | 30 +- + fs/xfs/xfs_inode_item.h | 41 +- + fs/xfs/xfs_itable.c | 33 +- + fs/xfs/xfs_log.c | 10 +- + fs/xfs/xfs_log_priv.h | 1 + + fs/xfs/xfs_log_recover.c | 105 +- + fs/xfs/xfs_mount.c | 47 +- + fs/xfs/xfs_mount.h | 55 +- + fs/xfs/xfs_qmops.c | 5 +- + fs/xfs/xfs_trans.c | 13 +- + fs/xfs/xfs_trans.h | 322 ++-- + fs/xfs/xfs_trans_ail.c | 362 +++-- + fs/xfs/xfs_trans_buf.c | 7 +- + fs/xfs/xfs_trans_item.c | 10 + + fs/xfs/xfs_trans_priv.h | 98 +- + fs/xfs/xfs_vfsops.c | 617 +------- + fs/xfs/xfs_vfsops.h | 2 - + fs/xfs/xfs_vnodeops.c | 141 +-- + fs/xfs/xfs_vnodeops.h | 6 +- + include/linux/fs.h | 2 + + kernel/sysctl_check.c | 1 - + 84 files changed, 8102 insertions(+), 10174 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_sync.c + create mode 100644 fs/xfs/linux-2.6/xfs_sync.h + create mode 100644 fs/xfs/xfs_btree_trace.c + create mode 100644 fs/xfs/xfs_btree_trace.h + delete mode 100644 fs/xfs/xfs_clnt.h +Applying fs: xfs needs inode_wait to be exported +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/ipath/ipath_ruc.c | 10 +++++----- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 ++- + 2 files changed, 7 insertions(+), 6 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/kernel-parameters.txt +Merge made by recursive. + Documentation/ABI/testing/sysfs-firmware-acpi | 16 ++-- + Documentation/kernel-parameters.txt | 5 +- + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/kernel/e820.c | 25 +++++ + drivers/acpi/ec.c | 4 +- + drivers/acpi/events/evxfevnt.c | 6 + + drivers/acpi/power.c | 8 +- + drivers/acpi/sleep/main.c | 68 ++++++++++++-- + drivers/acpi/system.c | 44 +++++---- + drivers/idle/Kconfig | 3 +- + drivers/misc/sony-laptop.c | 6 +- + include/acpi/actypes.h | 1 + + include/linux/acpi.h | 1 + + include/linux/suspend.h | 13 +++ + kernel/power/disk.c | 6 +- + kernel/power/swsusp.c | 122 +++++++++++++++++++++++++ + 16 files changed, 279 insertions(+), 51 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-cdev.c | 36 ++++++++------------ + drivers/firewire/fw-device.c | 3 ++ + drivers/firewire/fw-device.h | 4 ++ + drivers/firewire/fw-ohci.c | 73 ++++++++++++++++++++---------------------- + 4 files changed, 57 insertions(+), 59 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/x86/kernel/cpu/mtrr/main.c +Merge made by recursive. + arch/ia64/include/asm/kvm_host.h | 192 +++++++++++------- + arch/ia64/kvm/kvm-ia64.c | 74 ++++---- + arch/ia64/kvm/kvm_minstate.h | 4 +- + arch/ia64/kvm/misc.h | 3 +- + arch/ia64/kvm/vcpu.c | 5 +- + arch/ia64/kvm/vtlb.c | 4 +- + arch/x86/include/asm/kvm_host.h | 20 ++- + arch/x86/include/asm/kvm_x86_emulate.h | 10 +- + arch/x86/include/asm/mtrr.h | 25 +++ + arch/x86/kernel/cpu/mtrr/generic.c | 12 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 18 +-- + arch/x86/kvm/i8254.c | 19 ++ + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/lapic.c | 58 +++++- + arch/x86/kvm/mmu.c | 123 +++++++++++- + arch/x86/kvm/svm.c | 23 ++ + arch/x86/kvm/vmx.c | 343 ++++++++++++++++++++++---------- + arch/x86/kvm/vmx.h | 12 +- + arch/x86/kvm/x86.c | 131 +++++++++++-- + arch/x86/kvm/x86_emulate.c | 12 +- + include/linux/kvm.h | 11 +- + include/linux/kvm_host.h | 3 +- + virt/kvm/ioapic.c | 1 + + virt/kvm/irq_comm.c | 8 +- + virt/kvm/kvm_main.c | 2 +- + 26 files changed, 810 insertions(+), 308 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging tests/master +$ git merge tests/master +Auto-merged Makefile +Auto-merged drivers/misc/Makefile +Auto-merged kernel/Makefile +Auto-merged lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merged lib/Makefile +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 9e24c37: Merge commit 'tests/master' +$ git diff -M --stat --summary HEAD^.. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 93 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 101 +++++++++++++++++++++++ + tests/Makefile | 10 ++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 0 + {lib => tests}/locking-selftest-hardirq.h | 0 + {lib => tests}/locking-selftest-mutex.h | 0 + {lib => tests}/locking-selftest-rlock-hardirq.h | 0 + {lib => tests}/locking-selftest-rlock-softirq.h | 0 + {lib => tests}/locking-selftest-rlock.h | 0 + {lib => tests}/locking-selftest-rsem.h | 0 + {lib => tests}/locking-selftest-softirq.h | 0 + {lib => tests}/locking-selftest-spin-hardirq.h | 0 + {lib => tests}/locking-selftest-spin-softirq.h | 0 + {lib => tests}/locking-selftest-spin.h | 0 + {lib => tests}/locking-selftest-wlock-hardirq.h | 0 + {lib => tests}/locking-selftest-wlock-softirq.h | 0 + {lib => tests}/locking-selftest-wlock.h | 0 + {lib => tests}/locking-selftest-wsem.h | 0 + {lib => tests}/locking-selftest.c | 0 + {kernel => tests}/rcutorture.c | 0 + {kernel => tests}/rtmutex-tester.c | 2 +- + {kernel => tests}/test_kprobes.c | 0 + 27 files changed, 115 insertions(+), 98 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (100%) + rename {lib => tests}/locking-selftest-hardirq.h (100%) + rename {lib => tests}/locking-selftest-mutex.h (100%) + rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-rlock.h (100%) + rename {lib => tests}/locking-selftest-rsem.h (100%) + rename {lib => tests}/locking-selftest-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) + rename {lib => tests}/locking-selftest-spin-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin.h (100%) + rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-wlock.h (100%) + rename {lib => tests}/locking-selftest-wsem.h (100%) + rename {lib => tests}/locking-selftest.c (100%) + rename {kernel => tests}/rcutorture.c (100%) + rename {kernel => tests}/rtmutex-tester.c (99%) + rename {kernel => tests}/test_kprobes.c (100%) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/file.c | 27 +++-- + fs/ocfs2/inode.c | 6 + + fs/ocfs2/journal.c | 1 + + fs/ocfs2/mmap.c | 6 +- + fs/ocfs2/namei.c | 8 +- + fs/ocfs2/ocfs2.h | 3 + + fs/ocfs2/ocfs2_fs.h | 17 ++-- + fs/ocfs2/xattr.c | 333 +++++++++++++++++++++++++++------------------------ + fs/ocfs2/xattr.h | 38 +----- + 9 files changed, 231 insertions(+), 208 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Auto-merged drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merged drivers/media/dvb/dm1105/dm1105.c +Auto-merged drivers/net/amd8111e.c +Auto-merged drivers/net/cris/eth_v10.c +Auto-merged drivers/net/cs89x0.c +Auto-merged drivers/net/ibm_newemac/core.c +Auto-merged drivers/net/tulip/dmfe.c +Auto-merged drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merged drivers/net/wireless/libertas/cmd.c +Auto-merged drivers/net/wireless/libertas/scan.c +Auto-merged drivers/net/wireless/p54/p54common.c +CONFLICT (content): Merge conflict in drivers/net/wireless/p54/p54common.c +Auto-merged drivers/net/wireless/p54/p54pci.c +Auto-merged drivers/s390/net/qeth_l2_main.c +Auto-merged include/linux/kernel.h +Auto-merged net/core/neighbour.c +Auto-merged net/core/pktgen.c +Auto-merged net/ipv4/route.c +Resolved 'drivers/net/wireless/p54/p54common.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 41f5134: Merge commit 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/networking/ip-sysctl.txt | 6 + + 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/sparc64/kernel/idprom.c | 5 +- + arch/um/drivers/net_kern.c | 7 +- + arch/xtensa/platforms/iss/network.c | 5 +- + drivers/firmware/iscsi_ibft.c | 4 +- + drivers/infiniband/core/sysfs.c | 10 +- + drivers/infiniband/hw/mthca/mthca_mcg.c | 23 +-- + drivers/infiniband/hw/nes/nes.c | 6 +- + drivers/infiniband/hw/nes/nes_cm.c | 10 +- + drivers/infiniband/hw/nes/nes_nic.c | 10 +- + 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/srp/ib_srp.c | 31 +--- + 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-usb/dvb-usb-dvb.c | 5 +- + drivers/media/dvb/pluto2/pluto2.c | 3 +- + drivers/message/fusion/mptlan.c | 18 +- + drivers/net/3c503.c | 3 +- + drivers/net/3c505.c | 5 +- + drivers/net/3c507.c | 3 +- + drivers/net/3c509.c | 5 +- + drivers/net/3c515.c | 3 +- + drivers/net/3c523.c | 10 +- + drivers/net/3c527.c | 3 +- + drivers/net/3c59x.c | 3 +- + drivers/net/8139cp.c | 5 +- + drivers/net/8139too.c | 5 +- + drivers/net/82596.c | 13 +- + drivers/net/a2065.c | 4 +- + drivers/net/ac3200.c | 5 +- + drivers/net/acenic.c | 3 +- + drivers/net/amd8111e.c | 5 +- + drivers/net/apne.c | 3 +- + drivers/net/ariadne.c | 20 +-- + drivers/net/arm/am79c961a.c | 6 +- + drivers/net/arm/at91_ether.c | 10 +- + drivers/net/arm/ether1.c | 5 +- + drivers/net/arm/ether3.c | 5 +- + drivers/net/arm/etherh.c | 5 +- + drivers/net/at1700.c | 3 +- + drivers/net/atarilance.c | 17 +-- + drivers/net/atp.c | 5 +- + drivers/net/ax88796.c | 9 +- + drivers/net/b44.c | 5 +- + drivers/net/bmac.c | 5 +- + drivers/net/bnx2.c | 5 +- + drivers/net/bnx2x_main.c | 10 +- + drivers/net/bonding/bond_main.c | 15 +- + drivers/net/bonding/bond_sysfs.c | 4 +- + drivers/net/cassini.c | 5 +- + drivers/net/cpmac.c | 5 +- + drivers/net/cris/eth_v10.c | 4 +- + drivers/net/cs89x0.c | 12 +- + drivers/net/de600.c | 3 +- + drivers/net/de620.c | 8 +- + drivers/net/declance.c | 4 +- + drivers/net/depca.c | 6 +- + drivers/net/dl2k.c | 5 +- + drivers/net/dm9000.c | 8 +- + drivers/net/e100.c | 5 +- + drivers/net/e1000/e1000_main.c | 3 +- + drivers/net/e1000e/netdev.c | 11 +- + drivers/net/eepro.c | 3 +- + drivers/net/eepro100.c | 5 +- + drivers/net/enc28j60.c | 16 +- + drivers/net/enic/enic_res.c | 7 +- + drivers/net/enic/vnic_dev.c | 10 +- + drivers/net/epic100.c | 5 +- + drivers/net/es3210.c | 9 +- + drivers/net/ewrk3.c | 7 +- + drivers/net/fealnx.c | 5 +- + drivers/net/fec.c | 4 +- + drivers/net/forcedeth.c | 9 +- + drivers/net/fs_enet/fs_enet-main.c | 5 +- + drivers/net/gianfar.c | 4 +- + drivers/net/hamachi.c | 5 +- + drivers/net/hamradio/bpqether.c | 7 +- + drivers/net/hp-plus.c | 3 +- + drivers/net/hp.c | 3 +- + drivers/net/hp100.c | 5 +- + drivers/net/hydra.c | 5 +- + drivers/net/ibm_newemac/core.c | 11 +- + drivers/net/ibmlana.c | 5 +- + drivers/net/ibmveth.c | 5 +- + drivers/net/igb/igb_main.c | 6 +- + drivers/net/ioc3-eth.c | 12 +- + drivers/net/isa-skeleton.c | 3 +- + drivers/net/ixgbe/ixgbe_main.c | 6 +- + drivers/net/jazzsonic.c | 4 +- + drivers/net/jme.c | 12 +- + drivers/net/lance.c | 3 +- + drivers/net/lib82596.c | 13 +- + drivers/net/lne390.c | 5 +- + drivers/net/mac89x0.c | 4 +- + drivers/net/macb.c | 7 +- + drivers/net/mace.c | 5 +- + drivers/net/macmace.c | 5 +- + drivers/net/macsonic.c | 9 +- + drivers/net/macvlan.c | 24 +++ + drivers/net/meth.c | 3 +- + drivers/net/mlx4/mcg.c | 23 +-- + drivers/net/mv643xx_eth.c | 5 +- + drivers/net/mvme147.c | 5 +- + drivers/net/myri10ge/myri10ge.c | 4 +- + drivers/net/myri_sbus.c | 14 +- + drivers/net/natsemi.c | 5 +- + drivers/net/ne-h8300.c | 3 +- + drivers/net/ne.c | 3 +- + drivers/net/ne2.c | 6 +- + drivers/net/ne2k-pci.c | 5 +- + drivers/net/ne3210.c | 5 +- + drivers/net/netconsole.c | 9 +- + drivers/net/netxen/netxen_nic_main.c | 8 +- + drivers/net/netxen/netxen_nic_niu.c | 7 +- + drivers/net/ni5010.c | 3 +- + drivers/net/niu.c | 4 +- + drivers/net/ns83820.c | 6 +- + drivers/net/pasemi_mac.c | 5 +- + drivers/net/pci-skeleton.c | 5 +- + drivers/net/pcmcia/3c574_cs.c | 5 +- + drivers/net/pcmcia/3c589_cs.c | 5 +- + drivers/net/pcmcia/axnet_cs.c | 5 +- + drivers/net/pcmcia/fmvj18x_cs.c | 5 +- + drivers/net/pcmcia/nmclan_cs.c | 5 +- + drivers/net/pcmcia/pcnet_cs.c | 3 +- + drivers/net/pcmcia/smc91c92_cs.c | 5 +- + drivers/net/pcmcia/xirc2ps_cs.c | 5 +- + drivers/net/pcnet32.c | 3 +- + drivers/net/pppoe.c | 5 +- + drivers/net/ps3_gelic_net.c | 6 +- + drivers/net/ps3_gelic_wireless.c | 20 +-- + drivers/net/qla3xxx.c | 5 +- + drivers/net/qlge/qlge_main.c | 11 +- + drivers/net/rionet.c | 5 +- + drivers/net/rrunner.c | 3 +- + drivers/net/s2io.c | 4 +- + drivers/net/sb1250-mac.c | 5 +- + drivers/net/seeq8005.c | 3 +- + drivers/net/sfc/efx.c | 15 +- + drivers/net/sgiseeq.c | 4 +- + drivers/net/sis190.c | 6 +- + drivers/net/sis900.c | 5 +- + drivers/net/skge.c | 5 +- + drivers/net/sky2.c | 5 +- + drivers/net/smc-mca.c | 5 +- + drivers/net/smc-ultra.c | 5 +- + drivers/net/smc-ultra32.c | 5 +- + drivers/net/smc9194.c | 4 +- + drivers/net/smc91x.c | 5 +- + drivers/net/starfire.c | 13 +- + drivers/net/sun3lance.c | 9 +- + drivers/net/sunbmac.c | 5 +- + drivers/net/sundance.c | 5 +- + drivers/net/sungem.c | 6 +- + drivers/net/sunhme.c | 6 +- + drivers/net/sunlance.c | 5 +- + drivers/net/sunvnet.c | 5 +- + drivers/net/tc35815.c | 17 +- + drivers/net/tg3.c | 5 +- + drivers/net/tokenring/abyss.c | 4 +- + drivers/net/tokenring/ibmtr.c | 10 +- + drivers/net/tokenring/lanstreamer.c | 35 ++--- + drivers/net/tokenring/madgemc.c | 10 +- + drivers/net/tokenring/olympic.c | 50 ++---- + drivers/net/tokenring/proteon.c | 5 +- + drivers/net/tokenring/skisa.c | 5 +- + drivers/net/tokenring/tmspci.c | 5 +- + drivers/net/tsi108_eth.c | 5 +- + drivers/net/tulip/de2104x.c | 5 +- + drivers/net/tulip/de4x5.c | 12 +- + drivers/net/tulip/dmfe.c | 6 +- + drivers/net/tulip/tulip_core.c | 11 +- + drivers/net/tulip/uli526x.c | 5 +- + drivers/net/tulip/winbond-840.c | 15 +- + drivers/net/tulip/xircom_cb.c | 3 +- + drivers/net/tun.c | 5 +- + drivers/net/typhoon.c | 5 +- + drivers/net/usb/pegasus.c | 5 +- + drivers/net/usb/smsc95xx.c | 4 +- + drivers/net/usb/usbnet.c | 5 +- + drivers/net/veth.c | 16 -- + drivers/net/via-rhine.c | 5 +- + drivers/net/virtio_net.c | 4 +- + drivers/net/wd.c | 5 +- + drivers/net/wireless/adm8211.c | 5 +- + drivers/net/wireless/airo.c | 17 +-- + drivers/net/wireless/arlan-main.c | 26 +-- + drivers/net/wireless/ath9k/core.c | 3 - + drivers/net/wireless/ath9k/hw.c | 5 +- + drivers/net/wireless/ath9k/main.c | 19 +- + drivers/net/wireless/ath9k/rc.c | 9 +- + drivers/net/wireless/ath9k/xmit.c | 1 - + drivers/net/wireless/atmel.c | 5 +- + drivers/net/wireless/b43/main.c | 5 +- + drivers/net/wireless/hostap/hostap_80211_rx.c | 59 ++---- + drivers/net/wireless/hostap/hostap_80211_tx.c | 15 +- + drivers/net/wireless/hostap/hostap_ap.c | 241 ++++++++---------------- + drivers/net/wireless/hostap/hostap_hw.c | 10 +- + drivers/net/wireless/hostap/hostap_info.c | 16 +- + drivers/net/wireless/hostap/hostap_ioctl.c | 16 +- + drivers/net/wireless/hostap/hostap_main.c | 26 +-- + drivers/net/wireless/hostap/hostap_proc.c | 15 +- + drivers/net/wireless/ipw2100.c | 31 +--- + drivers/net/wireless/ipw2200.c | 217 ++++++++++------------ + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 18 +-- + drivers/net/wireless/iwlwifi/iwl-agn.c | 47 ++--- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 2 - + drivers/net/wireless/iwlwifi/iwl-sta.c | 38 ++--- + drivers/net/wireless/iwlwifi/iwl-tx.c | 17 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 54 ++---- + drivers/net/wireless/libertas/assoc.c | 32 ++-- + drivers/net/wireless/libertas/cmd.c | 5 +- + drivers/net/wireless/libertas/debugfs.c | 6 +- + drivers/net/wireless/libertas/main.c | 9 +- + drivers/net/wireless/libertas/scan.c | 11 +- + drivers/net/wireless/libertas/wext.c | 3 +- + drivers/net/wireless/libertas_tf/cmd.c | 5 +- + drivers/net/wireless/mac80211_hwsim.c | 15 +- + drivers/net/wireless/netwave_cs.c | 5 +- + drivers/net/wireless/orinoco.c | 10 +- + drivers/net/wireless/p54/p54common.c | 5 +- + drivers/net/wireless/p54/p54pci.c | 1 - + drivers/net/wireless/p54/p54usb.c | 1 - + drivers/net/wireless/prism54/isl_ioctl.c | 24 +-- + drivers/net/wireless/ray_cs.c | 9 +- + drivers/net/wireless/rndis_wlan.c | 9 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 4 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 5 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 4 +- + drivers/net/wireless/rt2x00/rt61pci.c | 4 +- + drivers/net/wireless/rt2x00/rt73usb.c | 4 +- + drivers/net/wireless/rtl8180_dev.c | 5 +- + drivers/net/wireless/rtl8187_dev.c | 5 +- + drivers/net/wireless/wavelan.c | 33 +--- + drivers/net/wireless/wavelan_cs.c | 38 +--- + drivers/net/wireless/wl3501_cs.c | 10 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 4 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 6 +- + drivers/net/xtsonic.c | 6 +- + drivers/net/yellowfin.c | 13 +- + drivers/net/znet.c | 5 +- + drivers/net/zorro8390.c | 7 +- + drivers/s390/net/qeth_l2_main.c | 18 +-- + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/usb/atm/cxacru.c | 4 +- + drivers/usb/atm/usbatm.c | 5 +- + drivers/usb/gadget/u_ether.c | 6 +- + drivers/uwb/wlp/eda.c | 38 +--- + fs/cifs/cifs_spnego.c | 3 +- + fs/lockd/host.c | 2 +- + fs/nfs/super.c | 3 +- + include/linux/kernel.h | 12 -- + include/linux/rculist.h | 17 ++ + include/linux/skbuff.h | 15 ++- + include/linux/sunrpc/svc_xprt.h | 4 +- + include/linux/xfrm.h | 14 ++ + include/net/dst.h | 3 +- + include/net/ip_vs.h | 4 +- + include/net/netfilter/nf_conntrack_tuple.h | 6 +- + include/net/netlink.h | 22 +- + include/net/netns/ipv4.h | 2 + + include/net/sctp/sctp.h | 4 +- + include/net/sock.h | 41 ++++- + include/net/udp.h | 25 ++-- + include/net/udplite.h | 2 +- + include/net/xfrm.h | 4 + + lib/vsprintf.c | 70 +++++++ + net/802/tr.c | 22 +-- + net/8021q/vlan.c | 8 +- + net/8021q/vlan.h | 6 +- + net/8021q/vlan_dev.c | 22 +++ + net/Kconfig | 2 +- + net/appletalk/aarp.c | 3 +- + net/atm/br2684.c | 5 +- + net/atm/lec.c | 26 +-- + net/bridge/netfilter/ebt_log.c | 6 +- + net/core/dev.c | 25 ++- + net/core/neighbour.c | 2 - + net/core/net-sysfs.c | 7 + + net/core/net_namespace.c | 2 - + net/core/netpoll.c | 5 +- + net/core/pktgen.c | 9 +- + net/core/skbuff.c | 2 +- + net/core/sock.c | 3 +- + net/ieee80211/ieee80211_crypt_ccmp.c | 13 +- + net/ieee80211/ieee80211_crypt_tkip.c | 29 ++-- + net/ieee80211/ieee80211_rx.c | 71 +++----- + net/ieee80211/ieee80211_wx.c | 5 +- + net/ipv4/cipso_ipv4.c | 1 - + net/ipv4/devinet.c | 9 +- + net/ipv4/icmp.c | 3 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/route.c | 135 +++++++++++++- + net/ipv4/sysctl_net_ipv4.c | 12 ++ + net/ipv4/tcp_input.c | 4 +- + net/ipv4/tcp_timer.c | 4 +- + net/ipv4/udp.c | 241 +++++++++++++++--------- + net/ipv4/udp_impl.h | 4 +- + net/ipv4/udplite.c | 14 +- + net/ipv6/addrconf.c | 5 +- + net/ipv6/addrlabel.c | 34 +--- + net/ipv6/ah6.c | 4 +- + net/ipv6/anycast.c | 6 +- + net/ipv6/esp6.c | 4 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/icmp.c | 7 +- + net/ipv6/ip6_flowlabel.c | 4 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6mr.c | 5 +- + net/ipv6/ipcomp6.c | 4 +- + net/ipv6/mcast.c | 10 +- + net/ipv6/ndisc.c | 7 +- + net/ipv6/netfilter/ip6t_LOG.c | 2 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 5 +- + net/ipv6/route.c | 9 +- + net/ipv6/tcp_ipv6.c | 8 +- + net/ipv6/udp.c | 137 ++++++++------ + net/ipv6/udp_impl.h | 4 +- + net/ipv6/udplite.c | 9 +- + net/irda/irlan/irlan_client.c | 4 +- + net/llc/llc_proc.c | 3 +- + net/mac80211/debugfs_key.c | 4 +- + net/mac80211/debugfs_netdev.c | 3 +- + net/mac80211/debugfs_sta.c | 5 +- + net/mac80211/event.c | 5 +- + net/mac80211/ht.c | 42 ++--- + net/mac80211/key.c | 10 +- + net/mac80211/mesh_plink.c | 49 ++---- + net/mac80211/mlme.c | 121 +++++------- + net/mac80211/rx.c | 38 ++--- + net/mac80211/sta_info.c | 33 ++-- + net/mac80211/tkip.c | 10 +- + net/mac80211/tx.c | 24 +-- + net/mac80211/wme.c | 8 +- + net/mac80211/wpa.c | 3 - + net/netfilter/ipvs/ip_vs_conn.c | 20 +-- + net/netfilter/ipvs/ip_vs_core.c | 8 +- + net/netfilter/ipvs/ip_vs_ctl.c | 8 +- + net/netfilter/ipvs/ip_vs_proto.c | 19 +-- + net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 5 +- + net/netfilter/ipvs/ip_vs_xmit.c | 17 +- + net/netfilter/nf_conntrack_ftp.c | 8 +- + net/netfilter/nf_conntrack_h323_main.c | 12 +- + net/netfilter/xt_hashlimit.c | 7 +- + net/netfilter/xt_recent.c | 5 +- + net/netlabel/netlabel_addrlist.c | 2 +- + net/netlink/attr.c | 2 +- + net/sctp/ipv6.c | 35 ++-- + net/sctp/sm_statefuns.c | 5 +- + net/sunrpc/clnt.c | 4 +- + net/sunrpc/rpcb_clnt.c | 6 +- + net/sunrpc/svcauth_unix.c | 7 +- + net/sunrpc/xprtsock.c | 26 ++-- + net/tipc/eth_media.c | 3 +- + net/xfrm/xfrm_policy.c | 6 +- + net/xfrm/xfrm_state.c | 12 +- + net/xfrm/xfrm_user.c | 52 +++++ + security/selinux/avc.c | 2 +- + security/selinux/hooks.c | 4 +- + 368 files changed, 2020 insertions(+), 2598 deletions(-) +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/onenand/omap2.c | 1 - + fs/jffs2/nodemgmt.c | 2 ++ + 2 files changed, 2 insertions(+), 1 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + crypto/camellia.c | 84 +++++++++------------ + crypto/testmgr.c | 7 ++- + drivers/crypto/hifn_795x.c | 5 ++ + drivers/crypto/talitos.c | 171 ++++++++++++++++++++++++++++---------------- + drivers/crypto/talitos.h | 11 +++- + 5 files changed, 166 insertions(+), 112 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Auto-merged sound/pci/hda/hda_intel.c +Merge made by recursive. + include/linux/input.h | 1 + + include/sound/asound.h | 1 + + include/sound/jack.h | 1 + + include/sound/soc-dapm.h | 2 - + include/sound/version.h | 2 +- + 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 | 140 ++++++ + sound/core/jack.c | 9 +- + sound/core/seq/seq.c | 4 +- + sound/drivers/pcsp/pcsp.c | 8 +- + sound/drivers/pcsp/pcsp.h | 1 + + sound/drivers/pcsp/pcsp_lib.c | 95 ++-- + sound/pci/Kconfig | 1 + + sound/pci/ac97/ac97_patch.c | 2 + + sound/pci/emu10k1/emu10k1_main.c | 494 ++++++++++---------- + sound/pci/hda/hda_codec.c | 428 +++++++++++++---- + sound/pci/hda/hda_codec.h | 46 ++- + sound/pci/hda/hda_generic.c | 20 +- + sound/pci/hda/hda_hwdep.c | 228 +++++++++ + sound/pci/hda/hda_intel.c | 154 ++----- + sound/pci/hda/hda_local.h | 24 +- + sound/pci/hda/hda_proc.c | 44 +-- + sound/pci/hda/patch_analog.c | 56 ++-- + sound/pci/hda/patch_conexant.c | 11 - + sound/pci/hda/patch_realtek.c | 86 ++-- + sound/pci/hda/patch_sigmatel.c | 249 ++++++++-- + sound/pci/hda/patch_via.c | 71 ++-- + sound/pci/ice1712/ice1724.c | 20 +- + sound/soc/codecs/wm8580.c | 108 +++--- + sound/soc/codecs/wm8580.h | 1 + + sound/soc/codecs/wm8900.c | 113 +++--- + sound/soc/codecs/wm8900.h | 1 + + sound/soc/soc-dapm.c | 22 - + 57 files changed, 1618 insertions(+), 906 deletions(-) + 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 +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + net/9p/client.c | 19 +++++++++---------- + net/9p/trans_rdma.c | 5 +++-- + 2 files changed, 12 insertions(+), 12 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Auto-merged Documentation/lguest/lguest.c +Auto-merged drivers/net/virtio_net.c +Auto-merged init/Kconfig +Merge made by recursive. + Documentation/lguest/Makefile | 2 +- + Documentation/lguest/lguest.c | 62 ++----------- + arch/x86/lguest/boot.c | 32 ++++--- + arch/x86/lguest/i386_head.S | 15 --- + drivers/lguest/lg.h | 2 +- + drivers/lguest/lguest_user.c | 13 +-- + drivers/lguest/page_tables.c | 72 ++++++++++++++- + drivers/net/virtio_net.c | 189 +++++++++++++++++++++++++++++++++----- + include/linux/lguest_launcher.h | 2 +- + include/linux/virtio_net.h | 9 ++ + init/Kconfig | 6 -- + 11 files changed, 278 insertions(+), 126 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/CHANGES | 6 +++++- + fs/cifs/cifsglob.h | 2 ++ + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 50 +++++++++++++++++++++++++++++++++++++------------- + fs/cifs/transport.c | 41 +++++++++++++++++++++++++++++++---------- + 5 files changed, 76 insertions(+), 25 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/ops_dentry.h +Auto-merged fs/gfs2/ops_export.c +Removed fs/gfs2/ops_fstype.h +Auto-merged fs/gfs2/ops_inode.c +Removed fs/gfs2/ops_inode.h +Removed fs/gfs2/ops_super.h +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/gfs2/glock.c | 8 ++++++++ + fs/gfs2/inode.c | 1 - + fs/gfs2/inode.h | 11 +++++++++++ + fs/gfs2/main.c | 2 +- + fs/gfs2/ops_address.c | 16 +++++++--------- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 ----------------- + fs/gfs2/ops_export.c | 3 +-- + fs/gfs2/ops_file.c | 1 - + fs/gfs2/ops_fstype.c | 3 --- + fs/gfs2/ops_fstype.h | 19 ------------------- + fs/gfs2/ops_inode.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- + fs/gfs2/ops_inode.h | 25 ------------------------- + fs/gfs2/ops_super.c | 8 ++++---- + fs/gfs2/ops_super.h | 17 ----------------- + fs/gfs2/super.h | 8 ++++++++ + fs/ioctl.c | 44 ++++++++++++++++++++++++++++++++++---------- + include/linux/fs.h | 3 +++ + 18 files changed, 125 insertions(+), 112 deletions(-) + delete mode 100644 fs/gfs2/ops_dentry.h + delete mode 100644 fs/gfs2/ops_fstype.h + delete mode 100644 fs/gfs2/ops_inode.h + delete mode 100644 fs/gfs2/ops_super.h +Merging input/next +$ git merge input/next +Merge made by recursive. + drivers/input/Makefile | 2 +- + drivers/input/evdev.c | 197 +----------------------- + drivers/input/input-compat.c | 135 +++++++++++++++++ + drivers/input/input-compat.h | 94 ++++++++++++ + drivers/input/keyboard/gpio_keys.c | 4 + + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/input/misc/uinput.c | 172 ++++++++++++++++++---- + drivers/input/mouse/appletouch.c | 274 +++++++++++++++++----------------- + drivers/input/serio/xilinx_ps2.c | 220 ++++++++++++++------------- + include/linux/gpio_keys.h | 1 + + 10 files changed, 638 insertions(+), 467 deletions(-) + create mode 100644 drivers/input/input-compat.c + create mode 100644 drivers/input/input-compat.h +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged arch/arm/mach-lh7a40x/clocks.c +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ps3_gelic_net.c +Auto-merged drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged include/net/bluetooth/hci_core.h +Auto-merged net/9p/trans_virtio.c +CONFLICT (content): Merge conflict in net/9p/trans_virtio.c +Auto-merged net/bluetooth/hci_core.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Resolved 'net/9p/trans_virtio.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit bc97241: Merge commit 'semaphore-removal/semaphore-removal' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- + drivers/net/bonding/bond_main.c | 21 +++++++++++---------- + drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- + drivers/net/ppp_async.c | 8 ++++---- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- + include/net/bluetooth/hci_core.h | 7 ++++--- + net/9p/trans_virtio.c | 21 +++++++++++---------- + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- + 11 files changed, 69 insertions(+), 63 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Already up-to-date. +Merging trivial/next +$ git merge trivial/next +Auto-merged Documentation/edac.txt +CONFLICT (content): Merge conflict in Documentation/edac.txt +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/base/sys.c +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/message/i2o/i2o_block.c +Auto-merged drivers/net/spider_net.c +Auto-merged drivers/serial/mpc52xx_uart.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/ntfs/aops.c +Auto-merged fs/proc/nommu.c +Auto-merged include/linux/securebits.h +CONFLICT (content): Merge conflict in include/linux/securebits.h +Auto-merged mm/migrate.c +Auto-merged mm/slub.c +Auto-merged net/wireless/wext.c +Resolved 'Documentation/edac.txt' using previous resolution. +Resolved 'include/linux/securebits.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 967ca0f: Merge commit 'trivial/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/hfs.txt | 2 +- + Documentation/ja_JP/SubmittingPatches | 4 ++-- + Documentation/zh_CN/SubmittingPatches | 4 ++-- + arch/mips/kernel/vpe.c | 2 +- + arch/sh/lib64/c-checksum.c | 4 ++-- + drivers/base/sys.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/net/spider_net.c | 2 +- + drivers/serial/mpc52xx_uart.c | 4 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/proc/nommu.c | 2 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 19 files changed, 24 insertions(+), 24 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Merge made by recursive. + block/blk-merge.c | 21 --------------------- + block/cfq-iosched.c | 8 ++------ + 2 files changed, 2 insertions(+), 27 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Auto-merged drivers/media/dvb/ttpci/av7110.c +Removed drivers/media/dvb/ttpci/fdump.c +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 +Auto-merged drivers/net/tg3.h +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Auto-merged drivers/scsi/qlogicpti.c +CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Auto-merged sound/isa/Kconfig +Auto-merged sound/isa/wavefront/wavefront_fx.c +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/scsi/qlogicpti.c' using previous resolution. +Resolved 'firmware/WHENCE' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit a16bb7b: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 789 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +----- + drivers/scsi/ql1040_fw.h | 2130 ------- + drivers/scsi/ql12160_fw.h | 1811 ------ + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 20 + + firmware/WHENCE | 121 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 + + firmware/advansys/38C0800.bin.ihex | 336 + + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 +++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 --------- + 49 files changed, 20560 insertions(+), 22498 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Merge made by recursive. + drivers/bluetooth/bluecard_cs.c | 2 +- + drivers/bluetooth/bt3c_cs.c | 6 ++++-- + drivers/bluetooth/btuart_cs.c | 6 ++++-- + drivers/bluetooth/dtl1_cs.c | 7 +++++-- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/parport/parport_cs.c | 2 +- + drivers/pcmcia/pcmcia_resource.c | 3 ++- + drivers/scsi/fdomain.c | 2 ++ + 8 files changed, 20 insertions(+), 10 deletions(-) +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +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 include/linux/slab.h +Auto-merged init/main.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Auto-merged mm/slab.c +Auto-merged mm/slob.c +Auto-merged mm/slub.c +Resolved 'mm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 482d770: Merge commit 'slab/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++++ + Documentation/kernel-parameters.txt | 10 + + Documentation/vm/kmemtrace.txt | 126 ++++++++++ + MAINTAINERS | 6 + + include/linux/kmemtrace.h | 86 +++++++ + include/linux/slab.h | 8 +- + include/linux/slab_def.h | 68 +++++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 52 ++++- + init/main.c | 2 + + kernel/relay.c | 7 +- + lib/Kconfig.debug | 20 ++ + mm/Makefile | 1 + + mm/kmemtrace.c | 333 +++++++++++++++++++++++++++ + mm/slab.c | 79 ++++++- + mm/slob.c | 37 +++- + mm/slub.c | 141 +++++++++--- + 17 files changed, 979 insertions(+), 77 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 +Merge made by recursive. + drivers/md/md.c | 26 +++++-- + drivers/md/raid0.c | 168 ++++++++++++++++++++++---------------------- + include/linux/raid/md_k.h | 1 + + include/linux/raid/raid0.h | 10 ++-- + 4 files changed, 109 insertions(+), 96 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/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/slab.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +Auto-merged kernel/fork.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 65a19ae: 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 +Merge made by recursive. + drivers/mfd/wm8350-regmap.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Removed Documentation/DocBook/wanbook.tmpl +CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree. +Removed include/net/syncppp.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 2c00ad8: Merge commit 'hdlc/hdlc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/networking.tmpl | 3 - + Documentation/DocBook/wanbook.tmpl | 99 -- + Documentation/networking/generic-hdlc.txt | 8 +- + drivers/net/wan/Makefile | 2 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/{hd6457x.c => hd64570.c} | 254 ++---- + drivers/net/wan/hd64572.c | 641 +++++++++++++ + drivers/net/wan/hdlc_fr.c | 10 +- + drivers/net/wan/hdlc_ppp.c | 648 ++++++++++++- + drivers/net/wan/n2.c | 9 +- + drivers/net/wan/pc300_drv.c | 17 +- + drivers/net/wan/pc300too.c | 73 +- + drivers/net/wan/pci200syn.c | 77 +- + drivers/net/wan/syncppp.c | 1480 ----------------------------- + include/linux/hdlc.h | 2 +- + include/net/syncppp.h | 102 -- + 17 files changed, 1372 insertions(+), 2061 deletions(-) + delete mode 100644 Documentation/DocBook/wanbook.tmpl + rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) + create mode 100644 drivers/net/wan/hd64572.c + delete mode 100644 drivers/net/wan/syncppp.c + delete mode 100644 include/net/syncppp.h +Merging drm/drm-next +$ git merge drm/drm-next +Merge made by recursive. + drivers/gpu/drm/i915/Makefile | 3 ++- + drivers/gpu/drm/i915/i915_drv.h | 7 +++++++ + drivers/gpu/drm/radeon/radeon_cp.c | 15 ++++++++------- + drivers/gpu/drm/radeon/radeon_drv.h | 12 ++++++------ + 4 files changed, 23 insertions(+), 14 deletions(-) +Merging voltage/for-linus +$ git merge voltage/for-linus +Merge made by recursive. + drivers/Kconfig | 2 ++ + drivers/regulator/da903x.c | 29 +++++++++++++++++------------ + 2 files changed, 19 insertions(+), 12 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Auto-merged net/ipv4/cipso_ipv4.c +Merge made by recursive. + net/ipv4/cipso_ipv4.c | 7 ++++--- + net/netlabel/netlabel_mgmt.c | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging quilt/ttydev +$ git merge quilt/ttydev +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging creds/creds-v4 +$ git merge creds/creds-v4 +Auto-merged arch/ia64/kernel/perfmon.c +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/s390/hypfs/inode.c +Auto-merged arch/x86/mm/fault.c +Auto-merged drivers/net/tun.c +Auto-merged fs/binfmt_elf.c +Auto-merged fs/cifs/cifsproto.h +Auto-merged fs/cifs/connect.c +Auto-merged fs/gfs2/inode.c +Auto-merged fs/ocfs2/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 +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/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/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/futex.c +Auto-merged kernel/kmod.c +Auto-merged kernel/sched.c +Auto-merged kernel/sysctl.c +Auto-merged kernel/trace/trace.c +Auto-merged kernel/workqueue.c +Auto-merged lib/Makefile +Auto-merged mm/migrate.c +Auto-merged net/9p/client.c +Auto-merged net/core/dev.c +Auto-merged net/ipv6/ip6_flowlabel.c +Auto-merged net/ipv6/netfilter/ip6t_LOG.c +Auto-merged security/selinux/hooks.c +Auto-merged security/selinux/selinuxfs.c +Recorded preimage for 'fs/xfs/linux-2.6/xfs_cred.h' +Recorded preimage for 'fs/xfs/linux-2.6/xfs_globals.h' +Recorded preimage for 'fs/xfs/xfs_vnodeops.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/xfs/linux-2.6/xfs_cred.h'. +Recorded resolution for 'fs/xfs/linux-2.6/xfs_globals.h'. +Recorded resolution for 'fs/xfs/xfs_vnodeops.h'. +Created commit b0e3205: Merge commit 'creds/creds-v4' +$ git diff -M --stat --summary HEAD^.. + Documentation/credentials.txt | 582 +++++++++++++ + arch/alpha/kernel/asm-offsets.c | 11 +- + arch/alpha/kernel/entry.S | 10 +- + arch/ia64/ia32/sys_ia32.c | 7 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/perfmon.c | 43 +- + arch/ia64/kernel/signal.c | 4 +- + arch/mips/kernel/kspd.c | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 5 +- + arch/mips/kernel/vpe.c | 4 +- + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 8 +- + arch/s390/hypfs/inode.c | 4 +- + arch/s390/kernel/compat_linux.c | 28 +- + arch/um/drivers/mconsole_kern.c | 3 +- + arch/x86/ia32/ia32_aout.c | 2 +- + arch/x86/mm/fault.c | 2 +- + drivers/block/loop.c | 6 +- + drivers/char/tty_audit.c | 6 +- + drivers/connector/cn_proc.c | 16 +- + drivers/isdn/capi/capifs.c | 4 +- + drivers/isdn/hysdn/hysdn_procconf.c | 6 +- + drivers/net/tun.c | 8 +- + drivers/usb/core/devio.c | 10 +- + drivers/usb/core/inode.c | 4 +- + fs/9p/fid.c | 2 +- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_super.c | 4 +- + fs/affs/inode.c | 4 +- + fs/affs/super.c | 4 +- + fs/anon_inodes.c | 4 +- + fs/attr.c | 4 +- + fs/autofs/inode.c | 4 +- + fs/autofs4/dev-ioctl.c | 3 +- + fs/autofs4/inode.c | 4 +- + fs/autofs4/waitq.c | 4 +- + fs/bfs/dir.c | 4 +- + fs/binfmt_aout.c | 2 +- + fs/binfmt_elf.c | 20 +- + fs/binfmt_elf_fdpic.c | 19 +- + fs/binfmt_flat.c | 2 +- + fs/binfmt_som.c | 2 +- + fs/cifs/cifs_fs_sb.h | 2 +- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 4 +- + fs/cifs/dir.c | 12 +- + fs/cifs/inode.c | 8 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/misc.c | 4 +- + fs/coda/cache.c | 6 +- + fs/coda/file.c | 2 +- + fs/coda/upcall.c | 2 +- + fs/compat.c | 42 +- + fs/devpts/inode.c | 4 +- + fs/dquot.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 3 +- + fs/ecryptfs/kthread.c | 9 +- + fs/ecryptfs/main.c | 3 +- + fs/ecryptfs/messaging.c | 18 +- + fs/ecryptfs/miscdev.c | 20 +- + fs/exec.c | 183 +++-- + fs/exportfs/expfs.c | 4 +- + fs/ext2/balloc.c | 2 +- + fs/ext2/ialloc.c | 4 +- + fs/ext3/balloc.c | 2 +- + fs/ext3/ialloc.c | 4 +- + fs/ext4/balloc.c | 5 +- + fs/ext4/ialloc.c | 4 +- + fs/fat/file.c | 2 +- + fs/fat/inode.c | 4 +- + fs/fcntl.c | 18 +- + fs/file_table.c | 10 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 25 +- + fs/gfs2/inode.c | 10 +- + fs/hfs/inode.c | 4 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/inode.c | 4 +- + fs/hfsplus/options.c | 4 +- + fs/hpfs/namei.c | 24 +- + fs/hpfs/super.c | 4 +- + fs/hppfs/hppfs.c | 6 +- + fs/hugetlbfs/inode.c | 21 +- + fs/inotify_user.c | 2 +- + fs/internal.h | 6 + + fs/ioprio.c | 18 +- + fs/jfs/jfs_inode.c | 4 +- + fs/locks.c | 2 +- + fs/minix/bitmap.c | 4 +- + fs/namei.c | 10 +- + fs/namespace.c | 2 +- + fs/ncpfs/ioctl.c | 91 +-- + fs/nfsctl.c | 3 +- + fs/nfsd/auth.c | 95 ++- + fs/nfsd/nfs4recover.c | 71 +- + fs/nfsd/nfsfh.c | 11 +- + fs/nfsd/vfs.c | 9 +- + fs/ocfs2/dlm/dlmfs.c | 8 +- + fs/ocfs2/namei.c | 4 +- + fs/omfs/inode.c | 8 +- + fs/open.c | 59 +- + fs/pipe.c | 4 +- + fs/posix_acl.c | 4 +- + fs/proc/array.c | 32 +- + fs/proc/base.c | 32 +- + fs/quota.c | 4 +- + fs/ramfs/inode.c | 4 +- + fs/reiserfs/namei.c | 4 +- + fs/smbfs/dir.c | 3 +- + fs/smbfs/inode.c | 2 +- + fs/smbfs/proc.c | 2 +- + fs/sysv/ialloc.c | 4 +- + fs/ubifs/budget.c | 2 +- + fs/ubifs/dir.c | 4 +- + fs/udf/ialloc.c | 4 +- + fs/udf/namei.c | 2 +- + fs/ufs/ialloc.c | 4 +- + fs/xfs/linux-2.6/xfs_cred.h | 4 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 5 +- + fs/xfs/xfs_acl.c | 6 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_vnodeops.h | 6 +- + include/keys/keyring-type.h | 31 + + include/linux/binfmts.h | 16 +- + include/linux/capability.h | 2 - + include/linux/cred.h | 340 +++++++- + include/linux/fs.h | 8 +- + include/linux/init_task.h | 13 +- + include/linux/key-ui.h | 66 -- + include/linux/key.h | 32 +- + include/linux/keyctl.h | 4 +- + include/linux/sched.h | 64 +-- + include/linux/securebits.h | 2 +- + include/linux/security.h | 326 ++++---- + include/net/scm.h | 4 +- + init/main.c | 1 + + ipc/mqueue.c | 19 +- + ipc/shm.c | 9 +- + ipc/util.c | 18 +- + kernel/Makefile | 2 +- + kernel/acct.c | 7 +- + kernel/auditsc.c | 57 +- + kernel/capability.c | 268 +------ + kernel/cgroup.c | 17 +- + kernel/cred-internals.h | 21 + + kernel/cred.c | 577 +++++++++++++ + kernel/exit.c | 23 +- + kernel/fork.c | 44 +- + kernel/futex.c | 20 +- + kernel/futex_compat.c | 7 +- + kernel/kmod.c | 30 +- + kernel/ptrace.c | 29 +- + kernel/sched.c | 26 +- + kernel/signal.c | 60 +- + kernel/sys.c | 579 ++++++++------ + kernel/sysctl.c | 2 +- + kernel/timer.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/tsacct.c | 6 +- + kernel/uid16.c | 31 +- + kernel/user.c | 37 +- + kernel/user_namespace.c | 14 +- + kernel/workqueue.c | 8 +- + lib/Makefile | 2 +- + lib/is_single_threaded.c | 45 + + mm/mempolicy.c | 9 +- + mm/migrate.c | 9 +- + mm/oom_kill.c | 6 +- + mm/shmem.c | 8 +- + net/9p/client.c | 2 +- + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 2 +- + net/core/dev.c | 8 +- + net/core/scm.c | 10 +- + net/ipv4/netfilter/ipt_LOG.c | 4 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/netfilter/ip6t_LOG.c | 4 +- + net/netfilter/nfnetlink_log.c | 5 +- + net/netfilter/xt_owner.c | 16 +- + net/netrom/af_netrom.c | 4 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/ar-key.c | 6 +- + net/sched/cls_flow.c | 4 +- + net/socket.c | 4 +- + net/sunrpc/auth.c | 14 +- + net/unix/af_unix.c | 11 +- + security/capability.c | 56 +- + security/commoncap.c | 699 ++++++++++------ + security/keys/internal.h | 47 +- + security/keys/key.c | 25 +- + security/keys/keyctl.c | 210 +++-- + security/keys/keyring.c | 15 +- + security/keys/permission.c | 29 +- + security/keys/proc.c | 8 +- + security/keys/process_keys.c | 469 +++++------ + security/keys/request_key.c | 133 ++-- + security/keys/request_key_auth.c | 46 +- + security/root_plug.c | 13 +- + security/security.c | 96 +-- + security/selinux/exports.c | 8 +- + security/selinux/hooks.c | 1151 ++++++++++++++------------ + security/selinux/include/av_perm_to_string.h | 2 + + security/selinux/include/av_permissions.h | 2 + + security/selinux/include/class_to_string.h | 5 + + security/selinux/include/flask.h | 1 + + security/selinux/include/objsec.h | 11 - + security/selinux/selinuxfs.c | 13 +- + security/selinux/xfrm.c | 6 +- + security/smack/smack_access.c | 4 +- + security/smack/smack_lsm.c | 173 +++-- + security/smack/smackfs.c | 6 +- + 212 files changed, 5058 insertions(+), 3094 deletions(-) + create mode 100644 Documentation/credentials.txt + create mode 100644 include/keys/keyring-type.h + delete mode 100644 include/linux/key-ui.h + create mode 100644 kernel/cred-internals.h + create mode 100644 kernel/cred.c + create mode 100644 lib/is_single_threaded.c +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already 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 +Already uptodate! +Merge made by recursive. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/Kconfig | 12 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/acquirewdt.c | 6 +- + drivers/watchdog/advantechwdt.c | 6 +- + drivers/watchdog/bfin_wdt.c | 2 +- + drivers/watchdog/eurotechwdt.c | 4 +- + drivers/watchdog/i6300esb.c | 3 +- + drivers/watchdog/ib700wdt.c | 55 ++-- + drivers/watchdog/indydog.c | 2 +- + drivers/watchdog/mpcore_wdt.c | 4 +- + drivers/watchdog/omap_wdt.c | 2 +- + drivers/watchdog/pcwd_pci.c | 2 +- + drivers/watchdog/pcwd_usb.c | 2 +- + drivers/watchdog/rc32434_wdt.c | 3 +- + drivers/watchdog/s3c2410_wdt.c | 2 +- + drivers/watchdog/sa1100_wdt.c | 2 +- + drivers/watchdog/sb_wdog.c | 4 +- + drivers/watchdog/sbc8360.c | 6 +- + drivers/watchdog/sbc_epx_c3.c | 2 +- + drivers/watchdog/sch311x_wdt.c | 578 +++++++++++++++++++++++++++++++++++++ + drivers/watchdog/smsc37b787_wdt.c | 2 +- + drivers/watchdog/softdog.c | 3 +- + drivers/watchdog/w83627hf_wdt.c | 6 +- + drivers/watchdog/w83697hf_wdt.c | 4 +- + drivers/watchdog/wafer5823wdt.c | 4 +- + drivers/watchdog/wdt.c | 4 +- + drivers/watchdog/wdt285.c | 3 +- + drivers/watchdog/wdt_pci.c | 4 +- + 28 files changed, 654 insertions(+), 74 deletions(-) + create mode 100644 drivers/watchdog/sch311x_wdt.c +Merging proc/proc +$ git merge proc/proc +Merge made by recursive. + fs/proc/generic.c | 8 ++------ + fs/proc/inode.c | 3 --- + fs/proc/proc_net.c | 2 +- + fs/proc/root.c | 8 +------- + fs/proc/uptime.c | 38 ++++++++++++++++++++------------------ + 5 files changed, 24 insertions(+), 35 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cpu_alloc/cpu_alloc +$ git merge cpu_alloc/cpu_alloc +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/sparc64/kernel/smp.c +Auto-merged arch/x86/kernel/setup_percpu.c +Auto-merged include/linux/percpu.h +Auto-merged init/main.c +Auto-merged kernel/lockdep.c +CONFLICT (content): Merge conflict in kernel/lockdep.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged mm/Makefile +Auto-merged mm/vmstat.c +Resolved 'kernel/lockdep.c' using previous resolution. +Resolved 'kernel/module.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 69ff415: Merge commit 'cpu_alloc/cpu_alloc' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 7 ++ + arch/ia64/include/asm/percpu.h | 2 +- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/sparc64/kernel/smp.c | 2 +- + arch/x86/kernel/setup_percpu.c | 2 +- + include/linux/module.h | 1 + + include/linux/percpu.h | 76 +++++++++++++- + include/linux/vmstat.h | 2 +- + init/main.c | 20 ++++- + kernel/lockdep.c | 2 +- + kernel/module.c | 173 ++------------------------------ + mm/Makefile | 2 +- + mm/cpu_alloc.c | 188 +++++++++++++++++++++++++++++++++++ + mm/vmstat.c | 1 + + 14 files changed, 305 insertions(+), 177 deletions(-) + create mode 100644 mm/cpu_alloc.c +Merging userns/next +$ git merge userns/next +Auto-merged include/linux/sched.h +Auto-merged kernel/fork.c +Merge made by recursive. + fs/ecryptfs/messaging.c | 13 +++---- + fs/ecryptfs/miscdev.c | 19 ++++------ + include/linux/cred.h | 2 + + include/linux/init_task.h | 1 - + include/linux/nsproxy.h | 1 - + include/linux/sched.h | 1 + + include/linux/user_namespace.h | 13 ++----- + kernel/cred.c | 15 +++++++- + kernel/fork.c | 19 ++++++++-- + kernel/nsproxy.c | 15 +------- + kernel/sys.c | 4 +- + kernel/user.c | 47 +++++++------------------ + kernel/user_namespace.c | 75 ++++++++++++++++------------------------ + 13 files changed, 96 insertions(+), 129 deletions(-) +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +$ git am -3 ../patches/0001-sparc-qlogicpti-fallout-from-sbus-removal.patch +Applying sparc: qlogicpti fallout from sbus removal +$ git am -3 ../patches/Work_around_ld_bug_in_older_binutils +Applying Work around ld bug in older binutils +$ git am -3 ../patches/ftrace__rename_FTRACE_to_FUNCTION_TRACER_more_successfully. +Applying ftrace: rename FTRACE to FUNCTION_TRACER more successfully. +$ git am -3 ../patches/nfsctl__credentials_error +Applying nfsctl: credentials error +$ git am -3 ../patches/coda__credentials_error +Applying coda: credentials error +$ git am -3 ../patches/0001-cpu_alloc-per_cpu_offset-is-already-defined-for-CO.patch +Applying cpu_alloc: per_cpu_offset is already defined for !CONFIG_SMP +$ git am -3 ../patches/ia64__Fix_gru_compiler_warning +Applying ia64: Fix gru compiler warning diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..56c9fa91310e --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,56 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Unchanged quilt series m68k +Unchanged quilt series driver-core +Unchanged quilt series usb +Importing device-mapper based on v2.6.28-rc2-95-g49fdf67 +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard 49fdf6785fd660e18a1eb4588928f47e9fa29a9a +HEAD is now at 49fdf67 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-snap-fix-register_snapshot-deadlock.patch +Unchanged quilt series i2c +Unchanged quilt series jdelvare-hwmon +Unchanged quilt series kernel-doc +Importing ide based on 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +$ git checkout quilt/ide +Switched to branch "quilt/ide" +$ git reset --hard 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 +HEAD is now at 57f8f7b Linux 2.6.28-rc1 +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-cd-fix-dma-alignment-regression.patch +ide-switch-to-a-common-address.patch +tx4938ide-check-minimum-cycle-time-and-shwt-range.patch +tx4938ide-do-not-call-devm_ioremap-for-whole-128kb.patch +tx4938ide-avoid-underflow-on-calculation-of-a-wait-cycle.patch +ide-gd-re-get-floppy-capacity-on-revalidate.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 +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 +Importing rr based on v2.6.28-rc2-185-ge946217 +$ git checkout quilt/rr +Switched to branch "quilt/rr" +$ git reset --hard e946217e4fdaa67681bbabfa8e6b18641921f750 +HEAD is now at e946217 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +virtio:net_recycle_some_more_rx_buffer_pages.patch +virtio:net_hook_up_the_set_tso_ethtool_op.patch +lguest:fix-moved-asm-dir.patch +lguest:fix-efi.patch +lguest:fix-irq-vectors.patch +virtio:net-mergeable-rx-bufs.patch +lguest:move_the_initial_guest_page_table_creation_code_to_the_host.patch +module:remove_config_kmod.patch +Unchanged quilt series ttydev diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..09324fc7cb76 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20081030 |