diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-07 17:05:29 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-07 17:05:29 +1000 |
| commit | 1fcfa405e99679fe6e3523b3ed697ab1b0f2801a (patch) | |
| tree | 179889bbadee0d9d97d176bf3582f542446a3541 | |
| parent | 3e4633f5e51b8ca78a9800b95e83ed76be35a9e5 (diff) | |
Add linux-next specific files for 20090507next-20090507
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 137 | ||||
| -rw-r--r-- | Next/Trees | 139 | ||||
| -rw-r--r-- | Next/merge.log | 4617 | ||||
| -rw-r--r-- | Next/quilt-import.log | 82 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4976 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..f976dad87025 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,137 @@ +Name SHA1 +---- ---- +origin 413f81eba35d6ede9289b0c8a920c013a84fac71 +fixes 16752e2ead535c0e616c64d3fee8401ebd0c9f62 +arm-current 0c15702445eef6ff9dba774fd1995aca10176969 +m68k-current adfe7c69891128f5e238a5e6823709b4bb85b340 +powerpc-merge 0203d6ec4e88062f20558fbed3cdff2af758a53b +sparc-current 956d039a2537cf79ca608450d36cc70e0e515482 +scsi-rc-fixes b4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a +net-current 356d6c2d55b71303a17910ea2cce3eba8e44bd29 +sound-current 5d7ee52f1c3dbe0e06d9bfad4912562fd1b6eb03 +pci-current 029091df01116aff8dea89ce96a0a2534401803a +wireless-current 25a6e989b58a9b9d173a3b2439180ab9d5446b99 +kbuild-current 4391ed6aa9a38cdfb48addd7a9b24a2ff099b1a7 +driver-core.current 092452b299f7a29e324a0297c3f7359f1b6d8ac9 +usb.current a02a347b4893130a2dee19014cb0be7c8713e52f +cpufreq-current 695817659757f837cc9ae92d592704144139af0d +input-current eacaad01b4e67336b5b3f4db6dc15ef92c64b47d +md-current 232795d488ef6d1b96230093787d72a67c60fcc1 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current acd246b7494c629aa617da49716409566cf52149 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 6a62fb824c162a976cc484c5f75753136f4c9f81 +avr32 7ebcfcf19723254ebe90cdf8718436b9955a9a01 +blackfin d6879c585b7f8c2f3eb2f7e7beac806af4e9755c +cris 999fb23ef868719b8bd55ee3f6b1f7a8fd8016af +ia64 413f81eba35d6ede9289b0c8a920c013a84fac71 +m68k 9c6948da2e55f787b942946d830eb3018323b7b7 +m68knommu ce8a7424d23a36f043d0de8484f888971c831119 +mips 69ee0d4358c09afa387a2c892e73ca8b95814ed1 +parisc b609308e1415efebdf79ebd553f4dd47b0ff2722 +powerpc 3dacbdad2401c06b97d8d754974233a70c165536 +4xx 3239572d8f3091fef59eb82f3d6ee2b5ccac150d +galak bd7582fab6729806f5e0d1ccdc85b79bbc2905ae +pxa ad7a47a77f65b9055c85a7fc9f7de9d740a10d05 +s390 ea92bb7b98e58c2f0b4193fdeb33236e3f10f859 +sh 25483efeb2e56521e418a59fa93401be156dc3bb +sparc c20a8d287b28a8f7b69410f3bf8daac145205c00 +x86 510aa2d72863145eec76c46422359511289aeadf +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +configfs 8af7d5ffe1b6468ed0de1c2bb5335ad40b755ba3 +ext4 883c6d474611b72d4a6f5c18c8cb37bab8e02cc8 +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +fuse 81ebac1be35a2c2fe1f4d3810a8e57d315600a32 +gfs2 6e6cccc85b8f5b56d31019472fb33807ef571ff5 +jfs 9c83633ad38138855181af6936e8ac570ef7e2cb +nfs 4770822f16154559c8168c1b7171c9941a7c4d89 +nfsd 42b2bd47b181322ff130eb9b086b8e41493e89ac +nilfs2 a474d85b68ec55d83ebaa76934fd45ad4f1ea706 +ocfs2 53d0c6a30bc4672472ba8eabd87f67decc20649b +squashfs 363911d027d1de1c6df79eb3f487f5476b9619f4 +v9fs b9b8e1c85b1d98534a562f601acda8132bfff439 +ubifs 6d6cb0d688d0f262cb4fd5771648b0ac01d4f82c +xfs 6321e3ed2acf3ee9643cdd403e1c88605d7944ba +tip-core 3eaa719fc74a6f1f7bf8ae4adfa9655859e59fa4 +cpus4096 f328ddc154605be11c4ca38fee6ace8adb140087 +tracing 92b134fed9b4f3066deb68218fb8d0474c4b9537 +genirq c09c94065c3b48f691a21d90731f8010850331b5 +safe-poison-pointers 39a42fc6ed7bd5781ec5ac66b80777c21f935881 +sched 208cbf5a59ed91f10f4f560ab7d78476487d0195 +stackprotector f328ddc154605be11c4ca38fee6ace8adb140087 +timers b78d74eaef6e5b5748c6f5c2745c57f4c08c6b7b +pci f4ac4eb2f7aaee460dc0b82c71743668a1b3bca1 +device-mapper 07e86b8db72ae671826a324ad2bcbaa1be1d398d +hid 6a6a4fdb2b0b97e059f3ff05bb739e5e6710a212 +i2c a728bc442891cfc0e29a14fd7303d2aa78e0b6bc +jdelvare-hwmon e8db107f148c07a1463d0a40b955ed2aed5b70b3 +kernel-doc 612392307cb09e49051225092cbbd7049bd8db93 +v4l-dvb 6f49157ae9aeab931df23b7ed779862052326cdc +quota a069e9cee1dba2f847839d325f46ce6976ed1b76 +kbuild efbe795f5f63b74ed642e196518907355aa94bd7 +ide 03682411b1ccd38cbde2e9a6ab43884ff34fbefc +libata f1fee71411a568c9a1fa2ecbc18ec81a3a2998f6 +infiniband b83369db1675059ad787479a9d1682875cc47686 +acpi 5d30dd067e29283d9a5b545cf7dd5ab19f371ba0 +ieee1394 32a0f488ce5e8a9a148491f15edc508ab5e8265b +ubi 091438dd5668396328a3419abcbc6591159eb8d1 +kvm 66b0aed4a9e15a2ea3a00763f362b6ee0b28d538 +dlm a29936f55560a439638a0ecbb683efed3548b3bc +scsi 2142d072d858912dfc17e173d8ba66eb60a31c6c +async_tx d189e4f7197b77eb1d187d710d7de293cc2e0d6b +udf 146bca72c7e6ba52de82a63b1fce7934dc103dbc +net c7ae011dc8306d982c25fb4f679752e790a08dc4 +wireless 9dfd6ba353b993d648dcda72480c7ce92cd27c7e +mtd 3f33b0aaac4e208579fe5aa2964857d4e9ba10c5 +crypto 765d9d61178a5bff63ed58f9f13cdf6c08edb393 +vfs aafca3a7a51fa9bb949ced6f2f601df0acdaf63a +sound 854ed29e5ff19454a32dc599b9fe2dda901aa2e7 +cpufreq f6be6ec6b7fd7a22a64d951de5cb7db8de43933c +rr 7a5e82cb780071541134bc14c2040a0929e5d21c +cifs ac68392460ffefed13020967bae04edc4d3add06 +mmc 9bc7b36642e199404fc9f80de95d5ecf4fd1fda4 +input 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 +bkl-removal 4a6a4499693a419a20559c41e33a7bd70bf20a6f +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block f68adec3c7155a8bbf32a90cb4c4d0737df045d9 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 372d121f48d50cf19e0bc438bb88483eff085e45 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery 5bf2b994bfe11bfe86231050897b2d881ca544d9 +leds ac15e95090c2588ada4904c8c4ae8edd347acdf0 +backlight e0724bf6e4a1f2e678d2b2aab01cae22e17862f0 +kgdb 4cc984538631d1f47c61f7e556e2031e0d31a1ae +slab 552895daba5fe9fae9b42d2a9244666f74a18b54 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 232795d488ef6d1b96230093787d72a67c60fcc1 +mfd 6922ccf23b5fb4751c05343758cd56261310c4fc +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm f23c20c83d523e5f8cda1f8f7ed52fe6afffbe29 +voltage 4bf176b53c4d15f9e794a990b9145369130232ce +security-testing 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb +lblnet 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b +ttydev dd6f67c751edba51d3ccc5839486c0ecd24c151c +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +generic-ipi f328ddc154605be11c4ca38fee6ace8adb140087 +oprofile f328ddc154605be11c4ca38fee6ace8adb140087 +fastboot f328ddc154605be11c4ca38fee6ace8adb140087 +sparseirq 2eeeea3ad2597ddc1b6993e5fedb68e4029d565c +iommu 8da7885bfef05d498828b08e34961f55339edf4e +uwb a3c1239eb59c0a907f8be5587d42e950f44543f8 +watchdog abf95846bd7f0f03f7329df1dbdf35acd11c7fc0 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu aed5d5f4c5ea5da01a774e42cff08c4b4fa59072 +cputime c742b31c03f37c5c499178f09f57381aa6c70131 +osd 0d8fe329a80714e0f729ae48cba8d64cbe5701cb +jc_docs 7ead643f665c618d4bbd9efb68595fa41b2eb93b +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 5f06e1d76d52cba2f08d6daed521f0edc7205008 +audit def57543418a5f47debae28a0a9dea2effc11692 +omap b4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a +aoe 1de9e8e70f5acc441550ca75433563d91b269bbe +kmemleak 050e17a1c0fa391510c91d8ed75462ceb4370578 +suspend 75e1711886b24d173d51ca4d18430825c9d1322f +driver-core 6e15073881585c733a4cb519d7e4ae74ef69e2b3 +usb e0f6d0446bbb5707ca1040b360dc0f692d62d906 +staging 2cdefeb072eaca90122e53aece617be9e8068be5 +scsi-post-merge 238c6d54830c624f34ac9cf123ac04aebfca5013 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..44093e5a7dcd --- /dev/null +++ b/Next/Trees @@ -0,0 +1,139 @@ +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 +fixes git -#fixes +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 +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 +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 +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#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 +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +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 +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 +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 +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 +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 +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.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#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 +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 +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 +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..bd924c238d87 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4617 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a425a63 Ignore madvise(MADV_WILLNEED) for hugetlbfs-backed regions +Merging origin/master +$ git merge origin/master +Updating a425a63..413f81e +Fast forward + arch/ia64/include/asm/idle.h | 7 +++++++ + arch/ia64/include/asm/xen/events.h | 7 +------ + arch/ia64/xen/xensetup.S | 2 -- + drivers/gpu/drm/drm_crtc_helper.c | 19 ------------------- + drivers/gpu/drm/drm_drv.c | 3 ++- + drivers/gpu/drm/drm_stub.c | 15 +++++++++------ + drivers/gpu/drm/drm_sysfs.c | 2 -- + drivers/gpu/drm/r128/r128_cce.c | 6 +++--- + drivers/gpu/drm/radeon/radeon_drv.h | 3 ++- + drivers/xen/balloon.c | 3 ++- + 10 files changed, 26 insertions(+), 41 deletions(-) + create mode 100644 arch/ia64/include/asm/idle.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Removing arch/arm/configs/mx31moboard_defconfig +Merge made by recursive. + arch/arm/Kconfig | 1 + + arch/arm/configs/kirkwood_defconfig | 92 ++- + arch/arm/configs/mv78xx0_defconfig | 429 ++++++++++--- + arch/arm/configs/mx31moboard_defconfig | 790 ------------------------ + arch/arm/configs/mx3_defconfig | 2 +- + arch/arm/configs/orion5x_defconfig | 363 +++++++++--- + arch/arm/mach-pxa/Kconfig | 4 +- + arch/arm/mach-s3c2412/pm.c | 3 + + arch/arm/mach-s3c6400/include/mach/map.h | 2 + + arch/arm/plat-mxc/dma-mx1-mx2.c | 17 +- + arch/arm/plat-mxc/gpio.c | 2 +- + arch/arm/plat-mxc/include/mach/board-mx27ads.h | 2 +- + drivers/serial/s3c6400.c | 1 + + drivers/serial/samsung.c | 61 ++- + drivers/serial/samsung.h | 4 + + drivers/video/mx3fb.c | 14 +- + 16 files changed, 769 insertions(+), 1018 deletions(-) + delete mode 100644 arch/arm/configs/mx31moboard_defconfig +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/wireless/iwlwifi/iwl-sta.c | 21 ++++---- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 - + include/linux/netfilter/xt_LED.h | 2 + + include/linux/netfilter/xt_cluster.h | 2 + + net/ipv6/netfilter/ip6t_ipv6header.c | 6 +- + net/mac80211/rc80211_minstrel.c | 2 +- + net/mac80211/rc80211_pid_algo.c | 73 ++++++++++++++------------ + net/mac80211/tx.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 48 +++++++---------- + net/netfilter/xt_cluster.c | 8 +++- + net/wireless/reg.c | 17 ++++++- + net/wireless/scan.c | 1 + + 12 files changed, 102 insertions(+), 81 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 +Merge made by recursive. + drivers/pci/pcie/aer/aerdrv.h | 3 +++ + drivers/pci/pcie/portdrv_pci.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/airo.c | 10 ++++++++-- + net/mac80211/rc80211_minstrel.c | 2 +- + net/mac80211/rc80211_pid_algo.c | 2 +- + 3 files changed, 10 insertions(+), 4 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/sysfs-rules.txt | 2 +- + drivers/base/platform.c | 22 +++------------------- + include/linux/device.h | 9 ++------- + include/linux/platform_device.h | 1 - + lib/Kconfig.debug | 1 - + 5 files changed, 6 insertions(+), 29 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/Makefile | 2 ++ + drivers/usb/atm/cxacru.c | 10 ++++++++-- + drivers/usb/gadget/usbstring.c | 6 +++--- + drivers/usb/serial/ftdi_sio.c | 20 ++++++++++++++++---- + drivers/usb/serial/ftdi_sio.h | 6 ++++++ + drivers/usb/storage/unusual_devs.h | 5 +++-- + 6 files changed, 38 insertions(+), 11 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 1 + + arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 2 ++ + 2 files changed, 3 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 +Merge made by recursive. + drivers/md/bitmap.c | 29 +++++++++++---------- + drivers/md/md.c | 70 ++++++++++++++++++++++++++++---------------------- + drivers/md/raid10.c | 12 ++++---- + 3 files changed, 60 insertions(+), 51 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/api.c | 3 ++- + crypto/eseqiv.c | 3 ++- + drivers/crypto/ixp4xx_crypto.c | 33 ++++++++++++++++++++++++++++++++- + drivers/crypto/padlock-aes.c | 2 +- + 4 files changed, 37 insertions(+), 4 deletions(-) +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Resolved 'arch/arm/Kconfig' using previous resolution. +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/mach-s3c6400/include/mach/map.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 77cb5b1] Merge commit 'arm/devel' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 169 ++- + arch/arm/Makefile | 121 +- + arch/arm/common/Kconfig | 7 + + arch/arm/common/vic.c | 221 +++- + arch/arm/configs/stmp378x_defconfig | 1141 +++++++++++++++ + arch/arm/configs/stmp37xx_defconfig | 1002 +++++++++++++ + arch/arm/include/asm/hardware/vic.h | 2 +- + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/mach-at91/clock.c | 151 ++- + arch/arm/mach-at91/include/mach/at91_pmc.h | 26 +- + arch/arm/mach-ep93xx/core.c | 19 +- + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 1 + + arch/arm/mach-netx/generic.c | 2 +- + arch/arm/mach-s3c2410/Kconfig | 8 + + arch/arm/mach-s3c2410/include/mach/map.h | 2 +- + arch/arm/mach-s3c2412/Kconfig | 3 + + arch/arm/mach-s3c2440/Kconfig | 5 + + arch/arm/mach-s3c6400/include/mach/map.h | 3 + + arch/arm/mach-s3c6400/include/mach/regs-clock.h | 16 + + arch/arm/mach-s3c6410/Kconfig | 1 + + arch/arm/mach-s3c6410/mach-smdk6410.c | 1 + + arch/arm/mach-stmp378x/Makefile | 2 + + arch/arm/mach-stmp378x/Makefile.boot | 3 + + arch/arm/mach-stmp378x/include/mach/entry-macro.S | 35 + + arch/arm/mach-stmp378x/include/mach/irqs.h | 95 ++ + arch/arm/mach-stmp378x/include/mach/pins.h | 151 ++ + arch/arm/mach-stmp378x/include/mach/regs-apbh.h | 88 ++ + arch/arm/mach-stmp378x/include/mach/regs-apbx.h | 79 + + arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h | 276 ++++ + arch/arm/mach-stmp378x/include/mach/regs-icoll.h | 213 +++ + arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h | 143 ++ + arch/arm/mach-stmp378x/include/mach/regs-power.h | 32 + + arch/arm/mach-stmp378x/include/mach/regs-timrot.h | 216 +++ + arch/arm/mach-stmp378x/stmp378x.c | 225 +++ + arch/arm/mach-stmp378x/stmp378x.h | 24 + + arch/arm/mach-stmp378x/stmp378x_devb.c | 80 ++ + arch/arm/mach-stmp37xx/Makefile | 2 + + arch/arm/mach-stmp37xx/Makefile.boot | 3 + + arch/arm/mach-stmp37xx/include/mach/entry-macro.S | 37 + + arch/arm/mach-stmp37xx/include/mach/irqs.h | 99 ++ + arch/arm/mach-stmp37xx/include/mach/pins.h | 147 ++ + arch/arm/mach-stmp37xx/include/mach/regs-apbh.h | 102 ++ + arch/arm/mach-stmp37xx/include/mach/regs-apbx.h | 109 ++ + arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h | 85 ++ + arch/arm/mach-stmp37xx/include/mach/regs-icoll.h | 36 + + arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h | 159 +++ + arch/arm/mach-stmp37xx/include/mach/regs-power.h | 31 + + arch/arm/mach-stmp37xx/include/mach/regs-timrot.h | 52 + + arch/arm/mach-stmp37xx/stmp37xx.c | 217 +++ + arch/arm/mach-stmp37xx/stmp37xx.h | 24 + + arch/arm/mach-stmp37xx/stmp37xx_devb.c | 83 ++ + arch/arm/mach-u300/Kconfig | 105 ++ + arch/arm/mach-u300/Makefile | 11 + + arch/arm/mach-u300/clock.c | 1487 ++++++++++++++++++++ + arch/arm/mach-u300/clock.h | 53 + + arch/arm/mach-u300/core.c | 649 +++++++++ + arch/arm/mach-u300/gpio.c | 701 +++++++++ + arch/arm/mach-u300/include/mach/clkdev.h | 7 + + arch/arm/mach-u300/include/mach/debug-macro.S | 22 + + arch/arm/mach-u300/include/mach/entry-macro.S | 40 + + arch/arm/mach-u300/include/mach/gpio.h | 290 ++++ + arch/arm/mach-u300/include/mach/hardware.h | 5 + + arch/arm/mach-u300/include/mach/io.h | 20 + + arch/arm/mach-u300/include/mach/irqs.h | 114 ++ + arch/arm/mach-u300/include/mach/memory.h | 42 + + arch/arm/mach-u300/include/mach/platform.h | 19 + + arch/arm/mach-u300/include/mach/syscon.h | 644 +++++++++ + arch/arm/mach-u300/include/mach/system.h | 42 + + arch/arm/mach-u300/include/mach/timex.h | 17 + + arch/arm/mach-u300/include/mach/u300-regs.h | 187 +++ + arch/arm/mach-u300/include/mach/uncompress.h | 46 + + arch/arm/mach-u300/include/mach/vmalloc.h | 12 + + arch/arm/mach-u300/mmc.c | 216 +++ + arch/arm/mach-u300/mmc.h | 18 + + arch/arm/mach-u300/padmux.c | 58 + + arch/arm/mach-u300/padmux.h | 19 + + arch/arm/mach-u300/timer.c | 422 ++++++ + arch/arm/mach-u300/u300.c | 55 + + arch/arm/mach-versatile/core.c | 2 +- + arch/arm/mm/mmu.c | 14 + + arch/arm/plat-s3c/Kconfig | 14 + + arch/arm/plat-s3c/Makefile | 2 + + arch/arm/plat-s3c/dev-usb.c | 50 + + arch/arm/plat-s3c/gpio.c | 11 +- + arch/arm/plat-s3c/include/plat/cpu.h | 3 + + arch/arm/plat-s3c/include/plat/gpio-core.h | 30 + + arch/arm/plat-s3c/include/plat/pm.h | 15 + + arch/arm/plat-s3c/include/plat/regs-serial.h | 5 + + arch/arm/plat-s3c/pm-gpio.c | 380 +++++ + arch/arm/plat-s3c/pm.c | 19 +- + arch/arm/plat-s3c24xx/devs.c | 30 - + arch/arm/plat-s3c24xx/gpiolib.c | 8 + + arch/arm/plat-s3c24xx/include/plat/map.h | 1 - + arch/arm/plat-s3c24xx/include/plat/pm-core.h | 5 + + arch/arm/plat-s3c24xx/pm.c | 213 --- + arch/arm/plat-s3c64xx/Kconfig | 1 + + arch/arm/plat-s3c64xx/Makefile | 6 + + arch/arm/plat-s3c64xx/cpu.c | 19 + + arch/arm/plat-s3c64xx/gpiolib.c | 10 +- + arch/arm/plat-s3c64xx/include/plat/irqs.h | 1 + + arch/arm/plat-s3c64xx/include/plat/pm-core.h | 98 ++ + arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 1 + + arch/arm/plat-s3c64xx/irq-eint.c | 3 + + arch/arm/plat-s3c64xx/irq-pm.c | 111 ++ + arch/arm/plat-s3c64xx/irq.c | 9 +- + arch/arm/plat-s3c64xx/pm.c | 175 +++ + arch/arm/plat-s3c64xx/sleep.S | 144 ++ + arch/arm/plat-stmp3xxx/Kconfig | 37 + + arch/arm/plat-stmp3xxx/Makefile | 5 + + arch/arm/plat-stmp3xxx/clock.c | 1112 +++++++++++++++ + arch/arm/plat-stmp3xxx/clock.h | 61 + + arch/arm/plat-stmp3xxx/core.c | 127 ++ + arch/arm/plat-stmp3xxx/dma.c | 462 ++++++ + arch/arm/plat-stmp3xxx/include/mach/clkdev.h | 18 + + arch/arm/plat-stmp3xxx/include/mach/cputype.h | 33 + + arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | 42 + + arch/arm/plat-stmp3xxx/include/mach/dma.h | 155 ++ + arch/arm/plat-stmp3xxx/include/mach/gpio.h | 28 + + arch/arm/plat-stmp3xxx/include/mach/hardware.h | 32 + + arch/arm/plat-stmp3xxx/include/mach/io.h | 25 + + arch/arm/plat-stmp3xxx/include/mach/memory.h | 22 + + arch/arm/plat-stmp3xxx/include/mach/pinmux.h | 158 +++ + arch/arm/plat-stmp3xxx/include/mach/pins.h | 30 + + arch/arm/plat-stmp3xxx/include/mach/platform.h | 47 + + arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h | 34 + + .../arm/plat-stmp3xxx/include/mach/stmp3xxx_regs.h | 195 +++ + arch/arm/plat-stmp3xxx/include/mach/system.h | 47 + + arch/arm/plat-stmp3xxx/include/mach/timex.h | 20 + + arch/arm/plat-stmp3xxx/include/mach/uncompress.h | 53 + + arch/arm/plat-stmp3xxx/include/mach/vmalloc.h | 12 + + arch/arm/plat-stmp3xxx/irq.c | 59 + + arch/arm/plat-stmp3xxx/pinmux.c | 545 +++++++ + arch/arm/plat-stmp3xxx/timer.c | 172 +++ + drivers/rtc/rtc-ep93xx.c | 149 ++- + 134 files changed, 15635 insertions(+), 477 deletions(-) + create mode 100644 arch/arm/configs/stmp378x_defconfig + create mode 100644 arch/arm/configs/stmp37xx_defconfig + create mode 100644 arch/arm/mach-s3c6400/include/mach/regs-clock.h + create mode 100644 arch/arm/mach-stmp378x/Makefile + create mode 100644 arch/arm/mach-stmp378x/Makefile.boot + create mode 100644 arch/arm/mach-stmp378x/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-stmp378x/include/mach/irqs.h + create mode 100644 arch/arm/mach-stmp378x/include/mach/pins.h + create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbh.h + create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbx.h + create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h + create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-icoll.h + create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h + create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-power.h + create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-timrot.h + create mode 100644 arch/arm/mach-stmp378x/stmp378x.c + create mode 100644 arch/arm/mach-stmp378x/stmp378x.h + create mode 100644 arch/arm/mach-stmp378x/stmp378x_devb.c + create mode 100644 arch/arm/mach-stmp37xx/Makefile + create mode 100644 arch/arm/mach-stmp37xx/Makefile.boot + create mode 100644 arch/arm/mach-stmp37xx/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-stmp37xx/include/mach/irqs.h + create mode 100644 arch/arm/mach-stmp37xx/include/mach/pins.h + create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h + create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h + create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h + create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-icoll.h + create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h + create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-power.h + create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h + create mode 100644 arch/arm/mach-stmp37xx/stmp37xx.c + create mode 100644 arch/arm/mach-stmp37xx/stmp37xx.h + create mode 100644 arch/arm/mach-stmp37xx/stmp37xx_devb.c + create mode 100644 arch/arm/mach-u300/Kconfig + create mode 100644 arch/arm/mach-u300/Makefile + create mode 100644 arch/arm/mach-u300/clock.c + create mode 100644 arch/arm/mach-u300/clock.h + create mode 100644 arch/arm/mach-u300/core.c + create mode 100644 arch/arm/mach-u300/gpio.c + create mode 100644 arch/arm/mach-u300/include/mach/clkdev.h + create mode 100644 arch/arm/mach-u300/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-u300/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-u300/include/mach/gpio.h + create mode 100644 arch/arm/mach-u300/include/mach/hardware.h + create mode 100644 arch/arm/mach-u300/include/mach/io.h + create mode 100644 arch/arm/mach-u300/include/mach/irqs.h + create mode 100644 arch/arm/mach-u300/include/mach/memory.h + create mode 100644 arch/arm/mach-u300/include/mach/platform.h + create mode 100644 arch/arm/mach-u300/include/mach/syscon.h + create mode 100644 arch/arm/mach-u300/include/mach/system.h + create mode 100644 arch/arm/mach-u300/include/mach/timex.h + create mode 100644 arch/arm/mach-u300/include/mach/u300-regs.h + create mode 100644 arch/arm/mach-u300/include/mach/uncompress.h + create mode 100644 arch/arm/mach-u300/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-u300/mmc.c + create mode 100644 arch/arm/mach-u300/mmc.h + create mode 100644 arch/arm/mach-u300/padmux.c + create mode 100644 arch/arm/mach-u300/padmux.h + create mode 100644 arch/arm/mach-u300/timer.c + create mode 100644 arch/arm/mach-u300/u300.c + create mode 100644 arch/arm/plat-s3c/dev-usb.c + create mode 100644 arch/arm/plat-s3c/pm-gpio.c + create mode 100644 arch/arm/plat-s3c64xx/include/plat/pm-core.h + create mode 100644 arch/arm/plat-s3c64xx/irq-pm.c + create mode 100644 arch/arm/plat-s3c64xx/pm.c + create mode 100644 arch/arm/plat-s3c64xx/sleep.S + create mode 100644 arch/arm/plat-stmp3xxx/Kconfig + create mode 100644 arch/arm/plat-stmp3xxx/Makefile + create mode 100644 arch/arm/plat-stmp3xxx/clock.c + create mode 100644 arch/arm/plat-stmp3xxx/clock.h + create mode 100644 arch/arm/plat-stmp3xxx/core.c + create mode 100644 arch/arm/plat-stmp3xxx/dma.c + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/clkdev.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/cputype.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/dma.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpio.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/hardware.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/io.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/memory.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/pinmux.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/pins.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/platform.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx_regs.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/system.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/timex.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/uncompress.h + create mode 100644 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h + create mode 100644 arch/arm/plat-stmp3xxx/irq.c + create mode 100644 arch/arm/plat-stmp3xxx/pinmux.c + create mode 100644 arch/arm/plat-stmp3xxx/timer.c +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 +Removing arch/cris/arch-v10/boot/compressed/Makefile +Removing arch/cris/arch-v10/boot/compressed/README +Removing arch/cris/arch-v10/boot/compressed/misc.c +Removing arch/cris/arch-v32/boot/Makefile +Removing arch/cris/arch-v32/boot/compressed/Makefile +Removing arch/cris/arch-v32/boot/rescue/Makefile +Merge made by recursive. + arch/cris/Makefile | 14 +- + arch/cris/arch-v10/boot/compressed/Makefile | 27 --- + arch/cris/arch-v10/boot/compressed/README | 25 -- + arch/cris/arch-v10/boot/compressed/misc.c | 246 -------------------- + arch/cris/arch-v10/kernel/entry.S | 14 +- + arch/cris/arch-v32/boot/Makefile | 20 -- + arch/cris/arch-v32/boot/compressed/Makefile | 26 -- + arch/cris/arch-v32/boot/rescue/Makefile | 26 -- + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 4 +- + arch/cris/arch-v32/kernel/Makefile | 2 - + arch/cris/arch-v32/kernel/entry.S | 8 + + arch/cris/{arch-v10 => }/boot/.gitignore | 0 + arch/cris/{arch-v10 => }/boot/Makefile | 8 +- + arch/cris/boot/compressed/Makefile | 38 +++ + arch/cris/{arch-v32 => }/boot/compressed/README | 0 + .../compressed/decompress_v10.lds} | 0 + .../compressed/decompress_v32.lds} | 0 + .../head.S => boot/compressed/head_v10.S} | 4 +- + .../head.S => boot/compressed/head_v32.S} | 10 +- + arch/cris/{arch-v32 => }/boot/compressed/misc.c | 193 +++++++++++----- + arch/cris/{arch-v10 => }/boot/rescue/Makefile | 22 ++- + .../boot/rescue/head.S => boot/rescue/head_v10.S} | 2 +- + .../boot/rescue/head.S => boot/rescue/head_v32.S} | 0 + .../cris/{arch-v10 => }/boot/rescue/kimagerescue.S | 0 + .../rescue.lds => boot/rescue/rescue_v10.lds} | 0 + .../rescue.lds => boot/rescue/rescue_v32.lds} | 0 + arch/cris/{arch-v10 => }/boot/rescue/testrescue.S | 0 + arch/cris/{arch-v10 => }/boot/tools/build.c | 0 + arch/cris/include/asm/unistd.h | 12 +- + 29 files changed, 240 insertions(+), 461 deletions(-) + delete mode 100644 arch/cris/arch-v10/boot/compressed/Makefile + delete mode 100644 arch/cris/arch-v10/boot/compressed/README + delete mode 100644 arch/cris/arch-v10/boot/compressed/misc.c + delete mode 100644 arch/cris/arch-v32/boot/Makefile + delete mode 100644 arch/cris/arch-v32/boot/compressed/Makefile + delete mode 100644 arch/cris/arch-v32/boot/rescue/Makefile + rename arch/cris/{arch-v10 => }/boot/.gitignore (100%) + rename arch/cris/{arch-v10 => }/boot/Makefile (65%) + create mode 100644 arch/cris/boot/compressed/Makefile + rename arch/cris/{arch-v32 => }/boot/compressed/README (100%) + rename arch/cris/{arch-v10/boot/compressed/decompress.lds => boot/compressed/decompress_v10.lds} (100%) + rename arch/cris/{arch-v32/boot/compressed/decompress.lds => boot/compressed/decompress_v32.lds} (100%) + rename arch/cris/{arch-v10/boot/compressed/head.S => boot/compressed/head_v10.S} (97%) + rename arch/cris/{arch-v32/boot/compressed/head.S => boot/compressed/head_v32.S} (94%) + rename arch/cris/{arch-v32 => }/boot/compressed/misc.c (65%) + rename arch/cris/{arch-v10 => }/boot/rescue/Makefile (63%) + rename arch/cris/{arch-v10/boot/rescue/head.S => boot/rescue/head_v10.S} (99%) + rename arch/cris/{arch-v32/boot/rescue/head.S => boot/rescue/head_v32.S} (100%) + rename arch/cris/{arch-v10 => }/boot/rescue/kimagerescue.S (100%) + rename arch/cris/{arch-v10/boot/rescue/rescue.lds => boot/rescue/rescue_v10.lds} (100%) + rename arch/cris/{arch-v32/boot/rescue/rescue.lds => boot/rescue/rescue_v32.lds} (100%) + rename arch/cris/{arch-v10 => }/boot/rescue/testrescue.S (100%) + rename arch/cris/{arch-v10 => }/boot/tools/build.c (100%) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. + drivers/rtc/Kconfig | 19 +++ + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 511 insertions(+), 0 deletions(-) + create mode 100644 drivers/rtc/rtc-msm6242.c + create mode 100644 drivers/rtc/rtc-rp5c01.c +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 +Merge made by recursive. + arch/mips/Kconfig | 2 + + arch/mips/cavium-octeon/Makefile | 4 + + arch/mips/cavium-octeon/dma-octeon.c | 311 +++- + arch/mips/cavium-octeon/executive/Makefile | 1 + + .../cavium-octeon/executive/cvmx-helper-errata.c | 70 + + .../cavium-octeon/executive/cvmx-helper-jtag.c | 144 ++ + arch/mips/cavium-octeon/msi.c | 288 +++ + arch/mips/cavium-octeon/octeon-irq.c | 2 + + arch/mips/cavium-octeon/pci-common.c | 137 ++ + arch/mips/cavium-octeon/pci-common.h | 39 + + arch/mips/cavium-octeon/pci.c | 568 +++++ + arch/mips/cavium-octeon/pcie.c | 1370 +++++++++++ + .../include/asm/mach-cavium-octeon/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-generic/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-ip27/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-ip32/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-jazz/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-lemote/dma-coherence.h | 6 +- + arch/mips/include/asm/octeon/cvmx-helper-errata.h | 33 + + arch/mips/include/asm/octeon/cvmx-helper-jtag.h | 43 + + arch/mips/include/asm/octeon/cvmx-npei-defs.h | 2560 ++++++++++++++++++++ + arch/mips/include/asm/octeon/cvmx-npi-defs.h | 1735 +++++++++++++ + arch/mips/include/asm/octeon/cvmx-pci-defs.h | 1645 +++++++++++++ + arch/mips/include/asm/octeon/cvmx-pcieep-defs.h | 1365 +++++++++++ + arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 1397 +++++++++++ + arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 410 ++++ + arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 229 ++ + arch/mips/include/asm/octeon/cvmx.h | 12 + + arch/mips/include/asm/octeon/octeon.h | 2 + + arch/mips/include/asm/r4kcache.h | 1 + + arch/mips/include/asm/txx9/dmac.h | 51 + + arch/mips/include/asm/txx9/tx4927.h | 2 + + arch/mips/include/asm/txx9/tx4938.h | 1 + + arch/mips/include/asm/txx9/tx4939.h | 1 + + arch/mips/kernel/cevt-txx9.c | 67 +- + arch/mips/mm/c-r4k.c | 12 + + arch/mips/mm/dma-default.c | 23 +- + arch/mips/txx9/generic/setup.c | 55 + + arch/mips/txx9/generic/setup_tx4927.c | 12 + + arch/mips/txx9/generic/setup_tx4938.c | 21 +- + arch/mips/txx9/generic/setup_tx4939.c | 21 +- + arch/mips/txx9/rbtx4927/setup.c | 4 + + arch/mips/txx9/rbtx4938/setup.c | 1 + + arch/mips/txx9/rbtx4939/setup.c | 1 + + drivers/dma/Kconfig | 8 + + drivers/dma/Makefile | 1 + + drivers/dma/txx9dmac.c | 1354 +++++++++++ + drivers/dma/txx9dmac.h | 307 +++ + 48 files changed, 14287 insertions(+), 59 deletions(-) + create mode 100644 arch/mips/cavium-octeon/executive/cvmx-helper-errata.c + create mode 100644 arch/mips/cavium-octeon/executive/cvmx-helper-jtag.c + create mode 100644 arch/mips/cavium-octeon/msi.c + create mode 100644 arch/mips/cavium-octeon/pci-common.c + create mode 100644 arch/mips/cavium-octeon/pci-common.h + create mode 100644 arch/mips/cavium-octeon/pci.c + create mode 100644 arch/mips/cavium-octeon/pcie.c + create mode 100644 arch/mips/include/asm/octeon/cvmx-helper-errata.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-helper-jtag.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-npei-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-npi-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-pci-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-pcieep-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-pciercx-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-pescx-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-pexp-defs.h + create mode 100644 arch/mips/include/asm/txx9/dmac.h + create mode 100644 drivers/dma/txx9dmac.c + create mode 100644 drivers/dma/txx9dmac.h +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 +Removing arch/powerpc/include/asm/mpc86xx.h +Merge made by recursive. + Documentation/powerpc/dts-bindings/ecm.txt | 64 ++ + .../powerpc/dts-bindings/fsl/cpm_qe/qe.txt | 3 + + Documentation/powerpc/dts-bindings/fsl/mcm.txt | 64 ++ + arch/powerpc/boot/dts/gef_ppc9a.dts | 13 + + arch/powerpc/boot/dts/gef_sbc310.dts | 13 + + arch/powerpc/boot/dts/gef_sbc610.dts | 13 + + arch/powerpc/boot/dts/ksi8560.dts | 13 + + arch/powerpc/boot/dts/mpc832x_mds.dts | 3 +- + arch/powerpc/boot/dts/mpc832x_rdb.dts | 3 +- + arch/powerpc/boot/dts/mpc8349emitx.dts | 2 - + arch/powerpc/boot/dts/mpc8349emitxgp.dts | 1 - + arch/powerpc/boot/dts/mpc834x_mds.dts | 2 - + arch/powerpc/boot/dts/mpc836x_mds.dts | 3 +- + arch/powerpc/boot/dts/mpc836x_rdk.dts | 2 + + arch/powerpc/boot/dts/mpc8377_mds.dts | 1 - + arch/powerpc/boot/dts/mpc8378_mds.dts | 1 - + arch/powerpc/boot/dts/mpc8379_mds.dts | 1 - + arch/powerpc/boot/dts/mpc8536ds.dts | 17 +- + arch/powerpc/boot/dts/mpc8540ads.dts | 14 +- + arch/powerpc/boot/dts/mpc8541cds.dts | 15 +- + arch/powerpc/boot/dts/mpc8544ds.dts | 17 +- + arch/powerpc/boot/dts/mpc8548cds.dts | 16 +- + arch/powerpc/boot/dts/mpc8555cds.dts | 15 +- + arch/powerpc/boot/dts/mpc8560ads.dts | 14 +- + arch/powerpc/boot/dts/mpc8568mds.dts | 17 +- + arch/powerpc/boot/dts/mpc8569mds.dts | 514 +++++++++++++++++ + arch/powerpc/boot/dts/mpc8572ds.dts | 16 +- + arch/powerpc/boot/dts/mpc8572ds_36b.dts | 16 +- + arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 15 +- + arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 1 - + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 15 +- + arch/powerpc/boot/dts/mpc8641_hpcn.dts | 15 +- + arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts | 610 ++++++++++++++++++++ + arch/powerpc/boot/dts/sbc8349.dts | 1 - + arch/powerpc/boot/dts/sbc8548.dts | 15 +- + arch/powerpc/boot/dts/sbc8560.dts | 14 +- + arch/powerpc/boot/dts/sbc8641d.dts | 15 +- + arch/powerpc/boot/dts/socrates.dts | 14 +- + arch/powerpc/boot/dts/stx_gp3_8560.dts | 14 +- + arch/powerpc/boot/dts/tqm8540.dts | 14 +- + arch/powerpc/boot/dts/tqm8541.dts | 14 +- + arch/powerpc/boot/dts/tqm8548-bigflash.dts | 15 +- + arch/powerpc/boot/dts/tqm8548.dts | 15 +- + arch/powerpc/boot/dts/tqm8555.dts | 14 +- + arch/powerpc/boot/dts/tqm8560.dts | 14 +- + arch/powerpc/include/asm/cpm1.h | 2 - + arch/powerpc/include/asm/cpm2.h | 4 - + arch/powerpc/include/asm/mpc86xx.h | 33 - + arch/powerpc/include/asm/pci-bridge.h | 6 +- + arch/powerpc/include/asm/qe.h | 21 +- + arch/powerpc/oprofile/op_model_fsl_emb.c | 14 - + arch/powerpc/platforms/82xx/pq2ads.h | 13 - + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 52 ++- + arch/powerpc/platforms/86xx/gef_ppc9a.c | 1 - + arch/powerpc/platforms/86xx/gef_sbc310.c | 1 - + arch/powerpc/platforms/86xx/gef_sbc610.c | 1 - + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 1 - + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 1 - + arch/powerpc/platforms/86xx/mpc86xx_smp.c | 8 +- + arch/powerpc/platforms/86xx/sbc8641d.c | 1 - + arch/powerpc/platforms/8xx/mpc885ads.h | 4 - + arch/powerpc/platforms/fsl_uli1575.c | 23 +- + arch/powerpc/sysdev/cpm2.c | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 4 + + arch/powerpc/sysdev/fsl_soc.c | 14 +- + arch/powerpc/sysdev/qe_lib/qe.c | 75 +++- + drivers/net/ucc_geth.c | 24 +- + drivers/net/ucc_geth.h | 4 +- + 68 files changed, 1806 insertions(+), 191 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/ecm.txt + create mode 100644 Documentation/powerpc/dts-bindings/fsl/mcm.txt + create mode 100644 arch/powerpc/boot/dts/mpc8569mds.dts + create mode 100644 arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts + delete mode 100644 arch/powerpc/include/asm/mpc86xx.h +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merging arch/arm/kernel/sys_oabi-compat.c +Auto-merging arch/arm/mach-pxa/Kconfig +Auto-merging arch/arm/mach-pxa/corgi.c +Auto-merging arch/arm/mach-pxa/littleton.c +Auto-merging arch/arm/mach-pxa/spitz.c +Auto-merging arch/arm/mach-pxa/zylonite_pxa300.c +Merge made by recursive. + arch/arm/mach-mmp/include/mach/irqs.h | 1 + + arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 27 +++++ + arch/arm/mach-mmp/include/mach/mfp-pxa910.h | 8 ++ + arch/arm/mach-mmp/include/mach/pxa168.h | 44 +++++++ + arch/arm/mach-mmp/include/mach/pxa910.h | 44 +++++++ + arch/arm/mach-mmp/include/mach/regs-apbc.h | 14 ++- + arch/arm/mach-mmp/pxa168.c | 18 +++ + arch/arm/mach-mmp/pxa910.c | 18 +++ + arch/arm/mach-pxa/Kconfig | 7 +- + arch/arm/mach-pxa/Makefile | 1 - + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/corgi.c | 47 +------- + arch/arm/mach-pxa/csb726.c | 18 +++- + arch/arm/mach-pxa/devices.c | 4 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/imote2.c | 21 +--- + arch/arm/mach-pxa/include/mach/irqs.h | 16 ++- + arch/arm/mach-pxa/littleton.c | 19 +--- + arch/arm/mach-pxa/magician.c | 12 ++- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/palmt5.c | 14 ++- + arch/arm/mach-pxa/palmte2.c | 32 +++++- + arch/arm/mach-pxa/palmtx.c | 14 ++- + arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- + arch/arm/mach-pxa/poodle.c | 17 +--- + arch/arm/mach-pxa/pxa27x.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 4 +- + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/spitz.c | 55 +--------- + arch/arm/mach-pxa/tosa.c | 2 +- + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 2 +- + arch/arm/plat-pxa/Makefile | 2 + + .../include/mach => plat-pxa/include/plat}/i2c.h | 0 + arch/arm/{mach-pxa => plat-pxa}/pwm.c | 119 +++++++++----------- + drivers/i2c/busses/i2c-pxa.c | 22 +++- + sound/soc/pxa/Kconfig | 7 +- + sound/soc/pxa/palm27x.c | 2 +- + 41 files changed, 365 insertions(+), 266 deletions(-) + rename arch/arm/{mach-pxa/include/mach => plat-pxa/include/plat}/i2c.h (100%) + rename arch/arm/{mach-pxa => plat-pxa}/pwm.c (77%) +Merging s390/features +$ git merge s390/features +Removing arch/s390/include/asm/cpu.h +Merge made by recursive. + arch/s390/Kconfig | 18 ++ + arch/s390/include/asm/compat.h | 19 ++- + arch/s390/include/asm/cpu.h | 32 ---- + arch/s390/include/asm/cputime.h | 19 ++ + arch/s390/include/asm/lowcore.h | 1 + + arch/s390/include/asm/seccomp.h | 16 ++ + arch/s390/include/asm/spinlock.h | 19 ++- + arch/s390/include/asm/thread_info.h | 10 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/entry.S | 5 +- + arch/s390/kernel/entry64.S | 5 +- + arch/s390/kernel/head.S | 65 +++++-- + arch/s390/kernel/nmi.c | 2 +- + arch/s390/kernel/process.c | 3 +- + arch/s390/kernel/ptrace.c | 16 +- + arch/s390/kernel/s390_ext.c | 2 +- + arch/s390/kernel/sclp.S | 327 +++++++++++++++++++++++++++++++++++ + arch/s390/kernel/signal.c | 3 +- + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/vdso.c | 4 +- + arch/s390/kernel/vtime.c | 2 +- + arch/s390/lib/spinlock.c | 40 +++++ + arch/s390/mm/fault.c | 3 +- + arch/s390/mm/mmap.c | 11 +- + drivers/s390/cio/cio.c | 2 +- + drivers/s390/cio/device_ops.c | 24 +-- + drivers/s390/cio/qdio_main.c | 44 ++---- + 27 files changed, 562 insertions(+), 134 deletions(-) + delete mode 100644 arch/s390/include/asm/cpu.h + create mode 100644 arch/s390/include/asm/seccomp.h + create mode 100644 arch/s390/kernel/sclp.S +Merging sh/master +$ git merge sh/master +Removing arch/sh/boards/mach-se/7751/pci.c +Removing arch/sh/drivers/pci/fixups-lboxre2.c +Removing arch/sh/drivers/pci/fixups-se7780.c +Removing arch/sh/drivers/pci/fixups-sh7785lcr.c +Removing arch/sh/drivers/pci/ops-landisk.c +Removing arch/sh/drivers/pci/ops-lboxre2.c +Removing arch/sh/drivers/pci/ops-r7780rp.c +Removing arch/sh/drivers/pci/ops-rts7751r2d.c +Removing arch/sh/drivers/pci/ops-sdk7780.c +Removing arch/sh/drivers/pci/ops-se7780.c +Removing arch/sh/drivers/pci/ops-sh03.c +Removing arch/sh/drivers/pci/ops-sh7785lcr.c +Removing arch/sh/drivers/pci/ops-snapgear.c +Removing arch/sh/drivers/pci/ops-titan.c +Removing arch/sh/drivers/pci/pci-auto.c +Removing arch/sh/kernel/timers/timer-cmt.c +Removing arch/sh/kernel/timers/timer-mtu2.c +Auto-merging drivers/rtc/Kconfig +Removing include/linux/sh_cmt.h +Merge made by recursive. + arch/sh/Kconfig | 58 +- + arch/sh/boards/Kconfig | 6 +- + arch/sh/boards/mach-dreamcast/setup.c | 6 - + arch/sh/boards/mach-r2d/setup.c | 50 + + arch/sh/boards/mach-se/7751/Makefile | 2 - + arch/sh/boards/mach-se/7751/io.c | 16 - + arch/sh/boards/mach-se/7751/pci.c | 147 -- + arch/sh/boards/mach-se/7780/irq.c | 27 +- + arch/sh/boards/mach-snapgear/io.c | 16 - + arch/sh/boards/mach-systemh/io.c | 16 - + arch/sh/boards/mach-titan/io.c | 20 +- + arch/sh/configs/ap325rxa_defconfig | 37 +- + arch/sh/configs/cayman_defconfig | 71 +- + arch/sh/configs/dreamcast_defconfig | 39 +- + arch/sh/configs/edosk7705_defconfig | 29 +- + arch/sh/configs/edosk7760_defconfig | 32 +- + arch/sh/configs/espt_defconfig | 39 +- + arch/sh/configs/hp6xx_defconfig | 35 +- + arch/sh/configs/landisk_defconfig | 48 +- + arch/sh/configs/lboxre2_defconfig | 44 +- + arch/sh/configs/magicpanelr2_defconfig | 30 +- + arch/sh/configs/microdev_defconfig | 36 +- + arch/sh/configs/migor_defconfig | 36 +- + arch/sh/configs/polaris_defconfig | 30 +- + arch/sh/configs/r7780mp_defconfig | 36 +- + arch/sh/configs/r7785rp_defconfig | 36 +- + arch/sh/configs/rsk7201_defconfig | 37 +- + arch/sh/configs/rsk7203_defconfig | 40 +- + arch/sh/configs/rts7751r2d1_defconfig | 43 +- + arch/sh/configs/rts7751r2dplus_defconfig | 130 ++- + arch/sh/configs/sdk7780_defconfig | 38 +- + arch/sh/configs/se7206_defconfig | 35 +- + arch/sh/configs/se7343_defconfig | 42 +- + arch/sh/configs/se7619_defconfig | 35 +- + arch/sh/configs/se7705_defconfig | 34 +- + arch/sh/configs/se7712_defconfig | 30 +- + arch/sh/configs/se7721_defconfig | 33 +- + arch/sh/configs/se7722_defconfig | 38 +- + arch/sh/configs/se7750_defconfig | 34 +- + arch/sh/configs/se7751_defconfig | 34 +- + arch/sh/configs/se7780_defconfig | 38 +- + arch/sh/configs/sh03_defconfig | 43 +- + arch/sh/configs/sh7710voipgw_defconfig | 35 +- + arch/sh/configs/sh7724_generic_defconfig | 707 +++++++ + arch/sh/configs/sh7763rdp_defconfig | 35 +- + arch/sh/configs/sh7785lcr_32bit_defconfig | 37 +- + arch/sh/configs/sh7785lcr_defconfig | 6 +- + arch/sh/configs/shmin_defconfig | 31 +- + arch/sh/configs/shx3_defconfig | 32 +- + arch/sh/configs/snapgear_defconfig | 40 +- + arch/sh/configs/systemh_defconfig | 39 +- + arch/sh/configs/titan_defconfig | 40 +- + arch/sh/configs/ul2_defconfig | 37 +- + arch/sh/configs/urquell_defconfig | 39 +- + arch/sh/drivers/pci/Kconfig | 18 - + arch/sh/drivers/pci/Makefile | 28 +- + .../drivers/pci/{ops-cayman.c => fixups-cayman.c} | 12 - + arch/sh/drivers/pci/fixups-dreamcast.c | 9 +- + arch/sh/drivers/pci/fixups-landisk.c | 34 + + arch/sh/drivers/pci/fixups-lboxre2.c | 41 - + arch/sh/drivers/pci/fixups-r7780rp.c | 41 +- + arch/sh/drivers/pci/fixups-rts7751r2d.c | 48 +- + arch/sh/drivers/pci/fixups-sdk7780.c | 63 +- + arch/sh/drivers/pci/fixups-se7751.c | 111 + + arch/sh/drivers/pci/fixups-se7780.c | 60 - + arch/sh/drivers/pci/fixups-sh7785lcr.c | 46 - + arch/sh/drivers/pci/fixups-snapgear.c | 38 + + arch/sh/drivers/pci/fixups-titan.c | 38 + + arch/sh/drivers/pci/ops-dreamcast.c | 107 +- + arch/sh/drivers/pci/ops-landisk.c | 67 - + arch/sh/drivers/pci/ops-lboxre2.c | 63 - + arch/sh/drivers/pci/ops-r7780rp.c | 68 - + arch/sh/drivers/pci/ops-rts7751r2d.c | 74 - + arch/sh/drivers/pci/ops-sdk7780.c | 73 - + arch/sh/drivers/pci/ops-se7780.c | 96 - + arch/sh/drivers/pci/ops-sh03.c | 45 - + arch/sh/drivers/pci/ops-sh4.c | 79 +- + arch/sh/drivers/pci/ops-sh5.c | 25 - + arch/sh/drivers/pci/ops-sh7785lcr.c | 66 - + arch/sh/drivers/pci/ops-snapgear.c | 94 - + arch/sh/drivers/pci/ops-titan.c | 77 - + arch/sh/drivers/pci/pci-auto.c | 545 ----- + arch/sh/drivers/pci/pci-dreamcast.c | 102 + + arch/sh/drivers/pci/pci-sh4.h | 19 +- + arch/sh/drivers/pci/pci-sh5.c | 51 +- + arch/sh/drivers/pci/pci-sh5.h | 3 - + arch/sh/drivers/pci/pci-sh7751.c | 216 +- + arch/sh/drivers/pci/pci-sh7751.h | 12 +- + arch/sh/drivers/pci/pci-sh7780.c | 227 +- + arch/sh/drivers/pci/pci-sh7780.h | 16 +- + arch/sh/drivers/pci/pci.c | 279 ++- + arch/sh/include/asm/device.h | 2 + + arch/sh/include/asm/io.h | 12 +- + arch/sh/include/asm/pci.h | 98 +- + arch/sh/include/asm/processor.h | 2 +- + arch/sh/include/asm/rtc.h | 11 + + arch/sh/include/asm/timer.h | 12 +- + arch/sh/include/cpu-sh4/cpu/freq.h | 18 + + arch/sh/include/cpu-sh4/cpu/sh7724.h | 255 +++ + arch/sh/include/mach-dreamcast/mach/pci.h | 2 + + arch/sh/kernel/Makefile_32 | 2 + + arch/sh/kernel/Makefile_64 | 2 + + arch/sh/kernel/cpu/irq/imask.c | 2 +- + arch/sh/kernel/cpu/irq/intc-sh5.c | 2 +- + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 84 + + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 111 +- + arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 115 + + arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 154 ++ + arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 187 ++ + 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 | 14 +- + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 14 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 112 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 14 +- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 556 +++++ + arch/sh/kernel/io.c | 1 + + .../{timers/timer-broadcast.c => localtimer.c} | 0 + arch/sh/kernel/setup.c | 10 +- + arch/sh/kernel/sh_ksyms_32.c | 3 +- + arch/sh/kernel/time_32.c | 107 +- + arch/sh/kernel/time_64.c | 53 +- + arch/sh/kernel/timers/Makefile | 4 - + arch/sh/kernel/timers/timer-cmt.c | 188 -- + arch/sh/kernel/timers/timer-mtu2.c | 202 -- + arch/sh/kernel/timers/timer.c | 6 - + arch/sh/mm/ioremap_32.c | 14 +- + arch/sh/oprofile/common.c | 1 + + drivers/clocksource/Makefile | 2 + + drivers/clocksource/sh_cmt.c | 116 +- + drivers/clocksource/sh_mtu2.c | 357 ++++ + drivers/clocksource/sh_tmu.c | 461 ++++ + drivers/rtc/Kconfig | 2 +- + drivers/serial/sh-sci.h | 23 +- + include/linux/clocksource.h | 10 +- + include/linux/sh_cmt.h | 13 - + include/linux/sh_timer.h | 13 + + include/linux/time.h | 15 + + kernel/time/clocksource.c | 3 - + kernel/time/timekeeping.c | 7 + + 142 files changed, 8191 insertions(+), 3247 deletions(-) + delete mode 100644 arch/sh/boards/mach-se/7751/pci.c + create mode 100644 arch/sh/configs/sh7724_generic_defconfig + rename arch/sh/drivers/pci/{ops-cayman.c => fixups-cayman.c} (88%) + create mode 100644 arch/sh/drivers/pci/fixups-landisk.c + delete mode 100644 arch/sh/drivers/pci/fixups-lboxre2.c + create mode 100644 arch/sh/drivers/pci/fixups-se7751.c + delete mode 100644 arch/sh/drivers/pci/fixups-se7780.c + delete mode 100644 arch/sh/drivers/pci/fixups-sh7785lcr.c + create mode 100644 arch/sh/drivers/pci/fixups-snapgear.c + create mode 100644 arch/sh/drivers/pci/fixups-titan.c + delete mode 100644 arch/sh/drivers/pci/ops-landisk.c + delete mode 100644 arch/sh/drivers/pci/ops-lboxre2.c + delete mode 100644 arch/sh/drivers/pci/ops-r7780rp.c + delete mode 100644 arch/sh/drivers/pci/ops-rts7751r2d.c + delete mode 100644 arch/sh/drivers/pci/ops-sdk7780.c + delete mode 100644 arch/sh/drivers/pci/ops-se7780.c + delete mode 100644 arch/sh/drivers/pci/ops-sh03.c + delete mode 100644 arch/sh/drivers/pci/ops-sh7785lcr.c + delete mode 100644 arch/sh/drivers/pci/ops-snapgear.c + delete mode 100644 arch/sh/drivers/pci/ops-titan.c + delete mode 100644 arch/sh/drivers/pci/pci-auto.c + create mode 100644 arch/sh/drivers/pci/pci-dreamcast.c + 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 + rename arch/sh/kernel/{timers/timer-broadcast.c => localtimer.c} (100%) + delete mode 100644 arch/sh/kernel/timers/timer-cmt.c + delete mode 100644 arch/sh/kernel/timers/timer-mtu2.c + create mode 100644 drivers/clocksource/sh_mtu2.c + create mode 100644 drivers/clocksource/sh_tmu.c + delete mode 100644 include/linux/sh_cmt.h + create mode 100644 include/linux/sh_timer.h +Merging sparc/master +$ git merge sparc/master +Auto-merging arch/sparc/kernel/head_64.S +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 +Removing arch/x86/boot/compressed/vmlinux_32.lds +Removing arch/x86/kernel/irqinit_64.c +Removing arch/x86/kernel/vmlinux_32.lds.S +Removing arch/x86/kernel/vmlinux_64.lds.S +Auto-merging kernel/sched.c +Merge made by recursive. + .../ABI/testing/sysfs-devices-cache_disable | 18 + + Documentation/kernel-parameters.txt | 3 + + arch/x86/Kbuild | 16 + + arch/x86/Kconfig | 26 +- + arch/x86/Makefile | 19 +- + arch/x86/boot/Makefile | 5 +- + arch/x86/boot/a20.c | 9 +- + arch/x86/boot/apm.c | 76 ++-- + arch/x86/boot/bioscall.S | 82 ++++ + arch/x86/boot/boot.h | 48 ++ + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/boot/compressed/head_32.S | 77 ++-- + arch/x86/boot/compressed/head_64.S | 44 +- + .../compressed/{vmlinux_64.lds => vmlinux.lds.S} | 14 +- + arch/x86/boot/compressed/vmlinux_32.lds | 43 -- + arch/x86/boot/edd.c | 71 ++-- + arch/x86/boot/header.S | 4 +- + arch/x86/boot/main.c | 39 +- + arch/x86/boot/mca.c | 27 +- + arch/x86/boot/memory.c | 81 ++-- + arch/x86/boot/regs.c | 29 ++ + arch/x86/boot/setup.ld | 6 + + arch/x86/boot/tty.c | 52 ++- + arch/x86/boot/video-bios.c | 27 +- + arch/x86/boot/video-vesa.c | 137 +++--- + arch/x86/boot/video-vga.c | 95 +++-- + arch/x86/boot/video.c | 42 +- + arch/x86/boot/video.h | 14 - + arch/x86/include/asm/alternative.h | 59 +-- + arch/x86/include/asm/apic.h | 31 +- + arch/x86/include/asm/boot.h | 13 +- + arch/x86/include/asm/cpufeature.h | 2 +- + arch/x86/include/asm/hw_irq.h | 4 + + arch/x86/include/asm/i387.h | 31 +- + arch/x86/include/asm/i8259.h | 4 - + arch/x86/include/asm/io_apic.h | 4 - + arch/x86/include/asm/iomap.h | 5 + + arch/x86/include/asm/irq_remapping.h | 2 +- + arch/x86/include/asm/irq_vectors.h | 1 + + arch/x86/include/asm/k8.h | 13 + + arch/x86/include/asm/page_32_types.h | 4 - + arch/x86/include/asm/page_64_types.h | 6 - + arch/x86/include/asm/page_types.h | 6 + + arch/x86/include/asm/paravirt.h | 22 +- + arch/x86/include/asm/pgtable.h | 4 + + arch/x86/include/asm/pgtable_64.h | 6 - + arch/x86/include/asm/pgtable_types.h | 1 - + arch/x86/include/asm/required-features.h | 8 +- + arch/x86/include/asm/setup.h | 1 - + arch/x86/include/asm/syscalls.h | 45 +- + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/include/asm/traps.h | 2 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/acpi/realmode/Makefile | 2 +- + arch/x86/kernel/acpi/realmode/bioscall.S | 1 + + arch/x86/kernel/acpi/realmode/regs.c | 1 + + arch/x86/kernel/apic/apic.c | 253 ++++++---- + arch/x86/kernel/apic/es7000_32.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 360 ++++++-------- + arch/x86/kernel/apic/nmi.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 1 - + arch/x86/kernel/apic/probe_64.c | 2 +- + arch/x86/kernel/apic/summit_32.c | 7 - + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 5 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 153 +++---- + arch/x86/kernel/dumpstack.h | 1 - + arch/x86/kernel/early-quirks.c | 2 + + arch/x86/kernel/head_32.S | 7 - + arch/x86/kernel/irq.c | 20 +- + arch/x86/kernel/{irqinit_32.c => irqinit.c} | 149 +++++-- + arch/x86/kernel/irqinit_64.c | 177 ------- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/paravirt.c | 56 +-- + arch/x86/kernel/process.c | 1 + + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 2 +- + arch/x86/kernel/quirks.c | 37 ++ + arch/x86/kernel/setup.c | 26 +- + arch/x86/kernel/smp.c | 20 +- + arch/x86/kernel/smpboot.c | 14 +- + arch/x86/kernel/traps.c | 10 +- + arch/x86/kernel/tsc.c | 8 +- + arch/x86/kernel/vmi_32.c | 20 +- + arch/x86/kernel/vmlinux.lds.S | 430 +++++++++++++++++- + arch/x86/kernel/vmlinux_32.lds.S | 229 --------- + arch/x86/kernel/vmlinux_64.lds.S | 298 ------------ + arch/x86/lguest/boot.c | 16 +- + arch/x86/mm/dump_pagetables.c | 7 +- + arch/x86/mm/fault.c | 57 +-- + arch/x86/mm/highmem_32.c | 2 - + arch/x86/mm/init.c | 71 +++- + arch/x86/mm/init_32.c | 57 +--- + arch/x86/mm/init_64.c | 43 -- + arch/x86/mm/iomap_32.c | 1 - + arch/x86/mm/pageattr.c | 14 - + arch/x86/vdso/vma.c | 1 + + arch/x86/xen/enlighten.c | 10 +- + arch/x86/xen/mmu.c | 23 +- + arch/x86/xen/xen-ops.h | 1 - + drivers/pci/intel-iommu.c | 9 - + drivers/pci/intr_remapping.c | 39 +- + drivers/xen/Kconfig | 20 + + drivers/xen/Makefile | 4 +- + drivers/xen/events.c | 6 + + drivers/xen/evtchn.c | 507 ++++++++++++++++++++ + drivers/xen/manage.c | 9 +- + drivers/xen/sys-hypervisor.c | 445 +++++++++++++++++ + drivers/xen/xenbus/xenbus_probe.c | 61 +-- + drivers/xen/xenbus/xenbus_xs.c | 2 + + drivers/xen/xenfs/super.c | 19 +- + include/Kbuild | 1 + + include/asm-generic/pgtable.h | 21 +- + include/linux/dmar.h | 3 + + include/xen/Kbuild | 1 + + include/xen/events.h | 3 + + include/xen/evtchn.h | 88 ++++ + include/xen/interface/version.h | 3 + + include/xen/xenbus.h | 3 +- + kernel/sched.c | 2 +- + 120 files changed, 3083 insertions(+), 2154 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-cache_disable + create mode 100644 arch/x86/Kbuild + create mode 100644 arch/x86/boot/bioscall.S + rename arch/x86/boot/compressed/{vmlinux_64.lds => vmlinux.lds.S} (76%) + delete mode 100644 arch/x86/boot/compressed/vmlinux_32.lds + create mode 100644 arch/x86/boot/regs.c + create mode 100644 arch/x86/kernel/acpi/realmode/bioscall.S + create mode 100644 arch/x86/kernel/acpi/realmode/regs.c + rename arch/x86/kernel/{irqinit_32.c => irqinit.c} (68%) + delete mode 100644 arch/x86/kernel/irqinit_64.c + delete mode 100644 arch/x86/kernel/vmlinux_32.lds.S + delete mode 100644 arch/x86/kernel/vmlinux_64.lds.S + create mode 100644 drivers/xen/evtchn.c + create mode 100644 drivers/xen/sys-hypervisor.c + create mode 100644 include/xen/Kbuild + create mode 100644 include/xen/evtchn.h +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 configfs/linux-next +$ git merge configfs/linux-next +Merge made by recursive. + fs/configfs/configfs_internal.h | 3 + + fs/configfs/dir.c | 193 ++++++++++++++++++++++++++++----------- + fs/configfs/inode.c | 38 ++++++++ + 3 files changed, 180 insertions(+), 54 deletions(-) +Merging ext4/next +$ git merge ext4/next +Removing fs/ext4/ext4_i.h +Removing fs/ext4/ext4_sb.h +Removing fs/ext4/group.h +Removing fs/ext4/namei.h +Merge made by recursive. + fs/ext3/acl.c | 13 ++- + fs/ext4/acl.c | 15 ++- + fs/ext4/balloc.c | 28 +++--- + fs/ext4/ext4.h | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++--- + fs/ext4/ext4_i.h | 140 ------------------------ + fs/ext4/ext4_sb.h | 161 --------------------------- + fs/ext4/extents.c | 13 ++- + fs/ext4/group.h | 29 ----- + fs/ext4/ialloc.c | 70 ++++++------- + fs/ext4/inode.c | 19 +++- + fs/ext4/mballoc.c | 145 ++++++++++--------------- + fs/ext4/mballoc.h | 1 - + fs/ext4/namei.c | 22 ++-- + fs/ext4/namei.h | 8 -- + fs/ext4/resize.c | 36 +++--- + fs/ext4/super.c | 222 ++++++++++++++++++++------------------ + 16 files changed, 587 insertions(+), 645 deletions(-) + delete mode 100644 fs/ext4/ext4_i.h + delete mode 100644 fs/ext4/ext4_sb.h + delete mode 100644 fs/ext4/group.h + delete mode 100644 fs/ext4/namei.h +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Merge made by recursive. + fs/Kconfig | 10 + + fs/fuse/Makefile | 1 + + fs/fuse/cuse.c | 610 +++++++++++++++++++++++++++++++++++++++++++++++++ + fs/fuse/dev.c | 15 +- + fs/fuse/dir.c | 33 +-- + fs/fuse/file.c | 346 ++++++++++++++++------------ + fs/fuse/fuse_i.h | 47 +++- + fs/fuse/inode.c | 117 ++++++---- + include/linux/fuse.h | 31 +++ + include/linux/magic.h | 5 +- + 10 files changed, 983 insertions(+), 232 deletions(-) + create mode 100644 fs/fuse/cuse.c +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/glock.c | 1 + + fs/gfs2/log.c | 6 +- + fs/gfs2/lops.c | 14 ++++--- + fs/gfs2/meta_io.c | 104 ++++++++++++++++++++++++++++++++++++++++++---------- + fs/gfs2/ops_file.c | 29 ++++++++------ + 5 files changed, 112 insertions(+), 42 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 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 nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging include/linux/nfsd/state.h +Merge made by recursive. + Documentation/filesystems/00-INDEX | 4 + + fs/lockd/svclock.c | 2 + + fs/locks.c | 3 +- + fs/nfsd/export.c | 13 +- + fs/nfsd/nfs3xdr.c | 1 + + fs/nfsd/nfs4callback.c | 222 +++++++++++++++--------- + fs/nfsd/nfs4state.c | 120 +++++++------ + fs/nfsd/nfs4xdr.c | 248 +++++++++++++-------------- + fs/nfsd/nfsctl.c | 284 ++++++++++++++++++------------ + include/linux/fs.h | 1 + + include/linux/nfsd/nfsfh.h | 7 + + include/linux/nfsd/state.h | 23 +-- + include/linux/nfsd/xdr4.h | 17 ++- + include/linux/sunrpc/svc_xprt.h | 7 +- + include/linux/sunrpc/svcsock.h | 7 +- + net/sunrpc/svc_xprt.c | 57 ++++-- + net/sunrpc/svcsock.c | 87 +++++++--- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 3 + + net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +- + 20 files changed, 661 insertions(+), 450 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/ioctl.c | 8 +++++--- + fs/nilfs2/mdt.c | 13 +++++++------ + fs/nilfs2/recovery.c | 6 ++++-- + 3 files changed, 16 insertions(+), 11 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/cluster/masklog.h | 35 ++++++++++---------- + fs/ocfs2/symlink.c | 77 +++++++++++++++++++++----------------------- + fs/ocfs2/xattr.c | 5 ++- + 3 files changed, 57 insertions(+), 60 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +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 e7611d4] Merge commit 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Merge made by recursive. + fs/ubifs/budget.c | 3 ++- + fs/ubifs/super.c | 5 +++++ + 2 files changed, 7 insertions(+), 1 deletions(-) +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. +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 +- + arch/x86/ia32/ia32entry.S | 1 + + arch/x86/include/asm/unistd_32.h | 1 + + arch/x86/include/asm/unistd_64.h | 2 + + arch/x86/kernel/syscall_table_32.S | 1 + + include/linux/compat.h | 2 + + include/linux/futex.h | 6 + + include/linux/mutex.h | 1 + + include/linux/rculist.h | 30 +- + include/linux/rcutree.h | 9 +- + include/linux/sched.h | 8 +- + include/linux/signal.h | 2 + + include/linux/thread_info.h | 3 +- + init/Kconfig | 2 +- + ipc/sem.c | 4 +- + kernel/compat.c | 11 + + kernel/futex.c | 1200 +++++++++++++++++++++++-------- + kernel/mutex.c | 25 +- + kernel/rcupreempt.c | 8 +- + kernel/rcutree.c | 25 +- + kernel/rcutree_trace.c | 64 ++- + kernel/rtmutex.c | 248 +++++-- + kernel/rtmutex_common.h | 8 + + kernel/signal.c | 56 ++- + lib/vsprintf.c | 56 ++- + mm/percpu.c | 141 ++--- + security/integrity/ima/ima_fs.c | 4 +- + security/smack/smackfs.c | 8 +- + 29 files changed, 1518 insertions(+), 514 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Already up-to-date. +Merging tracing/auto-tracing-next +$ git merge tracing/auto-tracing-next +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/process_32.c +Auto-merging arch/x86/kernel/process_64.c +Auto-merging include/linux/sched.h +Removing include/trace/irq.h +Removing include/trace/irq_event_types.h +Removing include/trace/kmemtrace.h +Removing include/trace/lockdep.h +Removing include/trace/lockdep_event_types.h +Removing include/trace/sched.h +Removing include/trace/skb.h +Removing include/trace/trace_event_types.h +Removing include/trace/trace_events.h +Auto-merging kernel/sched.c +Auto-merging kernel/signal.c +Removing kernel/trace/events.c +Removing kernel/trace/trace_events_stage_1.h +Removing kernel/trace/trace_events_stage_2.h +Removing kernel/trace/trace_events_stage_3.h +Merge made by recursive. + Documentation/DocBook/Makefile | 3 +- + Documentation/DocBook/tracepoint.tmpl | 89 ++ + Documentation/trace/events.txt | 135 +++ + Documentation/trace/power.txt | 17 + + arch/x86/Kconfig.cpu | 1 - + arch/x86/Kconfig.debug | 9 + + arch/x86/include/asm/ds.h | 82 +- + arch/x86/include/asm/processor.h | 35 +- + arch/x86/include/asm/ptrace.h | 9 +- + arch/x86/include/asm/tlbflush.h | 8 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/ds.c | 921 +++++++++++----- + arch/x86/kernel/ds_selftest.c | 408 +++++++ + arch/x86/kernel/ds_selftest.h | 15 + + arch/x86/kernel/entry_64.S | 19 +- + arch/x86/kernel/process.c | 5 +- + arch/x86/kernel/process_32.c | 3 +- + arch/x86/kernel/process_64.c | 3 +- + arch/x86/kernel/ptrace.c | 284 +++-- + arch/x86/mm/kmmio.c | 104 +- + arch/x86/mm/mmio-mod.c | 2 + + block/blk-core.c | 5 +- + block/blk-sysfs.c | 7 +- + block/compat_ioctl.c | 2 +- + drivers/md/dm.c | 3 +- + drivers/scsi/sg.c | 1 + + include/asm-generic/vmlinux.lds.h | 2 +- + include/linux/blktrace_api.h | 32 +- + include/linux/ftrace.h | 17 +- + include/linux/ftrace_event.h | 156 +++ + include/linux/init_task.h | 1 + + include/linux/kmemtrace.h | 25 + + include/linux/mm.h | 7 +- + include/linux/mmiotrace.h | 2 + + include/linux/module.h | 8 + + include/linux/ptrace.h | 10 - + include/linux/ring_buffer.h | 52 +- + include/linux/sched.h | 17 +- + include/linux/slab_def.h | 2 +- + include/linux/slub_def.h | 2 +- + include/linux/trace_seq.h | 90 ++ + include/linux/tracepoint.h | 8 +- + include/trace/block.h | 4 +- + include/trace/define_trace.h | 75 ++ + include/trace/events/irq.h | 134 +++ + include/trace/events/kmem.h | 194 ++++ + include/trace/events/lockdep.h | 96 ++ + .../trace/{sched_event_types.h => events/sched.h} | 20 +- + include/trace/events/skb.h | 40 + + include/trace/ftrace.h | 509 +++++++++ + include/trace/irq.h | 9 - + include/trace/irq_event_types.h | 55 - + include/trace/kmemtrace.h | 63 - + include/trace/lockdep.h | 9 - + include/trace/lockdep_event_types.h | 44 - + include/trace/sched.h | 9 - + include/trace/skb.h | 11 - + include/trace/trace_event_types.h | 5 - + include/trace/trace_events.h | 5 - + init/main.c | 2 +- + kernel/Makefile | 1 + + kernel/exit.c | 6 +- + kernel/fork.c | 9 +- + kernel/irq/handle.c | 5 +- + kernel/kthread.c | 5 +- + kernel/lockdep.c | 16 +- + kernel/module.c | 26 +- + kernel/ptrace.c | 10 - + kernel/sched.c | 55 +- + kernel/signal.c | 4 +- + kernel/softirq.c | 7 +- + kernel/trace/Kconfig | 89 ++- + kernel/trace/Makefile | 15 +- + kernel/trace/blktrace.c | 193 +++- + kernel/trace/events.c | 14 - + kernel/trace/ftrace.c | 726 +++++++++++-- + kernel/trace/kmemtrace.c | 10 +- + kernel/trace/ring_buffer.c | 626 +++++++---- + kernel/trace/ring_buffer_benchmark.c | 379 ++++++ + kernel/trace/trace.c | 360 ++++--- + kernel/trace/trace.h | 241 ++--- + kernel/trace/trace_boot.c | 5 +- + kernel/trace/trace_branch.c | 8 +- + kernel/trace/trace_event_profile.c | 24 +- + kernel/trace/trace_event_types.h | 12 +- + kernel/trace/trace_events.c | 681 ++++++++++-- + kernel/trace/trace_events_filter.c | 1199 ++++++++++++++++---- + kernel/trace/trace_events_stage_1.h | 39 - + kernel/trace/trace_events_stage_2.h | 176 --- + kernel/trace/trace_events_stage_3.h | 281 ----- + kernel/trace/trace_export.c | 110 ++- + kernel/trace/trace_functions_graph.c | 25 +- + kernel/trace/trace_hw_branches.c | 203 ++-- + kernel/trace/trace_mmiotrace.c | 6 +- + kernel/trace/trace_output.c | 82 ++- + kernel/trace/trace_output.h | 28 +- + kernel/trace/trace_power.c | 8 +- + kernel/trace/trace_printk.c | 6 +- + kernel/trace/trace_sched_switch.c | 12 +- + kernel/trace/trace_sched_wakeup.c | 8 +- + kernel/trace/trace_selftest.c | 58 + + kernel/trace/trace_stack.c | 13 +- + kernel/trace/trace_stat.c | 2 +- + kernel/trace/trace_stat.h | 2 +- + kernel/trace/trace_sysprof.c | 6 +- + kernel/trace/trace_workqueue.c | 2 +- + mm/mlock.c | 51 +- + mm/slab.c | 2 +- + mm/slob.c | 2 +- + mm/slub.c | 2 +- + mm/util.c | 11 +- + net/core/drop_monitor.c | 2 +- + net/core/net-traces.c | 4 +- + net/core/skbuff.c | 2 +- + samples/Kconfig | 6 + + samples/Makefile | 2 +- + samples/trace_events/Makefile | 8 + + samples/trace_events/trace-events-sample.c | 52 + + samples/trace_events/trace-events-sample.h | 124 ++ + scripts/kernel-doc | 22 + + scripts/recordmcount.pl | 6 +- + 121 files changed, 7433 insertions(+), 2542 deletions(-) + create mode 100644 Documentation/DocBook/tracepoint.tmpl + create mode 100644 Documentation/trace/events.txt + create mode 100644 Documentation/trace/power.txt + create mode 100644 arch/x86/kernel/ds_selftest.c + create mode 100644 arch/x86/kernel/ds_selftest.h + create mode 100644 include/linux/ftrace_event.h + create mode 100644 include/linux/kmemtrace.h + create mode 100644 include/linux/trace_seq.h + create mode 100644 include/trace/define_trace.h + create mode 100644 include/trace/events/irq.h + create mode 100644 include/trace/events/kmem.h + create mode 100644 include/trace/events/lockdep.h + rename include/trace/{sched_event_types.h => events/sched.h} (95%) + create mode 100644 include/trace/events/skb.h + create mode 100644 include/trace/ftrace.h + delete mode 100644 include/trace/irq.h + delete mode 100644 include/trace/irq_event_types.h + delete mode 100644 include/trace/kmemtrace.h + delete mode 100644 include/trace/lockdep.h + delete mode 100644 include/trace/lockdep_event_types.h + delete mode 100644 include/trace/sched.h + delete mode 100644 include/trace/skb.h + delete mode 100644 include/trace/trace_event_types.h + delete mode 100644 include/trace/trace_events.h + delete mode 100644 kernel/trace/events.c + create mode 100644 kernel/trace/ring_buffer_benchmark.c + delete mode 100644 kernel/trace/trace_events_stage_1.h + delete mode 100644 kernel/trace/trace_events_stage_2.h + delete mode 100644 kernel/trace/trace_events_stage_3.h + create mode 100644 samples/trace_events/Makefile + create mode 100644 samples/trace_events/trace-events-sample.c + create mode 100644 samples/trace_events/trace-events-sample.h +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merging arch/mips/cavium-octeon/octeon-irq.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging arch/x86/lguest/boot.c +Auto-merging drivers/xen/events.c +Auto-merging kernel/irq/handle.c +Auto-merging kernel/softirq.c +Merge made by recursive. + arch/alpha/kernel/sys_dp264.c | 8 +- + arch/alpha/kernel/sys_titan.c | 4 +- + arch/arm/common/gic.c | 4 +- + arch/cris/arch-v32/kernel/irq.c | 4 +- + arch/ia64/hp/sim/hpsim_irq.c | 3 +- + arch/ia64/kernel/acpi.c | 5 +- + arch/ia64/kernel/iosapic.c | 10 +- + arch/ia64/kernel/msi_ia64.c | 16 ++- + arch/ia64/sn/kernel/irq.c | 4 +- + arch/ia64/sn/kernel/msi_sn.c | 8 +- + arch/mips/cavium-octeon/octeon-irq.c | 8 +- + arch/mips/include/asm/irq.h | 2 +- + arch/mips/kernel/irq-gic.c | 5 +- + arch/mips/mti-malta/malta-smtc.c | 4 +- + arch/mips/sibyte/bcm1480/irq.c | 8 +- + arch/mips/sibyte/sb1250/irq.c | 8 +- + arch/parisc/kernel/irq.c | 6 +- + arch/powerpc/platforms/pseries/xics.c | 12 +- + arch/powerpc/sysdev/mpic.c | 4 +- + arch/powerpc/sysdev/mpic.h | 2 +- + arch/sparc/kernel/irq_64.c | 12 ++- + arch/x86/Kconfig | 10 +-- + arch/x86/configs/x86_64_defconfig | 1 - + arch/x86/include/asm/io_apic.h | 4 +- + arch/x86/include/asm/mpspec.h | 4 +- + arch/x86/kernel/acpi/boot.c | 8 +- + arch/x86/kernel/apic/io_apic.c | 203 +++++++++++++++------------------ + arch/x86/lguest/boot.c | 2 +- + drivers/acpi/pci_irq.c | 5 +- + drivers/char/hpet.c | 4 +- + drivers/parisc/iosapic.c | 6 +- + drivers/pci/htirq.c | 4 +- + drivers/pci/intr_remapping.c | 15 +-- + drivers/pnp/pnpacpi/rsparser.c | 2 +- + drivers/xen/events.c | 14 ++- + include/linux/acpi.h | 2 +- + include/linux/interrupt.h | 2 +- + include/linux/irq.h | 58 +++++----- + kernel/irq/Makefile | 2 +- + kernel/irq/chip.c | 12 +-- + kernel/irq/handle.c | 44 +++---- + kernel/irq/internals.h | 5 +- + kernel/irq/manage.c | 19 ++- + kernel/irq/migration.c | 14 ++- + kernel/irq/numa_migrate.c | 38 ++---- + kernel/softirq.c | 2 +- + 46 files changed, 311 insertions(+), 306 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merging arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merging kernel/mutex.c +Auto-merging kernel/sched.c +Merge made by recursive. + Documentation/memory-barriers.txt | 129 ++++++++++++++++++- + Documentation/scheduler/sched-rt-group.txt | 18 +++ + include/linux/wait.h | 2 - + kernel/mutex.c | 4 +- + kernel/sched.c | 198 ++++++++++++++++++++++++---- + kernel/sched_fair.c | 13 +-- + kernel/wait.c | 2 +- + 7 files changed, 328 insertions(+), 38 deletions(-) +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 +Merge made by recursive. + include/linux/timex.h | 42 +++++++++++++++++++++++++++++++----------- + kernel/time/clockevents.c | 2 ++ + kernel/time/tick-broadcast.c | 2 +- + kernel/timer.c | 3 +++ + 4 files changed, 37 insertions(+), 12 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + arch/x86/include/asm/pci.h | 1 + + drivers/pci/bus.c | 7 +- + drivers/pci/hotplug/Kconfig | 2 +- + drivers/pci/hotplug/cpqphp.h | 167 +++--- + drivers/pci/hotplug/cpqphp_core.c | 1101 +++++++++++++++++------------------- + drivers/pci/hotplug/cpqphp_ctrl.c | 371 +++++++------ + drivers/pci/hotplug/cpqphp_nvram.c | 97 ++-- + drivers/pci/hotplug/cpqphp_pci.c | 599 ++++++++++---------- + drivers/pci/hotplug/ibmphp_core.c | 1 + + drivers/pci/msi.c | 2 +- + drivers/pci/msi.h | 14 +- + drivers/pci/pcie/portdrv_core.c | 2 +- + drivers/pci/probe.c | 9 +- + drivers/pci/search.c | 30 - + drivers/pci/setup-bus.c | 53 ++- + drivers/pci/setup-res.c | 49 ++- + include/linux/ioport.h | 2 + + include/linux/pci.h | 12 +- + include/linux/pci_regs.h | 4 +- + 19 files changed, 1269 insertions(+), 1254 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merging drivers/md/dm.c +Merge made by recursive. + drivers/md/dm-crypt.c | 8 ++ + drivers/md/dm-delay.c | 6 +- + drivers/md/dm-io.c | 14 +++- + drivers/md/dm-linear.c | 4 +- + drivers/md/dm-mpath.c | 91 +++++++++++-------- + drivers/md/dm-region-hash.c | 2 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-snap.c | 11 +++ + drivers/md/dm-stripe.c | 15 +++- + drivers/md/dm-table.c | 121 ++++++++++++++++++++++--- + drivers/md/dm.c | 191 +++++++++++++++++++++------------------ + include/linux/device-mapper.h | 11 +++ + 12 files changed, 327 insertions(+), 149 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/hid-ids.h | 5 +++++ + drivers/hid/hid-lgff.c | 2 +- + drivers/hid/usbhid/hid-core.c | 2 +- + drivers/hid/usbhid/hid-quirks.c | 3 +++ + 4 files changed, 10 insertions(+), 2 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 10 - + Documentation/i2c/instantiating-devices | 44 ++ + Documentation/i2c/writing-clients | 16 +- + arch/mips/configs/bigsur_defconfig | 2 +- + arch/mips/configs/mtx1_defconfig | 2 +- + arch/powerpc/configs/ppc6xx_defconfig | 2 +- + drivers/i2c/busses/i2c-voodoo3.c | 1 - + drivers/i2c/chips/Kconfig | 15 - + drivers/i2c/chips/Makefile | 1 - + drivers/i2c/i2c-core.c | 535 ++++++++---------------- + drivers/macintosh/therm_adt746x.c | 84 ++-- + drivers/macintosh/therm_pm72.c | 95 ++--- + drivers/macintosh/therm_windtunnel.c | 126 +++--- + drivers/macintosh/windfarm_lm75_sensor.c | 129 ++++--- + drivers/macintosh/windfarm_max6690_sensor.c | 103 +++-- + drivers/macintosh/windfarm_smu_sat.c | 109 +++-- + drivers/media/video/bt8xx/bttv-i2c.c | 21 + + drivers/media/video/cx231xx/cx231xx-cards.c | 8 +- + drivers/media/video/cx231xx/cx231xx-i2c.c | 32 +-- + drivers/media/video/cx231xx/cx231xx-input.c | 2 +- + drivers/media/video/cx231xx/cx231xx.h | 2 +- + drivers/media/video/cx23885/cx23885-i2c.c | 12 + + drivers/media/video/cx88/cx88-i2c.c | 13 + + drivers/media/video/em28xx/em28xx-cards.c | 43 ++- + drivers/media/video/em28xx/em28xx-i2c.c | 25 +- + drivers/media/video/em28xx/em28xx-input.c | 8 +- + drivers/media/video/em28xx/em28xx.h | 2 +- + drivers/media/video/ir-kbd-i2c.c | 222 +++-------- + drivers/media/video/ivtv/ivtv-i2c.c | 36 ++- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 39 -- + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 24 + + drivers/media/video/saa7134/saa7134-i2c.c | 31 +-- + drivers/media/video/saa7134/saa7134-input.c | 102 +++-- + drivers/media/video/saa7134/saa7134.h | 2 +- + drivers/misc/eeprom/Kconfig | 14 + + drivers/misc/eeprom/Makefile | 1 + + drivers/{i2c/chips => misc/eeprom}/max6875.c | 2 +- + drivers/video/tdfxfb.c | 1 - + include/linux/i2c.h | 60 +--- + include/media/ir-kbd-i2c.h | 10 +- + 40 files changed, 891 insertions(+), 1095 deletions(-) + rename drivers/{i2c/chips => misc/eeprom}/max6875.c (99%) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/ibmaem | 2 +- + drivers/hwmon/Kconfig | 2 +- + drivers/hwmon/asus_atk0110.c | 2 ++ + drivers/hwmon/ibmaem.c | 1 + + 4 files changed, 5 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 +Auto-merging arch/arm/mach-pxa/pcm990-baseboard.c +Auto-merging drivers/media/video/em28xx/em28xx-cards.c +Auto-merging drivers/media/video/em28xx/em28xx.h +Auto-merging drivers/media/video/saa7134/saa7134-input.c +Auto-merging drivers/media/video/saa7134/saa7134.h +Merge made by recursive. + Documentation/dvb/get_dvb_firmware | 6 +- + Documentation/video4linux/CARDLIST.em28xx | 1 + + Documentation/video4linux/CARDLIST.saa7134 | 18 +- + Documentation/video4linux/gspca.txt | 1 + + Documentation/video4linux/pxa_camera.txt | 49 + + arch/arm/mach-pxa/pcm990-baseboard.c | 23 +- + drivers/media/dvb/dvb-usb/af9015.c | 80 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 7 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 + + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +- + drivers/media/dvb/frontends/Kconfig | 22 + + drivers/media/dvb/frontends/Makefile | 4 +- + drivers/media/dvb/frontends/isl6423.c | 308 ++ + drivers/media/dvb/frontends/isl6423.h | 63 + + drivers/media/dvb/frontends/stv0900_priv.h | 2 - + drivers/media/dvb/frontends/stv090x.c | 4090 +++++++++++++++++++++++ + drivers/media/dvb/frontends/stv090x.h | 106 + + drivers/media/dvb/frontends/stv090x_priv.h | 274 ++ + drivers/media/dvb/frontends/stv090x_reg.h | 2319 +++++++++++++ + drivers/media/dvb/frontends/stv6110x.c | 373 +++ + drivers/media/dvb/frontends/stv6110x.h | 71 + + drivers/media/dvb/frontends/stv6110x_priv.h | 75 + + drivers/media/dvb/frontends/stv6110x_reg.h | 82 + + drivers/media/dvb/siano/smscoreapi.c | 36 - + drivers/media/dvb/siano/smscoreapi.h | 119 +- + drivers/media/dvb/siano/smsendian.c | 100 + + drivers/media/dvb/siano/smsendian.h | 32 + + drivers/media/dvb/siano/smsir.c | 301 ++ + drivers/media/dvb/siano/smsir.h | 93 + + drivers/media/dvb/siano/smssdio.c | 354 ++ + drivers/media/dvb/ttpci/av7110_hw.c | 2 +- + drivers/media/dvb/ttpci/budget.c | 85 + + drivers/media/video/Makefile | 9 +- + drivers/media/video/cx18/cx18-audio.c | 44 +- + drivers/media/video/cx18/cx18-av-firmware.c | 82 +- + drivers/media/video/cx18/cx18-controls.c | 6 +- + drivers/media/video/cx18/cx18-driver.c | 95 +- + drivers/media/video/cx18/cx18-driver.h | 17 +- + drivers/media/video/cx18/cx18-dvb.c | 1 + + drivers/media/video/cx18/cx18-fileops.c | 7 +- + drivers/media/video/cx18/cx18-mailbox.c | 114 +- + drivers/media/video/cx18/cx18-mailbox.h | 2 +- + drivers/media/video/cx18/cx18-queue.c | 85 +- + drivers/media/video/cx18/cx18-streams.c | 35 +- + drivers/media/video/cx18/cx18-streams.h | 20 +- + drivers/media/video/cx18/cx18-version.h | 2 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 1 - + drivers/media/video/cx231xx/cx231xx-vbi.c | 1 - + 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/em28xx/em28xx-cards.c | 27 + + drivers/media/video/em28xx/em28xx-core.c | 2 +- + drivers/media/video/em28xx/em28xx-dvb.c | 1 + + drivers/media/video/em28xx/em28xx.h | 1 + + drivers/media/video/gspca/gspca.c | 2 +- + drivers/media/video/gspca/m5602/Makefile | 3 +- + drivers/media/video/gspca/m5602/m5602_bridge.h | 22 +- + drivers/media/video/gspca/m5602/m5602_core.c | 38 +- + drivers/media/video/gspca/m5602/m5602_mt9m111.c | 398 ++- + drivers/media/video/gspca/m5602/m5602_mt9m111.h | 805 +---- + drivers/media/video/gspca/m5602/m5602_ov7660.c | 227 ++ + drivers/media/video/gspca/m5602/m5602_ov7660.h | 279 ++ + drivers/media/video/gspca/m5602/m5602_ov9650.c | 186 +- + drivers/media/video/gspca/m5602/m5602_ov9650.h | 57 +- + drivers/media/video/gspca/m5602/m5602_po1030.c | 494 +++- + drivers/media/video/gspca/m5602/m5602_po1030.h | 439 +-- + drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 292 ++- + drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 108 +- + drivers/media/video/gspca/m5602/m5602_s5k83a.c | 472 ++- + drivers/media/video/gspca/m5602/m5602_s5k83a.h | 280 +-- + drivers/media/video/gspca/m5602/m5602_sensor.h | 9 +- + drivers/media/video/gspca/mr97310a.c | 8 +- + drivers/media/video/gspca/t613.c | 2 +- + drivers/media/video/gspca/zc3xx.c | 20 +- + drivers/media/video/mt9m001.c | 108 +- + drivers/media/video/mt9m111.c | 73 +- + drivers/media/video/mt9t031.c | 135 +- + drivers/media/video/mt9v022.c | 138 +- + drivers/media/video/mx1_camera.c | 50 +- + drivers/media/video/mx3_camera.c | 40 +- + drivers/media/video/pxa_camera.c | 120 +- + drivers/media/video/s2255drv.c | 47 +- + drivers/media/video/saa7134/saa7134-cards.c | 436 +++- + drivers/media/video/saa7134/saa7134-input.c | 13 +- + drivers/media/video/saa7134/saa7134.h | 14 +- + drivers/media/video/sh_mobile_ceu_camera.c | 27 +- + drivers/media/video/soc_camera.c | 35 +- + drivers/media/video/tda7432.c | 14 - + drivers/media/video/uvc/uvc_v4l2.c | 10 +- + drivers/media/video/uvc/uvc_video.c | 2 +- + include/linux/mmc/sdio_ids.h | 8 + + include/media/soc_camera.h | 5 +- + include/media/v4l2-device.h | 2 +- + 96 files changed, 12977 insertions(+), 2559 deletions(-) + create mode 100644 drivers/media/dvb/frontends/isl6423.c + create mode 100644 drivers/media/dvb/frontends/isl6423.h + create mode 100644 drivers/media/dvb/frontends/stv090x.c + create mode 100644 drivers/media/dvb/frontends/stv090x.h + create mode 100644 drivers/media/dvb/frontends/stv090x_priv.h + create mode 100644 drivers/media/dvb/frontends/stv090x_reg.h + create mode 100644 drivers/media/dvb/frontends/stv6110x.c + create mode 100644 drivers/media/dvb/frontends/stv6110x.h + create mode 100644 drivers/media/dvb/frontends/stv6110x_priv.h + create mode 100644 drivers/media/dvb/frontends/stv6110x_reg.h + create mode 100644 drivers/media/dvb/siano/smsendian.c + create mode 100644 drivers/media/dvb/siano/smsendian.h + create mode 100644 drivers/media/dvb/siano/smsir.c + create mode 100644 drivers/media/dvb/siano/smsir.h + create mode 100644 drivers/media/dvb/siano/smssdio.c + create mode 100644 drivers/media/video/cx88/cx88-dsp.c + create mode 100644 drivers/media/video/gspca/m5602/m5602_ov7660.c + create mode 100644 drivers/media/video/gspca/m5602/m5602_ov7660.h +Merging quota/for_next +$ git merge quota/for_next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging scripts/kernel-doc +Auto-merging scripts/mod/modpost.c +Merge made by recursive. + include/asm-generic/vmlinux.lds.h | 5 +- + include/linux/init.h | 3 +- + scripts/kconfig/lxdialog/checklist.c | 3 +- + scripts/kconfig/mconf.c | 10 ++- + scripts/mod/modpost.c | 48 +++++++++--- + scripts/package/builddeb | 149 +++++++++++++++++++++++----------- + 6 files changed, 156 insertions(+), 62 deletions(-) +$ git revert efbe795f5f63b74ed642e196518907355aa94bd7 +Finished one revert. +[master cd84516] Revert "initconst adjustments" + 3 files changed, 13 insertions(+), 43 deletions(-) +Merging ide/for-next +$ git merge ide/for-next +Auto-merging block/blk-core.c +Merge made by recursive. + block/blk-core.c | 10 +- + drivers/ide/alim15x3.c | 10 +- + drivers/ide/ide-atapi.c | 168 +++++++---- + drivers/ide/ide-cd.c | 88 ++---- + drivers/ide/ide-cd.h | 4 - + drivers/ide/ide-disk.c | 1 - + drivers/ide/ide-dma.c | 20 +- + drivers/ide/ide-floppy.c | 24 +- + drivers/ide/ide-io.c | 14 +- + drivers/ide/ide-ioctls.c | 1 - + drivers/ide/ide-park.c | 7 +- + drivers/ide/ide-pm.c | 38 +-- + drivers/ide/ide-tape.c | 740 ++++++++++---------------------------------- + drivers/ide/ide-taskfile.c | 18 +- + include/linux/ide.h | 27 +- + 15 files changed, 369 insertions(+), 801 deletions(-) +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 infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/amso1100/c2_cq.c | 4 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 1 + + drivers/infiniband/hw/ehca/ehca_irq.c | 9 ++-- + drivers/infiniband/hw/ehca/ehca_main.c | 2 +- + drivers/infiniband/hw/ehca/ehca_qp.c | 94 ++++++++++++++++++-------------- + drivers/infiniband/hw/ehca/hcp_if.c | 6 +- + drivers/infiniband/hw/ehca/hcp_if.h | 2 +- + drivers/infiniband/hw/ehca/hcp_phyp.c | 11 +++-- + drivers/infiniband/hw/ehca/hcp_phyp.h | 2 +- + drivers/infiniband/hw/ehca/ipz_pt_fn.c | 19 +++++-- + 10 files changed, 87 insertions(+), 63 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/acpica/rscalc.c +Merge made by recursive. + MAINTAINERS | 5 + + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/acpica/acglobal.h | 3 - + drivers/acpi/acpica/dsobject.c | 5 +- + drivers/acpi/acpica/dsopcode.c | 17 +- + drivers/acpi/acpica/dswstate.c | 4 +- + drivers/acpi/acpica/evxfevnt.c | 4 +- + drivers/acpi/acpica/exmutex.c | 9 +- + drivers/acpi/acpica/hwregs.c | 4 +- + drivers/acpi/acpica/nsnames.c | 2 +- + drivers/acpi/acpica/nspredef.c | 7 +- + drivers/acpi/acpica/nssearch.c | 4 + + drivers/acpi/acpica/rscalc.c | 3 - + drivers/acpi/acpica/rsxface.c | 8 +- + drivers/acpi/acpica/tbfadt.c | 16 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/utcopy.c | 23 + + drivers/acpi/acpica/utdebug.c | 8 +- + drivers/acpi/acpica/utmisc.c | 20 +- + drivers/acpi/acpica/utmutex.c | 26 +- + drivers/gpu/drm/Kconfig | 6 + + drivers/platform/x86/Kconfig | 13 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/oqo-wmi.c | 941 +++++++++++++++++++++++++++++++++++ + drivers/platform/x86/toshiba_acpi.c | 206 ++++++++- + include/acpi/acpixf.h | 7 +- + include/acpi/actypes.h | 20 +- + include/acpi/platform/acgcc.h | 4 + + include/acpi/platform/aclinux.h | 63 ++- + 29 files changed, 1313 insertions(+), 120 deletions(-) + create mode 100644 drivers/platform/x86/oqo-wmi.c +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/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 | 241 ++++++++++----- + 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 | 34 +- + 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/irq.c | 7 + + arch/x86/kvm/kvm_timer.h | 18 + + arch/x86/kvm/lapic.c | 251 +++++---------- + arch/x86/kvm/lapic.h | 12 +- + arch/x86/kvm/mmu.c | 165 ++++++----- + arch/x86/kvm/mmu.h | 5 + + arch/x86/kvm/paging_tmpl.h | 16 +- + arch/x86/kvm/svm.c | 352 +++++++++++---------- + arch/x86/kvm/timer.c | 46 +++ + arch/x86/kvm/vmx.c | 557 ++++++++++++++++----------------- + arch/x86/kvm/x86.c | 269 ++++++++++++---- + arch/x86/kvm/x86.h | 11 + + arch/x86/kvm/x86_emulate.c | 121 +++----- + include/linux/kvm.h | 46 +++- + include/linux/kvm_host.h | 20 +- + include/linux/kvm_types.h | 27 ++ + virt/kvm/ioapic.c | 153 ++-------- + virt/kvm/ioapic.h | 27 +-- + virt/kvm/iommu.c | 27 ++- + virt/kvm/irq_comm.c | 111 ++++--- + virt/kvm/kvm_main.c | 652 +++++++++++++++++++++++++++----------- + 42 files changed, 2001 insertions(+), 1439 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 +Resolved 'include/Kbuild' using previous resolution. +Removing drivers/scsi/mvsas.c +Auto-merging include/Kbuild +CONFLICT (content): Merge conflict in include/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c5f6c5d] Merge commit 'scsi/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/scsi/scsi_fc_transport.txt | 14 +- + Documentation/scsi/scsi_mid_low_api.txt | 5 + + drivers/scsi/Kconfig | 1 + + drivers/scsi/Makefile | 2 +- + drivers/scsi/mvsas.c | 3222 ------------------------------ + drivers/scsi/mvsas/Kconfig | 42 + + drivers/scsi/mvsas/Makefile | 32 + + drivers/scsi/mvsas/mv_64xx.c | 793 ++++++++ + drivers/scsi/mvsas/mv_64xx.h | 151 ++ + drivers/scsi/mvsas/mv_94xx.c | 672 +++++++ + drivers/scsi/mvsas/mv_94xx.h | 222 ++ + drivers/scsi/mvsas/mv_chips.h | 280 +++ + drivers/scsi/mvsas/mv_defs.h | 502 +++++ + drivers/scsi/mvsas/mv_init.c | 703 +++++++ + drivers/scsi/mvsas/mv_sas.c | 2157 ++++++++++++++++++++ + drivers/scsi/mvsas/mv_sas.h | 406 ++++ + drivers/scsi/qla2xxx/qla_attr.c | 81 +- + drivers/scsi/qla2xxx/qla_dbg.c | 7 +- + drivers/scsi/qla2xxx/qla_def.h | 34 +- + drivers/scsi/qla2xxx/qla_fw.h | 2 +- + drivers/scsi/qla2xxx/qla_gbl.h | 29 +- + drivers/scsi/qla2xxx/qla_gs.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 90 +- + drivers/scsi/qla2xxx/qla_iocb.c | 59 +- + drivers/scsi/qla2xxx/qla_isr.c | 236 +-- + drivers/scsi/qla2xxx/qla_mbx.c | 90 +- + drivers/scsi/qla2xxx/qla_mid.c | 118 +- + drivers/scsi/qla2xxx/qla_os.c | 233 ++- + drivers/scsi/qla2xxx/qla_sup.c | 38 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/scsi_transport_fc.c | 616 ++++++- + include/Kbuild | 1 + + include/scsi/Kbuild | 4 + + include/scsi/scsi_bsg_fc.h | 322 +++ + include/scsi/scsi_host.h | 9 + + include/scsi/scsi_transport_fc.h | 52 +- + 36 files changed, 7591 insertions(+), 3638 deletions(-) + delete mode 100644 drivers/scsi/mvsas.c + create mode 100644 drivers/scsi/mvsas/Kconfig + create mode 100644 drivers/scsi/mvsas/Makefile + create mode 100644 drivers/scsi/mvsas/mv_64xx.c + create mode 100644 drivers/scsi/mvsas/mv_64xx.h + create mode 100644 drivers/scsi/mvsas/mv_94xx.c + create mode 100644 drivers/scsi/mvsas/mv_94xx.h + create mode 100644 drivers/scsi/mvsas/mv_chips.h + create mode 100644 drivers/scsi/mvsas/mv_defs.h + create mode 100644 drivers/scsi/mvsas/mv_init.c + create mode 100644 drivers/scsi/mvsas/mv_sas.c + create mode 100644 drivers/scsi/mvsas/mv_sas.h + create mode 100644 include/scsi/Kbuild + create mode 100644 include/scsi/scsi_bsg_fc.h +Merging async_tx/next +$ git merge async_tx/next +Merge made by recursive. + drivers/dma/dmaengine.c | 17 ++++++++++----- + drivers/dma/dmatest.c | 4 +-- + drivers/dma/ioat_dma.c | 45 ++++++++++++++++++++++++++---------------- + drivers/dma/ipu/ipu_idmac.c | 4 +- + include/linux/dmaengine.h | 6 +++++ + 5 files changed, 48 insertions(+), 28 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Resolved 'include/linux/mmc/sdio_ids.h' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/net/atl1c/atl1c_main.c +Auto-merging drivers/net/benet/be_main.c +Removing drivers/net/bnx2x_init_values.h +Auto-merging drivers/net/e1000/e1000_main.c +Auto-merging drivers/net/ehea/ehea_main.c +Auto-merging drivers/net/ucc_geth.c +Auto-merging drivers/net/ucc_geth.h +Auto-merging drivers/net/usb/Kconfig +Auto-merging drivers/net/usb/Makefile +Auto-merging drivers/net/wireless/iwlwifi/iwl-sta.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/platform/x86/sony-laptop.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging include/linux/mmc/sdio_ids.h +CONFLICT (content): Merge conflict in include/linux/mmc/sdio_ids.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/net/tcp.h +Removing include/net/wireless.h +Auto-merging net/core/drop_monitor.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/mac80211/tx.c +Auto-merging net/rds/rds.h +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/scan.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2c1f859] Merge commit 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/isdn/00-INDEX | 29 +- + Documentation/networking/ip-sysctl.txt | 11 +- + Documentation/networking/mac80211-injection.txt | 28 +- + Documentation/rfkill.txt | 16 +- + MAINTAINERS | 12 +- + arch/arm/mach-pxa/tosa-bt.c | 4 +- + arch/powerpc/platforms/82xx/ep8248e.c | 9 +- + arch/powerpc/platforms/pasemi/gpio_mdio.c | 32 +- + drivers/net/3c509.c | 12 +- + drivers/net/8139too.c | 92 +- + drivers/net/8390.c | 10 +- + drivers/net/8390p.c | 19 +- + drivers/net/Kconfig | 15 + + drivers/net/Makefile | 3 + + drivers/net/atl1c/atl1c_main.c | 24 +- + 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/bnx2x.h | 15 + + drivers/net/bnx2x_fw_file_hdr.h | 37 + + drivers/net/bnx2x_init.h | 605 +- + drivers/net/bnx2x_init_ops.h | 442 + + drivers/net/bnx2x_init_values.h |16322 --------------------- + drivers/net/bnx2x_main.c | 347 +- + drivers/net/bonding/bond_main.c | 34 +- + drivers/net/chelsio/common.h | 2 +- + drivers/net/chelsio/cphy.h | 45 +- + drivers/net/chelsio/cxgb2.c | 36 +- + drivers/net/chelsio/mv88x201x.c | 45 +- + drivers/net/chelsio/my3126.c | 10 +- + drivers/net/chelsio/sge.c | 4 +- + drivers/net/chelsio/subr.c | 43 +- + drivers/net/cpmac.c | 23 +- + drivers/net/cxgb3/adapter.h | 2 +- + drivers/net/cxgb3/ael1002.c | 146 +- + drivers/net/cxgb3/common.h | 53 +- + drivers/net/cxgb3/cxgb3_main.c | 71 +- + drivers/net/cxgb3/sge.c | 53 +- + drivers/net/cxgb3/t3_hw.c | 78 +- + drivers/net/cxgb3/vsc8211.c | 70 +- + drivers/net/depca.c | 4 +- + drivers/net/dm9000.c | 30 +- + drivers/net/e1000/e1000_main.c | 13 +- + drivers/net/e1000e/netdev.c | 17 +- + drivers/net/ehea/ehea_main.c | 8 +- + drivers/net/fec.c | 897 +- + drivers/net/fec.h | 127 +- + drivers/net/fec_mpc52xx.c | 180 +- + drivers/net/fec_mpc52xx_phy.c | 26 +- + drivers/net/forcedeth.c | 23 + + drivers/net/fs_enet/fs_enet-main.c | 108 +- + drivers/net/fs_enet/fs_enet.h | 5 - + drivers/net/fs_enet/mac-fec.c | 34 - + drivers/net/fs_enet/mii-bitbang.c | 29 +- + drivers/net/fs_enet/mii-fec.c | 32 +- + drivers/net/fsl_pq_mdio.c | 53 +- + drivers/net/gianfar.c | 112 +- + drivers/net/gianfar.h | 4 +- + drivers/net/hp100.c | 4 +- + drivers/net/hplance.c | 21 +- + drivers/net/ibmveth.c | 34 +- + drivers/net/igb/e1000_82575.h | 1 + + drivers/net/igb/e1000_defines.h | 3 +- + drivers/net/igb/e1000_mbx.c | 8 +- + drivers/net/igb/igb_ethtool.c | 12 +- + drivers/net/igb/igb_main.c | 95 +- + 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_hw.c | 20 +- + drivers/net/ixgb/ixgb_hw.h | 14 +- + drivers/net/ixgb/ixgb_main.c | 13 +- + drivers/net/ixgb/ixgb_osdep.h | 2 +- + drivers/net/ixgbe/ixgbe.h | 4 + + drivers/net/ixgbe/ixgbe_82598.c | 209 +- + drivers/net/ixgbe/ixgbe_82599.c | 256 +- + drivers/net/ixgbe/ixgbe_common.c | 9 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 35 +- + drivers/net/ixgbe/ixgbe_main.c | 336 +- + drivers/net/ixgbe/ixgbe_phy.c | 136 +- + drivers/net/ixgbe/ixgbe_phy.h | 1 + + drivers/net/ixgbe/ixgbe_type.h | 65 +- + drivers/net/ixp2000/ixpdev.c | 19 +- + drivers/net/jazzsonic.c | 19 +- + drivers/net/korina.c | 25 +- + drivers/net/lib82596.c | 23 +- + drivers/net/ll_temac.h | 374 + + drivers/net/ll_temac_main.c | 969 ++ + drivers/net/ll_temac_mdio.c | 120 + + drivers/net/loopback.c | 21 +- + drivers/net/macb.c | 18 + + drivers/net/mace.c | 16 +- + drivers/net/macmace.c | 18 +- + drivers/net/macvlan.c | 22 +- + drivers/net/mdio.c | 414 + + drivers/net/meth.c | 28 +- + drivers/net/mii.c | 91 +- + drivers/net/mipsnet.c | 15 +- + drivers/net/mvme147.c | 17 +- + drivers/net/myri10ge/myri10ge.c | 38 +- + drivers/net/ne2k-pci.c | 2 +- + drivers/net/ne3210.c | 4 +- + drivers/net/netx-eth.c | 17 +- + drivers/net/netxen/netxen_nic.h | 611 +- + drivers/net/netxen/netxen_nic_ctx.c | 241 +- + drivers/net/netxen/netxen_nic_ethtool.c | 106 +- + drivers/net/netxen/netxen_nic_hdr.h | 8 - + drivers/net/netxen/netxen_nic_hw.c | 576 +- + drivers/net/netxen/netxen_nic_hw.h | 66 +- + drivers/net/netxen/netxen_nic_init.c | 523 +- + drivers/net/netxen/netxen_nic_main.c | 291 +- + drivers/net/netxen/netxen_nic_niu.c | 203 +- + drivers/net/netxen/netxen_nic_phan_reg.h | 27 +- + drivers/net/pasemi_mac.c | 58 +- + drivers/net/pasemi_mac.h | 1 - + drivers/net/pci-skeleton.c | 19 +- + drivers/net/pcmcia/3c574_cs.c | 2 +- + drivers/net/pcmcia/3c589_cs.c | 4 +- + drivers/net/pcnet32.c | 5 +- + drivers/net/phy/mdio_bus.c | 29 +- + drivers/net/phy/phy_device.c | 163 +- + drivers/net/pppol2tp.c | 3 +- + drivers/net/r8169.c | 61 +- + drivers/net/rionet.c | 14 +- + drivers/net/s2io-regs.h | 5 - + drivers/net/s2io.c | 21 +- + drivers/net/sb1250-mac.c | 35 +- + drivers/net/sfc/Kconfig | 2 +- + drivers/net/sfc/boards.c | 2 - + drivers/net/sfc/efx.c | 10 +- + drivers/net/sfc/ethtool.c | 19 +- + drivers/net/sfc/falcon.c | 137 +- + drivers/net/sfc/falcon_hwdefs.h | 3 - + drivers/net/sfc/falcon_xmac.c | 2 +- + drivers/net/sfc/mdio_10g.c | 385 +- + drivers/net/sfc/mdio_10g.h | 282 +- + drivers/net/sfc/net_driver.h | 34 +- + drivers/net/sfc/rx.c | 26 +- + drivers/net/sfc/selftest.c | 21 +- + drivers/net/sfc/selftest.h | 2 +- + drivers/net/sfc/sfe4001.c | 3 - + drivers/net/sfc/tenxpress.c | 226 +- + drivers/net/sfc/xenpack.h | 15 +- + drivers/net/sfc/xfp_phy.c | 51 +- + drivers/net/sgiseeq.c | 18 +- + drivers/net/smc-mca.c | 4 +- + drivers/net/smc911x.c | 23 +- + drivers/net/smsc911x.c | 13 + + drivers/net/sun3lance.c | 17 +- + drivers/net/tg3.c | 89 +- + drivers/net/tg3.h | 6 + + drivers/net/tulip/de4x5.c | 6 +- + drivers/net/tulip/winbond-840.c | 3 +- + drivers/net/tun.c | 26 +- + drivers/net/ucc_geth.c | 75 +- + drivers/net/ucc_geth.h | 3 +- + drivers/net/usb/Kconfig | 8 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/cdc_ether.c | 33 +- + drivers/net/usb/hso.c | 8 +- + drivers/net/usb/int51x1.c | 253 + + drivers/net/usb/kaweth.c | 33 +- + drivers/net/usb/usbnet.c | 37 +- + drivers/net/virtio_net.c | 12 +- + drivers/net/vxge/vxge-traffic.c | 4 +- + drivers/net/wan/pc300_drv.c | 20 +- + drivers/net/wireless/Kconfig | 16 +- + drivers/net/wireless/Makefile | 4 +- + drivers/net/wireless/at76c50x-usb.c | 4 +- + drivers/net/wireless/ath/Kconfig | 8 + + drivers/net/wireless/ath/Makefile | 6 + + drivers/net/wireless/{ => ath}/ar9170/Kconfig | 1 + + drivers/net/wireless/{ => ath}/ar9170/Makefile | 0 + drivers/net/wireless/{ => ath}/ar9170/ar9170.h | 32 +- + drivers/net/wireless/{ => ath}/ar9170/cmd.c | 0 + drivers/net/wireless/{ => ath}/ar9170/cmd.h | 0 + drivers/net/wireless/{ => ath}/ar9170/eeprom.h | 0 + drivers/net/wireless/{ => ath}/ar9170/hw.h | 15 +- + drivers/net/wireless/{ => ath}/ar9170/led.c | 0 + drivers/net/wireless/{ => ath}/ar9170/mac.c | 0 + drivers/net/wireless/{ => ath}/ar9170/main.c | 613 +- + drivers/net/wireless/{ => ath}/ar9170/phy.c | 0 + drivers/net/wireless/{ => ath}/ar9170/usb.c | 0 + drivers/net/wireless/{ => ath}/ar9170/usb.h | 2 +- + drivers/net/wireless/{ => ath}/ath5k/Kconfig | 1 + + drivers/net/wireless/{ => ath}/ath5k/Makefile | 0 + drivers/net/wireless/{ => ath}/ath5k/ath5k.h | 5 +- + drivers/net/wireless/{ => ath}/ath5k/attach.c | 0 + drivers/net/wireless/{ => ath}/ath5k/base.c | 74 +- + drivers/net/wireless/{ => ath}/ath5k/base.h | 1 - + drivers/net/wireless/{ => ath}/ath5k/caps.c | 0 + drivers/net/wireless/{ => ath}/ath5k/debug.c | 0 + drivers/net/wireless/{ => ath}/ath5k/debug.h | 0 + drivers/net/wireless/{ => ath}/ath5k/desc.c | 0 + drivers/net/wireless/{ => ath}/ath5k/desc.h | 0 + drivers/net/wireless/{ => ath}/ath5k/dma.c | 2 - + drivers/net/wireless/{ => ath}/ath5k/eeprom.c | 0 + drivers/net/wireless/{ => ath}/ath5k/eeprom.h | 0 + drivers/net/wireless/{ => ath}/ath5k/gpio.c | 0 + drivers/net/wireless/{ => ath}/ath5k/initvals.c | 8 +- + drivers/net/wireless/{ => ath}/ath5k/led.c | 4 +- + drivers/net/wireless/{ => ath}/ath5k/pcu.c | 0 + drivers/net/wireless/{ => ath}/ath5k/phy.c | 49 +- + drivers/net/wireless/{ => ath}/ath5k/qcu.c | 0 + drivers/net/wireless/{ => ath}/ath5k/reg.h | 0 + drivers/net/wireless/{ => ath}/ath5k/reset.c | 7 +- + drivers/net/wireless/{ => ath}/ath5k/rfbuffer.h | 0 + drivers/net/wireless/{ => ath}/ath5k/rfgain.h | 0 + drivers/net/wireless/{ => ath}/ath9k/Kconfig | 1 + + drivers/net/wireless/{ => ath}/ath9k/Makefile | 1 - + drivers/net/wireless/{ => ath}/ath9k/ahb.c | 0 + drivers/net/wireless/{ => ath}/ath9k/ani.c | 8 +- + drivers/net/wireless/{ => ath}/ath9k/ani.h | 0 + drivers/net/wireless/{ => ath}/ath9k/ath9k.h | 71 +- + drivers/net/wireless/{ => ath}/ath9k/beacon.c | 17 +- + drivers/net/wireless/{ => ath}/ath9k/calib.c | 123 +- + drivers/net/wireless/{ => ath}/ath9k/calib.h | 33 +- + drivers/net/wireless/{ => ath}/ath9k/debug.c | 3 + + drivers/net/wireless/{ => ath}/ath9k/debug.h | 24 +- + drivers/net/wireless/{ => ath}/ath9k/eeprom.c | 24 +- + drivers/net/wireless/{ => ath}/ath9k/eeprom.h | 2 + + drivers/net/wireless/{ => ath}/ath9k/hw.c | 179 +- + drivers/net/wireless/{ => ath}/ath9k/hw.h | 90 +- + drivers/net/wireless/{ => ath}/ath9k/initvals.h | 0 + drivers/net/wireless/{ => ath}/ath9k/mac.c | 63 +- + drivers/net/wireless/{ => ath}/ath9k/mac.h | 0 + drivers/net/wireless/{ => ath}/ath9k/main.c | 374 +- + drivers/net/wireless/{ => ath}/ath9k/pci.c | 0 + drivers/net/wireless/{ => ath}/ath9k/phy.c | 4 +- + drivers/net/wireless/{ => ath}/ath9k/phy.h | 3 - + drivers/net/wireless/{ => ath}/ath9k/rc.c | 26 +- + drivers/net/wireless/{ => ath}/ath9k/rc.h | 4 - + drivers/net/wireless/{ => ath}/ath9k/recv.c | 85 +- + drivers/net/wireless/{ => ath}/ath9k/reg.h | 0 + drivers/net/wireless/{ => ath}/ath9k/virtual.c | 0 + drivers/net/wireless/{ => ath}/ath9k/xmit.c | 64 +- + drivers/net/wireless/ath/main.c | 22 + + drivers/net/wireless/{ath9k => ath}/regd.c | 241 +- + drivers/net/wireless/{ath9k => ath}/regd.h | 40 +- + drivers/net/wireless/{ath9k => ath}/regd_common.h | 0 + drivers/net/wireless/b43/Kconfig | 8 +- + drivers/net/wireless/b43/b43.h | 8 +- + drivers/net/wireless/b43/main.c | 69 +- + drivers/net/wireless/b43/rfkill.c | 1 - + drivers/net/wireless/b43legacy/Kconfig | 8 +- + drivers/net/wireless/b43legacy/b43legacy.h | 8 +- + drivers/net/wireless/b43legacy/main.c | 193 +- + drivers/net/wireless/b43legacy/rfkill.c | 1 - + drivers/net/wireless/b43legacy/xmit.c | 2 +- + drivers/net/wireless/b43legacy/xmit.h | 4 +- + drivers/net/wireless/hostap/hostap_plx.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 7 +- + drivers/net/wireless/ipw2x00/libipw_module.c | 4 - + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 206 + + drivers/net/wireless/iwlwifi/iwl-3945.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 17 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 1 + + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 410 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 25 + + drivers/net/wireless/iwlwifi/iwl-agn.c | 791 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 751 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 59 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 1 + + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 96 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 23 +- + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 1 - + drivers/net/wireless/iwlwifi/iwl-rx.c | 7 - + drivers/net/wireless/iwlwifi/iwl-scan.c | 195 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 12 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 1017 +-- + drivers/net/wireless/libertas/cmd.c | 26 +- + drivers/net/wireless/libertas/defs.h | 21 + + drivers/net/wireless/libertas/dev.h | 1 + + drivers/net/wireless/libertas/host.h | 3 +- + drivers/net/wireless/libertas/hostcmd.h | 28 +- + drivers/net/wireless/libertas/if_cs.c | 34 +- + drivers/net/wireless/libertas/if_sdio.c | 17 +- + drivers/net/wireless/libertas/if_sdio.h | 2 + + drivers/net/wireless/libertas/if_spi.c | 6 +- + drivers/net/wireless/libertas/if_usb.c | 3 +- + drivers/net/wireless/libertas/main.c | 44 +- + drivers/net/wireless/libertas/rx.c | 48 +- + drivers/net/wireless/libertas/tx.c | 8 +- + drivers/net/wireless/libertas/types.h | 2 + + drivers/net/wireless/libertas_tf/if_usb.c | 3 +- + drivers/net/wireless/p54/p54.h | 78 +- + drivers/net/wireless/p54/p54common.c | 216 +- + drivers/net/wireless/p54/p54spi.c | 127 +- + drivers/net/wireless/rndis_wlan.c | 652 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00.h | 18 + + drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 16 +- + drivers/net/wireless/rt2x00/rt61pci.c | 7 +- + drivers/net/wireless/rt2x00/rt61pci.h | 6 - + drivers/net/wireless/rtl818x/Makefile | 2 +- + drivers/net/wireless/rtl818x/rtl8187.h | 7 + + drivers/net/wireless/rtl818x/rtl8187_dev.c | 21 +- + drivers/net/wireless/rtl818x/rtl8187_leds.c | 218 + + drivers/net/wireless/rtl818x/rtl8187_leds.h | 57 + + drivers/of/Kconfig | 6 + + drivers/of/Makefile | 1 + + drivers/of/base.c | 24 + + drivers/of/of_mdio.c | 139 + + drivers/platform/x86/acer-wmi.c | 1 - + drivers/platform/x86/hp-wmi.c | 3 - + drivers/platform/x86/sony-laptop.c | 4 - + drivers/platform/x86/toshiba_acpi.c | 1 - + drivers/serial/serial_cs.c | 22 +- + firmware/Makefile | 3 + + firmware/WHENCE | 40 + + firmware/bnx2x-e1-4.8.53.0.fw.ihex |10364 +++++++++++++ + firmware/bnx2x-e1h-4.8.53.0.fw.ihex |12028 +++++++++++++++ + firmware/cis/3CCFEM556.cis.ihex | 13 + + firmware/cis/3CXEM556.cis.ihex | 13 + + include/linux/ethtool.h | 15 +- + include/linux/fs_enet_pd.h | 6 +- + include/linux/ieee80211.h | 41 +- + include/linux/if_tun.h | 1 + + include/linux/if_vlan.h | 6 +- + include/linux/mdio.h | 312 + + include/linux/mii.h | 34 +- + include/linux/mmc/sdio_ids.h | 2 + + include/linux/netdevice.h | 67 +- + include/linux/nl80211.h | 127 +- + include/linux/of.h | 3 + + include/linux/of_mdio.h | 22 + + include/linux/pci_ids.h | 2 + + include/linux/phy.h | 6 + + include/linux/rfkill.h | 14 - + include/linux/skbuff.h | 8 +- + include/linux/smsc911x.h | 10 + + include/linux/snmp.h | 10 +- + include/linux/socket.h | 7 +- + include/linux/tcp.h | 4 +- + include/linux/usb/usbnet.h | 1 + + include/net/cfg80211.h | 897 +- + include/net/ip.h | 3 + + include/net/ip_fib.h | 3 - + include/net/ipv6.h | 15 +- + include/net/iucv/af_iucv.h | 9 + + include/net/mac80211.h | 117 +- + include/net/regulatory.h | 101 + + include/net/snmp.h | 19 +- + include/net/tcp.h | 13 + + include/net/wireless.h | 472 - + net/8021q/vlan_core.c | 4 +- + net/8021q/vlan_dev.c | 23 +- + net/core/datagram.c | 112 +- + net/core/dev.c | 100 +- + net/core/drop_monitor.c | 13 +- + net/core/iovec.c | 33 +- + net/core/net_namespace.c | 47 +- + net/ipv4/af_inet.c | 2 - + net/ipv4/inet_diag.c | 2 - + net/ipv4/ip_input.c | 13 +- + net/ipv4/ip_output.c | 12 +- + net/ipv4/proc.c | 10 +- + net/ipv4/syncookies.c | 5 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/tcp_output.c | 2 +- + net/ipv6/ip6_input.c | 7 +- + net/ipv6/ip6_output.c | 9 +- + net/ipv6/mcast.c | 19 +- + net/ipv6/ndisc.c | 4 +- + net/ipv6/proc.c | 10 +- + net/ipv6/raw.c | 2 +- + net/ipv6/syncookies.c | 4 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/iucv/af_iucv.c | 408 +- + net/iucv/iucv.c | 43 +- + net/mac80211/Kconfig | 16 + + net/mac80211/cfg.c | 59 +- + net/mac80211/debugfs.c | 8 +- + net/mac80211/event.c | 17 +- + net/mac80211/ht.c | 84 - + net/mac80211/ibss.c | 347 +- + net/mac80211/ieee80211_i.h | 85 +- + net/mac80211/iface.c | 16 +- + net/mac80211/main.c | 122 +- + net/mac80211/mlme.c | 445 +- + net/mac80211/pm.c | 121 +- + net/mac80211/rx.c | 2 +- + net/mac80211/scan.c | 28 +- + net/mac80211/spectmgmt.c | 2 +- + net/mac80211/sta_info.c | 71 +- + net/mac80211/sta_info.h | 3 +- + net/mac80211/tx.c | 35 +- + net/mac80211/util.c | 240 +- + net/mac80211/wext.c | 270 +- + net/mac80211/wpa.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 +- + net/rfkill/rfkill-input.c | 69 - + net/rfkill/rfkill.c | 54 +- + net/sctp/output.c | 17 +- + net/wimax/op-rfkill.c | 9 +- + net/wireless/Makefile | 2 +- + net/wireless/core.c | 27 +- + net/wireless/core.h | 15 +- + net/wireless/ibss.c | 369 + + net/wireless/mlme.c | 50 +- + net/wireless/nl80211.c | 639 +- + net/wireless/nl80211.h | 32 +- + net/wireless/reg.c | 35 +- + net/wireless/scan.c | 53 +- + net/wireless/util.c | 6 +- + net/wireless/wext-compat.c | 236 +- + 431 files changed, 39099 insertions(+), 27634 deletions(-) + create mode 100644 drivers/net/bnx2x_fw_file_hdr.h + create mode 100644 drivers/net/bnx2x_init_ops.h + delete mode 100644 drivers/net/bnx2x_init_values.h + create mode 100644 drivers/net/ll_temac.h + create mode 100644 drivers/net/ll_temac_main.c + create mode 100644 drivers/net/ll_temac_mdio.c + create mode 100644 drivers/net/mdio.c + create mode 100644 drivers/net/usb/int51x1.c + create mode 100644 drivers/net/wireless/ath/Kconfig + create mode 100644 drivers/net/wireless/ath/Makefile + rename drivers/net/wireless/{ => ath}/ar9170/Kconfig (96%) + rename drivers/net/wireless/{ => ath}/ar9170/Makefile (100%) + rename drivers/net/wireless/{ => ath}/ar9170/ar9170.h (90%) + rename drivers/net/wireless/{ => ath}/ar9170/cmd.c (100%) + rename drivers/net/wireless/{ => ath}/ar9170/cmd.h (100%) + rename drivers/net/wireless/{ => ath}/ar9170/eeprom.h (100%) + rename drivers/net/wireless/{ => ath}/ar9170/hw.h (97%) + rename drivers/net/wireless/{ => ath}/ar9170/led.c (100%) + rename drivers/net/wireless/{ => ath}/ar9170/mac.c (100%) + rename drivers/net/wireless/{ => ath}/ar9170/main.c (77%) + rename drivers/net/wireless/{ => ath}/ar9170/phy.c (100%) + rename drivers/net/wireless/{ => ath}/ar9170/usb.c (100%) + rename drivers/net/wireless/{ => ath}/ar9170/usb.h (98%) + rename drivers/net/wireless/{ => ath}/ath5k/Kconfig (98%) + rename drivers/net/wireless/{ => ath}/ath5k/Makefile (100%) + rename drivers/net/wireless/{ => ath}/ath5k/ath5k.h (99%) + rename drivers/net/wireless/{ => ath}/ath5k/attach.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/base.c (98%) + rename drivers/net/wireless/{ => ath}/ath5k/base.h (99%) + rename drivers/net/wireless/{ => ath}/ath5k/caps.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/debug.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/debug.h (100%) + rename drivers/net/wireless/{ => ath}/ath5k/desc.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/desc.h (100%) + rename drivers/net/wireless/{ => ath}/ath5k/dma.c (99%) + rename drivers/net/wireless/{ => ath}/ath5k/eeprom.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/eeprom.h (100%) + rename drivers/net/wireless/{ => ath}/ath5k/gpio.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/initvals.c (99%) + rename drivers/net/wireless/{ => ath}/ath5k/led.c (97%) + rename drivers/net/wireless/{ => ath}/ath5k/pcu.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/phy.c (99%) + rename drivers/net/wireless/{ => ath}/ath5k/qcu.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/reg.h (100%) + rename drivers/net/wireless/{ => ath}/ath5k/reset.c (99%) + rename drivers/net/wireless/{ => ath}/ath5k/rfbuffer.h (100%) + rename drivers/net/wireless/{ => ath}/ath5k/rfgain.h (100%) + rename drivers/net/wireless/{ => ath}/ath9k/Kconfig (97%) + rename drivers/net/wireless/{ => ath}/ath9k/Makefile (96%) + rename drivers/net/wireless/{ => ath}/ath9k/ahb.c (100%) + rename drivers/net/wireless/{ => ath}/ath9k/ani.c (99%) + rename drivers/net/wireless/{ => ath}/ath9k/ani.h (100%) + rename drivers/net/wireless/{ => ath}/ath9k/ath9k.h (94%) + rename drivers/net/wireless/{ => ath}/ath9k/beacon.c (98%) + rename drivers/net/wireless/{ => ath}/ath9k/calib.c (90%) + rename drivers/net/wireless/{ => ath}/ath9k/calib.h (81%) + rename drivers/net/wireless/{ => ath}/ath9k/debug.c (99%) + rename drivers/net/wireless/{ => ath}/ath9k/debug.h (89%) + rename drivers/net/wireless/{ => ath}/ath9k/eeprom.c (99%) + rename drivers/net/wireless/{ => ath}/ath9k/eeprom.h (99%) + rename drivers/net/wireless/{ => ath}/ath9k/hw.c (96%) + rename drivers/net/wireless/{ => ath}/ath9k/hw.h (87%) + rename drivers/net/wireless/{ => ath}/ath9k/initvals.h (100%) + rename drivers/net/wireless/{ => ath}/ath9k/mac.c (93%) + rename drivers/net/wireless/{ => ath}/ath9k/mac.h (100%) + rename drivers/net/wireless/{ => ath}/ath9k/main.c (91%) + rename drivers/net/wireless/{ => ath}/ath9k/pci.c (100%) + rename drivers/net/wireless/{ => ath}/ath9k/phy.c (99%) + rename drivers/net/wireless/{ => ath}/ath9k/phy.h (99%) + rename drivers/net/wireless/{ => ath}/ath9k/rc.c (98%) + rename drivers/net/wireless/{ => ath}/ath9k/rc.h (98%) + rename drivers/net/wireless/{ => ath}/ath9k/recv.c (93%) + rename drivers/net/wireless/{ => ath}/ath9k/reg.h (100%) + rename drivers/net/wireless/{ => ath}/ath9k/virtual.c (100%) + rename drivers/net/wireless/{ => ath}/ath9k/xmit.c (98%) + create mode 100644 drivers/net/wireless/ath/main.c + rename drivers/net/wireless/{ath9k => ath}/regd.c (65%) + rename drivers/net/wireless/{ath9k => ath}/regd.h (85%) + rename drivers/net/wireless/{ath9k => ath}/regd_common.h (100%) + create mode 100644 drivers/net/wireless/rtl818x/rtl8187_leds.c + create mode 100644 drivers/net/wireless/rtl818x/rtl8187_leds.h + create mode 100644 drivers/of/of_mdio.c + create mode 100644 firmware/bnx2x-e1-4.8.53.0.fw.ihex + create mode 100644 firmware/bnx2x-e1h-4.8.53.0.fw.ihex + create mode 100644 firmware/cis/3CCFEM556.cis.ihex + create mode 100644 firmware/cis/3CXEM556.cis.ihex + create mode 100644 include/linux/mdio.h + create mode 100644 include/linux/of_mdio.h + create mode 100644 include/net/regulatory.h + delete mode 100644 include/net/wireless.h + create mode 100644 net/wireless/ibss.c +Merging wireless/master +$ git merge wireless/master +Auto-merging drivers/net/wireless/iwlwifi/iwl-sta.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging net/mac80211/rc80211_minstrel.c +Auto-merging net/mac80211/rc80211_pid_algo.c +Auto-merging net/mac80211/tx.c +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/scan.c +Merge made by recursive. + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 2 + + drivers/net/wireless/adm8211.c | 14 +- + drivers/net/wireless/at76c50x-usb.c | 15 +- + drivers/net/wireless/ath/ar9170/hw.h | 2 + + drivers/net/wireless/ath/ar9170/mac.c | 33 +- + drivers/net/wireless/ath/ar9170/main.c | 48 +- + drivers/net/wireless/ath/ar9170/usb.c | 6 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 37 +- + drivers/net/wireless/ath/ath5k/attach.c | 1 - + drivers/net/wireless/ath/ath5k/base.c | 210 ++- + drivers/net/wireless/ath/ath5k/eeprom.c | 73 +- + drivers/net/wireless/ath/ath5k/eeprom.h | 46 +- + drivers/net/wireless/ath/ath5k/led.c | 6 +- + drivers/net/wireless/ath/ath5k/pcu.c | 6 +- + drivers/net/wireless/ath/ath5k/phy.c | 493 ++++- + drivers/net/wireless/ath/ath5k/qcu.c | 7 +- + drivers/net/wireless/ath/ath5k/reg.h | 9 +- + drivers/net/wireless/ath/ath5k/reset.c | 70 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 39 +- + drivers/net/wireless/ath/ath9k/beacon.c | 11 +- + drivers/net/wireless/ath/ath9k/calib.c | 6 +- + drivers/net/wireless/ath/ath9k/hw.c | 37 +- + drivers/net/wireless/ath/ath9k/hw.h | 3 +- + drivers/net/wireless/ath/ath9k/main.c | 206 +- + drivers/net/wireless/ath/ath9k/rc.c | 70 +- + drivers/net/wireless/ath/ath9k/xmit.c | 10 +- + drivers/net/wireless/atmel_cs.c | 2 +- + drivers/net/wireless/b43/main.c | 76 +- + drivers/net/wireless/b43legacy/main.c | 73 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 8 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 47 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 31 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 24 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 168 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 3 - + drivers/net/wireless/iwlwifi/iwl-sta.c | 2 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 69 +- + drivers/net/wireless/libertas_tf/main.c | 56 +- + drivers/net/wireless/mac80211_hwsim.c | 45 +- + drivers/net/wireless/mwl8k.c | 18 +- + drivers/net/wireless/p54/p54.h | 4 +- + drivers/net/wireless/p54/p54common.c | 86 +- + drivers/net/wireless/p54/p54usb.c | 314 ++-- + drivers/net/wireless/p54/p54usb.h | 16 +- + drivers/net/wireless/rt2x00/Kconfig | 17 + + drivers/net/wireless/rt2x00/Makefile | 2 + + drivers/net/wireless/rt2x00/rt2400pci.c | 1 - + drivers/net/wireless/rt2x00/rt2500pci.c | 1 - + drivers/net/wireless/rt2x00/rt2500usb.c | 3 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 3071 +++++++++++++++++++++++++++ + drivers/net/wireless/rt2x00/rt2800usb.h | 1945 +++++++++++++++++ + drivers/net/wireless/rt2x00/rt2x00.h | 32 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 5 + + drivers/net/wireless/rt2x00/rt2x00crypto.c | 87 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 125 +- + drivers/net/wireless/rt2x00/rt2x00ht.c | 69 + + drivers/net/wireless/rt2x00/rt2x00lib.h | 65 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 88 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 48 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 53 +- + drivers/net/wireless/rt2x00/rt61pci.c | 1 - + drivers/net/wireless/rt2x00/rt73usb.c | 4 +- + drivers/net/wireless/rtl818x/rtl8180_dev.c | 33 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 48 +- + drivers/net/wireless/wl12xx/Kconfig | 11 + + drivers/net/wireless/wl12xx/Makefile | 4 + + drivers/net/wireless/wl12xx/acx.c | 689 ++++++ + drivers/net/wireless/wl12xx/acx.h | 1245 +++++++++++ + drivers/net/wireless/wl12xx/boot.c | 295 +++ + drivers/net/wireless/wl12xx/boot.h | 40 + + drivers/net/wireless/wl12xx/cmd.c | 353 +++ + drivers/net/wireless/wl12xx/cmd.h | 265 +++ + drivers/net/wireless/wl12xx/debugfs.c | 508 +++++ + drivers/net/wireless/wl12xx/debugfs.h | 33 + + drivers/net/wireless/wl12xx/event.c | 127 ++ + drivers/net/wireless/wl12xx/event.h | 121 ++ + drivers/net/wireless/wl12xx/init.c | 200 ++ + drivers/net/wireless/wl12xx/init.h | 40 + + drivers/net/wireless/wl12xx/main.c | 1358 ++++++++++++ + drivers/net/wireless/wl12xx/ps.c | 151 ++ + drivers/net/wireless/wl12xx/ps.h | 36 + + drivers/net/wireless/wl12xx/reg.h | 745 +++++++ + drivers/net/wireless/wl12xx/rx.c | 208 ++ + drivers/net/wireless/wl12xx/rx.h | 122 ++ + drivers/net/wireless/wl12xx/spi.c | 358 ++++ + drivers/net/wireless/wl12xx/spi.h | 109 + + drivers/net/wireless/wl12xx/tx.c | 557 +++++ + drivers/net/wireless/wl12xx/tx.h | 215 ++ + drivers/net/wireless/wl12xx/wl1251.c | 709 ++++++ + drivers/net/wireless/wl12xx/wl1251.h | 165 ++ + drivers/net/wireless/wl12xx/wl12xx.h | 409 ++++ + drivers/net/wireless/wl12xx/wl12xx_80211.h | 156 ++ + drivers/net/wireless/zd1211rw/zd_mac.c | 80 +- + include/linux/ieee80211.h | 2 +- + include/linux/spi/wl12xx.h | 31 + + include/net/mac80211.h | 77 +- + net/mac80211/agg-rx.c | 19 +- + net/mac80211/agg-tx.c | 13 +- + net/mac80211/cfg.c | 49 +- + net/mac80211/debugfs.c | 20 +- + net/mac80211/driver-ops.h | 184 ++ + net/mac80211/ibss.c | 102 +- + net/mac80211/ieee80211_i.h | 14 +- + net/mac80211/iface.c | 100 +- + net/mac80211/key.c | 8 +- + net/mac80211/main.c | 165 +- + net/mac80211/mesh.c | 6 +- + net/mac80211/mlme.c | 74 +- + net/mac80211/pm.c | 9 +- + net/mac80211/rc80211_minstrel.c | 8 +- + net/mac80211/rc80211_pid_algo.c | 8 +- + net/mac80211/rx.c | 138 +- + net/mac80211/scan.c | 414 ++-- + net/mac80211/sta_info.c | 26 +- + net/mac80211/sta_info.h | 2 + + net/mac80211/tkip.c | 6 +- + net/mac80211/tx.c | 9 +- + net/mac80211/util.c | 31 +- + net/mac80211/wext.c | 2 +- + net/rfkill/rfkill.c | 5 + + net/wireless/nl80211.c | 6 +- + net/wireless/reg.c | 8 +- + net/wireless/scan.c | 10 +- + 125 files changed, 17180 insertions(+), 1883 deletions(-) + create mode 100644 drivers/net/wireless/rt2x00/rt2800usb.c + create mode 100644 drivers/net/wireless/rt2x00/rt2800usb.h + create mode 100644 drivers/net/wireless/rt2x00/rt2x00ht.c + create mode 100644 drivers/net/wireless/wl12xx/Kconfig + create mode 100644 drivers/net/wireless/wl12xx/Makefile + create mode 100644 drivers/net/wireless/wl12xx/acx.c + create mode 100644 drivers/net/wireless/wl12xx/acx.h + create mode 100644 drivers/net/wireless/wl12xx/boot.c + create mode 100644 drivers/net/wireless/wl12xx/boot.h + create mode 100644 drivers/net/wireless/wl12xx/cmd.c + create mode 100644 drivers/net/wireless/wl12xx/cmd.h + create mode 100644 drivers/net/wireless/wl12xx/debugfs.c + create mode 100644 drivers/net/wireless/wl12xx/debugfs.h + create mode 100644 drivers/net/wireless/wl12xx/event.c + create mode 100644 drivers/net/wireless/wl12xx/event.h + create mode 100644 drivers/net/wireless/wl12xx/init.c + create mode 100644 drivers/net/wireless/wl12xx/init.h + create mode 100644 drivers/net/wireless/wl12xx/main.c + create mode 100644 drivers/net/wireless/wl12xx/ps.c + create mode 100644 drivers/net/wireless/wl12xx/ps.h + create mode 100644 drivers/net/wireless/wl12xx/reg.h + create mode 100644 drivers/net/wireless/wl12xx/rx.c + create mode 100644 drivers/net/wireless/wl12xx/rx.h + create mode 100644 drivers/net/wireless/wl12xx/spi.c + create mode 100644 drivers/net/wireless/wl12xx/spi.h + create mode 100644 drivers/net/wireless/wl12xx/tx.c + create mode 100644 drivers/net/wireless/wl12xx/tx.h + create mode 100644 drivers/net/wireless/wl12xx/wl1251.c + create mode 100644 drivers/net/wireless/wl12xx/wl1251.h + create mode 100644 drivers/net/wireless/wl12xx/wl12xx.h + create mode 100644 drivers/net/wireless/wl12xx/wl12xx_80211.h + create mode 100644 include/linux/spi/wl12xx.h + create mode 100644 net/mac80211/driver-ops.h +$ git revert 621cac85297de5ba655e3430b007dd2e0da91da6 +Finished one revert. +[master 5cfea6b] Revert "rfkill: remove user_claim stuff" + 12 files changed, 72 insertions(+), 9 deletions(-) +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/devices/m25p80.c | 12 +++++++----- + drivers/mtd/mtdcore.c | 18 +++++++++++++++--- + 2 files changed, 22 insertions(+), 8 deletions(-) +Merging crypto/master +$ git merge crypto/master +Auto-merging crypto/api.c +Auto-merging drivers/char/hw_random/omap-rng.c +Auto-merging drivers/crypto/padlock-aes.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 | 24 +- + crypto/testmgr.c | 155 ++++++++- + crypto/testmgr.h | 479 ++++++++++++++++++++++++ + drivers/char/hw_random/omap-rng.c | 2 +- + drivers/crypto/Kconfig | 2 +- + drivers/crypto/padlock-aes.c | 13 + + drivers/crypto/talitos.c | 713 ++++++++++++++++++++++++++---------- + 14 files changed, 1636 insertions(+), 217 deletions(-) + create mode 100644 arch/x86/crypto/fpu.c +Merging vfs/for-next +$ git merge vfs/for-next +Auto-merging fs/ext4/super.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfsd/export.c +Auto-merging fs/ubifs/super.c +Auto-merging include/linux/fs.h +Merge made by recursive. + drivers/infiniband/hw/ipath/ipath_fs.c | 2 +- + drivers/mtd/mtdsuper.c | 3 +- + drivers/scsi/osd/osd_uld.c | 20 +- + fs/9p/vfs_super.c | 12 +- + fs/afs/mntpt.c | 2 +- + fs/afs/super.c | 3 +- + fs/autofs/dirhash.c | 5 +- + fs/autofs4/autofs_i.h | 6 +- + fs/autofs4/dev-ioctl.c | 195 ++++++-------------- + fs/autofs4/expire.c | 15 +- + fs/autofs4/root.c | 7 +- + fs/bfs/inode.c | 4 + + fs/block_dev.c | 19 ++- + fs/btrfs/inode.c | 7 - + fs/btrfs/super.c | 23 +-- + fs/cachefiles/interface.c | 4 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifsfs.c | 6 +- + fs/dcache.c | 9 +- + fs/devpts/inode.c | 5 +- + fs/ecryptfs/main.c | 5 +- + fs/exec.c | 79 +++------ + fs/exofs/super.c | 3 + + fs/ext2/super.c | 3 + + fs/ext3/balloc.c | 3 +- + fs/ext3/ialloc.c | 3 +- + fs/ext3/inode.c | 1 - + fs/ext3/resize.c | 2 - + fs/ext3/super.c | 22 --- + fs/ext3/xattr.c | 1 - + fs/ext4/super.c | 3 + + fs/fat/inode.c | 3 + + fs/file_table.c | 40 ++++- + fs/fs-writeback.c | 49 ----- + fs/fuse/inode.c | 3 + + fs/gfs2/log.c | 2 - + fs/gfs2/ops_fstype.c | 8 +- + fs/gfs2/ops_super.c | 13 -- + fs/hfs/super.c | 2 + + fs/hfsplus/super.c | 2 + + fs/inode.c | 83 ++++----- + fs/internal.h | 5 + + fs/jffs2/super.c | 3 + + fs/libfs.c | 3 +- + fs/namei.c | 142 +++++++++------ + fs/namespace.c | 320 ++++++++++++++------------------ + fs/nfs/namespace.c | 2 +- + fs/nfs/super.c | 22 +- + fs/nfsd/export.c | 78 ++++----- + fs/nfsd/vfs.c | 54 +++--- + fs/nilfs2/super.c | 4 + + fs/ocfs2/super.c | 14 -- + fs/open.c | 6 +- + fs/proc/internal.h | 25 +++ + fs/proc/proc_devtree.c | 1 + + fs/proc/root.c | 3 +- + fs/qnx4/inode.c | 9 - + fs/quota/quota.c | 25 ++- + fs/reiserfs/dir.c | 24 ++- + fs/reiserfs/namei.c | 17 +-- + fs/reiserfs/super.c | 30 ++-- + fs/reiserfs/xattr.c | 181 +++++++++--------- + fs/reiserfs/xattr_security.c | 12 +- + fs/romfs/super.c | 3 +- + fs/super.c | 219 ++++++---------------- + fs/sync.c | 119 ++++++++++-- + fs/sysv/inode.c | 3 + + fs/ubifs/super.c | 6 +- + fs/ufs/super.c | 3 + + fs/xattr.c | 4 +- + include/linux/Kbuild | 2 +- + include/linux/dcache.h | 7 +- + include/linux/fs.h | 23 ++- + include/linux/mount.h | 25 ++- + include/linux/namei.h | 6 +- + include/linux/nfsd/export.h | 6 +- + include/linux/proc_fs.h | 24 --- + include/linux/quotaops.h | 20 ++- + include/linux/reiserfs_fs_sb.h | 3 +- + include/linux/reiserfs_xattr.h | 3 +- + include/linux/romfs_fs.h | 5 - + include/linux/writeback.h | 1 - + kernel/audit_tree.c | 6 +- + kernel/cgroup.c | 3 +- + security/tomoyo/common.c | 6 +- + security/tomoyo/realpath.c | 16 +- + 86 files changed, 979 insertions(+), 1193 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 6d9b1cd Merge commit 'crypto/master' +Merging refs/next/20090506/vfs +$ git merge refs/next/20090506/vfs +Auto-merging fs/ext4/super.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfsd/export.c +Auto-merging include/linux/fs.h +Merge made by recursive. + drivers/scsi/osd/osd_uld.c | 20 ++-- + fs/9p/vfs_super.c | 6 +- + fs/afs/mntpt.c | 2 +- + fs/autofs/dirhash.c | 5 +- + fs/autofs4/autofs_i.h | 6 +- + fs/autofs4/dev-ioctl.c | 195 ++++++++----------------- + fs/autofs4/expire.c | 15 +- + fs/autofs4/root.c | 7 +- + fs/bfs/inode.c | 4 + + fs/block_dev.c | 19 ++- + fs/btrfs/inode.c | 7 - + fs/btrfs/super.c | 8 - + fs/cachefiles/interface.c | 2 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifsfs.c | 3 + + fs/dcache.c | 9 +- + fs/exec.c | 79 +++------- + fs/exofs/super.c | 3 + + fs/ext2/super.c | 3 + + fs/ext3/balloc.c | 3 +- + fs/ext3/ialloc.c | 3 +- + fs/ext3/inode.c | 1 - + fs/ext3/resize.c | 2 - + fs/ext3/super.c | 22 --- + fs/ext3/xattr.c | 1 - + fs/ext4/super.c | 3 + + fs/fat/inode.c | 3 + + fs/file_table.c | 40 +++++- + fs/fs-writeback.c | 49 ------ + fs/fuse/inode.c | 3 + + fs/gfs2/log.c | 2 - + fs/gfs2/ops_fstype.c | 8 +- + fs/gfs2/ops_super.c | 13 -- + fs/hfs/super.c | 2 + + fs/hfsplus/super.c | 2 + + fs/inode.c | 83 +++++------ + fs/internal.h | 5 + + fs/jffs2/super.c | 3 + + fs/namei.c | 142 +++++++++++------- + fs/namespace.c | 320 +++++++++++++++++----------------------- + fs/nfs/namespace.c | 2 +- + fs/nfs/super.c | 7 +- + fs/nfsd/export.c | 78 ++++------ + fs/nfsd/vfs.c | 54 ++++---- + fs/nilfs2/super.c | 4 + + fs/ocfs2/super.c | 14 -- + fs/open.c | 6 +- + fs/proc/internal.h | 25 +++ + fs/proc/proc_devtree.c | 1 + + fs/qnx4/inode.c | 9 - + fs/quota/quota.c | 23 ++-- + fs/reiserfs/dir.c | 24 ++-- + fs/reiserfs/namei.c | 17 +-- + fs/reiserfs/super.c | 9 +- + fs/reiserfs/xattr.c | 181 ++++++++++++----------- + fs/reiserfs/xattr_security.c | 12 ++- + fs/romfs/super.c | 3 +- + fs/super.c | 141 +----------------- + fs/sync.c | 110 ++++++++++++-- + fs/sysv/inode.c | 3 + + fs/ufs/super.c | 3 + + fs/xattr.c | 4 +- + include/linux/Kbuild | 2 +- + include/linux/dcache.h | 7 +- + include/linux/fs.h | 17 +-- + include/linux/mount.h | 25 +++- + include/linux/namei.h | 6 +- + include/linux/nfsd/export.h | 6 +- + include/linux/proc_fs.h | 24 --- + include/linux/quotaops.h | 20 ++- + include/linux/reiserfs_fs_sb.h | 3 +- + include/linux/reiserfs_xattr.h | 3 +- + include/linux/romfs_fs.h | 5 - + include/linux/writeback.h | 1 - + kernel/audit_tree.c | 6 +- + security/tomoyo/common.c | 6 +- + security/tomoyo/realpath.c | 16 +- + 77 files changed, 876 insertions(+), 1106 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Auto-merging include/linux/pci_ids.h +Removing include/sound/driver.h +Auto-merging sound/soc/pxa/Kconfig +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 11 +- + Documentation/sound/alsa/HD-Audio-Models.txt | 1 + + Documentation/sound/alsa/soc/dapm.txt | 1 + + include/linux/pci_ids.h | 5 + + include/sound/core.h | 10 - + include/sound/driver.h | 1 - + include/sound/pcm.h | 1 + + include/sound/soc-dai.h | 29 +- + include/sound/soc-dapm.h | 19 +- + include/sound/soc.h | 14 + + include/sound/version.h | 2 +- + sound/core/pcm_native.c | 8 +- + sound/drivers/serial-u16550.c | 11 +- + sound/isa/Kconfig | 7 +- + sound/isa/sc6000.c | 134 ++- + sound/pci/Kconfig | 10 + + sound/pci/Makefile | 1 + + sound/pci/hda/Kconfig | 13 + + sound/pci/hda/Makefile | 4 + + sound/pci/hda/hda_codec.c | 122 ++- + sound/pci/hda/hda_codec.h | 1 + + sound/pci/hda/hda_intel.c | 34 +- + sound/pci/hda/patch_ca0110.c | 573 +++++++++ + sound/pci/hda/patch_realtek.c | 237 +++-- + sound/pci/hda/patch_sigmatel.c | 44 +- + 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/pci/via82xx.c | 2 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/codecs/Kconfig | 12 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ac97.c | 4 +- + sound/soc/codecs/ad1980.c | 4 +- + sound/soc/codecs/cs4270.c | 44 +- + sound/soc/codecs/tlv320aic23.c | 2 + + sound/soc/codecs/twl4030.c | 681 ++++++++--- + sound/soc/codecs/twl4030.h | 29 +- + sound/soc/codecs/wm8350.h | 1 + + sound/soc/codecs/wm8903.c | 119 ++- + sound/soc/codecs/wm8940.c | 955 +++++++++++++++ + sound/soc/codecs/wm8940.h | 104 ++ + 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/wm8990.c | 40 +- + sound/soc/codecs/wm9705.c | 4 +- + sound/soc/codecs/wm9712.c | 6 +- + sound/soc/codecs/wm9713.c | 46 +- + sound/soc/omap/n810.c | 7 +- + sound/soc/omap/omap-mcbsp.c | 43 +- + sound/soc/omap/omap-pcm.c | 9 +- + sound/soc/omap/omap2evm.c | 2 +- + sound/soc/omap/omap3beagle.c | 28 +- + sound/soc/omap/omap3pandora.c | 4 +- + sound/soc/omap/overo.c | 2 +- + sound/soc/omap/sdp3430.c | 2 +- + sound/soc/pxa/Kconfig | 9 + + sound/soc/pxa/Makefile | 2 + + sound/soc/pxa/imote2.c | 114 ++ + sound/soc/pxa/pxa-ssp.c | 214 +--- + sound/soc/s3c24xx/s3c-i2s-v2.c | 87 ++- + sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- + sound/soc/s3c24xx/s3c64xx-i2s.c | 157 ++- + sound/soc/s3c24xx/s3c64xx-i2s.h | 6 +- + 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 | 250 +++-- + sound/usb/usbaudio.c | 14 +- + 80 files changed, 10560 insertions(+), 847 deletions(-) + delete mode 100644 include/sound/driver.h + 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/wm8940.c + create mode 100644 sound/soc/codecs/wm8940.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/pxa/imote2.c + 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 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 arch/x86/lguest/boot.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 f02342a] 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 +Auto-merging fs/cifs/cifs_dfs_ref.c +Merge made by recursive. + fs/cifs/CHANGES | 13 + + fs/cifs/README | 10 +- + fs/cifs/cifs_dfs_ref.c | 32 +- + fs/cifs/cifs_unicode.c | 198 ++++++++- + fs/cifs/cifs_unicode.h | 23 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 16 +- + fs/cifs/cifsproto.h | 5 +- + fs/cifs/cifssmb.c | 217 ++++------ + fs/cifs/connect.c | 1190 ++---------------------------------------------- + fs/cifs/inode.c | 21 +- + fs/cifs/link.c | 114 +----- + fs/cifs/misc.c | 71 --- + fs/cifs/netmisc.c | 2 + + fs/cifs/nterr.h | 9 +- + fs/cifs/ntlmssp.h | 68 ++- + fs/cifs/readdir.c | 72 +++- + fs/cifs/sess.c | 340 +++++++++++--- + fs/cifs/smberr.h | 1 + + include/linux/nls.h | 19 + + 20 files changed, 801 insertions(+), 1622 deletions(-) +Merging mmc/next +$ git merge mmc/next +Auto-merging drivers/mmc/host/omap.c +Merge made by recursive. + drivers/mmc/core/core.c | 99 +++++++++++++++++++++++------------------ + drivers/mmc/host/mmc_spi.c | 12 +++++ + drivers/mmc/host/omap.c | 3 +- + drivers/mmc/host/omap_hsmmc.c | 2 +- + drivers/mmc/host/sdhci.c | 53 ++++++++++++---------- + drivers/mmc/host/sdhci.h | 2 +- + 6 files changed, 98 insertions(+), 73 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/char/keyboard.c | 2 - + 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/Kconfig | 19 + + drivers/input/misc/Makefile | 2 + + drivers/input/misc/dm355evm_keys.c | 329 ++++++++++++++ + drivers/input/misc/rotary_encoder.c | 61 ++- + drivers/input/misc/twl4030-pwrbutton.c | 145 +++++++ + 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 +++++++++++++++++++ + drivers/input/touchscreen/wm97xx-core.c | 2 +- + include/linux/rotary_encoder.h | 2 + + 22 files changed, 1555 insertions(+), 48 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/misc/dm355evm_keys.c + create mode 100644 drivers/input/misc/twl4030-pwrbutton.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 lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Resolved 'drivers/block/hd.c' using previous resolution. +Resolved 'drivers/block/mg_disk.c' using previous resolution. +Auto-merging block/blk-core.c +Auto-merging drivers/block/hd.c +CONFLICT (content): Merge conflict in drivers/block/hd.c +Auto-merging drivers/block/mg_disk.c +CONFLICT (content): Merge conflict in drivers/block/mg_disk.c +Auto-merging drivers/ide/ide-cd.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging fs/block_dev.c +Auto-merging include/linux/blkdev.h +Removing include/linux/mg_disk.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d4d0475] Merge commit 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/plat-omap/mailbox.c | 54 +++-- + arch/um/drivers/ubd_kern.c | 33 +-- + block/Kconfig | 11 +- + block/as-iosched.c | 6 +- + block/blk-barrier.c | 9 +- + block/blk-core.c | 522 +++++++++++++++------------------- + block/blk-exec.c | 1 - + block/blk-map.c | 6 +- + block/blk-timeout.c | 22 +- + block/blk.h | 47 +++- + block/cfq-iosched.c | 6 +- + block/elevator.c | 137 +--------- + block/scsi_ioctl.c | 3 - + drivers/block/Kconfig | 2 +- + drivers/block/amiflop.c | 15 +- + drivers/block/ataflop.c | 18 +- + drivers/block/cpqarray.c | 3 +- + drivers/block/hd.c | 46 ++-- + drivers/block/loop.c | 26 +-- + drivers/block/mg_disk.c | 417 +++++++++++++++++----------- + drivers/block/paride/pcd.c | 12 +- + drivers/block/paride/pd.c | 5 +- + drivers/block/paride/pf.c | 28 +- + drivers/block/ps3disk.c | 11 +- + drivers/block/sunvdc.c | 9 +- + drivers/block/swim.c | 19 +- + drivers/block/swim3.c | 53 +--- + drivers/block/sx8.c | 3 +- + drivers/block/virtio_blk.c | 2 +- + drivers/block/xd.c | 22 +- + drivers/block/xen-blkfront.c | 6 +- + drivers/block/xsysace.c | 4 +- + drivers/block/z2ram.c | 4 +- + drivers/cdrom/gdrom.c | 8 +- + drivers/cdrom/viocd.c | 25 +-- + drivers/memstick/core/mspro_block.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 22 +- + drivers/s390/block/dasd.c | 17 +- + drivers/s390/char/tape_block.c | 15 +- + drivers/sbus/char/jsflash.c | 8 +- + drivers/scsi/scsi_lib.c | 3 +- + fs/block_dev.c | 7 + + include/linux/bio.h | 2 +- + include/linux/blkdev.h | 159 +++++++++-- + include/linux/loop.h | 3 +- + include/linux/mg_disk.h | 206 -------------- + 47 files changed, 884 insertions(+), 1157 deletions(-) + delete mode 100644 include/linux/mg_disk.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 init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging mm/slob.c +Auto-merging mm/slub.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-kernel-slab | 479 ++++ + 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 | 298 +++ + init/Kconfig | 28 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slob.c | 5 +- + mm/slqb.c | 3746 +++++++++++++++++++++++++++ + mm/slub.c | 6 +- + 12 files changed, 5658 insertions(+), 18 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-slab + 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 +Merge made by recursive. + drivers/mfd/htc-pasic3.c | 4 ++-- + drivers/mfd/pcf50633-core.c | 2 +- + drivers/mfd/twl4030-core.c | 2 +- + drivers/mfd/wm8350-core.c | 8 -------- + drivers/mfd/wm8350-regmap.c | 4 ++-- + drivers/mfd/wm8400-core.c | 2 +- + 6 files changed, 7 insertions(+), 15 deletions(-) +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/Kconfig | 19 ++ + drivers/regulator/Makefile | 2 + + drivers/regulator/da903x.c | 2 +- + drivers/regulator/fixed.c | 18 ++- + drivers/regulator/max1586.c | 249 ++++++++++++++++++++++++++ + drivers/regulator/pcf50633-regulator.c | 2 +- + drivers/regulator/userspace-consumer.c | 200 +++++++++++++++++++++ + drivers/regulator/virtual.c | 1 + + drivers/regulator/wm8350-regulator.c | 1 + + drivers/regulator/wm8400-regulator.c | 8 +- + include/linux/regulator/max1586.h | 52 ++++++ + include/linux/regulator/userspace-consumer.h | 25 +++ + 12 files changed, 571 insertions(+), 8 deletions(-) + create mode 100644 drivers/regulator/max1586.c + create mode 100644 drivers/regulator/userspace-consumer.c + create mode 100644 include/linux/regulator/max1586.h + create mode 100644 include/linux/regulator/userspace-consumer.h +Merging security-testing/next +$ git merge security-testing/next +Auto-merging Documentation/sysctl/kernel.txt +Auto-merging include/linux/sched.h +Auto-merging kernel/exit.c +Auto-merging kernel/module.c +Auto-merging kernel/signal.c +Auto-merging kernel/sysctl.c +Auto-merging security/commoncap.c +Auto-merging security/selinux/hooks.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/smack/smackfs.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 ++++++++++ + include/linux/sched.h | 1 + + kernel/exit.c | 1 + + kernel/module.c | 7 +- + kernel/signal.c | 11 +- + kernel/sysctl.c | 12 + + security/Makefile | 3 + + security/commoncap.c | 32 +++ + security/integrity/ima/ima_audit.c | 30 +--- + security/integrity/ima/ima_main.c | 16 +-- + security/integrity/ima/ima_policy.c | 8 +- + security/lsm_audit.c | 386 ++++++++++++++++++++++++++++++++++ + security/selinux/avc.c | 2 +- + security/selinux/hooks.c | 24 +-- + 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 ++++++ + 23 files changed, 1215 insertions(+), 203 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 +Merge made by recursive. + drivers/char/cyclades.c | 288 +++++++++------------ + 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 | 86 ++++++- + drivers/char/synclinkmp.c | 9 +- + drivers/char/tty_port.c | 38 +++- + drivers/char/vt_ioctl.c | 6 + + drivers/serial/jsm/jsm.h | 2 - + drivers/serial/jsm/jsm_driver.c | 1 - + drivers/usb/class/cdc-acm.c | 442 +++++++++++++++++++-------------- + drivers/usb/class/cdc-acm.h | 5 +- + 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 | 81 ++----- + drivers/usb/serial/digi_acceleport.c | 75 ++---- + 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 | 3 +- + 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 | 48 +++-- + 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 | 68 +++--- + drivers/usb/serial/oti6858.c | 57 +---- + drivers/usb/serial/pl2303.c | 79 +++---- + drivers/usb/serial/sierra.c | 97 ++++---- + 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 | 144 ++++++++---- + drivers/usb/serial/visor.c | 6 +- + drivers/usb/serial/whiteheat.c | 33 +--- + include/linux/cyclades.h | 37 +-- + include/linux/tty.h | 6 +- + include/linux/usb/serial.h | 10 +- + 58 files changed, 1038 insertions(+), 1092 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 up-to-date. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Already uptodate! +Merge made by recursive. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Auto-merging arch/x86/Kconfig.debug +Auto-merging lib/dma-debug.c +Merge made by recursive. + arch/x86/Kconfig.debug | 3 +- + arch/x86/kernel/pci-calgary_64.c | 54 +---------------- + arch/x86/kernel/pci-gart_64.c | 45 +++------------ + arch/x86/kernel/pci-swiotlb.c | 2 +- + include/linux/dma-debug.h | 7 ++ + include/linux/swiotlb.h | 3 +- + lib/dma-debug.c | 72 +++++++++++++++++++++-- + lib/swiotlb.c | 119 ++++++++++++++++++++------------------ + 8 files changed, 149 insertions(+), 156 deletions(-) +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 +Resolved 'drivers/pci/intel-iommu.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/kernel/pci-swiotlb.c +Auto-merging drivers/pci/intel-iommu.c +CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 743795a] Merge commit 'dwmw2-iommu/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 1 + + arch/ia64/include/asm/iommu.h | 1 + + arch/ia64/kernel/pci-dma.c | 2 + + arch/ia64/kernel/pci-swiotlb.c | 2 +- + arch/x86/include/asm/iommu.h | 1 + + arch/x86/kernel/pci-dma.c | 6 + + arch/x86/kernel/pci-swiotlb.c | 3 +- + drivers/pci/dmar.c | 11 ++- + drivers/pci/intel-iommu.c | 180 ++++++++++++++++++++++++++--------- + include/linux/dma_remapping.h | 8 ++ + include/linux/intel-iommu.h | 2 + + 11 files changed, 167 insertions(+), 50 deletions(-) +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 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 Documentation/kernel-parameters.txt +Auto-merging Documentation/sound/alsa/ALSA-Configuration.txt +Auto-merging arch/s390/kernel/head.S +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ide/ide-atapi.c +Auto-merging drivers/net/wireless/rndis_wlan.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00lib.h +Auto-merging drivers/usb/serial/io_ti.c +Auto-merging fs/inode.c +Merge made by recursive. + Documentation/CodingStyle | 4 ++-- + Documentation/DMA-API.txt | 4 ++-- + Documentation/RCU/rculist_nulls.txt | 2 +- + Documentation/SM501.txt | 2 +- + Documentation/block/deadline-iosched.txt | 2 +- + Documentation/braille-console.txt | 2 +- + Documentation/driver-model/devres.txt | 2 +- + Documentation/edac.txt | 8 ++++---- + Documentation/fb/sh7760fb.txt | 2 +- + .../filesystems/autofs4-mount-control.txt | 2 +- + Documentation/filesystems/caching/netfs-api.txt | 2 +- + Documentation/filesystems/ext4.txt | 6 +++--- + Documentation/filesystems/fiemap.txt | 2 +- + Documentation/filesystems/nfs-rdma.txt | 2 +- + Documentation/filesystems/proc.txt | 4 ++-- + Documentation/filesystems/sysfs-pci.txt | 2 +- + Documentation/filesystems/vfat.txt | 8 ++++---- + Documentation/gpio.txt | 2 +- + Documentation/kdump/kdump.txt | 4 ++-- + Documentation/kernel-parameters.txt | 4 ++-- + Documentation/kobject.txt | 2 +- + Documentation/laptops/acer-wmi.txt | 2 +- + Documentation/laptops/sony-laptop.txt | 2 +- + Documentation/laptops/thinkpad-acpi.txt | 2 +- + Documentation/local_ops.txt | 2 +- + Documentation/memory-hotplug.txt | 8 ++++---- + Documentation/mn10300/ABI.txt | 2 +- + Documentation/mtd/nand_ecc.txt | 12 ++++++------ + Documentation/networking/bonding.txt | 6 +++--- + Documentation/networking/can.txt | 2 +- + Documentation/networking/dm9000.txt | 2 +- + Documentation/networking/l2tp.txt | 2 +- + Documentation/networking/netdevices.txt | 2 +- + Documentation/networking/phonet.txt | 2 +- + Documentation/networking/regulatory.txt | 2 +- + Documentation/power/regulator/consumer.txt | 2 +- + Documentation/power/regulator/overview.txt | 2 +- + Documentation/power/s2ram.txt | 2 +- + Documentation/power/userland-swsusp.txt | 2 +- + Documentation/powerpc/booting-without-of.txt | 4 ++-- + Documentation/powerpc/dts-bindings/fsl/board.txt | 2 +- + .../powerpc/dts-bindings/fsl/cpm_qe/cpm.txt | 2 +- + .../powerpc/dts-bindings/fsl/cpm_qe/gpio.txt | 2 +- + Documentation/powerpc/dts-bindings/fsl/msi-pic.txt | 2 +- + Documentation/powerpc/dts-bindings/fsl/pmc.txt | 4 ++-- + Documentation/powerpc/qe_firmware.txt | 2 +- + Documentation/rbtree.txt | 8 ++++---- + Documentation/rfkill.txt | 4 ++-- + Documentation/s390/Debugging390.txt | 4 ++-- + Documentation/scheduler/sched-nice-design.txt | 2 +- + Documentation/scsi/aic79xx.txt | 2 +- + Documentation/scsi/ncr53c8xx.txt | 4 ++-- + Documentation/scsi/sym53c8xx_2.txt | 2 +- + Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- + Documentation/sound/alsa/HD-Audio.txt | 2 +- + Documentation/sound/alsa/hda_codec.txt | 2 +- + Documentation/sysctl/vm.txt | 4 ++-- + Documentation/timers/hpet.txt | 2 +- + Documentation/timers/timer_stats.txt | 2 +- + Documentation/trace/ftrace.txt | 2 +- + Documentation/usb/WUSB-Design-overview.txt | 8 ++++---- + Documentation/usb/anchors.txt | 4 ++-- + Documentation/video4linux/cx18.txt | 2 +- + arch/s390/kernel/head.S | 2 +- + arch/x86/mm/srat_32.c | 2 +- + drivers/ata/libata-acpi.c | 4 ++-- + drivers/ata/libata-eh.c | 2 +- + drivers/char/amiserial.c | 2 +- + drivers/edac/e752x_edac.c | 2 +- + drivers/ide/ide-atapi.c | 2 +- + drivers/isdn/divert/isdn_divert.c | 2 +- + drivers/isdn/mISDN/dsp_core.c | 2 +- + drivers/media/video/hdpvr/hdpvr-video.c | 2 +- + drivers/message/fusion/lsi/mpi_history.txt | 6 +++--- + drivers/mtd/Kconfig | 3 ++- + drivers/net/appletalk/ltpc.c | 2 +- + drivers/net/b44.h | 2 +- + drivers/net/e100.c | 2 +- + drivers/net/e1000e/e1000.h | 2 +- + drivers/net/ehea/ehea.h | 2 +- + drivers/net/igbvf/igbvf.h | 2 +- + drivers/net/ipg.h | 2 +- + drivers/net/mlx4/en_netdev.c | 2 +- + drivers/net/niu.h | 4 ++-- + drivers/net/qlge/qlge_mpi.c | 6 +++--- + drivers/net/skfp/h/smt.h | 2 +- + drivers/net/tokenring/3c359.c | 2 +- + drivers/net/tokenring/lanstreamer.c | 2 +- + drivers/net/tokenring/olympic.c | 2 +- + drivers/net/ucc_geth_ethtool.c | 2 +- + drivers/net/wireless/rndis_wlan.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 2 +- + drivers/net/wireless/wavelan_cs.c | 2 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + drivers/scsi/dpt/osd_util.h | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 4 ++-- + drivers/scsi/megaraid.h | 2 +- + drivers/scsi/megaraid/mbox_defs.h | 2 +- + drivers/staging/go7007/go7007.txt | 4 ++-- + drivers/staging/panel/lcd-panel-cgram.txt | 2 +- + drivers/staging/rt2860/common/mlme.c | 2 +- + drivers/staging/rt2870/common/mlme.c | 2 +- + drivers/staging/rt3070/common/mlme.c | 2 +- + drivers/usb/serial/io_ti.c | 2 +- + drivers/watchdog/iop_wdt.c | 2 +- + fs/bio.c | 4 ++-- + fs/compat.c | 2 +- + fs/compat_ioctl.c | 2 +- + fs/ext2/ext2.h | 2 +- + fs/inode.c | 2 +- + include/linux/ultrasound.h | 2 +- + kernel/power/poweroff.c | 2 +- + net/netfilter/nf_conntrack_acct.c | 2 +- + sound/pci/aw2/aw2-saa7146.c | 2 +- + sound/pci/sis7019.h | 4 ++-- + sound/pci/vx222/vx222_ops.c | 2 +- + sound/usb/usbmixer.c | 2 +- + 117 files changed, 164 insertions(+), 163 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +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 'mm/slob.c' +Resolved 'lib/Kconfig.debug' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +CONFLICT (delete/modify): arch/x86/kernel/vmlinux_32.lds.S deleted in HEAD and modified in kmemleak/kmemleak. Version kmemleak/kmemleak of arch/x86/kernel/vmlinux_32.lds.S left in tree. +CONFLICT (delete/modify): arch/x86/kernel/vmlinux_64.lds.S deleted in HEAD and modified in kmemleak/kmemleak. Version kmemleak/kmemleak of arch/x86/kernel/vmlinux_64.lds.S left in tree. +Auto-merging fs/block_dev.c +Auto-merging include/linux/percpu.h +Auto-merging include/linux/slab.h +Auto-merging 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/slab.c +Auto-merging mm/slob.c +CONFLICT (content): Merge conflict in mm/slob.c +Auto-merging mm/slub.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/x86/kernel/vmlinux_32.lds.S arch/x86/kernel/vmlinux_64.lds.S +arch/x86/kernel/vmlinux_32.lds.S: needs merge +arch/x86/kernel/vmlinux_64.lds.S: needs merge +lib/Kconfig.debug: needs merge +mm/slob.c: needs merge +rm 'arch/x86/kernel/vmlinux_32.lds.S' +rm 'arch/x86/kernel/vmlinux_64.lds.S' +Applying: kmemleak: fixup for x86 vmlinux.ld.S merge +$ git commit -v -a +Recorded resolution for 'mm/slob.c'. +[master 7b9c913] 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.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 | 32 + + 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 +- + 21 files changed, 2052 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 +Removing arch/x86/power/cpu_32.c +Merge made by recursive. + arch/x86/kernel/acpi/sleep.c | 2 +- + arch/x86/power/Makefile | 2 +- + arch/x86/power/{cpu_64.c => cpu.c} | 165 +++++++++++++++++++++++++++--------- + arch/x86/power/cpu_32.c | 148 -------------------------------- + drivers/base/sys.c | 16 ++++ + 5 files changed, 143 insertions(+), 190 deletions(-) + rename arch/x86/power/{cpu_64.c => cpu.c} (62%) + delete mode 100644 arch/x86/power/cpu_32.c +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merging arch/um/drivers/ubd_kern.c +Auto-merging drivers/base/firmware_class.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/ide/ide-pm.c +Auto-merging drivers/infiniband/hw/ehca/ehca_main.c +Auto-merging drivers/net/ehea/ehea_main.c +Auto-merging drivers/net/ibmveth.c +Auto-merging drivers/net/sb1250-mac.c +Auto-merging drivers/net/usb/hso.c +Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/regulator/wm8400-regulator.c +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Merge made by recursive. + Documentation/driver-model/device.txt | 32 +++++++++++++ + arch/mips/sni/eisa.c | 2 +- + arch/um/drivers/net_kern.c | 4 +- + arch/um/drivers/ubd_kern.c | 4 +- + drivers/base/dd.c | 4 ++ + drivers/base/firmware_class.c | 8 ++- + drivers/base/platform.c | 5 +- + drivers/block/xen-blkfront.c | 14 +++--- + drivers/char/hvcs.c | 6 +- + drivers/char/ipmi/ipmi_si_intf.c | 4 +- + drivers/eisa/pci_eisa.c | 2 +- + drivers/eisa/virtual_root.c | 2 +- + drivers/firewire/fw-sbp2.c | 6 +- + drivers/ide/ide-pm.c | 6 ++- + drivers/ide/ide-probe.c | 4 +- + drivers/ide/ide_platform.c | 2 +- + drivers/ieee1394/eth1394.c | 16 +++---- + drivers/ieee1394/sbp2.c | 8 ++-- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/hw/ehca/ehca_main.c | 8 ++-- + drivers/input/xen-kbdfront.c | 8 ++-- + drivers/media/dvb/firewire/firedtv-1394.c | 4 +- + drivers/media/dvb/firewire/firedtv-dvb.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 22 ++++---- + drivers/net/xen-netfront.c | 10 ++-- + drivers/parisc/eisa.c | 2 +- + drivers/parisc/sba_iommu.c | 6 +- + drivers/parport/parport_gsc.c | 4 +- + drivers/pcmcia/ds.c | 8 ++-- + drivers/s390/char/con3215.c | 16 +++--- + drivers/s390/char/raw3270.c | 16 +++--- + drivers/s390/char/tape_34xx.c | 2 +- + drivers/s390/char/tape_3590.c | 2 +- + drivers/s390/char/tape_core.c | 22 ++++---- + drivers/s390/char/vmlogrdr.c | 12 ++-- + drivers/s390/char/vmur.c | 16 +++--- + drivers/s390/net/claw.c | 52 ++++++++++---------- + drivers/s390/net/lcs.c | 20 ++++---- + drivers/s390/net/lcs.h | 2 +- + drivers/s390/net/netiucv.c | 47 ++++++++++--------- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +- + drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- + drivers/scsi/libsrp.c | 2 +- + drivers/serial/of_serial.c | 4 +- + drivers/thermal/thermal_sys.c | 4 +- + drivers/usb/gadget/at91_udc.c | 6 +- + drivers/video/xen-fbfront.c | 8 ++-- + fs/debugfs/inode.c | 11 ++++ + fs/sysfs/symlink.c | 5 ++- + include/linux/device.h | 2 + + include/linux/eisa.h | 4 +- + include/linux/platform_device.h | 4 +- + include/linux/sched.h | 2 +- + init/Kconfig | 6 +- + kernel/user.c | 67 +++++++++++++++----------- + sound/aoa/fabrics/layout.c | 8 ++-- + sound/aoa/soundbus/i2sbus/core.c | 8 ++-- + sound/soc/codecs/wm8400.c | 4 +- + sound/soc/codecs/wm8731.c | 4 +- + sound/soc/codecs/wm8753.c | 4 +- + 61 files changed, 321 insertions(+), 254 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Resolved 'drivers/usb/serial/sierra.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/garmin_gps.c +Auto-merging drivers/usb/serial/mos7840.c +Auto-merging drivers/usb/serial/option.c +Auto-merging drivers/usb/serial/sierra.c +CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c +Auto-merging include/linux/nls.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0212731] Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 + + drivers/pci/pci.c | 5 + + drivers/usb/Kconfig | 1 + + drivers/usb/Makefile | 1 + + drivers/usb/core/Kconfig | 16 +- + drivers/usb/core/Makefile | 4 +- + drivers/usb/core/config.c | 192 ++++- + drivers/usb/core/driver.c | 21 +- + drivers/usb/core/hcd-pci.c | 244 +++--- + drivers/usb/core/hcd.c | 203 ++++- + drivers/usb/core/hcd.h | 55 +- + drivers/usb/core/hub.c | 134 +++- + drivers/usb/core/hub.h | 3 + + drivers/usb/core/message.c | 194 +++-- + drivers/usb/core/sysfs.c | 12 +- + drivers/usb/core/urb.c | 12 + + drivers/usb/core/usb.c | 65 ++- + drivers/usb/core/usb.h | 2 - + drivers/usb/gadget/Kconfig | 2 +- + drivers/usb/gadget/at91_udc.c | 4 +- + drivers/usb/gadget/atmel_usba_udc.c | 4 +- + drivers/usb/gadget/ci13xxx_udc.c | 6 +- + drivers/usb/gadget/file_storage.c | 93 +-- + drivers/usb/gadget/goku_udc.c | 6 +- + drivers/usb/gadget/inode.c | 14 +- + drivers/usb/gadget/pxa27x_udc.c | 71 ++- + drivers/usb/gadget/pxa27x_udc.h | 2 + + drivers/usb/host/Kconfig | 20 + + drivers/usb/host/Makefile | 2 + + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-hub.c | 4 +- + drivers/usb/host/ehci-orion.c | 2 +- + drivers/usb/host/ehci-pci.c | 26 +- + drivers/usb/host/fhci-dbg.c | 2 +- + drivers/usb/host/hwa-hc.c | 21 - + drivers/usb/host/ohci-dbg.c | 31 +- + drivers/usb/host/ohci-hcd.c | 38 +- + drivers/usb/host/ohci-pci.c | 24 +- + drivers/usb/host/pci-quirks.c | 123 +++ + drivers/usb/host/r8a66597-hcd.c | 2 +- + drivers/usb/host/uhci-hcd.c | 23 +- + drivers/usb/host/uhci-q.c | 2 +- + drivers/usb/host/xhci-dbg.c | 485 ++++++++++ + drivers/usb/host/xhci-ext-caps.h | 145 +++ + drivers/usb/host/xhci-hcd.c | 1256 ++++++++++++++++++++++++++ + drivers/usb/host/xhci-hub.c | 308 +++++++ + drivers/usb/host/xhci-mem.c | 768 ++++++++++++++++ + drivers/usb/host/xhci-pci.c | 166 ++++ + drivers/usb/host/xhci-ring.c | 1649 +++++++++++++++++++++++++++++++++++ + drivers/usb/host/xhci.h | 1155 ++++++++++++++++++++++++ + drivers/usb/mon/mon_text.c | 2 +- + drivers/usb/musb/Kconfig | 2 + + drivers/usb/musb/blackfin.c | 11 +- + drivers/usb/musb/cppi_dma.c | 34 +- + drivers/usb/musb/cppi_dma.h | 6 +- + drivers/usb/musb/davinci.c | 54 +- + drivers/usb/musb/musb_core.c | 228 +++--- + drivers/usb/musb/musb_core.h | 22 +- + drivers/usb/musb/musb_gadget.c | 45 +- + drivers/usb/musb/musb_gadget_ep0.c | 45 +- + drivers/usb/musb/musb_host.c | 273 +++---- + drivers/usb/musb/musb_host.h | 1 + + drivers/usb/musb/musb_virthub.c | 35 +- + drivers/usb/musb/omap2430.c | 64 +- + drivers/usb/musb/tusb6010.c | 70 +- + drivers/usb/otg/nop-usb-xceiv.c | 25 +- + drivers/usb/otg/twl4030-usb.c | 28 +- + drivers/usb/serial/ftdi_sio.c | 146 +++- + drivers/usb/serial/ftdi_sio.h | 10 +- + drivers/usb/serial/garmin_gps.c | 198 ++--- + drivers/usb/serial/mos7840.c | 318 ++++---- + drivers/usb/serial/option.c | 19 +- + drivers/usb/serial/sierra.c | 134 ++-- + drivers/usb/storage/initializers.c | 14 +- + drivers/usb/storage/option_ms.c | 3 +- + drivers/usb/storage/unusual_devs.h | 2 +- + fs/befs/linuxvfs.c | 20 +- + fs/fat/dir.c | 29 +- + fs/fat/namei_vfat.c | 4 +- + fs/isofs/joliet.c | 36 +- + fs/ncpfs/ncplib_kernel.c | 8 +- + fs/nls/nls_base.c | 166 +++-- + fs/nls/nls_utf8.c | 13 +- + include/linux/nls.h | 35 +- + include/linux/pci.h | 8 + + include/linux/pci_ids.h | 1 + + include/linux/usb.h | 34 +- + include/linux/usb/ch9.h | 17 + + include/linux/usb/composite.h | 3 + + include/linux/usb/otg.h | 4 +- + 90 files changed, 8355 insertions(+), 1438 deletions(-) + create mode 100644 drivers/usb/host/xhci-dbg.c + create mode 100644 drivers/usb/host/xhci-ext-caps.h + create mode 100644 drivers/usb/host/xhci-hcd.c + create mode 100644 drivers/usb/host/xhci-hub.c + create mode 100644 drivers/usb/host/xhci-mem.c + create mode 100644 drivers/usb/host/xhci-pci.c + create mode 100644 drivers/usb/host/xhci-ring.c + create mode 100644 drivers/usb/host/xhci.h +Merging quilt/staging +$ git merge quilt/staging +Resolved 'drivers/staging/rt2860/common/mlme.c' using previous resolution. +Resolved 'drivers/staging/rt2870/common/mlme.c' using previous resolution. +Resolved 'drivers/staging/rt3070/common/mlme.c' using previous resolution. +Removing drivers/staging/comedi/comedi_rt.h +Removing drivers/staging/comedi/drivers/comedi_rt_timer.c +Removing drivers/staging/comedi/interrupt.h +Removing drivers/staging/comedi/rt.c +Removing drivers/staging/comedi/rt_pend_tq.c +Removing drivers/staging/comedi/rt_pend_tq.h +Auto-merging drivers/staging/rt2860/common/mlme.c +CONFLICT (content): Merge conflict in drivers/staging/rt2860/common/mlme.c +Removing drivers/staging/rt2860/common/netif_block.c +Removing drivers/staging/rt2860/common/netif_block.h +Removing drivers/staging/rt2860/leap.h +Removing drivers/staging/rt2860/rt_ate.c +Removing drivers/staging/rt2860/rt_ate.h +Removing drivers/staging/rt2860/sta/dls.c +Auto-merging drivers/staging/rt2870/common/mlme.c +CONFLICT (content): Merge conflict in drivers/staging/rt2870/common/mlme.c +Removing drivers/staging/rt2870/common/netif_block.c +Removing drivers/staging/rt2870/leap.h +Removing drivers/staging/rt2870/netif_block.h +Removing drivers/staging/rt2870/rt_ate.c +Removing drivers/staging/rt2870/rt_ate.h +Removing drivers/staging/rt2870/sta/dls.c +Removing drivers/staging/rt2870/sta_ioctl.c.patch +Removing drivers/staging/rt2870/tmp60 +Removing drivers/staging/rt2870/tmp61 +Auto-merging drivers/staging/rt3070/common/mlme.c +CONFLICT (content): Merge conflict in drivers/staging/rt3070/common/mlme.c +Removing drivers/staging/rt3070/common/netif_block.c +Removing drivers/staging/rt3070/leap.h +Removing drivers/staging/rt3070/netif_block.h +Removing drivers/staging/rt3070/rt_ate.c +Removing drivers/staging/rt3070/rt_ate.h +Removing drivers/staging/rt3070/sta/dls.c +Removing drivers/staging/winbond/wbhal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3e4633f] Merge branch 'quilt/staging' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/agnx/debug.h | 9 +- + drivers/staging/agnx/pci.c | 64 +- + drivers/staging/agnx/phy.c | 4 +- + drivers/staging/agnx/phy.h | 2 +- + drivers/staging/agnx/sta.c | 2 +- + drivers/staging/agnx/sta.h | 2 +- + drivers/staging/altpciechdma/altpciechdma.c | 18 +- + drivers/staging/b3dfg/b3dfg.c | 1 - + drivers/staging/comedi/Kconfig | 9 +- + drivers/staging/comedi/Makefile | 5 - + drivers/staging/comedi/TODO | 1 - + drivers/staging/comedi/comedi.h | 1 - + drivers/staging/comedi/comedi_fops.c | 504 +- + drivers/staging/comedi/comedi_ksyms.c | 7 - + drivers/staging/comedi/comedi_rt.h | 149 - + drivers/staging/comedi/comedidev.h | 15 +- + drivers/staging/comedi/drivers.c | 19 +- + drivers/staging/comedi/drivers/8253.h | 50 +- + drivers/staging/comedi/drivers/8255.c | 23 +- + drivers/staging/comedi/drivers/8255.h | 14 +- + drivers/staging/comedi/drivers/Makefile | 4 +- + drivers/staging/comedi/drivers/acl7225b.c | 22 +- + .../comedi/drivers/addi-data/APCI1710_82x54.c | 372 +- + .../comedi/drivers/addi-data/APCI1710_82x54.h | 32 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 402 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.h | 36 +- + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 309 +- + .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 1012 ++-- + .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 188 +- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 204 +- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 1314 ++-- + .../comedi/drivers/addi-data/APCI1710_Pwm.h | 70 +- + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 230 +- + .../comedi/drivers/addi-data/APCI1710_Ssi.h | 6 +- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 432 +- + .../comedi/drivers/addi-data/APCI1710_Tor.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 198 +- + .../comedi/drivers/addi-data/APCI1710_Ttl.h | 8 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 119 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.h | 6 +- + .../comedi/drivers/addi-data/addi_amcc_s5933.h | 12 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 191 +- + .../staging/comedi/drivers/addi-data/addi_common.h | 356 +- + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 438 +- + .../comedi/drivers/addi-data/amcc_s5933_58.h | 43 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 169 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci035.c | 214 +- + .../comedi/drivers/addi-data/hwdrv_apci035.h | 34 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 106 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.h | 29 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 532 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.h | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 174 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.h | 29 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 507 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.h | 52 +- + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 134 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 136 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.h | 26 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 176 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.h | 32 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 174 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.h | 26 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 1055 ++-- + .../comedi/drivers/addi-data/hwdrv_apci3120.h | 142 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 1701 ++-- + .../comedi/drivers/addi-data/hwdrv_apci3200.h | 176 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 225 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.h | 44 +- + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 274 +- + drivers/staging/comedi/drivers/addi_apci_035.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 177 +- + drivers/staging/comedi/drivers/adl_pci7296.c | 22 +- + drivers/staging/comedi/drivers/adl_pci7432.c | 32 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 325 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 135 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 648 +- + drivers/staging/comedi/drivers/adq12b.c | 82 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 348 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 122 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 112 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 46 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 44 +- + drivers/staging/comedi/drivers/am9513.h | 16 +- + drivers/staging/comedi/drivers/amcc_s5933.h | 10 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 226 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 138 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 82 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 131 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 306 +- + drivers/staging/comedi/drivers/c6xdigio.c | 140 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 160 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 840 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 1755 ++-- + drivers/staging/comedi/drivers/cb_pcidda.c | 323 +- + drivers/staging/comedi/drivers/cb_pcidio.c | 75 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 187 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 71 +- + drivers/staging/comedi/drivers/comedi_bond.c | 2 +- + drivers/staging/comedi/drivers/comedi_fc.c | 2 +- + drivers/staging/comedi/drivers/comedi_parport.c | 9 +- + drivers/staging/comedi/drivers/comedi_rt_timer.c | 728 -- + drivers/staging/comedi/drivers/comedi_test.c | 2 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 46 +- + drivers/staging/comedi/drivers/daqboard2000.c | 230 +- + drivers/staging/comedi/drivers/das08.c | 542 +- + drivers/staging/comedi/drivers/das08.h | 24 +- + drivers/staging/comedi/drivers/das08_cs.c | 65 +- + drivers/staging/comedi/drivers/das16.c | 816 +- + drivers/staging/comedi/drivers/das16m1.c | 152 +- + drivers/staging/comedi/drivers/das1800.c | 689 +- + drivers/staging/comedi/drivers/das6402.c | 47 +- + drivers/staging/comedi/drivers/das800.c | 213 +- + drivers/staging/comedi/drivers/dmm32at.c | 128 +- + drivers/staging/comedi/drivers/dt2801.c | 214 +- + drivers/staging/comedi/drivers/dt2811.c | 92 +- + drivers/staging/comedi/drivers/dt2814.c | 48 +- + drivers/staging/comedi/drivers/dt2815.c | 36 +- + drivers/staging/comedi/drivers/dt2817.c | 27 +- + drivers/staging/comedi/drivers/dt282x.c | 391 +- + drivers/staging/comedi/drivers/dt3000.c | 220 +- + drivers/staging/comedi/drivers/fl512.c | 42 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 234 +- + drivers/staging/comedi/drivers/icp_multi.c | 15 +- + drivers/staging/comedi/drivers/icp_multi.h | 12 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 83 +- + drivers/staging/comedi/drivers/jr3_pci.c | 211 +- + drivers/staging/comedi/drivers/jr3_pci.h | 8 +- + drivers/staging/comedi/drivers/ke_counter.c | 47 +- + drivers/staging/comedi/drivers/me4000.c | 9 +- + drivers/staging/comedi/drivers/me_daq.c | 1 + + drivers/staging/comedi/drivers/mite.c | 28 +- + drivers/staging/comedi/drivers/mite.h | 2 +- + drivers/staging/comedi/drivers/mpc624.c | 218 +- + drivers/staging/comedi/drivers/mpc8260cpm.c | 32 +- + drivers/staging/comedi/drivers/multiq3.c | 43 +- + drivers/staging/comedi/drivers/ni_6527.c | 73 +- + drivers/staging/comedi/drivers/ni_65xx.c | 251 +- + drivers/staging/comedi/drivers/ni_660x.c | 232 +- + drivers/staging/comedi/drivers/ni_670x.c | 84 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 275 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 90 +- + drivers/staging/comedi/drivers/ni_atmio.c | 327 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 117 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 113 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 110 +- + drivers/staging/comedi/drivers/ni_labpc.c | 693 +- + drivers/staging/comedi/drivers/ni_labpc.h | 50 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 105 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 970 ++-- + drivers/staging/comedi/drivers/ni_mio_cs.c | 256 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 188 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 139 +- + drivers/staging/comedi/drivers/ni_stc.h | 148 +- + drivers/staging/comedi/drivers/ni_tio.c | 18 +- + drivers/staging/comedi/drivers/ni_tio.h | 18 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 40 +- + drivers/staging/comedi/drivers/pcl711.c | 68 +- + drivers/staging/comedi/drivers/pcl724.c | 54 +- + drivers/staging/comedi/drivers/pcl725.c | 24 +- + drivers/staging/comedi/drivers/pcl726.c | 72 +- + drivers/staging/comedi/drivers/pcl730.c | 34 +- + drivers/staging/comedi/drivers/pcl812.c | 320 +- + drivers/staging/comedi/drivers/pcl816.c | 417 +- + drivers/staging/comedi/drivers/pcl818.c | 574 +- + drivers/staging/comedi/drivers/pcm3724.c | 67 +- + drivers/staging/comedi/drivers/pcm3730.c | 28 +- + drivers/staging/comedi/drivers/pcmad.c | 42 +- + drivers/staging/comedi/drivers/pcmda12.c | 46 +- + drivers/staging/comedi/drivers/pcmmio.c | 163 +- + drivers/staging/comedi/drivers/pcmuio.c | 137 +- + drivers/staging/comedi/drivers/plx9080.h | 8 +- + drivers/staging/comedi/drivers/poc.c | 104 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 79 +- + drivers/staging/comedi/drivers/rtd520.c | 78 +- + drivers/staging/comedi/drivers/rti800.c | 77 +- + drivers/staging/comedi/drivers/rti802.c | 24 +- + drivers/staging/comedi/drivers/s526.c | 386 +- + drivers/staging/comedi/drivers/s626.c | 282 +- + drivers/staging/comedi/drivers/s626.h | 2 +- + drivers/staging/comedi/drivers/serial2002.c | 100 +- + drivers/staging/comedi/drivers/skel.c | 90 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 49 +- + drivers/staging/comedi/drivers/unioxx5.c | 86 +- + drivers/staging/comedi/drivers/usbdux.c | 166 +- + drivers/staging/comedi/drivers/usbduxfast.c | 202 +- + drivers/staging/comedi/drivers/vmk80xx.c | 1116 +++ + drivers/staging/comedi/interrupt.h | 51 - + drivers/staging/comedi/kcomedilib/data.c | 4 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 33 +- + drivers/staging/comedi/kcomedilib/ksyms.c | 49 +- + drivers/staging/comedi/range.c | 9 +- + drivers/staging/comedi/rt.c | 411 - + drivers/staging/comedi/rt_pend_tq.c | 113 - + drivers/staging/comedi/rt_pend_tq.h | 10 - + drivers/staging/frontier/alphatrack.c | 1 - + drivers/staging/frontier/tranzport.c | 1 - + drivers/staging/heci/heci.h | 1 - + drivers/staging/heci/heci_data_structures.h | 1 - + drivers/staging/heci/heci_interface.h | 1 - + drivers/staging/meilhaus/me0600_ext_irq.c | 1 - + drivers/staging/meilhaus/me0900_di.c | 1 - + drivers/staging/meilhaus/me1400_device.c | 1 - + drivers/staging/meilhaus/me1400_ext_irq.c | 1 - + drivers/staging/meilhaus/me4600_ai.h | 1 - + drivers/staging/meilhaus/me4600_ext_irq.c | 1 - + drivers/staging/meilhaus/me6000_ao.h | 1 - + drivers/staging/meilhaus/me8100_di.c | 1 - + drivers/staging/meilhaus/me8200_di.c | 1 - + drivers/staging/meilhaus/me8200_do.c | 1 - + drivers/staging/meilhaus/memain.c | 182 +- + drivers/staging/meilhaus/memain.h | 194 - + drivers/staging/otus/80211core/ccmd.c | 2982 +++---- + drivers/staging/pohmelfs/crypto.c | 3 +- + drivers/staging/pohmelfs/dir.c | 9 +- + drivers/staging/pohmelfs/inode.c | 15 +- + drivers/staging/pohmelfs/net.c | 7 +- + drivers/staging/pohmelfs/netfs.h | 65 +- + drivers/staging/pohmelfs/trans.c | 7 +- + drivers/staging/rspiusb/rspiusb.c | 14 +- + drivers/staging/rt2860/2860_main_dev.c | 41 +- + drivers/staging/rt2860/Makefile | 5 +- + drivers/staging/rt2860/ap.h | 40 +- + drivers/staging/rt2860/chlist.h | 56 +- + drivers/staging/rt2860/common/2860_rtmp_init.c | 25 - + drivers/staging/rt2860/common/action.c | 444 +- + drivers/staging/rt2860/common/action.h | 7 - + drivers/staging/rt2860/common/ba_action.c | 179 +- + drivers/staging/rt2860/common/cmm_data.c | 647 +- + drivers/staging/rt2860/common/cmm_data_2860.c | 105 +- + drivers/staging/rt2860/common/cmm_info.c | 273 +- + drivers/staging/rt2860/common/cmm_sanity.c | 401 +- + drivers/staging/rt2860/common/cmm_sync.c | 113 +- + drivers/staging/rt2860/common/cmm_wpa.c | 28 +- + drivers/staging/rt2860/common/dfs.c | 21 - + drivers/staging/rt2860/common/eeprom.c | 1268 +++- + drivers/staging/rt2860/common/md5.c | 12 - + drivers/staging/rt2860/common/mlme.c | 1888 +++-- + drivers/staging/rt2860/common/netif_block.c | 144 - + drivers/staging/rt2860/common/netif_block.h | 58 - + drivers/staging/rt2860/common/rtmp_init.c | 1251 ++- + drivers/staging/rt2860/common/rtmp_tkip.c | 21 - + drivers/staging/rt2860/common/rtmp_wep.c | 2 - + drivers/staging/rt2860/common/spectrum.c | 57 +- + drivers/staging/rt2860/leap.h | 215 - + drivers/staging/rt2860/mlme.h | 309 - + drivers/staging/rt2860/oid.h | 173 +- + drivers/staging/rt2860/rt28xx.h | 1218 +--- + drivers/staging/rt2860/rt_ate.c | 6009 ------------- + drivers/staging/rt2860/rt_ate.h | 347 - + drivers/staging/rt2860/rt_config.h | 33 +- + drivers/staging/rt2860/rt_linux.c | 45 +- + drivers/staging/rt2860/rt_linux.h | 188 +- + drivers/staging/rt2860/rt_main_dev.c | 717 +-- + drivers/staging/rt2860/rt_profile.c | 161 +- + drivers/staging/rt2860/rtmp.h | 1831 ++-- + drivers/staging/rt2860/rtmp_def.h | 210 +- + drivers/staging/rt2860/spectrum.h | 30 - + drivers/staging/rt2860/sta/assoc.c | 586 +- + drivers/staging/rt2860/sta/auth.c | 14 - + drivers/staging/rt2860/sta/auth_rsp.c | 19 - + drivers/staging/rt2860/sta/connect.c | 602 +- + drivers/staging/rt2860/sta/dls.c | 2197 ----- + drivers/staging/rt2860/sta/rtmp_data.c | 336 +- + drivers/staging/rt2860/sta/sanity.c | 2 - + drivers/staging/rt2860/sta/sync.c | 290 +- + drivers/staging/rt2860/sta/wpa.c | 12 +- + drivers/staging/rt2860/sta_ioctl.c | 1236 ++-- + drivers/staging/rt2860/wpa.h | 31 +- + drivers/staging/rt2870/2870_main_dev.c | 264 +- + drivers/staging/rt2870/Makefile | 4 - + drivers/staging/rt2870/aironet.h | 211 +- + drivers/staging/rt2870/ap.h | 563 +-- + drivers/staging/rt2870/chlist.h | 1297 +--- + drivers/staging/rt2870/common/2870_rtmp_init.c | 117 +- + drivers/staging/rt2870/common/action.c | 1047 +--- + drivers/staging/rt2870/common/action.h | 69 +- + drivers/staging/rt2870/common/ba_action.c | 1799 +---- + drivers/staging/rt2870/common/cmm_data.c | 2732 +------ + drivers/staging/rt2870/common/cmm_data_2870.c | 73 +- + drivers/staging/rt2870/common/cmm_info.c | 3713 +-------- + drivers/staging/rt2870/common/cmm_sanity.c | 1664 +---- + drivers/staging/rt2870/common/cmm_sync.c | 712 +-- + drivers/staging/rt2870/common/cmm_wpa.c | 1655 +---- + drivers/staging/rt2870/common/dfs.c | 454 +- + drivers/staging/rt2870/common/eeprom.c | 255 +- + drivers/staging/rt2870/common/md5.c | 1428 +--- + drivers/staging/rt2870/common/mlme.c | 8610 +------------------ + drivers/staging/rt2870/common/netif_block.c | 144 - + drivers/staging/rt2870/common/rtmp_init.c | 4133 +--------- + drivers/staging/rt2870/common/rtmp_tkip.c | 1614 +---- + drivers/staging/rt2870/common/rtmp_wep.c | 509 +-- + drivers/staging/rt2870/common/rtusb_bulk.c | 775 +-- + drivers/staging/rt2870/common/rtusb_data.c | 13 - + drivers/staging/rt2870/common/rtusb_io.c | 211 +- + drivers/staging/rt2870/common/spectrum.c | 1877 +---- + drivers/staging/rt2870/dfs.h | 101 +- + drivers/staging/rt2870/leap.h | 215 - + drivers/staging/rt2870/link_list.h | 135 +- + drivers/staging/rt2870/md5.h | 108 +- + drivers/staging/rt2870/mlme.h | 1472 +---- + drivers/staging/rt2870/netif_block.h | 58 - + drivers/staging/rt2870/oid.h | 1092 +--- + drivers/staging/rt2870/rt2870.h | 253 +- + drivers/staging/rt2870/rt28xx.h | 2690 +------ + drivers/staging/rt2870/rt_ate.c | 6452 -------------- + drivers/staging/rt2870/rt_ate.h | 315 - + drivers/staging/rt2870/rt_config.h | 105 +- + drivers/staging/rt2870/rt_linux.c | 1096 +--- + drivers/staging/rt2870/rt_linux.h | 907 +-- + drivers/staging/rt2870/rt_main_dev.c | 1866 +---- + drivers/staging/rt2870/rt_profile.c | 2021 +----- + drivers/staging/rt2870/rtmp.h | 7587 +---------------- + drivers/staging/rt2870/rtmp_ckipmic.h | 114 +- + drivers/staging/rt2870/rtmp_def.h | 1623 +---- + drivers/staging/rt2870/rtmp_type.h | 95 +- + drivers/staging/rt2870/spectrum.h | 323 +- + drivers/staging/rt2870/spectrum_def.h | 96 +- + drivers/staging/rt2870/sta/aironet.c | 1313 +--- + drivers/staging/rt2870/sta/assoc.c | 2040 +----- + drivers/staging/rt2870/sta/auth.c | 475 +- + drivers/staging/rt2870/sta/auth_rsp.c | 167 +- + drivers/staging/rt2870/sta/connect.c | 2823 +------ + drivers/staging/rt2870/sta/dls.c | 2210 ----- + drivers/staging/rt2870/sta/rtmp_data.c | 2620 +------ + drivers/staging/rt2870/sta/sanity.c | 421 +- + drivers/staging/rt2870/sta/sync.c | 1754 +---- + drivers/staging/rt2870/sta/wpa.c | 2108 +----- + drivers/staging/rt2870/sta_ioctl.c | 7069 +--------------- + drivers/staging/rt2870/sta_ioctl.c.patch | 18 - + drivers/staging/rt2870/tmp60 | 7037 --------------- + drivers/staging/rt2870/tmp61 | 7037 --------------- + drivers/staging/rt2870/wpa.h | 358 +- + drivers/staging/rt3070/2870_main_dev.c | 1628 +---- + drivers/staging/rt3070/Makefile | 4 - + drivers/staging/rt3070/action.h | 69 +- + drivers/staging/rt3070/aironet.h | 211 +- + drivers/staging/rt3070/ap.h | 558 +-- + drivers/staging/rt3070/chlist.h | 1254 +--- + drivers/staging/rt3070/common/2870_rtmp_init.c | 1763 +---- + drivers/staging/rt3070/common/action.c | 1039 +--- + drivers/staging/rt3070/common/ba_action.c | 1811 +---- + drivers/staging/rt3070/common/cmm_data.c | 2828 +------ + drivers/staging/rt3070/common/cmm_data_2870.c | 981 +--- + drivers/staging/rt3070/common/cmm_info.c | 3396 +-------- + drivers/staging/rt3070/common/cmm_sanity.c | 1670 +---- + drivers/staging/rt3070/common/cmm_sync.c | 712 +-- + drivers/staging/rt3070/common/cmm_wpa.c | 1607 +---- + drivers/staging/rt3070/common/dfs.c | 442 +- + drivers/staging/rt3070/common/eeprom.c | 1499 +---- + drivers/staging/rt3070/common/md5.c | 1428 +--- + drivers/staging/rt3070/common/mlme.c | 9137 +------------------- + drivers/staging/rt3070/common/netif_block.c | 136 - + drivers/staging/rt3070/common/rtmp_init.c | 4198 +--------- + drivers/staging/rt3070/common/rtmp_tkip.c | 1614 +---- + drivers/staging/rt3070/common/rtmp_wep.c | 509 +-- + drivers/staging/rt3070/common/rtusb_bulk.c | 1383 +--- + drivers/staging/rt3070/common/rtusb_data.c | 219 +- + drivers/staging/rt3070/common/rtusb_io.c | 1909 +---- + drivers/staging/rt3070/common/spectrum.c | 1877 +---- + drivers/staging/rt3070/dfs.h | 101 +- + drivers/staging/rt3070/leap.h | 215 - + drivers/staging/rt3070/link_list.h | 135 +- + drivers/staging/rt3070/md5.h | 108 +- + drivers/staging/rt3070/mlme.h | 1469 +---- + drivers/staging/rt3070/netif_block.h | 58 - + drivers/staging/rt3070/oid.h | 1143 +--- + drivers/staging/rt3070/rt2870.h | 757 +-- + drivers/staging/rt3070/rt28xx.h | 2726 +------ + drivers/staging/rt3070/rt_ate.c | 6506 -------------- + drivers/staging/rt3070/rt_ate.h | 294 - + drivers/staging/rt3070/rt_config.h | 122 +- + drivers/staging/rt3070/rt_linux.c | 1064 +--- + drivers/staging/rt3070/rt_linux.h | 888 +-- + drivers/staging/rt3070/rt_main_dev.c | 1802 +---- + drivers/staging/rt3070/rt_profile.c | 2042 +----- + drivers/staging/rt3070/rtmp.h | 7729 +----------------- + drivers/staging/rt3070/rtmp_ckipmic.h | 114 +- + drivers/staging/rt3070/rtmp_def.h | 1560 +---- + drivers/staging/rt3070/rtmp_type.h | 96 +- + drivers/staging/rt3070/spectrum.h | 323 +- + drivers/staging/rt3070/spectrum_def.h | 96 +- + drivers/staging/rt3070/sta/aironet.c | 1313 +--- + drivers/staging/rt3070/sta/assoc.c | 2061 +----- + drivers/staging/rt3070/sta/auth.c | 476 +- + drivers/staging/rt3070/sta/auth_rsp.c | 168 +- + drivers/staging/rt3070/sta/connect.c | 2857 +------ + drivers/staging/rt3070/sta/dls.c | 2170 ----- + drivers/staging/rt3070/sta/rtmp_data.c | 2638 +------ + drivers/staging/rt3070/sta/sanity.c | 421 +- + drivers/staging/rt3070/sta/sync.c | 1756 +---- + drivers/staging/rt3070/sta/wpa.c | 2100 +----- + drivers/staging/rt3070/sta_ioctl.c | 7204 +--------------- + drivers/staging/rt3070/wpa.h | 357 +- + drivers/staging/rtl8187se/r8180.h | 2 +- + drivers/staging/rtl8187se/r8180_core.c | 46 +- + drivers/staging/rtl8187se/r8180_dm.c | 6 +- + drivers/staging/serqt_usb/serqt_usb.c | 1 - + drivers/staging/stlc45xx/stlc45xx.c | 39 +- + drivers/staging/sxg/sxg.c | 38 +- + drivers/staging/sxg/sxg_ethtool.c | 2 +- + drivers/staging/vt6655/80211hdr.h | 357 + + drivers/staging/vt6655/80211mgr.c | 1050 +++ + drivers/staging/vt6655/80211mgr.h | 832 ++ + drivers/staging/vt6655/IEEE11h.c | 324 + + drivers/staging/vt6655/IEEE11h.h | 68 + + drivers/staging/vt6655/Makefile | 218 + + drivers/staging/vt6655/Makefile.arm | 181 + + drivers/staging/vt6655/Makefile.x86 | 209 + + drivers/staging/vt6655/aes_ccmp.c | 410 + + drivers/staging/vt6655/aes_ccmp.h | 48 + + drivers/staging/vt6655/baseband.c | 2990 +++++++ + drivers/staging/vt6655/baseband.h | 198 + + drivers/staging/vt6655/bssdb.c | 1791 ++++ + drivers/staging/vt6655/bssdb.h | 380 + + drivers/staging/vt6655/card.c | 3126 +++++++ + drivers/staging/vt6655/card.h | 273 + + drivers/staging/vt6655/country.h | 192 + + drivers/staging/vt6655/datarate.c | 455 + + drivers/staging/vt6655/datarate.h | 95 + + drivers/staging/vt6655/desc.h | 697 ++ + drivers/staging/vt6655/device.h | 1063 +++ + drivers/staging/vt6655/device_cfg.h | 142 + + drivers/staging/vt6655/device_main.c | 4159 +++++++++ + drivers/staging/vt6655/dpc.c | 1688 ++++ + drivers/staging/vt6655/dpc.h | 75 + + drivers/staging/vt6655/hostap.c | 907 ++ + drivers/staging/vt6655/hostap.h | 94 + + drivers/staging/vt6655/iocmd.h | 481 + + drivers/staging/vt6655/ioctl.c | 775 ++ + drivers/staging/vt6655/ioctl.h | 74 + + drivers/staging/vt6655/iowpa.h | 159 + + drivers/staging/vt6655/iwctl.c | 2453 ++++++ + drivers/staging/vt6655/iwctl.h | 332 + + drivers/staging/vt6655/kcompat.h | 302 + + drivers/staging/vt6655/key.c | 836 ++ + drivers/staging/vt6655/key.h | 202 + + drivers/staging/vt6655/mac.c | 1752 ++++ + drivers/staging/vt6655/mac.h | 1166 +++ + drivers/staging/vt6655/mib.c | 616 ++ + drivers/staging/vt6655/mib.h | 399 + + drivers/staging/vt6655/michael.c | 188 + + drivers/staging/vt6655/michael.h | 62 + + drivers/staging/vt6655/power.c | 441 + + drivers/staging/vt6655/power.h | 85 + + drivers/staging/vt6655/rc4.c | 86 + + drivers/staging/vt6655/rc4.h | 51 + + drivers/staging/vt6655/rf.c | 1283 +++ + drivers/staging/vt6655/rf.h | 118 + + drivers/staging/vt6655/rxtx.c | 3269 +++++++ + drivers/staging/vt6655/rxtx.h | 132 + + drivers/staging/vt6655/srom.c | 437 + + drivers/staging/vt6655/srom.h | 179 + + drivers/staging/vt6655/tbit.h | 78 + + drivers/staging/vt6655/tcrc.c | 207 + + drivers/staging/vt6655/tcrc.h | 71 + + drivers/staging/vt6655/test | 9 + + drivers/staging/vt6655/tether.c | 123 + + drivers/staging/vt6655/tether.h | 256 + + drivers/staging/vt6655/tkip.c | 284 + + drivers/staging/vt6655/tkip.h | 76 + + drivers/staging/vt6655/tmacro.h | 152 + + drivers/staging/vt6655/tpci.h | 117 + + drivers/staging/vt6655/ttype.h | 386 + + drivers/staging/vt6655/umem.h | 75 + + drivers/staging/vt6655/upc.h | 171 + + drivers/staging/vt6655/vntconfiguration.dat | 1 + + drivers/staging/vt6655/vntwifi.c | 832 ++ + drivers/staging/vt6655/vntwifi.h | 330 + + drivers/staging/vt6655/wcmd.c | 1178 +++ + drivers/staging/vt6655/wcmd.h | 151 + + drivers/staging/vt6655/wctl.c | 261 + + drivers/staging/vt6655/wctl.h | 127 + + drivers/staging/vt6655/wmgr.c | 5100 +++++++++++ + drivers/staging/vt6655/wmgr.h | 521 ++ + drivers/staging/vt6655/wpa.c | 339 + + drivers/staging/vt6655/wpa.h | 98 + + drivers/staging/vt6655/wpa2.c | 373 + + drivers/staging/vt6655/wpa2.h | 100 + + drivers/staging/vt6655/wpactl.c | 1014 +++ + drivers/staging/vt6655/wpactl.c.bak | 995 +++ + drivers/staging/vt6655/wpactl.h | 89 + + drivers/staging/vt6655/wroute.c | 211 + + drivers/staging/vt6655/wroute.h | 65 + + drivers/staging/winbond/Makefile | 1 - + drivers/staging/winbond/mds.c | 2 +- + drivers/staging/winbond/mto.c | 2 +- + drivers/staging/winbond/phy_calibration.c | 19 + + drivers/staging/winbond/wbhal.c | 568 -- + drivers/staging/winbond/wbhal_f.h | 21 - + drivers/staging/winbond/wbhal_s.h | 1 - + drivers/staging/winbond/wbusb.c | 794 ++- + drivers/staging/wlan-ng/hfa384x.h | 244 + + drivers/staging/wlan-ng/hfa384x_usb.c | 1 - + drivers/staging/wlan-ng/p80211metadef.h | 48 + + drivers/staging/wlan-ng/p80211netdev.c | 15 - + drivers/staging/wlan-ng/p80211netdev.h | 3 - + drivers/staging/wlan-ng/p80211wep.c | 1 - + drivers/staging/wlan-ng/prism2fw.c | 1410 +++ + drivers/staging/wlan-ng/prism2mib.c | 1 - + drivers/staging/wlan-ng/prism2usb.c | 9 +- + 505 files changed, 80252 insertions(+), 236219 deletions(-) + delete mode 100644 drivers/staging/comedi/comedi_rt.h + delete mode 100644 drivers/staging/comedi/drivers/comedi_rt_timer.c + create mode 100644 drivers/staging/comedi/drivers/vmk80xx.c + delete mode 100644 drivers/staging/comedi/interrupt.h + delete mode 100644 drivers/staging/comedi/rt.c + delete mode 100644 drivers/staging/comedi/rt_pend_tq.c + delete mode 100644 drivers/staging/comedi/rt_pend_tq.h + delete mode 100644 drivers/staging/rt2860/common/netif_block.c + delete mode 100644 drivers/staging/rt2860/common/netif_block.h + delete mode 100644 drivers/staging/rt2860/leap.h + delete mode 100644 drivers/staging/rt2860/rt_ate.c + delete mode 100644 drivers/staging/rt2860/rt_ate.h + delete mode 100644 drivers/staging/rt2860/sta/dls.c + delete mode 100644 drivers/staging/rt2870/common/netif_block.c + delete mode 100644 drivers/staging/rt2870/leap.h + delete mode 100644 drivers/staging/rt2870/netif_block.h + delete mode 100644 drivers/staging/rt2870/rt_ate.c + delete mode 100644 drivers/staging/rt2870/rt_ate.h + delete mode 100644 drivers/staging/rt2870/sta/dls.c + delete mode 100644 drivers/staging/rt2870/sta_ioctl.c.patch + delete mode 100644 drivers/staging/rt2870/tmp60 + delete mode 100644 drivers/staging/rt2870/tmp61 + delete mode 100644 drivers/staging/rt3070/common/netif_block.c + delete mode 100644 drivers/staging/rt3070/leap.h + delete mode 100644 drivers/staging/rt3070/netif_block.h + delete mode 100644 drivers/staging/rt3070/rt_ate.c + delete mode 100644 drivers/staging/rt3070/rt_ate.h + delete mode 100644 drivers/staging/rt3070/sta/dls.c + create mode 100644 drivers/staging/vt6655/80211hdr.h + create mode 100644 drivers/staging/vt6655/80211mgr.c + create mode 100644 drivers/staging/vt6655/80211mgr.h + create mode 100644 drivers/staging/vt6655/IEEE11h.c + create mode 100644 drivers/staging/vt6655/IEEE11h.h + create mode 100644 drivers/staging/vt6655/Makefile + create mode 100644 drivers/staging/vt6655/Makefile.arm + create mode 100644 drivers/staging/vt6655/Makefile.x86 + create mode 100644 drivers/staging/vt6655/aes_ccmp.c + create mode 100644 drivers/staging/vt6655/aes_ccmp.h + create mode 100644 drivers/staging/vt6655/baseband.c + create mode 100644 drivers/staging/vt6655/baseband.h + create mode 100644 drivers/staging/vt6655/bssdb.c + create mode 100644 drivers/staging/vt6655/bssdb.h + create mode 100644 drivers/staging/vt6655/card.c + create mode 100644 drivers/staging/vt6655/card.h + create mode 100644 drivers/staging/vt6655/country.h + create mode 100644 drivers/staging/vt6655/datarate.c + create mode 100644 drivers/staging/vt6655/datarate.h + create mode 100644 drivers/staging/vt6655/desc.h + create mode 100644 drivers/staging/vt6655/device.h + create mode 100644 drivers/staging/vt6655/device_cfg.h + create mode 100644 drivers/staging/vt6655/device_main.c + create mode 100644 drivers/staging/vt6655/dpc.c + create mode 100644 drivers/staging/vt6655/dpc.h + create mode 100644 drivers/staging/vt6655/hostap.c + create mode 100644 drivers/staging/vt6655/hostap.h + create mode 100644 drivers/staging/vt6655/iocmd.h + create mode 100644 drivers/staging/vt6655/ioctl.c + create mode 100644 drivers/staging/vt6655/ioctl.h + create mode 100644 drivers/staging/vt6655/iowpa.h + create mode 100644 drivers/staging/vt6655/iwctl.c + create mode 100644 drivers/staging/vt6655/iwctl.h + create mode 100644 drivers/staging/vt6655/kcompat.h + create mode 100644 drivers/staging/vt6655/key.c + create mode 100644 drivers/staging/vt6655/key.h + create mode 100644 drivers/staging/vt6655/mac.c + create mode 100644 drivers/staging/vt6655/mac.h + create mode 100644 drivers/staging/vt6655/mib.c + create mode 100644 drivers/staging/vt6655/mib.h + create mode 100644 drivers/staging/vt6655/michael.c + create mode 100644 drivers/staging/vt6655/michael.h + create mode 100644 drivers/staging/vt6655/power.c + create mode 100644 drivers/staging/vt6655/power.h + create mode 100644 drivers/staging/vt6655/rc4.c + create mode 100644 drivers/staging/vt6655/rc4.h + create mode 100644 drivers/staging/vt6655/rf.c + create mode 100644 drivers/staging/vt6655/rf.h + create mode 100644 drivers/staging/vt6655/rxtx.c + create mode 100644 drivers/staging/vt6655/rxtx.h + create mode 100644 drivers/staging/vt6655/srom.c + create mode 100644 drivers/staging/vt6655/srom.h + create mode 100644 drivers/staging/vt6655/tbit.h + create mode 100644 drivers/staging/vt6655/tcrc.c + create mode 100644 drivers/staging/vt6655/tcrc.h + create mode 100644 drivers/staging/vt6655/test + create mode 100644 drivers/staging/vt6655/tether.c + create mode 100644 drivers/staging/vt6655/tether.h + create mode 100644 drivers/staging/vt6655/tkip.c + create mode 100644 drivers/staging/vt6655/tkip.h + create mode 100644 drivers/staging/vt6655/tmacro.h + create mode 100644 drivers/staging/vt6655/tpci.h + create mode 100644 drivers/staging/vt6655/ttype.h + create mode 100644 drivers/staging/vt6655/umem.h + create mode 100644 drivers/staging/vt6655/upc.h + create mode 100644 drivers/staging/vt6655/vntconfiguration.dat + create mode 100644 drivers/staging/vt6655/vntwifi.c + create mode 100644 drivers/staging/vt6655/vntwifi.h + create mode 100644 drivers/staging/vt6655/wcmd.c + create mode 100644 drivers/staging/vt6655/wcmd.h + create mode 100644 drivers/staging/vt6655/wctl.c + create mode 100644 drivers/staging/vt6655/wctl.h + create mode 100644 drivers/staging/vt6655/wmgr.c + create mode 100644 drivers/staging/vt6655/wmgr.h + create mode 100644 drivers/staging/vt6655/wpa.c + create mode 100644 drivers/staging/vt6655/wpa.h + create mode 100644 drivers/staging/vt6655/wpa2.c + create mode 100644 drivers/staging/vt6655/wpa2.h + create mode 100644 drivers/staging/vt6655/wpactl.c + create mode 100644 drivers/staging/vt6655/wpactl.c.bak + create mode 100644 drivers/staging/vt6655/wpactl.h + create mode 100644 drivers/staging/vt6655/wroute.c + create mode 100644 drivers/staging/vt6655/wroute.h + delete mode 100644 drivers/staging/winbond/wbhal.c + create mode 100644 drivers/staging/wlan-ng/prism2fw.c +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..471c79ba2208 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,82 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Unchanged quilt series device-mapper +Importing i2c based on 2.6.30-rc4-git2 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard a425a638c858fd10370b573bde81df3ba500e271 +HEAD is now at a425a63 Ignore madvise(MADV_WILLNEED) for hugetlbfs-backed regions +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-remove-void-casts.patch +i2c-retry-on-arbitration-loss.patch +i2c-tdfx-no-class.patch +i2c-adapter-no-default-parent.patch +i2c-chips-move-max6875-to-drivers-misc-eeprom.patch +macintosh-therm_pm72-convert-to-new-style-i2c.patch +macintosh-windfarm-convert-to-new-style-i2c.patch +macintosh-therm_adt746x-convert-to-new-style-i2c.patch +macintosh-therm_windtunnel-convert-to-new-style-i2c.patch +ir-kbd-i2c-conversion-ALL-IN-ONE.patch +media-video-pvrusb2-dont-use-client-list.patch +i2c-core-01-kill-client_register_unregister.patch +i2c-core-02-kill-legacy-binding-model.patch +i2c-core-03-kill-i2c_probe.patch +i2c-core-04-merge-i2c_attach_client.patch +i2c-core-05-kill-is_newstyle_driver.patch +i2c-core-06-kill-per-adapter-client-list.patch +i2c-sysfs-interface-to-instantiate-devices.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 38e44bd...a728bc4 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.30-rc4-git2 +$ cd ../quilt-tmp +$ git reset --hard a425a638c858fd10370b573bde81df3ba500e271 +HEAD is now at a425a63 Ignore madvise(MADV_WILLNEED) for hugetlbfs-backed regions +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-asus_atk0110-fix-compiler-warning.patch +hwmon-ibmaem-automatically-load-on-hc10-blade.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + ccb4f8d...e8db107 master -> quilt/jdelvare-hwmon (forced update) +Unchanged quilt series kernel-doc +Unchanged quilt series rr +Importing ttydev based on 27b1833279995e7c290a40cac4ef36ccea7e9283 +$ cd ../quilt-tmp +$ git reset --hard 27b1833279995e7c290a40cac4ef36ccea7e9283 +HEAD is now at 27b1833 Remove unused support code for refok sections. +$ git quiltimport --author Alan Cox <alan@lxorguk.ukuu.org.uk> --patches ../quilt/ttydev +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:306: trailing whitespace. + else +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2195: trailing whitespace. + serial_do_down(port); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2221: trailing whitespace. + return 1; +warning: 3 lines add whitespace errors. +tty-usb-acm-port +synclink-pio-mode +tty-cyclades-cast-clean +tty-cyclades-cache-hw-ver +tty-cyclades-macros-to-inlines +tty-cyclades-kill-typedefs +tty-cyclades-nports +tty-cyclades-remove-unused-vars +tty-usb-acm-kref +tty-usb-acm-clean +jsm-remove-unused-lock +vt-clocks +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/ttydev +From ../quilt-tmp + + daa1c6b...dd6f67c master -> quilt/ttydev (forced update) +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..815ee664c025 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090507 |