summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-04-15 14:40:38 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-04-15 14:40:38 +1000
commit3adc530b2833837b018f1192cba72224f5a81386 (patch)
treef37c43843bfa0c0c338c8ea59c17cf9c84d0ef2d
parent642b15249c76be9d0033b43b4a7f070cfeb2a657 (diff)
Add linux-next specific files for 20090415next-20090415
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat
-rw-r--r--Next/SHA1s135
-rw-r--r--Next/Trees137
-rw-r--r--Next/merge.log1197
-rw-r--r--Next/quilt-import.log27
-rw-r--r--localversion-next1
5 files changed, 1497 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..2c971f83984a
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,135 @@
+Name SHA1
+---- ----
+origin 0882e8dd3aad33eca41696d463bb896e6c8817eb
+arm-current 3d6fdf7563d0a67c6973cf421f7405524ed8bdaf
+m68k-current 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213
+powerpc-merge 15f7176eb1cccec0a332541285ee752b935c1c85
+sparc-current c7cb1521b3289e2d107d3139ad7a902b386d7e43
+scsi-rc-fixes ee568b25ee9e160b32d1aef73d8b2ee9c05d34db
+net-current fc59f9a3bf8096a1f68a8b78ada7a0e0ab9236b2
+sound-current 577c9c456f0e1371cbade38eaf91ae8e8a308555
+pci-current 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6
+wireless-current 752c9e4ac22e458c342d60a009445fd24d658b48
+kbuild-current 2810ae8c73cbfb37891aa99dfbca46ffd40dbc91
+driver-core.current 92b7e1a5861a62a25f282fd071dc876f4b05899b
+usb.current e587ba1a2c0771c6759e4ab1c136f5de50c112f7
+cpufreq-current 1e46cfa480d33da098c2c8fc1501651d620ef5a2
+input-current ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d
+md-current 303a0e11d0ee136ad8f53f747f3c377daece763b
+audit-current def57543418a5f47debae28a0a9dea2effc11692
+crypto-current 295c01f90db2b8b8394e1f7cde59b96d71f98e07
+dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442
+arm 9759d22c8348343b0da4e25d6150c41712686c14
+avr32 7ebcfcf19723254ebe90cdf8718436b9955a9a01
+blackfin d6879c585b7f8c2f3eb2f7e7beac806af4e9755c
+cris 276e79ee6b3ff670dc9c041178da4b61af456a27
+ia64 62b8e680e61d3f48f2a12ee248ca03ea8f376926
+m68k 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213
+m68knommu 577c9c456f0e1371cbade38eaf91ae8e8a308555
+mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382
+parisc b609308e1415efebdf79ebd553f4dd47b0ff2722
+powerpc 15f7176eb1cccec0a332541285ee752b935c1c85
+4xx 3239572d8f3091fef59eb82f3d6ee2b5ccac150d
+galak 5287bb0a2d24ca54749b7868866c78b47fb6dc21
+pxa 126ee52ad3fd0c20c9418f68f3bc88a0f646aa17
+s390 65c09e1a02e8806a6f097e62c863dbc277d837f2
+sh e588a00fe546695e93077b3f7b7009f0c31d9370
+sparc c20a8d287b28a8f7b69410f3bf8daac145205c00
+x86 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c
+xtensa 8903709b054a8dafe4e8c6d9a6444034d7aba36f
+tip-core a733f0933c15f21d69b102a0ddfc8c1e99e474f0
+cpus4096 c7b16712f76b93eaefb4eb71b7af2a64203b5176
+tracing 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c
+genirq b6c02a408e57289faffd381d79996d148ae9b894
+safe-poison-pointers 8ed8819917312f1a117337c0280ad55721fd3894
+sched 5c37875321fe4e0fb3fd14068afb33ef7c770f54
+stackprotector 705bb9dc72b2464a7e421ee45d5e4a3f206d5c75
+timers cf96c1fe8639bda48d3c685e63d37a323a5f6021
+pci 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6
+device-mapper 62b8e680e61d3f48f2a12ee248ca03ea8f376926
+hid 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c
+i2c 6d53ce25c6791cc90dd6de58012cb3931e65f8f3
+jdelvare-hwmon 7c4ede9113d1abe415af0f214a7aa97657c7ef61
+kernel-doc 612392307cb09e49051225092cbbd7049bd8db93
+v4l-dvb 200e2979ed4dcb163d57d99f3a522d4590ea3352
+quota 4c1cf65df6357fa4ee8be486c947b25f46a030a6
+jfs 9c83633ad38138855181af6936e8ac570ef7e2cb
+kbuild 32fb6c17566ec66de87324a834c7776f40e35e78
+ide 1af090986cbdc9f66a2451c0c15bfee16c960bb6
+libata 75d422d359868155cccb2bd752be332ac27752b5
+nfs 4770822f16154559c8168c1b7171c9941a7c4d89
+xfs 8de2bf937a6bea8f0f775fd5399ba20c1a0c3d77
+infiniband 07306c0b98a9a0399bff1b91229b4c3b55912189
+acpi 821fb0b2f3f5790fb65948ef2ec3fd165557ad2f
+nfsd b4ddd412d6ad6552cfc198723fc0b0ff7524ab89
+ieee1394 32a0f488ce5e8a9a148491f15edc508ab5e8265b
+ubi 577c9c456f0e1371cbade38eaf91ae8e8a308555
+kvm defdf1e543e0725019ef5095894ba16cdf552eaf
+dlm a29936f55560a439638a0ecbb683efed3548b3bc
+scsi 015640edb1f346e0b2eda703587c4cd1c310ec1d
+ocfs2 035a571120ddbe4f92b91bbe46f3eff05b6e43eb
+ext4 0f2ddca66d70c8ccba7486cf2d79c6b60e777abd
+async_tx 8c6db1bbf80123839ec87bdd6cb364aea384623d
+udf 146bca72c7e6ba52de82a63b1fce7934dc103dbc
+net 861ab44059350e5cab350238606cf8814abab93b
+wireless 7c757eb9f804782fb39d0ae2c1a88ffb9309138e
+mtd e0724bf6e4a1f2e678d2b2aab01cae22e17862f0
+crypto 7738f47ee60fd1a6d5e2aea61e86a0a5ab00bfd7
+vfs ced117c73edc917e96dea7cca98c91383f0792f7
+sound 566b6c9e5be5a426059ee681fc4cada7634a55c4
+cpufreq 1e46cfa480d33da098c2c8fc1501651d620ef5a2
+v9fs b9b8e1c85b1d98534a562f601acda8132bfff439
+rr 8a96932ef504f37122ca38d983a0b40e6479cf29
+cifs 8a5b718070cf4a7126c5378e62fa0e307754bbe7
+mmc 32ab83a56fdf42f543b86c349143c2a86ead9707
+gfs2 07c34a571786ce89923d98e52faf99cce4508a49
+input 19bc11da911a1da11291781c23d2410366867fd8
+bkl-removal 4a6a4499693a419a20559c41e33a7bd70bf20a6f
+ubifs 577c9c456f0e1371cbade38eaf91ae8e8a308555
+lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f
+block 3c7c371fd141c1d919737f341c8d60e7eed3d048
+embedded 4744b43431e8613f920c5cba88346756f53c5165
+firmware 372d121f48d50cf19e0bc438bb88483eff085e45
+pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2
+battery 5bf2b994bfe11bfe86231050897b2d881ca544d9
+leds ac15e95090c2588ada4904c8c4ae8edd347acdf0
+backlight e0724bf6e4a1f2e678d2b2aab01cae22e17862f0
+kgdb 4cc984538631d1f47c61f7e556e2031e0d31a1ae
+slab 5c0cceb3705cff925e7c48b5afbaadabc13a225c
+uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298
+md c8f517c444e4f9f55b5b5ca202b8404691a35805
+mfd fa15ce8ad59e9653d50b8596596cb02d3566d4aa
+hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
+drm f23c20c83d523e5f8cda1f8f7ed52fe6afffbe29
+voltage e21cb79b71eced6697462c1f226273eeac715b44
+security-testing 19e4529ee7345079eeacc8e40cf69a304a64dc23
+lblnet 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b
+ttydev c946e60ed7a79f85f3e8dc57e75f0ab59b099db5
+agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8
+generic-ipi ee568b25ee9e160b32d1aef73d8b2ee9c05d34db
+oprofile 5f062da729d7d5edcce94dd3e87d7ccbea7cea78
+fastboot ee568b25ee9e160b32d1aef73d8b2ee9c05d34db
+sparseirq 15c1ac564462a00eee1d3ba49366cc6610b56275
+iommu 84be58d4601c86306cd939ebf58a9b90989883a4
+uwb a3c1239eb59c0a907f8be5587d42e950f44543f8
+watchdog b32452442a88c1beef167d2cd68f439e6541e268
+bdev feaf3848a813a106f163013af6fcf6c4bfec92d9
+dwmw2-iommu e523b38e2f568af58baa13120a994cbf24e6dee0
+cputime c742b31c03f37c5c499178f09f57381aa6c70131
+osd 0d8fe329a80714e0f729ae48cba8d64cbe5701cb
+fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af
+fuse 3121bfe7631126d1b13064855ac2cfa164381bb0
+jc_docs 7ead643f665c618d4bbd9efb68595fa41b2eb93b
+nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32
+trivial bd41358ad6f8d295feea2cb66d36d794b0d97591
+audit def57543418a5f47debae28a0a9dea2effc11692
+squashfs 363911d027d1de1c6df79eb3f487f5476b9619f4
+omap 833bb3046b6cb320e775ea2160ddca87d53260d5
+aoe 1de9e8e70f5acc441550ca75433563d91b269bbe
+kmemleak 2c2e98331488a1811355842855968cb65078e633
+suspend 8efb8c76fcdccf5050c0ea059dac392789baaff2
+nilfs2 0882e8dd3aad33eca41696d463bb896e6c8817eb
+driver-core e587ba1a2c0771c6759e4ab1c136f5de50c112f7
+usb e587ba1a2c0771c6759e4ab1c136f5de50c112f7
+staging c0eaaad56c73024c57cb9a15adc06339220982bb
+scsi-post-merge 238c6d54830c624f34ac9cf123ac04aebfca5013
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..efd46c95a3f2
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,137 @@
+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
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master
+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.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
+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
+tracing git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-tracing-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
+wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master
+mtd git git://git.infradead.org/mtd-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
+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
+generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-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
+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
+cputime git git://git390.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
+aoe quilt http://support.coraid.com/support/linux/for-next/patches/
+kmemleak git git://linux-arm.org/linux-2.6.git#kmemleak
+suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next
+nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next
+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/
+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..90375cc80366
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,1197 @@
+$ git checkout master
+Already on "master"
+$ git reset --hard stable
+HEAD is now at 2e1c63b Merge branch 'for-rc1/xen/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
+Merging origin/master
+$ git merge origin/master
+Updating 2e1c63b..0882e8d
+Fast forward
+ Documentation/tomoyo.txt | 55 ++++++
+ MAINTAINERS | 3 +
+ Makefile | 9 +-
+ arch/microblaze/include/asm/auxvec.h | 1 +
+ arch/microblaze/include/asm/cputable.h | 1 +
+ arch/microblaze/include/asm/ftrace.h | 1 +
+ arch/microblaze/include/asm/hw_irq.h | 1 +
+ arch/microblaze/include/asm/io.h | 1 -
+ arch/microblaze/include/asm/socket.h | 3 +
+ arch/microblaze/include/asm/user.h | 1 +
+ arch/microblaze/include/asm/vga.h | 1 +
+ arch/microblaze/kernel/of_device.c | 10 +-
+ arch/microblaze/kernel/process.c | 3 +-
+ arch/microblaze/kernel/prom.c | 1 -
+ arch/microblaze/kernel/ptrace.c | 1 -
+ arch/microblaze/kernel/signal.c | 1 -
+ arch/microblaze/kernel/sys_microblaze.c | 2 -
+ arch/powerpc/include/asm/parport.h | 2 +-
+ arch/sh/Kconfig | 18 ++-
+ arch/sh/boards/board-ap325rxa.c | 1 +
+ arch/sh/boards/board-urquell.c | 30 +++
+ arch/sh/drivers/pci/ops-sh7785lcr.c | 5 +
+ arch/sh/drivers/pci/pci-sh7780.h | 2 +
+ arch/sh/drivers/pci/pci.c | 3 +
+ arch/sh/include/asm/dma-mapping.h | 36 +++-
+ arch/sh/include/asm/scatterlist.h | 11 +-
+ arch/sh/include/asm/topology.h | 7 +-
+ arch/sh/include/asm/unistd_32.h | 4 +-
+ arch/sh/include/asm/unistd_64.h | 4 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 14 +-
+ arch/sh/kernel/syscalls_32.S | 2 +
+ arch/sh/kernel/syscalls_64.S | 2 +
+ arch/sh/mm/consistent.c | 31 +++-
+ arch/sparc/include/asm/parport.h | 5 +-
+ arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 +-
+ arch/x86/kernel/microcode_core.c | 33 +--
+ drivers/gpu/drm/i915/i915_drv.h | 7 +
+ drivers/gpu/drm/i915/i915_gem.c | 187 +++++++++++++++---
+ drivers/gpu/drm/i915/i915_gem_debugfs.c | 93 +++++++++
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 111 +++++++++++-
+ drivers/gpu/drm/i915/intel_display.c | 2 +
+ drivers/gpu/drm/i915/intel_fb.c | 4 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 23 ++-
+ drivers/gpu/drm/i915/intel_sdvo.c | 22 ++-
+ drivers/parisc/superio.c | 3 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 2 +-
+ drivers/sh/intc.c | 35 +++-
+ drivers/usb/class/cdc-acm.c | 4 -
+ drivers/usb/serial/ti_usb_3410_5052.c | 26 ++--
+ fs/fuse/file.c | 8 +-
+ fs/nilfs2/bmap.c | 5 +
+ fs/nilfs2/nilfs.h | 5 -
+ fs/nilfs2/recovery.c | 20 +--
+ fs/nilfs2/sufile.c | 290 ++++++++++------------------
+ fs/nilfs2/sufile.h | 79 +++++++-
+ fs/nilfs2/super.c | 7 +-
+ fs/nilfs2/the_nilfs.c | 4 +
+ include/drm/i915_drm.h | 3 +
+ include/linux/debug_locks.h | 1 +
+ include/linux/usb/serial.h | 7 +-
+ security/tomoyo/common.c | 6 +-
+ security/tomoyo/common.h | 2 +-
+ security/tomoyo/domain.c | 2 +-
+ security/tomoyo/file.c | 2 +-
+ security/tomoyo/realpath.c | 2 +-
+ security/tomoyo/realpath.h | 2 +-
+ security/tomoyo/tomoyo.c | 2 +-
+ security/tomoyo/tomoyo.h | 2 +-
+ 68 files changed, 913 insertions(+), 362 deletions(-)
+ create mode 100644 Documentation/tomoyo.txt
+ create mode 100644 arch/microblaze/include/asm/ftrace.h
+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
+Already up-to-date.
+Merging sparc-current/master
+$ git merge sparc-current/master
+Updating 0882e8d..c7cb152
+Fast forward
+ arch/sparc/include/asm/atomic_32.h | 2 ++
+ arch/sparc/kernel/smp_64.c | 4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+Merging scsi-rc-fixes/master
+$ git merge scsi-rc-fixes/master
+Already up-to-date.
+Merging net-current/master
+$ git merge net-current/master
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ Documentation/networking/bonding.txt | 2 +-
+ MAINTAINERS | 13 ++------
+ drivers/net/ariadne.c | 19 +++++++---
+ drivers/net/arm/am79c961a.c | 24 ++++++++-----
+ drivers/net/arm/at91_ether.c | 32 +++++++++++-------
+ drivers/net/arm/ep93xx_eth.c | 19 +++++++---
+ drivers/net/arm/ether1.c | 19 +++++++---
+ drivers/net/arm/ether3.c | 19 +++++++---
+ drivers/net/benet/be_ethtool.c | 4 +-
+ drivers/net/bonding/bond_main.c | 5 +--
+ drivers/net/bonding/bond_sysfs.c | 14 ++++---
+ drivers/net/cris/eth_v10.c | 30 ++++++++++-------
+ drivers/net/forcedeth.c | 4 +-
+ drivers/net/fs_enet/fs_enet-main.c | 27 ++++++++++------
+ drivers/net/ibm_newemac/core.c | 41 ++++++++++++++++-------
+ drivers/net/igb/e1000_mac.c | 2 +-
+ drivers/net/igb/e1000_mac.h | 1 -
+ drivers/net/igb/e1000_mbx.c | 17 +--------
+ drivers/net/igb/e1000_mbx.h | 2 -
+ drivers/net/igb/igb_main.c | 37 ++++++++++++--------
+ drivers/net/igbvf/igbvf.h | 3 --
+ drivers/net/igbvf/netdev.c | 9 +++--
+ drivers/net/igbvf/vf.c | 2 +-
+ drivers/net/igbvf/vf.h | 1 -
+ drivers/net/ioc3-eth.c | 22 ++++++++----
+ drivers/net/isa-skeleton.c | 20 +++++++----
+ drivers/net/ixgbe/ixgbe_82598.c | 59 +--------------------------------
+ drivers/net/ixgbe/ixgbe_82599.c | 40 +----------------------
+ drivers/net/ixgbe/ixgbe_common.c | 55 +++++++++++++++++++++++++++++++
+ drivers/net/ixgbe/ixgbe_common.h | 3 ++
+ drivers/net/ixgbe/ixgbe_ethtool.c | 24 +++++++++++++-
+ drivers/net/mac89x0.c | 18 +++++++---
+ drivers/net/macb.c | 19 +++++++---
+ drivers/net/macsonic.c | 19 +++++++---
+ drivers/net/phy/fixed.c | 5 ++-
+ drivers/net/phy/marvell.c | 54 +++++++++++++++++++++++++++++++
+ drivers/net/phy/phy.c | 9 +++++
+ drivers/net/sh_eth.c | 21 ++++++++----
+ drivers/net/sun3_82586.c | 19 +++++++---
+ drivers/net/tc35815.c | 27 ++++++++++------
+ drivers/net/tg3.c | 9 ++++-
+ drivers/net/tsi108_eth.c | 20 +++++++----
+ drivers/net/tun.c | 5 ++-
+ drivers/net/via-velocity.c | 4 +-
+ drivers/net/xtsonic.c | 19 +++++++---
+ include/linux/phy.h | 6 +++
+ include/net/udp.h | 2 -
+ net/802/tr.c | 3 ++
+ net/8021q/vlan_core.c | 4 ++-
+ net/core/dev.c | 9 +++--
+ net/ipv4/tcp_input.c | 3 ++
+ net/ipv4/udp.c | 3 +-
+ net/ipv6/ipv6_sockglue.c | 4 --
+ net/ipv6/udp.c | 6 +++-
+ net/sched/em_meta.c | 6 ++-
+ 55 files changed, 528 insertions(+), 335 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
+Merge made by recursive.
+ drivers/net/ps3_gelic_wireless.c | 3 ++
+ drivers/net/wireless/airo.c | 2 +-
+ drivers/net/wireless/ar9170/usb.c | 2 +
+ drivers/net/wireless/at76c50x-usb.c | 2 +
+ drivers/net/wireless/ath9k/recv.c | 4 ++-
+ drivers/net/wireless/b43/dma.c | 50 ++++++++++++++++++++++++++------
+ drivers/net/wireless/libertas/rx.c | 2 +
+ drivers/net/wireless/p54/p54.h | 12 ++++----
+ drivers/net/wireless/p54/p54spi.c | 25 ++++++++--------
+ drivers/net/wireless/p54/p54usb.c | 1 +
+ drivers/net/wireless/rt2x00/rt73usb.c | 2 +
+ net/mac80211/main.c | 2 +-
+ net/mac80211/rx.c | 13 ++++++--
+ net/mac80211/wext.c | 41 +++++++++++++++++++++-----
+ net/wireless/reg.c | 5 ++-
+ 15 files changed, 121 insertions(+), 45 deletions(-)
+Merging kbuild-current/master
+$ git merge kbuild-current/master
+Already up-to-date.
+Merging quilt/driver-core.current
+$ git merge quilt/driver-core.current
+Merge made by recursive.
+ Documentation/driver-model/platform.txt | 59 ++++++++
+ drivers/base/base.h | 2 +-
+ drivers/base/platform.c | 239 +++++++++++++++++++++++++++++++
+ fs/proc/base.c | 4 +-
+ fs/sysfs/file.c | 16 ++-
+ include/linux/init.h | 1 +
+ include/linux/kernel.h | 9 ++
+ include/linux/platform_device.h | 42 ++++++
+ init/main.c | 7 +-
+ lib/kobject_uevent.c | 2 +-
+ 10 files changed, 373 insertions(+), 8 deletions(-)
+Merging quilt/usb.current
+$ git merge quilt/usb.current
+Merge made by recursive.
+ drivers/usb/class/cdc-wdm.c | 2 +-
+ drivers/usb/gadget/u_ether.c | 8 +-
+ drivers/usb/musb/cppi_dma.c | 23 +--
+ drivers/usb/musb/musb_core.c | 12 +-
+ drivers/usb/musb/musb_gadget.c | 33 ++-
+ drivers/usb/musb/musb_host.c | 406 ++++++++++++++++++++----------------
+ drivers/usb/musb/musbhsdma.c | 66 ++++---
+ drivers/usb/serial/ftdi_sio.c | 1 +
+ drivers/usb/serial/ftdi_sio.h | 7 +
+ drivers/usb/serial/option.c | 5 +
+ drivers/usb/serial/qcserial.c | 21 ++
+ drivers/usb/storage/unusual_devs.h | 14 +-
+ 12 files changed, 339 insertions(+), 259 deletions(-)
+Merging cpufreq-current/fixes
+$ git merge cpufreq-current/fixes
+Merge made by recursive.
+ arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+Merging input-current/for-linus
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master
+$ git merge crypto-current/master
+Auto-merging drivers/crypto/ixp4xx_crypto.c
+Merge made by recursive.
+ drivers/crypto/ixp4xx_crypto.c | 33 ++++++++++++++++++++++++++++++++-
+ 1 files changed, 32 insertions(+), 1 deletions(-)
+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/boards/merisc/setup.c | 7 ++++---
+ drivers/mmc/host/atmel-mci.c | 12 +++++++++---
+ include/linux/atmel-mci.h | 2 ++
+ 3 files changed, 15 insertions(+), 6 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
+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
+Merge made by recursive.
+ arch/powerpc/configs/40x/acadia_defconfig | 2 +-
+ arch/powerpc/configs/40x/ep405_defconfig | 2 +-
+ arch/powerpc/configs/40x/kilauea_defconfig | 2 +-
+ arch/powerpc/configs/40x/makalu_defconfig | 2 +-
+ arch/powerpc/configs/40x/virtex_defconfig | 2 +-
+ arch/powerpc/configs/44x/arches_defconfig | 2 +-
+ arch/powerpc/configs/44x/bamboo_defconfig | 2 +-
+ arch/powerpc/configs/44x/canyonlands_defconfig | 6 +++---
+ arch/powerpc/configs/44x/ebony_defconfig | 2 +-
+ arch/powerpc/configs/44x/katmai_defconfig | 2 +-
+ arch/powerpc/configs/44x/rainier_defconfig | 2 +-
+ arch/powerpc/configs/44x/redwood_defconfig | 2 +-
+ arch/powerpc/configs/44x/sam440ep_defconfig | 2 +-
+ arch/powerpc/configs/44x/sequoia_defconfig | 2 +-
+ arch/powerpc/configs/44x/taishan_defconfig | 2 +-
+ arch/powerpc/configs/44x/virtex5_defconfig | 2 +-
+ 16 files changed, 18 insertions(+), 18 deletions(-)
+Merging galak/next
+$ git merge galak/next
+Merge made by recursive.
+ arch/powerpc/boot/dts/tqm8540.dts | 4 +-
+ arch/powerpc/boot/dts/tqm8541.dts | 4 +-
+ arch/powerpc/boot/dts/tqm8548-bigflash.dts | 8 +-
+ arch/powerpc/boot/dts/tqm8548.dts | 8 +-
+ arch/powerpc/boot/dts/tqm8555.dts | 4 +-
+ arch/powerpc/boot/dts/tqm8560.dts | 4 +-
+ arch/powerpc/configs/85xx/tqm8548_defconfig | 164 ++++++++-------------------
+ arch/powerpc/include/asm/mmu.h | 6 +
+ arch/powerpc/include/asm/ppc-opcode.h | 13 ++-
+ arch/powerpc/kernel/cputable.c | 2 +-
+ arch/powerpc/mm/tlb_nohash.c | 1 -
+ arch/powerpc/mm/tlb_nohash_low.S | 14 ++-
+ arch/powerpc/oprofile/op_model_fsl_emb.c | 14 ---
+ 13 files changed, 95 insertions(+), 151 deletions(-)
+Merging pxa/for-next
+$ git merge pxa/for-next
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ arch/arm/mach-pxa/corgi.c | 55 +++++++++-----------------------------
+ arch/arm/mach-pxa/poodle.c | 18 +++----------
+ arch/arm/mach-pxa/spitz.c | 63 +++++++++----------------------------------
+ 3 files changed, 30 insertions(+), 106 deletions(-)
+Merging s390/features
+$ git merge s390/features
+Removing arch/s390/include/asm/cpu.h
+Merge made by recursive.
+ arch/s390/appldata/appldata_base.c | 2 +-
+ arch/s390/include/asm/cpu.h | 32 --------------
+ arch/s390/include/asm/cpuid.h | 25 +++++++++++
+ arch/s390/include/asm/cputime.h | 20 +++++++++
+ arch/s390/include/asm/kvm_host.h | 1 +
+ arch/s390/include/asm/lowcore.h | 12 ++++--
+ arch/s390/include/asm/processor.h | 17 +------
+ arch/s390/include/asm/ptrace.h | 2 -
+ arch/s390/include/asm/setup.h | 24 +++++-----
+ arch/s390/include/asm/thread_info.h | 3 +-
+ arch/s390/include/asm/timer.h | 1 +
+ arch/s390/include/asm/timex.h | 5 ++
+ arch/s390/include/asm/unistd.h | 4 +-
+ arch/s390/kernel/asm-offsets.c | 2 +
+ arch/s390/kernel/compat_wrapper.S | 18 ++++++++
+ arch/s390/kernel/early.c | 19 +++++++++
+ arch/s390/kernel/entry.S | 13 ++++++
+ arch/s390/kernel/entry64.S | 13 ++++++
+ arch/s390/kernel/head.S | 15 +++++-
+ arch/s390/kernel/nmi.c | 7 ++-
+ arch/s390/kernel/s390_ext.c | 2 +-
+ arch/s390/kernel/setup.c | 12 ++++-
+ arch/s390/kernel/smp.c | 6 ++-
+ arch/s390/kernel/syscalls.S | 2 +
+ arch/s390/kernel/time.c | 77 +++++++++++++++++++++++------------
+ arch/s390/kernel/vtime.c | 69 ++++++++++++++++---------------
+ drivers/s390/block/dasd.c | 37 +++++++++++-----
+ drivers/s390/block/dasd_eckd.c | 16 +++++--
+ drivers/s390/cio/cio.c | 2 +-
+ drivers/s390/cio/qdio_main.c | 43 +------------------
+ 30 files changed, 305 insertions(+), 196 deletions(-)
+ delete mode 100644 arch/s390/include/asm/cpu.h
+ create mode 100644 arch/s390/include/asm/cpuid.h
+Merging sh/master
+$ git merge sh/master
+Already up-to-date.
+Merging sparc/master
+$ git merge sparc/master
+Auto-merging arch/sparc/kernel/smp_64.c
+Merge made by recursive.
+ arch/sparc/Kconfig | 3 +
+ arch/sparc/include/asm/cpudata_64.h | 197 +-----------------------------
+ arch/sparc/include/asm/mdesc.h | 3 +-
+ arch/sparc/include/asm/percpu_64.h | 8 +-
+ arch/sparc/include/asm/prom.h | 2 +
+ arch/sparc/include/asm/trap_block.h | 207 +++++++++++++++++++++++++++++++
+ arch/sparc/kernel/ds.c | 3 +-
+ arch/sparc/kernel/head_64.S | 22 ----
+ arch/sparc/kernel/mdesc.c | 149 +++++++++++++---------
+ arch/sparc/kernel/prom.h | 1 -
+ arch/sparc/kernel/prom_64.c | 234 +++++++++++++++++++----------------
+ arch/sparc/kernel/prom_common.c | 2 -
+ arch/sparc/kernel/smp_64.c | 192 ++++++++++++++++++++++++-----
+ arch/sparc/kernel/traps_64.c | 170 ++++++++++++++------------
+ arch/sparc/mm/init_32.c | 1 +
+ arch/sparc/mm/init_64.c | 16 +--
+ 16 files changed, 692 insertions(+), 518 deletions(-)
+ create mode 100644 arch/sparc/include/asm/trap_block.h
+Merging x86/auto-x86-next
+$ git merge x86/auto-x86-next
+Already up-to-date.
+Merging xtensa/master
+$ git merge xtensa/master
+Already up-to-date.
+Merging tip-core/auto-core-next
+$ git merge tip-core/auto-core-next
+Merge made by recursive.
+ Documentation/RCU/trace.txt | 102 ++-
+ arch/sparc/include/asm/thread_info_64.h | 4 +-
+ include/linux/futex.h | 8 +
+ include/linux/rcutree.h | 10 +-
+ include/linux/thread_info.h | 3 +-
+ init/Kconfig | 2 +-
+ kernel/futex.c | 1202 +++++++++++++++++++++++-------
+ kernel/rcutree.c | 42 +-
+ kernel/rcutree_trace.c | 78 ++-
+ kernel/rtmutex.c | 240 +++++--
+ kernel/rtmutex_common.h | 8 +
+ lib/vsprintf.c | 37 +-
+ mm/percpu.c | 141 ++---
+ 13 files changed, 1383 insertions(+), 494 deletions(-)
+Merging cpus4096/auto-cpus4096-next
+$ git merge cpus4096/auto-cpus4096-next
+Auto-merging arch/parisc/kernel/irq.c
+Merge made by recursive.
+Merging tracing/auto-tracing-next
+$ git merge tracing/auto-tracing-next
+Already up-to-date.
+Merging genirq/auto-genirq-next
+$ git merge genirq/auto-genirq-next
+Already uptodate!
+Merge made by recursive.
+Merging safe-poison-pointers/auto-safe-poison-pointers-next
+$ git merge safe-poison-pointers/auto-safe-poison-pointers-next
+Auto-merging arch/x86/Kconfig
+Auto-merging include/linux/poison.h
+Merge made by recursive.
+ arch/x86/Kconfig | 5 +++++
+ include/linux/poison.h | 16 ++++++++++++++--
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+Merging sched/auto-sched-next
+$ git merge sched/auto-sched-next
+Already uptodate!
+Merge made by recursive.
+Merging stackprotector/auto-stackprotector-next
+$ git merge stackprotector/auto-stackprotector-next
+Already up-to-date.
+Merging timers/auto-timers-next
+$ git merge timers/auto-timers-next
+Already uptodate!
+Merge made by recursive.
+Merging pci/linux-next
+$ git merge pci/linux-next
+Already up-to-date.
+Merging quilt/device-mapper
+$ git merge quilt/device-mapper
+Already up-to-date.
+Merging hid/for-next
+$ git merge hid/for-next
+Already up-to-date.
+Merging quilt/i2c
+$ git merge quilt/i2c
+Merge made by recursive.
+ drivers/i2c/i2c-core.c | 2 +-
+ drivers/macintosh/therm_pm72.c | 95 ++++++++++++++++++++--------------------
+ sound/aoa/codecs/onyx.c | 74 ++++++++++++++++++++-----------
+ sound/aoa/codecs/tas.c | 66 ++++++++++++++++++----------
+ sound/ppc/keywest.c | 85 +++++++++++++++++-------------------
+ 5 files changed, 178 insertions(+), 144 deletions(-)
+Merging quilt/jdelvare-hwmon
+$ git merge quilt/jdelvare-hwmon
+Auto-merging drivers/hwmon/Kconfig
+Merge made by recursive.
+ Documentation/hwmon/ibmaem | 2 +-
+ drivers/hwmon/Kconfig | 2 +-
+ drivers/hwmon/ibmaem.c | 1 +
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+Merging quilt/kernel-doc
+$ git merge quilt/kernel-doc
+Already up-to-date.
+Merging v4l-dvb/master
+$ git merge v4l-dvb/master
+Merge made by recursive.
+ Documentation/video4linux/CARDLIST.saa7134 | 1 +
+ drivers/media/dvb/siano/smssdio.c | 356 +++++++++++++++++++++++++++
+ drivers/media/video/cx88/Makefile | 2 +-
+ drivers/media/video/cx88/cx88-core.c | 26 ++-
+ drivers/media/video/cx88/cx88-dsp.c | 312 +++++++++++++++++++++++
+ drivers/media/video/cx88/cx88-tvaudio.c | 115 +++++++---
+ drivers/media/video/cx88/cx88.h | 10 +
+ drivers/media/video/saa7134/saa7134-cards.c | 44 ++++
+ drivers/media/video/saa7134/saa7134-input.c | 1 +
+ drivers/media/video/saa7134/saa7134.h | 1 +
+ include/linux/mmc/sdio_ids.h | 8 +
+ 11 files changed, 842 insertions(+), 34 deletions(-)
+ create mode 100644 drivers/media/dvb/siano/smssdio.c
+ create mode 100644 drivers/media/video/cx88/cx88-dsp.c
+Merging quota/for_next
+$ git merge quota/for_next
+Merge made by recursive.
+ fs/ext2/super.c | 4 +++-
+ fs/quota/Makefile | 9 ---------
+ 2 files changed, 3 insertions(+), 10 deletions(-)
+Merging jfs/next
+$ git merge jfs/next
+Merge made by recursive.
+ fs/jfs/super.c | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+Merging kbuild/master
+$ git merge kbuild/master
+Already up-to-date.
+Merging quilt/ide
+$ git merge quilt/ide
+Resolved 'drivers/ide/ide-disk.c' using previous resolution.
+Auto-merging drivers/ide/ide-disk.c
+CONFLICT (content): Merge conflict in drivers/ide/ide-disk.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b21c01a] Merge branch 'quilt/ide'
+$ git diff -M --stat --summary HEAD^..
+ drivers/ide/ide-disk.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
+ drivers/ide/ide.c | 6 +++++
+ 2 files changed, 59 insertions(+), 0 deletions(-)
+Merging libata/NEXT
+$ git merge libata/NEXT
+Merge made by recursive.
+ drivers/ata/ahci.c | 17 ++++++++---------
+ drivers/ata/libata-sff.c | 20 +++++++++++++-------
+ 2 files changed, 21 insertions(+), 16 deletions(-)
+Merging nfs/linux-next
+$ git merge nfs/linux-next
+Auto-merging fs/nfs/super.c
+Merge made by recursive.
+ fs/nfs/Kconfig | 9 +
+ fs/nfs/client.c | 124 ++++-
+ fs/nfs/direct.c | 9 +
+ fs/nfs/internal.h | 62 +++
+ fs/nfs/nfs4_fs.h | 37 ++-
+ fs/nfs/nfs4proc.c | 1229 ++++++++++++++++++++++++++++++++++++++++--
+ fs/nfs/nfs4renewd.c | 6 +-
+ fs/nfs/nfs4state.c | 130 ++++-
+ fs/nfs/nfs4xdr.c | 1078 ++++++++++++++++++++++++++++++++-----
+ fs/nfs/read.c | 33 +-
+ fs/nfs/super.c | 12 +
+ fs/nfs/unlink.c | 20 +-
+ fs/nfs/write.c | 31 +-
+ include/linux/nfs4.h | 18 +
+ include/linux/nfs_fs_sb.h | 67 +++-
+ include/linux/nfs_xdr.h | 174 ++++++
+ include/linux/nfsd/state.h | 1 -
+ include/linux/sunrpc/clnt.h | 1 +
+ include/linux/sunrpc/sched.h | 1 +
+ net/sunrpc/clnt.c | 13 +
+ net/sunrpc/sched.c | 2 +-
+ 21 files changed, 2838 insertions(+), 219 deletions(-)
+Merging xfs/master
+$ git merge xfs/master
+Already up-to-date.
+Merging infiniband/for-next
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging acpi/test
+$ git merge acpi/test
+Merge made by recursive.
+ arch/x86/kernel/reboot.c | 2 +-
+ drivers/acpi/acpica/rscreate.c | 27 +----
+ drivers/acpi/button.c | 140 ++++++++----------------
+ drivers/acpi/video.c | 43 ++++----
+ drivers/platform/x86/toshiba_acpi.c | 207 +++++++++++++++++++++++++++++++++-
+ 5 files changed, 269 insertions(+), 150 deletions(-)
+Merging nfsd/nfsd-next
+$ git merge nfsd/nfsd-next
+Merge made by recursive.
+Merging ieee1394/for-next
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging kvm/master
+$ git merge kvm/master
+Auto-merging arch/ia64/kvm/kvm-ia64.c
+Auto-merging arch/ia64/kvm/vcpu.c
+Auto-merging arch/ia64/kvm/vtlb.c
+Auto-merging arch/x86/kernel/kvm.c
+Merge made by recursive.
+ arch/ia64/include/asm/kvm_host.h | 5 +-
+ arch/ia64/include/asm/pgtable.h | 2 +
+ arch/ia64/kvm/Kconfig | 2 +-
+ arch/ia64/kvm/kvm-ia64.c | 173 ++++++++---
+ arch/ia64/kvm/kvm_fw.c | 28 ++-
+ arch/ia64/kvm/lapic.h | 6 +-
+ arch/ia64/kvm/optvfault.S | 30 ++
+ arch/ia64/kvm/process.c | 5 +
+ arch/ia64/kvm/vcpu.c | 20 +-
+ arch/ia64/kvm/vmm.c | 12 +-
+ arch/ia64/kvm/vmm_ivt.S | 18 +-
+ arch/ia64/kvm/vtlb.c | 3 +-
+ arch/powerpc/kvm/powerpc.c | 6 +
+ arch/s390/kvm/interrupt.c | 6 +
+ arch/x86/include/asm/kvm.h | 1 +
+ arch/x86/include/asm/kvm_host.h | 7 +-
+ arch/x86/include/asm/svm.h | 1 +
+ arch/x86/kernel/kvm.c | 4 +
+ arch/x86/kvm/Makefile | 2 +-
+ arch/x86/kvm/i8254.c | 109 ++++---
+ arch/x86/kvm/i8254.h | 12 +-
+ arch/x86/kvm/kvm_timer.h | 18 +
+ arch/x86/kvm/lapic.c | 251 +++++----------
+ arch/x86/kvm/lapic.h | 12 +-
+ arch/x86/kvm/mmu.c | 88 +++++-
+ arch/x86/kvm/mmu.h | 5 +
+ arch/x86/kvm/paging_tmpl.h | 10 +-
+ arch/x86/kvm/svm.c | 68 ++---
+ arch/x86/kvm/timer.c | 46 +++
+ arch/x86/kvm/vmx.c | 349 ++++++++++++---------
+ arch/x86/kvm/x86.c | 136 ++++++--
+ arch/x86/kvm/x86.h | 18 +
+ arch/x86/kvm/x86_emulate.c | 1 -
+ include/linux/kvm.h | 40 +++-
+ include/linux/kvm_host.h | 20 +-
+ include/linux/kvm_types.h | 27 ++
+ virt/kvm/ioapic.c | 153 ++--------
+ virt/kvm/ioapic.h | 27 +--
+ virt/kvm/irq_comm.c | 109 ++++---
+ virt/kvm/kvm_main.c | 642 +++++++++++++++++++++++++++-----------
+ 40 files changed, 1548 insertions(+), 924 deletions(-)
+ create mode 100644 arch/x86/kvm/kvm_timer.h
+ create mode 100644 arch/x86/kvm/timer.c
+Merging dlm/next
+$ git merge dlm/next
+Merge made by recursive.
+ fs/dlm/lockspace.c | 17 ++++++++---------
+ include/linux/dlm.h | 4 ++--
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+Merging scsi/master
+$ git merge scsi/master
+Already up-to-date.
+Merging ocfs2/linux-next
+$ git merge ocfs2/linux-next
+Merge made by recursive.
+ fs/ocfs2/dir.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Merging ext4/next
+$ git merge ext4/next
+Already up-to-date.
+Merging async_tx/next
+$ git merge async_tx/next
+Already up-to-date.
+Merging udf/for_next
+$ git merge udf/for_next
+Already up-to-date.
+Merging net/master
+$ git merge net/master
+Auto-merging MAINTAINERS
+Auto-merging drivers/net/benet/be_main.c
+Auto-merging drivers/net/ixgbe/ixgbe_82598.c
+Auto-merging drivers/net/ixgbe/ixgbe_82599.c
+Auto-merging drivers/net/ixgbe/ixgbe_common.c
+Auto-merging drivers/net/wireless/at76c50x-usb.c
+Merge made by recursive.
+ Documentation/isdn/00-INDEX | 45 ++-
+ MAINTAINERS | 2 +-
+ drivers/net/atl1e/atl1e_main.c | 3 +-
+ drivers/net/atlx/atl1.c | 7 +-
+ drivers/net/benet/be_main.c | 28 +-
+ drivers/net/chelsio/sge.c | 4 +-
+ drivers/net/fs_enet/mii-fec.c | 6 +-
+ drivers/net/ixgb/ixgb_osdep.h | 2 +-
+ drivers/net/ixgbe/ixgbe_82598.c | 186 ++++++---
+ drivers/net/ixgbe/ixgbe_82599.c | 249 +++++++++----
+ drivers/net/ixgbe/ixgbe_common.c | 9 +-
+ drivers/net/ixgbe/ixgbe_main.c | 13 +-
+ drivers/net/ixgbe/ixgbe_phy.c | 19 +-
+ drivers/net/ixgbe/ixgbe_phy.h | 1 +
+ drivers/net/ixgbe/ixgbe_type.h | 18 +-
+ drivers/net/netxen/netxen_nic.h | 594 +++++++++++++----------------
+ drivers/net/netxen/netxen_nic_ctx.c | 204 ++++++----
+ drivers/net/netxen/netxen_nic_ethtool.c | 105 +++---
+ drivers/net/netxen/netxen_nic_hdr.h | 8 -
+ drivers/net/netxen/netxen_nic_hw.c | 393 ++++++++-----------
+ drivers/net/netxen/netxen_nic_hw.h | 66 +---
+ drivers/net/netxen/netxen_nic_init.c | 291 +++++++++------
+ drivers/net/netxen/netxen_nic_main.c | 268 +++++++-------
+ drivers/net/netxen/netxen_nic_niu.c | 203 ++++-------
+ drivers/net/netxen/netxen_nic_phan_reg.h | 27 +-
+ drivers/net/pppol2tp.c | 3 +-
+ drivers/net/r8169.c | 61 ++-
+ drivers/net/sfc/boards.c | 2 -
+ drivers/net/sfc/sfe4001.c | 3 -
+ drivers/net/tulip/winbond-840.c | 3 +-
+ drivers/net/usb/kaweth.c | 33 ++-
+ drivers/net/virtio_net.c | 12 +-
+ drivers/net/wireless/at76c50x-usb.c | 3 +-
+ drivers/net/wireless/ath5k/reset.c | 5 +-
+ drivers/net/wireless/ath9k/ath9k.h | 6 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 7 +-
+ drivers/net/wireless/libertas/if_usb.c | 3 +-
+ drivers/net/wireless/libertas_tf/if_usb.c | 3 +-
+ net/rds/af_rds.c | 1 -
+ net/rds/connection.c | 4 +-
+ net/rds/ib.c | 4 +-
+ net/rds/ib.h | 2 +-
+ net/rds/ib_recv.c | 2 +-
+ net/rds/ib_ring.c | 2 +-
+ net/rds/ib_send.c | 10 +-
+ net/rds/info.c | 5 +-
+ net/rds/iw.c | 4 +-
+ net/rds/iw.h | 2 +-
+ net/rds/iw_recv.c | 2 +-
+ net/rds/iw_ring.c | 2 +-
+ net/rds/iw_send.c | 10 +-
+ net/rds/rdma.c | 7 +-
+ net/rds/rdma_transport.c | 12 +-
+ net/rds/rds.h | 2 +-
+ net/rds/send.c | 10 +-
+ 55 files changed, 1549 insertions(+), 1427 deletions(-)
+Merging wireless/master
+$ git merge wireless/master
+Already up-to-date.
+Merging mtd/master
+$ git merge mtd/master
+Already up-to-date.
+Merging crypto/master
+$ git merge crypto/master
+Auto-merging drivers/char/hw_random/omap-rng.c
+Merge made by recursive.
+ arch/x86/crypto/Makefile | 2 +
+ arch/x86/crypto/aesni-intel_glue.c | 267 ++++++++++++++-
+ arch/x86/crypto/fpu.c | 166 +++++++++
+ crypto/Kconfig | 10 +
+ crypto/api.c | 5 +-
+ crypto/cryptd.c | 14 +-
+ crypto/pcompress.c | 1 +
+ crypto/tcrypt.c | 16 +-
+ crypto/testmgr.c | 6 +-
+ drivers/char/hw_random/omap-rng.c | 2 +-
+ drivers/crypto/talitos.c | 713 ++++++++++++++++++++++++++----------
+ 11 files changed, 987 insertions(+), 215 deletions(-)
+ create mode 100644 arch/x86/crypto/fpu.c
+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.
+ include/sound/jack.h | 2 +
+ include/sound/pcm.h | 3 +-
+ sound/core/jack.c | 3 ++
+ sound/core/pcm_lib.c | 47 ++++++++++++++++++++----
+ sound/pci/hda/hda_intel.c | 39 +++++++++++++-------
+ sound/pci/hda/patch_conexant.c | 21 +++++++++--
+ sound/pci/hda/patch_realtek.c | 5 +--
+ sound/pci/hda/patch_sigmatel.c | 27 +++++++++++---
+ sound/pci/intel8x0.c | 78 ++++++++++++++++++++++++++++++---------
+ sound/soc/pxa/magician.c | 2 -
+ sound/soc/s3c24xx/Kconfig | 6 ++--
+ 11 files changed, 176 insertions(+), 57 deletions(-)
+Merging cpufreq/next
+$ git merge cpufreq/next
+Already up-to-date.
+Merging v9fs/for-next
+$ git merge v9fs/for-next
+Resolved 'net/9p/protocol.c' using previous resolution.
+Auto-merging net/9p/protocol.c
+CONFLICT (content): Merge conflict in net/9p/protocol.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2a502a0] Merge commit 'v9fs/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging quilt/rr
+$ git merge quilt/rr
+Auto-merging drivers/video/uvesafb.c
+Auto-merging init/main.c
+Merge made by recursive.
+ arch/frv/include/asm/gdb-stub.h | 1 -
+ arch/mn10300/include/asm/gdb-stub.h | 1 -
+ drivers/video/aty/aty128fb.c | 2 +-
+ drivers/video/cyber2000fb.c | 9 +++----
+ drivers/video/uvesafb.c | 10 +++----
+ include/linux/compiler.h | 5 ++++
+ include/linux/cpu.h | 5 ----
+ include/linux/moduleparam.h | 40 ++++++++++++++++++++++--------
+ init/main.c | 1 -
+ kernel/cpu.c | 11 ++------
+ kernel/params.c | 46 +++++++++++++++++++++++-----------
+ 11 files changed, 77 insertions(+), 54 deletions(-)
+Merging cifs/master
+$ git merge cifs/master
+Merge made by recursive.
+ fs/cifs/CHANGES | 3 +-
+ fs/cifs/cifs_spnego.c | 2 +-
+ fs/cifs/cifsfs.c | 48 +------------
+ fs/cifs/cifsglob.h | 3 +-
+ fs/cifs/cifspdu.h | 8 +-
+ fs/cifs/cifssmb.c | 6 +-
+ fs/cifs/connect.c | 194 +++++++++++++++++++++++++++++++++++--------------
+ fs/cifs/dir.c | 145 ++++++++++++++++++++++++------------
+ fs/cifs/dns_resolve.c | 2 +-
+ fs/cifs/file.c | 127 ++++++++++++++++++++------------
+ fs/cifs/inode.c | 74 ++++++++++---------
+ fs/cifs/readdir.c | 6 +-
+ 12 files changed, 373 insertions(+), 245 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at 039d03e Merge branch 'quilt/rr'
+Merging refs/next/20090409/cifs
+$ git merge refs/next/20090409/cifs
+Auto-merging fs/cifs/dir.c
+Auto-merging fs/cifs/inode.c
+Merge made by recursive.
+ fs/cifs/CHANGES | 3 +-
+ fs/cifs/cifs_spnego.c | 2 +-
+ fs/cifs/cifsfs.c | 48 +------------
+ fs/cifs/cifsglob.h | 1 +
+ fs/cifs/cifspdu.h | 8 +-
+ fs/cifs/cifssmb.c | 6 +-
+ fs/cifs/connect.c | 194 +++++++++++++++++++++++++++++++++++--------------
+ fs/cifs/dir.c | 6 +-
+ fs/cifs/dns_resolve.c | 2 +-
+ fs/cifs/file.c | 64 +++++++++++++----
+ fs/cifs/inode.c | 74 ++++++++++---------
+ fs/cifs/readdir.c | 6 +-
+ 12 files changed, 249 insertions(+), 165 deletions(-)
+Merging mmc/next
+$ git merge mmc/next
+Already up-to-date.
+Merging gfs2/master
+$ git merge gfs2/master
+Merge made by recursive.
+ fs/gfs2/glock.c | 10 +++++-----
+ fs/gfs2/inode.c | 8 ++++----
+ fs/gfs2/inode.h | 14 ++++++++------
+ fs/gfs2/log.c | 6 +++---
+ fs/gfs2/lops.c | 14 ++++++++------
+ fs/gfs2/meta_io.c | 38 +++++++++++++++++++++++++++-----------
+ fs/gfs2/ops_file.c | 8 ++++----
+ fs/gfs2/ops_inode.c | 1 +
+ fs/gfs2/quota.c | 2 +-
+ 9 files changed, 61 insertions(+), 40 deletions(-)
+Merging input/next
+$ git merge input/next
+Auto-merging drivers/input/input.c
+Auto-merging drivers/input/touchscreen/ads7846.c
+Merge made by recursive.
+ drivers/input/input.c | 1 -
+ drivers/input/misc/Kconfig | 2 +-
+ drivers/input/serio/i8042-x86ia64io.h | 28 ++
+ drivers/input/serio/i8042.c | 37 ++-
+ drivers/input/touchscreen/Kconfig | 15 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/ads7846.c | 10 +
+ drivers/input/touchscreen/atmel-wm97xx.c | 444 ++++++++++++++++++++++++++++++
+ drivers/input/touchscreen/wm97xx-core.c | 3 +-
+ include/linux/spi/ads7846.h | 1 +
+ 10 files changed, 530 insertions(+), 12 deletions(-)
+ create mode 100644 drivers/input/touchscreen/atmel-wm97xx.c
+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
+Removing drivers/md/dm-bio-list.h
+Merge made by recursive.
+ Documentation/block/biodoc.txt | 19 +---
+ block/as-iosched.c | 116 ++++++++++----------
+ block/blk-sysfs.c | 4 +-
+ block/blk.h | 4 +-
+ block/cfq-iosched.c | 235 +++++++++++++++++++++++++++++++++-------
+ block/elevator.c | 8 +-
+ block/scsi_ioctl.c | 6 +-
+ drivers/md/dm-bio-list.h | 117 --------------------
+ drivers/md/dm-delay.c | 2 -
+ drivers/md/dm-mpath.c | 1 -
+ drivers/md/dm-raid1.c | 1 -
+ drivers/md/dm-region-hash.c | 1 -
+ drivers/md/dm-snap.c | 1 -
+ drivers/md/dm.c | 1 -
+ drivers/md/raid1.c | 1 -
+ drivers/md/raid10.c | 1 -
+ fs/buffer.c | 11 ++-
+ include/linux/bio.h | 109 +++++++++++++++++++
+ include/linux/fs.h | 59 ++++++++++
+ 19 files changed, 447 insertions(+), 250 deletions(-)
+ delete mode 100644 drivers/md/dm-bio-list.h
+Merging embedded/master
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master
+$ git merge firmware/master
+Merge made by recursive.
+ drivers/base/firmware_class.c | 129 ++++++++++++++++++++++++++++++++--------
+ 1 files changed, 103 insertions(+), 26 deletions(-)
+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
+Already up-to-date.
+Merging backlight/for-mm
+$ git merge backlight/for-mm
+Already up-to-date.
+Merging kgdb/kgdb-next
+$ git merge kgdb/kgdb-next
+Auto-merging arch/x86/kernel/kgdb.c
+Merge made by recursive.
+ Documentation/DocBook/kgdb.tmpl | 2 +-
+ arch/x86/kernel/kgdb.c | 3 +-
+ include/linux/kgdb.h | 50 +++++++++++++++++++++++++++++++++-----
+ kernel/kgdb.c | 6 ++--
+ 4 files changed, 49 insertions(+), 12 deletions(-)
+Merging slab/for-next
+$ git merge slab/for-next
+Auto-merging include/linux/rcupdate.h
+Auto-merging init/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging mm/Makefile
+Merge made by recursive.
+ Documentation/vm/slqbinfo.c | 1054 +++++++++++++
+ include/linux/rcu_types.h | 18 +
+ include/linux/rcupdate.h | 11 +-
+ include/linux/slab.h | 10 +-
+ include/linux/slqb_def.h | 296 ++++
+ init/Kconfig | 9 +-
+ lib/Kconfig.debug | 20 +
+ mm/Makefile | 1 +
+ mm/slqb.c | 3622 +++++++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 5027 insertions(+), 14 deletions(-)
+ create mode 100644 Documentation/vm/slqbinfo.c
+ create mode 100644 include/linux/rcu_types.h
+ create mode 100644 include/linux/slqb_def.h
+ create mode 100644 mm/slqb.c
+Merging uclinux/for-next
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/for-next
+$ git merge mfd/for-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.
+ drivers/regulator/core.c | 4 ++--
+ include/linux/regulator/driver.h | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+Merging security-testing/next
+$ git merge security-testing/next
+Auto-merging Documentation/sysctl/kernel.txt
+Auto-merging kernel/module.c
+Auto-merging kernel/sysctl.c
+Auto-merging security/commoncap.c
+Auto-merging security/tomoyo/common.c
+Auto-merging security/tomoyo/common.h
+Auto-merging security/tomoyo/domain.c
+Merge made by recursive.
+ Documentation/Smack.txt | 20 ++-
+ Documentation/sysctl/kernel.txt | 11 +
+ include/linux/lsm_audit.h | 111 ++++++++++
+ kernel/module.c | 7 +-
+ kernel/sysctl.c | 12 +
+ security/Makefile | 3 +
+ security/commoncap.c | 32 +++
+ security/lsm_audit.c | 386 ++++++++++++++++++++++++++++++++++
+ security/selinux/avc.c | 2 +-
+ security/selinux/include/security.h | 4 +-
+ security/selinux/selinuxfs.c | 4 +-
+ security/selinux/ss/services.c | 30 +---
+ security/smack/smack.h | 108 ++++++++++-
+ security/smack/smack_access.c | 141 +++++++++++--
+ security/smack/smack_lsm.c | 390 ++++++++++++++++++++++++++--------
+ security/smack/smackfs.c | 66 ++++++
+ 16 files changed, 1185 insertions(+), 142 deletions(-)
+ create mode 100644 include/linux/lsm_audit.h
+ create mode 100644 security/lsm_audit.c
+Merging lblnet/master
+$ git merge lblnet/master
+Already up-to-date.
+Merging quilt/ttydev
+$ git merge quilt/ttydev
+Resolved 'drivers/serial/8250_pci.c' using previous resolution.
+Resolved 'fs/devpts/inode.c' using previous resolution.
+Auto-merging arch/x86/kernel/kprobes.c
+Auto-merging drivers/char/cyclades.c
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/serial/8250_pci.c
+CONFLICT (content): Merge conflict in drivers/serial/8250_pci.c
+Auto-merging drivers/serial/Kconfig
+Auto-merging drivers/serial/bfin_5xx.c
+Auto-merging drivers/serial/cpm_uart/cpm_uart_core.c
+Auto-merging drivers/serial/jsm/jsm_tty.c
+Auto-merging drivers/usb/class/cdc-acm.c
+Auto-merging fs/devpts/inode.c
+CONFLICT (content): Merge conflict in fs/devpts/inode.c
+Auto-merging include/linux/pci_ids.h
+Auto-merging include/linux/serial_core.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0b488c6] Merge branch 'quilt/ttydev'
+$ git diff -M --stat --summary HEAD^..
+ drivers/serial/Kconfig | 2 +-
+ drivers/serial/bfin_5xx.c | 7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+Merging agp/agp-next
+$ git merge agp/agp-next
+Already up-to-date.
+Merging generic-ipi/auto-generic-ipi-next
+$ git merge generic-ipi/auto-generic-ipi-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
+Already up-to-date.
+Merging uwb/for-upstream
+$ git merge uwb/for-upstream
+Already up-to-date.
+Merging watchdog/master
+$ git merge watchdog/master
+Merge made by recursive.
+ drivers/watchdog/alim7101_wdt.c | 15 +++++++++++----
+ drivers/watchdog/at91rm9200_wdt.c | 3 ++-
+ drivers/watchdog/bfin_wdt.c | 14 ++++++++++----
+ drivers/watchdog/cpwd.c | 6 +++---
+ drivers/watchdog/davinci_wdt.c | 6 +++---
+ drivers/watchdog/iTCO_vendor_support.c | 6 +++---
+ drivers/watchdog/iTCO_wdt.c | 22 +++++++++++-----------
+ drivers/watchdog/ks8695_wdt.c | 4 ++--
+ drivers/watchdog/machzwd.c | 9 ++++++---
+ drivers/watchdog/mpcore_wdt.c | 7 +++++--
+ drivers/watchdog/mtx-1_wdt.c | 6 +++---
+ drivers/watchdog/pnx4008_wdt.c | 6 +++---
+ drivers/watchdog/rdc321x_wdt.c | 4 ++--
+ drivers/watchdog/rm9k_wdt.c | 6 +++---
+ drivers/watchdog/s3c2410_wdt.c | 32 ++++++++++++++------------------
+ drivers/watchdog/sb_wdog.c | 7 ++++---
+ drivers/watchdog/sbc60xxwdt.c | 5 +++--
+ drivers/watchdog/sbc8360.c | 4 ++--
+ drivers/watchdog/sbc_epx_c3.c | 9 ++++++---
+ drivers/watchdog/scx200_wdt.c | 4 +++-
+ drivers/watchdog/shwdt.c | 4 +++-
+ drivers/watchdog/softdog.c | 7 +++++--
+ drivers/watchdog/w83697hf_wdt.c | 3 ++-
+ drivers/watchdog/wdrtas.c | 7 +------
+ 24 files changed, 110 insertions(+), 86 deletions(-)
+Merging bdev/master
+$ git merge bdev/master
+Already up-to-date.
+Merging dwmw2-iommu/master
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging cputime/cputime
+$ git merge cputime/cputime
+Already up-to-date.
+Merging osd/linux-next
+$ git merge osd/linux-next
+Already up-to-date.
+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
+Merge made by recursive.
+ fs/compat.c | 2 +-
+ fs/ext2/ext2.h | 2 +-
+ fs/inode.c | 2 +-
+ sound/usb/usbmixer.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+Merging audit/for-next
+$ git merge audit/for-next
+Already up-to-date.
+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 quilt/aoe
+$ git merge quilt/aoe
+Already up-to-date.
+Merging kmemleak/kmemleak
+$ git merge kmemleak/kmemleak
+Resolved 'Documentation/kernel-parameters.txt' using previous resolution.
+Resolved 'init/main.c' using previous resolution.
+Resolved 'lib/Kconfig.debug' using previous resolution.
+Resolved 'mm/slob.c' using previous resolution.
+Auto-merging Documentation/kernel-parameters.txt
+CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging fs/block_dev.c
+Auto-merging include/linux/percpu.h
+Auto-merging include/linux/slab.h
+Auto-merging init/main.c
+CONFLICT (content): Merge conflict in init/main.c
+Auto-merging kernel/module.c
+Auto-merging lib/Kconfig.debug
+CONFLICT (content): Merge conflict in lib/Kconfig.debug
+Auto-merging mm/Makefile
+Auto-merging mm/page_alloc.c
+Auto-merging mm/slab.c
+Auto-merging mm/slob.c
+CONFLICT (content): Merge conflict in mm/slob.c
+Auto-merging mm/slub.c
+Auto-merging mm/vmalloc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 835ea56] 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 +
+ fs/block_dev.c | 6 +
+ 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 | 1498 +++++++++++++++++++++++++++++++++++
+ mm/page_alloc.c | 11 +
+ mm/slab.c | 32 +-
+ mm/slob.c | 7 +
+ mm/slub.c | 5 +-
+ mm/vmalloc.c | 30 +-
+ 22 files changed, 2054 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 suspend/linux-next
+$ git merge suspend/linux-next
+Already up-to-date.
+Merging nilfs2/for-next
+$ git merge nilfs2/for-next
+Already up-to-date.
+Merging quilt/driver-core
+$ git merge quilt/driver-core
+Already up-to-date.
+Merging quilt/usb
+$ git merge quilt/usb
+Already up-to-date.
+Merging quilt/staging
+$ git merge quilt/staging
+Merge made by recursive.
+ .../filesystems/pohmelfs/design_notes.txt | 5 +-
+ Documentation/filesystems/pohmelfs/info.txt | 21 ++-
+ drivers/staging/android/binder.c | 201 +++++++++++++++-----
+ drivers/staging/at76_usb/at76_usb.c | 20 ++-
+ drivers/staging/epl/VirtualEthernetLinux.c | 17 ++-
+ drivers/staging/et131x/et131x_netdev.c | 23 ++-
+ drivers/staging/go7007/go7007-driver.c | 15 --
+ drivers/staging/go7007/wis-sony-tuner.c | 2 +
+ drivers/staging/line6/audio.c | 9 +-
+ drivers/staging/otus/usbdrv.c | 47 +++--
+ drivers/staging/pohmelfs/config.c | 61 ++++++-
+ drivers/staging/pohmelfs/dir.c | 24 ++--
+ drivers/staging/pohmelfs/inode.c | 137 ++++++++++---
+ drivers/staging/pohmelfs/lock.c | 3 +-
+ drivers/staging/pohmelfs/net.c | 72 ++------
+ drivers/staging/pohmelfs/netfs.h | 21 +-
+ drivers/staging/pohmelfs/trans.c | 33 +--
+ drivers/staging/rt2860/rt_main_dev.c | 25 ++-
+ drivers/staging/rt2870/rt2870.h | 1 +
+ drivers/staging/rt2870/rt_main_dev.c | 28 ++--
+ drivers/staging/rt3070/rt_main_dev.c | 29 ++--
+ drivers/staging/slicoss/slicoss.c | 25 ++-
+ drivers/staging/stlc45xx/Kconfig | 2 +-
+ drivers/staging/sxg/sxg.c | 127 ++++++++----
+ drivers/staging/uc2322/aten2011.c | 28 +---
+ drivers/staging/wlan-ng/p80211netdev.c | 20 ++-
+ 26 files changed, 627 insertions(+), 369 deletions(-)
+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..600ab6f668e2
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,27 @@
+Unchanged quilt series driver-core.current
+Unchanged quilt series usb.current
+Unchanged quilt series device-mapper
+Importing i2c based on 2.6.30-rc1-git6
+$ git clone -s -l -n -q . ../quilt-tmp
+$ cd ../quilt-tmp
+$ git reset --hard 2e1c63b7ed36532b68f0eddd6a184d7ba1013b89
+HEAD is now at 2e1c63b Merge branch 'for-rc1/xen/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
+$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c
+i2c-remove-void-casts.patch
+sound-aoa-codecs-convert-to-new-style.patch
+sound-ppc-keywest-01-convert-to-new-style.patch
+sound-ppc-keywest-02-cleanup-i2c_device_name.patch
+macintosh-therm_pm72-convert-to-new-style-i2c.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/i2c
+From ../quilt-tmp
+ + 6f4e256...6d53ce2 master -> quilt/i2c (forced update)
+Unchanged quilt series jdelvare-hwmon
+Unchanged quilt series kernel-doc
+Unchanged quilt series ide
+Unchanged quilt series rr
+Unchanged quilt series ttydev
+Unchanged quilt series aoe
+Unchanged quilt series driver-core
+Unchanged quilt series usb
+Unchanged quilt series staging
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..71002e790f9d
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20090415
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 06:32:43 +0000