diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-15 16:54:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-15 16:54:33 +1100 |
| commit | 1cacfc11acf2150be17043317abbc3638c28e940 (patch) | |
| tree | ef1ba20bedf7cd8c63326e88ddea9e4e6bb41b97 | |
| parent | bec080a68e87e69a67019d878febd54153d622f2 (diff) | |
Add linux-next specific files for 20090115next-20090115
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 | 1617 | ||||
| -rw-r--r-- | Next/quilt-import.log | 78 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 1966 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..412546d16c9b --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,134 @@ +Name SHA1 +---- ---- +origin a6525042bfdfcab128bd91fad264de10fd24a55e +arm-current e6b50c8d58bde1cdc5c9c9520be7ed8921d26aab +m68k-current 877d52431f4d3cda4adea077ffbe88f3fd1755d3 +powerpc-merge ea0105ea3881b409e362451690184af494bce6e3 +sparc-current 37a76bd4f1b716949fc38a6842e89f0ccb8384d0 +scsi-rc-fixes 32aeef605aa01e1fee45e052eceffb00e72ba2b0 +net-current 7891cc818967e186be68caac32d84bfd0a3f0bd2 +sound-current 37a76bd4f1b716949fc38a6842e89f0ccb8384d0 +pci-current ede6f5aea054d3fb67c78857f7abdee602302043 +wireless-current 26d1597c9a4532eec74f9651c4c96483cb8892fe +kbuild-current df291fa993c506da89a89264ff8166bccd172a14 +driver-core.current c59765042f53a79a7a65585042ff463b69cb248c +usb.current c59765042f53a79a7a65585042ff463b69cb248c +cpufreq-current bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e +input-current 27f23336bcc1b08512751c878b3e05ed6b815e86 +md-current 4044ba58dd15cb01797c4fd034f39ef4a75f7cc3 +audit-current c05a63c58c2884c4db00308ba5eb0dbac2fb5ac9 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm c59765042f53a79a7a65585042ff463b69cb248c +avr32 52435bfc665716fdf9a02f0d08e7ce50ddb9bf45 +blackfin 06af15e086e39a5a2a2413973a64af8e10122f28 +cris 0db42c6b23ce26b05b235dbe2e0aa096db194e33 +ia64 e0b325d310a6b11f1538413fd557d2eb98f2fae5 +m68k 877d52431f4d3cda4adea077ffbe88f3fd1755d3 +m68knommu ae04d1401577bb63151480a053057de58b8e10bb +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc ae16489eb1175066c8f3008fc3c0396c525e1906 +powerpc ea0105ea3881b409e362451690184af494bce6e3 +4xx b58602a4bac012b5f4fc12fe6b46ab237b610d5d +galak ea0105ea3881b409e362451690184af494bce6e3 +pxa 9a8585e138d7d6285d50ab3cf3cce4fdb9d4dbd1 +s390 a6525042bfdfcab128bd91fad264de10fd24a55e +sh 7aa5fa7e424970e1144666468e8b25e5ac01b385 +sparc 6680598b44ed3c0052d155522eb21fc5a00de5f3 +x86 226cf6bc3b83a3c3d2434c9b9061021a302b0c9f +xtensa 8903709b054a8dafe4e8c6d9a6444034d7aba36f +driver-core 5400944a65406727e73f267fad1e0502553cb414 +usb 5400944a65406727e73f267fad1e0502553cb414 +tip-core fdbc0450df12cc9cb397f3497db4b0cad7c1a8ff +cpus4096 3869f98858df8674d9aca87de54717837c2a09dc +ftrace f5d94186ca202693152770ebd93cf1b36076e338 +genirq 1faa44855f8f1e9b2cd46e9227ad23c3301556c1 +safe-poison-pointers 286c12f72ad295bbc27cfe67b0922bfc09732af7 +sched d9be28ea9110c596a05bd2d56afa94251bd19818 +stackprotector a9de18eb761f7c1c860964b2e5addc1a35c7e861 +timers 74541be1cd6480943f84ae9116bfad1c90f1d3c0 +pci f6dc1e5e3d4b523e1616b43beddb04e4fb1d376a +device-mapper e468ea8c69698c3ef03cc064c2e31c5260a4a79c +hid 863baf3be4c41943a9965a7d84ebae9f27965046 +i2c 19319ecb4714df4e2410faccd1e66c02d62936c0 +jdelvare-hwmon 4f4c923667b3a8ce7c6d5316f018839beb2b1be5 +kernel-doc 7591103c08abade60aeddb432ed0686ddd0de1c6 +v4l-dvb 78e8c875e5f3730b0a17cbe4289b5a1168070654 +quota 04279f0aebb68d1eccd8957a5f24347df604ebd3 +jfs fec1878fe952b994125a3be7c94b1322db586f3b +kbuild b67ff8ce122f3353bd741db48ce1756c12fb5f2d +ide 1a71090a651a443a36c8217846aa8514bd51bdc2 +libata 0fe40ff891faa940e539bd5a92c4a5dd9ae49b0b +nfs df8ecd7ecb3a01647266109e50255ee0195b3fd7 +xfs ce79735c12d62c3cda38eb31762cf98e87c7b087 +infiniband e0b325d310a6b11f1538413fd557d2eb98f2fae5 +acpi 073ce4be3d0550c93664f18845831a86388b9f55 +nfsd cc5a9072abb1ca674f03357b261e963132f6dd90 +ieee1394 607e16ce197c58d4adcec238c4fc4d62a78b6c88 +ubi ae04d1401577bb63151480a053057de58b8e10bb +kvm 261763c30e7c349cac22eba0ca01c66ffb369a70 +dlm c7be761a8163d2f1ac0b606c21e4316b7abc5af7 +scsi bd21ed64ec1950f32706a54ecdbe93901fbc03a9 +ocfs2 5f58543eec96a176ac8d689563054cbcdbd9f708 +ext4 4b905671d2ea09fd48fed72c581df17e40823f39 +async_tx a9cd3ef4b23c49e31a284e4d26362fee8c7e7864 +udf 61edc2f987fc5e5f84dd098c4b6b488662ef37a4 +net 3c92ec8ae91ecf59d88c798301833d7cf83f2179 +mtd 5f877607cdfe8b60bf96fb96e527e0ce2a21e68b +wireless 9cf7f247bd0cd21e475c71a4e018bb612ef02aab +crypto 0ee4a96902dd7858e65f378c86f428a0355bd841 +vfs fd217f4d70172c526478f2bc76859e909fdfa674 +sound 24df3e28cfc05c09c9ac508161d449a381e84b25 +cpufreq 187d9f4ed4fc089f1f25a875fb485e27626972f9 +v9fs f1d9e4586e79e1fc7b26d1c567599a904013f199 +rr 815c3912efbea43704281f8e4e1f7c9ef5ea4ec8 +cifs a3952c2de7f7e76bc84d85e5895f70ca10079cd0 +mmc 418f19ea17a99421b22a64e101e14b6a16bed66d +gfs2 7e9198f97f28f9c8ebf4117c50809608c79379dd +input c59765042f53a79a7a65585042ff463b69cb248c +bkl-removal 048cd5888f81713af4597bde5815f32d58fdf5b0 +ubifs ae04d1401577bb63151480a053057de58b8e10bb +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block d3f761104b097738932afcc310fbbbbfb007ef92 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware f0c996e7399bb6aca523119a568b56c98bbe16df +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery ed8c3174dd227031d1f3b9fa4fbb512f8f623434 +leds f5f37177614739d9f02d036a2c9eb752d6ff63bc +backlight 8fd4c8b7fc804c3ccf7f6b1d2f3db0e9b8e25609 +kgdb 0136574e061924dc236a611f28e881a12ab6822a +slab a6525042bfdfcab128bd91fad264de10fd24a55e +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 4044ba58dd15cb01797c4fd034f39ef4a75f7cc3 +kmemcheck 72accebb513bcb4ab345719135baf5d242464dac +generic-ipi 6a94cb73064c952255336cc57731904174b2c58f +mfd d992c8403a72c4067587a32a7736bcc2af6c408f +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 3a03ac1a0223f779a3de313523408ddb099e5679 +voltage 4a0ef6913d443a38bec035cda17ac328882013b3 +security-testing c8334dc8fb6413b363df3e1419e287f5b25bce32 +lblnet ede6f5aea054d3fb67c78857f7abdee602302043 +ttydev 7afb3a948b2ae0818a69f6c434aa8ea283184544 +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 d5b524327b2a482dddae3839ced8f8825074730d +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 1900c6d960729ab3a21f6991d9f7b603c2a5e333 +audit b3985e2bf6ce51ae943208af4bd336287fb34ed6 +squashfs fc55584175589b70f4c30cb594f09f4bd6ad5d40 +omap c59765042f53a79a7a65585042ff463b69cb248c +kmemleak 075b7269bb81bf7df521d67f24a66dbe56f66a06 +staging 5400944a65406727e73f267fad1e0502553cb414 +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..3e1e2f43de06 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1617 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at e0b325d Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +Merging origin/master +$ git merge origin/master +Updating e0b325d..a652504 +Fast forward + arch/arm/mach-imx/clock.c | 2 +- + arch/arm/mach-imx/generic.c | 6 +- + arch/arm/mach-imx/include/mach/imx-regs.h | 106 ----------------------------- + arch/arm/mach-w90x900/mach-w90p910evb.c | 1 + + arch/arm/mach-w90x900/time.c | 1 - + arch/arm/mm/proc-syms.c | 1 + + arch/x86/include/asm/pgtable.h | 19 +++++ + arch/x86/mm/pageattr.c | 10 ++- + arch/x86/mm/pat.c | 90 +++++++++++++++++-------- + arch/x86/pci/i386.c | 12 +--- + drivers/mfd/twl4030-core.c | 8 +- + drivers/parisc/superio.c | 1 - + drivers/serial/8250.c | 2 + + fs/select.c | 2 +- + include/asm-generic/pgtable.h | 4 +- + mm/memory.c | 15 +++- + 16 files changed, 113 insertions(+), 167 deletions(-) +$ git am -3 ../patches/linux-next__mfd_tree_build_failure +Applying: linux-next: mfd tree build failure +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Merge made by recursive. + arch/powerpc/boot/dts/mpc8315erdb.dts | 4 +- + arch/powerpc/boot/dts/mpc8544ds.dts | 4 +- + arch/powerpc/boot/dts/mpc8572ds.dts | 4 +- + arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 2 +- + arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 2 +- + arch/powerpc/configs/ppc64_defconfig | 26 ++++- + arch/powerpc/include/asm/qe.h | 19 +++- + arch/powerpc/include/asm/rtas.h | 2 +- + arch/powerpc/include/asm/types.h | 7 +- + arch/powerpc/kernel/asm-offsets.c | 7 + + arch/powerpc/kernel/cacheinfo.c | 10 +- + arch/powerpc/kernel/dma-iommu.c | 4 +- + arch/powerpc/kernel/head_64.S | 9 ++ + arch/powerpc/kernel/head_fsl_booke.S | 8 +- + arch/powerpc/kernel/iommu.c | 12 +- + arch/powerpc/kernel/lparcfg.c | 10 +- + arch/powerpc/kernel/machine_kexec.c | 25 ++++ + arch/powerpc/kernel/pci_64.c | 6 +- + arch/powerpc/kernel/setup_64.c | 6 +- + arch/powerpc/kernel/vmlinux.lds.S | 4 +- + arch/powerpc/mm/fsl_booke_mmu.c | 9 +- + arch/powerpc/mm/mmu_decl.h | 11 ++- + arch/powerpc/mm/stab.c | 4 +- + arch/powerpc/oprofile/op_model_pa6t.c | 6 +- + arch/powerpc/platforms/512x/clock.c | 4 +- + arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 3 - + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 8 +- + arch/powerpc/platforms/83xx/Makefile | 1 + + .../powerpc/platforms/83xx}/mcu_mpc8349emitx.c | 0 + arch/powerpc/platforms/Kconfig | 11 ++ + arch/powerpc/platforms/cell/beat_interrupt.c | 2 +- + arch/powerpc/platforms/cell/celleb_scc_epci.c | 4 +- + arch/powerpc/platforms/cell/iommu.c | 4 +- + arch/powerpc/platforms/cell/ras.c | 8 +- + arch/powerpc/platforms/cell/spu_base.c | 4 +- + arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- + arch/powerpc/platforms/cell/spufs/coredump.c | 2 +- + arch/powerpc/platforms/cell/spufs/fault.c | 2 +- + arch/powerpc/platforms/cell/spufs/file.c | 6 +- + arch/powerpc/platforms/fsl_uli1575.c | 1 + + arch/powerpc/platforms/iseries/iommu.c | 4 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 35 +++--- + arch/powerpc/sysdev/fsl_pci.c | 107 +++++++++++----- + arch/powerpc/sysdev/mpic.c | 2 +- + drivers/block/xsysace.c | 1 + + drivers/char/bsr.c | 2 +- + drivers/char/hvc_console.c | 14 +- + drivers/char/hvc_irq.c | 2 +- + drivers/i2c/chips/Kconfig | 11 -- + drivers/i2c/chips/Makefile | 1 - + drivers/net/ehea/ehea_main.c | 8 +- + drivers/net/ehea/ehea_qmr.c | 18 ++-- + drivers/net/ibmveth.c | 16 +- + drivers/net/iseries_veth.c | 2 +- + drivers/net/pasemi_mac.c | 6 +- + drivers/of/of_i2c.c | 19 +++ + drivers/pcmcia/electra_cf.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 12 +- + drivers/spi/xilinx_spi.c | 137 ++++++++++++-------- + include/linux/of_i2c.h | 3 + + 61 files changed, 423 insertions(+), 244 deletions(-) + rename {drivers/i2c/chips => arch/powerpc/platforms/83xx}/mcu_mpc8349emitx.c (100%) +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/message/fusion/lsi/mpi.h | 7 ++- + drivers/message/fusion/lsi/mpi_cnfg.h | 47 ++++++++++++++- + drivers/message/fusion/lsi/mpi_fc.h | 2 +- + drivers/message/fusion/lsi/mpi_history.txt | 86 +++++++++++++++++++-------- + drivers/message/fusion/lsi/mpi_init.h | 2 +- + drivers/message/fusion/lsi/mpi_ioc.h | 22 ++++++- + drivers/message/fusion/lsi/mpi_lan.h | 2 +- + drivers/message/fusion/lsi/mpi_log_fc.h | 2 +- + drivers/message/fusion/lsi/mpi_log_sas.h | 37 ++++++++++-- + drivers/message/fusion/lsi/mpi_raid.h | 11 +++- + drivers/message/fusion/lsi/mpi_sas.h | 18 ++++-- + drivers/message/fusion/lsi/mpi_targ.h | 2 +- + drivers/message/fusion/lsi/mpi_tool.h | 2 +- + drivers/message/fusion/lsi/mpi_type.h | 4 +- + drivers/message/fusion/mptbase.c | 87 +++++++++++++++++++++++---- + drivers/message/fusion/mptbase.h | 3 + + drivers/message/fusion/mptscsih.c | 3 + + drivers/scsi/libiscsi_tcp.c | 3 +- + drivers/scsi/qla2xxx/qla_init.c | 58 +++++++++++------- + drivers/scsi/qla2xxx/qla_mid.c | 1 + + drivers/scsi/qla2xxx/qla_os.c | 7 +- + drivers/scsi/scsi.c | 5 +- + drivers/scsi/scsi_devinfo.c | 1 + + include/scsi/libiscsi_tcp.h | 1 + + 24 files changed, 318 insertions(+), 95 deletions(-) +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/gianfar.c | 8 ++++ + drivers/net/ppp_generic.c | 43 ++++++++++++++++++--- + drivers/net/usb/hso.c | 4 +- + drivers/net/wan/ixp4xx_hss.c | 6 +- + drivers/net/wireless/Kconfig | 2 +- + drivers/net/wireless/ath5k/base.c | 8 ++-- + drivers/net/wireless/ath5k/pcu.c | 4 +- + drivers/net/wireless/ath5k/reg.h | 2 +- + drivers/net/wireless/ath9k/Kconfig | 1 + + drivers/net/wireless/ath9k/main.c | 4 +- + drivers/net/wireless/ath9k/xmit.c | 48 +++++++++--------------- + drivers/net/wireless/b43/main.c | 2 +- + drivers/net/wireless/b43legacy/main.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 + + drivers/net/wireless/libertas_tf/main.c | 2 +- + drivers/net/wireless/orinoco/orinoco.c | 28 ++++++++++++- + drivers/net/wireless/orinoco/orinoco_cs.c | 1 + + drivers/net/wireless/p54/p54common.c | 34 +++++++++++++++-- + drivers/net/wireless/p54/p54usb.c | 2 + + drivers/net/wireless/rt2x00/rt2500usb.c | 23 ++++------- + drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +-- + drivers/net/wireless/rt2x00/rt2x00leds.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 11 ----- + drivers/net/wireless/rt2x00/rt2x00queue.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 6 +- + drivers/net/wireless/rt2x00/rt73usb.c | 1 + + drivers/net/wireless/rtl818x/rtl8180_dev.c | 1 + + drivers/net/wireless/rtl818x/rtl8187_dev.c | 5 +- + include/linux/netdevice.h | 2 +- + include/linux/netfilter/x_tables.h | 2 +- + net/bridge/br_netfilter.c | 18 ++++++--- + net/bridge/netfilter/ebtables.c | 2 +- + net/ipv4/netfilter/iptable_filter.c | 7 +--- + net/ipv4/netfilter/iptable_mangle.c | 6 +-- + net/ipv4/netfilter/iptable_raw.c | 6 +-- + net/ipv4/netfilter/iptable_security.c | 6 +-- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 5 +-- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 +- + net/ipv4/tcp.c | 11 ++++- + net/ipv6/ip6_fib.c | 15 ++++--- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- + net/mac80211/ht.c | 2 +- + net/mac80211/iface.c | 3 +- + net/mac80211/mesh_plink.c | 1 + + net/mac80211/rc80211_minstrel.c | 10 +++-- + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/x_tables.c | 8 ++++ + net/netfilter/xt_time.c | 11 +++++ + net/sched/sch_htb.c | 15 ++++--- + 52 files changed, 244 insertions(+), 161 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Removed arch/x86/scripts/strip-symbols +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 +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +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 +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v10/arch/byteorder.h | 10 ++++++---- + arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- + arch/cris/include/asm/byteorder.h | 20 ++++---------------- + 3 files changed, 14 insertions(+), 22 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Already up-to-date. +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/gpio.c | 338 +++++++++++++++++----------- + arch/sh/kernel/process_64.c | 2 - + arch/sh/mm/ioremap_64.c | 2 +- + drivers/serial/sh-sci.h | 6 +- + 56 files changed, 2546 insertions(+), 1226 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Already uptodate! +Merge made by recursive. +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 +Already up-to-date. +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/x86/include/asm/es7000/apic.h +Auto-merged arch/x86/include/asm/summit/apic.h +Auto-merged arch/x86/kernel/acpi/boot.c +Auto-merged arch/x86/kernel/apic.c +Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Auto-merged arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Auto-merged arch/x86/kernel/cpu/mcheck/mce_amd_64.c +Auto-merged arch/x86/kernel/cpuid.c +Auto-merged arch/x86/kernel/io_apic.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/setup_percpu.c +Auto-merged arch/x86/kernel/smp.c +Auto-merged arch/x86/kernel/smpboot.c +CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c +Auto-merged kernel/rcuclassic.c +CONFLICT (content): Merge conflict in kernel/rcuclassic.c +Auto-merged kernel/sched.c +Auto-merged kernel/time/tick-sched.c +Resolved 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c' using previous resolution. +Resolved 'arch/x86/kernel/smpboot.c' using previous resolution. +Resolved 'kernel/rcuclassic.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b286423: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 23 ++++++--- + arch/x86/kernel/microcode_core.c | 83 ++++++++++++++++--------------- + 2 files changed, 58 insertions(+), 48 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged init/main.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 +++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysrq.txt | 2 + + Documentation/vm/kmemtrace.txt | 126 ++++ + MAINTAINERS | 6 + + arch/x86/kvm/Kconfig | 3 +- + drivers/char/sysrq.c | 2 +- + include/linux/slab_def.h | 68 ++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 53 ++- + include/trace/kmemtrace.h | 75 +++ + init/main.c | 2 + + kernel/relay.c | 4 +- + kernel/trace/Kconfig | 21 + + kernel/trace/Makefile | 3 + + kernel/trace/ftrace.c | 4 +- + kernel/trace/kmemtrace.c | 350 +++++++++++ + kernel/trace/trace.c | 741 ++---------------------- + kernel/trace/trace.h | 61 ++- + kernel/trace/trace_boot.c | 1 + + kernel/trace/trace_branch.c | 295 ++++++---- + kernel/trace/trace_functions_graph.c | 8 +- + kernel/trace/trace_hw_branches.c | 1 + + kernel/trace/trace_mmiotrace.c | 4 +- + 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 | 243 ++++++++ + mm/slab.c | 71 ++- + mm/slob.c | 37 +- + mm/slub.c | 83 +++- + 32 files changed, 2368 insertions(+), 879 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/trace/kmemtrace.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 +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 +Already up-to-date. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/magic.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/panic.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/include/asm/pda.h | 4 ++-- + arch/x86/include/asm/system.h | 6 +++++- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged include/linux/clockchips.h +Auto-merged kernel/hrtimer.c +Auto-merged kernel/time/tick-common.c +CONFLICT (content): Merge conflict in kernel/time/tick-common.c +Resolved 'kernel/time/tick-common.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d00baae: Merge commit 'timers/auto-timers-next' +$ git diff -M --stat --summary HEAD^.. + include/linux/clockchips.h | 1 + + kernel/hrtimer.c | 34 +++++++++++++++++++++++++++++++++- + kernel/time/tick-common.c | 26 +++++++++++++++++++------- + 3 files changed, 53 insertions(+), 8 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +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-microsoft.c | 13 ++++--------- + 2 files changed, 7 insertions(+), 12 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. + Documentation/hwmon/adt7475 | 87 +++ + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adt7475.c | 1221 +++++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/k8temp.c | 55 ++- + 5 files changed, 1366 insertions(+), 9 deletions(-) + create mode 100644 Documentation/hwmon/adt7475 + create mode 100644 drivers/hwmon/adt7475.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merged 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 | 10 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/video/cs5345.c | 1 - + drivers/media/video/cx88/cx88.h | 2 +- + drivers/media/video/em28xx/em28xx-video.c | 41 +++-- + drivers/media/video/pwc/pwc-if.c | 1 - + 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/zoran/zoran_card.c | 8 + + 23 files changed, 273 insertions(+), 225 deletions(-) +Merging quota/for_next +$ git merge quota/for_next +Merge made by recursive. + fs/dquot.c | 300 +++++++++++++++++++++++++++++++++++----------- + include/linux/quota.h | 9 ++ + include/linux/quotaops.h | 88 ++++++++++++-- + 3 files changed, 314 insertions(+), 83 deletions(-) +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 +Auto-merged drivers/ide/ide-acpi.c +Merge made by recursive. + Documentation/mips/AU1xxx_IDE.README | 6 +- + drivers/ide/Kconfig | 15 +- + drivers/ide/Makefile | 1 + + drivers/ide/cs5536.c | 309 ++++++++++++++++++++++++++++++++++ + drivers/ide/ide-acpi.c | 214 ++++++------------------ + drivers/ide/ide-atapi.c | 21 +++- + drivers/ide/ide-disk.c | 2 +- + drivers/ide/ide-io.c | 20 --- + drivers/ide/ide-iops.c | 7 +- + drivers/ide/ide-pm.c | 12 +- + drivers/ide/ide-probe.c | 85 ++++------ + drivers/ide/ide-proc.c | 2 +- + drivers/ide/ide.c | 2 + + drivers/ide/it821x.c | 15 ++- + drivers/ide/sl82c105.c | 4 - + drivers/ide/tx4938ide.c | 1 - + drivers/ide/via82cxxx.c | 7 +- + include/linux/ide.h | 14 +- + include/linux/pci_ids.h | 1 + + 19 files changed, 465 insertions(+), 273 deletions(-) + create mode 100644 drivers/ide/cs5536.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 +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 +++++ + arch/ia64/kernel/ia64_ksyms.c | 1 + + 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 | 212 ++++-- + fs/afs/inode.c | 25 +- + fs/afs/internal.h | 53 +- + fs/afs/main.c | 27 +- + fs/afs/mntpt.c | 4 +- + fs/afs/vlocation.c | 23 +- + fs/afs/volume.c | 14 +- + fs/afs/write.c | 19 + + 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 + + 84 files changed, 15404 insertions(+), 409 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 +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 4 +- + fs/xfs/linux-2.6/xfs_aops.h | 2 - + fs/xfs/linux-2.6/xfs_buf.c | 79 +------------------------------------- + fs/xfs/linux-2.6/xfs_export.c | 23 +++++++++-- + fs/xfs/xfs_acl.h | 1 - + fs/xfs/xfs_ag.h | 2 +- + fs/xfs/xfs_attr_leaf.c | 72 +++++++++++++++++----------------- + fs/xfs/xfs_attr_leaf.h | 12 ------ + fs/xfs/xfs_bit.h | 10 +---- + fs/xfs/xfs_bmap_btree.c | 84 ++++++++++++++++++++-------------------- + fs/xfs/xfs_btree.c | 4 +- + fs/xfs/xfs_dir2_block.c | 7 ++- + fs/xfs/xfs_dir2_leaf.c | 6 +- + fs/xfs/xfs_dir2_sf.c | 15 ++++--- + fs/xfs/xfs_types.h | 4 +- + 15 files changed, 122 insertions(+), 203 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 5 + + arch/ia64/kernel/kprobes.c | 2 +- + arch/x86/kernel/kprobes.c | 2 +- + drivers/acpi/pci_link.c | 39 +- + drivers/misc/Makefile | 1 - + drivers/platform/x86/Kconfig | 25 + + drivers/platform/x86/Makefile | 2 + + drivers/{misc => platform/x86}/dell-laptop.c | 2 +- + drivers/platform/x86/eeepc-laptop.c | 4 +- + drivers/platform/x86/oqo-wmi.c | 941 ++++++++++++++++++++++++++ + include/acpi/actbl.h | 2 +- + kernel/kprobes.c | 2 +- + kernel/power/Makefile | 3 +- + 13 files changed, 1000 insertions(+), 30 deletions(-) + rename drivers/{misc => platform/x86}/dell-laptop.c (99%) + 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 +Auto-merged drivers/firewire/fw-card.c +Auto-merged drivers/firewire/fw-device.c +Auto-merged drivers/media/dvb/Kconfig +Merge made by recursive. + drivers/firewire/fw-card.c | 68 +-- + drivers/firewire/fw-cdev.c | 1012 ++++++++++++++++++++--------- + 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 | 28 +- + drivers/firewire/fw-topology.h | 19 +- + drivers/firewire/fw-transaction.c | 151 ++--- + drivers/firewire/fw-transaction.h | 127 ++--- + 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/firesat/Kconfig | 12 + + drivers/media/dvb/firesat/Makefile | 13 + + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ + drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ + drivers/media/dvb/firesat/cmp.c | 171 +++++ + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 261 ++++++++ + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ + drivers/media/dvb/firesat/firesat-rc.h | 11 + + drivers/media/dvb/firesat/firesat.h | 227 +++++++ + drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ + drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ + drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ + drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ + include/linux/firewire-cdev.h | 170 +++++- + 36 files changed, 4737 insertions(+), 786 deletions(-) + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/dvb/firesat/firesat_iso.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/powerpc/kernel/asm-offsets.c +Auto-merged arch/x86/kvm/Kconfig +Merge made by recursive. + arch/ia64/include/asm/kvm.h | 49 ++- + arch/ia64/include/asm/kvm_host.h | 8 +- + arch/ia64/kvm/Kconfig | 4 + + arch/ia64/kvm/kvm-ia64.c | 100 ++++- + arch/ia64/kvm/process.c | 15 - + 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/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 | 196 ++++++++ + 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 | 23 + + 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 | 273 ++++++++---- + arch/x86/kvm/x86_emulate.c | 56 ++- + include/linux/kvm.h | 61 ++- + include/linux/kvm_host.h | 25 +- + include/linux/kvm_types.h | 13 - + virt/kvm/ioapic.c | 6 + + virt/kvm/irq_comm.c | 24 + + virt/kvm/kvm_main.c | 67 +++- + 56 files changed, 3683 insertions(+), 1090 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/ocfs2/cluster/heartbeat.c | 96 +++++++++++++++++++++- + fs/ocfs2/cluster/heartbeat.h | 3 +- + fs/ocfs2/cluster/nodemanager.c | 9 ++- + fs/ocfs2/journal.c | 12 --- + fs/ocfs2/journal.h | 11 +++ + fs/ocfs2/localalloc.c | 86 ------------------- + fs/ocfs2/ocfs2.h | 6 +- + fs/ocfs2/super.c | 176 ++++++++++++++++++++++++++++++++++++++++ + fs/ocfs2/xattr.c | 17 ++-- + 10 files changed, 359 insertions(+), 116 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +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 | 2 +- + 3 files changed, 34 insertions(+), 5 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/lpddr/Kconfig | 1 + + 2 files changed, 9 insertions(+), 0 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + Documentation/sound/alsa/HD-Audio-Models.txt | 12 ++- + sound/pci/hda/hda_codec.c | 63 ++++++++++- + sound/pci/hda/hda_local.h | 3 + + sound/pci/hda/patch_nvhdmi.c | 2 + + sound/pci/hda/patch_realtek.c | 1 + + sound/pci/hda/patch_sigmatel.c | 159 +++++++++++++++++++++----- + sound/usb/usbquirks.h | 8 ++ + 7 files changed, 214 insertions(+), 34 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. + include/linux/module.h | 2 +- + 1 files changed, 1 insertions(+), 1 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 | 4 +- + fs/cifs/inode.c | 5 ++ + fs/cifs/md5.c | 38 +++++++++--------- + fs/cifs/md5.h | 6 +- + fs/cifs/transport.c | 107 +++++++++---------------------------------------- + 8 files changed, 61 insertions(+), 125 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 +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +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 +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 +Already up-to-date. +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 122e394: 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 mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Merge made by recursive. + drivers/gpu/drm/drm_irq.c | 18 +++++++++++++++--- + drivers/gpu/drm/i915/i915_dma.c | 8 ++++++++ + drivers/gpu/drm/i915/i915_irq.c | 6 ++++++ + 3 files changed, 29 insertions(+), 3 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/wm8400-regulator.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged drivers/char/pty.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 +Merge made by recursive. + 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 b30258f: 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 +Already up-to-date. +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 +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/net/wireless/ath9k/rc.c | 2 +- + drivers/usb/wusbcore/security.c | 2 +- + fs/proc/nommu.c | 2 +- + kernel/trace/ftrace.c | 2 +- + mm/page_alloc.c | 2 +- + 12 files changed, 23 insertions(+), 13 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 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 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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/slab.h'. +Recorded resolution for 'init/main.c'. +Recorded resolution for 'mm/slab.c'. +Recorded resolution for 'mm/slob.c'. +Recorded resolution for 'mm/slub.c'. +Created commit bec080a: 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 +Already up-to-date. +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..e511d5e53c1d --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,78 @@ +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 +Importing i2c based on 2.6.29-rc1-git2 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 3b1b71950b81c4a20ae63c2322383ab4932cdabd +HEAD is now at 3b1b719 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-id-remove-unused-ids.patch +i2c-id-remove-unused-hw-ids.patch +i2c-update-quilt-tree-location.patch +i2c-deprecate-legacy-binding-API.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 21f6b0d...19319ec master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.29-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard c59765042f53a79a7a65585042ff463b69cb248c +HEAD is now at c597650 Linux 2.6.29-rc1 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-k8temp-01-warn-about-errata.patch +hwmon-k8temp-02-fix-wrong-sensor-selection-for-revf-revg.patch +hwmon-k8temp-03-fix-temperature-reporting-for-most-revg.patch +hwmon-add-adt7475-driver-v2.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:17: space before tab in indent. + below this sets an alarm. +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:22: space before tab in indent. + only have effect when auto mode is turned off (see +warning: 2 lines add whitespace errors. +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + e533900...4f4c923 master -> quilt/jdelvare-hwmon (forced update) +Unchanged quilt series kernel-doc +Importing ide based on ede6f5aea054d3fb67c78857f7abdee602302043 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard ede6f5aea054d3fb67c78857f7abdee602302043 +HEAD is now at ede6f5a Fix up 64-bit byte swaps for most 32-bit architectures +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-fix-accidental-lockdep-breakage-caused-by-local_irq_set-removal.patch +it821x-add-ultra_mask-quirk-for-vortex86sx.patch +it821x-use-dev-revision-instead-of-pci_read_config_byte.patch +ide-cant-use-ssd-non-rotational-queue-flag-for-all-cfa-devices.patch +via82cxxx-fix-cable-warning-message.patch +sl82c105-remove-dead-code.patch +ide-remove-unused-config_blk_dev_ide_au1xxx_seqts_per_rq.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 +tx4938ide-fix-build-error-due-to-read_sff_dma_status-moving.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 +ide-fix-suspend-regression.patch +ide-fix-sparse-signed-ness-errors-with-host-host_busy.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/ide +From ../quilt-tmp + + 92ac468...1a71090 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..76e5a2188eca --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090115 |