diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-19 10:35:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-19 10:35:27 +1100 |
| commit | 41202512fbf74dfbab6a39d125213bc77a017f86 (patch) | |
| tree | 2fb7a5a53395b224d1219e30d40bdf8e191ae1a2 | |
| parent | 93661962b911a743844c4972f9a0a3a765ba0c30 (diff) | |
Add linux-next specific files for 20091219next-20091219
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 | 2939 | ||||
| -rw-r--r-- | Next/quilt-import.log | 221 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3477 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..2411da8ae2e0 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,157 @@ +Name SHA1 +---- ---- +origin 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +fixes 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c +arm-current 4da8b8208eded0ba21e3ed7cee79e7454b2b973d +m68k-current 49966bae8446f5ba7e8afbd01bde82af4e00628a +powerpc-merge 6ec22f9b037fc0c2e00ddb7023fad279c365324d +sparc-current 7466bd3caab6bd1d0095de957affbacd02ca58a7 +scsi-rc-fixes 4e46bf89972b9d98a9f282a9fed2359756a5e34e +net-current 503914cf4a4b5dbe3f844e0a92f412ae99fde70e +sound-current a9e060571a057c132240753b7f815f4a1e0320a3 +pci-current 2d1c861871d767153538a77c498752b36d4bb4b8 +wireless-current a06e79b63bdf00270d859a1ae205d73a863e61a4 +kbuild-current 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +driver-core.current 29d84f9bdcfb46a12948d42255cea7bfaf2dbe34 +tty.current 29d84f9bdcfb46a12948d42255cea7bfaf2dbe34 +usb.current e05cf59cd06a6966d4f1cd8ae8d2c84d8eee7f42 +staging.current 1259a443bd5d460d85ada8e115ed599041f37b0f +cpufreq-current 8e196da6b8e15e27af67ea6c9a01a888ae97b8b4 +input-current 1d9f26262aef6d63ff65eba0fd5f1583f342b69b +md-current 06e3c817b750c131a20e82eed57a17841ea88ed2 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current eed89d0f9d3383851cec634565a6414fae70fe91 +ide-curent f40542532e96dda5506eb76badea322f2ae4731c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 39d625526e1673fdd080534b56ec39974d2bbcc3 +davinci c16fe26701013b9f55aa554fc0a13a7320b164ee +msm 5c43d49aec499973b51e574af871c8918598c2db +omap 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung aac0d66a1b99d737d62a60d14570f2dae4efc4c0 +avr32 5416bf33f92a4104dbcd6062bf377c8421ca3cfd +blackfin 64a2b168023bfd09037ba760838762e56c44178e +cris d8fe989e7368a26e4baf9acb55524c71e5c3a117 +ia64 2546f47024a5b8232ab37853d13836d67f8f5318 +m68k 49966bae8446f5ba7e8afbd01bde82af4e00628a +m68knommu bea4c899f2b5fad80099aea979780ef19f9b1987 +microblaze 8bea8672edfca7ec5f661cafb218f1205863b343 +mips 70ddd14e31d59a43c53015cfc2dc0460d83d5f79 +parisc d0608b54740c82b08056b7611e38a3fd73be3564 +powerpc e090aa80321b64c3b793f3b047e31ecf1af9538d +4xx a18cb387e5c29be5c95cded5b5a55110bb930f5c +52xx-and-virtex 718deb6b61e34c200c1f2b706176d9aac334cb2d +galak c1a676dfa2fa25fb9ec77c92ebe3ff580648b6ac +s390 42d61b9b415686d81eaa022b846737548876e51d +sh 7521d473dfac6f0c721e9b47220635bbe36df78e +sparc 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +ceph c2e552e76e2c6907ca50cd9a4b747a2e2e8c615e +cifs a994b8fa669f16c50728328c3735722a3f20652e +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 9a94c9ae052b2c28000b22e6008f49ae19f8ed05 +ext3 ef22d6deda461ef32c72944f662863c022253571 +ext4 9f31d1227c3f2611405fc29e092c61a56b37da33 +fatfs 681142f9211b23e6aa2984259d38b76d7bdc05a8 +fuse 1b7323965a8c6eee9dc4e345a7ae4bff1dc93149 +gfs2 26bb7505cf7db3560286be9f6384b6d3911f78b5 +jfs 4a19fb11a90fdbbcb3bc02effa036230d035ca28 +logfs 5c564c2a04d4bb6ba79eeb83bd06de584479f362 +nfs 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +nfsd 45886dbdcb4e1aa7b0d0b5589451df8be487a1fc +nilfs2 0405938ee3288783bcf9809e2bf5488520230a63 +ocfs2 2503140141dd614698249c437414fb6f3c1b51bc +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +udf 2c948b3f86e5f0327e2e57858600af6e6f0ae29a +v9fs 47d425b937566337d4a7afdf01040a3006781007 +ubifs b38882f5c066dc681679e90f1903eda323e605b1 +xfs f8c89a9e39a10448543c8dc720626d4cf7f2ec49 +reiserfs-bkl 47376ceba54600cec4dd9e7c4fe8b98e4269633a +vfs 718deb6b61e34c200c1f2b706176d9aac334cb2d +pci 8bea8672edfca7ec5f661cafb218f1205863b343 +hid 3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0 +i2c 7aff07c3f4191773bcbebd80ca0323a7ae52d5d9 +bjdooks-i2c 155a49319fabae97c14c7eb474562f2bdfe5af1f +jdelvare-hwmon 2a60ee495c13f15d3fc1bed976ee548dc65dc78a +kernel-doc 23dca22646332256248dae260b85c1ac61024324 +v4l-dvb 5ee2472863a4de4edd42451fd86e3d7857602337 +kbuild 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +kconfig 7b76bfc86757ca5e7b0a62f50003752da77c115b +ide f40542532e96dda5506eb76badea322f2ae4731c +libata 4d4a7b8b51cd8ce7f2901bbc10e3daff67af5484 +infiniband 14f369d1d61e7ac6578c54ca9ce3caaf4072412c +acpi 72e22b921ab25fef6f3a0e3c9efceaea0cb14cf7 +ieee1394 0b4a42d709e5a410563b65da39582cb6ffc1852d +ubi 44244312d096294d4fc192c3af15e8184957f97b +kvm 126021c7fe32257d6788f08739e11700e7f7ded7 +dlm 573c24c4af6664ffcd9aa7ba617a35fde2b95534 +scsi 53ca353594a254e6bd45ccf2d405aa31bcbb7091 +async_tx 3542a113ab2f5880f1b62e5909d754250fb57d6b +net a252e749f1ae17e43ccc5824f7b1b5854417c98b +wireless 9f8ef9c7f91548bdbe0d67ae3e9d223e3010219a +mtd 60d9aa758c00f20ade0cb1951f6a934f628dd2d7 +crypto 8afb602bb676ed7da3cba154f2f5edf3971a582b +sound 90c2b31328f537f013ce6276c9d1eb3d22ab6428 +cpufreq 8e196da6b8e15e27af67ea6c9a01a888ae97b8b4 +rr 4543201763c2d8d47c7c4e0ec44cf6240ee8b83f +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +tmio-mmc 4b52cd752af330463abf2527a8b0df9a10916613 +input 1d9f26262aef6d63ff65eba0fd5f1583f342b69b +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 7667aa0630407bc07dc38dcc79d29cc0a65553c1 +device-mapper 8bea8672edfca7ec5f661cafb218f1205863b343 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 9fea84f46a821aa1ff2d034ffda8ad33bff48015 +battery d54e7929d8073b0fff8af16f8ff6ebbba6fc4154 +leds e45906203d27296b47e56efc1219f9a200bfc2db +backlight f7a297af49e5d9d2c577466307e8ef392750c9d9 +kgdb 51a3c2398cc9a3b1410e33690022e4701b7f069e +slab 0b9a2c5f71765320086e89074ae83a06bb056037 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md de3805f30ab1eac69702d3d26db8c79308ac63a8 +mfd 9da66539281b5e15afc4a4739014c8923059d894 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm be57261833a019c3e068e4d00de9b70799396591 +voltage b1c20d088686630db1dd168bcbc84fda3f390736 +security-testing fdb8ebb729bbb640e64028a4f579a02ebc405727 +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 6a7a25116787189f238a1c9a99ec473a3b6d565c +uwb 0396c215f301e92677d1e9a064b405e31501dc1d +watchdog 71cad895b4365a3f61652090aa78314e51b132fc +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu a79960e576ebca9dbf24489b562689f2be7e9ff0 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 9883784515ca7022409f6a1f3bafce423fa50fee +jc_docs 5e9b356216d97439aea1ec656bdb3c17b9c2d4ae +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 7e5555c2957798192485d89683600ab0cfb16d66 +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend fa30445f6441f90dcc18402fdff497462fe0454c +bluetooth 2861453b1b5e022fd5e1294b8fbf39254440b661 +fsnotify 34cb304c7a759738bebcdb091b90e6e8f16b8fa6 +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +drbd 12cd8974b39f4f985af114181421c67e765817c5 +catalin 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +alacrity e1077ef3b2751766c4437e2f974e3d7372742d0d +i7core_edac d0ae29a6eed06533e30dc7cd00d6f7983e3a7287 +devicetree f40542532e96dda5506eb76badea322f2ae4731c +spi d53342bf9616ecd7e4a03fece167d0f53b195e87 +limits 5663496f34df97aa0015f6b6a2f8613cf3eb2d1f +omap_dss2 3ef884b4c04e857c283cc77ca70ad8f638d94b0e +tip 744ff09f918924271be1f83f6f5ef57d19076a9f +edac-amd 256f7276af20c88b492353710d5d6640b09c3d63 +oprofile 374576a8b6f865022c0fd1ca62396889b23d66dd +percpu 72e7aea6c4d6653ee5e9512d4c70ffbd2c76529a +workqueues dc186ad741c12ae9ecac8b89e317ef706fdaf8f6 +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +hwpoison f2c03debdfb387fa2e35cac6382779072b8b9209 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core d8a5fcf4dbdd21a6295bded4911fca3cd14ba6bc +tty f91645a39ef28b84a9cd26d06d09835251508a09 +usb f91645a39ef28b84a9cd26d06d09835251508a09 +staging 2537c7b6a053a8b0d9a142df2fb7e408ea11bf26 +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..47072155e8b5 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2939 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b8a7f3c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 +Merging origin/master +$ git merge origin/master +Updating b8a7f3c..5563935 +Fast forward + Documentation/cpu-hotplug.txt | 49 +- + Documentation/hwmon/k10temp | 60 + + Makefile | 4 +- + arch/arm/common/dmabounce.c | 12 +- + arch/arm/include/asm/cacheflush.h | 17 +- + arch/arm/mach-kirkwood/Kconfig | 6 + + arch/arm/mach-kirkwood/Makefile | 1 + + arch/arm/mach-kirkwood/netspace_v2-setup.c | 325 ++ + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/board-cm-t35.c | 2 +- + arch/arm/mach-omap2/board-igep0020.c | 2 +- + arch/arm/mach-omap2/board-omap3evm.c | 2 +- + arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +- + arch/arm/mach-omap2/serial.c | 7 +- + arch/arm/mach-pxa/Kconfig | 3 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-s3c2410/include/mach/spi.h | 2 + + arch/arm/mm/cache-fa.S | 11 +- + arch/arm/mm/cache-l2x0.c | 93 +- + arch/arm/mm/cache-v3.S | 9 +- + arch/arm/mm/cache-v4.S | 9 +- + arch/arm/mm/cache-v4wb.S | 11 +- + arch/arm/mm/cache-v4wt.S | 11 +- + arch/arm/mm/cache-v6.S | 11 +- + arch/arm/mm/cache-v7.S | 13 +- + arch/arm/mm/flush.c | 4 +- + arch/arm/mm/highmem.c | 2 +- + arch/arm/mm/nommu.c | 2 +- + arch/arm/mm/proc-arm1020.S | 11 +- + arch/arm/mm/proc-arm1020e.S | 11 +- + arch/arm/mm/proc-arm1022.S | 11 +- + arch/arm/mm/proc-arm1026.S | 11 +- + arch/arm/mm/proc-arm920.S | 11 +- + arch/arm/mm/proc-arm922.S | 11 +- + arch/arm/mm/proc-arm925.S | 11 +- + arch/arm/mm/proc-arm926.S | 11 +- + arch/arm/mm/proc-arm940.S | 9 +- + arch/arm/mm/proc-arm946.S | 11 +- + arch/arm/mm/proc-feroceon.S | 15 +- + arch/arm/mm/proc-mohawk.S | 11 +- + arch/arm/mm/proc-syms.c | 3 +- + arch/arm/mm/proc-v6.S | 5 +- + arch/arm/mm/proc-xsc3.S | 11 +- + arch/arm/mm/proc-xscale.S | 13 +- + arch/arm/tools/mach-types | 44 +- + arch/mips/Kconfig | 119 +- + arch/mips/Kconfig.debug | 59 +- + arch/mips/Makefile | 57 +- + arch/mips/ar7/platform.c | 2 +- + arch/mips/basler/excite/Kconfig | 9 - + arch/mips/basler/excite/Makefile | 8 - + arch/mips/basler/excite/excite_device.c | 403 --- + arch/mips/basler/excite/excite_iodev.c | 178 - + arch/mips/basler/excite/excite_iodev.h | 10 - + arch/mips/basler/excite/excite_irq.c | 122 - + arch/mips/basler/excite/excite_procfs.c | 92 - + arch/mips/basler/excite/excite_prom.c | 144 - + arch/mips/basler/excite/excite_setup.c | 302 -- + arch/mips/bcm47xx/prom.c | 10 +- + arch/mips/boot/Makefile | 8 +- + arch/mips/boot/addinitrd.c | 131 - + arch/mips/boot/compressed/Makefile | 100 + + arch/mips/boot/compressed/dbg.c | 37 + + arch/mips/boot/compressed/decompress.c | 126 + + arch/mips/boot/compressed/dummy.c | 4 + + arch/mips/boot/compressed/head.S | 56 + + arch/mips/boot/compressed/ld.script | 150 + + arch/mips/boot/compressed/uart-16550.c | 43 + + arch/mips/cavium-octeon/Makefile | 2 +- + arch/mips/cavium-octeon/cpu.c | 52 + + arch/mips/cavium-octeon/octeon-platform.c | 88 + + arch/mips/configs/ar7_defconfig | 4 +- + arch/mips/configs/bcm47xx_defconfig | 3 +- + arch/mips/configs/bcm63xx_defconfig | 3 +- + arch/mips/configs/bigsur_defconfig | 3 +- + arch/mips/configs/capcella_defconfig | 3 +- + arch/mips/configs/cavium-octeon_defconfig | 4 +- + arch/mips/configs/cobalt_defconfig | 3 +- + arch/mips/configs/db1000_defconfig | 3 +- + arch/mips/configs/db1100_defconfig | 3 +- + arch/mips/configs/db1200_defconfig | 3 +- + arch/mips/configs/db1500_defconfig | 3 +- + arch/mips/configs/db1550_defconfig | 3 +- + arch/mips/configs/decstation_defconfig | 3 +- + arch/mips/configs/e55_defconfig | 3 +- + arch/mips/configs/excite_defconfig | 1335 -------- + arch/mips/configs/fuloong2e_defconfig | 96 +- + arch/mips/configs/ip22_defconfig | 3 +- + arch/mips/configs/ip27_defconfig | 3 +- + arch/mips/configs/ip28_defconfig | 3 +- + arch/mips/configs/ip32_defconfig | 3 +- + arch/mips/configs/jazz_defconfig | 3 +- + arch/mips/configs/jmr3927_defconfig | 3 +- + arch/mips/configs/lasat_defconfig | 3 +- + arch/mips/configs/lemote2f_defconfig | 1835 ++++++++++ + arch/mips/configs/malta_defconfig | 3 +- + arch/mips/configs/markeins_defconfig | 3 +- + arch/mips/configs/mipssim_defconfig | 3 +- + arch/mips/configs/mpc30x_defconfig | 3 +- + arch/mips/configs/msp71xx_defconfig | 3 +- + arch/mips/configs/mtx1_defconfig | 3 +- + arch/mips/configs/pb1100_defconfig | 3 +- + arch/mips/configs/pb1500_defconfig | 3 +- + arch/mips/configs/pb1550_defconfig | 3 +- + arch/mips/configs/pnx8335-stb225_defconfig | 3 +- + arch/mips/configs/pnx8550-jbs_defconfig | 3 +- + arch/mips/configs/pnx8550-stb810_defconfig | 3 +- + arch/mips/configs/powertv_defconfig | 1550 +++++++++ + arch/mips/configs/rb532_defconfig | 3 +- + arch/mips/configs/rbtx49xx_defconfig | 4 +- + arch/mips/configs/rm200_defconfig | 3 +- + arch/mips/configs/sb1250-swarm_defconfig | 3 +- + arch/mips/configs/tb0219_defconfig | 3 +- + arch/mips/configs/tb0226_defconfig | 3 +- + arch/mips/configs/tb0287_defconfig | 3 +- + arch/mips/configs/workpad_defconfig | 3 +- + arch/mips/configs/wrppmc_defconfig | 3 +- + arch/mips/configs/yosemite_defconfig | 3 +- + arch/mips/fw/arc/cmdline.c | 5 - + arch/mips/include/asm/bootinfo.h | 8 +- + arch/mips/include/asm/clock.h | 64 + + arch/mips/include/asm/cop2.h | 23 + + arch/mips/include/asm/cpu.h | 2 + + arch/mips/include/asm/fpu.h | 8 - + arch/mips/include/asm/fpu_emulator.h | 24 +- + arch/mips/include/asm/ftrace.h | 91 +- + arch/mips/include/asm/irq.h | 29 +- + .../asm/mach-excite/cpu-feature-overrides.h | 48 - + arch/mips/include/asm/mach-excite/excite.h | 154 - + arch/mips/include/asm/mach-excite/excite_fpga.h | 80 - + .../include/asm/mach-excite/excite_nandflash.h | 7 - + arch/mips/include/asm/mach-excite/rm9k_eth.h | 23 - + arch/mips/include/asm/mach-excite/rm9k_wdt.h | 12 - + arch/mips/include/asm/mach-excite/rm9k_xicap.h | 16 - + .../mips/include/asm/mach-loongson/cs5536/cs5536.h | 305 ++ + .../asm/mach-loongson/cs5536/cs5536_mfgpt.h | 35 + + .../include/asm/mach-loongson/cs5536/cs5536_pci.h | 153 + + .../include/asm/mach-loongson/cs5536/cs5536_vsm.h | 31 + + .../mips/include/asm/mach-loongson/dma-coherence.h | 4 + + arch/mips/include/asm/mach-loongson/loongson.h | 290 ++- + arch/mips/include/asm/mach-loongson/machine.h | 9 +- + arch/mips/include/asm/mach-loongson/mem.h | 27 +- + arch/mips/include/asm/mach-loongson/pci.h | 34 +- + arch/mips/include/asm/mach-powertv/asic.h | 107 + + arch/mips/include/asm/mach-powertv/asic_regs.h | 155 + + arch/mips/include/asm/mach-powertv/dma-coherence.h | 119 + + arch/mips/include/asm/mach-powertv/interrupts.h | 254 ++ + arch/mips/include/asm/mach-powertv/ioremap.h | 90 + + arch/mips/include/asm/mach-powertv/irq.h | 25 + + arch/mips/include/asm/mach-powertv/powertv-clock.h | 29 + + .../asm/{mach-excite => mach-powertv}/war.h | 19 +- + arch/mips/include/asm/mips-boards/bonito64.h | 5 - + arch/mips/include/asm/mmu_context.h | 29 +- + arch/mips/include/asm/octeon/cvmx-agl-defs.h | 1194 +++++++ + arch/mips/include/asm/octeon/cvmx-mixx-defs.h | 248 ++ + arch/mips/include/asm/octeon/cvmx-smix-defs.h | 178 + + arch/mips/include/asm/octeon/octeon.h | 1 + + arch/mips/include/asm/pgtable.h | 13 + + arch/mips/include/asm/sgialib.h | 3 +- + arch/mips/include/asm/stackframe.h | 40 +- + arch/mips/kernel/Makefile | 14 +- + arch/mips/kernel/cpu-probe.c | 2 + + arch/mips/kernel/cpufreq/Kconfig | 41 + + arch/mips/kernel/cpufreq/Makefile | 5 + + arch/mips/kernel/cpufreq/loongson2_clock.c | 166 + + arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 227 ++ + arch/mips/kernel/csrc-powertv.c | 180 + + arch/mips/kernel/ftrace.c | 275 ++ + arch/mips/kernel/irq.c | 30 + + arch/mips/kernel/mcount.S | 189 ++ + arch/mips/kernel/mips_ksyms.c | 5 + + arch/mips/kernel/setup.c | 44 +- + arch/mips/kernel/signal.c | 46 + + arch/mips/kernel/signal32.c | 24 + + arch/mips/kernel/smp.c | 3 +- + arch/mips/kernel/smtc.c | 21 +- + arch/mips/kernel/traps.c | 136 +- + arch/mips/kernel/unaligned.c | 25 +- + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/mips/lasat/picvue_proc.c | 113 +- + arch/mips/lasat/prom.c | 4 +- + arch/mips/lasat/sysctl.c | 2 +- + arch/mips/loongson/Kconfig | 108 +- + arch/mips/loongson/Makefile | 6 + + arch/mips/loongson/common/Makefile | 18 +- + arch/mips/loongson/common/bonito-irq.c | 13 +- + arch/mips/loongson/common/cmdline.c | 4 +- + arch/mips/loongson/common/cs5536/Makefile | 13 + + arch/mips/loongson/common/cs5536/cs5536_acc.c | 140 + + arch/mips/loongson/common/cs5536/cs5536_ehci.c | 158 + + arch/mips/loongson/common/cs5536/cs5536_ide.c | 179 + + arch/mips/loongson/common/cs5536/cs5536_isa.c | 316 ++ + arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 217 ++ + arch/mips/loongson/common/cs5536/cs5536_ohci.c | 147 + + arch/mips/loongson/common/cs5536/cs5536_pci.c | 87 + + arch/mips/loongson/common/early_printk.c | 17 +- + arch/mips/loongson/common/env.c | 3 + + arch/mips/loongson/common/init.c | 19 +- + arch/mips/loongson/common/irq.c | 12 +- + arch/mips/loongson/common/machtype.c | 25 +- + arch/mips/loongson/common/mem.c | 91 +- + arch/mips/loongson/common/pci.c | 20 +- + arch/mips/loongson/common/platform.c | 30 + + arch/mips/loongson/common/pm.c | 161 + + arch/mips/loongson/common/reset.c | 2 +- + arch/mips/loongson/common/serial.c | 76 + + arch/mips/loongson/common/time.c | 3 + + arch/mips/loongson/common/uart_base.c | 45 + + arch/mips/loongson/fuloong-2e/irq.c | 4 +- + arch/mips/loongson/fuloong-2e/reset.c | 4 +- + arch/mips/loongson/lemote-2f/Makefile | 11 + + arch/mips/loongson/lemote-2f/ec_kb3310b.c | 130 + + arch/mips/loongson/lemote-2f/ec_kb3310b.h | 188 ++ + arch/mips/loongson/lemote-2f/irq.c | 134 + + arch/mips/loongson/lemote-2f/pm.c | 149 + + arch/mips/loongson/lemote-2f/reset.c | 159 + + arch/mips/math-emu/cp1emu.c | 102 +- + arch/mips/math-emu/dsemul.c | 4 +- + arch/mips/mipssim/Makefile | 3 +- + arch/mips/mipssim/sim_setup.c | 1 - + arch/mips/mm/cerr-sb1.c | 7 +- + arch/mips/mm/init.c | 2 + + arch/mips/mm/tlbex.c | 28 +- + arch/mips/mm/uasm.c | 16 +- + arch/mips/mm/uasm.h | 7 + + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/nxp/pnx833x/common/interrupts.c | 4 +- + arch/mips/oprofile/op_model_loongson2.c | 5 +- + arch/mips/pci/Makefile | 4 +- + arch/mips/pci/fixup-excite.c | 36 - + arch/mips/pci/fixup-fuloong2e.c | 5 +- + arch/mips/pci/fixup-lemote2f.c | 160 + + arch/mips/pci/ops-bonito64.c | 7 - + arch/mips/pci/ops-loongson2.c | 208 ++ + arch/mips/pci/pci-excite.c | 149 - + arch/mips/powertv/Kconfig | 21 + + arch/mips/powertv/Makefile | 28 + + arch/mips/powertv/asic/Kconfig | 28 + + arch/mips/powertv/asic/Makefile | 23 + + arch/mips/powertv/asic/asic-calliope.c | 98 + + arch/mips/powertv/asic/asic-cronus.c | 98 + + arch/mips/powertv/asic/asic-zeus.c | 98 + + arch/mips/powertv/asic/asic_devices.c | 787 +++++ + arch/mips/powertv/asic/asic_int.c | 125 + + arch/mips/powertv/asic/irq_asic.c | 116 + + arch/mips/powertv/asic/prealloc-calliope.c | 620 ++++ + arch/mips/powertv/asic/prealloc-cronus.c | 608 ++++ + arch/mips/powertv/asic/prealloc-cronuslite.c | 290 ++ + arch/mips/powertv/asic/prealloc-zeus.c | 459 +++ + arch/mips/powertv/cmdline.c | 52 + + arch/mips/powertv/init.c | 128 + + arch/mips/powertv/init.h | 28 + + arch/mips/powertv/memory.c | 186 + + arch/mips/powertv/pci/Makefile | 21 + + arch/mips/powertv/pci/fixup-powertv.c | 36 + + arch/mips/powertv/pci/powertv-pci.h | 31 + + arch/mips/powertv/powertv-clock.h | 26 + + arch/mips/powertv/powertv_setup.c | 351 ++ + arch/mips/powertv/reset.c | 65 + + arch/mips/powertv/reset.h | 26 + + .../mips/{mipssim/sim_cmdline.c => powertv/time.c} | 21 +- + arch/mips/rb532/prom.c | 4 +- + arch/mips/sgi-ip22/ip22-eisa.c | 4 +- + arch/mips/sgi-ip22/ip22-int.c | 3 +- + arch/mips/sgi-ip22/ip22-setup.c | 2 +- + arch/mips/sgi-ip22/ip22-time.c | 3 +- + arch/mips/sgi-ip32/ip32-setup.c | 2 +- + arch/mips/sibyte/common/cfe.c | 4 +- + arch/mips/sni/a20r.c | 2 +- + arch/mips/sni/pcimt.c | 2 +- + arch/mips/sni/pcit.c | 2 +- + arch/mips/sni/rm200.c | 2 +- + arch/mips/sni/setup.c | 2 +- + arch/mips/txx9/generic/setup.c | 4 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 +- + drivers/hwmon/Kconfig | 37 + + drivers/hwmon/Makefile | 3 + + drivers/hwmon/k10temp.c | 197 ++ + drivers/hwmon/lis3lv02d_i2c.c | 183 + + drivers/hwmon/sht15.c | 6 +- + drivers/hwmon/smsc47m1.c | 153 +- + drivers/hwmon/via-cputemp.c | 356 ++ + drivers/hwmon/w83627hf.c | 2 +- + drivers/idle/i7300_idle.c | 15 +- + drivers/leds/Kconfig | 33 + + drivers/leds/Makefile | 4 + + drivers/leds/leds-adp5520.c | 230 ++ + drivers/leds/leds-alix2.c | 115 +- + drivers/leds/leds-cobalt-qube.c | 4 +- + drivers/leds/leds-cobalt-raq.c | 2 +- + drivers/leds/leds-lt3593.c | 217 ++ + drivers/leds/leds-pwm.c | 5 +- + drivers/leds/leds-regulator.c | 242 ++ + drivers/leds/leds-ss4200.c | 556 +++ + drivers/message/fusion/mptbase.c | 6 +- + drivers/misc/Kconfig | 1 + + drivers/misc/enclosure.c | 1 + + drivers/mmc/core/sdio.c | 5 +- + drivers/mmc/core/sdio_bus.c | 7 +- + drivers/mmc/host/Kconfig | 37 +- + drivers/mmc/host/Makefile | 6 +- + drivers/mmc/host/{sdhci-of.c => sdhci-of-core.c} | 143 +- + drivers/mmc/host/sdhci-of-esdhc.c | 143 + + drivers/mmc/host/sdhci-of-hlwd.c | 65 + + drivers/mmc/host/sdhci-of.h | 42 + + drivers/mmc/host/sdhci.h | 4 + + drivers/mtd/maps/pxa2xx-flash.c | 13 +- + drivers/mtd/nand/Kconfig | 8 - + drivers/mtd/nand/Makefile | 1 - + drivers/mtd/nand/excite_nandflash.c | 248 -- + drivers/net/Kconfig | 2 + + drivers/net/Makefile | 2 + + drivers/net/octeon/Kconfig | 10 + + drivers/net/octeon/Makefile | 2 + + drivers/net/octeon/octeon_mgmt.c | 1176 +++++++ + drivers/net/phy/Kconfig | 11 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/mdio-octeon.c | 180 + + drivers/pcmcia/pxa2xx_base.c | 6 +- + drivers/rtc/rtc-cmos.c | 3 +- + drivers/rtc/rtc-ds1305.c | 2 + + drivers/rtc/rtc-ds1307.c | 2 + + drivers/rtc/rtc-ds1374.c | 2 + + drivers/scsi/3w-9xxx.c | 11 +- + drivers/scsi/Kconfig | 10 + + drivers/scsi/Makefile | 1 + + drivers/scsi/be2iscsi/be_cmds.c | 12 +- + drivers/scsi/bnx2i/bnx2i.h | 1 + + drivers/scsi/bnx2i/bnx2i_hwi.c | 51 +- + drivers/scsi/bnx2i/bnx2i_init.c | 16 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 - + drivers/scsi/cxgb3i/cxgb3i_offload.c | 24 +- + drivers/scsi/cxgb3i/cxgb3i_pdu.c | 4 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 + + drivers/scsi/fcoe/fcoe.c | 137 +- + drivers/scsi/hpsa.c | 3531 ++++++++++++++++++++ + drivers/scsi/hpsa.h | 273 ++ + drivers/scsi/hpsa_cmd.h | 326 ++ + drivers/scsi/ipr.c | 1 + + drivers/scsi/libfc/fc_fcp.c | 65 +- + drivers/scsi/libfc/fc_lport.c | 7 +- + drivers/scsi/libfc/fc_rport.c | 1 + + drivers/scsi/lpfc/lpfc_init.c | 16 +- + drivers/scsi/megaraid/megaraid_sas.c | 14 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 5 + + drivers/scsi/mvsas/mv_init.c | 1 + + drivers/scsi/osd/osd_initiator.c | 88 +- + drivers/scsi/pm8001/pm8001_ctl.h | 10 - + drivers/scsi/pm8001/pm8001_hwi.c | 151 +- + drivers/scsi/pm8001/pm8001_hwi.h | 3 +- + drivers/scsi/pm8001/pm8001_init.c | 19 +- + drivers/scsi/pm8001/pm8001_sas.c | 57 +- + drivers/scsi/pm8001/pm8001_sas.h | 32 +- + drivers/scsi/pmcraid.c | 34 +- + drivers/scsi/pmcraid.h | 5 +- + drivers/scsi/qla2xxx/qla_def.h | 5 +- + drivers/scsi/qla2xxx/qla_gbl.h | 2 - + drivers/scsi/qla2xxx/qla_init.c | 12 +- + drivers/scsi/qla2xxx/qla_isr.c | 103 +- + drivers/scsi/qla2xxx/qla_mid.c | 4 + + drivers/scsi/qla2xxx/qla_os.c | 75 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/scsi_lib.c | 1 + + drivers/scsi/scsi_transport_fc.c | 17 +- + drivers/scsi/sd.c | 107 + + drivers/scsi/sd.h | 2 + + drivers/scsi/st.c | 23 +- + drivers/scsi/st.h | 1 + + drivers/spi/Kconfig | 28 + + drivers/spi/Makefile | 10 +- + drivers/spi/atmel_spi.c | 6 +- + drivers/spi/dw_spi.c | 944 ++++++ + drivers/spi/dw_spi_pci.c | 169 + + drivers/spi/spi_bfin5xx.c | 2 +- + drivers/spi/spi_mpc8xxx.c | 2 +- + drivers/spi/spi_s3c24xx.c | 244 ++- + drivers/spi/spi_s3c24xx_fiq.S | 116 + + drivers/spi/spi_s3c24xx_fiq.h | 26 + + drivers/spi/spi_s3c64xx.c | 1196 +++++++ + drivers/spi/spi_sh_sci.c | 2 +- + drivers/spi/spi_txx9.c | 6 +- + drivers/spi/spidev.c | 18 +- + drivers/staging/octeon/Kconfig | 3 +- + drivers/staging/octeon/ethernet-mdio.c | 204 +- + drivers/staging/octeon/ethernet-mdio.h | 2 +- + drivers/staging/octeon/ethernet-proc.c | 112 - + drivers/staging/octeon/ethernet-rgmii.c | 52 +- + drivers/staging/octeon/ethernet-sgmii.c | 2 +- + drivers/staging/octeon/ethernet-xaui.c | 2 +- + drivers/staging/octeon/ethernet.c | 23 +- + drivers/staging/octeon/octeon-ethernet.h | 6 +- + drivers/usb/host/ehci-omap.c | 2 +- + drivers/video/backlight/adp5520_bl.c | 2 +- + drivers/video/backlight/adx_bl.c | 2 +- + drivers/video/backlight/atmel-pwm-bl.c | 2 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/corgi_lcd.c | 2 +- + drivers/video/backlight/cr_bllcd.c | 4 +- + drivers/video/backlight/da903x_bl.c | 2 +- + drivers/video/backlight/generic_bl.c | 2 +- + drivers/video/backlight/hp680_bl.c | 2 +- + drivers/video/backlight/jornada720_bl.c | 2 +- + drivers/video/backlight/kb3886_bl.c | 2 +- + drivers/video/backlight/locomolcd.c | 2 +- + drivers/video/backlight/mbp_nvidia_bl.c | 20 +- + drivers/video/backlight/omap1_bl.c | 2 +- + drivers/video/backlight/progear_bl.c | 2 +- + drivers/video/backlight/pwm_bl.c | 11 +- + drivers/video/backlight/tosa_bl.c | 2 +- + drivers/video/backlight/wm831x_bl.c | 2 +- + drivers/video/omap/lcd_ldp.c | 4 +- + drivers/video/omap/lcd_omap2evm.c | 10 +- + drivers/video/omap/lcd_omap3beagle.c | 2 +- + drivers/video/omap/lcd_omap3evm.c | 10 +- + drivers/video/omap/lcd_overo.c | 2 +- + drivers/video/via/viafbdev.c | 4 +- + drivers/watchdog/Kconfig | 10 - + drivers/watchdog/Makefile | 1 - + drivers/watchdog/rm9k_wdt.c | 419 --- + fs/Kconfig | 4 - + fs/binfmt_aout.c | 13 +- + fs/binfmt_elf.c | 24 +- + fs/binfmt_elf_fdpic.c | 29 +- + fs/binfmt_flat.c | 6 +- + fs/binfmt_som.c | 2 +- + fs/btrfs/Kconfig | 1 - + fs/btrfs/acl.c | 23 +- + fs/btrfs/btrfs_inode.h | 5 +- + fs/btrfs/ctree.c | 229 +- + fs/btrfs/ctree.h | 40 +- + fs/btrfs/dir-item.c | 19 +- + fs/btrfs/disk-io.c | 27 +- + fs/btrfs/extent-tree.c | 72 +- + fs/btrfs/file.c | 669 ++--- + fs/btrfs/inode.c | 567 ++-- + fs/btrfs/ioctl.c | 34 +- + fs/btrfs/ordered-data.c | 115 +- + fs/btrfs/ordered-data.h | 5 +- + fs/btrfs/relocation.c | 38 +- + fs/btrfs/super.c | 15 +- + fs/btrfs/transaction.c | 44 +- + fs/btrfs/transaction.h | 6 +- + fs/btrfs/tree-log.c | 86 +- + fs/btrfs/volumes.c | 2 +- + fs/btrfs/xattr.c | 80 +- + fs/btrfs/xattr.h | 9 +- + fs/exec.c | 40 +- + fs/ext4/Kconfig | 1 - + fs/gfs2/Kconfig | 1 - + fs/jbd/Kconfig | 1 - + fs/jbd2/Kconfig | 1 - + fs/namespace.c | 3 +- + fs/nfs/super.c | 8 + + fs/nilfs2/Kconfig | 1 - + fs/ramfs/file-nommu.c | 2 +- + fs/reiserfs/Kconfig | 1 - + fs/reiserfs/inode.c | 18 +- + include/linux/backlight.h | 12 +- + include/linux/binfmts.h | 10 +- + include/linux/enclosure.h | 2 + + include/linux/init_task.h | 8 +- + include/linux/kmemleak.h | 6 +- + include/linux/leds-lp3944.h | 3 - + include/linux/leds-pca9532.h | 2 +- + include/linux/leds-regulator.h | 46 + + include/linux/mnt_namespace.h | 1 + + include/linux/pwm_backlight.h | 2 +- + include/linux/sched.h | 4 +- + include/linux/security.h | 7 + + include/linux/spi/dw_spi.h | 212 ++ + include/linux/vt.h | 4 + + include/scsi/osd_initiator.h | 5 +- + kernel/exit.c | 36 +- + kernel/fork.c | 2 +- + kernel/module.c | 13 +- + kernel/perf_event.c | 2 +- + kernel/printk.c | 4 +- + kernel/sysctl.c | 4 +- + kernel/time/timer_list.c | 4 +- + lib/Kconfig.debug | 1 + + lib/vsprintf.c | 13 +- + mm/Kconfig | 1 + + mm/kmemleak.c | 188 +- + mm/readahead.c | 12 + + mm/slab.c | 12 +- + scripts/Makefile.build | 1 + + scripts/recordmcount.pl | 58 +- + security/Makefile | 3 +- + security/keys/keyctl.c | 12 +- + security/min_addr.c | 2 +- + sound/soc/omap/sdp3430.c | 6 +- + 493 files changed, 31070 insertions(+), 6864 deletions(-) + create mode 100644 Documentation/hwmon/k10temp + create mode 100644 arch/arm/mach-kirkwood/netspace_v2-setup.c + delete mode 100644 arch/mips/basler/excite/Kconfig + delete mode 100644 arch/mips/basler/excite/Makefile + delete mode 100644 arch/mips/basler/excite/excite_device.c + delete mode 100644 arch/mips/basler/excite/excite_iodev.c + delete mode 100644 arch/mips/basler/excite/excite_iodev.h + delete mode 100644 arch/mips/basler/excite/excite_irq.c + delete mode 100644 arch/mips/basler/excite/excite_procfs.c + delete mode 100644 arch/mips/basler/excite/excite_prom.c + delete mode 100644 arch/mips/basler/excite/excite_setup.c + delete mode 100644 arch/mips/boot/addinitrd.c + create mode 100644 arch/mips/boot/compressed/Makefile + create mode 100644 arch/mips/boot/compressed/dbg.c + create mode 100644 arch/mips/boot/compressed/decompress.c + create mode 100644 arch/mips/boot/compressed/dummy.c + create mode 100644 arch/mips/boot/compressed/head.S + create mode 100644 arch/mips/boot/compressed/ld.script + create mode 100644 arch/mips/boot/compressed/uart-16550.c + create mode 100644 arch/mips/cavium-octeon/cpu.c + delete mode 100644 arch/mips/configs/excite_defconfig + create mode 100644 arch/mips/configs/lemote2f_defconfig + create mode 100644 arch/mips/configs/powertv_defconfig + create mode 100644 arch/mips/include/asm/clock.h + create mode 100644 arch/mips/include/asm/cop2.h + delete mode 100644 arch/mips/include/asm/mach-excite/cpu-feature-overrides.h + delete mode 100644 arch/mips/include/asm/mach-excite/excite.h + delete mode 100644 arch/mips/include/asm/mach-excite/excite_fpga.h + delete mode 100644 arch/mips/include/asm/mach-excite/excite_nandflash.h + delete mode 100644 arch/mips/include/asm/mach-excite/rm9k_eth.h + delete mode 100644 arch/mips/include/asm/mach-excite/rm9k_wdt.h + delete mode 100644 arch/mips/include/asm/mach-excite/rm9k_xicap.h + create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536.h + create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h + create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h + create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h + create mode 100644 arch/mips/include/asm/mach-powertv/asic.h + create mode 100644 arch/mips/include/asm/mach-powertv/asic_regs.h + create mode 100644 arch/mips/include/asm/mach-powertv/dma-coherence.h + create mode 100644 arch/mips/include/asm/mach-powertv/interrupts.h + create mode 100644 arch/mips/include/asm/mach-powertv/ioremap.h + create mode 100644 arch/mips/include/asm/mach-powertv/irq.h + create mode 100644 arch/mips/include/asm/mach-powertv/powertv-clock.h + rename arch/mips/include/asm/{mach-excite => mach-powertv}/war.h (56%) + create mode 100644 arch/mips/include/asm/octeon/cvmx-agl-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-mixx-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-smix-defs.h + create mode 100644 arch/mips/kernel/cpufreq/Kconfig + create mode 100644 arch/mips/kernel/cpufreq/Makefile + create mode 100644 arch/mips/kernel/cpufreq/loongson2_clock.c + create mode 100644 arch/mips/kernel/cpufreq/loongson2_cpufreq.c + create mode 100644 arch/mips/kernel/csrc-powertv.c + create mode 100644 arch/mips/kernel/ftrace.c + create mode 100644 arch/mips/kernel/mcount.S + create mode 100644 arch/mips/loongson/common/cs5536/Makefile + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_acc.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_ehci.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_ide.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_isa.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_mfgpt.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_ohci.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_pci.c + create mode 100644 arch/mips/loongson/common/platform.c + create mode 100644 arch/mips/loongson/common/pm.c + create mode 100644 arch/mips/loongson/common/serial.c + create mode 100644 arch/mips/loongson/common/uart_base.c + create mode 100644 arch/mips/loongson/lemote-2f/Makefile + create mode 100644 arch/mips/loongson/lemote-2f/ec_kb3310b.c + create mode 100644 arch/mips/loongson/lemote-2f/ec_kb3310b.h + create mode 100644 arch/mips/loongson/lemote-2f/irq.c + create mode 100644 arch/mips/loongson/lemote-2f/pm.c + create mode 100644 arch/mips/loongson/lemote-2f/reset.c + delete mode 100644 arch/mips/pci/fixup-excite.c + create mode 100644 arch/mips/pci/fixup-lemote2f.c + create mode 100644 arch/mips/pci/ops-loongson2.c + delete mode 100644 arch/mips/pci/pci-excite.c + create mode 100644 arch/mips/powertv/Kconfig + create mode 100644 arch/mips/powertv/Makefile + create mode 100644 arch/mips/powertv/asic/Kconfig + create mode 100644 arch/mips/powertv/asic/Makefile + create mode 100644 arch/mips/powertv/asic/asic-calliope.c + create mode 100644 arch/mips/powertv/asic/asic-cronus.c + create mode 100644 arch/mips/powertv/asic/asic-zeus.c + create mode 100644 arch/mips/powertv/asic/asic_devices.c + create mode 100644 arch/mips/powertv/asic/asic_int.c + create mode 100644 arch/mips/powertv/asic/irq_asic.c + create mode 100644 arch/mips/powertv/asic/prealloc-calliope.c + create mode 100644 arch/mips/powertv/asic/prealloc-cronus.c + create mode 100644 arch/mips/powertv/asic/prealloc-cronuslite.c + create mode 100644 arch/mips/powertv/asic/prealloc-zeus.c + create mode 100644 arch/mips/powertv/cmdline.c + create mode 100644 arch/mips/powertv/init.c + create mode 100644 arch/mips/powertv/init.h + create mode 100644 arch/mips/powertv/memory.c + create mode 100644 arch/mips/powertv/pci/Makefile + create mode 100644 arch/mips/powertv/pci/fixup-powertv.c + create mode 100644 arch/mips/powertv/pci/powertv-pci.h + create mode 100644 arch/mips/powertv/powertv-clock.h + create mode 100644 arch/mips/powertv/powertv_setup.c + create mode 100644 arch/mips/powertv/reset.c + create mode 100644 arch/mips/powertv/reset.h + rename arch/mips/{mipssim/sim_cmdline.c => powertv/time.c} (60%) + create mode 100644 drivers/hwmon/k10temp.c + create mode 100644 drivers/hwmon/lis3lv02d_i2c.c + create mode 100644 drivers/hwmon/via-cputemp.c + create mode 100644 drivers/leds/leds-adp5520.c + create mode 100644 drivers/leds/leds-lt3593.c + create mode 100644 drivers/leds/leds-regulator.c + create mode 100644 drivers/leds/leds-ss4200.c + rename drivers/mmc/host/{sdhci-of.c => sdhci-of-core.c} (58%) + create mode 100644 drivers/mmc/host/sdhci-of-esdhc.c + create mode 100644 drivers/mmc/host/sdhci-of-hlwd.c + create mode 100644 drivers/mmc/host/sdhci-of.h + delete mode 100644 drivers/mtd/nand/excite_nandflash.c + create mode 100644 drivers/net/octeon/Kconfig + create mode 100644 drivers/net/octeon/Makefile + create mode 100644 drivers/net/octeon/octeon_mgmt.c + create mode 100644 drivers/net/phy/mdio-octeon.c + create mode 100644 drivers/scsi/hpsa.c + create mode 100644 drivers/scsi/hpsa.h + create mode 100644 drivers/scsi/hpsa_cmd.h + create mode 100644 drivers/spi/dw_spi.c + create mode 100644 drivers/spi/dw_spi_pci.c + create mode 100644 drivers/spi/spi_s3c24xx_fiq.S + create mode 100644 drivers/spi/spi_s3c24xx_fiq.h + create mode 100644 drivers/spi/spi_s3c64xx.c + delete mode 100644 drivers/watchdog/rm9k_wdt.c + create mode 100644 include/linux/leds-regulator.h + create mode 100644 include/linux/spi/dw_spi.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Updating 5563935..4da8b82 +Fast forward + 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/mm/Kconfig | 4 - + arch/arm/mm/copypage-v6.c | 2 +- + arch/arm/nwfpe/Makefile | 4 +- + arch/arm/vfp/vfpmodule.c | 19 +- + 166 files changed, 220 insertions(+), 358 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 +Already up-to-date. +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 +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/rt2x00.h | 6 ++++ + drivers/net/wireless/rt2x00/rt2x00dev.c | 12 +++++++- + 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 +++++ + 33 files changed, 177 insertions(+), 113 deletions(-) +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 +Merge made by recursive. + Documentation/driver-model/driver.txt | 4 ++-- + Documentation/filesystems/sysfs.txt | 12 ++++++------ + Documentation/stable_kernel_rules.txt | 24 ++++++++++++++++++++++-- + drivers/base/core.c | 16 +++++++++++----- + drivers/base/devtmpfs.c | 12 +++++------- + drivers/base/driver.c | 4 ++-- + fs/super.c | 3 ++- + fs/sysfs/bin.c | 6 ++++-- + include/linux/device.h | 12 ++++++------ + include/linux/sysfs.h | 9 +++++---- + 10 files changed, 65 insertions(+), 37 deletions(-) +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + Documentation/ABI/testing/sysfs-bus-usb | 18 +++++---- + Documentation/usb/power-management.txt | 41 ++++++++-------------- + drivers/usb/Makefile | 2 - + drivers/usb/core/hub.c | 58 +++++++++++++++++------------- + drivers/usb/core/sysfs.c | 6 +++- + drivers/usb/gadget/f_audio.c | 8 +++-- + 6 files changed, 68 insertions(+), 65 deletions(-) +Merging quilt/staging.current +$ git merge quilt/staging.current +Removing drivers/staging/dst/Kconfig +Removing drivers/staging/dst/Makefile +Removing drivers/staging/dst/crypto.c +Removing drivers/staging/dst/dcore.c +Removing drivers/staging/dst/export.c +Removing drivers/staging/dst/state.c +Removing drivers/staging/dst/thread_pool.c +Removing drivers/staging/dst/trans.c +Removing include/linux/dst.h +Merge made by recursive. + 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 +- + include/linux/dst.h | 587 --------- + 53 files changed, 3696 insertions(+), 4674 deletions(-) + 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 + delete mode 100644 include/linux/dst.h +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/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 | 32 ++++++- + 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, 898 insertions(+), 329 deletions(-) +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +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/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 | 6 +- + 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 | 3 - + arch/mips/alchemy/common/setup.c | 3 +- + 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 | 137 ++ + arch/mips/alchemy/devboards/db1x00/Makefile | 2 +- + arch/mips/alchemy/devboards/db1x00/board_setup.c | 144 ++- + 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 | 193 +++ + 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 | 24 + + 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 | 37 +- + 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/kernel/linux32.c | 1 - + arch/mips/kernel/rtlx.c | 1 - + arch/mips/kernel/vpe.c | 1 - + 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 --- + 89 files changed, 5306 insertions(+), 3926 deletions(-) + delete mode 100644 arch/mips/alchemy/common/puts.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 +Merge made by recursive. + arch/powerpc/boot/dts/katmai.dts | 52 +++++++++++++++++++++++++++++++++++++- + arch/powerpc/boot/dts/warp.dts | 2 +- + 2 files changed, 52 insertions(+), 2 deletions(-) +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Merge made by recursive. + Documentation/powerpc/dts-bindings/fsl/mpic.txt | 42 ++++++++++++ + arch/powerpc/boot/dts/mpc8315erdb.dts | 27 ++++++++ + arch/powerpc/boot/dts/mpc8349emitx.dts | 82 ++++++++++++++++++++++- + arch/powerpc/include/asm/gpio.h | 5 +- + arch/powerpc/platforms/83xx/suspend.c | 52 ++++++++++++++- + arch/powerpc/sysdev/cpm2_pic.c | 28 ++++++-- + arch/powerpc/sysdev/fsl_pci.c | 8 ++- + arch/powerpc/sysdev/mpc8xxx_gpio.c | 21 ++++++- + 8 files changed, 248 insertions(+), 17 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/fsl/mpic.txt +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 +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/super.c +Auto-merging include/linux/fs.h +Merge made by recursive. + 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/quota/dquot.c | 288 ++++++++++++++++++++++++-------------------- + fs/quota/quota_v2.c | 4 +- + fs/stat.c | 10 ++- + include/linux/ext3_fs_sb.h | 2 + + include/linux/ext3_jbd.h | 7 +- + include/linux/fs.h | 1 + + include/linux/quota.h | 5 +- + 15 files changed, 246 insertions(+), 214 deletions(-) +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 +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/nfsd/nfsfh.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +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 +++++++++-------- + 3 files changed, 29 insertions(+), 23 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/alloc.c +Auto-merging fs/ocfs2/file.c +CONFLICT (content): Merge conflict in fs/ocfs2/file.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/ocfs2/xattr.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2bceee7] 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/alloc.c | 10 ++-- + fs/ocfs2/alloc.h | 5 ++ + 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 | 6 ++- + fs/ocfs2/ocfs2.h | 8 ++- + fs/ocfs2/ocfs2_fs.h | 2 +- + fs/ocfs2/refcounttree.c | 150 +++++++++++++++++++++++++++++++--------- + 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 + + 21 files changed, 290 insertions(+), 154 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 732f2c1] 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 576e3c6] 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 +Already up-to-date. +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. + drivers/hwmon/adt7462.c | 2 +- + drivers/hwmon/asus_atk0110.c | 289 ++++++++++++++++++++++++++++++++++-------- + 2 files changed, 236 insertions(+), 55 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/libata-scsi.c | 2 +- + drivers/ata/libata-sff.c | 2 +- + drivers/ata/pata_hpt366.c | 21 +--- + drivers/ata/pata_hpt37x.c | 187 ++++++++++++++++-------------------- + drivers/ata/pata_hpt3x2n.c | 180 +++++++++++++++++----------------- + drivers/ata/pata_octeon_cf.c | 2 +- + drivers/ata/sata_mv.c | 144 ++++++++++++++++++++++++---- + 8 files changed, 509 insertions(+), 250 deletions(-) + mode change 100644 => 100755 drivers/ata/sata_mv.c +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + drivers/platform/x86/sony-laptop.c | 151 ++++++++++++++++++++++++------------ + drivers/platform/x86/tc1100-wmi.c | 115 +++++++++++++-------------- + include/linux/sonypi.h | 1 + + 3 files changed, 158 insertions(+), 109 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Resolved 'drivers/media/dvb/firewire/firedtv-1394.c' using previous resolution. +Resolved 'drivers/media/dvb/firewire/firedtv-avc.c' using previous resolution. +Resolved 'drivers/media/dvb/firewire/firedtv-fw.c' using previous resolution. +Resolved 'drivers/media/dvb/firewire/firedtv.h' using previous resolution. +Auto-merging drivers/media/dvb/firewire/firedtv-1394.c +CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-1394.c +Auto-merging drivers/media/dvb/firewire/firedtv-avc.c +CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-avc.c +Auto-merging drivers/media/dvb/firewire/firedtv-dvb.c +Auto-merging drivers/media/dvb/firewire/firedtv-fw.c +CONFLICT (add/add): Merge conflict in drivers/media/dvb/firewire/firedtv-fw.c +Auto-merging drivers/media/dvb/firewire/firedtv.h +CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 55a62d4] Merge remote branch 'ieee1394/for-next' +$ git diff -M --stat --summary HEAD^.. + 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 +Merge made by recursive. + arch/x86/kvm/paging_tmpl.h | 18 ------------------ + 1 files changed, 0 insertions(+), 18 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/shdma.c +Merge made by recursive. + drivers/dma/at_hdmac.c | 4 +- + drivers/dma/shdma.c | 324 ++++++++++++++++++++++++++++++----------------- + drivers/dma/shdma.h | 9 +- + 3 files changed, 215 insertions(+), 122 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Merge made by recursive. + net/wireless/core.h | 2 ++ + net/wireless/nl80211.c | 37 ++----------------------------------- + net/wireless/util.c | 33 +++++++++++++++++++++++++++++++++ + net/wireless/wext-compat.c | 5 +---- + 4 files changed, 38 insertions(+), 39 deletions(-) +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/s390/crypto/aes_s390.c | 8 ++++---- + crypto/gf128mul.c | 4 ++-- + drivers/char/hw_random/pasemi-rng.c | 2 +- + drivers/char/hw_random/timeriomem-rng.c | 3 +-- + drivers/char/hw_random/virtio-rng.c | 6 +++--- + drivers/crypto/geode-aes.c | 6 +++--- + 6 files changed, 14 insertions(+), 15 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/arm/aaci.c | 177 ++++++------------ + sound/arm/aaci.h | 2 +- + sound/mips/sgio2audio.c | 2 +- + sound/oss/pss.c | 6 +- + sound/pci/hda/patch_conexant.c | 43 ++++- + sound/pci/hda/patch_realtek.c | 314 +++++++++++++++++++++++++++++--- + 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/usb/usbaudio.c | 2 +- + 11 files changed, 395 insertions(+), 175 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Auto-merging drivers/scsi/fcoe/fcoe.c +Auto-merging include/linux/sched.h +Auto-merging mm/slab.c +Merge made by recursive. + Documentation/lguest/lguest.c | 1 - + MAINTAINERS | 9 + + arch/ia64/kvm/Kconfig | 1 + + arch/powerpc/kvm/Kconfig | 1 + + arch/s390/kvm/Kconfig | 1 + + arch/x86/kvm/Kconfig | 1 + + drivers/Makefile | 1 + + drivers/net/tun.c | 101 ++++- + drivers/vhost/Kconfig | 11 + + drivers/vhost/Makefile | 2 + + drivers/vhost/net.c | 648 ++++++++++++++++++++++++++ + drivers/vhost/vhost.c | 968 +++++++++++++++++++++++++++++++++++++++ + drivers/vhost/vhost.h | 159 +++++++ + drivers/virtio/virtio_balloon.c | 108 ++++- + include/linux/Kbuild | 1 + + include/linux/gfp.h | 2 +- + include/linux/if_tun.h | 14 + + include/linux/kernel.h | 80 ++-- + include/linux/kmemcheck.h | 2 +- + include/linux/miscdevice.h | 1 + + include/linux/vhost.h | 130 ++++++ + include/linux/virtio_balloon.h | 15 + + include/linux/virtio_config.h | 5 +- + mm/mmu_context.c | 3 + + 24 files changed, 2203 insertions(+), 62 deletions(-) + create mode 100644 drivers/vhost/Kconfig + create mode 100644 drivers/vhost/Makefile + create mode 100644 drivers/vhost/net.c + create mode 100644 drivers/vhost/vhost.c + create mode 100644 drivers/vhost/vhost.h + create mode 100644 include/linux/vhost.h +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 +Already up-to-date. +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 +Merge made by recursive. +Merging slab/for-next +$ git merge slab/for-next +Already uptodate! +Merge made by recursive. +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 +Merge made by recursive. + drivers/gpu/drm/i2c/ch7006_drv.c | 5 + + drivers/gpu/drm/i2c/ch7006_mode.c | 5 - + 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 + + 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 | 6 +- + 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_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/radeon/radeon_encoders.c | 18 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 5 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 + + 47 files changed, 2028 insertions(+), 898 deletions(-) + 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 +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 +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 +Merge made by recursive. + drivers/watchdog/iTCO_wdt.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 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 +Merge made by recursive. + .../networking/timestamping/timestamping.c | 2 +- + arch/x86/kernel/apic/apic_flat_64.c | 2 +- + arch/x86/kernel/vmiclock_32.c | 2 +- + drivers/acpi/proc.c | 2 +- + drivers/block/ataflop.c | 2 -- + drivers/char/random.c | 2 +- + drivers/gpu/drm/radeon/radeon_state.c | 2 +- + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/net/cs89x0.c | 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/wireless/zd1211rw/zd_mac.c | 2 +- + fs/buffer.c | 2 +- + fs/dlm/member.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/sched_cpupri.c | 2 +- + kernel/trace/ring_buffer.c | 4 ++-- + 23 files changed, 34 insertions(+), 35 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 | 242 +++++++++++++++++++++++++++++++++++++----- + drivers/base/power/power.h | 6 +- + drivers/base/power/sysfs.c | 47 ++++++++ + drivers/input/serio/serio.c | 1 + + 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 +++++- + 9 files changed, 332 insertions(+), 30 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/exec.c +Auto-merging fs/namespace.c +Removing fs/notify/inotify/inotify.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/fs.h +Auto-merging include/linux/security.h +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 | 114 +++- + fs/notify/inotify/inotify_user.c | 308 ++++++---- + fs/notify/mark.c | 325 ++++++++++ + fs/notify/notification.c | 176 +++--- + fs/notify/vfsmount_mark.c | 176 ++++++ + fs/open.c | 10 +- + fs/read_write.c | 8 +- + include/asm-generic/fcntl.h | 8 + + include/linux/Kbuild | 1 + + include/linux/fanotify.h | 105 ++++ + include/linux/fs.h | 10 +- + 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 | 222 ++++--- + 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, 3075 insertions(+), 2230 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 8ecf8b9] 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 4a09811] 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 +Merge made by recursive. +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'include/linux/Kbuild' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in 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 673f163] 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 +Already up-to-date. +Merging limits/writable_limits +$ git merge limits/writable_limits +Recorded preimage for 'fs/exec.c' +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/ia64/kernel/perfmon.c +Auto-merging arch/ia64/mm/init.c +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/binfmt_aout.c +Auto-merging fs/binfmt_flat.c +Auto-merging fs/exec.c +CONFLICT (content): Merge conflict in fs/exec.c +Auto-merging fs/proc/base.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/sched.h +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging ipc/mqueue.c +Auto-merging ipc/shm.c +Auto-merging kernel/fork.c +Auto-merging kernel/perf_event.c +Auto-merging kernel/sched.c +Auto-merging kernel/sched_rt.c +Auto-merging kernel/signal.c +Auto-merging kernel/sys.c +Auto-merging mm/filemap.c +Auto-merging mm/mlock.c +Auto-merging mm/mmap.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/exec.c'. +[master 1a15cfd] 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 +Recorded preimage for 'include/linux/sched.h' +Auto-merging arch/x86/Kconfig +Auto-merging fs/proc/array.c +Removing include/linux/perf_counter.h +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging kernel/perf_event.c +Auto-merging kernel/sched.c +Auto-merging kernel/sched_rt.c +Auto-merging kernel/signal.c +Auto-merging kernel/sys.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/sched.h'. +[master 35be3c9] Merge remote branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Makefile | 7 + + arch/x86/Kconfig | 5 + + arch/x86/include/asm/cpufeature.h | 1 + + 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/include/asm/uv/bios.h | 7 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 6 +- + arch/x86/kernel/bios_uv.c | 20 +- + 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/msr.c | 4 +- + arch/x86/kernel/stacktrace.c | 18 +- + arch/x86/kernel/tsc.c | 1 + + 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/char/nvram.c | 3 - + fs/proc/array.c | 19 +- + include/linux/decompress/mm.h | 4 +- + include/linux/mm.h | 3 + + include/linux/perf_counter.h | 444 ---------------------------------- + include/linux/poison.h | 16 +- + include/linux/rcutiny.h | 5 + + include/linux/rcutree.h | 11 + + include/linux/sched.h | 13 +- + init/initramfs.c | 10 +- + init/main.c | 7 +- + kernel/cpu.c | 24 +-- + kernel/futex_compat.c | 6 +- + kernel/kthread.c | 23 ++ + kernel/perf_event.c | 32 ++- + kernel/sched.c | 401 ++++++++++++++++--------------- + kernel/sched_clock.c | 23 ++- + kernel/sched_fair.c | 53 ++++- + kernel/sched_idletask.c | 2 +- + kernel/sched_rt.c | 4 +- + kernel/signal.c | 25 +- + kernel/sys.c | 2 + + kernel/time/clockevents.c | 18 ++- + kernel/timer.c | 2 - + kernel/trace/trace_kprobe.c | 31 ++- + kernel/trace/trace_sysprof.c | 1 + + lib/decompress_bunzip2.c | 10 +- + mm/page_alloc.c | 4 +- + tools/perf/Makefile | 3 +- + tools/perf/builtin-probe.c | 4 + + tools/perf/util/probe-event.c | 15 ++ + tools/perf/util/probe-finder.h | 59 +++-- + 62 files changed, 864 insertions(+), 1081 deletions(-) + create mode 100644 arch/x86/lib/msr-smp.c + delete mode 100644 include/linux/perf_counter.h +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging arch/blackfin/mach-common/entry.S +Auto-merging arch/x86/kernel/vmlinux.lds.S +Auto-merging include/linux/vmstat.h +Auto-merging kernel/trace/trace.c +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(-) +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 +Already up-to-date. +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 +Merge made by recursive. + drivers/mmc/card/sdio_uart.c | 92 +++++++++++++---------------------------- + 1 files changed, 29 insertions(+), 63 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging quilt/staging +$ git merge quilt/staging +Removing drivers/staging/batman-adv/log.c +Merge made by recursive. + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/asus_oled/asus_oled.c | 14 +- + 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 +- + 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/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 | 175 +++ + 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 | 400 +++++++ + 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/ramzswap/ramzswap_drv.c | 1 - + 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/dot11d.h | 138 +-- + drivers/staging/rtl8192e/ieee80211.h | 3 - + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 3 - + .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 18 +- + .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 27 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 52 +- + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 4 +- + .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 6 +- + .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 6 +- + drivers/staging/rtl8192e/r8180_93cx6.h | 33 +- + drivers/staging/rtl8192e/r8190_rtl8256.h | 49 +- + drivers/staging/rtl8192e/r8192E_core.c | 2 +- + drivers/staging/rtl8192e/r819xE_firmware.c | 81 +- + drivers/staging/rtl8192e/r819xE_phy.h | 194 ++-- + drivers/staging/rtl8192e/r819xE_phyreg.h | 1207 ++++++++++--------- + 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 | 6 +- + .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 6 +- + drivers/staging/rtl8192su/r8192U_core.c | 2 +- + 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_TSProc.c | 6 +- + drivers/staging/rtl8192u/r8192U_core.c | 4 +- + drivers/staging/slicoss/slic.h | 9 - + drivers/staging/slicoss/slicoss.c | 104 +- + 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/wlags49_h2/wl_pci.c | 1 - + 132 files changed, 12818 insertions(+), 2479 deletions(-) + 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 +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..0dd7a5100b0d --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,221 @@ +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 +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core.current +From ../quilt-tmp + f405425..29d84f9 master -> quilt/driver-core.current +Importing tty.current based on quilt/driver-core.current + quilt series is empty +$ git update-ref refs/heads/quilt/tty.current 29d84f9bdcfb46a12948d42255cea7bfaf2dbe34 +Importing usb.current based on quilt/tty.current +$ cd ../quilt-tmp +$ git reset --hard 29d84f9bdcfb46a12948d42255cea7bfaf2dbe34 +HEAD is now at 29d84f9 Driver-core: Fix bogus 0 error return in device_add() +$ 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 +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb.current +From ../quilt-tmp + f405425..e05cf59 master -> quilt/usb.current +Importing staging.current based on quilt/usb.current +$ cd ../quilt-tmp +$ git reset --hard e05cf59cd06a6966d4f1cd8ae8d2c84d8eee7f42 +HEAD is now at e05cf59 USB: Fix double-linking of drivers/usb/otg when ULPI is selected +$ 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 + f405425..1259a44 master -> quilt/staging.current +Importing i2c based on 2.6.33-rc1 +$ cd ../quilt-tmp +$ git reset --hard 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +HEAD is now at 5563935 Linux 2.6.33-rc1 +$ 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 + + 3f62cce...7aff07c master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.33-rc1 +$ cd ../quilt-tmp +$ git reset --hard 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +HEAD is now at 5563935 Linux 2.6.33-rc1 +$ 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 +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 77d72d7...2a60ee49 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.32-8665-gb8a7f3c +$ cd ../quilt-tmp +$ git reset --hard b8a7f3cd7e8212e5c572178ff3b5a514861036a5 +HEAD is now at b8a7f3c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-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 +cpumask:kernel_perf_event-deprecated-function.patch +cpumask:mm_slab-deprecated-function.patch +cpumask:scsi-scoe-modernize.patch +cpumask:i7300_idle-to-cpumask_var_t.patch +cpumask:avoid-deref-in-timer_list.patch +cpumask:documentation-fixes.patch +cpumask:tsk_cpus_allowed-not-tsk_cpumask.patch +net:tun_export_underlying_socket.patch +mm:export_use_mm_unuse_mm.patch +virtio:vhost_net_a_kernel_level_server.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:60: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +virtio:vhost_add_missing_architectures.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 + + 9dd4c5a...4543201 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 1259a443bd5d460d85ada8e115ed599041f37b0f +HEAD is now at 1259a44 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 + f405425..d8a5fcf master -> quilt/driver-core +Importing tty based on quilt/driver-core +$ cd ../quilt-tmp +$ git reset --hard d8a5fcf4dbdd21a6295bded4911fca3cd14ba6bc +HEAD is now at d8a5fcf 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 +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/tty +From ../quilt-tmp + + c0a4970...f91645a master -> quilt/tty (forced update) +Importing usb based on quilt/tty + quilt series is empty +$ git update-ref refs/heads/quilt/usb f91645a39ef28b84a9cd26d06d09835251508a09 +Importing staging based on quilt/usb +$ cd ../quilt-tmp +$ git reset --hard f91645a39ef28b84a9cd26d06d09835251508a09 +HEAD is now at f91645a tty: sdio_uart: Use kfifo instead of the messy circ stuff +$ 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-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. +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging +From ../quilt-tmp + + c0a4970...2537c7b master -> quilt/staging (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..6494acce5b31 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20091219 |