diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-20 14:02:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-20 14:02:09 +1000 |
| commit | 6522aa8e2a4d0e5a153c0dc506684bb8c9f568d5 (patch) | |
| tree | 2adc06d70d82eb005a3324dd7d43eec58eb9d843 | |
| parent | 2d46185e285ad7c05399efdaa7203cc7a47907f1 (diff) | |
Add linux-next specific files for 20090420next-20090420
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 | 1722 | ||||
| -rw-r--r-- | Next/quilt-import.log | 59 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2052 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..cf26f2dc739c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,134 @@ +Name SHA1 +---- ---- +origin d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a +arm-current aefe6475720bd5eb8aacbc881488f3aa65618562 +m68k-current 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 +powerpc-merge 15f7176eb1cccec0a332541285ee752b935c1c85 +sparc-current ed247e12fe5da4417602c3c0ce22932fb0f9cac1 +scsi-rc-fixes ee568b25ee9e160b32d1aef73d8b2ee9c05d34db +net-current a0a69a0106dab8d20596f97f6674bed3b394d1ee +sound-current d6aa764ee8674512287913fcc3a0b1b5c050d5eb +pci-current 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6 +wireless-current 957b0516f7881284b48f2f2e4a909a1c5de0ddf8 +kbuild-current d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a +driver-core.current 0882e8dd3aad33eca41696d463bb896e6c8817eb +usb.current 0882e8dd3aad33eca41696d463bb896e6c8817eb +cpufreq-current 1e46cfa480d33da098c2c8fc1501651d620ef5a2 +input-current b2546df69b6bef19513112fd54ffb5d37cb3eb7a +md-current c03f6a19699fce4389888a45db8245969311d868 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current abe5fa7899fb5809ddc7336d8dd0edd5b2b96665 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 9759d22c8348343b0da4e25d6150c41712686c14 +avr32 7ebcfcf19723254ebe90cdf8718436b9955a9a01 +blackfin d6879c585b7f8c2f3eb2f7e7beac806af4e9755c +cris 276e79ee6b3ff670dc9c041178da4b61af456a27 +ia64 edb91dc01a216e84b78721b71a06db1e0db141b7 +m68k 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 +m68knommu 577c9c456f0e1371cbade38eaf91ae8e8a308555 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc b609308e1415efebdf79ebd553f4dd47b0ff2722 +powerpc 15f7176eb1cccec0a332541285ee752b935c1c85 +4xx 3239572d8f3091fef59eb82f3d6ee2b5ccac150d +galak 5287bb0a2d24ca54749b7868866c78b47fb6dc21 +pxa 126ee52ad3fd0c20c9418f68f3bc88a0f646aa17 +s390 472a36e507e7cbf5d96811f1017b992778154b23 +sh 8fb2bae4b41eb64f6e233e9bd3f3a789fbb04a06 +sparc c20a8d287b28a8f7b69410f3bf8daac145205c00 +x86 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +tip-core a733f0933c15f21d69b102a0ddfc8c1e99e474f0 +cpus4096 c7b16712f76b93eaefb4eb71b7af2a64203b5176 +tracing 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c +genirq b6c02a408e57289faffd381d79996d148ae9b894 +safe-poison-pointers 8ed8819917312f1a117337c0280ad55721fd3894 +sched 5c37875321fe4e0fb3fd14068afb33ef7c770f54 +stackprotector 705bb9dc72b2464a7e421ee45d5e4a3f206d5c75 +timers cf96c1fe8639bda48d3c685e63d37a323a5f6021 +pci 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6 +device-mapper 9f76208c33984ab777eace5d07a4e36e88703e02 +hid 243b706d8a71364ad6080328d45b73516c8af5f3 +i2c 43b096a724eb116d9c06b2622a4c975a39e28ccd +jdelvare-hwmon 7c4ede9113d1abe415af0f214a7aa97657c7ef61 +kernel-doc 612392307cb09e49051225092cbbd7049bd8db93 +v4l-dvb 200e2979ed4dcb163d57d99f3a522d4590ea3352 +quota 4c1cf65df6357fa4ee8be486c947b25f46a030a6 +jfs 9c83633ad38138855181af6936e8ac570ef7e2cb +kbuild 32fb6c17566ec66de87324a834c7776f40e35e78 +ide 242072dcffeb76223fc0660f16c05eed9d465697 +libata f1fee71411a568c9a1fa2ecbc18ec81a3a2998f6 +nfs 4770822f16154559c8168c1b7171c9941a7c4d89 +xfs 8de2bf937a6bea8f0f775fd5399ba20c1a0c3d77 +infiniband 07306c0b98a9a0399bff1b91229b4c3b55912189 +acpi e067663f96240168ad293c13a60db3a60eefd7c4 +nfsd b4ddd412d6ad6552cfc198723fc0b0ff7524ab89 +ieee1394 32a0f488ce5e8a9a148491f15edc508ab5e8265b +ubi 577c9c456f0e1371cbade38eaf91ae8e8a308555 +kvm defdf1e543e0725019ef5095894ba16cdf552eaf +dlm a29936f55560a439638a0ecbb683efed3548b3bc +scsi 015640edb1f346e0b2eda703587c4cd1c310ec1d +ocfs2 35c80d5f400f68f2eccf3069d1c068e154bde9c9 +configfs 35c80d5f400f68f2eccf3069d1c068e154bde9c9 +ext4 38d726d153cfe5efe5fe22d28d36ab382dda3a5c +async_tx 8c6db1bbf80123839ec87bdd6cb364aea384623d +udf 146bca72c7e6ba52de82a63b1fce7934dc103dbc +net 861ab44059350e5cab350238606cf8814abab93b +wireless 7c757eb9f804782fb39d0ae2c1a88ffb9309138e +mtd e7693548950ea5801d5d8b00414aed37033cf972 +crypto 7738f47ee60fd1a6d5e2aea61e86a0a5ab00bfd7 +vfs ced117c73edc917e96dea7cca98c91383f0792f7 +sound c959c230674acc67b20b53e83457c0c5af27e42d +cpufreq 1e46cfa480d33da098c2c8fc1501651d620ef5a2 +v9fs b9b8e1c85b1d98534a562f601acda8132bfff439 +rr 7a5e82cb780071541134bc14c2040a0929e5d21c +cifs ff54250a0ebab7f90a5f848a0ba63f999830c872 +mmc 32ab83a56fdf42f543b86c349143c2a86ead9707 +gfs2 f0b4507da1bd92372bceeca21a53a8cec02dd5a6 +input e06003af56c386018f0c209608ac6c6662228cc0 +bkl-removal 4a6a4499693a419a20559c41e33a7bd70bf20a6f +ubifs 1de9e8e70f5acc441550ca75433563d91b269bbe +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block a95320f3ede3f028837a621715cd352e83ffe7c2 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 372d121f48d50cf19e0bc438bb88483eff085e45 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery 5bf2b994bfe11bfe86231050897b2d881ca544d9 +leds ac15e95090c2588ada4904c8c4ae8edd347acdf0 +backlight e0724bf6e4a1f2e678d2b2aab01cae22e17862f0 +kgdb 4cc984538631d1f47c61f7e556e2031e0d31a1ae +slab d8895be47d51305a48dec818803679b9a640cef5 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md c03f6a19699fce4389888a45db8245969311d868 +mfd fa15ce8ad59e9653d50b8596596cb02d3566d4aa +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm f23c20c83d523e5f8cda1f8f7ed52fe6afffbe29 +voltage ce02f7cc4d6b4835f6046f97c86646e958a0d241 +security-testing 19e4529ee7345079eeacc8e40cf69a304a64dc23 +lblnet 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b +ttydev c946e60ed7a79f85f3e8dc57e75f0ab59b099db5 +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +generic-ipi ee568b25ee9e160b32d1aef73d8b2ee9c05d34db +oprofile 5f062da729d7d5edcce94dd3e87d7ccbea7cea78 +fastboot ee568b25ee9e160b32d1aef73d8b2ee9c05d34db +sparseirq 15c1ac564462a00eee1d3ba49366cc6610b56275 +iommu 84be58d4601c86306cd939ebf58a9b90989883a4 +uwb a3c1239eb59c0a907f8be5587d42e950f44543f8 +watchdog abf95846bd7f0f03f7329df1dbdf35acd11c7fc0 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu e523b38e2f568af58baa13120a994cbf24e6dee0 +cputime c742b31c03f37c5c499178f09f57381aa6c70131 +osd 0d8fe329a80714e0f729ae48cba8d64cbe5701cb +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +fuse 3121bfe7631126d1b13064855ac2cfa164381bb0 +jc_docs 7ead643f665c618d4bbd9efb68595fa41b2eb93b +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 6182edd212ace7cfb6cf892d0a1d1e780b960d36 +audit def57543418a5f47debae28a0a9dea2effc11692 +squashfs 363911d027d1de1c6df79eb3f487f5476b9619f4 +omap 0882e8dd3aad33eca41696d463bb896e6c8817eb +aoe 1de9e8e70f5acc441550ca75433563d91b269bbe +kmemleak 2c2e98331488a1811355842855968cb65078e633 +suspend 6a7c7eaf71b636f197d73b381a2ab729ebdcfb2e +nilfs2 0882e8dd3aad33eca41696d463bb896e6c8817eb +driver-core a255b892ced8a04b7cce8f8017c210a1810dba10 +scsi-post-merge 238c6d54830c624f34ac9cf123ac04aebfca5013 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..1ed8f5d7c017 --- /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 +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/jlbec/ocfs2.git#linux-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.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/ +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..6ba2c5df2e9b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1722 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at c19f836 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev +Merging origin/master +$ git merge origin/master +Updating c19f836..d91dfbb +Fast forward + .gitignore | 1 + + Documentation/driver-model/platform.txt | 59 + + .../filesystems/pohmelfs/design_notes.txt | 5 +- + Documentation/filesystems/pohmelfs/info.txt | 21 +- + Documentation/kbuild/makefiles.txt | 10 + + Documentation/kernel-parameters.txt | 78 +- + Documentation/lguest/.gitignore | 1 + + Documentation/lguest/lguest.txt | 11 +- + MAINTAINERS | 76 ++- + Makefile | 2 +- + arch/arm/common/vic.c | 9 +- + arch/arm/configs/imx27ads_defconfig | 826 --------------- + .../configs/{mx31ads_defconfig => mx1_defconfig} | 536 +++++++--- + .../configs/{pcm038_defconfig => mx27_defconfig} | 354 +++++-- + .../{mx31litekit_defconfig => mx3_defconfig} | 783 +++++++------- + arch/arm/configs/pcm037_defconfig | 769 -------------- + arch/arm/configs/s3c2410_defconfig | 1112 ++++++++++++++++---- + arch/arm/include/asm/tlb.h | 25 +- + arch/arm/kernel/sys_oabi-compat.c | 1 + + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-mx1/mx1ads.c | 6 - + arch/arm/mach-mx2/clock_imx21.c | 8 +- + arch/arm/mach-mx3/Kconfig | 2 + + arch/arm/mach-mx3/mx31ads.c | 4 +- + arch/arm/mach-mx3/pcm037.c | 4 +- + arch/arm/mach-mx3/qong.c | 28 +- + arch/arm/mach-pxa/em-x270.c | 6 +- + arch/arm/mach-pxa/generic.h | 3 + + arch/arm/mach-pxa/include/mach/colibri.h | 4 +- + arch/arm/mach-pxa/include/mach/palmt5.h | 1 - + arch/arm/mach-pxa/include/mach/palmtx.h | 1 - + arch/arm/mach-pxa/palmt5.c | 11 +- + arch/arm/mach-pxa/palmtx.c | 11 +- + arch/arm/mach-s3c2412/mach-jive.c | 5 +- + arch/arm/mach-s3c2440/mach-anubis.c | 2 +- + arch/arm/mach-s3c2440/mach-osiris.c | 1 - + arch/arm/mach-s3c6410/mach-smdk6410.c | 4 + + arch/arm/plat-mxc/include/mach/imx-uart.h | 2 - + arch/arm/plat-mxc/include/mach/iomux-mx3.h | 48 + + arch/arm/plat-mxc/include/mach/irqs.h | 2 +- + arch/arm/plat-mxc/include/mach/mx21.h | 3 - + arch/arm/plat-mxc/irq.c | 14 +- + arch/arm/plat-s3c/gpio-config.c | 3 + + arch/arm/plat-s3c/include/plat/devs.h | 1 + + arch/arm/plat-s3c24xx/adc.c | 19 +- + arch/arm/plat-s3c24xx/gpiolib.c | 2 +- + .../asm-h8300 => arch/h8300/include/asm}/timer.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/Kbuild | 0 + .../asm-m32r => arch/m32r/include/asm}/addrspace.h | 0 + .../asm-m32r => arch/m32r/include/asm}/assembler.h | 0 + .../asm-m32r => arch/m32r/include/asm}/atomic.h | 0 + .../asm-m32r => arch/m32r/include/asm}/auxvec.h | 0 + .../asm-m32r => arch/m32r/include/asm}/bitops.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/bug.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/bugs.h | 0 + .../asm-m32r => arch/m32r/include/asm}/byteorder.h | 0 + .../asm-m32r => arch/m32r/include/asm}/cache.h | 0 + .../asm-m32r => arch/m32r/include/asm}/cachectl.h | 0 + .../m32r/include/asm}/cacheflush.h | 0 + .../asm-m32r => arch/m32r/include/asm}/checksum.h | 0 + .../asm-m32r => arch/m32r/include/asm}/cputime.h | 0 + .../asm-m32r => arch/m32r/include/asm}/current.h | 0 + .../asm-m32r => arch/m32r/include/asm}/delay.h | 0 + .../asm-m32r => arch/m32r/include/asm}/device.h | 0 + .../asm-m32r => arch/m32r/include/asm}/div64.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/dma.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/elf.h | 0 + .../m32r/include/asm}/emergency-restart.h | 0 + .../asm-m32r => arch/m32r/include/asm}/errno.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/fb.h | 0 + .../asm-m32r => arch/m32r/include/asm}/fcntl.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/flat.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ftrace.h | 0 + .../asm-m32r => arch/m32r/include/asm}/futex.h | 0 + .../asm-m32r => arch/m32r/include/asm}/hardirq.h | 0 + .../asm-m32r => arch/m32r/include/asm}/hw_irq.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/io.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ioctl.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ioctls.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ipcbuf.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/irq.h | 0 + .../asm-m32r => arch/m32r/include/asm}/irq_regs.h | 0 + .../asm-m32r => arch/m32r/include/asm}/kdebug.h | 0 + .../m32r/include/asm}/kmap_types.h | 0 + .../asm-m32r => arch/m32r/include/asm}/linkage.h | 0 + .../asm-m32r => arch/m32r/include/asm}/local.h | 0 + .../asm-m32r => arch/m32r/include/asm}/m32102.h | 0 + .../m32r/include/asm}/m32104ut/m32104ut_pld.h | 0 + .../m32r/include/asm}/m32700ut/m32700ut_lan.h | 0 + .../m32r/include/asm}/m32700ut/m32700ut_lcd.h | 0 + .../m32r/include/asm}/m32700ut/m32700ut_pld.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/m32r.h | 0 + .../m32r/include/asm}/m32r_mp_fpga.h | 0 + .../m32r/include/asm}/mappi2/mappi2_pld.h | 0 + .../m32r/include/asm}/mappi3/mappi3_pld.h | 0 + .../m32r/include/asm}/mc146818rtc.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/mman.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/mmu.h | 0 + .../m32r/include/asm}/mmu_context.h | 0 + .../asm-m32r => arch/m32r/include/asm}/mmzone.h | 0 + .../asm-m32r => arch/m32r/include/asm}/module.h | 0 + .../asm-m32r => arch/m32r/include/asm}/msgbuf.h | 0 + .../asm-m32r => arch/m32r/include/asm}/mutex.h | 0 + .../m32r/include/asm}/opsput/opsput_lan.h | 0 + .../m32r/include/asm}/opsput/opsput_lcd.h | 0 + .../m32r/include/asm}/opsput/opsput_pld.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/page.h | 0 + .../asm-m32r => arch/m32r/include/asm}/param.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/pci.h | 0 + .../asm-m32r => arch/m32r/include/asm}/percpu.h | 0 + .../asm-m32r => arch/m32r/include/asm}/pgalloc.h | 0 + .../m32r/include/asm}/pgtable-2level.h | 0 + .../asm-m32r => arch/m32r/include/asm}/pgtable.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/poll.h | 0 + .../m32r/include/asm}/posix_types.h | 0 + .../asm-m32r => arch/m32r/include/asm}/processor.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ptrace.h | 0 + .../asm-m32r => arch/m32r/include/asm}/resource.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/rtc.h | 0 + .../asm-m32r => arch/m32r/include/asm}/s1d13806.h | 0 + .../m32r/include/asm}/scatterlist.h | 0 + .../asm-m32r => arch/m32r/include/asm}/sections.h | 0 + .../asm-m32r => arch/m32r/include/asm}/segment.h | 0 + .../asm-m32r => arch/m32r/include/asm}/sembuf.h | 0 + .../asm-m32r => arch/m32r/include/asm}/serial.h | 0 + .../asm-m32r => arch/m32r/include/asm}/setup.h | 0 + .../asm-m32r => arch/m32r/include/asm}/shmbuf.h | 0 + .../asm-m32r => arch/m32r/include/asm}/shmparam.h | 0 + .../m32r/include/asm}/sigcontext.h | 0 + .../asm-m32r => arch/m32r/include/asm}/siginfo.h | 0 + .../asm-m32r => arch/m32r/include/asm}/signal.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/smp.h | 0 + .../asm-m32r => arch/m32r/include/asm}/socket.h | 0 + .../asm-m32r => arch/m32r/include/asm}/sockios.h | 0 + .../asm-m32r => arch/m32r/include/asm}/spinlock.h | 0 + .../m32r/include/asm}/spinlock_types.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/stat.h | 0 + .../asm-m32r => arch/m32r/include/asm}/statfs.h | 0 + .../asm-m32r => arch/m32r/include/asm}/string.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/swab.h | 0 + .../asm-m32r => arch/m32r/include/asm}/syscall.h | 0 + .../asm-m32r => arch/m32r/include/asm}/system.h | 0 + .../asm-m32r => arch/m32r/include/asm}/termbits.h | 0 + .../asm-m32r => arch/m32r/include/asm}/termios.h | 0 + .../m32r/include/asm}/thread_info.h | 0 + .../asm-m32r => arch/m32r/include/asm}/timex.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/tlb.h | 0 + .../asm-m32r => arch/m32r/include/asm}/tlbflush.h | 0 + .../asm-m32r => arch/m32r/include/asm}/topology.h | 0 + .../asm-m32r => arch/m32r/include/asm}/types.h | 0 + .../asm-m32r => arch/m32r/include/asm}/uaccess.h | 0 + .../asm-m32r => arch/m32r/include/asm}/ucontext.h | 0 + .../asm-m32r => arch/m32r/include/asm}/unaligned.h | 0 + .../asm-m32r => arch/m32r/include/asm}/unistd.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/user.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/vga.h | 0 + {include/asm-m32r => arch/m32r/include/asm}/xor.h | 0 + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.cpu | 1 + + arch/x86/include/asm/lguest_hcall.h | 2 +- + arch/x86/include/asm/pat.h | 4 - + arch/x86/include/asm/uv/uv_mmrs.h | 5 + + arch/x86/kernel/apic/x2apic_uv_x.c | 16 +- + arch/x86/kernel/bios_uv.c | 3 +- + arch/x86/kernel/microcode_core.c | 2 - + arch/x86/kernel/pci-swiotlb.c | 2 +- + arch/x86/kernel/tlb_uv.c | 189 +++-- + arch/x86/kernel/uv_sysfs.c | 4 + + arch/x86/lguest/boot.c | 16 +- + arch/x86/mm/ioremap.c | 10 +- + arch/x86/mm/pageattr.c | 127 ++- + arch/x86/mm/pat.c | 189 +--- + drivers/ata/pata_legacy.c | 13 +- + drivers/ata/pata_via.c | 74 ++- + drivers/ata/sata_mv.c | 58 +- + drivers/base/base.h | 2 +- + drivers/base/core.c | 3 + + drivers/base/platform.c | 239 +++++ + drivers/block/ub.c | 20 +- + drivers/char/mem.c | 27 - + drivers/char/vt.c | 2 +- + drivers/ide/cs5536.c | 1 + + drivers/ide/hpt366.c | 14 +- + drivers/ide/ide-io.c | 11 +- + drivers/ide/pmac.c | 2 +- + drivers/input/gameport/gameport.c | 14 +- + drivers/input/input.c | 1 - + drivers/input/keyboard/atkbd.c | 20 +- + drivers/input/keyboard/bf54x-keys.c | 2 +- + drivers/input/misc/Kconfig | 2 +- + drivers/input/mouse/pc110pad.c | 1 - + drivers/input/serio/i8042-x86ia64io.h | 28 + + drivers/input/serio/i8042.c | 37 +- + drivers/input/touchscreen/ad7877.c | 4 +- + drivers/input/touchscreen/ad7879.c | 3 +- + drivers/input/touchscreen/ads7846.c | 12 +- + drivers/input/touchscreen/da9034-ts.c | 29 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 7 +- + drivers/input/touchscreen/wm97xx-core.c | 3 +- + drivers/isdn/hisax/st5481_usb.c | 9 +- + drivers/lguest/lg.h | 3 +- + drivers/lguest/segments.c | 13 +- + drivers/lguest/x86/core.c | 9 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 - + drivers/net/arm/ep93xx_eth.c | 2 +- + drivers/serial/samsung.c | 4 +- + drivers/spi/pxa2xx_spi.c | 2 +- + 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/otus/zdusb.c | 3 +- + drivers/staging/otus/zdusb.h | 4 + + 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/README | 31 +- + 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 +- + drivers/uio/uio_cif.c | 1 + + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/core/hcd.c | 26 + + drivers/usb/core/hcd.h | 14 + + drivers/usb/core/message.c | 58 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/gadget/u_ether.c | 8 +- + drivers/usb/host/whci/asl.c | 15 +- + drivers/usb/host/whci/hcd.c | 23 + + drivers/usb/host/whci/pzl.c | 16 +- + drivers/usb/host/whci/qset.c | 24 +- + drivers/usb/host/whci/whcd.h | 1 + + drivers/usb/host/whci/whci-hc.h | 1 + + 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/moto_modem.c | 1 + + drivers/usb/serial/option.c | 5 + + drivers/usb/serial/qcserial.c | 21 + + drivers/usb/storage/Makefile | 3 +- + drivers/usb/storage/transport.c | 4 +- + drivers/usb/storage/unusual_devs.h | 14 +- + drivers/usb/wusbcore/devconnect.c | 21 +- + drivers/usb/wusbcore/wusbhc.c | 32 +- + drivers/virtio/virtio_balloon.c | 3 +- + fs/afs/file.c | 2 + + 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 | 205 +++-- + fs/cifs/dir.c | 145 ++- + fs/cifs/dns_resolve.c | 2 +- + fs/cifs/file.c | 127 ++- + fs/cifs/inode.c | 77 +- + fs/cifs/readdir.c | 6 +- + fs/cifs/sess.c | 47 +- + fs/fat/Kconfig | 3 + + fs/namespace.c | 5 +- + fs/proc/base.c | 4 +- + fs/splice.c | 3 +- + fs/sysfs/file.c | 16 +- + include/asm-arm/.gitignore | 2 - + include/linux/dynamic_debug.h | 2 +- + include/linux/init.h | 1 + + include/linux/kernel.h | 9 + + include/linux/platform_device.h | 42 + + include/linux/rcutree.h | 3 +- + include/linux/seccomp.h | 2 + + include/linux/spi/ads7846.h | 1 + + include/linux/usb.h | 9 +- + init/main.c | 7 +- + kernel/rcutree.c | 19 +- + kernel/rcutree_trace.c | 14 +- + kernel/resource.c | 46 +- + kernel/sched.c | 10 +- + kernel/softirq.c | 4 +- + kernel/trace/trace_branch.c | 8 + + kernel/trace/trace_power.c | 7 + + lib/kobject_uevent.c | 2 +- + mm/vmscan.c | 5 +- + scripts/Makefile.build | 3 + + scripts/Makefile.lib | 9 +- + security/smack/smack_lsm.c | 11 +- + sound/pci/emu10k1/io.c | 2 +- + sound/pci/hda/hda_codec.c | 8 +- + sound/pci/hda/hda_intel.c | 2 +- + sound/pci/hda/patch_analog.c | 8 + + sound/pci/hda/patch_sigmatel.c | 10 +- + sound/pci/intel8x0.c | 12 +- + sound/soc/omap/omap-mcbsp.c | 7 +- + sound/soc/omap/osk5912.c | 4 +- + sound/soc/pxa/pxa-ssp.c | 1 + + sound/soc/s3c24xx/jive_wm8750.c | 12 +- + sound/soc/s3c24xx/s3c-i2s-v2.c | 18 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- + 317 files changed, 4958 insertions(+), 4028 deletions(-) + create mode 100644 Documentation/lguest/.gitignore + delete mode 100644 arch/arm/configs/imx27ads_defconfig + rename arch/arm/configs/{mx31ads_defconfig => mx1_defconfig} (60%) + rename arch/arm/configs/{pcm038_defconfig => mx27_defconfig} (77%) + rename arch/arm/configs/{mx31litekit_defconfig => mx3_defconfig} (61%) + delete mode 100644 arch/arm/configs/pcm037_defconfig + rename {include/asm-h8300 => arch/h8300/include/asm}/timer.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/Kbuild (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/addrspace.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/assembler.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/atomic.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/auxvec.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/bitops.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/bug.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/bugs.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/byteorder.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/cache.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/cachectl.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/cacheflush.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/checksum.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/cputime.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/current.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/delay.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/device.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/div64.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/dma.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/elf.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/emergency-restart.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/errno.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/fb.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/fcntl.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/flat.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ftrace.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/futex.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/hardirq.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/hw_irq.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/io.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ioctl.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ioctls.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ipcbuf.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/irq.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/irq_regs.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/kdebug.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/kmap_types.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/linkage.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/local.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32102.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32104ut/m32104ut_pld.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32700ut/m32700ut_lan.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32700ut/m32700ut_lcd.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32700ut/m32700ut_pld.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32r.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/m32r_mp_fpga.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mappi2/mappi2_pld.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mappi3/mappi3_pld.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mc146818rtc.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mman.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mmu.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mmu_context.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mmzone.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/module.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/msgbuf.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/mutex.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/opsput/opsput_lan.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/opsput/opsput_lcd.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/opsput/opsput_pld.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/page.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/param.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/pci.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/percpu.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/pgalloc.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/pgtable-2level.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/pgtable.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/poll.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/posix_types.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/processor.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ptrace.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/resource.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/rtc.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/s1d13806.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/scatterlist.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/sections.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/segment.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/sembuf.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/serial.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/setup.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/shmbuf.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/shmparam.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/sigcontext.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/siginfo.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/signal.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/smp.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/socket.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/sockios.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/spinlock.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/spinlock_types.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/stat.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/statfs.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/string.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/swab.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/syscall.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/system.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/termbits.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/termios.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/thread_info.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/timex.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/tlb.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/tlbflush.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/topology.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/types.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/uaccess.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/ucontext.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/unaligned.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/unistd.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/user.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/vga.h (100%) + rename {include/asm-m32r => arch/m32r/include/asm}/xor.h (100%) + delete mode 100644 include/asm-arm/.gitignore +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 +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 11 ++++++- + drivers/net/e1000/e1000_main.c | 6 ++-- + drivers/net/e1000e/netdev.c | 8 ++-- + drivers/net/ixgbe/ixgbe_dcb_82599.c | 28 +++++++++++------- + drivers/net/ixgbe/ixgbe_main.c | 54 +++++++++++++++++++++++++++++++--- + drivers/net/macb.c | 28 ++++-------------- + drivers/net/usb/pegasus.c | 1 + + include/net/netfilter/nf_nat.h | 1 + + net/can/af_can.c | 4 +- + net/ipv4/netfilter/nf_nat_core.c | 3 +- + net/ipv4/tcp.c | 6 ++- + net/netfilter/nf_conntrack_helper.c | 2 +- + net/netfilter/nf_log.c | 4 ++ + 13 files changed, 103 insertions(+), 53 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/hw.h | 8 ++-- + drivers/net/wireless/ar9170/usb.c | 4 ++ + drivers/net/wireless/at76c50x-usb.c | 2 + + drivers/net/wireless/ath9k/recv.c | 4 ++- + drivers/net/wireless/b43/dma.c | 50 +++++++++++++++++++++----- + drivers/net/wireless/b43/main.c | 5 +++ + drivers/net/wireless/b43/phy_common.c | 16 ++++++-- + drivers/net/wireless/b43/phy_common.h | 4 ++- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 + + drivers/net/wireless/libertas/rx.c | 2 + + drivers/net/wireless/orinoco/hw.c | 8 ++--- + 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/rt2x00dev.c | 4 +-- + drivers/net/wireless/rt2x00/rt73usb.c | 2 + + net/mac80211/main.c | 2 +- + net/mac80211/mlme.c | 26 ++++++++++---- + net/mac80211/rx.c | 13 +++++-- + net/mac80211/wext.c | 43 ++++++++++++++++++----- + net/wireless/core.h | 2 +- + net/wireless/reg.c | 5 ++- + net/wireless/scan.c | 40 +++++++++++++++++---- + 25 files changed, 207 insertions(+), 78 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 +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 +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 +Merge made by recursive. + drivers/input/keyboard/omap-keypad.c | 16 +++++++++- + drivers/input/mouse/elantech.c | 48 +++++++++++++++++++++++++++---- + drivers/input/mouse/elantech.h | 5 ++- + drivers/input/serio/sa1111ps2.c | 2 +- + drivers/input/touchscreen/tsc2007.c | 2 +- + drivers/input/touchscreen/ucb1400_ts.c | 2 +- + 6 files changed, 61 insertions(+), 14 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Merge made by recursive. + drivers/md/bitmap.c | 1 + + drivers/md/md.c | 41 ++++++++++++++++++++++++++++------------- + drivers/md/md.h | 21 +++++++++++++-------- + drivers/md/raid5.c | 7 ++++++- + 4 files changed, 48 insertions(+), 22 deletions(-) +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. + crypto/eseqiv.c | 3 ++- + drivers/crypto/ixp4xx_crypto.c | 33 ++++++++++++++++++++++++++++++++- + 2 files changed, 34 insertions(+), 2 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 +Merge made by recursive. + arch/ia64/kernel/smp.c | 14 ++++++-------- + 1 files changed, 6 insertions(+), 8 deletions(-) +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/oprofile/op_model_fsl_emb.c | 14 -------------- + 1 files changed, 0 insertions(+), 14 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-pxa/include/mach/colibri.h +Auto-merging arch/arm/mach-pxa/include/mach/palmt5.h +Auto-merging arch/arm/mach-pxa/include/mach/palmtx.h +Auto-merging arch/arm/mach-pxa/palmt5.c +Auto-merging arch/arm/mach-pxa/palmtx.c +Merge made by recursive. + arch/arm/mach-pxa/corgi.c | 55 ++++++-------------------- + arch/arm/mach-pxa/include/mach/colibri.h | 4 ++ + arch/arm/mach-pxa/poodle.c | 18 ++------- + arch/arm/mach-pxa/spitz.c | 63 ++++++----------------------- + 4 files changed, 34 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 | 32 ++++++++++++++-------------- + arch/s390/appldata/appldata_mem.c | 2 +- + arch/s390/include/asm/cpu.h | 32 ---------------------------- + arch/s390/include/asm/cputime.h | 20 ++++++++++++++++++ + arch/s390/include/asm/spinlock.h | 19 ++++++++++++++-- + arch/s390/kernel/ipl.c | 1 + + arch/s390/kernel/nmi.c | 2 +- + arch/s390/kernel/s390_ext.c | 2 +- + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/vtime.c | 2 +- + arch/s390/lib/spinlock.c | 40 ++++++++++++++++++++++++++++++++++++ + drivers/s390/cio/cio.c | 2 +- + 12 files changed, 99 insertions(+), 57 deletions(-) + delete mode 100644 arch/s390/include/asm/cpu.h +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 11 + + arch/sh/configs/sh7724_generic_defconfig | 707 ++++++++++ + arch/sh/include/asm/device.h | 2 + + arch/sh/include/asm/processor.h | 2 +- + arch/sh/include/cpu-sh4/cpu/freq.h | 18 + + arch/sh/include/cpu-sh4/cpu/sh7724.h | 255 ++++ + arch/sh/kernel/cpu/sh4/probe.c | 6 + + arch/sh/kernel/cpu/sh4a/Makefile | 3 + + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 112 ++- + arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 2230 ++++++++++++++++++++++++++++++ + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 10 + + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 10 + + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 11 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 11 +- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 556 ++++++++ + arch/sh/kernel/setup.c | 10 +- + arch/sh/kernel/time_32.c | 9 + + arch/sh/oprofile/common.c | 1 + + drivers/clocksource/sh_cmt.c | 18 +- + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-sh.c | 67 +- + drivers/serial/sh-sci.h | 23 +- + 22 files changed, 4034 insertions(+), 40 deletions(-) + create mode 100644 arch/sh/configs/sh7724_generic_defconfig + create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7724.h + create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c + create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7724.c +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 +Merge made by recursive. + arch/xtensa/Kconfig | 6 ++---- + arch/xtensa/include/asm/checksum.h | 6 ++++-- + 2 files changed, 6 insertions(+), 6 deletions(-) +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 | 9 +- + include/linux/thread_info.h | 3 +- + init/Kconfig | 2 +- + kernel/futex.c | 1202 +++++++++++++++++++++++------- + kernel/rcutree.c | 25 +- + kernel/rcutree_trace.c | 64 ++- + kernel/rtmutex.c | 240 +++++-- + kernel/rtmutex_common.h | 8 + + lib/vsprintf.c | 37 +- + mm/percpu.c | 141 ++--- + 13 files changed, 1375 insertions(+), 470 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 +Merge made by recursive. + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-lg.c | 2 ++ + drivers/hid/hidraw.c | 12 ++++++++---- + 4 files changed, 12 insertions(+), 4 deletions(-) +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 | 76 ++++++++++++++++++++++---------- + sound/aoa/codecs/tas.c | 66 ++++++++++++++++++---------- + sound/ppc/keywest.c | 85 +++++++++++++++++------------------- + 5 files changed, 183 insertions(+), 141 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 +Merge made by recursive. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/ahci.c | 17 ++++++++--------- + drivers/ata/libata-eh.c | 6 ++++-- + drivers/ata/libata-sff.c | 20 +++++++++++++------- + drivers/ata/sata_sil.c | 15 ++++++++++++++- + drivers/ata/sata_sx4.c | 11 +++++++---- + 5 files changed, 46 insertions(+), 23 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. + Documentation/laptops/thinkpad-acpi.txt | 4 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 30 ++-- + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 43 ++++--- + drivers/acpi/acpica/rscreate.c | 27 +---- + drivers/acpi/button.c | 140 ++++++------------- + drivers/acpi/ec.c | 1 + + drivers/acpi/sleep.c | 27 ++++ + drivers/acpi/thermal.c | 2 +- + drivers/acpi/video.c | 43 +++--- + drivers/platform/x86/sony-laptop.c | 27 +++- + drivers/platform/x86/thinkpad_acpi.c | 81 ++++++----- + drivers/platform/x86/toshiba_acpi.c | 207 +++++++++++++++++++++++++++- + 13 files changed, 406 insertions(+), 228 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 +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/jbd/revoke.c +Merge made by recursive. + fs/ext4/ialloc.c | 3 ++- + fs/jbd/commit.c | 2 +- + fs/jbd/revoke.c | 20 +++++++++++--------- + fs/jbd2/commit.c | 3 ++- + fs/jbd2/revoke.c | 21 ++++++++++++--------- + include/linux/jbd.h | 3 ++- + include/linux/jbd2.h | 3 ++- + 7 files changed, 32 insertions(+), 23 deletions(-) +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_main.c +Auto-merging drivers/net/wireless/at76c50x-usb.c +Merge made by recursive. + Documentation/isdn/00-INDEX | 45 +- + MAINTAINERS | 2 +- + drivers/net/8390.c | 10 +- + drivers/net/8390p.c | 10 +- + drivers/net/atl1e/atl1e_main.c | 3 +- + drivers/net/atlx/atl1.c | 7 +- + drivers/net/benet/be_main.c | 28 +- + drivers/net/bmac.c | 16 +- + drivers/net/chelsio/sge.c | 4 +- + drivers/net/cpmac.c | 23 +- + drivers/net/cxgb3/adapter.h | 2 +- + drivers/net/cxgb3/sge.c | 53 +- + drivers/net/dm9000.c | 30 +- + drivers/net/fec.c | 897 +++++++++++--------------- + drivers/net/fec.h | 127 ++--- + drivers/net/fs_enet/mii-fec.c | 6 +- + drivers/net/hplance.c | 21 +- + drivers/net/ibmveth.c | 26 +- + drivers/net/irda/au1k_ir.c | 18 +- + drivers/net/irda/pxaficp_ir.c | 16 +- + drivers/net/irda/sa1100_ir.c | 18 +- + drivers/net/iseries_veth.c | 17 +- + 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 | 11 +- + drivers/net/ixgbe/ixgbe_phy.c | 19 +- + drivers/net/ixgbe/ixgbe_phy.h | 1 + + drivers/net/ixgbe/ixgbe_type.h | 18 +- + drivers/net/ixp2000/ixpdev.c | 19 +- + drivers/net/jazzsonic.c | 19 +- + drivers/net/korina.c | 25 +- + drivers/net/lib82596.c | 23 +- + drivers/net/mace.c | 16 +- + drivers/net/macmace.c | 18 +- + drivers/net/meth.c | 28 +- + drivers/net/mipsnet.c | 15 +- + drivers/net/mvme147.c | 17 +- + drivers/net/myri10ge/myri10ge.c | 38 +- + drivers/net/netx-eth.c | 17 +- + 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/pasemi_mac.c | 23 +- + drivers/net/pci-skeleton.c | 19 +- + drivers/net/pppol2tp.c | 3 +- + drivers/net/r8169.c | 61 ++- + drivers/net/rionet.c | 14 +- + drivers/net/sb1250-mac.c | 29 +- + drivers/net/sfc/boards.c | 2 - + drivers/net/sfc/rx.c | 26 +- + drivers/net/sfc/sfe4001.c | 3 - + drivers/net/sgiseeq.c | 18 +- + drivers/net/smc911x.c | 23 +- + drivers/net/sun3lance.c | 17 +- + drivers/net/tulip/winbond-840.c | 3 +- + drivers/net/usb/kaweth.c | 33 +- + drivers/net/usb/usbnet.c | 6 - + drivers/net/virtio_net.c | 12 +- + drivers/net/wan/pc300_drv.c | 20 +- + 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/ipw2x00/libipw_module.c | 4 - + drivers/net/wireless/libertas/if_usb.c | 3 +- + drivers/net/wireless/libertas_tf/if_usb.c | 3 +- + include/linux/if_vlan.h | 6 +- + include/linux/netdevice.h | 22 +- + net/8021q/vlan_core.c | 4 +- + net/core/dev.c | 81 +-- + net/ipv4/af_inet.c | 2 - + 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 +- + 97 files changed, 2467 insertions(+), 2340 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at a6d77dc Merge commit 'ext4/next' +Merging refs/next/20090417/net +$ git merge refs/next/20090417/net +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/ixgbe/ixgbe_main.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 | 11 +- + 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, 1548 insertions(+), 1426 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/mtdcore.c | 18 +++++++++++++++--- + 1 files changed, 15 insertions(+), 3 deletions(-) +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. + Documentation/sound/alsa/ALSA-Configuration.txt | 7 + + include/linux/pci_ids.h | 5 + + include/sound/soc-dai.h | 1 + + include/sound/soc-dapm.h | 10 + + include/sound/soc.h | 6 + + sound/isa/Kconfig | 7 +- + sound/isa/sc6000.c | 127 ++- + sound/pci/Kconfig | 10 + + sound/pci/Makefile | 1 + + sound/pci/hda/Kconfig | 13 + + sound/pci/hda/Makefile | 4 + + sound/pci/hda/hda_codec.c | 3 + + sound/pci/hda/hda_intel.c | 15 +- + sound/pci/hda/patch_ca0110.c | 574 +++++++++ + sound/pci/lx6464es/Makefile | 2 + + sound/pci/lx6464es/lx6464es.c | 1152 ++++++++++++++++++ + sound/pci/lx6464es/lx6464es.h | 114 ++ + sound/pci/lx6464es/lx_core.c | 1444 +++++++++++++++++++++++ + sound/pci/lx6464es/lx_core.h | 242 ++++ + sound/pci/lx6464es/lx_defs.h | 376 ++++++ + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/codecs/Kconfig | 8 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/tlv320aic23.c | 2 + + sound/soc/codecs/wm8903.c | 1 + + sound/soc/codecs/wm8960.c | 969 +++++++++++++++ + sound/soc/codecs/wm8960.h | 127 ++ + sound/soc/codecs/wm8988.c | 1097 +++++++++++++++++ + sound/soc/codecs/wm8988.h | 60 + + sound/soc/codecs/wm9713.c | 40 +- + sound/soc/omap/n810.c | 7 +- + sound/soc/omap/omap-mcbsp.c | 38 +- + sound/soc/pxa/pxa-ssp.c | 11 +- + sound/soc/s6000/Kconfig | 19 + + sound/soc/s6000/Makefile | 11 + + sound/soc/s6000/s6000-i2s.c | 629 ++++++++++ + sound/soc/s6000/s6000-i2s.h | 25 + + sound/soc/s6000/s6000-pcm.c | 497 ++++++++ + sound/soc/s6000/s6000-pcm.h | 35 + + sound/soc/s6000/s6105-ipcam.c | 244 ++++ + sound/soc/soc-core.c | 58 +- + sound/soc/soc-dapm.c | 131 ++- + 43 files changed, 7992 insertions(+), 136 deletions(-) + create mode 100644 sound/pci/hda/patch_ca0110.c + create mode 100644 sound/pci/lx6464es/Makefile + create mode 100644 sound/pci/lx6464es/lx6464es.c + create mode 100644 sound/pci/lx6464es/lx6464es.h + create mode 100644 sound/pci/lx6464es/lx_core.c + create mode 100644 sound/pci/lx6464es/lx_core.h + create mode 100644 sound/pci/lx6464es/lx_defs.h + create mode 100644 sound/soc/codecs/wm8960.c + create mode 100644 sound/soc/codecs/wm8960.h + create mode 100644 sound/soc/codecs/wm8988.c + create mode 100644 sound/soc/codecs/wm8988.h + create mode 100644 sound/soc/s6000/Kconfig + create mode 100644 sound/soc/s6000/Makefile + create mode 100644 sound/soc/s6000/s6000-i2s.c + create mode 100644 sound/soc/s6000/s6000-i2s.h + create mode 100644 sound/soc/s6000/s6000-pcm.c + create mode 100644 sound/soc/s6000/s6000-pcm.h + create mode 100644 sound/soc/s6000/s6105-ipcam.c +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 e995f12] Merge commit 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/rr +$ git merge quilt/rr +Resolved 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c' using previous resolution. +Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Auto-merging drivers/video/uvesafb.c +Auto-merging init/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2ebe8f1] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + arch/frv/include/asm/gdb-stub.h | 1 - + arch/mn10300/include/asm/gdb-stub.h | 1 - + arch/x86/kernel/acpi/cstate.c | 36 ++++-- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 134 +++++++++++----------- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 60 +++------- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 81 +++++++------ + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 1 + + drivers/acpi/processor_throttling.c | 72 +++++------- + drivers/firmware/dcdbas.c | 49 +++----- + 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 +++++--- + 18 files changed, 280 insertions(+), 284 deletions(-) +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/log.c | 6 +++--- + fs/gfs2/lops.c | 14 ++++++++------ + fs/gfs2/meta_io.c | 38 +++++++++++++++++++++++++++----------- + 3 files changed, 38 insertions(+), 20 deletions(-) +Merging input/next +$ git merge input/next +Auto-merging drivers/input/keyboard/Kconfig +Merge made by recursive. + Documentation/input/input.txt | 2 +- + Documentation/input/rotary-encoder.txt | 9 +- + arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 42 ++ + drivers/input/gameport/fm801-gp.c | 1 + + drivers/input/gameport/gameport.c | 19 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/ep93xx_keypad.c | 470 +++++++++++++++++++++ + drivers/input/keyboard/gpio_keys.c | 3 +- + drivers/input/misc/rotary_encoder.c | 61 ++- + drivers/input/serio/serio.c | 21 +- + drivers/input/tablet/gtco.c | 1 + + drivers/input/touchscreen/Kconfig | 15 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/atmel-wm97xx.c | 446 +++++++++++++++++++ + include/linux/rotary_encoder.h | 2 + + 16 files changed, 1059 insertions(+), 45 deletions(-) + create mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h + create mode 100644 drivers/input/keyboard/ep93xx_keypad.c + 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 +Merge made by recursive. + block/blk-settings.c | 20 ++++---- + block/blk-timeout.c | 6 ++ + block/genhd.c | 12 +++-- + block/scsi_ioctl.c | 13 +++++- + drivers/block/loop.c | 26 +++-------- + fs/bio.c | 124 ++++++++++++++++++++++-------------------------- + include/linux/bio.h | 3 +- + include/linux/genhd.h | 1 + + include/linux/loop.h | 3 +- + lib/scatterlist.c | 9 ++- + 10 files changed, 111 insertions(+), 106 deletions(-) +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 init/Kconfig +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 | 299 ++++ + init/Kconfig | 28 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3732 +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 5157 insertions(+), 16 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 | 8 ++++---- + include/linux/regulator/driver.h | 1 + + 2 files changed, 5 insertions(+), 4 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/smack/smack_lsm.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 +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/option.c +Merge made by recursive. + drivers/char/cyclades.c | 23 ++------ + drivers/char/epca.c | 4 +- + drivers/char/isicom.c | 19 ++++-- + drivers/char/istallion.c | 8 +- + drivers/char/mxser.c | 12 +++- + drivers/char/pcmcia/synclink_cs.c | 11 ++- + drivers/char/rocket.c | 13 +++- + drivers/char/stallion.c | 6 +- + drivers/char/synclink.c | 9 ++- + drivers/char/synclink_gt.c | 9 ++- + drivers/char/synclinkmp.c | 9 ++- + drivers/char/tty_port.c | 38 +++++++++++- + drivers/usb/serial/belkin_sa.c | 6 +- + drivers/usb/serial/ch341.c | 46 +++++++++------- + drivers/usb/serial/console.c | 6 +- + drivers/usb/serial/cp210x.c | 6 +- + drivers/usb/serial/cyberjack.c | 6 +- + drivers/usb/serial/cypress_m8.c | 85 ++++++++-------------------- + drivers/usb/serial/digi_acceleport.c | 17 +----- + drivers/usb/serial/empeg.c | 6 +- + drivers/usb/serial/ftdi_sio.c | 50 +++++++++------- + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/generic.c | 9 +--- + drivers/usb/serial/io_edgeport.c | 10 +-- + drivers/usb/serial/io_ti.c | 3 +- + drivers/usb/serial/ipaq.c | 6 +- + drivers/usb/serial/ipw.c | 18 +++--- + drivers/usb/serial/ir-usb.c | 6 +- + drivers/usb/serial/iuu_phoenix.c | 25 +-------- + drivers/usb/serial/keyspan.c | 13 +++- + drivers/usb/serial/keyspan.h | 8 ++- + drivers/usb/serial/keyspan_pda.c | 17 ++++-- + drivers/usb/serial/kl5kusb105.c | 6 +- + drivers/usb/serial/kobil_sct.c | 9 +-- + drivers/usb/serial/mct_u232.c | 37 ++++++------ + drivers/usb/serial/mos7720.c | 3 +- + drivers/usb/serial/mos7840.c | 48 +---------------- + drivers/usb/serial/navman.c | 3 +- + drivers/usb/serial/omninet.c | 6 +- + drivers/usb/serial/opticon.c | 3 +- + drivers/usb/serial/option.c | 71 +++++++++++------------ + drivers/usb/serial/oti6858.c | 57 ++----------------- + drivers/usb/serial/pl2303.c | 79 ++++++++++---------------- + drivers/usb/serial/sierra.c | 87 ++++++++++++++--------------- + drivers/usb/serial/spcp8x5.c | 85 ++++++++++------------------ + drivers/usb/serial/symbolserial.c | 3 +- + drivers/usb/serial/ti_usb_3410_5052.c | 6 +- + drivers/usb/serial/usb-serial.c | 99 ++++++++++++++++++++------------- + drivers/usb/serial/visor.c | 6 +- + drivers/usb/serial/whiteheat.c | 33 +---------- + include/linux/tty.h | 6 ++- + include/linux/usb/serial.h | 10 ++- + 52 files changed, 496 insertions(+), 668 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 3bdd90d Merge commit 'security-testing/next' +Merging refs/next/20090417/ttydev +$ git merge refs/next/20090417/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/char/vt.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 e8b3412] Merge commit 'refs/next/20090417/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 +Auto-merging fs/inode.c +Merge made by recursive. + drivers/char/amiserial.c | 2 +- + drivers/media/video/hdpvr/hdpvr-video.c | 2 +- + drivers/mtd/Kconfig | 3 ++- + drivers/net/b44.h | 2 +- + drivers/net/e100.c | 2 +- + drivers/net/niu.h | 4 ++-- + drivers/scsi/megaraid.h | 2 +- + drivers/scsi/megaraid/mbox_defs.h | 2 +- + drivers/staging/rt2860/common/mlme.c | 2 +- + drivers/staging/rt2870/common/mlme.c | 2 +- + drivers/staging/rt3070/common/mlme.c | 2 +- + drivers/watchdog/iop_wdt.c | 2 +- + fs/compat.c | 2 +- + fs/ext2/ext2.h | 2 +- + fs/inode.c | 2 +- + include/linux/ultrasound.h | 2 +- + sound/pci/aw2/aw2-saa7146.c | 2 +- + sound/usb/usbmixer.c | 2 +- + 18 files changed, 20 insertions(+), 19 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 +Recorded preimage for 'Documentation/kernel-parameters.txt' +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 drivers/char/vt.c +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 +Recorded resolution for 'Documentation/kernel-parameters.txt'. +[master bac7034] 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 +Auto-merging drivers/acpi/sleep.c +Merge made by recursive. + drivers/acpi/sleep.c | 8 ++++---- + include/linux/suspend.h | 36 ++++++++++++++++++++++++++---------- + kernel/power/main.c | 24 +++++++++++++++++------- + 3 files changed, 47 insertions(+), 21 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merging init/Kconfig +Merge made by recursive. + include/linux/sched.h | 2 +- + init/Kconfig | 6 ++-- + kernel/user.c | 67 ++++++++++++++++++++++++++++-------------------- + 3 files changed, 43 insertions(+), 32 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..eb38f3235cc9 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,59 @@ +Importing driver-core.current based on 2.6.30-rc2 + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core.current 0882e8dd3aad33eca41696d463bb896e6c8817eb +Importing usb.current based on quilt/driver-core.current + quilt series is empty +$ git update-ref refs/heads/quilt/usb.current 0882e8dd3aad33eca41696d463bb896e6c8817eb +Importing device-mapper based on v2.6.30-rc2-195-g9f76208 + quilt series is empty +$ git update-ref refs/heads/quilt/device-mapper 9f76208c33984ab777eace5d07a4e36e88703e02 +Unchanged quilt series i2c +Unchanged quilt series jdelvare-hwmon +Unchanged quilt series kernel-doc +Unchanged quilt series ide +Unchanged quilt series rr +Importing ttydev based on 9f76208c33984ab777eace5d07a4e36e88703e02 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 9f76208c33984ab777eace5d07a4e36e88703e02 +HEAD is now at 9f76208 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Alan Cox <alan@lxorguk.ukuu.org.uk> --patches ../quilt/ttydev +tty-usb-aten2011-clean +cyclades-firmware-ze +cyclades-fw-dontreset +cyclades-remove-spare-null-check +tty-port-carrierclose +tty-port-drain-delay +tty-usb-use-port +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:310: trailing whitespace. + else +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1989: trailing whitespace. + serial_do_down(port); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2015: trailing whitespace. + return 1; +warning: 3 lines add whitespace errors. +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/ttydev +From ../quilt-tmp + + c946e60...97c5824 master -> quilt/ttydev (forced update) +Unchanged quilt series aoe +Importing driver-core based on quilt/usb.current +$ cd ../quilt-tmp +$ git reset --hard 0882e8dd3aad33eca41696d463bb896e6c8817eb +HEAD is now at 0882e8d Linux 2.6.30-rc2 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +driver-core-set-default-sysfs_deprecated-n.patch +sched-delayed-cleanup-of-user_struct.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core +From ../quilt-tmp + + b6e999b...a255b89 master -> quilt/driver-core (forced update) +Importing usb based on quilt/driver-core +$ cd ../quilt-tmp +$ git reset --hard a255b892ced8a04b7cce8f8017c210a1810dba10 +HEAD is now at a255b89 sched: delayed cleanup of user_struct +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +musb_gadget-fix-unhandled-endpoint-0-irqs.patch +musb_gadget-suppress-parasitic-tx-interrupts-with-cppi.patch +error: patch failed: drivers/usb/musb/musb_gadget.c:349 +error: drivers/usb/musb/musb_gadget.c: patch does not apply diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..04f7806ca707 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090420 |