diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-24 13:37:44 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-24 13:37:44 +1100 |
| commit | 5a7a413f173a87890a2a221abe5c5eeee0820269 (patch) | |
| tree | 8ec130075e786b184592b14c5ffadb4fd1512c15 | |
| parent | b2ed6073df5c990e5c823991549eedad210d139d (diff) | |
Add linux-next specific files for 20091224next-20091224
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 157 | ||||
| -rw-r--r-- | Next/Trees | 159 | ||||
| -rw-r--r-- | Next/merge.log | 3108 | ||||
| -rw-r--r-- | Next/quilt-import.log | 638 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4063 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..36661735743c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,157 @@ +Name SHA1 +---- ---- +origin 2f99f5c8f05e02f3df1bb4d93b6704e6f5972872 +fixes ea659eda2843978c815b1551eff83d96696b4b64 +arm-current 52e8bfd81af5492a14cc3a4641d4c80d05b66bdb +m68k-current 49966bae8446f5ba7e8afbd01bde82af4e00628a +powerpc-merge 95cd34b42b43c0ed5a89a764e023189bfe7b1530 +sparc-current 7466bd3caab6bd1d0095de957affbacd02ca58a7 +scsi-rc-fixes 4e46bf89972b9d98a9f282a9fed2359756a5e34e +net-current ed4b2019a62e2208a8370461dd91ed4de2c9fc8f +sound-current 54a26089a2733df2765342acaaf71466d37ff5a5 +pci-current 2d1c861871d767153538a77c498752b36d4bb4b8 +wireless-current 92c6f8d849178582fc527aaf1e51dd37a74767d3 +kbuild-current 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +driver-core.current 2f99f5c8f05e02f3df1bb4d93b6704e6f5972872 +tty.current 477fec79c5b59cdf6f0231206142ef889392cb00 +usb.current 477fec79c5b59cdf6f0231206142ef889392cb00 +staging.current 477fec79c5b59cdf6f0231206142ef889392cb00 +cpufreq-current 8e196da6b8e15e27af67ea6c9a01a888ae97b8b4 +input-current 1d9f26262aef6d63ff65eba0fd5f1583f342b69b +md-current 06e3c817b750c131a20e82eed57a17841ea88ed2 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current eed89d0f9d3383851cec634565a6414fae70fe91 +ide-curent f40542532e96dda5506eb76badea322f2ae4731c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm bce810362c933dd4b2691890687df4ba4e96d970 +davinci ec10c9ed12b45e94e6ef0bc5099b01533d2647e6 +msm 5c43d49aec499973b51e574af871c8918598c2db +omap 97875794c4277ff9be73403e4e7b32c31be812bc +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung aac0d66a1b99d737d62a60d14570f2dae4efc4c0 +avr32 5416bf33f92a4104dbcd6062bf377c8421ca3cfd +blackfin dd59f6c76b265ed2ff18b497d6105a9511b1feb1 +cris d8fe989e7368a26e4baf9acb55524c71e5c3a117 +ia64 2546f47024a5b8232ab37853d13836d67f8f5318 +m68k 49966bae8446f5ba7e8afbd01bde82af4e00628a +m68knommu bea4c899f2b5fad80099aea979780ef19f9b1987 +microblaze 8bea8672edfca7ec5f661cafb218f1205863b343 +mips 7aa60c93e5d831d6ac2ff5b8b36fd02caba485b8 +parisc d0608b54740c82b08056b7611e38a3fd73be3564 +powerpc 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +4xx a18cb387e5c29be5c95cded5b5a55110bb930f5c +52xx-and-virtex 59044fd688900f3abb03407ea0789a31c729c54a +galak c1a676dfa2fa25fb9ec77c92ebe3ff580648b6ac +s390 42d61b9b415686d81eaa022b846737548876e51d +sh 76e7461a21dfe13565b2a323b53c8cc963541126 +sparc 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +ceph c2e552e76e2c6907ca50cd9a4b747a2e2e8c615e +cifs a994b8fa669f16c50728328c3735722a3f20652e +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 9a94c9ae052b2c28000b22e6008f49ae19f8ed05 +ext3 869835dfad3eb6f7d90c3255a24b084fea82f30d +ext4 9f31d1227c3f2611405fc29e092c61a56b37da33 +fatfs 681142f9211b23e6aa2984259d38b76d7bdc05a8 +fuse 1b7323965a8c6eee9dc4e345a7ae4bff1dc93149 +gfs2 26bb7505cf7db3560286be9f6384b6d3911f78b5 +jfs 4a19fb11a90fdbbcb3bc02effa036230d035ca28 +logfs 5c564c2a04d4bb6ba79eeb83bd06de584479f362 +nfs 486bad2e40e938cd68fd853b7a9fa3115a9d3a4a +nfsd 5039ed0dc5ee0620a775d0a7bfb2054163764cc6 +nilfs2 7e66139f76f1a31dce1e82d972da3d9c1c570b77 +ocfs2 2503140141dd614698249c437414fb6f3c1b51bc +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +udf 2c948b3f86e5f0327e2e57858600af6e6f0ae29a +v9fs 47d425b937566337d4a7afdf01040a3006781007 +ubifs b38882f5c066dc681679e90f1903eda323e605b1 +xfs f8c89a9e39a10448543c8dc720626d4cf7f2ec49 +reiserfs-bkl 47376ceba54600cec4dd9e7c4fe8b98e4269633a +vfs 718deb6b61e34c200c1f2b706176d9aac334cb2d +pci 8bea8672edfca7ec5f661cafb218f1205863b343 +hid add5101926b8f0aa534e891da98046ba587540c9 +i2c a3b888c0d92cb3d264e754e18ca90c81fe6f71b4 +bjdooks-i2c 155a49319fabae97c14c7eb474562f2bdfe5af1f +jdelvare-hwmon bef086aa961b2843b4d4b1a65457bc9fffb09e0e +kernel-doc 23dca22646332256248dae260b85c1ac61024324 +v4l-dvb 5ee2472863a4de4edd42451fd86e3d7857602337 +kbuild 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +kconfig 7b76bfc86757ca5e7b0a62f50003752da77c115b +ide f40542532e96dda5506eb76badea322f2ae4731c +libata 6df2e36a5975f543462894ec8e2008ae28e535e3 +infiniband 14f369d1d61e7ac6578c54ca9ce3caaf4072412c +acpi 0878b6aa830cc95fdb6f56f41ef2d722acee4eb9 +ieee1394 79680cbd7c1ca91c0dd0ecfbcae39eb5a7120024 +ubi 44244312d096294d4fc192c3af15e8184957f97b +kvm 1996e8e50f2126218af5ed05f99b4278250bdaab +dlm 573c24c4af6664ffcd9aa7ba617a35fde2b95534 +scsi 53ca353594a254e6bd45ccf2d405aa31bcbb7091 +async_tx aa849c79b307df55e52262baf0be7576417394dc +net b4de921ae6f7bb211868be4f7d56e80ac6da676c +wireless b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 +mtd 60d9aa758c00f20ade0cb1951f6a934f628dd2d7 +crypto 863b557a88f8c033f7419fabafef4712a5055f85 +sound b6f6e6d56d06f77cbf6a449ac9f3764124db071b +cpufreq 8e196da6b8e15e27af67ea6c9a01a888ae97b8b4 +rr b9f26e17db88c6275b6315f23c84fa53683e501a +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +tmio-mmc 4b52cd752af330463abf2527a8b0df9a10916613 +input 1d9f26262aef6d63ff65eba0fd5f1583f342b69b +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 6ec1480d8539c8e2e6ba7fbbeffe5adc640bfe98 +device-mapper 8bea8672edfca7ec5f661cafb218f1205863b343 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 9fea84f46a821aa1ff2d034ffda8ad33bff48015 +battery d54e7929d8073b0fff8af16f8ff6ebbba6fc4154 +leds e45906203d27296b47e56efc1219f9a200bfc2db +backlight f7a297af49e5d9d2c577466307e8ef392750c9d9 +kgdb 51a3c2398cc9a3b1410e33690022e4701b7f069e +slab 84e554e6865c4f4ae84d38800cf270b9a67901cc +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md de3805f30ab1eac69702d3d26db8c79308ac63a8 +mfd 9da66539281b5e15afc4a4739014c8923059d894 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm be57261833a019c3e068e4d00de9b70799396591 +voltage b1c20d088686630db1dd168bcbc84fda3f390736 +security-testing fdb8ebb729bbb640e64028a4f579a02ebc405727 +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 6a7a25116787189f238a1c9a99ec473a3b6d565c +uwb 355ffe69cb329bb9ab9eca3ebef369268162220d +watchdog f277223000a651df741e2e3367b498049139298d +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu a79960e576ebca9dbf24489b562689f2be7e9ff0 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 9883784515ca7022409f6a1f3bafce423fa50fee +jc_docs 5e9b356216d97439aea1ec656bdb3c17b9c2d4ae +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 6caa1b4b8c419cb4740b80ac07bacdfab5a09c30 +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend cdbcb1f80c8fc4ead55431814f9b1cecf07a2b81 +bluetooth 38e816d0112974ca7959306cb88a7372ce07e946 +fsnotify 9ec95a50f4d31fe58fd8fae9f86627eea4582ccb +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +drbd 820cd61a28503598f4262c544082ccb33678b9fc +catalin 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +alacrity e1077ef3b2751766c4437e2f974e3d7372742d0d +i7core_edac d0ae29a6eed06533e30dc7cd00d6f7983e3a7287 +devicetree f40542532e96dda5506eb76badea322f2ae4731c +spi c047819305845279ecb8f13c5a08b71cf9c7849d +limits 20834fb1b458753273e79a72570b054775503b78 +omap_dss2 3ef884b4c04e857c283cc77ca70ad8f638d94b0e +tip d98cb44954d4a0c3f05b5b2f68450c67786f4cd1 +edac-amd 6d55f3ac0edc959c6bf943cb383140c92449755d +oprofile 374576a8b6f865022c0fd1ca62396889b23d66dd +percpu 1d1543492b83903ae203b55da3867c226a87f5c3 +workqueues dc186ad741c12ae9ecac8b89e317ef706fdaf8f6 +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +hwpoison 27df5068e24f2f88de98e95eb6e8dbc9800bf80e +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 35bd8c8a8a9d687be88e33a19b6b4aab2f4343ac +tty 61d7f7052bb3675e65f8c2d0c2b4d0867228061e +usb 8196ff919ba81e51b1c60ef7687f808f910faaee +staging d978bacd9a500886e4fe66df4ffb2c7ca905f943 +scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4cf99c9ec607 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,159 @@ +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://repo.or.cz/linux-kbuild.git#for-linus +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +tty.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-tty.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb.current/ +staging.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-staging.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 +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#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 +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next +msm git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +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/vapier/blackfin.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 +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#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#next +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 +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#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 +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_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 +logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master +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 +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +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 +reiserfs-bkl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#reiserfs/kill-bkl +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +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/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-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 +kbuild git git://repo.or.cz/linux-kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master +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#linux-next +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 +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 +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/ +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +tmio-mmc git git://git.mnementh.co.uk/linux-2.6-im#linux-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +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 +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-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 +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +hwlat git git://git.kernel.org/pub/scm/linux/kernel/git/jcm/linux-2.6-hwlat.git#for-linus +drbd git git://git.drbd.org/linux-2.6-drbd.git#for-jens +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree +spi git git://git.secretlab.ca/git/linux-2.6#next-spi +limits git git://decibel.fi.muni.cz/~xslaby/linux#writable_limits +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-driver-core/ +tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-tty/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-usb/ +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-08-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..aadaa4006d74 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3108 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 5563935 Linux 2.6.33-rc1 +Merging origin/master +$ git merge origin/master +Updating 5563935..2f99f5c +Fast forward + Documentation/ABI/testing/sysfs-bus-usb | 18 +- + Documentation/driver-model/driver.txt | 4 +- + Documentation/filesystems/sysfs.txt | 12 +- + Documentation/power/runtime_pm.txt | 223 +++-- + Documentation/powerpc/dts-bindings/fsl/mpic.txt | 42 + + Documentation/sound/alsa/HD-Audio-Models.txt | 1 + + Documentation/stable_kernel_rules.txt | 24 +- + Documentation/trace/events-kmem.txt | 14 +- + Documentation/usb/power-management.txt | 41 +- + MAINTAINERS | 12 +- + Makefile | 7 + + arch/Kconfig | 4 +- + arch/alpha/Kconfig | 1 + + arch/alpha/include/asm/bug.h | 3 +- + arch/alpha/include/asm/perf_event.h | 9 + + arch/alpha/include/asm/unistd.h | 17 +- + arch/alpha/kernel/systbls.S | 16 +- + arch/powerpc/boot/dts/katmai.dts | 52 +- + arch/powerpc/boot/dts/mpc8315erdb.dts | 27 + + arch/powerpc/boot/dts/mpc8349emitx.dts | 82 ++- + arch/powerpc/boot/dts/warp.dts | 2 +- + arch/powerpc/boot/ugecon.c | 2 +- + arch/powerpc/configs/g5_defconfig | 6 +- + arch/powerpc/configs/iseries_defconfig | 4 +- + arch/powerpc/configs/ppc64_defconfig | 14 +- + arch/powerpc/configs/ppc64e_defconfig | 4 +- + arch/powerpc/configs/pseries_defconfig | 14 +- + arch/powerpc/include/asm/bug.h | 2 +- + arch/powerpc/include/asm/gpio.h | 5 +- + arch/powerpc/kernel/align.c | 63 +- + arch/powerpc/mm/hash_utils_64.c | 12 +- + arch/powerpc/mm/mmu_context_nohash.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/powerpc/platforms/83xx/suspend.c | 52 +- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +- + arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 10 +- + arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 2 +- + arch/powerpc/platforms/iseries/mf.c | 147 ++- + arch/powerpc/platforms/iseries/viopath.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 2 + + arch/powerpc/platforms/pseries/cmm.c | 254 ++++- + arch/powerpc/platforms/pseries/dlpar.c | 6 +- + arch/powerpc/platforms/pseries/smp.c | 4 +- + arch/powerpc/sysdev/cpm2_pic.c | 28 +- + arch/powerpc/sysdev/fsl_pci.c | 8 +- + arch/powerpc/sysdev/mpc8xxx_gpio.c | 21 +- + arch/powerpc/sysdev/mpic.c | 19 +- + arch/powerpc/sysdev/mpic_msi.c | 11 +- + arch/powerpc/sysdev/mpic_u3msi.c | 46 +- + arch/s390/crypto/aes_s390.c | 2 +- + arch/s390/hypfs/hypfs_diag.c | 4 +- + arch/s390/hypfs/hypfs_vm.c | 2 +- + arch/s390/include/asm/unistd.h | 3 +- + arch/s390/kernel/compat_wrapper.S | 9 + + arch/s390/kernel/ipl.c | 6 +- + arch/s390/kernel/ptrace.c | 2 +- + arch/s390/kernel/syscalls.S | 1 + + arch/s390/kernel/traps.c | 6 +- + arch/x86/Kconfig | 2 + + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/include/asm/hw_irq.h | 3 +- + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/include/asm/msr.h | 16 +- + arch/x86/include/asm/processor.h | 2 +- + arch/x86/include/asm/stacktrace.h | 24 + + arch/x86/kernel/apic/apic_flat_64.c | 5 +- + arch/x86/kernel/apic/bigsmp_32.c | 5 +- + arch/x86/kernel/apic/io_apic.c | 32 +- + arch/x86/kernel/apic/x2apic_cluster.c | 5 +- + arch/x86/kernel/apic/x2apic_phys.c | 5 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 5 +- + arch/x86/kernel/cpu/amd.c | 53 +- + arch/x86/kernel/cpu/intel.c | 1 - + arch/x86/kernel/cpu/perf_event.c | 1 + + arch/x86/kernel/cpuid.c | 5 +- + arch/x86/kernel/dumpstack.c | 33 +- + arch/x86/kernel/dumpstack.h | 6 - + arch/x86/kernel/dumpstack_32.c | 2 +- + arch/x86/kernel/dumpstack_64.c | 4 +- + arch/x86/kernel/e820.c | 2 +- + arch/x86/kernel/microcode_core.c | 2 +- + arch/x86/kernel/msr.c | 4 +- + arch/x86/kernel/stacktrace.c | 18 +- + arch/x86/kernel/tsc.c | 1 + + arch/x86/kernel/uv_irq.c | 3 +- + arch/x86/lib/Makefile | 4 +- + arch/x86/lib/msr-smp.c | 204 ++++ + arch/x86/lib/msr.c | 213 ---- + arch/x86/mm/srat_32.c | 2 + + arch/x86/mm/srat_64.c | 4 +- + arch/x86/oprofile/backtrace.c | 9 +- + arch/x86/tools/chkobjdump.awk | 2 +- + arch/x86/tools/gen-insn-attr-x86.awk | 10 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/ata/libata-sff.c | 2 +- + drivers/ata/pata_bf54x.c | 19 + + drivers/ata/pata_cmd64x.c | 118 +-- + drivers/ata/pata_hpt3x2n.c | 64 +- + drivers/ata/pata_octeon_cf.c | 2 +- + drivers/ata/sata_mv.c | 144 ++- + drivers/base/bus.c | 2 +- + drivers/base/core.c | 16 +- + drivers/base/devtmpfs.c | 19 +- + drivers/base/driver.c | 4 +- + drivers/base/memory.c | 19 + + drivers/base/platform.c | 1 + + drivers/base/power/main.c | 128 ++- + drivers/base/power/runtime.c | 45 + + drivers/bluetooth/btusb.c | 1 + + drivers/char/nozomi.c | 48 +- + drivers/char/sonypi.c | 49 +- + drivers/gpu/drm/drm_drv.c | 13 +- + drivers/gpu/drm/drm_edid.c | 2 +- + drivers/gpu/drm/drm_ioc32.c | 89 +- + drivers/gpu/drm/drm_mm.c | 4 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 5 + + drivers/gpu/drm/i2c/ch7006_mode.c | 5 - + drivers/gpu/drm/i810/i810_dma.c | 2 +- + drivers/gpu/drm/i810/i810_drv.c | 2 +- + drivers/gpu/drm/i830/i830_dma.c | 2 +- + drivers/gpu/drm/i830/i830_drv.c | 2 +- + drivers/gpu/drm/i915/i915_drv.c | 2 +- + drivers/gpu/drm/i915/i915_ioc32.c | 23 +- + drivers/gpu/drm/mga/mga_drv.c | 2 +- + drivers/gpu/drm/mga/mga_ioc32.c | 13 +- + drivers/gpu/drm/nouveau/Makefile | 5 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 621 +++++----- + drivers/gpu/drm/nouveau/nouveau_bios.h | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 28 +- + drivers/gpu/drm/nouveau/nouveau_drv.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 27 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 22 +- + drivers/gpu/drm/nouveau/nouveau_grctx.c | 161 +++ + drivers/gpu/drm/nouveau/nouveau_grctx.h | 133 +++ + drivers/gpu/drm/nouveau/nouveau_ioc32.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_state.c | 147 ++- + drivers/gpu/drm/nouveau/nv04_crtc.c | 10 +- + drivers/gpu/drm/nouveau/nv04_dac.c | 8 +- + drivers/gpu/drm/nouveau/nv04_dfp.c | 8 +- + drivers/gpu/drm/nouveau/nv04_display.c | 11 +- + drivers/gpu/drm/nouveau/nv04_graph.c | 2 +- + drivers/gpu/drm/nouveau/nv10_graph.c | 197 +++- + drivers/gpu/drm/nouveau/nv17_tv.c | 4 +- + drivers/gpu/drm/nouveau/nv40_graph.c | 212 +--- + drivers/gpu/drm/nouveau/nv40_grctx.c | 678 +++++++++++ + drivers/gpu/drm/nouveau/nv50_crtc.c | 22 +- + drivers/gpu/drm/nouveau/nv50_cursor.c | 8 +- + drivers/gpu/drm/nouveau/nv50_dac.c | 20 +- + drivers/gpu/drm/nouveau/nv50_display.c | 20 +- + drivers/gpu/drm/nouveau/nv50_fifo.c | 2 +- + drivers/gpu/drm/nouveau/nv50_graph.c | 10 +- + drivers/gpu/drm/nouveau/nv50_sor.c | 16 +- + drivers/gpu/drm/r128/r128_drv.c | 2 +- + drivers/gpu/drm/r128/r128_ioc32.c | 16 +- + drivers/gpu/drm/radeon/atom.c | 12 +- + drivers/gpu/drm/radeon/atom.h | 1 + + drivers/gpu/drm/radeon/atombios.h | 199 ++++ + drivers/gpu/drm/radeon/r100.c | 4 + + drivers/gpu/drm/radeon/r100_track.h | 4 +- + drivers/gpu/drm/radeon/r300.c | 30 + + drivers/gpu/drm/radeon/r300_cmdbuf.c | 6 +- + drivers/gpu/drm/radeon/r300_reg.h | 1 + + drivers/gpu/drm/radeon/r600_cs.c | 4 +- + drivers/gpu/drm/radeon/radeon.h | 4 +- + drivers/gpu/drm/radeon/radeon_asic.h | 7 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 105 ++- + drivers/gpu/drm/radeon/radeon_clocks.c | 2 +- + drivers/gpu/drm/radeon/radeon_combios.c | 9 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 16 +- + drivers/gpu/drm/radeon/radeon_device.c | 80 ++- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_drv.c | 4 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 18 +- + drivers/gpu/drm/radeon/radeon_fence.c | 9 +- + drivers/gpu/drm/radeon/radeon_ioc32.c | 38 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 5 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 + + drivers/gpu/drm/radeon/radeon_mode.h | 6 + + drivers/gpu/drm/radeon/radeon_test.c | 4 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 4 + + drivers/gpu/drm/savage/savage_drv.c | 2 +- + drivers/gpu/drm/sis/sis_drv.c | 2 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 2 +- + drivers/gpu/drm/via/via_drv.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 47 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 157 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 149 ++-- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 9 +- + drivers/infiniband/hw/cxgb3/cxio_resource.c | 75 +- + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/media/video/cx23885/cx23888-ir.c | 44 +- + drivers/media/video/meye.c | 60 +- + drivers/media/video/meye.h | 4 +- + drivers/net/bnx2.c | 12 +- + drivers/net/can/at91_can.c | 2 +- + drivers/net/davinci_emac.c | 2 +- + drivers/net/e100.c | 2 +- + drivers/net/e1000e/82571.c | 6 - + drivers/net/gianfar.c | 50 +- + drivers/net/gianfar.h | 18 +- + drivers/net/netxen/netxen_nic_main.c | 57 +- + drivers/net/phy/broadcom.c | 3 +- + drivers/net/wireless/libertas/cmd.c | 4 +- + drivers/net/wireless/libertas/dev.h | 4 +- + drivers/net/wireless/libertas/main.c | 21 +- + drivers/platform/x86/fujitsu-laptop.c | 30 +- + drivers/platform/x86/sony-laptop.c | 56 +- + drivers/s390/block/dasd_alias.c | 2 +- + drivers/s390/block/dasd_diag.c | 42 +- + drivers/s390/char/fs3270.c | 2 +- + drivers/s390/char/tape_34xx.c | 1 + + drivers/s390/char/tape_3590.c | 3 +- + drivers/s390/char/tape_block.c | 1 + + drivers/s390/char/tape_char.c | 3 + + drivers/s390/char/tape_class.c | 4 + + drivers/s390/char/tape_core.c | 2 + + drivers/s390/char/tape_proc.c | 3 + + drivers/s390/char/tape_std.c | 3 + + drivers/s390/cio/ccwreq.c | 3 - + drivers/s390/cio/device.c | 1 + + drivers/s390/cio/device_pgid.c | 29 +- + drivers/s390/cio/fcx.c | 4 +- + drivers/s390/cio/io_sch.h | 1 + + drivers/s390/cio/qdio_main.c | 3 +- + drivers/s390/cio/qdio_perf.c | 2 + + drivers/s390/cio/qdio_perf.h | 1 + + drivers/s390/cio/qdio_setup.c | 10 +- + drivers/scsi/libiscsi.c | 22 +- + drivers/scsi/libiscsi_tcp.c | 36 +- + drivers/scsi/libsrp.c | 17 +- + drivers/staging/Kconfig | 4 +- + drivers/staging/Makefile | 2 +- + drivers/staging/batman-adv/Kconfig | 1 + + drivers/staging/batman-adv/send.c | 4 +- + drivers/staging/comedi/comedi.h | 2 +- + drivers/staging/comedi/drivers/jr3_pci.c | 7 +- + drivers/staging/comedi/drivers/usbdux.c | 5 +- + drivers/staging/dst/Kconfig | 67 -- + drivers/staging/dst/Makefile | 3 - + drivers/staging/dst/crypto.c | 733 ------------ + drivers/staging/dst/dcore.c | 968 --------------- + drivers/staging/dst/export.c | 660 ----------- + drivers/staging/dst/state.c | 844 ------------- + drivers/staging/dst/thread_pool.c | 348 ------ + drivers/staging/dst/trans.c | 337 ------ + drivers/staging/panel/Kconfig | 2 +- + drivers/staging/panel/panel.c | 2 +- + drivers/staging/pohmelfs/dir.c | 2 - + drivers/staging/ramzswap/TODO | 1 - + drivers/staging/ramzswap/ramzswap_drv.c | 28 +- + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 10 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 2 +- + .../rtl8187se/ieee80211/ieee80211_softmac.c | 14 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8187se/r8180_core.c | 10 +- + drivers/staging/rtl8187se/r8180_wx.c | 2 +- + drivers/staging/rtl8192e/ieee80211.h | 12 +- + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 12 +- + .../staging/rtl8192e/ieee80211/ieee80211_module.c | 10 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 24 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 2 +- + .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 6 +- + drivers/staging/rtl8192e/r8192E_core.c | 14 +- + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 8 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 6 +- + .../rtl8192su/ieee80211/ieee80211_softmac.c | 16 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192su/r8192U_core.c | 10 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 6 +- + drivers/staging/sm7xx/Kconfig | 15 + + drivers/staging/sm7xx/Makefile | 3 + + drivers/staging/sm7xx/TODO | 10 + + drivers/staging/sm7xx/smtc2d.c | 979 +++++++++++++++ + drivers/staging/sm7xx/smtc2d.h | 530 +++++++++ + drivers/staging/sm7xx/smtcfb.c | 1253 ++++++++++++++++++++ + drivers/staging/sm7xx/smtcfb.h | 793 +++++++++++++ + drivers/staging/vt6655/Kconfig | 2 +- + drivers/staging/vt6656/Kconfig | 2 +- + drivers/staging/wlan-ng/prism2fw.c | 2 +- + drivers/usb/Makefile | 2 - + drivers/usb/core/hcd.c | 4 +- + drivers/usb/core/hub.c | 58 +- + drivers/usb/core/sysfs.c | 6 +- + drivers/usb/core/usb.c | 6 +- + drivers/usb/early/ehci-dbgp.c | 2 +- + drivers/usb/gadget/audio.c | 1 + + drivers/usb/gadget/f_audio.c | 15 +- + drivers/usb/gadget/u_audio.c | 12 +- + drivers/usb/gadget/u_audio.h | 2 +- + drivers/usb/host/fhci-sched.c | 10 +- + drivers/usb/host/fhci-tds.c | 35 +- + drivers/usb/host/fhci.h | 16 +- + drivers/usb/misc/appledisplay.c | 5 +- + drivers/usb/misc/emi62.c | 2 +- + drivers/usb/musb/blackfin.c | 150 ++- + drivers/usb/musb/blackfin.h | 2 - + drivers/usb/musb/cppi_dma.c | 6 + + drivers/usb/musb/davinci.c | 2 +- + drivers/usb/musb/musb_core.c | 14 +- + drivers/usb/musb/musb_gadget.c | 13 +- + drivers/usb/musb/musb_gadget_ep0.c | 14 +- + drivers/usb/otg/isp1301_omap.c | 4 +- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio.h | 959 +--------------- + drivers/usb/serial/ftdi_sio_ids.h | 986 +++++++++++++++ + drivers/usb/serial/generic.c | 12 +- + drivers/usb/serial/mos7840.c | 7 +- + drivers/usb/serial/option.c | 5 + + drivers/usb/serial/usb-serial.c | 7 +- + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/geodewdt.c | 40 +- + fs/anon_inodes.c | 4 +- + fs/compat_ioctl.c | 2 - + fs/eventfd.c | 2 +- + fs/eventpoll.c | 2 +- + fs/ext3/inode.c | 8 +- + fs/ext3/namei.c | 28 +- + fs/ext3/resize.c | 35 +- + fs/ext3/super.c | 19 +- + fs/ext4/ext4.h | 6 +- + fs/ext4/inode.c | 36 +- + fs/ext4/mballoc.c | 6 - + fs/ext4/super.c | 5 + + fs/file_table.c | 4 +- + fs/internal.h | 7 + + fs/jbd/journal.c | 2 +- + fs/jbd2/journal.c | 3 +- + fs/jfs/super.c | 2 +- + fs/namei.c | 8 +- + fs/nfsd/nfsfh.c | 2 +- + fs/ocfs2/alloc.c | 10 +- + fs/ocfs2/alloc.h | 5 + + fs/ocfs2/namei.c | 5 +- + fs/ocfs2/refcounttree.c | 150 ++- + fs/open.c | 13 +- + fs/proc/array.c | 19 +- + fs/quota/dquot.c | 288 +++-- + fs/quota/quota_v2.c | 9 +- + fs/signalfd.c | 2 +- + fs/stat.c | 10 +- + fs/super.c | 3 +- + fs/sysfs/bin.c | 6 +- + fs/timerfd.c | 2 +- + include/drm/drmP.h | 5 +- + include/linux/decompress/mm.h | 4 +- + include/linux/device.h | 12 +- + include/linux/dst.h | 587 --------- + include/linux/elf.h | 2 +- + include/linux/ext3_fs_sb.h | 2 + + include/linux/ext3_jbd.h | 7 +- + include/linux/fs.h | 6 +- + include/linux/kfifo.h | 554 ++++++++- + include/linux/memory.h | 27 + + include/linux/mm.h | 3 + + include/linux/namei.h | 2 - + include/linux/perf_counter.h | 444 ------- + include/linux/quota.h | 5 +- + include/linux/rcutiny.h | 5 + + include/linux/rcutree.h | 11 + + include/linux/sched.h | 13 +- + include/linux/sysfs.h | 9 +- + include/linux/usb/serial.h | 3 +- + include/scsi/libiscsi.h | 3 +- + include/scsi/libiscsi_tcp.h | 2 +- + include/scsi/libsrp.h | 2 +- + init/initramfs.c | 10 +- + init/main.c | 7 +- + kernel/audit_tree.c | 13 +- + kernel/auditsc.c | 1 - + kernel/cpu.c | 24 +- + kernel/kfifo.c | 361 +++++-- + kernel/kthread.c | 23 + + kernel/perf_event.c | 34 +- + kernel/resource.c | 32 +- + kernel/sched.c | 307 +++--- + kernel/sched_clock.c | 23 +- + kernel/sched_fair.c | 53 +- + kernel/sched_rt.c | 4 +- + kernel/signal.c | 25 +- + kernel/sys.c | 2 + + kernel/time.c | 1 + + kernel/time/clockevents.c | 18 +- + kernel/time/timekeeping.c | 27 +- + kernel/timer.c | 2 - + kernel/trace/trace_kprobe.c | 31 +- + kernel/trace/trace_sysprof.c | 1 + + lib/decompress_bunzip2.c | 10 +- + lib/string.c | 6 +- + mm/page_alloc.c | 61 +- + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap.c | 5 +- + net/dccp/probe.c | 20 +- + net/ipv6/reassembly.c | 3 +- + net/ipv6/route.c | 1 + + security/tomoyo/file.c | 1 - + sound/arm/aaci.c | 177 +-- + sound/arm/aaci.h | 2 +- + sound/core/Kconfig | 1 + + sound/core/pcm_lib.c | 4 +- + sound/core/pcm_timer.c | 17 +- + sound/isa/msnd/msnd_midi.c | 2 +- + sound/isa/sb/emu8000.c | 6 +- + sound/mips/sgio2audio.c | 2 +- + sound/oss/pss.c | 6 +- + sound/pci/hda/hda_codec.c | 10 +- + sound/pci/hda/hda_intel.c | 1 + + sound/pci/hda/patch_cirrus.c | 22 +- + sound/pci/hda/patch_conexant.c | 43 +- + sound/pci/hda/patch_realtek.c | 387 ++++++- + sound/pci/hda/patch_sigmatel.c | 22 +- + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 2 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/stac9766.c | 18 +- + sound/soc/codecs/wm8974.c | 2 +- + sound/soc/codecs/wm9712.c | 3 +- + sound/soc/imx/mx27vis_wm8974.c | 3 +- + sound/soc/sh/fsi.c | 2 +- + sound/usb/usbaudio.c | 2 +- + tools/perf/Makefile | 3 +- + tools/perf/builtin-probe.c | 4 + + tools/perf/builtin-report.c | 2 +- + tools/perf/util/event.h | 4 +- + tools/perf/util/probe-event.c | 15 + + tools/perf/util/probe-finder.h | 59 +- + virt/kvm/kvm_main.c | 4 +- + 435 files changed, 12001 insertions(+), 9512 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/fsl/mpic.txt + create mode 100644 arch/alpha/include/asm/perf_event.h + create mode 100644 arch/x86/lib/msr-smp.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_grctx.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_grctx.h + create mode 100644 drivers/gpu/drm/nouveau/nv40_grctx.c + delete mode 100644 drivers/staging/dst/Kconfig + delete mode 100644 drivers/staging/dst/Makefile + delete mode 100644 drivers/staging/dst/crypto.c + delete mode 100644 drivers/staging/dst/dcore.c + delete mode 100644 drivers/staging/dst/export.c + delete mode 100644 drivers/staging/dst/state.c + delete mode 100644 drivers/staging/dst/thread_pool.c + delete mode 100644 drivers/staging/dst/trans.c + create mode 100644 drivers/staging/sm7xx/Kconfig + create mode 100644 drivers/staging/sm7xx/Makefile + create mode 100644 drivers/staging/sm7xx/TODO + create mode 100644 drivers/staging/sm7xx/smtc2d.c + create mode 100644 drivers/staging/sm7xx/smtc2d.h + create mode 100644 drivers/staging/sm7xx/smtcfb.c + create mode 100644 drivers/staging/sm7xx/smtcfb.h + create mode 100644 drivers/usb/serial/ftdi_sio_ids.h + delete mode 100644 include/linux/dst.h + delete mode 100644 include/linux/perf_counter.h +Merging fixes/fixes +$ git merge fixes/fixes +Merge made by recursive. + include/scsi/libsrp.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/common/dmabounce.c | 2 +- + arch/arm/configs/acs5k_defconfig | 1 - + arch/arm/configs/acs5k_tiny_defconfig | 1 - + arch/arm/configs/afeb9260_defconfig | 1 - + arch/arm/configs/am200epdkit_defconfig | 1 - + arch/arm/configs/am3517_evm_defconfig | 1 - + arch/arm/configs/ams_delta_defconfig | 1 - + arch/arm/configs/assabet_defconfig | 1 - + arch/arm/configs/at91cap9adk_defconfig | 1 - + arch/arm/configs/at91rm9200dk_defconfig | 1 - + arch/arm/configs/at91rm9200ek_defconfig | 1 - + arch/arm/configs/at91sam9260ek_defconfig | 1 - + arch/arm/configs/at91sam9261ek_defconfig | 1 - + arch/arm/configs/at91sam9263ek_defconfig | 1 - + arch/arm/configs/at91sam9g20ek_defconfig | 1 - + arch/arm/configs/at91sam9rlek_defconfig | 1 - + arch/arm/configs/ateb9200_defconfig | 1 - + arch/arm/configs/badge4_defconfig | 1 - + arch/arm/configs/bcmring_defconfig | 1 - + arch/arm/configs/cam60_defconfig | 1 - + arch/arm/configs/carmeva_defconfig | 1 - + arch/arm/configs/cerfcube_defconfig | 1 - + arch/arm/configs/cm_t35_defconfig | 1 - + arch/arm/configs/cm_x2xx_defconfig | 1 - + arch/arm/configs/cm_x300_defconfig | 1 - + arch/arm/configs/colibri_pxa270_defconfig | 1 - + arch/arm/configs/colibri_pxa300_defconfig | 1 - + arch/arm/configs/collie_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/cpu9260_defconfig | 1 - + arch/arm/configs/cpu9g20_defconfig | 1 - + arch/arm/configs/cpuat91_defconfig | 1 - + arch/arm/configs/csb337_defconfig | 1 - + arch/arm/configs/csb637_defconfig | 1 - + arch/arm/configs/da8xx_omapl_defconfig | 1 - + arch/arm/configs/davinci_all_defconfig | 1 - + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/ebsa110_defconfig | 1 - + arch/arm/configs/ecbat91_defconfig | 1 - + arch/arm/configs/edb7211_defconfig | 1 - + arch/arm/configs/em_x270_defconfig | 1 - + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/eseries_pxa_defconfig | 1 - + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/footbridge_defconfig | 1 - + arch/arm/configs/fortunet_defconfig | 1 - + arch/arm/configs/h3600_defconfig | 1 - + arch/arm/configs/h5000_defconfig | 1 - + arch/arm/configs/h7201_defconfig | 1 - + arch/arm/configs/h7202_defconfig | 1 - + arch/arm/configs/hackkit_defconfig | 1 - + arch/arm/configs/htcherald_defconfig | 1 - + arch/arm/configs/igep0020_defconfig | 1 - + arch/arm/configs/integrator_defconfig | 1 - + arch/arm/configs/iop13xx_defconfig | 1 - + arch/arm/configs/iop32x_defconfig | 1 - + arch/arm/configs/iop33x_defconfig | 1 - + arch/arm/configs/ixp2000_defconfig | 1 - + arch/arm/configs/ixp23xx_defconfig | 1 - + arch/arm/configs/ixp4xx_defconfig | 1 - + arch/arm/configs/jornada720_defconfig | 1 - + arch/arm/configs/kafa_defconfig | 1 - + arch/arm/configs/kb9202_defconfig | 1 - + arch/arm/configs/kirkwood_defconfig | 1 - + arch/arm/configs/ks8695_defconfig | 1 - + arch/arm/configs/lart_defconfig | 1 - + arch/arm/configs/loki_defconfig | 1 - + arch/arm/configs/lpd270_defconfig | 1 - + arch/arm/configs/lpd7a400_defconfig | 1 - + arch/arm/configs/lpd7a404_defconfig | 1 - + arch/arm/configs/lubbock_defconfig | 1 - + arch/arm/configs/lusl7200_defconfig | 1 - + arch/arm/configs/magician_defconfig | 1 - + arch/arm/configs/mainstone_defconfig | 1 - + arch/arm/configs/mini2440_defconfig | 1 - + arch/arm/configs/msm_defconfig | 1 - + arch/arm/configs/mv78xx0_defconfig | 1 - + arch/arm/configs/mx1_defconfig | 1 - + arch/arm/configs/mx1ads_defconfig | 1 - + arch/arm/configs/mx21_defconfig | 1 - + arch/arm/configs/mx27_defconfig | 1 - + arch/arm/configs/mx31pdk_defconfig | 1 - + arch/arm/configs/mx3_defconfig | 1 - + arch/arm/configs/n770_defconfig | 1 - + arch/arm/configs/n8x0_defconfig | 1 - + arch/arm/configs/neocore926_defconfig | 1 - + arch/arm/configs/neponset_defconfig | 1 - + arch/arm/configs/netwinder_defconfig | 1 - + arch/arm/configs/netx_defconfig | 1 - + arch/arm/configs/nhk8815_defconfig | 1 - + arch/arm/configs/nuc910_defconfig | 1 - + arch/arm/configs/nuc950_defconfig | 1 - + arch/arm/configs/nuc960_defconfig | 1 - + arch/arm/configs/omap3_beagle_defconfig | 1 - + arch/arm/configs/omap3_defconfig | 1 - + arch/arm/configs/omap3_evm_defconfig | 1 - + arch/arm/configs/omap3_pandora_defconfig | 1 - + arch/arm/configs/omap3_touchbook_defconfig | 1 - + arch/arm/configs/omap_2430sdp_defconfig | 1 - + arch/arm/configs/omap_3430sdp_defconfig | 1 - + arch/arm/configs/omap_3630sdp_defconfig | 1 - + arch/arm/configs/omap_4430sdp_defconfig | 1 - + arch/arm/configs/omap_apollon_2420_defconfig | 1 - + arch/arm/configs/omap_generic_1510_defconfig | 1 - + arch/arm/configs/omap_generic_1610_defconfig | 1 - + arch/arm/configs/omap_generic_1710_defconfig | 1 - + arch/arm/configs/omap_generic_2420_defconfig | 1 - + arch/arm/configs/omap_h2_1610_defconfig | 1 - + arch/arm/configs/omap_h4_2420_defconfig | 1 - + arch/arm/configs/omap_innovator_1510_defconfig | 1 - + arch/arm/configs/omap_innovator_1610_defconfig | 1 - + arch/arm/configs/omap_ldp_defconfig | 1 - + arch/arm/configs/omap_osk_5912_defconfig | 1 - + arch/arm/configs/omap_perseus2_730_defconfig | 1 - + arch/arm/configs/omap_zoom2_defconfig | 1 - + arch/arm/configs/omap_zoom3_defconfig | 1 - + arch/arm/configs/onearm_defconfig | 1 - + arch/arm/configs/orion5x_defconfig | 1 - + arch/arm/configs/overo_defconfig | 1 - + arch/arm/configs/palmte_defconfig | 1 - + arch/arm/configs/palmtt_defconfig | 1 - + arch/arm/configs/palmz71_defconfig | 1 - + arch/arm/configs/palmz72_defconfig | 1 - + arch/arm/configs/pcm027_defconfig | 1 - + arch/arm/configs/picotux200_defconfig | 1 - + arch/arm/configs/pleb_defconfig | 1 - + arch/arm/configs/pnx4008_defconfig | 1 - + arch/arm/configs/pxa168_defconfig | 1 - + arch/arm/configs/pxa255-idp_defconfig | 1 - + arch/arm/configs/pxa3xx_defconfig | 1 - + arch/arm/configs/pxa910_defconfig | 1 - + arch/arm/configs/qil-a9260_defconfig | 1 - + arch/arm/configs/realview-smp_defconfig | 1 - + arch/arm/configs/realview_defconfig | 1 - + arch/arm/configs/rpc_defconfig | 1 - + arch/arm/configs/rx51_defconfig | 1 - + arch/arm/configs/s3c2410_defconfig | 1 - + arch/arm/configs/s3c6400_defconfig | 1 - + arch/arm/configs/s5pc100_defconfig | 1 - + arch/arm/configs/sam9_l9260_defconfig | 1 - + arch/arm/configs/shannon_defconfig | 1 - + arch/arm/configs/shark_defconfig | 1 - + arch/arm/configs/simpad_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + arch/arm/configs/stmp378x_defconfig | 1 - + arch/arm/configs/stmp37xx_defconfig | 1 - + arch/arm/configs/sx1_defconfig | 1 - + arch/arm/configs/tct_hammer_defconfig | 1 - + arch/arm/configs/trizeps4_defconfig | 1 - + arch/arm/configs/u300_defconfig | 1 - + arch/arm/configs/u8500_defconfig | 1 - + arch/arm/configs/usb-a9260_defconfig | 1 - + arch/arm/configs/usb-a9263_defconfig | 1 - + arch/arm/configs/versatile_defconfig | 1 - + arch/arm/configs/viper_defconfig | 1 - + arch/arm/configs/xcep_defconfig | 1 - + arch/arm/configs/yl9200_defconfig | 1 - + arch/arm/configs/zeus_defconfig | 1 - + arch/arm/include/asm/proc-fns.h | 374 ++++++++++++----------- + arch/arm/include/asm/thread_notify.h | 2 +- + arch/arm/kernel/crunch.c | 2 +- + arch/arm/kernel/process.c | 12 +- + arch/arm/kernel/xscale-cp0.c | 2 +- + arch/arm/mach-w90x900/cpu.c | 1 + + arch/arm/mach-w90x900/dev.c | 2 +- + arch/arm/mach-w90x900/include/mach/uncompress.h | 10 + + arch/arm/mm/Kconfig | 4 - + arch/arm/mm/copypage-v6.c | 2 +- + arch/arm/mm/fault-armv.c | 5 +- + arch/arm/nwfpe/Makefile | 4 +- + arch/arm/oprofile/op_model_v7.c | 8 +- + arch/arm/vfp/vfpmodule.c | 19 +- + drivers/char/nwflash.c | 1 + + 173 files changed, 238 insertions(+), 369 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merging drivers/net/Kconfig +Merge made by recursive. + drivers/net/Kconfig | 2 + + drivers/net/wireless/ath/ath9k/mac.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 6 ++++ + drivers/net/wireless/ath/ath9k/xmit.c | 40 +++++++++++--------------- + drivers/net/wireless/iwlwifi/iwl-3945.c | 5 ++- + drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 14 ++++++--- + drivers/net/wireless/iwlwifi/iwl-5000.c | 7 +++-- + drivers/net/wireless/iwlwifi/iwl-agn.c | 6 ++-- + drivers/net/wireless/iwlwifi/iwl-csr.h | 8 ++--- + drivers/net/wireless/iwlwifi/iwl-dev.h | 13 ++++++++- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 37 +++++++++++-------------- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 8 +---- + drivers/net/wireless/iwlwifi/iwl-scan.c | 3 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 8 +---- + drivers/net/wireless/iwlwifi/iwl-tx.c | 3 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 27 +++++++++--------- + drivers/net/wireless/iwmc3200wifi/iwm.h | 2 +- + drivers/net/wireless/iwmc3200wifi/netdev.c | 2 +- + drivers/net/wireless/iwmc3200wifi/rx.c | 2 +- + drivers/net/wireless/libertas/wext.c | 2 - + drivers/net/wireless/rt2x00/rt2800.h | 2 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 17 +++++++---- + drivers/net/wireless/rt2x00/rt61pci.c | 5 +++ + include/linux/ieee80211.h | 2 +- + include/net/mac80211.h | 6 ++++ + net/mac80211/ht.c | 25 +++++++++++++++-- + net/mac80211/main.c | 2 + + net/mac80211/mlme.c | 8 +++++ + 31 files changed, 160 insertions(+), 112 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 +Auto-merging drivers/pci/intel-iommu.c +Auto-merging drivers/pci/intr_remapping.c +Merge made by recursive. + Documentation/vgaarbiter.txt | 2 +- + arch/powerpc/kernel/pci-common.c | 13 +++++++ + arch/x86/pci/bus_numa.c | 2 +- + drivers/pci/hotplug/shpchp.h | 2 +- + drivers/pci/intel-iommu.c | 6 ++-- + drivers/pci/intr_remapping.c | 2 +- + drivers/pci/pci-acpi.c | 10 +---- + drivers/pci/pci.c | 30 +++++++++++++++-- + drivers/pci/pci.h | 8 ++++ + drivers/pci/pcie/aer/Kconfig.debug | 4 +- + drivers/pci/pcie/aer/aer_inject.c | 6 ++-- + drivers/pci/pcie/aer/aerdrv.c | 2 +- + drivers/pci/pcie/aer/aerdrv_acpi.c | 2 +- + drivers/pci/pcie/aer/aerdrv_core.c | 6 ++-- + drivers/pci/pcie/aer/aerdrv_errprint.c | 4 +- + drivers/pci/pcie/aspm.c | 4 +- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/pci/quirks.c | 57 +++++++++++++++++++++++++++++++- + drivers/pci/search.c | 6 ++-- + drivers/pcmcia/cardbus.c | 2 +- + include/linux/pci.h | 3 ++ + 21 files changed, 135 insertions(+), 38 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/for-linus +$ git merge kbuild-current/for-linus +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Merge made by recursive. + drivers/serial/imx.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging quilt/staging.current +$ git merge quilt/staging.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Merge made by recursive. + Documentation/cpu-freq/governors.txt | 4 ++-- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 3 ++- + drivers/cpufreq/cpufreq.c | 19 ++++++++++--------- + 3 files changed, 14 insertions(+), 12 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging arch/arm/common/dmabounce.c +Auto-merging arch/arm/mm/copypage-v6.c +Merge made by recursive. + arch/arm/common/dmabounce.c | 4 +- + arch/arm/include/asm/cacheflush.h | 56 +++---------- + arch/arm/include/asm/dma-mapping.h | 79 ++++++++++++++---- + arch/arm/include/asm/io.h | 11 ++- + arch/arm/include/asm/page.h | 7 +- + arch/arm/include/asm/smp_plat.h | 5 + + arch/arm/kernel/asm-offsets.c | 5 + + arch/arm/mach-davinci/io.c | 2 +- + arch/arm/mach-iop13xx/io.c | 7 +- + arch/arm/mach-msm/io.c | 3 +- + arch/arm/mm/cache-fa.S | 32 ++++++- + arch/arm/mm/cache-v3.S | 43 +++++----- + arch/arm/mm/cache-v4.S | 43 +++++----- + arch/arm/mm/cache-v4wb.S | 32 ++++++- + arch/arm/mm/cache-v4wt.S | 40 ++++++--- + arch/arm/mm/cache-v6.S | 34 +++++++- + arch/arm/mm/cache-v7.S | 34 +++++++- + arch/arm/mm/copypage-feroceon.c | 3 +- + arch/arm/mm/copypage-v3.c | 2 +- + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/mm/copypage-v4wb.c | 3 +- + arch/arm/mm/copypage-v4wt.c | 2 +- + arch/arm/mm/copypage-v6.c | 4 +- + arch/arm/mm/copypage-xsc3.c | 3 +- + arch/arm/mm/copypage-xscale.c | 2 +- + arch/arm/mm/dma-mapping.c | 159 +++++++++++++++++++----------------- + arch/arm/mm/flush.c | 51 ++++++++++-- + arch/arm/mm/ioremap.c | 57 ++++++++----- + arch/arm/mm/nommu.c | 12 +++ + arch/arm/mm/proc-arm1020.S | 32 ++++++- + arch/arm/mm/proc-arm1020e.S | 32 ++++++- + arch/arm/mm/proc-arm1022.S | 32 ++++++- + arch/arm/mm/proc-arm1026.S | 32 ++++++- + arch/arm/mm/proc-arm920.S | 32 ++++++- + arch/arm/mm/proc-arm922.S | 32 ++++++- + arch/arm/mm/proc-arm925.S | 32 ++++++- + arch/arm/mm/proc-arm926.S | 32 ++++++- + arch/arm/mm/proc-arm940.S | 32 ++++++- + arch/arm/mm/proc-arm946.S | 32 ++++++- + arch/arm/mm/proc-feroceon.S | 54 ++++++++++-- + arch/arm/mm/proc-mohawk.S | 32 ++++++- + arch/arm/mm/proc-xsc3.S | 32 ++++++- + arch/arm/mm/proc-xscale.S | 49 ++++++++++-- + arch/arm/plat-iop/io.c | 3 +- + arch/arm/plat-omap/io.c | 2 +- + 45 files changed, 900 insertions(+), 329 deletions(-) +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/davinci_emac.c +Merge made by recursive. + arch/arm/Kconfig | 1 + + arch/arm/mach-davinci/Kconfig | 4 + + arch/arm/mach-davinci/board-da830-evm.c | 4 +- + arch/arm/mach-davinci/board-da850-evm.c | 17 ++- + arch/arm/mach-davinci/board-dm646x-evm.c | 112 ++++++++++------ + arch/arm/mach-davinci/clock.c | 142 +++++++------------ + arch/arm/mach-davinci/clock.h | 29 ++++- + arch/arm/mach-davinci/common.c | 2 +- + arch/arm/mach-davinci/cp_intc.c | 11 ++ + arch/arm/mach-davinci/cpuidle.c | 38 +----- + arch/arm/mach-davinci/da830.c | 10 +- + arch/arm/mach-davinci/da850.c | 47 +++++-- + arch/arm/mach-davinci/devices-da8xx.c | 28 ++++- + arch/arm/mach-davinci/dm355.c | 4 +- + arch/arm/mach-davinci/dm365.c | 4 +- + arch/arm/mach-davinci/dm644x.c | 8 +- + arch/arm/mach-davinci/dm646x.c | 11 +- + arch/arm/mach-davinci/include/mach/cpuidle.h | 1 + + arch/arm/mach-davinci/include/mach/da8xx.h | 14 ++- + arch/arm/mach-davinci/include/mach/dm365.h | 2 +- + arch/arm/mach-davinci/include/mach/dm644x.h | 2 +- + arch/arm/mach-davinci/include/mach/dm646x.h | 4 +- + arch/arm/mach-davinci/include/mach/memory.h | 4 + + arch/arm/mach-davinci/include/mach/psc.h | 15 ++ + arch/arm/mach-davinci/include/mach/timex.h | 7 +- + arch/arm/mach-davinci/psc.c | 17 +-- + drivers/net/Kconfig | 2 +- + drivers/net/davinci_emac.c | 55 +++++--- + .../mach/emac.h => include/linux/davinci_emac.h | 7 +- + 29 files changed, 348 insertions(+), 254 deletions(-) + rename arch/arm/mach-davinci/include/mach/emac.h => include/linux/davinci_emac.h (83%) +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Auto-merging arch/arm/plat-omap/io.c +Merge made by recursive. + arch/arm/mach-omap1/clock_data.c | 4 +- + arch/arm/mach-omap2/clock34xx.c | 1 - + arch/arm/mach-omap2/clock34xx_data.c | 6 ++++- + arch/arm/mach-omap2/clockdomain.c | 4 +- + arch/arm/mach-omap2/io.c | 19 ++++++++--------- + arch/arm/plat-omap/clock.c | 6 ----- + arch/arm/plat-omap/include/plat/io.h | 36 +++++++++++++++------------------ + arch/arm/plat-omap/io.c | 12 +++++----- + 8 files changed, 40 insertions(+), 48 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Auto-merging arch/arm/plat-s3c64xx/Kconfig +Merge made by recursive. + arch/arm/mach-s3c2412/clock.c | 52 ++- + arch/arm/mach-s3c2440/clock.c | 6 +- + arch/arm/mach-s3c2442/clock.c | 6 +- + arch/arm/mach-s3c2443/clock.c | 88 +++-- + arch/arm/plat-s3c/clock.c | 31 +- + arch/arm/plat-s3c/pwm-clock.c | 94 ++-- + arch/arm/plat-s3c24xx/clock-dclk.c | 22 +- + arch/arm/plat-s3c24xx/s3c244x-clock.c | 4 +- + arch/arm/plat-s3c64xx/Kconfig | 1 + + arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 71 +--- + arch/arm/plat-s3c64xx/s3c6400-clock.c | 510 ++++++-------------- + arch/arm/plat-s5pc1xx/clock.c | 8 +- + arch/arm/plat-s5pc1xx/s5pc100-clock.c | 126 ++--- + arch/arm/plat-samsung/Kconfig | 5 + + arch/arm/plat-samsung/Makefile | 1 + + arch/arm/plat-samsung/clock-clksrc.c | 184 +++++++ + arch/arm/plat-samsung/include/plat/clock-clksrc.h | 83 ++++ + .../include/plat/clock.h | 29 +- + 18 files changed, 686 insertions(+), 635 deletions(-) + create mode 100644 arch/arm/plat-samsung/clock-clksrc.c + create mode 100644 arch/arm/plat-samsung/include/plat/clock-clksrc.h + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/clock.h (78%) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Auto-merging arch/cris/kernel/irq.c +Merge made by recursive. + arch/cris/arch-v10/kernel/irq.c | 2 +- + arch/cris/arch-v32/kernel/irq.c | 2 +- + arch/cris/arch-v32/kernel/pinmux.c | 4 ++-- + arch/cris/arch-v32/mach-a3/pinmux.c | 2 +- + arch/cris/arch-v32/mach-fs/pinmux.c | 4 ++-- + arch/cris/kernel/irq.c | 2 +- + 6 files changed, 8 insertions(+), 8 deletions(-) +Merging ia64/test +$ git merge ia64/test +Auto-merging arch/ia64/kernel/Makefile +Merge made by recursive. + arch/ia64/Kconfig | 6 ++ + arch/ia64/Kconfig.debug | 3 + + arch/ia64/include/asm/irqflags.h | 101 ++++++++++++++++++++++++++++++++++++ + arch/ia64/include/asm/page.h | 2 +- + arch/ia64/include/asm/rwsem.h | 27 +++++++--- + arch/ia64/include/asm/stacktrace.h | 7 +++ + arch/ia64/include/asm/system.h | 84 +----------------------------- + arch/ia64/kernel/Makefile | 1 + + arch/ia64/kernel/entry.S | 6 ++ + arch/ia64/kernel/ivt.S | 29 ++++++++++ + arch/ia64/kernel/process.c | 6 +- + arch/ia64/kernel/setup.c | 4 ++ + arch/ia64/kernel/smpboot.c | 2 +- + arch/ia64/kernel/stacktrace.c | 24 +++++++++ + arch/ia64/kernel/time.c | 4 +- + include/linux/lockdep.h | 2 +- + 16 files changed, 209 insertions(+), 99 deletions(-) + create mode 100644 arch/ia64/include/asm/irqflags.h + create mode 100644 arch/ia64/include/asm/stacktrace.h + create mode 100644 arch/ia64/kernel/stacktrace.c +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Already up-to-date. +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Removing arch/mips/alchemy/common/puts.c +Removing arch/mips/alchemy/common/reset.c +Removing arch/mips/alchemy/devboards/db1x00/irqmap.c +Removing arch/mips/alchemy/devboards/pb1200/irqmap.c +Removing arch/mips/alchemy/mtx-1/irqmap.c +Removing arch/mips/alchemy/xxs1500/irqmap.c +Removing arch/mips/include/asm/mach-pb1x00/pb1100.h +Removing arch/mips/include/asm/mach-pb1x00/pb1500.h +Removing drivers/mtd/maps/alchemy-flash.c +Removing drivers/pcmcia/au1000_db1x00.c +Removing drivers/pcmcia/au1000_xxs1500.c +Removing sound/soc/au1x/sample-ac97.c +Merge made by recursive. + arch/mips/alchemy/Kconfig | 28 +- + arch/mips/alchemy/common/Makefile | 7 +- + arch/mips/alchemy/common/dbdma.c | 74 +- + arch/mips/alchemy/common/dma.c | 36 +- + arch/mips/alchemy/common/gpiolib-au1000.c | 10 +- + arch/mips/alchemy/common/irq.c | 436 ++++---- + arch/mips/alchemy/common/platform.c | 152 ++- + arch/mips/alchemy/common/puts.c | 68 - + arch/mips/alchemy/common/reset.c | 188 --- + arch/mips/alchemy/common/setup.c | 12 +- + arch/mips/alchemy/common/time.c | 35 +- + arch/mips/alchemy/devboards/Makefile | 6 +- + arch/mips/alchemy/devboards/bcsr.c | 148 +++ + arch/mips/alchemy/devboards/db1200/Makefile | 1 + + arch/mips/alchemy/devboards/db1200/platform.c | 561 ++++++++ + arch/mips/alchemy/devboards/db1200/setup.c | 118 ++ + arch/mips/alchemy/devboards/db1x00/Makefile | 2 +- + arch/mips/alchemy/devboards/db1x00/board_setup.c | 185 +++- + arch/mips/alchemy/devboards/db1x00/irqmap.c | 90 -- + arch/mips/alchemy/devboards/db1x00/platform.c | 118 ++ + arch/mips/alchemy/devboards/pb1000/board_setup.c | 30 +- + arch/mips/alchemy/devboards/pb1100/Makefile | 3 +- + arch/mips/alchemy/devboards/pb1100/board_setup.c | 32 +- + arch/mips/alchemy/devboards/pb1100/platform.c | 50 + + arch/mips/alchemy/devboards/pb1200/Makefile | 2 +- + arch/mips/alchemy/devboards/pb1200/board_setup.c | 84 +- + arch/mips/alchemy/devboards/pb1200/irqmap.c | 134 -- + arch/mips/alchemy/devboards/pb1200/platform.c | 63 +- + arch/mips/alchemy/devboards/pb1500/Makefile | 3 +- + arch/mips/alchemy/devboards/pb1500/board_setup.c | 40 +- + arch/mips/alchemy/devboards/pb1500/platform.c | 49 + + arch/mips/alchemy/devboards/pb1550/Makefile | 3 +- + arch/mips/alchemy/devboards/pb1550/board_setup.c | 45 +- + arch/mips/alchemy/devboards/pb1550/platform.c | 69 + + arch/mips/alchemy/devboards/platform.c | 222 ++++ + arch/mips/alchemy/devboards/platform.h | 21 + + arch/mips/alchemy/devboards/prom.c | 5 + + arch/mips/alchemy/mtx-1/Makefile | 2 +- + arch/mips/alchemy/mtx-1/board_setup.c | 39 +- + arch/mips/alchemy/mtx-1/init.c | 6 + + arch/mips/alchemy/mtx-1/irqmap.c | 56 - + arch/mips/alchemy/xxs1500/Makefile | 4 +- + arch/mips/alchemy/xxs1500/board_setup.c | 52 +- + arch/mips/alchemy/xxs1500/init.c | 6 + + arch/mips/alchemy/xxs1500/irqmap.c | 52 - + arch/mips/alchemy/xxs1500/platform.c | 63 + + arch/mips/configs/db1200_defconfig | 1481 +++++++++++++--------- + arch/mips/include/asm/mach-au1x00/au1000.h | 884 ++++++------- + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 23 +- + arch/mips/include/asm/mach-au1x00/au1xxx_eth.h | 18 + + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 164 ++-- + arch/mips/include/asm/mach-au1x00/gpio.h | 2 +- + arch/mips/include/asm/mach-db1x00/bcsr.h | 238 ++++ + arch/mips/include/asm/mach-db1x00/db1200.h | 156 +--- + arch/mips/include/asm/mach-db1x00/db1x00.h | 100 -- + arch/mips/include/asm/mach-pb1x00/pb1100.h | 85 -- + arch/mips/include/asm/mach-pb1x00/pb1200.h | 122 +-- + arch/mips/include/asm/mach-pb1x00/pb1500.h | 49 - + arch/mips/include/asm/mach-pb1x00/pb1550.h | 96 -- + arch/mips/include/asm/page.h | 12 - + arch/mips/include/asm/pgalloc.h | 4 +- + arch/mips/include/asm/pgtable-64.h | 36 +- + arch/mips/include/asm/pgtable.h | 2 +- + arch/mips/kernel/asm-offsets.c | 4 + + arch/mips/kernel/linux32.c | 1 - + arch/mips/kernel/rtlx.c | 1 - + arch/mips/kernel/vpe.c | 1 - + arch/mips/mm/init.c | 2 +- + arch/mips/mm/pgtable-64.c | 44 +- + arch/mips/mm/tlbex.c | 2 + + arch/mips/sibyte/common/sb_tbprof.c | 1 - + drivers/ide/au1xxx-ide.c | 21 +- + drivers/mmc/host/au1xmmc.c | 8 +- + drivers/mtd/maps/Kconfig | 6 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/alchemy-flash.c | 166 --- + drivers/mtd/nand/au1550nd.c | 4 +- + drivers/net/au1000_eth.c | 449 ++++---- + drivers/net/au1000_eth.h | 9 + + drivers/net/irda/au1k_ir.c | 14 +- + drivers/pcmcia/Kconfig | 21 + + drivers/pcmcia/Makefile | 12 +- + drivers/pcmcia/au1000_db1x00.c | 305 ----- + drivers/pcmcia/au1000_generic.h | 12 +- + drivers/pcmcia/au1000_pb1x00.c | 119 +-- + drivers/pcmcia/au1000_xxs1500.c | 188 --- + drivers/pcmcia/db1xxx_ss.c | 630 +++++++++ + drivers/pcmcia/xxs1500_ss.c | 357 ++++++ + drivers/serial/8250.c | 15 +- + drivers/spi/au1550_spi.c | 6 +- + drivers/video/tdfxfb.c | 4 +- + sound/oss/au1550_ac97.c | 16 +- + sound/soc/au1x/Kconfig | 10 +- + sound/soc/au1x/Makefile | 4 +- + sound/soc/au1x/db1200.c | 141 ++ + sound/soc/au1x/dbdma2.c | 14 +- + sound/soc/au1x/sample-ac97.c | 144 --- + 97 files changed, 5452 insertions(+), 4162 deletions(-) + delete mode 100644 arch/mips/alchemy/common/puts.c + delete mode 100644 arch/mips/alchemy/common/reset.c + create mode 100644 arch/mips/alchemy/devboards/bcsr.c + create mode 100644 arch/mips/alchemy/devboards/db1200/Makefile + create mode 100644 arch/mips/alchemy/devboards/db1200/platform.c + create mode 100644 arch/mips/alchemy/devboards/db1200/setup.c + delete mode 100644 arch/mips/alchemy/devboards/db1x00/irqmap.c + create mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c + create mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c + delete mode 100644 arch/mips/alchemy/devboards/pb1200/irqmap.c + create mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c + create mode 100644 arch/mips/alchemy/devboards/pb1550/platform.c + create mode 100644 arch/mips/alchemy/devboards/platform.c + create mode 100644 arch/mips/alchemy/devboards/platform.h + delete mode 100644 arch/mips/alchemy/mtx-1/irqmap.c + delete mode 100644 arch/mips/alchemy/xxs1500/irqmap.c + create mode 100644 arch/mips/alchemy/xxs1500/platform.c + create mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx_eth.h + create mode 100644 arch/mips/include/asm/mach-db1x00/bcsr.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1100.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1500.h + delete mode 100644 drivers/mtd/maps/alchemy-flash.c + delete mode 100644 drivers/pcmcia/au1000_db1x00.c + delete mode 100644 drivers/pcmcia/au1000_xxs1500.c + create mode 100644 drivers/pcmcia/db1xxx_ss.c + create mode 100644 drivers/pcmcia/xxs1500_ss.c + create mode 100644 sound/soc/au1x/db1200.c + delete mode 100644 sound/soc/au1x/sample-ac97.c +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Merge made by recursive. + arch/powerpc/configs/52xx/cm5200_defconfig | 75 ++++++++++++++---- + arch/powerpc/configs/52xx/lite5200b_defconfig | 90 +++++++++++++++++----- + arch/powerpc/configs/52xx/motionpro_defconfig | 79 ++++++++++++++++--- + arch/powerpc/configs/52xx/pcm030_defconfig | 83 +++++++++++++++----- + arch/powerpc/configs/52xx/tqm5200_defconfig | 79 +++++++++++++++---- + arch/powerpc/configs/mpc5200_defconfig | 105 ++++++++++++++++++++----- + 6 files changed, 412 insertions(+), 99 deletions(-) +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/include/asm/dma.h | 6 ++- + arch/sh/include/asm/pgalloc.h | 28 ++++------------ + arch/sh/include/asm/pgalloc_nopmd.h | 30 +++++++++++++++++ + arch/sh/include/asm/pgalloc_pmd.h | 41 +++++++++++++++++++++++ + arch/sh/include/asm/pgtable.h | 22 +++---------- + arch/sh/include/asm/pgtable_nopmd.h | 22 +++++++++++++ + arch/sh/include/asm/pgtable_pmd.h | 55 ++++++++++++++++++++++++++++++++ + arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | 8 ++-- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 15 +++++++++ + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 14 ++++++++ + arch/sh/kernel/idle.c | 2 + + arch/sh/mm/Kconfig | 24 ++++++++++++-- + arch/sh/mm/fault_32.c | 3 ++ + arch/sh/mm/init.c | 6 +++ + 14 files changed, 229 insertions(+), 47 deletions(-) + create mode 100644 arch/sh/include/asm/pgalloc_nopmd.h + create mode 100644 arch/sh/include/asm/pgalloc_pmd.h + create mode 100644 arch/sh/include/asm/pgtable_nopmd.h + create mode 100644 arch/sh/include/asm/pgtable_pmd.h +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +Merging ceph/for-next +$ git merge ceph/for-next +Auto-merging MAINTAINERS +Auto-merging fs/Kconfig +Merge made by recursive. + Documentation/filesystems/ceph.txt | 139 ++ + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 9 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ceph/Kconfig | 26 + + fs/ceph/Makefile | 37 + + fs/ceph/README | 20 + + fs/ceph/addr.c | 1115 +++++++++++++ + fs/ceph/auth.c | 225 +++ + fs/ceph/auth.h | 77 + + fs/ceph/auth_none.c | 120 ++ + fs/ceph/auth_none.h | 28 + + fs/ceph/buffer.c | 61 + + fs/ceph/buffer.h | 37 + + fs/ceph/caps.c | 2863 ++++++++++++++++++++++++++++++++ + fs/ceph/ceph_debug.h | 37 + + fs/ceph/ceph_frag.c | 21 + + fs/ceph/ceph_frag.h | 109 ++ + fs/ceph/ceph_fs.c | 74 + + fs/ceph/ceph_fs.h | 648 ++++++++ + fs/ceph/ceph_hash.c | 118 ++ + fs/ceph/ceph_hash.h | 13 + + fs/ceph/ceph_strings.c | 176 ++ + fs/ceph/crush/crush.c | 151 ++ + fs/ceph/crush/crush.h | 180 ++ + fs/ceph/crush/hash.c | 149 ++ + fs/ceph/crush/hash.h | 17 + + fs/ceph/crush/mapper.c | 596 +++++++ + fs/ceph/crush/mapper.h | 20 + + fs/ceph/debugfs.c | 450 +++++ + fs/ceph/decode.h | 159 ++ + fs/ceph/dir.c | 1222 ++++++++++++++ + fs/ceph/export.c | 223 +++ + fs/ceph/file.c | 904 +++++++++++ + fs/ceph/inode.c | 1627 +++++++++++++++++++ + fs/ceph/ioctl.c | 160 ++ + fs/ceph/ioctl.h | 40 + + fs/ceph/mds_client.c | 2975 ++++++++++++++++++++++++++++++++++ + fs/ceph/mds_client.h | 332 ++++ + fs/ceph/mdsmap.c | 170 ++ + fs/ceph/mdsmap.h | 54 + + fs/ceph/messenger.c | 2092 ++++++++++++++++++++++++ + fs/ceph/messenger.h | 256 +++ + fs/ceph/mon_client.c | 751 +++++++++ + fs/ceph/mon_client.h | 115 ++ + fs/ceph/msgpool.c | 181 ++ + fs/ceph/msgpool.h | 27 + + fs/ceph/msgr.h | 167 ++ + fs/ceph/osd_client.c | 1363 ++++++++++++++++ + fs/ceph/osd_client.h | 155 ++ + fs/ceph/osdmap.c | 916 +++++++++++ + fs/ceph/osdmap.h | 124 ++ + fs/ceph/rados.h | 370 +++++ + fs/ceph/snap.c | 887 ++++++++++ + fs/ceph/super.c | 984 +++++++++++ + fs/ceph/super.h | 895 ++++++++++ + fs/ceph/types.h | 29 + + fs/ceph/xattr.c | 844 ++++++++++ + 59 files changed, 25541 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/ceph.txt + create mode 100644 fs/ceph/Kconfig + create mode 100644 fs/ceph/Makefile + create mode 100644 fs/ceph/README + create mode 100644 fs/ceph/addr.c + create mode 100644 fs/ceph/auth.c + create mode 100644 fs/ceph/auth.h + create mode 100644 fs/ceph/auth_none.c + create mode 100644 fs/ceph/auth_none.h + create mode 100644 fs/ceph/buffer.c + create mode 100644 fs/ceph/buffer.h + create mode 100644 fs/ceph/caps.c + create mode 100644 fs/ceph/ceph_debug.h + create mode 100644 fs/ceph/ceph_frag.c + create mode 100644 fs/ceph/ceph_frag.h + create mode 100644 fs/ceph/ceph_fs.c + create mode 100644 fs/ceph/ceph_fs.h + create mode 100644 fs/ceph/ceph_hash.c + create mode 100644 fs/ceph/ceph_hash.h + create mode 100644 fs/ceph/ceph_strings.c + create mode 100644 fs/ceph/crush/crush.c + create mode 100644 fs/ceph/crush/crush.h + create mode 100644 fs/ceph/crush/hash.c + create mode 100644 fs/ceph/crush/hash.h + create mode 100644 fs/ceph/crush/mapper.c + create mode 100644 fs/ceph/crush/mapper.h + create mode 100644 fs/ceph/debugfs.c + create mode 100644 fs/ceph/decode.h + create mode 100644 fs/ceph/dir.c + create mode 100644 fs/ceph/export.c + create mode 100644 fs/ceph/file.c + create mode 100644 fs/ceph/inode.c + create mode 100644 fs/ceph/ioctl.c + create mode 100644 fs/ceph/ioctl.h + create mode 100644 fs/ceph/mds_client.c + create mode 100644 fs/ceph/mds_client.h + create mode 100644 fs/ceph/mdsmap.c + create mode 100644 fs/ceph/mdsmap.h + create mode 100644 fs/ceph/messenger.c + create mode 100644 fs/ceph/messenger.h + create mode 100644 fs/ceph/mon_client.c + create mode 100644 fs/ceph/mon_client.h + create mode 100644 fs/ceph/msgpool.c + create mode 100644 fs/ceph/msgpool.h + create mode 100644 fs/ceph/msgr.h + create mode 100644 fs/ceph/osd_client.c + create mode 100644 fs/ceph/osd_client.h + create mode 100644 fs/ceph/osdmap.c + create mode 100644 fs/ceph/osdmap.h + create mode 100644 fs/ceph/rados.h + create mode 100644 fs/ceph/snap.c + create mode 100644 fs/ceph/super.c + create mode 100644 fs/ceph/super.h + create mode 100644 fs/ceph/types.h + create mode 100644 fs/ceph/xattr.c +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/CHANGES | 4 +++- + fs/cifs/cifsfs.c | 3 ++- + fs/cifs/connect.c | 13 +++++++++---- + 3 files changed, 14 insertions(+), 6 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/inode.c +Merge made by recursive. + fs/ecryptfs/file.c | 14 +++--- + fs/ecryptfs/inode.c | 118 +++++++++++++++++++++++++++++++++++---------------- + 2 files changed, 88 insertions(+), 44 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Merge made by recursive. + fs/ext4/Kconfig | 2 +- + fs/ext4/block_validity.c | 1 - + fs/ext4/extents.c | 8 +++++++- + fs/ext4/mballoc.h | 1 - + 4 files changed, 8 insertions(+), 4 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Auto-merging Documentation/filesystems/00-INDEX +Auto-merging MAINTAINERS +Auto-merging fs/Kconfig +Auto-merging fs/Makefile +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Merge made by recursive. + Documentation/filesystems/00-INDEX | 2 + + Documentation/filesystems/logfs.txt | 241 ++++ + MAINTAINERS | 7 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/logfs/Kconfig | 17 + + fs/logfs/Makefile | 13 + + fs/logfs/compr.c | 95 ++ + fs/logfs/dev_bdev.c | 263 ++++ + fs/logfs/dev_mtd.c | 253 ++++ + fs/logfs/dir.c | 827 +++++++++++++ + fs/logfs/file.c | 263 ++++ + fs/logfs/gc.c | 730 ++++++++++++ + fs/logfs/inode.c | 417 +++++++ + fs/logfs/journal.c | 879 ++++++++++++++ + fs/logfs/logfs.h | 722 +++++++++++ + fs/logfs/logfs_abi.h | 627 ++++++++++ + fs/logfs/readwrite.c | 2246 +++++++++++++++++++++++++++++++++++ + fs/logfs/segment.c | 924 ++++++++++++++ + fs/logfs/super.c | 634 ++++++++++ + include/linux/btree-128.h | 109 ++ + include/linux/btree-type.h | 147 +++ + include/linux/btree.h | 243 ++++ + lib/Kconfig | 3 + + lib/Makefile | 1 + + lib/btree.c | 797 +++++++++++++ + 26 files changed, 10462 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/logfs.txt + create mode 100644 fs/logfs/Kconfig + create mode 100644 fs/logfs/Makefile + create mode 100644 fs/logfs/compr.c + create mode 100644 fs/logfs/dev_bdev.c + create mode 100644 fs/logfs/dev_mtd.c + create mode 100644 fs/logfs/dir.c + create mode 100644 fs/logfs/file.c + create mode 100644 fs/logfs/gc.c + create mode 100644 fs/logfs/inode.c + create mode 100644 fs/logfs/journal.c + create mode 100644 fs/logfs/logfs.h + create mode 100644 fs/logfs/logfs_abi.h + create mode 100644 fs/logfs/readwrite.c + create mode 100644 fs/logfs/segment.c + create mode 100644 fs/logfs/super.c + create mode 100644 include/linux/btree-128.h + create mode 100644 include/linux/btree-type.h + create mode 100644 include/linux/btree.h + create mode 100644 lib/btree.c +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + net/sunrpc/auth_gss/auth_gss.c | 17 ++++++++++++++++- + net/sunrpc/auth_gss/gss_krb5_mech.c | 4 +++- + net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- + 3 files changed, 20 insertions(+), 3 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/bmap.c | 4 ++-- + fs/nilfs2/cpfile.c | 31 ++++++++++++++++++------------- + fs/nilfs2/direct.c | 17 +++++++++-------- + fs/nilfs2/ioctl.c | 2 +- + 4 files changed, 30 insertions(+), 24 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Resolved 'fs/ocfs2/file.c' using previous resolution. +Auto-merging fs/ocfs2/acl.c +Auto-merging fs/ocfs2/file.c +CONFLICT (content): Merge conflict in fs/ocfs2/file.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/ocfs2/xattr.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 68d519c] Merge remote branch 'ocfs2/linux-next' +$ git diff -M --stat --summary HEAD^.. + fs/ocfs2/Kconfig | 10 +---- + fs/ocfs2/Makefile | 7 +-- + fs/ocfs2/acl.c | 4 -- + fs/ocfs2/acl.h | 22 --------- + fs/ocfs2/cluster/nodemanager.c | 51 +++++++++++++++++++++ + fs/ocfs2/cluster/nodemanager.h | 7 +++ + fs/ocfs2/cluster/quorum.c | 16 ++++++- + fs/ocfs2/dlm/dlmrecovery.c | 18 ++++---- + fs/ocfs2/extent_map.c | 2 + + fs/ocfs2/file.c | 21 ++++++--- + fs/ocfs2/namei.c | 1 + + fs/ocfs2/ocfs2.h | 8 ++- + fs/ocfs2/ocfs2_fs.h | 2 +- + fs/ocfs2/stack_user.c | 2 +- + fs/ocfs2/super.c | 95 ++++++++++++++++++++-------------------- + fs/ocfs2/xattr.c | 4 -- + fs/ocfs2/xattr.h | 2 - + include/linux/fiemap.h | 2 + + 18 files changed, 159 insertions(+), 115 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Resolved 'fs/9p/cache.c' using previous resolution. +Auto-merging fs/9p/cache.c +CONFLICT (add/add): Merge conflict in fs/9p/cache.c +Auto-merging fs/9p/vfs_inode.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8dd0cc1] Merge remote branch 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Resolved 'fs/xfs/linux-2.6/xfs_trace.h' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Auto-merging fs/xfs/linux-2.6/xfs_acl.c +Auto-merging fs/xfs/linux-2.6/xfs_aops.c +Auto-merging fs/xfs/linux-2.6/xfs_iops.c +Auto-merging fs/xfs/linux-2.6/xfs_lrw.c +Auto-merging fs/xfs/linux-2.6/xfs_trace.h +CONFLICT (add/add): Merge conflict in fs/xfs/linux-2.6/xfs_trace.h +Auto-merging fs/xfs/quota/xfs_dquot.h +Auto-merging fs/xfs/xfs_iget.c +Auto-merging fs/xfs/xfs_log_recover.c +Auto-merging fs/xfs/xfs_mount.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master be7628f] Merge remote branch 'xfs/master' +$ git diff -M --stat --summary HEAD^.. + fs/xfs/linux-2.6/xfs_trace.h | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging reiserfs-bkl/reiserfs/kill-bkl +$ git merge reiserfs-bkl/reiserfs/kill-bkl +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/reiserfs/xattr.c +Auto-merging include/linux/reiserfs_fs.h +Merge made by recursive. + fs/reiserfs/bitmap.c | 3 +++ + fs/reiserfs/inode.c | 5 +++-- + fs/reiserfs/xattr.c | 3 ++- + include/linux/reiserfs_fs.h | 9 +++++++++ + 4 files changed, 17 insertions(+), 3 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/Kconfig | 6 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-3m-pct.c | 291 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-core.c | 4 +- + drivers/hid/hid-ids.h | 10 +- + drivers/hid/hid-samsung.c | 25 +++- + 6 files changed, 325 insertions(+), 12 deletions(-) + create mode 100644 drivers/hid/hid-3m-pct.c +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/busses/i2c-scmi.c | 33 +++++++++++++++++++++++++-------- + 1 files changed, 25 insertions(+), 8 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/k10temp | 17 ++- + drivers/hwmon/adt7462.c | 2 +- + drivers/hwmon/asus_atk0110.c | 289 ++++++++++++++++++++++++++++++++++-------- + drivers/hwmon/k10temp.c | 38 +++++- + 4 files changed, 279 insertions(+), 67 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/DocBook/mtdnand.tmpl | 12 ++++++------ + Documentation/IO-mapping.txt | 2 +- + .../{DMA-mapping.txt => PCI/PCI-DMA-mapping.txt} | 0 + Documentation/block/biodoc.txt | 2 +- + fs/fs-writeback.c | 1 + + 5 files changed, 9 insertions(+), 8 deletions(-) + rename Documentation/{DMA-mapping.txt => PCI/PCI-DMA-mapping.txt} (100%) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + Documentation/video4linux/gspca.txt | 1 + + drivers/media/IR/Makefile | 2 +- + drivers/media/IR/ir-functions.c | 2 +- + drivers/media/IR/ir-keytable.c | 45 +- + drivers/media/IR/ir-sysfs.c | 210 +++ + drivers/media/common/tuners/tuner-xc2028.c | 20 +- + drivers/media/common/tuners/tuner-xc2028.h | 2 + + drivers/media/dvb/Kconfig | 4 + + drivers/media/dvb/Makefile | 14 +- + drivers/media/dvb/dm1105/dm1105.c | 4 +- + drivers/media/dvb/dvb-usb/dw2102.c | 94 ++- + drivers/media/dvb/frontends/Kconfig | 19 + + drivers/media/dvb/frontends/Makefile | 2 + + drivers/media/dvb/frontends/dib8000.h | 2 +- + drivers/media/dvb/frontends/lgdt3305.h | 6 +- + drivers/media/dvb/frontends/mb86a16.c | 1878 +++++++++++++++++++++++++++ + drivers/media/dvb/frontends/mb86a16.h | 52 + + drivers/media/dvb/frontends/mb86a16_priv.h | 151 +++ + drivers/media/dvb/frontends/stv0900.h | 2 + + drivers/media/dvb/frontends/stv0900_core.c | 87 ++- + drivers/media/dvb/frontends/stv0900_priv.h | 11 + + drivers/media/dvb/frontends/stv0900_reg.h | 6 + + drivers/media/dvb/frontends/stv0900_sw.c | 44 +- + drivers/media/dvb/frontends/tda10021.c | 4 + + drivers/media/dvb/frontends/tda665x.c | 257 ++++ + drivers/media/dvb/frontends/tda665x.h | 52 + + drivers/media/dvb/mantis/Kconfig | 32 + + drivers/media/dvb/mantis/Makefile | 28 + + drivers/media/dvb/mantis/hopper_cards.c | 275 ++++ + drivers/media/dvb/mantis/hopper_vp3028.c | 88 ++ + drivers/media/dvb/mantis/hopper_vp3028.h | 30 + + drivers/media/dvb/mantis/mantis_ca.c | 207 +++ + drivers/media/dvb/mantis/mantis_ca.h | 27 + + drivers/media/dvb/mantis/mantis_cards.c | 305 +++++ + drivers/media/dvb/mantis/mantis_common.h | 179 +++ + drivers/media/dvb/mantis/mantis_core.c | 238 ++++ + drivers/media/dvb/mantis/mantis_core.h | 57 + + drivers/media/dvb/mantis/mantis_dma.c | 256 ++++ + drivers/media/dvb/mantis/mantis_dma.h | 30 + + drivers/media/dvb/mantis/mantis_dvb.c | 296 +++++ + drivers/media/dvb/mantis/mantis_dvb.h | 35 + + drivers/media/dvb/mantis/mantis_evm.c | 117 ++ + drivers/media/dvb/mantis/mantis_hif.c | 240 ++++ + drivers/media/dvb/mantis/mantis_hif.h | 29 + + drivers/media/dvb/mantis/mantis_i2c.c | 267 ++++ + drivers/media/dvb/mantis/mantis_i2c.h | 30 + + drivers/media/dvb/mantis/mantis_input.c | 148 +++ + drivers/media/dvb/mantis/mantis_ioc.c | 130 ++ + drivers/media/dvb/mantis/mantis_ioc.h | 51 + + drivers/media/dvb/mantis/mantis_link.h | 83 ++ + drivers/media/dvb/mantis/mantis_pci.c | 177 +++ + drivers/media/dvb/mantis/mantis_pci.h | 27 + + drivers/media/dvb/mantis/mantis_pcmcia.c | 120 ++ + drivers/media/dvb/mantis/mantis_reg.h | 197 +++ + drivers/media/dvb/mantis/mantis_uart.c | 186 +++ + drivers/media/dvb/mantis/mantis_uart.h | 58 + + drivers/media/dvb/mantis/mantis_vp1033.c | 212 +++ + drivers/media/dvb/mantis/mantis_vp1033.h | 30 + + drivers/media/dvb/mantis/mantis_vp1034.c | 119 ++ + drivers/media/dvb/mantis/mantis_vp1034.h | 33 + + drivers/media/dvb/mantis/mantis_vp1041.c | 358 +++++ + drivers/media/dvb/mantis/mantis_vp1041.h | 33 + + drivers/media/dvb/mantis/mantis_vp2033.c | 187 +++ + drivers/media/dvb/mantis/mantis_vp2033.h | 30 + + drivers/media/dvb/mantis/mantis_vp2040.c | 186 +++ + drivers/media/dvb/mantis/mantis_vp2040.h | 32 + + drivers/media/dvb/mantis/mantis_vp3028.c | 38 + + drivers/media/dvb/mantis/mantis_vp3028.h | 33 + + drivers/media/dvb/mantis/mantis_vp3030.c | 105 ++ + drivers/media/dvb/mantis/mantis_vp3030.h | 30 + + drivers/media/dvb/ttpci/budget-ci.c | 2 +- + drivers/media/video/bt8xx/bttv-input.c | 4 +- + drivers/media/video/cx231xx/cx231xx-input.c | 2 +- + drivers/media/video/cx23885/cx23885-input.c | 2 +- + drivers/media/video/cx88/cx88-input.c | 4 +- + drivers/media/video/em28xx/em28xx-input.c | 83 +- + drivers/media/video/gspca/gspca.c | 2 + + drivers/media/video/gspca/ov534.c | 2 +- + drivers/media/video/gspca/sunplus.c | 1 + + drivers/media/video/ir-kbd-i2c.c | 4 +- + drivers/media/video/saa7134/saa7134-input.c | 4 +- + drivers/media/video/uvc/uvc_ctrl.c | 2 +- + drivers/media/video/uvc/uvc_driver.c | 65 +- + drivers/media/video/uvc/uvc_queue.c | 14 +- + drivers/media/video/uvc/uvc_video.c | 55 +- + drivers/media/video/uvc/uvcvideo.h | 9 +- + drivers/staging/tm6000/Kconfig | 32 + + drivers/staging/tm6000/Makefile | 15 + + drivers/staging/tm6000/README | 11 + + drivers/staging/tm6000/hack.c | 252 ++++ + drivers/staging/tm6000/hack.h | 45 + + drivers/staging/tm6000/tm6000-alsa.c | 413 ++++++ + drivers/staging/tm6000/tm6000-cards.c | 662 ++++++++++ + drivers/staging/tm6000/tm6000-core.c | 511 ++++++++ + drivers/staging/tm6000/tm6000-dvb.c | 322 +++++ + drivers/staging/tm6000/tm6000-i2c.c | 245 ++++ + drivers/staging/tm6000/tm6000-regs.h | 86 ++ + drivers/staging/tm6000/tm6000-stds.c | 873 +++++++++++++ + drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + + drivers/staging/tm6000/tm6000-video.c | 1550 ++++++++++++++++++++++ + drivers/staging/tm6000/tm6000.h | 278 ++++ + include/linux/videodev2.h | 1 + + include/media/ir-common.h | 4 +- + include/media/ir-core.h | 42 +- + include/media/ir-kbd-i2c.h | 2 +- + 105 files changed, 13855 insertions(+), 137 deletions(-) + create mode 100644 drivers/media/IR/ir-sysfs.c + create mode 100644 drivers/media/dvb/frontends/mb86a16.c + create mode 100644 drivers/media/dvb/frontends/mb86a16.h + create mode 100644 drivers/media/dvb/frontends/mb86a16_priv.h + create mode 100644 drivers/media/dvb/frontends/tda665x.c + create mode 100644 drivers/media/dvb/frontends/tda665x.h + create mode 100644 drivers/media/dvb/mantis/Kconfig + create mode 100644 drivers/media/dvb/mantis/Makefile + create mode 100644 drivers/media/dvb/mantis/hopper_cards.c + create mode 100644 drivers/media/dvb/mantis/hopper_vp3028.c + create mode 100644 drivers/media/dvb/mantis/hopper_vp3028.h + create mode 100644 drivers/media/dvb/mantis/mantis_ca.c + create mode 100644 drivers/media/dvb/mantis/mantis_ca.h + create mode 100644 drivers/media/dvb/mantis/mantis_cards.c + create mode 100644 drivers/media/dvb/mantis/mantis_common.h + create mode 100644 drivers/media/dvb/mantis/mantis_core.c + create mode 100644 drivers/media/dvb/mantis/mantis_core.h + create mode 100644 drivers/media/dvb/mantis/mantis_dma.c + create mode 100644 drivers/media/dvb/mantis/mantis_dma.h + create mode 100644 drivers/media/dvb/mantis/mantis_dvb.c + create mode 100644 drivers/media/dvb/mantis/mantis_dvb.h + create mode 100644 drivers/media/dvb/mantis/mantis_evm.c + create mode 100644 drivers/media/dvb/mantis/mantis_hif.c + create mode 100644 drivers/media/dvb/mantis/mantis_hif.h + create mode 100644 drivers/media/dvb/mantis/mantis_i2c.c + create mode 100644 drivers/media/dvb/mantis/mantis_i2c.h + create mode 100644 drivers/media/dvb/mantis/mantis_input.c + create mode 100644 drivers/media/dvb/mantis/mantis_ioc.c + create mode 100644 drivers/media/dvb/mantis/mantis_ioc.h + create mode 100644 drivers/media/dvb/mantis/mantis_link.h + create mode 100644 drivers/media/dvb/mantis/mantis_pci.c + create mode 100644 drivers/media/dvb/mantis/mantis_pci.h + create mode 100644 drivers/media/dvb/mantis/mantis_pcmcia.c + create mode 100644 drivers/media/dvb/mantis/mantis_reg.h + create mode 100644 drivers/media/dvb/mantis/mantis_uart.c + create mode 100644 drivers/media/dvb/mantis/mantis_uart.h + create mode 100644 drivers/media/dvb/mantis/mantis_vp1033.c + create mode 100644 drivers/media/dvb/mantis/mantis_vp1033.h + create mode 100644 drivers/media/dvb/mantis/mantis_vp1034.c + create mode 100644 drivers/media/dvb/mantis/mantis_vp1034.h + create mode 100644 drivers/media/dvb/mantis/mantis_vp1041.c + create mode 100644 drivers/media/dvb/mantis/mantis_vp1041.h + create mode 100644 drivers/media/dvb/mantis/mantis_vp2033.c + create mode 100644 drivers/media/dvb/mantis/mantis_vp2033.h + create mode 100644 drivers/media/dvb/mantis/mantis_vp2040.c + create mode 100644 drivers/media/dvb/mantis/mantis_vp2040.h + create mode 100644 drivers/media/dvb/mantis/mantis_vp3028.c + create mode 100644 drivers/media/dvb/mantis/mantis_vp3028.h + create mode 100644 drivers/media/dvb/mantis/mantis_vp3030.c + create mode 100644 drivers/media/dvb/mantis/mantis_vp3030.h + create mode 100644 drivers/staging/tm6000/Kconfig + create mode 100644 drivers/staging/tm6000/Makefile + create mode 100644 drivers/staging/tm6000/README + create mode 100644 drivers/staging/tm6000/hack.c + create mode 100644 drivers/staging/tm6000/hack.h + create mode 100644 drivers/staging/tm6000/tm6000-alsa.c + create mode 100644 drivers/staging/tm6000/tm6000-cards.c + create mode 100644 drivers/staging/tm6000/tm6000-core.c + create mode 100644 drivers/staging/tm6000/tm6000-dvb.c + create mode 100644 drivers/staging/tm6000/tm6000-i2c.c + create mode 100644 drivers/staging/tm6000/tm6000-regs.h + create mode 100644 drivers/staging/tm6000/tm6000-stds.c + create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h + create mode 100644 drivers/staging/tm6000/tm6000-video.c + create mode 100644 drivers/staging/tm6000/tm6000.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Already up-to-date. +Merging kconfig/for-next +$ git merge kconfig/for-next +Auto-merging Documentation/dontdiff +Removing scripts/binoffset.c +Merge made by recursive. + Documentation/dontdiff | 1 - + scripts/.gitignore | 1 - + scripts/binoffset.c | 163 ---------------------------------------------- + scripts/extract-ikconfig | 127 ++++++++++++----------------------- + 4 files changed, 44 insertions(+), 248 deletions(-) + delete mode 100644 scripts/binoffset.c +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/ahci.c | 221 ++++++++++++++++++++++++++++++++++++++++---- + drivers/ata/pata_hpt366.c | 21 +--- + drivers/ata/pata_hpt37x.c | 187 +++++++++++++++++-------------------- + drivers/ata/pata_hpt3x2n.c | 118 +++++++++++------------- + 4 files changed, 347 insertions(+), 200 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Resolved 'drivers/platform/x86/sony-laptop.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/ia64/kernel/Makefile +Removing arch/ia64/kernel/acpi-processor.c +Removing arch/x86/kernel/acpi/processor.c +Auto-merging drivers/platform/x86/fujitsu-laptop.c +Auto-merging drivers/platform/x86/sony-laptop.c +CONFLICT (content): Merge conflict in drivers/platform/x86/sony-laptop.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 88b21d1] Merge remote branch 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 5 + + arch/ia64/include/asm/acpi.h | 6 + + arch/ia64/kernel/Makefile | 4 - + arch/ia64/kernel/acpi-processor.c | 85 -------------- + arch/x86/include/asm/acpi.h | 26 +++++ + arch/x86/kernel/acpi/Makefile | 2 +- + arch/x86/kernel/acpi/processor.c | 101 ----------------- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 4 +- + drivers/acpi/Makefile | 1 + + drivers/acpi/blacklist.c | 14 +++ + drivers/acpi/bus.c | 28 ++++-- + drivers/acpi/ec.c | 10 ++- + drivers/acpi/internal.h | 1 + + drivers/acpi/processor_core.c | 71 +------------ + drivers/acpi/processor_pdc.c | 165 ++++++++++++++++++++++++++++ + drivers/platform/x86/fujitsu-laptop.c | 8 +- + drivers/platform/x86/sony-laptop.c | 148 +++++++++++++++++-------- + drivers/platform/x86/tc1100-wmi.c | 115 +++++++++---------- + include/acpi/processor.h | 8 +- + include/linux/sonypi.h | 1 + + 20 files changed, 415 insertions(+), 388 deletions(-) + delete mode 100644 arch/ia64/kernel/acpi-processor.c + delete mode 100644 arch/x86/kernel/acpi/processor.c + create mode 100644 drivers/acpi/processor_pdc.c +$ git am -3 ../patches/0001-acpi-further-update-fo-__kfifo_len-API-change.patch +Applying: acpi: further update fo __kfifo_len API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/platform/x86/sony-laptop.c +$ git add . +$ git commit -v -a --amend +[master 2e2343c] Merge remote branch 'acpi/test' +$ git am -3 ../patches/0001-acpi-another-fix-for-kfifo-API-change.patch +Applying: acpi: another fix for kfifo API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/platform/x86/sony-laptop.c +$ git add . +$ git commit -v -a --amend +[master 2538e67] Merge remote branch 'acpi/test' +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/media/dvb/firewire/firedtv-1394.c | 9 +- + drivers/media/dvb/firewire/firedtv-avc.c | 514 ++++++++++++++++------------- + drivers/media/dvb/firewire/firedtv-dvb.c | 1 - + drivers/media/dvb/firewire/firedtv-fw.c | 2 +- + drivers/media/dvb/firewire/firedtv.h | 6 +- + 5 files changed, 286 insertions(+), 246 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging virt/kvm/kvm_main.c +Merge made by recursive. + Documentation/kvm/api.txt | 10 +++++++++- + arch/ia64/kvm/vcpu.h | 9 ++++++--- + arch/ia64/kvm/vmm.c | 4 ++-- + arch/ia64/kvm/vtlb.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu.c | 22 +++++++++++++++++++++- + arch/x86/include/asm/kvm.h | 4 ++++ + arch/x86/kvm/lapic.c | 1 + + arch/x86/kvm/paging_tmpl.h | 18 ------------------ + arch/x86/kvm/x86.c | 12 ++++++++---- + virt/kvm/assigned-dev.c | 6 +++--- + virt/kvm/kvm_main.c | 5 ++++- + 11 files changed, 59 insertions(+), 34 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/at_hdmac.c +Auto-merging drivers/dma/dw_dmac.c +Merge made by recursive. + crypto/async_tx/raid6test.c | 7 + + drivers/dma/at_hdmac.c | 4 +- + drivers/dma/coh901318.c | 2 +- + drivers/dma/dw_dmac.c | 2 - + drivers/dma/ioat/dma.c | 2 +- + drivers/dma/ioat/dma.h | 18 +++ + drivers/dma/ioat/dma_v2.c | 69 +++++++--- + drivers/dma/ioat/dma_v2.h | 2 + + drivers/dma/ioat/dma_v3.c | 60 ++++++-- + drivers/dma/ioat/registers.h | 1 + + drivers/dma/shdma.c | 324 +++++++++++++++++++++++++++--------------- + drivers/dma/shdma.h | 9 +- + 12 files changed, 341 insertions(+), 159 deletions(-) +Merging net/master +$ git merge net/master +Already uptodate! +Merge made by recursive. +Merging wireless/master +$ git merge wireless/master +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-dev.h +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/iwmc3200wifi/rx.c +Auto-merging drivers/net/wireless/libertas/cmd.c +Auto-merging drivers/net/wireless/libertas/dev.h +Auto-merging drivers/net/wireless/libertas/main.c +Auto-merging drivers/net/wireless/libertas/wext.c +Auto-merging drivers/net/wireless/wl12xx/wl1251_main.c +Auto-merging include/linux/ieee80211.h +Auto-merging include/net/mac80211.h +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/ht.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/main.c +Auto-merging net/mac80211/mesh.c +Auto-merging net/mac80211/mesh_hwmp.c +Auto-merging net/mac80211/mesh_pathtbl.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/scan.c +Auto-merging net/mac80211/util.c +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/wext-compat.c +Merge made by recursive. + Documentation/networking/regulatory.txt | 24 ++ + drivers/net/wireless/ath/ar9170/ar9170.h | 9 +- + drivers/net/wireless/ath/ar9170/hw.h | 1 + + drivers/net/wireless/ath/ar9170/mac.c | 2 +- + drivers/net/wireless/ath/ar9170/main.c | 102 ++++----- + drivers/net/wireless/ath/ar9170/usb.c | 2 + + drivers/net/wireless/ath/ath9k/ath9k.h | 1 - + drivers/net/wireless/ath/ath9k/debug.c | 38 +++- + drivers/net/wireless/ath/ath9k/hw.c | 40 +--- + drivers/net/wireless/ath/ath9k/hw.h | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 21 +-- + drivers/net/wireless/ath/ath9k/rc.h | 4 + + drivers/net/wireless/hostap/hostap_hw.c | 9 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 3 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 251 +++++++++++++++++++---- + drivers/net/wireless/iwlwifi/iwl-calib.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 128 +++++++++--- + drivers/net/wireless/iwlwifi/iwl-core.h | 10 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 105 +++++++++- + drivers/net/wireless/iwlwifi/iwl-dev.h | 30 +++ + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 + + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 44 ++++ + drivers/net/wireless/iwlwifi/iwl3945-base.c | 101 ++++++--- + drivers/net/wireless/iwmc3200wifi/rx.c | 71 +++++-- + drivers/net/wireless/libertas/Kconfig | 6 + + drivers/net/wireless/libertas/Makefile | 2 +- + drivers/net/wireless/libertas/assoc.c | 17 +-- + drivers/net/wireless/libertas/cmd.c | 22 +-- + drivers/net/wireless/libertas/cmd.h | 12 - + drivers/net/wireless/libertas/cmdresp.c | 16 +-- + drivers/net/wireless/libertas/defs.h | 7 - + drivers/net/wireless/libertas/dev.h | 7 +- + drivers/net/wireless/libertas/ethtool.c | 2 + + drivers/net/wireless/libertas/main.c | 42 ++-- + drivers/net/wireless/libertas/mesh.c | 29 ++- + drivers/net/wireless/libertas/mesh.h | 32 +++ + drivers/net/wireless/libertas/scan.c | 2 +- + drivers/net/wireless/libertas/tx.c | 2 +- + drivers/net/wireless/libertas/wext.c | 26 ++- + drivers/net/wireless/mac80211_hwsim.c | 85 +++++++- + drivers/net/wireless/rndis_wlan.c | 42 +++-- + drivers/net/wireless/rt2x00/rt2800pci.c | 6 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 45 +++-- + drivers/net/wireless/rt2x00/rt2800usb.h | 90 ++++++-- + drivers/net/wireless/rt2x00/rt2x00.h | 6 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 3 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 79 ++++---- + drivers/net/wireless/rt2x00/rt2x00queue.h | 5 +- + drivers/net/wireless/rt2x00/rt73usb.c | 1 + + drivers/net/wireless/rtl818x/rtl8180_dev.c | 1 - + drivers/net/wireless/wl12xx/wl1251.h | 1 + + drivers/net/wireless/wl12xx/wl1251_acx.c | 69 ++++++ + drivers/net/wireless/wl12xx/wl1251_acx.h | 87 ++++++++ + drivers/net/wireless/wl12xx/wl1251_debugfs.c | 23 ++ + drivers/net/wireless/wl12xx/wl1251_init.c | 5 + + drivers/net/wireless/wl12xx/wl1251_init.h | 47 ++++ + drivers/net/wireless/wl12xx/wl1251_main.c | 50 ++++- + drivers/net/wireless/wl12xx/wl1251_ps.c | 9 +- + drivers/net/wireless/wl12xx/wl1251_rx.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_tx.c | 9 +- + drivers/net/wireless/wl12xx/wl1251_tx.h | 17 ++ + drivers/net/wireless/zd1211rw/zd_usb.c | 14 +- + include/linux/ieee80211.h | 30 +++- + include/net/cfg80211.h | 22 ++- + include/net/mac80211.h | 61 ++++++ + net/mac80211/Kconfig | 12 - + net/mac80211/agg-rx.c | 15 +- + net/mac80211/agg-tx.c | 25 +-- + net/mac80211/cfg.c | 112 +++++++--- + net/mac80211/debugfs_key.c | 2 +- + net/mac80211/debugfs_netdev.c | 166 ++++++++++----- + net/mac80211/debugfs_netdev.h | 9 +- + net/mac80211/debugfs_sta.c | 64 +++++- + net/mac80211/driver-ops.h | 29 ++-- + net/mac80211/driver-trace.h | 42 ++-- + net/mac80211/ht.c | 53 +++++- + net/mac80211/ibss.c | 34 ++-- + net/mac80211/ieee80211_i.h | 21 ++- + net/mac80211/iface.c | 62 +++++- + net/mac80211/key.c | 6 +- + net/mac80211/key.h | 8 +- + net/mac80211/main.c | 50 ++++- + net/mac80211/mesh.c | 4 +- + net/mac80211/mesh_hwmp.c | 20 +- + net/mac80211/mesh_pathtbl.c | 6 +- + net/mac80211/mesh_plink.c | 6 +- + net/mac80211/mlme.c | 192 +++++++++++------ + net/mac80211/pm.c | 4 +- + net/mac80211/rx.c | 295 ++++++++++---------------- + net/mac80211/scan.c | 2 +- + net/mac80211/spectmgmt.c | 4 +- + net/mac80211/sta_info.c | 32 ++-- + net/mac80211/sta_info.h | 29 +++- + net/mac80211/status.c | 46 ++++- + net/mac80211/tkip.c | 38 ++-- + net/mac80211/tx.c | 42 ++-- + net/mac80211/util.c | 104 ++++++++- + net/wireless/.gitignore | 1 + + net/wireless/Kconfig | 16 ++ + net/wireless/Makefile | 6 + + net/wireless/core.h | 2 + + net/wireless/db.txt | 17 ++ + net/wireless/genregdb.awk | 118 ++++++++++ + net/wireless/mlme.c | 11 +- + net/wireless/nl80211.c | 37 +--- + net/wireless/reg.c | 120 +++++++++-- + net/wireless/regdb.h | 7 + + net/wireless/util.c | 132 +++++++++++- + net/wireless/wext-compat.c | 5 +- + 117 files changed, 2965 insertions(+), 1122 deletions(-) + create mode 100644 net/wireless/.gitignore + create mode 100644 net/wireless/db.txt + create mode 100644 net/wireless/genregdb.awk + create mode 100644 net/wireless/regdb.h +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/arm/mach-nomadik/cpu-8815.c | 8 +++ + crypto/testmgr.c | 84 +++++++++++++++++++++++++++ + drivers/char/hw_random/Kconfig | 12 ++++ + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/nomadik-rng.c | 103 ++++++++++++++++++++++++++++++++++ + 5 files changed, 208 insertions(+), 0 deletions(-) + create mode 100644 drivers/char/hw_random/nomadik-rng.c +Merging sound/for-next +$ git merge sound/for-next +Already uptodate! +Merge made by recursive. +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. + Documentation/lguest/lguest.c | 1 - + drivers/virtio/virtio_balloon.c | 108 ++++++++++++++++++++++++++++++++++++--- + include/linux/gfp.h | 2 +- + include/linux/kernel.h | 80 ++++++++++++++++++----------- + include/linux/kmemcheck.h | 2 +- + include/linux/virtio_balloon.h | 15 +++++ + include/linux/virtio_config.h | 5 ++- + kernel/module.c | 17 ++++--- + 8 files changed, 180 insertions(+), 50 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging tmio-mmc/linux-next +$ git merge tmio-mmc/linux-next +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/asic3.c +Auto-merging drivers/mmc/core/core.c +Auto-merging drivers/mmc/core/core.h +Auto-merging drivers/mmc/host/tmio_mmc.c +Merge made by recursive. + drivers/mfd/Makefile | 6 +- + drivers/mfd/asic3.c | 43 +++++++++++++++---- + drivers/mfd/t7l66xb.c | 31 +++++++++++-- + drivers/mfd/tc6387xb.c | 97 ++++++++++++++++++++++++++++++++++-------- + drivers/mfd/tc6393xb.c | 56 +++++++++++++++++++++---- + drivers/mfd/tmio_core.c | 62 +++++++++++++++++++++++++++ + drivers/mmc/core/core.c | 4 +- + drivers/mmc/core/core.h | 10 ++++ + drivers/mmc/host/tmio_mmc.c | 78 +++++++++++++++-------------------- + drivers/mmc/host/tmio_mmc.h | 46 +++------------------ + include/linux/mfd/tmio.h | 40 ++++++++++++++++++ + 11 files changed, 342 insertions(+), 131 deletions(-) + create mode 100644 drivers/mfd/tmio_core.c +Merging input/next +$ git merge input/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Removing Documentation/block/as-iosched.txt +Merge made by recursive. + Documentation/block/00-INDEX | 2 - + Documentation/block/as-iosched.txt | 172 ------------------------------------ + block/blk-settings.c | 87 +++++++++++-------- + block/cfq-iosched.c | 55 +++--------- + drivers/block/DAC960.c | 2 +- + drivers/block/aoe/aoecmd.c | 17 +---- + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_main.c | 5 +- + drivers/block/drbd/drbd_proc.c | 2 +- + drivers/block/drbd/drbd_receiver.c | 1 - + drivers/block/drbd/drbd_worker.c | 2 - + drivers/block/mg_disk.c | 2 +- + 12 files changed, 69 insertions(+), 280 deletions(-) + delete mode 100644 Documentation/block/as-iosched.txt +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Merge made by recursive. + drivers/power/pmu_battery.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +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 MAINTAINERS +Auto-merging drivers/serial/8250.c +Removing kernel/kgdb.c +Auto-merging kernel/module.c +Auto-merging kernel/sched.c +Merge made by recursive. + MAINTAINERS | 6 +- + arch/arm/include/asm/kgdb.h | 2 + + arch/arm/include/asm/kmap_types.h | 1 + + arch/arm/kernel/kgdb.c | 13 + + arch/arm/kernel/traps.c | 5 + + arch/blackfin/kernel/kgdb.c | 5 + + arch/mips/include/asm/kgdb.h | 2 + + arch/mips/kernel/kgdb.c | 27 +- + arch/mips/kernel/traps.c | 14 + + arch/powerpc/include/asm/kmap_types.h | 1 + + arch/powerpc/kernel/kgdb.c | 12 +- + arch/powerpc/kernel/traps.c | 7 + + arch/sh/kernel/kgdb.c | 14 +- + arch/sparc/kernel/kgdb_32.c | 6 + + arch/sparc/kernel/kgdb_64.c | 6 + + arch/x86/include/asm/kgdb.h | 3 + + arch/x86/kernel/hw_breakpoint.c | 5 +- + arch/x86/kernel/kgdb.c | 247 ++- + arch/x86/kernel/traps.c | 6 + + drivers/char/Makefile | 1 + + drivers/char/kdb_keyboard.c | 207 +++ + drivers/char/kdb_keyboard.h | 143 ++ + drivers/char/keyboard.c | 30 +- + drivers/gpu/drm/drm_fb_helper.c | 105 ++ + drivers/gpu/drm/i915/intel_display.c | 118 ++ + drivers/input/input.c | 15 + + drivers/misc/kgdbts.c | 6 + + drivers/serial/8250.c | 4 +- + drivers/serial/amba-pl011.c | 6 +- + drivers/serial/kgdboc.c | 150 ++- + drivers/serial/sh-sci.c | 6 +- + drivers/serial/sunzilog.c | 50 + + drivers/video/console/fbcon.c | 8 + + fs/proc/meminfo.c | 143 ++ + fs/proc/mmu.c | 16 +- + include/asm-generic/kmap_types.h | 3 +- + include/drm/drm_crtc_helper.h | 2 + + include/drm/drm_fb_helper.h | 4 + + include/linux/hugetlb.h | 4 + + include/linux/input.h | 10 + + include/linux/kdb.h | 119 ++ + include/linux/keyboard.h | 2 + + include/linux/kgdb.h | 79 +- + include/linux/sched.h | 4 + + include/linux/serial_core.h | 1 + + include/linux/swap.h | 2 + + init/main.c | 6 + + kernel/Makefile | 2 +- + kernel/debug/Makefile | 7 + + kernel/debug/debug_core.c | 977 +++++++++++ + kernel/debug/debug_core.h | 82 + + kernel/debug/gdbstub.c | 1022 ++++++++++++ + kernel/debug/kdb/.gitignore | 1 + + kernel/debug/kdb/Makefile | 24 + + kernel/debug/kdb/kdb_bp.c | 671 ++++++++ + kernel/debug/kdb/kdb_bt.c | 217 +++ + kernel/debug/kdb/kdb_cmds | 32 + + kernel/debug/kdb/kdb_debugger.c | 168 ++ + kernel/debug/kdb/kdb_io.c | 820 ++++++++++ + kernel/debug/kdb/kdb_main.c | 2852 +++++++++++++++++++++++++++++++++ + kernel/debug/kdb/kdb_private.h | 420 +++++ + kernel/debug/kdb/kdb_support.c | 942 +++++++++++ + kernel/kallsyms.c | 21 + + kernel/kgdb.c | 1760 -------------------- + kernel/module.c | 19 +- + kernel/panic.c | 7 +- + kernel/printk.c | 26 +- + kernel/sched.c | 93 ++- + kernel/signal.c | 42 + + kernel/softlockup.c | 16 + + lib/Kconfig.kgdb | 22 + + mm/hugetlb.c | 19 + + mm/swapfile.c | 10 +- + 73 files changed, 9990 insertions(+), 1908 deletions(-) + create mode 100644 drivers/char/kdb_keyboard.c + create mode 100644 drivers/char/kdb_keyboard.h + create mode 100644 include/linux/kdb.h + create mode 100644 kernel/debug/Makefile + create mode 100644 kernel/debug/debug_core.c + create mode 100644 kernel/debug/debug_core.h + create mode 100644 kernel/debug/gdbstub.c + create mode 100644 kernel/debug/kdb/.gitignore + create mode 100644 kernel/debug/kdb/Makefile + create mode 100644 kernel/debug/kdb/kdb_bp.c + create mode 100644 kernel/debug/kdb/kdb_bt.c + create mode 100644 kernel/debug/kdb/kdb_cmds + create mode 100644 kernel/debug/kdb/kdb_debugger.c + create mode 100644 kernel/debug/kdb/kdb_io.c + create mode 100644 kernel/debug/kdb/kdb_main.c + create mode 100644 kernel/debug/kdb/kdb_private.h + create mode 100644 kernel/debug/kdb/kdb_support.c + delete mode 100644 kernel/kgdb.c +$ git reset --hard HEAD^ +HEAD is now at bf486f8 Merge remote branch 'battery/master' +Merging refs/next/20091219/kgdb +$ git merge refs/next/20091219/kgdb +Merge made by recursive. +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/slub_def.h | 27 ++--- + mm/slub.c | 303 +++++++++++---------------------------------- + 2 files changed, 86 insertions(+), 244 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Merge made by recursive. + drivers/md/md.c | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) +Merging mfd/for-next +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Merge made by recursive. + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- + drivers/gpu/drm/i915/i915_dma.c | 16 +-- + drivers/gpu/drm/i915/i915_drv.c | 174 ++++++++++++++++++++++++++++++++-- + drivers/gpu/drm/i915/i915_drv.h | 116 ++++++++++------------- + drivers/gpu/drm/i915/i915_gem.c | 7 +- + drivers/gpu/drm/i915/i915_irq.c | 32 ++++-- + drivers/gpu/drm/i915/i915_reg.h | 7 -- + drivers/gpu/drm/i915/intel_crt.c | 2 + + drivers/gpu/drm/i915/intel_display.c | 30 +++++-- + drivers/gpu/drm/i915/intel_dp.c | 6 + + drivers/gpu/drm/i915/intel_hdmi.c | 5 + + drivers/gpu/drm/i915/intel_lvds.c | 83 ++++------------- + drivers/gpu/drm/i915/intel_sdvo.c | 3 + + drivers/gpu/drm/i915/intel_tv.c | 2 + + 14 files changed, 304 insertions(+), 181 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. +Merging security-testing/next +$ git merge security-testing/next +Auto-merging security/selinux/ss/services.c +Auto-merging security/tomoyo/file.c +Merge made by recursive. + kernel/capability.c | 4 +- + security/security.c | 30 ++++---- + security/selinux/ss/mls.c | 4 +- + security/selinux/ss/services.c | 4 +- + security/tomoyo/common.c | 151 +++++++++++++++++--------------------- + security/tomoyo/common.h | 40 ++++++++--- + security/tomoyo/domain.c | 63 ++++++++++------- + security/tomoyo/file.c | 157 ++++++++++++++++++++++++++++------------ + security/tomoyo/realpath.c | 11 ++- + security/tomoyo/tomoyo.c | 81 ++++++++++++++++++++- + security/tomoyo/tomoyo.h | 12 +++- + 11 files changed, 362 insertions(+), 195 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. + drivers/char/agp/amd64-agp.c | 2 ++ + drivers/char/agp/backend.c | 13 +++++++++---- + 2 files changed, 11 insertions(+), 4 deletions(-) +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Auto-merging drivers/watchdog/adx_wdt.c +CONFLICT (delete/modify): drivers/watchdog/rm9k_wdt.c deleted in HEAD and modified in watchdog/master. Version watchdog/master of drivers/watchdog/rm9k_wdt.c left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/watchdog/rm9k_wdt.c +drivers/watchdog/rm9k_wdt.c: needs merge +rm 'drivers/watchdog/rm9k_wdt.c' +$ git commit -v -a +[master 6f8b2e4] Merge remote branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + drivers/watchdog/adx_wdt.c | 4 ++-- + drivers/watchdog/at32ap700x_wdt.c | 2 +- + drivers/watchdog/davinci_wdt.c | 2 +- + drivers/watchdog/iTCO_wdt.c | 4 ++++ + drivers/watchdog/mpcore_wdt.c | 2 +- + drivers/watchdog/mv64x60_wdt.c | 2 +- + drivers/watchdog/omap_wdt.c | 9 ++++----- + drivers/watchdog/pnx4008_wdt.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 2 +- + drivers/watchdog/txx9wdt.c | 6 ++---- + 10 files changed, 18 insertions(+), 17 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Merge made by recursive. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Merge made by recursive. + Documentation/video4linux/videobuf | 341 ++++++++++++++++++++++++++++++++++++ + 1 files changed, 341 insertions(+), 0 deletions(-) + create mode 100644 Documentation/video4linux/videobuf +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging arch/x86/kernel/apic/apic_flat_64.c +Auto-merging drivers/gpu/drm/radeon/atombios.h +Auto-merging drivers/isdn/mISDN/l1oip_core.c +Auto-merging fs/namei.c +Auto-merging mm/slub.c +Merge made by recursive. + .../networking/timestamping/timestamping.c | 2 +- + arch/arm/mach-s5pc100/setup-sdhci.c | 4 ++-- + arch/x86/kernel/apic/apic_flat_64.c | 2 +- + arch/x86/kernel/ptrace.c | 2 +- + arch/x86/kernel/vmiclock_32.c | 2 +- + drivers/acpi/proc.c | 2 +- + drivers/ata/libata-core.c | 2 +- + drivers/block/ataflop.c | 2 -- + drivers/char/random.c | 2 +- + drivers/gpu/drm/radeon/atombios.h | 2 +- + drivers/gpu/drm/radeon/radeon_state.c | 2 +- + drivers/ieee1394/pcilynx.c | 2 +- + drivers/input/tablet/aiptek.c | 2 +- + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/mmc/card/sdio_uart.c | 2 +- + drivers/net/cs89x0.c | 2 +- + drivers/net/sfc/mcdi_pcol.h | 2 +- + drivers/net/typhoon.c | 6 +++--- + drivers/net/wan/cosa.c | 10 +++++----- + drivers/net/wan/hdlc_cisco.c | 8 ++++---- + drivers/net/wan/hdlc_x25.c | 4 ++-- + drivers/net/wimax/i2400m/fw.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 2 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 4 ++-- + drivers/uwb/i1480/i1480-est.c | 4 ++-- + drivers/video/sstfb.c | 2 +- + fs/buffer.c | 2 +- + fs/dlm/member.c | 2 +- + fs/locks.c | 2 +- + fs/mpage.c | 2 +- + fs/namei.c | 2 +- + fs/qnx4/inode.c | 3 ++- + include/linux/mmzone.h | 2 +- + include/math-emu/op-common.h | 2 +- + kernel/audit.c | 2 +- + kernel/sched_cpupri.c | 2 +- + kernel/trace/ring_buffer.c | 4 ++-- + mm/slub.c | 2 +- + 40 files changed, 54 insertions(+), 55 deletions(-) + mode change 100755 => 100644 arch/arm/mach-omap2/board-3630sdp.c + mode change 100755 => 100644 arch/arm/mach-omap2/board-zoom-peripherals.c + mode change 100755 => 100644 drivers/mtd/chips/cfi_util.c + mode change 100755 => 100644 drivers/mtd/inftlcore.c + mode change 100755 => 100644 drivers/scsi/lpfc/lpfc_hbadisc.c +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Auto-merging include/linux/device.h +Merge made by recursive. + drivers/base/power/main.c | 116 +++++++++++++++++++++++++++++++++++++++-- + drivers/base/power/power.h | 6 +- + drivers/base/power/sysfs.c | 47 +++++++++++++++++ + include/linux/device.h | 11 ++++ + include/linux/pm.h | 3 + + include/linux/resume-trace.h | 7 +++ + kernel/power/Kconfig | 14 +++++ + kernel/power/main.c | 31 +++++++++++- + 8 files changed, 225 insertions(+), 10 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Auto-merging drivers/bluetooth/btmrvl_sdio.c +Merge made by recursive. + drivers/bluetooth/btmrvl_sdio.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Removing fs/notify/inotify/inotify.c +Auto-merging include/linux/fs.h +Auto-merging kernel/audit.c +Auto-merging security/security.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 - + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/ia32/sys_ia32.c | 9 + + arch/x86/include/asm/sys_ia32.h | 3 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/inode.c | 8 +- + fs/namespace.c | 5 + + fs/nfsd/vfs.c | 4 +- + fs/notify/Kconfig | 1 + + fs/notify/Makefile | 4 +- + fs/notify/dnotify/dnotify.c | 198 +++---- + fs/notify/fanotify/Kconfig | 26 + + fs/notify/fanotify/Makefile | 1 + + fs/notify/fanotify/fanotify.c | 255 ++++++++ + fs/notify/fanotify/fanotify_user.c | 776 +++++++++++++++++++++++ + fs/notify/fsnotify.c | 140 ++++- + fs/notify/fsnotify.h | 33 +- + fs/notify/group.c | 178 +++--- + fs/notify/inode_mark.c | 309 +++------- + fs/notify/inotify/Kconfig | 15 - + fs/notify/inotify/Makefile | 1 - + fs/notify/inotify/inotify.c | 933 ---------------------------- + fs/notify/inotify/inotify.h | 7 +- + fs/notify/inotify/inotify_fsnotify.c | 116 +++- + fs/notify/inotify/inotify_user.c | 307 ++++++---- + fs/notify/mark.c | 325 ++++++++++ + fs/notify/notification.c | 176 +++--- + fs/notify/vfsmount_mark.c | 176 ++++++ + fs/open.c | 3 +- + fs/read_write.c | 8 +- + include/asm-generic/fcntl.h | 8 + + include/linux/Kbuild | 1 + + include/linux/fanotify.h | 105 ++++ + include/linux/fs.h | 13 +- + include/linux/fsnotify.h | 153 +++--- + include/linux/fsnotify_backend.h | 162 ++++-- + include/linux/inotify.h | 174 ------ + include/linux/mount.h | 6 +- + include/linux/security.h | 1 + + include/linux/syscalls.h | 5 + + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 +- + kernel/audit_tree.c | 232 ++++--- + kernel/audit_watch.c | 295 +++++---- + kernel/auditfilter.c | 39 +- + kernel/auditsc.c | 10 +- + kernel/sys_ni.c | 4 + + security/security.c | 16 +- + 54 files changed, 3077 insertions(+), 2235 deletions(-) + create mode 100644 fs/notify/fanotify/Kconfig + create mode 100644 fs/notify/fanotify/Makefile + create mode 100644 fs/notify/fanotify/fanotify.c + create mode 100644 fs/notify/fanotify/fanotify_user.c + delete mode 100644 fs/notify/inotify/inotify.c + create mode 100644 fs/notify/mark.c + create mode 100644 fs/notify/vfsmount_mark.c + create mode 100644 include/linux/fanotify.h +Merging irda/for-next +$ git merge irda/for-next +Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. +Auto-merging drivers/net/irda/irda-usb.c +CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 38c96cb] Merge remote branch 'irda/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/misc/Makefile' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +CONFLICT (content): Merge conflict in drivers/misc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2ed186b] Merge remote branch 'hwlat/for-linus' +$ git diff -M --stat --summary HEAD^.. + Documentation/hwlat_detector.txt | 64 ++ + MAINTAINERS | 9 + + drivers/misc/Kconfig | 29 + + drivers/misc/Makefile | 1 + + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 1311 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwlat_detector.txt + create mode 100644 drivers/misc/hwlat_detector.c +Merging drbd/for-jens +$ git merge drbd/for-jens +Already up-to-date. +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1a05b0e] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 247 +++++++ + drivers/vbus/pci-bridge.c | 1015 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4387 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging Documentation/edac.txt +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging drivers/edac/edac_core.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/edac.txt | 153 +++ + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/kernel/cpu/mcheck/mce.c | 10 + + arch/x86/pci/legacy.c | 42 +- + drivers/edac/Kconfig | 13 + + drivers/edac/Makefile | 2 + + drivers/edac/edac_core.h | 23 +- + drivers/edac/edac_mc_sysfs.c | 175 +++- + drivers/edac/edac_mce.c | 61 ++ + drivers/edac/i7core_edac.c | 1977 ++++++++++++++++++++++++++++++++++++++ + include/linux/edac_mce.h | 31 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 19 + + 13 files changed, 2465 insertions(+), 44 deletions(-) + create mode 100644 drivers/edac/edac_mce.c + create mode 100644 drivers/edac/i7core_edac.c + create mode 100644 include/linux/edac_mce.h +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Auto-merging arch/arm/include/asm/io.h +Merge made by recursive. + arch/arm/include/asm/io.h | 4 ++++ + drivers/spi/xilinx_spi.c | 28 ++++++++++++++++++++++++---- + 2 files changed, 28 insertions(+), 4 deletions(-) +Merging limits/writable_limits +$ git merge limits/writable_limits +Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. +Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. +Auto-merging arch/x86/ia32/ia32entry.S +CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/include/asm/unistd_32.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h +Auto-merging arch/x86/include/asm/unistd_64.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h +Auto-merging arch/x86/kernel/syscall_table_32.S +CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S +Auto-merging fs/exec.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging kernel/perf_event.c +Auto-merging kernel/sched.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6bf9eb2] Merge remote branch 'limits/writable_limits' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/kernel/perfmon.c | 2 +- + arch/ia64/mm/init.c | 2 +- + arch/powerpc/mm/mmap_64.c | 4 +- + arch/powerpc/platforms/cell/spufs/coredump.c | 2 +- + arch/s390/mm/mmap.c | 4 +- + arch/sparc/kernel/sys_sparc_64.c | 6 +- + arch/x86/ia32/ia32_aout.c | 2 +- + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + arch/x86/mm/mmap.c | 4 +- + drivers/infiniband/core/umem.c | 2 +- + drivers/infiniband/hw/ipath/ipath_user_pages.c | 3 +- + fs/attr.c | 2 +- + fs/binfmt_aout.c | 2 +- + fs/binfmt_flat.c | 2 +- + fs/exec.c | 8 +- + fs/fcntl.c | 2 +- + fs/file.c | 2 +- + fs/proc/array.c | 4 +- + fs/proc/base.c | 101 ++++++++++++++-- + fs/select.c | 2 +- + include/asm-generic/unistd.h | 6 +- + include/linux/Kbuild | 2 +- + include/linux/posix-timers.h | 2 +- + include/linux/resource.h | 10 ++- + include/linux/sched.h | 22 ++++ + include/linux/security.h | 9 +- + include/linux/syscalls.h | 4 + + ipc/mqueue.c | 2 +- + ipc/shm.c | 3 +- + kernel/compat.c | 91 +++++++++++--- + kernel/fork.c | 10 +- + kernel/perf_event.c | 2 +- + kernel/posix-cpu-timers.c | 52 ++++---- + kernel/sched.c | 4 +- + kernel/sched_rt.c | 5 +- + kernel/signal.c | 2 +- + kernel/sys.c | 161 +++++++++++++++++++---- + mm/filemap.c | 2 +- + mm/mlock.c | 12 +- + mm/mmap.c | 13 +- + mm/mremap.c | 2 +- + security/capability.c | 3 +- + security/security.c | 5 +- + security/selinux/hooks.c | 10 +- + 47 files changed, 450 insertions(+), 152 deletions(-) +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + arch/x86/include/asm/uv/bios.h | 7 ++++--- + arch/x86/kernel/apic/x2apic_uv_x.c | 6 +++--- + arch/x86/kernel/bios_uv.c | 20 ++++++++++++++------ + arch/x86/tools/chkobjdump.awk | 16 +++++++++++++--- + drivers/char/nvram.c | 3 --- + include/linux/poison.h | 16 ++++++++++++++-- + kernel/futex_compat.c | 6 +++--- + tools/perf/builtin-buildid-list.c | 2 +- + tools/perf/builtin-diff.c | 3 ++- + tools/perf/builtin-report.c | 3 +-- + tools/perf/builtin-trace.c | 4 ++-- + 12 files changed, 62 insertions(+), 29 deletions(-) +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Merge made by recursive. + drivers/edac/amd64_edac.c | 45 +++++++++++++++++++++++++--------------- + drivers/edac/edac_pci_sysfs.c | 2 - + 2 files changed, 28 insertions(+), 19 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Merge made by recursive. + arch/blackfin/mach-common/entry.S | 4 +- + arch/cris/arch-v10/kernel/entry.S | 2 +- + arch/cris/arch-v32/mm/mmu.S | 2 +- + arch/ia64/include/asm/percpu.h | 4 +- + arch/ia64/kernel/ia64_ksyms.c | 4 +- + arch/ia64/mm/discontig.c | 2 +- + arch/microblaze/include/asm/entry.h | 2 +- + arch/parisc/lib/fixup.S | 8 +++--- + arch/sparc/kernel/nmi.c | 6 ++-- + arch/sparc/kernel/rtrap_64.S | 8 +++--- + arch/x86/include/asm/percpu.h | 37 +++++++++++++--------------- + arch/x86/include/asm/system.h | 8 +++--- + arch/x86/kernel/apic/nmi.c | 6 ++-- + arch/x86/kernel/head_32.S | 6 ++-- + arch/x86/kernel/vmlinux.lds.S | 4 +- + arch/x86/xen/xen-asm_32.S | 4 +- + include/asm-generic/percpu.h | 18 ++++++++----- + include/linux/compiler.h | 4 ++- + include/linux/percpu-defs.h | 40 +++++++++++++++++++----------- + include/linux/percpu.h | 44 ++++++++++++++++++++------------- + include/linux/vmstat.h | 8 +++--- + kernel/rcutorture.c | 8 +++--- + kernel/trace/trace.c | 6 ++-- + kernel/trace/trace_functions_graph.c | 4 +- + mm/percpu.c | 18 ++++++------- + 25 files changed, 139 insertions(+), 118 deletions(-) +$ git am -3 ../patches/0001-slab-update-for-percpu-API-change.patch +Applying: slab: update for percpu API change +$ git reset HEAD^ +Unstaged changes after reset: +M mm/slub.c +$ git add . +$ git commit -v -a --amend +[master 5eec939] Merge remote branch 'percpu/for-next' +Merging workqueues/for-next +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Merge made by recursive. + mm/Kconfig | 2 +- + mm/memory-failure.c | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletions(-) +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Merge made by recursive. + samples/kobject/kobject-example.c | 4 ++-- + samples/kobject/kset-example.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging quilt/tty +$ git merge quilt/tty +Auto-merging drivers/serial/8250.c +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + drivers/char/cyclades.c | 15 +- + drivers/char/hvc_console.c | 2 +- + drivers/char/ip2/ip2main.c | 11 +- + drivers/char/isicom.c | 49 ++-- + drivers/char/moxa.c | 17 +- + drivers/char/mxser.c | 3 +- + drivers/char/synclink_gt.c | 186 ++++++----- + drivers/parport/parport_pc.c | 6 + + drivers/serial/68328serial.c | 8 +- + drivers/serial/8250.c | 28 +- + drivers/serial/8250_pci.c | 31 ++- + drivers/serial/8250_pnp.c | 10 +- + drivers/serial/Kconfig | 52 ++-- + drivers/serial/atmel_serial.c | 22 ++ + drivers/serial/bfin_sport_uart.c | 701 +++++++++++++++++++++++++------------- + drivers/serial/bfin_sport_uart.h | 38 +-- + drivers/serial/imx.c | 6 +- + drivers/serial/msm_serial.c | 6 +- + drivers/serial/serial_core.c | 88 ++--- + drivers/serial/serial_cs.c | 3 +- + drivers/serial/timbuart.c | 7 +- + include/linux/pci_ids.h | 3 + + 22 files changed, 786 insertions(+), 506 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + Documentation/networking/00-INDEX | 2 + + Documentation/networking/cxacru-cf.py | 48 + + Documentation/networking/cxacru.txt | 16 + + Documentation/usb/error-codes.txt | 6 +- + arch/arm/mach-mx2/devices.c | 80 +- + arch/arm/mach-mx2/devices.h | 1 + + arch/arm/plat-mxc/include/mach/mx21-usbhost.h | 38 + + drivers/usb/Kconfig | 1 + + drivers/usb/Makefile | 1 + + drivers/usb/atm/cxacru.c | 192 ++- + drivers/usb/atm/usbatm.c | 1 + + drivers/usb/atm/usbatm.h | 15 + + drivers/usb/class/cdc-acm.c | 61 +- + drivers/usb/class/cdc-acm.h | 1 - + drivers/usb/core/devio.c | 22 +- + drivers/usb/core/hcd.h | 1 + + drivers/usb/core/hub.c | 19 +- + drivers/usb/core/quirks.c | 3 +- + drivers/usb/core/sysfs.c | 31 + + drivers/usb/core/urb.c | 7 + + drivers/usb/gadget/at91_udc.c | 10 +- + drivers/usb/gadget/atmel_usba_udc.c | 4 +- + drivers/usb/gadget/epautoconf.c | 19 + + drivers/usb/gadget/pxa27x_udc.c | 21 +- + drivers/usb/host/Kconfig | 11 + + drivers/usb/host/Makefile | 2 + + drivers/usb/host/ehci-atmel.c | 2 +- + drivers/usb/host/ehci-au1xxx.c | 6 +- + drivers/usb/host/ehci-fsl.c | 97 ++- + drivers/usb/host/ehci-mxc.c | 18 +- + drivers/usb/host/ehci-orion.c | 8 +- + drivers/usb/host/ehci-sched.c | 12 +- + drivers/usb/host/imx21-dbg.c | 527 ++++++++ + drivers/usb/host/imx21-hcd.c | 1789 +++++++++++++++++++++++++ + drivers/usb/host/imx21-hcd.h | 436 ++++++ + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/sl811-hcd.c | 5 +- + drivers/usb/host/xhci-dbg.c | 19 + + drivers/usb/host/xhci-hcd.c | 150 ++- + drivers/usb/host/xhci-hub.c | 65 +- + drivers/usb/host/xhci-mem.c | 43 +- + drivers/usb/host/xhci-pci.c | 1 + + drivers/usb/host/xhci-ring.c | 41 +- + drivers/usb/host/xhci.h | 11 +- + drivers/usb/musb/musb_core.c | 63 +- + drivers/usb/musb/musb_core.h | 16 +- + drivers/usb/otg/twl4030-usb.c | 35 +- + drivers/usb/serial/cypress_m8.c | 21 +- + drivers/usb/serial/ftdi_sio.c | 18 +- + drivers/usb/serial/generic.c | 5 +- + drivers/usb/serial/mct_u232.c | 57 +- + drivers/usb/serial/mct_u232.h | 2 + + drivers/usb/serial/usb-serial.c | 2 +- + drivers/usb/storage/transport.c | 6 + + drivers/usb/wusbcore/mmc.c | 2 +- + include/linux/usb/otg.h | 25 + + include/linux/usb/quirks.h | 3 + + 57 files changed, 3768 insertions(+), 332 deletions(-) + create mode 100644 Documentation/networking/cxacru-cf.py + create mode 100644 arch/arm/plat-mxc/include/mach/mx21-usbhost.h + create mode 100644 drivers/usb/host/imx21-dbg.c + create mode 100644 drivers/usb/host/imx21-hcd.c + create mode 100644 drivers/usb/host/imx21-hcd.h +Merging quilt/staging +$ git merge quilt/staging +Removing drivers/staging/altpciechdma/Kconfig +Removing drivers/staging/altpciechdma/Makefile +Removing drivers/staging/altpciechdma/TODO +Removing drivers/staging/altpciechdma/altpciechdma.c +Removing drivers/staging/b3dfg/Kconfig +Removing drivers/staging/b3dfg/Makefile +Removing drivers/staging/b3dfg/TODO +Removing drivers/staging/b3dfg/b3dfg.c +Removing drivers/staging/batman-adv/log.c +Removing drivers/staging/p9auth/Kconfig +Removing drivers/staging/p9auth/Makefile +Removing drivers/staging/p9auth/p9auth.c +Merge made by recursive. + drivers/staging/Kconfig | 8 +- + drivers/staging/Makefile | 4 +- + drivers/staging/altpciechdma/Kconfig | 10 - + drivers/staging/altpciechdma/Makefile | 2 - + drivers/staging/altpciechdma/TODO | 15 - + drivers/staging/altpciechdma/altpciechdma.c | 1182 ------------------- + drivers/staging/asus_oled/asus_oled.c | 14 +- + drivers/staging/b3dfg/Kconfig | 10 - + drivers/staging/b3dfg/Makefile | 1 - + drivers/staging/b3dfg/TODO | 4 - + drivers/staging/b3dfg/b3dfg.c | 1100 ----------------- + drivers/staging/batman-adv/Kconfig | 4 +- + drivers/staging/batman-adv/Makefile | 2 +- + drivers/staging/batman-adv/README | 50 +- + drivers/staging/batman-adv/bitarray.c | 15 +- + drivers/staging/batman-adv/device.c | 13 +- + drivers/staging/batman-adv/hard-interface.c | 36 +- + drivers/staging/batman-adv/log.c | 179 --- + drivers/staging/batman-adv/main.c | 25 +- + drivers/staging/batman-adv/main.h | 45 +- + drivers/staging/batman-adv/originator.c | 243 ++++ + drivers/staging/batman-adv/{log.h => originator.h} | 19 +- + drivers/staging/batman-adv/proc.c | 171 +--- + drivers/staging/batman-adv/routing.c | 1240 ++++++++++---------- + drivers/staging/batman-adv/routing.h | 12 +- + drivers/staging/batman-adv/send.c | 56 +- + drivers/staging/batman-adv/soft-interface.c | 3 +- + drivers/staging/batman-adv/translation-table.c | 22 +- + drivers/staging/batman-adv/vis.c | 12 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 2 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 2 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci035.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 2 +- + drivers/staging/comedi/drivers/pcmad.c | 21 +- + drivers/staging/dream/camera/Kconfig | 2 +- + drivers/staging/dream/camera/Makefile | 1 + + drivers/staging/dream/camera/msm_camera.c | 4 +- + drivers/staging/dream/camera/s5k3e2fx.c | 10 +- + drivers/staging/dream/include/linux/android_pmem.h | 80 ++ + drivers/staging/dream/include/linux/gpio_event.h | 154 +++ + drivers/staging/dream/include/linux/msm_adsp.h | 84 ++ + drivers/staging/dream/include/linux/msm_audio.h | 115 ++ + .../staging/dream/include/linux/msm_rpcrouter.h | 47 + + drivers/staging/dream/include/linux/wakelock.h | 91 ++ + drivers/staging/dream/include/mach/camera.h | 279 +++++ + drivers/staging/dream/include/mach/msm_adsp.h | 112 ++ + drivers/staging/dream/include/mach/msm_rpcrouter.h | 179 +++ + drivers/staging/dream/include/mach/msm_smd.h | 107 ++ + .../dream/include/mach/qdsp5/qdsp5audplaycmdi.h | 94 ++ + .../dream/include/mach/qdsp5/qdsp5audplaymsg.h | 70 ++ + .../dream/include/mach/qdsp5/qdsp5audppcmdi.h | 914 +++++++++++++++ + .../dream/include/mach/qdsp5/qdsp5audppmsg.h | 318 +++++ + .../dream/include/mach/qdsp5/qdsp5audpreproccmdi.h | 256 ++++ + .../dream/include/mach/qdsp5/qdsp5audpreprocmsg.h | 85 ++ + .../dream/include/mach/qdsp5/qdsp5audreccmdi.h | 176 +++ + .../dream/include/mach/qdsp5/qdsp5audrecmsg.h | 127 ++ + .../dream/include/mach/qdsp5/qdsp5jpegcmdi.h | 376 ++++++ + .../dream/include/mach/qdsp5/qdsp5jpegmsg.h | 177 +++ + .../dream/include/mach/qdsp5/qdsp5lpmcmdi.h | 82 ++ + .../staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h | 80 ++ + .../dream/include/mach/qdsp5/qdsp5vdeccmdi.h | 235 ++++ + .../dream/include/mach/qdsp5/qdsp5vdecmsg.h | 107 ++ + .../dream/include/mach/qdsp5/qdsp5venccmdi.h | 212 ++++ + .../dream/include/mach/qdsp5/qdsp5vfecmdi.h | 910 ++++++++++++++ + .../staging/dream/include/mach/qdsp5/qdsp5vfemsg.h | 290 +++++ + drivers/staging/dream/include/media/msm_camera.h | 388 ++++++ + drivers/staging/dream/qdsp5/Makefile | 1 + + drivers/staging/dream/smd/Makefile | 1 + + drivers/staging/dream/smd/smd_rpcrouter.c | 2 - + drivers/staging/dt3155/Kconfig | 4 + + drivers/staging/dt3155/Makefile | 6 + + drivers/staging/dt3155/TODO | 10 + + drivers/staging/dt3155/allocator.README | 98 ++ + drivers/staging/dt3155/allocator.c | 296 +++++ + drivers/staging/dt3155/allocator.h | 28 + + drivers/staging/dt3155/dt3155.h | 171 +++ + drivers/staging/dt3155/dt3155.sysvinit | 60 + + drivers/staging/dt3155/dt3155_drv.c | 1204 +++++++++++++++++++ + drivers/staging/dt3155/dt3155_drv.h | 50 + + drivers/staging/dt3155/dt3155_io.c | 236 ++++ + drivers/staging/dt3155/dt3155_io.h | 397 +++++++ + drivers/staging/dt3155/dt3155_isr.c | 545 +++++++++ + drivers/staging/dt3155/dt3155_isr.h | 77 ++ + drivers/staging/dt3155/pci-compat.h | 97 ++ + drivers/staging/dt3155/sysdep.h | 820 +++++++++++++ + drivers/staging/iio/ring_sw.c | 1 - + drivers/staging/mimio/mimio.c | 124 +-- + drivers/staging/otus/80211core/ctxrx.c | 3 +- + drivers/staging/otus/apdbg.c | 53 +- + drivers/staging/p9auth/Kconfig | 9 - + drivers/staging/p9auth/Makefile | 1 - + drivers/staging/p9auth/p9auth.c | 408 ------- + drivers/staging/ramzswap/ramzswap_drv.c | 1 - + drivers/staging/rt2860/sta/connect.c | 4 +- + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 - + .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 21 +- + .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 20 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 48 +- + .../rtl8187se/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 6 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 4 +- + drivers/staging/rtl8192e/Makefile | 9 +- + drivers/staging/rtl8192e/dot11d.h | 138 +-- + drivers/staging/rtl8192e/ieee80211.h | 3 - + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 159 +++- + .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 18 +- + .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 27 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 148 ++- + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 246 ++++- + .../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 26 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 80 ++- + drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 4 +- + .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 6 +- + drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 4 +- + .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 65 +- + .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 6 +- + drivers/staging/rtl8192e/r8180_93cx6.h | 33 +- + drivers/staging/rtl8192e/r8190_rtl8256.c | 360 +++--- + drivers/staging/rtl8192e/r8190_rtl8256.h | 49 +- + drivers/staging/rtl8192e/r8192E.h | 23 +- + drivers/staging/rtl8192e/r8192E_core.c | 763 +++++++++++-- + drivers/staging/rtl8192e/r8192E_dm.c | 40 +- + drivers/staging/rtl8192e/r8192E_hw.h | 8 + + drivers/staging/rtl8192e/r8192E_wx.c | 212 +++-- + drivers/staging/rtl8192e/r8192E_wx.h | 1 - + drivers/staging/rtl8192e/r819xE_firmware.c | 81 +- + drivers/staging/rtl8192e/r819xE_phy.c | 2 +- + drivers/staging/rtl8192e/r819xE_phy.h | 194 ++-- + drivers/staging/rtl8192e/r819xE_phyreg.h | 1117 +++++++++--------- + drivers/staging/rtl8192su/Kconfig | 3 +- + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 4 - + .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 21 +- + .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 20 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 48 +- + .../rtl8192su/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 4 +- + .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 21 +- + .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2 +- + .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 6 +- + drivers/staging/rtl8192su/r8192U_core.c | 4 +- + drivers/staging/rtl8192su/r8192U_dm.c | 2 +- + drivers/staging/rtl8192u/ieee80211.h | 3 - + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 3 - + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 21 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 20 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 48 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 4 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 6 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 6 +- + drivers/staging/rtl8192u/r8192U_core.c | 6 +- + drivers/staging/slicoss/slic.h | 9 - + drivers/staging/slicoss/slicoss.c | 104 +- + drivers/staging/udlfb/udlfb.c | 652 +++++++---- + drivers/staging/udlfb/udlfb.h | 156 +--- + drivers/staging/vme/bridges/vme_ca91cx42.c | 46 +- + drivers/staging/vme/bridges/vme_tsi148.c | 45 +- + drivers/staging/vme/devices/vme_user.c | 4 +- + drivers/staging/vme/vme.c | 222 ++-- + drivers/staging/vme/vme.h | 23 +- + drivers/staging/vme/vme_bridge.h | 40 +- + drivers/staging/winbond/core.h | 2 +- + drivers/staging/winbond/localpara.h | 34 +- + drivers/staging/winbond/mds_f.h | 3 - + drivers/staging/winbond/mds_s.h | 28 - + drivers/staging/winbond/mlme_s.h | 8 - + drivers/staging/winbond/mto.h | 5 - + drivers/staging/winbond/reg.c | 10 +- + drivers/staging/winbond/scan_s.h | 1 - + drivers/staging/winbond/sme_api.h | 4 +- + drivers/staging/winbond/wb35reg_f.h | 2 +- + drivers/staging/winbond/wbusb.c | 8 +- + drivers/staging/wlags49_h2/wl_netdev.c | 2 +- + drivers/staging/wlags49_h2/wl_pci.c | 1 - + drivers/staging/wlan-ng/Kconfig | 3 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- + drivers/staging/wlan-ng/p80211wext.c | 15 + + 201 files changed, 14963 insertions(+), 6096 deletions(-) + delete mode 100644 drivers/staging/altpciechdma/Kconfig + delete mode 100644 drivers/staging/altpciechdma/Makefile + delete mode 100644 drivers/staging/altpciechdma/TODO + delete mode 100644 drivers/staging/altpciechdma/altpciechdma.c + delete mode 100644 drivers/staging/b3dfg/Kconfig + delete mode 100644 drivers/staging/b3dfg/Makefile + delete mode 100644 drivers/staging/b3dfg/TODO + delete mode 100644 drivers/staging/b3dfg/b3dfg.c + delete mode 100644 drivers/staging/batman-adv/log.c + create mode 100644 drivers/staging/batman-adv/originator.c + rename drivers/staging/batman-adv/{log.h => originator.h} (61%) + create mode 100644 drivers/staging/dream/include/linux/android_pmem.h + create mode 100644 drivers/staging/dream/include/linux/gpio_event.h + create mode 100644 drivers/staging/dream/include/linux/msm_adsp.h + create mode 100644 drivers/staging/dream/include/linux/msm_audio.h + create mode 100644 drivers/staging/dream/include/linux/msm_rpcrouter.h + create mode 100644 drivers/staging/dream/include/linux/wakelock.h + create mode 100644 drivers/staging/dream/include/mach/camera.h + create mode 100644 drivers/staging/dream/include/mach/msm_adsp.h + create mode 100644 drivers/staging/dream/include/mach/msm_rpcrouter.h + create mode 100644 drivers/staging/dream/include/mach/msm_smd.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaycmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaymsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppcmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreproccmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreprocmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audreccmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audrecmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegcmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmcmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdeccmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdecmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5venccmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfecmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfemsg.h + create mode 100644 drivers/staging/dream/include/media/msm_camera.h + create mode 100644 drivers/staging/dt3155/Kconfig + create mode 100644 drivers/staging/dt3155/Makefile + create mode 100644 drivers/staging/dt3155/TODO + create mode 100644 drivers/staging/dt3155/allocator.README + create mode 100644 drivers/staging/dt3155/allocator.c + create mode 100644 drivers/staging/dt3155/allocator.h + create mode 100644 drivers/staging/dt3155/dt3155.h + create mode 100644 drivers/staging/dt3155/dt3155.sysvinit + create mode 100644 drivers/staging/dt3155/dt3155_drv.c + create mode 100644 drivers/staging/dt3155/dt3155_drv.h + create mode 100644 drivers/staging/dt3155/dt3155_io.c + create mode 100644 drivers/staging/dt3155/dt3155_io.h + create mode 100644 drivers/staging/dt3155/dt3155_isr.c + create mode 100644 drivers/staging/dt3155/dt3155_isr.h + create mode 100644 drivers/staging/dt3155/pci-compat.h + create mode 100644 drivers/staging/dt3155/sysdep.h + delete mode 100644 drivers/staging/p9auth/Kconfig + delete mode 100644 drivers/staging/p9auth/Makefile + delete mode 100644 drivers/staging/p9auth/p9auth.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..dc9ff05ed2f5 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,638 @@ +Importing driver-core.current based on 2.6.33-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +HEAD is now at 5563935 Linux 2.6.33-rc1 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +devtmpfs-convert-dirlock-to-a-mutex.patch +vfs-get_sb_single-do-not-pass-options-twice.patch +doc-stable-rules-add-new-cherry-pick-logic.patch +driver-core-device_attribute-parameters-can-often-be-const.patch +driver-core-bin_attribute-parameters-can-often-be-const.patch +driver-core-driver_attribute-parameters-can-often-be-const.patch +drivers-base-fix-error-path.patch +driver-core-prevent-reference-to-freed-memory-on-error-path.patch +driver-core-export-platform_device_register_data-as-a-gpl-symbol.patch +devtmpfs-unlock-mutex-in-case-of-string-allocation-error.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core.current +From ../quilt-tmp + + 29d84f9...cf02de9 master -> quilt/driver-core.current (forced update) +Importing tty.current based on quilt/driver-core.current +$ cd ../quilt-tmp +$ git reset --hard cf02de9debad5857f8e6af9c81880b8d5397eb26 +HEAD is now at cf02de9 devtmpfs: unlock mutex in case of string allocation error +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty.current +serial-imx-bit-confusion.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/tty.current +From ../quilt-tmp + + 29d84f9...84c4457 master -> quilt/tty.current (forced update) +Importing usb.current based on quilt/tty.current +$ cd ../quilt-tmp +$ git reset --hard 84c445734317673557ced2e4841d81a22093b1bb +HEAD is now at 84c4457 serial: imx: bit &/| confusion +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-power-management-documentation-update.patch +usb-rename-usb_configure_device.patch +usb-fix-bugs-in-usb_-de-authorize_device.patch +usb-gadget-use-err_ptr-is_err.patch +usb-fix-double-linking-of-drivers-usb-otg-when-ulpi-is-selected.patch +usb-serial-extra-device-vendor-id-for-mos7840-driver.patch +usb-emi62-fix-crash-when-trying-to-load-emi-6-2-firmware.patch +usb-fix-section-mismatch-in-early-ehci-dbgp.patch +usb-add-device-id-for-apple-cinema-display-23in-2007.patch +usb-core-fix-recent-kernel-doc-warnings.patch +usb-ftdi_sio-isolate-all-device-ids-to-new-ftdi_sio_ids.h-header.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1006: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +usb-ftdi_sio-sort-pid-vid-entries-in-new-ftdi_sio_ids.h-header.patch +usb-musb_gadget-fix-kernel-oops-in-txstate.patch +usb-musb-move-musb_remove-to-__exit.patch +usb-musb-fix-compiling-warning-with-min-macro.patch +usb-musb-maintainers-fix-my-tree-s-address.patch +usb-musb-populate-the-vbus-gpio-with-the-correct-gpio-number.patch +usb-musb-gadget-set-otg-tranceiver-to-idle-when-registering-gadget.patch +usb-musb-do-not-work-if-no-gadget-driver-is-loaded.patch +usb-musb-fix-for-crash-in-dm646x-usb-when-cppi-dma-is-enabled.patch +usb-musb-gadget_ep0-avoid-setupend-interrupt.patch +usb-musb-correct-dma-address-for-tx.patch +usb-musb-fix-null-pointer-dereference-issue.patch +usb-musb-fix-array-index-out-of-bounds-issue.patch +usb-musb-workaround-blackfin-fifo-anomalies.patch +usb-otg-isp1301_omap-fix-compile-error.patch +usb-audio-gadget-fix-wtotallength-calculation.patch +usb-audio-gadget-free-alsa-devices-when-unloading.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb.current +From ../quilt-tmp + + e05cf59...0059839 master -> quilt/usb.current (forced update) +Importing staging.current based on quilt/usb.current +$ cd ../quilt-tmp +$ git reset --hard 00598390b1e55fa1e28c10167d034f1175538d8b +HEAD is now at 0059839 USB: audio gadget: free alsa devices when unloading +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging.current +staging-sm7xx-add-a-new-framebuffer-driver.patch +staging-dst-remove-from-the-tree.patch +staging-comedi-usbdux.c-fix-locking-up-of-the-driver-when-the-comedi-ringbuffer-runs-empty.patch +staging-comedi-removed-depricated-from-comedi_cb_block.patch +staging-comedi-jr3_pci-don-t-ioremap-too-much-space.-check-result.patch +staging-rtl8192su-fix-test-for-negative-error-in-rtl8192_rx_isr.patch +staging-fix-rtl8187se-compilation-errors-with-mac80211.patch +staging-fix-rtl8192e-compilation-errors-with-mac80211.patch +staging-fix-rtl8192su-compilation-errors-with-mac80211.patch +staging-rtl8192su-add-usb-vid-pid-for-hwnum-300.patch +staging-pohmelfs-fix-build-error.patch +staging-wlan-ng-fix-correct-size-given-to-memset.patch +staging-rtl8192x-fix-printk-formats.patch +staging-ramzswap-remove-arm-specific-d-cache-hack.patch +staging-panel-fix-compilation-error-with-custom-lcd-charset.patch +staging-panel-adjust-range-for-panel_keypad-in-kconfig.patch +staging-batman-adv-add-kconfig-dependancies-on-proc_fs-and-packet.patch +staging-batman-adv-introduce-missing-kfree.patch +staging-vt66-kconfig-depends-on-wlan.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging.current +From ../quilt-tmp + + 1259a44...cf43c53 master -> quilt/staging.current (forced update) +Importing i2c based on 2.6.33-rc1-git1 +$ cd ../quilt-tmp +$ git reset --hard dd59f6c76b265ed2ff18b497d6105a9511b1feb1 +HEAD is now at dd59f6c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-scmi-support-ibm-smbus-cmi-devices.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 7aff07c...a3b888c master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.33-rc1-git1 +$ cd ../quilt-tmp +$ git reset --hard dd59f6c76b265ed2ff18b497d6105a9511b1feb1 +HEAD is now at dd59f6c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-adt7462-fix-pin-28-monitoring.patch +hwmon-asus_atk0110-01-refactor-interface-probe-code.patch +hwmon-asus_atk0110-02-debugfs-interface.patch +hwmon-k10temp-blacklist-more-family-10h-processors.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 2a60ee49...bef086a master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.32-git5 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.33-rc1-96-gdd59f6c +$ cd ../quilt-tmp +$ git reset --hard dd59f6c76b265ed2ff18b497d6105a9511b1feb1 +HEAD is now at dd59f6c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +misc:enhance-BUILD_BUG_ON.patch +misc:remove-MAYBE_BUILD_BUG_ON.patch +misc:move-BUILD_BUG-et-al-inside-__KERNEL__.patch +module:skip_empty_sections_when_exporting_section_notes.patch +virtio:add_memory_statistics_reporting_to_the_balloon_driver_v4.patch +virtio:fix_scheduling_while_atomic_in_balloon_stats.patch +lguest:remove-unneeded-zlib-include.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/rr +From ../quilt-tmp + + 4543201...b9f26e1 master -> quilt/rr (forced update) +Importing device-mapper based on v2.6.32-7500-g8bea867 +Unchanged quilt series device-mapper +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current +$ cd ../quilt-tmp +$ git reset --hard cf43c53bfac23a42f2c625353de5e6444f4c18cd +HEAD is now at cf43c53 Staging/vt66*: kconfig, depends on WLAN +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +kobject-example-spelling-fixes.patch +kset-example-spelling-fixes.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core +From ../quilt-tmp + + d8a5fcf...fc59c91 master -> quilt/driver-core (forced update) +Importing tty based on quilt/driver-core +$ cd ../quilt-tmp +$ git reset --hard fc59c915240fbd8e95b8e12f247724c11625b437 +HEAD is now at fc59c91 kset-example: Spelling fixes. +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty +tty-sdio_uart-use-kfifo-instead-of-the-messy-circ-stuff.patch +serial-core-resume-serial-hardware-with-no_console_suspend.patch +serial-fit-blackfin-uart-over-sport-driver-into-common-uart-infrastructure.patch +serial-copy-uart-properties-of-upf_fixed_type-ports-provisioned-using-early_serial_setup.patch +serial-68328serial.c-remove-baud_table_size-macro.patch +serial-serial_cs-oxsemi-quirk-breaks-resume.patch +serial-atmel_serial-add-poll_get_char-and-poll_put_char-uart_ops.patch +serial-8250-add-serial-transmitter-fully-empty-test.patch +serial-8250_pnp-use-wildcard-for-serial-wacom-tablets.patch +serial-synclink_gt-dropped-transmit-data-bugfix.patch +serial-8250_pci-add-support-for-mcs9865-syba-6x-serial-port-card.patch +serial-imx-fix-null-dereference-oops-when-pdata-null.patch +serial-add-support-for-korenix-jetcard.patch +serial-fix-test-of-unsigned.patch +serial-char-cyclades-fix-compiler-warning.patch +serial-cyclades-allow-overriding-isa-defaults-also-when-the-driver-is-built-in.patch +tty-char-mxser-remove-unnecessary-tty-test.patch +serial-isicom.c-use-pr_fmt-and-pr_-level.patch +hvc_console-fix-test-on-unsigned-in-hvc_console_print.patch +tty-moxa-remove-ifdef-module-completely.patch +ip2-remove-ifdef-module-from-ip2main.c.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/tty +From ../quilt-tmp + + f91645a...0eddb71 master -> quilt/tty (forced update) +Importing usb based on quilt/tty +$ cd ../quilt-tmp +$ git reset --hard 0eddb7114f7e96e76b761e4fbd69c709fe5877bd +HEAD is now at 0eddb71 ip2: remove #ifdef MODULE from ip2main.c +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-mxc-add-i.mx21-specific-usb-host-controller-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:54: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2815: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2832: new blank line at EOF. ++ +warning: 3 lines add whitespace errors. +usb-mxc-use-dma_bit_mask-macro-rather-than-hardcoded-constants.patch +usb-mxc-add-platform-resources-for-i.mx21-usb-host-controller.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:8: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +usb-cxacru-return-an-empty-value-for-modulation-if-there-is-no-connection.patch +usb-cxacru-check-data-length-is-not-negative.patch +usb-cxacru-check-device-isn-t-being-removed-during-sysfs-calls.patch +usb-cxacru-document-how-to-interact-with-the-flash-memory.patch +usb-cxacru-firmware-writes-on-ohci-are-slow-log-progress.patch +usb-cxacru-add-write-only-sysfs-attribute-for-modem-configuration.patch +usb-cxacru-remove-cxacru-cf.bin-loader.patch +usb-cxacru-increment-driver-version.patch +usb-ftdi_sio-fix-error-message-on-close.patch +usb-ftdi_sio-remove-obsolete-comment.patch +usb-serial-fix-typo-in-debug-message.patch +usb-ftdi_sio-fix-initialisation-of-latency-timeout.patch +usb-ftdi_sio-remove-support-for-5-and-6-data-bits.patch +usb-fix-occasional-ulpi-timeouts-with-ehci-mxc.patch +usb-pxa27x_udc-avoid-compiler-warnings-and-misbehavior-on-buggy-hardware.patch +usb-serial-mct_usb232-add-drain-on-close.patch +usb-serial-mct_usb232-move-dma-buffers-to-heap.patch +cdc_acm-add-reset_resume-method.patch +usb-check-the-endpoint-type-against-the-pipe-type.patch +usb-xhci-fix-error-path-when-configuring-endpoints.patch +usb-xhci-refactor-code-to-free-or-cache-endpoint-rings.patch +usb-xhci-allow-allocation-of-commands-without-input-contexts.patch +usb-xhci-refactor-test-for-vendor-specific-completion-codes.patch +usb-xhci-refactor-code-to-clear-port-change-bits.patch +usb-xhci-allow-roothub-ports-to-be-disabled.patch +usb-xhci-notify-the-xhc-when-a-device-is-reset.patch +usb-add-call-to-notify-xhc-of-a-device-reset.patch +usb-ehci-add-call-of-free_cached_itd_list-function-in-disable_periodic.patch +usb-ehci-fix-audio-record-functionality-for-some-full-speed-sound-blaster-devices.patch +usb-ehci-fsl-fix-sparse-warnings.patch +usb-ehci-fsl-add-power-management-support.patch +usb-pxa27x_udc.c-use-resource_size.patch +usb-atmel_usba_udc.c-use-resource_size.patch +usb-at91_udc.c-use-resource_size.patch +usb-ehci-orion.c-use-resource_size.patch +usb-ehci-atmel.c-use-resource_size.patch +usb-ehci-au1xxx.c-use-platform_get_resource-and-resource_size.patch +usb-cdc-acm-update-to-new-autopm-api.patch +usb-xhci-no-gfp_kernel-in-block-error-handling.patch +usb-wusb-check-chid-is-all-zeros-before-stopping-the-host.patch +usb-otg-add-notifier-support.patch +usb-otg-twl4030-add-support-for-notifier.patch +usb-storage-never-reset-devices-that-will-morph-to-an-old-mode.patch +usb-export-usb_quirk_reset_morphs-through-sysfs.patch +usb-cypress_m8-stop-using-usb-debug-driver-config.patch +usb-cypress_m8-unify-confusing-new-baudrate-check.patch +usb-cypress_m8-allow-unstable-baud-rates.patch +usb-isp1362-use-kzalloc-for-allocating-only-one-thing.patch +usb-host-sl811-fix-unaligned-accesses.patch +usb-host-sl811-allow-the-hcd-on-blackfin-systems.patch +usb-gadget-use-ep5-for-bulk-in-and-ep6-for-bulk-out-for-blackfin-musb.patch +usb-gadget-add-int-support-for-blackfin-musb.patch +usb-musb-use-resource_size.patch +usb-musb-move-two-printk-to-dev_err.patch +usb-musb-move-to-sysfs_groups.patch +usb-musb-remove-some-of-the-never-defined-defines.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb +From ../quilt-tmp + + f91645a...730e1fb master -> quilt/usb (forced update) +Importing staging based on quilt/usb +$ cd ../quilt-tmp +$ git reset --hard 730e1fba3135fe31183f43c15acdbec6b557539c +HEAD is now at 730e1fb USB: musb: remove some of the never defined defines +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging +staging-comedi-pcmad-cleanup-code-indent-warning-messages.patch +staging-comedi-pcmad-cleanup-remove-unneeded-braces.patch +staging-comedi-pcmad-cleanup-printk-warnings.patch +staging-dream-add-missing-include-files.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:56: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:551: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1504: new blank line at EOF. ++ +warning: 3 lines add whitespace errors. +staging-dream-fix-memory-leak-in-camera-error-path.patch +staging-dream-remove-duplicated-include.patch +staging-otus-fix-some-sparse-warnings.patch +staging-otus-fix-branch-in-zfprotrspsim.patch +staging-vme-correct-vme_user-error-message-typo.patch +staging-vme-allow-override-of-geographical-address-on-tsi148.patch +staging-vme-allow-override-of-geographical-address-on-ca91c142.patch +staging-vme-fix-checkpatch-errors-on-vme-core.patch +staging-vme-remove-old-structures-for-implemented-features.patch +staging-vme-allow-drivers-to-co-exist.patch +staging-slicoss-convert-to-netdev_tx_t.patch +staging-slicoss-check-for-valid-hw-address.patch +staging-slicoss-no-need-type-casting-when-using-netdev_priv.patch +staging-slicoss-no-need-to-check-pointer-in-debugfs_remove.patch +staging-slicoss-use-dev-stats-rather-than-adapter-stats.patch +staging-slicoss-use-pci_device_table.patch +staging-slicoss-use-compare_ether_addr.patch +staging-slicoss-use-pci_set_consistent_dma_mask.patch +staging-rtl8187x-use-pm-for-mac-address-output.patch +staging-mimio-fix-checkpatch.pl-spacing-errors.patch +staging-mimio-remove-dead-code.patch +staging-mimio-checkpatch.pl-line-80-chars-fixes.patch +staging-asus_oled-add-defines-for-asus-vendor_id-and-device_id-to-be-consistent-with-hid-ids.h.patch +staging-batman-adv-replace-internal-logging-mechanism.patch +staging-batman-adv-refactor-routing.c.patch +staging-batman-adv-stop-persistent-warnings-if-a-device-is-deactivated.patch +staging-batman-adv-always-receive-when-discarding.patch +staging-batman-adv-split-originator-handling-parts-out-of-routing.c.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:30: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:276: new blank line at EOF. ++ +warning: 2 lines add whitespace errors. +staging-batman-adv-fix-the-naming-of-the-debug-option.patch +staging-iio-checkinclude.pl-fix.patch +staging-wlags49_h2-remove-duplicated-include.patch +staging-remove-unused-include-linux-version.h.patch +staging-rtl8192e-fix-some-codingstyle-issues.patch +staging-rtl9192e-fix-power-usage-issues.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:564: space before tab in indent. + ieee->ieee80211_ips_leave(ieee->dev); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1238: space before tab in indent. + (memcmp(net->bssid, BELKINF5D82334V3_RALINK, 3)==0) || +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1247: space before tab in indent. + //(memcmp(net->bssid, NETGEAR834Bv2_BROADCOM, 3)==0) || +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1698: space before tab in indent. + // IPS should go to this. +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2147: space before tab in indent. + else +warning: squelched 5 whitespace errors +warning: 10 lines add whitespace errors. +staging-rtl8192e-fix-more-coding-style-issues.patch +staging-rtl8192e-code-style-fix-for-r819xe_phyreg.h.patch +staging-rtl8192e-code-style-fixes-for-r819xe_phy.h.patch +staging-rtl8192e-small-code-fixes-for-r819xe_firmware.c.patch +staging-add-dt3155-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:20: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:350: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:451: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:3158: new blank line at EOF. ++ +warning: 4 lines add whitespace errors. +staging-dt3155-add-needed-include.patch +staging-dt3155-add-todo-file.patch +staging-dt3155-add-it-to-the-build.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:10: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +staging-udlfb-add-dynamic-modeset-support.patch +staging-fix-misspelling-of-successful-and-variants.patch +staging-fix-misspelling-of-should-and-shouldn-t-in-comments.patch +staging-fix-misspelling-of-invocation-in-comment.patch +staging-w35und-convert-typedef-local_para-to-struct-wb_local_para.patch +staging-w35und-convert-typedef-radiooff-to-struct-radio_off.patch +staging-w35und-remove-unused-typedef-_eventlog.patch +staging-w35und-convert-typedef-chaninfo-to-struct-chan_info.patch +staging-w35und-remove-unused-typedef-chan_list.patch +staging-w35und-remove-unused-typedef-txretry_rec.patch +staging-w35und-remove-unused-typedef-rxlayer1.patch +staging-w35und-remove-unused-typedefs-mlme_deauthreq_para-and-mlme_disassocreq_para.patch +staging-s5k3e2fx.c-simplify-complexity-by-factoring.patch +staging-rtl8192su-build-should-select-wireless_ext.patch +staging-rtl8192su-use-z-format-qualifier-for-output-of-sizeof.patch +staging-prism2-usb-build-should-select-wireless_ext.patch +staging-wlan-ng-initialise-mibitem.patch +staging-dt3155-coding-style-cleanups-for-allocator-code.patch +staging-dt3155-coding-style-cleanups-for-the-.h-files.patch +staging-remove-the-b3dfg-driver.patch +staging-p9auth-remove-driver-from-tree.patch +staging-altpciechdma-remove-driver.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging +From ../quilt-tmp + + 2537c7b...4b24c2a master -> quilt/staging (forced update) +Importing driver-core.current based on 2.6.33-rc1-git4 + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core.current 2f99f5c8f05e02f3df1bb4d93b6704e6f5972872 +Importing tty.current based on quilt/driver-core.current +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 2f99f5c8f05e02f3df1bb4d93b6704e6f5972872 +HEAD is now at 2f99f5c Revert "x86, ucode-amd: Ensure ucode update on suspend/resume after CPU off/online cycle" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty.current +serial-imx-bit-confusion.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/tty.current +From ../quilt-tmp + + 84c4457...477fec7 master -> quilt/tty.current (forced update) +Importing usb.current based on quilt/tty.current + quilt series is empty +$ git update-ref refs/heads/quilt/usb.current 477fec79c5b59cdf6f0231206142ef889392cb00 +Importing staging.current based on quilt/usb.current + quilt series is empty +$ git update-ref refs/heads/quilt/staging.current 477fec79c5b59cdf6f0231206142ef889392cb00 +Importing i2c based on 2.6.33-rc1-git1 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 2.6.33-rc1-git1 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 2.6.32-git5 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.33-rc1-96-gdd59f6c +Unchanged quilt series rr +Importing device-mapper based on v2.6.32-7500-g8bea867 +Unchanged quilt series device-mapper +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current +$ cd ../quilt-tmp +$ git reset --hard 477fec79c5b59cdf6f0231206142ef889392cb00 +HEAD is now at 477fec7 serial: imx: bit &/| confusion +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +kobject-example-spelling-fixes.patch +kset-example-spelling-fixes.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core +From ../quilt-tmp + + fc59c91...35bd8c8 master -> quilt/driver-core (forced update) +Importing tty based on quilt/driver-core +$ cd ../quilt-tmp +$ git reset --hard 35bd8c8a8a9d687be88e33a19b6b4aab2f4343ac +HEAD is now at 35bd8c8 kset-example: Spelling fixes. +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty +serial-core-resume-serial-hardware-with-no_console_suspend.patch +serial-fit-blackfin-uart-over-sport-driver-into-common-uart-infrastructure.patch +serial-copy-uart-properties-of-upf_fixed_type-ports-provisioned-using-early_serial_setup.patch +serial-68328serial.c-remove-baud_table_size-macro.patch +serial-serial_cs-oxsemi-quirk-breaks-resume.patch +serial-atmel_serial-add-poll_get_char-and-poll_put_char-uart_ops.patch +serial-8250-add-serial-transmitter-fully-empty-test.patch +serial-8250_pnp-use-wildcard-for-serial-wacom-tablets.patch +serial-synclink_gt-dropped-transmit-data-bugfix.patch +serial-8250_pci-add-support-for-mcs9865-syba-6x-serial-port-card.patch +serial-imx-fix-null-dereference-oops-when-pdata-null.patch +serial-add-support-for-korenix-jetcard.patch +serial-fix-test-of-unsigned.patch +serial-char-cyclades-fix-compiler-warning.patch +serial-cyclades-allow-overriding-isa-defaults-also-when-the-driver-is-built-in.patch +tty-char-mxser-remove-unnecessary-tty-test.patch +serial-isicom.c-use-pr_fmt-and-pr_-level.patch +hvc_console-fix-test-on-unsigned-in-hvc_console_print.patch +tty-moxa-remove-ifdef-module-completely.patch +ip2-remove-ifdef-module-from-ip2main.c.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/tty +From ../quilt-tmp + + 0eddb71...61d7f70 master -> quilt/tty (forced update) +Importing usb based on quilt/tty +$ cd ../quilt-tmp +$ git reset --hard 61d7f7052bb3675e65f8c2d0c2b4d0867228061e +HEAD is now at 61d7f70 ip2: remove #ifdef MODULE from ip2main.c +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-mxc-add-i.mx21-specific-usb-host-controller-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:54: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2815: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2832: new blank line at EOF. ++ +warning: 3 lines add whitespace errors. +usb-mxc-use-dma_bit_mask-macro-rather-than-hardcoded-constants.patch +usb-mxc-add-platform-resources-for-i.mx21-usb-host-controller.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:8: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +usb-cxacru-return-an-empty-value-for-modulation-if-there-is-no-connection.patch +usb-cxacru-check-data-length-is-not-negative.patch +usb-cxacru-check-device-isn-t-being-removed-during-sysfs-calls.patch +usb-cxacru-document-how-to-interact-with-the-flash-memory.patch +usb-cxacru-firmware-writes-on-ohci-are-slow-log-progress.patch +usb-cxacru-add-write-only-sysfs-attribute-for-modem-configuration.patch +usb-cxacru-remove-cxacru-cf.bin-loader.patch +usb-cxacru-increment-driver-version.patch +usb-ftdi_sio-fix-error-message-on-close.patch +usb-ftdi_sio-remove-obsolete-comment.patch +usb-serial-fix-typo-in-debug-message.patch +usb-ftdi_sio-fix-initialisation-of-latency-timeout.patch +usb-ftdi_sio-remove-support-for-5-and-6-data-bits.patch +usb-fix-occasional-ulpi-timeouts-with-ehci-mxc.patch +usb-pxa27x_udc-avoid-compiler-warnings-and-misbehavior-on-buggy-hardware.patch +usb-serial-mct_usb232-add-drain-on-close.patch +usb-serial-mct_usb232-move-dma-buffers-to-heap.patch +cdc_acm-add-reset_resume-method.patch +usb-check-the-endpoint-type-against-the-pipe-type.patch +usb-xhci-fix-error-path-when-configuring-endpoints.patch +usb-xhci-refactor-code-to-free-or-cache-endpoint-rings.patch +usb-xhci-allow-allocation-of-commands-without-input-contexts.patch +usb-xhci-refactor-test-for-vendor-specific-completion-codes.patch +usb-xhci-refactor-code-to-clear-port-change-bits.patch +usb-xhci-allow-roothub-ports-to-be-disabled.patch +usb-xhci-notify-the-xhc-when-a-device-is-reset.patch +usb-add-call-to-notify-xhc-of-a-device-reset.patch +usb-ehci-add-call-of-free_cached_itd_list-function-in-disable_periodic.patch +usb-ehci-fix-audio-record-functionality-for-some-full-speed-sound-blaster-devices.patch +usb-ehci-fsl-fix-sparse-warnings.patch +usb-ehci-fsl-add-power-management-support.patch +usb-pxa27x_udc.c-use-resource_size.patch +usb-atmel_usba_udc.c-use-resource_size.patch +usb-at91_udc.c-use-resource_size.patch +usb-ehci-orion.c-use-resource_size.patch +usb-ehci-atmel.c-use-resource_size.patch +usb-ehci-au1xxx.c-use-platform_get_resource-and-resource_size.patch +usb-cdc-acm-update-to-new-autopm-api.patch +usb-xhci-no-gfp_kernel-in-block-error-handling.patch +usb-wusb-check-chid-is-all-zeros-before-stopping-the-host.patch +usb-otg-add-notifier-support.patch +usb-otg-twl4030-add-support-for-notifier.patch +usb-storage-never-reset-devices-that-will-morph-to-an-old-mode.patch +usb-export-usb_quirk_reset_morphs-through-sysfs.patch +usb-cypress_m8-stop-using-usb-debug-driver-config.patch +usb-cypress_m8-unify-confusing-new-baudrate-check.patch +usb-cypress_m8-allow-unstable-baud-rates.patch +usb-isp1362-use-kzalloc-for-allocating-only-one-thing.patch +usb-host-sl811-fix-unaligned-accesses.patch +usb-host-sl811-allow-the-hcd-on-blackfin-systems.patch +usb-gadget-use-ep5-for-bulk-in-and-ep6-for-bulk-out-for-blackfin-musb.patch +usb-gadget-add-int-support-for-blackfin-musb.patch +usb-musb-use-resource_size.patch +usb-musb-move-two-printk-to-dev_err.patch +usb-musb-move-to-sysfs_groups.patch +usb-musb-remove-some-of-the-never-defined-defines.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb +From ../quilt-tmp + + 730e1fb...8196ff9 master -> quilt/usb (forced update) +Importing staging based on quilt/usb +$ cd ../quilt-tmp +$ git reset --hard 8196ff919ba81e51b1c60ef7687f808f910faaee +HEAD is now at 8196ff9 USB: musb: remove some of the never defined defines +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging +staging-comedi-pcmad-cleanup-code-indent-warning-messages.patch +staging-comedi-pcmad-cleanup-remove-unneeded-braces.patch +staging-comedi-pcmad-cleanup-printk-warnings.patch +staging-dream-add-missing-include-files.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:56: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:551: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1504: new blank line at EOF. ++ +warning: 3 lines add whitespace errors. +staging-dream-fix-memory-leak-in-camera-error-path.patch +staging-dream-remove-duplicated-include.patch +staging-otus-fix-some-sparse-warnings.patch +staging-otus-fix-branch-in-zfprotrspsim.patch +staging-vme-correct-vme_user-error-message-typo.patch +staging-vme-allow-override-of-geographical-address-on-tsi148.patch +staging-vme-allow-override-of-geographical-address-on-ca91c142.patch +staging-vme-fix-checkpatch-errors-on-vme-core.patch +staging-vme-remove-old-structures-for-implemented-features.patch +staging-vme-allow-drivers-to-co-exist.patch +staging-slicoss-convert-to-netdev_tx_t.patch +staging-slicoss-check-for-valid-hw-address.patch +staging-slicoss-no-need-type-casting-when-using-netdev_priv.patch +staging-slicoss-no-need-to-check-pointer-in-debugfs_remove.patch +staging-slicoss-use-dev-stats-rather-than-adapter-stats.patch +staging-slicoss-use-pci_device_table.patch +staging-slicoss-use-compare_ether_addr.patch +staging-slicoss-use-pci_set_consistent_dma_mask.patch +staging-rtl8187x-use-pm-for-mac-address-output.patch +staging-mimio-fix-checkpatch.pl-spacing-errors.patch +staging-mimio-remove-dead-code.patch +staging-mimio-checkpatch.pl-line-80-chars-fixes.patch +staging-asus_oled-add-defines-for-asus-vendor_id-and-device_id-to-be-consistent-with-hid-ids.h.patch +staging-batman-adv-replace-internal-logging-mechanism.patch +staging-batman-adv-refactor-routing.c.patch +staging-batman-adv-stop-persistent-warnings-if-a-device-is-deactivated.patch +staging-batman-adv-always-receive-when-discarding.patch +staging-batman-adv-split-originator-handling-parts-out-of-routing.c.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:30: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:276: new blank line at EOF. ++ +warning: 2 lines add whitespace errors. +staging-batman-adv-fix-the-naming-of-the-debug-option.patch +staging-iio-checkinclude.pl-fix.patch +staging-wlags49_h2-remove-duplicated-include.patch +staging-remove-unused-include-linux-version.h.patch +staging-rtl8192e-fix-some-codingstyle-issues.patch +staging-rtl9192e-fix-power-usage-issues.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:564: space before tab in indent. + ieee->ieee80211_ips_leave(ieee->dev); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1238: space before tab in indent. + (memcmp(net->bssid, BELKINF5D82334V3_RALINK, 3)==0) || +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1247: space before tab in indent. + //(memcmp(net->bssid, NETGEAR834Bv2_BROADCOM, 3)==0) || +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1698: space before tab in indent. + // IPS should go to this. +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2147: space before tab in indent. + else +warning: squelched 5 whitespace errors +warning: 10 lines add whitespace errors. +staging-rtl8192e-fix-more-coding-style-issues.patch +staging-rtl8192e-code-style-fix-for-r819xe_phyreg.h.patch +staging-rtl8192e-code-style-fixes-for-r819xe_phy.h.patch +staging-rtl8192e-small-code-fixes-for-r819xe_firmware.c.patch +staging-add-dt3155-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:20: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:350: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:451: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:3158: new blank line at EOF. ++ +warning: 4 lines add whitespace errors. +staging-dt3155-add-needed-include.patch +staging-dt3155-add-todo-file.patch +staging-dt3155-add-it-to-the-build.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:10: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +staging-udlfb-add-dynamic-modeset-support.patch +staging-fix-misspelling-of-successful-and-variants.patch +staging-fix-misspelling-of-should-and-shouldn-t-in-comments.patch +staging-fix-misspelling-of-invocation-in-comment.patch +staging-w35und-convert-typedef-local_para-to-struct-wb_local_para.patch +staging-w35und-convert-typedef-radiooff-to-struct-radio_off.patch +staging-w35und-remove-unused-typedef-_eventlog.patch +staging-w35und-convert-typedef-chaninfo-to-struct-chan_info.patch +staging-w35und-remove-unused-typedef-chan_list.patch +staging-w35und-remove-unused-typedef-txretry_rec.patch +staging-w35und-remove-unused-typedef-rxlayer1.patch +staging-w35und-remove-unused-typedefs-mlme_deauthreq_para-and-mlme_disassocreq_para.patch +staging-s5k3e2fx.c-simplify-complexity-by-factoring.patch +staging-rtl8192su-build-should-select-wireless_ext.patch +staging-rtl8192su-use-z-format-qualifier-for-output-of-sizeof.patch +staging-prism2-usb-build-should-select-wireless_ext.patch +staging-wlan-ng-initialise-mibitem.patch +staging-dt3155-coding-style-cleanups-for-allocator-code.patch +staging-dt3155-coding-style-cleanups-for-the-.h-files.patch +staging-remove-the-b3dfg-driver.patch +staging-p9auth-remove-driver-from-tree.patch +staging-altpciechdma-remove-driver.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging +From ../quilt-tmp + + 4b24c2a...d978bac master -> quilt/staging (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..6098c085207d --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20091224 |