diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-20 17:25:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-20 17:25:45 +1100 |
| commit | 7d6d34122d4dbd2c7f00476d6f97fcea8aa32c37 (patch) | |
| tree | a336d0f979233608031cc73321268e49065360e3 | |
| parent | 91995dd9d6079f4489445d1baec9934ba1036482 (diff) | |
Add linux-next specific files for 20090120next-20090120
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 134 | ||||
| -rw-r--r-- | Next/Trees | 136 | ||||
| -rw-r--r-- | Next/merge.log | 2845 | ||||
| -rw-r--r-- | Next/quilt-import.log | 50 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3166 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c7504eea89da --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,134 @@ +Name SHA1 +---- ---- +origin f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b +arm-current cdba4b7d98e56fcfdf136c6e019a3ba12f5f3efc +m68k-current 877d52431f4d3cda4adea077ffbe88f3fd1755d3 +powerpc-merge f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b +sparc-current f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b +scsi-rc-fixes 32aeef605aa01e1fee45e052eceffb00e72ba2b0 +net-current 62608864ada074fc67a1435eba7ba5fa70644a51 +sound-current 6e78b780efdfc5cfbd3c92df7dbdfb5c81aa2a15 +pci-current c2fdd36b550659f5ac2240d1f5a83ffa1a092289 +wireless-current 674743033c1ae9f7cc94e1e0037f6f719e6d1d67 +kbuild-current df291fa993c506da89a89264ff8166bccd172a14 +driver-core.current 5df2cb05f04d0ffe0f8a4129158e58248c5083ee +usb.current 7a64bf1b6370628b834f4986f9fa148f6e007600 +cpufreq-current f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b +input-current 27f23336bcc1b08512751c878b3e05ed6b815e86 +md-current 4044ba58dd15cb01797c4fd034f39ef4a75f7cc3 +audit-current c05a63c58c2884c4db00308ba5eb0dbac2fb5ac9 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b +avr32 61f3632fdcdcf547f6487f56b45976d7964756c4 +blackfin 06af15e086e39a5a2a2413973a64af8e10122f28 +cris 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 +ia64 1de9e8e70f5acc441550ca75433563d91b269bbe +m68k 877d52431f4d3cda4adea077ffbe88f3fd1755d3 +m68knommu 49148020bcb6910ce71417bd990a5ce7017f9bd3 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc ae16489eb1175066c8f3008fc3c0396c525e1906 +powerpc f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b +4xx 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 +galak ea0105ea3881b409e362451690184af494bce6e3 +pxa 9a8585e138d7d6285d50ab3cf3cce4fdb9d4dbd1 +s390 a6525042bfdfcab128bd91fad264de10fd24a55e +sh fca0943425b2f3ae292f353e3f5add9a0c08881b +sparc 6680598b44ed3c0052d155522eb21fc5a00de5f3 +x86 5bf5e7d3d121a6651df02bf63e3de5b841c8af6c +xtensa 8903709b054a8dafe4e8c6d9a6444034d7aba36f +driver-core c0cdf4791676b423766cad9fdb8129cee0662794 +usb c0cdf4791676b423766cad9fdb8129cee0662794 +tip-core 16967e08a9498509f854667c50b4d1a23493bd3b +cpus4096 c99dbbe9f8f6b3e9383e64710217e873431d1c31 +ftrace 00ab3756ef617434d3f1bd3797efeda5c5aabe30 +genirq 1faa44855f8f1e9b2cd46e9227ad23c3301556c1 +safe-poison-pointers 286c12f72ad295bbc27cfe67b0922bfc09732af7 +sched d1aae69963a31c870bc330f4428fa902db288ad4 +stackprotector 59ccb2385ef6566bc51ab04ea7b901f7f46edd1d +timers 0ccf02e6669b764f54613f405059ce7d0c54b35b +pci 27637a55c5b67044fab75ecbfe3d81a2f0812508 +device-mapper e468ea8c69698c3ef03cc064c2e31c5260a4a79c +hid 58e363fdc44ab31b781c6995a5135469ae7d8b96 +i2c 48917c1123929d86f0bd501c5684ddbe28cb3b7a +jdelvare-hwmon 68bb0fb80d70d89f96fef5f844d6bb6753dd4acb +kernel-doc 7591103c08abade60aeddb432ed0686ddd0de1c6 +v4l-dvb ca57639da6141d2f9592e09681362e9bcd64178e +quota 84fbd499651800207d90a25f951cad8afac4708f +jfs fec1878fe952b994125a3be7c94b1322db586f3b +kbuild b67ff8ce122f3353bd741db48ce1756c12fb5f2d +ide 53cec23b74180ad3889583b336aa9387c79978dd +libata 5393f780277165f282a37ed82dd878159ec9dad5 +nfs bb400772524cc29470eee262cd7aa1268932930f +xfs 55622c6df3600267b1d61fa7e8a4d9341de3db24 +infiniband aae39041210b008381babda673b9d76646a5430b +acpi 7945428dbc737e27e56ed5b4db6db4eb65212c84 +nfsd cc5a9072abb1ca674f03357b261e963132f6dd90 +ieee1394 e967c702f1ca0f88acbfa0524ffe6117fb5bbc3f +ubi 3013ee31b6c5fd9a49a81816d6c13e1cdb7a1288 +kvm 5326eee2be7b747e71f29b9b6abeb7255b4e352a +dlm c7be761a8163d2f1ac0b606c21e4316b7abc5af7 +scsi bd21ed64ec1950f32706a54ecdbe93901fbc03a9 +ocfs2 046a40cbfbfa6d256dd203c7294322caff500c6c +ext4 c1aa87aa364b5d665978f8e9f8fe4a54448fedcc +async_tx 169d5f663759ec494aa74a552ce99486235e6e50 +udf 61edc2f987fc5e5f84dd098c4b6b488662ef37a4 +net 3c92ec8ae91ecf59d88c798301833d7cf83f2179 +mtd 3afd522de8d8ec446efe957b86e4f63e3dd8ce9d +wireless 9cf7f247bd0cd21e475c71a4e018bb612ef02aab +crypto 9afc33f2f32204a779ef6c96728a034bcf4df29f +vfs fd217f4d70172c526478f2bc76859e909fdfa674 +sound 38410e96e57dd9558fe53f7fd2d09f46ed57fcd4 +cpufreq 77a33c31a78c6cd11395c8b554152be684110e94 +v9fs f1d9e4586e79e1fc7b26d1c567599a904013f199 +rr c7e2d0997eccb324b9483871e23f1e02efe9afd5 +cifs f89d4921c413dc3cb3e32494f1e7976c9805ac7c +mmc 418f19ea17a99421b22a64e101e14b6a16bed66d +gfs2 7e9198f97f28f9c8ebf4117c50809608c79379dd +input c59765042f53a79a7a65585042ff463b69cb248c +bkl-removal 7232c910b7bcf86e8985f7029bba2f0a80d31df3 +ubifs e8b815663b1bfd9c255af5176604ec0eafdf6ed7 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block d3f761104b097738932afcc310fbbbbfb007ef92 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware f0c996e7399bb6aca523119a568b56c98bbe16df +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery ed8c3174dd227031d1f3b9fa4fbb512f8f623434 +leds f5f37177614739d9f02d036a2c9eb752d6ff63bc +backlight 8fd4c8b7fc804c3ccf7f6b1d2f3db0e9b8e25609 +kgdb 0136574e061924dc236a611f28e881a12ab6822a +slab 1a9582610a0e0b3db0b2ca52cb787a2732528f54 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 4044ba58dd15cb01797c4fd034f39ef4a75f7cc3 +kmemcheck 72accebb513bcb4ab345719135baf5d242464dac +generic-ipi 6a94cb73064c952255336cc57731904174b2c58f +mfd d992c8403a72c4067587a32a7736bcc2af6c408f +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 34b8686e12eaf9878aaab89e92222060c3e7cc48 +voltage 2f1f740085fd6cb414c3b6eba92352fb820d3db1 +security-testing cd89596f0ccfa3ccb8a81ce47782231cf7ea7296 +lblnet ede6f5aea054d3fb67c78857f7abdee602302043 +ttydev 5a48823b16a89e43ed30fd79d8097df22ace5517 +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +oprofile 5ac9919ca2707f800e80657eadf9afc719807afd +fastboot 6a94cb73064c952255336cc57731904174b2c58f +sparseirq ac8931efd29418a669d66831a818e2ff736e4e82 +iommu 322957b8ca8c9d2e18c93f88527e84ce6960ad39 +uwb a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c +watchdog 478fbf9551ec27784be684a4a6de385a4ceb2631 +proc 7f97784510006c41f045d97f1c48f7c639715873 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 0b4e7781aee2f03a6f9577a4268c96d6072be59d +cpu_alloc c905c8806c7df091085a66bab590c3ee499b86cc +cputime c742b31c03f37c5c499178f09f57381aa6c70131 +osd f6d15b9467ffe6882166620d6739305d97b756c5 +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +fuse 5d9ec854bfb6f1e122b1d96b344164a71eac5be8 +jc_docs 7ead643f665c618d4bbd9efb68595fa41b2eb93b +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial fa22aa45ce33295529d358b17ad359284883590b +audit b3985e2bf6ce51ae943208af4bd336287fb34ed6 +squashfs fc55584175589b70f4c30cb594f09f4bd6ad5d40 +omap c59765042f53a79a7a65585042ff463b69cb248c +kmemleak aa6d73d3be6fe763067d6a0549e2e28f701c7a36 +staging 1454baaa278e49555f21f80263a12185dbd4ade2 +scsi-post-merge 238c6d54830c624f34ac9cf123ac04aebfca5013 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a1217a639db8 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,136 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/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/tip/linux-2.6-tip.git#auto-x86-next +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-timers-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/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 +quota git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6.git#for_next +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr 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 +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next +fastboot git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next +sparseirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-iommu-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +proc git git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git#proc +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cpu_alloc git git://git.kernel.org/pub/scm/linux/kernel/git/christoph/work.git#cpu_alloc +cputime git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +kmemleak git git://linux-arm.org/linux-2.6.git#kmemleak +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/ +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..f9846fb519ef --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2845 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at f3b8436 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband +Merging origin/master +$ git merge origin/master +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. + drivers/mfd/pcf50633-core.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Removed arch/arm/plat-omap/include/mach/aic23.h +Merge made by recursive. + arch/arm/mach-davinci/usb.c | 1 + + arch/arm/mach-omap1/board-h2.c | 45 +----------- + arch/arm/mach-omap1/board-h3.c | 50 ------------ + arch/arm/mach-omap1/board-innovator.c | 39 --------- + arch/arm/mach-omap1/board-nokia770.c | 8 ++- + arch/arm/mach-omap1/board-osk.c | 43 +---------- + arch/arm/mach-omap1/board-palmte.c | 29 ------- + arch/arm/mach-omap1/board-palmtt.c | 41 ---------- + arch/arm/mach-omap1/board-palmz71.c | 37 --------- + arch/arm/mach-omap1/board-sx1.c | 39 +-------- + arch/arm/mach-omap1/board-voiceblue.c | 1 - + arch/arm/mach-omap1/mcbsp.c | 1 + + arch/arm/mach-omap2/board-apollon.c | 64 ++-------------- + arch/arm/mach-omap2/board-ldp.c | 2 +- + arch/arm/mach-omap2/board-omap3beagle.c | 9 +- + arch/arm/mach-omap2/mcbsp.c | 1 + + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/plat-omap/dma.c | 13 +-- + arch/arm/plat-omap/gpio.c | 3 + + arch/arm/plat-omap/include/mach/aic23.h | 116 ---------------------------- + arch/arm/plat-omap/include/mach/board-h3.h | 4 +- + arch/arm/plat-omap/include/mach/gpio.h | 10 --- + arch/arm/plat-omap/include/mach/mcbsp.h | 11 +++ + arch/arm/plat-omap/mcbsp.c | 4 + + drivers/char/hw_random/omap-rng.c | 2 +- + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mtd/onenand/omap2.c | 6 +- + drivers/video/omap/lcdc.c | 4 +- + 29 files changed, 65 insertions(+), 524 deletions(-) + delete mode 100644 arch/arm/plat-omap/include/mach/aic23.h +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/wireless/ath9k/rc.c | 2 +- + drivers/net/wireless/ath9k/regd_common.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- + drivers/net/wireless/libertas/hostcmd.h | 91 ++++++++++---------- + drivers/net/wireless/p54/p54common.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00rfkill.c | 2 +- + include/net/mac80211.h | 1 - + net/mac80211/sta_info.h | 1 - + net/wireless/reg.c | 128 ++++++++++++++++++++++++--- + 10 files changed, 170 insertions(+), 67 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + Documentation/kernel-parameters.txt | 7 ------- + sound/pci/Kconfig | 4 ++-- + sound/pci/hda/patch_realtek.c | 2 ++ + sound/pci/hda/patch_sigmatel.c | 17 +++++++++-------- + sound/pci/oxygen/virtuoso.c | 3 ++- + sound/soc/atmel/atmel-pcm.c | 2 -- + 6 files changed, 15 insertions(+), 20 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + drivers/pci/hotplug/pciehp_core.c | 4 +- + drivers/pci/msi.c | 16 +++---- + drivers/pci/pci-driver.c | 91 +++++++++++-------------------------- + drivers/pci/pci.c | 63 +++++++++++++++++++++++--- + drivers/pci/pci.h | 6 +++ + include/linux/pci.h | 5 ++ + 6 files changed, 105 insertions(+), 80 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Auto-merged Makefile +Removed arch/x86/scripts/strip-symbols +Auto-merged init/Kconfig +Removed scripts/strip-symbols +Merge made by recursive. + Documentation/kbuild/kbuild.txt | 29 +++--- + Makefile | 59 ++++-------- + arch/x86/scripts/strip-symbols | 1 - + init/Kconfig | 7 -- + kernel/kallsyms.c | 16 ++- + scripts/Makefile.build | 55 ++++------- + scripts/Makefile.modinst | 3 +- + scripts/config | 4 + + scripts/genksyms/genksyms.c | 21 +--- + scripts/genksyms/keywords.c_shipped | 189 +++++++++++++++++------------------ + scripts/genksyms/keywords.gperf | 2 - + scripts/kallsyms.c | 21 +++-- + scripts/mksysmap | 7 +- + scripts/strip-symbols | 22 ---- + 14 files changed, 185 insertions(+), 251 deletions(-) + delete mode 100644 arch/x86/scripts/strip-symbols + delete mode 100644 scripts/strip-symbols +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + drivers/base/core.c | 6 ++++++ + scripts/mod/file2alias.c | 17 +++++++++++++++-- + 2 files changed, 21 insertions(+), 2 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/serial/cp2101.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Auto-merged drivers/input/keyboard/atkbd.c +Auto-merged drivers/input/keyboard/omap-keypad.c +Merge made by recursive. + drivers/input/keyboard/atkbd.c | 4 ++-- + drivers/input/keyboard/corgikbd.c | 8 ++++---- + drivers/input/keyboard/omap-keypad.c | 8 ++++---- + drivers/input/keyboard/spitzkbd.c | 8 ++++---- + drivers/input/mouse/Kconfig | 2 +- + drivers/input/touchscreen/corgi_ts.c | 9 +++++---- + drivers/input/touchscreen/usbtouchscreen.c | 19 +++++++++++++++++-- + drivers/media/video/uvc/uvc_status.c | 10 ++++++---- + 8 files changed, 43 insertions(+), 25 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/include/asm/uaccess.h | 8 ++-- + arch/avr32/kernel/entry-avr32b.S | 60 ++++++++++++++++++------------------ + arch/avr32/kernel/syscall-stubs.S | 14 ++++---- + arch/avr32/lib/strnlen_user.S | 2 +- + 4 files changed, 42 insertions(+), 42 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Auto-merged Makefile +CONFLICT (delete/modify): arch/m68knommu/include/asm/Kbuild deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68knommu/include/asm/Kbuild left in tree. +Removed arch/m68knommu/include/asm/cachectl.h +Removed arch/m68knommu/include/asm/cputime.h +Removed arch/m68knommu/include/asm/errno.h +Removed arch/m68knommu/include/asm/fcntl.h +Removed arch/m68knommu/include/asm/hwtest.h +Removed arch/m68knommu/include/asm/ioctls.h +Removed arch/m68knommu/include/asm/ipcbuf.h +Removed arch/m68knommu/include/asm/linkage.h +Removed arch/m68knommu/include/asm/local.h +Removed arch/m68knommu/include/asm/math-emu.h +Removed arch/m68knommu/include/asm/md.h +Removed arch/m68knommu/include/asm/mman.h +Removed arch/m68knommu/include/asm/movs.h +Removed arch/m68knommu/include/asm/msgbuf.h +Removed arch/m68knommu/include/asm/openprom.h +Removed arch/m68knommu/include/asm/oplib.h +Removed arch/m68knommu/include/asm/percpu.h +Removed arch/m68knommu/include/asm/poll.h +Removed arch/m68knommu/include/asm/posix_types.h +Removed arch/m68knommu/include/asm/resource.h +Removed arch/m68knommu/include/asm/rtc.h +Removed arch/m68knommu/include/asm/sections.h +Removed arch/m68knommu/include/asm/sembuf.h +Removed arch/m68knommu/include/asm/shm.h +Removed arch/m68knommu/include/asm/shmbuf.h +Removed arch/m68knommu/include/asm/shmparam.h +Removed arch/m68knommu/include/asm/socket.h +Removed arch/m68knommu/include/asm/sockios.h +Removed arch/m68knommu/include/asm/spinlock.h +Removed arch/m68knommu/include/asm/stat.h +Removed arch/m68knommu/include/asm/statfs.h +Removed arch/m68knommu/include/asm/termbits.h +Removed arch/m68knommu/include/asm/termios.h +Removed arch/m68knommu/include/asm/tlb.h +Removed arch/m68knommu/include/asm/types.h +Removed arch/m68knommu/include/asm/user.h +Removed include/asm-m68k/auxvec.h +Removed include/asm-m68k/device.h +Removed include/asm-m68k/emergency-restart.h +Removed include/asm-m68k/futex.h +Removed include/asm-m68k/ioctl.h +Removed include/asm-m68k/irq_regs.h +Removed include/asm-m68k/kdebug.h +Removed include/asm-m68k/mutex.h +Removed include/asm-m68k/topology.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/m68knommu/include/asm/Kbuild +arch/m68knommu/include/asm/Kbuild: needs merge +rm 'arch/m68knommu/include/asm/Kbuild' +rm 'arch/m68knommu/include/asm/Kbuild' +$ git commit -v -a +Created commit 8076679: Merge commit 'm68knommu/for-next' +$ git diff -M --stat --summary HEAD^.. + Makefile | 4 ++++ + {include/asm-m68k => arch/m68k/include/asm}/Kbuild | 0 + arch/{m68knommu => m68k}/include/asm/MC68328.h | 0 + arch/{m68knommu => m68k}/include/asm/MC68332.h | 0 + arch/{m68knommu => m68k}/include/asm/MC68EZ328.h | 0 + arch/{m68knommu => m68k}/include/asm/MC68VZ328.h | 0 + .../m68k/include/asm}/a.out-core.h | 0 + .../asm-m68k => arch/m68k/include/asm}/a.out.h | 0 + .../asm-m68k => arch/m68k/include/asm}/adb_iop.h | 0 + .../asm-m68k => arch/m68k/include/asm}/amigahw.h | 0 + .../asm-m68k => arch/m68k/include/asm}/amigaints.h | 0 + .../asm-m68k => arch/m68k/include/asm}/amigayle.h | 0 + .../asm-m68k => arch/m68k/include/asm}/amipcmcia.h | 0 + arch/{m68knommu => m68k}/include/asm/anchor.h | 0 + .../asm-m68k => arch/m68k/include/asm}/apollodma.h | 0 + .../asm-m68k => arch/m68k/include/asm}/apollohw.h | 0 + .../asm-m68k => arch/m68k/include/asm}/atafd.h | 0 + .../asm-m68k => arch/m68k/include/asm}/atafdreg.h | 0 + .../m68k/include/asm}/atari_joystick.h | 0 + .../m68k/include/asm}/atari_stdma.h | 0 + .../m68k/include/asm}/atari_stram.h | 0 + .../asm-m68k => arch/m68k/include/asm}/atarihw.h | 0 + .../asm-m68k => arch/m68k/include/asm}/atariints.h | 0 + .../asm-m68k => arch/m68k/include/asm}/atarikb.h | 0 + arch/m68k/include/asm/atomic.h | 5 +++++ + .../atomic.h => arch/m68k/include/asm/atomic_mm.h | 0 + .../asm/atomic.h => m68k/include/asm/atomic_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/auxvec.h | 0 + arch/m68k/include/asm/bitops.h | 5 +++++ + .../bitops.h => arch/m68k/include/asm/bitops_mm.h | 0 + .../asm/bitops.h => m68k/include/asm/bitops_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/blinken.h | 0 + arch/m68k/include/asm/bootinfo.h | 5 +++++ + .../m68k/include/asm/bootinfo_mm.h | 0 + .../bootinfo.h => m68k/include/asm/bootinfo_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/bootstd.h | 0 + arch/m68k/include/asm/bug.h | 5 +++++ + .../bug.h => arch/m68k/include/asm/bug_mm.h | 0 + .../asm/bug.h => m68k/include/asm/bug_no.h} | 0 + arch/m68k/include/asm/bugs.h | 5 +++++ + .../bugs.h => arch/m68k/include/asm/bugs_mm.h | 0 + .../asm/bugs.h => m68k/include/asm/bugs_no.h} | 0 + .../m68k/include/asm}/bvme6000hw.h | 0 + arch/m68k/include/asm/byteorder.h | 5 +++++ + .../m68k/include/asm/byteorder_mm.h | 0 + .../include/asm/byteorder_no.h} | 0 + arch/m68k/include/asm/cache.h | 5 +++++ + .../cache.h => arch/m68k/include/asm/cache_mm.h | 0 + .../asm/cache.h => m68k/include/asm/cache_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/cachectl.h | 0 + arch/m68k/include/asm/cacheflush.h | 5 +++++ + .../m68k/include/asm/cacheflush_mm.h | 0 + .../include/asm/cacheflush_no.h} | 0 + arch/m68k/include/asm/checksum.h | 5 +++++ + .../m68k/include/asm/checksum_mm.h | 0 + .../checksum.h => m68k/include/asm/checksum_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/coldfire.h | 0 + arch/{m68knommu => m68k}/include/asm/commproc.h | 0 + .../asm-m68k => arch/m68k/include/asm}/contregs.h | 0 + .../asm-m68k => arch/m68k/include/asm}/cputime.h | 0 + arch/m68k/include/asm/current.h | 5 +++++ + .../m68k/include/asm/current_mm.h | 0 + .../current.h => m68k/include/asm/current_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/dbg.h | 0 + arch/m68k/include/asm/delay.h | 5 +++++ + .../delay.h => arch/m68k/include/asm/delay_mm.h | 0 + .../asm/delay.h => m68k/include/asm/delay_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/device.h | 0 + arch/m68k/include/asm/div64.h | 5 +++++ + .../div64.h => arch/m68k/include/asm/div64_mm.h | 0 + .../asm/div64.h => m68k/include/asm/div64_no.h} | 0 + arch/m68k/include/asm/dma-mapping.h | 5 +++++ + .../m68k/include/asm/dma-mapping_mm.h | 0 + .../include/asm/dma-mapping_no.h} | 0 + arch/m68k/include/asm/dma.h | 5 +++++ + .../dma.h => arch/m68k/include/asm/dma_mm.h | 0 + .../asm/dma.h => m68k/include/asm/dma_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/dsp56k.h | 0 + {include/asm-m68k => arch/m68k/include/asm}/dvma.h | 0 + arch/m68k/include/asm/elf.h | 5 +++++ + .../elf.h => arch/m68k/include/asm/elf_mm.h | 0 + .../asm/elf.h => m68k/include/asm/elf_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/elia.h | 0 + .../include/asm/emergency-restart.h | 0 + arch/m68k/include/asm/entry.h | 5 +++++ + .../entry.h => arch/m68k/include/asm/entry_mm.h | 0 + .../asm/entry.h => m68k/include/asm/entry_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/errno.h | 0 + arch/m68k/include/asm/fb.h | 5 +++++ + .../asm-m68k/fb.h => arch/m68k/include/asm/fb_mm.h | 0 + .../include/asm/fb.h => m68k/include/asm/fb_no.h} | 0 + {include/asm-m68k => arch/m68k/include/asm}/fbio.h | 0 + .../asm-m68k => arch/m68k/include/asm}/fcntl.h | 0 + arch/{m68knommu => m68k}/include/asm/flat.h | 0 + .../asm-m68k => arch/m68k/include/asm}/floppy.h | 0 + arch/m68k/include/asm/fpu.h | 5 +++++ + .../fpu.h => arch/m68k/include/asm/fpu_mm.h | 0 + .../asm/fpu.h => m68k/include/asm/fpu_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/futex.h | 0 + arch/m68k/include/asm/hardirq.h | 5 +++++ + .../m68k/include/asm/hardirq_mm.h | 0 + .../hardirq.h => m68k/include/asm/hardirq_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/hp300hw.h | 0 + arch/m68k/include/asm/hw_irq.h | 5 +++++ + .../hw_irq.h => arch/m68k/include/asm/hw_irq_mm.h | 0 + .../asm/hw_irq.h => m68k/include/asm/hw_irq_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/hwtest.h | 0 + {include/asm-m68k => arch/m68k/include/asm}/ide.h | 0 + .../asm-m68k => arch/m68k/include/asm}/idprom.h | 0 + .../asm-m68k => arch/m68k/include/asm}/intersil.h | 0 + arch/m68k/include/asm/io.h | 5 +++++ + .../asm-m68k/io.h => arch/m68k/include/asm/io_mm.h | 0 + .../include/asm/io.h => m68k/include/asm/io_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/ioctl.h | 0 + .../asm-m68k => arch/m68k/include/asm}/ioctls.h | 0 + .../asm-m68k => arch/m68k/include/asm}/ipcbuf.h | 0 + arch/m68k/include/asm/irq.h | 5 +++++ + .../irq.h => arch/m68k/include/asm/irq_mm.h | 0 + .../asm/irq.h => m68k/include/asm/irq_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/irq_regs.h | 0 + arch/{m68knommu => m68k}/include/asm/kdebug.h | 0 + arch/m68k/include/asm/kmap_types.h | 5 +++++ + .../m68k/include/asm/kmap_types_mm.h | 0 + .../include/asm/kmap_types_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/linkage.h | 0 + .../asm-m68k => arch/m68k/include/asm}/local.h | 0 + arch/{m68knommu => m68k}/include/asm/m5206sim.h | 0 + arch/{m68knommu => m68k}/include/asm/m520xsim.h | 0 + arch/{m68knommu => m68k}/include/asm/m523xsim.h | 0 + arch/{m68knommu => m68k}/include/asm/m5249sim.h | 0 + arch/{m68knommu => m68k}/include/asm/m5272sim.h | 0 + arch/{m68knommu => m68k}/include/asm/m527xsim.h | 0 + arch/{m68knommu => m68k}/include/asm/m528xsim.h | 0 + arch/{m68knommu => m68k}/include/asm/m5307sim.h | 0 + arch/{m68knommu => m68k}/include/asm/m532xsim.h | 0 + arch/{m68knommu => m68k}/include/asm/m5407sim.h | 0 + arch/{m68knommu => m68k}/include/asm/m68360.h | 0 + arch/{m68knommu => m68k}/include/asm/m68360_enet.h | 0 + arch/{m68knommu => m68k}/include/asm/m68360_pram.h | 0 + .../{m68knommu => m68k}/include/asm/m68360_quicc.h | 0 + arch/{m68knommu => m68k}/include/asm/m68360_regs.h | 0 + .../asm-m68k => arch/m68k/include/asm}/mac_asc.h | 0 + .../m68k/include/asm}/mac_baboon.h | 0 + .../asm-m68k => arch/m68k/include/asm}/mac_iop.h | 0 + .../asm-m68k => arch/m68k/include/asm}/mac_mouse.h | 0 + .../asm-m68k => arch/m68k/include/asm}/mac_oss.h | 0 + .../asm-m68k => arch/m68k/include/asm}/mac_psc.h | 0 + .../asm-m68k => arch/m68k/include/asm}/mac_via.h | 0 + arch/m68k/include/asm/machdep.h | 5 +++++ + .../m68k/include/asm/machdep_mm.h | 0 + .../machdep.h => m68k/include/asm/machdep_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/machines.h | 0 + .../asm-m68k => arch/m68k/include/asm}/machw.h | 0 + .../asm-m68k => arch/m68k/include/asm}/macintosh.h | 0 + .../asm-m68k => arch/m68k/include/asm}/macints.h | 0 + .../asm-m68k => arch/m68k/include/asm}/math-emu.h | 0 + arch/m68k/include/asm/mc146818rtc.h | 5 +++++ + .../m68k/include/asm/mc146818rtc_mm.h | 0 + .../include/asm/mc146818rtc_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/mcfcache.h | 0 + arch/{m68knommu => m68k}/include/asm/mcfdma.h | 0 + arch/{m68knommu => m68k}/include/asm/mcfmbus.h | 0 + arch/{m68knommu => m68k}/include/asm/mcfne.h | 0 + arch/{m68knommu => m68k}/include/asm/mcfpci.h | 0 + arch/{m68knommu => m68k}/include/asm/mcfpit.h | 0 + arch/{m68knommu => m68k}/include/asm/mcfsim.h | 0 + arch/{m68knommu => m68k}/include/asm/mcfsmc.h | 0 + arch/{m68knommu => m68k}/include/asm/mcftimer.h | 0 + arch/{m68knommu => m68k}/include/asm/mcfuart.h | 0 + arch/{m68knommu => m68k}/include/asm/mcfwdebug.h | 0 + {include/asm-m68k => arch/m68k/include/asm}/md.h | 0 + {include/asm-m68k => arch/m68k/include/asm}/mman.h | 0 + arch/m68k/include/asm/mmu.h | 5 +++++ + arch/m68k/include/asm/mmu_context.h | 5 +++++ + .../m68k/include/asm/mmu_context_mm.h | 0 + .../include/asm/mmu_context_no.h} | 0 + .../mmu.h => arch/m68k/include/asm/mmu_mm.h | 0 + .../asm/mmu.h => m68k/include/asm/mmu_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/mmzone.h | 0 + arch/m68k/include/asm/module.h | 5 +++++ + .../module.h => arch/m68k/include/asm/module_mm.h | 0 + .../asm/module.h => m68k/include/asm/module_no.h} | 0 + .../m68k/include/asm}/motorola_pgalloc.h | 0 + .../m68k/include/asm}/motorola_pgtable.h | 0 + {include/asm-m68k => arch/m68k/include/asm}/movs.h | 0 + .../asm-m68k => arch/m68k/include/asm}/msgbuf.h | 0 + arch/{m68knommu => m68k}/include/asm/mutex.h | 0 + .../asm-m68k => arch/m68k/include/asm}/mvme147hw.h | 0 + .../asm-m68k => arch/m68k/include/asm}/mvme16xhw.h | 0 + arch/{m68knommu => m68k}/include/asm/nettel.h | 0 + .../asm-m68k => arch/m68k/include/asm}/nubus.h | 0 + .../asm-m68k => arch/m68k/include/asm}/openprom.h | 0 + .../asm-m68k => arch/m68k/include/asm}/oplib.h | 0 + arch/m68k/include/asm/page.h | 5 +++++ + .../page.h => arch/m68k/include/asm/page_mm.h | 0 + .../asm/page.h => m68k/include/asm/page_no.h} | 0 + arch/m68k/include/asm/page_offset.h | 5 +++++ + .../m68k/include/asm/page_offset_mm.h | 0 + .../include/asm/page_offset_no.h} | 0 + arch/m68k/include/asm/param.h | 5 +++++ + .../param.h => arch/m68k/include/asm/param_mm.h | 0 + .../asm/param.h => m68k/include/asm/param_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/parport.h | 0 + arch/m68k/include/asm/pci.h | 5 +++++ + .../pci.h => arch/m68k/include/asm/pci_mm.h | 0 + .../asm/pci.h => m68k/include/asm/pci_no.h} | 2 +- + .../asm-m68k => arch/m68k/include/asm}/percpu.h | 0 + arch/m68k/include/asm/pgalloc.h | 5 +++++ + .../m68k/include/asm/pgalloc_mm.h | 0 + .../pgalloc.h => m68k/include/asm/pgalloc_no.h} | 0 + arch/m68k/include/asm/pgtable.h | 5 +++++ + .../m68k/include/asm/pgtable_mm.h | 0 + .../pgtable.h => m68k/include/asm/pgtable_no.h} | 0 + {include/asm-m68k => arch/m68k/include/asm}/poll.h | 0 + .../m68k/include/asm}/posix_types.h | 0 + arch/m68k/include/asm/processor.h | 5 +++++ + .../m68k/include/asm/processor_mm.h | 0 + .../include/asm/processor_no.h} | 0 + arch/m68k/include/asm/ptrace.h | 5 +++++ + .../ptrace.h => arch/m68k/include/asm/ptrace_mm.h | 0 + .../asm/ptrace.h => m68k/include/asm/ptrace_no.h} | 0 + .../m68k/include/asm}/q40_master.h | 0 + .../asm-m68k => arch/m68k/include/asm}/q40ints.h | 0 + .../{m68knommu => m68k}/include/asm/quicc_simple.h | 0 + .../asm-m68k => arch/m68k/include/asm}/raw_io.h | 0 + .../asm-m68k => arch/m68k/include/asm}/resource.h | 0 + {include/asm-m68k => arch/m68k/include/asm}/rtc.h | 0 + {include/asm-m68k => arch/m68k/include/asm}/sbus.h | 0 + arch/m68k/include/asm/scatterlist.h | 5 +++++ + .../m68k/include/asm/scatterlist_mm.h | 0 + .../include/asm/scatterlist_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/sections.h | 0 + arch/m68k/include/asm/segment.h | 5 +++++ + .../m68k/include/asm/segment_mm.h | 0 + .../segment.h => m68k/include/asm/segment_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/sembuf.h | 0 + .../asm-m68k => arch/m68k/include/asm}/serial.h | 0 + arch/m68k/include/asm/setup.h | 5 +++++ + .../setup.h => arch/m68k/include/asm/setup_mm.h | 0 + .../asm/setup.h => m68k/include/asm/setup_no.h} | 2 +- + {include/asm-m68k => arch/m68k/include/asm}/shm.h | 0 + .../asm-m68k => arch/m68k/include/asm}/shmbuf.h | 0 + .../asm-m68k => arch/m68k/include/asm}/shmparam.h | 0 + arch/m68k/include/asm/sigcontext.h | 5 +++++ + .../m68k/include/asm/sigcontext_mm.h | 0 + .../include/asm/sigcontext_no.h} | 0 + arch/m68k/include/asm/siginfo.h | 5 +++++ + .../m68k/include/asm/siginfo_mm.h | 0 + .../siginfo.h => m68k/include/asm/siginfo_no.h} | 0 + arch/m68k/include/asm/signal.h | 5 +++++ + .../signal.h => arch/m68k/include/asm/signal_mm.h | 0 + .../asm/signal.h => m68k/include/asm/signal_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/smp.h | 0 + .../asm-m68k => arch/m68k/include/asm}/socket.h | 0 + .../asm-m68k => arch/m68k/include/asm}/sockios.h | 0 + .../asm-m68k => arch/m68k/include/asm}/spinlock.h | 0 + {include/asm-m68k => arch/m68k/include/asm}/stat.h | 0 + .../asm-m68k => arch/m68k/include/asm}/statfs.h | 0 + arch/m68k/include/asm/string.h | 5 +++++ + .../string.h => arch/m68k/include/asm/string_mm.h | 0 + .../asm/string.h => m68k/include/asm/string_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/sun3-head.h | 0 + .../m68k/include/asm}/sun3_pgalloc.h | 0 + .../m68k/include/asm}/sun3_pgtable.h | 0 + .../asm-m68k => arch/m68k/include/asm}/sun3ints.h | 0 + .../asm-m68k => arch/m68k/include/asm}/sun3mmu.h | 0 + .../asm-m68k => arch/m68k/include/asm}/sun3x.h | 0 + .../asm-m68k => arch/m68k/include/asm}/sun3xflop.h | 0 + .../asm-m68k => arch/m68k/include/asm}/sun3xprom.h | 0 + .../asm-m68k => arch/m68k/include/asm}/suspend.h | 0 + .../swab.h => arch/m68k/include/asm/swab_mm.h | 0 + .../asm/swab.h => m68k/include/asm/swab_no.h} | 0 + arch/m68k/include/asm/system.h | 5 +++++ + .../system.h => arch/m68k/include/asm/system_mm.h | 0 + .../asm/system.h => m68k/include/asm/system_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/termbits.h | 0 + .../asm-m68k => arch/m68k/include/asm}/termios.h | 0 + arch/m68k/include/asm/thread_info.h | 5 +++++ + .../m68k/include/asm/thread_info_mm.h | 0 + .../include/asm/thread_info_no.h} | 0 + arch/m68k/include/asm/timex.h | 5 +++++ + .../timex.h => arch/m68k/include/asm/timex_mm.h | 0 + .../asm/timex.h => m68k/include/asm/timex_no.h} | 0 + {include/asm-m68k => arch/m68k/include/asm}/tlb.h | 0 + arch/m68k/include/asm/tlbflush.h | 5 +++++ + .../m68k/include/asm/tlbflush_mm.h | 0 + .../tlbflush.h => m68k/include/asm/tlbflush_no.h} | 0 + arch/{m68knommu => m68k}/include/asm/topology.h | 0 + arch/m68k/include/asm/traps.h | 5 +++++ + .../traps.h => arch/m68k/include/asm/traps_mm.h | 0 + .../asm/traps.h => m68k/include/asm/traps_no.h} | 0 + .../asm-m68k => arch/m68k/include/asm}/types.h | 0 + arch/m68k/include/asm/uaccess.h | 5 +++++ + .../m68k/include/asm/uaccess_mm.h | 0 + .../uaccess.h => m68k/include/asm/uaccess_no.h} | 0 + arch/m68k/include/asm/ucontext.h | 5 +++++ + .../m68k/include/asm/ucontext_mm.h | 0 + .../ucontext.h => m68k/include/asm/ucontext_no.h} | 0 + arch/m68k/include/asm/unaligned.h | 5 +++++ + .../m68k/include/asm/unaligned_mm.h | 0 + .../include/asm/unaligned_no.h} | 0 + arch/m68k/include/asm/unistd.h | 5 +++++ + .../unistd.h => arch/m68k/include/asm/unistd_mm.h | 0 + .../asm/unistd.h => m68k/include/asm/unistd_no.h} | 0 + {include/asm-m68k => arch/m68k/include/asm}/user.h | 0 + .../m68k/include/asm}/virtconvert.h | 0 + {include/asm-m68k => arch/m68k/include/asm}/xor.h | 0 + .../asm-m68k => arch/m68k/include/asm}/zorro.h | 0 + arch/m68knommu/include/asm/Kbuild | 1 - + arch/m68knommu/include/asm/cachectl.h | 1 - + arch/m68knommu/include/asm/cputime.h | 6 ------ + arch/m68knommu/include/asm/errno.h | 1 - + arch/m68knommu/include/asm/fcntl.h | 1 - + arch/m68knommu/include/asm/hwtest.h | 1 - + arch/m68knommu/include/asm/ioctls.h | 1 - + arch/m68knommu/include/asm/ipcbuf.h | 1 - + arch/m68knommu/include/asm/linkage.h | 1 - + arch/m68knommu/include/asm/local.h | 6 ------ + arch/m68knommu/include/asm/math-emu.h | 1 - + arch/m68knommu/include/asm/md.h | 1 - + arch/m68knommu/include/asm/mman.h | 1 - + arch/m68knommu/include/asm/movs.h | 1 - + arch/m68knommu/include/asm/msgbuf.h | 1 - + arch/m68knommu/include/asm/openprom.h | 1 - + arch/m68knommu/include/asm/oplib.h | 1 - + arch/m68knommu/include/asm/percpu.h | 6 ------ + arch/m68knommu/include/asm/poll.h | 1 - + arch/m68knommu/include/asm/posix_types.h | 1 - + arch/m68knommu/include/asm/resource.h | 1 - + arch/m68knommu/include/asm/rtc.h | 1 - + arch/m68knommu/include/asm/sections.h | 7 ------- + arch/m68knommu/include/asm/sembuf.h | 1 - + arch/m68knommu/include/asm/shm.h | 1 - + arch/m68knommu/include/asm/shmbuf.h | 1 - + arch/m68knommu/include/asm/shmparam.h | 1 - + arch/m68knommu/include/asm/socket.h | 1 - + arch/m68knommu/include/asm/sockios.h | 1 - + arch/m68knommu/include/asm/spinlock.h | 1 - + arch/m68knommu/include/asm/stat.h | 1 - + arch/m68knommu/include/asm/statfs.h | 1 - + arch/m68knommu/include/asm/termbits.h | 1 - + arch/m68knommu/include/asm/termios.h | 1 - + arch/m68knommu/include/asm/tlb.h | 1 - + arch/m68knommu/include/asm/types.h | 1 - + arch/m68knommu/include/asm/user.h | 1 - + include/asm-m68k/auxvec.h | 4 ---- + include/asm-m68k/device.h | 7 ------- + include/asm-m68k/emergency-restart.h | 6 ------ + include/asm-m68k/futex.h | 6 ------ + include/asm-m68k/ioctl.h | 1 - + include/asm-m68k/irq_regs.h | 1 - + include/asm-m68k/kdebug.h | 1 - + include/asm-m68k/mutex.h | 9 --------- + include/asm-m68k/topology.h | 6 ------ + 354 files changed, 266 insertions(+), 101 deletions(-) + rename {include/asm-m68k => arch/m68k/include/asm}/Kbuild (100%) + rename arch/{m68knommu => m68k}/include/asm/MC68328.h (100%) + rename arch/{m68knommu => m68k}/include/asm/MC68332.h (100%) + rename arch/{m68knommu => m68k}/include/asm/MC68EZ328.h (100%) + rename arch/{m68knommu => m68k}/include/asm/MC68VZ328.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/a.out-core.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/a.out.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/adb_iop.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/amigahw.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/amigaints.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/amigayle.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/amipcmcia.h (100%) + rename arch/{m68knommu => m68k}/include/asm/anchor.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/apollodma.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/apollohw.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/atafd.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/atafdreg.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/atari_joystick.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/atari_stdma.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/atari_stram.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/atarihw.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/atariints.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/atarikb.h (100%) + create mode 100644 arch/m68k/include/asm/atomic.h + rename include/asm-m68k/atomic.h => arch/m68k/include/asm/atomic_mm.h (100%) + rename arch/{m68knommu/include/asm/atomic.h => m68k/include/asm/atomic_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/auxvec.h (100%) + create mode 100644 arch/m68k/include/asm/bitops.h + rename include/asm-m68k/bitops.h => arch/m68k/include/asm/bitops_mm.h (100%) + rename arch/{m68knommu/include/asm/bitops.h => m68k/include/asm/bitops_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/blinken.h (100%) + create mode 100644 arch/m68k/include/asm/bootinfo.h + rename include/asm-m68k/bootinfo.h => arch/m68k/include/asm/bootinfo_mm.h (100%) + rename arch/{m68knommu/include/asm/bootinfo.h => m68k/include/asm/bootinfo_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/bootstd.h (100%) + create mode 100644 arch/m68k/include/asm/bug.h + rename include/asm-m68k/bug.h => arch/m68k/include/asm/bug_mm.h (100%) + rename arch/{m68knommu/include/asm/bug.h => m68k/include/asm/bug_no.h} (100%) + create mode 100644 arch/m68k/include/asm/bugs.h + rename include/asm-m68k/bugs.h => arch/m68k/include/asm/bugs_mm.h (100%) + rename arch/{m68knommu/include/asm/bugs.h => m68k/include/asm/bugs_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/bvme6000hw.h (100%) + create mode 100644 arch/m68k/include/asm/byteorder.h + rename include/asm-m68k/byteorder.h => arch/m68k/include/asm/byteorder_mm.h (100%) + rename arch/{m68knommu/include/asm/byteorder.h => m68k/include/asm/byteorder_no.h} (100%) + create mode 100644 arch/m68k/include/asm/cache.h + rename include/asm-m68k/cache.h => arch/m68k/include/asm/cache_mm.h (100%) + rename arch/{m68knommu/include/asm/cache.h => m68k/include/asm/cache_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/cachectl.h (100%) + create mode 100644 arch/m68k/include/asm/cacheflush.h + rename include/asm-m68k/cacheflush.h => arch/m68k/include/asm/cacheflush_mm.h (100%) + rename arch/{m68knommu/include/asm/cacheflush.h => m68k/include/asm/cacheflush_no.h} (100%) + create mode 100644 arch/m68k/include/asm/checksum.h + rename include/asm-m68k/checksum.h => arch/m68k/include/asm/checksum_mm.h (100%) + rename arch/{m68knommu/include/asm/checksum.h => m68k/include/asm/checksum_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/coldfire.h (100%) + rename arch/{m68knommu => m68k}/include/asm/commproc.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/contregs.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/cputime.h (100%) + create mode 100644 arch/m68k/include/asm/current.h + rename include/asm-m68k/current.h => arch/m68k/include/asm/current_mm.h (100%) + rename arch/{m68knommu/include/asm/current.h => m68k/include/asm/current_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/dbg.h (100%) + create mode 100644 arch/m68k/include/asm/delay.h + rename include/asm-m68k/delay.h => arch/m68k/include/asm/delay_mm.h (100%) + rename arch/{m68knommu/include/asm/delay.h => m68k/include/asm/delay_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/device.h (100%) + create mode 100644 arch/m68k/include/asm/div64.h + rename include/asm-m68k/div64.h => arch/m68k/include/asm/div64_mm.h (100%) + rename arch/{m68knommu/include/asm/div64.h => m68k/include/asm/div64_no.h} (100%) + create mode 100644 arch/m68k/include/asm/dma-mapping.h + rename include/asm-m68k/dma-mapping.h => arch/m68k/include/asm/dma-mapping_mm.h (100%) + rename arch/{m68knommu/include/asm/dma-mapping.h => m68k/include/asm/dma-mapping_no.h} (100%) + create mode 100644 arch/m68k/include/asm/dma.h + rename include/asm-m68k/dma.h => arch/m68k/include/asm/dma_mm.h (100%) + rename arch/{m68knommu/include/asm/dma.h => m68k/include/asm/dma_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/dsp56k.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/dvma.h (100%) + create mode 100644 arch/m68k/include/asm/elf.h + rename include/asm-m68k/elf.h => arch/m68k/include/asm/elf_mm.h (100%) + rename arch/{m68knommu/include/asm/elf.h => m68k/include/asm/elf_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/elia.h (100%) + rename arch/{m68knommu => m68k}/include/asm/emergency-restart.h (100%) + create mode 100644 arch/m68k/include/asm/entry.h + rename include/asm-m68k/entry.h => arch/m68k/include/asm/entry_mm.h (100%) + rename arch/{m68knommu/include/asm/entry.h => m68k/include/asm/entry_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/errno.h (100%) + create mode 100644 arch/m68k/include/asm/fb.h + rename include/asm-m68k/fb.h => arch/m68k/include/asm/fb_mm.h (100%) + rename arch/{m68knommu/include/asm/fb.h => m68k/include/asm/fb_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/fbio.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/fcntl.h (100%) + rename arch/{m68knommu => m68k}/include/asm/flat.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/floppy.h (100%) + create mode 100644 arch/m68k/include/asm/fpu.h + rename include/asm-m68k/fpu.h => arch/m68k/include/asm/fpu_mm.h (100%) + rename arch/{m68knommu/include/asm/fpu.h => m68k/include/asm/fpu_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/futex.h (100%) + create mode 100644 arch/m68k/include/asm/hardirq.h + rename include/asm-m68k/hardirq.h => arch/m68k/include/asm/hardirq_mm.h (100%) + rename arch/{m68knommu/include/asm/hardirq.h => m68k/include/asm/hardirq_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/hp300hw.h (100%) + create mode 100644 arch/m68k/include/asm/hw_irq.h + rename include/asm-m68k/hw_irq.h => arch/m68k/include/asm/hw_irq_mm.h (100%) + rename arch/{m68knommu/include/asm/hw_irq.h => m68k/include/asm/hw_irq_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/hwtest.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/ide.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/idprom.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/intersil.h (100%) + create mode 100644 arch/m68k/include/asm/io.h + rename include/asm-m68k/io.h => arch/m68k/include/asm/io_mm.h (100%) + rename arch/{m68knommu/include/asm/io.h => m68k/include/asm/io_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/ioctl.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/ioctls.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/ipcbuf.h (100%) + create mode 100644 arch/m68k/include/asm/irq.h + rename include/asm-m68k/irq.h => arch/m68k/include/asm/irq_mm.h (100%) + rename arch/{m68knommu/include/asm/irq.h => m68k/include/asm/irq_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/irq_regs.h (100%) + rename arch/{m68knommu => m68k}/include/asm/kdebug.h (100%) + create mode 100644 arch/m68k/include/asm/kmap_types.h + rename include/asm-m68k/kmap_types.h => arch/m68k/include/asm/kmap_types_mm.h (100%) + rename arch/{m68knommu/include/asm/kmap_types.h => m68k/include/asm/kmap_types_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/linkage.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/local.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m5206sim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m520xsim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m523xsim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m5249sim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m5272sim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m527xsim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m528xsim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m5307sim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m532xsim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m5407sim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m68360.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m68360_enet.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m68360_pram.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m68360_quicc.h (100%) + rename arch/{m68knommu => m68k}/include/asm/m68360_regs.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mac_asc.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mac_baboon.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mac_iop.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mac_mouse.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mac_oss.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mac_psc.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mac_via.h (100%) + create mode 100644 arch/m68k/include/asm/machdep.h + rename include/asm-m68k/machdep.h => arch/m68k/include/asm/machdep_mm.h (100%) + rename arch/{m68knommu/include/asm/machdep.h => m68k/include/asm/machdep_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/machines.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/machw.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/macintosh.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/macints.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/math-emu.h (100%) + create mode 100644 arch/m68k/include/asm/mc146818rtc.h + rename include/asm-m68k/mc146818rtc.h => arch/m68k/include/asm/mc146818rtc_mm.h (100%) + rename arch/{m68knommu/include/asm/mc146818rtc.h => m68k/include/asm/mc146818rtc_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/mcfcache.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mcfdma.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mcfmbus.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mcfne.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mcfpci.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mcfpit.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mcfsim.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mcfsmc.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mcftimer.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mcfuart.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mcfwdebug.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/md.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mman.h (100%) + create mode 100644 arch/m68k/include/asm/mmu.h + create mode 100644 arch/m68k/include/asm/mmu_context.h + rename include/asm-m68k/mmu_context.h => arch/m68k/include/asm/mmu_context_mm.h (100%) + rename arch/{m68knommu/include/asm/mmu_context.h => m68k/include/asm/mmu_context_no.h} (100%) + rename include/asm-m68k/mmu.h => arch/m68k/include/asm/mmu_mm.h (100%) + rename arch/{m68knommu/include/asm/mmu.h => m68k/include/asm/mmu_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mmzone.h (100%) + create mode 100644 arch/m68k/include/asm/module.h + rename include/asm-m68k/module.h => arch/m68k/include/asm/module_mm.h (100%) + rename arch/{m68knommu/include/asm/module.h => m68k/include/asm/module_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/motorola_pgalloc.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/motorola_pgtable.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/movs.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/msgbuf.h (100%) + rename arch/{m68knommu => m68k}/include/asm/mutex.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mvme147hw.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/mvme16xhw.h (100%) + rename arch/{m68knommu => m68k}/include/asm/nettel.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/nubus.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/openprom.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/oplib.h (100%) + create mode 100644 arch/m68k/include/asm/page.h + rename include/asm-m68k/page.h => arch/m68k/include/asm/page_mm.h (100%) + rename arch/{m68knommu/include/asm/page.h => m68k/include/asm/page_no.h} (100%) + create mode 100644 arch/m68k/include/asm/page_offset.h + rename include/asm-m68k/page_offset.h => arch/m68k/include/asm/page_offset_mm.h (100%) + rename arch/{m68knommu/include/asm/page_offset.h => m68k/include/asm/page_offset_no.h} (100%) + create mode 100644 arch/m68k/include/asm/param.h + rename include/asm-m68k/param.h => arch/m68k/include/asm/param_mm.h (100%) + rename arch/{m68knommu/include/asm/param.h => m68k/include/asm/param_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/parport.h (100%) + create mode 100644 arch/m68k/include/asm/pci.h + rename include/asm-m68k/pci.h => arch/m68k/include/asm/pci_mm.h (100%) + rename arch/{m68knommu/include/asm/pci.h => m68k/include/asm/pci_no.h} (96%) + rename {include/asm-m68k => arch/m68k/include/asm}/percpu.h (100%) + create mode 100644 arch/m68k/include/asm/pgalloc.h + rename include/asm-m68k/pgalloc.h => arch/m68k/include/asm/pgalloc_mm.h (100%) + rename arch/{m68knommu/include/asm/pgalloc.h => m68k/include/asm/pgalloc_no.h} (100%) + create mode 100644 arch/m68k/include/asm/pgtable.h + rename include/asm-m68k/pgtable.h => arch/m68k/include/asm/pgtable_mm.h (100%) + rename arch/{m68knommu/include/asm/pgtable.h => m68k/include/asm/pgtable_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/poll.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/posix_types.h (100%) + create mode 100644 arch/m68k/include/asm/processor.h + rename include/asm-m68k/processor.h => arch/m68k/include/asm/processor_mm.h (100%) + rename arch/{m68knommu/include/asm/processor.h => m68k/include/asm/processor_no.h} (100%) + create mode 100644 arch/m68k/include/asm/ptrace.h + rename include/asm-m68k/ptrace.h => arch/m68k/include/asm/ptrace_mm.h (100%) + rename arch/{m68knommu/include/asm/ptrace.h => m68k/include/asm/ptrace_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/q40_master.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/q40ints.h (100%) + rename arch/{m68knommu => m68k}/include/asm/quicc_simple.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/raw_io.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/resource.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/rtc.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sbus.h (100%) + create mode 100644 arch/m68k/include/asm/scatterlist.h + rename include/asm-m68k/scatterlist.h => arch/m68k/include/asm/scatterlist_mm.h (100%) + rename arch/{m68knommu/include/asm/scatterlist.h => m68k/include/asm/scatterlist_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sections.h (100%) + create mode 100644 arch/m68k/include/asm/segment.h + rename include/asm-m68k/segment.h => arch/m68k/include/asm/segment_mm.h (100%) + rename arch/{m68knommu/include/asm/segment.h => m68k/include/asm/segment_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sembuf.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/serial.h (100%) + create mode 100644 arch/m68k/include/asm/setup.h + rename include/asm-m68k/setup.h => arch/m68k/include/asm/setup_mm.h (100%) + rename arch/{m68knommu/include/asm/setup.h => m68k/include/asm/setup_no.h} (84%) + rename {include/asm-m68k => arch/m68k/include/asm}/shm.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/shmbuf.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/shmparam.h (100%) + create mode 100644 arch/m68k/include/asm/sigcontext.h + rename include/asm-m68k/sigcontext.h => arch/m68k/include/asm/sigcontext_mm.h (100%) + rename arch/{m68knommu/include/asm/sigcontext.h => m68k/include/asm/sigcontext_no.h} (100%) + create mode 100644 arch/m68k/include/asm/siginfo.h + rename include/asm-m68k/siginfo.h => arch/m68k/include/asm/siginfo_mm.h (100%) + rename arch/{m68knommu/include/asm/siginfo.h => m68k/include/asm/siginfo_no.h} (100%) + create mode 100644 arch/m68k/include/asm/signal.h + rename include/asm-m68k/signal.h => arch/m68k/include/asm/signal_mm.h (100%) + rename arch/{m68knommu/include/asm/signal.h => m68k/include/asm/signal_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/smp.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/socket.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sockios.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/spinlock.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/stat.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/statfs.h (100%) + create mode 100644 arch/m68k/include/asm/string.h + rename include/asm-m68k/string.h => arch/m68k/include/asm/string_mm.h (100%) + rename arch/{m68knommu/include/asm/string.h => m68k/include/asm/string_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sun3-head.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sun3_pgalloc.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sun3_pgtable.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sun3ints.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sun3mmu.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sun3x.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sun3xflop.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/sun3xprom.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/suspend.h (100%) + create mode 100644 arch/m68k/include/asm/swab.h + rename include/asm-m68k/swab.h => arch/m68k/include/asm/swab_mm.h (100%) + rename arch/{m68knommu/include/asm/swab.h => m68k/include/asm/swab_no.h} (100%) + create mode 100644 arch/m68k/include/asm/system.h + rename include/asm-m68k/system.h => arch/m68k/include/asm/system_mm.h (100%) + rename arch/{m68knommu/include/asm/system.h => m68k/include/asm/system_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/termbits.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/termios.h (100%) + create mode 100644 arch/m68k/include/asm/thread_info.h + rename include/asm-m68k/thread_info.h => arch/m68k/include/asm/thread_info_mm.h (100%) + rename arch/{m68knommu/include/asm/thread_info.h => m68k/include/asm/thread_info_no.h} (100%) + create mode 100644 arch/m68k/include/asm/timex.h + rename include/asm-m68k/timex.h => arch/m68k/include/asm/timex_mm.h (100%) + rename arch/{m68knommu/include/asm/timex.h => m68k/include/asm/timex_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/tlb.h (100%) + create mode 100644 arch/m68k/include/asm/tlbflush.h + rename include/asm-m68k/tlbflush.h => arch/m68k/include/asm/tlbflush_mm.h (100%) + rename arch/{m68knommu/include/asm/tlbflush.h => m68k/include/asm/tlbflush_no.h} (100%) + rename arch/{m68knommu => m68k}/include/asm/topology.h (100%) + create mode 100644 arch/m68k/include/asm/traps.h + rename include/asm-m68k/traps.h => arch/m68k/include/asm/traps_mm.h (100%) + rename arch/{m68knommu/include/asm/traps.h => m68k/include/asm/traps_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/types.h (100%) + create mode 100644 arch/m68k/include/asm/uaccess.h + rename include/asm-m68k/uaccess.h => arch/m68k/include/asm/uaccess_mm.h (100%) + rename arch/{m68knommu/include/asm/uaccess.h => m68k/include/asm/uaccess_no.h} (100%) + create mode 100644 arch/m68k/include/asm/ucontext.h + rename include/asm-m68k/ucontext.h => arch/m68k/include/asm/ucontext_mm.h (100%) + rename arch/{m68knommu/include/asm/ucontext.h => m68k/include/asm/ucontext_no.h} (100%) + create mode 100644 arch/m68k/include/asm/unaligned.h + rename include/asm-m68k/unaligned.h => arch/m68k/include/asm/unaligned_mm.h (100%) + rename arch/{m68knommu/include/asm/unaligned.h => m68k/include/asm/unaligned_no.h} (100%) + create mode 100644 arch/m68k/include/asm/unistd.h + rename include/asm-m68k/unistd.h => arch/m68k/include/asm/unistd_mm.h (100%) + rename arch/{m68knommu/include/asm/unistd.h => m68k/include/asm/unistd_no.h} (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/user.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/virtconvert.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/xor.h (100%) + rename {include/asm-m68k => arch/m68k/include/asm}/zorro.h (100%) + delete mode 100644 arch/m68knommu/include/asm/Kbuild + delete mode 100644 arch/m68knommu/include/asm/cachectl.h + delete mode 100644 arch/m68knommu/include/asm/cputime.h + delete mode 100644 arch/m68knommu/include/asm/errno.h + delete mode 100644 arch/m68knommu/include/asm/fcntl.h + delete mode 100644 arch/m68knommu/include/asm/hwtest.h + delete mode 100644 arch/m68knommu/include/asm/ioctls.h + delete mode 100644 arch/m68knommu/include/asm/ipcbuf.h + delete mode 100644 arch/m68knommu/include/asm/linkage.h + delete mode 100644 arch/m68knommu/include/asm/local.h + delete mode 100644 arch/m68knommu/include/asm/math-emu.h + delete mode 100644 arch/m68knommu/include/asm/md.h + delete mode 100644 arch/m68knommu/include/asm/mman.h + delete mode 100644 arch/m68knommu/include/asm/movs.h + delete mode 100644 arch/m68knommu/include/asm/msgbuf.h + delete mode 100644 arch/m68knommu/include/asm/openprom.h + delete mode 100644 arch/m68knommu/include/asm/oplib.h + delete mode 100644 arch/m68knommu/include/asm/percpu.h + delete mode 100644 arch/m68knommu/include/asm/poll.h + delete mode 100644 arch/m68knommu/include/asm/posix_types.h + delete mode 100644 arch/m68knommu/include/asm/resource.h + delete mode 100644 arch/m68knommu/include/asm/rtc.h + delete mode 100644 arch/m68knommu/include/asm/sections.h + delete mode 100644 arch/m68knommu/include/asm/sembuf.h + delete mode 100644 arch/m68knommu/include/asm/shm.h + delete mode 100644 arch/m68knommu/include/asm/shmbuf.h + delete mode 100644 arch/m68knommu/include/asm/shmparam.h + delete mode 100644 arch/m68knommu/include/asm/socket.h + delete mode 100644 arch/m68knommu/include/asm/sockios.h + delete mode 100644 arch/m68knommu/include/asm/spinlock.h + delete mode 100644 arch/m68knommu/include/asm/stat.h + delete mode 100644 arch/m68knommu/include/asm/statfs.h + delete mode 100644 arch/m68knommu/include/asm/termbits.h + delete mode 100644 arch/m68knommu/include/asm/termios.h + delete mode 100644 arch/m68knommu/include/asm/tlb.h + delete mode 100644 arch/m68knommu/include/asm/types.h + delete mode 100644 arch/m68knommu/include/asm/user.h + delete mode 100644 include/asm-m68k/auxvec.h + delete mode 100644 include/asm-m68k/device.h + delete mode 100644 include/asm-m68k/emergency-restart.h + delete mode 100644 include/asm-m68k/futex.h + delete mode 100644 include/asm-m68k/ioctl.h + delete mode 100644 include/asm-m68k/irq_regs.h + delete mode 100644 include/asm-m68k/kdebug.h + delete mode 100644 include/asm-m68k/mutex.h + delete mode 100644 include/asm-m68k/topology.h +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 +Merge made by recursive. +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 63 +----- + arch/sh/boards/Kconfig | 6 +- + arch/sh/boards/board-ap325rxa.c | 53 ++++- + arch/sh/boards/board-magicpanelr2.c | 23 ++- + arch/sh/boards/board-sh7785lcr.c | 1 + + arch/sh/boards/mach-highlander/Kconfig | 2 +- + arch/sh/boards/mach-highlander/setup.c | 1 + + arch/sh/boards/mach-hp6xx/setup.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 171 ++++++-------- + arch/sh/boards/mach-rsk/Kconfig | 2 +- + arch/sh/boards/mach-rsk/devices-rsk7203.c | 24 +- + arch/sh/boards/mach-x3proto/setup.c | 1 + + arch/sh/configs/ap325rxa_defconfig | 355 ++++++++++++++++++++++++++--- + arch/sh/configs/dreamcast_defconfig | 60 ++++-- + arch/sh/configs/edosk7705_defconfig | 18 +- + arch/sh/configs/edosk7760_defconfig | 83 +++++-- + arch/sh/configs/hp6xx_defconfig | 88 ++++---- + arch/sh/configs/landisk_defconfig | 76 +++++-- + arch/sh/configs/lboxre2_defconfig | 63 ++++-- + arch/sh/configs/magicpanelr2_defconfig | 119 +++++++--- + arch/sh/configs/microdev_defconfig | 63 ++++-- + arch/sh/configs/migor_defconfig | 95 ++++++-- + arch/sh/configs/r7780mp_defconfig | 85 ++++++-- + arch/sh/configs/r7785rp_defconfig | 130 ++++++++--- + arch/sh/configs/rsk7201_defconfig | 26 ++- + arch/sh/configs/rsk7203_defconfig | 88 ++++++-- + arch/sh/configs/rts7751r2d1_defconfig | 87 +++++-- + arch/sh/configs/rts7751r2dplus_defconfig | 87 +++++-- + arch/sh/configs/sdk7780_defconfig | 101 ++++++--- + arch/sh/configs/se7206_defconfig | 75 +++++-- + arch/sh/configs/se7343_defconfig | 61 +++-- + arch/sh/configs/se7619_defconfig | 47 +++-- + arch/sh/configs/se7705_defconfig | 60 +++-- + arch/sh/configs/se7712_defconfig | 79 +++++-- + arch/sh/configs/se7721_defconfig | 85 +++++--- + arch/sh/configs/se7722_defconfig | 61 +++-- + arch/sh/configs/se7750_defconfig | 61 +++-- + arch/sh/configs/se7751_defconfig | 56 +++-- + arch/sh/configs/se7780_defconfig | 87 +++++--- + arch/sh/configs/sh03_defconfig | 82 +++++-- + arch/sh/configs/sh7710voipgw_defconfig | 55 +++-- + arch/sh/configs/sh7763rdp_defconfig | 71 ++++-- + arch/sh/configs/sh7785lcr_defconfig | 92 +++++--- + arch/sh/configs/shmin_defconfig | 54 +++-- + arch/sh/configs/shx3_defconfig | 77 +++++-- + arch/sh/configs/snapgear_defconfig | 53 +++-- + arch/sh/configs/systemh_defconfig | 50 +++-- + arch/sh/configs/titan_defconfig | 90 +++++-- + arch/sh/configs/ul2_defconfig | 69 ++++-- + arch/sh/include/asm/gpio.h | 70 ++++--- + arch/sh/include/asm/posix_types_32.h | 8 +- + arch/sh/include/asm/posix_types_64.h | 8 +- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 31 +++ + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +- + arch/sh/kernel/gpio.c | 338 +++++++++++++++++----------- + arch/sh/kernel/process_64.c | 2 - + arch/sh/mm/ioremap_64.c | 2 +- + drivers/serial/sh-sci.h | 6 +- + 58 files changed, 2578 insertions(+), 1227 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Merge made by recursive. + Documentation/x86/boot.txt | 13 ++- + arch/x86/Kconfig.cpu | 4 +- + arch/x86/include/asm/bitops.h | 14 ++- + arch/x86/include/asm/cpu.h | 21 ++++ + arch/x86/include/asm/cpumask.h | 28 ++++++ + arch/x86/include/asm/hardirq_32.h | 3 + + arch/x86/include/asm/io.h | 1 - + arch/x86/include/asm/io_apic.h | 26 +----- + arch/x86/include/asm/mpspec_def.h | 23 +++-- + arch/x86/include/asm/smp.h | 41 +-------- + arch/x86/include/asm/system.h | 6 +- + arch/x86/include/asm/tlbflush.h | 2 + + arch/x86/kernel/acpi/boot.c | 96 +++++++++---------- + arch/x86/kernel/apic.c | 4 + + arch/x86/kernel/cpu/common.c | 2 + + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 - + arch/x86/kernel/crash.c | 2 +- + arch/x86/kernel/entry_64.S | 2 + + arch/x86/kernel/io_apic.c | 119 ++++++++++++------------ + arch/x86/kernel/microcode_intel.c | 10 +- + arch/x86/kernel/module_32.c | 6 +- + arch/x86/kernel/module_64.c | 32 +++--- + arch/x86/kernel/mpparse.c | 142 ++++++++++++++-------------- + arch/x86/kernel/msr.c | 2 +- + arch/x86/kernel/reboot.c | 1 + + arch/x86/kernel/setup.c | 2 +- + arch/x86/kernel/setup_percpu.c | 1 + + arch/x86/kernel/smpboot.c | 1 - + arch/x86/kernel/tlb_64.c | 16 ++-- + arch/x86/kernel/tlb_uv.c | 1 + + arch/x86/mach-voyager/setup.c | 1 + + arch/x86/mm/init_32.c | 49 +++++++++- + arch/x86/mm/ioremap.c | 25 ----- + arch/x86/mm/pat.c | 37 +++++-- + drivers/pci/intr_remapping.c | 1 + + include/asm-generic/bitops/__ffs.h | 2 +- + include/asm-generic/bitops/__fls.h | 2 +- + include/asm-generic/bitops/fls.h | 2 +- + include/asm-generic/bitops/fls64.h | 4 +- + 39 files changed, 393 insertions(+), 353 deletions(-) + create mode 100644 arch/x86/include/asm/cpumask.h +Merging xtensa/master +$ git merge xtensa/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Merge made by recursive. + include/linux/init.h | 1 + + init/main.c | 9 +++++++++ + lib/kobject.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 60 insertions(+), 0 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged arch/x86/include/asm/system.h +Auto-merged arch/x86/kernel/apic.c +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/tlb_64.c +Auto-merged arch/x86/kernel/tlb_uv.c +Auto-merged init/Kconfig +Auto-merged init/main.c +Merge made by recursive. + Documentation/cputopology.txt | 6 +- + arch/alpha/kernel/irq.c | 2 +- + arch/arm/kernel/irq.c | 18 ++- + arch/arm/kernel/vmlinux.lds.S | 1 + + arch/arm/oprofile/op_model_mpcore.c | 2 +- + arch/blackfin/kernel/irqchip.c | 5 + + arch/ia64/kernel/iosapic.c | 2 +- + arch/ia64/kernel/irq.c | 4 +- + arch/ia64/kernel/irq_ia64.c | 12 ++- + arch/ia64/kernel/msi_ia64.c | 4 +- + arch/ia64/kernel/vmlinux.lds.S | 1 + + arch/ia64/sn/kernel/msi_sn.c | 2 +- + arch/mips/include/asm/irq.h | 2 +- + arch/mips/kernel/irq-gic.c | 2 +- + arch/mips/kernel/smtc.c | 6 +- + arch/mips/mti-malta/malta-smtc.c | 5 +- + arch/mips/sgi-ip22/ip22-int.c | 2 +- + arch/mips/sgi-ip22/ip22-time.c | 2 +- + arch/mips/sibyte/bcm1480/smp.c | 3 +- + arch/mips/sibyte/sb1250/smp.c | 3 +- + arch/mn10300/kernel/mn10300-watchdog.c | 3 +- + arch/parisc/kernel/irq.c | 8 +- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 1 + + arch/powerpc/platforms/pseries/xics.c | 5 +- + arch/powerpc/sysdev/mpic.c | 3 +- + arch/sparc/kernel/irq_64.c | 5 +- + arch/sparc/kernel/time_64.c | 2 +- + arch/x86/Kconfig | 23 ++-- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/ia32/ia32entry.S | 8 +- + arch/x86/include/asm/apicnum.h | 12 ++ + arch/x86/include/asm/current.h | 24 +--- + arch/x86/include/asm/e820.h | 11 ++- + arch/x86/include/asm/hardirq_64.h | 24 +++- + arch/x86/include/asm/irq_regs_32.h | 4 +- + arch/x86/include/asm/irq_vectors.h | 13 ++- + arch/x86/include/asm/mce.h | 5 +- + arch/x86/include/asm/mmu_context_32.h | 12 +- + arch/x86/include/asm/mmu_context_64.h | 16 +-- + arch/x86/include/asm/mtrr.h | 1 + + arch/x86/include/asm/page_64.h | 4 +- + arch/x86/include/asm/paravirt.h | 8 +- + arch/x86/include/asm/pda.h | 126 +++---------------- + arch/x86/include/asm/percpu.h | 159 ++++++++++-------------- + arch/x86/include/asm/prctl.h | 4 - + arch/x86/include/asm/processor.h | 3 + + arch/x86/include/asm/ptrace-abi.h | 5 +- + arch/x86/include/asm/setup.h | 9 +- + arch/x86/include/asm/sigcontext.h | 2 +- + arch/x86/include/asm/sigcontext32.h | 2 + + arch/x86/include/asm/smp.h | 8 +- + arch/x86/include/asm/stackprotector.h | 39 ++++++ + arch/x86/include/asm/system.h | 8 +- + arch/x86/include/asm/thread_info.h | 20 ++-- + arch/x86/include/asm/tlbflush.h | 15 +-- + arch/x86/include/asm/topology.h | 8 +- + arch/x86/include/asm/trampoline.h | 1 + + arch/x86/include/asm/uv/uv_bau.h | 3 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/acpi/sleep.c | 1 + + arch/x86/kernel/apic.c | 22 ++-- + arch/x86/kernel/asm-offsets_64.c | 8 +- + arch/x86/kernel/cpu/common.c | 78 ++++-------- + arch/x86/kernel/cpu/intel_cacheinfo.c | 63 +++++++--- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 21 ++- + arch/x86/kernel/dumpstack_64.c | 35 +++--- + arch/x86/kernel/entry_64.S | 41 +++--- + arch/x86/kernel/head64.c | 23 +---- + arch/x86/kernel/head_64.S | 47 ++++++- + arch/x86/kernel/io_apic.c | 44 +++++-- + arch/x86/kernel/irq.c | 6 +- + arch/x86/kernel/irq_32.c | 2 +- + arch/x86/kernel/irq_64.c | 5 +- + arch/x86/kernel/nmi.c | 10 +-- + arch/x86/kernel/process_32.c | 5 +- + arch/x86/kernel/process_64.c | 35 ++++-- + arch/x86/kernel/setup_percpu.c | 207 +++++++++++++++++------------- + arch/x86/kernel/smpboot.c | 68 +--------- + arch/x86/kernel/smpcommon.c | 10 +- + arch/x86/kernel/tlb_32.c | 85 +++++-------- + arch/x86/kernel/tlb_64.c | 76 +++++++----- + arch/x86/kernel/tlb_uv.c | 16 ++-- + arch/x86/kernel/vmlinux_32.lds.S | 9 +-- + arch/x86/kernel/vmlinux_64.lds.S | 22 +++- + arch/x86/kernel/x8664_ksyms_64.c | 2 - + arch/x86/mach-voyager/voyager_smp.c | 6 +- + arch/x86/mm/fault.c | 7 + + arch/x86/xen/enlighten.c | 47 +++---- + arch/x86/xen/irq.c | 8 +- + arch/x86/xen/mmu.c | 8 +- + arch/x86/xen/multicalls.h | 2 +- + arch/x86/xen/smp.c | 33 +---- + arch/x86/xen/xen-asm_64.S | 31 +++--- + drivers/base/cpu.c | 2 +- + drivers/base/topology.c | 33 +++--- + drivers/firmware/dcdbas.c | 12 ++- + drivers/misc/sgi-xp/xpc_main.c | 2 +- + drivers/net/sfc/efx.c | 17 ++- + drivers/oprofile/buffer_sync.c | 22 +++- + drivers/oprofile/buffer_sync.h | 4 + + drivers/oprofile/cpu_buffer.c | 5 + + drivers/oprofile/cpu_buffer.h | 7 + + drivers/oprofile/oprof.c | 9 ++- + drivers/xen/events.c | 26 +++- + drivers/xen/manage.c | 2 +- + fs/btrfs/locking.c | 10 -- + include/asm-generic/percpu.h | 52 ++++++++ + include/asm-generic/sections.h | 2 +- + include/asm-generic/vmlinux.lds.h | 75 ++++++++++- + include/linux/aio_abi.h | 1 + + include/linux/atalk.h | 1 + + include/linux/atmbr2684.h | 1 + + include/linux/atmdev.h | 2 + + include/linux/auto_fs4.h | 1 + + include/linux/bfs_fs.h | 2 + + include/linux/blktrace_api.h | 2 + + include/linux/can/bcm.h | 2 + + include/linux/capability.h | 8 +- + include/linux/cdrom.h | 1 + + include/linux/cgroupstats.h | 1 + + include/linux/cm4000_cs.h | 2 +- + include/linux/coda_psdev.h | 2 + + include/linux/dlm_plock.h | 2 + + include/linux/dn.h | 2 + + include/linux/dvb/dmx.h | 2 +- + include/linux/dvb/frontend.h | 3 +- + include/linux/dvb/net.h | 3 +- + include/linux/dvb/video.h | 7 +- + include/linux/edd.h | 2 + + include/linux/efs_fs_sb.h | 1 + + include/linux/elf-fdpic.h | 2 + + include/linux/elfcore.h | 2 + + include/linux/errqueue.h | 2 + + include/linux/fb.h | 4 +- + include/linux/genetlink.h | 1 + + include/linux/gfs2_ondisk.h | 2 + + include/linux/hiddev.h | 2 + + include/linux/icmpv6.h | 1 + + include/linux/if_addr.h | 1 + + include/linux/if_addrlabel.h | 2 + + include/linux/if_fc.h | 1 + + include/linux/if_hippi.h | 1 + + include/linux/if_link.h | 1 + + include/linux/if_ppp.h | 1 + + include/linux/if_strip.h | 2 + + include/linux/if_tr.h | 1 + + include/linux/igmp.h | 1 + + include/linux/in6.h | 2 +- + include/linux/inet_diag.h | 2 + + include/linux/interrupt.h | 1 + + include/linux/ip6_tunnel.h | 2 + + include/linux/ipv6.h | 1 + + include/linux/ipv6_route.h | 2 + + include/linux/ipx.h | 1 + + include/linux/irda.h | 2 + + include/linux/irq.h | 86 ++++++++++++- + include/linux/irqnr.h | 1 + + include/linux/kernel.h | 3 +- + include/linux/magic.h | 1 + + include/linux/minix_fs.h | 1 + + include/linux/msdos_fs.h | 1 + + include/linux/mutex.h | 5 +- + include/linux/neighbour.h | 1 + + include/linux/netfilter/xt_conntrack.h | 1 + + include/linux/nfs_idmap.h | 2 + + include/linux/nfsd/export.h | 3 +- + include/linux/nfsd/nfsfh.h | 3 +- + include/linux/nfsd/stats.h | 2 + + include/linux/nfsd/syscall.h | 3 +- + include/linux/nubus.h | 5 +- + include/linux/phonet.h | 2 + + include/linux/pkt_cls.h | 5 +- + include/linux/pkt_sched.h | 2 + + include/linux/pktcdvd.h | 2 + + include/linux/ppp_defs.h | 2 + + include/linux/raid/md_p.h | 2 + + include/linux/random.h | 1 + + include/linux/raw.h | 2 + + include/linux/rtnetlink.h | 1 + + include/linux/sched.h | 35 +++++- + include/linux/signalfd.h | 1 + + include/linux/socket.h | 13 +- + include/linux/sound.h | 2 + + include/linux/spi/spidev.h | 1 + + include/linux/stackprotector.h | 16 +++ + include/linux/synclink.h | 2 + + include/linux/taskstats.h | 2 + + include/linux/tc_act/tc_gact.h | 1 + + include/linux/tc_act/tc_mirred.h | 1 + + include/linux/tc_act/tc_pedit.h | 1 + + include/linux/tc_ematch/tc_em_cmp.h | 1 + + include/linux/tc_ematch/tc_em_meta.h | 1 + + include/linux/tc_ematch/tc_em_nbyte.h | 1 + + include/linux/tc_ematch/tc_em_text.h | 1 + + include/linux/topology.h | 6 + + include/linux/usb/cdc.h | 2 + + include/linux/usb/gadgetfs.h | 2 +- + include/linux/video_decoder.h | 2 + + include/linux/video_encoder.h | 2 + + include/linux/videodev.h | 1 + + include/linux/videodev2.h | 2 +- + include/linux/virtio_blk.h | 1 + + include/linux/virtio_console.h | 2 + + include/linux/virtio_net.h | 2 + + include/mtd/inftl-user.h | 2 + + include/sound/hdsp.h | 2 + + include/video/sisfb.h | 2 +- + include/video/uvesafb.h | 2 + + init/Kconfig | 179 ++++++++++++++------------- + init/main.c | 7 + + kernel/Makefile | 1 + + kernel/exit.c | 5 +- + kernel/fork.c | 7 +- + kernel/hung_task.c | 206 ++++++++++++++++++++++++++++++ + kernel/irq/chip.c | 5 +- + kernel/irq/handle.c | 57 +++++---- + kernel/irq/internals.h | 7 + + kernel/irq/manage.c | 12 +- + kernel/irq/migration.c | 12 +- + kernel/irq/numa_migrate.c | 19 +++- + kernel/irq/proc.c | 4 +- + kernel/mutex-debug.c | 9 +-- + kernel/mutex-debug.h | 18 ++-- + kernel/mutex.c | 121 ++++++++++++++++--- + kernel/mutex.h | 22 +++- + kernel/panic.c | 12 ++- + kernel/rcuclassic.c | 2 +- + kernel/rcutree.c | 2 +- + kernel/relay.c | 4 +- + kernel/sched.c | 78 ++++++++++-- + kernel/sched_features.h | 1 + + kernel/sched_rt.c | 36 ++++-- + kernel/softirq.c | 5 + + kernel/softlockup.c | 109 ++--------------- + kernel/sysctl.c | 17 +++- + lib/Kconfig.debug | 38 ++++++ + lib/smp_processor_id.c | 2 +- + 239 files changed, 2071 insertions(+), 1317 deletions(-) + create mode 100644 arch/x86/include/asm/apicnum.h + create mode 100644 arch/x86/include/asm/stackprotector.h + create mode 100644 include/linux/stackprotector.h + create mode 100644 kernel/hung_task.c +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/x86/include/asm/topology.h +Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Resolved 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 18581c3: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/include/asm/topology.h | 2 +- + arch/x86/include/asm/topology.h | 17 ++++++++++++++--- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 11 ++++------- + 3 files changed, 19 insertions(+), 11 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged Documentation/sysrq.txt +Auto-merged MAINTAINERS +Auto-merged arch/ia64/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged drivers/char/sysrq.c +Auto-merged init/main.c +Auto-merged kernel/relay.c +Auto-merged scripts/Makefile.build +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 +++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysrq.txt | 2 + + Documentation/tracers/mmiotrace.txt | 6 +- + Documentation/vm/kmemtrace.txt | 126 ++++ + MAINTAINERS | 6 + + arch/ia64/Kconfig | 3 + + arch/ia64/include/asm/ftrace.h | 28 + + arch/ia64/kernel/Makefile | 5 + + arch/ia64/kernel/entry.S | 100 ++++ + arch/ia64/kernel/ftrace.c | 206 +++++++ + arch/ia64/kernel/ia64_ksyms.c | 6 + + arch/x86/Kconfig.debug | 24 +- + arch/x86/kvm/Kconfig | 3 +- + drivers/char/sysrq.c | 2 +- + include/linux/ftrace.h | 4 + + include/linux/slab_def.h | 68 ++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 53 ++- + include/trace/kmemtrace.h | 75 +++ + include/trace/workqueue.h | 25 + + init/main.c | 2 + + kernel/relay.c | 4 +- + kernel/trace/Kconfig | 55 ++ + kernel/trace/Makefile | 4 + + kernel/trace/ftrace.c | 45 +- + kernel/trace/kmemtrace.c | 350 +++++++++++ + kernel/trace/ring_buffer.c | 50 +- + kernel/trace/trace.c | 742 ++---------------------- + kernel/trace/trace.h | 46 +- + kernel/trace/trace_boot.c | 1 + + kernel/trace/trace_branch.c | 278 ++++++---- + kernel/trace/trace_functions_graph.c | 8 +- + kernel/trace/trace_hw_branches.c | 1 + + kernel/trace/trace_mmiotrace.c | 18 +- + kernel/trace/trace_output.c | 832 +++++++++++++++++++++++++++ + kernel/trace/trace_output.h | 59 ++ + kernel/trace/trace_power.c | 1 + + kernel/trace/trace_selftest.c | 1 - + kernel/trace/trace_stat.c | 319 ++++++++++ + kernel/trace/trace_stat.h | 31 + + kernel/trace/trace_workqueue.c | 287 +++++++++ + kernel/workqueue.c | 16 +- + mm/slab.c | 71 ++- + mm/slob.c | 37 +- + mm/slub.c | 83 +++- + scripts/Makefile.build | 13 +- + scripts/recordmcount.pl | 18 +- + 48 files changed, 3252 insertions(+), 952 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 arch/ia64/include/asm/ftrace.h + create mode 100644 arch/ia64/kernel/ftrace.c + create mode 100644 include/trace/kmemtrace.h + create mode 100644 include/trace/workqueue.h + create mode 100644 kernel/trace/kmemtrace.c + create mode 100644 kernel/trace/trace_output.c + create mode 100644 kernel/trace/trace_output.h + create mode 100644 kernel/trace/trace_stat.c + create mode 100644 kernel/trace/trace_stat.h + create mode 100644 kernel/trace/trace_workqueue.c +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged kernel/irq/chip.c +Merge made by recursive. + kernel/irq/chip.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged include/linux/sched.h +Auto-merged init/Kconfig +Auto-merged kernel/sched.c +Auto-merged kernel/sched_features.h +Auto-merged kernel/sched_rt.c +Merge made by recursive. + include/linux/init_task.h | 1 + + include/linux/plist.h | 9 +- + include/linux/sched.h | 7 +- + init/Kconfig | 1 - + kernel/sched.c | 129 ++++++++++-- + kernel/sched_debug.c | 1 + + kernel/sched_fair.c | 59 +++++- + kernel/sched_features.h | 3 +- + kernel/sched_rt.c | 537 +++++++++++++++++++++++++++++++-------------- + lib/Kconfig | 6 - + lib/Makefile | 4 +- + 11 files changed, 557 insertions(+), 200 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Already uptodate! +Merge made by recursive. +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged include/linux/init_task.h +Auto-merged include/linux/sched.h +Auto-merged kernel/fork.c +Merge made by recursive. + arch/x86/kernel/hpet.c | 2 +- + arch/x86/kernel/quirks.c | 3 +- + include/linux/clockchips.h | 1 + + include/linux/init_task.h | 6 ++++ + include/linux/sched.h | 29 +++++++++++------- + include/linux/workqueue.h | 6 ++++ + kernel/fork.c | 16 ++++----- + kernel/hrtimer.c | 34 ++++++++++++++++++++- + kernel/posix-cpu-timers.c | 70 -------------------------------------------- + kernel/sched_stats.h | 33 +++++++++----------- + kernel/time/tick-common.c | 26 ++++++++++++---- + kernel/time/tick-sched.c | 2 +- + 12 files changed, 109 insertions(+), 119 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/pci/hotplug/pciehp_core.c +Auto-merged drivers/pci/pci.c +Auto-merged drivers/pci/pci.h +Merge made by recursive. + Documentation/kernel-parameters.txt | 2 + + arch/x86/pci/early.c | 19 ++-- + drivers/pci/hotplug/pciehp_acpi.c | 16 +--- + drivers/pci/hotplug/pciehp_core.c | 18 +--- + drivers/pci/pci.c | 17 ++- + drivers/pci/pci.h | 20 ++-- + drivers/pci/pcie/aer/aerdrv.c | 28 +----- + drivers/pci/pcie/aer/aerdrv_core.c | 10 +- + drivers/pci/pcie/portdrv.h | 8 +- + drivers/pci/pcie/portdrv_bus.c | 18 ++-- + drivers/pci/pcie/portdrv_core.c | 173 ++++++++++++++++++----------------- + drivers/pci/pcie/portdrv_pci.c | 61 ++++--------- + include/linux/pcieport_if.h | 24 ++--- + 13 files changed, 181 insertions(+), 233 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-ioctl.c | 7 ++- + drivers/md/dm-target.c | 104 ++++++++++++----------------------------- + drivers/md/dm.h | 2 +- + include/linux/device-mapper.h | 3 + + 4 files changed, 38 insertions(+), 78 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/Kconfig | 6 +- + drivers/hid/hid-core.c | 16 ++ + drivers/hid/hid-microsoft.c | 13 +- + drivers/hid/hidraw.c | 17 ++- + drivers/hid/usbhid/hid-core.c | 440 ++++++++++++++++++++++++++++++++--------- + drivers/hid/usbhid/hiddev.c | 17 ++- + drivers/hid/usbhid/usbhid.h | 14 +- + include/linux/hid.h | 6 + + 8 files changed, 414 insertions(+), 115 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 2 +- + drivers/gpu/drm/i915/intel_i2c.c | 4 -- + drivers/i2c/busses/i2c-acorn.c | 1 - + drivers/i2c/busses/i2c-ali1535.c | 1 - + drivers/i2c/busses/i2c-ali1563.c | 1 - + drivers/i2c/busses/i2c-ali15x3.c | 1 - + drivers/i2c/busses/i2c-amd756.c | 1 - + drivers/i2c/busses/i2c-amd8111.c | 1 - + drivers/i2c/busses/i2c-au1550.c | 1 - + drivers/i2c/busses/i2c-bfin-twi.c | 1 - + drivers/i2c/busses/i2c-elektor.c | 1 - + drivers/i2c/busses/i2c-hydra.c | 1 - + drivers/i2c/busses/i2c-i801.c | 1 - + drivers/i2c/busses/i2c-ibm_iic.c | 1 - + drivers/i2c/busses/i2c-iop3xx.c | 1 - + drivers/i2c/busses/i2c-ixp2000.c | 1 - + drivers/i2c/busses/i2c-mpc.c | 1 - + drivers/i2c/busses/i2c-mv64xxx.c | 1 - + drivers/i2c/busses/i2c-nforce2.c | 1 - + drivers/i2c/busses/i2c-parport-light.c | 1 - + drivers/i2c/busses/i2c-parport.c | 1 - + drivers/i2c/busses/i2c-pca-isa.c | 1 - + drivers/i2c/busses/i2c-piix4.c | 1 - + drivers/i2c/busses/i2c-sibyte.c | 2 - + drivers/i2c/busses/i2c-sis5595.c | 1 - + drivers/i2c/busses/i2c-sis630.c | 1 - + drivers/i2c/busses/i2c-sis96x.c | 1 - + drivers/i2c/busses/i2c-via.c | 1 - + drivers/i2c/busses/i2c-viapro.c | 1 - + drivers/i2c/busses/i2c-voodoo3.c | 2 - + drivers/i2c/busses/scx200_acb.c | 1 - + drivers/i2c/busses/scx200_i2c.c | 1 - + drivers/ieee1394/pcilynx.c | 1 - + drivers/video/aty/radeon_i2c.c | 1 - + drivers/video/i810/i810-i2c.c | 1 - + drivers/video/intelfb/intelfb_i2c.c | 1 - + drivers/video/nvidia/nv_i2c.c | 1 - + drivers/video/savage/savagefb-i2c.c | 1 - + include/linux/i2c-id.h | 61 -------------------------------- + include/linux/i2c.h | 8 +++-- + 40 files changed, 6 insertions(+), 107 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + drivers/hwmon/ds1621.c | 79 +++++++++++++++++++++++++++++++++++++++-------- + 1 files changed, 65 insertions(+), 14 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merged drivers/media/video/uvc/uvc_status.c +Merge made by recursive. + Documentation/video4linux/v4lgrab.c | 25 +- + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 24 +- + drivers/media/dvb/dvb-core/dvb_ca_en50221.h | 6 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 18 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 + + drivers/media/dvb/frontends/stb0899_algo.c | 3 + + drivers/media/video/cs5345.c | 1 - + drivers/media/video/cx23885/cx23885-417.c | 3 +- + drivers/media/video/cx23885/cx23885-video.c | 5 +- + drivers/media/video/cx88/cx88-dvb.c | 72 ++-- + drivers/media/video/cx88/cx88.h | 2 +- + drivers/media/video/em28xx/em28xx-core.c | 9 + + drivers/media/video/em28xx/em28xx-video.c | 41 +- + drivers/media/video/em28xx/em28xx.h | 19 + + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 12 + + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 19 + + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 6 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 12 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 2 +- + drivers/media/video/pwc/pwc-if.c | 1 - + drivers/media/video/saa7127.c | 52 +- + drivers/media/video/saa7134/saa7134-core.c | 4 + + drivers/media/video/saa717x.c | 1 - + drivers/media/video/tveeprom.c | 3 + + drivers/media/video/tvp514x.c | 2 +- + drivers/media/video/upd64031a.c | 1 - + drivers/media/video/upd64083.c | 1 - + drivers/media/video/uvc/uvc_ctrl.c | 7 +- + drivers/media/video/uvc/uvc_driver.c | 55 +- + drivers/media/video/uvc/uvc_isight.c | 2 + + drivers/media/video/uvc/uvc_queue.c | 31 +- + drivers/media/video/uvc/uvc_status.c | 3 +- + drivers/media/video/uvc/uvc_v4l2.c | 10 +- + drivers/media/video/uvc/uvc_video.c | 31 +- + drivers/media/video/uvc/uvcvideo.h | 232 ++++---- + drivers/media/video/v4l2-subdev.c | 10 +- + drivers/media/video/vivi.c | 186 +++++-- + drivers/media/video/zoran/zoran.h | 12 +- + drivers/media/video/zoran/zoran_card.c | 620 ++++++++++---------- + drivers/media/video/zoran/zoran_card.h | 2 - + drivers/media/video/zoran/zoran_driver.c | 105 ++--- + include/media/v4l2-device.h | 8 +- + include/media/v4l2-subdev.h | 3 + + 43 files changed, 913 insertions(+), 750 deletions(-) +Merging quota/for_next +$ git merge quota/for_next +Merge made by recursive. + fs/dquot.c | 514 +++++++++++++++++++++++++++++++--------------- + fs/ext3/super.c | 44 +---- + fs/ext4/super.c | 44 +---- + fs/reiserfs/super.c | 58 +----- + include/linux/quota.h | 9 + + include/linux/quotaops.h | 90 +++++++- + 6 files changed, 440 insertions(+), 319 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 9d0d848 Merge commit 'v4l-dvb/master' +Merging jfs/next +$ git merge jfs/next +Merge made by recursive. + fs/jfs/jfs_extent.c | 63 +++++-------- + fs/jfs/jfs_imap.c | 10 +-- + fs/jfs/jfs_types.h | 29 ------ + fs/jfs/jfs_xtree.c | 263 +-------------------------------------------------- + fs/jfs/jfs_xtree.h | 2 - + 5 files changed, 28 insertions(+), 339 deletions(-) +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Merge made by recursive. + drivers/ide/Kconfig | 18 +++ + drivers/ide/Makefile | 4 +- + drivers/ide/cs5536.c | 309 +++++++++++++++++++++++++++++++++++++++++++ + drivers/ide/falconide.c | 2 +- + drivers/ide/ide-acpi.c | 214 +++++++---------------------- + drivers/ide/ide-atapi.c | 26 ++++- + drivers/ide/ide-cd.c | 4 +- + drivers/ide/ide-devsets.c | 190 ++++++++++++++++++++++++++ + drivers/ide/ide-dma.c | 57 ++++++++ + drivers/ide/ide-io.c | 191 ++++----------------------- + drivers/ide/ide-iops.c | 39 +----- + drivers/ide/ide-lib.c | 240 --------------------------------- + drivers/ide/ide-park.c | 25 ++++ + drivers/ide/ide-probe.c | 88 +++++-------- + drivers/ide/ide-proc.c | 2 +- + drivers/ide/ide-xfer-mode.c | 246 ++++++++++++++++++++++++++++++++++ + drivers/ide/ide.c | 156 +--------------------- + drivers/ide/palm_bk3710.c | 11 +- + drivers/ide/via82cxxx.c | 5 + + include/linux/ide.h | 33 +++-- + 20 files changed, 1023 insertions(+), 837 deletions(-) + create mode 100644 drivers/ide/cs5536.c + create mode 100644 drivers/ide/ide-devsets.c + create mode 100644 drivers/ide/ide-xfer-mode.c +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merged init/Kconfig +Auto-merged kernel/Makefile +Auto-merged kernel/sysctl.c +Merge made by recursive. + Documentation/filesystems/caching/backend-api.txt | 658 ++++++++++++++++ + Documentation/filesystems/caching/cachefiles.txt | 501 ++++++++++++ + Documentation/filesystems/caching/fscache.txt | 333 ++++++++ + Documentation/filesystems/caching/netfs-api.txt | 800 +++++++++++++++++++ + Documentation/filesystems/caching/object.txt | 313 ++++++++ + Documentation/filesystems/caching/operations.txt | 213 +++++ + Documentation/slow-work.txt | 174 +++++ + fs/Kconfig | 24 + + fs/Makefile | 2 + + fs/afs/Makefile | 3 + + fs/afs/cache.c | 503 ++++++++----- + fs/afs/cache.h | 15 +- + fs/afs/cell.c | 16 +- + fs/afs/file.c | 220 ++++-- + fs/afs/inode.c | 31 +- + fs/afs/internal.h | 53 +- + fs/afs/main.c | 27 +- + fs/afs/mntpt.c | 4 +- + fs/afs/vlocation.c | 25 +- + fs/afs/volume.c | 14 +- + fs/afs/write.c | 21 + + fs/cachefiles/Kconfig | 39 + + fs/cachefiles/Makefile | 18 + + fs/cachefiles/cf-bind.c | 286 +++++++ + fs/cachefiles/cf-daemon.c | 754 ++++++++++++++++++ + fs/cachefiles/cf-interface.c | 449 +++++++++++ + fs/cachefiles/cf-internal.h | 360 +++++++++ + fs/cachefiles/cf-key.c | 159 ++++ + fs/cachefiles/cf-main.c | 106 +++ + fs/cachefiles/cf-namei.c | 772 +++++++++++++++++++ + fs/cachefiles/cf-proc.c | 134 ++++ + fs/cachefiles/cf-rdwr.c | 853 +++++++++++++++++++++ + fs/cachefiles/cf-security.c | 116 +++ + fs/cachefiles/cf-xattr.c | 291 +++++++ + fs/ext2/inode.c | 2 + + fs/ext3/inode.c | 9 +- + fs/fscache/Kconfig | 56 ++ + fs/fscache/Makefile | 19 + + fs/fscache/fsc-cache.c | 415 ++++++++++ + fs/fscache/fsc-cookie.c | 498 ++++++++++++ + fs/fscache/fsc-fsdef.c | 144 ++++ + fs/fscache/fsc-histogram.c | 109 +++ + fs/fscache/fsc-internal.h | 380 +++++++++ + fs/fscache/fsc-main.c | 124 +++ + fs/fscache/fsc-netfs.c | 103 +++ + fs/fscache/fsc-object.c | 810 +++++++++++++++++++ + fs/fscache/fsc-operation.c | 459 +++++++++++ + fs/fscache/fsc-page.c | 771 +++++++++++++++++++ + fs/fscache/fsc-proc.c | 68 ++ + fs/fscache/fsc-stats.c | 212 +++++ + fs/nfs/Makefile | 1 + + fs/nfs/client.c | 14 +- + fs/nfs/file.c | 37 +- + fs/nfs/fscache-index.c | 337 ++++++++ + fs/nfs/fscache.c | 521 +++++++++++++ + fs/nfs/fscache.h | 208 +++++ + fs/nfs/inode.c | 17 +- + fs/nfs/internal.h | 4 + + fs/nfs/iostat.h | 18 + + fs/nfs/read.c | 27 +- + fs/nfs/super.c | 45 +- + fs/splice.c | 3 +- + fs/super.c | 1 + + include/linux/fs.h | 7 + + include/linux/fscache-cache.h | 504 ++++++++++++ + include/linux/fscache.h | 592 ++++++++++++++ + include/linux/nfs_fs.h | 13 + + include/linux/nfs_fs_sb.h | 11 + + include/linux/nfs_iostat.h | 12 + + include/linux/page-flags.h | 43 +- + include/linux/pagemap.h | 21 + + include/linux/slow-work.h | 95 +++ + init/Kconfig | 12 + + kernel/Makefile | 1 + + kernel/slow-work.c | 640 ++++++++++++++++ + kernel/sysctl.c | 9 + + mm/filemap.c | 99 +++ + mm/migrate.c | 10 +- + mm/readahead.c | 40 +- + mm/swap.c | 4 +- + mm/truncate.c | 10 +- + mm/vmscan.c | 6 +- + security/security.c | 2 + + 83 files changed, 15436 insertions(+), 394 deletions(-) + create mode 100644 Documentation/filesystems/caching/backend-api.txt + create mode 100644 Documentation/filesystems/caching/cachefiles.txt + create mode 100644 Documentation/filesystems/caching/fscache.txt + create mode 100644 Documentation/filesystems/caching/netfs-api.txt + create mode 100644 Documentation/filesystems/caching/object.txt + create mode 100644 Documentation/filesystems/caching/operations.txt + create mode 100644 Documentation/slow-work.txt + create mode 100644 fs/cachefiles/Kconfig + create mode 100644 fs/cachefiles/Makefile + create mode 100644 fs/cachefiles/cf-bind.c + create mode 100644 fs/cachefiles/cf-daemon.c + create mode 100644 fs/cachefiles/cf-interface.c + create mode 100644 fs/cachefiles/cf-internal.h + create mode 100644 fs/cachefiles/cf-key.c + create mode 100644 fs/cachefiles/cf-main.c + create mode 100644 fs/cachefiles/cf-namei.c + create mode 100644 fs/cachefiles/cf-proc.c + create mode 100644 fs/cachefiles/cf-rdwr.c + create mode 100644 fs/cachefiles/cf-security.c + create mode 100644 fs/cachefiles/cf-xattr.c + create mode 100644 fs/fscache/Kconfig + create mode 100644 fs/fscache/Makefile + create mode 100644 fs/fscache/fsc-cache.c + create mode 100644 fs/fscache/fsc-cookie.c + create mode 100644 fs/fscache/fsc-fsdef.c + create mode 100644 fs/fscache/fsc-histogram.c + create mode 100644 fs/fscache/fsc-internal.h + create mode 100644 fs/fscache/fsc-main.c + create mode 100644 fs/fscache/fsc-netfs.c + create mode 100644 fs/fscache/fsc-object.c + create mode 100644 fs/fscache/fsc-operation.c + create mode 100644 fs/fscache/fsc-page.c + create mode 100644 fs/fscache/fsc-proc.c + create mode 100644 fs/fscache/fsc-stats.c + create mode 100644 fs/nfs/fscache-index.c + create mode 100644 fs/nfs/fscache.c + create mode 100644 fs/nfs/fscache.h + create mode 100644 include/linux/fscache-cache.h + create mode 100644 include/linux/fscache.h + create mode 100644 include/linux/slow-work.h + create mode 100644 kernel/slow-work.c +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/xfs/Kconfig | 1 + + fs/xfs/linux-2.6/xfs_ioctl.c | 305 ++++++++++++++++++---------------------- + fs/xfs/linux-2.6/xfs_ioctl.h | 15 ++- + fs/xfs/linux-2.6/xfs_ioctl32.c | 184 ++++++++----------------- + fs/xfs/linux-2.6/xfs_super.c | 17 ++- + fs/xfs/quota/xfs_dquot.c | 38 ++++-- + fs/xfs/quota/xfs_dquot.h | 10 ++ + fs/xfs/quota/xfs_qm.c | 9 ++ + fs/xfs/xfs_ag.h | 6 +- + fs/xfs/xfs_alloc_btree.c | 2 +- + fs/xfs/xfs_attr.c | 26 ++-- + fs/xfs/xfs_bmap.c | 166 +++++++++++----------- + fs/xfs/xfs_bmap.h | 2 - + fs/xfs/xfs_bmap_btree.c | 10 +- + fs/xfs/xfs_bmap_btree.h | 4 - + fs/xfs/xfs_btree.c | 6 +- + fs/xfs/xfs_da_btree.c | 8 +- + fs/xfs/xfs_ialloc.c | 6 +- + fs/xfs/xfs_ialloc.h | 2 - + fs/xfs/xfs_ialloc_btree.h | 1 - + fs/xfs/xfs_inode.c | 19 ++- + fs/xfs/xfs_inode_item.h | 4 - + fs/xfs/xfs_iomap.c | 10 +- + fs/xfs/xfs_itable.c | 6 +- + fs/xfs/xfs_mount.c | 26 ++-- + fs/xfs/xfs_mount.h | 9 +- + fs/xfs/xfs_rename.c | 2 +- + fs/xfs/xfs_rtalloc.c | 2 +- + fs/xfs/xfs_rw.h | 1 - + fs/xfs/xfs_sb.h | 2 +- + fs/xfs/xfs_vnodeops.c | 20 ++-- + 31 files changed, 436 insertions(+), 483 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/cm.c | 15 ++-- + drivers/infiniband/core/cm_msgs.h | 22 +++--- + drivers/infiniband/core/mad_rmpp.c | 2 +- + drivers/infiniband/hw/amso1100/c2.c | 20 +++-- + drivers/infiniband/hw/amso1100/c2_provider.c | 15 ++-- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +- + drivers/infiniband/hw/ehca/ehca_sqp.c | 8 +- + drivers/infiniband/hw/ipath/ipath_eeprom.c | 4 +- + drivers/infiniband/hw/ipath/ipath_mad.c | 95 ++++++++++++------------- + drivers/infiniband/hw/ipath/ipath_rc.c | 2 +- + drivers/infiniband/hw/ipath/ipath_sdma.c | 4 +- + drivers/infiniband/hw/ipath/ipath_uc.c | 2 +- + drivers/infiniband/hw/ipath/ipath_ud.c | 4 +- + drivers/infiniband/hw/ipath/ipath_user_sdma.c | 6 +- + drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +- + drivers/infiniband/hw/ipath/ipath_verbs.h | 10 ++-- + drivers/infiniband/hw/mlx4/qp.c | 22 +++--- + drivers/infiniband/hw/nes/nes_nic.c | 22 ++++--- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 20 +++-- + include/rdma/ib_cm.h | 12 ++-- + include/rdma/ib_mad.h | 2 +- + include/rdma/ib_smi.h | 34 +++++----- + 22 files changed, 169 insertions(+), 158 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged MAINTAINERS +Auto-merged arch/x86/kernel/acpi/sleep.c +Auto-merged arch/x86/kernel/reboot.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + MAINTAINERS | 5 + + arch/x86/kernel/acpi/sleep.c | 4 +- + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/battery.c | 14 +- + drivers/acpi/ec.c | 2 +- + drivers/acpi/pci_link.c | 39 +- + drivers/acpi/sbs.c | 31 +- + drivers/acpi/sleep.c | 51 +- + drivers/platform/x86/Kconfig | 13 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/oqo-wmi.c | 941 ++++++++++++++++++++++++++++ + drivers/platform/x86/panasonic-laptop.c | 2 +- + drivers/power/power_supply_sysfs.c | 2 + + include/linux/power_supply.h | 2 + + kernel/power/main.c | 26 +- + 16 files changed, 1060 insertions(+), 83 deletions(-) + create mode 100644 drivers/platform/x86/oqo-wmi.c +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merged fs/Kconfig +Merge made by recursive. + Documentation/filesystems/nfs-rdma.txt | 4 +- + fs/Kconfig | 5 +- + fs/nfsd/nfs3proc.c | 5 +- + fs/nfsd/nfs4state.c | 163 ++++++++++++++++++-------------- + 4 files changed, 98 insertions(+), 79 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-card.c | 70 +-- + drivers/firewire/fw-cdev.c | 1006 +++++++++++++++++-------- + drivers/firewire/fw-device.c | 43 +- + drivers/firewire/fw-device.h | 7 +- + drivers/firewire/fw-iso.c | 225 +++++- + drivers/firewire/fw-ohci.c | 240 +++--- + drivers/firewire/fw-sbp2.c | 57 +- + drivers/firewire/fw-topology.c | 40 +- + drivers/firewire/fw-topology.h | 19 +- + drivers/firewire/fw-transaction.c | 151 ++--- + drivers/firewire/fw-transaction.h | 136 ++--- + drivers/ieee1394/dma.h | 1 + + drivers/ieee1394/ieee1394_core.c | 1 + + drivers/ieee1394/ieee1394_transactions.c | 29 + + drivers/ieee1394/ieee1394_transactions.h | 2 + + drivers/ieee1394/iso.h | 1 + + drivers/ieee1394/nodemgr.c | 10 +- + drivers/ieee1394/nodemgr.h | 18 + + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 + + drivers/media/dvb/firewire/Kconfig | 12 + + drivers/media/dvb/firewire/Makefile | 11 + + drivers/media/dvb/firewire/avc.c | 1180 +++++++++++++++++++++++++++++ + drivers/media/dvb/firewire/avc.h | 427 +++++++++++ + drivers/media/dvb/firewire/firedtv-1394.c | 378 +++++++++ + drivers/media/dvb/firewire/firedtv-ci.c | 261 +++++++ + drivers/media/dvb/firewire/firedtv-ci.h | 9 + + drivers/media/dvb/firewire/firedtv-dvb.c | 276 +++++++ + drivers/media/dvb/firewire/firedtv-fe.c | 244 ++++++ + drivers/media/dvb/firewire/firedtv-rc.c | 191 +++++ + drivers/media/dvb/firewire/firedtv-rc.h | 11 + + drivers/media/dvb/firewire/firedtv.h | 190 +++++ + include/linux/firewire-cdev.h | 170 ++++- + 33 files changed, 4633 insertions(+), 787 deletions(-) + create mode 100644 drivers/media/dvb/firewire/Kconfig + create mode 100644 drivers/media/dvb/firewire/Makefile + create mode 100644 drivers/media/dvb/firewire/avc.c + create mode 100644 drivers/media/dvb/firewire/avc.h + create mode 100644 drivers/media/dvb/firewire/firedtv-1394.c + create mode 100644 drivers/media/dvb/firewire/firedtv-ci.c + create mode 100644 drivers/media/dvb/firewire/firedtv-ci.h + create mode 100644 drivers/media/dvb/firewire/firedtv-dvb.c + create mode 100644 drivers/media/dvb/firewire/firedtv-fe.c + create mode 100644 drivers/media/dvb/firewire/firedtv-rc.c + create mode 100644 drivers/media/dvb/firewire/firedtv-rc.h + create mode 100644 drivers/media/dvb/firewire/firedtv.h +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/cdev.c | 148 ++++++++++++++++++++++++++++++++------------- + drivers/mtd/ubi/gluebi.c | 11 +--- + drivers/mtd/ubi/scan.c | 8 +-- + drivers/mtd/ubi/ubi.h | 6 +- + drivers/mtd/ubi/upd.c | 21 ++---- + drivers/mtd/ubi/vmt.c | 17 ++--- + include/mtd/ubi-user.h | 98 +++++++++++++++++++++++------- + 7 files changed, 204 insertions(+), 105 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/x86/kvm/Kconfig +Merge made by recursive. + arch/ia64/include/asm/kvm.h | 53 ++- + arch/ia64/include/asm/kvm_host.h | 8 +- + arch/ia64/kvm/Kconfig | 4 + + arch/ia64/kvm/kvm-ia64.c | 105 ++++- + arch/ia64/kvm/process.c | 32 +- + arch/ia64/kvm/vcpu.c | 39 +-- + arch/ia64/kvm/vtlb.c | 5 - + arch/powerpc/include/asm/kvm.h | 7 + + arch/powerpc/include/asm/kvm_44x.h | 7 + + arch/powerpc/include/asm/kvm_asm.h | 7 +- + arch/powerpc/include/asm/kvm_e500.h | 67 +++ + arch/powerpc/include/asm/kvm_host.h | 21 +- + arch/powerpc/include/asm/kvm_ppc.h | 15 +- + arch/powerpc/include/asm/mmu-fsl-booke.h | 2 + + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x.c | 72 +--- + arch/powerpc/kvm/44x_emulate.c | 217 +------- + arch/powerpc/kvm/44x_tlb.c | 39 +- + arch/powerpc/kvm/44x_tlb.h | 9 - + arch/powerpc/kvm/Kconfig | 16 + + arch/powerpc/kvm/Makefile | 10 + + arch/powerpc/kvm/booke.c | 50 +- + arch/powerpc/kvm/booke.h | 35 +- + arch/powerpc/kvm/booke_emulate.c | 266 +++++++++ + arch/powerpc/kvm/booke_interrupts.S | 5 + + arch/powerpc/kvm/e500.c | 169 ++++++ + arch/powerpc/kvm/e500_emulate.c | 194 +++++++ + arch/powerpc/kvm/e500_tlb.c | 737 +++++++++++++++++++++++++ + arch/powerpc/kvm/e500_tlb.h | 184 +++++++ + arch/powerpc/kvm/emulate.c | 93 +++- + arch/powerpc/kvm/powerpc.c | 35 +- + arch/s390/include/asm/kvm.h | 7 + + arch/s390/include/asm/kvm_host.h | 3 - + arch/s390/kvm/Kconfig | 3 + + arch/s390/kvm/kvm-s390.c | 8 +- + arch/x86/include/asm/kvm.h | 31 ++ + arch/x86/include/asm/kvm_host.h | 59 ++- + arch/x86/include/asm/msr-index.h | 7 + + arch/x86/include/asm/svm.h | 4 - + arch/x86/include/asm/virtext.h | 2 +- + arch/x86/include/asm/vmx.h | 5 +- + arch/x86/kvm/Kconfig | 4 + + arch/x86/kvm/i8254.c | 23 +- + arch/x86/kvm/i8254.h | 2 + + arch/x86/kvm/kvm_svm.h | 16 +- + arch/x86/kvm/mmu.c | 217 ++++---- + arch/x86/kvm/paging_tmpl.h | 213 ++++----- + arch/x86/kvm/svm.c | 868 ++++++++++++++++++++++++++---- + arch/x86/kvm/vmx.c | 303 +++++++---- + arch/x86/kvm/x86.c | 310 +++++++---- + arch/x86/kvm/x86_emulate.c | 56 ++- + include/linux/kvm.h | 104 +++- + include/linux/kvm_host.h | 56 ++- + include/linux/kvm_types.h | 13 - + virt/kvm/ioapic.c | 6 + + virt/kvm/irq_comm.c | 192 +++++++- + virt/kvm/kvm_main.c | 103 +++- + 57 files changed, 3999 insertions(+), 1123 deletions(-) + create mode 100644 arch/powerpc/include/asm/kvm_e500.h + create mode 100644 arch/powerpc/kvm/booke_emulate.c + create mode 100644 arch/powerpc/kvm/e500.c + create mode 100644 arch/powerpc/kvm/e500_emulate.c + create mode 100644 arch/powerpc/kvm/e500_tlb.c + create mode 100644 arch/powerpc/kvm/e500_tlb.h +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/scsi/scsi.c +Merge made by recursive. + drivers/scsi/Kconfig | 2 + + drivers/scsi/scsi.c | 104 +++++++++++ + drivers/scsi/scsi_debug.c | 443 +++++++++++++++++++++++++++++++++++++++++++- + drivers/scsi/scsi_sysfs.c | 1 - + drivers/scsi/ses.c | 31 +--- + include/scsi/scsi_device.h | 1 + + 6 files changed, 547 insertions(+), 35 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/configfs/dir.c | 59 +++++++++++ + fs/dquot.c | 218 ++++++++++++++++++++++------------------ + fs/ocfs2/cluster/heartbeat.c | 96 +++++++++++++++++- + fs/ocfs2/cluster/heartbeat.h | 3 +- + fs/ocfs2/cluster/nodemanager.c | 9 ++- + fs/ocfs2/dcache.c | 42 +++++++- + fs/ocfs2/dcache.h | 9 ++- + fs/ocfs2/journal.c | 12 -- + fs/ocfs2/journal.h | 11 ++ + fs/ocfs2/localalloc.c | 86 ---------------- + fs/ocfs2/ocfs2.h | 12 ++- + fs/ocfs2/quota_global.c | 173 +------------------------------- + fs/ocfs2/super.c | 179 ++++++++++++++++++++++++++++++++ + fs/ocfs2/xattr.c | 17 ++-- + include/linux/quotaops.h | 2 - + 15 files changed, 542 insertions(+), 386 deletions(-) +Merging ext4/next +$ git merge ext4/next +Merge made by recursive. + fs/ext3/namei.c | 20 ++++++++++++++------ + fs/ext4/ext4.h | 17 +++++------------ + fs/ext4/ext4_i.h | 3 --- + fs/ext4/ext4_sb.h | 4 ---- + fs/ext4/inode.c | 4 ++-- + fs/ext4/mballoc.h | 1 - + fs/ext4/namei.c | 21 +++++++++++++++------ + fs/jbd2/journal.c | 6 +++--- + include/linux/jbd2.h | 3 ++- + 9 files changed, 41 insertions(+), 38 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Merge made by recursive. + drivers/dma/dmaengine.c | 2 ++ + drivers/dma/dmatest.c | 35 +++++++++++++++++++++++++++++++---- + drivers/dma/fsldma.c | 8 +++++--- + 3 files changed, 38 insertions(+), 7 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Merge made by recursive. + Documentation/filesystems/udf.txt | 2 + + fs/udf/balloc.c | 113 +++++----- + fs/udf/dir.c | 14 +- + fs/udf/directory.c | 38 ++-- + fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 213 ++++++++++--------- + fs/udf/misc.c | 29 ++-- + fs/udf/namei.c | 86 ++++---- + fs/udf/osta_udf.h | 22 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 139 ++++++++----- + fs/udf/truncate.c | 44 ++-- + fs/udf/udf_i.h | 6 +- + fs/udf/udf_sb.h | 4 + + fs/udf/udfdecl.h | 46 +++-- + fs/udf/udfend.h | 28 ++-- + fs/udf/udftime.c | 6 +- + fs/udf/unicode.c | 41 +++-- + 19 files changed, 663 insertions(+), 590 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/chips/map_rom.c | 8 ++++++++ + drivers/mtd/devices/slram.c | 14 ++++++++++---- + drivers/mtd/lpddr/Kconfig | 1 + + 3 files changed, 19 insertions(+), 4 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/aes-i586-asm_32.S | 18 +- + arch/x86/crypto/aes-x86_64-asm_64.S | 6 +- + arch/x86/crypto/aes_glue.c | 20 +- + arch/x86/crypto/aesni-intel_asm.S | 896 +++++++++++++++++++++++++++++++++++ + arch/x86/crypto/aesni-intel_glue.c | 461 ++++++++++++++++++ + arch/x86/include/asm/cpufeature.h | 1 + + crypto/Kconfig | 25 + + crypto/cryptd.c | 35 ++ + crypto/shash.c | 2 - + include/crypto/aes.h | 6 +- + include/crypto/cryptd.h | 27 + + 12 files changed, 1480 insertions(+), 20 deletions(-) + create mode 100644 arch/x86/crypto/aesni-intel_asm.S + create mode 100644 arch/x86/crypto/aesni-intel_glue.c + create mode 100644 include/crypto/cryptd.h +$ git reset --hard HEAD^ +HEAD is now at 84d88dd Merge commit 'mtd/master' +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Already uptodate! +Merge made by recursive. +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Recorded preimage for 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c'. +Created commit 430cabe: Merge commit 'cpufreq/next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 36 ++-- + arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | 54 ++-- + arch/x86/kernel/cpu/cpufreq/e_powersaver.c | 21 +- + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 6 +- + arch/x86/kernel/cpu/cpufreq/gx-suspmod.c | 105 +++++--- + arch/x86/kernel/cpu/cpufreq/longhaul.c | 182 +++++++------ + arch/x86/kernel/cpu/cpufreq/longhaul.h | 12 +- + arch/x86/kernel/cpu/cpufreq/longrun.c | 25 +- + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 60 +++-- + arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 44 ++-- + arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 239 ++++++++++------- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 354 ++++++++++++++++--------- + arch/x86/kernel/cpu/cpufreq/sc520_freq.c | 30 ++- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 70 +++--- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 129 ++++++---- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.h | 18 +- + arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | 166 +++++++----- + drivers/cpufreq/cpufreq.c | 52 ++-- + drivers/cpufreq/cpufreq_conservative.c | 28 +- + drivers/cpufreq/cpufreq_ondemand.c | 32 +-- + drivers/cpufreq/cpufreq_stats.c | 74 +++--- + drivers/cpufreq/cpufreq_userspace.c | 27 +- + drivers/cpufreq/freq_table.c | 18 +- + 23 files changed, 1022 insertions(+), 760 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 2e83eb4 Merge commit 'sound/for-next' +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged kernel/module.c +Auto-merged kernel/workqueue.c +Merge made by recursive. + include/linux/module.h | 25 ++++++++++++++++--------- + kernel/module.c | 33 +++++++++++++++++++++++---------- + kernel/workqueue.c | 20 ++++++++++---------- + 3 files changed, 49 insertions(+), 29 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/CHANGES | 4 +- + fs/cifs/cifsencrypt.c | 18 ++++---- + fs/cifs/cifsproto.h | 4 +- + fs/cifs/connect.c | 8 +-- + fs/cifs/dir.c | 56 ++++++++++++---------- + fs/cifs/inode.c | 5 ++ + fs/cifs/md5.c | 38 +++++++------- + fs/cifs/md5.h | 6 +- + fs/cifs/transport.c | 127 +++++++++++++++---------------------------------- + 9 files changed, 113 insertions(+), 153 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/locking.c +Removed fs/gfs2/locking/dlm/Makefile +Removed fs/gfs2/locking/dlm/lock.c +Removed fs/gfs2/locking/dlm/lock_dlm.h +Removed fs/gfs2/locking/dlm/main.c +Removed fs/gfs2/locking/dlm/mount.c +Removed fs/gfs2/locking/dlm/sysfs.c +Removed fs/gfs2/locking/dlm/thread.c +Removed fs/gfs2/mount.h +Removed include/linux/lm_interface.h +Merge made by recursive. + fs/gfs2/Kconfig | 17 +- + fs/gfs2/Makefile | 4 +- + fs/gfs2/acl.c | 1 - + fs/gfs2/bmap.c | 1 - + fs/gfs2/dir.c | 1 - + fs/gfs2/eaops.c | 1 - + fs/gfs2/eattr.c | 1 - + fs/gfs2/glock.c | 251 +++++---------- + fs/gfs2/glock.h | 127 +++++++- + fs/gfs2/glops.c | 14 - + fs/gfs2/incore.h | 67 ++++- + fs/gfs2/inode.c | 13 +- + fs/gfs2/inode.h | 22 +- + fs/gfs2/lock_dlm.c | 240 ++++++++++++++ + fs/gfs2/locking.c | 232 ------------- + fs/gfs2/locking/dlm/Makefile | 3 - + fs/gfs2/locking/dlm/lock.c | 708 ---------------------------------------- + fs/gfs2/locking/dlm/lock_dlm.h | 166 ---------- + fs/gfs2/locking/dlm/main.c | 48 --- + fs/gfs2/locking/dlm/mount.c | 276 ---------------- + fs/gfs2/locking/dlm/sysfs.c | 226 ------------- + fs/gfs2/locking/dlm/thread.c | 68 ---- + fs/gfs2/log.c | 1 - + fs/gfs2/lops.c | 1 - + fs/gfs2/main.c | 13 +- + fs/gfs2/meta_io.c | 1 - + fs/gfs2/mount.c | 112 +------ + fs/gfs2/mount.h | 17 - + fs/gfs2/ops_address.c | 2 +- + fs/gfs2/ops_dentry.c | 1 - + fs/gfs2/ops_export.c | 1 - + fs/gfs2/ops_file.c | 74 ++--- + fs/gfs2/ops_fstype.c | 147 ++++++--- + fs/gfs2/ops_inode.c | 1 - + fs/gfs2/ops_super.c | 42 ++- + fs/gfs2/quota.c | 203 ++++++------ + fs/gfs2/quota.h | 2 + + fs/gfs2/recovery.c | 28 +- + fs/gfs2/rgrp.c | 1 - + fs/gfs2/super.c | 1 - + fs/gfs2/super.h | 26 +- + fs/gfs2/sys.c | 156 +++++++++- + fs/gfs2/trans.c | 3 +- + fs/gfs2/util.c | 11 +- + include/linux/lm_interface.h | 277 ---------------- + 45 files changed, 1013 insertions(+), 2595 deletions(-) + create mode 100644 fs/gfs2/lock_dlm.c + delete mode 100644 fs/gfs2/locking.c + delete mode 100644 fs/gfs2/locking/dlm/Makefile + delete mode 100644 fs/gfs2/locking/dlm/lock.c + delete mode 100644 fs/gfs2/locking/dlm/lock_dlm.h + delete mode 100644 fs/gfs2/locking/dlm/main.c + delete mode 100644 fs/gfs2/locking/dlm/mount.c + delete mode 100644 fs/gfs2/locking/dlm/sysfs.c + delete mode 100644 fs/gfs2/locking/dlm/thread.c + delete mode 100644 fs/gfs2/mount.h + delete mode 100644 include/linux/lm_interface.h +Merging input/next +$ git merge input/next +Already up-to-date. +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged fs/fcntl.c +Auto-merged fs/ioctl.c +Auto-merged include/linux/fs.h +Merge made by recursive. + drivers/char/tty_io.c | 5 +-- + fs/fcntl.c | 65 +++++++++++++++++++++++++++++++++++++++---------- + fs/ioctl.c | 25 ++++--------------- + fs/nfsd/vfs.c | 5 +++- + include/linux/fs.h | 17 +++++++++++++ + 5 files changed, 80 insertions(+), 37 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Merge made by recursive. + fs/ubifs/dir.c | 4 ++-- + fs/ubifs/file.c | 8 ++++---- + fs/ubifs/super.c | 11 ++++++----- + fs/ubifs/ubifs.h | 14 +++++++------- + 4 files changed, 19 insertions(+), 18 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Removed drivers/media/dvb/ttpci/fdump.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +Auto-merged firmware/WHENCE +Removed sound/isa/wavefront/yss225.c +Merge made by recursive. + 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/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/.gitignore | 1 + + firmware/Makefile | 29 +- + firmware/WHENCE | 59 + + 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 + + {scripts => firmware}/ihex2fw.c | 0 + 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/yamaha/yss225_registers.bin.ihex | 998 +++++++++++ + scripts/.gitignore | 1 - + scripts/Makefile | 3 +- + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 ----------------------------- + 34 files changed, 9695 insertions(+), 11724 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + 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/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 + rename {scripts => firmware}/ihex2fw.c (100%) + 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/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merged drivers/leds/Kconfig +Auto-merged drivers/leds/Makefile +Merge made by recursive. + Documentation/powerpc/dts-bindings/gpio/led.txt | 46 ++++- + drivers/leds/Kconfig | 28 +++- + drivers/leds/Makefile | 3 + + drivers/leds/led-class.c | 21 +++- + drivers/leds/leds-dac124s085.c | 150 +++++++++++++++++ + drivers/leds/leds-gpio.c | 205 ++++++++++++++++++----- + drivers/leds/leds.h | 4 +- + drivers/leds/ledtrig-default-on.c | 2 +- + drivers/leds/ledtrig-heartbeat.c | 4 +- + drivers/leds/ledtrig-ide-disk.c | 3 +- + drivers/leds/ledtrig-timer.c | 2 +- + include/linux/leds.h | 1 + + 12 files changed, 408 insertions(+), 61 deletions(-) + create mode 100644 drivers/leds/leds-dac124s085.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + drivers/video/backlight/mbp_nvidia_bl.c | 191 +++++++++++++++++++++++++------ + 1 files changed, 155 insertions(+), 36 deletions(-) +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 mm/slob.c +CONFLICT (content): Merge conflict in mm/slob.c +Auto-merged mm/slub.c +Recorded preimage for 'mm/slob.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'mm/slob.c'. +Created commit 9a4df90: Merge commit 'slab/for-next' +$ git diff -M --stat --summary HEAD^.. + mm/slob.c | 40 +++++++++++++++++++++++++--------------- + mm/slub.c | 2 +- + 2 files changed, 26 insertions(+), 16 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/include/asm/pgtable.h +Auto-merged arch/x86/kernel/traps.c +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/gfp.h +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/mm_types.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit c9ca1a0: 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 | 14 +- + 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, 1981 insertions(+), 103 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 hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 57 +++++++++++++++++++---- + drivers/regulator/bq24022.c | 6 +-- + drivers/regulator/core.c | 46 ++++++++++++++++++ + drivers/regulator/virtual.c | 12 +++-- + drivers/regulator/wm8350-regulator.c | 2 +- + include/linux/regulator/driver.h | 17 +++++++ + 6 files changed, 121 insertions(+), 19 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 1 + + security/selinux/hooks.c | 83 +++++++++++++++++++++++------------ + security/selinux/include/objsec.h | 2 - + security/selinux/include/security.h | 8 +++ + 4 files changed, 64 insertions(+), 30 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged drivers/net/usb/hso.c +Merge made by recursive. +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already uptodate! +Merge made by recursive. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +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 +Auto-merged lib/swiotlb.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merged drivers/usb/wusbcore/rh.c +Merge made by recursive. + drivers/usb/host/whci/asl.c | 9 +++++++-- + drivers/usb/host/whci/hw.c | 15 +++++++++++++++ + drivers/usb/host/whci/pzl.c | 9 +++++++-- + drivers/usb/host/whci/whcd.h | 1 + + drivers/usb/wusbcore/devconnect.c | 1 + + drivers/usb/wusbcore/rh.c | 3 +++ + drivers/uwb/allocator.c | 1 - + drivers/uwb/rsv.c | 17 +++++++++++++---- + 8 files changed, 47 insertions(+), 9 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. +Merging proc/proc +$ git merge proc/proc +Removed fs/proc/inode-alloc.txt +Auto-merged include/linux/magic.h +Auto-merged kernel/exit.c +Auto-merged security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Recorded preimage for 'security/selinux/hooks.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'security/selinux/hooks.c'. +Created commit 97f6b29: Merge commit 'proc/proc' +$ git diff -M --stat --summary HEAD^.. + fs/proc/Makefile | 1 + + fs/proc/automount.c | 28 +++++ + fs/proc/base.c | 26 +++--- + fs/proc/generic.c | 62 ++++++++---- + fs/proc/inode-alloc.txt | 14 --- + fs/proc/inode.c | 2 +- + fs/proc/internal.h | 15 +++- + fs/proc/proc_net.c | 235 ++++++++++++++++++++++++++++++++---------- + include/linux/magic.h | 1 + + include/linux/proc_fs.h | 10 +- + include/net/net_namespace.h | 1 + + kernel/exit.c | 2 +- + security/selinux/hooks.c | 29 ++++- + 13 files changed, 309 insertions(+), 117 deletions(-) + create mode 100644 fs/proc/automount.c + delete mode 100644 fs/proc/inode-alloc.txt +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merged drivers/pci/intel-iommu.c +CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c +Auto-merged include/linux/dma_remapping.h +CONFLICT (content): Merge conflict in include/linux/dma_remapping.h +Auto-merged include/linux/intel-iommu.h +Resolved 'drivers/pci/intel-iommu.c' using previous resolution. +Resolved 'include/linux/dma_remapping.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 3e9c8d2: Merge commit 'dwmw2-iommu/master' +$ git diff -M --stat --summary HEAD^.. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merged MAINTAINERS +Auto-merged drivers/scsi/Kconfig +Merge made by recursive. + Documentation/devices.txt | 6 + + Documentation/scsi/osd.txt | 198 +++++ + MAINTAINERS | 10 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 2 + + drivers/scsi/osd/Kbuild | 45 + + drivers/scsi/osd/Kconfig | 53 ++ + drivers/scsi/osd/Makefile | 37 + + drivers/scsi/osd/osd_debug.h | 30 + + drivers/scsi/osd/osd_initiator.c | 1646 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/osd/osd_uld.c | 452 +++++++++++ + drivers/scsi/scsi_scan.c | 1 + + include/linux/major.h | 1 + + include/scsi/osd_attributes.h | 327 ++++++++ + include/scsi/osd_initiator.h | 428 ++++++++++ + include/scsi/osd_protocol.h | 579 ++++++++++++++ + include/scsi/osd_sec.h | 45 + + include/scsi/osd_sense.h | 260 ++++++ + include/scsi/osd_types.h | 40 + + include/scsi/scsi.h | 1 + + 20 files changed, 4163 insertions(+), 0 deletions(-) + create mode 100644 Documentation/scsi/osd.txt + create mode 100644 drivers/scsi/osd/Kbuild + create mode 100644 drivers/scsi/osd/Kconfig + create mode 100755 drivers/scsi/osd/Makefile + create mode 100644 drivers/scsi/osd/osd_debug.h + create mode 100644 drivers/scsi/osd/osd_initiator.c + create mode 100644 drivers/scsi/osd/osd_uld.c + create mode 100644 include/scsi/osd_attributes.h + create mode 100644 include/scsi/osd_initiator.h + create mode 100644 include/scsi/osd_protocol.h + create mode 100644 include/scsi/osd_sec.h + create mode 100644 include/scsi/osd_sense.h + create mode 100644 include/scsi/osd_types.h +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Merge made by recursive. + Documentation/SubmittingPatches | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merged kernel/trace/ftrace.c +Auto-merged lib/Kconfig.debug +Merge made by recursive. + Documentation/filesystems/ext3.txt | 14 ++++++++++++-- + arch/arm/mach-netx/include/mach/netx-regs.h | 2 +- + drivers/base/sys.c | 2 +- + drivers/input/mouse/gpio_mouse.c | 2 +- + drivers/isdn/mISDN/l1oip_codec.c | 2 +- + drivers/net/skfp/h/hwmtm.h | 2 +- + drivers/net/wan/farsync.c | 2 +- + drivers/usb/wusbcore/security.c | 2 +- + fs/proc/nommu.c | 2 +- + lib/Kconfig.debug | 13 ------------- + mm/page_alloc.c | 2 +- + 11 files changed, 21 insertions(+), 24 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging kmemleak/kmemleak +$ git merge kmemleak/kmemleak +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/arm/kernel/vmlinux.lds.S +Auto-merged arch/x86/kernel/vmlinux_32.lds.S +Auto-merged arch/x86/kernel/vmlinux_64.lds.S +Auto-merged include/linux/slab.h +CONFLICT (content): Merge conflict in include/linux/slab.h +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/module.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/Makefile +Auto-merged mm/page_alloc.c +Auto-merged mm/slab.c +CONFLICT (content): Merge conflict in mm/slab.c +Auto-merged mm/slob.c +CONFLICT (content): Merge conflict in mm/slob.c +Auto-merged mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Auto-merged mm/vmalloc.c +CONFLICT (content): Merge conflict in mm/vmalloc.c +Recorded preimage for 'mm/slob.c' +Resolved 'include/linux/slab.h' using previous resolution. +Resolved 'init/main.c' using previous resolution. +Resolved 'mm/slab.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Resolved 'mm/vmalloc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'mm/slob.c'. +Created commit 3004254: Merge commit 'kmemleak/kmemleak' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 4 + + Documentation/kmemleak.txt | 142 ++++ + MAINTAINERS | 6 + + arch/arm/kernel/vmlinux.lds.S | 2 + + arch/x86/kernel/vmlinux_32.lds.S | 1 + + arch/x86/kernel/vmlinux_64.lds.S | 1 + + drivers/char/vt.c | 7 + + include/linux/kmemleak.h | 96 +++ + include/linux/percpu.h | 5 + + include/linux/slab.h | 2 + + init/main.c | 4 +- + kernel/module.c | 56 ++ + lib/Kconfig.debug | 33 + + mm/Makefile | 2 + + mm/kmemleak-test.c | 111 +++ + mm/kmemleak.c | 1465 +++++++++++++++++++++++++++++++++++ + mm/page_alloc.c | 11 + + mm/slab.c | 32 +- + mm/slob.c | 7 + + mm/slub.c | 5 +- + mm/vmalloc.c | 30 +- + 21 files changed, 2015 insertions(+), 7 deletions(-) + create mode 100644 Documentation/kmemleak.txt + create mode 100644 include/linux/kmemleak.h + create mode 100644 mm/kmemleak-test.c + create mode 100644 mm/kmemleak.c +Merging quilt/staging +$ git merge quilt/staging +Merge made by recursive. + drivers/staging/Kconfig | 6 + + drivers/staging/Makefile | 3 + + drivers/staging/android/binder.c | 6 +- + drivers/staging/android/lowmemorykiller.txt | 16 + + drivers/staging/android/timed_gpio.c | 2 +- + drivers/staging/comedi/Kconfig | 1 + + drivers/staging/dst/Kconfig | 67 + + drivers/staging/dst/Makefile | 3 + + drivers/staging/dst/crypto.c | 731 ++++++++ + drivers/staging/dst/dcore.c | 972 ++++++++++ + drivers/staging/dst/export.c | 664 +++++++ + drivers/staging/dst/state.c | 839 +++++++++ + drivers/staging/dst/thread_pool.c | 345 ++++ + drivers/staging/dst/trans.c | 335 ++++ + drivers/staging/meilhaus/Kconfig | 21 +- + drivers/staging/stlc45xx/Kconfig | 8 + + drivers/staging/stlc45xx/Makefile | 1 + + drivers/staging/stlc45xx/stlc45xx.c | 2606 +++++++++++++++++++++++++++ + drivers/staging/stlc45xx/stlc45xx.h | 283 +++ + drivers/staging/stlc45xx/stlc45xx_lmac.h | 434 +++++ + drivers/staging/sxg/sxg.c | 1682 ++++++++++-------- + drivers/staging/sxg/sxg.h | 884 +++++----- + drivers/staging/sxg/sxg_os.h | 100 +- + drivers/staging/sxg/sxgdbg.h | 101 +- + drivers/staging/sxg/sxghif.h | 1079 +++++++----- + drivers/staging/sxg/sxghw.h | 1550 ++++++++++------- + drivers/staging/sxg/sxgphycode.h | 14 +- + drivers/staging/tuxguardian/Kconfig | 8 + + drivers/staging/tuxguardian/Makefile | 3 + + drivers/staging/tuxguardian/capability.c | 102 ++ + drivers/staging/tuxguardian/commoncap.c | 346 ++++ + drivers/staging/tuxguardian/errors.h | 135 ++ + drivers/staging/tuxguardian/tg-defs.c | 406 +++++ + drivers/staging/tuxguardian/tg-defs.h | 52 + + drivers/staging/tuxguardian/tg.c | 459 +++++ + drivers/staging/tuxguardian/tg.h | 110 ++ + include/linux/connector.h | 4 +- + include/linux/dst.h | 587 ++++++ + 38 files changed, 12573 insertions(+), 2392 deletions(-) + create mode 100644 drivers/staging/android/lowmemorykiller.txt + create mode 100644 drivers/staging/dst/Kconfig + create mode 100644 drivers/staging/dst/Makefile + create mode 100644 drivers/staging/dst/crypto.c + create mode 100644 drivers/staging/dst/dcore.c + create mode 100644 drivers/staging/dst/export.c + create mode 100644 drivers/staging/dst/state.c + create mode 100644 drivers/staging/dst/thread_pool.c + create mode 100644 drivers/staging/dst/trans.c + create mode 100644 drivers/staging/stlc45xx/Kconfig + create mode 100644 drivers/staging/stlc45xx/Makefile + create mode 100644 drivers/staging/stlc45xx/stlc45xx.c + create mode 100644 drivers/staging/stlc45xx/stlc45xx.h + create mode 100644 drivers/staging/stlc45xx/stlc45xx_lmac.h + create mode 100644 drivers/staging/tuxguardian/Kconfig + create mode 100644 drivers/staging/tuxguardian/Makefile + create mode 100644 drivers/staging/tuxguardian/capability.c + create mode 100644 drivers/staging/tuxguardian/commoncap.c + create mode 100644 drivers/staging/tuxguardian/errors.h + create mode 100644 drivers/staging/tuxguardian/tg-defs.c + create mode 100644 drivers/staging/tuxguardian/tg-defs.h + create mode 100644 drivers/staging/tuxguardian/tg.c + create mode 100644 drivers/staging/tuxguardian/tg.h + create mode 100644 include/linux/dst.h +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..7e79bfb96f76 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,50 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Unchanged quilt series driver-core +Unchanged quilt series usb +Unchanged quilt series device-mapper +Unchanged quilt series i2c +Unchanged quilt series jdelvare-hwmon +Unchanged quilt series kernel-doc +Importing ide based on 5393f780277165f282a37ed82dd878159ec9dad5 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 5393f780277165f282a37ed82dd878159ec9dad5 +HEAD is now at 5393f78 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-fix-pmac-breakage.patch +ide-fix-falcon-ide-breakage.patch +palm_bk3710-buildfix.patch +ide-fix-ide_dflag_no_io_32bit-handling.patch +ide-move-ide_pktcmd_tf_load-to-ide-atapi-c.patch +ide-no-need-to-touch-local-irqs-in-ide_probe_port.patch +ide-move-rqsize-init-from-init_irq-to-ide_init_port.patch +ide-move-lock-and-timer-init-from-init_irq-to-ide_init_port_data.patch +ide-init_irq-doesnt-need-to-hold-ide_cfg_mtx.patch +ide-force-via-ide-legacy-interrupts-for-amigaone-boards.patch +ide-add-cs5536-host-driver-v2.patch +ide-remove-superfluous-check-from-ide_proc_port_register_devices.patch +ide-acpi-no-need-to-zero-acpidata-for-devices.patch +ide-acpi-init-acpi-handles-early-for-devices.patch +ide-add-ide_for_each_present_dev-iterator.patch +ide-sanitize-acpi-initialization.patch +ide-acpi-cleanup-do_drive_get_gtf.patch +ide-acpi-cleanup-do_drive_set_taskfiles.patch +ide-acpi-remove-taskfile_load_raw.patch +Context reduced to (2/2) to apply fragment at 21 +ide-remove-stale-comments-from-drive_is_ready.patch +ide-unexport-ide_devset_execute.patch +ide-move-drive_is_ready-to-ide-io-c.patch +ide-move-ide_dma_timeout_retry-to-ide-dma-c.patch +ide-remove-ide_do_drive_cmd.patch +ide-factor-out-processing-of-special-commands-from-ide_special_rq.patch +ide-move-ide_do_park_unpark-to-ide-park-c.patch +ide-move-device-settings-code-to-ide-devsets-c.patch +ide-move-xfer-mode-tuning-to-ide-xfer-mode-c.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/ide +From ../quilt-tmp + + 59a9cec...53cec23 master -> quilt/ide (forced update) +Unchanged quilt series rr +Unchanged quilt series ttydev +Unchanged quilt series staging diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..caeb2cf277b2 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090120 |